summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorPiotr Jaroszyński <peper@gentoo.org>2007-07-01 22:08:15 +0000
committerPiotr Jaroszyński <peper@gentoo.org>2007-07-01 22:08:15 +0000
commit9d021059f9f71751f9adf22da138b785b4027ddb (patch)
treeb33d3e607d89739416c3ee8b382dc77ea5fb2f8e /eclass
parentAdded src_test, removed PN from DESCRIPTION, use DOCS instead of mydoc, quotes (diff)
downloadgentoo-2-9d021059f9f71751f9adf22da138b785b4027ddb.tar.gz
gentoo-2-9d021059f9f71751f9adf22da138b785b4027ddb.tar.bz2
gentoo-2-9d021059f9f71751f9adf22da138b785b4027ddb.zip
(QA) RESTRICT="multilib-pkg-force" -> EMULTILIB_PKG="true" (1/2)
Diffstat (limited to 'eclass')
-rw-r--r--eclass/multilib.eclass6
1 files changed, 3 insertions, 3 deletions
diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass
index 0f0abf67435c..6f9c24702166 100644
--- a/eclass/multilib.eclass
+++ b/eclass/multilib.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.61 2007/06/05 18:21:00 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.62 2007/07/01 22:08:15 peper Exp $
#
# Maintainer: amd64@gentoo.org / toolchain@gentoo.org
#
@@ -212,8 +212,8 @@ get_install_abis() {
return 0
fi
- if hasq multilib-pkg-force ${RESTRICT} ||
- { hasq multilib-pkg ${FEATURES} && hasq multilib-pkg ${RESTRICT}; }; then
+ if hasq multilib-pkg-force ${RESTRICT} || [[ ${EMULTILIB_PKG} == "true" ]]
+ then
for x in ${MULTILIB_ABIS} ; do
if [[ ${x} != "${DEFAULT_ABI}" ]] ; then
hasq ${x} ${ABI_DENY} || ordera="${ordera} ${x}"