1 |
commit: 5f252c72350e1671ad01630e90d5acb2226629e3 |
2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jun 23 00:29:39 2012 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jun 23 00:29:39 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=5f252c72 |
7 |
|
8 |
Document /etc/portage/sets and world_sets more. |
9 |
|
10 |
--- |
11 |
man/emerge.1 | 18 ++++++++++++++---- |
12 |
man/portage.5 | 19 +++++++++++++++++-- |
13 |
2 files changed, 31 insertions(+), 6 deletions(-) |
14 |
|
15 |
diff --git a/man/emerge.1 b/man/emerge.1 |
16 |
index 0d9f6de..5d0c05d 100644 |
17 |
--- a/man/emerge.1 |
18 |
+++ b/man/emerge.1 |
19 |
@@ -1,4 +1,4 @@ |
20 |
-.TH "EMERGE" "1" "Dec 2011" "Portage VERSION" "Portage" |
21 |
+.TH "EMERGE" "1" "Jun 2012" "Portage VERSION" "Portage" |
22 |
.SH "NAME" |
23 |
emerge \- Command\-line interface to the Portage system |
24 |
.SH "SYNOPSIS" |
25 |
@@ -69,7 +69,9 @@ packages deemed necessary for your system to run properly. \fBworld\fR |
26 |
encompasses both the \fBselected\fR and \fBsystem\fR sets. [See |
27 |
\fBFILES\fR below for more information.] Other sets can exist depending |
28 |
on the current configuration. The default set configuration is located |
29 |
-in the \fB/usr/share/portage/config/sets\fR directory. Note that a \fIset\fR |
30 |
+in the \fB/usr/share/portage/config/sets\fR directory. |
31 |
+User sets may be created by placing files in the \fB/etc/portage/sets/\fR |
32 |
+directory (see \fBportage\fR(5)). Note that a \fIset\fR |
33 |
is generally used in conjunction with \fB\-\-update\fR. When used as |
34 |
arguments to \fBemerge\fR sets have to be prefixed with \fB@\fR to be |
35 |
recognized. Use the \fB\-\-list\-sets\fR action to display a list of |
36 |
@@ -543,7 +545,7 @@ the build may fail if the dependencies aren't satisfied. |
37 |
.TP |
38 |
.BR "\-\-noreplace " (\fB\-n\fR) |
39 |
Skips the packages specified on the command\-line that have already |
40 |
-been installed. Without this option, any packages, ebuilds, or deps |
41 |
+been installed. Without this option, any package atoms or package sets |
42 |
you specify on the command\-line \fBwill\fR cause Portage to remerge |
43 |
the package, even if it is already installed. Note that Portage will |
44 |
not remerge dependencies by default. |
45 |
@@ -915,7 +917,7 @@ those USE settings (on Bourne-compatible shells you may omit the \fBenv\fR |
46 |
part). If you want those USE settings to be more |
47 |
permanent, you can put them in /etc/portage/package.use instead. |
48 |
.LP |
49 |
-If \fBemerge \-\-update system\fR or \fBemerge \-\-update world\fR |
50 |
+If \fBemerge \-\-update @system\fR or \fBemerge \-\-update @world\fR |
51 |
fails with an error message, it may be that an ebuild uses some |
52 |
newer feature not present in this version of \fBemerge\fR. You |
53 |
can use \fBemerge \-\-update portage\fR to upgrade to the lastest |
54 |
@@ -1054,6 +1056,11 @@ Contains a list of all user\-specified packages. You can safely edit |
55 |
this file, adding packages that you want to be considered in \fBworld\fR |
56 |
set updates and removing those that you do not want to be considered. |
57 |
.TP |
58 |
+.B /var/lib/portage/world_sets |
59 |
+This is like the world file but instead of package atoms it contains |
60 |
+packages sets which always begin with the \fB@\fR character. Use |
61 |
+\fB/etc/portage/sets/\fR to define user package sets. |
62 |
+.TP |
63 |
.B /etc/make.conf |
64 |
Contains variables for the build process, overriding those in |
65 |
\fBmake.globals\fR. |
66 |
@@ -1061,6 +1068,9 @@ Contains variables for the build process, overriding those in |
67 |
.B /etc/portage/color.map |
68 |
Contains variables customizing colors. |
69 |
.TP |
70 |
+.B /etc/portage/sets/ |
71 |
+Contains user package set definitions (see \fBportage\fR(5)). |
72 |
+.TP |
73 |
.B /etc/dispatch\-conf.conf |
74 |
Contains settings to handle automatic updates/backups of configuration |
75 |
files. |
76 |
|
77 |
diff --git a/man/portage.5 b/man/portage.5 |
78 |
index 099d601..7341a03 100644 |
79 |
--- a/man/portage.5 |
80 |
+++ b/man/portage.5 |
81 |
@@ -1,4 +1,4 @@ |
82 |
-.TH "PORTAGE" "5" "Oct 2011" "Portage VERSION" "Portage" |
83 |
+.TH "PORTAGE" "5" "Jun 2012" "Portage VERSION" "Portage" |
84 |
.SH NAME |
85 |
portage \- the heart of Gentoo |
86 |
.SH "DESCRIPTION" |
87 |
@@ -69,6 +69,9 @@ package-specific bashrc files |
88 |
.BR /etc/portage/profile/ |
89 |
site-specific overrides of \fB/etc/make.profile/\fR |
90 |
.TP |
91 |
+.BR /etc/portage/sets/ |
92 |
+user\-defined package sets |
93 |
+.TP |
94 |
.BR /usr/portage/metadata/ |
95 |
.nf |
96 |
layout.conf |
97 |
@@ -761,6 +764,17 @@ in the following order: |
98 |
/etc/portage/env/${CATEGORY}/${PF} |
99 |
.RE |
100 |
.TP |
101 |
+.BR /etc/portage/sets/ |
102 |
+.RS |
103 |
+For each file in this directory, a package set is created with its name |
104 |
+corresponding to the name of the file. Each file should contain a list |
105 |
+of package atoms, one per line. When referencing package sets in |
106 |
+\fBemerge\fR(1) arguments, the set name is prefixed with \fB@\fR. |
107 |
+ |
108 |
+Also see \fB/var/lib/portage/world_sets\fR and the \fBemerge\fR(1) |
109 |
+\fB\-\-list\-sets\fR option. |
110 |
+.RE |
111 |
+.TP |
112 |
.BR /usr/portage/metadata/ |
113 |
.RS |
114 |
.TP |
115 |
@@ -1077,7 +1091,8 @@ app\-cdr/cdemu |
116 |
.TP |
117 |
.BR world_sets |
118 |
This is like the world file but instead of package atoms it contains |
119 |
-packages sets which always begin with the @ character. |
120 |
+packages sets which always begin with the \fB@\fR character. Use |
121 |
+\fB/etc/portage/sets/\fR to define user package sets. |
122 |
|
123 |
.I Example: |
124 |
.nf |