summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2012-11-30 11:40:15 +0000
committerMichał Górny <mgorny@gentoo.org>2012-11-30 11:40:15 +0000
commit09ec412a7d9eb19b4570fdbf2d1f2c7fef7eee7a (patch)
treefb9ca11c24087f6a27a1705ff214f1347af4e78d /eclass/python-r1.eclass
parentStable for x86, wrt bug #445246 (diff)
downloadhistorical-09ec412a7d9eb19b4570fdbf2d1f2c7fef7eee7a.tar.gz
historical-09ec412a7d9eb19b4570fdbf2d1f2c7fef7eee7a.tar.bz2
historical-09ec412a7d9eb19b4570fdbf2d1f2c7fef7eee7a.zip
Make python-single-r1 stand-alone, and blocking python-r1.
Diffstat (limited to 'eclass/python-r1.eclass')
-rw-r--r--eclass/python-r1.eclass17
1 files changed, 5 insertions, 12 deletions
diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index c98969081fbc..3e1a4d2240ed 100644
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.23 2012/11/26 08:31:26 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.24 2012/11/30 11:40:15 mgorny Exp $
# @ECLASS: python-r1
# @MAINTAINER:
@@ -42,18 +42,11 @@ esac
if [[ ! ${_PYTHON_R1} ]]; then
-inherit python-utils-r1
+if [[ ${_PYTHON_SINGLE_R1} ]]; then
+ die 'python-r1.eclass can not be used with python-single-r1.eclass.'
+fi
-# @ECLASS-VARIABLE: _PYTHON_ALL_IMPLS
-# @INTERNAL
-# @DESCRIPTION:
-# All supported Python implementations, most preferred last.
-_PYTHON_ALL_IMPLS=(
- jython2_5
- pypy1_8 pypy1_9
- python3_1 python3_2 python3_3
- python2_5 python2_6 python2_7
-)
+inherit python-utils-r1
# @ECLASS-VARIABLE: PYTHON_COMPAT
# @REQUIRED