From 66adc4cab632d00f18ff61721ac16921a0bcfb52 Mon Sep 17 00:00:00 2001
From: Stuart Shelton <stuart@shelton.me>
Date: Wed, 18 Nov 2015 01:18:41 +0000
Subject: Update eclass/multilib.eclass

---
 eclass/multilib.eclass | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'eclass')

diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass
index bcc601a1..2391ddd0 100644
--- a/eclass/multilib.eclass
+++ b/eclass/multilib.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: eb0ac1d24100d6a882f109a492b60fc4a0c186f0 $
+# $Id: 69582b652c2149909c376854ea1c2770e1479e3f $
 
 # @ECLASS: multilib.eclass
 # @MAINTAINER:
@@ -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]
-- 
cgit v1.2.3-65-gdbad