From ad4c142684afb096e8fff2937ae5c5c3385dd22e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Fri, 13 Nov 2015 19:46:33 +0100 Subject: [PATCH] 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 758a6191cedb..0141bc6a86bd 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 de3c65a78303..b850cf7af1a6 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 -- 2.26.2