[gentoo-commits] gentoo-x86 commit in x11-proto/xcb-proto: xcb-proto-1.10.ebuild xcb-proto-1.8-r3.ebuild xcb-proto-1.9-r1.ebuild ChangeLog

[Michal Gorny (mgorny)]

mgorny      14/05/23 22:43:17

  Modified:             xcb-proto-1.10.ebuild xcb-proto-1.8-r3.ebuild
                        xcb-proto-1.9-r1.ebuild ChangeLog
  Log:
  Fix inlining multilib BUILD_DIR logic, use sub-phase functions instead. Fixes bug #511142.
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)

Revision  Changes    Path
1.11                 x11-proto/xcb-proto/xcb-proto-1.10.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-proto/xcb-proto/xcb-proto-1.10.ebuild?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-proto/xcb-proto/xcb-proto-1.10.ebuild?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-proto/xcb-proto/xcb-proto-1.10.ebuild?r1=1.10&r2=1.11

Index: xcb-proto-1.10.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-proto/xcb-proto/xcb-proto-1.10.ebuild,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xcb-proto-1.10.ebuild	19 Apr 2014 17:48:02 -0000	1.10
+++ xcb-proto-1.10.ebuild	23 May 2014 22:43:17 -0000	1.11
@@ -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 @@
 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
+}



1.15                 x11-proto/xcb-proto/xcb-proto-1.8-r3.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-proto/xcb-proto/xcb-proto-1.8-r3.ebuild?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-proto/xcb-proto/xcb-proto-1.8-r3.ebuild?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-proto/xcb-proto/xcb-proto-1.8-r3.ebuild?r1=1.14&r2=1.15

Index: xcb-proto-1.8-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-proto/xcb-proto/xcb-proto-1.8-r3.ebuild,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xcb-proto-1.8-r3.ebuild	8 Oct 2013 05:09:51 -0000	1.14
+++ xcb-proto-1.8-r3.ebuild	23 May 2014 22:43:17 -0000	1.15
@@ -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 @@
 	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() {



1.2                  x11-proto/xcb-proto/xcb-proto-1.9-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-proto/xcb-proto/xcb-proto-1.9-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-proto/xcb-proto/xcb-proto-1.9-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-proto/xcb-proto/xcb-proto-1.9-r1.ebuild?r1=1.1&r2=1.2

Index: xcb-proto-1.9-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-proto/xcb-proto/xcb-proto-1.9-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xcb-proto-1.9-r1.ebuild	12 Nov 2013 02:38:27 -0000	1.1
+++ xcb-proto-1.9-r1.ebuild	23 May 2014 22:43:17 -0000	1.2
@@ -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_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
 }



1.138                x11-proto/xcb-proto/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-proto/xcb-proto/ChangeLog?rev=1.138&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-proto/xcb-proto/ChangeLog?rev=1.138&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-proto/xcb-proto/ChangeLog?r1=1.137&r2=1.138

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-proto/xcb-proto/ChangeLog,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- ChangeLog	19 Apr 2014 17:48:02 -0000	1.137
+++ ChangeLog	23 May 2014 22:43:17 -0000	1.138
@@ -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@g.o> 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@g.o> xcb-proto-1.10.ebuild:
   Stable for sparc, wrt bug #500368