commit: 7dc3f597f739d09b751f38000069f36a7a0fddf9
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 11 11:37:18 2015 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 11 11:44:14 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7dc3f597
dev-lang/python: Backport EAPI=5 and slot operators in deps
dev-lang/python/python-2.7.10-r3.ebuild | 25 +++++++++++++------------
dev-lang/python/python-3.3.5-r3.ebuild | 27 ++++++++++++++-------------
dev-lang/python/python-3.4.3-r3.ebuild | 27 ++++++++++++++-------------
3 files changed, 41 insertions(+), 38 deletions(-)
diff --git a/dev-lang/python/python-2.7.10-r3.ebuild
b/dev-lang/python/python-2.7.10-r3.ebuild
index 1fa586e..70d8d82 100644
--- a/dev-lang/python/python-2.7.10-r3.ebuild
+++ b/dev-lang/python/python-2.7.10-r3.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI="4"
+EAPI="5"
WANT_LIBTOOL="none"
inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1
toolchain-funcs multiprocessing
@@ -25,11 +25,10 @@ IUSE="-berkdb build doc elibc_uclibc examples gdbm hardened
ipv6 libressl +ncurs
# run the bootstrap code on your dev box and include the results in the
# patchset. See bug 447752.
-RDEPEND="app-arch/bzip2
- >=sys-libs/zlib-1.1.3
+RDEPEND="app-arch/bzip2:0=
+ >=sys-libs/zlib-1.1.3:0=
virtual/libffi
virtual/libintl
- xml? ( >=dev-libs/expat-2.1 )
berkdb? ( || (
sys-libs/db:5.3
sys-libs/db:5.2
@@ -43,21 +42,23 @@ RDEPEND="app-arch/bzip2
sys-libs/db:4.3
sys-libs/db:4.2
) )
- gdbm? ( sys-libs/gdbm[berkdb] )
+ gdbm? ( sys-libs/gdbm:0=[berkdb] )
ncurses? (
- >=sys-libs/ncurses-5.2
- readline? ( >=sys-libs/readline-4.1 )
+ >=sys-libs/ncurses-5.2:0=
+ readline? ( >=sys-libs/readline-4.1:0= )
)
- sqlite? ( >=dev-db/sqlite-3.3.8:3 )
+ sqlite? ( >=dev-db/sqlite-3.3.8:3= )
ssl? (
- !libressl? ( dev-libs/openssl:0 )
- libressl? ( dev-libs/libressl )
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:= )
)
tk? (
- >=dev-lang/tk-8.0
- dev-tcltk/blt
+ >=dev-lang/tcl-8.0:0=
+ >=dev-lang/tk-8.0:0=
+ dev-tcltk/blt:0=
dev-tcltk/tix
)
+ xml? ( >=dev-libs/expat-2.1 )
!!<sys-apps/portage-2.1.9"
DEPEND="${RDEPEND}
virtual/pkgconfig
diff --git a/dev-lang/python/python-3.3.5-r3.ebuild
b/dev-lang/python/python-3.3.5-r3.ebuild
index ef98794..a215e16 100644
--- a/dev-lang/python/python-3.3.5-r3.ebuild
+++ b/dev-lang/python/python-3.3.5-r3.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI="4"
+EAPI="5"
WANT_AUTOMAKE="none"
WANT_LIBTOOL="none"
@@ -27,28 +27,29 @@ IUSE="build doc elibc_uclibc examples gdbm hardened ipv6
libressl +ncurses +read
# run the bootstrap code on your dev box and include the results in the
# patchset. See bug 447752.
-RDEPEND="app-arch/bzip2
- app-arch/xz-utils
- >=sys-libs/zlib-1.1.3
+RDEPEND="app-arch/bzip2:0=
+ app-arch/xz-utils:0=
+ >=sys-libs/zlib-1.1.3:0=
virtual/libffi
virtual/libintl
!build? (
- gdbm? ( sys-libs/gdbm[berkdb] )
+ gdbm? ( sys-libs/gdbm:0=[berkdb] )
ncurses? (
- >=sys-libs/ncurses-5.2
- readline? ( >=sys-libs/readline-4.1 )
+ >=sys-libs/ncurses-5.2:0=
+ readline? ( >=sys-libs/readline-4.1:0= )
)
- sqlite? ( >=dev-db/sqlite-3.3.8:3 )
+ sqlite? ( >=dev-db/sqlite-3.3.8:3= )
ssl? (
- !libressl? ( dev-libs/openssl:0 )
- libressl? ( dev-libs/libressl )
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:= )
)
tk? (
- >=dev-lang/tk-8.0
- dev-tcltk/blt
+ >=dev-lang/tcl-8.0:0=
+ >=dev-lang/tk-8.0:0=
+ dev-tcltk/blt:0=
dev-tcltk/tix
)
- xml? ( >=dev-libs/expat-2.1 )
+ xml? ( >=dev-libs/expat-2.1:0= )
)
!!<sys-apps/sandbox-2.6-r1"
DEPEND="${RDEPEND}
diff --git a/dev-lang/python/python-3.4.3-r3.ebuild
b/dev-lang/python/python-3.4.3-r3.ebuild
index 32ddf14..17ccabc 100644
--- a/dev-lang/python/python-3.4.3-r3.ebuild
+++ b/dev-lang/python/python-3.4.3-r3.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI="4"
+EAPI="5"
WANT_LIBTOOL="none"
inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1
toolchain-funcs multiprocessing
@@ -25,27 +25,28 @@ IUSE="build elibc_uclibc examples gdbm hardened ipv6
libressl +ncurses +readline
# run the bootstrap code on your dev box and include the results in the
# patchset. See bug 447752.
-RDEPEND="app-arch/bzip2
- app-arch/xz-utils
- >=sys-libs/zlib-1.1.3
+RDEPEND="app-arch/bzip2:0=
+ app-arch/xz-utils:0=
+ >=sys-libs/zlib-1.1.3:0=
virtual/libffi
virtual/libintl
- xml? ( >=dev-libs/expat-2.1 )
- gdbm? ( sys-libs/gdbm[berkdb] )
+ gdbm? ( sys-libs/gdbm:0=[berkdb] )
ncurses? (
- >=sys-libs/ncurses-5.2
- readline? ( >=sys-libs/readline-4.1 )
+ >=sys-libs/ncurses-5.2:0=
+ readline? ( >=sys-libs/readline-4.1:0= )
)
- sqlite? ( >=dev-db/sqlite-3.3.8:3 )
+ sqlite? ( >=dev-db/sqlite-3.3.8:3= )
ssl? (
- !libressl? ( dev-libs/openssl:0 )
- libressl? ( dev-libs/libressl )
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:= )
)
tk? (
- >=dev-lang/tk-8.0
- dev-tcltk/blt
+ >=dev-lang/tcl-8.0:0=
+ >=dev-lang/tk-8.0:0=
+ dev-tcltk/blt:0=
dev-tcltk/tix
)
+ xml? ( >=dev-libs/expat-2.1:0= )
!!<sys-apps/sandbox-2.6-r1"
DEPEND="${RDEPEND}
virtual/pkgconfig
