[gentoo-commits] proj/x11:master commit in: x11-proto/xcb-proto/

[Michał Górny]

commit:     264f3bc8857ce2e6be6bb6ad7e25a4722d1f6e0c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri May 23 22:37:54 2014 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri May 23 22:37:54 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=264f3bc8

x11-proto/xcb-proto: Fix inlining multilib BUILD_DIR logic, use sub-phase functions instead. Fixes bug #511142.

Package-Manager: portage-2.2.10

---
 x11-proto/xcb-proto/xcb-proto-9999.ebuild | 36 +++++++++++++++++++++----------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/x11-proto/xcb-proto/xcb-proto-9999.ebuild b/x11-proto/xcb-proto/xcb-proto-9999.ebuild
index 1449375..818087e 100644
--- a/x11-proto/xcb-proto/xcb-proto-9999.ebuild
+++ b/x11-proto/xcb-proto/xcb-proto-9999.ebuild
@@ -25,26 +25,40 @@ DEPEND="${RDEPEND}
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 src_configure() {
-	python_export_best
+	python_setup
 	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
+	# 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
+}