[gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/_config/

[gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/_config/

[Zac Medico]

commit:     4bb1eabca9fd59df5226bd96452b01268387377d
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 26 01:44:46 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Mar 26 01:44:46 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=4bb1eabc

config: blacklist PORTAGE_BACKGROUND* vars

---
 .../package/ebuild/_config/special_env_vars.py     |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/pym/portage/package/ebuild/_config/special_env_vars.py b/pym/portage/package/ebuild/_config/special_env_vars.py
index 6a196cf..4faa810 100644
--- a/pym/portage/package/ebuild/_config/special_env_vars.py
+++ b/pym/portage/package/ebuild/_config/special_env_vars.py
@@ -8,12 +8,16 @@ __all__ = (
 
 import re
 
+# Blacklisted variables are internal variables that are never allowed
+# to enter the config instance from the external environment or
+# configuration files.
 env_blacklist = frozenset((
 	"A", "AA", "CATEGORY", "DEPEND", "DESCRIPTION", "EAPI",
 	"EBUILD_PHASE", "ED", "EMERGE_FROM", "EPREFIX", "EROOT",
 	"HOMEPAGE", "INHERITED", "IUSE",
 	"KEYWORDS", "LICENSE", "MERGE_TYPE",
-	"PDEPEND", "PF", "PKGUSE", "PORTAGE_BUILDIR_LOCKED",
+	"PDEPEND", "PF", "PKGUSE", "PORTAGE_BACKGROUND",
+	"PORTAGE_BACKGROUND_UNMERGE", "PORTAGE_BUILDIR_LOCKED",
 	"PORTAGE_BUILT_USE", "PORTAGE_CONFIGROOT", "PORTAGE_IUSE",
 	"PORTAGE_NONFATAL", "PORTAGE_REPO_NAME", "PORTAGE_SANDBOX_COMPAT_LEVEL",
 	"PORTAGE_USE", "PROPERTIES", "PROVIDE", "RDEPEND", "RESTRICT",

[gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/_config/

[Zac Medico]

commit:     469376e5c96b70bdd4f19782c2abd6a5264a4949
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  4 22:03:01 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Apr  4 22:03:01 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=469376e5

filter PORTAGE_GPG_SIGNING_COMMAND for ebuild env

---
 .../package/ebuild/_config/special_env_vars.py     |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/pym/portage/package/ebuild/_config/special_env_vars.py b/pym/portage/package/ebuild/_config/special_env_vars.py
index 28f6612..0214c86 100644
--- a/pym/portage/package/ebuild/_config/special_env_vars.py
+++ b/pym/portage/package/ebuild/_config/special_env_vars.py
@@ -148,7 +148,8 @@ environ_filter += [
 	"PORTAGE_ELOG_MAILURI", "PORTAGE_ELOG_SYSTEM",
 	"PORTAGE_FETCH_CHECKSUM_TRY_MIRRORS", "PORTAGE_FETCH_RESUME_MIN_SIZE",
 	"PORTAGE_GPG_DIR",
-	"PORTAGE_GPG_KEY", "PORTAGE_IONICE_COMMAND",
+	"PORTAGE_GPG_KEY", "PORTAGE_GPG_SIGNING_COMMAND",
+	"PORTAGE_IONICE_COMMAND",
 	"PORTAGE_PACKAGE_EMPTY_ABORT",
 	"PORTAGE_REPO_DUPLICATE_WARN",
 	"PORTAGE_RO_DISTDIRS",

[gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/_config/

[Zac Medico]

commit:     33b197b02574c0f49d4dce659562d2f3362e5eba
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 21 01:31:17 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Jun 21 01:31:17 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=33b197b0

UseManager: avoid possible repo KeyErrors

---
 pym/portage/package/ebuild/_config/UseManager.py |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pym/portage/package/ebuild/_config/UseManager.py b/pym/portage/package/ebuild/_config/UseManager.py
index de18500..67e9294 100644
--- a/pym/portage/package/ebuild/_config/UseManager.py
+++ b/pym/portage/package/ebuild/_config/UseManager.py
@@ -148,8 +148,8 @@ class UseManager(object):
 		usemask = []
 		if hasattr(pkg, "repo") and pkg.repo != Package.UNKNOWN_REPO:
 			for repo in [repo.name for repo in self.repositories[pkg.repo].masters] + [pkg.repo]:
-				usemask.append(self._repo_usemask_dict[repo])
-				cpdict = self._repo_pusemask_dict[repo].get(cp)
+				usemask.append(self._repo_usemask_dict.get(repo, {}))
+				cpdict = self._repo_pusemask_dict.get(repo, {}).get(cp)
 				if cpdict:
 					pkg_usemask = ordered_by_atom_specificity(cpdict, pkg)
 					if pkg_usemask:
@@ -175,8 +175,8 @@ class UseManager(object):
 		useforce = []
 		if hasattr(pkg, "repo") and pkg.repo != Package.UNKNOWN_REPO:
 			for repo in [repo.name for repo in self.repositories[pkg.repo].masters] + [pkg.repo]:
-				useforce.append(self._repo_useforce_dict[repo])
-				cpdict = self._repo_puseforce_dict[repo].get(cp)
+				useforce.append(self._repo_useforce_dict.get(repo, {}))
+				cpdict = self._repo_puseforce_dict.get(repo, {}).get(cp)
 				if cpdict:
 					pkg_useforce = ordered_by_atom_specificity(cpdict, pkg)
 					if pkg_useforce:

[gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/_config/

[Zac Medico]

commit:     fad5fbffa2d59964e29dca4cc231ba0168d39ce2
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 13 17:25:47 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Jul 13 17:25:47 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=fad5fbff

Protect EBUILD_{FORCE_TEST,SKIP_MANIFEST} vars.

These belong in the blacklist, in order to avoid potential interference
from the calling environment.

---
 .../package/ebuild/_config/special_env_vars.py     |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/pym/portage/package/ebuild/_config/special_env_vars.py b/pym/portage/package/ebuild/_config/special_env_vars.py
index 3da724d..87aa606 100644
--- a/pym/portage/package/ebuild/_config/special_env_vars.py
+++ b/pym/portage/package/ebuild/_config/special_env_vars.py
@@ -13,7 +13,8 @@ import re
 # configuration files.
 env_blacklist = frozenset((
 	"A", "AA", "CATEGORY", "DEPEND", "DESCRIPTION", "EAPI",
-	"EBUILD_PHASE", "ED", "EMERGE_FROM", "EPREFIX", "EROOT",
+	"EBUILD_FORCE_TEST", "EBUILD_PHASE", "EBUILD_SKIP_MANIFEST",
+	"ED", "EMERGE_FROM", "EPREFIX", "EROOT",
 	"HOMEPAGE", "INHERITED", "IUSE",
 	"KEYWORDS", "LICENSE", "MERGE_TYPE",
 	"PDEPEND", "PF", "PKGUSE", "PORTAGE_BACKGROUND",

[gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/_config/

[Zac Medico]

commit:     0ccacd85137588bbf1ceb90e1d72be79daaf9e58
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 13 12:23:39 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Aug 13 12:23:39 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=0ccacd85

config: blacklist GREP_OPTIONS variable

This variable could cause interference with the ebuild environment and
portage shell code, like in bug 370085.

---
 .../package/ebuild/_config/special_env_vars.py     |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/pym/portage/package/ebuild/_config/special_env_vars.py b/pym/portage/package/ebuild/_config/special_env_vars.py
index 87aa606..1b54867 100644
--- a/pym/portage/package/ebuild/_config/special_env_vars.py
+++ b/pym/portage/package/ebuild/_config/special_env_vars.py
@@ -15,7 +15,7 @@ env_blacklist = frozenset((
 	"A", "AA", "CATEGORY", "DEPEND", "DESCRIPTION", "EAPI",
 	"EBUILD_FORCE_TEST", "EBUILD_PHASE", "EBUILD_SKIP_MANIFEST",
 	"ED", "EMERGE_FROM", "EPREFIX", "EROOT",
-	"HOMEPAGE", "INHERITED", "IUSE",
+	"GREP_OPTIONS", "HOMEPAGE", "INHERITED", "IUSE",
 	"KEYWORDS", "LICENSE", "MERGE_TYPE",
 	"PDEPEND", "PF", "PKGUSE", "PORTAGE_BACKGROUND",
 	"PORTAGE_BACKGROUND_UNMERGE", "PORTAGE_BUILDIR_LOCKED",

[gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/_config/

[Zac Medico]

commit:     9144faeb653b9f1dbe74c69f85cd48f26761aa2f
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  2 02:12:52 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Oct  2 02:12:52 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=9144faeb

KeywordsManager: support ~* in KEYWORDS

This allows ~* in KEYWORDS to be match by any unstable keyword in the
user's configuration, similar to how * in KEYWORDS already matches any
user configuration. Thanks to Daniel Robbins <drobbins <AT> funtoo.org> for
the suggestion.

Also, the warning about * or -* in KEYWORDS is now gone, so that
ebuilds from the funtoo tree will be usable without triggering
warnings like this. If necessary, we can add ways to selectively
enable these kinds of warnings via layout.conf and/or repos.conf.

---
 .../package/ebuild/_config/KeywordsManager.py      |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/pym/portage/package/ebuild/_config/KeywordsManager.py b/pym/portage/package/ebuild/_config/KeywordsManager.py
index cd22554..c2b8343 100644
--- a/pym/portage/package/ebuild/_config/KeywordsManager.py
+++ b/pym/portage/package/ebuild/_config/KeywordsManager.py
@@ -206,12 +206,16 @@ class KeywordsManager(object):
 		hasstable = False
 		hastesting = False
 		for gp in mygroups:
-			if gp == "*" or (gp == "-*" and len(mygroups) == 1):
-				writemsg(_("--- WARNING: Package '%(cpv)s' uses"
-					" '%(keyword)s' keyword.\n") % {"cpv": cpv, "keyword": gp},
-					 noiselevel=-1)
-				if gp == "*":
-					match = True
+			if gp == "*":
+				match = True
+				break
+			elif gp == "~*":
+				hastesting = True
+				for x in pgroups:
+					if x[:1] == "~":
+						match = True
+						break
+				if match:
 					break
 			elif gp in pgroups:
 				match = True

[gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/_config/

[Arfrever Frehtes Taifersar Arahesis]

commit:     37f05a23fd55b633674f91f4d7658c19e41d2d63
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Gentoo <DOT> Org>
AuthorDate: Sat Oct  8 21:39:10 2011 +0000
Commit:     Arfrever Frehtes Taifersar Arahesis <arfrever <AT> gentoo <DOT> org>
CommitDate: Sat Oct  8 21:39:10 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=37f05a23

MaskManager: Fix stacking of lines from master repositories.

---
 pym/portage/package/ebuild/_config/MaskManager.py |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pym/portage/package/ebuild/_config/MaskManager.py b/pym/portage/package/ebuild/_config/MaskManager.py
index df93e10..8bcaf7a 100644
--- a/pym/portage/package/ebuild/_config/MaskManager.py
+++ b/pym/portage/package/ebuild/_config/MaskManager.py
@@ -43,11 +43,12 @@ class MaskManager(object):
 		for repo in repositories.repos_with_profiles():
 			lines = []
 			repo_lines = grab_pmask(repo.location)
+			master_lines = []
 			for master in repo.masters:
-				master_lines = grab_pmask(master.location)
-				lines.append(stack_lists([master_lines, repo_lines], incremental=1,
-					remember_source_file=True, warn_for_unmatched_removal=True,
-					strict_warn_for_unmatched_removal=strict_umatched_removal))
+				master_lines.extend(grab_pmask(master.location))
+			lines.append(stack_lists([master_lines, repo_lines], incremental=1,
+				remember_source_file=True, warn_for_unmatched_removal=True,
+				strict_warn_for_unmatched_removal=strict_umatched_removal))
 			if not repo.masters:
 				lines.append(stack_lists([repo_lines], incremental=1,
 					remember_source_file=True, warn_for_unmatched_removal=True,

[gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/_config/

[Zac Medico]

commit:     caede8f642482b923c2d5ae7e630494dae849d4e
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  9 19:08:55 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Oct  9 19:08:55 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=caede8f6

Revert "MaskManager: Fix stacking of lines from master repositories."

This reverts commit 37f05a23fd55b633674f91f4d7658c19e41d2d63.
Reverting all masters recursion code for now (see bug #386569).

---
 pym/portage/package/ebuild/_config/MaskManager.py |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/pym/portage/package/ebuild/_config/MaskManager.py b/pym/portage/package/ebuild/_config/MaskManager.py
index 8bcaf7a..df93e10 100644
--- a/pym/portage/package/ebuild/_config/MaskManager.py
+++ b/pym/portage/package/ebuild/_config/MaskManager.py
@@ -43,12 +43,11 @@ class MaskManager(object):
 		for repo in repositories.repos_with_profiles():
 			lines = []
 			repo_lines = grab_pmask(repo.location)
-			master_lines = []
 			for master in repo.masters:
-				master_lines.extend(grab_pmask(master.location))
-			lines.append(stack_lists([master_lines, repo_lines], incremental=1,
-				remember_source_file=True, warn_for_unmatched_removal=True,
-				strict_warn_for_unmatched_removal=strict_umatched_removal))
+				master_lines = grab_pmask(master.location)
+				lines.append(stack_lists([master_lines, repo_lines], incremental=1,
+					remember_source_file=True, warn_for_unmatched_removal=True,
+					strict_warn_for_unmatched_removal=strict_umatched_removal))
 			if not repo.masters:
 				lines.append(stack_lists([repo_lines], incremental=1,
 					remember_source_file=True, warn_for_unmatched_removal=True,

[gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/_config/

[Zac Medico]

commit:     c5d2d4c32f0745f30e0cad2e427e79064f93c593
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 10 01:40:32 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Oct 10 01:40:32 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=c5d2d4c3

MaskManager: fix "Unmatched removal", bug #386569

---
 pym/portage/package/ebuild/_config/MaskManager.py |   45 ++++++++++++++++++--
 1 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/pym/portage/package/ebuild/_config/MaskManager.py b/pym/portage/package/ebuild/_config/MaskManager.py
index df93e10..08acf92 100644
--- a/pym/portage/package/ebuild/_config/MaskManager.py
+++ b/pym/portage/package/ebuild/_config/MaskManager.py
@@ -7,7 +7,8 @@ __all__ = (
 
 from portage import os
 from portage.dep import ExtendedAtomDict, match_from_list, _repo_separator, _slot_separator
-from portage.util import append_repo, grabfile_package, stack_lists
+from portage.localization import _
+from portage.util import append_repo, grabfile_package, stack_lists, writemsg
 from portage.versions import cpv_getkey
 from _emerge.Package import Package
 
@@ -43,14 +44,48 @@ class MaskManager(object):
 		for repo in repositories.repos_with_profiles():
 			lines = []
 			repo_lines = grab_pmask(repo.location)
+			removals = frozenset(line[0][1:] for line in repo_lines
+				if line[0][:1] == "-")
+			matched_removals = set()
 			for master in repo.masters:
 				master_lines = grab_pmask(master.location)
+				for line in master_lines:
+					if line[0] in removals:
+						matched_removals.add(line[0])
+				# Since we don't stack masters recursively, there aren't any
+				# atoms earlier in the stack to be matched by negative atoms in
+				# master_lines. Also, repo_lines may contain negative atoms
+				# that are intended to negate atoms from a different master
+				# than the one with which we are currently stacking. Therefore,
+				# we disable warn_for_unmatched_removal here (see bug #386569).
 				lines.append(stack_lists([master_lines, repo_lines], incremental=1,
-					remember_source_file=True, warn_for_unmatched_removal=True,
-					strict_warn_for_unmatched_removal=strict_umatched_removal))
-			if not repo.masters:
+					remember_source_file=True, warn_for_unmatched_removal=False))
+
+			# It's safe to warn for unmatched removal if masters have not
+			# been overridden by the user, which is guaranteed when
+			# user_config is false (when called by repoman).
+			if repo.masters:
+				unmatched_removals = removals.difference(matched_removals)
+				if unmatched_removals and not user_config:
+					source_file = os.path.join(repo.location,
+						"profiles", "package.mask")
+					unmatched_removals = list(unmatched_removals)
+					if len(unmatched_removals) > 3:
+						writemsg(
+							_("--- Unmatched removal atoms in %s: %s and %s more\n") %
+							(source_file,
+							", ".join("-" + x for x in unmatched_removals[:3]),
+							len(unmatched_removals) - 3), noiselevel=-1)
+					else:
+						writemsg(
+							_("--- Unmatched removal atom(s) in %s: %s\n") %
+							(source_file,
+							", ".join("-" + x for x in unmatched_removals)),
+							noiselevel=-1)
+
+			else:
 				lines.append(stack_lists([repo_lines], incremental=1,
-					remember_source_file=True, warn_for_unmatched_removal=True,
+					remember_source_file=True, warn_for_unmatched_removal=not user_config,
 					strict_warn_for_unmatched_removal=strict_umatched_removal))
 			repo_pkgmasklines.extend(append_repo(stack_lists(lines), repo.name, remember_source_file=True))
 

[gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/_config/

[Zac Medico]

commit:     30e5cfa6c706c02e9920deda543b7faf29733e0b
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 27 17:22:33 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu Oct 27 17:22:33 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=30e5cfa6

LocationsManager: portage-1-compat warnings.warn

---
 .../package/ebuild/_config/LocationsManager.py     |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pym/portage/package/ebuild/_config/LocationsManager.py b/pym/portage/package/ebuild/_config/LocationsManager.py
index 92c838c..a4098ba 100644
--- a/pym/portage/package/ebuild/_config/LocationsManager.py
+++ b/pym/portage/package/ebuild/_config/LocationsManager.py
@@ -6,6 +6,8 @@ __all__ = (
 )
 
 import io
+import warnings
+
 from portage import os, eapi_is_supported, _encodings, _unicode_encode
 from portage.const import CUSTOM_PROFILE_PATH, GLOBAL_CONFIG_PATH, \
 	PROFILE_PATH, USER_CONFIG_PATH
@@ -120,7 +122,7 @@ class LocationsManager(object):
 			offenders = sorted(x for x in offenders
 				if os.path.isdir(os.path.join(currentPath, x)))
 			if offenders:
-				writemsg((_("Profile '%(profile_path)s' in repository "
+				warnings.warn((_("Profile '%(profile_path)s' in repository "
 					"'%(repo_name)s' is implicitly using 'portage-1' profile format, but "
 					"the repository profiles are not marked as that format.  This will break "
 					"in the future.  Please either convert the following paths "
@@ -128,7 +130,7 @@ class LocationsManager(object):
 					"repositories layout.conf.  Files: '%(files)s'\n")
 					% dict(profile_path=currentPath, repo_name=repo_loc,
 						files=', '.join(offenders))),
-					noiselevel=-1)
+					)
 
 		parentsFile = os.path.join(currentPath, "parent")
 		eapi_file = os.path.join(currentPath, "eapi")

[gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/_config/

[Zac Medico]

commit:     985ddf279d8a26a848ddbc3d10a9a77b16d3af22
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 27 18:49:20 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu Oct 27 18:49:20 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=985ddf27

LocationsManager._addProfile: realpath parents

If it seems that a parent may point outside of the current repo,
realpath it.

---
 .../package/ebuild/_config/LocationsManager.py     |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/pym/portage/package/ebuild/_config/LocationsManager.py b/pym/portage/package/ebuild/_config/LocationsManager.py
index debabed..0ab0950 100644
--- a/pym/portage/package/ebuild/_config/LocationsManager.py
+++ b/pym/portage/package/ebuild/_config/LocationsManager.py
@@ -108,6 +108,7 @@ class LocationsManager(object):
 	def _addProfile(self, currentPath, known_repos):
 		current_abs_path = os.path.abspath(currentPath)
 		allow_directories = True
+		repo_loc = None
 		compat_mode = False
 		intersecting_repos = [x for x in known_repos if current_abs_path.startswith(x[0])]
 		if intersecting_repos:
@@ -158,8 +159,16 @@ class LocationsManager(object):
 				raise ParseError(
 					_("Empty parent file: '%s'") % parentsFile)
 			for parentPath in parents:
+				abs_parent = parentPath[:1] == os.sep
 				parentPath = normalize_path(os.path.join(
 					currentPath, parentPath))
+
+				if abs_parent or repo_loc is None or \
+					not parentPath.startswith(repo_loc):
+					# It seems that this parent may point outside
+					# of the current repo, so realpath it.
+					parentPath = os.path.realpath(parentPath)
+
 				if os.path.exists(parentPath):
 					self._addProfile(parentPath, known_repos)
 				else:

[gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/_config/

[Zac Medico]

commit:     fb07ebafca678357afebbba2da284e22be7e625d
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 28 01:45:19 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Oct 28 01:45:19 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=fb07ebaf

grab_pmask: use local repo_config reference

The previous code worked, but it looked wrong because it was using the
'repo' variable from the parent scope.

---
 pym/portage/package/ebuild/_config/MaskManager.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/pym/portage/package/ebuild/_config/MaskManager.py b/pym/portage/package/ebuild/_config/MaskManager.py
index 6b0f1c3..affa5af 100644
--- a/pym/portage/package/ebuild/_config/MaskManager.py
+++ b/pym/portage/package/ebuild/_config/MaskManager.py
@@ -46,7 +46,7 @@ class MaskManager(object):
 						"in the future.  Please either convert the following paths "
 						"to files, or add\nprofile-format = portage-1\nto the "
 						"repositories layout.conf.\n")
-						% dict(repo_name=repo.name)),
+						% dict(repo_name=repo_config.name)),
 						noiselevel=-1)
 
 			return pmask_cache[loc]

[gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/_config/

[Zac Medico]

commit:     d3acfaa3e8a61ab86edfe04e9a37c77737d9998b
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 28 02:48:16 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Oct 28 02:48:16 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=d3acfaa3

MaskManager: portage-1-compat warnings.warn

---
 .../package/ebuild/_config/LocationsManager.py     |    5 ++---
 pym/portage/package/ebuild/_config/MaskManager.py  |    7 ++++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pym/portage/package/ebuild/_config/LocationsManager.py b/pym/portage/package/ebuild/_config/LocationsManager.py
index ec3f003..244b7e0 100644
--- a/pym/portage/package/ebuild/_config/LocationsManager.py
+++ b/pym/portage/package/ebuild/_config/LocationsManager.py
@@ -136,15 +136,14 @@ class LocationsManager(object):
 			offenders = sorted(x for x in offenders
 				if os.path.isdir(os.path.join(currentPath, x)))
 			if offenders:
-				warnings.warn((_("Profile '%(profile_path)s' in repository "
+				warnings.warn(_("Profile '%(profile_path)s' in repository "
 					"'%(repo_name)s' is implicitly using 'portage-1' profile format, but "
 					"the repository profiles are not marked as that format.  This will break "
 					"in the future.  Please either convert the following paths "
 					"to files, or add\nprofile-formats = portage-1\nto the "
 					"repositories layout.conf.  Files: '%(files)s'\n")
 					% dict(profile_path=currentPath, repo_name=repo_loc,
-						files=', '.join(offenders))),
-					)
+						files=', '.join(offenders)))
 
 		parentsFile = os.path.join(currentPath, "parent")
 		eapi_file = os.path.join(currentPath, "eapi")

diff --git a/pym/portage/package/ebuild/_config/MaskManager.py b/pym/portage/package/ebuild/_config/MaskManager.py
index affa5af..64a1c5e 100644
--- a/pym/portage/package/ebuild/_config/MaskManager.py
+++ b/pym/portage/package/ebuild/_config/MaskManager.py
@@ -5,6 +5,8 @@ __all__ = (
 	'MaskManager',
 )
 
+import warnings
+
 from portage import os
 from portage.dep import ExtendedAtomDict, match_from_list, _repo_separator, _slot_separator
 from portage.localization import _
@@ -40,14 +42,13 @@ class MaskManager(object):
 						recursive=repo_config.portage1_profiles,
 						remember_source_file=True, verify_eapi=True)
 				if repo_config.portage1_profiles_compat and os.path.isdir(path):
-					writemsg((_("Repository '%(repo_name)s' is implicitly using "
+					warnings.warn(_("Repository '%(repo_name)s' is implicitly using "
 						"'portage-1' profile format in its profiles/package.mask, but "
 						"the repository profiles are not marked as that format.  This will break "
 						"in the future.  Please either convert the following paths "
 						"to files, or add\nprofile-format = portage-1\nto the "
 						"repositories layout.conf.\n")
-						% dict(repo_name=repo_config.name)),
-						noiselevel=-1)
+						% dict(repo_name=repo_config.name))
 
 			return pmask_cache[loc]
 

[gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/_config/

[Zac Medico]

commit:     1d81304986095ff9b19f851e79e07707192a3c61
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 28 04:55:28 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Oct 28 04:55:28 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=1d813049

Fix profile-formats spelling in messages.

---
 pym/portage/package/ebuild/_config/MaskManager.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/pym/portage/package/ebuild/_config/MaskManager.py b/pym/portage/package/ebuild/_config/MaskManager.py
index 64a1c5e..bce1152 100644
--- a/pym/portage/package/ebuild/_config/MaskManager.py
+++ b/pym/portage/package/ebuild/_config/MaskManager.py
@@ -46,7 +46,7 @@ class MaskManager(object):
 						"'portage-1' profile format in its profiles/package.mask, but "
 						"the repository profiles are not marked as that format.  This will break "
 						"in the future.  Please either convert the following paths "
-						"to files, or add\nprofile-format = portage-1\nto the "
+						"to files, or add\nprofile-formats = portage-1\nto the "
 						"repositories layout.conf.\n")
 						% dict(repo_name=repo_config.name))
 

[gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/_config/

[Zac Medico]

commit:     4cf9c9eb3d11fb653695c483d0013cba8b08039a
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 30 07:15:57 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Oct 30 07:15:57 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=4cf9c9eb

_profile_node: use collections.namedtuple

---
 .../package/ebuild/_config/LocationsManager.py     |   14 +++-----------
 1 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/pym/portage/package/ebuild/_config/LocationsManager.py b/pym/portage/package/ebuild/_config/LocationsManager.py
index 244b7e0..f559bb5 100644
--- a/pym/portage/package/ebuild/_config/LocationsManager.py
+++ b/pym/portage/package/ebuild/_config/LocationsManager.py
@@ -5,6 +5,7 @@ __all__ = (
 	'LocationsManager',
 )
 
+import collections
 import io
 import warnings
 
@@ -23,17 +24,8 @@ _PORTAGE1_DIRECTORIES = frozenset([
 	'package.use', 'package.use.mask', 'package.use.force',
 	'use.mask', 'use.force'])
 
-class _profile_node(object):
-
-	__slots__ = ('location', 'portage1_directories')
-
-	def __init__(self, location, portage1_directories):
-		object.__setattr__(self, 'location', location)
-		object.__setattr__(self, 'portage1_directories', portage1_directories)
-
-	def __setattr__(self, name, value):
-		raise AttributeError("_profile_node instances are immutable",
-			self.__class__, name, value)
+_profile_node = collections.namedtuple('_profile_node',
+	'location portage1_directories')
 
 class LocationsManager(object):
 

[gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/_config/

[Zac Medico]

commit:     53ab2996f3cb76e0aa5cd5b09d70833f263ff90a
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 18 20:15:13 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Dec 18 20:15:13 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=53ab2996

whitelist COLUMNS

---
 .../package/ebuild/_config/special_env_vars.py     |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/pym/portage/package/ebuild/_config/special_env_vars.py b/pym/portage/package/ebuild/_config/special_env_vars.py
index d6ee647..c1628f7 100644
--- a/pym/portage/package/ebuild/_config/special_env_vars.py
+++ b/pym/portage/package/ebuild/_config/special_env_vars.py
@@ -36,7 +36,7 @@ environ_whitelist = []
 # environment in order to prevent sandbox from sourcing /etc/profile
 # in it's bashrc (causing major leakage).
 environ_whitelist += [
-	"ACCEPT_LICENSE", "BASH_ENV", "BUILD_PREFIX", "D",
+	"ACCEPT_LICENSE", "BASH_ENV", "BUILD_PREFIX", "COLUMNS", "D",
 	"DISTDIR", "DOC_SYMLINKS_DIR", "EAPI", "EBUILD",
 	"EBUILD_FORCE_TEST",
 	"EBUILD_PHASE", "ECLASSDIR", "ECLASS_DEPTH", "ED",

[gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/_config/

[Zac Medico]

commit:     ed4065fab76e9c12fb7dbf22d4bef42bae3c50ca
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 25 16:37:48 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Apr 25 16:37:48 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=ed4065fa

LocationsManager: empty profiles_complex on error

This prevents an IndexError in code which assumes that profiles and
profiles_complex are the same length.

---
 .../package/ebuild/_config/LocationsManager.py     |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/pym/portage/package/ebuild/_config/LocationsManager.py b/pym/portage/package/ebuild/_config/LocationsManager.py
index 8ad41f7..b114033 100644
--- a/pym/portage/package/ebuild/_config/LocationsManager.py
+++ b/pym/portage/package/ebuild/_config/LocationsManager.py
@@ -89,7 +89,8 @@ class LocationsManager(object):
 				writemsg(_("!!! Unable to parse profile: '%s'\n") % \
 					self.profile_path, noiselevel=-1)
 				writemsg("!!! ParseError: %s\n" % str(e), noiselevel=-1)
-				self.profiles = []
+				self.profiles = ()
+				self.profiles_complex = ()
 
 		if self._user_config and self.profiles:
 			custom_prof = os.path.join(

[gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/_config/

[Zac Medico]

commit:     fb9453f7466b7843c2ef6805bbeb9375de93c8ef
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 25 16:37:48 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Apr 25 16:41:08 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=fb9453f7

LocationsManager: empty profiles_complex on error

This prevents an IndexError in code which assumes that profiles and
profiles_complex are the same length.

---
 .../package/ebuild/_config/LocationsManager.py     |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/pym/portage/package/ebuild/_config/LocationsManager.py b/pym/portage/package/ebuild/_config/LocationsManager.py
index 8ad41f7..9c73612 100644
--- a/pym/portage/package/ebuild/_config/LocationsManager.py
+++ b/pym/portage/package/ebuild/_config/LocationsManager.py
@@ -90,6 +90,7 @@ class LocationsManager(object):
 					self.profile_path, noiselevel=-1)
 				writemsg("!!! ParseError: %s\n" % str(e), noiselevel=-1)
 				self.profiles = []
+				self.profiles_complex = []
 
 		if self._user_config and self.profiles:
 			custom_prof = os.path.join(

[gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/_config/

[Zac Medico]

commit:     fc591a3caf67dd73c713af698ea83b53f8c483e0
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 25 20:40:10 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Aug 25 20:40:10 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=fc591a3c

KeywordsManager: fix isStable comment

---
 .../package/ebuild/_config/KeywordsManager.py      |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/pym/portage/package/ebuild/_config/KeywordsManager.py b/pym/portage/package/ebuild/_config/KeywordsManager.py
index e42f490..d477889 100644
--- a/pym/portage/package/ebuild/_config/KeywordsManager.py
+++ b/pym/portage/package/ebuild/_config/KeywordsManager.py
@@ -112,7 +112,7 @@ class KeywordsManager(object):
 			return False
 
 		# If replacing all keywords with unstable variants would mask the
-		# package, then it's not considered stable.
+		# package, then it's considered stable.
 		unstable = []
 		for kw in mygroups:
 			if kw[:1] != "~":

[gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/_config/

[Zac Medico]

commit:     6fc7bc421beb8023fa51ca3d6e504f2565cf1635
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 29 15:51:19 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Aug 29 15:51:19 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=6fc7bc42

Blacklist IUSE_EFFECTIVE from external env.

---
 .../package/ebuild/_config/special_env_vars.py     |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/pym/portage/package/ebuild/_config/special_env_vars.py b/pym/portage/package/ebuild/_config/special_env_vars.py
index c974eb9..2505ce3 100644
--- a/pym/portage/package/ebuild/_config/special_env_vars.py
+++ b/pym/portage/package/ebuild/_config/special_env_vars.py
@@ -15,7 +15,7 @@ env_blacklist = frozenset((
 	"A", "AA", "CATEGORY", "DEPEND", "DESCRIPTION", "EAPI",
 	"EBUILD_FORCE_TEST", "EBUILD_PHASE", "EBUILD_SKIP_MANIFEST",
 	"ED", "EMERGE_FROM", "EPREFIX", "EROOT",
-	"GREP_OPTIONS", "HOMEPAGE", "INHERITED", "IUSE",
+	"GREP_OPTIONS", "HOMEPAGE", "INHERITED", "IUSE", "IUSE_EFFECTIVE",
 	"KEYWORDS", "LICENSE", "MERGE_TYPE",
 	"PDEPEND", "PF", "PKGUSE", "PORTAGE_BACKGROUND",
 	"PORTAGE_BACKGROUND_UNMERGE", "PORTAGE_BUILDIR_LOCKED",

[gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/_config/

[Arfrever Frehtes Taifersar Arahesis]

commit:     0fbd27b62a8a9a5118e167aba9eec584c8e10334
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Thu Sep  6 21:45:26 2012 +0000
Commit:     Arfrever Frehtes Taifersar Arahesis <arfrever.fta <AT> gmail <DOT> com>
CommitDate: Thu Sep  6 21:45:26 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=0fbd27b6

Update comment.

---
 pym/portage/package/ebuild/_config/UseManager.py |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/pym/portage/package/ebuild/_config/UseManager.py b/pym/portage/package/ebuild/_config/UseManager.py
index 94ff286..bf60cb2 100644
--- a/pym/portage/package/ebuild/_config/UseManager.py
+++ b/pym/portage/package/ebuild/_config/UseManager.py
@@ -32,10 +32,14 @@ class UseManager(object):
 		#	profiles
 		#--------------------------------
 		#	use.mask			_usemask_list
+		#	use.stable.mask			_usestablemask_list
 		#	use.force			_useforce_list
+		#	use.stable.force		_usestableforce_list
 		#	package.use.mask		_pusemask_list
+		#	package.use.stable.mask		_pusestablemask_list
 		#	package.use			_pkgprofileuse
 		#	package.use.force		_puseforce_list
+		#	package.use.stable.force	_pusestableforce_list
 		#--------------------------------
 		#	user config
 		#--------------------------------

[gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/_config/

[Arfrever Frehtes Taifersar Arahesis]

commit:     87c9660406126e19a29531d4e7ab0d70f1dbb3e3
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Fri Sep  7 00:46:07 2012 +0000
Commit:     Arfrever Frehtes Taifersar Arahesis <arfrever.fta <AT> gmail <DOT> com>
CommitDate: Fri Sep  7 00:46:07 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=87c96604

Support repository-specific use.stable.force, use.stable.mask,
package.use.stable.force and package.use.stable.mask in EAPI >=5.

---
 pym/portage/package/ebuild/_config/UseManager.py |   70 ++++++++++++++++-----
 1 files changed, 53 insertions(+), 17 deletions(-)

diff --git a/pym/portage/package/ebuild/_config/UseManager.py b/pym/portage/package/ebuild/_config/UseManager.py
index bf60cb2..185a14f 100644
--- a/pym/portage/package/ebuild/_config/UseManager.py
+++ b/pym/portage/package/ebuild/_config/UseManager.py
@@ -25,9 +25,13 @@ class UseManager(object):
 		#	repositories
 		#--------------------------------
 		#	use.mask			_repo_usemask_dict
+		#	use.stable.mask			_repo_usestablemask_dict
 		#	use.force			_repo_useforce_dict
+		#	use.stable.force		_repo_usestableforce_dict
 		#	package.use.mask		_repo_pusemask_dict
+		#	package.use.stable.mask		_repo_pusestablemask_dict
 		#	package.use.force		_repo_puseforce_dict
+		#	package.use.stable.force	_repo_pusestableforce_dict
 		#--------------------------------
 		#	profiles
 		#--------------------------------
@@ -43,7 +47,7 @@ class UseManager(object):
 		#--------------------------------
 		#	user config
 		#--------------------------------
-		#	package.use			_pusedict	
+		#	package.use			_pusedict
 
 		# Dynamic variables tracked by the config class
 		#--------------------------------
@@ -57,9 +61,21 @@ class UseManager(object):
 		#	puse
 
 		self._repo_usemask_dict = self._parse_repository_files_to_dict_of_tuples("use.mask", repositories)
+		self._repo_usestablemask_dict = \
+			self._parse_repository_files_to_dict_of_tuples("use.stable.mask",
+				repositories, eapi_filter=self._stable_mask_eapi_filter)
 		self._repo_useforce_dict = self._parse_repository_files_to_dict_of_tuples("use.force", repositories)
+		self._repo_usestableforce_dict = \
+			self._parse_repository_files_to_dict_of_tuples("use.stable.force",
+				repositories, eapi_filter=self._stable_mask_eapi_filter)
 		self._repo_pusemask_dict = self._parse_repository_files_to_dict_of_dicts("package.use.mask", repositories)
+		self._repo_pusestablemask_dict = \
+			self._parse_repository_files_to_dict_of_dicts("package.use.stable.mask",
+				repositories, eapi_filter=self._stable_mask_eapi_filter)
 		self._repo_puseforce_dict = self._parse_repository_files_to_dict_of_dicts("package.use.force", repositories)
+		self._repo_pusestableforce_dict = \
+			self._parse_repository_files_to_dict_of_dicts("package.use.stable.force",
+				repositories, eapi_filter=self._stable_mask_eapi_filter)
 		self._repo_puse_dict = self._parse_repository_files_to_dict_of_dicts("package.use", repositories)
 
 		self._usemask_list = self._parse_profile_files_to_tuple_of_tuples("use.mask", profiles)
@@ -154,16 +170,16 @@ class UseManager(object):
 
 		return ret
 
-	def _parse_repository_files_to_dict_of_tuples(self, file_name, repositories):
+	def _parse_repository_files_to_dict_of_tuples(self, file_name, repositories, eapi_filter=None):
 		ret = {}
 		for repo in repositories.repos_with_profiles():
-			ret[repo.name] = self._parse_file_to_tuple(os.path.join(repo.location, "profiles", file_name))
+			ret[repo.name] = self._parse_file_to_tuple(os.path.join(repo.location, "profiles", file_name), eapi_filter=eapi_filter)
 		return ret
 
-	def _parse_repository_files_to_dict_of_dicts(self, file_name, repositories):
+	def _parse_repository_files_to_dict_of_dicts(self, file_name, repositories, eapi_filter=None):
 		ret = {}
 		for repo in repositories.repos_with_profiles():
-			ret[repo.name] = self._parse_file_to_dict(os.path.join(repo.location, "profiles", file_name))
+			ret[repo.name] = self._parse_file_to_dict(os.path.join(repo.location, "profiles", file_name), eapi_filter=eapi_filter)
 		return ret
 
 	def _parse_profile_files_to_tuple_of_tuples(self, file_name, locations,
@@ -192,7 +208,15 @@ class UseManager(object):
 			repo = dep_getrepo(pkg)
 			pkg = _pkg_str(remove_slot(pkg), slot=slot, repo=repo)
 			cp = pkg.cp
+
+		try:
+			stable = pkg.stable
+		except AttributeError:
+			# KEYWORDS is unavailable (prior to "depend" phase)
+			stable = False
+
 		usemask = []
+
 		if hasattr(pkg, "repo") and pkg.repo != Package.UNKNOWN_REPO:
 			repos = []
 			try:
@@ -203,17 +227,19 @@ class UseManager(object):
 			repos.append(pkg.repo)
 			for repo in repos:
 				usemask.append(self._repo_usemask_dict.get(repo, {}))
+				if stable:
+					usemask.append(self._repo_usestablemask_dict.get(repo, {}))
 				cpdict = self._repo_pusemask_dict.get(repo, {}).get(cp)
 				if cpdict:
 					pkg_usemask = ordered_by_atom_specificity(cpdict, pkg)
 					if pkg_usemask:
 						usemask.extend(pkg_usemask)
-	
-		try:
-			stable = pkg.stable
-		except AttributeError:
-			# KEYWORDS is unavailable (prior to "depend" phase)
-			stable = False
+				if stable:
+					cpdict = self._repo_pusestablemask_dict.get(repo, {}).get(cp)
+					if cpdict:
+						pkg_usemask = ordered_by_atom_specificity(cpdict, pkg)
+						if pkg_usemask:
+							usemask.extend(pkg_usemask)
 
 		for i, pusemask_dict in enumerate(self._pusemask_list):
 			if self._usemask_list[i]:
@@ -242,7 +268,15 @@ class UseManager(object):
 		cp = getattr(pkg, "cp", None)
 		if cp is None:
 			cp = cpv_getkey(remove_slot(pkg))
+
+		try:
+			stable = pkg.stable
+		except AttributeError:
+			# KEYWORDS is unavailable (prior to "depend" phase)
+			stable = False
+
 		useforce = []
+
 		if hasattr(pkg, "repo") and pkg.repo != Package.UNKNOWN_REPO:
 			repos = []
 			try:
@@ -253,17 +287,19 @@ class UseManager(object):
 			repos.append(pkg.repo)
 			for repo in repos:
 				useforce.append(self._repo_useforce_dict.get(repo, {}))
+				if stable:
+					useforce.append(self._repo_usestableforce_dict.get(repo, {}))
 				cpdict = self._repo_puseforce_dict.get(repo, {}).get(cp)
 				if cpdict:
 					pkg_useforce = ordered_by_atom_specificity(cpdict, pkg)
 					if pkg_useforce:
 						useforce.extend(pkg_useforce)
-
-		try:
-			stable = pkg.stable
-		except AttributeError:
-			# KEYWORDS is unavailable (prior to "depend" phase)
-			stable = False
+				if stable:
+					cpdict = self._repo_pusestableforce_dict.get(repo, {}).get(cp)
+					if cpdict:
+						pkg_useforce = ordered_by_atom_specificity(cpdict, pkg)
+						if pkg_useforce:
+							useforce.extend(pkg_useforce)
 
 		for i, puseforce_dict in enumerate(self._puseforce_list):
 			if self._useforce_list[i]:

[gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/_config/

[Zac Medico]

commit:     a2076bfb144b7cf23d9c21da0ceb557e18e9cb95
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  7 20:52:03 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Sep  7 20:52:03 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=a2076bfb

UseManager: add compat code for getUseForce/PUSE

Similar code was added to getUseMask in commit
af50fee789e71c1fff0b405db4cf55b618b73466.

---
 pym/portage/package/ebuild/_config/UseManager.py |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/pym/portage/package/ebuild/_config/UseManager.py b/pym/portage/package/ebuild/_config/UseManager.py
index 185a14f..a359e00 100644
--- a/pym/portage/package/ebuild/_config/UseManager.py
+++ b/pym/portage/package/ebuild/_config/UseManager.py
@@ -10,7 +10,7 @@ from portage import os
 from portage.dep import dep_getrepo, dep_getslot, ExtendedAtomDict, remove_slot, _get_useflag_re
 from portage.localization import _
 from portage.util import grabfile, grabdict_package, read_corresponding_eapi_file, stack_lists, writemsg
-from portage.versions import cpv_getkey, _pkg_str
+from portage.versions import _pkg_str
 
 from portage.package.ebuild._config.helper import ordered_by_atom_specificity
 
@@ -267,7 +267,10 @@ class UseManager(object):
 
 		cp = getattr(pkg, "cp", None)
 		if cp is None:
-			cp = cpv_getkey(remove_slot(pkg))
+			slot = dep_getslot(pkg)
+			repo = dep_getrepo(pkg)
+			pkg = _pkg_str(remove_slot(pkg), slot=slot, repo=repo)
+			cp = pkg.cp
 
 		try:
 			stable = pkg.stable
@@ -323,7 +326,10 @@ class UseManager(object):
 	def getPUSE(self, pkg):
 		cp = getattr(pkg, "cp", None)
 		if cp is None:
-			cp = cpv_getkey(remove_slot(pkg))
+			slot = dep_getslot(pkg)
+			repo = dep_getrepo(pkg)
+			pkg = _pkg_str(remove_slot(pkg), slot=slot, repo=repo)
+			cp = pkg.cp
 		ret = ""
 		cpdict = self._pusedict.get(cp)
 		if cpdict:

[gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/_config/

[Arfrever Frehtes Taifersar Arahesis]

commit:     257a7faf60ab5670b4b2cfb3507d1a2835caaff3
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Fri Sep 21 04:30:12 2012 +0000
Commit:     Arfrever Frehtes Taifersar Arahesis <arfrever.fta <AT> gmail <DOT> com>
CommitDate: Fri Sep 21 04:30:12 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=257a7faf

Read profile EAPI earlier.

---
 .../package/ebuild/_config/LocationsManager.py     |   38 ++++++++++---------
 1 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/pym/portage/package/ebuild/_config/LocationsManager.py b/pym/portage/package/ebuild/_config/LocationsManager.py
index 365d507..2200be6 100644
--- a/pym/portage/package/ebuild/_config/LocationsManager.py
+++ b/pym/portage/package/ebuild/_config/LocationsManager.py
@@ -130,6 +130,26 @@ class LocationsManager(object):
 		allow_parent_colon = True
 		repo_loc = None
 		compat_mode = False
+
+		eapi_file = os.path.join(currentPath, "eapi")
+		f = None
+		try:
+			f = io.open(_unicode_encode(eapi_file,
+				encoding=_encodings['fs'], errors='strict'),
+				mode='r', encoding=_encodings['content'], errors='replace')
+			eapi = f.readline().strip()
+		except IOError:
+			pass
+		else:
+			if not eapi_is_supported(eapi):
+				raise ParseError(_(
+					"Profile contains unsupported "
+					"EAPI '%s': '%s'") % \
+					(eapi, os.path.realpath(eapi_file),))
+		finally:
+			if f is not None:
+				f.close()
+
 		intersecting_repos = [x for x in known_repos if current_abs_path.startswith(x[0])]
 		if intersecting_repos:
 			# protect against nested repositories.  Insane configuration, but the longest
@@ -156,24 +176,6 @@ class LocationsManager(object):
 						files=', '.join(offenders)))
 
 		parentsFile = os.path.join(currentPath, "parent")
-		eapi_file = os.path.join(currentPath, "eapi")
-		f = None
-		try:
-			f = io.open(_unicode_encode(eapi_file,
-				encoding=_encodings['fs'], errors='strict'),
-				mode='r', encoding=_encodings['content'], errors='replace')
-			eapi = f.readline().strip()
-		except IOError:
-			pass
-		else:
-			if not eapi_is_supported(eapi):
-				raise ParseError(_(
-					"Profile contains unsupported "
-					"EAPI '%s': '%s'") % \
-					(eapi, os.path.realpath(eapi_file),))
-		finally:
-			if f is not None:
-				f.close()
 		if os.path.exists(parentsFile):
 			parents = grabfile(parentsFile)
 			if not parents:

[gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/_config/

[Zac Medico]

commit:     56d2d7554ecd8dcae3d42c0862d1c3bb1cc08186
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 18 01:02:50 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu Oct 18 01:02:50 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=56d2d755

MaskManager: use _pkg_str

---
 pym/portage/package/ebuild/_config/MaskManager.py |   31 +++++++++++++-------
 1 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/pym/portage/package/ebuild/_config/MaskManager.py b/pym/portage/package/ebuild/_config/MaskManager.py
index bce1152..4f22a2a 100644
--- a/pym/portage/package/ebuild/_config/MaskManager.py
+++ b/pym/portage/package/ebuild/_config/MaskManager.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2011 Gentoo Foundation
+# Copyright 2010-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 __all__ = (
@@ -8,11 +8,10 @@ __all__ = (
 import warnings
 
 from portage import os
-from portage.dep import ExtendedAtomDict, match_from_list, _repo_separator, _slot_separator
+from portage.dep import ExtendedAtomDict, match_from_list
 from portage.localization import _
 from portage.util import append_repo, grabfile_package, stack_lists, writemsg
-from portage.versions import cpv_getkey
-from _emerge.Package import Package
+from portage.versions import _pkg_str
 
 class MaskManager(object):
 
@@ -185,12 +184,15 @@ class MaskManager(object):
 		@return: A matching atom string or None if one is not found.
 		"""
 
-		cp = cpv_getkey(cpv)
-		mask_atoms = self._pmaskdict.get(cp)
+		try:
+			cpv.slot
+		except AttributeError:
+			pkg = _pkg_str(cpv, slot=slot, repo=repo)
+		else:
+			pkg = cpv
+
+		mask_atoms = self._pmaskdict.get(pkg.cp)
 		if mask_atoms:
-			pkg = "".join((cpv, _slot_separator, slot))
-			if repo and repo != Package.UNKNOWN_REPO:
-				pkg = "".join((pkg, _repo_separator, repo))
 			pkg_list = [pkg]
 			for x in mask_atoms:
 				if not match_from_list(x, pkg_list):
@@ -219,8 +221,15 @@ class MaskManager(object):
 		@return: A matching atom string or None if one is not found.
 		"""
 
-		cp = cpv_getkey(cpv)
-		return self._getMaskAtom(cpv, slot, repo, self._punmaskdict.get(cp))
+		try:
+			cpv.slot
+		except AttributeError:
+			pkg = _pkg_str(cpv, slot=slot, repo=repo)
+		else:
+			pkg = cpv
+
+		return self._getMaskAtom(pkg, slot, repo,
+			self._punmaskdict.get(pkg.cp))
 
 
 	def getRawMaskAtom(self, cpv, slot, repo):

[gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/_config/

[Zac Medico]

commit:     61215c22e0f9b9ebf2f9ae09c23a4663febaf5b0
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 15 15:02:59 2013 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Jan 15 15:02:59 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=61215c22

Warn if 2 make.profile dirs found, bug #452176

---
 .../package/ebuild/_config/LocationsManager.py     |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/pym/portage/package/ebuild/_config/LocationsManager.py b/pym/portage/package/ebuild/_config/LocationsManager.py
index 1ca2b32..8f88e49 100644
--- a/pym/portage/package/ebuild/_config/LocationsManager.py
+++ b/pym/portage/package/ebuild/_config/LocationsManager.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2012 Gentoo Foundation
+# Copyright 2010-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 __all__ = (
@@ -73,13 +73,25 @@ class LocationsManager(object):
 		known_repos = tuple(known_repos)
 
 		if self.config_profile_path is None:
+			deprecated_profile_path = os.path.join(
+				self.config_root, 'etc', 'make.profile')
 			self.config_profile_path = \
 				os.path.join(self.config_root, PROFILE_PATH)
 			if os.path.isdir(self.config_profile_path):
 				self.profile_path = self.config_profile_path
+				if os.path.isdir(deprecated_profile_path) and not \
+					os.path.samefile(self.profile_path,
+					deprecated_profile_path):
+					# Don't warn if they refer to the same path, since
+					# that can be used for backward compatibility with
+					# old software.
+					writemsg("!!! %s\n" %
+						_("Found 2 make.profile dirs: "
+						"using '%s', ignoring '%s'") %
+						(self.profile_path, deprecated_profile_path),
+						noiselevel=-1)
 			else:
-				self.config_profile_path = \
-					os.path.join(self.config_root, 'etc', 'make.profile')
+				self.config_profile_path = deprecated_profile_path
 				if os.path.isdir(self.config_profile_path):
 					self.profile_path = self.config_profile_path
 				else:

[gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/_config/

[Zac Medico]

commit:     00d6aaac2782e52f5a261b295e84c6f452b14302
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 20 00:12:30 2013 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Jan 20 00:12:30 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=00d6aaac

isStable: handle * for repoman

---
 .../package/ebuild/_config/KeywordsManager.py      |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/pym/portage/package/ebuild/_config/KeywordsManager.py b/pym/portage/package/ebuild/_config/KeywordsManager.py
index 3e029c3..344a2d2 100644
--- a/pym/portage/package/ebuild/_config/KeywordsManager.py
+++ b/pym/portage/package/ebuild/_config/KeywordsManager.py
@@ -127,7 +127,7 @@ class KeywordsManager(object):
 			# profile, then consider it stable.
 			for kw in pgroups:
 				if kw[:1] != "~":
-					if kw in mygroups:
+					if kw in mygroups or kw == '*':
 						return True
 			return False
 

[gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/_config/

[Zac Medico]

commit:     617efacba8941af7194ab50ecfb1824db7bef823
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 20 00:44:29 2013 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Jan 20 00:44:29 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=617efacb

isStable: handle * for repoman more

---
 .../package/ebuild/_config/KeywordsManager.py      |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/pym/portage/package/ebuild/_config/KeywordsManager.py b/pym/portage/package/ebuild/_config/KeywordsManager.py
index 344a2d2..50494ad 100644
--- a/pym/portage/package/ebuild/_config/KeywordsManager.py
+++ b/pym/portage/package/ebuild/_config/KeywordsManager.py
@@ -127,7 +127,7 @@ class KeywordsManager(object):
 			# profile, then consider it stable.
 			for kw in pgroups:
 				if kw[:1] != "~":
-					if kw in mygroups or kw == '*':
+					if kw in mygroups or kw == '*' or '*' in mygroups:
 						return True
 			return False
 

[gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/_config/

[Zac Medico]

commit:     4260039c929d93e6391e2cceef9f5f3368e84021
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 20 01:28:08 2013 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Jan 20 01:28:08 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=4260039c

isStable: fix * logic for repoman

---
 .../package/ebuild/_config/KeywordsManager.py      |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/pym/portage/package/ebuild/_config/KeywordsManager.py b/pym/portage/package/ebuild/_config/KeywordsManager.py
index 50494ad..90301b0 100644
--- a/pym/portage/package/ebuild/_config/KeywordsManager.py
+++ b/pym/portage/package/ebuild/_config/KeywordsManager.py
@@ -127,8 +127,12 @@ class KeywordsManager(object):
 			# profile, then consider it stable.
 			for kw in pgroups:
 				if kw[:1] != "~":
-					if kw in mygroups or kw == '*' or '*' in mygroups:
+					if kw in mygroups or '*' in mygroups:
 						return True
+					if kw == '*':
+						for x in mygroups:
+							if kw[:1] != "~":
+								return True
 			return False
 
 	def getMissingKeywords(self,

[gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/_config/

[Zac Medico]

commit:     6cb7a5b6a72cf0601dff513fefad52ff6fb83835
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 20 01:28:08 2013 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Jan 20 01:29:55 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=6cb7a5b6

isStable: fix * logic for repoman

---
 .../package/ebuild/_config/KeywordsManager.py      |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/pym/portage/package/ebuild/_config/KeywordsManager.py b/pym/portage/package/ebuild/_config/KeywordsManager.py
index 50494ad..af606f1 100644
--- a/pym/portage/package/ebuild/_config/KeywordsManager.py
+++ b/pym/portage/package/ebuild/_config/KeywordsManager.py
@@ -127,8 +127,12 @@ class KeywordsManager(object):
 			# profile, then consider it stable.
 			for kw in pgroups:
 				if kw[:1] != "~":
-					if kw in mygroups or kw == '*' or '*' in mygroups:
+					if kw in mygroups or '*' in mygroups:
 						return True
+					if kw == '*':
+						for x in mygroups:
+							if x[:1] != "~":
+								return True
 			return False
 
 	def getMissingKeywords(self,

[gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/_config/

[Mike Frysinger]

commit:     8d7ea946b1fa85fe421d993fad08159d910a68be
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 12 00:43:09 2013 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Mar 12 00:43:09 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=8d7ea946

ebuild: reformat user error message to be a bit more readable

Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

---
 .../package/ebuild/_config/LocationsManager.py     |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/pym/portage/package/ebuild/_config/LocationsManager.py b/pym/portage/package/ebuild/_config/LocationsManager.py
index 95a7751..5057f95 100644
--- a/pym/portage/package/ebuild/_config/LocationsManager.py
+++ b/pym/portage/package/ebuild/_config/LocationsManager.py
@@ -183,14 +183,17 @@ class LocationsManager(object):
 			offenders = sorted(x for x in offenders
 				if os.path.isdir(os.path.join(currentPath, x)))
 			if offenders:
-				warnings.warn(_("Profile '%(profile_path)s' in repository "
-					"'%(repo_name)s' is implicitly using 'portage-1' profile format, but "
-					"the repository profiles are not marked as that format.  This will break "
-					"in the future.  Please either convert the following paths "
-					"to files, or add\nprofile-formats = portage-1\nto the "
-					"repositories layout.conf.  Files: '%(files)s'\n")
+				warnings.warn(_(
+					"\nThe selected profile is implicitly using the 'portage-1' format:\n"
+					"\tprofile = %(profile_path)s\n"
+					"But this repository is not using that format:\n"
+					"\trepo = %(repo_name)s\n"
+					"This will break in the future.  Please convert these dirs to files:\n"
+					"\t%(files)s\n"
+					"Or, add this line to the repository's layout.conf:\n"
+					"\tprofile-formats = portage-1")
 					% dict(profile_path=currentPath, repo_name=repo_loc,
-						files=', '.join(offenders)))
+						files='\n\t'.join(offenders)))
 
 		parentsFile = os.path.join(currentPath, "parent")
 		if exists_raise_eaccess(parentsFile):

[gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/_config/

[Arfrever Frehtes Taifersar Arahesis]

commit:     74f5333345bdcab0ec3dac6e941debec2cd6319c
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Fri Jun  7 20:31:59 2013 +0000
Commit:     Arfrever Frehtes Taifersar Arahesis <arfrever.fta <AT> gmail <DOT> com>
CommitDate: Fri Jun  7 20:31:59 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=74f53333

portage.package.ebuild._config.UseManager.UseManager.getUseAliases(): Accept pkg argument of type str.

---
 pym/portage/package/ebuild/_config/UseManager.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pym/portage/package/ebuild/_config/UseManager.py b/pym/portage/package/ebuild/_config/UseManager.py
index 8e7aaa2..0d00810 100644
--- a/pym/portage/package/ebuild/_config/UseManager.py
+++ b/pym/portage/package/ebuild/_config/UseManager.py
@@ -413,7 +413,7 @@ class UseManager(object):
 		return frozenset(stack_lists(useforce, incremental=True))
 
 	def getUseAliases(self, pkg):
-		if not eapi_has_use_aliases(pkg.eapi):
+		if hasattr(pkg, "eapi") and not eapi_has_use_aliases(pkg.eapi):
 			return {}
 
 		cp = getattr(pkg, "cp", None)

[gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/_config/

[Zac Medico]

commit:     f4cda84b0bd33775c068a37042556d339ab3adaa
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 30 05:30:17 2013 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Jul 30 05:30:17 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=f4cda84b

Exclude PORTAGE_BINPKG_FORMAT from ebuild env.

---
 pym/portage/package/ebuild/_config/special_env_vars.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pym/portage/package/ebuild/_config/special_env_vars.py b/pym/portage/package/ebuild/_config/special_env_vars.py
index 84000cd..74fedd6 100644
--- a/pym/portage/package/ebuild/_config/special_env_vars.py
+++ b/pym/portage/package/ebuild/_config/special_env_vars.py
@@ -158,7 +158,7 @@ environ_filter += [
 	"FETCHCOMMAND_RSYNC", "FETCHCOMMAND_SFTP",
 	"GENTOO_MIRRORS", "NOCONFMEM", "O",
 	"PORTAGE_BACKGROUND", "PORTAGE_BACKGROUND_UNMERGE",
-	"PORTAGE_BINHOST",
+	"PORTAGE_BINHOST", "PORTAGE_BINPKG_FORMAT",
 	"PORTAGE_BUILDDIR_LOCKED",
 	"PORTAGE_CHECKSUM_FILTER",
 	"PORTAGE_ELOG_CLASSES",

[gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/_config/

[Arfrever Frehtes Taifersar Arahesis]

commit:     d6960022b9f92380e39d6fe21453c925cf239b69
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Sat Oct 26 19:31:17 2013 +0000
Commit:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
CommitDate: Sat Oct 26 19:31:17 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=d6960022

Fix a typo.

---
 pym/portage/package/ebuild/_config/MaskManager.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pym/portage/package/ebuild/_config/MaskManager.py b/pym/portage/package/ebuild/_config/MaskManager.py
index 4f22a2a..aeb04d7 100644
--- a/pym/portage/package/ebuild/_config/MaskManager.py
+++ b/pym/portage/package/ebuild/_config/MaskManager.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2012 Gentoo Foundation
+# Copyright 2010-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 __all__ = (
@@ -46,7 +46,7 @@ class MaskManager(object):
 						"the repository profiles are not marked as that format.  This will break "
 						"in the future.  Please either convert the following paths "
 						"to files, or add\nprofile-formats = portage-1\nto the "
-						"repositories layout.conf.\n")
+						"repository's layout.conf.\n")
 						% dict(repo_name=repo_config.name))
 
 			return pmask_cache[loc]

[gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/_config/

[Zac Medico]

commit:     1d351a59a57e018e9c79a371f0cae21505c2249c
Author:     Bertrand SIMONNET <bsimonnet <AT> chromium <DOT> org>
AuthorDate: Tue Sep 30 00:12:36 2014 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Oct 24 20:07:42 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=1d351a59

Add profile-formats to profile_complex

---
 pym/portage/package/ebuild/_config/LocationsManager.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pym/portage/package/ebuild/_config/LocationsManager.py b/pym/portage/package/ebuild/_config/LocationsManager.py
index 4427f1d..8bf321c 100644
--- a/pym/portage/package/ebuild/_config/LocationsManager.py
+++ b/pym/portage/package/ebuild/_config/LocationsManager.py
@@ -31,7 +31,7 @@ _PORTAGE1_DIRECTORIES = frozenset([
 	'use.mask', 'use.force'])
 
 _profile_node = collections.namedtuple('_profile_node',
-	'location portage1_directories user_config')
+	'location portage1_directories user_config profile_formats')
 
 _allow_parent_colon = frozenset(
 	["portage-2"])
@@ -132,7 +132,7 @@ class LocationsManager(object):
 				self.user_profile_dir = custom_prof
 				self.profiles.append(custom_prof)
 				self.profiles_complex.append(
-					_profile_node(custom_prof, True, True))
+					_profile_node(custom_prof, True, True, ()))
 			del custom_prof
 
 		self.profiles = tuple(self.profiles)
@@ -151,6 +151,7 @@ class LocationsManager(object):
 		allow_parent_colon = True
 		repo_loc = None
 		compat_mode = False
+		current_formats = ()
 
 		eapi_file = os.path.join(currentPath, "eapi")
 		eapi = "0"
@@ -183,6 +184,8 @@ class LocationsManager(object):
 				layout_data['profile-formats'] == ('portage-1-compat',)
 			allow_parent_colon = any(x in _allow_parent_colon
 				for x in layout_data['profile-formats'])
+			current_formats = tuple(layout_data['profile-formats'])
+
 
 		if compat_mode:
 			offenders = _PORTAGE1_DIRECTORIES.intersection(os.listdir(currentPath))
@@ -233,7 +236,8 @@ class LocationsManager(object):
 
 		self.profiles.append(currentPath)
 		self.profiles_complex.append(
-			_profile_node(currentPath, allow_directories, False))
+			_profile_node(currentPath, allow_directories, False,
+				current_formats))
 
 	def _expand_parent_colon(self, parentsFile, parentPath,
 		repo_loc, repositories):

[gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/_config/

[Zac Medico]

commit:     3ddb56254c02b034939b8c28f4d49a7d1eb7615d
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 24 23:17:23 2014 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Nov  2 17:49:23 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=3ddb5625

LocationsManager: enable user package.bashrc

In /etc/portage/profile, we already have support for using directories
in the place of regular config files (portage1_directories = True). So,
go ahead and enable package.bashrc there too.

We could also support /etc/portage/package.bashrc, but that would be
more complicated since /etc/portage/bashrc is the long-standing location
of the user's bashrc which applies to all packages, and package.bashrc
would instead expect /etc/portage/bashrc to be a directory containing
per-package bashrc files. So for now, we only support package.bashrc
inside /etc/portage/profile.

Note that since /etc/portage/profile is not part of a repository,
there's no associated layout.conf. So, there's no way to enable the
profile-env profile-formats setting in /etc/portage/profile, except by
hardcoding.

Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
Acked-by: Brian Dolbec <dolsen <AT> gentoo.org>

---
 pym/portage/package/ebuild/_config/LocationsManager.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pym/portage/package/ebuild/_config/LocationsManager.py b/pym/portage/package/ebuild/_config/LocationsManager.py
index 8bf321c..6280a42 100644
--- a/pym/portage/package/ebuild/_config/LocationsManager.py
+++ b/pym/portage/package/ebuild/_config/LocationsManager.py
@@ -132,7 +132,8 @@ class LocationsManager(object):
 				self.user_profile_dir = custom_prof
 				self.profiles.append(custom_prof)
 				self.profiles_complex.append(
-					_profile_node(custom_prof, True, True, ()))
+					_profile_node(custom_prof, True, True,
+					('profile-bashrcs',)))
 			del custom_prof
 
 		self.profiles = tuple(self.profiles)

[gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/_config/

[Arfrever Frehtes Taifersar Arahesis]

commit:     10d19623c5a3aabe00d502029a454f49f72983d1
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Sat Dec 13 06:34:29 2014 +0000
Commit:     Arfrever Frehtes Taifersar Arahesis <arfrever <AT> apache <DOT> org>
CommitDate: Sat Dec 13 06:34:29 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=10d19623

Blacklist _ variable.

---
 pym/portage/package/ebuild/_config/special_env_vars.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pym/portage/package/ebuild/_config/special_env_vars.py b/pym/portage/package/ebuild/_config/special_env_vars.py
index 387f4ae..6bb3c95 100644
--- a/pym/portage/package/ebuild/_config/special_env_vars.py
+++ b/pym/portage/package/ebuild/_config/special_env_vars.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2013 Gentoo Foundation
+# Copyright 2010-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 from __future__ import unicode_literals
@@ -27,7 +27,7 @@ env_blacklist = frozenset((
 	"PORTAGE_INTERNAL_CALLER", "PORTAGE_IUSE",
 	"PORTAGE_NONFATAL", "PORTAGE_PIPE_FD", "PORTAGE_REPO_NAME",
 	"PORTAGE_USE", "PROPERTIES", "PROVIDE", "RDEPEND", "REPOSITORY",
-	"RESTRICT", "ROOT", "SLOT", "SRC_URI"
+	"RESTRICT", "ROOT", "SLOT", "SRC_URI", "_"
 ))
 
 environ_whitelist = []

[gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/_config/

[Arfrever Frehtes Taifersar Arahesis]

commit:     5ea789a0e740303858f8f8a72dc538eb87d6df1c
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Mon Nov 30 23:25:42 2015 +0000
Commit:     Arfrever Frehtes Taifersar Arahesis <arfrever <AT> apache <DOT> org>
CommitDate: Mon Nov 30 23:25:42 2015 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=5ea789a0

portage.package.ebuild._config.LicenseManager.LicenseManager._getPkgAcceptLicense(): Fix typo in call to hasattr().

 pym/portage/package/ebuild/_config/LicenseManager.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pym/portage/package/ebuild/_config/LicenseManager.py b/pym/portage/package/ebuild/_config/LicenseManager.py
index f76e7e2..1d4e082 100644
--- a/pym/portage/package/ebuild/_config/LicenseManager.py
+++ b/pym/portage/package/ebuild/_config/LicenseManager.py
@@ -1,4 +1,4 @@
-# Copyright 201-2012 Gentoo Foundation
+# Copyright 2010-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 __all__ = (
@@ -119,7 +119,7 @@ class LicenseManager(object):
 		cp = cpv_getkey(cpv)
 		cpdict = self._plicensedict.get(cp)
 		if cpdict:
-			if not hasattr(cpv, slot):
+			if not hasattr(cpv, "slot"):
 				cpv = _pkg_str(cpv, slot=slot, repo=repo)
 			plicence_list = ordered_by_atom_specificity(cpdict, cpv)
 			if plicence_list:

[gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/_config/

[Zac Medico]

commit:     9c819f72399d4fdae731883d9d915aa824d30fcc
Author:     lihan <tclh123 <AT> gmail <DOT> com>
AuthorDate: Fri Aug  4 08:32:17 2017 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Aug  5 20:21:14 2017 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=9c819f72

config: allow_build_id=True for user config keywords and use

Fixes: c6e3af2b1e41 ("binpkg-multi-instance 7 of 7")
Closes: https://github.com/gentoo/portage/pull/185

 pym/portage/package/ebuild/_config/KeywordsManager.py | 4 ++--
 pym/portage/package/ebuild/_config/UseManager.py      | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pym/portage/package/ebuild/_config/KeywordsManager.py b/pym/portage/package/ebuild/_config/KeywordsManager.py
index a4ffb623e..fd0a6318d 100644
--- a/pym/portage/package/ebuild/_config/KeywordsManager.py
+++ b/pym/portage/package/ebuild/_config/KeywordsManager.py
@@ -57,12 +57,12 @@ class KeywordsManager(object):
 			pkgdict = grabdict_package(
 				os.path.join(abs_user_config, "package.keywords"),
 				recursive=1, allow_wildcard=True, allow_repo=True,
-				verify_eapi=False)
+				verify_eapi=False, allow_build_id=True)
 
 			for k, v in grabdict_package(
 				os.path.join(abs_user_config, "package.accept_keywords"),
 				recursive=1, allow_wildcard=True, allow_repo=True,
-				verify_eapi=False).items():
+				verify_eapi=False, allow_build_id=True).items():
 				pkgdict.setdefault(k, []).extend(v)
 
 			accept_keywords_defaults = global_accept_keywords.split()

diff --git a/pym/portage/package/ebuild/_config/UseManager.py b/pym/portage/package/ebuild/_config/UseManager.py
index 604180214..9ebd0f3ab 100644
--- a/pym/portage/package/ebuild/_config/UseManager.py
+++ b/pym/portage/package/ebuild/_config/UseManager.py
@@ -239,7 +239,10 @@ class UseManager(object):
 		ret = ExtendedAtomDict(dict)
 		if user_config:
 			pusedict = grabdict_package(
-				os.path.join(location, file_name), recursive=1, newlines=1, allow_wildcard=True, allow_repo=True, verify_eapi=False)
+				os.path.join(location, file_name),
+				recursive=1, newlines=1, allow_wildcard=True,
+				allow_repo=True, verify_eapi=False,
+				allow_build_id=True)
 			for k, v in pusedict.items():
 				l = []
 				use_expand_prefix = ''

[gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/_config/

[Zac Medico]

commit:     ef13bd2f3e48cb6b9f6f2a0e093768aea5f7b3b7
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  2 08:25:54 2017 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Sep  2 08:26:34 2017 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=ef13bd2f

config/env_blacklist: add REQUIRED_USE

Reported-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>

 pym/portage/package/ebuild/_config/special_env_vars.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pym/portage/package/ebuild/_config/special_env_vars.py b/pym/portage/package/ebuild/_config/special_env_vars.py
index 13da64008..490b62d36 100644
--- a/pym/portage/package/ebuild/_config/special_env_vars.py
+++ b/pym/portage/package/ebuild/_config/special_env_vars.py
@@ -27,7 +27,7 @@ env_blacklist = frozenset((
 	"PORTAGE_INTERNAL_CALLER", "PORTAGE_IUSE",
 	"PORTAGE_NONFATAL", "PORTAGE_PIPE_FD", "PORTAGE_REPO_NAME",
 	"PORTAGE_USE", "PROPERTIES", "PROVIDE", "RDEPEND", "REPOSITORY",
-	"RESTRICT", "ROOT", "SLOT", "SRC_URI", "_"
+	"REQUIRED_USE", "RESTRICT", "ROOT", "SLOT", "SRC_URI", "_"
 ))
 
 environ_whitelist = []

[gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/_config/

[Zac Medico]

commit:     98a5a0a6031f5930ed54ba8305fc4faf694400b6
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  2 16:53:46 2017 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Sep  2 16:53:46 2017 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=98a5a0a6

config/env_blacklist: add DOCS (bug 627106)

DOCS is used by default_src_install.

X-Gentoo-bug: 627106
X-Gentoo-bug-url: https://bugs.gentoo.org/627106

 pym/portage/package/ebuild/_config/special_env_vars.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pym/portage/package/ebuild/_config/special_env_vars.py b/pym/portage/package/ebuild/_config/special_env_vars.py
index 490b62d36..1753c8b92 100644
--- a/pym/portage/package/ebuild/_config/special_env_vars.py
+++ b/pym/portage/package/ebuild/_config/special_env_vars.py
@@ -14,7 +14,7 @@ import re
 # to enter the config instance from the external environment or
 # configuration files.
 env_blacklist = frozenset((
-	"A", "AA", "CATEGORY", "DEPEND", "DESCRIPTION", "EAPI",
+	"A", "AA", "CATEGORY", "DEPEND", "DESCRIPTION", "DOCS", "EAPI",
 	"EBUILD_FORCE_TEST", "EBUILD_PHASE",
 	"EBUILD_PHASE_FUNC", "EBUILD_SKIP_MANIFEST",
 	"ED", "EMERGE_FROM", "EPREFIX", "EROOT",

[gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/_config/

[Zac Medico]

commit:     cd7364fbbb048564c2714d8a08df1ecbdc9cfe6e
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Thu May  3 20:27:59 2018 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu May  3 20:33:27 2018 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=cd7364fb

special_env_vars: add ESYSROOT and SYSROOT to environ_whitelist

Since these variables are filtered from the peristent ebuild environment
by the __filter_readonly_variables function, they have to be whitelisted
so that the config.environ() method allow them to pass through.

Fixes: a41dacf7926c ("Export SYSROOT and ESYSROOT in ebuild env in EAPI 7")
Reported-by: James Le Cuirot <chewi <AT> gentoo.org>

 pym/portage/package/ebuild/_config/special_env_vars.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pym/portage/package/ebuild/_config/special_env_vars.py b/pym/portage/package/ebuild/_config/special_env_vars.py
index 3323ff064..a308518af 100644
--- a/pym/portage/package/ebuild/_config/special_env_vars.py
+++ b/pym/portage/package/ebuild/_config/special_env_vars.py
@@ -46,7 +46,7 @@ environ_whitelist += [
 	"DISTDIR", "DOC_SYMLINKS_DIR", "EAPI", "EBUILD",
 	"EBUILD_FORCE_TEST",
 	"EBUILD_PHASE", "EBUILD_PHASE_FUNC", "ECLASSDIR", "ECLASS_DEPTH", "ED",
-	"EMERGE_FROM", "EPREFIX", "EROOT",
+	"EMERGE_FROM", "EPREFIX", "EROOT", "ESYSROOT",
 	"FEATURES", "FILESDIR", "HOME", "MERGE_TYPE", "NOCOLOR", "PATH",
 	"PKGDIR",
 	"PKGUSE", "PKG_LOGDIR", "PKG_TMPDIR",
@@ -77,7 +77,7 @@ environ_whitelist += [
 	"PORTAGE_VERBOSE", "PORTAGE_WORKDIR_MODE", "PORTAGE_XATTR_EXCLUDE",
 	"PORTDIR", "PORTDIR_OVERLAY", "PREROOTPATH", "PYTHONDONTWRITEBYTECODE",
 	"REPLACING_VERSIONS", "REPLACED_BY_VERSION",
-	"ROOT", "ROOTPATH", "T", "TMP", "TMPDIR",
+	"ROOT", "ROOTPATH", "SYSROOT", "T", "TMP", "TMPDIR",
 	"USE_EXPAND", "USE_ORDER", "WORKDIR",
 	"XARGS", "__PORTAGE_TEST_HARDLINK_LOCKS",
 ]

[gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/_config/

[Zac Medico]

commit:     b69a756099973abbf9719717ea3726519b32ce60
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Thu May  3 23:00:35 2018 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu May  3 23:08:47 2018 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=b69a7560

LocationsManager: fix SYSROOT normalization to handle empty SYSROOT

This issue was exposed when building portage-2.3.34 with USE="epydoc"
enabled, since epydoc triggers instantiation of portage.settings.
The empty SYSROOT change for bug 654600 (in commit
1b5110557d1dd725f7c12bbed4b7ceaaec29f2a3) triggered incorrect
normalization behavior here.

Fixes: a41dacf7926c ("Export SYSROOT and ESYSROOT in ebuild env in EAPI 7")

 pym/portage/package/ebuild/_config/LocationsManager.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pym/portage/package/ebuild/_config/LocationsManager.py b/pym/portage/package/ebuild/_config/LocationsManager.py
index b57443ba7..f7d7209ff 100644
--- a/pym/portage/package/ebuild/_config/LocationsManager.py
+++ b/pym/portage/package/ebuild/_config/LocationsManager.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2014 Gentoo Foundation
+# Copyright 2010-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 from __future__ import unicode_literals
@@ -69,7 +69,7 @@ class LocationsManager(object):
 		if self.sysroot is None:
 			self.sysroot = "/"
 		else:
-			self.sysroot = normalize_path(os.path.abspath(self.sysroot)).rstrip(os.sep) + os.sep
+			self.sysroot = normalize_path(os.path.abspath(self.sysroot or os.sep)).rstrip(os.sep) + os.sep
 
 		self.esysroot = self.sysroot.rstrip(os.sep) + self.eprefix + os.sep