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 5f5a06950d84f07871ef43820147e9a0c1fa88fa..d24ae551f7c281b5840cd73753efe3e36f992975 100644 (file)
--- 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 c3634a0048612af49f13ba3374e268f1d2df2cd6..592119fa79931c6e9bc9882ff654b0973c00cddf 100644 (file)
--- 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