[gentoo-python] [PATCH python-utils-r1 3/4] Add support for PyPy 2.1 paths.

["Michał Górny" <mgorny@gentoo.org>]

---
 gx86/eclass/python-utils-r1.eclass | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/gx86/eclass/python-utils-r1.eclass b/gx86/eclass/python-utils-r1.eclass
index e798c8d..c34bcbd 100644
--- a/gx86/eclass/python-utils-r1.eclass
+++ b/gx86/eclass/python-utils-r1.eclass
@@ -215,19 +215,19 @@ python_export() {
 	local impl var
 
 	case "${1}" in
-		python*|jython*)
-			impl=${1/_/.}
-			shift
-			;;
 		pypy-c*)
 			impl=${1}
 			shift
 			;;
-		pypy*)
+		pypy1*|pypy2_0)
 			local v=${1#pypy}
 			impl=pypy-c${v/_/.}
 			shift
 			;;
+		python*|jython*|pypy-*)
+			impl=${1/_/.}
+			shift
+			;;
 		*)
 			impl=${EPYTHON}
 			[[ ${impl} ]] || die "python_export: no impl nor EPYTHON"
@@ -248,15 +248,15 @@ python_export() {
 			PYTHON_SITEDIR)
 				local dir
 				case "${impl}" in
-					python*)
-						dir=/usr/$(get_libdir)/${impl}
-						;;
 					jython*)
 						dir=/usr/share/${impl}/Lib
 						;;
-					pypy*)
+					pypy-c*)
 						dir=/usr/$(get_libdir)/${impl/-c/}
 						;;
+					python*|pypy*)
+						dir=/usr/$(get_libdir)/${impl}
+						;;
 				esac
 
 				export PYTHON_SITEDIR=${EPREFIX}${dir}/site-packages
@@ -271,9 +271,12 @@ python_export() {
 					jython*)
 						dir=/usr/share/${impl}/Include
 						;;
-					pypy*)
+					pypy-c*)
 						dir=/usr/$(get_libdir)/${impl/-c/}/include
 						;;
+					pypy*)
+						dir=/usr/$(get_libdir)/${impl}/include
+						;;
 				esac
 
 				export PYTHON_INCLUDEDIR=${EPREFIX}${dir}
@@ -500,7 +503,7 @@ _python_rewrite_shebang() {
 
 	local impl
 	case "${1}" in
-		python*|jython*|pypy-c*)
+		python*|jython*|pypy*)
 			impl=${1}
 			shift
 			;;
-- 
1.8.3.2