Do not hardcode -L/usr/lib when linking -- it is both unnecessary and wrong as it breaks cross-compiling badly.

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

4 files changed, 26 insertions, 11 deletions

diff --git a/app-cdr/cdrtools/ChangeLog b/app-cdr/cdrtools/ChangeLog
index 2bf244a33ad0..090a52d9ce01 100644
--- a/app-cdr/cdrtools/ChangeLog
+++ b/app-cdr/cdrtools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-cdr/cdrtools
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.350 2015/02/19 03:08:59 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.351 2015/02/25 22:00:37 vapier Exp $
+
+  25 Feb 2015; Mike Frysinger <vapier@gentoo.org> cdrtools-3.01_alpha24.ebuild,
+  cdrtools-3.01_alpha27.ebuild:
+  Do not hardcode -L/usr/lib when linking -- it is both unnecessary and wrong as
+  it breaks cross-compiling badly.
 
   19 Feb 2015; Mike Gilbert <floppym@gentoo.org> cdrtools-3.01_alpha17.ebuild,
   cdrtools-3.01_alpha24.ebuild, cdrtools-3.01_alpha27.ebuild:
diff --git a/app-cdr/cdrtools/Manifest b/app-cdr/cdrtools/Manifest
index 0310604db124..f8502e93110d 100644
--- a/app-cdr/cdrtools/Manifest
+++ b/app-cdr/cdrtools/Manifest
@@ -5,14 +5,24 @@ DIST cdrtools-3.01a17.tar.bz2 2061522 SHA256 3d613965b213ad83e4be0ba2535e7849018
 DIST cdrtools-3.01a24.tar.bz2 2075400 SHA256 4d9907b84f5b65dc6ca278b6202b90b8eb68652b01aa4dda978ffede8bdd4a5b SHA512 19be30de77fca00bb06fa6325149421304c1d5ff7d40a9d842496058494fcf0e798678c661ff3ae9ebc9e4c5971917f7aabfd813a6d88ff863d7e2e5f1456766 WHIRLPOOL 4533288dffef2b702eeef2a44fd702aff3e66283d5d90c810eb177ee4f1f1aa7cfd75238bf1f2a406e9b8ccaa43c7a77fb401825f8ce806e73fdc80abcc0a45a
 DIST cdrtools-3.01a27.tar.bz2 2079545 SHA256 71188d5a9ad61de440b07471e2612b937b5f9b456eae10efbdb012b6a9dfe3ca SHA512 bec2efd8989899cec58d39129f4bd8f0c42af34d65c575af48feea89a63c7eaf5064a885922730364879b325a9e0d6d78c2e3e7dc4ee5b06523da33f55333f72 WHIRLPOOL 5f722e7861452f6a216d9a4df9b5bd5c61b75056ba8503d1a489b42ce075bf24e469849f943bce180c46ce7030fdd1ce940a71fe7f17b2d585b6940c6abe87d9
 EBUILD cdrtools-3.01_alpha17.ebuild 5237 SHA256 dd3795acba623f8e9c80c3c3acf287cc2c60aed3bee9325fb07d9e6edbfee47a SHA512 42b48b0e10ea809e5645f4f401a489fa591d1d083d4d8b0467b524fde723e37eca2ba9d2673c37f81bf247d63e0c0b795a0b9c6639c0f661613a5a52edc7edb5 WHIRLPOOL ba4ee8a0fc4f76d73aa09356bc2901e638a47bd339dc1c288e746a6966e0a24f6985616459b9b80f8043d632e86a43f4cd9d1fd97c8b9867ccb47d575b6b3a7a
-EBUILD cdrtools-3.01_alpha24.ebuild 7999 SHA256 6d2b1f9913ba8e2a0461d8967a9900fa16664ea17826377f1d88afc763ffb8ae SHA512 28fec619343eb7b56b3ba13f6f73d6b6a5780c592d39a41e21660877062db042c06d346e3867844c7e4189f496f844df173a34183c3c2fee97f0894dd4733707 WHIRLPOOL bf6bbe07351590c1f32fa94c456adbcb97045874eb50198287f8dbe3f8996e7adcaeafd92b06541daeff4250ca5ef7216a5ffa1855baffeaeaaf09b7f6b8bed7
-EBUILD cdrtools-3.01_alpha27.ebuild 7982 SHA256 14cb5b100783bc357402177780b039db68fa7c70d2faf7810ab9ea153e946fb8 SHA512 8647a554c6e2da859aab1572d416099966c6d0369174fb70ba9233bd7340c7305aec3756862cf0c8740a58c3f7ea3e57680f056b42ab46a3f927b4d9417c5554 WHIRLPOOL 46e6f58cef5a307114bb7e21b7dd2077990d9cc5c948e3d09368846c12a718bae7e5b19c71be23ddf80c2cb8aa6829f25b86922864b5a4afc47ad9e6d48a14a7
-MISC ChangeLog 53681 SHA256 2ee45e469f78c1f35204a74428e436d84421f050987509971f7140b87a2b2213 SHA512 8b042704445814ff4916bac3dd63402b89d914256f728a8da3e2881ae2e29f7572ba0698cadef5abf1d32fecd3be8909b113ee31c18a9fe94a9aa4da45bdf467 WHIRLPOOL 0448c19bb76c196f1249b0ce4b868bdc0fd3f37279bc7b7d0c4c0725f2a7af8a64fee3c98bdbb451f41bdbf9ac3d9f69c7d5cac1ccf9ef60deffd6ed4201e152
+EBUILD cdrtools-3.01_alpha24.ebuild 7984 SHA256 2b4ccd4846adace696efccfbfe09aa492efc44b088d358d528ff6ea0fe94bd42 SHA512 31114f6343206ae9c427004743e683ab279fc9f64d06a5d3869a80e325b73da86f3b3322c7e1823d27b84952a5e4e0924abf6dda8035953f961071425534d1b0 WHIRLPOOL a91d38c8b24007b8d2fd9aaa21711dbda7bdd1f00298960f09728c4c580a14885358c263ac7113c8a126b95680d8db10adf9c5293e331c5b14a029166c9a261c
+EBUILD cdrtools-3.01_alpha27.ebuild 7967 SHA256 ccffbabf1e66f5fdf000310241cdc1e51d4c6c680b9e48c530e2db5d2dfa7252 SHA512 978d0f05dbddf4c3789395f318798df02d6d91208a78e01e75e85c4b3b4f48552618d0d39ee7697be0067c807f797d5871bcb1f51e3b29e696b56559d255b7f0 WHIRLPOOL 6a0b43b7e95d2254a8c54d3e24b460b5c0aef8a277deef9968bb763dedcd31e3b29a3f2269898776eee06bdc5593b9cd846baf7550ca1bd9b54ad48091ce8318
+MISC ChangeLog 53909 SHA256 d441bf3f0555e766b6d5ce3d3a33f5530a6b7db4cb8e5f79046cda6252fb6399 SHA512 a40b29584d16285017932a7e9ec02852f82b4ded262f474d17738ecbf1ba548c25a49844271355ec9e05a88419609546646bc74d91e024a4d4a6ce2e52150b41 WHIRLPOOL c0154b64078f8226d69e1a91a0f1743bbf4b3632af8c5af0c9d3859224fff46fbf50c9c12c49cfa0c4055e1cc3a3fc3d9750921d144e7bdf49176f8cd84b7d17
 MISC metadata.xml 507 SHA256 f1086372c5bae26f9438544c1102cbadc619718b163392cbe35f3b359560ef3b SHA512 77aef4353064a013d1944ee796b1a6cb9a8a60c698d53df46cac7be17c556d9a495c71b9578a536c61c429a0c87e894e962bdca9167bbc60522ef25aeab756a6 WHIRLPOOL 0771499480bc135391ab921f22aba47f9966b68c79083f29f9df8c185919b65422f69953cc876d7dca8a2af5539b85e0c592f4521f5b4034ca5cb6035dc7c28b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlTlU80ACgkQC77qH+pIQ6T8BgD7BJWU4S4xK2pxBN/iw8xiRc0L
-EUs9tG7PXtfh0c0wPaIA/0g6GqKcxisGqx5uTfjEebcg4bBMMe5VqaoKJ1tPMtWb
-=1LTg
+iQIcBAEBCAAGBQJU7kYGAAoJEPGu1DbS6WIAuw0QAIU2xq9OlwcxSBr2PVcYZRo+
+z4U9/M8PrZ0/76SQby7Xf+qGWSsOodi/404z8OE68bV+v/ly3k5qlcdqra5vaFC8
+cvWpniPy4bzK/fsNZImIJQPbOcIej8j8NzirigJMDFrbwstIeI17fmCGjRUqp581
+2oCR27nScYaEMKTM0JtaniuakT7ojxkUxOpE7tqA44e+cjsyNvY9hPEYWbYRYZgf
+2FAnb7aU6x8YxyJhh8aAZ8EqRC3CTHYcL4JvRMjDB6JMGA9SZ2KdMtIJZlo8CiRE
+E72a6ZE8p68iYzhg7A20pXwkfef0r8Jn67G7MOV0wpiVzsHgwmLodX9uzJslyh+/
+WS6LK6EJmezT9SWCx4wQPP4fMnGEnewDgOed35w1HE9/w5AUTsf+UpXmuAFTFLN/
+pwHwdUwx3shAJJSaerJWsrPzPOZSMLeAAX0VJVomcL1HZM68WTPdb/KUyvitqctN
+ByoJbRVPebSFSUU95O7wLk8peYj5nBn99/rWZNra9ub3PwO45+C1ZIyrT0T11cTJ
+icragBgW7f8RBLnUdY6ZYDFvUJUV+XQT8l78SpMh9gFySd5xisyaYEBy2YrKpzXo
+gAXMOfSm4+G50hrb8Ng6LBm6DXAG2WFJfxueZOMHu+ovYXxmhx6ErdTW74wa3XKg
+OFKRDXGwdxh2gM85twQq
+=uhmx
 -----END PGP SIGNATURE-----
diff --git a/app-cdr/cdrtools/cdrtools-3.01_alpha24.ebuild b/app-cdr/cdrtools/cdrtools-3.01_alpha24.ebuild
index 68606ac9441f..88852d5a2747 100644
--- a/app-cdr/cdrtools/cdrtools-3.01_alpha24.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.01_alpha24.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-3.01_alpha24.ebuild,v 1.6 2015/02/19 03:08:59 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-3.01_alpha24.ebuild,v 1.7 2015/02/25 22:00:37 vapier Exp $
 
 EAPI=5
 
@@ -90,7 +90,7 @@ src_prepare() {
 	sed -i \
 		-e "s|^\(DEFLINKMODE=\).*|\1\tdynamic|" \
 		-e "s|^\(LINUX_INCL_PATH=\).*|\1|" \
-		-e "s|^\(LDPATH=\).*|\1\t\t-L/usr/lib|" \
+		-e "s|^\(LDPATH=\).*|\1|" \
 		-e "s|^\(RUNPATH=\).*|\1|" \
 		-e "s|^\(INS_BASE=\).*|\1\t${ED}/usr|" \
 		-e "s|^\(INS_RBASE=\).*|\1\t${ED}|" \
diff --git a/app-cdr/cdrtools/cdrtools-3.01_alpha27.ebuild b/app-cdr/cdrtools/cdrtools-3.01_alpha27.ebuild
index 656264834819..697d58df44cd 100644
--- a/app-cdr/cdrtools/cdrtools-3.01_alpha27.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.01_alpha27.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-3.01_alpha27.ebuild,v 1.3 2015/02/19 03:08:59 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-3.01_alpha27.ebuild,v 1.4 2015/02/25 22:00:37 vapier Exp $
 
 EAPI=5
 
@@ -90,7 +90,7 @@ src_prepare() {
 	sed -i \
 		-e "s|^\(DEFLINKMODE=\).*|\1\tdynamic|" \
 		-e "s|^\(LINUX_INCL_PATH=\).*|\1|" \
-		-e "s|^\(LDPATH=\).*|\1\t\t-L/usr/lib|" \
+		-e "s|^\(LDPATH=\).*|\1|" \
 		-e "s|^\(RUNPATH=\).*|\1|" \
 		-e "s|^\(INS_BASE=\).*|\1\t${ED}/usr|" \
 		-e "s|^\(INS_RBASE=\).*|\1\t${ED}|" \