| 1 |
mgorny 14/07/06 11:45:20 |
| 2 |
|
| 3 |
Modified: ChangeLog python-utils-r1.eclass |
| 4 |
Log: |
| 5 |
Disable python2.6 support and clean up the related code. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.1311 eclass/ChangeLog |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1311&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1311&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1310&r2=1.1311 |
| 13 |
|
| 14 |
Index: ChangeLog |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 17 |
retrieving revision 1.1310 |
| 18 |
retrieving revision 1.1311 |
| 19 |
diff -u -r1.1310 -r1.1311 |
| 20 |
--- ChangeLog 4 Jul 2014 13:02:21 -0000 1.1310 |
| 21 |
+++ ChangeLog 6 Jul 2014 11:45:20 -0000 1.1311 |
| 22 |
@@ -1,6 +1,9 @@ |
| 23 |
# ChangeLog for eclass directory |
| 24 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1310 2014/07/04 13:02:21 mgorny Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1311 2014/07/06 11:45:20 mgorny Exp $ |
| 27 |
+ |
| 28 |
+ 06 Jul 2014; Michał Górny <mgorny@g.o> python-utils-r1.eclass: |
| 29 |
+ Disable python2.6 support and clean up the related code. |
| 30 |
|
| 31 |
04 Jul 2014; Michał Górny <mgorny@g.o> multilib-build.eclass: |
| 32 |
Declare REQUIRED_USE inside MULTILIB_COMPAT conditional, reported by steev. |
| 33 |
|
| 34 |
|
| 35 |
|
| 36 |
1.60 eclass/python-utils-r1.eclass |
| 37 |
|
| 38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.60&view=markup |
| 39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.60&content-type=text/plain |
| 40 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.59&r2=1.60 |
| 41 |
|
| 42 |
Index: python-utils-r1.eclass |
| 43 |
=================================================================== |
| 44 |
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v |
| 45 |
retrieving revision 1.59 |
| 46 |
retrieving revision 1.60 |
| 47 |
diff -u -r1.59 -r1.60 |
| 48 |
--- python-utils-r1.eclass 29 Jun 2014 14:24:22 -0000 1.59 |
| 49 |
+++ python-utils-r1.eclass 6 Jul 2014 11:45:20 -0000 1.60 |
| 50 |
@@ -1,6 +1,6 @@ |
| 51 |
# Copyright 1999-2014 Gentoo Foundation |
| 52 |
# Distributed under the terms of the GNU General Public License v2 |
| 53 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.59 2014/06/29 14:24:22 floppym Exp $ |
| 54 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.60 2014/07/06 11:45:20 mgorny Exp $ |
| 55 |
|
| 56 |
# @ECLASS: python-utils-r1 |
| 57 |
# @MAINTAINER: |
| 58 |
@@ -43,7 +43,7 @@ |
| 59 |
jython2_5 jython2_7 |
| 60 |
pypy |
| 61 |
python3_2 python3_3 python3_4 |
| 62 |
- python2_6 python2_7 |
| 63 |
+ python2_7 |
| 64 |
) |
| 65 |
|
| 66 |
# @FUNCTION: _python_impl_supported |
| 67 |
@@ -66,10 +66,10 @@ |
| 68 |
# keep in sync with _PYTHON_ALL_IMPLS! |
| 69 |
# (not using that list because inline patterns shall be faster) |
| 70 |
case "${impl}" in |
| 71 |
- python2_[67]|python3_[234]|jython2_[57]) |
| 72 |
+ python2_7|python3_[234]|jython2_[57]) |
| 73 |
return 0 |
| 74 |
;; |
| 75 |
- pypy1_[89]|pypy2_0|python2_5|python3_1) |
| 76 |
+ pypy1_[89]|pypy2_0|python2_[56]|python3_1) |
| 77 |
return 1 |
| 78 |
;; |
| 79 |
pypy) |
| 80 |
@@ -98,7 +98,7 @@ |
| 81 |
# |
| 82 |
# Example value: |
| 83 |
# @CODE |
| 84 |
-# /usr/bin/python2.6 |
| 85 |
+# /usr/bin/python2.7 |
| 86 |
# @CODE |
| 87 |
|
| 88 |
# @ECLASS-VARIABLE: EPYTHON |
| 89 |
@@ -117,7 +117,7 @@ |
| 90 |
# |
| 91 |
# Example value: |
| 92 |
# @CODE |
| 93 |
-# python2.6 |
| 94 |
+# python2.7 |
| 95 |
# @CODE |
| 96 |
|
| 97 |
# @ECLASS-VARIABLE: PYTHON_SITEDIR |
| 98 |
@@ -129,7 +129,7 @@ |
| 99 |
# |
| 100 |
# Example value: |
| 101 |
# @CODE |
| 102 |
-# /usr/lib64/python2.6/site-packages |
| 103 |
+# /usr/lib64/python2.7/site-packages |
| 104 |
# @CODE |
| 105 |
|
| 106 |
# @ECLASS-VARIABLE: PYTHON_INCLUDEDIR |
| 107 |
@@ -141,7 +141,7 @@ |
| 108 |
# |
| 109 |
# Example value: |
| 110 |
# @CODE |
| 111 |
-# /usr/include/python2.6 |
| 112 |
+# /usr/include/python2.7 |
| 113 |
# @CODE |
| 114 |
|
| 115 |
# @ECLASS-VARIABLE: PYTHON_LIBPATH |
| 116 |
@@ -154,7 +154,7 @@ |
| 117 |
# |
| 118 |
# Example value: |
| 119 |
# @CODE |
| 120 |
-# /usr/lib64/libpython2.6.so |
| 121 |
+# /usr/lib64/libpython2.7.so |
| 122 |
# @CODE |
| 123 |
|
| 124 |
# @ECLASS-VARIABLE: PYTHON_CFLAGS |
| 125 |
@@ -307,10 +307,6 @@ |
| 126 |
local val |
| 127 |
|
| 128 |
case "${impl}" in |
| 129 |
- python2.5|python2.6) |
| 130 |
- # old versions support python-config only |
| 131 |
- val=$("${impl}-config" --includes) |
| 132 |
- ;; |
| 133 |
python*) |
| 134 |
# python-2.7, python-3.2, etc. |
| 135 |
val=$($(tc-getPKG_CONFIG) --cflags ${impl/n/n-}) |
| 136 |
@@ -327,10 +323,6 @@ |
| 137 |
local val |
| 138 |
|
| 139 |
case "${impl}" in |
| 140 |
- python2.5|python2.6) |
| 141 |
- # old versions support python-config only |
| 142 |
- val=$("${impl}-config" --libs) |
| 143 |
- ;; |
| 144 |
python*) |
| 145 |
# python-2.7, python-3.2, etc. |
| 146 |
val=$($(tc-getPKG_CONFIG) --libs ${impl/n/n-}) |
| 147 |
@@ -346,8 +338,6 @@ |
| 148 |
PYTHON_PKG_DEP) |
| 149 |
local d |
| 150 |
case ${impl} in |
| 151 |
- python2.6) |
| 152 |
- PYTHON_PKG_DEP='>=dev-lang/python-2.6.8-r3:2.6';; |
| 153 |
python2.7) |
| 154 |
PYTHON_PKG_DEP='>=dev-lang/python-2.7.5-r2:2.7';; |
| 155 |
python3.2) |
| 156 |
@@ -542,6 +532,7 @@ |
| 157 |
[[ ${PYTHON} ]] || python_export PYTHON |
| 158 |
|
| 159 |
# Note: python2.6 can't handle passing files to compileall... |
| 160 |
+ # TODO: we do not support 2.6 any longer |
| 161 |
|
| 162 |
# default to sys.path |
| 163 |
if [[ ${#} -eq 0 ]]; then |
| 164 |
@@ -877,20 +868,11 @@ |
| 165 |
ln -s "${PYTHON}-config" "${workdir}"/bin/python-config || die |
| 166 |
|
| 167 |
# Python 2.6+. |
| 168 |
- if [[ ${EPYTHON} != python2.5 ]]; then |
| 169 |
- ln -s "${PYTHON/python/2to3-}" "${workdir}"/bin/2to3 || die |
| 170 |
- else |
| 171 |
- nonsupp+=( 2to3 ) |
| 172 |
- fi |
| 173 |
+ ln -s "${PYTHON/python/2to3-}" "${workdir}"/bin/2to3 || die |
| 174 |
|
| 175 |
# Python 2.7+. |
| 176 |
- if [[ ${EPYTHON} != python2.[56] ]]; then |
| 177 |
- ln -s "${EPREFIX}"/usr/$(get_libdir)/pkgconfig/${EPYTHON/n/n-}.pc \ |
| 178 |
- "${workdir}"/pkgconfig/python.pc || die |
| 179 |
- else |
| 180 |
- # XXX? |
| 181 |
- ln -s /dev/null "${workdir}"/pkgconfig/python.pc || die |
| 182 |
- fi |
| 183 |
+ ln -s "${EPREFIX}"/usr/$(get_libdir)/pkgconfig/${EPYTHON/n/n-}.pc \ |
| 184 |
+ "${workdir}"/pkgconfig/python.pc || die |
| 185 |
ln -s python.pc "${workdir}"/pkgconfig/python${pyver}.pc || die |
| 186 |
else |
| 187 |
nonsupp+=( 2to3 python-config ) |
Archives