Fix cross-compiling logic with the makekeys tool by using the proper env vars.

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

4 files changed, 39 insertions, 39 deletions

diff --git a/x11-libs/libX11/ChangeLog b/x11-libs/libX11/ChangeLog
index 57babfad03a5..04503a16df69 100644
--- a/x11-libs/libX11/ChangeLog
+++ b/x11-libs/libX11/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/libX11
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/ChangeLog,v 1.223 2015/03/11 00:30:30 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/ChangeLog,v 1.224 2015/07/23 03:43:25 vapier Exp $
+
+  23 Jul 2015; Mike Frysinger <vapier@gentoo.org> libX11-1.6.2.ebuild,
+  libX11-1.6.3.ebuild:
+  Fix cross-compiling logic with the makekeys tool by using the proper env vars.
 
 *libX11-1.6.3 (11 Mar 2015)
 
diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
index 73cd1dc4afa5..f48484169fe8 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -6,24 +6,24 @@ AUX libX11-1.1.5-solaris.patch 246 SHA256 89210b0559e936cdb0a42b9bc5df9bf47704b8
 AUX libX11-1.1.5-winnt-private.patch 420 SHA256 d0349ef4d379ab3eefa33a28d20e0ec9c630ab0b5c64a52c3849cc8d1d4abba0 SHA512 71f036f88ab45286826bde20fafaa1eea86aade16d21601e4da0ed935e2a937c6570969e3b173967e1860778c594b0ea08eb905e7c47b67e147d65834905c251 WHIRLPOOL d72c7b3cf0ea7202c0aa1aae3d30c5c453dbeafc8b6d8ccb8aa993da41ea1863edae8ed27a4bcdb8e02335c9083e5bce8842ae5018bbb9f23eb6fe8057e5e16f
 DIST libX11-1.6.2.tar.bz2 2339981 SHA256 2aa027e837231d2eeea90f3a4afe19948a6eb4c8b2bec0241eba7dbc8106bd16 SHA512 c8609ff34d1fe71f35b35e0273a872ccded4d824c8afdcca37e1779d37bf667cb814e0ead0805668b4222f196148476f283e417ba371b722f1fe716a5bbba20b WHIRLPOOL 1e6e5010725586557912ab51aa07c41a6297e26f3818e31cf62d455735f4a4f29c0bd13140964ffb1290588ccb8e1643217bca685aa2e7ec40d99b907541656c
 DIST libX11-1.6.3.tar.bz2 2363858 SHA256 cf31a7c39f2f52e8ebd0db95640384e63451f9b014eed2bb7f5de03e8adc8111 SHA512 01bbac8075b3fdae19cacfde1c799469f06fb864235025ce444fc10a3ba079bce30f4f3527db47c5edbf91d08299c61116cdf296efa38b2034c0099fac99cc69 WHIRLPOOL 1aa82b4d00af27e05bd9157cfafe16f2cdeecd3711e983224fda0cf6f323c7165b18f5a4572067b29ff3ca244e91def8523d56fb7be55e977bed507bd5a846f1
-EBUILD libX11-1.6.2.ebuild 1728 SHA256 0a35fc9162425e21bf79ffe4ac32359fdebb8cfe91a94fb314cd4137995217d2 SHA512 489932b397431f5a12dfac0a4ed8128989d2842a403946272b8f8eb38f9e779a9a9427d644c1a22c973507a2a67e30456ddef3a364b4a4f25cd4f2c38434ad51 WHIRLPOOL 79247b74aa98d2a37da508d365f3923117d6f648a3d46f3bcc6c7e9263cec92112f32baca0c220fcc2b0d789ce3898c75f5e8f54ad09564ea3ea72fffb013c1f
-EBUILD libX11-1.6.3.ebuild 1737 SHA256 39b7c359f1f2a5cdbf1e27a2eec0577f0f56da495bad8eab2d8e43e0ad715b2a SHA512 79f459fed289255bf0779aaa7195a40b88ad677c62833afa39e15f0bedf54966d1306f6247e380ac9039cf7527927645ee78a23b5eda246e2cf4c45523e388d9 WHIRLPOOL 92509ddb25ec92bde63478ab1ca28dd5cbee8ccf3619e3896b8e2adbb622e3ba0cef330d149d272903f54b610f0372768097bda8af6278d3f3c5ea0aa3e8f846
-MISC ChangeLog 29492 SHA256 83197b5b2b4823f218a50810a639b6dde6a9ec7611d45b6547ce3b4a73be8844 SHA512 58c344ffdbecda9f8ed7a763153fbf026fc3309af7a58b7c0c9440cc33c79d1ce74b8bc08c83578b7bd386a92508339638b97e8099c663e48f4cf8960c4833ad WHIRLPOOL 48b99c759a0b270377c7f180918377d730704585c04163d9deb9d510782e9a6e41396b733b5a5dffbc5d7ed5d8abdbc59ee93ed1db285eb09215396326122d77
+EBUILD libX11-1.6.2.ebuild 1716 SHA256 cc2d3e4c2373cff44edb7df4c4414a528da2b2040a5a0647f4c6d306250af34d SHA512 702c9ac84350836ad838d78bacc15f0708d149c4682660f1ad5c49e8a809e4d1eb7e692050ba903ebf7f5b5dcf1bbbef5a33ac92c6dfc74ae6206249733eaa2b WHIRLPOOL c25e077a8e8547e83f6d688a8ae0364bcb4f73a63e900851e81b2f581352765fe35c7bbc5c534c468b2e346201bae478938ed929c9f045cf540de94d819e62bd
+EBUILD libX11-1.6.3.ebuild 1725 SHA256 8ec15b4c9320186405ec55c0697c4deca79cf16e9613c0b789d2cd66b4dd28c1 SHA512 17c1f7b0791a74964258d4f954cefe3c18aa2f1fbd6d72c43036e7f9556e3fb49d8e6880ff4f49a8954d7b8e181fef745394ead6fb9d56c1ecd6422df8db1e46 WHIRLPOOL 4cd7a500e7a1731fcda4808c7dc2124a6b3d56a135097c95741d2ffb5da48e47c2f5c0a97e51c04f182838423685aeaacc5ac3a23b92959c6a7f191ac66bd8f6
+MISC ChangeLog 29666 SHA256 978963feeac7f75ed2b8435ace0e1bbcdd2f8ed446b5e9ee1f1f33bf1eeea271 SHA512 3e06dc82662c53d9ed276e67994756d5c9f2021de48624feab3080fac484225fc2f9593586596389ce8350ae231cacefe17251dbd33efe23311457d03c24c263 WHIRLPOOL 32cd160fc9f486527260f5fd532167e5653cddd0ddc4c11ba4058cf04b3c36680eec02313ac093483b5d994c607516af033ec7d225891ab9c9106ba575d80387
 MISC metadata.xml 235 SHA256 a202310d22801d09c363b58972e7d8101369192bb97b063bc1a3c7b7ef0e79c6 SHA512 f0f79bbc5200a007cad2a1ba783b5776b2eee19579daaac83546731ab3377e11d4d5546f91b35cf6f4331927ba9cf2d4f95e254736259145f38b84d2f9cc43aa WHIRLPOOL 1978b61b9ad4838ef7838ca760b612c79219acf8c52702e1c168d28ef52f799f710b6a1644031caa6b19f54f4857dc5fe7e3963df020fe688e0de7c5d5a07e08
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU/4yrAAoJEA/daC2XTKcqLsQP+wanoMvrEpbwpIZ7pkOZJVH6
-xhL4ruUr2GhVrFQi2pbNgJzbNHzLRQa17wMNOweEd/Ums5wCzRp39ZyHI+rNB9HE
-jjNwlVNd6IGsdQVL3lZJYytv5IqvkC/nuLpLNdgN5DrIF/xBMNNIf47P0t1wpgih
-3B6mDjom78XH4oh5E1OlOzhF1XZwtglGinx5y5QVJyu7zv8m1NgsjfwaOVReXU3b
-HgmGXEZN5s9dj7hIj4j56/o6nrKu+kM1Uxt9DfzfqEvrF+lUdFe/a6BOkL51xEJn
-YuLmVRpTd/+AW7B6gYnPRoF3TOzYMP+11SuAuOiQurHkyYC6tmYNYL2tADK6c7yK
-yZtPGbeH7n56niaZfm7GxOMujQJqRldyB2f/xQdekMdKcguM8LjOkZOsmE2qBBbB
-ZxHAb1iFwifVAhEECPCQT0w3E3PeM0Di7w8deOWOLxgYu0kvCzFqHneE5lUlXIaq
-uIEpsZ5ieV8uVjD/xIfYGFKRuNkzCxP9A0n5+kSh2BiIyPVe8GQdUBCxFTeJEjsv
-uKqKb7YUyz26qB/pqWVXb8ondw6kC6rsWYQ/7Js/L63ZmaPTyuTo5C45h+vQaIFl
-1L4agSVBcEtWX/H1QonQ5ZadjxlxrQUlqbozqOF/RNd0M6z1ogpN70oPKGlZHG+5
-wGCwx0wh/G14bo30F853
-=4wpo
+iQIcBAEBCAAGBQJVsGLfAAoJEPGu1DbS6WIAtugP/0AmIAqgwRWXaalr7y/WCRRq
+xMT8TDWNLB4R+QwITY8t57GOPakHOAOQUYvYlDGPnKoL2vNQQ14CalOrXOlhAm7l
++UqJi0MeVIDIanlg+Tpcfoey9syq4gYE2y3dwwzsKN2RAcs8oFSaIc9aYMZku2qX
+UmZQau1F5/0mMXzJzIhkWceWFbADFs64rhoVwT2JmxzdlXj3MJd3hSc1nWB4hNUM
+2Wf3A8euKHLj95l+TWLAC2lmEnMzTfHLhAHAu/O6LnmmNWE/UG6M08YiI2wFvH7H
+Crwfqd/XFPPWQ+zSdPVhhdjm83UHdiBl+xOiQR9z+NkEXNg7wbiV8kT5zV/UHeTr
+HtfVWf/Ys4ZLfDawUkQ3AMg38PTnQoza1k7sRLXvAcQLwnpLF23hvQ/usoWOZs4B
+NleeFyjskWYDvbmvOWzUpDY2EecIDRI4kCWkZHAyRZbhlS6mQO5QfLeircismTE5
+k7LdI7A3wILsr2anVdXMNuoVxZ94PoR60lqo9gQm3Q1k8gXoRBo5eJYCHNTNYYLG
+eYy9EuozDRn6LIAbn/pJstJJBanq/HIua3jlqEIkGLb6gdyzvUB+Y72uoJU4zO8Z
+JA2LrbJKvdIB+mxqHeW22FJ8McAh3oJNzhQHnTit9Hhxrvg3GqArwvrpmpsjtDMm
+3c2hPh4F/zlgnKxni7Os
+=Wk8/
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/libX11/libX11-1.6.2.ebuild b/x11-libs/libX11/libX11-1.6.2.ebuild
index 3365a1b0194e..1e73f2170df5 100644
--- a/x11-libs/libX11/libX11-1.6.2.ebuild
+++ b/x11-libs/libX11/libX11-1.6.2.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/x11-libs/libX11/libX11-1.6.2.ebuild,v 1.14 2015/02/22 02:21:24 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/libX11-1.6.2.ebuild,v 1.15 2015/07/23 03:43:25 vapier Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ XORG_DOC=doc
 # needs automake-1.14 without eautoreconf
 XORG_EAUTORECONF=yes
 XORG_MULTILIB=yes
-inherit xorg-2 toolchain-funcs flag-o-matic
+inherit xorg-2 toolchain-funcs
 
 DESCRIPTION="X.Org X11 library"
 
@@ -44,16 +44,14 @@ src_configure() {
 }
 
 multilib_src_compile() {
-	# [Cross-Compile Love] Disable {C,LD}FLAGS and redefine CC= for 'makekeys'
 	if tc-is-cross-compiler; then
-		(
-			filter-flags -m*
-			emake -C src/util \
-			CC=$(tc-getBUILD_CC) \
-			CFLAGS="${CFLAGS}" \
-			LDFLAGS="" \
-			clean all || die
-		)
+		# Make sure the build-time tool "makekeys" uses build settings.
+		tc-export_build_env BUILD_CC
+		emake -C src/util \
+			CC="${BUILD_CC}" \
+			CFLAGS="${BUILD_CFLAGS}" \
+			LDFLAGS="${BUILD_LDFLAGS}" \
+			clean all
 	fi
 
 	default
diff --git a/x11-libs/libX11/libX11-1.6.3.ebuild b/x11-libs/libX11/libX11-1.6.3.ebuild
index 4568ec1b07c2..65f160dbd554 100644
--- a/x11-libs/libX11/libX11-1.6.3.ebuild
+++ b/x11-libs/libX11/libX11-1.6.3.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/x11-libs/libX11/libX11-1.6.3.ebuild,v 1.1 2015/03/11 00:30:30 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/libX11-1.6.3.ebuild,v 1.2 2015/07/23 03:43:25 vapier Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ XORG_DOC=doc
 # needs automake-1.14 without eautoreconf
 XORG_EAUTORECONF=yes
 XORG_MULTILIB=yes
-inherit xorg-2 toolchain-funcs flag-o-matic
+inherit xorg-2 toolchain-funcs
 
 DESCRIPTION="X.Org X11 library"
 
@@ -44,16 +44,14 @@ src_configure() {
 }
 
 multilib_src_compile() {
-	# [Cross-Compile Love] Disable {C,LD}FLAGS and redefine CC= for 'makekeys'
 	if tc-is-cross-compiler; then
-		(
-			filter-flags -m*
-			emake -C src/util \
-			CC=$(tc-getBUILD_CC) \
-			CFLAGS="${CFLAGS}" \
-			LDFLAGS="" \
-			clean all || die
-		)
+		# Make sure the build-time tool "makekeys" uses build settings.
+		tc-export_build_env BUILD_CC
+		emake -C src/util \
+			CC="${BUILD_CC}" \
+			CFLAGS="${BUILD_CFLAGS}" \
+			LDFLAGS="${BUILD_LDFLAGS}" \
+			clean all
 	fi
 
 	default