Fix path var collisions when cross-compiling.

Package-Manager: portage-2.2.0/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

4 files changed, 45 insertions, 12 deletions

diff --git a/app-accessibility/brltty/ChangeLog b/app-accessibility/brltty/ChangeLog
index f418ca2cad92..8a5091040a55 100644
--- a/app-accessibility/brltty/ChangeLog
+++ b/app-accessibility/brltty/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-accessibility/brltty
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/ChangeLog,v 1.132 2013/08/20 13:47:27 teiresias Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/ChangeLog,v 1.133 2013/08/20 23:25:35 vapier Exp $
+
+  20 Aug 2013; Mike Frysinger <vapier@gentoo.org>
+  +files/brltty-4.5-fix-mk4build-cross.patch, brltty-4.5-r1.ebuild:
+  Fix path var collisions when cross-compiling.
 
 *brltty-4.5-r1 (20 Aug 2013)
 
diff --git a/app-accessibility/brltty/Manifest b/app-accessibility/brltty/Manifest
index 0f9bf5601d57..47739c329dc6 100644
--- a/app-accessibility/brltty/Manifest
+++ b/app-accessibility/brltty/Manifest
@@ -7,23 +7,30 @@ AUX brltty-4.2-fix-ocaml-install.patch 842 SHA256 4b9e48655afb62b758f72e49bc05ad
 AUX brltty-4.2-fix-svnversion.patch 918 SHA256 7ea5ba1d7521bc2382629c023dc862acd6b2a9ed1c059274cbcd218a4aa8a9fa SHA512 dbf23b5d454732fc61e368faca2292066a9f3ec454297170aed7d06dee61a23de69ecf160415fa873e5073a703ac850db0c90def426658b591ff8c91ec1252f5 WHIRLPOOL b65cefa5493629494c029240109a05d6789955d132587b298be10b09ea4bd4ca6292c6da3a204a1ad19a2655ab81bfcfa5c5c52588d547819821dac1bc56e789
 AUX brltty-4.2-glibc-212.patch 287 SHA256 6fb14f246788b6668b0442201144a31dcae003f5e70185e643e14e3f01ce1516 SHA512 75f58735665d67eed57dcb1031b588d7da80c6316c3180d3550b4440165740f077516fab133751264ff5c0220463cf452ccf8cedcf760042f37e66ea97c9ef64 WHIRLPOOL 110dc8464f74991c0f06a96620fefb5b2155d6c50c2a945696d0849f4eef062c82abbb4c91fb29d8ed7af323c34c86ea46d5b3d1915cc14bbd3f6ae9c69faf70
 AUX brltty-4.5-fix-ldflags.patch 2168 SHA256 6d9022614cb0d1d65ad11f0f924c369a860a7f2e02bfec77f8a61c60350daa75 SHA512 72ce6b722e90deb9e3d6d537b54ce2f8625154a5920eb555fb5fab1b65703a4ff88a2e0907b74a11454231507ebd9741533ee9b77ec5dfeffd3870179ebd98e8 WHIRLPOOL 9214b7f5810aee65e5bbaf16830eb9c5f63e4c25d26a2f484fc7b700412db32ddc3adf34026f9dc7c98fe111c28d11431e28346d6d6bab8c7a017702a0649df2
+AUX brltty-4.5-fix-mk4build-cross.patch 759 SHA256 1abb970aa9e6797d6a859e0b861c50b7d7d48c34b9cac4f7ffdad02c2beb17a8 SHA512 c409e0ebccf929b0c49d6b4b9f014c1b4505d9c68e022b860ec53733f8b19538d304349d2640d610581a81e728699f5edc66f0eefdb534036f22640891e413ae WHIRLPOOL 9dcdbfe5a55ddb23fcd73f4d13684b3a4ee202f4b4217f9501b0a12f19b89abc4d3ae3a120df396c5dedaa890c9cb08aae1b41078b85ef25db78d364a8872a46
 AUX brltty-4.5-udev.patch 1105 SHA256 0472a6f103c95d4f2c3214f246092f39ded516ebcf682bd1ed86ee67911fd2cf SHA512 69a15bd7aff192f949e6a01e9f869d24a8b75e91938156fd2ff8fd510755c2a83ca9f35381f3bd2c8877fd2a5101a861b718cc103c960dce58ae4174209b1847 WHIRLPOOL 052715b04b688988ca6c86b2330a318b93d59bde3a10faa51f2faf9bbba011967d7e166883d6060d9ada8d7b4002b1270434cb1d2614ff9b1d395022da1e39af
 AUX brltty.rc 356 SHA256 24950c773d16156fed8f71be72abefa77a4c45d930e2ea53b6371a0e659644f8 SHA512 4e4b363aa297f94c2078744417e630d13d5796ed55f24929e39f43108cce91c7dd49622d24d28fd91d3642371370feb9a62256d773ec052617bd4f015be81af2 WHIRLPOOL 26e7c5344218c79e4cbddbb0fd82a6589116fe43afe4439881c7f3d4dcafcf60f447cab8e5574d5f3aab83bbc85522f3b25f28497c1ad8a136b4b32abe9673d6
 DIST brltty-4.2.tar.gz 2234191 SHA256 fc2b1a96255afc26ac43cadd3f730fabb73d0b1d991ffefd4c2214c5e20a8aa2 SHA512 94b7fe40593d06a242be57c8cee1f06c0869515bc0be97eccc1d81dd57549bf2197e7ebdf1f9cb173dd4b6048df9a85adb327b5cd1cc74888b06145755a27cb5 WHIRLPOOL 0109b1e7d57f4246af84a5cd3fe48a6190a374787e059c058de758d4e38368a61015b25912efa71065ece5dd2e0bf5900af4d72ae111bab235c0e8807c039b73
 DIST brltty-4.5.tar.gz 3260872 SHA256 87af9ecff2ff563f4dc62e0ca4e8d8217ee7ee57e8344508cf0096c47ff77da0 SHA512 55efa7fffef3914638bfda2df4d4369fb4b72dd19897153bba69b11960732eda583c02a578fef6919e7d620d08beda8010d4352e4d4d8fabbbefa44b3e1c8d90 WHIRLPOOL 3d677445675da3fafa64bbad0dcfb13b85de57f7c6473ceaf2cd51a7e60fee2c425f1584ccca44ce95dcaabf5b50fede0b5c1cd35c20f556921aa7c1d7859ff5
 EBUILD brltty-4.2-r1.ebuild 4163 SHA256 46e613ed1ac40e8805302d9cb9fde8910d8a6f4adfcc36070ec0e3af99649d72 SHA512 371fb3cbfeec164e519048e96ba9270fda8dde3317d136f292be1a91c35c557e5567b2634b2c76f5cef235f69bf6c33725bdc6f5e80543ba9380caf0218dd340 WHIRLPOOL 241aedf9ff83b2cf8eef11436626f5a591162fb96f8283e32977abff740693f5518b0d632d0d1835e92491a4bc254b81ef0d2cf693f3af81fd46416a33ed8b3e
 EBUILD brltty-4.2.ebuild 4133 SHA256 b0e521c09b7b5b5621a6fbd537ae22d8a22cf7b68d558c0ae2203a20d7365884 SHA512 8ecf0911f15710bbd760ec4b3e55503914efad8ef29a4594dd3bad982d209e1e07aa401a603a9458009c3e70b667757757e2ba3d6aa58e9f50d073bf3ecafb5e WHIRLPOOL 839206b4c32db6d5639cce90b07e4f2699a4b0e99718dd03d37efe20e6c6d0cbf2c56a86902eecf54ae47c0af6b3cfffdcd08512465eeb69545337116d6d6b30
-EBUILD brltty-4.5-r1.ebuild 4082 SHA256 f3d4bb260ca8a692f5aa0fcce130268a1303573c45b757ec10bc1799602c7479 SHA512 70e65ea0dd0c54edb9220a6f064c5f8f4255386119720fbcf043569934711ab72bedf6601684bf783158f878f2c3d68813cdf841b99bde237a7996bc4d239929 WHIRLPOOL 682c087b32d0b32c71b76fd08f77a11f0b82bb2054a4b2c19f379c9903f73731d9a260c0a33ea844f8871e96a7e15109f788901260efad662f546761db666952
-MISC ChangeLog 16705 SHA256 627766cd7a61d2639103b2dbfc80ff4be62fb1edfec25f6c40ac408bf012ef62 SHA512 a924c87612dc4025d569acc7375386c70fc4ca9870a4e423752dd17c1eeef038688305e1decde7fc46961d855f55cd9ad54b45d29b0d74da28d061c30c96cbe1 WHIRLPOOL f7200097603dc9d105e0bae9f3f1d8cfdf0915ef2d8811c72bc881d118d8cd1534c7bef3297c2f8e95912c7e8a4c6792026be51396ae1a4fa0ff685bcdd6c126
+EBUILD brltty-4.5-r1.ebuild 4127 SHA256 21ff72fc2d1df7b7df65ef2e5933f58379627f2a25fbfd64e0c8925cffbfbab6 SHA512 8b6960bfd7f7089d28a6e01398409fa09f1f704a361491c6ef417f8a2943bb33ced75fa2f574ad339b84bf69b7bc37dd5363ca59dcd01dc7e558d771c5a2a44d WHIRLPOOL 1588b9e4cb34d7907a38d6b2a85a27be4342f120715d6e77a7675abc34a4486a0077763f4953017971103e04e30bf66dd1d90488fb9ff3c87284545d71797a4a
+MISC ChangeLog 16869 SHA256 30128e231a1f25dfe4282ff35522224bf5f54fd077066fd0a35cba3b6885b47b SHA512 047bd84a16103cb951abe5d17d4c444340ee72d04e8b9f0a24739b28fcafea3a2c7746eb529fd501504e058bbe6bfe194bcc6a7b2e54d3569ff6f3160bf965cc WHIRLPOOL 12a2c26764970b8b3b1a374cc80a405700e336a91bcaaaa1355e9502fd91cd656b257e8b0f2e53238fe5ca86ccab45b8c43f14717171036e646dece081a88d29
 MISC metadata.xml 1917 SHA256 f957f9853a05c0ec1aed09b4f01e78b0b50cd8a554a53a3c4c3917a50459f8e0 SHA512 b895695cf6f214e2acaf2409cd6f7dce1cb3bbaed1374b7b73c5193a794412325d2d09268725aa533b2e497d3c98c7cec83e72b8cd0066822ad6bb9440abe854 WHIRLPOOL f08f4ef21fa745e1ffd07e664e05283230abb5276cee5f91340f0bc818a46addfbc4dbcdd73fe19cea2d301ecef7f8994f7350109cbf390ae9b9ab8c7bc5f6d4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSE3N5AAoJEH8qFnJlIeBtDN4H/36PkG8wiZhs3nBcejXjhxa8
-IVDEA6RvEODqoPPz6M6njv7OcYvAtjTuZU6nPLcX1Vi1fUlhlH3nlij9++7NetBi
-E3gInysCl1yW6byUYgcf0SWqNUmA8I9rLbttNbZ5hStOY5z7E4W5dpEmmcUx4N9o
-E3+9vbrD6d1b0GmRwAw6oTk0zMISe7BKETzc/PJh+S0gN61dXr9P4dQn+4Qj+zjv
-H7bXJBy7CLjJdg7ss6h8BQSZAUhd7fwQ3Pw6/ieSrI/90llZputXo706wC8h9Bt4
-sc80JYQOEcx6TvHqrPDluzD1Q5e0/CfN7cga5uu+YwzufpGlZrujVeU7ivPqogg=
-=ZZ1D
+iQIcBAEBCAAGBQJSE/r2AAoJELEHsLL7fEFWUFEQAJYw/B2uE7pf0hg16ese1bW/
+AHPXo3ybivM1Hxx29eTVMqddJKXWs8PYlgbSgnJdu6SJbaJfZuMHt+A/WPNure4k
+c6/1diywEVIIS99PZDHaXLfVV70eBO4FoJh+FigGnXf1YxseFpWLC13VEE7tsLT+
+iGjJ3uPlU1sVriw5hHprr8vr5wt/LQOEppV/H6u/81KIPmBFts17PPkbX0y8dG3z
+nb/3kQCAWI3XTeNypHegw3QV7FqMus3DPVGt8cRhaf03YDl15x3sInoRLqdK3BE9
+mZ6oVeg16pDPo+DJ+uQhiXHk61kaLv9g0J59AWmKhxOsIOtusA1lWeaPr3TRsg1V
+X2Z2xHDLE6FO/btsf7VYPTGmbTVE4wsQKxJWoS7mqFOleLhFJUfR+2uMjN6c8sGl
+QA2iVzH+4QK3knfMr/WetqgT4KxP+xxxhMYrbxMgsiH1RCthryQzTtDBd9rkb8bA
+A+3ZHqtQUHHKsxeERygacVz3yK9wrHxFsDDIm9eV8QLcNd7/Dm5N68nnvsk/MkU4
+7lBYut5TBUo8conQPd56vSIUX/B0e/i6VpAm2/IOlFJ16QPYNQdE8wEhwUO603Pb
+gDt8Zxvep7qSxx8v4rbXeJWbV310JK6A9Pcb/ISUcyJHYBeZnGrfPY1sacXfmF92
+HannsAd5/xV8jPl/V8v1
+=QVoI
 -----END PGP SIGNATURE-----
diff --git a/app-accessibility/brltty/brltty-4.5-r1.ebuild b/app-accessibility/brltty/brltty-4.5-r1.ebuild
index 8656ca1e9e9a..bc10d3178b7d 100644
--- a/app-accessibility/brltty/brltty-4.5-r1.ebuild
+++ b/app-accessibility/brltty/brltty-4.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-4.5-r1.ebuild,v 1.1 2013/08/20 13:47:27 teiresias Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-4.5-r1.ebuild,v 1.2 2013/08/20 23:25:35 vapier Exp $
 
 EAPI=5
 
@@ -43,7 +43,8 @@ RDEPEND="java? ( >=virtual/jre-1.4 )
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-fix-ldflags.patch \
-		"${FILESDIR}"/${P}-udev.patch
+		"${FILESDIR}"/${P}-udev.patch \
+		"${FILESDIR}"/${P}-fix-mk4build-cross.patch
 
 	java-pkg-opt-2_src_prepare
 
diff --git a/app-accessibility/brltty/files/brltty-4.5-fix-mk4build-cross.patch b/app-accessibility/brltty/files/brltty-4.5-fix-mk4build-cross.patch
new file mode 100644
index 000000000000..7a516eb63a58
--- /dev/null
+++ b/app-accessibility/brltty/files/brltty-4.5-fix-mk4build-cross.patch
@@ -0,0 +1,21 @@
+this script generates forbuild.mk.  it takes config.mk and adds a "_FOR_BUILD"
+suffix to every variable it finds in there.  but it only matches vars that are
+all uppercase and miss things like "libdir".  normally this isn't a problem as
+the vars have the same value.  but when you cross-compile, this script will
+produce a different config.mk file which will have different paths (such as
+config.mk:libdir=/usr/lib64 but forbuild.mk:libdir=/usr/lib).  so update the
+script to convert all vars including lowercase ones.
+
+Patch by Peter Nilsson Lundblad
+
+--- a/mk4build
++++ b/mk4build
+@@ -106,7 +106,7 @@
+ 
+ sedScript="${outputName}.${sedExtension}"
+ sed -n -e '
+-s/^ *\([A-Z][A-Z_]*\) *=.*$/\1/
++s/^ *\([[:alpha:]][[:alpha:]_]*\) *=.*$/\1/
+ t found
+ d
+ :found