mgorny      15/02/20 17:02:56

  Modified:             ChangeLog python-r1.eclass python-single-r1.eclass
                        python-utils-r1.eclass
  Log:
  Restore EAPI=4 deprecation. That commit was perfectly fine.

Revision  Changes    Path
1.1544               eclass/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1544&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1544&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1543&r2=1.1544

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1543
retrieving revision 1.1544
diff -u -r1.1543 -r1.1544
--- ChangeLog   20 Feb 2015 10:22:42 -0000      1.1543
+++ ChangeLog   20 Feb 2015 17:02:56 -0000      1.1544
@@ -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.1543 2015/02/20 
10:22:42 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1544 2015/02/20 
17:02:56 mgorny Exp $
+
+  20 Feb 2015; Michał Górny <mgo...@gentoo.org> python-r1.eclass,
+  python-single-r1.eclass, python-utils-r1.eclass:
+  Restore EAPI=4 deprecation. That commit was perfectly fine.
 
   20 Feb 2015; Ulrich Müller <u...@gentoo.org> games.eclass:
   [QA] Leave permissions of top-level directories alone, bug 537580.



1.88                 eclass/python-r1.eclass

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.88&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.88&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?r1=1.87&r2=1.88

Index: python-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- python-r1.eclass    20 Feb 2015 08:14:22 -0000      1.87
+++ python-r1.eclass    20 Feb 2015 17:02:56 -0000      1.88
@@ -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.87 2015/02/20 
08:14:22 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.88 2015/02/20 
17:02:56 mgorny Exp $
 
 # @ECLASS: python-r1
 # @MAINTAINER:
@@ -652,6 +652,7 @@
 
        _python_validate_useflags
        _python_check_USE_PYTHON
+       _python_check_EAPI
 
        MULTIBUILD_VARIANTS=()
 



1.35                 eclass/python-single-r1.eclass

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-single-r1.eclass?rev=1.35&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-single-r1.eclass?rev=1.35&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-single-r1.eclass?r1=1.34&r2=1.35

Index: python-single-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-single-r1.eclass,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- python-single-r1.eclass     20 Feb 2015 08:14:22 -0000      1.34
+++ python-single-r1.eclass     20 Feb 2015 17:02:56 -0000      1.35
@@ -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.34 
2015/02/20 08:14:22 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-single-r1.eclass,v 1.35 
2015/02/20 17:02:56 mgorny Exp $
 
 # @ECLASS: python-single-r1
 # @MAINTAINER:
@@ -379,6 +379,8 @@
 python_setup() {
        debug-print-function ${FUNCNAME} "${@}"
 
+       _python_check_EAPI
+
        unset EPYTHON
 
        local impl impls=()



1.79                 eclass/python-utils-r1.eclass

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.79&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.79&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.78&r2=1.79

Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- python-utils-r1.eclass      20 Feb 2015 08:18:05 -0000      1.78
+++ python-utils-r1.eclass      20 Feb 2015 17:02:56 -0000      1.79
@@ -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.78 
2015/02/20 08:18:05 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.79 
2015/02/20 17:02:56 mgorny Exp $
 
 # @ECLASS: python-utils-r1
 # @MAINTAINER:
@@ -1168,6 +1168,22 @@
        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 using 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() {




Reply via email to