Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/x11:master commit in: x11-libs/libxcb/
Date: Sun, 29 Sep 2013 20:50:37
Message-Id: 1380487864.e6c78ac711b9871600724e1940226b50ac53e70d.mgorny@gentoo
1 commit: e6c78ac711b9871600724e1940226b50ac53e70d
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sun Sep 29 20:51:04 2013 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Sep 29 20:51:04 2013 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=e6c78ac7
7
8 x11-libs/libxcb: Convert to python-any-r1, using the new python_gen_any_dep.
9
10 Package-Manager: portage-2.2.7
11
12 ---
13 x11-libs/libxcb/libxcb-9999.ebuild | 14 +++++++++-----
14 1 file changed, 9 insertions(+), 5 deletions(-)
15
16 diff --git a/x11-libs/libxcb/libxcb-9999.ebuild b/x11-libs/libxcb/libxcb-9999.ebuild
17 index f4511c9..ac9a6e9 100644
18 --- a/x11-libs/libxcb/libxcb-9999.ebuild
19 +++ b/x11-libs/libxcb/libxcb-9999.ebuild
20 @@ -9,7 +9,7 @@ PYTHON_REQ_USE=xml
21
22 XORG_DOC=doc
23 XORG_MULTILIB=yes
24 -inherit python-single-r1 xorg-2
25 +inherit python-any-r1 xorg-2
26
27 DESCRIPTION="X C-language Bindings library"
28 HOMEPAGE="http://xcb.freedesktop.org/"
29 @@ -23,14 +23,18 @@ IUSE="selinux xkb"
30 RDEPEND="dev-libs/libpthread-stubs[${MULTILIB_USEDEP}]
31 x11-libs/libXau[${MULTILIB_USEDEP}]
32 x11-libs/libXdmcp[${MULTILIB_USEDEP}]"
33 +# Note: ${PYTHON_USEDEP} needs to go verbatim
34 DEPEND="${RDEPEND}
35 - dev-lang/python[xml]
36 dev-libs/libxslt
37 - >=x11-proto/xcb-proto-1.7-r1[${MULTILIB_USEDEP},${PYTHON_USEDEP}]
38 - ${PYTHON_DEPS}"
39 + $(python_gen_any_dep \
40 + ">=x11-proto/xcb-proto-1.7-r1[${MULTILIB_USEDEP},\${PYTHON_USEDEP}]")"
41 +
42 +python_check_deps() {
43 + has_version ">=x11-proto/xcb-proto-1.7-r1[${MULTILIB_USEDEP},${PYTHON_USEDEP}]"
44 +}
45
46 pkg_setup() {
47 - python-single-r1_pkg_setup
48 + python-any-r1_pkg_setup
49 }
50
51 src_configure() {