Fix building with -Wl,--as-needed, bug 190180.

Package-Manager: portage-2.1.3.7

4 files changed, 56 insertions, 20 deletions

diff --git a/app-cdr/cdrtools/ChangeLog b/app-cdr/cdrtools/ChangeLog
index ee0be5d540cc..6bc173ae5259 100644
--- a/app-cdr/cdrtools/ChangeLog
+++ b/app-cdr/cdrtools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-cdr/cdrtools
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.184 2007/08/24 19:10:26 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.185 2007/08/28 20:08:46 drac Exp $
+
+  28 Aug 2007; Samuli Suominen <drac@gentoo.org>
+  +files/cdrtools-2.01.01_alpha34-asneeded.patch,
+  cdrtools-2.01.01_alpha34.ebuild:
+  Fix building with -Wl,--as-needed, bug 190180.
 
 *cdrtools-2.01.01_alpha34 (24 Aug 2007)
 
diff --git a/app-cdr/cdrtools/Manifest b/app-cdr/cdrtools/Manifest
index 446ec73c041a..edb3505c101f 100644
--- a/app-cdr/cdrtools/Manifest
+++ b/app-cdr/cdrtools/Manifest
@@ -1,10 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX cdrtools-2.01-scsi-remote.patch 938 RMD160 146ba7ddd5a0d987ea554bcf7e50aea5bf0690ff SHA1 0388616bf453e46fa3186c93cc17f881508aa562 SHA256 93719cbcbf594be14e0aa993b49157fc6be2885e94f4a92947ea73bd58ed2a62
 MD5 3b1ffea11e1653b7b16c2c89597d1c5a files/cdrtools-2.01-scsi-remote.patch 938
 RMD160 146ba7ddd5a0d987ea554bcf7e50aea5bf0690ff files/cdrtools-2.01-scsi-remote.patch 938
 SHA256 93719cbcbf594be14e0aa993b49157fc6be2885e94f4a92947ea73bd58ed2a62 files/cdrtools-2.01-scsi-remote.patch 938
+AUX cdrtools-2.01.01_alpha34-asneeded.patch 1407 RMD160 1d7f740ae9c895c0afa75115642676a515d79403 SHA1 6afe7907a408ef26b917f805ca2327edb976d672 SHA256 9cdfe85219c500541f126108be6ae5b0bfd15e8d8fb90b34dbdff3d9baadcee1
+MD5 3fb904bdd2ae4c924e43cfbacbbdc966 files/cdrtools-2.01.01_alpha34-asneeded.patch 1407
+RMD160 1d7f740ae9c895c0afa75115642676a515d79403 files/cdrtools-2.01.01_alpha34-asneeded.patch 1407
+SHA256 9cdfe85219c500541f126108be6ae5b0bfd15e8d8fb90b34dbdff3d9baadcee1 files/cdrtools-2.01.01_alpha34-asneeded.patch 1407
 AUX cdrtools-2.01.01a01-scanbus.patch 776 RMD160 911c74412e4ccf3fb82140dd43d7e2c8e4c542f4 SHA1 bc2c89f40086c82e58cfce84ebb4c02e5df9c29c SHA256 7ec459a5779472df931cec14ec1ef9e297fb78e00ab93f83967dbadce73008ed
 MD5 0a9c4d3c7d28293dd147c78f57dd2a1f files/cdrtools-2.01.01a01-scanbus.patch 776
 RMD160 911c74412e4ccf3fb82140dd43d7e2c8e4c542f4 files/cdrtools-2.01.01a01-scanbus.patch 776
@@ -49,14 +50,14 @@ EBUILD cdrtools-2.01.01_alpha32.ebuild 3527 RMD160 7f1ab5cc237e565ecf755b21653f1
 MD5 b42c310eae34a9004bd867d3ce4283c5 cdrtools-2.01.01_alpha32.ebuild 3527
 RMD160 7f1ab5cc237e565ecf755b21653f114737eab6b9 cdrtools-2.01.01_alpha32.ebuild 3527
 SHA256 960ac89017b1b02cb371a101a5083fa886d6004c8a36f5d875d865e9ac6ac9a3 cdrtools-2.01.01_alpha32.ebuild 3527
-EBUILD cdrtools-2.01.01_alpha34.ebuild 3583 RMD160 2c2228add9e6c57204c406868d36e41d9614bd40 SHA1 f47e7948ede9ff7faf633f158933e607cdb6fe6e SHA256 82d508e7d404d35de800916636e436e55748482553837565e0f7cb4ba1d01d25
-MD5 c0f5fe207cd42ac2fccc03aa10d42f2b cdrtools-2.01.01_alpha34.ebuild 3583
-RMD160 2c2228add9e6c57204c406868d36e41d9614bd40 cdrtools-2.01.01_alpha34.ebuild 3583
-SHA256 82d508e7d404d35de800916636e436e55748482553837565e0f7cb4ba1d01d25 cdrtools-2.01.01_alpha34.ebuild 3583
-MISC ChangeLog 27633 RMD160 a664542d59945761d5b8818bdc5b318a39b28ef1 SHA1 b7ec80cfbc40fb517dd2c85f47fea65d82f4759d SHA256 9ab125ffda73a8e9859c5a283aec265d8b739afbdce364abda91b8d1d233222a
-MD5 957d3bc5dc3d5083089b5e55c50c8ef2 ChangeLog 27633
-RMD160 a664542d59945761d5b8818bdc5b318a39b28ef1 ChangeLog 27633
-SHA256 9ab125ffda73a8e9859c5a283aec265d8b739afbdce364abda91b8d1d233222a ChangeLog 27633
+EBUILD cdrtools-2.01.01_alpha34.ebuild 3624 RMD160 71ba8721cee46bcf86c8ad1e79f2faae82af1721 SHA1 247dd1cbf595f6948618c1d3ab757fe17908bb42 SHA256 4ce2461d7188fc89be63d5be92f78f00cff8850748a1c9c00a1c3c370c805952
+MD5 09ad2df4183234637715c2a23665d382 cdrtools-2.01.01_alpha34.ebuild 3624
+RMD160 71ba8721cee46bcf86c8ad1e79f2faae82af1721 cdrtools-2.01.01_alpha34.ebuild 3624
+SHA256 4ce2461d7188fc89be63d5be92f78f00cff8850748a1c9c00a1c3c370c805952 cdrtools-2.01.01_alpha34.ebuild 3624
+MISC ChangeLog 27816 RMD160 3610bb9dae7c1faed8e37f8870f7ebaef6a78974 SHA1 27cda15487f8f3f7f12395052c04d5e6cc892e5d SHA256 930fcb63a203993775229f5a0aa5f9cc354d49b2a1e30086a025b8b276a2a19e
+MD5 3ddb52b150a6d6bbefd902b5dfbbe5e0 ChangeLog 27816
+RMD160 3610bb9dae7c1faed8e37f8870f7ebaef6a78974 ChangeLog 27816
+SHA256 930fcb63a203993775229f5a0aa5f9cc354d49b2a1e30086a025b8b276a2a19e ChangeLog 27816
 MISC metadata.xml 254 RMD160 f274a70fa23d8064efddcce296e0aed3344bd86b SHA1 ab52ea446603ae6242dae41e0c90fcf7ae8f09cf SHA256 21400abf2dad3e5b7b0d2f7f9586c33cba6336b42a97e1f2b3e7e8b9db0daae5
 MD5 015ab4293805faaa417d5ac5304750c4 metadata.xml 254
 RMD160 f274a70fa23d8064efddcce296e0aed3344bd86b metadata.xml 254
@@ -73,10 +74,3 @@ SHA256 6ee13448f4702fc10782dec3961f41ba45bae610be9b3c02bfcd309411541ab2 files/di
 MD5 131ed223bfc9f6b9d9a89186fc87e00c files/digest-cdrtools-2.01.01_alpha34 265
 RMD160 290d5a2197352d9afdbeb66a9c29e900b60df75e files/digest-cdrtools-2.01.01_alpha34 265
 SHA256 bdb88a74b196a4fe8b2fe28757aad351a3b053f22813ccb76bf9c2cfb20de768 files/digest-cdrtools-2.01.01_alpha34 265
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-iD8DBQFGzyz+6IPkARlRZfQRAtZVAJwK8LNsX3m6tcIdTTYeIKEpaY/53wCgoecP
-fQU2ucD0kUPI/I5Vliy7ZI4=
-=3fT2
------END PGP SIGNATURE-----
diff --git a/app-cdr/cdrtools/cdrtools-2.01.01_alpha34.ebuild b/app-cdr/cdrtools/cdrtools-2.01.01_alpha34.ebuild
index 8aede229fd3f..7b2571f85366 100644
--- a/app-cdr/cdrtools/cdrtools-2.01.01_alpha34.ebuild
+++ b/app-cdr/cdrtools/cdrtools-2.01.01_alpha34.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha34.ebuild,v 1.1 2007/08/24 19:10:26 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha34.ebuild,v 1.2 2007/08/28 20:08:46 drac Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -26,6 +26,7 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}"/${PN}-2.01.01a03-warnings.patch
+	epatch "${FILESDIR}"/${P}-asneeded.patch
 
 	# ppc-macos support
 	cd "${S}"/DEFAULTS
diff --git a/app-cdr/cdrtools/files/cdrtools-2.01.01_alpha34-asneeded.patch b/app-cdr/cdrtools/files/cdrtools-2.01.01_alpha34-asneeded.patch
new file mode 100644
index 000000000000..90fb1664ebaa
--- /dev/null
+++ b/app-cdr/cdrtools/files/cdrtools-2.01.01_alpha34-asneeded.patch
@@ -0,0 +1,36 @@
+diff -ur cdrtools-2.01.01.orig/libfind/libfind.mk cdrtools-2.01.01/libfind/libfind.mk
+--- cdrtools-2.01.01.orig/libfind/libfind.mk	2007-02-04 01:00:05.000000000 +0200
++++ cdrtools-2.01.01/libfind/libfind.mk	2007-08-28 22:33:25.000000000 +0300
+@@ -20,7 +20,7 @@
+ CPPOPTS +=	-DSCHILY_PRINT
+ 
+ include		Targets
+-LIBS=		
++LIBS=		$(LIB_ACL)
+ 
+ ###########################################################################
+ include		$(SRCROOT)/$(RULESDIR)/rules.lib
+diff -ur cdrtools-2.01.01.orig/libfind/libfind_p.mk cdrtools-2.01.01/libfind/libfind_p.mk
+--- cdrtools-2.01.01.orig/libfind/libfind_p.mk	2007-06-30 14:13:34.000000000 +0300
++++ cdrtools-2.01.01/libfind/libfind_p.mk	2007-08-28 22:34:04.000000000 +0300
+@@ -22,7 +22,7 @@
+ CPPOPTS +=	-DSCHILY_PRINT
+ 
+ include		Targets
+-LIBS=		
++LIBS=		$(LIB_ACL)
+ 
+ ###########################################################################
+ include		$(SRCROOT)/$(RULESDIR)/rules.lib
+diff -ur cdrtools-2.01.01.orig/libfind/shlfind.mk cdrtools-2.01.01/libfind/shlfind.mk
+--- cdrtools-2.01.01.orig/libfind/shlfind.mk	2007-02-04 01:00:05.000000000 +0200
++++ cdrtools-2.01.01/libfind/shlfind.mk	2007-08-28 22:45:14.000000000 +0300
+@@ -21,7 +21,7 @@
+ CPPOPTS +=	-DSCHILY_PRINT
+ 
+ include		Targets
+-LIBS=		-lschily -lc
++LIBS=		-lschily -lc $(LIB_ACL)
+ 
+ ###########################################################################
+ include		$(SRCROOT)/$(RULESDIR)/rules.shl