| 1 |
mgorny 14/07/26 09:48:43 |
| 2 |
|
| 3 |
Modified: portage-9999.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Remove code for python2_6 & pypy2_0 which both are removed nowadays. |
| 6 |
|
| 7 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.96 sys-apps/portage/portage-9999.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.96&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.96&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?r1=1.95&r2=1.96 |
| 15 |
|
| 16 |
Index: portage-9999.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v |
| 19 |
retrieving revision 1.95 |
| 20 |
retrieving revision 1.96 |
| 21 |
diff -u -r1.95 -r1.96 |
| 22 |
--- portage-9999.ebuild 6 Apr 2014 17:00:03 -0000 1.95 |
| 23 |
+++ portage-9999.ebuild 26 Jul 2014 09:48:43 -0000 1.96 |
| 24 |
@@ -1,12 +1,12 @@ |
| 25 |
# Copyright 1999-2014 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.95 2014/04/06 17:00:03 mgorny Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.96 2014/07/26 09:48:43 mgorny Exp $ |
| 29 |
|
| 30 |
EAPI=3 |
| 31 |
PYTHON_COMPAT=( |
| 32 |
- pypy pypy2_0 |
| 33 |
+ pypy |
| 34 |
python3_2 python3_3 python3_4 |
| 35 |
- python2_6 python2_7 |
| 36 |
+ python2_7 |
| 37 |
) |
| 38 |
inherit git-r3 eutils multilib |
| 39 |
|
| 40 |
@@ -22,22 +22,18 @@ |
| 41 |
done |
| 42 |
unset _pyimpl |
| 43 |
|
| 44 |
-# Import of the io module in python-2.6 raises ImportError for the |
| 45 |
-# thread module if threading is disabled. |
| 46 |
python_dep_ssl="python3? ( =dev-lang/python-3*[ssl] ) |
| 47 |
!pypy? ( !python2? ( !python3? ( |
| 48 |
- || ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] ) |
| 49 |
+ >=dev-lang/python-2.7[ssl] |
| 50 |
) ) ) |
| 51 |
pypy? ( !python2? ( !python3? ( virtual/pypy:0[bzip2] ) ) ) |
| 52 |
- python2? ( !python3? ( || ( dev-lang/python:2.7[ssl] dev-lang/python:2.6[ssl,threads] ) ) )" |
| 53 |
+ python2? ( !python3? ( dev-lang/python:2.7[ssl] ) )" |
| 54 |
python_dep="${python_dep_ssl//\[ssl\]}" |
| 55 |
python_dep="${python_dep//,ssl}" |
| 56 |
python_dep="${python_dep//ssl,}" |
| 57 |
|
| 58 |
python_dep="${python_dep} |
| 59 |
python_targets_pypy? ( virtual/pypy:0 ) |
| 60 |
- python_targets_pypy2_0? ( virtual/pypy:2.0 ) |
| 61 |
- python_targets_python2_6? ( dev-lang/python:2.6 ) |
| 62 |
python_targets_python2_7? ( dev-lang/python:2.7 ) |
| 63 |
python_targets_python3_2? ( dev-lang/python:3.2 ) |
| 64 |
python_targets_python3_3? ( dev-lang/python:3.3 ) |
| 65 |
@@ -69,7 +65,7 @@ |
| 66 |
>=app-misc/pax-utils-0.1.17 |
| 67 |
selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) ) |
| 68 |
xattr? ( kernel_linux? ( |
| 69 |
- $(for python_impl in python{2_6,2_7,3_2} pypy pypy2_0; do |
| 70 |
+ $(for python_impl in python{2_7,3_2} pypy; do |
| 71 |
echo "python_targets_${python_impl}? ( dev-python/pyxattr[python_targets_${python_impl}] )" |
| 72 |
done) ) ) |
| 73 |
!<app-shells/bash-3.2_p17 |
| 74 |
@@ -123,10 +119,6 @@ |
| 75 |
pypy) |
| 76 |
python=${impl} |
| 77 |
;; |
| 78 |
- pypy*) |
| 79 |
- python=${impl/_/.} |
| 80 |
- python=${python/pypy/pypy-c} |
| 81 |
- ;; |
| 82 |
*) |
| 83 |
die "Unrecognized python target: ${impl}" |
| 84 |
esac |
| 85 |
|
| 86 |
|
| 87 |
|
| 88 |
1.1398 sys-apps/portage/ChangeLog |
| 89 |
|
| 90 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1398&view=markup |
| 91 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1398&content-type=text/plain |
| 92 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.1397&r2=1.1398 |
| 93 |
|
| 94 |
Index: ChangeLog |
| 95 |
=================================================================== |
| 96 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v |
| 97 |
retrieving revision 1.1397 |
| 98 |
retrieving revision 1.1398 |
| 99 |
diff -u -r1.1397 -r1.1398 |
| 100 |
--- ChangeLog 6 Apr 2014 17:00:03 -0000 1.1397 |
| 101 |
+++ ChangeLog 26 Jul 2014 09:48:43 -0000 1.1398 |
| 102 |
@@ -1,6 +1,9 @@ |
| 103 |
# ChangeLog for sys-apps/portage |
| 104 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 105 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1397 2014/04/06 17:00:03 mgorny Exp $ |
| 106 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1398 2014/07/26 09:48:43 mgorny Exp $ |
| 107 |
+ |
| 108 |
+ 26 Jul 2014; Michał Górny <mgorny@g.o> portage-9999.ebuild: |
| 109 |
+ Remove code for python2_6 & pypy2_0 which both are removed nowadays. |
| 110 |
|
| 111 |
06 Apr 2014; Michał Górny <mgorny@g.o> metadata.xml, |
| 112 |
portage-2.2.10.ebuild, portage-9999.ebuild: |
Archives