From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SOrB4-0005FF-BR for garchives@archives.gentoo.org; Mon, 30 Apr 2012 14:02:10 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5F40DE07FA; Mon, 30 Apr 2012 14:01:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 2E2E9E07FA for ; Mon, 30 Apr 2012 14:01:54 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 902971B401F for ; Mon, 30 Apr 2012 14:01:53 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 099F0E5403 for ; Mon, 30 Apr 2012 14:01:51 +0000 (UTC) From: "Thomas Sachau" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Sachau" Message-ID: <1335794586.990780b52e169ed8e5b6b3f48624321ccb84352d.tommy@gentoo> Subject: [gentoo-commits] proj/portage:multilib commit in: bin/, pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: bin/auto-multilib.sh pym/_emerge/Package.py X-VCS-Directories: bin/ pym/_emerge/ X-VCS-Committer: tommy X-VCS-Committer-Name: Thomas Sachau X-VCS-Revision: 990780b52e169ed8e5b6b3f48624321ccb84352d X-VCS-Branch: multilib Date: Mon, 30 Apr 2012 14:01:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 6b58413d-8436-409c-8e5e-5b85a2d1a269 X-Archives-Hash: 75a46106cbad7024248312ed00f002a5 commit: 990780b52e169ed8e5b6b3f48624321ccb84352d Author: Thomas Sachau gentoo org> AuthorDate: Mon Apr 30 14:03:06 2012 +0000 Commit: Thomas Sachau gentoo org> CommitDate: Mon Apr 30 14:03:06 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D990780b5 Move configuration of binary wrapping from variable to USE flag (called a= biwrapper) --- bin/auto-multilib.sh | 2 +- pym/_emerge/Package.py | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/bin/auto-multilib.sh b/bin/auto-multilib.sh index 7abed9b..4287f0f 100755 --- a/bin/auto-multilib.sh +++ b/bin/auto-multilib.sh @@ -302,7 +302,7 @@ _finalize_abi_install() { for i in ${MULTILIB_ABIS}; do noabi+=3D( ! -name '*-'${i} ) done - if ! [[ ${RESTRICT_MULTILIB_BINARIES} =3D=3D *${CATEGORY}/${PN}* ]]; th= en + if use abiwrapper ; then for i in $(find "${D}"usr/bin/ "${D}"usr/sbin "${D}"bin "${D}"sbin -ty= pe f ${noabi[@]} 2>/dev/null); do prep_ml_binaries "${i}" done diff --git a/pym/_emerge/Package.py b/pym/_emerge/Package.py index a587185..0a09fa5 100644 --- a/pym/_emerge/Package.py +++ b/pym/_emerge/Package.py @@ -641,6 +641,7 @@ class _PackageMetadataWrapper(_PackageMetadataWrapper= Base): if 'force-multilib' in self._pkg.root_config.settings.get("FEATURES", = ''): for multilib_abis in self._pkg.root_config.settings.get("MULTILIB_ABI= S", '').split(' '): v =3D v + " multilib_abi_" + multilib_abis + v =3D v + " abiwrapper" self._pkg.iuse =3D self._pkg._iuse( v.split(), self._pkg.root_config.settings._iuse_implicit_match) =20