1 |
commit: a859556ffaa4b3f55123215a269228f2ef89ee21 |
2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Aug 6 00:07:35 2018 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Apr 18 17:52:54 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=a859556f |
7 |
|
8 |
Update /usr/portage references (bug 378603) |
9 |
|
10 |
Update all relevant references in docs, messages, and comments |
11 |
to refer to /var/db/repos/gentoo instead of /usr/portage. Also |
12 |
update DISTDIR and PKGDIR references to refer to the new |
13 |
/var/cache/{distfiles,binpkgs} locations. |
14 |
|
15 |
Bug: https://bugs.gentoo.org/378603 |
16 |
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> |
17 |
|
18 |
cnf/make.conf.example | 16 +++++------- |
19 |
lib/portage/__init__.py | 6 ++--- |
20 |
lib/portage/cache/flat_hash.py | 4 +-- |
21 |
lib/portage/tests/news/test_NewsItem.py | 4 +-- |
22 |
lib/portage/tests/resolver/ResolverPlayground.py | 4 +-- |
23 |
lib/portage/xml/metadata.py | 6 ++--- |
24 |
man/ebuild.5 | 9 ++++--- |
25 |
man/emerge.1 | 8 +++--- |
26 |
man/make.conf.5 | 26 ++++++++----------- |
27 |
man/portage.5 | 32 ++++++++++++------------ |
28 |
man/quickpkg.1 | 4 +-- |
29 |
repoman/lib/repoman/__init__.py | 4 +-- |
30 |
12 files changed, 57 insertions(+), 66 deletions(-) |
31 |
|
32 |
diff --git a/cnf/make.conf.example b/cnf/make.conf.example |
33 |
index 70cb8b19b..94210faa9 100644 |
34 |
--- a/cnf/make.conf.example |
35 |
+++ b/cnf/make.conf.example |
36 |
@@ -14,7 +14,7 @@ |
37 |
# https://wiki.gentoo.org/wiki/Handbook:X86/Working/USE |
38 |
# |
39 |
# The available list of use flags with descriptions is in the ebuild repository. |
40 |
-# Use 'less' to view them: --> less /usr/portage/profiles/use.desc <-- |
41 |
+# Use 'less' to view them: --> less /var/db/repos/gentoo/profiles/use.desc <-- |
42 |
# |
43 |
# 'ufed' is an ncurses/dialog interface available in portage to make handling |
44 |
# useflags for you. 'emerge app-portage/ufed' |
45 |
@@ -111,24 +111,20 @@ |
46 |
# will protect the default locations of DISTDIR and PKGDIR, but users are |
47 |
# warned that any other locations inside PORTDIR are not necessarily safe |
48 |
# for data storage. |
49 |
-#PORTDIR=/usr/portage |
50 |
+#PORTDIR=/var/db/repos/gentoo |
51 |
# |
52 |
# DISTDIR is where all of the source code tarballs will be placed for |
53 |
# emerges. After packages are built, it is safe to remove any and |
54 |
# all files from this directory since they will be automatically |
55 |
# fetched on demand for a given build. If you would like to |
56 |
# selectively prune obsolete files from this directory, see |
57 |
-# eclean from the gentoolkit package. Note that locations under |
58 |
-# /usr/portage are not necessarily safe for data storage. See the |
59 |
-# PORTDIR documentation for more information. |
60 |
-#DISTDIR=/usr/portage/distfiles |
61 |
+# eclean from the gentoolkit package. |
62 |
+#DISTDIR=/var/cache/distfiles |
63 |
# |
64 |
# PKGDIR is the location of binary packages that you can have created |
65 |
# with '--buildpkg' or '-b' while emerging a package. This can get |
66 |
-# up to several hundred megs, or even a few gigs. Note that |
67 |
-# locations under /usr/portage are not necessarily safe for data |
68 |
-# storage. See the PORTDIR documentation for more information. |
69 |
-#PKGDIR=/usr/portage/packages |
70 |
+# up to several hundred megs, or even a few gigs. |
71 |
+#PKGDIR=/var/cache/binpkgs |
72 |
# |
73 |
# PORTAGE_LOGDIR is the location where portage will store all the logs it |
74 |
# creates from each individual merge. They are stored as |
75 |
|
76 |
diff --git a/lib/portage/__init__.py b/lib/portage/__init__.py |
77 |
index 053d197b5..b108ca3e5 100644 |
78 |
--- a/lib/portage/__init__.py |
79 |
+++ b/lib/portage/__init__.py |
80 |
@@ -1,4 +1,4 @@ |
81 |
-# Copyright 1998-2018 Gentoo Foundation |
82 |
+# Copyright 1998-2019 Gentoo Foundation |
83 |
# Distributed under the terms of the GNU General Public License v2 |
84 |
|
85 |
from __future__ import unicode_literals |
86 |
@@ -132,8 +132,8 @@ except ImportError as e: |
87 |
sys.stderr.write("\n\n") |
88 |
sys.stderr.write("!!! Failed to complete portage imports. There are internal modules for\n") |
89 |
sys.stderr.write("!!! portage and failure here indicates that you have a problem with your\n") |
90 |
- sys.stderr.write("!!! installation of portage. Please try a rescue portage located in the\n") |
91 |
- sys.stderr.write("!!! ebuild repository under '/usr/portage/sys-apps/portage/files/' (default).\n") |
92 |
+ sys.stderr.write("!!! installation of portage. Please try a rescue portage located in the ebuild\n") |
93 |
+ sys.stderr.write("!!! repository under '/var/db/repos/gentoo/sys-apps/portage/files/' (default).\n") |
94 |
sys.stderr.write("!!! There is a README.RESCUE file that details the steps required to perform\n") |
95 |
sys.stderr.write("!!! a recovery of portage.\n") |
96 |
sys.stderr.write(" "+str(e)+"\n\n") |
97 |
|
98 |
diff --git a/lib/portage/cache/flat_hash.py b/lib/portage/cache/flat_hash.py |
99 |
index 79783245b..451ea9e51 100644 |
100 |
--- a/lib/portage/cache/flat_hash.py |
101 |
+++ b/lib/portage/cache/flat_hash.py |
102 |
@@ -1,4 +1,4 @@ |
103 |
-# Copyright 2005-2016 Gentoo Foundation |
104 |
+# Copyright 2005-2019 Gentoo Authors |
105 |
# Distributed under the terms of the GNU General Public License v2 |
106 |
# Author(s): Brian Harring (ferringb@g.o) |
107 |
|
108 |
@@ -144,7 +144,7 @@ class database(fs_template.FsBased): |
109 |
# Only recurse 1 deep, in order to avoid iteration over |
110 |
# entries from another nested cache instance. This can |
111 |
# happen if the user nests an overlay inside |
112 |
- # /usr/portage/local as in bug #302764. |
113 |
+ # /var/db/repos/gentoo/local as in bug #302764. |
114 |
if depth < 1: |
115 |
dirs.append((depth+1, p)) |
116 |
continue |
117 |
|
118 |
diff --git a/lib/portage/tests/news/test_NewsItem.py b/lib/portage/tests/news/test_NewsItem.py |
119 |
index 2f183a7e0..22c7fc7dc 100644 |
120 |
--- a/lib/portage/tests/news/test_NewsItem.py |
121 |
+++ b/lib/portage/tests/news/test_NewsItem.py |
122 |
@@ -1,5 +1,5 @@ |
123 |
# test_NewsItem.py -- Portage Unit Testing Functionality |
124 |
-# Copyright 2007 Gentoo Foundation |
125 |
+# Copyright 2007-2019 Gentoo Authors |
126 |
# Distributed under the terms of the GNU General Public License v2 |
127 |
|
128 |
from portage import os |
129 |
@@ -43,7 +43,7 @@ against YourSQL: |
130 |
The revdep-rebuild tool is provided by app-portage/gentoolkit. |
131 |
""" |
132 |
def setUp(self): |
133 |
- self.profile = "/usr/portage/profiles/default-linux/x86/2007.0/" |
134 |
+ self.profile = "/var/db/repos/gentoo/profiles/default-linux/x86/2007.0/" |
135 |
self.keywords = "x86" |
136 |
# Use fake/test dbapi to avoid slow tests |
137 |
self.vardb = testdbapi() |
138 |
|
139 |
diff --git a/lib/portage/tests/resolver/ResolverPlayground.py b/lib/portage/tests/resolver/ResolverPlayground.py |
140 |
index fc754fb42..22d54e251 100644 |
141 |
--- a/lib/portage/tests/resolver/ResolverPlayground.py |
142 |
+++ b/lib/portage/tests/resolver/ResolverPlayground.py |
143 |
@@ -1,4 +1,4 @@ |
144 |
-# Copyright 2010-2015 Gentoo Foundation |
145 |
+# Copyright 2010-2019 Gentoo Authors |
146 |
# Distributed under the terms of the GNU General Public License v2 |
147 |
|
148 |
from itertools import permutations |
149 |
@@ -399,7 +399,7 @@ class ResolverPlayground(object): |
150 |
f.write("masters =\n") |
151 |
|
152 |
if repo == "test_repo": |
153 |
- #Create a minimal profile in /usr/portage |
154 |
+ #Create a minimal profile in /var/db/repos/gentoo |
155 |
sub_profile_dir = os.path.join(profile_dir, "default", "linux", "x86", "test_profile") |
156 |
os.makedirs(sub_profile_dir) |
157 |
|
158 |
|
159 |
diff --git a/lib/portage/xml/metadata.py b/lib/portage/xml/metadata.py |
160 |
index 9e48dddde..24888bb47 100644 |
161 |
--- a/lib/portage/xml/metadata.py |
162 |
+++ b/lib/portage/xml/metadata.py |
163 |
@@ -1,13 +1,13 @@ |
164 |
-# Copyright 2010-2017 Gentoo Foundation |
165 |
+# Copyright 2010-2019 Gentoo Authors |
166 |
# Distributed under the terms of the GNU General Public License v2 |
167 |
|
168 |
"""Provides an easy-to-use python interface to Gentoo's metadata.xml file. |
169 |
|
170 |
Example usage: |
171 |
>>> from portage.xml.metadata import MetaDataXML |
172 |
- >>> pkg_md = MetaDataXML('/usr/portage/app-misc/gourmet/metadata.xml') |
173 |
+ >>> pkg_md = MetaDataXML('/var/db/repos/gentoo/app-misc/gourmet/metadata.xml') |
174 |
>>> pkg_md |
175 |
- <MetaDataXML '/usr/portage/app-misc/gourmet/metadata.xml'> |
176 |
+ <MetaDataXML '/var/db/repos/gentoo/app-misc/gourmet/metadata.xml'> |
177 |
>>> pkg_md.herds() |
178 |
['no-herd'] |
179 |
>>> for maint in pkg_md.maintainers(): |
180 |
|
181 |
diff --git a/man/ebuild.5 b/man/ebuild.5 |
182 |
index 27f47d2b1..20684d8f4 100644 |
183 |
--- a/man/ebuild.5 |
184 |
+++ b/man/ebuild.5 |
185 |
@@ -1,4 +1,4 @@ |
186 |
-.TH "EBUILD" "5" "Oct 2017" "Portage VERSION" "Portage" |
187 |
+.TH "EBUILD" "5" "Apr 2019" "Portage VERSION" "Portage" |
188 |
|
189 |
.SH "NAME" |
190 |
ebuild \- the internal format, variables, and functions in an ebuild script |
191 |
@@ -530,7 +530,8 @@ being submitted for inclusion, it must have ~arch set for architectures |
192 |
where it has been PROVEN TO WORK. (Packages KEYWORDed this way may be |
193 |
unmasked for testing by setting ACCEPT_KEYWORDS="~arch" on the command |
194 |
line, or in \fBmake.conf\fR(5)) For an authoritative list please review |
195 |
-/usr/portage/profiles/arch.list. Please keep this list in alphabetical order. |
196 |
+/var/db/repos/gentoo/profiles/arch.list. Please keep this list in |
197 |
+alphabetical order. |
198 |
.TP |
199 |
.B SLOT |
200 |
This sets the SLOT for packages that may need to have multiple versions |
201 |
@@ -553,8 +554,8 @@ usage. |
202 |
.B LICENSE |
203 |
This should be a space delimited list of licenses that the package falls |
204 |
under. This \fB_must_\fR be set to a matching license in |
205 |
-/usr/portage/licenses/. If the license does not exist in portage yet, you |
206 |
-must add it first. |
207 |
+/var/db/repos/gentoo/licenses/. If the license does not exist in the repository |
208 |
+yet, you must add it first. |
209 |
.TP |
210 |
.B IUSE |
211 |
This should be a list of any and all USE flags that are leveraged within |
212 |
|
213 |
diff --git a/man/emerge.1 b/man/emerge.1 |
214 |
index afac83e76..78ac55e25 100644 |
215 |
--- a/man/emerge.1 |
216 |
+++ b/man/emerge.1 |
217 |
@@ -1,4 +1,4 @@ |
218 |
-.TH "EMERGE" "1" "Mar 2018" "Portage VERSION" "Portage" |
219 |
+.TH "EMERGE" "1" "Apr 2019" "Portage VERSION" "Portage" |
220 |
.SH "NAME" |
221 |
emerge \- Command\-line interface to the Portage system |
222 |
.SH "SYNOPSIS" |
223 |
@@ -43,7 +43,7 @@ as \fBsys\-apps/portage\fR or \fB=python\-2.2.1\-r2\fR. |
224 |
\fBemerge\fR |
225 |
ignores a trailing slash so that filename completion can be used. |
226 |
The \fIebuild\fR may also be an actual filename, such as |
227 |
-\fB/usr/portage/app\-admin/python/python\-2.2.1\-r2.ebuild\fR. |
228 |
+\fB/var/db/repos/gentoo/app\-admin/python/python\-2.2.1\-r2.ebuild\fR. |
229 |
\fBWARNING:\fR The implementation of \fBemerge /path/to/ebuild\fR is broken and |
230 |
so this syntax shouldn't be used. |
231 |
.TP |
232 |
@@ -1280,7 +1280,7 @@ avoid dependency conflicts and/or unsatisfied dependencies. |
233 |
.BR package.mask |
234 |
The \fBpackage.mask\fR file primarily blocks the use of packages that cause |
235 |
problems or are known to have issues on different systems. It resides in |
236 |
-\fI/usr/portage/profiles\fR. |
237 |
+\fI/var/db/repos/gentoo/profiles\fR. |
238 |
.TP |
239 |
.BR CHOST |
240 |
Use the \fBACCEPT_CHOSTS\fR variable in \fBmake.conf\fR(5) to control |
241 |
@@ -1426,7 +1426,7 @@ files. |
242 |
Contains profile\-specific variables for the build process. \fBDo not |
243 |
edit this file\fR. |
244 |
.TP |
245 |
-.B /usr/portage/profiles/use.desc |
246 |
+.B /var/db/repos/gentoo/profiles/use.desc |
247 |
Contains the master list of USE flags with descriptions of their |
248 |
functions. \fBDo not edit this file\fR. |
249 |
.TP |
250 |
|
251 |
diff --git a/man/make.conf.5 b/man/make.conf.5 |
252 |
index adbd6dc85..0ad3e2f7d 100644 |
253 |
--- a/man/make.conf.5 |
254 |
+++ b/man/make.conf.5 |
255 |
@@ -1,4 +1,4 @@ |
256 |
-.TH "MAKE.CONF" "5" "Feb 2019" "Portage VERSION" "Portage" |
257 |
+.TH "MAKE.CONF" "5" "Apr 2019" "Portage VERSION" "Portage" |
258 |
.SH "NAME" |
259 |
make.conf \- custom settings for Portage |
260 |
.SH "SYNOPSIS" |
261 |
@@ -217,12 +217,8 @@ like to selectively prune obsolete files from this directory, see |
262 |
|
263 |
Use the \fBPORTAGE_RO_DISTDIRS\fR variable to specify one or |
264 |
more read-only directories containing distfiles. |
265 |
- |
266 |
-Note |
267 |
-that locations under /usr/portage are not necessarily safe for data storage. |
268 |
-See the \fBPORTDIR\fR documentation for more information. |
269 |
.br |
270 |
-Defaults to /usr/portage/distfiles. |
271 |
+Defaults to /var/cache/distfiles. |
272 |
.TP |
273 |
.B DOC_SYMLINKS_DIR |
274 |
If this variable contains a directory then symlinks to html documentation will |
275 |
@@ -826,11 +822,9 @@ By default, a given package is stored in a subdirectory corresponding |
276 |
to it's category. However, for backward compatibility with the layout |
277 |
used by older versions of portage, if the \fI${PKGDIR}/All\fR directory |
278 |
exists then all packages will be stored inside of it and symlinks to |
279 |
-the packages will be created in the category subdirectories. Note |
280 |
-that locations under /usr/portage are not necessarily safe for data storage. |
281 |
-See the \fBPORTDIR\fR documentation for more information. |
282 |
+the packages will be created in the category subdirectories. |
283 |
.br |
284 |
-Defaults to /usr/portage/packages. |
285 |
+Defaults to /var/cache/binpkgs. |
286 |
.TP |
287 |
.B PORT_LOGDIR |
288 |
See \fIPORTAGE_LOGDIR\fR below. Deprecated. |
289 |
@@ -1066,7 +1060,7 @@ Defines the location of main repository. This variable is deprecated in favor of |
290 |
settings in \fBrepos.conf\fR. If you change this, you must update |
291 |
your /etc/portage/make.profile symlink accordingly. |
292 |
.br |
293 |
-Defaults to /usr/portage. |
294 |
+Defaults to /var/db/repos/gentoo. |
295 |
.br |
296 |
\fB***Warning***\fR |
297 |
.br |
298 |
@@ -1151,7 +1145,7 @@ rsync://private\-mirror.com/portage\-module |
299 |
.br |
300 |
rsync://rsync\-user@private\-mirror.com:873/gentoo\-portage |
301 |
.br |
302 |
-ssh://ssh\-user@192.168.0.1:22/usr/portage |
303 |
+ssh://ssh\-user@192.168.0.1:22/var/db/repos/gentoo |
304 |
.br |
305 |
ssh://ssh\-user@192.168.0.1:22/\\${HOME}/portage\-storage |
306 |
.TP |
307 |
@@ -1169,7 +1163,7 @@ Defaults to "/lib/modules/*". |
308 |
\fBUSE\fR = \fI[space delimited list of USE items]\fR |
309 |
This variable contains options that control the build behavior of several |
310 |
packages. More information in \fBebuild\fR(5). Possible USE values |
311 |
-can be found in \fI/usr/portage/profiles/use.desc\fR. |
312 |
+can be found in \fI/var/db/repos/gentoo/profiles/use.desc\fR. |
313 |
.TP |
314 |
\fBUSE_ORDER\fR = \fI"env:pkg:conf:defaults:pkginternal:features:repo:env.d"\fR |
315 |
Determines the precedence of layers in the incremental stacking of the USE |
316 |
@@ -1206,7 +1200,7 @@ for FEATURES=\fBtest\fR. |
317 |
.TP |
318 |
.B repo |
319 |
USE from make.defaults and package.use in the repo's profiles/ top dir |
320 |
-(e.g. /usr/portage/profiles/package.use) (see \fBportage\fR(5)) |
321 |
+(e.g. /var/db/repos/gentoo/profiles/package.use) (see \fBportage\fR(5)) |
322 |
.TP |
323 |
.B env.d |
324 |
USE from the environment variables, such as LINGUAS, defined by files in |
325 |
@@ -1236,10 +1230,10 @@ Contains the default variables for the build\-process, you should edit |
326 |
.B /etc/portage/color.map |
327 |
Contains variables customizing colors. |
328 |
.TP |
329 |
-.B /usr/portage/profiles/use.desc |
330 |
+.B /var/db/repos/gentoo/profiles/use.desc |
331 |
Contains a list of all global USE flags. |
332 |
.TP |
333 |
-.B /usr/portage/profiles/use.local.desc |
334 |
+.B /var/db/repos/gentoo/profiles/use.local.desc |
335 |
Contains a list of all local USE variables. |
336 |
.SH "SEE ALSO" |
337 |
.BR emerge (1), |
338 |
|
339 |
diff --git a/man/portage.5 b/man/portage.5 |
340 |
index caf993672..36c871123 100644 |
341 |
--- a/man/portage.5 |
342 |
+++ b/man/portage.5 |
343 |
@@ -1,4 +1,4 @@ |
344 |
-.TH "PORTAGE" "5" "Apr 2018" "Portage VERSION" "Portage" |
345 |
+.TH "PORTAGE" "5" "Apr 2019" "Portage VERSION" "Portage" |
346 |
.SH NAME |
347 |
portage \- the heart of Gentoo |
348 |
.SH "DESCRIPTION" |
349 |
@@ -77,18 +77,18 @@ site-specific overrides of \fB/etc/portage/make.profile/\fR |
350 |
.BR /etc/portage/sets/ |
351 |
user\-defined package sets |
352 |
.TP |
353 |
-.BR /usr/portage/ |
354 |
+.BR /var/db/repos/gentoo/ |
355 |
.nf |
356 |
sets.conf |
357 |
.fi |
358 |
.TP |
359 |
-.BR /usr/portage/metadata/ |
360 |
+.BR /var/db/repos/gentoo/metadata/ |
361 |
.nf |
362 |
layout.conf |
363 |
pkg_desc_index |
364 |
.fi |
365 |
.TP |
366 |
-.BR /usr/portage/profiles/ |
367 |
+.BR /var/db/repos/gentoo/profiles/ |
368 |
.nf |
369 |
arch.list |
370 |
categories |
371 |
@@ -214,7 +214,7 @@ More reading: |
372 |
.TP |
373 |
\fB/etc/portage/make.profile/\fR or \fB/etc/make.profile/\fR |
374 |
This is usually just a symlink to the correct profile in |
375 |
-\fB/usr/portage/profiles/\fR. Since it is part of the ebuild repository, it |
376 |
+\fB/var/db/repos/gentoo/profiles/\fR. Since it is part of the ebuild repository, it |
377 |
may easily be updated/regenerated by running `emerge \-\-sync`. It defines |
378 |
what a profile is (usually arch specific stuff). If you need a custom |
379 |
profile, then you should make your own \fBmake.profile\fR |
380 |
@@ -248,10 +248,10 @@ explaining how they can upgrade. |
381 |
|
382 |
.I Example: |
383 |
.nf |
384 |
-default-linux/x86/2005.0 |
385 |
-# emerge -n '>=sys-apps/portage-2.0.51' |
386 |
+default/linux/amd64/17.0 |
387 |
+# emerge -n '>=sys-apps/portage-2.3.62' |
388 |
# rm -f /etc/portage/make.profile |
389 |
-# ln -s /usr/portage/profiles/default-linux/alpha/2005.0 \ |
390 |
+# ln -s /var/db/repos/gentoo/profiles/default/linux/amd64/17.0 \ |
391 |
/etc/portage/make.profile |
392 |
.fi |
393 |
.TP |
394 |
@@ -644,7 +644,7 @@ The global custom settings for Portage. See \fBmake.conf\fR(5). |
395 |
.BR mirrors |
396 |
Whenever portage encounters a mirror:// style URI it will look up the actual |
397 |
hosts here. If the mirror set is not found here, it will check the global |
398 |
-mirrors file at /usr/portage/profiles/thirdpartymirrors. You may also set a |
399 |
+mirrors file at /var/db/repos/gentoo/profiles/thirdpartymirrors. You may also set a |
400 |
special mirror type called "local". This list of mirrors will be checked |
401 |
before GENTOO_MIRRORS and will be used even if the package has |
402 |
RESTRICT="mirror" or RESTRICT="fetch". |
403 |
@@ -1094,7 +1094,7 @@ rsync://private\-mirror.com/portage\-module |
404 |
.br |
405 |
rsync://rsync\-user@private\-mirror.com:873/gentoo\-portage |
406 |
.br |
407 |
-ssh://ssh\-user@192.168.0.1:22/usr/portage |
408 |
+ssh://ssh\-user@192.168.0.1:22/var/db/repos/gentoo |
409 |
.br |
410 |
ssh://ssh\-user@192.168.0.1:22/\\${HOME}/portage\-storage |
411 |
.RE |
412 |
@@ -1218,7 +1218,7 @@ masters = |
413 |
|
414 |
# Repository 'gentoo' synchronized using CVS |
415 |
[gentoo] |
416 |
-location = /usr/portage |
417 |
+location = /var/db/repos/gentoo |
418 |
sync\-type = cvs |
419 |
sync\-uri = :pserver:anonymous@××××××××××××××.org:/var/cvsroot |
420 |
sync\-cvs\-repo = gentoo\-x86 |
421 |
@@ -1235,7 +1235,7 @@ auto\-sync = yes |
422 |
.TP |
423 |
.BR sets.conf |
424 |
A package set configuration file. Settings here override settings from |
425 |
-\fB/usr/portage/sets.conf\fR and \fB/usr/share/portage/config/sets\fR. |
426 |
+\fB/var/db/repos/gentoo/sets.conf\fR and \fB/usr/share/portage/config/sets\fR. |
427 |
The format is described extensively in the |
428 |
\fIPackage Set Configuration\fR section of the html documentation which |
429 |
is installed with portage when the "doc" USE flag is enabled. |
430 |
@@ -1296,7 +1296,7 @@ Also see \fB/var/lib/portage/world_sets\fR and the \fBemerge\fR(1) |
431 |
\fB\-\-list\-sets\fR option. |
432 |
.RE |
433 |
.TP |
434 |
-.BR /usr/portage/ |
435 |
+.BR /var/db/repos/gentoo/ |
436 |
.RS |
437 |
.TP |
438 |
.BR sets.conf |
439 |
@@ -1305,7 +1305,7 @@ which overrides these settings, and |
440 |
\fB/usr/share/portage/config/sets\fR which contains default settings. |
441 |
.RE |
442 |
.TP |
443 |
-.BR /usr/portage/metadata/ |
444 |
+.BR /var/db/repos/gentoo/metadata/ |
445 |
.RS |
446 |
.TP |
447 |
.BR layout.conf |
448 |
@@ -1472,7 +1472,7 @@ sys-apps/usleep 0.1: A wrapper for usleep |
449 |
.fi |
450 |
.RE |
451 |
.TP |
452 |
-.BR /usr/portage/profiles/ |
453 |
+.BR /var/db/repos/gentoo/profiles/ |
454 |
Global Gentoo settings that are controlled by the developers. To override |
455 |
these settings, you can use the files in \fB/etc/portage/\fR. |
456 |
.RS |
457 |
@@ -1683,7 +1683,7 @@ for \fB/etc/portage/repos.conf\fR. |
458 |
.TP |
459 |
.BR sets |
460 |
A directory containing package set configuration files. Also see |
461 |
-\fB/etc/portage/sets.conf\fR and \fB/usr/portage/sets.conf\fR, both of |
462 |
+\fB/etc/portage/sets.conf\fR and \fB/var/db/repos/gentoo/sets.conf\fR, both of |
463 |
which override values set here. Default set configurations are installed |
464 |
in \fB/usr/share/portage/config/sets/portage.conf\fR. |
465 |
.RE |
466 |
|
467 |
diff --git a/man/quickpkg.1 b/man/quickpkg.1 |
468 |
index 06a1f0b6e..a6aff7c50 100644 |
469 |
--- a/man/quickpkg.1 |
470 |
+++ b/man/quickpkg.1 |
471 |
@@ -1,4 +1,4 @@ |
472 |
-.TH "QUICKPKG" "1" "Dec 2012" "Portage VERSION" "Portage" |
473 |
+.TH "QUICKPKG" "1" "Apr 2019" "Portage VERSION" "Portage" |
474 |
.SH NAME |
475 |
quickpkg \- creates portage packages |
476 |
.SH SYNOPSIS |
477 |
@@ -17,7 +17,7 @@ modified since they were first installed. |
478 |
.br |
479 |
The packages, after being created, will be placed in \fBPKGDIR\fR. |
480 |
This variable is defined in \fBmake.conf\fR(5) and defaults to |
481 |
-/usr/portage/packages. |
482 |
+/var/cache/binpkgs. |
483 |
.SH OPTIONS |
484 |
.TP |
485 |
.B <list of packages or package\-sets> |
486 |
|
487 |
diff --git a/repoman/lib/repoman/__init__.py b/repoman/lib/repoman/__init__.py |
488 |
index 301b34309..4f3e59e50 100644 |
489 |
--- a/repoman/lib/repoman/__init__.py |
490 |
+++ b/repoman/lib/repoman/__init__.py |
491 |
@@ -13,8 +13,8 @@ except ImportError as e: |
492 |
sys.stderr.write("\n\n") |
493 |
sys.stderr.write("!!! Failed to complete portage imports. There are internal modules for\n") |
494 |
sys.stderr.write("!!! portage and failure here indicates that you have a problem with your\n") |
495 |
- sys.stderr.write("!!! installation of portage. Please try a rescue portage located in the\n") |
496 |
- sys.stderr.write("!!! ebuild repository under '/usr/portage/sys-apps/portage/files/' (default).\n") |
497 |
+ sys.stderr.write("!!! installation of portage. Please try a rescue portage located in the ebuild\n") |
498 |
+ sys.stderr.write("!!! repository under '/var/db/repos/gentoo/sys-apps/portage/files/' (default).\n") |
499 |
sys.stderr.write("!!! There is a README.RESCUE file that details the steps required to perform\n") |
500 |
sys.stderr.write("!!! a recovery of portage.\n") |
501 |
sys.stderr.write(" "+str(e)+"\n\n") |