| 1 |
commit: 8139c4bd4ce61c3ff87483e913d444264572095e |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jun 3 14:49:46 2016 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jun 3 16:30:45 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8139c4bd |
| 7 |
|
| 8 |
sys-apps/portage: Clean up old Python impls from the compat ebuild |
| 9 |
|
| 10 |
sys-apps/portage/portage-2.2.8-r2.ebuild | 42 ++++++-------------------------- |
| 11 |
1 file changed, 7 insertions(+), 35 deletions(-) |
| 12 |
|
| 13 |
diff --git a/sys-apps/portage/portage-2.2.8-r2.ebuild b/sys-apps/portage/portage-2.2.8-r2.ebuild |
| 14 |
index 7559568..7d29fe9 100644 |
| 15 |
--- a/sys-apps/portage/portage-2.2.8-r2.ebuild |
| 16 |
+++ b/sys-apps/portage/portage-2.2.8-r2.ebuild |
| 17 |
@@ -6,9 +6,8 @@ |
| 18 |
# syntax support) which also requires EAPI 2. |
| 19 |
EAPI=2 |
| 20 |
PYTHON_COMPAT=( |
| 21 |
- pypy2_0 |
| 22 |
- python3_2 python3_3 python3_4 |
| 23 |
- python2_6 python2_7 |
| 24 |
+ python3_3 python3_4 |
| 25 |
+ python2_7 |
| 26 |
) |
| 27 |
inherit eutils multilib |
| 28 |
|
| 29 |
@@ -17,7 +16,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" |
| 30 |
LICENSE="GPL-2" |
| 31 |
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" |
| 32 |
SLOT="0" |
| 33 |
-IUSE="build doc epydoc +ipc linguas_ru pypy2_0 python2 python3 selinux xattr" |
| 34 |
+IUSE="build doc epydoc +ipc linguas_ru python2 python3 selinux xattr" |
| 35 |
|
| 36 |
for _pyimpl in ${PYTHON_COMPAT[@]} ; do |
| 37 |
IUSE+=" python_targets_${_pyimpl}" |
| 38 |
@@ -27,20 +26,13 @@ unset _pyimpl |
| 39 |
# Import of the io module in python-2.6 raises ImportError for the |
| 40 |
# thread module if threading is disabled. |
| 41 |
python_dep_ssl="python3? ( =dev-lang/python-3*[ssl] ) |
| 42 |
- !pypy2_0? ( !python2? ( !python3? ( |
| 43 |
- || ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] ) |
| 44 |
- ) ) ) |
| 45 |
- pypy2_0? ( !python2? ( !python3? ( virtual/pypy:2.0[bzip2] ) ) ) |
| 46 |
- python2? ( !python3? ( || ( dev-lang/python:2.7[ssl] dev-lang/python:2.6[ssl,threads] ) ) )" |
| 47 |
+ !python3? ( >=dev-lang/python-2.7[ssl] )" |
| 48 |
python_dep="${python_dep_ssl//\[ssl\]}" |
| 49 |
python_dep="${python_dep//,ssl}" |
| 50 |
python_dep="${python_dep//ssl,}" |
| 51 |
|
| 52 |
python_dep="${python_dep} |
| 53 |
- python_targets_pypy2_0? ( virtual/pypy:2.0 ) |
| 54 |
- python_targets_python2_6? ( dev-lang/python:2.6 ) |
| 55 |
python_targets_python2_7? ( dev-lang/python:2.7 ) |
| 56 |
- python_targets_python3_2? ( dev-lang/python:3.2 ) |
| 57 |
python_targets_python3_3? ( dev-lang/python:3.3 ) |
| 58 |
python_targets_python3_4? ( dev-lang/python:3.4 ) |
| 59 |
" |
| 60 |
@@ -71,9 +63,8 @@ RDEPEND="${python_dep} |
| 61 |
>=app-misc/pax-utils-0.1.17 |
| 62 |
selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) ) |
| 63 |
xattr? ( kernel_linux? ( |
| 64 |
- $(for python_impl in python{2_6,2_7,3_2} pypy2_0; do |
| 65 |
- echo "python_targets_${python_impl}? ( dev-python/pyxattr[python_targets_${python_impl}] )" |
| 66 |
- done) ) ) |
| 67 |
+ python_targets_python2_7? ( dev-python/pyxattr[python_targets_python2_7] ) |
| 68 |
+ ) ) |
| 69 |
!<app-admin/logrotate-3.8.0" |
| 70 |
PDEPEND=" |
| 71 |
!build? ( |
| 72 |
@@ -133,10 +124,6 @@ get_python_interpreter() { |
| 73 |
python*) |
| 74 |
python=${impl/_/.} |
| 75 |
;; |
| 76 |
- pypy*) |
| 77 |
- python=${impl/_/.} |
| 78 |
- python=${python/pypy/pypy-c} |
| 79 |
- ;; |
| 80 |
*) |
| 81 |
die "Unrecognized python target: ${impl}" |
| 82 |
esac |
| 83 |
@@ -164,9 +151,6 @@ python_compileall() { |
| 84 |
# and __doc__ is None when -OO is used. |
| 85 |
"${PYTHON}" -O -m compileall -q -f -d "${d}" "${d_image}" || die |
| 86 |
;; |
| 87 |
- pypy*) |
| 88 |
- "${PYTHON}" -m compileall -q -f -d "${d}" "${d_image}" || die |
| 89 |
- ;; |
| 90 |
*) |
| 91 |
die "Unrecognized EPYTHON value: ${EPYTHON}" |
| 92 |
esac |
| 93 |
@@ -177,15 +161,7 @@ pkg_setup() { |
| 94 |
ewarn "Both python2 and python3 USE flags are enabled, but only one" |
| 95 |
ewarn "can be in the shebangs. Using python3." |
| 96 |
fi |
| 97 |
- if use pypy2_0 && use python3 ; then |
| 98 |
- ewarn "Both pypy2_0 and python3 USE flags are enabled, but only one" |
| 99 |
- ewarn "can be in the shebangs. Using python3." |
| 100 |
- fi |
| 101 |
- if use pypy2_0 && use python2 ; then |
| 102 |
- ewarn "Both pypy2_0 and python2 USE flags are enabled, but only one" |
| 103 |
- ewarn "can be in the shebangs. Using python2" |
| 104 |
- fi |
| 105 |
- if ! use pypy2_0 && ! use python2 && ! use python3 && \ |
| 106 |
+ if ! use python2 && ! use python3 && \ |
| 107 |
! compatible_python_is_selected ; then |
| 108 |
ewarn "Attempting to select a compatible default python interpreter" |
| 109 |
local x success=0 |
| 110 |
@@ -214,8 +190,6 @@ pkg_setup() { |
| 111 |
EPYTHON=python3 |
| 112 |
elif use python2; then |
| 113 |
EPYTHON=python2 |
| 114 |
- elif use pypy2_0; then |
| 115 |
- EPYTHON=pypy-c2.0 |
| 116 |
fi |
| 117 |
} |
| 118 |
|
| 119 |
@@ -253,8 +227,6 @@ src_prepare() { |
| 120 |
set_shebang=python3 |
| 121 |
elif use python2; then |
| 122 |
set_shebang=python2 |
| 123 |
- elif use pypy2_0; then |
| 124 |
- set_shebang=pypy-c2.0 |
| 125 |
fi |
| 126 |
if [[ -n ${set_shebang} ]] ; then |
| 127 |
einfo "Converting shebangs for ${set_shebang}..." |
Archives