[gentoo-dev] [PATCH autotools-multilib 1/2] Require EAPI=5 for working MULTILIB_USEDEPs.

[gentoo-dev] [PATCH autotools-multilib 1/2] Require EAPI=5 for working MULTILIB_USEDEPs.

[Michał Górny]

Long story short, PMS, portage, havoc and that stuff.

There's currently one in-tree eclass consumer and I have bumped it
to EAPI=5 (from 4) already.

---
 eclass/autotools-multilib.eclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eclass/autotools-multilib.eclass b/eclass/autotools-multilib.eclass
index 024884d..b4af121 100644
--- a/eclass/autotools-multilib.eclass
+++ b/eclass/autotools-multilib.eclass
@@ -19,8 +19,9 @@
 # enabled. Thus, it is impossible to use AUTOTOOLS_IN_SOURCE_BUILD with
 # it.
 
+# EAPI=5 is required for meaningful MULTILIB_USEDEP.
 case ${EAPI:-0} in
-	2|3|4) ;;
+	5) ;;
 	*) die "EAPI=${EAPI} is not supported" ;;
 esac
 
-- 
1.8.1.1

[gentoo-dev] [PATCH autotools-multilib 2/2] Use (-)-dep in MULTILIB_USEDEP to make sure it works.

[Michał Górny]

Due to use.force and magic like that, non-EAPI-5 deps would be assumed
to have USE=multilib otherwise.

---
 eclass/autotools-multilib.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/autotools-multilib.eclass b/eclass/autotools-multilib.eclass
index b4af121..dbf2ad1 100644
--- a/eclass/autotools-multilib.eclass
+++ b/eclass/autotools-multilib.eclass
@@ -45,7 +45,7 @@ IUSE=multilib
 # RDEPEND="dev-libs/libfoo[${MULTILIB_USEDEP}]
 #	net-libs/libbar[ssl,${MULTILIB_USEDEP}]"
 # @CODE
-MULTILIB_USEDEP=multilib?
+MULTILIB_USEDEP='multilib(-)?'
 
 # @FUNCTION: autotools-multilib_foreach_abi
 # @USAGE: argv...
-- 
1.8.1.1