Gentoo Archives: gentoo-commits

From: Davide Pesavento <pesa@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/qt:master commit in: dev-python/sip/
Date: Wed, 29 Jul 2015 16:42:06
Message-Id: 1438188074.bbd8daa03f6bfac76445bf72d1683be83435823f.pesa@gentoo
1 commit: bbd8daa03f6bfac76445bf72d1683be83435823f
2 Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jul 29 16:41:14 2015 +0000
4 Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
5 CommitDate: Wed Jul 29 16:41:14 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=bbd8daa0
7
8 [dev-python/sip] Don't call python2 directly, use python_setup().
9
10 Package-Manager: portage-2.2.20
11
12 dev-python/sip/sip-4.9999.ebuild | 10 ++++++----
13 1 file changed, 6 insertions(+), 4 deletions(-)
14
15 diff --git a/dev-python/sip/sip-4.9999.ebuild b/dev-python/sip/sip-4.9999.ebuild
16 index de669d9..58888b6 100644
17 --- a/dev-python/sip/sip-4.9999.ebuild
18 +++ b/dev-python/sip/sip-4.9999.ebuild
19 @@ -33,23 +33,25 @@ IUSE="debug doc"
20
21 DEPEND="${PYTHON_DEPS}"
22 RDEPEND="${DEPEND}"
23 -
24 [[ ${PV} == *9999* ]] && DEPEND+="
25 - =dev-lang/python-2*
26 sys-devel/bison
27 sys-devel/flex
28 doc? ( dev-python/sphinx[$(python_gen_usedep 'python2*')] )
29 "
30
31 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
32 +[[ ${PV} == *9999* ]] && REQUIRED_USE+="
33 + || ( $(python_gen_useflags 'python2*') )
34 +"
35
36 src_prepare() {
37 epatch "${FILESDIR}"/${PN}-4.15.5-darwin.patch
38
39 if [[ ${PV} == *9999* ]]; then
40 - python2 build.py prepare || die
41 + python_setup 'python2*'
42 + "${PYTHON}" build.py prepare || die
43 if use doc; then
44 - python2 build.py doc || die
45 + "${PYTHON}" build.py doc || die
46 fi
47 fi