From: Michał Górny <mgorny@gentoo.org>
Date: Fri, 13 Nov 2015 18:44:21 +0000 (+0100)
Subject: python.eclass, distutils.eclass: Ban for EAPI=6
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=7ebd9fec81aac3ea0814c9c45e1cfc806ba00a30;p=gentoo.git

python.eclass, distutils.eclass: Ban for EAPI=6

Ban deprecated python and distutils eclasses to avoid being accidentally
enabled in EAPI 6.
---

diff --git a/eclass/distutils.eclass b/eclass/distutils.eclass
index 5f5a06950d84..d24ae551f7c2 100644
--- a/eclass/distutils.eclass
+++ b/eclass/distutils.eclass
@@ -18,6 +18,9 @@ fi
 inherit multilib
 
 case "${EAPI:-0}" in
+	6)
+		die "${ECLASS}.eclass is banned in EAPI ${EAPI}"
+		;;
 	0|1)
 		EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_postinst pkg_postrm
 		;;
diff --git a/eclass/python.eclass b/eclass/python.eclass
index c3634a004861..592119fa7993 100644
--- a/eclass/python.eclass
+++ b/eclass/python.eclass
@@ -12,6 +12,10 @@
 # This eclass is DEPRECATED. Please use python-r1, python-single-r1
 # or python-any-r1 instead.
 
+if [[ ${EAPI} == 6 ]]; then
+	die "${ECLASS}.eclass is banned in EAPI ${EAPI}"
+fi
+
 if [[ ${_PYTHON_UTILS_R1} ]]; then
 	die 'python.eclass can not be used with python-r1 suite eclasses.'
 fi