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