[gentoo-commits] proj/portage:multilib commit in: bin/, pym/_emerge/

[gentoo-commits] proj/portage:multilib commit in: bin/, pym/_emerge/

[Thomas Sachau]

commit:     5da82edbe654f78a6c7865ca87ac6d5b72c984ff
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 18 16:10:46 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Feb 18 16:10:46 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=5da82edb

Remove unused attributes

---
 bin/auto-multilib.sh          |    6 +++++-
 pym/_emerge/EbuildExecuter.py |    8 ++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/bin/auto-multilib.sh b/bin/auto-multilib.sh
index aa65d39..db49c52 100755
--- a/bin/auto-multilib.sh
+++ b/bin/auto-multilib.sh
@@ -124,7 +124,11 @@ get_abi_order() {
 	fi
 
 	if [ -z "${order}" ]; then
-		die "Could not determine your profile ABI(s).  Perhaps your USE flags or MULTILIB_ABIS are too restrictive for this package or your profile does not set DEFAULT_ABI."
+		if ! [ -z "${DEFAULT_ABI}" ]; then
+			order=${DEFAULT_ABI}
+		else
+			die "Could not determine your profile ABI(s).  Perhaps your USE flags or MULTILIB_ABIS are too restrictive for this package or your profile does not set DEFAULT_ABI."
+		fi
 	fi
 
 	echo ${order}

diff --git a/pym/_emerge/EbuildExecuter.py b/pym/_emerge/EbuildExecuter.py
index b340f09..6591ee5 100644
--- a/pym/_emerge/EbuildExecuter.py
+++ b/pym/_emerge/EbuildExecuter.py
@@ -109,9 +109,13 @@ class EbuildExecuter(CompositeTask):
 			# This initializes PORTAGE_LOG_FILE.
 			portage.prepare_build_dirs(pkg.root, settings, cleanup)
 
+		setup_phase = EbuildPhase(background=self.background,
+			phase="setup", scheduler=scheduler,
+			settings=settings)
+
 			setup_phase = EbuildPhase(background=self.background,
-				pkg=pkg, phase="setup", scheduler=scheduler,
-				settings=settings, tree=self)
+				phase="setup", scheduler=scheduler,
+				settings=settings)
 
 			setup_phase.addExitListener(self._setup_exit)
 			self._current_task = setup_phase

[gentoo-commits] proj/portage:multilib commit in: bin/, pym/_emerge/

[Thomas Sachau]

commit:     990780b52e169ed8e5b6b3f48624321ccb84352d
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 30 14:03:06 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Mon Apr 30 14:03:06 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=990780b5

Move configuration of binary wrapping from variable to USE flag (called abiwrapper)

---
 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+=( ! -name '*-'${i} )
 	done
-	if ! [[ ${RESTRICT_MULTILIB_BINARIES} == *${CATEGORY}/${PN}* ]]; then
+	if use abiwrapper ; then
 		for i in $(find "${D}"usr/bin/ "${D}"usr/sbin "${D}"bin "${D}"sbin -type 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(_PackageMetadataWrapperBase):
 		if 'force-multilib' in self._pkg.root_config.settings.get("FEATURES", ''):
 			for multilib_abis in self._pkg.root_config.settings.get("MULTILIB_ABIS", '').split(' '):
 				v = v + " multilib_abi_" + multilib_abis
+			v = v + " abiwrapper"
 		self._pkg.iuse = self._pkg._iuse(
 			v.split(), self._pkg.root_config.settings._iuse_implicit_match)