diff options
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/python-r1.eclass | 9 |
2 files changed, 8 insertions, 6 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index cf3a32a46b0d..fcea0810fa71 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.938 2013/08/27 05:32:28 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.939 2013/08/27 18:47:33 mgorny Exp $ + + 27 Aug 2013; Michał Górny <mgorny@gentoo.org> python-r1.eclass: + Enable EAPI=4 on python-r1. 27 Aug 2013; Tim Harder <radhermit@gentoo.org> java-utils-2.eclass: Don't add subslots to JAVA_PKG_NAME (bug #482270 by chutzpah). diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass index dbfd0dc33a61..5c5b33c95ac6 100644 --- a/eclass/python-r1.eclass +++ b/eclass/python-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-r1.eclass,v 1.57 2013/08/07 16:37:32 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.58 2013/08/27 18:47:33 mgorny Exp $ # @ECLASS: python-r1 # @MAINTAINER: @@ -28,12 +28,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}" |