Bug #229443, compile-fix for newer libtool setups.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.26-rc4-00103-g1beee8d x86_64

4 files changed, 43 insertions, 4 deletions

diff --git a/sys-power/nut/ChangeLog b/sys-power/nut/ChangeLog
index 32a6e4f2b633..6d3af9aa9caf 100644
--- a/sys-power/nut/ChangeLog
+++ b/sys-power/nut/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-power/nut
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/ChangeLog,v 1.56 2008/06/25 02:53:07 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/ChangeLog,v 1.57 2008/07/05 03:15:15 robbat2 Exp $
+
+  05 Jul 2008; Robin H. Johnson <robbat2@gentoo.org>
+  +files/nut-2.2.2-no-libdummy.patch, nut-2.2.2.ebuild:
+  Bug #229443, compile-fix for newer libtool setups.
 
   25 Jun 2008; Robin H. Johnson <robbat2@gentoo.org>
   files/nut-2.2.2-init.d-upsmon:
diff --git a/sys-power/nut/Manifest b/sys-power/nut/Manifest
index 93c089868bd6..8b54635afc40 100644
--- a/sys-power/nut/Manifest
+++ b/sys-power/nut/Manifest
@@ -4,6 +4,7 @@ AUX nut-2.0.5-bcmxcp-3phase.patch 2983 RMD160 f27271648742d96952902e27b83e4b5ed3
 AUX nut-2.2.2-init.d-upsd 770 RMD160 339bdc9e9f338c6560155cb51986e5210693cfe2 SHA1 918b6955f2799eaedd08bf277b234c82e2b4cf7a SHA256 5cabebe42add66c88ec3f75b94faab21730c2828f7e2a390c90cc80cd765a0f6
 AUX nut-2.2.2-init.d-upsdrv 978 RMD160 249292e9338ae68b956c5858db7588447c3f41d7 SHA1 753bc85f2c521074bad8a2cec206a4c8bc50f68e SHA256 19d16a28347868e380a08c1d0aed542ac7c37afaf0afe85d6e5c974796dfc138
 AUX nut-2.2.2-init.d-upsmon 655 RMD160 04ba8bdc74c296f7126dcc06a748fbeac630ab64 SHA1 c69bd2d85fcf9e59d49b57fd5a3d51575bd688b0 SHA256 f8063853e446dc4012254ac6f81d4c1921f3e9f5c8dabe49bec3420bad98bc06
+AUX nut-2.2.2-no-libdummy.patch 1421 RMD160 aa7156a547922c38db419a69ccf70c3f83119a4a SHA1 49038db25dc33836adbcdab821286db7ade34b94 SHA256 1a9dfcd2b9bb96e43642f70087e290a27ae631fca0f8c2c9c976f417ec4007fb
 AUX upsd.rc6 733 RMD160 e95d9885a27059b16f17c6f124a43f158fef3b19 SHA1 7ffcd039a7a2e58f1608a7fe29898c13b3c4a762 SHA256 f78f9ef953e4f9b17f40eb36fe404118a39bb0baba9ccde0fb4ea0274440bb93
 AUX upsdrv.rc6-r1 490 RMD160 b13a0dcc1facd1d857d15838da65a5bc360daa83 SHA1 ffbcc64d07317e6a3275156bbdcbbb08497415aa SHA256 4b2f21251cdf789ebe0688ad27ad699940f5cfb0ddaa4d9c5d22f8343ccbfd84
 AUX upsmon.rc6 473 RMD160 6ad1ce54be6199d3399e77d008229acb2f02bc43 SHA1 bde917f09b74a9efc563d91b9dd74a4e8b793e3f SHA256 f338e5955c6f1e601cb0b90b95c00cbde47ef3dc56e970d8f42bb335203fbcc7
@@ -15,6 +16,6 @@ DIST nut-2.2.2.tar.gz 1184406 RMD160 4dc1d2b729fc0e02c0475008c44bc62e1901f705 SH
 EBUILD nut-2.0.5-r2.ebuild 5267 RMD160 f362f6a45271e42790628cd7b5713f64c3901feb SHA1 007caacbb0b61fc2c1a73eb0e3abde8720b0d311 SHA256 025dda38a95e65de8b32c0a329fba2325196cb0fd007a5ff670ab467a8479717
 EBUILD nut-2.2.0.ebuild 5571 RMD160 c33ecc31fb43183cb756f6220b41f772da4dc61d SHA1 7c38071303ffaaeefbe6c8540ebcfc4b63e05c3c SHA256 4a2add25611a7f3689c62bbaee92b0445f45abcb4d179d5192f0c893bc513766
 EBUILD nut-2.2.1.ebuild 5875 RMD160 05852fcbf41fa9f865a501eaab1a95fb2003d0a8 SHA1 3d093f2dbbe65888137abbfd508473289e2d9a13 SHA256 12355204b83d33f420905d28454d80f6c85d361060ad49d9a3d058ebbd7f6652
-EBUILD nut-2.2.2.ebuild 6107 RMD160 98b96e6f20cce20d72c3d828a29caf47b34a837d SHA1 9e8741ed97c87f7b030e9de83c1cee3db8c3e653 SHA256 8b6ccf13f803207399b6fd105f830fd7982ccae5d635b990a4ae0d3bdd9f76f5
-MISC ChangeLog 15500 RMD160 580acdcab71213ed276b5c86c50abbf9e26048c1 SHA1 f5624f6938147978835ba164f310a88b972160ac SHA256 74b62b92cfd81ecb0284f323033cd4c779414d6aaf799124fd345fb0c68208b7
+EBUILD nut-2.2.2.ebuild 6151 RMD160 e0f47ff470ad675ddaf1f256f70080f8bd4cfea6 SHA1 0394ffcd8f22c10803cc62d82f9111134a0cc439 SHA256 8d84f46ce7208e647ed94c4dac2528b196d98b2165136306431a5e91b794e0e5
+MISC ChangeLog 15663 RMD160 223ffcab72bf2c0f50c81ccc0e0596be04702c2f SHA1 3ce44707ec3d29557c9a1934ed49ee1d7e36746c SHA256 a47318b9242509827d09e90db5445da7ae2873f9e75b0a818589322e8c3f6404
 MISC metadata.xml 219 RMD160 7737543ce33cd412792e332121aa1c6ed452adfc SHA1 6c360930b80d6f4168ba1a486a25ad176505ea63 SHA256 8b2ef93d0d6f03a1ad115651dc46a7752e7775a62a32a7046c3294e50b14725b
diff --git a/sys-power/nut/files/nut-2.2.2-no-libdummy.patch b/sys-power/nut/files/nut-2.2.2-no-libdummy.patch
new file mode 100644
index 000000000000..646e9fefe184
--- /dev/null
+++ b/sys-power/nut/files/nut-2.2.2-no-libdummy.patch
@@ -0,0 +1,32 @@
+diff -Nuar nut-2.2.2.orig/common/Makefile.am nut-2.2.2/common/Makefile.am
+--- nut-2.2.2.orig/common/Makefile.am	2007-05-27 07:07:56.000000000 -0700
++++ nut-2.2.2/common/Makefile.am	2008-07-04 20:09:14.062814944 -0700
+@@ -10,8 +10,8 @@
+ 
+ # Define a dummy library so that Automake builds rules for the
+ # corresponding object files.  This library is not actually built,
+-EXTRA_LIBRARIES = libdummy.a
+-libdummy_a_SOURCES = parseconf.c state.c upsconf.c
++#EXTRA_LIBRARIES = libdummy.a
++#libdummy_a_SOURCES = parseconf.c state.c upsconf.c
+ 
+ ../include/nut_version.h: FORCE
+ 	(cd ../include/ && $(MAKE) $(AM_MAKEFLAGS) nut_version.h)
+diff -Nuar nut-2.2.2.orig/drivers/Makefile.am nut-2.2.2/drivers/Makefile.am
+--- nut-2.2.2.orig/drivers/Makefile.am	2008-07-04 20:12:38.201211819 -0700
++++ nut-2.2.2/drivers/Makefile.am	2008-07-04 20:12:59.829462787 -0700
+@@ -211,10 +211,12 @@
+  upscode2.h victronups.h powerpanel.h powerp-bin.h powerp-txt.h		\
+  upshandler.h netxml-ups.h mge-xml.h
+ 
++EXTRA_LIBRARIES =
++
+ # Define a dummy library so that Automake builds rules for the
+ # corresponding object files.  This library is not actually built,
+-EXTRA_LIBRARIES = libdummy.a
+-libdummy_a_SOURCES = main.c dstate.c serial.c
++#EXTRA_LIBRARIES += libdummy.a
++#libdummy_a_SOURCES = main.c dstate.c serial.c
+ 
+ # the nuthalmain library combines the code for main-hal.c and
+ # dstate-hal.c. It is necessary for Automake-technical reasons,
diff --git a/sys-power/nut/nut-2.2.2.ebuild b/sys-power/nut/nut-2.2.2.ebuild
index 82fde6b56617..efac2ac7c3f7 100644
--- a/sys-power/nut/nut-2.2.2.ebuild
+++ b/sys-power/nut/nut-2.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/nut-2.2.2.ebuild,v 1.2 2008/06/25 16:03:48 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/nut-2.2.2.ebuild,v 1.3 2008/07/05 03:15:15 robbat2 Exp $
 
 inherit eutils fixheadtails autotools
 
@@ -58,6 +58,8 @@ src_unpack() {
 
 	ht_fix_file configure.in
 
+	epatch "${FILESDIR}"/${P}-no-libdummy.patch
+
 	sed -e "s:GD_LIBS.*=.*-L/usr/X11R6/lib \(.*\) -lXpm -lX11:GD_LIBS=\"\1:" \
 		-i configure.in || die "sed failed"