public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/x11:master commit in: x11-proto/xcb-proto/
@ 2012-01-12 12:50 Chi-Thanh Christopher Nguyen
  0 siblings, 0 replies; 15+ messages in thread
From: Chi-Thanh Christopher Nguyen @ 2012-01-12 12:50 UTC (permalink / raw
  To: gentoo-commits

commit:     01f78886ecf0d3501d21cd63cdee361a5f0cff1c
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 12 12:30:46 2012 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Thu Jan 12 12:30:46 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=01f78886

x11-proto/xcb-proto: works with python-3

---
 x11-proto/xcb-proto/xcb-proto-9999.ebuild |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/x11-proto/xcb-proto/xcb-proto-9999.ebuild b/x11-proto/xcb-proto/xcb-proto-9999.ebuild
index eb579a4..8f9346d 100644
--- a/x11-proto/xcb-proto/xcb-proto-9999.ebuild
+++ b/x11-proto/xcb-proto/xcb-proto-9999.ebuild
@@ -2,8 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
-PYTHON_DEPEND="2:2.5"
+EAPI=4
 
 inherit python xorg-2
 
@@ -20,10 +19,6 @@ RDEPEND=""
 DEPEND="${RDEPEND}
 	dev-libs/libxml2"
 
-pkg_setup() {
-	python_set_active_version 2
-}
-
 src_install() {
 	xorg-2_src_install
 	python_clean_installation_image



^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] proj/x11:master commit in: x11-proto/xcb-proto/
@ 2012-03-10  1:17 Chi-Thanh Christopher Nguyen
  0 siblings, 0 replies; 15+ messages in thread
From: Chi-Thanh Christopher Nguyen @ 2012-03-10  1:17 UTC (permalink / raw
  To: gentoo-commits

commit:     eeb8e888ea829f8eb1601ccee337e699156bd23e
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 10 01:15:32 2012 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Sat Mar 10 01:15:32 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=eeb8e888

x11-proto/xcb-proto: sync python changes with portage.

---
 x11-proto/xcb-proto/xcb-proto-9999.ebuild |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/x11-proto/xcb-proto/xcb-proto-9999.ebuild b/x11-proto/xcb-proto/xcb-proto-9999.ebuild
index 8f9346d..45f6aa9 100644
--- a/x11-proto/xcb-proto/xcb-proto-9999.ebuild
+++ b/x11-proto/xcb-proto/xcb-proto-9999.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI=4
+PYTHON_DEPEND="*"
 
 inherit python xorg-2
 
@@ -19,9 +20,9 @@ RDEPEND=""
 DEPEND="${RDEPEND}
 	dev-libs/libxml2"
 
-src_install() {
-	xorg-2_src_install
-	python_clean_installation_image
+src_prepare() {
+	python_clean_py-compile_files
+	xorg-2_src_prepare
 }
 
 pkg_postinst() {



^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] proj/x11:master commit in: x11-proto/xcb-proto/
@ 2013-02-25 23:09 Michał Górny
  0 siblings, 0 replies; 15+ messages in thread
From: Michał Górny @ 2013-02-25 23:09 UTC (permalink / raw
  To: gentoo-commits

commit:     78379a1ea97aad808fb9e999c164a4d9cd76e147
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 25 23:08:41 2013 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Feb 25 23:08:41 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=78379a1e

x11-proto/xcb-proto: Enable multilib.

Package-Manager: portage-2.2.0_alpha163
RepoMan-Options: --force

---
 x11-proto/xcb-proto/xcb-proto-9999.ebuild |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/x11-proto/xcb-proto/xcb-proto-9999.ebuild b/x11-proto/xcb-proto/xcb-proto-9999.ebuild
index f7971b2..1788579 100644
--- a/x11-proto/xcb-proto/xcb-proto-9999.ebuild
+++ b/x11-proto/xcb-proto/xcb-proto-9999.ebuild
@@ -3,7 +3,9 @@
 # $Header: $
 
 EAPI=5
+
 PYTHON_DEPEND="*"
+XORG_MULTILIB=yes
 
 inherit python xorg-2
 


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] proj/x11:master commit in: x11-proto/xcb-proto/
@ 2013-09-24  7:04 Michał Górny
  0 siblings, 0 replies; 15+ messages in thread
From: Michał Górny @ 2013-09-24  7:04 UTC (permalink / raw
  To: gentoo-commits

commit:     0520733c9ea5e3c767c1c98a4482877c07719de6
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 24 07:04:42 2013 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Sep 24 07:04:42 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=0520733c

x11-proto/xcb-proto: Sync the Python/multilib changes from in-tree ebuild.

Package-Manager: portage-2.2.6
RepoMan-Options: --force

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

diff --git a/x11-proto/xcb-proto/xcb-proto-9999.ebuild b/x11-proto/xcb-proto/xcb-proto-9999.ebuild
index 85b4a9e..335e3d1 100644
--- a/x11-proto/xcb-proto/xcb-proto-9999.ebuild
+++ b/x11-proto/xcb-proto/xcb-proto-9999.ebuild
@@ -4,9 +4,10 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 XORG_MULTILIB=yes
-inherit python-single-r1 xorg-2
+
+inherit python-r1 xorg-2
 
 DESCRIPTION="X C-language Bindings protocol headers"
 HOMEPAGE="http://xcb.freedesktop.org/"
@@ -21,10 +22,22 @@ RDEPEND="${PYTHON_DEPS}"
 DEPEND="${RDEPEND}
 	dev-libs/libxml2"
 
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
 src_configure() {
 	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
+
+	python_foreach_impl autotools-utils_src_compile -C xcbgen \
+		top_builddir="${WORKDIR}/${P}-${ABI:-${DEFAULT_ABI}}"
+}
+
+src_install() {
+	xorg-2_src_install
+
+	python_foreach_impl autotools-utils_src_install -C xcbgen \
+		top_builddir="${WORKDIR}/${P}-${ABI:-${DEFAULT_ABI}}"
 }


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] proj/x11:master commit in: x11-proto/xcb-proto/
@ 2013-09-29 20:53 Michał Górny
  0 siblings, 0 replies; 15+ messages in thread
From: Michał Górny @ 2013-09-29 20:53 UTC (permalink / raw
  To: gentoo-commits

commit:     722b323d07cad143510568e74ce9fae18d8c62c2
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 29 20:54:08 2013 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Sep 29 20:54:08 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=722b323d

x11-proto/xcb-proto: Perform the multilib build part with one of the flag-enabled implementations.

Package-Manager: portage-2.2.7
RepoMan-Options: --force

---
 x11-proto/xcb-proto/xcb-proto-9999.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/x11-proto/xcb-proto/xcb-proto-9999.ebuild b/x11-proto/xcb-proto/xcb-proto-9999.ebuild
index 335e3d1..368866f 100644
--- a/x11-proto/xcb-proto/xcb-proto-9999.ebuild
+++ b/x11-proto/xcb-proto/xcb-proto-9999.ebuild
@@ -23,6 +23,7 @@ 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


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] proj/x11:master commit in: x11-proto/xcb-proto/
@ 2013-11-09  8:55 Michał Górny
  0 siblings, 0 replies; 15+ messages in thread
From: Michał Górny @ 2013-11-09  8:55 UTC (permalink / raw
  To: gentoo-commits

commit:     39beabbadca9d95fc222309b786e7a44fe5de0bf
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  9 08:55:34 2013 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Nov  9 08:55:34 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=39beabba

x11-proto/xcb-proto: Null out the pythondir in xcb-proto.pc to make xcb-proto useful for any Python implementation.

Package-Manager: portage-2.2.7
RepoMan-Options: --force

---
 x11-proto/xcb-proto/xcb-proto-9999.ebuild | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/x11-proto/xcb-proto/xcb-proto-9999.ebuild b/x11-proto/xcb-proto/xcb-proto-9999.ebuild
index 368866f..daed605 100644
--- a/x11-proto/xcb-proto/xcb-proto-9999.ebuild
+++ b/x11-proto/xcb-proto/xcb-proto-9999.ebuild
@@ -41,4 +41,7 @@ src_install() {
 
 	python_foreach_impl autotools-utils_src_install -C xcbgen \
 		top_builddir="${WORKDIR}/${P}-${ABI:-${DEFAULT_ABI}}"
+
+	sed -i -e '/pythondir/s:=.*$:=/dev/null:' \
+		"${ED}"/usr/lib*/pkgconfig/xcb-proto.pc || die
 }


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] proj/x11:master commit in: x11-proto/xcb-proto/
@ 2013-11-09  9:10 Michał Górny
  0 siblings, 0 replies; 15+ messages in thread
From: Michał Górny @ 2013-11-09  9:10 UTC (permalink / raw
  To: gentoo-commits

commit:     ada42067e0786dc790140de3a64a49c70e1a8c99
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  9 09:10:38 2013 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Nov  9 09:10:38 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=ada42067

x11-proto/xcb-proto: Do a parallel Python configure.

Package-Manager: portage-2.2.7
RepoMan-Options: --force

---
 x11-proto/xcb-proto/xcb-proto-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-proto/xcb-proto/xcb-proto-9999.ebuild b/x11-proto/xcb-proto/xcb-proto-9999.ebuild
index daed605..e5b0e9b 100644
--- a/x11-proto/xcb-proto/xcb-proto-9999.ebuild
+++ b/x11-proto/xcb-proto/xcb-proto-9999.ebuild
@@ -26,7 +26,7 @@ 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
+	python_parallel_foreach_impl autotools-utils_src_configure
 }
 
 src_compile() {


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] proj/x11:master commit in: x11-proto/xcb-proto/
@ 2014-01-19 18:23 Alexey Shvetsov
  0 siblings, 0 replies; 15+ messages in thread
From: Alexey Shvetsov @ 2014-01-19 18:23 UTC (permalink / raw
  To: gentoo-commits

commit:     19756779d4538d7d904e8e9f9d713a252a1067be
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 19 18:21:46 2014 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Sun Jan 19 18:21:46 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=19756779

[x11-proto/xcb-proto] Version bump per bug #496800 and bug #496802

Package-Manager: portage-2.2.8

---
 x11-proto/xcb-proto/metadata.xml          |  5 ++++
 x11-proto/xcb-proto/xcb-proto-1.10.ebuild | 49 +++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+)

diff --git a/x11-proto/xcb-proto/metadata.xml b/x11-proto/xcb-proto/metadata.xml
new file mode 100644
index 0000000..01c4c00
--- /dev/null
+++ b/x11-proto/xcb-proto/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>x11</herd>
+</pkgmetadata>

diff --git a/x11-proto/xcb-proto/xcb-proto-1.10.ebuild b/x11-proto/xcb-proto/xcb-proto-1.10.ebuild
new file mode 100644
index 0000000..32f6a40
--- /dev/null
+++ b/x11-proto/xcb-proto/xcb-proto-1.10.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+XORG_MULTILIB=yes
+
+inherit python-r1 xorg-2
+
+DESCRIPTION="X C-language Bindings protocol headers"
+HOMEPAGE="http://xcb.freedesktop.org/"
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/proto"
+[[ ${PV} != 9999* ]] && \
+	SRC_URI="http://xcb.freedesktop.org/dist/${P}.tar.bz2"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	dev-libs/libxml2"
+
+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
+
+	python_foreach_impl autotools-utils_src_compile -C xcbgen \
+		top_builddir="${WORKDIR}/${P}-${ABI:-${DEFAULT_ABI}}"
+}
+
+src_install() {
+	xorg-2_src_install
+
+	python_foreach_impl autotools-utils_src_install -C xcbgen \
+		top_builddir="${WORKDIR}/${P}-${ABI:-${DEFAULT_ABI}}"
+
+	sed -i -e '/pythondir/s:=.*$:=/dev/null:' \
+		"${ED}"/usr/lib*/pkgconfig/xcb-proto.pc || die
+}


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] proj/x11:master commit in: x11-proto/xcb-proto/
@ 2014-01-26 19:10 Matt Turner
  0 siblings, 0 replies; 15+ messages in thread
From: Matt Turner @ 2014-01-26 19:10 UTC (permalink / raw
  To: gentoo-commits

commit:     3fffab480de0d7b8e63d399e1db0f8ba3a329ae1
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Sun Jan 26 19:11:18 2014 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Jan 26 19:11:18 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=3fffab48

x11-proto/xcb-proto: Move 1.10 to the tree.

---
 x11-proto/xcb-proto/xcb-proto-1.10.ebuild | 49 -------------------------------
 1 file changed, 49 deletions(-)

diff --git a/x11-proto/xcb-proto/xcb-proto-1.10.ebuild b/x11-proto/xcb-proto/xcb-proto-1.10.ebuild
deleted file mode 100644
index 32f6a40..0000000
--- a/x11-proto/xcb-proto/xcb-proto-1.10.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-XORG_MULTILIB=yes
-
-inherit python-r1 xorg-2
-
-DESCRIPTION="X C-language Bindings protocol headers"
-HOMEPAGE="http://xcb.freedesktop.org/"
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/proto"
-[[ ${PV} != 9999* ]] && \
-	SRC_URI="http://xcb.freedesktop.org/dist/${P}.tar.bz2"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	dev-libs/libxml2"
-
-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
-
-	python_foreach_impl autotools-utils_src_compile -C xcbgen \
-		top_builddir="${WORKDIR}/${P}-${ABI:-${DEFAULT_ABI}}"
-}
-
-src_install() {
-	xorg-2_src_install
-
-	python_foreach_impl autotools-utils_src_install -C xcbgen \
-		top_builddir="${WORKDIR}/${P}-${ABI:-${DEFAULT_ABI}}"
-
-	sed -i -e '/pythondir/s:=.*$:=/dev/null:' \
-		"${ED}"/usr/lib*/pkgconfig/xcb-proto.pc || die
-}


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] proj/x11:master commit in: x11-proto/xcb-proto/
@ 2014-02-11 13:03 Chi-Thanh Christopher Nguyen
  0 siblings, 0 replies; 15+ messages in thread
From: Chi-Thanh Christopher Nguyen @ 2014-02-11 13:03 UTC (permalink / raw
  To: gentoo-commits

commit:     2ee65999072f7ef2ab2ab7587fe7310950e711bf
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 11 13:03:14 2014 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Tue Feb 11 13:03:14 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=2ee65999

x11-proto/xcb-proto: add comment about pythondir removal

Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=486512

---
 x11-proto/xcb-proto/xcb-proto-9999.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/x11-proto/xcb-proto/xcb-proto-9999.ebuild b/x11-proto/xcb-proto/xcb-proto-9999.ebuild
index 32f6a40..1449375 100644
--- a/x11-proto/xcb-proto/xcb-proto-9999.ebuild
+++ b/x11-proto/xcb-proto/xcb-proto-9999.ebuild
@@ -44,6 +44,7 @@ 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
 }


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] proj/x11:master commit in: x11-proto/xcb-proto/
@ 2014-05-23 22:38 Michał Górny
  0 siblings, 0 replies; 15+ messages in thread
From: Michał Górny @ 2014-05-23 22:38 UTC (permalink / raw
  To: gentoo-commits

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
+}


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] proj/x11:master commit in: x11-proto/xcb-proto/
@ 2014-10-04 20:54 David Heidelberger
  0 siblings, 0 replies; 15+ messages in thread
From: David Heidelberger @ 2014-10-04 20:54 UTC (permalink / raw
  To: gentoo-commits

commit:     3f0b6b8db7227fe2c6b51c2a6ac40eaf95cd6640
Author:     David Heidelberger <david.heidelberger <AT> ixit <DOT> cz>
AuthorDate: Sat Oct  4 20:51:46 2014 +0000
Commit:     David Heidelberger <d.okias <AT> gmail <DOT> com>
CommitDate: Sat Oct  4 20:51:46 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=3f0b6b8d

x11-proto/xcb-proto: bump 1.11

Signed-off-by: David Heidelberger <david.heidelberger <AT> ixit.cz>

---
 .../xcb-proto/{xcb-proto-9999.ebuild => xcb-proto-1.11.ebuild}      | 6 +++---
 x11-proto/xcb-proto/xcb-proto-9999.ebuild                           | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/x11-proto/xcb-proto/xcb-proto-9999.ebuild b/x11-proto/xcb-proto/xcb-proto-1.11.ebuild
similarity index 79%
copy from x11-proto/xcb-proto/xcb-proto-9999.ebuild
copy to x11-proto/xcb-proto/xcb-proto-1.11.ebuild
index 818087e..19b1bc7 100644
--- a/x11-proto/xcb-proto/xcb-proto-9999.ebuild
+++ b/x11-proto/xcb-proto/xcb-proto-1.11.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+PYTHON_COMPAT=( python{2_7,3_2,3_3} )
 XORG_MULTILIB=yes
 
 inherit python-r1 xorg-2
@@ -15,7 +15,7 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/proto"
 [[ ${PV} != 9999* ]] && \
 	SRC_URI="http://xcb.freedesktop.org/dist/${P}.tar.bz2"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}"
@@ -25,7 +25,7 @@ DEPEND="${RDEPEND}
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 src_configure() {
-	python_setup
+	python_export_best
 	xorg-2_src_configure
 }
 

diff --git a/x11-proto/xcb-proto/xcb-proto-9999.ebuild b/x11-proto/xcb-proto/xcb-proto-9999.ebuild
index 818087e..4ae2110 100644
--- a/x11-proto/xcb-proto/xcb-proto-9999.ebuild
+++ b/x11-proto/xcb-proto/xcb-proto-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+PYTHON_COMPAT=( python{2_7,3_2,3_3} )
 XORG_MULTILIB=yes
 
 inherit python-r1 xorg-2


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] proj/x11:master commit in: x11-proto/xcb-proto/
@ 2014-10-06 11:46 Chi-Thanh Christopher Nguyen
  0 siblings, 0 replies; 15+ messages in thread
From: Chi-Thanh Christopher Nguyen @ 2014-10-06 11:46 UTC (permalink / raw
  To: gentoo-commits

commit:     06b6d819586497b42cbea40a49162b0bb4e6f001
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  6 11:47:09 2014 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Mon Oct  6 11:47:09 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=06b6d819

x11-proto/xcb-proto: drop stable keywords

---
 x11-proto/xcb-proto/xcb-proto-1.11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-proto/xcb-proto/xcb-proto-1.11.ebuild b/x11-proto/xcb-proto/xcb-proto-1.11.ebuild
index 19b1bc7..f2baee5 100644
--- a/x11-proto/xcb-proto/xcb-proto-1.11.ebuild
+++ b/x11-proto/xcb-proto/xcb-proto-1.11.ebuild
@@ -15,7 +15,7 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/proto"
 [[ ${PV} != 9999* ]] && \
 	SRC_URI="http://xcb.freedesktop.org/dist/${P}.tar.bz2"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}"


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] proj/x11:master commit in: x11-proto/xcb-proto/
@ 2014-11-03 22:45 Remi Cardona
  0 siblings, 0 replies; 15+ messages in thread
From: Remi Cardona @ 2014-11-03 22:45 UTC (permalink / raw
  To: gentoo-commits

commit:     b72ea65a5349d849d4dbd81559f9faa8e8b62cfc
Author:     Rémi Cardona <remi <AT> gentoo <DOT> org>
AuthorDate: Mon Nov  3 07:28:48 2014 +0000
Commit:     Remi Cardona <remi <AT> gentoo <DOT> org>
CommitDate: Mon Nov  3 20:48:17 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=b72ea65a

x11-proto/xcb-proto: Sync with portage

- remove 1.11 that's in portage
- sync -9999 with latest ~arch from portage
- remove thick manifest

---
 x11-proto/xcb-proto/xcb-proto-1.11.ebuild | 64 -------------------------------
 x11-proto/xcb-proto/xcb-proto-9999.ebuild |  4 +-
 2 files changed, 2 insertions(+), 66 deletions(-)

diff --git a/x11-proto/xcb-proto/xcb-proto-1.11.ebuild b/x11-proto/xcb-proto/xcb-proto-1.11.ebuild
deleted file mode 100644
index f2baee5..0000000
--- a/x11-proto/xcb-proto/xcb-proto-1.11.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_2,3_3} )
-XORG_MULTILIB=yes
-
-inherit python-r1 xorg-2
-
-DESCRIPTION="X C-language Bindings protocol headers"
-HOMEPAGE="http://xcb.freedesktop.org/"
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/proto"
-[[ ${PV} != 9999* ]] && \
-	SRC_URI="http://xcb.freedesktop.org/dist/${P}.tar.bz2"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	dev-libs/libxml2"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_configure() {
-	python_export_best
-	xorg-2_src_configure
-}
-
-multilib_src_configure() {
-	autotools-utils_src_configure
-
-	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
-
-	# 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-9999.ebuild b/x11-proto/xcb-proto/xcb-proto-9999.ebuild
index 4ae2110..2fca85d 100644
--- a/x11-proto/xcb-proto/xcb-proto-9999.ebuild
+++ b/x11-proto/xcb-proto/xcb-proto-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_2,3_3} )
+PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
 XORG_MULTILIB=yes
 
 inherit python-r1 xorg-2
@@ -15,7 +15,7 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/proto"
 [[ ${PV} != 9999* ]] && \
 	SRC_URI="http://xcb.freedesktop.org/dist/${P}.tar.bz2"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}"


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] proj/x11:master commit in: x11-proto/xcb-proto/
@ 2016-05-29 19:31 Chí-Thanh Christopher Nguyễn
  0 siblings, 0 replies; 15+ messages in thread
From: Chí-Thanh Christopher Nguyễn @ 2016-05-29 19:31 UTC (permalink / raw
  To: gentoo-commits

commit:     e100ea972747f657f601fba4b1b294568b6a6901
Author:     Chí-Thanh Christopher Nguyễn <chithanh <AT> gentoo <DOT> org>
AuthorDate: Sun May 29 19:32:00 2016 +0000
Commit:     Chí-Thanh Christopher Nguyễn <chithanh <AT> gentoo <DOT> org>
CommitDate: Sun May 29 19:32:00 2016 +0000
URL:        https://gitweb.gentoo.org/proj/x11.git/commit/?id=e100ea97

x11-libs/libxcb: sync python compatibility with portage

 x11-proto/xcb-proto/xcb-proto-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-proto/xcb-proto/xcb-proto-9999.ebuild b/x11-proto/xcb-proto/xcb-proto-9999.ebuild
index e733dd8..c260908 100644
--- a/x11-proto/xcb-proto/xcb-proto-9999.ebuild
+++ b/x11-proto/xcb-proto/xcb-proto-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4,3_5} )
 XORG_MULTILIB=yes
 
 inherit python-r1 xorg-2


^ permalink raw reply related	[flat|nested] 15+ messages in thread

end of thread, other threads:[~2016-05-29 19:31 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-05-29 19:31 [gentoo-commits] proj/x11:master commit in: x11-proto/xcb-proto/ Chí-Thanh Christopher Nguyễn
  -- strict thread matches above, loose matches on Subject: below --
2014-11-03 22:45 Remi Cardona
2014-10-06 11:46 Chi-Thanh Christopher Nguyen
2014-10-04 20:54 David Heidelberger
2014-05-23 22:38 Michał Górny
2014-02-11 13:03 Chi-Thanh Christopher Nguyen
2014-01-26 19:10 Matt Turner
2014-01-19 18:23 Alexey Shvetsov
2013-11-09  9:10 Michał Górny
2013-11-09  8:55 Michał Górny
2013-09-29 20:53 Michał Górny
2013-09-24  7:04 Michał Górny
2013-02-25 23:09 Michał Górny
2012-03-10  1:17 Chi-Thanh Christopher Nguyen
2012-01-12 12:50 Chi-Thanh Christopher Nguyen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox