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

12 files changed, 12 insertions, 12 deletions

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()