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

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

[Thomas Sachau]

commit:     e4127765b5b4cc90d1c459c984860e2f5d4acc96
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Tue May  1 14:16:37 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Tue May  1 14:16:37 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=e4127765

Only add the USE flag internally for the current ebuild, not for already built packages, move change of IUSE file from phase-functions.sh to doebuild.py, so the later doesnt overwrite it

---
 bin/phase-functions.sh                 |   11 ++++-------
 pym/_emerge/Package.py                 |    7 ++++---
 pym/portage/package/ebuild/doebuild.py |    4 ++++
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh
index 7307b76..43e5ef8 100644
--- a/bin/phase-functions.sh
+++ b/bin/phase-functions.sh
@@ -709,13 +709,10 @@ dyn_install() {
 		done
 	fi
 	if [[ " ${FEATURES} " == *" force-multilib "* ]]; then
-		if has_multilib_profile ; then
-			local i= x=
-			for i in ${MULTILIB_ABIS} ; do
-				x+=" multilib_abi_${i}"
-			done
-			echo "${IUSE}${x}"      > IUSE
-		fi
+		#IUSE is changed in _post_src_install_chost_fix
+		#in pym/portage/package/ebuild/doebuild.py
+		#which is run after dyn_install, so useless to
+		#add internal USE flags here 
 		if is_auto-multilib; then
 			echo "$(get_abi_order)" > MULTILIB_ABIS
 		fi

diff --git a/pym/_emerge/Package.py b/pym/_emerge/Package.py
index 0a09fa5..fbd320a 100644
--- a/pym/_emerge/Package.py
+++ b/pym/_emerge/Package.py
@@ -639,9 +639,10 @@ class _PackageMetadataWrapper(_PackageMetadataWrapperBase):
 
 	def _set_iuse(self, k, v):
 		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"
+			if self._pkg.built is False:
+				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)
 

diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py
index da30bda..3c57d8d 100644
--- a/pym/portage/package/ebuild/doebuild.py
+++ b/pym/portage/package/ebuild/doebuild.py
@@ -1654,6 +1654,10 @@ def _post_src_install_chost_fix(settings):
 
 	for k in ('IUSE',):
 		v = settings.get(k)
+		if "force-multilib" in settings.get('FEATURES'):
+			v = v + " abiwrapper"
+			for i in settings.get('MULTILIB_ABIS').split(' '):
+				v = v + " multilib_abi_" + i
 		if v is not None:
 			write_atomic(os.path.join(build_info_dir, k), v + '\n')