[gentoo-commits] proj/portage:master commit in: man/

[Alexander Berntsen]

commit: b96fb047b342d055ef2a254bbdc2960c8ad9cc6e
Author: Alexander Berntsen  gentoo  org>
AuthorDate: Sat Jun 14 21:52:48 2014 +
Commit: Alexander Berntsen  gentoo  org>
CommitDate: Sat Jun 14 21:52:48 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=b96fb047

man/emerge.1: Make the --alert example more safe

Signed-off-by: Alexander Berntsen  gentoo.org>
Suggested-by:  Steve J. Long   rathaus.eclipse.co.uk>

---
 man/emerge.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/man/emerge.1 b/man/emerge.1
index 1db41b0..e32bb43 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -306,7 +306,7 @@ finished calculating the graph.
 
 \fB--alert\fR may be 'y' or 'n'. 'true' and 'false' mean the same thing.
 Using \fB--alert\fR without an option is the same as using it with 'y'.
-Try it with 'emerge -aAC gcc'. Remember to answer \fBno\fR!
+Try it with 'emerge -aA portage'.
 
 If your terminal emulator is set up to make '\\a' into a window manager
 urgency hint, move your cursor to a different window to get the effect.

[gentoo-commits] proj/portage:master commit in: man/

[Arfrever Frehtes Taifersar Arahesis]

commit: 73f08e1840269c14879a523f7f39375bc6cc2ba0
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Fri Apr 18 21:15:13 2014 +
Commit: Arfrever Frehtes Taifersar Arahesis  apache  org>
CommitDate: Fri Apr 18 21:15:13 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=73f08e18

make.conf.5: Fix order of some paragraphs.

---
 man/make.conf.5 | 127 
 1 file changed, 63 insertions(+), 64 deletions(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index 2281014..84e894b 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -1,4 +1,4 @@
-.TH "MAKE.CONF" "5" "Jan 2014" "Portage VERSION" "Portage"
+.TH "MAKE.CONF" "5" "Apr 2014" "Portage VERSION" "Portage"
 .SH "NAME"
 make.conf \- custom settings for Portage
 .SH "SYNOPSIS"
@@ -178,6 +178,10 @@ of \fBemerge\fR(1) for more information.
 This variable is passed by the \fIebuild scripts\fR to the \fIconfigure\fR
 as \fI\-\-target=${CTARGET}\fR only if it is defined.
 .TP
+.B DCO_SIGNED_OFF_BY
+This variable may contain a name and email address which will be used by
+\fBrepoman\fR(1) to add a Signed\-off\-by line to each commit message.
+.TP
 \fBDISTDIR\fR = \fI[path]\fR
 Defines the location of your local source file repository. After packages
 are built, it is safe to remove any and all files from this directory since
@@ -194,10 +198,6 @@ See the \fBPORTDIR\fR documentation for more information.
 .br
 Defaults to /usr/portage/distfiles.
 .TP
-.B DCO_SIGNED_OFF_BY
-This variable may contain a name and email address which will be used by
-\fBrepoman\fR(1) to add a Signed\-off\-by line to each commit message.
-.TP
 .B DOC_SYMLINKS_DIR
 If this variable contains a directory then symlinks to html documentation will
 be installed into it.
@@ -298,12 +298,6 @@ Log file names have an extension that is appropriate for 
the compression
 type. Currently, only \fBgzip\fR(1) compression is supported, so build
 logs will have a '.gz' extension when this feature is enabled.
 .TP
-.B compressdebug
-Compress the debug sections in the split debug files with zlib to save
-space.  Make sure you have built both binutils and gdb with USE=zlib
-support for this to work.  See \fBsplitdebug\fR for general split debug
-information (upon which this feature depends).
-.TP
 .B compress\-index
 If set then a compressed copy of 'Packages' index file will be written.
 This feature is intended for Gentoo binhosts using certain webservers
@@ -311,6 +305,12 @@ This feature is intended for Gentoo binhosts using certain 
webservers
 redundant on\-the\-fly compression.  The resulting file will be called
 \[aq]Packages.gz' and its modification time will match that of 'Packages'.
 .TP
+.B compressdebug
+Compress the debug sections in the split debug files with zlib to save
+space.  Make sure you have built both binutils and gdb with USE=zlib
+support for this to work.  See \fBsplitdebug\fR for general split debug
+information (upon which this feature depends).
+.TP
 .B config\-protect\-if\-modified
 This causes the \fBCONFIG_PROTECT\fR behavior to be skipped for files
 that have not been modified since they were installed. This feature is
@@ -346,10 +346,6 @@ exist). Also see the related \fIunmerge\-backup\fR feature.
 Use locks to ensure that unsandboxed ebuild phases never execute
 concurrently. Also see \fIparallel\-install\fR.
 .TP
-.B fakeroot
-Enable fakeroot for the install and package phases when a non-root user runs
-the \fBebuild\fR(1) command.
-.TP
 .B fail\-clean
 Clean up temporary files after a build failure. This is particularly useful
 if you have \fBPORTAGE_TMPDIR\fR on tmpfs. If this feature is enabled, you
@@ -357,24 +353,9 @@ probably also want to enable \fBPORT_LOGDIR\fR in order to 
save the build log.
 Both the \fBebuild\fR(1) command and the \fInoclean\fR feature cause the
 \fIfail\-clean\fR feature to be automatically disabled.
 .TP
-.B getbinpkg
-Force emerges to always try to fetch files from the \fIPORTAGE_BINHOST\fR.  See
-\fBmake.conf\fR(5) for more information.
-.TP
-.B installsources
-Install source code into /usr/src/debug/${CATEGORY}/${PF} (also see
-\fBsplitdebug\fR). This feature works only if debugedit is installed and CFLAGS
-is set to include debug information (such as with the \-ggdb flag).
-.TP
-.B keeptemp
-Do not delete the ${T} directory after the merge process.
-.TP
-.B keepwork
-Do not delete the ${WORKDIR} directory after the merge process. ${WORKDIR} can
-then be reused since this feature disables most of the clean phase that runs
-prior to each build. Due to lack of proper cleanup, this feature can
-interfere with normal emerge operation and therefore it should not be left
-enabled for more than a short period of time.
+.B fakeroot
+Enable fakeroot for the install and package phases when a non-root user runs
+the \fBebuild\fR(1) command.
 .TP
 .B fixlafiles
 Modifies .la files to not include other .la files and some other
@

[gentoo-commits] proj/portage:master commit in: man/

[Alexander Berntsen]

commit: b68e09039821286daa7f8cfc8cd353a397fd4ddd
Author: Alexander Berntsen  plaimi  net>
AuthorDate: Thu Mar 13 23:13:35 2014 +
Commit: Alexander Berntsen  gentoo  org>
CommitDate: Thu Mar 13 23:15:07 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=b68e0903

man/make.conf.5: Fix misinformation (bug 504532)

---
 man/make.conf.5 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index 80f642f..2281014 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -392,7 +392,7 @@ for all EAPIs (for obvious reasons).
 .TP
 .B ipc\-sandbox
 Isolate the ebuild phase functions from host IPC namespace. Supported
-only on Linux. Requires network namespace support in kernel.
+only on Linux. Requires IPC namespace support in kernel.
 .TP
 .B lmirror
 When \fImirror\fR is enabled in \fBFEATURES\fR, fetch files even

[gentoo-commits] proj/portage:master commit in: man/

[Brian Dolbec]

commit: 66f5190e3c44a628c01d9a554005b1debf583dc2
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Sun Jul 19 16:08:52 2015 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Mon Jul 20 21:42:28 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=66f5190e

man/make.conf.5: Document globbing for INSTALL_MASK.

The INSTALL_MASK variable has long supported shell glob patterns, but
these were not mentioned in the man page. In fact there are two
different behaviors -- one for globs that the shell can expand, and
one for "bare globs" like "*.pdf". Both of these are now documented in
the man page.

In addition, a warning and example have been added to the man page
regarding spaces within filenames (patterns).

 man/make.conf.5 | 44 
 1 file changed, 36 insertions(+), 8 deletions(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index a7417f3..13b8042 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -699,14 +699,42 @@ These variables are used by network clients such as 
\fBwget\fR(1) and
 \fBrsync\fR(1). They are only required if you use a
 proxy server for internet access.
 .TP
-\fBINSTALL_MASK\fR = \fI[space delimited list of file names]\fR
-Use this variable if you want to selectively prevent certain files from being
-copied into your file system tree.  This does not work on symlinks, but only on
-actual files.  Useful if you wish to filter out files like HACKING.gz and
-TODO.gz. The \fBINSTALL_MASK\fR is processed just before a package is merged.
-Also supported is a \fBPKG_INSTALL_MASK\fR variable that behaves exactly like
-\fBINSTALL_MASK\fR except that it is processed just before creation of a binary
-package.
+\fBINSTALL_MASK\fR = \fI[space delimited list of filename patterns (globs)]\fR
+Use this variable if you want to selectively prevent certain files
+from being copied into your file system tree.  This does not work on
+symlinks, but only on actual files. Useful if you wish to filter out
+files like HACKING.gz and TODO.gz.
+
+Patterns are matched against both the absolute path and the bare
+filename of each file (or directory) to be installed.
+
+The \fBINSTALL_MASK\fR is processed just before a package is merged.
+Also supported is a \fBPKG_INSTALL_MASK\fR variable that behaves
+exactly like \fBINSTALL_MASK\fR except that it is processed just
+before creation of a binary package.
+
+\fB***warning***\fR
+.br
+This does not place nice with filenames containing spaces. If you
+supply a pattern with a space in it, that single pattern will be
+interpreted as two separate patterns.
+
+.I Examples:
+
+.nf
+# Prevent individual files from being installed.
+INSTALL_MASK="/usr/bin/zless /usr/bin/zzxorcat"
+
+# Prevent all PDF files from being installed.
+INSTALL_MASK="*.pdf"
+
+# Block PDF files one level beneath /usr/share/doc.
+INSTALL_MASK="/usr/share/doc/*/*.pdf"
+
+# Watch out! This will be interpreted as two patterns, and
+# prevent both "README" AND all PDF files from being installed.
+INSTALL_MASK="README\\ *.pdf"
+.fi
 .TP
 .B LDFLAGS
 A list of flags to pass to the compiler when the linker will be called. See

[gentoo-commits] proj/portage:master commit in: man/

[Brian Dolbec]

commit: afea444b15c31a0cf0805c2f66b9af4d7208a374
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Sep 20 02:17:13 2015 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sun Sep 20 02:24:56 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=afea444b

man: Document repoman ci as a synonym for repoman commit

 man/repoman.1 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/man/repoman.1 b/man/repoman.1
index 59d8ca4..e2b9c66 100644
--- a/man/repoman.1
+++ b/man/repoman.1
@@ -139,6 +139,9 @@ Check Manifests for missing or incorrect digests
 .TP
 .B commit
 Scan directory tree for QA issues; if OK, commit via VCS
+.TP
+.B ci
+Synonym for commit
 .SH QA KEYWORDS
 .TP
 .B CVS/Entries.IO_error

[gentoo-commits] proj/portage:master commit in: man/

[Brian Dolbec]

commit: c62a55bcf83805b9278d976772998bc9dd18a75a
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Sep 20 02:17:12 2015 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sun Sep 20 02:24:52 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=c62a55bc

man: repoman commit: Replace reference to "cvs" with "VCS"

 man/repoman.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/man/repoman.1 b/man/repoman.1
index abd998b..59d8ca4 100644
--- a/man/repoman.1
+++ b/man/repoman.1
@@ -138,7 +138,7 @@ option if you would like to replace existing distfiles 
digests.
 Check Manifests for missing or incorrect digests
 .TP
 .B commit
-Scan directory tree for QA issues; if OK, commit via cvs
+Scan directory tree for QA issues; if OK, commit via VCS
 .SH QA KEYWORDS
 .TP
 .B CVS/Entries.IO_error

[gentoo-commits] proj/portage:master commit in: man/

[Brian Dolbec]

commit: f3a7a9aaed8a3affc56cf3cbd23f18d8a01120b1
Author: Ulrich Müller  gentoo  org>
AuthorDate: Tue Sep 22 07:15:12 2015 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Tue Sep 22 16:38:41 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=f3a7a9aa

man/ebuild.5: Update description of =* operator.

After commit d4966a381ee4577818bd972946647338046715b1
"match_from_list: restrict =* to match only on version part
boundaries" the description of the =* operator in ebuild(5) was
no longer accurate.

This reverts commit 2b1eceaf79ac667eecdf1ef9585592a235c8d93f.

 man/ebuild.5 | 9 +++--
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 6a27cc5..e60eee1 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -96,12 +96,9 @@ Example:
 .fi
 .TP
 .I *
-means match any version of the package so long
-as the specified string prefix is matched. So with a
-version of '2*', we can match '2.1', '2.2', '2.2.1',
-etc... and not match version '1.0', '3.0', '4.1', etc...
-Beware that, due to the string matching nature, '20'
-will also be matched by '2*'. The version part
+means match any version of the package so long as the specified base
+is matched.  So with a version of '2*', we can match '2.1', '2.2', '2.2.1',
+etc... and not match version '1.0', '3.0', '4.1', etc... The version part
 that comes before the '*' must be a valid version in the absence of the '*'.
 For example, '2' is a valid version and '2.' is not. Therefore, '2*' is
 allowed and '2.*' is not.

[gentoo-commits] proj/portage:master commit in: man/

[Mike Frysinger]

commit: e0f2b2568feab394858c50da5630ee43daf9a7d5
Author: Mike Frysinger  gentoo  org>
AuthorDate: Wed Nov 25 00:04:24 2015 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Wed Nov 25 00:04:24 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=e0f2b256

ebuild(5): clarify fperms/fowners arguments

 man/ebuild.5 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index e60eee1..c9b5f4b 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -1449,9 +1449,9 @@ depending on local\-file's ending.  Creates all necessary 
dirs.
 
 .PD 0
 .TP
-.B fowners\fR \fI  [files]
+.B fowners\fR \fI[-h|-H|-L|-P|-R] [user][:group]  [files]
 .TP
-.B fperms\fR \fI  [files]
+.B fperms\fR \fI[-R]   [files]
 .PD 1
 Performs chown (\fBfowners\fR) or chmod (\fBfperms\fR), applying
 \fIpermissions\fR to \fIfiles\fR.

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit: 8889360554e80e2ca461ee67bbbc11de8a9a5a1a
Author: Brenton Horne  gmail  com>
AuthorDate: Sat Apr 22 06:50:37 2017 +
Commit: Zac Medico  gentoo  org>
CommitDate: Sat Apr 22 07:55:00 2017 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=88893605

man/emerge.1: fix quickpkg input in tb2file section (bug 616262)

quickpkg takes atom input, not /var/db/pkg//.

X-Gentoo-bug: 616262
X-Gentoo-bug-url: https://bugs.gentoo.org/show_bug.cgi?id=616262

 man/emerge.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/man/emerge.1 b/man/emerge.1
index 7db427199..f1a9d4f3f 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -50,7 +50,7 @@ so this syntax shouldn't be used.
 .BR tbz2file
 A \fItbz2file\fR must be a valid .tbz2 created with \fBebuild
 \-.ebuild package\fR or \fBemerge \-\-buildpkg
-[category/]\fR or \fBquickpkg /var/db/pkg//\fR.
+[category/]\fR or \fBquickpkg [category/]\fR.
 .TP
 .BR file
 A \fIfile\fR must be a file or directory that has been installed by one or

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit: 90a15aad608c87a7a03dade22592fa95a0ac4fbd
Author: Zac Medico  gentoo  org>
AuthorDate: Sun May 28 04:17:03 2017 +
Commit: Zac Medico  gentoo  org>
CommitDate: Tue May 30 09:56:34 2017 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=90a15aad

man/portage.5: document -* in profile "packages" files (bug 610670)

The -* wildcard has been supported since portage-2.3.4, but it was
not explicitly documented.

X-Gentoo-Bug: 610670
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=610670
Acked-by: Brian Dolbec  gentoo.org>

 man/portage.5 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/man/portage.5 b/man/portage.5
index 82e979ecf..366a1fa85 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -369,7 +369,8 @@ hurt \fBemerge\fR's ability to parallelize.
 .I Note:
 In a cascading profile setup, you can remove packages in children
 profiles which were added by parent profiles by prefixing the atom with
-a '\-'.
+a '\-'. The '\-*' wildcard discards all @system and @profile packages
+added by parent profiles.
 
 .I Example:
 .nf

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit: 2d277427a32f09a27fabd6eec75dfaf51ed1d3f2
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Fri Jan 12 22:56:52 2018 +
Commit: Zac Medico  gentoo  org>
CommitDate: Sat Jan 13 10:08:28 2018 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=2d277427

man/ebuild.5: document that dodir is for nonempty directories.

 man/ebuild.5 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 42a0599fe..28e9582d1 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -1271,7 +1271,8 @@ Creates directories inside of ${ED}.
 .br
 .BR 'dodir\ /usr/lib/apache'
 creates ${ED}/usr/lib/apache.  Note that the do* functions will run
-\fBdodir\fR for you.
+\fBdodir\fR for you. If this directory will be empty when it is merged,
+then please use \fBkeepdir\fR instead.
 .TP
 .B diropts\fR \fI[options for install(1)]
 Can be used to define options for the install function used in

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit: 40c4cf6ec4cda1a05c4bf3a4a6e9ece4ca74f803
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Fri Jan 12 22:56:53 2018 +
Commit: Zac Medico  gentoo  org>
CommitDate: Sat Jan 13 10:09:57 2018 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=40c4cf6e

man/ebuild.5: document the rationale for using keepdir over dodir.

 man/ebuild.5 | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 28e9582d1..270e47fe8 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -1285,8 +1285,9 @@ Sets the root (\fIDESTTREE\fR) for other functions like 
\fBdobin\fR,
 The default root is /usr.
 .TP
 .B keepdir\fR \fI [more paths]
-Tells portage to leave directories behind even if they're empty.  Functions
-the same as \fBdodir\fR.
+Similar to \fBdodir\fR, but used to create directories that would otherwise
+be empty. The treatment of completely\-empty directories is undefined by
+PMS, and using \fBkeepdir\fR ensures that they are tracked.
 .TP
 .B dobin\fR \fI [list of more binaries]
 Installs a \fIbinary\fR or a list of binaries into \fIDESTTREE\fR/bin.

[gentoo-commits] proj/portage:master commit in: man/

[Mike Frysinger]

commit: 8a2d449cffbfbfb5c8f9f20e4bb9eb1aec55b474
Author: Mike Frysinger  gentoo  org>
AuthorDate: Tue Jan  9 18:38:31 2018 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Tue Jan  9 18:38:31 2018 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=8a2d449c

man: emaint: fix option styling to match standard pages

The comma separating the short & long options should not be highlighted.

Arguments to the options should be styled with \fI instead of \fB.

 man/emaint.1 | 22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/man/emaint.1 b/man/emaint.1
index 49c257e1e..4ded0058a 100644
--- a/man/emaint.1
+++ b/man/emaint.1
@@ -33,7 +33,7 @@ OPTIONS: check, fix
 .TP
 .BR logs
 Clean out old logs from the \fBPORT_LOGDIR\fR using the command
-\fBPORT_LOGDIR_CLEAN\fR
+\fBPORT_LOGDIR_CLEAN\fR.
 See the \fBmake.conf\fR(5) man page for additional information as well as
 enabling the \fB'clean-logs'\fR feature in emerge to do this automatically.
 .br
@@ -65,35 +65,35 @@ Fix problems in the \fIworld\fR file.
 OPTIONS: check, fix
 .SH DEFAULT OPTIONS (Not supported in all commands)
 .TP
-.B \-c, \-\-check
+.BR \-c ", " \-\-check
 Check for any problems that may exist.
 .TP
-.B \-f, \-\-fix
+.BR \-f ", " \-\-fix
 Fix any problems that may exist.
 .SH OPTIONS logs command only
 .TP
-.B \-C, \-\-clean
+.BR \-C ", " \-\-clean
 Cleans the logs from \fBPORT_LOGDIR\fR
 .TP
-.B \-p, \-\-pretend
+.BR \-p ", " \-\-pretend
 Sets pretend mode (same as \-c, \-\-check) for use with the \-C, \-\-clean
 OPTION
 .TP
-.B \-t NUM, \-\-time NUM
-Changes the minimum age \fBNUM\fR (in days) of the logs to be listed or
+.BR \-t \ \fINUM\fR,\  \-\-time \ \fINUM\fR
+Changes the minimum age \fINUM\fR (in days) of the logs to be listed or
 deleted.
 .SH OPTIONS sync command only
 .TP
-.B \-a, \-\-auto
+.BR \-a ", " \-\-auto
 Sync repositories which have their auto\-sync setting set yes, true.
 .TP
-.B \-A, \-\-allrepos
+.BR \-A ", " \-\-allrepos
 Sync all repositories which have a sync\-uri specified.
 .TP
-.B \-r, \-\-repo REPO
+.BR \-r ", " \-\-repo \ \fIREPO\fR
 Sync the repository specified.
 .TP
-.BR "\-\-sync-submodule "
+.BR \-\-sync-submodule \ \fI\fR
 Restrict sync to the specified submodule(s). This option may be
 specified multiple times, in order to sync multiple submodules.
 Currently, this option has no effect for sync protocols other

[gentoo-commits] proj/portage:master commit in: man/

[Mike Frysinger]

commit: fdecff607e8c6859c986965b53a71fe3c4bddc99
Author: Mike Frysinger  gentoo  org>
AuthorDate: Tue Jan  9 18:32:02 2018 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Tue Jan  9 18:32:02 2018 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=fdecff60

man: egencache(1): fix y/n arg style to match other pages

 man/egencache.1 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/man/egencache.1 b/man/egencache.1
index 9c77029e0..27cd69e63 100644
--- a/man/egencache.1
+++ b/man/egencache.1
@@ -94,13 +94,13 @@ This option should only be needed for distribution via 
something like
 more thorough mechanism which allows it to detect changed inode numbers
 (described in \fIracy-git.txt\fR in the git technical docs).
 .TP
-.BR "\-\-sign\-manifests< y | n >"
+.BR "\-\-sign\-manifests < y | n >"
 Manually override layout.conf sign-manifests setting.
 .TP
-.BR "\-\-strict\-manifests< y | n >"
+.BR "\-\-strict\-manifests < y | n >"
 Manually override "strict" FEATURES setting.
 .TP
-.BR "\-\-thin\-manifests< y | n >"
+.BR "\-\-thin\-manifests < y | n >"
 Manually override layout.conf thin-manifests setting.
 .TP
 .BR "\-\-tolerant"

[gentoo-commits] proj/portage:master commit in: man/

[Mike Frysinger]

commit: 4680f098cf807d460bfab9fbd3bb3010228fc2f2
Author: Mike Frysinger  gentoo  org>
AuthorDate: Tue Jan  9 18:48:00 2018 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Tue Jan  9 18:48:00 2018 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=4680f098

man: emerge: use standard short option style

Man pages generally separate long & short options via a comma,
not by putting the short option in parens.

 man/emerge.1 | 96 ++--
 1 file changed, 48 insertions(+), 48 deletions(-)

diff --git a/man/emerge.1 b/man/emerge.1
index b292954a3..3c81b9c9f 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -118,12 +118,12 @@ the most recently installed version in each \fbslot\fR.  
Clean should not
 remove unslotted packages. Note: Most recently installed means most
 \fBrecent\fR, not highest version.
 .TP
-.BR "\-\-config "
+.BR \-\-config
 Run package specific actions needed to be executed after the emerge process
 has completed.  This usually entails configuration file setup or other similar
 setups that the user may wish to run.
 .TP
-.BR "\-\-depclean (-c)"
+.BR \-\-depclean ", " \-c
 Cleans the system by removing packages that are not associated
 with explicitly merged packages. Depclean works by creating the
 full dependency tree from the @world set,
@@ -162,7 +162,7 @@ by uninstall actions, including \fB-\-depclean\fR,
 in order to prevent uninstall actions from removing
 atoms from the world file.
 .TP
-.BR "\-\-help " (\fB\-h\fR)
+.BR \-\-help ", " \-h
 Displays help information for emerge.  Adding one of the additional
 arguments listed above will give you more specific help information
 on that subject.  The internal \fBemerge\fR help documentation is
@@ -188,7 +188,7 @@ repositories, use \fB\-\-regen\fR.
 In versions of portage >=2.1.5 the \-\-metadata action is totally unnecessary
 unless the user has enabled FEATURES="metadata-transfer" in \fBmake.conf\fR(5).
 .TP
-.BR "\-\-prune " (\fB\-P\fR)
+.BR \-\-prune ", " \-P
 Removes all but the highest installed version of a package from your
 system. Use \fB\-\-prune\fR together with \fB\-\-verbose\fR to show
 reverse dependencies or with \fB\-\-nodeps\fR to ignore all dependencies.
@@ -209,7 +209,7 @@ a sync operation. In order to specify parallel 
\fB\-\-regen\fR behavior, use
 the \fB\-\-jobs\fR and \fB\-\-load\-average\fR options. If you would like to
 generate and distribute cache for use by others, use \fBegencache\fR(1).
 .TP
-.BR "\-\-resume" (\fB\-r\fR)
+.BR \-\-resume ", " \-r
 Resumes the most recent merge list that has been aborted due to an error.
 This re\-uses the arguments and options that were given with the original
 command that's being resumed, and the user may also provide
@@ -226,7 +226,7 @@ The resume lists are stored in 
\fI/var/cache/edb/mtimedb\fR, and may be
 explicitly discarded by running `emaint \-\-fix cleanresume` (see
 \fBemaint\fR(1)).
 .TP
-.BR "\-\-search " (\fB\-s\fR)
+.BR \-\-search ", " \-s
 Searches for matches of the supplied string in the portage tree.
 By default emerge uses a case-insensitive simple search, but you can
 enable a regular expression search by prefixing the search string with %.
@@ -238,7 +238,7 @@ category into the search string, prepend an @: \fBemerge 
\-\-search
 "%@^dev-java.*jdk"\fR. If you want to search the package descriptions as well,
 use the \fB\-\-searchdesc\fR action.
 .TP
-.BR "\-\-searchdesc " (\fB\-S\fR)
+.BR \-\-searchdesc ", " \-S
 Matches the search string against the description field as well as
 the package name.  \fBTake caution\fR as the descriptions are also
 matched as regular expressions.
@@ -268,7 +268,7 @@ portage tree as a tarball, which is much faster than emerge
 \-\-sync for first time syncs.
 
 .TP
-.BR "\-\-unmerge " (\fB\-C\fR)
+.BR \-\-unmerge ", " \-C
 \fBWARNING: This action can remove important packages!\fR Removes
 all matching packages following a counter governed by \fBCLEAN_DELAY\fR.
 This does no checking of dependencies, so it may remove packages necessary
@@ -277,7 +277,7 @@ or \fIebuilds\fR. For a dependency aware version of 
\fB\-\-unmerge\fR, use
 \fB\-\-depclean\fR or \fB\-\-prune\fR.  For a version with
 \fBCLEAN_DELAY=0\fR, use \fB\-\-rage\-clean\fR.
 .TP
-.BR "\-\-version " (\fB\-V\fR)
+.BR \-\-version ", " \-V
 Displays the version number of \fBemerge\fR.
 .SH "OPTIONS"
 .TP
@@ -310,7 +310,7 @@ re\-distributable. With default
 configuration, this would result in an effective
 \fBACCEPT_RESTRICT\fR value of "* -bindist".
 .TP
-.BR "\-\-alert [ y | n ] (\-A short option)"
+.BR "\-\-alert [ y | n ]" ", " \-A
 Add a terminal bell character ('\\a') to all interactive prompts. This
 is especially useful if dependency resolution is taking a long time, and
 you want emerge to alert you when it is finished. If you use
@@ -324,11 +324,11 @@ Try it with 'emerge -aA portage'.
 If your terminal emulator is set up to make '\\a' into a window manager
 urgency hint, mov

[gentoo-commits] proj/portage:master commit in: man/

[Manuel Rüger]

commit: 44437b45ed34a158a2c4b50bc0ca71988af6ef05
Author: Manuel Rüger  gentoo  org>
AuthorDate: Tue Oct  3 14:55:59 2017 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Mon Oct  9 18:24:16 2017 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=44437b45

man/portage.5: Update example, fix a typo

Reviewed-by: Zac Medico  gentoo.org>

 man/portage.5 | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/man/portage.5 b/man/portage.5
index 5f1f2bbb0..5b1dfa838 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -1296,7 +1296,7 @@ version is followed by a hyphen and an integer build\-id.
 .RS
 .I Example:
 .nf
-# Specify the repository name (overriding profils/repo_name).
+# Specify the repository name (overriding profiles/repo_name).
 repo\-name = foo-overlay
 
 # eclasses provided by java-overlay take precedence over identically named
@@ -1310,7 +1310,7 @@ aliases = foo-overlay
 eapis\-banned = 0 1
 
 # indicate that ebuilds with the specified EAPIs are deprecated
-eapis\-deprecated = 2 3
+eapis\-deprecated = 2 3 4
 
 # sign commits in this repo, which requires Git >=1.7.9, and
 # key configured by `git config user.signingkey key_id`
@@ -1330,11 +1330,11 @@ use\-manifests = strict
 manifest\-hashes = SHA256 SHA512 WHIRLPOOL
 
 # indicate that this repo enables repoman's --echangelog=y option automatically
-update\-changelog = true
+update\-changelog = false
 
-# indicate that this repo contains both md5-dict and pms cache formats,
+# indicate that this repo contains the md5-dict cache format,
 # which may be generated by egencache(1)
-cache\-formats = md5-dict pms
+cache\-formats = md5-dict
 
 # indicate that this repo contains profiles that may use directories for
 # package.mask, package.provided, package.use, package.use.force,

[gentoo-commits] proj/portage:master commit in: man/

[Ulrich Müller]

commit: d1c87038e183d15eea2de517bd355aeab85af82f
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sat Oct 14 13:59:44 2017 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sat Oct 14 13:59:44 2017 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=d1c87038

man: Update URI of GLEP references.

GLEPs have been moved to https://www.gentoo.org/glep/.

 man/ebuild.5| 2 +-
 man/emerge.1| 2 +-
 man/make.conf.5 | 4 ++--
 man/portage.5   | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index e4c866cd2..43d12765d 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -730,7 +730,7 @@ allows for packages to depend on \fIvirtual/jdk\fR rather 
than on blackdown
 or sun specifically.
 
 The \fBPROVIDE\fR variable has been deprecated. See
-\fIhttps://wiki.gentoo.org/wiki/GLEP:37\fR for details.
+\fIhttps://www.gentoo.org/glep/glep-0037.html\fR for details.
 
 .TP
 .B DOCS

diff --git a/man/emerge.1 b/man/emerge.1
index 12a0db166..3198ba028 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -108,7 +108,7 @@ later updating.
 .BR \-\-check\-news
 Scan all repositories for relevant unread GLEP 42 news items, and display
 how many are found. See
-\fIhttps://wiki.gentoo.org/wiki/GLEP:42\fR.
+\fIhttps://www.gentoo.org/glep/glep-0042.html\fR.
 .TP
 .BR \-\-clean
 Cleans up the system by examining the installed packages and removing older

diff --git a/man/make.conf.5 b/man/make.conf.5
index 65c18cc6d..a81b497bd 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -62,7 +62,7 @@ with the '@' symbol. License groups are defined in the 
\fIlicense_groups\fR
 file (see \fBportage\fR(5)). In addition to license and group names, the
 \fI*\fR and \fI-*\fR wildcard tokens are also supported. Refer to GLEP 23
 for further information:
-\fIhttps://wiki.gentoo.org/wiki/GLEP:23\fR.
+\fIhttps://www.gentoo.org/glep/glep-0023.html\fR.
 .br
 Defaults to the value of * -@EULA.
 .br
@@ -503,7 +503,7 @@ configures new enough distcc to use the proxy.
 .TP
 .B news
 Enable GLEP 42 news support. See
-\fIhttps://wiki.gentoo.org/wiki/GLEP:42\fR.
+\fIhttps://www.gentoo.org/glep/glep-0042.html\fR.
 .TP
 .B noauto
 When utilizing \fBebuild\fR(1), only run the function requested. Also, forces

diff --git a/man/portage.5 b/man/portage.5
index 5b1dfa838..89dc8ce44 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -1408,7 +1408,7 @@ A list of all the variables which will be displayed when 
you run `emerge info`.
 This contains groups of licenses that may be specifed in the
 \fBACCEPT_LICENSE\fR variable (see \fBmake.conf\fR(5)). Refer
 to GLEP 23 for further information:
-\fIhttps://wiki.gentoo.org/wiki/GLEP:23\fR.
+\fIhttps://www.gentoo.org/glep/glep-0023.html\fR.
 
 .I Format:
 .nf
@@ -1542,7 +1542,7 @@ All local USE flags are listed here along with the 
package and a
 description. This file is automatically generated from the
 metadata.xml files that are included with each individual package.
 Refer to GLEP 56 for further information:
-\fIhttps://wiki.gentoo.org/wiki/GLEP:56\fR.
+\fIhttps://www.gentoo.org/glep/glep-0056.html\fR.
 
 .nf
 .I Format:

[gentoo-commits] proj/portage:master commit in: man/

[Ulrich Müller]

commit: 606491574fd91b65447b4376b2b21bf092749a64
Author: Ulrich Müller  gentoo  org>
AuthorDate: Tue Oct 24 08:48:09 2017 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Tue Oct 24 10:33:50 2017 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=60649157

man/ebuild.5: Do not document internal functions.

Functions containing "hook" or "prep" in their name may not be used
or relied upon by ebuilds. Therefore they should not be documented
in ebuild(5) which describes the funtions available for ebuilds.

PMS reference: https://projects.gentoo.org/pms/6/pms.html#x1-14700011.3.3.16

Acked-by: Zac Medico  gentoo.org>

 man/ebuild.5 | 76 +---
 1 file changed, 1 insertion(+), 75 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 43d12765d..42a0599fe 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -1,4 +1,4 @@
-.TH "EBUILD" "5" "Nov 2014" "Portage VERSION" "Portage"
+.TH "EBUILD" "5" "Oct 2017" "Portage VERSION" "Portage"
 
 .SH "NAME"
 ebuild \- the internal format, variables, and functions in an ebuild script
@@ -1104,16 +1104,6 @@ Example:
installed)
 .fi
 
-.SS "Hooks:"
-.TP
-.B register_die_hook\fR \fI[list of function names]
-Register one or more functions to call when the ebuild fails for any reason,
-including file collisions with other packages.
-.TP
-.B register_success_hook\fR \fI[list of function names]
-Register one or more functions to call when the ebuild builds and/or installs
-successfully.
-
 .SS "Output:"
 .TP
 .B einfo\fR \fI"disposable message"
@@ -1225,70 +1215,6 @@ Please do \fBnot\fR use this in place of 'emake install 
DESTDIR=${D}'.
 That is the preferred way of installing make\-based packages.  Also, do
 not utilize the \fIEXTRA_EINSTALL\fR variable since it is for users.
 
-.PD 0
-.TP
-.B prepall
-.TP
-.B prepalldocs
-.TP
-.B prepallinfo
-.TP
-.B prepallman
-.TP
-.B prepallstrip
-.PD 1
-Useful for when a package installs into \fB${D}\fR via scripts
-(i.e. makefiles).  If you want to be sure that libraries are executable,
-aclocal files are installed into the right place, doc/info/man files are
-all compressed, and that executables are all stripped of debugging symbols,
-then use these suite of functions.
-.RS
-.PD 0
-.TP
-.B prepall:
-Runs \fBprepallman\fR, \fBprepallinfo\fR, \fBprepallstrip\fR, sets
-libraries +x, and then checks aclocal directories.  Please note this
-does \fI*not*\fR run \fBprepalldocs\fR.
-.TP
-.B prepalldocs:
-Compresses all doc files in ${ED}/usr/share/doc.
-.TP
-.B prepallinfo:
-Compresses all info files in ${ED}/usr/share/info.
-.TP
-.B prepallman:
-Compresses all man files in ${ED}/usr/share/man.
-.TP
-.B prepallstrip:
-Strips all executable files of debugging symboles.  This includes libraries.
-.RE
-
-.TP
-.B prepinfo\fR \fI[dir]
-.TP
-.B prepman\fR \fI[dir]
-.TP
-.B prepstrip\fR \fI[dir]
-.PD 1
-Similar to the \fBprepall\fR functions, these are subtle in their differences.
-.RS
-.PD 0
-.TP
-.B prepinfo:
-If a \fIdir\fR is not specified, then \fBprepinfo\fR will assume the dir
-\fIusr\fR. \fBprepinfo\fR will then compress all the files in
-${ED}/\fIdir\fR/info.
-.TP
-.B prepman:
-If a \fIdir\fR is not specified, then \fBprepman\fR will assume the dir
-\fIusr\fR. \fBprepman\fR will then compress all the files in
-${ED}/\fIdir\fR/man/*/.
-.TP
-.B prepstrip:
-All the files found in ${ED}/\fIdir\fR will be stripped.  You may specify
-multiple directories.
-.RE
-.PD 1
 .TP
 .B docompress\fR \fI[\-x]  [list of more paths]
 .RS

[gentoo-commits] proj/portage:master commit in: man/

[Alexander Berntsen]

commit: 4369d1aca89eaecd589af4aa7a387ce36e5c42e7
Author: Alexander Berntsen  gentoo  org>
AuthorDate: Tue Feb  2 14:10:13 2016 +
Commit: Alexander Berntsen  gentoo  org>
CommitDate: Tue Feb  2 14:10:54 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=4369d1ac

Be extra clear on INSTALL_MASK & dirs (bug 527004)

Signed-off-by: Alexander Berntsen  gentoo.org>

X-Gentoo-Bug: 527004
X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=527004

 man/make.conf.5 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index 1d1cfeb..49c88ce 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -705,8 +705,8 @@ proxy server for internet access.
 \fBINSTALL_MASK\fR = \fI[space delimited list of filename patterns (globs)]\fR
 Use this variable if you want to selectively prevent certain files
 from being copied into your file system tree.  This does not work on
-symlinks, but only on actual files. Useful if you wish to filter out
-files like HACKING.gz and TODO.gz.
+symlinks, but only on actual files (including directories). Useful if
+you wish to filter out files like HACKING.gz and TODO.gz.
 
 Patterns are matched against both the absolute path and the bare
 filename of each file (or directory) to be installed.

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit: a29847f77d57f2c423c30b931fa40e65523795c4
Author: Wim Muskee  gmail  com>
AuthorDate: Mon Dec 12 18:59:08 2016 +
Commit: Zac Medico  gentoo  org>
CommitDate: Wed Dec 14 21:05:27 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=a29847f7

man: emaint typo fix, bug 575178

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

 man/emaint.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/man/emaint.1 b/man/emaint.1
index cfdadc8..24e4744 100644
--- a/man/emaint.1
+++ b/man/emaint.1
@@ -1,6 +1,6 @@
 .TH "EMAINT" "1" "May 2015" "Portage VERSION" "Portage"
 .SH NAME
-emaint \- performs package managment related system health checks and 
maintenance
+emaint \- performs package management related system health checks and 
maintenance
 .SH SYNOPSIS
 .BR emaint
 [\fIoptions\fR]

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit: 92069c976b67412791bb4fe3b007244a05d11a6d
Author: Alexandru Elisei  gmail  com>
AuthorDate: Mon Feb 27 13:32:37 2017 +
Commit: Zac Medico  gentoo  org>
CommitDate: Tue Feb 28 20:36:50 2017 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=92069c97

man/emerge.1: use repo names or aliases with --sync

X-Gentoo-Bug: 610852
X-Gentoo-Bug-Url: https://bugs.gentoo.org/show_bug.cgi?id=610852

 man/emerge.1 | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/man/emerge.1 b/man/emerge.1
index 7442220ba..5b6122023 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -8,7 +8,7 @@ emerge \- Command\-line interface to the Portage system
 \fI@set\fR | \fIatom\fR] ...
 .TP
 .BR emerge
-\fB\-\-sync\fR | \fB\-\-version\fR
+\fB\-\-sync\fR [\fIrepo\fR | \fIalias\fR] ...
 .TP
 .BR emerge
 \fB\-\-info\fR [\fIatom\fR]
@@ -17,7 +17,7 @@ emerge \- Command\-line interface to the Portage system
 \fB\-\-search\fR \fIsomestring\fR
 .TP
 .BR emerge
-\fB\-\-help\fR
+\fB\-\-help\fR | \fB\-\-version\fR
 .SH "DESCRIPTION"
 \fBemerge\fR is the definitive command\-line interface to the Portage
 system.  It is primarily used for installing packages, and \fBemerge\fR
@@ -245,7 +245,9 @@ matched as regular expressions.
 .TP
 .BR \-\-sync
 Updates repositories, for which auto\-sync, sync\-type and sync\-uri 
attributes are
-set in repos.conf. See \fBportage\fR(5) for more information.
+set in repos.conf. A list of repos or aliases can be specified, in which case
+they  will be updated regardless of their auto\-sync attribute. See
+\fBportage\fR(5) for more information.
 The \fBPORTAGE_SYNC_STALE\fR variable configures
 warnings that are shown when emerge \-\-sync has not
 been executed recently.

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit: 35c78fcd275eaf0b7c2a80131c37980eda6240e6
Author: Alexandru Elisei  gmail  com>
AuthorDate: Thu Jan 26 14:02:11 2017 +
Commit: Zac Medico  gentoo  org>
CommitDate: Thu Jan 26 18:48:55 2017 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=35c78fcd

man/portage.5: replace repos.conf sync-type 'websync' with 'webrsync'

 man/portage.5 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/man/portage.5 b/man/portage.5
index 2cacafc..415817a 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -1,4 +1,4 @@
-.TH "PORTAGE" "5" "Nov 2016" "Portage VERSION" "Portage"
+.TH "PORTAGE" "5" "Jan 2017" "Portage VERSION" "Portage"
 .SH NAME
 portage \- the heart of Gentoo
 .SH "DESCRIPTION"
@@ -989,7 +989,7 @@ repository has changed since the previous sync operation.
 .B sync\-type
 Specifies type of synchronization performed by `emerge \-\-sync`.
 .br
-Valid non\-empty values: cvs, git, rsync, svn, websync (emerge-webrsync)
+Valid non\-empty values: cvs, git, rsync, svn, webrsync (emerge-webrsync)
 .br
 This attribute can be set to empty value to disable synchronization of given
 repository. Empty value is default.

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit: e567328c17d7b03d9f773661d03673b76054570d
Author: Chris Mayo  gmail  com>
AuthorDate: Sat Jan  7 17:24:23 2017 +
Commit: Zac Medico  gentoo  org>
CommitDate: Sun Jan  8 23:43:43 2017 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=e567328c

man/emaint.1: Add sync to synopsis and fix its in sync --auto

Signed-off-by: Chris Mayo  gmail.com>

 man/emaint.1 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/man/emaint.1 b/man/emaint.1
index 24e4744..49c257e 100644
--- a/man/emaint.1
+++ b/man/emaint.1
@@ -1,11 +1,11 @@
-.TH "EMAINT" "1" "May 2015" "Portage VERSION" "Portage"
+.TH "EMAINT" "1" "Jan 2017" "Portage VERSION" "Portage"
 .SH NAME
 emaint \- performs package management related system health checks and 
maintenance
 .SH SYNOPSIS
 .BR emaint
 [\fIoptions\fR]
 [\fBall\fR | \fBbinhost\fR | \fBcleanresume\fR | \
-\fBmerges\fR | \fBmovebin\fR | \fBmoveinst\fR | \fBworld\fR]
+\fBmerges\fR | \fBmovebin\fR | \fBmoveinst\fR | \fBsync\fR | \fBworld\fR]
 .SH DESCRIPTION
 The emaint program provides a command line interface to package
 management health checks and maintenance.
@@ -85,7 +85,7 @@ deleted.
 .SH OPTIONS sync command only
 .TP
 .B \-a, \-\-auto
-Sync repositories which have its auto\-sync setting set yes, true.
+Sync repositories which have their auto\-sync setting set yes, true.
 .TP
 .B \-A, \-\-allrepos
 Sync all repositories which have a sync\-uri specified.

[gentoo-commits] proj/portage:master commit in: man/

[Mike Frysinger]

commit: dba953f388dc3ab5b1bdbc702ebf646fac940492
Author: Mike Frysinger  gentoo  org>
AuthorDate: Thu Feb 26 06:32:39 2015 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Thu Feb 26 06:33:03 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=dba953f3

man: fix bold style with man page sections

The section number should not be bolded like the main page.

---
 man/ebuild.5| 4 ++--
 man/egencache.1 | 6 +++---
 man/emerge.1| 2 +-
 man/make.conf.5 | 2 +-
 man/portage.5   | 2 +-
 man/repoman.1   | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 95d0453..7049f17 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -1326,7 +1326,7 @@ If the item does not exist, it is ignored.
 .TP
 .B dosed\fR \fI"s:orig:change:g" 
 Beginning with \fBEAPI 4\fR, the \fBdosed\fR helper no longer exists. Ebuilds
-should call \fBsed(1)\fR directly (and assume that it is GNU sed).
+should call \fBsed\fR(1) directly (and assume that it is GNU sed).
 
 Performs sed in place on \fIfilename\fR inside ${ED}. If no expression is
 given then \fI"s:${D}::g"\fR is used as the default expression.  Note
@@ -1412,7 +1412,7 @@ file name.
 .TP
 .B dohard\fR \fI 
 Beginning with \fBEAPI 4\fR, the \fBdohard\fR helper no longer exists. Ebuilds
-should call \fBln(1)\fR directly.
+should call \fBln\fR(1) directly.
 .TP
 .B dosym\fR \fI 
 .PD 1

diff --git a/man/egencache.1 b/man/egencache.1
index 3a3197f..9c1f488 100644
--- a/man/egencache.1
+++ b/man/egencache.1
@@ -120,13 +120,13 @@ Prior to portage-2.1.11.32, the 'pms' cache format was 
enabled by default.
 This 'pms' format, which is distributed in the \fImetadata/cache/\fR
 directory of the repository, has significant limitations related to the
 cache validation mechanism which involves comparison of
-a cache entry mtime to the mtime of the corresponding \fBebuild(5)\fR. This
+a cache entry mtime to the mtime of the corresponding \fBebuild\fR(5). This
 mechanism is unreliable in cases when eclass changes result in metadata
 changes, since no information about eclass state is available in the cache.
 Also, since the mtime of the cache entry must correspond to that of the
 ebuild, the cache format is only suitable for distribution via protocols
-that preserve timestamps (such as \fBrsync(1))\fR. For cache that is
-distributed via \fBgit(1)\fR repositories, there is currently a workaround
+that preserve timestamps (such as \fBrsync\fR(1)). For cache that is
+distributed via \fBgit\fR(1) repositories, there is currently a workaround
 implemented in \fBemerge\fR(1) \fB\-\-sync\fR which updates ebuild mtimes
 to match their corresponding cache entries (except for ebuilds that are
 modified relative to HEAD).

diff --git a/man/emerge.1 b/man/emerge.1
index 25602e0..237fb79 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -257,7 +257,7 @@ additions of files) inside repositories synchronized using 
rsync.
 \fBNOTE:\fR
 The emerge \-\-sync command is a compatibility command.  Sync operations are
 now performed using the the new emaint sync module. This new emaint sync module
-has greater functionality and flexibility.  Please refer to \fBemaint(1)\fR for
+has greater functionality and flexibility.  Please refer to \fBemaint\fR(1) for
 more information about sync operations.
 
 \fBNOTE:\fR

diff --git a/man/make.conf.5 b/man/make.conf.5
index 84b7191..cd1ae21 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -623,7 +623,7 @@ Enable the sandbox in the compile phase, when running 
without root privs
 (\fIuserpriv\fR).
 .TP
 .B usersync
-Drop privileges to the owner of ${repository_location} for \fBemerge(1) 
--sync\fR
+Drop privileges to the owner of ${repository_location} for \fBemerge\fR(1) 
--sync
 operations. Note that this feature assumes that all subdirectories of
 ${repository_location} have the same ownership as ${repository_location} 
itself.
 It is the user's responsibility to ensure correct ownership, since otherwise

diff --git a/man/portage.5 b/man/portage.5
index 3a64206..3b099ff 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -151,7 +151,7 @@ More reading:
 .br
 The following atom syntax extensions are only supported in user
 configuration files and command line arguments for programs such as
-\fBemerge(1)\fR:
+\fBemerge\fR(1):
 .RS
 .TP
 .B Repository Constraints

diff --git a/man/repoman.1 b/man/repoman.1
index c576768..d490227 100644
--- a/man/repoman.1
+++ b/man/repoman.1
@@ -67,7 +67,7 @@ For commit mode, call echangelog if ChangeLog is unmodified 
(or
 regardless of modification if 'force' is specified). This option
 can be enabled by default for a particular repository by setting
 "update\-changelog = true" in metadata/layout.conf (see
-\fBportage(5)\fR).
+\fBportage\fR(5)).
 .TP
 \fB\-\-experimental\-inherit=\fR
 Enable experimental inherit.missing checks which may misbehave when the

[gentoo-commits] proj/portage:master commit in: man/

[Pavel Kazakov]

commit: 1d3a298c9d0d9aaf908542b77a8e6187965b1c78
Author: Pavel Kazakov  gentoo  org>
AuthorDate: Sat Feb 28 17:32:09 2015 +
Commit: Pavel Kazakov  gentoo  org>
CommitDate: Sat Feb 28 17:32:09 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=1d3a298c

main/emaint.1: Add entry about the merges module

---
 man/emaint.1 | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/man/emaint.1 b/man/emaint.1
index 6b8fdf9..c97945f 100644
--- a/man/emaint.1
+++ b/man/emaint.1
@@ -5,7 +5,7 @@ emaint \- performs package managment related system health 
checks and maintenanc
 .BR emaint
 [\fIoptions\fR]
 [\fBall\fR | \fBbinhost\fR | \fBcleanresume\fR | \
-\fBmovebin\fR | \fBmoveinst\fR | \fBworld\fR]
+\fBmerges\fR | \fBmovebin\fR | \fBmoveinst\fR | \fBworld\fR]
 .SH DESCRIPTION
 The emaint program provides a command line interface to package
 management health checks and maintenance.
@@ -31,6 +31,9 @@ Clean out old logs from the \fBPORT_LOGDIR\fR using the 
command
 See the \fBmake.conf\fR(5) man page for additional information as well as
 enabling the \fB'clean-logs'\fR feature in emerge to do this automatically.
 .TP
+.BR merges
+Scan for failed package merges and attempt to fix those failed packages.
+.TP
 .BR movebin
 Perform package move updates for binary packages located in \fBPKGDIR\fR.
 .TP
@@ -82,6 +85,7 @@ than rsync.
 Please report bugs via http://bugs.gentoo.org/
 .SH AUTHORS
 .nf
+Pavel Kazakov 
 Mike Frysinger 
 Brian Dolbec 
 .fi
@@ -92,6 +96,10 @@ Contains a list of all user\-specified packages.
 .TP
 .B /var/lib/portage/config
 Contains the paths and md5sums of all the config files being tracked.
+.TP
+.B /var/lib/portage/failed-merges
+Contains the packages and timestamps of any failed merges being cleaned from
+the system, and to be re-emerged.
 .SH "SEE ALSO"
 .BR emerge (1),
 .BR portage (5)

[gentoo-commits] proj/portage:master commit in: man/

[Brian Dolbec]

commit: 44f2a48390909050dd42404de9136bf78c97928e
Author: Brian Dolbec  gentoo  org>
AuthorDate: Sat Feb 28 23:45:29 2015 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Wed Mar  4 20:38:05 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=44f2a483

emaint.1: Update man page for better clarity (540482)

As recommended by Duncan on the gentoo-portage-dev list.
Clarify the all command.
Add OPTIONS to all commands, so a user can determine which modules
 may run when the 'all' command is used.
Remove repetitive '(* command only)' text by adding it to the section header.

 man/emaint.1 | 43 ++-
 1 file changed, 30 insertions(+), 13 deletions(-)

diff --git a/man/emaint.1 b/man/emaint.1
index c97945f..9d8de55 100644
--- a/man/emaint.1
+++ b/man/emaint.1
@@ -12,75 +12,92 @@ management health checks and maintenance.
 .SH COMMANDS
 .TP
 .BR all
-Perform all supported commands.
+Perform all supported commands that accept the specified option.
 .TP
 .BR binhost
 Generate a metadata index for binary packages located in \fBPKGDIR\fR (for
 download by remote clients). See the \fBPORTAGE_BINHOST\fR documentation in
 the \fBmake.conf\fR(5) man page for additional information.
+.br
+OPTIONS: check, fix
 .TP
 .BR cleanconfig
 Discard no longer installed config tracker entries.
+.br
+OPTIONS: check, fix
 .TP
 .BR cleanresume
 Discard merge lists saved for the \fBemerge\fR(1) \fB--resume\fR action.
+.br
+OPTIONS: check, fix
 .TP
 .BR logs
 Clean out old logs from the \fBPORT_LOGDIR\fR using the command
 \fBPORT_LOGDIR_CLEAN\fR
 See the \fBmake.conf\fR(5) man page for additional information as well as
 enabling the \fB'clean-logs'\fR feature in emerge to do this automatically.
+.br
+OPTIONS: check, clean
 .TP
 .BR merges
 Scan for failed package merges and attempt to fix those failed packages.
+.br
+OPTIONS: check, fix, purge
 .TP
 .BR movebin
 Perform package move updates for binary packages located in \fBPKGDIR\fR.
+.br
+OPTIONS: check, fix
 .TP
 .BR moveinst
 Perform package move updates for installed packages.
+.br
+OPTIONS: check, fix
 .TP
 .BR sync
 Perform sync actions on specified repositories.
+.br
+OPTIONS: allrepos, auto, repo
 .TP
 .BR world
 Fix problems in the \fIworld\fR file.
-.SH DEFAULT OPTIONS
+.br
+OPTIONS: check, fix
+.SH DEFAULT OPTIONS (Not supported in all commands)
 .TP
 .B \-c, \-\-check
-Check for any problems that may exist.  (all commands)
+Check for any problems that may exist.
 .TP
 .B \-f, \-\-fix
-Fix any problems that may exist.  (not all commands)
-.SH OPTIONS logs command
+Fix any problems that may exist.
+.SH OPTIONS logs command only
 .TP
 .B \-C, \-\-clean
-Cleans the logs from \fBPORT_LOGDIR\fR (logs command only)
+Cleans the logs from \fBPORT_LOGDIR\fR
 .TP
 .B \-p, \-\-pretend
 Sets pretend mode (same as \-c, \-\-check) for use with the \-C, \-\-clean
-OPTION (logs command only)
+OPTION
 .TP
 .B \-t NUM, \-\-time NUM
 Changes the minimum age \fBNUM\fR (in days) of the logs to be listed or
-deleted. (logs command only)
-.SH OPTIONS sync command
+deleted.
+.SH OPTIONS sync command only
 .TP
 .B \-a, \-\-auto
-Sync repositories which have its auto\-sync setting set yes, true. (sync 
command only)
+Sync repositories which have its auto\-sync setting set yes, true.
 .TP
 .B \-A, \-\-allrepos
-Sync all repositories which have a sync\-uri specified. (sync command only)
+Sync all repositories which have a sync\-uri specified.
 .TP
 .B \-r, \-\-repo REPO
-Sync the repository specified. (sync command only)
+Sync the repository specified.
 .TP
 .BR "\-\-sync-submodule "
 Restrict sync to the specified submodule(s). This option may be
 specified multiple times, in order to sync multiple submodules.
 Currently, this option has no effect for sync protocols other
 than rsync.
-(sync command only)
 .SH "REPORTING BUGS"
 Please report bugs via http://bugs.gentoo.org/
 .SH AUTHORS

[gentoo-commits] proj/portage:master commit in: man/

[Brian Dolbec]

commit: 465565a0f90843133ae1ae9072244d34d82eaf73
Author: Brian Dolbec  gentoo  org>
AuthorDate: Wed Mar  4 20:18:38 2015 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Wed Mar  4 20:38:36 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=465565a0

man/egencache.1: Add missed --write-timestamp option (540482)

 man/egencache.1 | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/man/egencache.1 b/man/egencache.1
index 9c1f488..daf08aa 100644
--- a/man/egencache.1
+++ b/man/egencache.1
@@ -107,7 +107,10 @@ updates due to ebuilds that either fail to source or are 
not sourced
 due to invalid Manifest entries.
 .TP
 .BR "\-\-use\-local\-desc\-output=ULD_OUTPUT"
-output file for use.local.desc data (or '-' for stdout)
+Output file for use.local.desc data (or '-' for stdout)
+.TP
+.BR "\-\-write\-timestamp
+Write metadata/timestamp.chk as required for rsync repositories
 .SH "ENVIRONMENT OPTIONS"
 .TP
 \fBEGENCACHE_DEFAULT_OPTS\fR

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit: 7f38c9cbe3ce4a1eb4791b81b1ccd1a2f4eebfd1
Author: Zac Medico  gentoo  org>
AuthorDate: Sun Nov  9 19:16:58 2014 +
Commit: Zac Medico  gentoo  org>
CommitDate: Mon Nov 10 18:29:30 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=7f38c9cb

man/ebuild.5: document assert for bug #528760

X-Gentoo-Bug: 528760
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=528760
Acked-by: Alexander Berntsen  gentoo.org>

---
 man/ebuild.5 | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 89bd6a2..b587264 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -1,4 +1,4 @@
-.TH "EBUILD" "5" "Jan 2014" "Portage VERSION" "Portage"
+.TH "EBUILD" "5" "Nov 2014" "Portage VERSION" "Portage"
 
 .SH "NAME"
 ebuild \- the internal format, variables, and functions in an ebuild script
@@ -969,6 +969,11 @@ default_src_test
 
 .SS "General:"
 .TP
+.B assert\fR \fI[reason]
+Checks the value of the shell's PIPESTATUS array variable, and if any
+component is non-zero (indicating failure), calls die with \fIreason\fR
+as a failure message.
+.TP
 .B die\fR \fI[reason]
 Causes the current emerge process to be aborted. The final display will
 include \fIreason\fR.

[gentoo-commits] proj/portage:master commit in: man/

[Brian Dolbec]

commit: fe59f38a84d7b22bb99d7e62e0324916c74f32a9
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon May 18 21:20:01 2015 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Mon May 18 21:24:15 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=fe59f38a

man: Document repoman --straight-to-stable

 man/repoman.1 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/man/repoman.1 b/man/repoman.1
index 6cb826a..6a60e5c 100644
--- a/man/repoman.1
+++ b/man/repoman.1
@@ -50,6 +50,9 @@ replacing existing digests, it is the user's responsibility 
to ensure that
 files contained in ${DISTDIR} have the correct identities. Especially beware
 of partially downloaded files.
 .TP
+\fB-S\fR, \fB--straight-to-stable\fR
+Allow committing straight to stable
+.TP
 \fB-q\fR, \fB--quiet\fR
 Be less verbose about extraneous info
 .TP

[gentoo-commits] proj/portage:master commit in: man/

[Brian Dolbec]

commit: e332dd6b73855096032f883d47246f39fc0ee14a
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon May 18 21:20:00 2015 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Mon May 18 21:24:07 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=e332dd6b

man: Add short option (-f) for repoman --force

 man/repoman.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/man/repoman.1 b/man/repoman.1
index d490227..6cb826a 100644
--- a/man/repoman.1
+++ b/man/repoman.1
@@ -36,7 +36,7 @@ entries that already exist. Replacement of existing Manifest
 DIST entries can be forced by using the \fBmanifest\fR mode
 together with the \fB\-\-force\fR option.
 .TP
-\fB--force\fR
+\fB-f\fR, \fB--force\fR
 Force commit to proceed, regardless of QA issues. For convenience, this option
 causes the most time consuming QA checks to be skipped. The commit message will
 include an indication that this option has been enabled, together with the

[gentoo-commits] proj/portage:master commit in: man/

[Alexander Berntsen]

commit: 8c0c7b8502df0c46915aaa763cd8379bb012ee15
Author: Alexander Berntsen  gentoo  org>
AuthorDate: Tue May 19 10:46:34 2015 +
Commit: Alexander Berntsen  gentoo  org>
CommitDate: Tue May 19 10:46:34 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=8c0c7b85

man: Update copyright headers for recent commits

Update copyright headers for some of our manpages, as some recent
commits made changes that are probably "big enough" to warrant this. The
relevant commits are included below.

emaint.1: Update man page for better clarity (540482):
44f2a48390909050dd42404de9136bf78c97928e

man/egencache.1: Add missed --write-timestamp option (540482):
465565a0f90843133ae1ae9072244d34d82eaf73

man: Add short option (-f) for repoman --force:
e332dd6b73855096032f883d47246f39fc0ee14a

man: Document repoman --straight-to-stabl
fe59f38a84d7b22bb99d7e62e0324916c74f32a9

Signed-off-by: Alexander Berntsen  gentoo.org>

 man/egencache.1 | 2 +-
 man/emaint.1| 2 +-
 man/repoman.1   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/man/egencache.1 b/man/egencache.1
index daf08aa..abbbdb9 100644
--- a/man/egencache.1
+++ b/man/egencache.1
@@ -1,4 +1,4 @@
-.TH "EGENCACHE" "1" "Jul 2013" "Portage VERSION" "Portage"
+.TH "EGENCACHE" "1" "Mar 2015" "Portage VERSION" "Portage"
 .SH "NAME"
 egencache \- generate metadata cache for ebuild repositories
 .SH "SYNOPSIS"

diff --git a/man/emaint.1 b/man/emaint.1
index 9d8de55..9a31635 100644
--- a/man/emaint.1
+++ b/man/emaint.1
@@ -1,4 +1,4 @@
-.TH "EMAINT" "1" "Jan 2015" "Portage VERSION" "Portage"
+.TH "EMAINT" "1" "Mar 2015" "Portage VERSION" "Portage"
 .SH NAME
 emaint \- performs package managment related system health checks and 
maintenance
 .SH SYNOPSIS

diff --git a/man/repoman.1 b/man/repoman.1
index 6a60e5c..54e677e 100644
--- a/man/repoman.1
+++ b/man/repoman.1
@@ -1,4 +1,4 @@
-.TH "REPOMAN" "1" "Aug 2013" "Portage VERSION" "Portage"
+.TH "REPOMAN" "1" "May 2015" "Portage VERSION" "Portage"
 .SH NAME
 repoman \- Gentoo's program to enforce a minimal level of quality assurance in
 packages added to the portage tree

[gentoo-commits] proj/portage:master commit in: man/

[Brian Dolbec]

commit: 1eb8e1e38c410a6b3792d005da7a75a87c811721
Author: Brian Dolbec  gentoo  org>
AuthorDate: Fri May 29 07:25:55 2015 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Fri May 29 07:28:48 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=1eb8e1e3

man/emaint.1: Fix missed rename of cleanconfig to cleanconfmem bug 550324

X-Gentoo-Bug: 550324
X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=550324
X-Getoo-Reporter: Claudio Roberto França Pereira

 man/emaint.1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/man/emaint.1 b/man/emaint.1
index 9a31635..7c7638f 100644
--- a/man/emaint.1
+++ b/man/emaint.1
@@ -1,4 +1,4 @@
-.TH "EMAINT" "1" "Mar 2015" "Portage VERSION" "Portage"
+.TH "EMAINT" "1" "May 2015" "Portage VERSION" "Portage"
 .SH NAME
 emaint \- performs package managment related system health checks and 
maintenance
 .SH SYNOPSIS
@@ -21,7 +21,7 @@ the \fBmake.conf\fR(5) man page for additional information.
 .br
 OPTIONS: check, fix
 .TP
-.BR cleanconfig
+.BR cleanconfmem
 Discard no longer installed config tracker entries.
 .br
 OPTIONS: check, fix

[gentoo-commits] proj/portage:master commit in: man/

[Alexander Berntsen]

commit: 1a07f62c987622267c0142f0e96a7bb204bd8926
Author: Alexander Berntsen  gentoo  org>
AuthorDate: Thu Jun 18 12:16:52 2015 +
Commit: Alexander Berntsen  gentoo  org>
CommitDate: Thu Jun 18 12:27:17 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=1a07f62c

man/repoman.1: Fix deprecated java-devel link

Signed-off-by: Alexander Berntsen  gentoo.org>

 man/repoman.1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/man/repoman.1 b/man/repoman.1
index 54e677e..abd998b 100644
--- a/man/repoman.1
+++ b/man/repoman.1
@@ -1,4 +1,4 @@
-.TH "REPOMAN" "1" "May 2015" "Portage VERSION" "Portage"
+.TH "REPOMAN" "1" "Jun 2015" "Portage VERSION" "Portage"
 .SH NAME
 repoman \- Gentoo's program to enforce a minimal level of quality assurance in
 packages added to the portage tree
@@ -339,7 +339,7 @@ Ebuild inherits a deprecated eclass
 .TP
 .B java.eclassesnotused
 With virtual/jdk in DEPEND you must inherit a java eclass. Refer to
-\fIhttp://www.gentoo.org/proj/en/java/java\-devel.xml\fR for more information.
+\fIhttps://wiki.gentoo.org/wiki/Project:Java\fR for more information.
 .TP
 .B manifest.bad
 Manifest has missing or incorrect digests

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit: 1d267aa670e7773b31bb88fc285dec9819fd9770
Author: Zac Medico  gentoo  org>
AuthorDate: Fri Dec 26 22:01:25 2014 +
Commit: Zac Medico  gentoo  org>
CommitDate: Mon Jan  5 20:00:59 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=1d267aa6

man pages: note that make.conf can be a directory (463266)

Commit 86e75790954e766beba75443d967b2c25055c5b0 added support for
make.conf to be a directory, but the feature was undocumented.
Therefore, update the man pages, as suggested in bug #465164,
comment #9.

Fixes 86e75790954e ("make.conf: recurse directories, bug #463266")
X-Gentoo-Bug: 463266
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=463266
Acked-by: Alexander Berntsen  gentoo.org>

---
 man/make.conf.5 | 5 -
 man/portage.5   | 5 +++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index 69d95fc..ed5fc78 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -1,4 +1,4 @@
-.TH "MAKE.CONF" "5" "Apr 2014" "Portage VERSION" "Portage"
+.TH "MAKE.CONF" "5" "Jan 2015" "Portage VERSION" "Portage"
 .SH "NAME"
 make.conf \- custom settings for Portage
 .SH "SYNOPSIS"
@@ -14,6 +14,9 @@ features like arrays and special parameter expansions. For 
more details, see
 the Simple lexical analysis documentation:
 \fLhttp://docs.python.org/3/library/shlex.html\fR. Note that if you source
 files, they need to be in the same shlex syntax for portage to read them.
+If make.conf is a directory, then all the files in that directory will
+be sorted in ascending alphabetical order by file name and summed
+together as if it were a single file.
 .br
 Portage will check the currently\-defined environment variables
 first for any settings.  If no environment settings are found,

diff --git a/man/portage.5 b/man/portage.5
index fbff9a6..ed0423f 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -1,4 +1,4 @@
-.TH "PORTAGE" "5" "December 2014" "Portage VERSION" "Portage"
+.TH "PORTAGE" "5" "Jan 2015" "Portage VERSION" "Portage"
 .SH NAME
 portage \- the heart of Gentoo
 .SH "DESCRIPTION"
@@ -573,7 +573,8 @@ virtual/aspell\-dict   app\-dicts/aspell\-en
 .RE
 .TP
 .BR /etc/portage/
-Any file in this directory that begins with "package." or is repos.conf can be
+Files in this directory including make.conf, repos.conf, and any file
+with a name that begins with "package." can be
 more than just a flat file.  If it is a directory, then all the files in that
 directory will be sorted in ascending alphabetical order by file name and 
summed
 together as if it were a single file.

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit: f2d25e174634151732b86e72befd3a90f048aeb8
Author: Zac Medico  gentoo  org>
AuthorDate: Fri Dec 26 22:28:45 2014 +
Commit: Zac Medico  gentoo  org>
CommitDate: Mon Jan  5 20:08:16 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=f2d25e17

man/emerge.1: clarify --buildpkg-exclude wrt *-backup FEATURES (533036)

The --buildpkg-exclude option does not affect downgrade-backup or
unmerge-backup features, since having this option disable backups is
not necessarily desirable.

X-Gentoo-Bug: 533036
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=533036
Acked-by: Alexander Berntsen  gentoo.org>

---
 man/emerge.1 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/man/emerge.1 b/man/emerge.1
index ec2363d..4636997 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -403,7 +403,9 @@ live filesystem.
 .BR "\-\-buildpkg\-exclude " ATOMS
 A space separated list of package atoms for which
 no binary packages should be built. This option overrides all
-possible ways to enable building of binary packages.
+possible ways to enable building of binary packages except for
+the downgrade\-backup and unmerge\-backup \fBFEATURES\fR settings (see
+\fBmake.conf\fR(5) for more information about \fBFEATURES\fR settings).
 .TP
 .BR "\-\-buildpkgonly " (\fB\-B\fR)
 Creates binary packages for all ebuilds processed without actually

[gentoo-commits] proj/portage:master commit in: man/

[Mike Frysinger]

commit: d9ce5bbc4cdfe2f3c5c0595b8257688336c6eba2
Author: Mike Frysinger  gentoo  org>
AuthorDate: Wed Feb 18 18:24:04 2015 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Wed Feb 18 18:24:04 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=d9ce5bbc

emerge(1): use (...) for parenthetical asides

---
 man/emerge.1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/man/emerge.1 b/man/emerge.1
index 7d8d003..25602e0 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -71,8 +71,8 @@ necessary for your system to run properly (the differences 
between these
 two sets are documented in \fBportage\fR(5)).
 \fBselected\fR encompasses both the \fBselected-packages\fR
 and \fBselected-sets\fR sets, while \fBworld\fR encompasses the \fBselected\fR,
-\fBsystem\fR and \fBprofile\fR sets. [See
-\fBFILES\fR below for more information.] Other sets can exist depending
+\fBsystem\fR and \fBprofile\fR sets. (See \fBFILES\fR below for more
+information.) Other sets can exist depending
 on the current configuration. The default set configuration is located
 in the \fB/usr/share/portage/config/sets\fR directory.
 User sets may be created by placing files in the \fB/etc/portage/sets/\fR

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit: 86a675d7c9979f245499dd8d2253557933b6a3fe
Author: Zac Medico  gentoo  org>
AuthorDate: Tue Feb 24 00:13:41 2015 +
Commit: Zac Medico  gentoo  org>
CommitDate: Tue Feb 24 00:37:48 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=86a675d7

man/portage.5: document sets.conf (bug 541188)

This documents /etc/portage/sets.conf, /usr/portage/sets.conf, and
/usr/share/portage/config/sets. It refers to "Package Set Configuration"
section of the html documentation for more information.

X-Gentoo-Bug: 541188
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=541188
Acked-by: Brian Dolbec  gentoo.org>

---
 man/portage.5 | 49 -
 1 file changed, 48 insertions(+), 1 deletion(-)

diff --git a/man/portage.5 b/man/portage.5
index ed5140d..3a64206 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -1,4 +1,4 @@
-.TH "PORTAGE" "5" "Jan 2015" "Portage VERSION" "Portage"
+.TH "PORTAGE" "5" "Feb 2015" "Portage VERSION" "Portage"
 .SH NAME
 portage \- the heart of Gentoo
 .SH "DESCRIPTION"
@@ -65,6 +65,7 @@ package.use
 postsync.d
 repo.postsync.d
 repos.conf
+sets.conf
 .fi
 .TP
 .BR /etc/portage/env/
@@ -76,6 +77,11 @@ site-specific overrides of \fB/etc/portage/make.profile/\fR
 .BR /etc/portage/sets/
 user\-defined package sets
 .TP
+.BR /usr/portage/
+.nf
+sets.conf
+.fi
+.TP
 .BR /usr/portage/metadata/
 .nf
 layout.conf
@@ -112,6 +118,7 @@ use.stable.force
 .nf
 make.globals
 repos.conf
+sets
 .fi
 .TP
 .BR /var/cache/edb/
@@ -1066,6 +1073,30 @@ sync\-uri = git://git.overlays.gentoo.org/proj/voip.git
 auto\-sync = yes
 .fi
 .RE
+.TP
+.BR sets.conf
+A package set configuration file. Settings here override settings from
+\fB/usr/portage/sets.conf\fR and \fB/usr/share/portage/config/sets\fR.
+The format is described extensively in the
+\fIPackage Set Configuration\fR section of the html documentation which
+is installed with portage when the "doc" USE flag is enabled.
+
+.I Example:
+.nf
+[world]
+class = portage.sets.base.DummyPackageSet
+packages = @profile @selected @system
+
+[usersets]
+class = portage.sets.files.StaticFileSet
+multiset = true
+directory =  %(PORTAGE_CONFIGROOT)setc/portage/sets
+world-candidate = True
+
+[module-rebuild]
+class = portage.sets.dbapi.OwnerSet
+files = /lib/modules
+.fi
 .RE
 .TP
 .BR /etc/portage/env/
@@ -1106,6 +1137,15 @@ Also see \fB/var/lib/portage/world_sets\fR and the 
\fBemerge\fR(1)
 \fB\-\-list\-sets\fR option.
 .RE
 .TP
+.BR /usr/portage/
+.RS
+.TP
+.BR sets.conf
+A package set configuration file. Also see \fB/etc/portage/sets.conf\fR
+which overrides these settings, and
+\fB/usr/share/portage/config/sets\fR which contains default settings.
+.RE
+.TP
 .BR /usr/portage/metadata/
 .RS
 .TP
@@ -1470,6 +1510,13 @@ The default configuration of repositories for Portage.  
This comes from
 the portage package itself.  Settings in \fB/etc/portage/repos.conf\fR
 override values set here. The format is described extensively in section
 for \fB/etc/portage/repos.conf\fR.
+.TP
+.BR sets
+A directory containing package set configuration files. Also see
+\fB/etc/portage/sets.conf\fR and \fB/usr/portage/sets.conf\fR, both of
+which override values set here. Default set configurations are installed
+in \fB/usr/share/portage/config/sets/portage.conf\fR.
+.RE
 .RE
 .TP
 .BR /var/cache/edb/

[gentoo-commits] proj/portage:master commit in: man/

[Michał Górny]

commit: 96c0a2d38396ff7a37fb51ddd2e7f66fd444e6e2
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Jan 24 09:27:59 2015 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Jan 24 17:40:38 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=96c0a2d3

Fix typo breaking the portage(5) manpage

---
 man/portage.5 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/man/portage.5 b/man/portage.5
index 5d0e7c0..189561c 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -1,4 +1,4 @@
-TH "PORTAGE" "5" "Jan 2015" "Portage VERSION" "Portage"
+.TH "PORTAGE" "5" "Jan 2015" "Portage VERSION" "Portage"
 .SH NAME
 portage \- the heart of Gentoo
 .SH "DESCRIPTION"

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit: 0eecbc899ad9b97cb786ad9b10cc7a5d56c35e79
Author: Austin English  gmail  com>
AuthorDate: Fri Dec  5 15:29:16 2014 +
Commit: Zac Medico  gentoo  org>
CommitDate: Mon Dec  8 15:36:22 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=0eecbc89

man/emerge.1: --quiet-build=n overridden by --jobs (505116)

Users may be confused that --quiet-build=n has no effect when used
together with --jobs, so it deserves to be mentioned in the man page.

X-Gentoo-Bug: 505116
X-Gentoo-Url: https://bugs.gentoo.org/show_bug.cgi?id=505116
Acked-by: Alexander Berntsen  gentoo.org>

---
 man/emerge.1 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/man/emerge.1 b/man/emerge.1
index b9ce79c..f64fd1b 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -1,4 +1,4 @@
-.TH "EMERGE" "1" "Nov 2014" "Portage VERSION" "Portage"
+.TH "EMERGE" "1" "Dec 2014" "Portage VERSION" "Portage"
 .SH "NAME"
 emerge \- Command\-line interface to the Portage system
 .SH "SYNOPSIS"
@@ -708,6 +708,8 @@ corresponding die messages.
 Note that interactive packages currently force all build output to
 be displayed on stdout. This issue can be temporarily avoided
 by specifying \fI\-\-accept\-properties=\-interactive\fR.
+Further, note that disabling \fI\-\-quiet\-build\fR has no effect if
+\fI\-\-jobs\fR is set to anything higher than 1.
 .TP
 .BR "\-\-quiet\-fail [ y | n ]"
 Suppresses display of the build log on stdout when build output is hidden

[gentoo-commits] proj/portage:master commit in: man/

[Brian Dolbec]

commit: de41f86caafd105e4b836f8f2fef457336182ea2
Author: Brian Dolbec  gentoo  org>
AuthorDate: Wed Feb  4 21:40:47 2015 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Wed Feb  4 21:49:36 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=de41f86c

man/portage.5 Final updates for sync changes

---
 man/portage.5 | 32 +++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/man/portage.5 b/man/portage.5
index 5ac3100..74b0771 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -61,6 +61,8 @@ package.mask
 package.properties
 package.unmask
 package.use
+postsync.d
+repo.postsync.d
 repos.conf
 .fi
 .TP
@@ -808,6 +810,26 @@ x11\-libs/qt \-mysql
 */* VIDEO_CARDS: \-* radeon
 .fi
 .TP
+.BR postsync.d/
+This directory is for user supplied postsync hooks to be run once after all
+repositories have been synced.  Each script is called in alphabetic order
+without any arguments.
+.fi
+.TP
+.BR repo.postsync.d/
+This directory is for user supplied postsync hooks to be run once after each
+repository has been synced.  Each script is called in alphabetic order
+with three arguments.
+
+.I args:
+repository name, sync-uri, location
+.fi
+
+Using this information it is possible for hooks to be run for only a certain
+repository.  This way other update actions can be performed for that repository
+only.
+.fi
+.TP
 .BR repos.conf
 Specifies \fIsite\-specific\fR repository configuration information.
 .br
@@ -871,7 +893,7 @@ desired via "\fBemaint sync \-\-repo foo\fR".
 Valid values: yes, no, true, false.
 .br
 If unset, the repo will be treated as set
-no, false.
+yes, true.
 .TP
 .B eclass\-overrides
 Makes given repository inherit eclasses from specified repositories.
@@ -1011,6 +1033,14 @@ location = /usr/portage
 sync\-type = cvs
 sync\-uri = :pserver:anonym...@anoncvs.gentoo.org:/var/cvsroot
 sync\-cvs\-repo = gentoo\-x86
+auto\-sync = yes
+
+# Overlay 'voip' syncronized with layman's plug-in sync module
+[voip]
+location = /var/lib/layman/voip
+sync-type = laymanator
+sync-uri = git://git.overlays.gentoo.org/proj/voip.git
+auto-sync = yes
 .fi
 .RE
 .RE

[gentoo-commits] proj/portage:master commit in: man/

[Brian Dolbec]

commit: 7c912b0cfbbacdb901435e59ed8c541de9de61d7
Author: Brian Dolbec  gentoo  org>
AuthorDate: Thu Feb  5 21:10:08 2015 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Thu Feb  5 21:10:08 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=7c912b0c

man/portage.5: Add missing valid sync-type's

Fix some missed - escapes.

---
 man/portage.5 | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/man/portage.5 b/man/portage.5
index 74b0771..8bebd32 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -941,7 +941,7 @@ the newest commit). If set to 0, the depth is unlimited.
 .B sync\-type
 Specifies type of synchronization performed by `emerge \-\-sync`.
 .br
-Valid non\-empty values: cvs, git, rsync
+Valid non\-empty values: cvs, git, rsync, svn, websync (emerge-webrsync)
 .br
 This attribute can be set to empty value to disable synchronization of given
 repository. Empty value is default.
@@ -1038,9 +1038,9 @@ auto\-sync = yes
 # Overlay 'voip' syncronized with layman's plug-in sync module
 [voip]
 location = /var/lib/layman/voip
-sync-type = laymanator
-sync-uri = git://git.overlays.gentoo.org/proj/voip.git
-auto-sync = yes
+sync\-type = laymanator
+sync\-uri = git://git.overlays.gentoo.org/proj/voip.git
+auto\-sync = yes
 .fi
 .RE
 .RE

[gentoo-commits] proj/portage:master commit in: man/

[Brian Dolbec]

commit: ca75eb4bdce089a3f27686f031fd56f1c39d0827
Author: Brian Dolbec  gentoo  org>
AuthorDate: Fri Feb  6 19:39:13 2015 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Fri Feb  6 19:39:13 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=ca75eb4b

man/emaint.1: As suggested in the forums, improve the decription

---
 man/emaint.1 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/man/emaint.1 b/man/emaint.1
index 47b67f4..f8b2031 100644
--- a/man/emaint.1
+++ b/man/emaint.1
@@ -1,14 +1,14 @@
 .TH "EMAINT" "1" "Jan 2015" "Portage VERSION" "Portage"
 .SH NAME
-emaint \- performs system health checks and maintenance
+emaint \- performs package managment related system health checks and 
maintenance
 .SH SYNOPSIS
 .BR emaint
 [\fIoptions\fR]
 [\fBall\fR | \fBbinhost\fR | \fBcleanresume\fR | \
 \fBmovebin\fR | \fBmoveinst\fR | \fBworld\fR]
 .SH DESCRIPTION
-The emaint program provides an interface to system health
-checks and maintenance.
+The emaint program provides a command line interface to the modular package
+management system health checks and maintenance.
 .SH COMMANDS
 .TP
 .BR all

[gentoo-commits] proj/portage:master commit in: man/

[Brian Dolbec]

commit: 530397434931af654c7b857d20f35ed3939cf95c
Author: Brian Dolbec  gentoo  org>
AuthorDate: Sat Feb  7 00:24:00 2015 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Feb  7 00:24:00 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=53039743

man/emaint.1: Suggested tweaks from igli

---
 man/emaint.1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/man/emaint.1 b/man/emaint.1
index f8b2031..6b8fdf9 100644
--- a/man/emaint.1
+++ b/man/emaint.1
@@ -7,8 +7,8 @@ emaint \- performs package managment related system health 
checks and maintenanc
 [\fBall\fR | \fBbinhost\fR | \fBcleanresume\fR | \
 \fBmovebin\fR | \fBmoveinst\fR | \fBworld\fR]
 .SH DESCRIPTION
-The emaint program provides a command line interface to the modular package
-management system health checks and maintenance.
+The emaint program provides a command line interface to package
+management health checks and maintenance.
 .SH COMMANDS
 .TP
 .BR all

[gentoo-commits] proj/portage:master commit in: man/

[Alexander Berntsen]

commit: 4cbf3ef951c50f727dc23af99fac254b97814afd
Author: Alexander Berntsen  gentoo  org>
AuthorDate: Sat Jul 19 13:49:53 2014 +
Commit: Alexander Berntsen  gentoo  org>
CommitDate: Sat Jul 19 13:49:53 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=4cbf3ef9

man/repoman: Note line inaccuracies (bug 517416)

Signed-off-by: Alexander Berntsen  gentoo.org>

---
 man/repoman.1 | 4 
 1 file changed, 4 insertions(+)

diff --git a/man/repoman.1 b/man/repoman.1
index a78f94e..c576768 100644
--- a/man/repoman.1
+++ b/man/repoman.1
@@ -12,6 +12,10 @@ checks the quality of ebuild repositories.
 
 Note: \fBrepoman commit\fR only works \fIinside local\fR cvs, git, or
 subversion repositories.
+
+Note: Messages pertaining to specific lines may be inaccurate in the
+prescence of continuation lines from use of the \fI\\\fR character in
+BASH.
 .SH OPTIONS
 .TP
 \fB-a\fR, \fB--ask\fR

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit: 095f2391505547eb2149dd9b808c6f9bb507142a
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Mar 17 13:50:26 2019 +
Commit: Zac Medico  gentoo  org>
CommitDate: Sun Mar 17 20:27:50 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=095f2391

man: Update has_version and best_version descriptions for EAPI 7

Closes: https://github.com/gentoo/portage/pull/412
Signed-off-by: James Le Cuirot  gentoo.org>
Signed-off-by: Zac Medico  gentoo.org>

 man/ebuild.5 | 36 ++--
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 5ae84eb74..85a621fa3 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -1086,20 +1086,28 @@ has a default value of ' ', or a space.  It is a 
\fBbash\fR(1) setting.
 .B hasv\fR \fI\fR \fI
 Like \fBhas\fR, but also echoes \fIitem\fR when \fBhas\fR returns true.
 .TP
-.B has_version\fR \fI[\-\-host\-root]\fR \fI
-Check to see if \fIcategory/package\-version\fR is installed on the system.
-The parameter accepts all values that are acceptable in the \fBDEPEND\fR
-variable.  The function returns 0 if \fIcategory/package\-version\fR is
-installed, 1 otherwise. Beginning with \fBEAPI 5\fR, the
-\-\-host\-root option may be used in order to cause the query
-to apply to the host root instead of ${ROOT}.
-.TP
-.B best_version\fR \fI[\-\-host\-root]\fR \fI
-This function will look up \fIpackage name\fR in the database of currently
-installed programs and echo the "best version" of the package that is
-currently installed. Beginning with \fBEAPI 5\fR, the
-\-\-host\-root option may be used in order to cause the query
-to apply to the host root instead of ${ROOT}.
+.B has_version\fR \fI[\-b]\fR \fI[\-d]\fR \fI[\-r]\fR \fI[\-\-host\-root]\fR 
\fI
+Check to see if \fIcategory/package\-version\fR is installed.  The
+parameter accepts all values that are acceptable in the \fBDEPEND\fR
+variable.  The function returns 0 if \fIcategory/package\-version\fR
+is installed, 1 otherwise. The package is searched for in \fBROOT\fR
+by default.
+
+In \fBEAPI 5\fR and \fBEAPI 6\fR, the package is searched for in the
+build host if the \fI\-\-host\-root\fR option is given.
+
+In \fBEAPI 7\fR and later, the confusing \fI\-\-host\-root\fR option
+has been replaced with \fI\-b\fR, which corresponds to a dependency
+satisfied by \fBBDEPEND\fR in the build host.  Similarly, the
+\fI\-d\fR option corresponds to \fBDEPEND\fR in \fBSYSROOT\fR and the
+\fI\-r\fR option corresponds to \fBRDEPEND\fR in \fBROOT\fR.
+.TP
+.B best_version\fR \fI[\-b]\fR \fI[\-d]\fR \fI[\-r]\fR \fI[\-\-host\-root]\fR 
\fI
+This function will look up \fIpackage name\fR in the database of
+currently installed packages and echo the "best version" of the
+package that is found or nothing if no version is installed.  The
+package is searched for in \fBROOT\fR by default.  It accepts the same
+options as \fBhas_version\fR.
 
 Example:
 .nf

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit: 1932757ff18f46fdf83c03bb56981a31709b755f
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Mar 17 17:22:11 2019 +
Commit: Zac Medico  gentoo  org>
CommitDate: Sun Mar 17 20:49:02 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=1932757f

man: Remove obsolete cross-compilation section

It makes heavy use of ambiguous terminology from EAPI 5-hdepend. Part
of it talks about the targetroot USE flag, which we do not plan to
formally adopt into PMS. Overall, it is more likely to confuse than
help people.

I thought about rewriting it but it is difficult to summarise this
complex subject in a useful way. The wiki is probably a better place
to write about it.

Closes: https://github.com/gentoo/portage/pull/413
Signed-off-by: James Le Cuirot  gentoo.org>
Signed-off-by: Zac Medico  gentoo.org>

 man/ebuild.5 | 43 ---
 1 file changed, 43 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 1d0c89529..27f47d2b1 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -314,49 +314,6 @@ the user does not specify any of the previous choices.
 Note that if any of the packages listed are already merged, the package manager
 will use that to consider the dependency satisfied.
 
-.SS "Cross-compilation"
-Portage supports cross-compilation into a subdirectory specified by \fBROOT\fR.
-.TP
-.B Host
-\fIHost\fR in this context means the platform hosting the build process, i.e.
-what autotools calls CBUILD.
-Its packages are contained in the root of the filesystem ("\fI/\fR").
-
-If \fBROOT\fR is "\fI/\fR", all dependency types will be installed there.
-Otherwise, for EAPIs that support \fBHDEPEND\fR (experimental
-\fBEAPI 5-hdepend\fR), only \fBHDEPEND\fR is installed into "\fI/\fR".
-For EAPIs that do not support \fBHDEPEND\fR, the behaviour is controlled by the
-\fI\-\-root-deps\fR flag to \fBemerge\fR(1), defaulting to install only
-\fBDEPEND\fR into the \fIhost\fR.
-.TP
-.B Target
-\fITarget\fR refers to the platform that the package will later run on, i.e.
-what autotools calls CHOST.
-The directory housing this system is specified by \fBROOT\fR.
-If it is different from "\fI/\fR", i.e. \fIhost\fR and \fItarget\fR are not the
-same, this variable contains the path to the directory housing the \fItarget\fR
-system.
-
-For EAPIs that support \fBHDEPEND\fR (experimental \fBEAPI 5-hdepend\fR),
-\fBDEPEND\fR, \fBRDEPEND\fR, and \fBPDEPEND\fR
-list the \fItarget\fR dependencies, i.e. those to be installed into \fBROOT\fR.
-For EAPIs that do not support \fBHDEPEND\fR, the \fBemerge\fR(1) flag
-\fI\-\-root-deps\fR controls what the package manager installs there.
-Without it, \fBemerge\fR defaults to install only runtime dependencies (i.e.
-\fBRDEPEND\fR and \fBPDEPEND\fR) into \fBROOT\fR.
-.PP
-See section \fBVARIABLES\fR for more information about the \fBDEPEND\fR,
-\fBRDEPEND\fR and \fBHDEPEND\fR variables.
-.TP
-.B The targetroot USE flag
-For EAPIs that support the "\fItargetroot\fR" USE flag, that flag is
-automatically enabled by the package manager if \fIhost\fR and \fItarget\fR
-system are not the same, i.e. if the \fBROOT\fR is not "\fI/\fR".
-This is necessary where the package to be built needs an executable copy of
-itself during the build process.
-A known example is dev-lang/python, which needs to run a Python interpreter
-during compilation.
-
 .SH "VARIABLES"
 .TP
 .B Usage Notes

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit: e68df766397b238c26f567882f9d3dfcccb99e10
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Mar 17 17:19:27 2019 +
Commit: Zac Medico  gentoo  org>
CommitDate: Sun Mar 17 20:48:49 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=e68df766

man: Replace HDEPEND description with newer BDEPEND description

Include a passing reference to HDEPEND from EAPI 5-hdepend.

Signed-off-by: James Le Cuirot  gentoo.org>
Signed-off-by: Zac Medico  gentoo.org>

 man/ebuild.5 | 23 ---
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 85a621fa3..1d0c89529 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -616,10 +616,9 @@ This should contain a list of all packages that are 
required for the program
 to compile (aka \fIbuildtime\fR dependencies).  These are usually libraries and
 headers.
 
-Starting from experimental \fBEAPI 5-hdepend\fR, tools should go into the
-\fBHDEPEND\fR variable instead, as \fBDEPEND\fR will only be installed into the
-\fItarget\fR system and hence cannot be executed in a cross\-compile setting.
-(See section \fBCross\-compilation\fR for more information.)
+Starting from \fBEAPI 7\fR, tools should go into the \fBBDEPEND\fR
+variable instead, as \fBDEPEND\fR will only be installed into the
+system being built and hence cannot be executed when cross-compiling.
 
 You may use the syntax described above in the \fBDependencies\fR section.
 .TP
@@ -633,14 +632,16 @@ implicitly set.
 
 You may use the syntax described above in the \fBDependencies\fR section.
 .TP
-.B HDEPEND
-This should contain a list of all packages that are required to be executable
-during compilation of this program (aka \fIhost\fR buildtime dependencies).
-These are usually tools, like interpreters or (cross\-)compilers.
+.B BDEPEND
+This should contain a list of all packages that are required to be
+executable during compilation of this program (aka \fInative build\fR
+dependencies).  These are usually tools, like interpreters or
+(cross\-)compilers.  They will be installed into the system performing
+the build.
 
-This variable is new in experimental \fBEAPI 5-hdepend\fR and will be installed
-into the \fIhost\fR system.
-(See section \fBCross-compilation\fR for more information.)
+This variable was formally introduced in \fBEAPI 7\fR but was
+previously known as \fBHDEPEND\fR in the experimental
+\fBEAPI 5-hdepend\fR.
 
 You may use the syntax described above in the \fBDependencies\fR section.
 .TP

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit: 778492b753b27753992d99ded118a37589649dd9
Author: Chris Mayo  gmail  com>
AuthorDate: Sat Mar 14 18:38:50 2020 +
Commit: Zac Medico  gentoo  org>
CommitDate: Sat Mar 14 19:00:54 2020 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=778492b7

man/emerge.1: fix logrotate directory containing elog-save-summary

Signed-off-by: Chris Mayo  gmail.com>
Signed-off-by: Zac Medico  gentoo.org>

 man/emerge.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/man/emerge.1 b/man/emerge.1
index 2261a771b..28b7f79f5 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -1491,7 +1491,7 @@ Contains a log of all the fetches in the previous emerge 
invocation.
 .TP
 .B
 /var/log/portage/elog/summary.log
-Contains the emerge summaries. Installs \fI/etc/logrotate/elog-save-summary\fR.
+Contains the emerge summaries. Installs 
\fI/etc/logrotate.d/elog-save-summary\fR.
 .SH "SEE ALSO"
 .BR "emerge \-\-help",
 .BR quickpkg (1),

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit: 86b022ce2a4fdd7b8477320d46088cb05e62e0f5
Author: James Le Cuirot  gentoo  org>
AuthorDate: Mon Apr  2 21:36:07 2018 +
Commit: Zac Medico  gentoo  org>
CommitDate: Tue May  1 08:28:44 2018 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=86b022ce

man: emerge: Describe the SYSROOT environment variable for EAPI 7

This deprecates the --root-deps option and the PORTAGE_CONFIGROOT
variable.

 man/emerge.1 | 38 +-
 1 file changed, 29 insertions(+), 9 deletions(-)

diff --git a/man/emerge.1 b/man/emerge.1
index a3c8dd7cd..f53ba92f5 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -911,6 +911,9 @@ necessary.
 .BR \-\-root=DIR
 Set the \fBROOT\fR environment variable.
 .TP
+.BR \-\-sysroot=DIR
+Set the \fBSYSROOT\fR environment variable.
+.TP
 .BR \-\-root\-deps[=rdeps]
 If no argument is given then build\-time dependencies of packages for
 \fBROOT\fR are installed to \fBROOT\fR instead of /.
@@ -919,12 +922,16 @@ of packages for \fBROOT\fR.
 This option is only meaningful when used together with \fBROOT\fR and it should
 not be enabled under normal circumstances!
 
-Does not affect EAPIs that support \fBHDEPEND\fR.
-Experimental \fBEAPI 5-hdepend\fR provides \fBHDEPEND\fR as a new
-means to adjust installation into "\fI/\fR" and \fBROOT\fR.
-If ebuilds using EAPIs which \fIdo not\fR support \fBHDEPEND\fR are built in
-the same \fBemerge\fR run as those using EAPIs which \fIdo\fR support
-\fBHDEPEND\fR, this option affects only the former.
+Does not affect EAPIs that support \fBBDEPEND\fR or \fBHDEPEND\fR.
+\fBEAPI 7\fR introduces \fBBDEPEND\fR and experimental
+\fBEAPI 5-hdepend\fR features \fBHDEPEND\fR as a means to adjust
+installation into / and \fBROOT\fR.  Use the \fBSYSROOT\fR environment
+variable to control where \fBDEPEND\fR is installed to under
+\fBEAPI 7\fR.
+
+When ebuilds with different EAPIs feature in the same emerge run, the
+appropriate behaviour for each EAPI is applied independently to each
+ebuild.
 .TP
 .BR "\-\-search\-index < y | n >"
 Enable or disable indexed search for search actions. This option is
@@ -1090,8 +1097,19 @@ Defaults to the prefix where portage is currently 
installed.
 .TP
 \fBROOT\fR = \fI[path]\fR
 Use \fBROOT\fR to specify the target root filesystem to be used for
-merging packages or ebuilds. This variable can be set via the \fB\-\-root\fR
-option or in \fBmake.conf\fR(5) (the command line overrides other settings).
+merging the requested packages or ebuilds and their runtime
+dependencies.  This variable can be set via the \fB\-\-root\fR option
+or in \fBmake.conf\fR(5) (the command line overrides other settings).
+.br
+Defaults to /.
+.TP
+\fBSYSROOT\fR = \fI[path]\fR
+Use \fBSYSROOT\fR to specify the target root filesystem to be used for
+merging the build dependencies satisfied by \fBDEPEND\fR.  This
+variable can be set via the \fB\-\-sysroot\fR option or in
+\fBmake.conf\fR(5) (the command line overrides other settings).  The
+value must either be / or equal to \fBROOT\fR.  When cross-compiling,
+only the latter is valid.
 .br
 Defaults to /.
 .TP
@@ -1099,7 +1117,9 @@ Defaults to /.
 Use \fBPORTAGE_CONFIGROOT\fR to specify the location for various portage
 configuration files
 (see \fBFILES\fR for a detailed list of configuration files).  This variable
-can be set via the \fB\-\-config\-root\fR option.
+can be set via the \fB\-\-config\-root\fR option.  However, it is now
+superseded by the \fBSYSROOT\fR variable and can only be given if its
+value matches \fBSYSROOT\fR or if \fBROOT=/\fR.
 .br
 Defaults to /.
 .SH "OUTPUT"

[gentoo-commits] proj/portage:master commit in: man/

[Mike Frysinger]

commit: cdcf4a28409daa7c56a0c2c94054f48bd5e43c6d
Author: Mike Frysinger  chromium  org>
AuthorDate: Tue Oct  2 17:20:04 2018 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Tue Oct  2 17:20:04 2018 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=cdcf4a28

man: ebuild: clarify revision handling in PVR/PF

Signed-off-by: Mike Frysinger  gentoo.org>

 man/ebuild.5 | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 9f491dd73..d085d5a92 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -392,13 +392,17 @@ Contains the revision number or 'r0' if no revision 
number exists.
 xfree\-4.2.1\-r2.ebuild \-\-> $PR=='r2'
 .TP
 .B PVR
-Contains the version number with the revision.
+Contains the version number with the revision (if non-zero).
 
+xfree\-4.2.1.ebuild \-\-> $PVR=='4.2.1'
+.nf
 xfree\-4.2.1\-r2.ebuild \-\-> $PVR=='4.2.1\-r2'
 .TP
 .B PF
 Contains the full package name \fBPN\fR\-\fBPVR\fR
 
+xfree\-4.2.1.ebuild \-\-> $PF=='xfree\-4.2.1'
+.nf
 xfree\-4.2.1\-r2.ebuild \-\-> $PF=='xfree\-4.2.1\-r2'
 .TP
 .B CATEGORY

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit: 35999c9dd08b695244d4b4850dfa75bce0ad9dec
Author: Zac Medico  gentoo  org>
AuthorDate: Wed Aug 29 18:15:46 2018 +
Commit: Zac Medico  gentoo  org>
CommitDate: Wed Aug 29 18:16:52 2018 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=35999c9d

man/emerge.1: fix "the the" typo (bug 664272)

Reported-by: kmac  koreymacdougall.com>
Bug: https://bugs.gentoo.org/664272

 man/emerge.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/man/emerge.1 b/man/emerge.1
index 08d23388d..8662f5514 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -258,7 +258,7 @@ additions of files) inside repositories synchronized using 
rsync.
 
 \fBNOTE:\fR
 The emerge \-\-sync command is a compatibility command.  Sync operations are
-now performed using the the new emaint sync module. This new emaint sync module
+now performed using the new emaint sync module. This new emaint sync module
 has greater functionality and flexibility.  Please refer to \fBemaint\fR(1) for
 more information about sync operations.
 

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit: 2ce54f65e6cb1f0f8109db3de40c282388c86316
Author: Zac Medico  gentoo  org>
AuthorDate: Fri Apr 13 21:11:52 2018 +
Commit: Zac Medico  gentoo  org>
CommitDate: Fri Apr 13 21:13:08 2018 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=2ce54f65

man/portage.5: fix manual section in header

Fixes: Fixes: 8aa1a070921d ("GitSync: Support setting environment variables for 
git")

 man/portage.5 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/man/portage.5 b/man/portage.5
index 2c3a75ccd..82a50a8f4 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -1,4 +1,4 @@
-.TH "PORTAGE" "31" "Apr 2018" "Portage VERSION" "Portage"
+.TH "PORTAGE" "5" "Apr 2018" "Portage VERSION" "Portage"
 .SH NAME
 portage \- the heart of Gentoo
 .SH "DESCRIPTION"

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit: b8cc6a4cd9990a86894ff14f2832f5f3a88bbd22
Author: Aaron Bauman  gentoo  org>
AuthorDate: Sun Aug 25 20:13:26 2019 +
Commit: Zac Medico  gentoo  org>
CommitDate: Mon Aug 26 18:09:49 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=b8cc6a4c

man/glsa-check.1: update the glsa-check man page

* Remove "Gentoo" from the name. It is obvious.
* Change "SYNTAX" to "SYNOPSIS" which is more common among man pages
* Update description to use the command name vice "This tool"
* Move bug reporting information to BUGS section
* Remove references to the "portage tree". Just call it a repo.
* Add the "sets" all, new, and affected to the SYNOPSIS
* Sentence case and add periods to all option descriptions

Signed-off-by: Aaron Bauman  gentoo.org>
Signed-off-by: Zac Medico  gentoo.org>

 man/glsa-check.1 | 119 ++-
 1 file changed, 57 insertions(+), 62 deletions(-)

diff --git a/man/glsa-check.1 b/man/glsa-check.1
index 67527230c..a0d49d4dd 100644
--- a/man/glsa-check.1
+++ b/man/glsa-check.1
@@ -1,66 +1,61 @@
-.TH "GLSA-CHECK" "1" "Aug 2019" "Portage VERSION" "Portage"
+.TH "GLSA\-CHECK" "1" "August 2019" "Portage VERSION" "Portage"
+.
 .SH "NAME"
-.LP
-glsa\-check \- Gentoo: Tool to locally monitor and manage GLSAs
-.SH "SYNTAX"
-.LP
-glsa\-check <\fIoption\fP> [\fIglsa\-list\fP]
-
-[\fIglsa\-list\fR] can contain an arbitrary number of GLSA ids, filenames 
containing GLSAs or the special identifiers 'all' and 'affected'
+\fBglsa\-check\fR \- Tool to locally monitor and manage GLSAs
+.
+.SH "SYNOPSIS"
+\fBglsa\-check\fR [options] [glsa\-id | all | new | affected]
+.
 .SH "DESCRIPTION"
-.LP
-This tool is used to locally monitor and manage Gentoo Linux Security 
Advisories.
-Please read:
-.br
-http://www.gentoo.org/security
-.br
-before reporting a bug.
-.LP
-Note: In order for this tool to be effective, you must regularly sync your 
local portage tree.
+\fBglsa\-check\fR is used to locally monitor and manage Gentoo Linux Security 
Advisories\. In order for \fBglsa\-check\fR to be effective, it is required 
that a local repository exists containing GLSA metadata\.
+.
 .SH "OPTIONS"
-.LP
-.TP
-.B \-l, \-\-list
-list the a summary for all GLSAs in glsa\-list and whether they affect the 
system
-.TP
-.B \-d, \-\-dump, \-\-print
-show all information about the GLSAs in glsa\-list
-.TP
-.B \-t, \-\-test
-test if this system is affected by the GLSAs in glsa\-list and output the GLSA 
IDs
-.TP
-.B \-p, \-\-pretend
-show the necessary steps to apply the GLSAs in glsa\-list
-.TP
-.B \-f, \-\-fix
-try to auto\-apply the GLSAs in in glsa\-list using emerge. This will only 
upgrade packages to later version, but not remove packages when no upgrade path 
exists (experimental)
-.TP
-.B \-i, \-\-inject
-inject the given GLSA into the glsa_injected file
-.TP
-.B \-n, \-\-nocolor
-disable colors (option)
-.TP
-.B \-h, \-\-help
-show this help message
-.TP
-.B \-V, \-\-version
-some information about this tool
-.TP
-.B \-v, \-\-verbose
-print more messages (option)
-.TP
-.B \-c, \-\-cve
-show CVE ids in listing mode (option)
-.TP
-.B \-q, \-\-quiet
-be less verbose and do not send empty mail (option)
-.TP
-.B \-m, \-\-mail
-send a mail with the given GLSAs to the administrator
+\fB\-l\fR, \fB\-\-list\fR List a summary for the given GLSA(s) or set and 
whether they affect the system\.
+.
+.P
+\fB\-d\fR, \fB\-\-dump\fR, \fB\-\-print\fR Show all information about the 
GLSA(s) or set\.
+.
+.P
+\fB\-t\fR, \fB\-\-test\fR Test if this system is affected by the GLSA(s) or 
set and output the GLSA ID(s)\.
+.
+.P
+\fB\-p\fR, \fB\-\-pretend\fR Show the necessary steps to remediate the system\.
+.
+.P
+\fB\-f\fR, \fB\-\-fix\fR (experimental) Attempt to remediate the system based 
on the instructions given in the GLSA(s) or set\. This will only upgrade (when 
an upgrade path exists) or remove packages\.
+.
+.P
+\fB\-i\fR, \fB\-\-inject\fR Inject the given GLSA(s) into the glsa_injected 
file\.
+.
+.P
+\fB\-n\fR, \fB\-\-nocolor\fR Removes color from output\.
+.
+.P
+\fB\-h\fR, \fB\-\-help\fR Show this help message\.
+.
+.P
+\fBV\fR, \fB\-\-version\fR Show information about \fBglsa\-check\fR\.
+.
+.P
+\fB\-v\fR, \fB\-\-verbose\fR Print more messages\.
+.
+.P
+\fB\-c\fR, \fB\-\-cve\fR Show CVE IDs in listing mode\.
+.
+.P
+\fB\-q\fR, \fB\-\-quiet\fR Be less verbose and do not send empty mail\.
+.
+.P
+\fB\-m\fR, \fB\-\-mail\fR Send a mail with the given GLSAs to the 
administrator\.
+.
+.SH "EXAMPLES"
+\fBglsa\-check \-t all\fR Test the system against all GLSAs in the GLSA 
repository\.
+.
+.P
+\fBglsa\-check \-t 201801\-01\fR Test the system against the specific GLSA 
201801\-01\.
+.
 .SH "FILES"
-.LP
-.TP
-.B /var/lib/portage/glsa_injected
-List of GLSA ids that have been injected and will never show up as 'affected' 
on this system.
-The file must contain one GLSA id (e.g. '200804\-02') per line.
+\fB/var/lib/portage/glsa_injected\fR List of GLSA ids that 

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit: 712e2b3fe88fd597914ddf449849b195c15fbcf6
Author: Aaron Bauman  gentoo  org>
AuthorDate: Fri Aug 30 19:29:00 2019 +
Commit: Zac Medico  gentoo  org>
CommitDate: Sat Aug 31 03:40:20 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=712e2b3f

glsa-check: add man page exit values

Bug: https://bugs.gentoo.org/587930

Reported-by: Bandie Yip Kojote  ttygap.net>
Signed-off-by: Aaron Bauman  gentoo.org>
Signed-off-by: Zac Medico  gentoo.org>

 man/glsa-check.1 | 12 
 1 file changed, 12 insertions(+)

diff --git a/man/glsa-check.1 b/man/glsa-check.1
index f1041737f..6bae0e9ed 100644
--- a/man/glsa-check.1
+++ b/man/glsa-check.1
@@ -57,6 +57,18 @@
 .P
 \fBglsa\-check \-t 201801\-01\fR Test the system against the specific GLSA 
201801\-01\.
 .
+.SH "EXIT VALUES"
+\fB0\fR Success
+.
+.P
+\fB1\fR Syntax or usage error
+.
+.P
+\fB2\fR Missing permissions, solution, etc
+.
+.P
+\fB6\fR System is affected by some GLSAs
+.
 .SH "FILES"
 \fB/var/lib/portage/glsa_injected\fR List of GLSA ids that have been injected 
and will never show up as \'affected\' on this system\. The file must contain 
one GLSA ID (e\.g\. \'200804\-02\') per line\.
 .

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit: d27242e08f17465da9fa94824998c427c5d81f88
Author: Zac Medico  gentoo  org>
AuthorDate: Sun Sep  1 04:53:49 2019 +
Commit: Zac Medico  gentoo  org>
CommitDate: Sun Sep  1 04:58:35 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=d27242e0

man/glsa-check.1: remove deprecated "new" target

The "new" target was remove in 82797924dcc6dbfcca22067633cd160ead1199a7.

Fixes: b8cc6a4cd999 ("man/glsa-check.1: update the glsa-check man page")
Reported-by: Aaron Bauman  gentoo.org>
Signed-off-by: Zac Medico  gentoo.org>

 man/glsa-check.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/man/glsa-check.1 b/man/glsa-check.1
index 6bae0e9ed..bb15cf5a9 100644
--- a/man/glsa-check.1
+++ b/man/glsa-check.1
@@ -4,7 +4,7 @@
 \fBglsa\-check\fR \- Tool to locally monitor and manage GLSAs
 .
 .SH "SYNOPSIS"
-\fBglsa\-check\fR [options] [glsa\-id | all | new | affected]
+\fBglsa\-check\fR [options] [glsa\-id | all | affected]
 .
 .SH "DESCRIPTION"
 \fBglsa\-check\fR is used to locally monitor and manage Gentoo Linux Security 
Advisories\. In order for \fBglsa\-check\fR to be effective, it is required 
that a local repository exists containing GLSA metadata\.

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit: 636ca48fa524efe5c0d1b69e35e86a422e6d4be1
Author: Aaron Bauman  gentoo  org>
AuthorDate: Sun Sep  1 16:07:40 2019 +
Commit: Zac Medico  gentoo  org>
CommitDate: Sun Sep  1 18:29:10 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=636ca48f

glsa-check: update man page with -r option

Also remove duplicate --quiet documentation.

Signed-off-by: Aaron Bauman  gentoo.org>
Signed-off-by: Zac Medico  gentoo.org>

 man/glsa-check.1 | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/man/glsa-check.1 b/man/glsa-check.1
index bb15cf5a9..23b5e9d94 100644
--- a/man/glsa-check.1
+++ b/man/glsa-check.1
@@ -1,4 +1,4 @@
-.TH "GLSA\-CHECK" "1" "August 2019" "Portage VERSION" "Portage"
+.TH "GLSA\-CHECK" "1" "September 2019" "Portage VERSION" "Portage"
 .
 .SH "NAME"
 \fBglsa\-check\fR \- Tool to locally monitor and manage GLSAs
@@ -37,9 +37,6 @@
 \fBV\fR, \fB\-\-version\fR Show information about \fBglsa\-check\fR\.
 .
 .P
-\fB\-q\fR, \fB\-\-quiet\fR Be less verbose and do not send empty mail\.
-.
-.P
 \fB\-v\fR, \fB\-\-verbose\fR Print more messages\.
 .
 .P
@@ -51,6 +48,9 @@
 .P
 \fB\-m\fR, \fB\-\-mail\fR Send a mail with the given GLSAs to the 
administrator\.
 .
+.P
+\fB\-r\fR, \fB\-\-reverse\fR List GLSAs in reverse order
+.
 .SH "EXAMPLES"
 \fBglsa\-check \-t all\fR Test the system against all GLSAs in the GLSA 
repository\.
 .

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit: 582e681e3911d3cc09b7729e564c5862db368478
Author: Zac Medico  gentoo  org>
AuthorDate: Sun Sep  1 22:04:16 2019 +
Commit: Zac Medico  gentoo  org>
CommitDate: Sun Sep  1 22:07:35 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=582e681e

man/glsa-check.1: fix man2html formatting

Signed-off-by: Zac Medico  gentoo.org>

 man/glsa-check.1 | 65 ++--
 1 file changed, 21 insertions(+), 44 deletions(-)

diff --git a/man/glsa-check.1 b/man/glsa-check.1
index 23b5e9d94..4fe1ad506 100644
--- a/man/glsa-check.1
+++ b/man/glsa-check.1
@@ -1,76 +1,53 @@
-.TH "GLSA\-CHECK" "1" "September 2019" "Portage VERSION" "Portage"
-.
+.TH "GLSA-CHECK" "1" "September 2019" "Portage VERSION" "Portage"
 .SH "NAME"
 \fBglsa\-check\fR \- Tool to locally monitor and manage GLSAs
-.
 .SH "SYNOPSIS"
 \fBglsa\-check\fR [options] [glsa\-id | all | affected]
-.
 .SH "DESCRIPTION"
 \fBglsa\-check\fR is used to locally monitor and manage Gentoo Linux Security 
Advisories\. In order for \fBglsa\-check\fR to be effective, it is required 
that a local repository exists containing GLSA metadata\.
-.
 .SH "OPTIONS"
+.TP
 \fB\-l\fR, \fB\-\-list\fR List a summary for the given GLSA(s) or set and 
whether they affect the system\.
-.
-.P
+.TP
 \fB\-d\fR, \fB\-\-dump\fR, \fB\-\-print\fR Show all information about the 
GLSA(s) or set\.
-.
-.P
+.TP
 \fB\-t\fR, \fB\-\-test\fR Test if this system is affected by the GLSA(s) or 
set and output the GLSA ID(s)\.
-.
-.P
+.TP
 \fB\-p\fR, \fB\-\-pretend\fR Show the necessary steps to remediate the system\.
-.
-.P
+.TP
 \fB\-f\fR, \fB\-\-fix\fR (experimental) Attempt to remediate the system based 
on the instructions given in the GLSA(s) or set\. This will only upgrade (when 
an upgrade path exists) or remove packages\.
-.
-.P
+.TP
 \fB\-i\fR, \fB\-\-inject\fR Inject the given GLSA(s) into the glsa_injected 
file\.
-.
-.P
+.TP
 \fB\-n\fR, \fB\-\-nocolor\fR Removes color from output\.
-.
-.P
+.TP
 \fB\-h\fR, \fB\-\-help\fR Show this help message\.
-.
-.P
-\fBV\fR, \fB\-\-version\fR Show information about \fBglsa\-check\fR\.
-.
-.P
+.TP
+\fB\-V\fR, \fB\-\-version\fR Show information about \fBglsa\-check\fR\.
+.TP
 \fB\-v\fR, \fB\-\-verbose\fR Print more messages\.
-.
-.P
+.TP
 \fB\-c\fR, \fB\-\-cve\fR Show CVE IDs in listing mode\.
-.
-.P
+.TP
 \fB\-q\fR, \fB\-\-quiet\fR Be less verbose and do not send empty mail\.
-.
-.P
+.TP
 \fB\-m\fR, \fB\-\-mail\fR Send a mail with the given GLSAs to the 
administrator\.
-.
-.P
+.TP
 \fB\-r\fR, \fB\-\-reverse\fR List GLSAs in reverse order
-.
 .SH "EXAMPLES"
 \fBglsa\-check \-t all\fR Test the system against all GLSAs in the GLSA 
repository\.
-.
-.P
+.TP
 \fBglsa\-check \-t 201801\-01\fR Test the system against the specific GLSA 
201801\-01\.
-.
 .SH "EXIT VALUES"
+.TP
 \fB0\fR Success
-.
-.P
+.TP
 \fB1\fR Syntax or usage error
-.
-.P
+.TP
 \fB2\fR Missing permissions, solution, etc
-.
-.P
+.TP
 \fB6\fR System is affected by some GLSAs
-.
 .SH "FILES"
 \fB/var/lib/portage/glsa_injected\fR List of GLSA ids that have been injected 
and will never show up as \'affected\' on this system\. The file must contain 
one GLSA ID (e\.g\. \'200804\-02\') per line\.
-.
 .SH "BUGS"
 All bugs should be reported to the Portage team via https://bugs\.gentoo\.org

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit: 84b9b5c2aea408b9e490b352885891bb3875714d
Author: Daniel Robbins  funtoo  org>
AuthorDate: Sun Sep 29 21:50:18 2019 +
Commit: Zac Medico  gentoo  org>
CommitDate: Sun Sep 29 21:50:18 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=84b9b5c2

man/ebuild.5: Improvements to the ebuild(5) man page

The following patch contains several formatting improvements,
as well as extended information about KEYWORDS that is easier
to understand. The original description started describing Gentoo
policy on KEYWORDS without actually explaining what they are and how
they work.

I have also added missing documentation for the ARCH variable as this
was sort of shoe-horned in to the KEYWORDS documentation, and tried
to make it clearer what is a technical requirement of Portage the
software and what are Gentoo-specific arch team requirements.

Bug: https://bugs.gentoo.org/695870
Signed-off-by: Zac Medico  gentoo.org>

 man/ebuild.5 | 160 +++
 1 file changed, 116 insertions(+), 44 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index b002f3889..e955907f7 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -17,9 +17,10 @@ calculating relationships between packages.  Please note 
that if the atom has
 not already been emerged, then the latest version available is matched.
 .TP
 .B Atom Bases
-The base atom is just a full category/packagename.
+The base atom is just a full category/packagename. Another name for a full
+category/packagename is a \fI"catpkg"\fR. You will find this shorthand\-name
+used frequently in Gentoo. Here are some base atoms, a.k.a \fI"catpkgs"\fR:
 
-Examples:
 .nf
 .I sys\-apps/sed
 .I sys\-libs/zlib
@@ -31,7 +32,7 @@ It is nice to be more specific and say that only certain 
versions of atoms are
 acceptable.  Note that versions must be combined with a prefix (see below).
 Hence you may add a version number as a postfix to the base.
 
-Examples:
+\fBExamples\fR:
 .nf
sys\-apps/sed\fI\-4.0.5\fR
sys\-libs/zlib\fI\-1.1.4\-r1\fR
@@ -51,7 +52,7 @@ Sometimes you want to be able to depend on general versions 
rather than
 specifying exact versions all the time.  Hence we provide standard boolean
 operators:
 
-Examples:
+\fBExamples\fR:
 .nf
\fI>\fRmedia\-libs/libgd\-1.6
\fI>=\fRmedia\-libs/libgd\-1.6
@@ -71,7 +72,7 @@ means match any revision of the base version specified.  So 
in the
 example below, we would match versions '1.0.2a', '1.0.2a\-r1', '1.0.2a\-r2',
 etc...
 
-Example:
+\fBExample\fR:
 .nf
\fI~\fRnet\-libs/libnet\-1.0.2a
 .fi
@@ -79,7 +80,7 @@ Example:
 .I !
 means block packages from being installed at the same time.
 
-Example:
+\fBExample\fR:
 .nf
\fI!\fRapp\-text/dos2unix
 .fi
@@ -90,7 +91,7 @@ and explicitly disallow them from being temporarily installed
 simultaneously during a series of upgrades. This syntax is supported
 beginning with \fBEAPI 2\fR.
 
-Example:
+\fBExample\fR:
 .nf
\fI!!\fR $P=='xfree\-4.2.1'
+\fBExample\fR:
+.nf
+   x11\-base/xorg\-server\-1.20.5\-r2 \-\-> 
'\fIx11\-base/xorg\-server\-1.20.5\fR'
+.fi
 .TP
 .B PN
 Contains the name of the script without the version number.
 
-xfree\-4.2.1\-r2.ebuild \-\-> $PN=='xfree'
+\fBExample\fR:
+.nf
+   x11\-base/xorg\-server\-1.20.5\-r2 \-\-> '\fIx11\-base/xorg\-server\fR'
+.fi
 .TP
 .B PV
 Contains the version number without the revision.
 
-xfree\-4.2.1\-r2.ebuild \-\-> $PV=='4.2.1'
+\fBExample\fR:
+.nf
+   x11\-base/xorg\-server\-1.20.5\-r2 \-\-> '\fI1.20.5\fR'
+.fi
 .TP
 .B PR
 Contains the revision number or 'r0' if no revision number exists.
 
-xfree\-4.2.1\-r2.ebuild \-\-> $PR=='r2'
+\fBExample\fR:
+.nf
+   x11\-base/xorg\-server\-1.20.5\-r2 \-\-> '\fIr2\fR'
+.fi
 .TP
 .B PVR
 Contains the version number with the revision (if non-zero).
 
+\fBExample\fR:
 .nf
-xfree\-4.2.1.ebuild \-\-> $PVR=='4.2.1'
-xfree\-4.2.1\-r2.ebuild \-\-> $PVR=='4.2.1\-r2'
+   x11\-base/xorg\-server\-1.20.5 \-\-> '\fI1.20.5\fR'
+   x11\-base/xorg\-server\-1.20.5\-r2 \-\-> '\fI1.20.5\-r2\fR'
 .fi
 .TP
 .B PF
 Contains the full package name \fBPN\fR\-\fBPVR\fR
 
+\fBExamples\fR:
 .nf
-xfree\-4.2.1.ebuild \-\-> $PF=='xfree\-4.2.1'
-xfree\-4.2.1\-r2.ebuild \-\-> $PF=='xfree\-4.2.1\-r2'
+   x11\-base/xorg\-server\-1.20.5 \-\-> '\fIxorg\-server\-1.20.5\fR'
+   x11\-base/xorg\-server\-1.20.5\-r2 \-\-> 
'\fIxorg\-server\-1.20.5\-r2\fR'
 .fi
 .TP
 .B CATEGORY
 Contains the package category name.
+
+\fBExample\fR:
+.nf
+   x11\-base/xorg\-server\-1.20.5\-r2 \-\-> '\fIx11\-base\fR'
+.fi
 .TP
 .B A
 Contains all source files required for the package.  This variable must
@@ -543,17 +571,61 @@ file name, should be separated by whitespace.
 Should contain a list of URIs for the sources main sites and other further
 package dependent information.
 .TP
-.B KEYWORDS\fR = \fI[\-~][x86,ppc,sparc,mips,alpha,arm,hppa]
-Should contain appropriate list of arches that the eb

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit: 5cc59a0064f2b6a79f87d6975354033eba29beaf
Author: Daniel Robbins  funtoo  org>
AuthorDate: Wed Jul 10 02:14:55 2019 +
Commit: Zac Medico  gentoo  org>
CommitDate: Wed Jul 10 20:26:14 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=5cc59a00

Improvements for man 5 ebuild to reflect EAPI 7 changes.

Closes: https://github.com/gentoo/portage/pull/437
Signed-off-by: Zac Medico  gentoo.org>

 man/ebuild.5 | 24 ++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 20684d8f4..7742ffbce 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -411,6 +411,9 @@ should be prefixed with ${D}.
 Beginning with \fBEAPI 3\fR, the offset prefix often needs
 to be taken into account here, for which the variable
 ${ED} is provided (see below).
+Note that with \fBEAPI 7\fR, any trailing slash
+contained in this path will be automatically removed for ease of concatenating
+paths within ebuilds.
 Do not modify this variable.
 .TP
 .B ED\fR = \fI"${PORTAGE_TMPDIR}/portage/${CATEGORY}/${PF}/image/${EPREFIX}/"
@@ -418,7 +421,9 @@ Beginning with \fBEAPI 3\fR, contains the path
 "${D%/}${EPREFIX}/" for convenience purposes.
 For EAPI values prior to \fBEAPI 3\fR which do
 not support ED, helpers use \fBD\fR where
-they would otherwise use ED.
+they would otherwise use ED. Note that with \fBEAPI 7\fR, any trailing slash
+contained in this path will be automatically removed for ease of concatenating
+paths within ebuilds.
 Do not modify this variable.
 .TP
 .B MERGE_TYPE
@@ -477,6 +482,18 @@ excluded during generation of \fBREQUIRES\fR metadata (see
 possible to create patterns containing quoted whitespace.
 .TP
 .B ROOT\fR = \fI"/"
+Please note an important recent change regarding the ROOT variable -- in 
\fBEAPI 7\fR ebuilds,
+this variable will default to "" rather than the traditional "/" within ebuilds
+when pointing to the root filesystem, and when set to a non-root path
+this variable will never contain a trailing slash. This has the added
+convenience of eliminating the need to
+specify "${ROOT%/}" when concatenating paths, making the use of ROOT
+more elegant. This applies to the variables EROOT, D and ED as well. Please
+make note that this will
+mean that ebuilds must use different logic in conditionals to determine if
+they are installing to the root filesystem -- use [[ "$ROOT" == "" ]] instead 
of
+[[ "$ROOT" == "/" ]].
+
 Contains the path that portage should use as the root of the live filesystem.
 When packages wish to make changes to the live filesystem, they should do so in
 the tree prefixed by ${ROOT}.  Often the offset prefix needs to be taken
@@ -486,7 +503,10 @@ below).  Do not modify this variable.
 .B EROOT\fR = \fI"${ROOT%/}${EPREFIX}/"
 Beginning with \fBEAPI 3\fR, contains
 "${ROOT%/}${EPREFIX}/" for convenience
-purposes. Do not modify this variable.
+purposes. Do not modify this variable. Also see the important note regarding
+ROOT with \fBEAPI 7\fR, above. As with ROOT, EROOT will be defined as ""
+when set to the root filesystem and never have a trailing slash within an
+ebuild.
 .TP
 .B BROOT\fR = \fI"${EPREFIX}"
 Beginning with \fBEAPI 7\fR, the absolute path to the root directory

[gentoo-commits] proj/portage:master commit in: man/

[Ulrich Müller]

commit: 132d0830cdd291f0a7b09c3b963e4da6efea31b9
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sat Jul 27 14:27:39 2019 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sat Jul 27 14:27:39 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=132d0830

man/ebuild.5: Fix .nf macro usage.

Several .nf (no-fill mode) blocks were not terminated by .fi, causing
broken formatting of the rest of the manpage.

Fixes: cdcf4a28409daa7c56a0c2c94054f48bd5e43c6d
Signed-off-by: Ulrich Müller  gentoo.org>

 man/ebuild.5 | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 7742ffbce..31bd8f771 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -351,16 +351,18 @@ xfree\-4.2.1\-r2.ebuild \-\-> $PR=='r2'
 .B PVR
 Contains the version number with the revision (if non-zero).
 
-xfree\-4.2.1.ebuild \-\-> $PVR=='4.2.1'
 .nf
+xfree\-4.2.1.ebuild \-\-> $PVR=='4.2.1'
 xfree\-4.2.1\-r2.ebuild \-\-> $PVR=='4.2.1\-r2'
+.fi
 .TP
 .B PF
 Contains the full package name \fBPN\fR\-\fBPVR\fR
 
-xfree\-4.2.1.ebuild \-\-> $PF=='xfree\-4.2.1'
 .nf
+xfree\-4.2.1.ebuild \-\-> $PF=='xfree\-4.2.1'
 xfree\-4.2.1\-r2.ebuild \-\-> $PF=='xfree\-4.2.1\-r2'
+.fi
 .TP
 .B CATEGORY
 Contains the package category name.

[gentoo-commits] proj/portage:master commit in: man/

[Ulrich Müller]

commit: 8ac598cb3b115fe2e98f3e3e28a85950bd674099
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sat Jul 27 14:34:10 2019 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sat Jul 27 14:34:10 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=8ac598cb

man/ebuild.5: Document PROPERTIES="live".

Signed-off-by: Ulrich Müller  gentoo.org>

 man/ebuild.5 | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 31bd8f771..b002f3889 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -1,4 +1,4 @@
-.TH "EBUILD" "5" "Apr 2019" "Portage VERSION" "Portage"
+.TH "EBUILD" "5" "Jul 2019" "Portage VERSION" "Portage"
 
 .SH "NAME"
 ebuild \- the internal format, variables, and functions in an ebuild script
@@ -708,13 +708,17 @@ Disables userpriv for specific packages.
 .RE
 .PD 1
 .TP
-.B PROPERTIES\fR = \fI[interactive]
+.B PROPERTIES\fR = \fI[interactive,live]
 A space delimited list of properties, with conditional syntax support.
 .PD 0
 .RS
 .TP
 .I interactive
 One or more ebuild phases will produce a prompt that requires user interaction.
+.TP
+.I live
+The package uses live source code that may vary each time that the package
+is installed.
 .RE
 .PD 1
 .TP

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

[Zac Medico]

commit: cd5e6d8d4e84bc042c041f75e428410d6cdb5475
Author: Zac Medico  gentoo  org>
AuthorDate: Tue Aug 13 01:02:55 2019 +
Commit: Zac Medico  gentoo  org>
CommitDate: Mon Aug 19 04:09:54 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=cd5e6d8d

glsa-check: install in /usr/bin (bug 463952)

In order to eliminate the duplicate implementation from gentoolkit,
install glsa-check into /usr/bin and add man page from gentoolkit.

Bug: https://bugs.gentoo.org/463952
Signed-off-by: Zac Medico  gentoo.org>

 man/glsa-check.1 | 66 
 setup.py |  2 +-
 2 files changed, 67 insertions(+), 1 deletion(-)

diff --git a/man/glsa-check.1 b/man/glsa-check.1
new file mode 100644
index 0..67527230c
--- /dev/null
+++ b/man/glsa-check.1
@@ -0,0 +1,66 @@
+.TH "GLSA-CHECK" "1" "Aug 2019" "Portage VERSION" "Portage"
+.SH "NAME"
+.LP
+glsa\-check \- Gentoo: Tool to locally monitor and manage GLSAs
+.SH "SYNTAX"
+.LP
+glsa\-check <\fIoption\fP> [\fIglsa\-list\fP]
+
+[\fIglsa\-list\fR] can contain an arbitrary number of GLSA ids, filenames 
containing GLSAs or the special identifiers 'all' and 'affected'
+.SH "DESCRIPTION"
+.LP
+This tool is used to locally monitor and manage Gentoo Linux Security 
Advisories.
+Please read:
+.br
+http://www.gentoo.org/security
+.br
+before reporting a bug.
+.LP
+Note: In order for this tool to be effective, you must regularly sync your 
local portage tree.
+.SH "OPTIONS"
+.LP
+.TP
+.B \-l, \-\-list
+list the a summary for all GLSAs in glsa\-list and whether they affect the 
system
+.TP
+.B \-d, \-\-dump, \-\-print
+show all information about the GLSAs in glsa\-list
+.TP
+.B \-t, \-\-test
+test if this system is affected by the GLSAs in glsa\-list and output the GLSA 
IDs
+.TP
+.B \-p, \-\-pretend
+show the necessary steps to apply the GLSAs in glsa\-list
+.TP
+.B \-f, \-\-fix
+try to auto\-apply the GLSAs in in glsa\-list using emerge. This will only 
upgrade packages to later version, but not remove packages when no upgrade path 
exists (experimental)
+.TP
+.B \-i, \-\-inject
+inject the given GLSA into the glsa_injected file
+.TP
+.B \-n, \-\-nocolor
+disable colors (option)
+.TP
+.B \-h, \-\-help
+show this help message
+.TP
+.B \-V, \-\-version
+some information about this tool
+.TP
+.B \-v, \-\-verbose
+print more messages (option)
+.TP
+.B \-c, \-\-cve
+show CVE ids in listing mode (option)
+.TP
+.B \-q, \-\-quiet
+be less verbose and do not send empty mail (option)
+.TP
+.B \-m, \-\-mail
+send a mail with the given GLSAs to the administrator
+.SH "FILES"
+.LP
+.TP
+.B /var/lib/portage/glsa_injected
+List of GLSA ids that have been injected and will never show up as 'affected' 
on this system.
+The file must contain one GLSA id (e.g. '200804\-02') per line.

diff --git a/setup.py b/setup.py
index 156537a31..c71deb97f 100755
--- a/setup.py
+++ b/setup.py
@@ -38,7 +38,7 @@ import sys
 x_scripts = {
'bin': [
'bin/ebuild', 'bin/egencache', 'bin/emerge', 
'bin/emerge-webrsync',
-   'bin/emirrordist', 'bin/portageq', 'bin/quickpkg',
+   'bin/emirrordist', 'bin/glsa-check', 'bin/portageq', 
'bin/quickpkg',
],
'sbin': [
'bin/archive-conf', 'bin/dispatch-conf', 'bin/emaint', 
'bin/env-update',

[gentoo-commits] proj/portage:master commit in: man/

[Mike Frysinger]

commit: e31d6813d5f1cdd133726add02383c444a3f17ff
Author: Mike Frysinger  chromium  org>
AuthorDate: Wed Aug 21 21:40:10 2019 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Wed Sep 11 08:43:57 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=e31d6813

make.conf: clarify distlocks usage

The current text makes it sound like distlocks control mutual access
in more scenarios than it actually does.  Clarify that it only shows
up for distfiles & binpkgs.

Signed-off-by: Mike Frysinger  gentoo.org>

 man/make.conf.5 | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index 9dcd35b2c..71165bc53 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -399,9 +399,13 @@ Enable portage support for the distcc package with pump 
mode.
 .TP
 .B distlocks
 Portage uses lockfiles to ensure competing instances don't clobber
-each other's files. This feature is enabled by default but may cause
+each other's files.  It covers saving distfiles to ${DISTDIR} and
+binpkgs to ${PKGDIR}.
+
+This feature is enabled by default but may cause
 heartache on less intelligent remote filesystems like NFSv2 and some
-strangely configured Samba server (oplocks off, NFS re\-export). A tool
+strangely configured Samba servers (oplocks off, NFS re\-export).
+
 /usr/lib/portage/bin/clean_locks exists to help handle lock issues
 when a problem arises (normally due to a crash or disconnect).
 .TP

[gentoo-commits] proj/portage:master commit in: man/

[Michał Górny]

commit: 63c0ac0dd06c0912ea37ac1e886da97f19492692
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Oct 12 06:44:55 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Oct 12 07:26:29 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=63c0ac0d

man/emirrordist.1: document new options

Reviewed-by: Zac Medico  gentoo.org>
Signed-off-by: Michał Górny  gentoo.org>

 man/emirrordist.1 | 10 ++
 1 file changed, 10 insertions(+)

diff --git a/man/emirrordist.1 b/man/emirrordist.1
index cdd66cbdb..45108ef8c 100644
--- a/man/emirrordist.1
+++ b/man/emirrordist.1
@@ -119,6 +119,16 @@ Directory for individual fetch logs.
 Specifies a file containing a list of files to whitelist, one per line,
 # prefixed lines ignored. Use this option multiple times in order to
 specify multiple whitelists.
+.TP
+\fB\-\-symlinks\fR
+Use symbolic links to link distfiles to the primary layout from other
+specified layouts. If not specified, hard links are used instead.
+.TP
+\fB\-\-layout\-conf\fR=\fIFILE\fR
+Specifies alternate mirror \fIlayout.conf\fR file to use in order
+to select the desired distfile layout. If not specified,
+\fIlayout.conf\fR in \fB\-\-distfiles\fR directory will be used
+if present, otherwise flat layout will be assumed.
 .SH "REPORTING BUGS"
 Please report bugs via https://bugs.gentoo.org/
 .SH "THANKS"

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit: b1a7ab1f7fe84818a70ac021d92facacaa14b769
Author: Zac Medico  gentoo  org>
AuthorDate: Wed Jun 19 20:48:23 2019 +
Commit: Zac Medico  gentoo  org>
CommitDate: Wed Jun 19 20:50:16 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=b1a7ab1f

man/emerge.1: --update implies --selective

Reported-by: Ben Kohler  gentoo.org>
Bug: https://bugs.gentoo.org/688356#c2
Signed-off-by: Zac Medico  gentoo.org>

 man/emerge.1 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/man/emerge.1 b/man/emerge.1
index 78ac55e25..4db2b3e62 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -1,4 +1,4 @@
-.TH "EMERGE" "1" "Apr 2019" "Portage VERSION" "Portage"
+.TH "EMERGE" "1" "Jun 2019" "Portage VERSION" "Portage"
 .SH "NAME"
 emerge \- Command\-line interface to the Portage system
 .SH "SYNOPSIS"
@@ -992,6 +992,7 @@ not always be the highest version number due to masking
 for testing and development. Package atoms specified on
 the command line are greedy, meaning that unspecific
 atoms may match multiple versions of slotted packages.
+This option also implies the \fB\-\-selective\fR option.
 .TP
 .BR "\-\-use\-ebuild\-visibility [ y | n ]"
 Use unbuilt ebuild metadata for visibility

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit: 38262ec5c16907161a5e4720d620f7c36be86941
Author: M. J. Everitt  iee  org>
AuthorDate: Sat Dec 15 01:59:00 2018 +
Commit: Zac Medico  gentoo  org>
CommitDate: Thu Dec 20 04:24:32 2018 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=38262ec5

Update documentation for PORT_LOGDIR* changes

Suggested-by: Michael Everitt  iee.org>
Bug: https://bugs.gentoo.org/668538
Signed-off-by: Zac Medico  gentoo.org>

 man/make.conf.5 | 28 +---
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index a0faf51bf..a8f5b639f 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -833,19 +833,10 @@ See the \fBPORTDIR\fR documentation for more information.
 Defaults to /usr/portage/packages.
 .TP
 .B PORT_LOGDIR
-This variable defines the directory in which per\-ebuild logs are kept.
-Logs are created only when this is set. They are stored as
-${CATEGORY}:${PF}:MMDD\-HHMMSS.log in the directory specified. If the
-directory does not exist, it will be created automatically and group
-permissions will be applied to it.  If the directory already exists, portage
-will not modify it's permissions.
+See \fIPORTAGE_LOGDIR\fR below. Deprecated.
 .TP
 .B PORT_LOGDIR_CLEAN
-This variable should contain a command for portage to call in order
-to clean PORT_LOGDIR. The command string should contain a
-\\${PORT_LOGDIR} place\-holder that will be substituted
-with the value of that variable. This variable will have no effect
-unless \fBclean\-logs\fR is enabled in \fBFEATURES\fR.
+See \fIPORTAGE_LOGDIR_CLEAN\fR below. Deprecated.
 .TP
 \fBPORTAGE_BINHOST\fR = \fI[space delimited URI list]\fR
 This is a list of hosts from which portage will grab prebuilt\-binary packages.
@@ -979,6 +970,21 @@ with an integer pid. For example, a value of "ionice \-c 3 
\-p \\${PID}"
 will set idle io priority. For more information about ionice, see
 \fBionice\fR(1). This variable is unset by default.
 .TP
+.B PORTAGE_LOGDIR
+This variable defines the directory in which per\-ebuild logs are kept.
+Logs are created only when this is set. They are stored as
+${CATEGORY}:${PF}:MMDD\-HHMMSS.log in the directory specified. If the
+directory does not exist, it will be created automatically and group
+permissions will be applied to it.  If the directory already exists, portage
+will not modify it's permissions.
+.TP
+.B PORTAGE_LOGDIR_CLEAN
+This variable should contain a command for portage to call in order
+to clean PORTAGE_LOGDIR. The command string should contain a
+\\${PORTAGE_LOGDIR} place\-holder that will be substituted
+with the value of that variable. This variable will have no effect
+unless \fBclean\-logs\fR is enabled in \fBFEATURES\fR.
+.TP
 \fBPORTAGE_NICENESS\fR = \fI[number]\fR
 The value of this variable will be added to the current nice level that
 emerge is running at.  In other words, this will not set the nice level,

[gentoo-commits] proj/portage:master commit in: man/

[Mike Frysinger]

commit: 792008adbec3e16902cea4976b32449fe7aaf756
Author: Mike Frysinger  chromium  org>
AuthorDate: Thu Dec 20 23:09:07 2018 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Thu Dec 20 23:09:07 2018 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=792008ad

man: fix random bad double spaces

Signed-off-by: Mike Frysinger  gentoo.org>

 man/emerge.1  | 6 +++---
 man/portage.5 | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/man/emerge.1 b/man/emerge.1
index 6f53680b4..afac83e76 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -246,7 +246,7 @@ matched as regular expressions.
 .BR \-\-sync
 Updates repositories, for which auto\-sync, sync\-type and sync\-uri 
attributes are
 set in repos.conf. A list of repos or aliases can be specified, in which case
-they  will be updated regardless of their auto\-sync attribute. See
+they will be updated regardless of their auto\-sync attribute.  See
 \fBportage\fR(5) for more information.
 The \fBPORTAGE_SYNC_STALE\fR variable configures
 warnings that are shown when emerge \-\-sync has not
@@ -577,7 +577,7 @@ first to make sure the result is what you expect.
 .TP
 .BR "\-\-exclude " ATOMS
 A space separated list of package names or slot atoms.
-Emerge won't  install any ebuild or binary package that
+Emerge won't install any ebuild or binary package that
 matches any of the given package atoms.
 .TP
 .BR "\-\-fail\-clean [ y | n ]"
@@ -988,7 +988,7 @@ readable dependency tree.
 .TP
 .BR \-\-update ", " \-u
 Updates packages to the best version available, which may
-not always be the  highest version number due to masking
+not always be the highest version number due to masking
 for testing and development. Package atoms specified on
 the command line are greedy, meaning that unspecific
 atoms may match multiple versions of slotted packages.

diff --git a/man/portage.5 b/man/portage.5
index 62943fb76..1a36e9b86 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -347,7 +347,7 @@ Special USE flags which may be needed when bootstrapping 
from stage1 to stage2.
 .TP
 .BR packages
 Provides the list of packages that compose the \fI@system\fR and
-\fI@profile\fR  package sets. The motivation to have \fI@profile\fR
+\fI@profile\fR package sets.  The motivation to have \fI@profile\fR
 separate from \fI@system\fR is that \fI@system\fR packages may have
 incomplete dependency specifications (due to long-standing Gentoo
 policy), and incomplete dependency specifications have deleterious

[gentoo-commits] proj/portage:master commit in: man/

[Mike Frysinger]

commit: c36e8dfaf808f68586e7519232e072490ccc51db
Author: Mike Frysinger  chromium  org>
AuthorDate: Tue Jun 30 19:15:16 2020 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Tue Jun 30 19:15:16 2020 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=c36e8dfa

man: fix syntax for page refs

Signed-off-by: Mike Frysinger  gentoo.org>

 man/egencache.1 | 4 ++--
 man/emerge.1| 8 
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/man/egencache.1 b/man/egencache.1
index 27cd69e63..98b230a14 100644
--- a/man/egencache.1
+++ b/man/egencache.1
@@ -13,7 +13,7 @@ itself, for distribution.
 .BR "\-\-update [ATOM] ... "
 Update the \fImetadata/md5\-cache/\fR directory (generate metadata as
 necessary).
-If no package atoms are specified then all will be updated. See ebuild(5)
+If no package atoms are specified then all will be updated. See \fBebuild\fR(5)
 for the details on package atom syntax.
 .TP
 .BR "\-\-update\-changelogs"
@@ -151,7 +151,7 @@ exists in the repository. It can also be explicitly enabled 
via the
 cache\-formats setting in \fImetadata/layout.conf\fR (refer to \fBportage\fR(5)
 for example usage). If the 'pms' cache format is enabled and the 'md5-dict'
 format is not enabled, then it is necessary to enable
-\fBmetadata-transfer\fR in \fBFEATURES\fR (see \fBmake.conf(5)\fR).
+\fBmetadata-transfer\fR in \fBFEATURES\fR (see \fBmake.conf\fR(5)).
 This causes intermediate cache (in a different format that includes
 eclass state) to be generated inside the directory which is configurable
 via the \fB\-\-cache\-dir\fR option.

diff --git a/man/emerge.1 b/man/emerge.1
index 28b7f79f5..a8be677d6 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -56,8 +56,8 @@ A \fItbz2file\fR must be a valid .tbz2 created with \fBebuild
 A \fIfile\fR must be a file or directory that has been installed by one or
 more packages. If an absolute path is not used, then it must begin with
 either "./" or "../". For directories that are owned by multiple packages, all
-owning packages will be selected. See the portageq(1) owners command if you
-would like to query the owners of one or more files or directories.
+owning packages will be selected. See the \fBportageq\fR(1) owners command if
+you would like to query the owners of one or more files or directories.
 .TP
 .BR set
 A \fIset\fR is a convenient shorthand for a large group of
@@ -1100,7 +1100,7 @@ This also applies to options that enable the 
\fB\-\-usepkg\fR option
 implicitly, such as \fB\-\-getbinpkg\fR.
 
 This setting can be added to
-\fBEMERGE_DEFAULT_OPTS\fR (see make.conf(5)) and later overridden via the
+\fBEMERGE_DEFAULT_OPTS\fR (see \fBmake.conf\fR(5)) and later overridden via the
 command line.
 .TP
 .BR "\-\-with\-bdeps\-auto < y | n >"
@@ -1109,7 +1109,7 @@ This option is used to enable or disable the program 
logic that causes
 actions. This option is enabled by default. Use
 \fB\-\-with\-bdeps\-auto=n\fR to prevent \fB\-\-with\-bdeps\fR from
 being automatically enabled for installation actions. This setting can
-be added to \fBEMERGE_DEFAULT_OPTS\fR (see make.conf(5)) and later
+be added to \fBEMERGE_DEFAULT_OPTS\fR (see \fBmake.conf\fR(5)) and later
 overridden via the command line.
 
 \fBNOTE:\fR The program logic that causes \fB\-\-with\-bdeps\fR to be

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit: 81687462dcc5636c097acb618bf9076c4d4e6e56
Author: Zac Medico  gentoo  org>
AuthorDate: Thu Nov 21 19:26:18 2019 +
Commit: Zac Medico  gentoo  org>
CommitDate: Thu Nov 21 20:10:51 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=81687462

man/make.conf.5: fix \fI typo

$ groff -man man/make.conf.5 >/dev/null
man/make.conf.5:15: warning: can't find font `L'

Reported-by: Ulrich Müller  gentoo.org>
Fixes: b5365341dad1 ("refresh many URIs in the code base")
Signed-off-by: Zac Medico  gentoo.org>

 man/make.conf.5 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index 71165bc53..44d518dbb 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -12,7 +12,7 @@ simple shell\-like expansion of the form \fIvar="${var}"\fR, 
the source
 keyword and variable substitution, but not some of the more advanced BASH
 features like arrays and special parameter expansions. For more details, see
 the Simple lexical analysis documentation:
-\fLhttps://docs.python.org/3/library/shlex.html\fR. Note that if you source
+\fIhttps://docs.python.org/3/library/shlex.html\fR. Note that if you source
 files, they need to be in the same shlex syntax for portage to read them.
 If make.conf is a directory, then all the files in that directory will
 be sorted in ascending alphabetical order by file name and summed

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit: 364c70a2d8f77640731c9dc4bef9f3bacbeab7a9
Author: Zac Medico  gentoo  org>
AuthorDate: Tue Nov 26 21:03:38 2019 +
Commit: Zac Medico  gentoo  org>
CommitDate: Wed Nov 27 03:19:00 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=364c70a2

man/emerge.1: fix \fB typo

$ groff -man man/emerge.1 >/dev/null
man/emerge.1:117: warning: can't find font `b'

Signed-off-by: Zac Medico  gentoo.org>

 man/emerge.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/man/emerge.1 b/man/emerge.1
index dd6cdfd6e..8d3e74074 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -114,7 +114,7 @@ how many are found. See
 Cleans up the system by examining the installed packages and removing older
 packages.  This is accomplished by looking at each installed package and
 separating the installed versions by \fBslot\fR.  Clean will \fBremove all but
-the most recently installed version in each \fbslot\fR.  Clean should not
+the most recently installed version in each slot\fR.  Clean should not
 remove unslotted packages. Note: Most recently installed means most
 \fBrecent\fR, not highest version.
 .TP

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit: bd362352dc83db6185528c794bb890d81b49cd4d
Author: Zac Medico  gentoo  org>
AuthorDate: Mon Feb 22 12:27:54 2021 +
Commit: Zac Medico  gentoo  org>
CommitDate: Mon Feb 22 12:30:58 2021 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=bd362352

man/make.conf.5: mention eclean-pkg for binpkg-multi-instance

Signed-off-by: Zac Medico  gentoo.org>

 man/make.conf.5 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index 548a10b9b..76e0ac155 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -313,8 +313,8 @@ per\-package PATH attribute in the 'Packages' index directs 
them to
 download the file from the correct URI, and they automatically use
 BUILD_TIME metadata to select the latest builds.
 
-There is currently no automated way to prune old builds from PKGDIR,
-although it is possible to remove packages manually, and then run
+The \fBeclean\-pkg\fR command can be used to prune old builds from PKGDIR.
+It is also possible to remove packages manually, and then run
 \(aqemaint \-\-fix binhost' to update the ${PKGDIR}/Packages index.
 .TP
 .B buildpkg

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit: d55e6f8f02fdc65986871a93809ead528b0e54fa
Author: Zac Medico  gentoo  org>
AuthorDate: Sat Feb 27 07:55:29 2021 +
Commit: Zac Medico  gentoo  org>
CommitDate: Sat Feb 27 07:56:10 2021 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=d55e6f8f

man/emirrordist.1: fix --content-db description

Signed-off-by: Zac Medico  gentoo.org>

 man/emirrordist.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/man/emirrordist.1 b/man/emirrordist.1
index 7ad10dfd0..d66a1849d 100644
--- a/man/emirrordist.1
+++ b/man/emirrordist.1
@@ -68,7 +68,7 @@ reporting purposes. Overwritten with each run.
 .TP
 \fB\-\-content\-db\fR=\fIFILE\fR
 Database file used to pair content digests with distfiles names
-(required fo content\-hash layout).
+(required for content\-hash layout).
 .TP
 \fB\-\-delete\fR
 Enable deletion of unused distfiles.

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit: ee944c4fd76af4f7dffb756e9ed0303cb9606112
Author: Thymo van Beers  gmail  com>
AuthorDate: Mon Jun 28 21:56:47 2021 +
Commit: Zac Medico  gentoo  org>
CommitDate: Sun Jul  4 22:59:21 2021 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=ee944c4f

man/make.conf.5: remove mention of zlib USE flag

Both sys-devel/binutils and sys-devel/gdb are built with system zlib by
default for some time now. This commit removes the mention of USE=zlib to avoid
confusion.

Signed-off-by: Thymo van Beers  gmail.com>
Signed-off-by: Zac Medico  gentoo.org>

 man/make.conf.5 | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index 1c72109ad..db742fdb5 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -378,8 +378,7 @@ redundant on\-the\-fly compression.  The resulting file 
will be called
 .TP
 .B compressdebug
 Compress the debug sections in the split debug files with zlib to save
-space.  Make sure you have built both binutils and gdb with USE=zlib
-support for this to work.  See \fBsplitdebug\fR for general split debug
+space.  See \fBsplitdebug\fR for general split debug
 information (upon which this feature depends).
 .TP
 .B config\-protect\-if\-modified

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit: 1f3bfcb357c3f262730175f4d59c11e1ed4f8dc3
Author: Zac Medico  gentoo  org>
AuthorDate: Fri Apr  9 18:26:49 2021 +
Commit: Zac Medico  gentoo  org>
CommitDate: Mon May 24 06:44:57 2021 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=1f3bfcb3

make.conf.5: Suggest PORTAGE_LOG_FILTER_FILE_CMD supervisor for cat fallback 
(bug 781854)

If PORTAGE_LOG_FILTER_FILE_CMD fails after exec, then output
will be lost. Therefore, suggest to use bash as a supervisor,
with fallback to cat.

Bug: https://bugs.gentoo.org/781854
Signed-off-by: Zac Medico  gentoo.org>

 man/make.conf.5 | 13 -
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index badaea18e..1c72109ad 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -998,7 +998,18 @@ will set idle io priority. For more information about 
ionice, see
 .B PORTAGE_LOG_FILTER_FILE_CMD
 This variable specifies a command that filters build log output to a
 log file. In order to filter ANSI escape codes from build logs,
-\fBansifilter\fR(1) is a convenient setting for this variable.
+\fBansifilter\fR(1) is a convenient setting for this variable. Generally,
+PORTAGE_LOG_FILTER_FILE_CMD should include a supervisor that falls back
+to cat if the real filter command fails after exec. For example, a
+supervisor is needed for ansifilter, in case it fails after exec due to
+a problem resolving libstdc++ during a gcc upgrade.
+.br
+.I Example:
+.nf
+# Use bash as a supervisor, for fallback to cat if ansifilter fails
+# after exec due to a problem resolving libstdc++ during a gcc upgrade.
+PORTAGE_LOG_FILTER_FILE_CMD="bash -c \\"ansifilter; exec cat\\""
+.fi
 .TP
 .B PORTAGE_LOGDIR
 This variable defines the directory in which per\-ebuild logs are kept.

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit: 5d2af567772bb12b073f1671daea6263055cbdc2
Author: Matthew Smith  gentoo  org>
AuthorDate: Sun Apr 24 18:32:00 2022 +
Commit: Zac Medico  gentoo  org>
CommitDate: Sun Apr 24 21:45:56 2022 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=5d2af567

man/make.conf.5: Document default MAKEOPTS behaviour

After commits 5a1e6c9 and 6c054da, if MAKEOPTS is left unset, it will
default to the number of processors.

Closes: https://github.com/gentoo/portage/pull/826
Signed-off-by: Matthew Smith  gentoo.org>
Signed-off-by: Zac Medico  gentoo.org>

 man/make.conf.5 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/man/make.conf.5 b/man/make.conf.5
index 8afde4a00..fc4a018c5 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -923,6 +923,7 @@ between \fICPUs+1\fR and \fI2*CPUs+1\fR. In order to avoid
 excess load, the \fB\-\-load\-average\fR option is recommended.
 For more information, see \fBmake\fR(1). Also see \fBemerge\fR(1) for
 information about analogous \fB\-\-jobs\fR and \fB\-\-load\-average\fR options.
+Defaults to the number of processors if left unset.
 .TP
 \fBNOCOLOR\fR = \fI["true" | "false"]\fR
 Defines if color should be disabled by default.

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit: 0b391cd238dd5db84268d3002a56154a10e9e32a
Author: Florian Schmaus  geekplace  eu>
AuthorDate: Tue Jul  7 09:31:36 2020 +
Commit: Zac Medico  gentoo  org>
CommitDate: Tue Jul  7 20:12:59 2020 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=0b391cd2

man/ebuild.5: Fix $P and $PN example

Both variables do *not* include the package's category. So $PN,
instead of

x11-base/xorg-server

returns

xorg-server

Same goes for $P.

This commit fixes the error which was introduced by
84b9b5c2a ("man/ebuild.5: Improvements to the ebuild(5) man page").

Bug: https://bugs.gentoo.org/731246
Closes: https://github.com/gentoo/portage/pull/567
Signed-off-by: Florian Schmaus  geekplace.eu>
Signed-off-by: Zac Medico  gentoo.org>

 man/ebuild.5 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index e955907f7..1afa59eef 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -342,7 +342,7 @@ This variable must NEVER be modified.
 
 \fBExample\fR:
 .nf
-   x11\-base/xorg\-server\-1.20.5\-r2 \-\-> 
'\fIx11\-base/xorg\-server\-1.20.5\fR'
+   x11\-base/xorg\-server\-1.20.5\-r2 \-\-> '\fIxorg\-server\-1.20.5\fR'
 .fi
 .TP
 .B PN
@@ -350,7 +350,7 @@ Contains the name of the script without the version number.
 
 \fBExample\fR:
 .nf
-   x11\-base/xorg\-server\-1.20.5\-r2 \-\-> '\fIx11\-base/xorg\-server\fR'
+   x11\-base/xorg\-server\-1.20.5\-r2 \-\-> '\fIxorg\-server\fR'
 .fi
 .TP
 .B PV

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit: 8851a437c7edc7ae01ba04dbff42b27e1f36b37b
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Apr  5 19:27:39 2021 +
Commit: Zac Medico  gentoo  org>
CommitDate: Mon Apr  5 20:41:40 2021 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=8851a437

man/emerge.1: fix typos

Fixes: 3253686e9438 ("emerge: make --binpkg-respect-use=y imply 
--autounmask-use=n")
Bug: https://bugs.gentoo.org/773469
Signed-off-by: Thomas Deutschmann  gentoo.org>
Signed-off-by: Zac Medico  gentoo.org>

 man/emerge.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/man/emerge.1 b/man/emerge.1
index 33416d986..f0988cd4a 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -418,7 +418,7 @@ Allow autounmask package.license changes.
 .BR "\-\-autounmask\-use < y | n >"
 Allow autounmask package.use changes. This option is enabled by default
 (any of \fB\-\-autounmask=n\fR, \fB\-\-autounmask\-use=n\fR,
-or \fB\-\-binpkg-\-respect\-use=y\fR  disables
+or \fB\-\-binpkg\-respect\-use=y\fR  disables
 it). The \fBEMERGE_DEFAULT_OPTS\fR variable may be used to
 disable this option by default in \fBmake.conf\fR(5).
 .TP

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit: 18a7fac56795fd1ae27ac6e8eb1d2591787c5694
Author: Sam James  gentoo  org>
AuthorDate: Fri Mar  5 21:25:49 2021 +
Commit: Zac Medico  gentoo  org>
CommitDate: Sat Mar  6 08:41:03 2021 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=18a7fac5

man/make.conf.5: fix typos

Closes: https://github.com/gentoo/portage/pull/681
Signed-off-by: Sam James  gentoo.org>
Signed-off-by: Zac Medico  gentoo.org>

 man/make.conf.5 | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index e78751c16..8d551c95e 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -849,7 +849,7 @@ Defaults to false.
 Defines the location where created .tbz2 binary packages will be
 stored when the \fBemerge\fR(1) \fB\-\-buildpkg\fR option is enabled.
 By default, a given package is stored in a subdirectory corresponding
-to it's category. However, for backward compatibility with the layout
+to its category. However, for backward compatibility with the layout
 used by older versions of portage, if the \fI${PKGDIR}/All\fR directory
 exists then all packages will be stored inside of it and symlinks to
 the packages will be created in the category subdirectories.
@@ -878,7 +878,7 @@ build packages for clients.  It defines the URI header 
field for the package
 index file which is located at ${PKGDIR}/Packages. Clients that have
 \fBPORTAGE_BINHOST\fR properly configured will be able to fetch the index and
 use the URI header field as a base URI for fetching binary packages. If the URI
-header field is not defined then the client will use it's ${PORTAGE_BINHOST}
+header field is not defined then the client will use its ${PORTAGE_BINHOST}
 setting as the base URI.
 .TP
 .B PORTAGE_BINPKG_FORMAT
@@ -989,7 +989,7 @@ Defaults to 0.
 .TP
 \fBPORTAGE_IONICE_COMMAND\fR = \fI[ionice command string]\fR
 This variable should contain a command for portage to call in order
-to adjust the io priority of portage and it's subprocesses. The command
+to adjust the io priority of portage and its subprocesses. The command
 string should contain a \\${PID} place-holder that will be substituted
 with an integer pid. For example, a value of "ionice \-c 3 \-p \\${PID}"
 will set idle io priority. For more information about ionice, see
@@ -1006,7 +1006,7 @@ Logs are created only when this is set. They are stored as
 ${CATEGORY}:${PF}:MMDD\-HHMMSS.log in the directory specified. If the
 directory does not exist, it will be created automatically and group
 permissions will be applied to it.  If the directory already exists, portage
-will not modify it's permissions.
+will not modify its permissions.
 .TP
 .B PORTAGE_LOGDIR_CLEAN
 This variable should contain a command for portage to call in order

[gentoo-commits] proj/portage:master commit in: man/

[Ulrich Müller]

commit: 9436de9277593b668008c3906c8aca53f544b2ba
Author: Ulrich Müller  gentoo  org>
AuthorDate: Mon Jan 18 18:18:13 2021 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Mon Jan 18 18:18:13 2021 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=9436de92

man/make.conf.5: Fix typo in markup

Fixes: bcf12c6f26cf ("Add a note that PORTDIR is a repository ...")
Signed-off-by: Ulrich Müller  gentoo.org>

 man/make.conf.5 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index f6eae6f60..10f72d5c0 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -1104,7 +1104,7 @@ the emerge \-\-sync command. The default value of
 \fBPORTAGE_RSYNC_OPTS\fR will protect the default locations of
 \fBDISTDIR\fR and \fBPKGDIR\fR, but users are warned that any other locations
 inside \fBPORTDIR\fR are not necessarily safe for data storage.  You should not
-put other data (such as overlays) in your \fBPORTDIR\fB.  Portage will walk
+put other data (such as overlays) in your \fBPORTDIR\fR.  Portage will walk
 directory structures and may arbitrarily add invalid categories as packages.
 .TP
 \fBPORTDIR_OVERLAY\fR = \fI"[path] [different\-path] [etc...]"\fR

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

[Zac Medico]

commit: 0971f2e89390058a1b35a6288a2f2c396a2ad038
Author: Wolfgang E. Sanyer  gmail  com>
AuthorDate: Mon Sep 20 02:36:19 2021 +
Commit: Zac Medico  gentoo  org>
CommitDate: Mon Sep 20 03:57:25 2021 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=0971f2e8

Change README to markdown. Also add badge and info for black formatting.

Signed-off-by: Wolfgang E. Sanyer  gmail.com>
Signed-off-by: Zac Medico  gentoo.org>

 README => README.md | 42 ++
 man/make.conf.5 |  2 +-
 setup.py|  4 ++--
 3 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/README b/README.md
similarity index 59%
rename from README
rename to README.md
index d2bc9fdda..c176e8a3f 100644
--- a/README
+++ b/README.md
@@ -1,3 +1,5 @@
+[![CI](https://github.com/gentoo/portage/actions/workflows/ci.yml/badge.svg)](https://github.com/gentoo/portage/actions/workflows/ci.yml)
+
 About Portage
 =
 
@@ -6,6 +8,27 @@ Package Manager Specification Project (PMS) standardises and 
documents
 the behaviour of Portage so that ebuild repositories can be used by
 other package managers.
 
+Contributing
+
+
+Contributions are always welcome! We've started using
+[black](https://pypi.org/project/black/) to format the code base. Please make
+sure you run it against any PR's prior to submitting (otherwise we'll probably
+reject it).
+
+There are [ways to
+integrate](https://black.readthedocs.io/en/stable/integrations/editors.html)
+black into your text editor and/or IDE.
+
+You can also set up a git hook to check your commits, in case you don't want
+editor integration. Something like this:
+
+```sh
+# .git/hooks/pre-commit (don't forget to chmod +x)
+
+#!/bin/bash
+black --check --diff .
+```
 
 Dependencies
 
@@ -25,8 +48,10 @@ The following setup.cfg settings can be used to enable 
building of
 native extensions for all invocations of the build_ext command (the
 build_ext command is invoked automatically by other build commands):
 
+```
[build_ext]
portage_ext_modules=true
+```
 
 Currently, the native extensions only include libc bindings which are
 used to validate LC_CTYPE and LC_COLLATE behavior for EAPI 6. If the
@@ -54,15 +79,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
MA
 More information
 
 
--DEVELOPING contains some code guidelines.
--LICENSE contains the GNU General Public License version 2.
--NEWS contains new features/major bug fixes for each version.
--RELEASE NOTES contains mainly upgrade information for each version.
--TEST-NOTES contains Portage unit test information.
+- DEVELOPING contains some code guidelines.
+- LICENSE contains the GNU General Public License version 2.
+- NEWS contains new features/major bug fixes for each version.
+- RELEASE NOTES contains mainly upgrade information for each version.
+- TEST-NOTES contains Portage unit test information.
 
 
 Links
 =
-Gentoo project page: 
-PMS: 
-PMS git repo: 
+
+- Gentoo project page: https://wiki.gentoo.org/wiki/Project:Portage
+- PMS: https://dev.gentoo.org/~ulm/pms/head/pms.html
+- PMS git repo: https://gitweb.gentoo.org/proj/pms.git/

diff --git a/man/make.conf.5 b/man/make.conf.5
index 0790933f7..43e70803f 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -815,7 +815,7 @@ INSTALL_MASK="/usr/share/doc/*/*.pdf"
 
 # Watch out! This will be interpreted as two patterns, and
 # prevent both "README" AND all PDF files from being installed.
-INSTALL_MASK="README\\ *.pdf"
+INSTALL_MASK="README.md\\ *.pdf"
 .fi
 .TP
 .B LDFLAGS

diff --git a/setup.py b/setup.py
index 718c05f9d..77fa0808c 100755
--- a/setup.py
+++ b/setup.py
@@ -47,7 +47,7 @@ autodetect_pip = os.path.basename(os.environ.get("_", "")) == 
"pip" or os.path.b
 ).startswith("pip-")
 venv_prefix = "" if sys.prefix == sys.base_prefix else sys.prefix
 create_entry_points = bool(autodetect_pip or venv_prefix)
-with open(os.path.join(os.path.dirname(__file__), "README"), "rt") as f:
+with open(os.path.join(os.path.dirname(__file__), "README.md"), "rt") as f:
 long_description = f.read()
 
 # TODO:
@@ -816,7 +816,7 @@ setup(
 description="Portage is the package management and distribution system for 
Gentoo",
 license="GPLV2",
 long_description=long_description,
-long_description_content_type="text/plain",
+long_description_content_type="text/markdown",
 package_dir={"": "lib"},
 packages=list(find_packages()),
 # something to cheat build & install commands

[gentoo-commits] proj/portage:master commit in: man/

[Sam James]

commit: 4af629dddcd30efeb76416e2f8f17c5944c16ca7
Author: Sam James  gentoo  org>
AuthorDate: Wed Jun 16 23:42:50 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Aug 15 20:58:47 2021 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=4af629dd

man/emerge.1: Fix typo in --with-bdeps description

Closes: https://github.com/gentoo/portage/pull/730
Signed-off-by: Sam James  gentoo.org>

 man/emerge.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/man/emerge.1 b/man/emerge.1
index f0988cd4a..8f8c2ebda 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -1095,7 +1095,7 @@ The default is set to "y" (on).
 In dependency calculations, pull in build time dependencies
 that are not strictly required. This option is automatically enabled for
 installation actions, meaning they will be installed, and defaults to
-\(aqy\(aq for the \fB\-\-depclean\fR action, meaning they will not be
+"y" for the \fB\-\-depclean\fR action, meaning they will not be
 removed. In order to prevent the \fB\-\-with\-bdeps\fR option from being
 automatically enabled for installation actions, specify
 \fB\-\-with\-bdeps\-auto=n\fR in either the command line or

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit: f737795e9da830d543a424ab7e74b2151e58fca8
Author: Nekun  firemail  cc>
AuthorDate: Sun Apr 11 01:23:26 2021 +
Commit: Zac Medico  gentoo  org>
CommitDate: Sun Apr 25 03:38:31 2021 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=f737795e

man/portage.5: Add userpatch documentation

Bug: https://bugs.gentoo.org/698244
Signed-off-by: Nekun  firemail.cc>
Signed-off-by: Zac Medico  gentoo.org>

 man/portage.5 | 33 -
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/man/portage.5 b/man/portage.5
index 247ec5ab0..50f20454c 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -1,4 +1,4 @@
-.TH "PORTAGE" "5" "Mar 2021" "Portage VERSION" "Portage"
+.TH "PORTAGE" "5" "Apr 2021" "Portage VERSION" "Portage"
 .SH NAME
 portage \- the heart of Gentoo
 .SH "DESCRIPTION"
@@ -78,6 +78,9 @@ site-specific overrides of \fB/etc/portage/make.profile/\fR
 .BR /etc/portage/sets/
 user\-defined package sets
 .TP
+.BR /etc/portage/patches/
+user\-provided patches to packages
+.TP
 .BR /var/db/repos/gentoo/
 .nf
 sets.conf
@@ -1375,6 +1378,34 @@ Also see \fB/var/lib/portage/world_sets\fR and the 
\fBemerge\fR(1)
 \fB\-\-list\-sets\fR option.
 .RE
 .TP
+.BR /etc/portage/patches/
+.RS
+In this directory patches to the package source tree can be created.
+For each package, patches are taken from these subdirectories in the
+following order:
+.nr step 1 1
+.IP \n[step]. 3
+/etc/portage/patches/${CATEGORY}/${P}\-${PR}[:${SLOT}]
+.IP \n+[step].
+/etc/portage/patches/${CATEGORY}/${P}[:${SLOT}]
+.IP \n+[step].
+/etc/portage/patches/${CATEGORY}/${PN}[:${SLOT}]
+.RE 2
+
+Patches from more-specific directories overrides patches from less-specific,
+i.e. if patches with the same name coexist in different directories matches
+same package, only patch from directory matches the first matching pattern
+will be applied. Patches for each package are applied in the POSIX
+lexicographic order. Patch file name must end in ".patch" or, for
+\fBEAPI\fR >= \fB6\fR, in ".diff".
+
+If package ebuild uses \fBEAPI\fR <= \fB5\fR, it must explicitly invoke
+\fBepatch_user\fR or inherit \fBepatch.eclass\fR(5) and rely on default
+\fBsrc_prepare\fR for apply patches. Otherwise, patches are silently
+ignored. If package ebuild uses \fBEAPI\fR >= \fB6\fR, applying user
+patches is mandatory.
+.RE
+.TP
 .BR /var/db/repos/gentoo/
 .RS
 .TP

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit: eb650736537728f40cee65c8a3d523d7dcfde804
Author: Nekun  firemail  cc>
AuthorDate: Sun Apr 11 01:23:27 2021 +
Commit: Zac Medico  gentoo  org>
CommitDate: Sun Apr 25 03:38:34 2021 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=eb650736

ebuild.5: Add eapply documentation

Bug: https://bugs.gentoo.org/698244
Signed-off-by: Nekun  firemail.cc>
Signed-off-by: Zac Medico  gentoo.org>

 man/ebuild.5 | 22 +-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 1afa59eef..a113c1502 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -1,4 +1,4 @@
-.TH "EBUILD" "5" "Jul 2019" "Portage VERSION" "Portage"
+.TH "EBUILD" "5" "Apr 2021" "Portage VERSION" "Portage"
 
 .SH "NAME"
 ebuild \- the internal format, variables, and functions in an ebuild script
@@ -799,6 +799,11 @@ Beginning with \fBEAPI 4\fR, an array or space\-delimited 
list of documentation
 files for the default src_install function to install using dodoc. If
 undefined, a reasonable default list is used. See the documentation for
 src_install below.
+.TP
+.B PATCHES
+Beginning with \fBEAPI 6\fR, an array of patches for applying in the default
+\fIsrc_prepare\fR function using \fIeapply\fR.
+
 
 .SS "QA Control Variables:"
 .TP
@@ -1210,6 +1215,21 @@ message\fR is displayed.
 This function uncompresses and/or untars a list of sources into the current
 directory. The function will append \fIsource\fR to the \fBDISTDIR\fR variable.
 
+.SS "Prepare:"
+.TP
+.B eapply\fR \fI[patch options]\fR \fI
+Applies patches to the \fB${WORKDIR}\fR with specified options. Default patch 
level is \fI\-p1\fR. If a directory specified, all patches from it with
+\fI.patch\fR or \fI.diff\fR suffix are applied.
+This function is available beginning with \fBEAPI 6\fR, replacing old
+\fBepatch.eclass\fR(5) functions.
+.TP
+.B eapply_user
+Applies user\-provided patches to the \fB${WORKDIR}\fR from Portage config
+directory tree. For directory syntax and applying rules, see
+\fI/etc/portage/patches/\fR section in \fBportage\fR(5). This function is
+available beginning with \fBEAPI 6\fR, replacing old \fBepatch.eclass\fR(5)
+functions.
+
 .SS "Compile:"
 .TP
 .B econf\fR \fI[configure options]

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit: 70e50f5ac0880e0a55baa2d3b567381743403e7e
Author: Daniel M. Weeks  danweeks  net>
AuthorDate: Mon Feb  1 17:22:38 2021 +
Commit: Zac Medico  gentoo  org>
CommitDate: Mon Feb  1 18:08:05 2021 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=70e50f5a

man/make.conf.5: FETCHCOMMAND DIGESTS placeholder uses colons

Closes: https://github.com/gentoo/portage/pull/668
Fixes: f04dae7728b5 ("Make digests available to fetch command")
Signed-off-by: Daniel M. Weeks  danweeks.net>
Signed-off-by: Zac Medico  gentoo.org>

 man/make.conf.5 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index 10f72d5c0..548a10b9b 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -1,4 +1,4 @@
-.TH "MAKE.CONF" "5" "Jan 2021" "Portage VERSION" "Portage"
+.TH "MAKE.CONF" "5" "Feb 2021" "Portage VERSION" "Portage"
 .SH "NAME"
 make.conf \- custom settings for Portage
 .SH "SYNOPSIS"
@@ -755,7 +755,7 @@ ___
 l l l.
 PlaceholderMeaning Example
 
-\\${DIGESTS}   Space separated list of file digestsblake2b  
sha512 
+\\${DIGESTS}   Space separated list of file digestsblake2b: 
sha512:
 .TE
 .RE
 .TP

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit: f1f9062578936d68040490a8122ccf84c087030a
Author: Michael Everitt  veremit  xyz>
AuthorDate: Sun Sep  6 00:05:59 2020 +
Commit: Zac Medico  gentoo  org>
CommitDate: Mon Sep  7 23:40:32 2020 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=f1f90625

man/{portage,make.conf}.5: Files in subdirs are parsed in lexical order

Most files in packages.*, make.conf/*, *.postsync.d/* are parsed not just in
ascending alphabetical order, but actually in lexographical (lexical) order,
which means alpha-numerically + symbols.

Closes: https://github.com/gentoo/portage/pull/616
Signed-off-by: Michael Everitt  veremit.xyz>
Signed-off-by: Zac Medico  gentoo.org>

 man/make.conf.5 |  4 ++--
 man/portage.5   | 15 +++
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index eb812150f..1b997ad37 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -15,8 +15,8 @@ the Simple lexical analysis documentation:
 \fIhttps://docs.python.org/3/library/shlex.html\fR. Note that if you source
 files, they need to be in the same shlex syntax for portage to read them.
 If make.conf is a directory, then all the files in that directory will
-be sorted in ascending alphabetical order by file name and summed
-together as if it were a single file.
+be sorted in lexical order by file name and summed together as if it were
+a single file.
 .br
 Portage will check the currently\-defined environment variables
 first for any settings.  If no environment settings are found,

diff --git a/man/portage.5 b/man/portage.5
index 7472972cc..db6e9ba76 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -229,8 +229,8 @@ will be preferred.
 Any file in this directory, directories of other profiles or top-level
 "profiles" directory that begins with "package." or "use." can be more than
 just a flat file.  If it is a directory, then all the files in that directory
-will be sorted in ascending alphabetical order by file name and summed together
-as if it were a single file. Note that this behavior is only supported since
+will be sorted in lexical order by file name and summed together as if
+it were a single file. Note that this behavior is only supported since
 portage-2.1.6.7, and it is not included in PMS at this time.
 
 .I Example:
@@ -602,8 +602,8 @@ virtual/aspell\-dict   app\-dicts/aspell\-en
 Files in this directory including make.conf, repos.conf, and any file
 with a name that begins with "package." can be
 more than just a flat file.  If it is a directory, then all the files in that
-directory will be sorted in ascending alphabetical order by file name and 
summed
-together as if it were a single file.
+directory will be sorted in lexical order by file name and summed together
+as if it were a single file.
 
 .I Example:
 .nf
@@ -843,15 +843,14 @@ x11\-libs/qt \-mysql
 .TP
 .BR postsync.d/
 This directory is for user supplied postsync hooks to be run once after all
-repositories have been synced.  Each script is called in alphabetic order
+repositories have been synced.  Each script is called in lexical order
 without any arguments.
 .fi
 .TP
 .BR repo.postsync.d/
 This directory is for user supplied postsync hooks to be run once after each
-repository has been synced.  Each script is called in alphabetic order
-with three arguments.
-
+repository has been synced.  Each script is called in lexical order
+with the following three arguments:
 .I args:
 repository name, sync-uri, location
 .fi

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit: e108f1ccb4a7d38d27154943d7240fe8d2ff4a7d
Author: Zac Medico  gentoo  org>
AuthorDate: Tue Sep  8 01:16:40 2020 +
Commit: Zac Medico  gentoo  org>
CommitDate: Tue Sep  8 01:17:16 2020 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=e108f1cc

man/portage.5: Fix man2html rendering in repos.conf section

Signed-off-by: Zac Medico  gentoo.org>

 man/portage.5 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/man/portage.5 b/man/portage.5
index db6e9ba76..4cffb194a 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -1,4 +1,4 @@
-.TH "PORTAGE" "5" "Jul 2020" "Portage VERSION" "Portage"
+.TH "PORTAGE" "5" "Sep 2020" "Portage VERSION" "Portage"
 .SH NAME
 portage \- the heart of Gentoo
 .SH "DESCRIPTION"
@@ -875,8 +875,8 @@ format as \fBrepos.conf\fR.
 \- attributes are specified in "${attribute} = ${value}" format
 .fi
 
-.I Attributes supported in DEFAULT section:
 .RS
+.I Attributes supported in DEFAULT section:
 .RS
 .TP
 .B main\-repo

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit: b851d7f8f3c451d4dd4863580e75461c511b44d0
Author: Michael Everitt  veremit  xyz>
AuthorDate: Sun Sep  6 00:05:04 2020 +
Commit: Zac Medico  gentoo  org>
CommitDate: Sun Sep  6 01:13:48 2020 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=b851d7f8

man/portage.5: Tidy up some long (>80 char) lines

Closes: https://github.com/gentoo/portage/pull/615
Signed-off-by: Michael Everitt  veremit.xyz>
Signed-off-by: Zac Medico  gentoo.org>

 man/portage.5 | 23 +--
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/man/portage.5 b/man/portage.5
index a7e64cd5f..7472972cc 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -214,8 +214,8 @@ More reading:
 .TP
 \fB/etc/portage/make.profile/\fR or \fB/etc/make.profile/\fR
 This is usually just a symlink to the correct profile in
-\fB/var/db/repos/gentoo/profiles/\fR.  Since it is part of the ebuild 
repository, it
-may easily be updated/regenerated by running `emerge \-\-sync`.  It defines
+\fB/var/db/repos/gentoo/profiles/\fR.  Since it is part of the ebuild 
repository,
+it may easily be updated/regenerated by running `emerge \-\-sync`.  It defines
 what a profile is (usually arch specific stuff).  If you need a custom
 profile, then you should make your own \fBmake.profile\fR
 directory and populate it.  However, if you just wish to override some
@@ -644,8 +644,8 @@ The global custom settings for Portage. See 
\fBmake.conf\fR(5).
 .BR mirrors
 Whenever portage encounters a mirror:// style URI it will look up the actual
 hosts here.  If the mirror set is not found here, it will check the global
-mirrors file at /var/db/repos/gentoo/profiles/thirdpartymirrors.  You may also 
set a
-special mirror type called "local".  This list of mirrors will be checked
+mirrors file at /var/db/repos/gentoo/profiles/thirdpartymirrors.  You may also
+set a special mirror type called "local".  This list of mirrors will be checked
 before GENTOO_MIRRORS and will be used even if the package has
 RESTRICT="mirror" or RESTRICT="fetch".
 
@@ -864,8 +864,9 @@ only.
 .BR repos.conf
 Specifies \fIsite\-specific\fR repository configuration information.
 .br
-Configuration specified in \fBrepos.conf\fR can be overriden by 
\fBPORTAGE_REPOSITORIES\fR
-environmental variable, which has the same format as \fBrepos.conf\fR.
+Configuration specified in \fBrepos.conf\fR can be overriden by
+\fBPORTAGE_REPOSITORIES\fR environmental variable, which has the same
+format as \fBrepos.conf\fR.
 
 .I Format:
 .nf
@@ -918,8 +919,8 @@ since operations performed by these tools are inherently
 .TP
 .B auto\-sync = yes|no|true|false
 This setting determines if the repo will be synced during "\fBemerge 
\-\-sync\fR" or
-"\fBemaint sync \-\-auto\fR" runs.  This allows for repositories to be synced 
only when
-desired via "\fBemaint sync \-\-repo foo\fR".
+"\fBemaint sync \-\-auto\fR" runs.  This allows for repositories to be synced
+only when desired via "\fBemaint sync \-\-repo foo\fR".
 .br
 If unset, the repo will be treated as set
 yes, true.
@@ -1001,7 +1002,8 @@ Extra options to give to git when cloning repository (git 
clone).
 .TP
 .B sync\-git\-env
 Set environment variables for git when cloning or pulling the repository.
-These will be overridden by setting them again in sync-git-clone-env and 
sync-git-pull-env.
+These will be overridden by setting them again in sync\-git\-clone\-env and
+sync\-git\-pull\-env.
 See also example for sync-git-clone-env.
 .TP
 .B sync\-git\-pull\-env
@@ -1390,7 +1392,8 @@ and the newer/faster "md5-dict" format.  Default is to 
detect dirs.
 The EAPI to use for profiles when unspecified. This attribute is
 supported only if profile-default-eapi is included in profile-formats.
 .TP
-.BR profile\-formats " = [pms] [portage-1] [portage-2] [profile-bashrcs] 
[profile-set] [profile-default-eapi] [build-id]"
+.BR profile\-formats " = [pms] [portage-1] [portage-2] [profile-bashrcs] \
+[profile-set] [profile-default-eapi] [build-id]"
 Control functionality available to profiles in this repo such as which files
 may be dirs, or the syntax available in parent files.  Use "portage-2" if 
you're
 unsure.  The default is "portage-1-compat" mode which is meant to be compatible

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit: b7c3656f8c356b20675abf90df37b24ab8b8eeb5
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Wed Aug 10 12:57:23 2022 +
Commit: Zac Medico  gentoo  org>
CommitDate: Fri Aug 12 16:05:47 2022 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=b7c3656f

man/emerge.1: add clarification to -k and -K

Both -k and -K imply --with-bdeps=n.  While this is already noted
under the documentation for --with-bdeps, a brief reminder under
the documentation for -k and -K is useful.  A user interested in
binary packages might look under -k and -K first and miss the
default behavior with respect to build time dependencies.

Bug: https://bugs.gentoo.org/863422
Closes: https://github.com/gentoo/portage/pull/886
Signed-off-by: Anthony G. Basile  gentoo.org>
Signed-off-by: Zac Medico  gentoo.org>

 man/emerge.1 | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/man/emerge.1 b/man/emerge.1
index 5ba88f3bc..4eaf073e2 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -1056,13 +1056,16 @@ Tells emerge to use binary packages (from $PKGDIR) if 
they are available, thus
 possibly avoiding some time\-consuming compiles.  This option is useful for CD
 installs; you can export PKGDIR=/mnt/cdrom/packages and then use this option to
 have emerge "pull" binary packages from the CD in order to satisfy
-dependencies.
+dependencies.  Note this option implies \fB\-\-with\-bdeps=n\fR.  To include
+build time dependencies, \fB\-\-with\-bdeps=y\fR must be specified explicitly.
 .TP
 .BR "\-\-usepkgonly [ y | n ]" ", " \-K
 Tells emerge to only use binary packages (from $PKGDIR).  All the binary
 packages must be available at the time of dependency calculation or emerge
 will simply abort.  Portage does not use ebuild repositories when calculating
-dependency information so all masking information is ignored.
+dependency information so all masking information is ignored.  Like \fB\-k\fR
+above, this option implies \fB\-\-with\-bdeps=n\fR.  To include build time
+dependencies, \fB\-\-with\-bdeps=y\fR must be specified explicitly.
 .TP
 .BR "\-\-usepkg\-exclude\-live [ y | n ]"
 Tells emerge to not install from binary packages for live ebuilds.

[gentoo-commits] proj/portage:master commit in: man/

[Sam James]

commit: 4455feee439bff65fcc8bce6af864840df2a3b96
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul 18 19:19:00 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 18 19:37:43 2022 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=4455feee

ebuild.5: dohtml is banned in EAPI 7

Signed-off-by: Sam James  gentoo.org>

 man/ebuild.5 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/man/ebuild.5 b/man/ebuild.5
index ef1de107b..b4022bdd3 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -1468,6 +1468,7 @@ Setting \fI\-a\fR limits what types of files will be 
included,
 \fI\-A\fR appends to the default list, setting \fI\-x\fR sets which dirs to
 exclude (CVS excluded by default), \fI\-p\fR sets a document prefix,
 \fI\-r\fR sets recursive.
+\fBdohtml\fR is banned in \fBEAPI 7\fR: use \fBdodoc\fR and \fBdocinto\fR 
instead.
 .TP
 .B doinfo\fR \fI [list of more info\-files]
 Installs info\-pages into \fIDESTDIR\fR/info.  Files are automatically

[gentoo-commits] proj/portage:master commit in: man/

[Sam James]

commit: 16591cd0ca834fca0ec81819610ad891408cea11
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul 18 19:33:13 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 18 19:37:43 2022 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=16591cd0

ebuild.5: einstall was banned in EAPI 6

Closes: https://github.com/gentoo/portage/pull/858
Signed-off-by: Sam James  gentoo.org>

 man/ebuild.5 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 6c49055ea..55a9380d5 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -1314,7 +1314,8 @@ make \\
 .fi
 Please do \fBnot\fR use this in place of 'emake install DESTDIR=${D}'.
 That is the preferred way of installing make\-based packages.  Also, do
-not utilize the \fIEXTRA_EINSTALL\fR variable since it is for users.
+not utilize the \fIEXTRA_EINSTALL\fR variable since it is for users.  Banned
+since \fBEAPI 6\fR.
 
 .TP
 .B docompress\fR \fI[\-x]  [list of more paths]

[gentoo-commits] proj/portage:master commit in: man/

[Sam James]

commit: a98e6e5fd481d4233433451d6535609060308bad
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul 18 19:14:18 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 18 19:37:42 2022 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=a98e6e5f

ebuild.5: update for dolib, libopts being banned in EAPI 7

Signed-off-by: Sam James  gentoo.org>

 man/ebuild.5 | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 8402d667b..ef1de107b 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -1421,11 +1421,13 @@ necessary dirs.
 .B dolib.so\fR \fI\fR \fI[list of more libraries]
 .PD 1
 Installs a library or a list of libraries into \fIDESTTREE\fR/lib.
-Creates all necessary dirs.
+Creates all necessary dirs.  dolib is banned in \fBEAPI 7\fR: use the more
+specific \fBdolib.a\fR or \fBdolib.so\fR instead.
 .TP
 .B libopts\fR \fI[options for install(1)]
 Can be used to define options for the install function used in
-the \fBdolib\fR functions.  The default is \fI\-m0644\fR.
+the \fBdolib\fR functions.  The default is \fI\-m0644\fR.  \fBlibopts\fR
+is banned in \fBEAPI 7\fR.
 .TP
 .B doman\fR \fI[\-i18n=]\fR \fI [list of more man\-pages]
 Installs manual\-pages into /usr/share/man/man[0\-9n] depending on the

[gentoo-commits] proj/portage:master commit in: man/

[Sam James]

commit: eea2e2f446187cff2f3a733185a6009574d5338e
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul 18 19:19:56 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 18 19:37:43 2022 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=eea2e2f4

ebuild.5: hasv is banned in EAPI 8

Signed-off-by: Sam James  gentoo.org>

 man/ebuild.5 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index b4022bdd3..939d43f9b 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -1157,7 +1157,8 @@ The \fIitem list\fR is delimited by the \fIIFS\fR 
variable.  This variable
 has a default value of ' ', or a space.  It is a \fBbash\fR(1) setting.
 .TP
 .B hasv\fR \fI\fR \fI
-Like \fBhas\fR, but also echoes \fIitem\fR when \fBhas\fR returns true.
+Like \fBhas\fR, but also echoes \fIitem\fR when \fBhas\fR returns true.  Banned
+in \fBEAPI 8\fR.
 .TP
 .B has_version\fR \fI[\-b]\fR \fI[\-d]\fR \fI[\-r]\fR \fI[\-\-host\-root]\fR 
\fI
 Check to see if \fIcategory/package\-version\fR is installed.  The

[gentoo-commits] proj/portage:master commit in: man/

[Sam James]

commit: e87ce6cb2d1c0893d6b5faee64af69ca9ea16de1
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul 18 19:21:57 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 18 19:37:43 2022 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=e87ce6cb

ebuild.5: mention dosym -r for EAPI 8

Signed-off-by: Sam James  gentoo.org>

 man/ebuild.5 | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 939d43f9b..6c49055ea 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -1450,9 +1450,10 @@ file name.
 Beginning with \fBEAPI 4\fR, the \fBdohard\fR helper no longer exists. Ebuilds
 should call \fBln\fR(1) directly.
 .TP
-.B dosym\fR \fI 
+.B dosym\fR \fI[\-r] \fI 
 .PD 1
-Performs the ln command to create a symlink.
+Performs the ln command to create a symlink.  Setting \-r creates a relative
+symlink.  The \-r option is available beginning with \fBEAPI 8\fR.
 .TP
 .B doheader\fR \fI[\-r]  [list of more files]
 Installs the given header files into /usr/include/, by default

[gentoo-commits] proj/portage:master commit in: man/

[Sam James]

commit: 18156a381dfaa4b4afc8c3c3f83ff30ca50d4008
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul 18 19:48:39 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 18 20:14:33 2022 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=18156a38

ebuild.5: update econf for EAPI 6/7/8

Signed-off-by: Sam James  gentoo.org>

 man/ebuild.5 | 12 
 1 file changed, 12 insertions(+)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 55a9380d5..9c663213b 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -1275,6 +1275,18 @@ Beginning with \fBEAPI 5\fR, \fBeconf\fR adds
 \fIdisable\-silent\-rules\fR to the arguments if the
 string \fIdisable\-silent\-rules\fR occurs in the output
 of \fIconfigure \-\-help\fR.
+Beginning with \fBEAPI 6\fR, \fBeconf\fR adds
+\fIdocdir\fR and \fIhtmldir\fR if the corresponding string occurs
+in the output of \fIconfigure \-\-help\fR.
+Beginning with \fBEAPI 7\fR, \fBeconf\fR adds
+\fIwith\-sysroot\fR to the arguments if the string
+\fIwith\-sysroot\fR occurs in the output of \fIconfigure \-\-help\fR.
+Beginning with \fBEAPI 8\fR, \fBeconf\fR adds
+\fIdatarootdir\fR to the arguments if the srting
+\fIdatarootdir\fR occurs in the output of \fIconfigure \-\-help\fR.  
Additionally,
+in \fBEAPI 8\fR, \fBeconf\fR adds \fIdisable\-static\fR to the arguments
+if the string \fIdisable\-static\fR or \fIenable\-static\fR occurs in the 
output
+of \fIconfigure \-\-help\fR.
 .TP
 .B emake\fR \fI[make options]
 This must be used in place of `make` in ebuilds.  Performs `${MAKE:-make}

[gentoo-commits] proj/portage:master commit in: man/

[Sam James]

commit: 333f0a12627c33f5bf5be4b68b5af4ce093d32f6
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul 18 20:11:17 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 18 20:14:34 2022 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=333f0a12

ebuild.5: drop --disable-dependency-tracking in "example" econf

As discussed in #gentoo-qa, it's easier for now to drop this for
consistency rather than add all the extra args (which would be wrong
by itself without rephrasing all the text below to say e.g. "in EAPI ...,
econf doesn't add ...").

So, go for the easiest fix for now so that things make sense, and
we can revisit later.

Signed-off-by: Sam James  gentoo.org>

 man/ebuild.5 | 1 -
 1 file changed, 1 deletion(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 9c663213b..18547122e 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -1257,7 +1257,6 @@ ${\fIECONF_SOURCE\fR:-.}/configure \\
\-\-mandir="${EPREFIX}"/usr/share/man \\
\-\-sysconfdir="${EPREFIX}"/etc \\
${CTARGET:+\-\-target=${CTARGET}} \\
-   \-\-disable\-dependency\-tracking \\
\fI${EXTRA_ECONF}\fR \\
\fIconfigure options\fR || die "econf failed"
 .fi

[gentoo-commits] proj/portage:master commit in: man/

[Sam James]

commit: 8218c39e5d6472a368b53e9e4f27ea5ef7eecd84
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul 18 20:20:42 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 18 20:20:42 2022 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=8218c39e

ebuild.5: update examples a bit

Signed-off-by: Sam James  gentoo.org>

 man/ebuild.5 | 19 ---
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 18547122e..91660660a 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -257,7 +257,7 @@ multiple Atoms and be nested to an infinite depth.
 To include the jpeg library when the user has jpeg in \fBUSE\fR, simply use the
 following syntax:
 
-jpeg? ( media\-libs/jpeg )
+jpeg? ( media\-libs/libjpeg-turbo )
 .TP
 .B !usevar? ( Atom )
 If you want to include a package only if the user does not have a certain
@@ -271,11 +271,11 @@ support for a feature and have it enabled by default.
 .B usevar? ( Atom if true ) !usevar? ( Atom if false )
 For functionality like the tertiary operator found in C you must use
 two statements, one normal and one inverted.  If a package uses
-GTK2 or GTK1, but not both, then you can handle that like this:
+GTK3 or GTK2, but not both, then you can handle that like this:
 
-gtk2? ( =x11\-libs/gtk+\-2* ) !gtk2? ( =x11\-libs/gtk+\-1* )
+gtk3? ( =x11\-libs/gtk+\-3* ) !gtk3? ( =x11\-libs/gtk+\-2* )
 
-That way the default is the superior GTK2 library.
+That way the default is the superior GTK3 library.
 .TP
 .B || ( Atom Atom ... )
 When a package can work with a few different packages but a virtual is not
@@ -1574,11 +1574,10 @@ first parameter is \- (a hyphen).
 .SH "EXAMPLES"
 .DS
 .nf
-# Copyright 1999\-2013 Gentoo Foundation
+# Copyright 1999\-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
 
-EAPI="5"
+EAPI=8
 
 inherit some_eclass another_eclass
 
@@ -1588,11 +1587,9 @@ SRC_URI="ftp://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.gz";
 
 LICENSE="GPL\-2"
 SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
+KEYWORDS="~amd64"
 
-RDEPEND=""
-DEPEND="nls? ( sys-devel/gettext )"
+BDEPEND="nls? ( sys-devel/gettext )"
 
 src_configure() {
econf \\

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

[Sam James]

commit: bbf7f53a970f9ee31830e1546d7c04997ea3463e
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul 18 20:20:56 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 18 20:22:04 2022 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=bbf7f53a

ebuild.5: update modified date

Signed-off-by: Sam James  gentoo.org>

 NEWS | 2 ++
 man/ebuild.5 | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 5e87b85d6..129416f50 100644
--- a/NEWS
+++ b/NEWS
@@ -36,6 +36,8 @@ Bug fixes:
 * ebuild(5): econf: drop --disable-dependency-tracking from "example"
   because it's confusing (implies it was always added, even before EAPI 4).
 
+* ebuild(5): modernize examples slightly.
+
 portage-3.0.32 (2022-07-11)
 --
 

diff --git a/man/ebuild.5 b/man/ebuild.5
index 91660660a..226b998e8 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -1,4 +1,4 @@
-.TH "EBUILD" "5" "May 2021" "Portage VERSION" "Portage"
+.TH "EBUILD" "5" "July 2022" "Portage VERSION" "Portage"
 
 .SH "NAME"
 ebuild \- the internal format, variables, and functions in an ebuild script

[gentoo-commits] proj/portage:master commit in: man/

[Sam James]

commit: 54d778fb16653f5f57f1892bacf0b36baa4ea462
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul 19 00:17:56 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul 19 00:17:56 2022 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=54d778fb

ebuild.5: fix typo

Signed-off-by: Sam James  gentoo.org>

 man/ebuild.5 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 226b998e8..1e38e18af 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -1281,7 +1281,7 @@ Beginning with \fBEAPI 7\fR, \fBeconf\fR adds
 \fIwith\-sysroot\fR to the arguments if the string
 \fIwith\-sysroot\fR occurs in the output of \fIconfigure \-\-help\fR.
 Beginning with \fBEAPI 8\fR, \fBeconf\fR adds
-\fIdatarootdir\fR to the arguments if the srting
+\fIdatarootdir\fR to the arguments if the string
 \fIdatarootdir\fR occurs in the output of \fIconfigure \-\-help\fR.  
Additionally,
 in \fBEAPI 8\fR, \fBeconf\fR adds \fIdisable\-static\fR to the arguments
 if the string \fIdisable\-static\fR or \fIenable\-static\fR occurs in the 
output

[gentoo-commits] proj/portage:master commit in: man/

[Sam James]

commit: 498c785f1398ceb7304d45ff31d7b4a7f5700eaa
Author: Sam James  gentoo  org>
AuthorDate: Wed Jul 20 02:00:40 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jul 20 02:09:39 2022 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=498c785f

ebuild.5: style tweaks to examples

Signed-off-by: Sam James  gentoo.org>

 man/ebuild.5 | 22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 1e38e18af..ae1e1ce27 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -22,9 +22,9 @@ category/packagename is a \fI"catpkg"\fR. You will find this 
shorthand\-name
 used frequently in Gentoo. Here are some base atoms, a.k.a \fI"catpkgs"\fR:
 
 .nf
+.I net\-misc/dhcp
 .I sys\-apps/sed
 .I sys\-libs/zlib
-.I net\-misc/dhcp
 .fi
 .TP
 .B Atom Versions
@@ -131,9 +131,9 @@ delimited by a \fI/\fR character.
 
 \fBExamples\fR:
 .nf
+   dev\-lang/perl:0/5.12
dev\-libs/icu:0/0
dev\-libs/icu:0/49
-   dev\-lang/perl:0/5.12
dev\-libs/glib:2/2.30
 .fi
 .TP
@@ -150,9 +150,9 @@ a different matching package in a different slot.
 
 \fBExamples\fR:
 .nf
-   dev\-libs/icu:*
dev\-lang/perl:*
-   dev-libs/glib:*
+   dev\-libs/glib:*
+   dev\-libs/icu:*
 .fi
 .TP
 .I =
@@ -164,9 +164,9 @@ time the package was installed is available.
 
 \fBExamples\fR:
 .nf
-   dev\-libs/icu:=
+   dev\-libs/glib:=
dev\-lang/perl:=
-   dev-libs/glib:=
+   dev\-libs/icu:=
 .fi
 .TP
 .I slot=
@@ -175,9 +175,9 @@ otherwise behaves identically to the plain equals slot 
operator.
 
 \fBExamples\fR:
 .nf
-   dev\-libs/icu:0=
dev\-lang/perl:0=
-   dev-libs/glib:2=
+   dev\-libs/glib:2=
+   dev\-libs/icu:0=
 .fi
 .PP
 To implement the equals slot operator, the package manager
@@ -193,10 +193,10 @@ the regular slot).
 
 \fBExamples\fR:
 .nf
+   dev\-lang/perl:0/5.12=
+   dev\-libs/glib:2/2.30=
dev\-libs/icu:0/0=
dev\-libs/icu:0/49=
-   dev\-lang/perl:0/5.12=
-   dev-libs/glib:2/2.30=
 .fi
 .RE
 .TP
@@ -1579,7 +1579,7 @@ first parameter is \- (a hyphen).
 
 EAPI=8
 
-inherit some_eclass another_eclass
+inherit another-eclass some-eclass
 
 DESCRIPTION="Super\-useful stream editor (sed)"
 HOMEPAGE="https://www.gnu.org/software/sed/";

[gentoo-commits] proj/portage:master commit in: man/

[Sam James]

commit: 0eadc50aab2fd5e064127defe1058e4abce156f3
Author: Sam James  gentoo  org>
AuthorDate: Wed Jul 20 02:05:05 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jul 20 02:09:39 2022 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=0eadc50a

ebuild.5: mention Bash version depends on EAPI

Signed-off-by: Sam James  gentoo.org>

 man/ebuild.5 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index ae1e1ce27..4a96276e8 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -9,7 +9,8 @@ This script contains variables and commands that specify how to 
download,
 unpack, patch, compile, install and merge a particular software package from
 its original sources.  In addition to all of this, the ebuild script can also
 contain pre/post install/remove commands, as required.  All ebuild scripts are
-written in bash.
+written in bash.  The minimum version of Bash for an ebuild depends on the
+EAPI version.
 
 .SS "Dependencies"
 A \fIdepend atom\fR is simply a dependency that is used by portage when