Restore EAPI=4 deprecation. That commit was perfectly fine.

diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index dbaa91df4ce0ab8c9c068ff4e35b8510f8a75052..06b11fc224faccf16ab569bc3fc21b889e2e4a50 100644 (file)
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -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 <mgorny@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 <ulm@gentoo.org> games.eclass:
   [QA] Leave permissions of top-level directories alone, bug 537580.

diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index ec8c1db75f2d561606789af8e92d6ab7b07dd4e8..813e7c1306a7f31d4e7a48fc2cae48beb2dd72a2 100644 (file)
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -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_obtain_impls() {
 
        _python_validate_useflags
        _python_check_USE_PYTHON
+       _python_check_EAPI
 
        MULTIBUILD_VARIANTS=()
 

diff --git a/eclass/python-single-r1.eclass b/eclass/python-single-r1.eclass
index 8b994f8cf698c0ed4913bcd4bf5bc7470641cf57..2ce469f71d8f8e6db19518707df0aa055029b300 100644 (file)
--- a/eclass/python-single-r1.eclass
+++ b/eclass/python-single-r1.eclass
@@ -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_gen_cond_dep() {
 python_setup() {
        debug-print-function ${FUNCNAME} "${@}"
 
+       _python_check_EAPI
+
        unset EPYTHON
 
        local impl impls=()

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index b36d8182299704e90c279f52e9b5478b2c5a1677..4fb3d749eb8a5533fa0c4b64da74728a36511532 100644 (file)
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -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 @@ python_export_utf8_locale() {
        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() {