Added get_all_abis. Renamed get_abi_order to get_install_abis.

1 files changed, 32 insertions, 2 deletions

diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass
index 8d2ff24ac021..40f19274b52f 100644
--- a/eclass/multilib.eclass
+++ b/eclass/multilib.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.16 2005/01/31 06:37:31 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.17 2005/02/03 05:29:07 eradicator Exp $
 #
 # Author: Jeremy Huddleston <eradicator@gentoo.org>
 #
@@ -25,10 +25,14 @@ DESCRIPTION="Based on the ${ECLASS} eclass"
 # number_abis:
 # echo the number of ABIs we will be installing for
 
-# get_abi_order:
+# get_install_abis:
 # Return a list of the ABIs we want to install for with
 # the last one in the list being the default.
 
+# get_all_abis:
+# Return a list of the ABIs supported by this profile.
+# the last one in the list being the default.
+
 # get_all_libdirs:
 # Returns a list of all the libdirs used by this profile.  This includes
 # those that might not be touched by the current ebuild and always includes
@@ -184,6 +188,11 @@ get_abi_LIBDIR() { get_abi_var LIBDIR ${@}; }
 # Return a list of the ABIs we want to install for with 
 # the last one in the list being the default.
 get_abi_order() {
+	ewarn "Please update your ebuild to use get_install_abis instead of get_abi_order"
+	get_install_abis ${@}
+}
+
+get_install_abis() {
 	local order=""
 
 	if [ -z "${MULTILIB_ABIS}" ]; then
@@ -221,6 +230,27 @@ get_abi_order() {
 	return 0
 }
 
+# Return a list of the ABIs supported by this profile.
+# the last one in the list being the default.
+get_all_abis() {
+	local order=""
+
+	if [ -z "${MULTILIB_ABIS}" ]; then
+		echo "NOMULTILIB"
+		return 1
+	fi
+
+	for x in ${MULTILIB_ABIS}; do
+		if [ "${x}" != "${DEFAULT_ABI}" ]; then
+			order="${order:+${order }}${x}"
+		fi
+	done
+	order="${order:+${order} }${DEFAULT_ABI}"
+
+	echo ${order}
+	return 0
+}
+
 # get_all_libdirs()
 # Returns a list of all the libdirs used by this profile.  This includes
 # those that might not be touched by the current ebuild.