From: Fabian Groffen <grobian@gentoo.org>
Date: Mon, 20 Sep 2010 15:19:05 +0000 (+0200)
Subject: revert previous profile stacking behaviour for as long as profiles/package.mask's... 
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=63d7e91e6ea1ed2248de6a6889feadcebb6ba303;p=portage.git

revert previous profile stacking behaviour for as long as profiles/package.mask's content isn't transferred to profiles/base/package.mask, since prefix profile needs to undo some of the maskings from profiles/package.mask
---

diff --git a/pym/portage/package/ebuild/_config/MaskManager.py b/pym/portage/package/ebuild/_config/MaskManager.py
index f5b240a47..a09dfb595 100644
--- a/pym/portage/package/ebuild/_config/MaskManager.py
+++ b/pym/portage/package/ebuild/_config/MaskManager.py
@@ -42,17 +42,23 @@ class MaskManager(object):
 		#to allow profiles to override masks from their parent profiles.
 		profile_pkgmasklines = []
 		profile_pkgunmasklines = []
+		# PREFIX LOCAL: Prefix has unmasks for stuff in profiles/package.mask
+		# If we don't consider the repomasks here, those unmasks are
+		# lost, causing lots of issues (e.g. Portage being masked)
 		for x in profiles:
-			profile_pkgmasklines.append(grabfile_package(
-				os.path.join(x, "package.mask"), recursive=1, remember_source_file=True, verify_eapi=True))
-			profile_pkgunmasklines.append(grabfile_package(
-				os.path.join(x, "package.unmask"), recursive=1, remember_source_file=True, verify_eapi=True))
-		profile_pkgmasklines = stack_lists(profile_pkgmasklines, incremental=1, \
-			remember_source_file=True, warn_for_unmatched_removal=True,
-			strict_warn_for_unmatched_removal=strict_umatched_removal)
-		profile_pkgunmasklines = stack_lists(profile_pkgunmasklines, incremental=1, \
-			remember_source_file=True, warn_for_unmatched_removal=True,
-			strict_warn_for_unmatched_removal=strict_umatched_removal)
+			#profile_pkgmasklines.append(grabfile_package(
+			profile_pkgmasklines = grabfile_package(
+				os.path.join(x, "package.mask"), recursive=1, remember_source_file=True, verify_eapi=True)#)
+			#profile_pkgunmasklines.append(grabfile_package(
+			profile_pkgunmasklines = grabfile_package(
+				os.path.join(x, "package.unmask"), recursive=1, remember_source_file=True, verify_eapi=True)#)
+		#profile_pkgmasklines = stack_lists(profile_pkgmasklines, incremental=1, \
+		#	remember_source_file=True, warn_for_unmatched_removal=True,
+		#	strict_warn_for_unmatched_removal=strict_umatched_removal)
+		#profile_pkgunmasklines = stack_lists(profile_pkgunmasklines, incremental=1, \
+		#	remember_source_file=True, warn_for_unmatched_removal=True,
+		#	strict_warn_for_unmatched_removal=strict_umatched_removal)
+		# PREFIX LOCAL
 
 		#Read /etc/portage/package.mask. Don't stack it to allow the user to
 		#remove mask atoms from everywhere with -atoms.