[gentoo-commits] repo/gentoo:master commit in: eclass/

[Michał Górny]

commit:     ad4c142684afb096e8fff2937ae5c5c3385dd22e
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 13 18:46:33 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Nov 13 23:52:53 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad4c1426

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.

 eclass/autotools-multilib.eclass | 1 +
 eclass/autotools-utils.eclass    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/eclass/autotools-multilib.eclass b/eclass/autotools-multilib.eclass
index 758a619..0141bc6 100644
--- 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 de3c65a..b850cf7 100644
--- 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