Gentoo Archives: gentoo-portage-dev

From: Zac Medico <zmedico@g.o>
To: gentoo-portage-dev@l.g.o
Cc: Zac Medico <zmedico@g.o>
Subject: [gentoo-portage-dev] [PATCH 2/2 v2] Update /usr/portage references (bug 378603)
Date: Mon, 06 Aug 2018 05:34:50
Message-Id: 20180806053234.24978-1-zmedico@gentoo.org
In Reply to: [gentoo-portage-dev] [PATCH 2/2] Update /usr/portage references (bug 378603) by Zac Medico
1 Update all relevant references in docs, messages, and comments
2 to refer to /var/db/repos/gentoo instead of /usr/portage. Also
3 update DISTDIR and PKGDIR references to refer to the new
4 /var/cache/{distfiles,binpkgs} locations.
5
6 Bug: https://bugs.gentoo.org/378603
7 ---
8 [PATCH 2/2 v2] fixes DISTDIR and PKGDIR references to rever to the
9 new /var/cache/{distfiles,binpkgs} locations
10
11 cnf/make.conf.example | 12 +++++------
12 lib/portage/__init__.py | 2 +-
13 lib/portage/cache/flat_hash.py | 2 +-
14 lib/portage/tests/news/test_NewsItem.py | 2 +-
15 lib/portage/tests/resolver/ResolverPlayground.py | 2 +-
16 lib/portage/xml/metadata.py | 4 ++--
17 man/ebuild.5 | 4 ++--
18 man/emerge.1 | 6 +++---
19 man/make.conf.5 | 20 +++++++++---------
20 man/portage.5 | 26 ++++++++++++------------
21 man/quickpkg.1 | 2 +-
22 repoman/lib/repoman/__init__.py | 2 +-
23 repoman/lib/repoman/checks/herds/herdbase.py | 2 +-
24 13 files changed, 43 insertions(+), 43 deletions(-)
25
26 diff --git a/cnf/make.conf.example b/cnf/make.conf.example
27 index 04f3a0274..c16f2afbd 100644
28 --- a/cnf/make.conf.example
29 +++ b/cnf/make.conf.example
30 @@ -14,7 +14,7 @@
31 # https://wiki.gentoo.org/wiki/Handbook:X86/Working/USE
32 #
33 # The available list of use flags with descriptions is in your portage tree.
34 -# Use 'less' to view them: --> less /usr/portage/profiles/use.desc <--
35 +# Use 'less' to view them: --> less /var/db/repos/gentoo/profiles/use.desc <--
36 #
37 # 'ufed' is an ncurses/dialog interface available in portage to make handling
38 # useflags for you. 'emerge app-portage/ufed'
39 @@ -111,7 +111,7 @@
40 # will protect the default locations of DISTDIR and PKGDIR, but users are
41 # warned that any other locations inside PORTDIR are not necessarily safe
42 # for data storage.
43 -#PORTDIR=/usr/portage
44 +#PORTDIR=/var/db/repos/gentoo
45 #
46 # DISTDIR is where all of the source code tarballs will be placed for
47 # emerges. After packages are built, it is safe to remove any and
48 @@ -119,16 +119,16 @@
49 # fetched on demand for a given build. If you would like to
50 # selectively prune obsolete files from this directory, see
51 # eclean from the gentoolkit package. Note that locations under
52 -# /usr/portage are not necessarily safe for data storage. See the
53 +# /var/db/repos/gentoo are not necessarily safe for data storage. See the
54 # PORTDIR documentation for more information.
55 -#DISTDIR=/usr/portage/distfiles
56 +#DISTDIR=/var/cache/distfiles
57 #
58 # PKGDIR is the location of binary packages that you can have created
59 # with '--buildpkg' or '-b' while emerging a package. This can get
60 # up to several hundred megs, or even a few gigs. Note that
61 -# locations under /usr/portage are not necessarily safe for data
62 +# locations under /var/db/repos/gentoo are not necessarily safe for data
63 # storage. See the PORTDIR documentation for more information.
64 -#PKGDIR=/usr/portage/packages
65 +#PKGDIR=/var/cache/binpkgs
66 #
67 # PORT_LOGDIR is the location where portage will store all the logs it
68 # creates from each individual merge. They are stored as
69 diff --git a/lib/portage/__init__.py b/lib/portage/__init__.py
70 index 166bfc700..61a240100 100644
71 --- a/lib/portage/__init__.py
72 +++ b/lib/portage/__init__.py
73 @@ -133,7 +133,7 @@ except ImportError as e:
74 sys.stderr.write("!!! Failed to complete portage imports. There are internal modules for\n")
75 sys.stderr.write("!!! portage and failure here indicates that you have a problem with your\n")
76 sys.stderr.write("!!! installation of portage. Please try a rescue portage located in the\n")
77 - sys.stderr.write("!!! portage tree under '/usr/portage/sys-apps/portage/files/' (default).\n")
78 + sys.stderr.write("!!! portage tree under '/var/db/repos/gentoo/sys-apps/portage/files/' (default).\n")
79 sys.stderr.write("!!! There is a README.RESCUE file that details the steps required to perform\n")
80 sys.stderr.write("!!! a recovery of portage.\n")
81 sys.stderr.write(" "+str(e)+"\n\n")
82 diff --git a/lib/portage/cache/flat_hash.py b/lib/portage/cache/flat_hash.py
83 index 79783245b..1ec32fb5b 100644
84 --- a/lib/portage/cache/flat_hash.py
85 +++ b/lib/portage/cache/flat_hash.py
86 @@ -144,7 +144,7 @@ class database(fs_template.FsBased):
87 # Only recurse 1 deep, in order to avoid iteration over
88 # entries from another nested cache instance. This can
89 # happen if the user nests an overlay inside
90 - # /usr/portage/local as in bug #302764.
91 + # /var/db/repos/gentoo/local as in bug #302764.
92 if depth < 1:
93 dirs.append((depth+1, p))
94 continue
95 diff --git a/lib/portage/tests/news/test_NewsItem.py b/lib/portage/tests/news/test_NewsItem.py
96 index 2f183a7e0..411b8d36d 100644
97 --- a/lib/portage/tests/news/test_NewsItem.py
98 +++ b/lib/portage/tests/news/test_NewsItem.py
99 @@ -43,7 +43,7 @@ against YourSQL:
100 The revdep-rebuild tool is provided by app-portage/gentoolkit.
101 """
102 def setUp(self):
103 - self.profile = "/usr/portage/profiles/default-linux/x86/2007.0/"
104 + self.profile = "/var/db/repos/gentoo/profiles/default-linux/x86/2007.0/"
105 self.keywords = "x86"
106 # Use fake/test dbapi to avoid slow tests
107 self.vardb = testdbapi()
108 diff --git a/lib/portage/tests/resolver/ResolverPlayground.py b/lib/portage/tests/resolver/ResolverPlayground.py
109 index e2e061669..c0fbb541b 100644
110 --- a/lib/portage/tests/resolver/ResolverPlayground.py
111 +++ b/lib/portage/tests/resolver/ResolverPlayground.py
112 @@ -350,7 +350,7 @@ class ResolverPlayground(object):
113 f.write("masters =\n")
114
115 if repo == "test_repo":
116 - #Create a minimal profile in /usr/portage
117 + #Create a minimal profile in /var/db/repos/gentoo
118 sub_profile_dir = os.path.join(profile_dir, "default", "linux", "x86", "test_profile")
119 os.makedirs(sub_profile_dir)
120
121 diff --git a/lib/portage/xml/metadata.py b/lib/portage/xml/metadata.py
122 index 9e48dddde..8e82df0d0 100644
123 --- a/lib/portage/xml/metadata.py
124 +++ b/lib/portage/xml/metadata.py
125 @@ -5,9 +5,9 @@
126
127 Example usage:
128 >>> from portage.xml.metadata import MetaDataXML
129 - >>> pkg_md = MetaDataXML('/usr/portage/app-misc/gourmet/metadata.xml')
130 + >>> pkg_md = MetaDataXML('/var/db/repos/gentoo/app-misc/gourmet/metadata.xml')
131 >>> pkg_md
132 - <MetaDataXML '/usr/portage/app-misc/gourmet/metadata.xml'>
133 + <MetaDataXML '/var/db/repos/gentoo/app-misc/gourmet/metadata.xml'>
134 >>> pkg_md.herds()
135 ['no-herd']
136 >>> for maint in pkg_md.maintainers():
137 diff --git a/man/ebuild.5 b/man/ebuild.5
138 index 9f491dd73..e6660c283 100644
139 --- a/man/ebuild.5
140 +++ b/man/ebuild.5
141 @@ -569,7 +569,7 @@ being submitted for inclusion, it must have ~arch set for architectures
142 where it has been PROVEN TO WORK. (Packages KEYWORDed this way may be
143 unmasked for testing by setting ACCEPT_KEYWORDS="~arch" on the command
144 line, or in \fBmake.conf\fR(5)) For an authoritative list please review
145 -/usr/portage/profiles/arch.list. Please keep this list in alphabetical order.
146 +/var/db/repos/gentoo/profiles/arch.list. Please keep this list in alphabetical order.
147 .TP
148 .B SLOT
149 This sets the SLOT for packages that may need to have multiple versions
150 @@ -592,7 +592,7 @@ usage.
151 .B LICENSE
152 This should be a space delimited list of licenses that the package falls
153 under. This \fB_must_\fR be set to a matching license in
154 -/usr/portage/licenses/. If the license does not exist in portage yet, you
155 +/var/db/repos/gentoo/licenses/. If the license does not exist in portage yet, you
156 must add it first.
157 .TP
158 .B IUSE
159 diff --git a/man/emerge.1 b/man/emerge.1
160 index f53ba92f5..21c3b854c 100644
161 --- a/man/emerge.1
162 +++ b/man/emerge.1
163 @@ -43,7 +43,7 @@ as \fBsys\-apps/portage\fR or \fB=python\-2.2.1\-r2\fR.
164 \fBemerge\fR
165 ignores a trailing slash so that filename completion can be used.
166 The \fIebuild\fR may also be an actual filename, such as
167 -\fB/usr/portage/app\-admin/python/python\-2.2.1\-r2.ebuild\fR.
168 +\fB/var/db/repos/gentoo/app\-admin/python/python\-2.2.1\-r2.ebuild\fR.
169 \fBWARNING:\fR The implementation of \fBemerge /path/to/ebuild\fR is broken and
170 so this syntax shouldn't be used.
171 .TP
172 @@ -1280,7 +1280,7 @@ avoid dependency conflicts and/or unsatisfied dependencies.
173 .BR package.mask
174 The \fBpackage.mask\fR file primarily blocks the use of packages that cause
175 problems or are known to have issues on different systems. It resides in
176 -\fI/usr/portage/profiles\fR.
177 +\fI/var/db/repos/gentoo/profiles\fR.
178 .TP
179 .BR CHOST
180 Use the \fBACCEPT_CHOSTS\fR variable in \fBmake.conf\fR(5) to control
181 @@ -1426,7 +1426,7 @@ files.
182 Contains profile\-specific variables for the build process. \fBDo not
183 edit this file\fR.
184 .TP
185 -.B /usr/portage/profiles/use.desc
186 +.B /var/db/repos/gentoo/profiles/use.desc
187 Contains the master list of USE flags with descriptions of their
188 functions. \fBDo not edit this file\fR.
189 .TP
190 diff --git a/man/make.conf.5 b/man/make.conf.5
191 index a4e33923c..ba5b8573e 100644
192 --- a/man/make.conf.5
193 +++ b/man/make.conf.5
194 @@ -219,10 +219,10 @@ Use the \fBPORTAGE_RO_DISTDIRS\fR variable to specify one or
195 more read-only directories containing distfiles.
196
197 Note
198 -that locations under /usr/portage are not necessarily safe for data storage.
199 +that locations under /var/db/repos/gentoo are not necessarily safe for data storage.
200 See the \fBPORTDIR\fR documentation for more information.
201 .br
202 -Defaults to /usr/portage/distfiles.
203 +Defaults to /var/cache/distfiles.
204 .TP
205 .B DOC_SYMLINKS_DIR
206 If this variable contains a directory then symlinks to html documentation will
207 @@ -800,10 +800,10 @@ to it's category. However, for backward compatibility with the layout
208 used by older versions of portage, if the \fI${PKGDIR}/All\fR directory
209 exists then all packages will be stored inside of it and symlinks to
210 the packages will be created in the category subdirectories. Note
211 -that locations under /usr/portage are not necessarily safe for data storage.
212 +that locations under /var/db/repos/gentoo are not necessarily safe for data storage.
213 See the \fBPORTDIR\fR documentation for more information.
214 .br
215 -Defaults to /usr/portage/packages.
216 +Defaults to /var/cache/binpkgs.
217 .TP
218 .B PORT_LOGDIR
219 This variable defines the directory in which per\-ebuild logs are kept.
220 @@ -1033,7 +1033,7 @@ Defines the location of main repository. This variable is deprecated in favor of
221 settings in \fBrepos.conf\fR. If you change this, you must update
222 your /etc/portage/make.profile symlink accordingly.
223 .br
224 -Defaults to /usr/portage.
225 +Defaults to /var/db/repos/gentoo.
226 .br
227 \fB***Warning***\fR
228 .br
229 @@ -1118,7 +1118,7 @@ rsync://private\-mirror.com/portage\-module
230 .br
231 rsync://rsync\-user@private\-mirror.com:873/gentoo\-portage
232 .br
233 -ssh://ssh\-user@192.168.0.1:22/usr/portage
234 +ssh://ssh\-user@192.168.0.1:22/var/db/repos/gentoo
235 .br
236 ssh://ssh\-user@192.168.0.1:22/\\${HOME}/portage\-storage
237 .TP
238 @@ -1136,7 +1136,7 @@ Defaults to "/lib/modules/*".
239 \fBUSE\fR = \fI[space delimited list of USE items]\fR
240 This variable contains options that control the build behavior of several
241 packages. More information in \fBebuild\fR(5). Possible USE values
242 -can be found in \fI/usr/portage/profiles/use.desc\fR.
243 +can be found in \fI/var/db/repos/gentoo/profiles/use.desc\fR.
244 .TP
245 \fBUSE_ORDER\fR = \fI"env:pkg:conf:defaults:pkginternal:features:repo:env.d"\fR
246 Determines the precedence of layers in the incremental stacking of the USE
247 @@ -1173,7 +1173,7 @@ for FEATURES=\fBtest\fR.
248 .TP
249 .B repo
250 USE from make.defaults and package.use in the repo's profiles/ top dir
251 -(e.g. /usr/portage/profiles/package.use) (see \fBportage\fR(5))
252 +(e.g. /var/db/repos/gentoo/profiles/package.use) (see \fBportage\fR(5))
253 .TP
254 .B env.d
255 USE from the environment variables, such as LINGUAS, defined by files in
256 @@ -1203,10 +1203,10 @@ Contains the default variables for the build\-process, you should edit
257 .B /etc/portage/color.map
258 Contains variables customizing colors.
259 .TP
260 -.B /usr/portage/profiles/use.desc
261 +.B /var/db/repos/gentoo/profiles/use.desc
262 Contains a list of all global USE flags.
263 .TP
264 -.B /usr/portage/profiles/use.local.desc
265 +.B /var/db/repos/gentoo/profiles/use.local.desc
266 Contains a list of all local USE variables.
267 .SH "SEE ALSO"
268 .BR emerge (1),
269 diff --git a/man/portage.5 b/man/portage.5
270 index cd9d5036d..0db8c5258 100644
271 --- a/man/portage.5
272 +++ b/man/portage.5
273 @@ -77,18 +77,18 @@ site-specific overrides of \fB/etc/portage/make.profile/\fR
274 .BR /etc/portage/sets/
275 user\-defined package sets
276 .TP
277 -.BR /usr/portage/
278 +.BR /var/db/repos/gentoo/
279 .nf
280 sets.conf
281 .fi
282 .TP
283 -.BR /usr/portage/metadata/
284 +.BR /var/db/repos/gentoo/metadata/
285 .nf
286 layout.conf
287 pkg_desc_index
288 .fi
289 .TP
290 -.BR /usr/portage/profiles/
291 +.BR /var/db/repos/gentoo/profiles/
292 .nf
293 arch.list
294 categories
295 @@ -214,7 +214,7 @@ More reading:
296 .TP
297 \fB/etc/portage/make.profile/\fR or \fB/etc/make.profile/\fR
298 This is usually just a symlink to the correct profile in
299 -\fB/usr/portage/profiles/\fR. Since it is part of the portage tree, it
300 +\fB/var/db/repos/gentoo/profiles/\fR. Since it is part of the portage tree, it
301 may easily be updated/regenerated by running `emerge \-\-sync`. It defines
302 what a profile is (usually arch specific stuff). If you need a custom
303 profile, then you should make your own \fBmake.profile\fR
304 @@ -251,7 +251,7 @@ explaining how they can upgrade.
305 default-linux/x86/2005.0
306 # emerge -n '>=sys-apps/portage-2.0.51'
307 # rm -f /etc/portage/make.profile
308 -# ln -s /usr/portage/profiles/default-linux/alpha/2005.0 \
309 +# ln -s /var/db/repos/gentoo/profiles/default-linux/alpha/2005.0 \
310 /etc/portage/make.profile
311 .fi
312 .TP
313 @@ -644,7 +644,7 @@ The global custom settings for Portage. See \fBmake.conf\fR(5).
314 .BR mirrors
315 Whenever portage encounters a mirror:// style URI it will look up the actual
316 hosts here. If the mirror set is not found here, it will check the global
317 -mirrors file at /usr/portage/profiles/thirdpartymirrors. You may also set a
318 +mirrors file at /var/db/repos/gentoo/profiles/thirdpartymirrors. You may also set a
319 special mirror type called "local". This list of mirrors will be checked
320 before GENTOO_MIRRORS and will be used even if the package has
321 RESTRICT="mirror" or RESTRICT="fetch".
322 @@ -1059,7 +1059,7 @@ rsync://private\-mirror.com/portage\-module
323 .br
324 rsync://rsync\-user@private\-mirror.com:873/gentoo\-portage
325 .br
326 -ssh://ssh\-user@192.168.0.1:22/usr/portage
327 +ssh://ssh\-user@192.168.0.1:22/var/db/repos/gentoo
328 .br
329 ssh://ssh\-user@192.168.0.1:22/\\${HOME}/portage\-storage
330 .RE
331 @@ -1178,7 +1178,7 @@ masters =
332
333 # Repository 'gentoo' synchronized using CVS
334 [gentoo]
335 -location = /usr/portage
336 +location = /var/db/repos/gentoo
337 sync\-type = cvs
338 sync\-uri = :pserver:anonymous@××××××××××××××.org:/var/cvsroot
339 sync\-cvs\-repo = gentoo\-x86
340 @@ -1195,7 +1195,7 @@ auto\-sync = yes
341 .TP
342 .BR sets.conf
343 A package set configuration file. Settings here override settings from
344 -\fB/usr/portage/sets.conf\fR and \fB/usr/share/portage/config/sets\fR.
345 +\fB/var/db/repos/gentoo/sets.conf\fR and \fB/usr/share/portage/config/sets\fR.
346 The format is described extensively in the
347 \fIPackage Set Configuration\fR section of the html documentation which
348 is installed with portage when the "doc" USE flag is enabled.
349 @@ -1256,7 +1256,7 @@ Also see \fB/var/lib/portage/world_sets\fR and the \fBemerge\fR(1)
350 \fB\-\-list\-sets\fR option.
351 .RE
352 .TP
353 -.BR /usr/portage/
354 +.BR /var/db/repos/gentoo/
355 .RS
356 .TP
357 .BR sets.conf
358 @@ -1265,7 +1265,7 @@ which overrides these settings, and
359 \fB/usr/share/portage/config/sets\fR which contains default settings.
360 .RE
361 .TP
362 -.BR /usr/portage/metadata/
363 +.BR /var/db/repos/gentoo/metadata/
364 .RS
365 .TP
366 .BR layout.conf
367 @@ -1432,7 +1432,7 @@ sys-apps/usleep 0.1: A wrapper for usleep
368 .fi
369 .RE
370 .TP
371 -.BR /usr/portage/profiles/
372 +.BR /var/db/repos/gentoo/profiles/
373 Global Gentoo settings that are controlled by the developers. To override
374 these settings, you can use the files in \fB/etc/portage/\fR.
375 .RS
376 @@ -1643,7 +1643,7 @@ for \fB/etc/portage/repos.conf\fR.
377 .TP
378 .BR sets
379 A directory containing package set configuration files. Also see
380 -\fB/etc/portage/sets.conf\fR and \fB/usr/portage/sets.conf\fR, both of
381 +\fB/etc/portage/sets.conf\fR and \fB/var/db/repos/gentoo/sets.conf\fR, both of
382 which override values set here. Default set configurations are installed
383 in \fB/usr/share/portage/config/sets/portage.conf\fR.
384 .RE
385 diff --git a/man/quickpkg.1 b/man/quickpkg.1
386 index 06a1f0b6e..9ed366878 100644
387 --- a/man/quickpkg.1
388 +++ b/man/quickpkg.1
389 @@ -17,7 +17,7 @@ modified since they were first installed.
390 .br
391 The packages, after being created, will be placed in \fBPKGDIR\fR.
392 This variable is defined in \fBmake.conf\fR(5) and defaults to
393 -/usr/portage/packages.
394 +/var/cache/binpkgs.
395 .SH OPTIONS
396 .TP
397 .B <list of packages or package\-sets>
398 diff --git a/repoman/lib/repoman/__init__.py b/repoman/lib/repoman/__init__.py
399 index 89779b95c..d1312a267 100644
400 --- a/repoman/lib/repoman/__init__.py
401 +++ b/repoman/lib/repoman/__init__.py
402 @@ -14,7 +14,7 @@ except ImportError as e:
403 sys.stderr.write("!!! Failed to complete portage imports. There are internal modules for\n")
404 sys.stderr.write("!!! portage and failure here indicates that you have a problem with your\n")
405 sys.stderr.write("!!! installation of portage. Please try a rescue portage located in the\n")
406 - sys.stderr.write("!!! portage tree under '/usr/portage/sys-apps/portage/files/' (default).\n")
407 + sys.stderr.write("!!! portage tree under '/var/db/repos/gentoo/sys-apps/portage/files/' (default).\n")
408 sys.stderr.write("!!! There is a README.RESCUE file that details the steps required to perform\n")
409 sys.stderr.write("!!! a recovery of portage.\n")
410 sys.stderr.write(" "+str(e)+"\n\n")
411 diff --git a/repoman/lib/repoman/checks/herds/herdbase.py b/repoman/lib/repoman/checks/herds/herdbase.py
412 index ebe6a19b4..1e7c0b27c 100644
413 --- a/repoman/lib/repoman/checks/herds/herdbase.py
414 +++ b/repoman/lib/repoman/checks/herds/herdbase.py
415 @@ -119,7 +119,7 @@ def get_herd_base(repoman_settings):
416
417
418 if __name__ == '__main__':
419 - h = make_herd_base('/usr/portage/metadata/herds.xml')
420 + h = make_herd_base('/var/db/repos/gentoo/metadata/herds.xml')
421
422 assert(h.known_herd('sound'))
423 assert(not h.known_herd('media-sound'))
424 --
425 2.16.4

Replies