Fix inlining multilib BUILD_DIR logic, use sub-phase functions instead. Fixes bug #511142.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

5 files changed, 94 insertions, 52 deletions

diff --git a/x11-proto/xcb-proto/ChangeLog b/x11-proto/xcb-proto/ChangeLog
index ed6b1800c792..b1af69d39495 100644
--- a/x11-proto/xcb-proto/ChangeLog
+++ b/x11-proto/xcb-proto/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-proto/xcb-proto
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/xcb-proto/ChangeLog,v 1.137 2014/04/19 17:48:02 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/xcb-proto/ChangeLog,v 1.138 2014/05/23 22:43:17 mgorny Exp $
+
+  23 May 2014; Michał Górny <mgorny@gentoo.org> xcb-proto-1.10.ebuild,
+  xcb-proto-1.8-r3.ebuild, xcb-proto-1.9-r1.ebuild:
+  Fix inlining multilib BUILD_DIR logic, use sub-phase functions instead. Fixes
+  bug #511142.
 
   19 Apr 2014; Agostino Sarubbo <ago@gentoo.org> xcb-proto-1.10.ebuild:
   Stable for sparc, wrt bug #500368
diff --git a/x11-proto/xcb-proto/Manifest b/x11-proto/xcb-proto/Manifest
index dc1ac5e51b50..26a1151ce0c7 100644
--- a/x11-proto/xcb-proto/Manifest
+++ b/x11-proto/xcb-proto/Manifest
@@ -4,25 +4,27 @@ Hash: SHA256
 DIST xcb-proto-1.10.tar.bz2 138834 SHA256 7ef40ddd855b750bc597d2a435da21e55e502a0fefa85b274f2c922800baaf05 SHA512 b979d6432dcb58b5040a460ecb5285c67d288203768e2b6d032acac6593219dda9f29ae95920bc10b1d9451d928e3295f49d8e457b2bfb69d06481219745c6de WHIRLPOOL aa6905d8d402a5900c37ea411a3818820ec19c90250eb8e86b93e901e0a81f102216e7f2603a851365305c07630c91356b0e827ec85359da9eb8d66c73186830
 DIST xcb-proto-1.8.tar.bz2 125072 SHA256 233d16c7a019235b3092111e7c11429119357eb13754a607b75eea04453121b0 SHA512 181fee36ab4c842b8b3eaa244ff94c31be2488cb24bdb82cc23082b229d1994746c00307dc0a37d00ae0b7c92f804f90f1ad9ba29f4d5134c5c64a4f23c696ab WHIRLPOOL 3d0b394428544660b82b3984a7c707e93987e686678b737fb396404a20f0d8e78e6deae564925bffe917f6a3b573bff936647f2cf9fde80b9c4469dcb2cd6cf0
 DIST xcb-proto-1.9.tar.bz2 136421 SHA256 895afe21793e6e26c5ce999b1900c02a5984c201d96d55cc42c182d3c3bde43c SHA512 063e08e51893302b160f7cbfe75e2319c6c0c7172cae3d1bbda4cb69695e47ce4938ea18679d36eda436bab7ee1cc288e62381d7d6115892e35626bb6ca2607d WHIRLPOOL 60cea257c17bb6d953f7435340cca2102c116ea71b6cdd71773274926e1442b7d72ed36d2cd915ae8b8b4033c6a6f7e8d1d3fae6a80eeb08f9f88ad6815d9b15
-EBUILD xcb-proto-1.10.ebuild 1573 SHA256 ad73103caf63f5eec45932db1be25036fb376a89cdcbfa9dda87a1c81e6d3486 SHA512 60309160349903a3082811078ae860c7030de712fa4437269786314dbc1cd58c205b1b8e1a387c2e0351e6c7f60e33f10658c896540eaf419b3b54a6e8370eae WHIRLPOOL bae1cb3de53391188775583e3ab63a352af8136a7ec49a79477019b65c88b6d5c38a5ca477abb3228b571129f87ee195e0827a359223d64926e5a4bc1f99e23e
-EBUILD xcb-proto-1.8-r3.ebuild 1462 SHA256 42645088cdeb9628e1854d2b38eef90371db9711d0ac9dabe123473a59343adc SHA512 20a60d13e3880141fd7d873d3c06c9a6adf6b1f53cf6bf6ad6f637f353cce28d66a735e4c3483a28ed88a59ecb6066f2b417cab83fc9f3c9180e979ba69809a4 WHIRLPOOL 6fe4c0bee5f56124f1bb7347f725dabb58124dd4632daa397d9bdb83ba3a6f47ce1f3a2db9b498ba38f6871f6195c993fc9d169d188481aa19d3db8a8107fe47
-EBUILD xcb-proto-1.9-r1.ebuild 1580 SHA256 fc4b3e41d478ed13fcd0959246c5a0f8a5a5e4efa409f8668d9ab915eb08e638 SHA512 0684843cd50b923ed743fd97f13a552a9b1ba70625de7a9a5831dd081d857b5dceb2f59cbacf1e4d00964ee014400743dcd11717f2e6f49d89c6010d1d56b412 WHIRLPOOL f620e51a21bec185cf6a96572ba264a00b5b3be9dce2d24ecea994a396309c981098da252df77715ad2485b1f67c5ad1b017c3aed85e4d90b777ada368902fe6
-MISC ChangeLog 16517 SHA256 61f97afb457b667303e01b0b3473a4be0f3e7bafea9fbf73489dc6c6ac996135 SHA512 b993fc1760b4de4cad492651f6b6f2dc53f2e9890aa89f4760061c5a5dc6db2e66d33d2830cae8917234f4811ebfb5a0fa08f4e45f629ceb7fbacf39f4693703 WHIRLPOOL 9e264378180fc9db664000ed8ac493df2090fd556e6d986042361d39349ff9632705daee0052d105d525aa8dfa0ae1ae0d9a7b4a390de33b6be00eba392230c7
+EBUILD xcb-proto-1.10.ebuild 1663 SHA256 d7bb2c848abb8de546e8ea54e5af43bdc29da13b4567b7f676e4b630c848f44e SHA512 a36ac9dd55a91ee607b729f6522f0a4fe25c7309ee685aa78ac01f269b8fb07792a0d74244551d2e4768013b5a22ac6d425ab4257d8e358b7b0a82b34dbeeea8 WHIRLPOOL 24ef6ff2f2a876ab90f85048f56c70f7b3a2401cca903b7fc995ddc4fdf47aa8d33830daf259fdc107f56a47fd84391ee1ce97a9ec844f14b18a5093b2a5e5de
+EBUILD xcb-proto-1.8-r3.ebuild 1542 SHA256 023e20343a55cba133ae11559619d089e9219a726b13ae9aeae85c222d869afd SHA512 c77ffe1cb6849cda5e177fc512f11b626a6b2e18600084016fd0ef8426cafb5ff521ea1896cd7ab9a29ba5d861ed6e54f7b2f29060506798d1b2d7436bf36f4d WHIRLPOOL 89266b78fea3b52d0a7adef20488d37059064e678ae577906238a46ccc1d19b33a4c45e6bdb5783bb4f1e13bf7bad93ab5d9a1cfb941bf4c8ffabf23a63430fa
+EBUILD xcb-proto-1.9-r1.ebuild 1635 SHA256 bd862dc628faa0242e330e4085c515693fbb4e7d5bb93f5275837208c2a68692 SHA512 d9d44d6c608cb5cde4ec79dce92aecda795daaf905741f61093056bb8a69eea552c785767e692a95871cefdf5942fed631d7e686b15a7f452c7caaafbfa77224 WHIRLPOOL c4f3658e333902bc9f922fb844f25e07cf4d1ceed40c18a42da1dfc7db45771bf7995f5c309b89a54e6aff7c9a2679d0487a797301169f421b17cfd783719dac
+MISC ChangeLog 16741 SHA256 07585051d4fdc753281ca0fe809ea07e9ca1c39b8811c10a19366040ae45999d SHA512 a9158c48f2c85ddb7ae53c4634f71189ce075ee06f09026d42463caeefceb304b3b7b7779e33baa4671bb2e62cfd1f6a2c322d0529df31760f1415ecff1f2b1d WHIRLPOOL 9b37ee43157298c2f8827240cd2235cfba0a8f577cc1ce8d6cf0b0427b9d04f685a4dd7f253287f440330132ccbc3a52801d2e35219b2491aacb94ed9ca03159
 MISC metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 SHA512 daa9bb2a9b1a16220327bc394f10d93a1a8a427bfbed8808cd247c1dfd5a5b87a4945d55d8243e07fede2c8182a208c618ebd483773d77e9d23862ec77016019 WHIRLPOOL 691e028648bb8b60771d74ef718c51fdb0f4a587e984f6ac4c13d7796415ecf770df2e0fd766399091771924bb65995e9bb290baa35971c56e07d76f2bbf6d93
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTUrbTAAoJELp701BxlEWfuVUQAKdA0z9fTcEIoLXMX3VXMf9d
-kB/Q8JzSn1OHg1WSWXf1TkwjVtUcfi8a6Ivu4OQ/LAgaVAn/swcYxe/JwTmlHU3A
-tuksg1jPq5qpci07Pudb2wi54lzTU3dWUM49fF9T13nlgqa6cxA3yuCmwULZx9nX
-YALxWm3Th/IlEBn77Q1n/ODWH6HvWyc5aiRcWjoOv+G3SboORWLi2+Kc12zElKUq
-DoLS/3nRK9iQNUP9FPLDZZEo1/fLxtISft9L/r4y3b7UZyFbMpZxL3Z9bMJrrW4W
-gE8VvWhsx4mZ9UK03Zt0IeGTlA4c/coQ7ro0MTb/kpN9Da3zFEVFL6cOIEDSPx46
-uzOZaDS+J6ECSix2lMJlYNXLWJtFmCbxwE893ifanUKpBd8nOtAiMiab1+Ef3LIj
-xe4w4ViWuJ0Hlkc5RL1ge8CTpGAl0S1frwhUMH5L9+/eNBTGq4Z8sBqiIxGg/tar
-ntJUTfTOAwsBketDqyqM47ea5LHCyWyHUFzyhI2zkVhbp4wKB8JhvgOVWejElG/n
-rRQg0hLVlx0B5zidSNYIukGmtbGYX3dc0bhq0IF6toKuNbWiMmD35hwxbWGW17LI
-+ZP4rmQuBnYJdBGY3R4ziw5UOq2xo4+nGNqUC+rfQPPsffu6msmepOaX5mVl9ZFI
-vT4v5tJLRMa3HUDAGbJG
-=cjxD
+iQJ8BAEBCABmBQJTf88IXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZODTwP/R6YExranngcX6Eh5F4nVL+7
+w9VhylSHcKtDnt/KENzLUByJm7Gf3NqFmz/bS4Q7lAzsS9YSha87ZqmH+bjCAZnR
+mdsrfZCnwlbambZ+VcXG94HhvnD5TmZlrE/earXKexOpxafkCOvVYBvz14kf1tVP
+LAPHtM93Ofs5ndEbDpHEeCH4c8IOKSIZb+a2rRwPaAhcAC3bErwztvyKM3Yuo0EH
+oSsq1zv44zLsojvfWhkxbEATLkxtlI57nTZHyUAAOcS/s4p/2G19/t1n1FzXyFLk
+c1WBY2vojKKiFbHMRwVPANT9acFllt/zoT0cjqdXLK9jW+TLk3FqMk1p9L8Jwsma
+BCtYqrR7OsYa4fpvTqeOxfA2VoYE9upYAUQONERmmi6Yup68CdNGC1wll70ccjP8
+C64cwd/0nv6X5KHIOQaNExGPJX/g+8mGwIIYygql4VNQen2Z/21lkt/P7RvSa0mV
+K5wU2G8Q7jgdao0VsCbfZJG/S24C73R33c+caiwHDEL1pmkajWi+Cm6pc1g/vtdD
+RaoMxEGHOva9QpPt0NFprnLjqggBgqdyTvaBar97DI+XgS2sK2GFxwoOlA0jtHDd
+peQjej8AhYGzouK8Zm5gxc+jt57aTIGDQJ/pDNSh2ge5LVVRQF0SQr2oS66AM2Pu
+bP9W3bFQwdnzAwBHLwcq
+=9vAd
 -----END PGP SIGNATURE-----
diff --git a/x11-proto/xcb-proto/xcb-proto-1.10.ebuild b/x11-proto/xcb-proto/xcb-proto-1.10.ebuild
index f09df87486e5..e327965bbc18 100644
--- a/x11-proto/xcb-proto/xcb-proto-1.10.ebuild
+++ b/x11-proto/xcb-proto/xcb-proto-1.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/xcb-proto/xcb-proto-1.10.ebuild,v 1.10 2014/04/19 17:48:02 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/xcb-proto/xcb-proto-1.10.ebuild,v 1.11 2014/05/23 22:43:17 mgorny Exp $
 
 EAPI=5
 
@@ -27,24 +27,38 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 src_configure() {
 	python_export_best
 	xorg-2_src_configure
-	#Note: multilib is not supported with python, therefore use only one ABI
-	python_parallel_foreach_impl autotools-utils_src_configure
 }
 
-src_compile() {
-	xorg-2_src_compile
+multilib_src_configure() {
+	autotools-utils_src_configure
 
-	python_foreach_impl autotools-utils_src_compile -C xcbgen \
-		top_builddir="${WORKDIR}/${P}-${ABI:-${DEFAULT_ABI}}"
+	if multilib_is_native_abi; then
+		python_parallel_foreach_impl autotools-utils_src_configure
+	fi
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi; then
+		python_foreach_impl autotools-utils_src_compile -C xcbgen \
+			top_builddir="${BUILD_DIR}"
+	fi
 }
 
 src_install() {
 	xorg-2_src_install
 
-	python_foreach_impl autotools-utils_src_install -C xcbgen \
-		top_builddir="${WORKDIR}/${P}-${ABI:-${DEFAULT_ABI}}"
-
 	# pkg-config file hardcodes python sitedir, bug 486512
 	sed -i -e '/pythondir/s:=.*$:=/dev/null:' \
 		"${ED}"/usr/lib*/pkgconfig/xcb-proto.pc || die
 }
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi; then
+		python_foreach_impl autotools-utils_src_install -C xcbgen \
+			top_builddir="${BUILD_DIR}"
+	fi
+}
diff --git a/x11-proto/xcb-proto/xcb-proto-1.8-r3.ebuild b/x11-proto/xcb-proto/xcb-proto-1.8-r3.ebuild
index 7b3235bfb76a..52cf0dad41c6 100644
--- a/x11-proto/xcb-proto/xcb-proto-1.8-r3.ebuild
+++ b/x11-proto/xcb-proto/xcb-proto-1.8-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/xcb-proto/xcb-proto-1.8-r3.ebuild,v 1.14 2013/10/08 05:09:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/xcb-proto/xcb-proto-1.8-r3.ebuild,v 1.15 2014/05/23 22:43:17 mgorny Exp $
 
 EAPI=5
 
@@ -23,23 +23,34 @@ DEPEND="${RDEPEND}
 	dev-libs/libxml2"
 
 src_configure() {
+	python_export_best
 	xorg-2_src_configure
-	#Note: multilib is not supported with python, therefore use only one ABI
-	python_foreach_impl autotools-utils_src_configure
 }
 
-src_compile() {
-	xorg-2_src_compile
+multilib_src_configure() {
+	autotools-utils_src_configure
 
-	python_foreach_impl autotools-utils_src_compile -C xcbgen \
-		top_builddir="${WORKDIR}/${P}-${ABI:-${DEFAULT_ABI}}"
+	if multilib_is_native_abi; then
+		python_parallel_foreach_impl autotools-utils_src_configure
+	fi
 }
 
-src_install() {
-	xorg-2_src_install
+multilib_src_compile() {
+	default
 
-	python_foreach_impl autotools-utils_src_install -C xcbgen \
-		top_builddir="${WORKDIR}/${P}-${ABI:-${DEFAULT_ABI}}"
+	if multilib_is_native_abi; then
+		python_foreach_impl autotools-utils_src_compile -C xcbgen \
+			top_builddir="${BUILD_DIR}"
+	fi
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi; then
+		python_foreach_impl autotools-utils_src_install -C xcbgen \
+			top_builddir="${BUILD_DIR}"
+	fi
 }
 
 pkg_postinst() {
diff --git a/x11-proto/xcb-proto/xcb-proto-1.9-r1.ebuild b/x11-proto/xcb-proto/xcb-proto-1.9-r1.ebuild
index 27bab245e8a9..8d4ee7c7279c 100644
--- a/x11-proto/xcb-proto/xcb-proto-1.9-r1.ebuild
+++ b/x11-proto/xcb-proto/xcb-proto-1.9-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/xcb-proto/xcb-proto-1.9-r1.ebuild,v 1.1 2013/11/12 02:38:27 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/xcb-proto/xcb-proto-1.9-r1.ebuild,v 1.2 2014/05/23 22:43:17 mgorny Exp $
 
 EAPI=5
 
@@ -34,20 +34,30 @@ src_prepare() {
 src_configure() {
 	python_export_best
 	xorg-2_src_configure
-	#Note: multilib is not supported with python, therefore use only one ABI
-	python_foreach_impl autotools-utils_src_configure
 }
 
-src_compile() {
-	xorg-2_src_compile
+multilib_src_configure() {
+	autotools-utils_src_configure
 
-	python_foreach_impl autotools-utils_src_compile -C xcbgen \
-		top_builddir="${WORKDIR}/${P}-${ABI:-${DEFAULT_ABI}}"
+	if multilib_is_native_abi; then
+		python_parallel_foreach_impl autotools-utils_src_configure
+	fi
 }
 
-src_install() {
-	xorg-2_src_install
+multilib_src_compile() {
+	default
 
-	python_foreach_impl autotools-utils_src_install -C xcbgen \
-		top_builddir="${WORKDIR}/${P}-${ABI:-${DEFAULT_ABI}}"
+	if multilib_is_native_abi; then
+		python_foreach_impl autotools-utils_src_compile -C xcbgen \
+			top_builddir="${BUILD_DIR}"
+	fi
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi; then
+		python_foreach_impl autotools-utils_src_install -C xcbgen \
+			top_builddir="${BUILD_DIR}"
+	fi
 }