Added patch from bug #132563 to fix compilation with -Wl,--as-needed. Thanks to TGL <degrenier@easyconnect.fr>.

Package-Manager: portage-2.1_pre10-r5

6 files changed, 83 insertions, 12 deletions

diff --git a/dev-java/commons-daemon/ChangeLog b/dev-java/commons-daemon/ChangeLog
index d50290e345df..e13816389332 100644
--- a/dev-java/commons-daemon/ChangeLog
+++ b/dev-java/commons-daemon/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/commons-daemon
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-daemon/ChangeLog,v 1.14 2005/06/07 18:05:53 luckyduck Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-daemon/ChangeLog,v 1.15 2006/05/12 12:59:38 betelgeuse Exp $
+
+  12 May 2006; Petteri Räty <betelgeuse@gentoo.org>
+  +files/1.0.1-as-needed.patch, commons-daemon-1.0.1.ebuild:
+  Added patch from bug #132563 to fix compilation with -Wl,--as-needed. Thanks
+  to TGL <degrenier@easyconnect.fr>.
 
 *commons-daemon-1.0.1 (07 Jun 2005)
 
diff --git a/dev-java/commons-daemon/Manifest b/dev-java/commons-daemon/Manifest
index 2fd75ff5e178..b505bba31693 100644
--- a/dev-java/commons-daemon/Manifest
+++ b/dev-java/commons-daemon/Manifest
@@ -1,16 +1,38 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 aa748f7c11b6af776b833f7448e33c40 commons-daemon-1.0.1.ebuild 1591
+AUX 1.0.1-as-needed.patch 1295 RMD160 97f3cca890f3b2be7e0aeaa2d710acb8504fb096 SHA1 deb095d7d97006e8f7fe05d1d2c42f4b63d07281 SHA256 640d2239d1679892e218c9c71053c37719894d6438b00e1ece5e0e461ed4f888 size 1295
+MD5 c9be4f24c5ff845b60a4cdbe704407db files/1.0.1-as-needed.patch 1295
+RMD160 97f3cca890f3b2be7e0aeaa2d710acb8504fb096 files/1.0.1-as-needed.patch 1295
+SHA256 640d2239d1679892e218c9c71053c37719894d6438b00e1ece5e0e461ed4f888 files/1.0.1-as-needed.patch 1295
+DIST daemon-1.0-Alpha.tar.gz 219634 RMD160 a698ccbe1385a0870f3add2a7d2603c1ae546159 SHA256 e024b0adf38777ffc6b65864b8853a317d4f1be6f2f510a56382c2138005e805 size 219634
+DIST daemon-1.0.1.tar.gz 301023 RMD160 b77ffd3dbc40d18d867afd62015ba1aa05bd9c65 SHA256 177107b8d99cabdbcda58cec284a2e2ccb5063113cc1fdb1b672754d4652848c size 301023
+EBUILD commons-daemon-1.0.1.ebuild 1642 RMD160 8858cbd83420aacfeed74c6999a79a0a39a7984a SHA1 d85741a7fb09fecfb87ac48add6b5d0d5c5b8cae SHA256 d9b5ffb05532f87f177fed07287c1409fea4927350b36c8f9eee0191cf81fe13 size 1642
+MD5 8fc56e2e1fba3487bbd70aeff57b9bc7 commons-daemon-1.0.1.ebuild 1642
+RMD160 8858cbd83420aacfeed74c6999a79a0a39a7984a commons-daemon-1.0.1.ebuild 1642
+SHA256 d9b5ffb05532f87f177fed07287c1409fea4927350b36c8f9eee0191cf81fe13 commons-daemon-1.0.1.ebuild 1642
+EBUILD commons-daemon-1.0.ebuild 1291 RMD160 e2aa5bd0fb81fe551170cfb20b44e197e457c28f SHA1 7418e89f2275c27098514e5500deb8bab997dae1 SHA256 9706f764c729f6ae965f5164e971c52bbdf638db33e41c8699e7ecb5e8041454 size 1291
 MD5 928d2548f7069d617e6bdc4de5fa8ecf commons-daemon-1.0.ebuild 1291
-MD5 05a2811225c0064a602d150ed750ea94 ChangeLog 1937
+RMD160 e2aa5bd0fb81fe551170cfb20b44e197e457c28f commons-daemon-1.0.ebuild 1291
+SHA256 9706f764c729f6ae965f5164e971c52bbdf638db33e41c8699e7ecb5e8041454 commons-daemon-1.0.ebuild 1291
+MISC ChangeLog 2169 RMD160 71049c6aa652eac2580787d9599172f497c95c7f SHA1 744ac81852aff321c24129b7fccda6fe9c84c3f4 SHA256 464a84ebf04085f7113dccc694eb96fe7b3c6a9cdb0fc0becfcfc2a61cff927c size 2169
+MD5 cdedf30abbae940e8017ad8137b47188 ChangeLog 2169
+RMD160 71049c6aa652eac2580787d9599172f497c95c7f ChangeLog 2169
+SHA256 464a84ebf04085f7113dccc694eb96fe7b3c6a9cdb0fc0becfcfc2a61cff927c ChangeLog 2169
+MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 size 157
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 33c2af11a1ef867c6f6667c9c015eda6 files/digest-commons-daemon-1.0.1 64
-MD5 594ef90d87023327ed87ea6bad1ce322 files/digest-commons-daemon-1.0 68
+RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
+SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata.xml 157
+MD5 1fee43be4db58952fe2fcba0aa768f3d files/digest-commons-daemon-1.0 250
+RMD160 ede3e602117112a95a89d9d02af9152af9aa4fba files/digest-commons-daemon-1.0 250
+SHA256 505cc3a8483b7eb05c06bc81dd406f845d608a9248da424b7edba65151bc07e4 files/digest-commons-daemon-1.0 250
+MD5 fddd3a2c1a4c981297f9b860c934775c files/digest-commons-daemon-1.0.1 238
+RMD160 a6e1fb33ccb1551a62716c164102b3d85116ae84 files/digest-commons-daemon-1.0.1 238
+SHA256 48ecc6d148e38bb4563627f45eefe01663cc435820e920937d8c570b62330a09 files/digest-commons-daemon-1.0.1 238
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFC3UFr/rLF9B432nYRAkRqAJ9hGDZpTur0N9QfmyJacnSPv8/tUwCguZAC
-zkpb4ZoQCvVmOzuh7+5zlpY=
-=mDzF
+iD8DBQFEZIbEcxLzpIGCsLQRAh3PAJ4vhoHOTWwuolCRctlAYKZSg4HQPACeNHlw
+sGKX5iYxPszDu1EOMftPRvc=
+=ud+6
 -----END PGP SIGNATURE-----
diff --git a/dev-java/commons-daemon/commons-daemon-1.0.1.ebuild b/dev-java/commons-daemon/commons-daemon-1.0.1.ebuild
index 642b4b6880ee..213403ba2a39 100644
--- a/dev-java/commons-daemon/commons-daemon-1.0.1.ebuild
+++ b/dev-java/commons-daemon/commons-daemon-1.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-daemon/commons-daemon-1.0.1.ebuild,v 1.2 2005/07/19 18:07:12 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-daemon/commons-daemon-1.0.1.ebuild,v 1.3 2006/05/12 12:59:38 betelgeuse Exp $
 
 inherit java-pkg eutils
 
@@ -25,6 +25,8 @@ S=${WORKDIR}/daemon-${PV}
 src_unpack() {
 	unpack ${A}
 
+	epatch "${FILESDIR}/1.0.1-as-needed.patch"
+
 	cd ${S}/src/native/unix
 	sed -e "s/powerpc/powerpc|powerpc64/g" -i support/apsupport.m4
 	export WANT_AUTOCONF="2.5"
diff --git a/dev-java/commons-daemon/files/1.0.1-as-needed.patch b/dev-java/commons-daemon/files/1.0.1-as-needed.patch
new file mode 100644
index 000000000000..3f2bc5f1ac40
--- /dev/null
+++ b/dev-java/commons-daemon/files/1.0.1-as-needed.patch
@@ -0,0 +1,38 @@
+--- daemon-1.0.1/src/native/unix/support/apsupport.m4.orig	2006-05-07 15:28:22.000000000 +0200
++++ daemon-1.0.1/src/native/unix/support/apsupport.m4	2006-05-07 15:34:42.000000000 +0200
+@@ -35,7 +35,7 @@
+   linux*)
+     CFLAGS="$CFLAGS -DOS_LINUX -DDSO_DLFCN"
+     supported_os="linux"
+-    LDFLAGS="$LDFLAGS -ldl -lpthread"
++    LIBS="$LIBS -ldl -lpthread"
+     ;;
+   cygwin)
+     CFLAGS="$CFLAGS -DOS_CYGWIN -DDSO_DLFCN -DNO_SETSID"
+@@ -94,4 +94,5 @@
+   AC_MSG_RESULT([ok])
+   AC_SUBST(CFLAGS)
+   AC_SUBST(LDFLAGS)
++  AC_SUBST(LIBS)
+ ])
+--- daemon-1.0.1/src/native/unix/Makedefs.in.orig	2006-05-07 15:50:07.000000000 +0200
++++ daemon-1.0.1/src/native/unix/Makedefs.in	2004-02-27 09:40:46.000000000 +0100
+@@ -22,6 +22,7 @@
+ JAR = @JAR@
+ CFLAGS = @CFLAGS@
+ LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
+ JAVACFLAGS = @JAVACFLAGS@
+ RANLIB = @RANLIB@
+ LDCMD = @LDCMD@
+--- daemon-1.0.1/src/native/unix/native/Makefile.in.orig	2006-05-07 15:36:54.000000000 +0200
++++ daemon-1.0.1/src/native/unix/native/Makefile.in	2006-05-07 15:37:44.000000000 +0200
+@@ -36,7 +36,7 @@
+ 	$(RANLIB) libservice.a
+ 
+ jsvc: jsvc-unix.o libservice.a
+-	$(LDCMD) $(LDFLAGS) jsvc-unix.o libservice.a -o ../jsvc
++	$(LDCMD) $(LDFLAGS) jsvc-unix.o libservice.a $(LIBS) -o ../jsvc
+ 
+ clean:
+ 	rm -f $(OBJS) ../jsvc jsvc-unix.o libservice.a
diff --git a/dev-java/commons-daemon/files/digest-commons-daemon-1.0 b/dev-java/commons-daemon/files/digest-commons-daemon-1.0
index d77f6d60490b..541ac0427c37 100644
--- a/dev-java/commons-daemon/files/digest-commons-daemon-1.0
+++ b/dev-java/commons-daemon/files/digest-commons-daemon-1.0
@@ -1 +1,3 @@
 MD5 266c684ece05fbf7261bdcd566453f35 daemon-1.0-Alpha.tar.gz 219634
+RMD160 a698ccbe1385a0870f3add2a7d2603c1ae546159 daemon-1.0-Alpha.tar.gz 219634
+SHA256 e024b0adf38777ffc6b65864b8853a317d4f1be6f2f510a56382c2138005e805 daemon-1.0-Alpha.tar.gz 219634
diff --git a/dev-java/commons-daemon/files/digest-commons-daemon-1.0.1 b/dev-java/commons-daemon/files/digest-commons-daemon-1.0.1
index 1755e56d8f52..3e3fd1923d9c 100644
--- a/dev-java/commons-daemon/files/digest-commons-daemon-1.0.1
+++ b/dev-java/commons-daemon/files/digest-commons-daemon-1.0.1
@@ -1 +1,3 @@
 MD5 df3eb5aafa53ca530843a09d40b8a1c0 daemon-1.0.1.tar.gz 301023
+RMD160 b77ffd3dbc40d18d867afd62015ba1aa05bd9c65 daemon-1.0.1.tar.gz 301023
+SHA256 177107b8d99cabdbcda58cec284a2e2ccb5063113cc1fdb1b672754d4652848c daemon-1.0.1.tar.gz 301023