diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2013-09-26 11:24:30 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2013-09-26 11:24:30 +0000 |
| commit | b1bf78fbba19f23863d7dd98bee659703c2f6858 (patch) | |
| tree | 14e70041293d8bb56fe386086896f896895c91a3 /eclass/python-single-r1.eclass | |
| parent | Add myself to maintainers (okayed by lu_zero in IRC). (diff) | |
| download | historical-b1bf78fbba19f23863d7dd98bee659703c2f6858.tar.gz historical-b1bf78fbba19f23863d7dd98bee659703c2f6858.tar.bz2 historical-b1bf78fbba19f23863d7dd98bee659703c2f6858.zip | |
Fix EAPI=4 on python-exec:2 since that is what pkgcore will require (the only EAPI=4 consumer right now).
Diffstat (limited to 'eclass/python-single-r1.eclass')
| -rw-r--r-- | eclass/python-single-r1.eclass | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/eclass/python-single-r1.eclass b/eclass/python-single-r1.eclass index e3670bf75f06..30bbab45c162 100644 --- a/eclass/python-single-r1.eclass +++ b/eclass/python-single-r1.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/python-single-r1.eclass,v 1.21 2013/09/17 13:33:55 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/python-single-r1.eclass,v 1.22 2013/09/26 11:24:30 mgorny Exp $ # @ECLASS: python-single-r1 # @MAINTAINER: @@ -31,12 +31,11 @@ # http://www.gentoo.org/proj/en/Python/python-r1/dev-guide.xml case "${EAPI:-0}" in - 0|1|2|3|4) + 0|1|2|3) die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}" ;; - 5) - # EAPI=5 is required for meaningful USE default deps - # on USE_EXPAND flags + 4|5) + # EAPI=4 is required for USE default deps on USE_EXPAND flags ;; *) die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" @@ -194,11 +193,11 @@ _python_single_set_globals() { # 2) python-exec should be built with all targets forced anyway # but if new targets were added, we may need to force a rebuild # 3) use whichever python-exec slot installed in EAPI 5. For EAPI 4, - # just fix :0 for now since := deps are not supported. + # just fix :2 since := deps are not supported. if [[ ${EAPI} != 4 ]]; then PYTHON_DEPS+="dev-python/python-exec:=[${PYTHON_USEDEP}]" else - PYTHON_DEPS+="dev-python/python-exec:0[${PYTHON_USEDEP}]" + PYTHON_DEPS+="dev-python/python-exec:2[${PYTHON_USEDEP}]" fi } _python_single_set_globals |