autotools-{utils,multilib}.eclass: Ban for EAPI=6

Ban autotools-utils.eclass and dependant autotools-multilib.eclass for
EAPI=6 to avoid them being accidentally enabled. The former eclass
should be replaced with inline code, the latter with
multilib-minimal.eclass.

diff --git a/eclass/autotools-multilib.eclass b/eclass/autotools-multilib.eclass
index 758a6191cedb3d187a75303c2afcc36c19d1b693..0141bc6a86bd84f4a6ba1d164cb78514701a3d73 100644 (file)
--- a/eclass/autotools-multilib.eclass
+++ b/eclass/autotools-multilib.eclass
@@ -21,6 +21,7 @@
 
 # EAPI=4 is required for meaningful MULTILIB_USEDEP.
 case ${EAPI:-0} in
+       6) die "${ECLASS}.eclass is banned in EAPI ${EAPI}";;
        4|5) ;;
        *) die "EAPI=${EAPI} is not supported" ;;
 esac

diff --git a/eclass/autotools-utils.eclass b/eclass/autotools-utils.eclass
index de3c65a78303eaad7139e66238f6fe9c6fd0cd08..b850cf7af1a610814ab5b23c6eec595b43c90215 100644 (file)
--- a/eclass/autotools-utils.eclass
+++ b/eclass/autotools-utils.eclass
@@ -89,6 +89,7 @@
 # Keep variable names synced with cmake-utils and the other way around!
 
 case ${EAPI:-0} in
+       6) die "${ECLASS}.eclass is banned in EAPI ${EAPI}";;
        2|3|4|5) ;;
        *) die "EAPI=${EAPI} is not supported" ;;
 esac