| 1 |
mgorny 13/07/27 11:17:44 |
| 2 |
|
| 3 |
Modified: ChangeLog python-distutils-ng.eclass |
| 4 |
python-utils-r1.eclass python.eclass |
| 5 |
Log: |
| 6 |
Switch eclasses to use virtual/pypy (and therefore support pypy-bin). |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.898 eclass/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.898&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.898&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.897&r2=1.898 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 18 |
retrieving revision 1.897 |
| 19 |
retrieving revision 1.898 |
| 20 |
diff -u -r1.897 -r1.898 |
| 21 |
--- ChangeLog 27 Jul 2013 11:16:48 -0000 1.897 |
| 22 |
+++ ChangeLog 27 Jul 2013 11:17:44 -0000 1.898 |
| 23 |
@@ -1,6 +1,10 @@ |
| 24 |
# ChangeLog for eclass directory |
| 25 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.897 2013/07/27 11:16:48 mgorny Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.898 2013/07/27 11:17:44 mgorny Exp $ |
| 28 |
+ |
| 29 |
+ 27 Jul 2013; Michał Górny <mgorny@g.o> python.eclass, |
| 30 |
+ python-distutils-ng.eclass, python-utils-r1.eclass: |
| 31 |
+ Switch eclasses to use virtual/pypy (and therefore support pypy-bin). |
| 32 |
|
| 33 |
27 Jul 2013; Michał Górny <mgorny@g.o> python-any-r1.eclass: |
| 34 |
Use PYTHON_PKG_DEP for generating deps. |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.30 eclass/python-distutils-ng.eclass |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-distutils-ng.eclass?rev=1.30&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-distutils-ng.eclass?rev=1.30&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-distutils-ng.eclass?r1=1.29&r2=1.30 |
| 43 |
|
| 44 |
Index: python-distutils-ng.eclass |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v |
| 47 |
retrieving revision 1.29 |
| 48 |
retrieving revision 1.30 |
| 49 |
diff -u -r1.29 -r1.30 |
| 50 |
--- python-distutils-ng.eclass 30 Oct 2012 17:22:33 -0000 1.29 |
| 51 |
+++ python-distutils-ng.eclass 27 Jul 2013 11:17:44 -0000 1.30 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
-# Copyright 1999-2012 Gentoo Foundation |
| 54 |
+# Copyright 1999-2013 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v 1.29 2012/10/30 17:22:33 mgorny Exp $ |
| 57 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v 1.30 2013/07/27 11:17:44 mgorny Exp $ |
| 58 |
|
| 59 |
# @ECLASS: python-distutils-ng |
| 60 |
# @MAINTAINER: |
| 61 |
@@ -132,7 +132,7 @@ |
| 62 |
jython?.?) |
| 63 |
dep_str="dev-java/jython:${dep_str: -3}${_PYTHON_USE}" ;; |
| 64 |
pypy?.?) |
| 65 |
- dep_str="dev-python/pypy:${dep_str: -3}${_PYTHON_USE}" ;; |
| 66 |
+ dep_str="virtual/pypy:${dep_str: -3}${_PYTHON_USE}" ;; |
| 67 |
*) |
| 68 |
die "Unsupported implementation: ${impl}" ;; |
| 69 |
esac |
| 70 |
|
| 71 |
|
| 72 |
|
| 73 |
1.30 eclass/python-utils-r1.eclass |
| 74 |
|
| 75 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.30&view=markup |
| 76 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.30&content-type=text/plain |
| 77 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.29&r2=1.30 |
| 78 |
|
| 79 |
Index: python-utils-r1.eclass |
| 80 |
=================================================================== |
| 81 |
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v |
| 82 |
retrieving revision 1.29 |
| 83 |
retrieving revision 1.30 |
| 84 |
diff -u -r1.29 -r1.30 |
| 85 |
--- python-utils-r1.eclass 11 Jul 2013 07:20:13 -0000 1.29 |
| 86 |
+++ python-utils-r1.eclass 27 Jul 2013 11:17:44 -0000 1.30 |
| 87 |
@@ -1,6 +1,6 @@ |
| 88 |
# Copyright 1999-2013 Gentoo Foundation |
| 89 |
# Distributed under the terms of the GNU General Public License v2 |
| 90 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.29 2013/07/11 07:20:13 mgorny Exp $ |
| 91 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.30 2013/07/27 11:17:44 mgorny Exp $ |
| 92 |
|
| 93 |
# @ECLASS: python-utils-r1 |
| 94 |
# @MAINTAINER: |
| 95 |
@@ -343,7 +343,7 @@ |
| 96 |
jython*) |
| 97 |
PYTHON_PKG_DEP='dev-java/jython';; |
| 98 |
pypy*) |
| 99 |
- PYTHON_PKG_DEP='dev-python/pypy';; |
| 100 |
+ PYTHON_PKG_DEP='virtual/pypy';; |
| 101 |
*) |
| 102 |
die "Invalid implementation: ${impl}" |
| 103 |
esac |
| 104 |
|
| 105 |
|
| 106 |
|
| 107 |
1.167 eclass/python.eclass |
| 108 |
|
| 109 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?rev=1.167&view=markup |
| 110 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?rev=1.167&content-type=text/plain |
| 111 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?r1=1.166&r2=1.167 |
| 112 |
|
| 113 |
Index: python.eclass |
| 114 |
=================================================================== |
| 115 |
RCS file: /var/cvsroot/gentoo-x86/eclass/python.eclass,v |
| 116 |
retrieving revision 1.166 |
| 117 |
retrieving revision 1.167 |
| 118 |
diff -u -r1.166 -r1.167 |
| 119 |
--- python.eclass 7 Mar 2013 21:02:06 -0000 1.166 |
| 120 |
+++ python.eclass 27 Jul 2013 11:17:44 -0000 1.167 |
| 121 |
@@ -1,6 +1,6 @@ |
| 122 |
# Copyright 1999-2013 Gentoo Foundation |
| 123 |
# Distributed under the terms of the GNU General Public License v2 |
| 124 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.166 2013/03/07 21:02:06 radhermit Exp $ |
| 125 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.167 2013/07/27 11:17:44 mgorny Exp $ |
| 126 |
|
| 127 |
# @ECLASS: python.eclass |
| 128 |
# @MAINTAINER: |
| 129 |
@@ -109,7 +109,7 @@ |
| 130 |
return 0 |
| 131 |
elif [[ "${CATEGORY}/${PN}" == "dev-java/jython" ]]; then |
| 132 |
return 0 |
| 133 |
- elif [[ "${CATEGORY}/${PN}" == "dev-python/pypy" ]]; then |
| 134 |
+ elif [[ "${CATEGORY}/${PN}" == "virtual/pypy" ]]; then |
| 135 |
return 0 |
| 136 |
else |
| 137 |
return 1 |
| 138 |
@@ -2054,7 +2054,7 @@ |
| 139 |
elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then |
| 140 |
echo "=dev-java/jython-${PYTHON_ABI%-jython}*" |
| 141 |
elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "PyPy" ]]; then |
| 142 |
- echo "=dev-python/pypy-${PYTHON_ABI#*-pypy-}*" |
| 143 |
+ echo "=virtual/pypy-${PYTHON_ABI#*-pypy-}*" |
| 144 |
fi |
| 145 |
else |
| 146 |
if [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "CPython" ]]; then |
| 147 |
@@ -2062,7 +2062,7 @@ |
| 148 |
elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then |
| 149 |
echo "dev-java/jython:${PYTHON_ABI%-jython}" |
| 150 |
elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "PyPy" ]]; then |
| 151 |
- echo "dev-python/pypy:${PYTHON_ABI#*-pypy-}" |
| 152 |
+ echo "virtual/pypy:${PYTHON_ABI#*-pypy-}" |
| 153 |
fi |
| 154 |
fi |
| 155 |
} |
Archives