[gentoo-commits] proj/portage:master commit in: bin/, lib/portage/dbapi/, lib/_emerge/, cnf/, lib/portage/sync/modules/rsync/, /, ...

[gentoo-commits] proj/portage:master commit in: bin/, lib/portage/dbapi/, lib/_emerge/, cnf/, lib/portage/sync/modules/rsync/, /, ...

[Zac Medico]

commit:     3f462e983b2e08107e0f7e4a2753d8deca4ac62a
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Aug  6 23:38:55 2018 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Aug  6 23:38:55 2018 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=3f462e98

Refer to "ebuild repository" rather than "portage tree"

 README                                      |  4 ++--
 bin/ebuild                                  |  2 +-
 bin/ebuild.sh                               |  2 +-
 cnf/make.conf.example                       |  8 ++++----
 lib/_emerge/actions.py                      |  2 +-
 lib/_emerge/create_world_atom.py            |  2 +-
 lib/_emerge/depgraph.py                     |  2 +-
 lib/_emerge/search.py                       |  2 +-
 lib/portage/__init__.py                     |  2 +-
 lib/portage/_global_updates.py              |  2 +-
 lib/portage/dbapi/porttree.py               |  2 +-
 lib/portage/dbapi/vartree.py                |  2 +-
 lib/portage/emaint/modules/merges/merges.py |  2 +-
 lib/portage/news.py                         |  2 +-
 lib/portage/package/ebuild/config.py        |  2 +-
 lib/portage/sync/modules/rsync/rsync.py     |  2 +-
 man/emerge.1                                | 10 +++++-----
 man/make.conf.5                             |  2 +-
 man/portage.5                               |  6 +++---
 repoman/README                              |  2 +-
 repoman/lib/repoman/__init__.py             |  2 +-
 repoman/lib/repoman/utilities.py            |  2 +-
 repoman/man/repoman.1                       |  2 +-
 23 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/README b/README
index 311d036f4..cae987242 100644
--- a/README
+++ b/README
@@ -3,8 +3,8 @@ About Portage
 
 Portage is a package management system based on ports collections. The
 Package Manager Specification Project (PMS) standardises and documents
-the behaviour of Portage so that the Portage tree can be used by other
-package managers.
+the behaviour of Portage so that ebuild repositories can be used by
+other package managers.
 
 
 Dependencies

diff --git a/bin/ebuild b/bin/ebuild
index a49e28b99..5aa3ead95 100755
--- a/bin/ebuild
+++ b/bin/ebuild
@@ -143,7 +143,7 @@ if not os.path.isabs(ebuild):
 		mycwd = portage.normalize_path(pwd)
 	ebuild = os.path.join(mycwd, ebuild)
 ebuild = portage.normalize_path(ebuild)
-# portdbapi uses the canonical path for the base of the portage tree, but
+# portdbapi uses the canonical path for the base of the ebuild repository, but
 # subdirectories of the base can be built from symlinks (like crossdev does).
 ebuild_portdir = os.path.realpath(
 	os.path.dirname(os.path.dirname(os.path.dirname(ebuild))))

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 98ed570c2..5491c4f58 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -279,7 +279,7 @@ inherit() {
 		then
 			# This is disabled in the *rm phases because they frequently give
 			# false alarms due to INHERITED in /var/db/pkg being outdated
-			# in comparison the the eclasses from the portage tree. It's
+			# in comparison to the eclasses from the ebuild repository. It's
 			# disabled for nofetch, since that can be called by repoman and
 			# that triggers bug #407449 due to repoman not exporting
 			# non-essential variables such as INHERITED.

diff --git a/cnf/make.conf.example b/cnf/make.conf.example
index 04f3a0274..36fc9a8e4 100644
--- a/cnf/make.conf.example
+++ b/cnf/make.conf.example
@@ -13,7 +13,7 @@
 # very extensive set of USE variables described in our USE variable HOWTO at
 # https://wiki.gentoo.org/wiki/Handbook:X86/Working/USE
 #
-# The available list of use flags with descriptions is in your portage tree.
+# The available list of use flags with descriptions is in the ebuild repository.
 # Use 'less' to view them:  --> less /usr/portage/profiles/use.desc <--
 #
 # 'ufed' is an ncurses/dialog interface available in portage to make handling
@@ -102,7 +102,7 @@
 #     the application being installed.
 #PORTAGE_TMPDIR=/var/tmp
 #
-# PORTDIR is the location of the portage tree. This is the repository
+# PORTDIR is the location of the ebuild repository. This is the repository
 #     for all profile information as well as all ebuilds. If you change
 #     this, you must update your /etc/portage/make.profile symlink accordingly.
 #     ***Warning***
@@ -193,7 +193,7 @@
 # Synchronizing Portage
 # =====================
 #
-# Each of these settings affects how Gentoo synchronizes your Portage tree.
+# Each of these settings affects how Gentoo synchronizes the ebuild repository.
 # Synchronization is handled by rsync and these settings allow some control
 # over how it is done.
 #
@@ -220,7 +220,7 @@
 #SYNC="rsync://rsync.gentoo.org/gentoo-portage"
 #
 # PORTAGE_RSYNC_RETRIES sets the number of times portage will attempt to retrieve
-#     a current portage tree before it exits with an error. This allows
+#     a current ebuild repository before it exits with an error. This allows
 #     for a more successful retrieval without user intervention most times.
 #     If set to a negative number, then retry until all possible addresses are
 #     exhausted.

diff --git a/lib/_emerge/actions.py b/lib/_emerge/actions.py
index f7232341d..46cb02791 100644
--- a/lib/_emerge/actions.py
+++ b/lib/_emerge/actions.py
@@ -985,7 +985,7 @@ def calc_depclean(settings, trees, ldpath_mtimes,
 			msg.append("")
 			msg.extend(textwrap.wrap(
 				"Also, note that it may be necessary to manually uninstall " + \
-				"packages that no longer exist in the portage tree, since " + \
+				"packages that no longer exist in the repository, since " + \
 				"it may not be possible to satisfy their dependencies.", 65
 			))
 			if action == "prune":

diff --git a/lib/_emerge/create_world_atom.py b/lib/_emerge/create_world_atom.py
index 947f8088a..c5e1f58be 100644
--- a/lib/_emerge/create_world_atom.py
+++ b/lib/_emerge/create_world_atom.py
@@ -67,7 +67,7 @@ def create_world_atom(pkg, args_set, root_config, before_install=False):
 		#    unknown value, so just record an unslotted atom.
 		#
 		# 2) SLOT comes from an installed package and there is no
-		#    matching SLOT in the portage tree.
+		#    matching SLOT in the ebuild repository.
 		#
 		# Make sure that the slot atom is available in either the
 		# portdb or the vardb, since otherwise the user certainly

diff --git a/lib/_emerge/depgraph.py b/lib/_emerge/depgraph.py
index b63d4f242..63e905cdb 100644
--- a/lib/_emerge/depgraph.py
+++ b/lib/_emerge/depgraph.py
@@ -4007,7 +4007,7 @@ class depgraph(object):
 				pkgdir = os.path.dirname(ebuild_path)
 				tree_root = os.path.dirname(os.path.dirname(pkgdir))
 				cp = pkgdir[len(tree_root)+1:]
-				error_msg = ("\n\n!!! '%s' is not in a valid portage tree "
+				error_msg = ("\n\n!!! '%s' is not in a valid ebuild repository "
 					"hierarchy or does not exist\n") % x
 				if not portage.isvalidatom(cp):
 					writemsg(error_msg, noiselevel=-1)

diff --git a/lib/_emerge/search.py b/lib/_emerge/search.py
index eb52b2ca3..be639dfa3 100644
--- a/lib/_emerge/search.py
+++ b/lib/_emerge/search.py
@@ -104,7 +104,7 @@ class search(object):
 		for db in self._dbs:
 			if db is not self._portdb:
 				# We don't want findname to return anything
-				# unless it's an ebuild in a portage tree.
+				# unless it's an ebuild in a repository.
 				# Otherwise, it's already built and we don't
 				# care about it.
 				continue

diff --git a/lib/portage/__init__.py b/lib/portage/__init__.py
index 166bfc700..053d197b5 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("!!! ebuild repository under '/usr/portage/sys-apps/portage/files/' (default).\n")
 	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/lib/portage/_global_updates.py b/lib/portage/_global_updates.py
index 81ee484ee..6a595da56 100644
--- a/lib/portage/_global_updates.py
+++ b/lib/portage/_global_updates.py
@@ -22,7 +22,7 @@ def _global_updates(trees, prev_mtimes, quiet=False, if_mtime_changed=True):
 	This simply returns if ROOT != "/" (when len(trees) != 1). If ROOT != "/"
 	then the user should instead use emaint --fix movebin and/or moveinst.
 
-	@param trees: A dictionary containing portage trees.
+	@param trees: A dictionary containing package databases.
 	@type trees: dict
 	@param prev_mtimes: A dictionary containing mtimes of files located in
 		$PORTDIR/profiles/updates/.

diff --git a/lib/portage/dbapi/porttree.py b/lib/portage/dbapi/porttree.py
index 677452273..aa8b50a57 100644
--- a/lib/portage/dbapi/porttree.py
+++ b/lib/portage/dbapi/porttree.py
@@ -239,7 +239,7 @@ class portdbapi(dbapi):
 		# This is used as sanity check for aux_get(). If there is no
 		# root eclass dir, we assume that PORTDIR is invalid or
 		# missing. This check allows aux_get() to detect a missing
-		# portage tree and return early by raising a KeyError.
+		# repository and return early by raising a KeyError.
 		self._have_root_eclass_dir = os.path.isdir(
 			os.path.join(self.settings.repositories.mainRepoLocation(), "eclass"))
 

diff --git a/lib/portage/dbapi/vartree.py b/lib/portage/dbapi/vartree.py
index a104306eb..c16fdfe88 100644
--- a/lib/portage/dbapi/vartree.py
+++ b/lib/portage/dbapi/vartree.py
@@ -2175,7 +2175,7 @@ class dblink(object):
 							"removal phases to execute successfully. "
 							"The ebuild will be "
 							"sourced and the eclasses "
-							"from the current portage tree will be used "
+							"from the current ebuild repository will be used "
 							"when necessary. Removal of "
 							"the ebuild file will cause the "
 							"pkg_prerm() and pkg_postrm() removal "

diff --git a/lib/portage/emaint/modules/merges/merges.py b/lib/portage/emaint/modules/merges/merges.py
index 416a725ff..e166150f4 100644
--- a/lib/portage/emaint/modules/merges/merges.py
+++ b/lib/portage/emaint/modules/merges/merges.py
@@ -182,7 +182,7 @@ class MergesHandler(object):
 					% pkg_atom)
 			if not portdb.cpv_exists(pkg_name):
 				pkg_invalid_entries.add(
-					"'%s' does not exist in the portage tree." % pkg_name)
+					"'%s' does not exist in the ebuild repository." % pkg_name)
 			pkg_atoms.add(pkg_atom)
 
 

diff --git a/lib/portage/news.py b/lib/portage/news.py
index d4f1429b2..8397646b0 100644
--- a/lib/portage/news.py
+++ b/lib/portage/news.py
@@ -393,7 +393,7 @@ def count_unread_news(portdb, vardb, repos=None, update=True):
 	By default, this will scan all repos and check for new items that have
 	appeared since the last scan.
 
-	@param portdb: a portage tree database
+	@param portdb: an ebuild database
 	@type portdb: pordbapi
 	@param vardb: an installed package database
 	@type vardb: vardbapi

diff --git a/lib/portage/package/ebuild/config.py b/lib/portage/package/ebuild/config.py
index 37c5c6656..3e0081829 100644
--- a/lib/portage/package/ebuild/config.py
+++ b/lib/portage/package/ebuild/config.py
@@ -1124,7 +1124,7 @@ class config(object):
 		archlist = self.archlist()
 		if not archlist:
 			writemsg(_("--- 'profiles/arch.list' is empty or "
-				"not available. Empty portage tree?\n"), noiselevel=1)
+				"not available. Empty ebuild repository?\n"), noiselevel=1)
 		else:
 			for group in groups:
 				if group not in archlist and \

diff --git a/lib/portage/sync/modules/rsync/rsync.py b/lib/portage/sync/modules/rsync/rsync.py
index 56e38631e..e0748794a 100644
--- a/lib/portage/sync/modules/rsync/rsync.py
+++ b/lib/portage/sync/modules/rsync/rsync.py
@@ -352,7 +352,7 @@ class RsyncSync(NewBase):
 				if (retries==0):
 					if "--ask" in opts:
 						uq = UserQuery(opts)
-						if uq.query("Do you want to sync your Portage tree " + \
+						if uq.query("Do you want to sync your ebuild repository " + \
 							"with the mirror at\n" + blue(dosyncuri) + bold("?"),
 							enter_invalid) == "No":
 							print()

diff --git a/man/emerge.1 b/man/emerge.1
index f53ba92f5..08d23388d 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -22,7 +22,7 @@ emerge \- Command\-line interface to the Portage system
 \fBemerge\fR is the definitive command\-line interface to the Portage
 system.  It is primarily used for installing packages, and \fBemerge\fR
 can automatically handle any dependencies that the desired package has.
-\fBemerge\fR can also update the \fBportage tree\fR, making new and
+\fBemerge\fR can also update the \fBebuild repository\fR, making new and
 updated packages available.  \fBemerge\fR gracefully handles updating
 installed packages to newer releases as well.  It handles both source
 and binary packages, and it can be used to create binary packages for
@@ -198,7 +198,7 @@ the emerge output of the next \-\-depclean run carefully! Use
 .TP
 .BR \-\-regen
 Causes portage to check and update the dependency cache of all ebuilds in the
-portage tree.  The cache is used to speed up searches and the building of
+repository.  The cache is used to speed up searches and the building of
 dependency trees.  This command is not recommended for rsync users as rsync
 updates the cache using server\-side caches.  If you do not know the
 differences between a 'rsync user' and some other user, then you are a 'rsync
@@ -227,7 +227,7 @@ explicitly discarded by running `emaint \-\-fix cleanresume` (see
 \fBemaint\fR(1)).
 .TP
 .BR \-\-search ", " \-s
-Searches for matches of the supplied string in the portage tree.
+Searches for matches of the supplied string in the ebuild repository.
 By default emerge uses a case-insensitive simple search, but you can
 enable a regular expression search by prefixing the search string with %.
 For example, \fBemerge \-\-search "%^kde"\fR searches for any package whose
@@ -264,7 +264,7 @@ more information about sync operations.
 
 \fBNOTE:\fR
 The \fBemerge\-webrsync\fR program will download the entire
-portage tree as a tarball, which is much faster than emerge
+ebuild repository as a tarball, which is much faster than emerge
 \-\-sync for first time syncs.
 
 .TP
@@ -1230,7 +1230,7 @@ You should almost always precede any package install or update attempt with a
 \fB\-\-pretend\fR install or update.  This lets you see how much will be
 done, and shows you any blocking packages that you will have to rectify.
 This goes doubly so for the \fBsystem\fR and \fBworld\fR sets, which can
-update a large number of packages if the portage tree has been particularly
+update a large number of packages if the ebuild repository has been particularly
 active.
 .LP
 You also want to typically use \fB\-\-update\fR, which ignores packages that

diff --git a/man/make.conf.5 b/man/make.conf.5
index a4e33923c..a33929143 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -1101,7 +1101,7 @@ Defaults to /usr/portage/rpm.
 .TP
 \fBSYNC\fR = \fI[RSYNC]\fR
 Insert your preferred rsync mirror here.  This rsync server
-is used to sync the local portage tree when `emerge \-\-sync` is run.
+is used to sync the local ebuild repository when `emerge \-\-sync` is run.
 
 Note that the \fBSYNC\fR variable is now deprecated, and instead the
 sync\-type and sync\-uri attributes in repos.conf should be used. See

diff --git a/man/portage.5 b/man/portage.5
index cd9d5036d..c3c610a6c 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -214,7 +214,7 @@ More reading:
 .TP
 \fB/etc/portage/make.profile/\fR or \fB/etc/make.profile/\fR
 This is usually just a symlink to the correct profile in
-\fB/usr/portage/profiles/\fR.  Since it is part of the portage tree, it
+\fB/usr/portage/profiles/\fR.  Since it is part of the ebuild repository, it
 may easily be updated/regenerated by running `emerge \-\-sync`.  It defines
 what a profile is (usually arch specific stuff).  If you need a custom
 profile, then you should make your own \fBmake.profile\fR
@@ -1666,13 +1666,13 @@ again.
 All installed package information is recorded here.  If portage thinks you have
 a package installed, it is usually because it is listed here.
 
-The format follows somewhat closely that of the portage tree.  There is a
+The format follows somewhat closely that of the ebuild repository. There is a
 directory for each category and a package-version subdirectory for each package
 you have installed.
 
 Inside each package directory are misc files that describe the installed
 contents of the package as well as build time information (so that the package
-can be unmerged without needing the portage tree).
+can be unmerged without needing the ebuild repository).
 
 The exact file contents and format are not described here again so that things
 can be changed quickly.  Generally though there is one file per environment

diff --git a/repoman/README b/repoman/README
index 5e78842c9..f0976e841 100644
--- a/repoman/README
+++ b/repoman/README
@@ -3,7 +3,7 @@ About Portage
 
 Portage is a package management system based on ports collections. The
 Package Manager Specification Project (PMS) standardises and documents
-the behaviour of Portage so that the Portage tree can be used by other
+the behaviour of Portage so that ebuild repositories can be used by other
 package managers.
 
 

diff --git a/repoman/lib/repoman/__init__.py b/repoman/lib/repoman/__init__.py
index 89779b95c..301b34309 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("!!! ebuild repository under '/usr/portage/sys-apps/portage/files/' (default).\n")
 	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/utilities.py b/repoman/lib/repoman/utilities.py
index 1272f3fb6..790d5e516 100644
--- a/repoman/lib/repoman/utilities.py
+++ b/repoman/lib/repoman/utilities.py
@@ -256,7 +256,7 @@ def FindPortdir(settings):
 	pwd = _unicode_decode(os.environ.get('PWD', ''), encoding=_encodings['fs'])
 	if pwd and pwd != location and os.path.realpath(pwd) == location:
 		# getcwd() returns the canonical path but that makes it hard for repoman to
-		# orient itself if the user has symlinks in their portage tree structure.
+		# orient itself if the user has symlinks in their repository structure.
 		# We use os.environ["PWD"], if available, to get the non-canonical path of
 		# the current working directory (from the shell).
 		location = pwd

diff --git a/repoman/man/repoman.1 b/repoman/man/repoman.1
index dea17c3b4..766146f57 100644
--- a/repoman/man/repoman.1
+++ b/repoman/man/repoman.1
@@ -1,7 +1,7 @@
 .TH "REPOMAN" "1" "Mar 2018" "Repoman VERSION" "Repoman"
 .SH NAME
 repoman \- Gentoo's program to enforce a minimal level of quality assurance in
-packages added to the portage tree
+packages added to the ebuild repository
 .SH SYNOPSIS
 \fBrepoman\fR [\fIoption\fR] [\fImode\fR]
 .SH DESCRIPTION