mgorny 15/03/21 14:55:33
Modified: ChangeLog python-r1.eclass python-single-r1.eclass
python-utils-r1.eclass
Log:
Ban new EAPI < 5 packages for python-r1 & python-single-r1.
Revision Changes Path
1.1570 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1570&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1570&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1569&r2=1.1570
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1569
retrieving revision 1.1570
diff -u -r1.1569 -r1.1570
--- ChangeLog 20 Mar 2015 00:13:32 -0000 1.1569
+++ ChangeLog 21 Mar 2015 14:55:33 -0000 1.1570
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1569 2015/03/20
00:13:32 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1570 2015/03/21
14:55:33 mgorny Exp $
+
+ 21 Mar 2015; Michał Górny <mgo...@gentoo.org> python-r1.eclass,
+ python-single-r1.eclass, python-utils-r1.eclass:
+ Ban new EAPI < 5 packages for python-r1 & python-single-r1.
20 Mar 2015; Mike Pagano <mpag...@gentoo.org> kernel-2.eclass:
Move cpu-optimation removal. See bug #542810
1.90 eclass/python-r1.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.90&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.90&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?r1=1.89&r2=1.90
Index: python-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- python-r1.eclass 20 Feb 2015 17:57:22 -0000 1.89
+++ python-r1.eclass 21 Mar 2015 14:55:33 -0000 1.90
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.89 2015/02/20
17:57:22 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.90 2015/03/21
14:55:33 mgorny Exp $
# @ECLASS: python-r1
# @MAINTAINER:
@@ -33,8 +33,22 @@
0|1|2|3)
die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
;;
- 4|5)
- # EAPI=4 is required for USE default deps on USE_EXPAND flags
+ 4)
+ # EAPI=4 is only allowed on legacy packages
+ if [[ ${CATEGORY}/${P} == dev-python/pyelftools-0.2[123] ]];
then
+ :
+ elif [[ ${CATEGORY}/${P} == sys-apps/file-5.22 ]]; then
+ :
+ elif [[ ${CATEGORY}/${P} == sys-apps/i2c-tools-3.1.1 ]]; then
+ :
+ elif [[ ${CATEGORY}/${P} == sys-libs/cracklib-2.9.[12] ]]; then
+ :
+ else
+ die "Unsupported EAPI=${EAPI:-4} (too old, allowed only
on restricted set of packages) for ${ECLASS}"
+ fi
+ ;;
+ 5)
+ # EAPI=5 is required for sane USE_EXPAND dependencies
;;
*)
die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
@@ -652,7 +666,6 @@
_python_validate_useflags
_python_check_USE_PYTHON
- _python_check_EAPI
MULTIBUILD_VARIANTS=()
1.37 eclass/python-single-r1.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-single-r1.eclass?rev=1.37&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-single-r1.eclass?rev=1.37&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-single-r1.eclass?r1=1.36&r2=1.37
Index: python-single-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-single-r1.eclass,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- python-single-r1.eclass 20 Feb 2015 17:57:22 -0000 1.36
+++ python-single-r1.eclass 21 Mar 2015 14:55:33 -0000 1.37
@@ -1,6 +1,6 @@
# Copyright 1999-2015 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.36
2015/02/20 17:57:22 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-single-r1.eclass,v 1.37
2015/03/21 14:55:33 mgorny Exp $
# @ECLASS: python-single-r1
# @MAINTAINER:
@@ -35,8 +35,28 @@
0|1|2|3)
die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
;;
- 4|5)
- # EAPI=4 is required for USE default deps on USE_EXPAND flags
+ 4)
+ # EAPI=4 is only allowed on legacy packages
+ if [[ ${CATEGORY}/${P} == app-arch/threadzip-1.2 ]]; then
+ :
+ elif [[ ${CATEGORY}/${P} == media-libs/lv2-1.8.0 ]]; then
+ :
+ elif [[ ${CATEGORY}/${P} == media-libs/lv2-1.10.0 ]]; then
+ :
+ elif [[ ${CATEGORY}/${P} == sys-apps/paludis-1* ]]; then
+ :
+ elif [[ ${CATEGORY}/${P} == sys-apps/paludis-2.[02].0 ]]; then
+ :
+ elif [[ ${CATEGORY}/${P} == sys-apps/util-linux-2.2[456]* ]];
then
+ :
+ elif [[ ${CATEGORY}/${P} == sys-devel/gdb-7.[78]* ]]; then
+ :
+ else
+ die "Unsupported EAPI=${EAPI:-4} (too old, allowed only
on restricted set of packages) for ${ECLASS}"
+ fi
+ ;;
+ 5)
+ # EAPI=5 is required for sane USE_EXPAND dependencies
;;
*)
die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
@@ -379,8 +399,6 @@
python_setup() {
debug-print-function ${FUNCNAME} "${@}"
- _python_check_EAPI
-
unset EPYTHON
local impl impls=()
1.82 eclass/python-utils-r1.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.82&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.82&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.81&r2=1.82
Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- python-utils-r1.eclass 21 Feb 2015 08:07:30 -0000 1.81
+++ python-utils-r1.eclass 21 Mar 2015 14:55:33 -0000 1.82
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.81
2015/02/21 08:07:30 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.82
2015/03/21 14:55:33 mgorny Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -1127,22 +1127,6 @@
return 0
}
-# @FUNCTION: _python_check_EAPI
-# @INTERNAL
-# @DESCRIPTION:
-# Check whether the ebuild is not using deprecated EAPI 4. Output
-# a QA warning if it does.
-_python_check_EAPI() {
- if [[ ${EAPI} == 4 && ! ${_PYTHON_WARNED_EAPI} ]]; then
- eqawarn "This package is still using EAPI=4. This results in
package"
- eqawarn "dependencies violating PMS and causing issues for
package managers."
- eqawarn "For this reason, using EAPI=4 in new Python packages
will be banned"
- eqawarn "on 2015-03-20 (2 years and 6 months after approving
EAPI 5)."
-
- _PYTHON_WARNED_EAPI=1
- fi
-}
-
# -- python.eclass functions --
_python_check_dead_variables() {
