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

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

[Zac Medico]

commit:     e2992bf17858032c41f60d1936e44b2f899ed267
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  7 04:35:45 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu Jul  7 04:35:45 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=e2992bf1

digestcheck: support allow-missing-manifests

Also, update the man page.

---
 man/make.conf.5                           |    4 ++++
 pym/portage/package/ebuild/digestcheck.py |    9 +++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index 92a29d7..5206f2e 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -198,6 +198,10 @@ non-developers as well. The \fBsandbox\fR feature is very important and
 should not be disabled by default.
 .RS
 .TP
+.B allow\-missing\-manifests
+Allow missing manifest entries. This primarily useful for temporary
+trees or instances where manifests aren't used.
+.TP
 .B assume\-digests
 When commiting work to cvs with \fBrepoman\fR(1), assume that all existing 
 SRC_URI digests are correct.  This feature also affects digest generation via

diff --git a/pym/portage/package/ebuild/digestcheck.py b/pym/portage/package/ebuild/digestcheck.py
index 68ce1f5..e4432f1 100644
--- a/pym/portage/package/ebuild/digestcheck.py
+++ b/pym/portage/package/ebuild/digestcheck.py
@@ -28,6 +28,7 @@ def digestcheck(myfiles, mysettings, strict=False, justmanifest=None):
 
 	if mysettings.get("EBUILD_SKIP_MANIFEST") == "1":
 		return 1
+	allow_missing = "allow-missing-manifests" in mysettings.features
 	pkgdir = mysettings["O"]
 	manifest_path = os.path.join(pkgdir, "Manifest")
 	if not os.path.exists(manifest_path):
@@ -86,6 +87,10 @@ def digestcheck(myfiles, mysettings, strict=False, justmanifest=None):
 		writemsg(_("!!! Got: %s\n") % e.value[2], noiselevel=-1)
 		writemsg(_("!!! Expected: %s\n") % e.value[3], noiselevel=-1)
 		return 0
+	if allow_missing:
+		# In this case we ignore any missing digests that
+		# would otherwise be detected below.
+		return 1
 	# Make sure that all of the ebuilds are actually listed in the Manifest.
 	for f in os.listdir(pkgdir):
 		pf = None
@@ -96,8 +101,8 @@ def digestcheck(myfiles, mysettings, strict=False, justmanifest=None):
 				os.path.join(pkgdir, f), noiselevel=-1)
 			if strict:
 				return 0
-	""" epatch will just grab all the patches out of a directory, so we have to
-	make sure there aren't any foreign files that it might grab."""
+	# epatch will just grab all the patches out of a directory, so we have to
+	# make sure there aren't any foreign files that it might grab.
 	filesdir = os.path.join(pkgdir, "files")
 
 	for parent, dirs, files in os.walk(filesdir):

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

[Zac Medico]

commit:     ac77fac359701c4f3a24c8e546f7a4d90adbd6d8
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Wed May  9 22:23:24 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed May  9 22:23:24 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=ac77fac3

Refer to bug #402167 where appropriate.

---
 man/repoman.1                               |    2 +-
 pym/portage/package/ebuild/_eapi_invalid.py |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/man/repoman.1 b/man/repoman.1
index 4305ce7..49e5afa 100644
--- a/man/repoman.1
+++ b/man/repoman.1
@@ -147,7 +147,7 @@ Ebuilds that have a missing or empty DESCRIPTION variable
 .TP
 .B EAPI.definition
 EAPI definition does not conform to PMS section 7.3.1 (first
-non\-comment, non\-blank line)
+non\-comment, non\-blank line). See bug #402167.
 .TP
 .B EAPI.deprecated
 Ebuilds that use features that are deprecated in the current EAPI

diff --git a/pym/portage/package/ebuild/_eapi_invalid.py b/pym/portage/package/ebuild/_eapi_invalid.py
index 50a6978..1ee8a8b 100644
--- a/pym/portage/package/ebuild/_eapi_invalid.py
+++ b/pym/portage/package/ebuild/_eapi_invalid.py
@@ -12,7 +12,7 @@ def eapi_invalid(self, cpv, repo_name, settings,
 
 	msg = []
 	msg.extend(textwrap.wrap(("EAPI assignment in ebuild '%s%s%s' does not"
-		" conform with PMS section 7.3.1:") %
+		" conform with PMS section 7.3.1 (see bug #402167):") %
 		(cpv, _repo_separator, repo_name), 70))
 
 	if not eapi_parsed:

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

[Michał Górny]

commit:     e3366b392c76249ead2ef947b275eb5bba99bc1e
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  5 16:25:58 2014 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jan 12 16:11:42 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=e3366b39

Allow virtuals in package.provided

With new-style virtuals, there is no reason to enforce special rules to
virtuals in package.provided. If user wishes to implicitly provide
the virual package, we should not forbid him. Of course, he knows
the implications.

Reviewed-By: Zac Medico <zmedico <AT> gentoo.org>

---
 man/portage.5                        | 7 -------
 pym/portage/package/ebuild/config.py | 6 ------
 2 files changed, 13 deletions(-)

diff --git a/man/portage.5 b/man/portage.5
index ed0423f..f0b0e20 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -419,13 +419,6 @@ entries may cause installed packages satisfying equivalent dependencies
 to be removed by \fBemerge\fR(1) \fB\-\-depclean\fR actions (see the
 \fBACTIONS\fR section of the \fBemerge\fR(1) man page for more information).
 
-Virtual packages (virtual/*) should not be specified in package.provided,
-since virtual packages themselves do not provide any files, and
-package.provided is intended to represent packages that do provide files.
-Depending on the type of virtual, it may be necessary to add an entry to the
-virtuals file and/or add a package that satisfies a virtual to
-package.provided.
-
 .I Format:
 .nf
 \- comments begin with # (no inline comments)

diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py
index b7dd9ea..e119498 100644
--- a/pym/portage/package/ebuild/config.py
+++ b/pym/portage/package/ebuild/config.py
@@ -808,12 +808,6 @@ class config(object):
 					has_invalid_data = True
 					del pkgprovidedlines[x]
 					continue
-				if cpvr[0] == "virtual":
-					writemsg(_("Virtual package in package.provided: %s\n") % \
-						myline, noiselevel=-1)
-					has_invalid_data = True
-					del pkgprovidedlines[x]
-					continue
 			if has_invalid_data:
 				writemsg(_("See portage(5) for correct package.provided usage.\n"),
 					noiselevel=-1)

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

[Mike Frysinger]

commit:     d56707b9d3451810562fc1e763d4916ab02dd54e
Author:     Mike Frysinger <vapier <AT> chromium <DOT> org>
AuthorDate: Fri Jun 16 04:31:13 2017 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Jan 17 18:41:28 2018 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=d56707b9

ebuild: allow RESTRICT=network-sandbox in ebuilds

Some ebuilds are a bit hard to fix their use of the network in src
phases, so allow them to disable things.  This allows us to turn off
access by default and for the vast majority while we work out how to
fix the few broken packages.

URL: https://crbug.com/731905

 man/ebuild.5                           | 4 ++++
 pym/portage/package/ebuild/doebuild.py | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 270e47fe8..71e754d48 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -689,6 +689,10 @@ binaries that are not compatible with debugedit.
 .I mirror
 files in \fBSRC_URI\fR will not be downloaded from the \fBGENTOO_MIRRORS\fR.
 .TP
+.I network\-sandbox
+Disables the network namespace for specific packages.
+Should not be used in the main Gentoo tree.
+.TP
 .I preserve\-libs
 Disables preserve\-libs for specific packages. Note than when a package is
 merged, RESTRICT=preserve\-libs applies if either the new instance or the

diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py
index 0be148fd4..f75f11a1a 100644
--- a/pym/portage/package/ebuild/doebuild.py
+++ b/pym/portage/package/ebuild/doebuild.py
@@ -148,7 +148,8 @@ def _doebuild_spawn(phase, settings, actionmap=None, **kwargs):
 	kwargs['ipc'] = 'ipc-sandbox' not in settings.features or \
 		phase in _ipc_phases
 	kwargs['networked'] = 'network-sandbox' not in settings.features or \
-		phase in _networked_phases
+		phase in _networked_phases or \
+		'network-sandbox' in settings['PORTAGE_RESTRICT'].split()
 
 	if phase == 'depend':
 		kwargs['droppriv'] = 'userpriv' in settings.features