multilib.eclass: get_libdir is part of EAPI 6
authorMichał Górny <mgorny@gentoo.org>
Mon, 16 Nov 2015 07:10:52 +0000 (08:10 +0100)
committerMichał Górny <mgorny@gentoo.org>
Mon, 16 Nov 2015 07:13:47 +0000 (08:13 +0100)
Disable get_libdir in EAPIs other than {0..5} since it is now part of
EAPI.

eclass/multilib.eclass

index eb0ac1d24100d6a882f109a492b60fc4a0c186f0..69582b652c2149909c376854ea1c2770e1479e3f 100644 (file)
@@ -49,15 +49,17 @@ has_multilib_profile() {
 #   fall back on old behavior.  Any profile that has these set should also
 #   depend on a newer version of portage (not yet released) which uses these
 #   over CONF_LIBDIR in econf, dolib, etc...
-get_libdir() {
-       local CONF_LIBDIR
-       if [ -n  "${CONF_LIBDIR_OVERRIDE}" ] ; then
-               # if there is an override, we want to use that... always.
-               echo ${CONF_LIBDIR_OVERRIDE}
-       else
-               get_abi_LIBDIR
-       fi
-}
+if has "${EAPI:-0}" 0 1 2 3 4 5; then
+       get_libdir() {
+               local CONF_LIBDIR
+               if [ -n  "${CONF_LIBDIR_OVERRIDE}" ] ; then
+                       # if there is an override, we want to use that... always.
+                       echo ${CONF_LIBDIR_OVERRIDE}
+               else
+                       get_abi_LIBDIR
+               fi
+       }
+fi
 
 # @FUNCTION: get_abi_var
 # @USAGE: <VAR> [ABI]