On Sun, 5 Aug 2018 22:32:34 -0700
Zac Medico <zmed...@gentoo.org> wrote:
> Update all relevant references in docs, messages, and comments
> to refer to /var/db/repos/gentoo instead of /usr/portage. Also
> update DISTDIR and PKGDIR references to refer to the new
> /var/cache/{distfiles,binpkgs} locations.
>
> Bug: https://bugs.gentoo.org/378603
> ---
> [PATCH 2/2 v2] fixes DISTDIR and PKGDIR references to rever to the
> new /var/cache/{distfiles,binpkgs} locations
>
> cnf/make.conf.example | 12 +++++------
> lib/portage/__init__.py | 2 +-
> lib/portage/cache/flat_hash.py | 2 +-
> lib/portage/tests/news/test_NewsItem.py | 2 +-
> lib/portage/tests/resolver/ResolverPlayground.py | 2 +-
> lib/portage/xml/metadata.py | 4 ++--
> man/ebuild.5 | 4 ++--
> man/emerge.1 | 6 +++---
> man/make.conf.5 | 20
> +++++++++--------- man/portage.5 |
> 26 ++++++++++++------------
> man/quickpkg.1 | 2 +-
> repoman/lib/repoman/__init__.py | 2 +-
> repoman/lib/repoman/checks/herds/herdbase.py | 2 +- 13 files
> changed, 43 insertions(+), 43 deletions(-)
>
> diff --git a/cnf/make.conf.example b/cnf/make.conf.example
> index 04f3a0274..c16f2afbd 100644
> --- a/cnf/make.conf.example
> +++ b/cnf/make.conf.example
> @@ -14,7 +14,7 @@
> # https://wiki.gentoo.org/wiki/Handbook:X86/Working/USE
> #
> # The available list of use flags with descriptions is in your
> portage tree. -# Use 'less' to view them: -->
> less /usr/portage/profiles/use.desc <-- +# Use 'less' to view them:
> --> less /var/db/repos/gentoo/profiles/use.desc <-- #
> # 'ufed' is an ncurses/dialog interface available in portage to make
> handling # useflags for you. 'emerge app-portage/ufed'
> @@ -111,7 +111,7 @@
> # will protect the default locations of DISTDIR and PKGDIR, but
> users are # warned that any other locations inside PORTDIR are
> not necessarily safe # for data storage.
> -#PORTDIR=/usr/portage
> +#PORTDIR=/var/db/repos/gentoo
> #
> # DISTDIR is where all of the source code tarballs will be placed for
> # emerges. After packages are built, it is safe to remove any and
> @@ -119,16 +119,16 @@
> # fetched on demand for a given build. If you would like to
> # selectively prune obsolete files from this directory, see
> # eclean from the gentoolkit package. Note that locations under
> -# /usr/portage are not necessarily safe for data storage. See the
> +# /var/db/repos/gentoo are not necessarily safe for data
> storage. See the # PORTDIR documentation for more information.
> -#DISTDIR=/usr/portage/distfiles
> +#DISTDIR=/var/cache/distfiles
> #
> # PKGDIR is the location of binary packages that you can have created
> # with '--buildpkg' or '-b' while emerging a package. This can
> get # up to several hundred megs, or even a few gigs. Note that
> -# locations under /usr/portage are not necessarily safe for data
> +# locations under /var/db/repos/gentoo are not necessarily safe
> for data # storage. See the PORTDIR documentation for more
> information. -#PKGDIR=/usr/portage/packages
> +#PKGDIR=/var/cache/binpkgs
> #
> # PORT_LOGDIR is the location where portage will store all the logs
> it # creates from each individual merge. They are stored as
> diff --git a/lib/portage/__init__.py b/lib/portage/__init__.py
> index 166bfc700..61a240100 100644
> --- a/lib/portage/__init__.py
> +++ b/lib/portage/__init__.py
> @@ -133,7 +133,7 @@ except ImportError as e:
> sys.stderr.write("!!! Failed to complete portage imports.
> There are internal modules for\n") sys.stderr.write("!!! portage and
> failure here indicates that you have a problem with your\n")
> sys.stderr.write("!!! installation of portage. Please try a rescue
> portage located in the\n")
> - sys.stderr.write("!!! portage tree under
> '/usr/portage/sys-apps/portage/files/' (default).\n")
> + sys.stderr.write("!!! portage tree under
> '/var/db/repos/gentoo/sys-apps/portage/files/' (default).\n")
This should also get updated replacing "portage tree" with "gentoo
tree"
...
> The packages, after being created, will be placed in \fBPKGDIR\fR.
> This variable is defined in \fBmake.conf\fR(5) and defaults to
> -/usr/portage/packages.
> +/var/cache/binpkgs.
> .SH OPTIONS
> .TP
> .B <list of packages or package\-sets>
> diff --git a/repoman/lib/repoman/__init__.py
> b/repoman/lib/repoman/__init__.py index 89779b95c..d1312a267 100644
> --- a/repoman/lib/repoman/__init__.py
> +++ b/repoman/lib/repoman/__init__.py
> @@ -14,7 +14,7 @@ except ImportError as e:
> sys.stderr.write("!!! Failed to complete portage imports.
> There are internal modules for\n") sys.stderr.write("!!! portage and
> failure here indicates that you have a problem with your\n")
> sys.stderr.write("!!! installation of portage. Please try a rescue
> portage located in the\n")
> - sys.stderr.write("!!! portage tree under
> '/usr/portage/sys-apps/portage/files/' (default).\n")
> + sys.stderr.write("!!! portage tree under
> '/var/db/repos/gentoo/sys-apps/portage/files/' (default).\n")
same again here replace "portage tree" with "gentoo tree"
> sys.stderr.write("!!! There is a README.RESCUE file that details the
> steps required to perform\n") sys.stderr.write("!!! a recovery of
> portage.\n") sys.stderr.write(" "+str(e)+"\n\n") diff --git
> a/repoman/lib/repoman/checks/herds/herdbase.py
> b/repoman/lib/repoman/checks/herds/herdbase.py index
> ebe6a19b4..1e7c0b27c 100644 ---
> a/repoman/lib/repoman/checks/herds/herdbase.py +++
> b/repoman/lib/repoman/checks/herds/herdbase.py @@ -119,7 +119,7 @@
> def get_herd_base(repoman_settings):
> if __name__ == '__main__':
> - h = make_herd_base('/usr/portage/metadata/herds.xml')
> + h = make_herd_base('/var/db/repos/gentoo/metadata/herds.xml')
>
> assert(h.known_herd('sound'))
> assert(not h.known_herd('media-sound'))
Has it been long enough since herds are removed from gentoo that we
can drop the herds code completey? but otherwise the change itself is
fine.
