mgorny 14/04/08 16:05:30
Modified: ChangeLog python-any-r1.eclass python-r1.eclass
python-utils-r1.eclass
Log:
Disable pypy2_0 and clean up after it.
Revision Changes Path
1.1198 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1198&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1198&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1197&r2=1.1198
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1197
retrieving revision 1.1198
diff -u -r1.1197 -r1.1198
--- ChangeLog 5 Apr 2014 20:56:03 -0000 1.1197
+++ ChangeLog 8 Apr 2014 16:05:30 -0000 1.1198
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1197 2014/04/05
20:56:03 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1198 2014/04/08
16:05:30 mgorny Exp $
+
+ 08 Apr 2014; Michał Górny <mgo...@gentoo.org> python-any-r1.eclass,
+ python-r1.eclass, python-utils-r1.eclass, tests/python-utils-r1.sh:
+ Disable pypy2_0 and clean up after it.
05 Apr 2014; Michał Górny <mgo...@gentoo.org> python-r1.eclass:
Fix improper suggestions to put unsupported implmentations in USE_PYTHON, bug
1.17 eclass/python-any-r1.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-any-r1.eclass?rev=1.17&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-any-r1.eclass?rev=1.17&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-any-r1.eclass?r1=1.16&r2=1.17
Index: python-any-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-any-r1.eclass,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- python-any-r1.eclass 22 Oct 2013 15:16:56 -0000 1.16
+++ python-any-r1.eclass 8 Apr 2014 16:05:30 -0000 1.17
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python-any-r1.eclass,v 1.16
2013/10/22 15:16:56 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-any-r1.eclass,v 1.17
2014/04/08 16:05:30 mgorny Exp $
# @ECLASS: python-any-r1
# @MAINTAINER:
@@ -230,10 +230,7 @@
local i=${EPYTHON/./_}
case "${i}" in
- python*|jython*)
- ;;
- pypy-c*)
- i=${i/-c/}
+ python*|jython*|pypy*)
;;
*)
ewarn "Invalid EPYTHON: ${EPYTHON}"
1.68 eclass/python-r1.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.68&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.68&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?r1=1.67&r2=1.68
Index: python-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- python-r1.eclass 5 Apr 2014 20:56:03 -0000 1.67
+++ python-r1.eclass 8 Apr 2014 16:05:30 -0000 1.68
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.67 2014/04/05
20:56:03 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.68 2014/04/08
16:05:30 mgorny Exp $
# @ECLASS: python-r1
# @MAINTAINER:
@@ -85,7 +85,7 @@
#
# Example:
# @CODE
-# PYTHON_COMPAT_OVERRIDE='pypy2_0 python3_3' emerge -1v dev-python/foo
+# PYTHON_COMPAT_OVERRIDE='pypy python3_3' emerge -1v dev-python/foo
# @CODE
# @ECLASS-VARIABLE: PYTHON_REQ_USE
@@ -561,9 +561,6 @@
jython*)
abi=${impl#jython}-jython
;;
- pypy*)
- abi=2.7-pypy-${impl#pypy}
- ;;
*)
die "Unexpected Python implementation:
${impl}"
;;
1.53 eclass/python-utils-r1.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.53&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.53&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.52&r2=1.53
Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- python-utils-r1.eclass 13 Mar 2014 08:10:46 -0000 1.52
+++ python-utils-r1.eclass 8 Apr 2014 16:05:30 -0000 1.53
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.52
2014/03/13 08:10:46 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.53
2014/04/08 16:05:30 mgorny Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -41,7 +41,7 @@
# All supported Python implementations, most preferred last.
_PYTHON_ALL_IMPLS=(
jython2_5 jython2_7
- pypy2_0 pypy
+ pypy
python3_2 python3_3 python3_4
python2_6 python2_7
)
@@ -66,10 +66,10 @@
# keep in sync with _PYTHON_ALL_IMPLS!
# (not using that list because inline patterns shall be faster)
case "${impl}" in
- python2_[67]|python3_[234]|pypy2_0|jython2_[57])
+ python2_[67]|python3_[234]|jython2_[57])
return 0
;;
- pypy1_[89]|python2_5|python3_1)
+ pypy1_[89]|pypy2_0|python2_5|python3_1)
return 1
;;
pypy)
@@ -239,15 +239,6 @@
impl=${1}
shift
;;
- pypy-c*)
- impl=${1}
- shift
- ;;
- pypy*)
- local v=${1#pypy}
- impl=pypy-c${v/_/.}
- shift
- ;;
*)
impl=${EPYTHON}
[[ ${impl} ]] || die "python_export: no impl nor
EPYTHON"
@@ -268,15 +259,12 @@
PYTHON_SITEDIR)
local dir
case "${impl}" in
- python*)
+ python*|pypy)
dir=/usr/$(get_libdir)/${impl}
;;
jython*)
dir=/usr/share/${impl/n/n-}/Lib
;;
- pypy*)
-
dir=/usr/$(get_libdir)/${impl/-c/}
- ;;
esac
export
PYTHON_SITEDIR=${EPREFIX}${dir}/site-packages
@@ -288,8 +276,8 @@
python*)
dir=/usr/include/${impl}
;;
- pypy*)
-
dir=/usr/$(get_libdir)/${impl/-c/}/include
+ pypy)
+
dir=/usr/$(get_libdir)/${impl}/include
;;
*)
die "${impl} lacks header files"
@@ -368,8 +356,6 @@
PYTHON_PKG_DEP='>=dev-lang/python-3.3.2-r2:3.3';;
python*)
PYTHON_PKG_DEP="dev-lang/python:${impl#python}";;
- pypy-c2.0)
-
PYTHON_PKG_DEP='>=virtual/pypy-2.0.2:2.0';;
pypy)
PYTHON_PKG_DEP='virtual/pypy:0=';;
jython2.5)
@@ -517,7 +503,7 @@
local impl
case "${1}" in
- python*|jython*|pypy-c*)
+ python*|jython*|pypy*)
impl=${1}
shift
;;
