Rename pym→lib, for better distutils-r1 interoperability

Closes: https://github.com/gentoo/portage/pull/343

755 files changed, 41 insertions, 57 deletions

diff --git a/TEST-NOTES b/TEST-NOTES
index f9c6ab0cd2a..8be5f9cf340 100644
--- a/TEST-NOTES
+++ b/TEST-NOTES
@@ -4,7 +4,7 @@ UnitTests
 Portage has some tests that use the unittest framework that ships with python (2.3-2.4ish)
 Tests have a specific naming convention.
 
-in pym/portage/tests/ there is a runTest script that invokes pym/portage/tests/__init__.py
+in lib/portage/tests/ there is a runTest script that invokes lib/portage/tests/__init__.py
 
 This init looks at a hardcoded list of test dirs to search for tests.
 If you add a new dir and don't see your new tests, make sure that the dir is in this list.
@@ -15,14 +15,14 @@ you should have files of the form test_${function}.py.
 
 So if I was to write a vercmp test, and vercmp is in portage_versions.
 
-pym/portage/tests/portage_versions/test_vercmp.py
+lib/portage/tests/portage_versions/test_vercmp.py
 
 would be the filename.
 
 The __init__.py file now does recursive tests, but you need to tell it so.  For example, if
 you had cache tests the dir format would be something like...
 
-pym/portage/tests/cache/flat_hash/test_foo.py
+lib/portage/tests/cache/flat_hash/test_foo.py
 
 and you would put "cache/flat_hash" into the testDirs variable in __init__.py.
 
diff --git a/bin/archive-conf b/bin/archive-conf
index 59350a0f898..8341ffe739a 100755
--- a/bin/archive-conf
+++ b/bin/archive-conf
@@ -15,7 +15,7 @@ import sys
 
 from os import path as osp
 if osp.isfile(osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), ".portage_not_installed")):
-	sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
+	sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "lib"))
 import portage
 portage._internal_caller = True
 
diff --git a/bin/binhost-snapshot b/bin/binhost-snapshot
index 4130e75ae0a..d677e75682b 100755
--- a/bin/binhost-snapshot
+++ b/bin/binhost-snapshot
@@ -15,7 +15,7 @@ except ImportError:
 
 from os import path as osp
 if osp.isfile(osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), ".portage_not_installed")):
-	sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
+	sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "lib"))
 import portage
 portage._internal_caller = True
 
diff --git a/bin/clean_locks b/bin/clean_locks
index fb245972f38..94ba4c6066f 100755
--- a/bin/clean_locks
+++ b/bin/clean_locks
@@ -7,7 +7,7 @@ from __future__ import print_function
 import sys, errno
 from os import path as osp
 if osp.isfile(osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), ".portage_not_installed")):
-	sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
+	sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "lib"))
 import portage
 portage._internal_caller = True
 
diff --git a/bin/dispatch-conf b/bin/dispatch-conf
index 49e7774bfce..32a0a731ef6 100755
--- a/bin/dispatch-conf
+++ b/bin/dispatch-conf
@@ -24,7 +24,7 @@ from random import random
 
 from os import path as osp
 if osp.isfile(osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), ".portage_not_installed")):
-	sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
+	sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "lib"))
 import portage
 portage._internal_caller = True
 from portage import os, shutil
diff --git a/bin/ebuild b/bin/ebuild
index 710257549ec..a49e28b99cc 100755
--- a/bin/ebuild
+++ b/bin/ebuild
@@ -42,7 +42,7 @@ import io
 import os
 from os import path as osp
 if osp.isfile(osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), ".portage_not_installed")):
-	sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
+	sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "lib"))
 import portage
 portage._internal_caller = True
 from portage import os
diff --git a/bin/ebuild-ipc.py b/bin/ebuild-ipc.py
index 1f323bdc559..d68d3f05eaf 100755
--- a/bin/ebuild-ipc.py
+++ b/bin/ebuild-ipc.py
@@ -26,7 +26,7 @@ else:
 signal.signal(debug_signum, debug_signal)
 
 if os.path.isfile(os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), ".portage_not_installed")):
-	pym_paths = [os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), "pym")]
+	pym_paths = [os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), "lib")]
 	sys.path.insert(0, pym_paths[0])
 else:
 	import distutils.sysconfig
diff --git a/bin/egencache b/bin/egencache
index 70fb5aa0090..d172319f82a 100755
--- a/bin/egencache
+++ b/bin/egencache
@@ -44,7 +44,7 @@ import re
 
 from os import path as osp
 if osp.isfile(osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), ".portage_not_installed")):
-	sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
+	sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "lib"))
 import portage
 portage._internal_caller = True
 from portage import os, _encodings, _unicode_encode, _unicode_decode
diff --git a/bin/emaint b/bin/emaint
index a26dae1e7d3..df904f7c0d5 100755
--- a/bin/emaint
+++ b/bin/emaint
@@ -27,7 +27,7 @@ except KeyboardInterrupt:
 
 from os import path as osp
 if osp.isfile(osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), ".portage_not_installed")):
-	sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
+	sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "lib"))
 import portage
 portage._internal_caller = True
 from portage.emaint.main import emaint_main
diff --git a/bin/emerge b/bin/emerge
index e1262d5445f..e372f5e9e4c 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -38,7 +38,7 @@ try:
 
 	from os import path as osp
 	if osp.isfile(osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), ".portage_not_installed")):
-		sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
+		sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "lib"))
 	import portage
 	portage._internal_caller = True
 	portage._disable_legacy_globals()
diff --git a/bin/env-update b/bin/env-update
index 03fc5849f1a..2256b37f52d 100755
--- a/bin/env-update
+++ b/bin/env-update
@@ -27,7 +27,7 @@ if len(sys.argv) > 1:
 
 from os import path as osp
 if osp.isfile(osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), ".portage_not_installed")):
-	sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
+	sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "lib"))
 import portage
 portage._internal_caller = True
 
diff --git a/bin/fixpackages b/bin/fixpackages
index 70ca9fc904a..a291e013da1 100755
--- a/bin/fixpackages
+++ b/bin/fixpackages
@@ -10,7 +10,7 @@ import sys
 
 from os import path as osp
 if osp.isfile(osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), ".portage_not_installed")):
-	sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
+	sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "lib"))
 import portage
 portage._internal_caller = True
 from portage import os
diff --git a/bin/glsa-check b/bin/glsa-check
index afc8eb84b2e..b5b76aae28b 100755
--- a/bin/glsa-check
+++ b/bin/glsa-check
@@ -12,7 +12,7 @@ import operator
 
 from os import path as osp
 if osp.isfile(osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), ".portage_not_installed")):
-	sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
+	sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "lib"))
 import portage
 portage._internal_caller = True
 from portage import os
diff --git a/bin/portageq b/bin/portageq
index 35499afd207..c63591a7747 100755
--- a/bin/portageq
+++ b/bin/portageq
@@ -25,7 +25,7 @@ import os
 import types
 
 if os.path.isfile(os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), ".portage_not_installed")):
-	pym_paths = [os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), "pym")]
+	pym_paths = [os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), "lib")]
 	sys.path.insert(0, pym_paths[0])
 else:
 	import distutils.sysconfig
diff --git a/bin/quickpkg b/bin/quickpkg
index f071dd90442..c28a3e38234 100755
--- a/bin/quickpkg
+++ b/bin/quickpkg
@@ -14,7 +14,7 @@ import tarfile
 
 from os import path as osp
 if osp.isfile(osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), ".portage_not_installed")):
-	sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
+	sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "lib"))
 import portage
 portage._internal_caller = True
 from portage import os
diff --git a/bin/regenworld b/bin/regenworld
index eef4cfdfa55..bedc58bdad1 100755
--- a/bin/regenworld
+++ b/bin/regenworld
@@ -7,7 +7,7 @@ from __future__ import print_function
 import sys
 from os import path as osp
 if osp.isfile(osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), ".portage_not_installed")):
-	sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
+	sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "lib"))
 import portage
 portage._internal_caller = True
 from portage import os
diff --git a/pym/_emerge/AbstractDepPriority.py b/lib/_emerge/AbstractDepPriority.py
index 1fcd043455d..1fcd043455d 100644
--- a/pym/_emerge/AbstractDepPriority.py
+++ b/lib/_emerge/AbstractDepPriority.py
diff --git a/pym/_emerge/AbstractEbuildProcess.py b/lib/_emerge/AbstractEbuildProcess.py
index bda0bd83f42..bda0bd83f42 100644
--- a/pym/_emerge/AbstractEbuildProcess.py
+++ b/lib/_emerge/AbstractEbuildProcess.py
diff --git a/pym/_emerge/AbstractPollTask.py b/lib/_emerge/AbstractPollTask.py
index 4157794c610..4157794c610 100644
--- a/pym/_emerge/AbstractPollTask.py
+++ b/lib/_emerge/AbstractPollTask.py
diff --git a/pym/_emerge/AsynchronousLock.py b/lib/_emerge/AsynchronousLock.py
index aed1bcb1569..aed1bcb1569 100644
--- a/pym/_emerge/AsynchronousLock.py
+++ b/lib/_emerge/AsynchronousLock.py
diff --git a/pym/_emerge/AsynchronousTask.py b/lib/_emerge/AsynchronousTask.py
index cf6e6dc440e..cf6e6dc440e 100644
--- a/pym/_emerge/AsynchronousTask.py
+++ b/lib/_emerge/AsynchronousTask.py
diff --git a/pym/_emerge/AtomArg.py b/lib/_emerge/AtomArg.py
index 343d7aaabd5..343d7aaabd5 100644
--- a/pym/_emerge/AtomArg.py
+++ b/lib/_emerge/AtomArg.py
diff --git a/pym/_emerge/Binpkg.py b/lib/_emerge/Binpkg.py
index 7791ec23651..7791ec23651 100644
--- a/pym/_emerge/Binpkg.py
+++ b/lib/_emerge/Binpkg.py
diff --git a/pym/_emerge/BinpkgEnvExtractor.py b/lib/_emerge/BinpkgEnvExtractor.py
index 5ba14955dc1..5ba14955dc1 100644
--- a/pym/_emerge/BinpkgEnvExtractor.py
+++ b/lib/_emerge/BinpkgEnvExtractor.py
diff --git a/pym/_emerge/BinpkgExtractorAsync.py b/lib/_emerge/BinpkgExtractorAsync.py
index 3733bdeb5b0..3733bdeb5b0 100644
--- a/pym/_emerge/BinpkgExtractorAsync.py
+++ b/lib/_emerge/BinpkgExtractorAsync.py
diff --git a/pym/_emerge/BinpkgFetcher.py b/lib/_emerge/BinpkgFetcher.py
index 36d027de3c4..36d027de3c4 100644
--- a/pym/_emerge/BinpkgFetcher.py
+++ b/lib/_emerge/BinpkgFetcher.py
diff --git a/pym/_emerge/BinpkgPrefetcher.py b/lib/_emerge/BinpkgPrefetcher.py
index 7ca8970494f..7ca8970494f 100644
--- a/pym/_emerge/BinpkgPrefetcher.py
+++ b/lib/_emerge/BinpkgPrefetcher.py
diff --git a/pym/_emerge/BinpkgVerifier.py b/lib/_emerge/BinpkgVerifier.py
index 7a6d15e8079..7a6d15e8079 100644
--- a/pym/_emerge/BinpkgVerifier.py
+++ b/lib/_emerge/BinpkgVerifier.py
diff --git a/pym/_emerge/Blocker.py b/lib/_emerge/Blocker.py
index 93046069d8e..93046069d8e 100644
--- a/pym/_emerge/Blocker.py
+++ b/lib/_emerge/Blocker.py
diff --git a/pym/_emerge/BlockerCache.py b/lib/_emerge/BlockerCache.py
index 53342d6d6f9..53342d6d6f9 100644
--- a/pym/_emerge/BlockerCache.py
+++ b/lib/_emerge/BlockerCache.py
diff --git a/pym/_emerge/BlockerDB.py b/lib/_emerge/BlockerDB.py
index 5b3b01c370b..5b3b01c370b 100644
--- a/pym/_emerge/BlockerDB.py
+++ b/lib/_emerge/BlockerDB.py
diff --git a/pym/_emerge/BlockerDepPriority.py b/lib/_emerge/BlockerDepPriority.py
index 1004a3717be..1004a3717be 100644
--- a/pym/_emerge/BlockerDepPriority.py
+++ b/lib/_emerge/BlockerDepPriority.py
diff --git a/pym/_emerge/CompositeTask.py b/lib/_emerge/CompositeTask.py
index 1edec4a1784..1edec4a1784 100644
--- a/pym/_emerge/CompositeTask.py
+++ b/lib/_emerge/CompositeTask.py
diff --git a/pym/_emerge/DepPriority.py b/lib/_emerge/DepPriority.py
index 34fdb481cff..34fdb481cff 100644
--- a/pym/_emerge/DepPriority.py
+++ b/lib/_emerge/DepPriority.py
diff --git a/pym/_emerge/DepPriorityNormalRange.py b/lib/_emerge/DepPriorityNormalRange.py
index 86395549ffe..86395549ffe 100644
--- a/pym/_emerge/DepPriorityNormalRange.py
+++ b/lib/_emerge/DepPriorityNormalRange.py
diff --git a/pym/_emerge/DepPrioritySatisfiedRange.py b/lib/_emerge/DepPrioritySatisfiedRange.py
index 391f5409bd7..391f5409bd7 100644
--- a/pym/_emerge/DepPrioritySatisfiedRange.py
+++ b/lib/_emerge/DepPrioritySatisfiedRange.py
diff --git a/pym/_emerge/Dependency.py b/lib/_emerge/Dependency.py
index 2ec860f8363..2ec860f8363 100644
--- a/pym/_emerge/Dependency.py
+++ b/lib/_emerge/Dependency.py
diff --git a/pym/_emerge/DependencyArg.py b/lib/_emerge/DependencyArg.py
index 29a0072c4ef..29a0072c4ef 100644
--- a/pym/_emerge/DependencyArg.py
+++ b/lib/_emerge/DependencyArg.py
diff --git a/pym/_emerge/EbuildBinpkg.py b/lib/_emerge/EbuildBinpkg.py
index 6e098eb8a07..6e098eb8a07 100644
--- a/pym/_emerge/EbuildBinpkg.py
+++ b/lib/_emerge/EbuildBinpkg.py
diff --git a/pym/_emerge/EbuildBuild.py b/lib/_emerge/EbuildBuild.py
index ab5a4da74be..ab5a4da74be 100644
--- a/pym/_emerge/EbuildBuild.py
+++ b/lib/_emerge/EbuildBuild.py
diff --git a/pym/_emerge/EbuildBuildDir.py b/lib/_emerge/EbuildBuildDir.py
index 477113db8fc..477113db8fc 100644
--- a/pym/_emerge/EbuildBuildDir.py
+++ b/lib/_emerge/EbuildBuildDir.py
diff --git a/pym/_emerge/EbuildExecuter.py b/lib/_emerge/EbuildExecuter.py
index d387b42becb..d387b42becb 100644
--- a/pym/_emerge/EbuildExecuter.py
+++ b/lib/_emerge/EbuildExecuter.py
diff --git a/pym/_emerge/EbuildFetcher.py b/lib/_emerge/EbuildFetcher.py
index ad5109c2859..ad5109c2859 100644
--- a/pym/_emerge/EbuildFetcher.py
+++ b/lib/_emerge/EbuildFetcher.py
diff --git a/pym/_emerge/EbuildFetchonly.py b/lib/_emerge/EbuildFetchonly.py
index eec2ad208dd..eec2ad208dd 100644
--- a/pym/_emerge/EbuildFetchonly.py
+++ b/lib/_emerge/EbuildFetchonly.py
diff --git a/pym/_emerge/EbuildIpcDaemon.py b/lib/_emerge/EbuildIpcDaemon.py
index d0dbe18bd76..d0dbe18bd76 100644
--- a/pym/_emerge/EbuildIpcDaemon.py
+++ b/lib/_emerge/EbuildIpcDaemon.py
diff --git a/pym/_emerge/EbuildMerge.py b/lib/_emerge/EbuildMerge.py
index bedea902daa..bedea902daa 100644
--- a/pym/_emerge/EbuildMerge.py
+++ b/lib/_emerge/EbuildMerge.py
diff --git a/pym/_emerge/EbuildMetadataPhase.py b/lib/_emerge/EbuildMetadataPhase.py
index 4940d40b61b..4940d40b61b 100644
--- a/pym/_emerge/EbuildMetadataPhase.py
+++ b/lib/_emerge/EbuildMetadataPhase.py
diff --git a/pym/_emerge/EbuildPhase.py b/lib/_emerge/EbuildPhase.py
index 4104cefa703..4104cefa703 100644
--- a/pym/_emerge/EbuildPhase.py
+++ b/lib/_emerge/EbuildPhase.py
diff --git a/pym/_emerge/EbuildProcess.py b/lib/_emerge/EbuildProcess.py
index 333ad7bd0aa..333ad7bd0aa 100644
--- a/pym/_emerge/EbuildProcess.py
+++ b/lib/_emerge/EbuildProcess.py
diff --git a/pym/_emerge/EbuildSpawnProcess.py b/lib/_emerge/EbuildSpawnProcess.py
index 26d26fc7720..26d26fc7720 100644
--- a/pym/_emerge/EbuildSpawnProcess.py
+++ b/lib/_emerge/EbuildSpawnProcess.py
diff --git a/pym/_emerge/FakeVartree.py b/lib/_emerge/FakeVartree.py
index 3f82e97e994..3f82e97e994 100644
--- a/pym/_emerge/FakeVartree.py
+++ b/lib/_emerge/FakeVartree.py
diff --git a/pym/_emerge/FifoIpcDaemon.py b/lib/_emerge/FifoIpcDaemon.py
index 0cbaa13c776..0cbaa13c776 100644
--- a/pym/_emerge/FifoIpcDaemon.py
+++ b/lib/_emerge/FifoIpcDaemon.py
diff --git a/pym/_emerge/JobStatusDisplay.py b/lib/_emerge/JobStatusDisplay.py
index b8e142af9ee..b8e142af9ee 100644
--- a/pym/_emerge/JobStatusDisplay.py
+++ b/lib/_emerge/JobStatusDisplay.py
diff --git a/pym/_emerge/MergeListItem.py b/lib/_emerge/MergeListItem.py
index 938f8014ae5..938f8014ae5 100644
--- a/pym/_emerge/MergeListItem.py
+++ b/lib/_emerge/MergeListItem.py
diff --git a/pym/_emerge/MetadataRegen.py b/lib/_emerge/MetadataRegen.py
index 8eb110a46d8..8eb110a46d8 100644
--- a/pym/_emerge/MetadataRegen.py
+++ b/lib/_emerge/MetadataRegen.py
diff --git a/pym/_emerge/MiscFunctionsProcess.py b/lib/_emerge/MiscFunctionsProcess.py
index 89fd226351f..89fd226351f 100644
--- a/pym/_emerge/MiscFunctionsProcess.py
+++ b/lib/_emerge/MiscFunctionsProcess.py
diff --git a/pym/_emerge/Package.py b/lib/_emerge/Package.py
index 5f34f3d275e..5f34f3d275e 100644
--- a/pym/_emerge/Package.py
+++ b/lib/_emerge/Package.py
diff --git a/pym/_emerge/PackageArg.py b/lib/_emerge/PackageArg.py
index ebfe4b21b5d..ebfe4b21b5d 100644
--- a/pym/_emerge/PackageArg.py
+++ b/lib/_emerge/PackageArg.py
diff --git a/pym/_emerge/PackageMerge.py b/lib/_emerge/PackageMerge.py
index 1e7b58ba386..1e7b58ba386 100644
--- a/pym/_emerge/PackageMerge.py
+++ b/lib/_emerge/PackageMerge.py
diff --git a/pym/_emerge/PackagePhase.py b/lib/_emerge/PackagePhase.py
index 107e2ca3647..107e2ca3647 100644
--- a/pym/_emerge/PackagePhase.py
+++ b/lib/_emerge/PackagePhase.py
diff --git a/pym/_emerge/PackageUninstall.py b/lib/_emerge/PackageUninstall.py
index 43210b4bc38..43210b4bc38 100644
--- a/pym/_emerge/PackageUninstall.py
+++ b/lib/_emerge/PackageUninstall.py
diff --git a/pym/_emerge/PackageVirtualDbapi.py b/lib/_emerge/PackageVirtualDbapi.py
index 26293dd98b3..26293dd98b3 100644
--- a/pym/_emerge/PackageVirtualDbapi.py
+++ b/lib/_emerge/PackageVirtualDbapi.py
diff --git a/pym/_emerge/PipeReader.py b/lib/_emerge/PipeReader.py
index 1aa5ee3bfef..1aa5ee3bfef 100644
--- a/pym/_emerge/PipeReader.py
+++ b/lib/_emerge/PipeReader.py
diff --git a/pym/_emerge/PollScheduler.py b/lib/_emerge/PollScheduler.py
index 569879b368e..569879b368e 100644
--- a/pym/_emerge/PollScheduler.py
+++ b/lib/_emerge/PollScheduler.py
diff --git a/pym/_emerge/ProgressHandler.py b/lib/_emerge/ProgressHandler.py
index f5afe6d87ec..f5afe6d87ec 100644
--- a/pym/_emerge/ProgressHandler.py
+++ b/lib/_emerge/ProgressHandler.py
diff --git a/pym/_emerge/RootConfig.py b/lib/_emerge/RootConfig.py
index 3648d01d743..3648d01d743 100644
--- a/pym/_emerge/RootConfig.py
+++ b/lib/_emerge/RootConfig.py
diff --git a/pym/_emerge/Scheduler.py b/lib/_emerge/Scheduler.py
index 422308184cc..422308184cc 100644
--- a/pym/_emerge/Scheduler.py
+++ b/lib/_emerge/Scheduler.py
diff --git a/pym/_emerge/SequentialTaskQueue.py b/lib/_emerge/SequentialTaskQueue.py
index 80908936c71..80908936c71 100644
--- a/pym/_emerge/SequentialTaskQueue.py
+++ b/lib/_emerge/SequentialTaskQueue.py
diff --git a/pym/_emerge/SetArg.py b/lib/_emerge/SetArg.py
index 5c829754760..5c829754760 100644
--- a/pym/_emerge/SetArg.py
+++ b/lib/_emerge/SetArg.py
diff --git a/pym/_emerge/SpawnProcess.py b/lib/_emerge/SpawnProcess.py
index cd535d1436b..cd535d1436b 100644
--- a/pym/_emerge/SpawnProcess.py
+++ b/lib/_emerge/SpawnProcess.py
diff --git a/pym/_emerge/SubProcess.py b/lib/_emerge/SubProcess.py
index 7d6b032725d..7d6b032725d 100644
--- a/pym/_emerge/SubProcess.py
+++ b/lib/_emerge/SubProcess.py
diff --git a/pym/_emerge/Task.py b/lib/_emerge/Task.py
index 250d45802b8..250d45802b8 100644
--- a/pym/_emerge/Task.py
+++ b/lib/_emerge/Task.py
diff --git a/pym/_emerge/TaskSequence.py b/lib/_emerge/TaskSequence.py
index 1f2ba94c266..1f2ba94c266 100644
--- a/pym/_emerge/TaskSequence.py
+++ b/lib/_emerge/TaskSequence.py
diff --git a/pym/_emerge/UninstallFailure.py b/lib/_emerge/UninstallFailure.py
index e4f28347ad7..e4f28347ad7 100644
--- a/pym/_emerge/UninstallFailure.py
+++ b/lib/_emerge/UninstallFailure.py
diff --git a/pym/_emerge/UnmergeDepPriority.py b/lib/_emerge/UnmergeDepPriority.py
index ec44a67a17e..ec44a67a17e 100644
--- a/pym/_emerge/UnmergeDepPriority.py
+++ b/lib/_emerge/UnmergeDepPriority.py
diff --git a/pym/_emerge/UseFlagDisplay.py b/lib/_emerge/UseFlagDisplay.py
index 12820e9d121..12820e9d121 100644
--- a/pym/_emerge/UseFlagDisplay.py
+++ b/lib/_emerge/UseFlagDisplay.py
diff --git a/pym/_emerge/UserQuery.py b/lib/_emerge/UserQuery.py
index e20bbc6c3ab..e20bbc6c3ab 100644
--- a/pym/_emerge/UserQuery.py
+++ b/lib/_emerge/UserQuery.py
diff --git a/pym/_emerge/__init__.py b/lib/_emerge/__init__.py
index f98c564575d..f98c564575d 100644
--- a/pym/_emerge/__init__.py
+++ b/lib/_emerge/__init__.py
diff --git a/pym/_emerge/_find_deep_system_runtime_deps.py b/lib/_emerge/_find_deep_system_runtime_deps.py
index ca09d83acce..ca09d83acce 100644
--- a/pym/_emerge/_find_deep_system_runtime_deps.py
+++ b/lib/_emerge/_find_deep_system_runtime_deps.py
diff --git a/pym/_emerge/_flush_elog_mod_echo.py b/lib/_emerge/_flush_elog_mod_echo.py
index 9ac65b8ae6d..9ac65b8ae6d 100644
--- a/pym/_emerge/_flush_elog_mod_echo.py
+++ b/lib/_emerge/_flush_elog_mod_echo.py
diff --git a/pym/_emerge/actions.py b/lib/_emerge/actions.py
index f7232341d2f..f7232341d2f 100644
--- a/pym/_emerge/actions.py
+++ b/lib/_emerge/actions.py
diff --git a/pym/_emerge/chk_updated_cfg_files.py b/lib/_emerge/chk_updated_cfg_files.py
index e5e090767b1..e5e090767b1 100644
--- a/pym/_emerge/chk_updated_cfg_files.py
+++ b/lib/_emerge/chk_updated_cfg_files.py
diff --git a/pym/_emerge/clear_caches.py b/lib/_emerge/clear_caches.py
index cb0db105bf3..cb0db105bf3 100644
--- a/pym/_emerge/clear_caches.py
+++ b/lib/_emerge/clear_caches.py
diff --git a/pym/_emerge/countdown.py b/lib/_emerge/countdown.py
index 62e3c8dead1..62e3c8dead1 100644
--- a/pym/_emerge/countdown.py
+++ b/lib/_emerge/countdown.py
diff --git a/pym/_emerge/create_depgraph_params.py b/lib/_emerge/create_depgraph_params.py
index 08605baa1fe..08605baa1fe 100644
--- a/pym/_emerge/create_depgraph_params.py
+++ b/lib/_emerge/create_depgraph_params.py
diff --git a/pym/_emerge/create_world_atom.py b/lib/_emerge/create_world_atom.py
index 947f8088abb..947f8088abb 100644
--- a/pym/_emerge/create_world_atom.py
+++ b/lib/_emerge/create_world_atom.py
diff --git a/pym/_emerge/depgraph.py b/lib/_emerge/depgraph.py
index b63d4f2429f..b63d4f2429f 100644
--- a/pym/_emerge/depgraph.py
+++ b/lib/_emerge/depgraph.py
diff --git a/pym/_emerge/emergelog.py b/lib/_emerge/emergelog.py
index aea94f74e1c..aea94f74e1c 100644
--- a/pym/_emerge/emergelog.py
+++ b/lib/_emerge/emergelog.py
diff --git a/pym/_emerge/getloadavg.py b/lib/_emerge/getloadavg.py
index 6a2794fb1c8..6a2794fb1c8 100644
--- a/pym/_emerge/getloadavg.py
+++ b/lib/_emerge/getloadavg.py
diff --git a/pym/_emerge/help.py b/lib/_emerge/help.py
index dd3a3475c0f..dd3a3475c0f 100644
--- a/pym/_emerge/help.py
+++ b/lib/_emerge/help.py
diff --git a/pym/_emerge/is_valid_package_atom.py b/lib/_emerge/is_valid_package_atom.py
index 17f7642665b..17f7642665b 100644
--- a/pym/_emerge/is_valid_package_atom.py
+++ b/lib/_emerge/is_valid_package_atom.py
diff --git a/pym/_emerge/main.py b/lib/_emerge/main.py
index e8b2c2e13eb..e8b2c2e13eb 100644
--- a/pym/_emerge/main.py
+++ b/lib/_emerge/main.py
diff --git a/pym/_emerge/post_emerge.py b/lib/_emerge/post_emerge.py
index 7e6063c527d..7e6063c527d 100644
--- a/pym/_emerge/post_emerge.py
+++ b/lib/_emerge/post_emerge.py
diff --git a/pym/_emerge/resolver/DbapiProvidesIndex.py b/lib/_emerge/resolver/DbapiProvidesIndex.py
index 1650edd4ed2..1650edd4ed2 100644
--- a/pym/_emerge/resolver/DbapiProvidesIndex.py
+++ b/lib/_emerge/resolver/DbapiProvidesIndex.py
diff --git a/pym/_emerge/resolver/__init__.py b/lib/_emerge/resolver/__init__.py
index 21a391aeecf..21a391aeecf 100644
--- a/pym/_emerge/resolver/__init__.py
+++ b/lib/_emerge/resolver/__init__.py
diff --git a/pym/_emerge/resolver/backtracking.py b/lib/_emerge/resolver/backtracking.py
index c29b9d42a3d..c29b9d42a3d 100644
--- a/pym/_emerge/resolver/backtracking.py
+++ b/lib/_emerge/resolver/backtracking.py
diff --git a/pym/_emerge/resolver/circular_dependency.py b/lib/_emerge/resolver/circular_dependency.py
index 5c119567bd5..5c119567bd5 100644
--- a/pym/_emerge/resolver/circular_dependency.py
+++ b/lib/_emerge/resolver/circular_dependency.py
diff --git a/pym/_emerge/resolver/output.py b/lib/_emerge/resolver/output.py
index 24340576c70..24340576c70 100644
--- a/pym/_emerge/resolver/output.py
+++ b/lib/_emerge/resolver/output.py
diff --git a/pym/_emerge/resolver/output_helpers.py b/lib/_emerge/resolver/output_helpers.py
index b83717e9350..b83717e9350 100644
--- a/pym/_emerge/resolver/output_helpers.py
+++ b/lib/_emerge/resolver/output_helpers.py
diff --git a/pym/_emerge/resolver/package_tracker.py b/lib/_emerge/resolver/package_tracker.py
index ccb0b11cf81..ccb0b11cf81 100644
--- a/pym/_emerge/resolver/package_tracker.py
+++ b/lib/_emerge/resolver/package_tracker.py
diff --git a/pym/_emerge/resolver/slot_collision.py b/lib/_emerge/resolver/slot_collision.py
index f676b38c84a..f676b38c84a 100644
--- a/pym/_emerge/resolver/slot_collision.py
+++ b/lib/_emerge/resolver/slot_collision.py
diff --git a/pym/_emerge/search.py b/lib/_emerge/search.py
index eb52b2ca398..eb52b2ca398 100644
--- a/pym/_emerge/search.py
+++ b/lib/_emerge/search.py
diff --git a/pym/_emerge/show_invalid_depstring_notice.py b/lib/_emerge/show_invalid_depstring_notice.py
index e11ea65edbc..e11ea65edbc 100644
--- a/pym/_emerge/show_invalid_depstring_notice.py
+++ b/lib/_emerge/show_invalid_depstring_notice.py
diff --git a/pym/_emerge/stdout_spinner.py b/lib/_emerge/stdout_spinner.py
index 670686adf75..670686adf75 100644
--- a/pym/_emerge/stdout_spinner.py
+++ b/lib/_emerge/stdout_spinner.py
diff --git a/pym/_emerge/unmerge.py b/lib/_emerge/unmerge.py
index 8923e20ea45..8923e20ea45 100644
--- a/pym/_emerge/unmerge.py
+++ b/lib/_emerge/unmerge.py
diff --git a/pym/portage/__init__.py b/lib/portage/__init__.py
index 166bfc7002c..166bfc7002c 100644
--- a/pym/portage/__init__.py
+++ b/lib/portage/__init__.py
diff --git a/pym/portage/_emirrordist/Config.py b/lib/portage/_emirrordist/Config.py
index 574a83559d0..574a83559d0 100644
--- a/pym/portage/_emirrordist/Config.py
+++ b/lib/portage/_emirrordist/Config.py
diff --git a/pym/portage/_emirrordist/DeletionIterator.py b/lib/portage/_emirrordist/DeletionIterator.py
index dff52c04250..dff52c04250 100644
--- a/pym/portage/_emirrordist/DeletionIterator.py
+++ b/lib/portage/_emirrordist/DeletionIterator.py
diff --git a/pym/portage/_emirrordist/DeletionTask.py b/lib/portage/_emirrordist/DeletionTask.py
index 7d10957face..7d10957face 100644
--- a/pym/portage/_emirrordist/DeletionTask.py
+++ b/lib/portage/_emirrordist/DeletionTask.py
diff --git a/pym/portage/_emirrordist/FetchIterator.py b/lib/portage/_emirrordist/FetchIterator.py
index 4ad79750296..4ad79750296 100644
--- a/pym/portage/_emirrordist/FetchIterator.py
+++ b/lib/portage/_emirrordist/FetchIterator.py
diff --git a/pym/portage/_emirrordist/FetchTask.py b/lib/portage/_emirrordist/FetchTask.py
index 1440b697c30..1440b697c30 100644
--- a/pym/portage/_emirrordist/FetchTask.py
+++ b/lib/portage/_emirrordist/FetchTask.py
diff --git a/pym/portage/_emirrordist/MirrorDistTask.py b/lib/portage/_emirrordist/MirrorDistTask.py
index 8eb3081c6d5..8eb3081c6d5 100644
--- a/pym/portage/_emirrordist/MirrorDistTask.py
+++ b/lib/portage/_emirrordist/MirrorDistTask.py
diff --git a/pym/portage/_emirrordist/__init__.py b/lib/portage/_emirrordist/__init__.py
index 6cde9320b3e..6cde9320b3e 100644
--- a/pym/portage/_emirrordist/__init__.py
+++ b/lib/portage/_emirrordist/__init__.py
diff --git a/pym/portage/_emirrordist/main.py b/lib/portage/_emirrordist/main.py
index b63837b2a9e..b63837b2a9e 100644
--- a/pym/portage/_emirrordist/main.py
+++ b/lib/portage/_emirrordist/main.py
diff --git a/pym/portage/_global_updates.py b/lib/portage/_global_updates.py
index 81ee484ee46..81ee484ee46 100644
--- a/pym/portage/_global_updates.py
+++ b/lib/portage/_global_updates.py
diff --git a/pym/portage/_legacy_globals.py b/lib/portage/_legacy_globals.py
index 45113d150be..45113d150be 100644
--- a/pym/portage/_legacy_globals.py
+++ b/lib/portage/_legacy_globals.py
diff --git a/pym/portage/_selinux.py b/lib/portage/_selinux.py
index 985e96628f6..985e96628f6 100644
--- a/pym/portage/_selinux.py
+++ b/lib/portage/_selinux.py
diff --git a/pym/portage/_sets/ProfilePackageSet.py b/lib/portage/_sets/ProfilePackageSet.py
index fec937391af..fec937391af 100644
--- a/pym/portage/_sets/ProfilePackageSet.py
+++ b/lib/portage/_sets/ProfilePackageSet.py
diff --git a/pym/portage/_sets/__init__.py b/lib/portage/_sets/__init__.py
index 2c9bf971592..2c9bf971592 100644
--- a/pym/portage/_sets/__init__.py
+++ b/lib/portage/_sets/__init__.py
diff --git a/pym/portage/_sets/base.py b/lib/portage/_sets/base.py
index aba29560285..aba29560285 100644
--- a/pym/portage/_sets/base.py
+++ b/lib/portage/_sets/base.py
diff --git a/pym/portage/_sets/dbapi.py b/lib/portage/_sets/dbapi.py
index 299cb8157e7..299cb8157e7 100644
--- a/pym/portage/_sets/dbapi.py
+++ b/lib/portage/_sets/dbapi.py
diff --git a/pym/portage/_sets/files.py b/lib/portage/_sets/files.py
index e045701ffc2..e045701ffc2 100644
--- a/pym/portage/_sets/files.py
+++ b/lib/portage/_sets/files.py
diff --git a/pym/portage/_sets/libs.py b/lib/portage/_sets/libs.py
index 022e076f573..022e076f573 100644
--- a/pym/portage/_sets/libs.py
+++ b/lib/portage/_sets/libs.py
diff --git a/pym/portage/_sets/profiles.py b/lib/portage/_sets/profiles.py
index bccc02e7cef..bccc02e7cef 100644
--- a/pym/portage/_sets/profiles.py
+++ b/lib/portage/_sets/profiles.py
diff --git a/pym/portage/_sets/security.py b/lib/portage/_sets/security.py
index f8dbef2beb2..f8dbef2beb2 100644
--- a/pym/portage/_sets/security.py
+++ b/lib/portage/_sets/security.py
diff --git a/pym/portage/_sets/shell.py b/lib/portage/_sets/shell.py
index 2c95845c839..2c95845c839 100644
--- a/pym/portage/_sets/shell.py
+++ b/lib/portage/_sets/shell.py
diff --git a/pym/portage/cache/__init__.py b/lib/portage/cache/__init__.py
index e7fe599f0ce..e7fe599f0ce 100644
--- a/pym/portage/cache/__init__.py
+++ b/lib/portage/cache/__init__.py
diff --git a/pym/portage/cache/anydbm.py b/lib/portage/cache/anydbm.py
index 88d85b0da25..88d85b0da25 100644
--- a/pym/portage/cache/anydbm.py
+++ b/lib/portage/cache/anydbm.py
diff --git a/pym/portage/cache/cache_errors.py b/lib/portage/cache/cache_errors.py
index 3c1f2397ec0..3c1f2397ec0 100644
--- a/pym/portage/cache/cache_errors.py
+++ b/lib/portage/cache/cache_errors.py
diff --git a/pym/portage/cache/ebuild_xattr.py b/lib/portage/cache/ebuild_xattr.py
index cc6b0624632..cc6b0624632 100644
--- a/pym/portage/cache/ebuild_xattr.py
+++ b/lib/portage/cache/ebuild_xattr.py
diff --git a/pym/portage/cache/flat_hash.py b/lib/portage/cache/flat_hash.py
index 79783245ba3..79783245ba3 100644
--- a/pym/portage/cache/flat_hash.py
+++ b/lib/portage/cache/flat_hash.py
diff --git a/pym/portage/cache/fs_template.py b/lib/portage/cache/fs_template.py
index e3c3c12c26e..e3c3c12c26e 100644
--- a/pym/portage/cache/fs_template.py
+++ b/lib/portage/cache/fs_template.py
diff --git a/pym/portage/cache/index/IndexStreamIterator.py b/lib/portage/cache/index/IndexStreamIterator.py
index 972aee11658..972aee11658 100644
--- a/pym/portage/cache/index/IndexStreamIterator.py
+++ b/lib/portage/cache/index/IndexStreamIterator.py
diff --git a/pym/portage/cache/index/__init__.py b/lib/portage/cache/index/__init__.py
index 7cd880e11d9..7cd880e11d9 100644
--- a/pym/portage/cache/index/__init__.py
+++ b/lib/portage/cache/index/__init__.py
diff --git a/pym/portage/cache/index/pkg_desc_index.py b/lib/portage/cache/index/pkg_desc_index.py
index dbcbb831348..dbcbb831348 100644
--- a/pym/portage/cache/index/pkg_desc_index.py
+++ b/lib/portage/cache/index/pkg_desc_index.py
diff --git a/pym/portage/cache/mappings.py b/lib/portage/cache/mappings.py
index 921fdaf1bc5..921fdaf1bc5 100644
--- a/pym/portage/cache/mappings.py
+++ b/lib/portage/cache/mappings.py
diff --git a/pym/portage/cache/metadata.py b/lib/portage/cache/metadata.py
index 59b25b60601..59b25b60601 100644
--- a/pym/portage/cache/metadata.py
+++ b/lib/portage/cache/metadata.py
diff --git a/pym/portage/cache/sql_template.py b/lib/portage/cache/sql_template.py
index d023b1b5d0b..d023b1b5d0b 100644
--- a/pym/portage/cache/sql_template.py
+++ b/lib/portage/cache/sql_template.py
diff --git a/pym/portage/cache/sqlite.py b/lib/portage/cache/sqlite.py
index 69150f679c2..69150f679c2 100644
--- a/pym/portage/cache/sqlite.py
+++ b/lib/portage/cache/sqlite.py
diff --git a/pym/portage/cache/template.py b/lib/portage/cache/template.py
index 8662d859f07..8662d859f07 100644
--- a/pym/portage/cache/template.py
+++ b/lib/portage/cache/template.py
diff --git a/pym/portage/cache/volatile.py b/lib/portage/cache/volatile.py
index 55167451be4..55167451be4 100644
--- a/pym/portage/cache/volatile.py
+++ b/lib/portage/cache/volatile.py
diff --git a/pym/portage/checksum.py b/lib/portage/checksum.py
index 4174638e646..4174638e646 100644
--- a/pym/portage/checksum.py
+++ b/lib/portage/checksum.py
diff --git a/pym/portage/const.py b/lib/portage/const.py
index 7f84bf0e908..7f84bf0e908 100644
--- a/pym/portage/const.py
+++ b/lib/portage/const.py
diff --git a/pym/portage/cvstree.py b/lib/portage/cvstree.py
index 87bbed8bbd7..87bbed8bbd7 100644
--- a/pym/portage/cvstree.py
+++ b/lib/portage/cvstree.py
diff --git a/pym/portage/data.py b/lib/portage/data.py
index 28d6eb79db3..28d6eb79db3 100644
--- a/pym/portage/data.py
+++ b/lib/portage/data.py
diff --git a/pym/portage/dbapi/DummyTree.py b/lib/portage/dbapi/DummyTree.py
index 6579e88e2ce..6579e88e2ce 100644
--- a/pym/portage/dbapi/DummyTree.py
+++ b/lib/portage/dbapi/DummyTree.py
diff --git a/pym/portage/dbapi/IndexedPortdb.py b/lib/portage/dbapi/IndexedPortdb.py
index 510e0278c46..510e0278c46 100644
--- a/pym/portage/dbapi/IndexedPortdb.py
+++ b/lib/portage/dbapi/IndexedPortdb.py
diff --git a/pym/portage/dbapi/IndexedVardb.py b/lib/portage/dbapi/IndexedVardb.py
index e2910b27f7e..e2910b27f7e 100644
--- a/pym/portage/dbapi/IndexedVardb.py
+++ b/lib/portage/dbapi/IndexedVardb.py
diff --git a/pym/portage/dbapi/_ContentsCaseSensitivityManager.py b/lib/portage/dbapi/_ContentsCaseSensitivityManager.py
index c479ec971b9..c479ec971b9 100644
--- a/pym/portage/dbapi/_ContentsCaseSensitivityManager.py
+++ b/lib/portage/dbapi/_ContentsCaseSensitivityManager.py
diff --git a/pym/portage/dbapi/_MergeProcess.py b/lib/portage/dbapi/_MergeProcess.py
index 371550079e1..371550079e1 100644
--- a/pym/portage/dbapi/_MergeProcess.py
+++ b/lib/portage/dbapi/_MergeProcess.py
diff --git a/pym/portage/dbapi/_SyncfsProcess.py b/lib/portage/dbapi/_SyncfsProcess.py
index 767dc20618c..767dc20618c 100644
--- a/pym/portage/dbapi/_SyncfsProcess.py
+++ b/lib/portage/dbapi/_SyncfsProcess.py
diff --git a/pym/portage/dbapi/_VdbMetadataDelta.py b/lib/portage/dbapi/_VdbMetadataDelta.py
index 7461f87c50d..7461f87c50d 100644
--- a/pym/portage/dbapi/_VdbMetadataDelta.py
+++ b/lib/portage/dbapi/_VdbMetadataDelta.py
diff --git a/pym/portage/dbapi/__init__.py b/lib/portage/dbapi/__init__.py
index 6fca6090c7b..6fca6090c7b 100644
--- a/pym/portage/dbapi/__init__.py
+++ b/lib/portage/dbapi/__init__.py
diff --git a/pym/portage/dbapi/_expand_new_virt.py b/lib/portage/dbapi/_expand_new_virt.py
index 9aa603d1149..9aa603d1149 100644
--- a/pym/portage/dbapi/_expand_new_virt.py
+++ b/lib/portage/dbapi/_expand_new_virt.py
diff --git a/pym/portage/dbapi/_similar_name_search.py b/lib/portage/dbapi/_similar_name_search.py
index b6e4a1fbe95..b6e4a1fbe95 100644
--- a/pym/portage/dbapi/_similar_name_search.py
+++ b/lib/portage/dbapi/_similar_name_search.py
diff --git a/pym/portage/dbapi/bintree.py b/lib/portage/dbapi/bintree.py
index 9c2d877e73d..9c2d877e73d 100644
--- a/pym/portage/dbapi/bintree.py
+++ b/lib/portage/dbapi/bintree.py
diff --git a/pym/portage/dbapi/cpv_expand.py b/lib/portage/dbapi/cpv_expand.py
index 70ee782457e..70ee782457e 100644
--- a/pym/portage/dbapi/cpv_expand.py
+++ b/lib/portage/dbapi/cpv_expand.py
diff --git a/pym/portage/dbapi/dep_expand.py b/lib/portage/dbapi/dep_expand.py
index 9515b7dec88..9515b7dec88 100644
--- a/pym/portage/dbapi/dep_expand.py
+++ b/lib/portage/dbapi/dep_expand.py
diff --git a/pym/portage/dbapi/porttree.py b/lib/portage/dbapi/porttree.py
index 67745227359..67745227359 100644
--- a/pym/portage/dbapi/porttree.py
+++ b/lib/portage/dbapi/porttree.py
diff --git a/pym/portage/dbapi/vartree.py b/lib/portage/dbapi/vartree.py
index a104306ebf7..a104306ebf7 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/lib/portage/dbapi/vartree.py
diff --git a/pym/portage/dbapi/virtual.py b/lib/portage/dbapi/virtual.py
index 3f7e6c221f5..3f7e6c221f5 100644
--- a/pym/portage/dbapi/virtual.py
+++ b/lib/portage/dbapi/virtual.py
diff --git a/pym/portage/debug.py b/lib/portage/debug.py
index d5a8cfbf639..193e6229144 100644
--- a/pym/portage/debug.py
+++ b/lib/portage/debug.py
@@ -33,7 +33,7 @@ class trace_handler(object):
 		for x in python_system_paths:
 			self.ignore_prefixes.append(x + os.sep)
 
-		self.trim_filename = prefix_trimmer(os.path.join(portage.const.PORTAGE_BASE_PATH, "pym") + os.sep).trim
+		self.trim_filename = prefix_trimmer(os.path.join(portage.const.PORTAGE_BASE_PATH, "lib") + os.sep).trim
 		self.show_local_lines = False
 		self.max_repr_length = 200
 
diff --git a/pym/portage/dep/__init__.py b/lib/portage/dep/__init__.py
index 26595da4753..26595da4753 100644
--- a/pym/portage/dep/__init__.py
+++ b/lib/portage/dep/__init__.py
diff --git a/pym/portage/dep/_dnf.py b/lib/portage/dep/_dnf.py
index 59657fd6a10..59657fd6a10 100644
--- a/pym/portage/dep/_dnf.py
+++ b/lib/portage/dep/_dnf.py
diff --git a/pym/portage/dep/_slot_operator.py b/lib/portage/dep/_slot_operator.py
index bae94b30aaa..bae94b30aaa 100644
--- a/pym/portage/dep/_slot_operator.py
+++ b/lib/portage/dep/_slot_operator.py
diff --git a/pym/portage/dep/dep_check.py b/lib/portage/dep/dep_check.py
index 2896e238950..2896e238950 100644
--- a/pym/portage/dep/dep_check.py
+++ b/lib/portage/dep/dep_check.py
diff --git a/pym/portage/dep/soname/SonameAtom.py b/lib/portage/dep/soname/SonameAtom.py
index a7dad973d1d..a7dad973d1d 100644
--- a/pym/portage/dep/soname/SonameAtom.py
+++ b/lib/portage/dep/soname/SonameAtom.py
diff --git a/pym/portage/dep/soname/__init__.py b/lib/portage/dep/soname/__init__.py
index 4725d3317e6..4725d3317e6 100644
--- a/pym/portage/dep/soname/__init__.py
+++ b/lib/portage/dep/soname/__init__.py
diff --git a/pym/portage/dep/soname/multilib_category.py b/lib/portage/dep/soname/multilib_category.py
index 84e018fb002..84e018fb002 100644
--- a/pym/portage/dep/soname/multilib_category.py
+++ b/lib/portage/dep/soname/multilib_category.py
diff --git a/pym/portage/dep/soname/parse.py b/lib/portage/dep/soname/parse.py
index 3f3757209f5..3f3757209f5 100644
--- a/pym/portage/dep/soname/parse.py
+++ b/lib/portage/dep/soname/parse.py
diff --git a/pym/portage/dispatch_conf.py b/lib/portage/dispatch_conf.py
index eaea5939383..eaea5939383 100644
--- a/pym/portage/dispatch_conf.py
+++ b/lib/portage/dispatch_conf.py
diff --git a/pym/portage/eapi.py b/lib/portage/eapi.py
index 158d582435e..158d582435e 100644
--- a/pym/portage/eapi.py
+++ b/lib/portage/eapi.py
diff --git a/pym/portage/eclass_cache.py b/lib/portage/eclass_cache.py
index d2d9e2710f7..d2d9e2710f7 100644
--- a/pym/portage/eclass_cache.py
+++ b/lib/portage/eclass_cache.py
diff --git a/pym/portage/elog/__init__.py b/lib/portage/elog/__init__.py
index cc086123f0b..cc086123f0b 100644
--- a/pym/portage/elog/__init__.py
+++ b/lib/portage/elog/__init__.py
diff --git a/pym/portage/elog/filtering.py b/lib/portage/elog/filtering.py
index 82181a4cb00..82181a4cb00 100644
--- a/pym/portage/elog/filtering.py
+++ b/lib/portage/elog/filtering.py
diff --git a/pym/portage/elog/messages.py b/lib/portage/elog/messages.py
index a4897d8d81f..a4897d8d81f 100644
--- a/pym/portage/elog/messages.py
+++ b/lib/portage/elog/messages.py
diff --git a/pym/portage/elog/mod_custom.py b/lib/portage/elog/mod_custom.py
index e1a5223d657..e1a5223d657 100644
--- a/pym/portage/elog/mod_custom.py
+++ b/lib/portage/elog/mod_custom.py
diff --git a/pym/portage/elog/mod_echo.py b/lib/portage/elog/mod_echo.py
index fb86547a478..fb86547a478 100644
--- a/pym/portage/elog/mod_echo.py
+++ b/lib/portage/elog/mod_echo.py
diff --git a/pym/portage/elog/mod_mail.py b/lib/portage/elog/mod_mail.py
index 086c683a69c..086c683a69c 100644
--- a/pym/portage/elog/mod_mail.py
+++ b/lib/portage/elog/mod_mail.py
diff --git a/pym/portage/elog/mod_mail_summary.py b/lib/portage/elog/mod_mail_summary.py
index 0bd67f22bd3..0bd67f22bd3 100644
--- a/pym/portage/elog/mod_mail_summary.py
+++ b/lib/portage/elog/mod_mail_summary.py
diff --git a/pym/portage/elog/mod_save.py b/lib/portage/elog/mod_save.py
index 829ec6c5e03..829ec6c5e03 100644
--- a/pym/portage/elog/mod_save.py
+++ b/lib/portage/elog/mod_save.py
diff --git a/pym/portage/elog/mod_save_summary.py b/lib/portage/elog/mod_save_summary.py
index 786f894548c..786f894548c 100644
--- a/pym/portage/elog/mod_save_summary.py
+++ b/lib/portage/elog/mod_save_summary.py
diff --git a/pym/portage/elog/mod_syslog.py b/lib/portage/elog/mod_syslog.py
index 8b26ffa1e2f..8b26ffa1e2f 100644
--- a/pym/portage/elog/mod_syslog.py
+++ b/lib/portage/elog/mod_syslog.py
diff --git a/pym/portage/emaint/__init__.py b/lib/portage/emaint/__init__.py
index 48bc6e2ae41..48bc6e2ae41 100644
--- a/pym/portage/emaint/__init__.py
+++ b/lib/portage/emaint/__init__.py
diff --git a/pym/portage/emaint/defaults.py b/lib/portage/emaint/defaults.py
index 30f36af50ab..30f36af50ab 100644
--- a/pym/portage/emaint/defaults.py
+++ b/lib/portage/emaint/defaults.py
diff --git a/pym/portage/emaint/main.py b/lib/portage/emaint/main.py
index f448d6baa80..f448d6baa80 100644
--- a/pym/portage/emaint/main.py
+++ b/lib/portage/emaint/main.py
diff --git a/pym/portage/emaint/modules/__init__.py b/lib/portage/emaint/modules/__init__.py
index f67197d9f8e..f67197d9f8e 100644
--- a/pym/portage/emaint/modules/__init__.py
+++ b/lib/portage/emaint/modules/__init__.py
diff --git a/pym/portage/emaint/modules/binhost/__init__.py b/lib/portage/emaint/modules/binhost/__init__.py
index d535b47dd33..d535b47dd33 100644
--- a/pym/portage/emaint/modules/binhost/__init__.py
+++ b/lib/portage/emaint/modules/binhost/__init__.py
diff --git a/pym/portage/emaint/modules/binhost/binhost.py b/lib/portage/emaint/modules/binhost/binhost.py
index d3df0cbce94..d3df0cbce94 100644
--- a/pym/portage/emaint/modules/binhost/binhost.py
+++ b/lib/portage/emaint/modules/binhost/binhost.py
diff --git a/pym/portage/emaint/modules/config/__init__.py b/lib/portage/emaint/modules/config/__init__.py
index e94e767e0cd..e94e767e0cd 100644
--- a/pym/portage/emaint/modules/config/__init__.py
+++ b/lib/portage/emaint/modules/config/__init__.py
diff --git a/pym/portage/emaint/modules/config/config.py b/lib/portage/emaint/modules/config/config.py
index a0d56992c2d..a0d56992c2d 100644
--- a/pym/portage/emaint/modules/config/config.py
+++ b/lib/portage/emaint/modules/config/config.py
diff --git a/pym/portage/emaint/modules/logs/__init__.py b/lib/portage/emaint/modules/logs/__init__.py
index 5b78d71ffed..5b78d71ffed 100644
--- a/pym/portage/emaint/modules/logs/__init__.py
+++ b/lib/portage/emaint/modules/logs/__init__.py
diff --git a/pym/portage/emaint/modules/logs/logs.py b/lib/portage/emaint/modules/logs/logs.py
index 97b45475d12..97b45475d12 100644
--- a/pym/portage/emaint/modules/logs/logs.py
+++ b/lib/portage/emaint/modules/logs/logs.py
diff --git a/pym/portage/emaint/modules/merges/__init__.py b/lib/portage/emaint/modules/merges/__init__.py
index 89aa758a0b0..89aa758a0b0 100644
--- a/pym/portage/emaint/modules/merges/__init__.py
+++ b/lib/portage/emaint/modules/merges/__init__.py
diff --git a/pym/portage/emaint/modules/merges/merges.py b/lib/portage/emaint/modules/merges/merges.py
index 416a725ff7c..416a725ff7c 100644
--- a/pym/portage/emaint/modules/merges/merges.py
+++ b/lib/portage/emaint/modules/merges/merges.py
diff --git a/pym/portage/emaint/modules/move/__init__.py b/lib/portage/emaint/modules/move/__init__.py
index 0dbd86b0d82..0dbd86b0d82 100644
--- a/pym/portage/emaint/modules/move/__init__.py
+++ b/lib/portage/emaint/modules/move/__init__.py
diff --git a/pym/portage/emaint/modules/move/move.py b/lib/portage/emaint/modules/move/move.py
index e9a6acb6baa..e9a6acb6baa 100644
--- a/pym/portage/emaint/modules/move/move.py
+++ b/lib/portage/emaint/modules/move/move.py
diff --git a/pym/portage/emaint/modules/resume/__init__.py b/lib/portage/emaint/modules/resume/__init__.py
index 0c86f9536ca..0c86f9536ca 100644
--- a/pym/portage/emaint/modules/resume/__init__.py
+++ b/lib/portage/emaint/modules/resume/__init__.py
diff --git a/pym/portage/emaint/modules/resume/resume.py b/lib/portage/emaint/modules/resume/resume.py
index 580643b26be..580643b26be 100644
--- a/pym/portage/emaint/modules/resume/resume.py
+++ b/lib/portage/emaint/modules/resume/resume.py
diff --git a/pym/portage/emaint/modules/sync/__init__.py b/lib/portage/emaint/modules/sync/__init__.py
index 23f3a2e37fb..23f3a2e37fb 100644
--- a/pym/portage/emaint/modules/sync/__init__.py
+++ b/lib/portage/emaint/modules/sync/__init__.py
diff --git a/pym/portage/emaint/modules/sync/sync.py b/lib/portage/emaint/modules/sync/sync.py
index ebdc362e1ca..ebdc362e1ca 100644
--- a/pym/portage/emaint/modules/sync/sync.py
+++ b/lib/portage/emaint/modules/sync/sync.py
diff --git a/pym/portage/emaint/modules/world/__init__.py b/lib/portage/emaint/modules/world/__init__.py
index eaf3e5eff9c..eaf3e5eff9c 100644
--- a/pym/portage/emaint/modules/world/__init__.py
+++ b/lib/portage/emaint/modules/world/__init__.py
diff --git a/pym/portage/emaint/modules/world/world.py b/lib/portage/emaint/modules/world/world.py
index d142c3dda34..d142c3dda34 100644
--- a/pym/portage/emaint/modules/world/world.py
+++ b/lib/portage/emaint/modules/world/world.py
diff --git a/pym/portage/env/__init__.py b/lib/portage/env/__init__.py
index 17b66d17cee..17b66d17cee 100644
--- a/pym/portage/env/__init__.py
+++ b/lib/portage/env/__init__.py
diff --git a/pym/portage/env/config.py b/lib/portage/env/config.py
index 865d8353a2c..865d8353a2c 100644
--- a/pym/portage/env/config.py
+++ b/lib/portage/env/config.py
diff --git a/pym/portage/env/loaders.py b/lib/portage/env/loaders.py
index f86988471b3..f86988471b3 100644
--- a/pym/portage/env/loaders.py
+++ b/lib/portage/env/loaders.py
diff --git a/pym/portage/env/validators.py b/lib/portage/env/validators.py
index 4d11d69fedd..4d11d69fedd 100644
--- a/pym/portage/env/validators.py
+++ b/lib/portage/env/validators.py
diff --git a/pym/portage/exception.py b/lib/portage/exception.py
index aed8beeb9ef..aed8beeb9ef 100644
--- a/pym/portage/exception.py
+++ b/lib/portage/exception.py
diff --git a/pym/portage/getbinpkg.py b/lib/portage/getbinpkg.py
index 14dc149b1d5..14dc149b1d5 100644
--- a/pym/portage/getbinpkg.py
+++ b/lib/portage/getbinpkg.py
diff --git a/pym/portage/glsa.py b/lib/portage/glsa.py
index ccf93439df2..ccf93439df2 100644
--- a/pym/portage/glsa.py
+++ b/lib/portage/glsa.py
diff --git a/pym/portage/localization.py b/lib/portage/localization.py
index b215b9cbad8..b215b9cbad8 100644
--- a/pym/portage/localization.py
+++ b/lib/portage/localization.py
diff --git a/pym/portage/locks.py b/lib/portage/locks.py
index f61e1819ad9..f61e1819ad9 100644
--- a/pym/portage/locks.py
+++ b/lib/portage/locks.py
diff --git a/pym/portage/mail.py b/lib/portage/mail.py
index 11923eea6b2..11923eea6b2 100644
--- a/pym/portage/mail.py
+++ b/lib/portage/mail.py
diff --git a/pym/portage/manifest.py b/lib/portage/manifest.py
index 4bca61e8607..4bca61e8607 100644
--- a/pym/portage/manifest.py
+++ b/lib/portage/manifest.py
diff --git a/pym/portage/metadata.py b/lib/portage/metadata.py
index 1abec5a890a..1abec5a890a 100644
--- a/pym/portage/metadata.py
+++ b/lib/portage/metadata.py
diff --git a/pym/portage/module.py b/lib/portage/module.py
index bd7c94d4eed..bd7c94d4eed 100644
--- a/pym/portage/module.py
+++ b/lib/portage/module.py
diff --git a/pym/portage/news.py b/lib/portage/news.py
index d4f1429b264..d4f1429b264 100644
--- a/pym/portage/news.py
+++ b/lib/portage/news.py
diff --git a/pym/portage/output.py b/lib/portage/output.py
index 1070d0ef39b..1070d0ef39b 100644
--- a/pym/portage/output.py
+++ b/lib/portage/output.py
diff --git a/pym/portage/package/__init__.py b/lib/portage/package/__init__.py
index 21a391aeecf..21a391aeecf 100644
--- a/pym/portage/package/__init__.py
+++ b/lib/portage/package/__init__.py
diff --git a/pym/portage/package/ebuild/__init__.py b/lib/portage/package/ebuild/__init__.py
index 21a391aeecf..21a391aeecf 100644
--- a/pym/portage/package/ebuild/__init__.py
+++ b/lib/portage/package/ebuild/__init__.py
diff --git a/pym/portage/package/ebuild/_config/KeywordsManager.py b/lib/portage/package/ebuild/_config/KeywordsManager.py
index fd0a6318df8..fd0a6318df8 100644
--- a/pym/portage/package/ebuild/_config/KeywordsManager.py
+++ b/lib/portage/package/ebuild/_config/KeywordsManager.py
diff --git a/pym/portage/package/ebuild/_config/LicenseManager.py b/lib/portage/package/ebuild/_config/LicenseManager.py
index 1d4e08207e5..1d4e08207e5 100644
--- a/pym/portage/package/ebuild/_config/LicenseManager.py
+++ b/lib/portage/package/ebuild/_config/LicenseManager.py
diff --git a/pym/portage/package/ebuild/_config/LocationsManager.py b/lib/portage/package/ebuild/_config/LocationsManager.py
index f7d7209ff4c..f7d7209ff4c 100644
--- a/pym/portage/package/ebuild/_config/LocationsManager.py
+++ b/lib/portage/package/ebuild/_config/LocationsManager.py
diff --git a/pym/portage/package/ebuild/_config/MaskManager.py b/lib/portage/package/ebuild/_config/MaskManager.py
index 40cc6e0c4c2..40cc6e0c4c2 100644
--- a/pym/portage/package/ebuild/_config/MaskManager.py
+++ b/lib/portage/package/ebuild/_config/MaskManager.py
diff --git a/pym/portage/package/ebuild/_config/UseManager.py b/lib/portage/package/ebuild/_config/UseManager.py
index 7302876abb1..7302876abb1 100644
--- a/pym/portage/package/ebuild/_config/UseManager.py
+++ b/lib/portage/package/ebuild/_config/UseManager.py
diff --git a/pym/portage/package/ebuild/_config/VirtualsManager.py b/lib/portage/package/ebuild/_config/VirtualsManager.py
index c4d1e363504..c4d1e363504 100644
--- a/pym/portage/package/ebuild/_config/VirtualsManager.py
+++ b/lib/portage/package/ebuild/_config/VirtualsManager.py
diff --git a/pym/portage/package/ebuild/_config/__init__.py b/lib/portage/package/ebuild/_config/__init__.py
index 21a391aeecf..21a391aeecf 100644
--- a/pym/portage/package/ebuild/_config/__init__.py
+++ b/lib/portage/package/ebuild/_config/__init__.py
diff --git a/pym/portage/package/ebuild/_config/env_var_validation.py b/lib/portage/package/ebuild/_config/env_var_validation.py
index d3db545cb40..d3db545cb40 100644
--- a/pym/portage/package/ebuild/_config/env_var_validation.py
+++ b/lib/portage/package/ebuild/_config/env_var_validation.py
diff --git a/pym/portage/package/ebuild/_config/features_set.py b/lib/portage/package/ebuild/_config/features_set.py
index 62236fd89da..62236fd89da 100644
--- a/pym/portage/package/ebuild/_config/features_set.py
+++ b/lib/portage/package/ebuild/_config/features_set.py
diff --git a/pym/portage/package/ebuild/_config/helper.py b/lib/portage/package/ebuild/_config/helper.py
index ee0c090a043..ee0c090a043 100644
--- a/pym/portage/package/ebuild/_config/helper.py
+++ b/lib/portage/package/ebuild/_config/helper.py
diff --git a/pym/portage/package/ebuild/_config/special_env_vars.py b/lib/portage/package/ebuild/_config/special_env_vars.py
index a308518afbe..a308518afbe 100644
--- a/pym/portage/package/ebuild/_config/special_env_vars.py
+++ b/lib/portage/package/ebuild/_config/special_env_vars.py
diff --git a/pym/portage/package/ebuild/_config/unpack_dependencies.py b/lib/portage/package/ebuild/_config/unpack_dependencies.py
index 1375189490b..1375189490b 100644
--- a/pym/portage/package/ebuild/_config/unpack_dependencies.py
+++ b/lib/portage/package/ebuild/_config/unpack_dependencies.py
diff --git a/pym/portage/package/ebuild/_ipc/ExitCommand.py b/lib/portage/package/ebuild/_ipc/ExitCommand.py
index f14050b91ce..f14050b91ce 100644
--- a/pym/portage/package/ebuild/_ipc/ExitCommand.py
+++ b/lib/portage/package/ebuild/_ipc/ExitCommand.py
diff --git a/pym/portage/package/ebuild/_ipc/IpcCommand.py b/lib/portage/package/ebuild/_ipc/IpcCommand.py
index efb27f0a2ec..efb27f0a2ec 100644
--- a/pym/portage/package/ebuild/_ipc/IpcCommand.py
+++ b/lib/portage/package/ebuild/_ipc/IpcCommand.py
diff --git a/pym/portage/package/ebuild/_ipc/QueryCommand.py b/lib/portage/package/ebuild/_ipc/QueryCommand.py
index fa6d1ea1686..fa6d1ea1686 100644
--- a/pym/portage/package/ebuild/_ipc/QueryCommand.py
+++ b/lib/portage/package/ebuild/_ipc/QueryCommand.py
diff --git a/pym/portage/package/ebuild/_ipc/__init__.py b/lib/portage/package/ebuild/_ipc/__init__.py
index 21a391aeecf..21a391aeecf 100644
--- a/pym/portage/package/ebuild/_ipc/__init__.py
+++ b/lib/portage/package/ebuild/_ipc/__init__.py
diff --git a/pym/portage/package/ebuild/_metadata_invalid.py b/lib/portage/package/ebuild/_metadata_invalid.py
index bcf1f7fcdd0..bcf1f7fcdd0 100644
--- a/pym/portage/package/ebuild/_metadata_invalid.py
+++ b/lib/portage/package/ebuild/_metadata_invalid.py
diff --git a/pym/portage/package/ebuild/_parallel_manifest/ManifestProcess.py b/lib/portage/package/ebuild/_parallel_manifest/ManifestProcess.py
index 44e257664c0..44e257664c0 100644
--- a/pym/portage/package/ebuild/_parallel_manifest/ManifestProcess.py
+++ b/lib/portage/package/ebuild/_parallel_manifest/ManifestProcess.py
diff --git a/pym/portage/package/ebuild/_parallel_manifest/ManifestScheduler.py b/lib/portage/package/ebuild/_parallel_manifest/ManifestScheduler.py
index fabea9bc135..fabea9bc135 100644
--- a/pym/portage/package/ebuild/_parallel_manifest/ManifestScheduler.py
+++ b/lib/portage/package/ebuild/_parallel_manifest/ManifestScheduler.py
diff --git a/pym/portage/package/ebuild/_parallel_manifest/ManifestTask.py b/lib/portage/package/ebuild/_parallel_manifest/ManifestTask.py
index 6bf5e82efad..6bf5e82efad 100644
--- a/pym/portage/package/ebuild/_parallel_manifest/ManifestTask.py
+++ b/lib/portage/package/ebuild/_parallel_manifest/ManifestTask.py
diff --git a/pym/portage/package/ebuild/_parallel_manifest/__init__.py b/lib/portage/package/ebuild/_parallel_manifest/__init__.py
index 418ad862bbc..418ad862bbc 100644
--- a/pym/portage/package/ebuild/_parallel_manifest/__init__.py
+++ b/lib/portage/package/ebuild/_parallel_manifest/__init__.py
diff --git a/pym/portage/package/ebuild/_spawn_nofetch.py b/lib/portage/package/ebuild/_spawn_nofetch.py
index bbfd5b72be0..bbfd5b72be0 100644
--- a/pym/portage/package/ebuild/_spawn_nofetch.py
+++ b/lib/portage/package/ebuild/_spawn_nofetch.py
diff --git a/pym/portage/package/ebuild/config.py b/lib/portage/package/ebuild/config.py
index 320d9f6c0e0..320d9f6c0e0 100644
--- a/pym/portage/package/ebuild/config.py
+++ b/lib/portage/package/ebuild/config.py
diff --git a/pym/portage/package/ebuild/deprecated_profile_check.py b/lib/portage/package/ebuild/deprecated_profile_check.py
index fdb19b4ac38..fdb19b4ac38 100644
--- a/pym/portage/package/ebuild/deprecated_profile_check.py
+++ b/lib/portage/package/ebuild/deprecated_profile_check.py
diff --git a/pym/portage/package/ebuild/digestcheck.py b/lib/portage/package/ebuild/digestcheck.py
index 502950f3167..502950f3167 100644
--- a/pym/portage/package/ebuild/digestcheck.py
+++ b/lib/portage/package/ebuild/digestcheck.py
diff --git a/pym/portage/package/ebuild/digestgen.py b/lib/portage/package/ebuild/digestgen.py
index 6f3f877cdda..6f3f877cdda 100644
--- a/pym/portage/package/ebuild/digestgen.py
+++ b/lib/portage/package/ebuild/digestgen.py
diff --git a/pym/portage/package/ebuild/doebuild.py b/lib/portage/package/ebuild/doebuild.py
index 97a9199a318..941a597e290 100644
--- a/pym/portage/package/ebuild/doebuild.py
+++ b/lib/portage/package/ebuild/doebuild.py
@@ -2519,7 +2519,7 @@ def _prepare_self_update(settings):
 	shutil.copytree(orig_bin_path, portage._bin_path, symlinks=True)
 
 	orig_pym_path = portage._pym_path
-	portage._pym_path = os.path.join(base_path_tmp, "pym")
+	portage._pym_path = os.path.join(base_path_tmp, "lib")
 	os.mkdir(portage._pym_path)
 	for pmod in PORTAGE_PYM_PACKAGES:
 		shutil.copytree(os.path.join(orig_pym_path, pmod),
diff --git a/pym/portage/package/ebuild/fetch.py b/lib/portage/package/ebuild/fetch.py
index 0431e11eab2..0431e11eab2 100644
--- a/pym/portage/package/ebuild/fetch.py
+++ b/lib/portage/package/ebuild/fetch.py
diff --git a/pym/portage/package/ebuild/getmaskingreason.py b/lib/portage/package/ebuild/getmaskingreason.py
index 1e4ed21ceb3..1e4ed21ceb3 100644
--- a/pym/portage/package/ebuild/getmaskingreason.py
+++ b/lib/portage/package/ebuild/getmaskingreason.py
diff --git a/pym/portage/package/ebuild/getmaskingstatus.py b/lib/portage/package/ebuild/getmaskingstatus.py
index 4b9e588f77b..4b9e588f77b 100644
--- a/pym/portage/package/ebuild/getmaskingstatus.py
+++ b/lib/portage/package/ebuild/getmaskingstatus.py
diff --git a/pym/portage/package/ebuild/prepare_build_dirs.py b/lib/portage/package/ebuild/prepare_build_dirs.py
index e53ccd0fb2a..e53ccd0fb2a 100644
--- a/pym/portage/package/ebuild/prepare_build_dirs.py
+++ b/lib/portage/package/ebuild/prepare_build_dirs.py
diff --git a/pym/portage/package/ebuild/profile_iuse.py b/lib/portage/package/ebuild/profile_iuse.py
index d3f201e548f..d3f201e548f 100644
--- a/pym/portage/package/ebuild/profile_iuse.py
+++ b/lib/portage/package/ebuild/profile_iuse.py
diff --git a/pym/portage/process.py b/lib/portage/process.py
index fd326731a51..fd326731a51 100644
--- a/pym/portage/process.py
+++ b/lib/portage/process.py
diff --git a/pym/portage/progress.py b/lib/portage/progress.py
index e43c2afbd7d..e43c2afbd7d 100644
--- a/pym/portage/progress.py
+++ b/lib/portage/progress.py
diff --git a/pym/portage/proxy/__init__.py b/lib/portage/proxy/__init__.py
index f98c564575d..f98c564575d 100644
--- a/pym/portage/proxy/__init__.py
+++ b/lib/portage/proxy/__init__.py
diff --git a/pym/portage/proxy/lazyimport.py b/lib/portage/proxy/lazyimport.py
index d4258706d76..d4258706d76 100644
--- a/pym/portage/proxy/lazyimport.py
+++ b/lib/portage/proxy/lazyimport.py
diff --git a/pym/portage/proxy/objectproxy.py b/lib/portage/proxy/objectproxy.py
index a755774aefb..a755774aefb 100644
--- a/pym/portage/proxy/objectproxy.py
+++ b/lib/portage/proxy/objectproxy.py
diff --git a/pym/portage/repository/__init__.py b/lib/portage/repository/__init__.py
index 21a391aeecf..21a391aeecf 100644
--- a/pym/portage/repository/__init__.py
+++ b/lib/portage/repository/__init__.py
diff --git a/pym/portage/repository/config.py b/lib/portage/repository/config.py
index e45e67dec49..f790f9392d5 100644
--- a/pym/portage/repository/config.py
+++ b/lib/portage/repository/config.py
@@ -863,7 +863,7 @@ class RepoConfigLoader(object):
 
 			if repo._masters_orig is None and self.mainRepo() and \
 				repo.name != self.mainRepo().name and not portage._sync_mode:
-				# TODO: Delete masters code in pym/portage/tests/resolver/ResolverPlayground.py when deleting this warning.
+				# TODO: Delete masters code in lib/portage/tests/resolver/ResolverPlayground.py when deleting this warning.
 				writemsg_level("!!! %s\n" % _("Repository '%s' is missing masters attribute in '%s'") %
 					(repo.name, os.path.join(repo.location, "metadata", "layout.conf")) +
 					"!!! %s\n" % _("Set 'masters = %s' in this file for future compatibility") %
diff --git a/pym/portage/sync/__init__.py b/lib/portage/sync/__init__.py
index 805b1f27081..805b1f27081 100644
--- a/pym/portage/sync/__init__.py
+++ b/lib/portage/sync/__init__.py
diff --git a/pym/portage/sync/config_checks.py b/lib/portage/sync/config_checks.py
index db316aa8851..db316aa8851 100644
--- a/pym/portage/sync/config_checks.py
+++ b/lib/portage/sync/config_checks.py
diff --git a/pym/portage/sync/controller.py b/lib/portage/sync/controller.py
index 3bccf6f749b..3bccf6f749b 100644
--- a/pym/portage/sync/controller.py
+++ b/lib/portage/sync/controller.py
diff --git a/pym/portage/sync/getaddrinfo_validate.py b/lib/portage/sync/getaddrinfo_validate.py
index 5e6009c745f..5e6009c745f 100644
--- a/pym/portage/sync/getaddrinfo_validate.py
+++ b/lib/portage/sync/getaddrinfo_validate.py
diff --git a/pym/portage/sync/modules/__init__.py b/lib/portage/sync/modules/__init__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/pym/portage/sync/modules/__init__.py
+++ b/lib/portage/sync/modules/__init__.py
diff --git a/pym/portage/sync/modules/cvs/__init__.py b/lib/portage/sync/modules/cvs/__init__.py
index 8025a29079d..8025a29079d 100644
--- a/pym/portage/sync/modules/cvs/__init__.py
+++ b/lib/portage/sync/modules/cvs/__init__.py
diff --git a/pym/portage/sync/modules/cvs/cvs.py b/lib/portage/sync/modules/cvs/cvs.py
index e202560c3a0..e202560c3a0 100644
--- a/pym/portage/sync/modules/cvs/cvs.py
+++ b/lib/portage/sync/modules/cvs/cvs.py
diff --git a/pym/portage/sync/modules/git/__init__.py b/lib/portage/sync/modules/git/__init__.py
index 270d971869b..270d971869b 100644
--- a/pym/portage/sync/modules/git/__init__.py
+++ b/lib/portage/sync/modules/git/__init__.py
diff --git a/pym/portage/sync/modules/git/git.py b/lib/portage/sync/modules/git/git.py
index 2fb82c6000a..2fb82c6000a 100644
--- a/pym/portage/sync/modules/git/git.py
+++ b/lib/portage/sync/modules/git/git.py
diff --git a/pym/portage/sync/modules/rsync/__init__.py b/lib/portage/sync/modules/rsync/__init__.py
index cb80f6d66fd..cb80f6d66fd 100644
--- a/pym/portage/sync/modules/rsync/__init__.py
+++ b/lib/portage/sync/modules/rsync/__init__.py
diff --git a/pym/portage/sync/modules/rsync/rsync.py b/lib/portage/sync/modules/rsync/rsync.py
index fb1960a3c52..fb1960a3c52 100644
--- a/pym/portage/sync/modules/rsync/rsync.py
+++ b/lib/portage/sync/modules/rsync/rsync.py
diff --git a/pym/portage/sync/modules/svn/__init__.py b/lib/portage/sync/modules/svn/__init__.py
index c7ae3b87c51..c7ae3b87c51 100644
--- a/pym/portage/sync/modules/svn/__init__.py
+++ b/lib/portage/sync/modules/svn/__init__.py
diff --git a/pym/portage/sync/modules/svn/svn.py b/lib/portage/sync/modules/svn/svn.py
index 723beedcbbb..723beedcbbb 100644
--- a/pym/portage/sync/modules/svn/svn.py
+++ b/lib/portage/sync/modules/svn/svn.py
diff --git a/pym/portage/sync/modules/webrsync/__init__.py b/lib/portage/sync/modules/webrsync/__init__.py
index dc7def20c57..dc7def20c57 100644
--- a/pym/portage/sync/modules/webrsync/__init__.py
+++ b/lib/portage/sync/modules/webrsync/__init__.py
diff --git a/pym/portage/sync/modules/webrsync/webrsync.py b/lib/portage/sync/modules/webrsync/webrsync.py
index 3d79f455751..3d79f455751 100644
--- a/pym/portage/sync/modules/webrsync/webrsync.py
+++ b/lib/portage/sync/modules/webrsync/webrsync.py
diff --git a/pym/portage/sync/old_tree_timestamp.py b/lib/portage/sync/old_tree_timestamp.py
index aaed18b5661..aaed18b5661 100644
--- a/pym/portage/sync/old_tree_timestamp.py
+++ b/lib/portage/sync/old_tree_timestamp.py
diff --git a/pym/portage/sync/syncbase.py b/lib/portage/sync/syncbase.py
index ce69a4fc06e..ce69a4fc06e 100644
--- a/pym/portage/sync/syncbase.py
+++ b/lib/portage/sync/syncbase.py
diff --git a/pym/portage/tests/__init__.py b/lib/portage/tests/__init__.py
index e149b5c0cf5..e149b5c0cf5 100644
--- a/pym/portage/tests/__init__.py
+++ b/lib/portage/tests/__init__.py
diff --git a/pym/portage/tests/bin/__init__.py b/lib/portage/tests/bin/__init__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/pym/portage/tests/bin/__init__.py
+++ b/lib/portage/tests/bin/__init__.py
diff --git a/pym/portage/tests/bin/__test__.py b/lib/portage/tests/bin/__test__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/pym/portage/tests/bin/__test__.py
+++ b/lib/portage/tests/bin/__test__.py
diff --git a/pym/portage/tests/bin/setup_env.py b/lib/portage/tests/bin/setup_env.py
index 9cc26df088f..9cc26df088f 100644
--- a/pym/portage/tests/bin/setup_env.py
+++ b/lib/portage/tests/bin/setup_env.py
diff --git a/pym/portage/tests/bin/test_dobin.py b/lib/portage/tests/bin/test_dobin.py
index 6f50d7aba88..6f50d7aba88 100644
--- a/pym/portage/tests/bin/test_dobin.py
+++ b/lib/portage/tests/bin/test_dobin.py
diff --git a/pym/portage/tests/bin/test_dodir.py b/lib/portage/tests/bin/test_dodir.py
index 5d401816169..5d401816169 100644
--- a/pym/portage/tests/bin/test_dodir.py
+++ b/lib/portage/tests/bin/test_dodir.py
diff --git a/pym/portage/tests/bin/test_doins.py b/lib/portage/tests/bin/test_doins.py
index e3d5153b361..e3d5153b361 100644
--- a/pym/portage/tests/bin/test_doins.py
+++ b/lib/portage/tests/bin/test_doins.py
diff --git a/pym/portage/tests/bin/test_eapi7_ver_funcs.py b/lib/portage/tests/bin/test_eapi7_ver_funcs.py
index 40897529827..40897529827 100644
--- a/pym/portage/tests/bin/test_eapi7_ver_funcs.py
+++ b/lib/portage/tests/bin/test_eapi7_ver_funcs.py
diff --git a/pym/portage/tests/bin/test_filter_bash_env.py b/lib/portage/tests/bin/test_filter_bash_env.py
index d906ea793d7..d906ea793d7 100644
--- a/pym/portage/tests/bin/test_filter_bash_env.py
+++ b/lib/portage/tests/bin/test_filter_bash_env.py
diff --git a/pym/portage/tests/dbapi/__init__.py b/lib/portage/tests/dbapi/__init__.py
index 532918b6a39..532918b6a39 100644
--- a/pym/portage/tests/dbapi/__init__.py
+++ b/lib/portage/tests/dbapi/__init__.py
diff --git a/pym/portage/tests/dbapi/__test__.py b/lib/portage/tests/dbapi/__test__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/pym/portage/tests/dbapi/__test__.py
+++ b/lib/portage/tests/dbapi/__test__.py
diff --git a/pym/portage/tests/dbapi/test_fakedbapi.py b/lib/portage/tests/dbapi/test_fakedbapi.py
index 19ea9cd00b0..19ea9cd00b0 100644
--- a/pym/portage/tests/dbapi/test_fakedbapi.py
+++ b/lib/portage/tests/dbapi/test_fakedbapi.py
diff --git a/pym/portage/tests/dbapi/test_portdb_cache.py b/lib/portage/tests/dbapi/test_portdb_cache.py
index d3101b12039..d3101b12039 100644
--- a/pym/portage/tests/dbapi/test_portdb_cache.py
+++ b/lib/portage/tests/dbapi/test_portdb_cache.py
diff --git a/pym/portage/tests/dep/__init__.py b/lib/portage/tests/dep/__init__.py
index 9c3f52476f9..9c3f52476f9 100644
--- a/pym/portage/tests/dep/__init__.py
+++ b/lib/portage/tests/dep/__init__.py
diff --git a/pym/portage/tests/dep/__test__.py b/lib/portage/tests/dep/__test__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/pym/portage/tests/dep/__test__.py
+++ b/lib/portage/tests/dep/__test__.py
diff --git a/pym/portage/tests/dep/testAtom.py b/lib/portage/tests/dep/testAtom.py
index da58be27c0c..da58be27c0c 100644
--- a/pym/portage/tests/dep/testAtom.py
+++ b/lib/portage/tests/dep/testAtom.py
diff --git a/pym/portage/tests/dep/testCheckRequiredUse.py b/lib/portage/tests/dep/testCheckRequiredUse.py
index c4128c29a1e..c4128c29a1e 100644
--- a/pym/portage/tests/dep/testCheckRequiredUse.py
+++ b/lib/portage/tests/dep/testCheckRequiredUse.py
diff --git a/pym/portage/tests/dep/testExtendedAtomDict.py b/lib/portage/tests/dep/testExtendedAtomDict.py
index 69d092e386c..69d092e386c 100644
--- a/pym/portage/tests/dep/testExtendedAtomDict.py
+++ b/lib/portage/tests/dep/testExtendedAtomDict.py
diff --git a/pym/portage/tests/dep/testExtractAffectingUSE.py b/lib/portage/tests/dep/testExtractAffectingUSE.py
index 026a5527432..026a5527432 100644
--- a/pym/portage/tests/dep/testExtractAffectingUSE.py
+++ b/lib/portage/tests/dep/testExtractAffectingUSE.py
diff --git a/pym/portage/tests/dep/testStandalone.py b/lib/portage/tests/dep/testStandalone.py
index 88e3f39f8a2..88e3f39f8a2 100644
--- a/pym/portage/tests/dep/testStandalone.py
+++ b/lib/portage/tests/dep/testStandalone.py
diff --git a/pym/portage/tests/dep/test_best_match_to_list.py b/lib/portage/tests/dep/test_best_match_to_list.py
index 586c8bc5071..586c8bc5071 100644
--- a/pym/portage/tests/dep/test_best_match_to_list.py
+++ b/lib/portage/tests/dep/test_best_match_to_list.py
diff --git a/pym/portage/tests/dep/test_dep_getcpv.py b/lib/portage/tests/dep/test_dep_getcpv.py
index 79c1514a1ce..79c1514a1ce 100644
--- a/pym/portage/tests/dep/test_dep_getcpv.py
+++ b/lib/portage/tests/dep/test_dep_getcpv.py
diff --git a/pym/portage/tests/dep/test_dep_getrepo.py b/lib/portage/tests/dep/test_dep_getrepo.py
index 6c17d3cf710..6c17d3cf710 100644
--- a/pym/portage/tests/dep/test_dep_getrepo.py
+++ b/lib/portage/tests/dep/test_dep_getrepo.py
diff --git a/pym/portage/tests/dep/test_dep_getslot.py b/lib/portage/tests/dep/test_dep_getslot.py
index 84828648b81..84828648b81 100644
--- a/pym/portage/tests/dep/test_dep_getslot.py
+++ b/lib/portage/tests/dep/test_dep_getslot.py
diff --git a/pym/portage/tests/dep/test_dep_getusedeps.py b/lib/portage/tests/dep/test_dep_getusedeps.py
index cd58eab354a..cd58eab354a 100644
--- a/pym/portage/tests/dep/test_dep_getusedeps.py
+++ b/lib/portage/tests/dep/test_dep_getusedeps.py
diff --git a/pym/portage/tests/dep/test_dnf_convert.py b/lib/portage/tests/dep/test_dnf_convert.py
index b92778d4a9e..b92778d4a9e 100644
--- a/pym/portage/tests/dep/test_dnf_convert.py
+++ b/lib/portage/tests/dep/test_dnf_convert.py
diff --git a/pym/portage/tests/dep/test_get_operator.py b/lib/portage/tests/dep/test_get_operator.py
index 5076e210782..5076e210782 100644
--- a/pym/portage/tests/dep/test_get_operator.py
+++ b/lib/portage/tests/dep/test_get_operator.py
diff --git a/pym/portage/tests/dep/test_get_required_use_flags.py b/lib/portage/tests/dep/test_get_required_use_flags.py
index 90e096c781c..90e096c781c 100644
--- a/pym/portage/tests/dep/test_get_required_use_flags.py
+++ b/lib/portage/tests/dep/test_get_required_use_flags.py
diff --git a/pym/portage/tests/dep/test_isjustname.py b/lib/portage/tests/dep/test_isjustname.py
index 9b95bcd0f87..9b95bcd0f87 100644
--- a/pym/portage/tests/dep/test_isjustname.py
+++ b/lib/portage/tests/dep/test_isjustname.py
diff --git a/pym/portage/tests/dep/test_isvalidatom.py b/lib/portage/tests/dep/test_isvalidatom.py
index 9d3367aab2b..9d3367aab2b 100644
--- a/pym/portage/tests/dep/test_isvalidatom.py
+++ b/lib/portage/tests/dep/test_isvalidatom.py
diff --git a/pym/portage/tests/dep/test_match_from_list.py b/lib/portage/tests/dep/test_match_from_list.py
index 3080479c237..3080479c237 100644
--- a/pym/portage/tests/dep/test_match_from_list.py
+++ b/lib/portage/tests/dep/test_match_from_list.py
diff --git a/pym/portage/tests/dep/test_overlap_dnf.py b/lib/portage/tests/dep/test_overlap_dnf.py
index ee48e5556f8..ee48e5556f8 100644
--- a/pym/portage/tests/dep/test_overlap_dnf.py
+++ b/lib/portage/tests/dep/test_overlap_dnf.py
diff --git a/pym/portage/tests/dep/test_paren_reduce.py b/lib/portage/tests/dep/test_paren_reduce.py
index 32446528911..32446528911 100644
--- a/pym/portage/tests/dep/test_paren_reduce.py
+++ b/lib/portage/tests/dep/test_paren_reduce.py
diff --git a/pym/portage/tests/dep/test_use_reduce.py b/lib/portage/tests/dep/test_use_reduce.py
index 4f65567cfbb..4f65567cfbb 100644
--- a/pym/portage/tests/dep/test_use_reduce.py
+++ b/lib/portage/tests/dep/test_use_reduce.py
diff --git a/pym/portage/tests/ebuild/__init__.py b/lib/portage/tests/ebuild/__init__.py
index e2d487ecbec..e2d487ecbec 100644
--- a/pym/portage/tests/ebuild/__init__.py
+++ b/lib/portage/tests/ebuild/__init__.py
diff --git a/pym/portage/tests/ebuild/__test__.py b/lib/portage/tests/ebuild/__test__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/pym/portage/tests/ebuild/__test__.py
+++ b/lib/portage/tests/ebuild/__test__.py
diff --git a/pym/portage/tests/ebuild/test_array_fromfile_eof.py b/lib/portage/tests/ebuild/test_array_fromfile_eof.py
index 1f2a1ab7bb7..1f2a1ab7bb7 100644
--- a/pym/portage/tests/ebuild/test_array_fromfile_eof.py
+++ b/lib/portage/tests/ebuild/test_array_fromfile_eof.py
diff --git a/pym/portage/tests/ebuild/test_config.py b/lib/portage/tests/ebuild/test_config.py
index dcb5ffe0d0a..dcb5ffe0d0a 100644
--- a/pym/portage/tests/ebuild/test_config.py
+++ b/lib/portage/tests/ebuild/test_config.py
diff --git a/pym/portage/tests/ebuild/test_doebuild_fd_pipes.py b/lib/portage/tests/ebuild/test_doebuild_fd_pipes.py
index b894218229c..b894218229c 100644
--- a/pym/portage/tests/ebuild/test_doebuild_fd_pipes.py
+++ b/lib/portage/tests/ebuild/test_doebuild_fd_pipes.py
diff --git a/pym/portage/tests/ebuild/test_doebuild_spawn.py b/lib/portage/tests/ebuild/test_doebuild_spawn.py
index 6b344658f92..6b344658f92 100644
--- a/pym/portage/tests/ebuild/test_doebuild_spawn.py
+++ b/lib/portage/tests/ebuild/test_doebuild_spawn.py
diff --git a/pym/portage/tests/ebuild/test_ipc_daemon.py b/lib/portage/tests/ebuild/test_ipc_daemon.py
index e6da51a76b7..e6da51a76b7 100644
--- a/pym/portage/tests/ebuild/test_ipc_daemon.py
+++ b/lib/portage/tests/ebuild/test_ipc_daemon.py
diff --git a/pym/portage/tests/ebuild/test_spawn.py b/lib/portage/tests/ebuild/test_spawn.py
index a38e109721e..a38e109721e 100644
--- a/pym/portage/tests/ebuild/test_spawn.py
+++ b/lib/portage/tests/ebuild/test_spawn.py
diff --git a/pym/portage/tests/ebuild/test_use_expand_incremental.py b/lib/portage/tests/ebuild/test_use_expand_incremental.py
index a58f08cb914..a58f08cb914 100644
--- a/pym/portage/tests/ebuild/test_use_expand_incremental.py
+++ b/lib/portage/tests/ebuild/test_use_expand_incremental.py
diff --git a/pym/portage/tests/emerge/__init__.py b/lib/portage/tests/emerge/__init__.py
index 532918b6a39..532918b6a39 100644
--- a/pym/portage/tests/emerge/__init__.py
+++ b/lib/portage/tests/emerge/__init__.py
diff --git a/pym/portage/tests/emerge/__test__.py b/lib/portage/tests/emerge/__test__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/pym/portage/tests/emerge/__test__.py
+++ b/lib/portage/tests/emerge/__test__.py
diff --git a/pym/portage/tests/emerge/test_config_protect.py b/lib/portage/tests/emerge/test_config_protect.py
index 06ab059eef3..06ab059eef3 100644
--- a/pym/portage/tests/emerge/test_config_protect.py
+++ b/lib/portage/tests/emerge/test_config_protect.py
diff --git a/pym/portage/tests/emerge/test_emerge_blocker_file_collision.py b/lib/portage/tests/emerge/test_emerge_blocker_file_collision.py
index 10d09d843da..10d09d843da 100644
--- a/pym/portage/tests/emerge/test_emerge_blocker_file_collision.py
+++ b/lib/portage/tests/emerge/test_emerge_blocker_file_collision.py
diff --git a/pym/portage/tests/emerge/test_emerge_slot_abi.py b/lib/portage/tests/emerge/test_emerge_slot_abi.py
index 20069939654..20069939654 100644
--- a/pym/portage/tests/emerge/test_emerge_slot_abi.py
+++ b/lib/portage/tests/emerge/test_emerge_slot_abi.py
diff --git a/pym/portage/tests/emerge/test_global_updates.py b/lib/portage/tests/emerge/test_global_updates.py
index eb54310593f..eb54310593f 100644
--- a/pym/portage/tests/emerge/test_global_updates.py
+++ b/lib/portage/tests/emerge/test_global_updates.py
diff --git a/pym/portage/tests/emerge/test_simple.py b/lib/portage/tests/emerge/test_simple.py
index b1402ddd5e3..b1402ddd5e3 100644
--- a/pym/portage/tests/emerge/test_simple.py
+++ b/lib/portage/tests/emerge/test_simple.py
diff --git a/pym/portage/tests/env/__init__.py b/lib/portage/tests/env/__init__.py
index cbeabe5c6b3..cbeabe5c6b3 100644
--- a/pym/portage/tests/env/__init__.py
+++ b/lib/portage/tests/env/__init__.py
diff --git a/pym/portage/tests/env/__test__.py b/lib/portage/tests/env/__test__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/pym/portage/tests/env/__test__.py
+++ b/lib/portage/tests/env/__test__.py
diff --git a/pym/portage/tests/env/config/__init__.py b/lib/portage/tests/env/config/__init__.py
index ef5cc43b6ec..ef5cc43b6ec 100644
--- a/pym/portage/tests/env/config/__init__.py
+++ b/lib/portage/tests/env/config/__init__.py
diff --git a/pym/portage/tests/env/config/__test__.py b/lib/portage/tests/env/config/__test__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/pym/portage/tests/env/config/__test__.py
+++ b/lib/portage/tests/env/config/__test__.py
diff --git a/pym/portage/tests/env/config/test_PackageKeywordsFile.py b/lib/portage/tests/env/config/test_PackageKeywordsFile.py
index 609c0fda289..609c0fda289 100644
--- a/pym/portage/tests/env/config/test_PackageKeywordsFile.py
+++ b/lib/portage/tests/env/config/test_PackageKeywordsFile.py
diff --git a/pym/portage/tests/env/config/test_PackageMaskFile.py b/lib/portage/tests/env/config/test_PackageMaskFile.py
index 0c5b30f53c6..0c5b30f53c6 100644
--- a/pym/portage/tests/env/config/test_PackageMaskFile.py
+++ b/lib/portage/tests/env/config/test_PackageMaskFile.py
diff --git a/pym/portage/tests/env/config/test_PackageUseFile.py b/lib/portage/tests/env/config/test_PackageUseFile.py
index b1a6ccbde03..b1a6ccbde03 100644
--- a/pym/portage/tests/env/config/test_PackageUseFile.py
+++ b/lib/portage/tests/env/config/test_PackageUseFile.py
diff --git a/pym/portage/tests/env/config/test_PortageModulesFile.py b/lib/portage/tests/env/config/test_PortageModulesFile.py
index 05584a5f84d..05584a5f84d 100644
--- a/pym/portage/tests/env/config/test_PortageModulesFile.py
+++ b/lib/portage/tests/env/config/test_PortageModulesFile.py
diff --git a/pym/portage/tests/glsa/__init__.py b/lib/portage/tests/glsa/__init__.py
index 6cde9320b3e..6cde9320b3e 100644
--- a/pym/portage/tests/glsa/__init__.py
+++ b/lib/portage/tests/glsa/__init__.py
diff --git a/pym/portage/tests/glsa/__test__.py b/lib/portage/tests/glsa/__test__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/pym/portage/tests/glsa/__test__.py
+++ b/lib/portage/tests/glsa/__test__.py
diff --git a/pym/portage/tests/glsa/test_security_set.py b/lib/portage/tests/glsa/test_security_set.py
index e73deaba9d6..e73deaba9d6 100644
--- a/pym/portage/tests/glsa/test_security_set.py
+++ b/lib/portage/tests/glsa/test_security_set.py
diff --git a/pym/portage/tests/lafilefixer/__init__.py b/lib/portage/tests/lafilefixer/__init__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/pym/portage/tests/lafilefixer/__init__.py
+++ b/lib/portage/tests/lafilefixer/__init__.py
diff --git a/pym/portage/tests/lafilefixer/__test__.py b/lib/portage/tests/lafilefixer/__test__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/pym/portage/tests/lafilefixer/__test__.py
+++ b/lib/portage/tests/lafilefixer/__test__.py
diff --git a/pym/portage/tests/lafilefixer/test_lafilefixer.py b/lib/portage/tests/lafilefixer/test_lafilefixer.py
index 0bcffaadafd..0bcffaadafd 100644
--- a/pym/portage/tests/lafilefixer/test_lafilefixer.py
+++ b/lib/portage/tests/lafilefixer/test_lafilefixer.py
diff --git a/pym/portage/tests/lazyimport/__init__.py b/lib/portage/tests/lazyimport/__init__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/pym/portage/tests/lazyimport/__init__.py
+++ b/lib/portage/tests/lazyimport/__init__.py
diff --git a/pym/portage/tests/lazyimport/__test__.py b/lib/portage/tests/lazyimport/__test__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/pym/portage/tests/lazyimport/__test__.py
+++ b/lib/portage/tests/lazyimport/__test__.py
diff --git a/pym/portage/tests/lazyimport/test_lazy_import_portage_baseline.py b/lib/portage/tests/lazyimport/test_lazy_import_portage_baseline.py
index 080cf3f982a..080cf3f982a 100644
--- a/pym/portage/tests/lazyimport/test_lazy_import_portage_baseline.py
+++ b/lib/portage/tests/lazyimport/test_lazy_import_portage_baseline.py
diff --git a/pym/portage/tests/lazyimport/test_preload_portage_submodules.py b/lib/portage/tests/lazyimport/test_preload_portage_submodules.py
index 9d20ebacf76..9d20ebacf76 100644
--- a/pym/portage/tests/lazyimport/test_preload_portage_submodules.py
+++ b/lib/portage/tests/lazyimport/test_preload_portage_submodules.py
diff --git a/pym/portage/tests/lint/__init__.py b/lib/portage/tests/lint/__init__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/pym/portage/tests/lint/__init__.py
+++ b/lib/portage/tests/lint/__init__.py
diff --git a/pym/portage/tests/lint/__test__.py b/lib/portage/tests/lint/__test__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/pym/portage/tests/lint/__test__.py
+++ b/lib/portage/tests/lint/__test__.py
diff --git a/pym/portage/tests/lint/metadata.py b/lib/portage/tests/lint/metadata.py
index e3f90cbf20e..e3f90cbf20e 100644
--- a/pym/portage/tests/lint/metadata.py
+++ b/lib/portage/tests/lint/metadata.py
diff --git a/pym/portage/tests/lint/test_bash_syntax.py b/lib/portage/tests/lint/test_bash_syntax.py
index fdbb6fe8812..fdbb6fe8812 100644
--- a/pym/portage/tests/lint/test_bash_syntax.py
+++ b/lib/portage/tests/lint/test_bash_syntax.py
diff --git a/pym/portage/tests/lint/test_compile_modules.py b/lib/portage/tests/lint/test_compile_modules.py
index 51eb8cd8aa0..51eb8cd8aa0 100644
--- a/pym/portage/tests/lint/test_compile_modules.py
+++ b/lib/portage/tests/lint/test_compile_modules.py
diff --git a/pym/portage/tests/lint/test_import_modules.py b/lib/portage/tests/lint/test_import_modules.py
index fcdcb3b33de..fcdcb3b33de 100644
--- a/pym/portage/tests/lint/test_import_modules.py
+++ b/lib/portage/tests/lint/test_import_modules.py
diff --git a/pym/portage/tests/locks/__init__.py b/lib/portage/tests/locks/__init__.py
index 21a391aeecf..21a391aeecf 100644
--- a/pym/portage/tests/locks/__init__.py
+++ b/lib/portage/tests/locks/__init__.py
diff --git a/pym/portage/tests/locks/__test__.py b/lib/portage/tests/locks/__test__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/pym/portage/tests/locks/__test__.py
+++ b/lib/portage/tests/locks/__test__.py
diff --git a/pym/portage/tests/locks/test_asynchronous_lock.py b/lib/portage/tests/locks/test_asynchronous_lock.py
index 338d91e0902..338d91e0902 100644
--- a/pym/portage/tests/locks/test_asynchronous_lock.py
+++ b/lib/portage/tests/locks/test_asynchronous_lock.py
diff --git a/pym/portage/tests/locks/test_lock_nonblock.py b/lib/portage/tests/locks/test_lock_nonblock.py
index 2ff7b35273e..2ff7b35273e 100644
--- a/pym/portage/tests/locks/test_lock_nonblock.py
+++ b/lib/portage/tests/locks/test_lock_nonblock.py
diff --git a/pym/portage/tests/news/__init__.py b/lib/portage/tests/news/__init__.py
index 28a753f9c8c..28a753f9c8c 100644
--- a/pym/portage/tests/news/__init__.py
+++ b/lib/portage/tests/news/__init__.py
diff --git a/pym/portage/tests/news/__test__.py b/lib/portage/tests/news/__test__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/pym/portage/tests/news/__test__.py
+++ b/lib/portage/tests/news/__test__.py
diff --git a/pym/portage/tests/news/test_NewsItem.py b/lib/portage/tests/news/test_NewsItem.py
index 2f183a7e03c..2f183a7e03c 100644
--- a/pym/portage/tests/news/test_NewsItem.py
+++ b/lib/portage/tests/news/test_NewsItem.py
diff --git a/pym/portage/tests/process/__init__.py b/lib/portage/tests/process/__init__.py
index d19e353cc27..d19e353cc27 100644
--- a/pym/portage/tests/process/__init__.py
+++ b/lib/portage/tests/process/__init__.py
diff --git a/pym/portage/tests/process/__test__.py b/lib/portage/tests/process/__test__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/pym/portage/tests/process/__test__.py
+++ b/lib/portage/tests/process/__test__.py
diff --git a/pym/portage/tests/process/test_PopenProcess.py b/lib/portage/tests/process/test_PopenProcess.py
index 88da0b35403..88da0b35403 100644
--- a/pym/portage/tests/process/test_PopenProcess.py
+++ b/lib/portage/tests/process/test_PopenProcess.py
diff --git a/pym/portage/tests/process/test_PopenProcessBlockingIO.py b/lib/portage/tests/process/test_PopenProcessBlockingIO.py
index 9ee291a39ef..9ee291a39ef 100644
--- a/pym/portage/tests/process/test_PopenProcessBlockingIO.py
+++ b/lib/portage/tests/process/test_PopenProcessBlockingIO.py
diff --git a/pym/portage/tests/process/test_poll.py b/lib/portage/tests/process/test_poll.py
index f700a558518..f700a558518 100644
--- a/pym/portage/tests/process/test_poll.py
+++ b/lib/portage/tests/process/test_poll.py
diff --git a/pym/portage/tests/resolver/ResolverPlayground.py b/lib/portage/tests/resolver/ResolverPlayground.py
index e2e061669be..e2e061669be 100644
--- a/pym/portage/tests/resolver/ResolverPlayground.py
+++ b/lib/portage/tests/resolver/ResolverPlayground.py
diff --git a/pym/portage/tests/resolver/__init__.py b/lib/portage/tests/resolver/__init__.py
index 21a391aeecf..21a391aeecf 100644
--- a/pym/portage/tests/resolver/__init__.py
+++ b/lib/portage/tests/resolver/__init__.py
diff --git a/pym/portage/tests/resolver/__test__.py b/lib/portage/tests/resolver/__test__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/pym/portage/tests/resolver/__test__.py
+++ b/lib/portage/tests/resolver/__test__.py
diff --git a/pym/portage/tests/resolver/binpkg_multi_instance/__init__.py b/lib/portage/tests/resolver/binpkg_multi_instance/__init__.py
index 4725d3317e6..4725d3317e6 100644
--- a/pym/portage/tests/resolver/binpkg_multi_instance/__init__.py
+++ b/lib/portage/tests/resolver/binpkg_multi_instance/__init__.py
diff --git a/pym/portage/tests/resolver/binpkg_multi_instance/__test__.py b/lib/portage/tests/resolver/binpkg_multi_instance/__test__.py
index 4725d3317e6..4725d3317e6 100644
--- a/pym/portage/tests/resolver/binpkg_multi_instance/__test__.py
+++ b/lib/portage/tests/resolver/binpkg_multi_instance/__test__.py
diff --git a/pym/portage/tests/resolver/binpkg_multi_instance/test_build_id_profile_format.py b/lib/portage/tests/resolver/binpkg_multi_instance/test_build_id_profile_format.py
index 0397509f807..0397509f807 100644
--- a/pym/portage/tests/resolver/binpkg_multi_instance/test_build_id_profile_format.py
+++ b/lib/portage/tests/resolver/binpkg_multi_instance/test_build_id_profile_format.py
diff --git a/pym/portage/tests/resolver/binpkg_multi_instance/test_rebuilt_binaries.py b/lib/portage/tests/resolver/binpkg_multi_instance/test_rebuilt_binaries.py
index 5729df4652e..5729df4652e 100644
--- a/pym/portage/tests/resolver/binpkg_multi_instance/test_rebuilt_binaries.py
+++ b/lib/portage/tests/resolver/binpkg_multi_instance/test_rebuilt_binaries.py
diff --git a/pym/portage/tests/resolver/soname/__init__.py b/lib/portage/tests/resolver/soname/__init__.py
index 4725d3317e6..4725d3317e6 100644
--- a/pym/portage/tests/resolver/soname/__init__.py
+++ b/lib/portage/tests/resolver/soname/__init__.py
diff --git a/pym/portage/tests/resolver/soname/__test__.py b/lib/portage/tests/resolver/soname/__test__.py
index 4725d3317e6..4725d3317e6 100644
--- a/pym/portage/tests/resolver/soname/__test__.py
+++ b/lib/portage/tests/resolver/soname/__test__.py
diff --git a/pym/portage/tests/resolver/soname/test_autounmask.py b/lib/portage/tests/resolver/soname/test_autounmask.py
index be0f94e1794..be0f94e1794 100644
--- a/pym/portage/tests/resolver/soname/test_autounmask.py
+++ b/lib/portage/tests/resolver/soname/test_autounmask.py
diff --git a/pym/portage/tests/resolver/soname/test_depclean.py b/lib/portage/tests/resolver/soname/test_depclean.py
index 50cc169e376..50cc169e376 100644
--- a/pym/portage/tests/resolver/soname/test_depclean.py
+++ b/lib/portage/tests/resolver/soname/test_depclean.py
diff --git a/pym/portage/tests/resolver/soname/test_downgrade.py b/lib/portage/tests/resolver/soname/test_downgrade.py
index a95be3406cc..a95be3406cc 100644
--- a/pym/portage/tests/resolver/soname/test_downgrade.py
+++ b/lib/portage/tests/resolver/soname/test_downgrade.py
diff --git a/pym/portage/tests/resolver/soname/test_or_choices.py b/lib/portage/tests/resolver/soname/test_or_choices.py
index 2420cd399ae..2420cd399ae 100644
--- a/pym/portage/tests/resolver/soname/test_or_choices.py
+++ b/lib/portage/tests/resolver/soname/test_or_choices.py
diff --git a/pym/portage/tests/resolver/soname/test_reinstall.py b/lib/portage/tests/resolver/soname/test_reinstall.py
index b8f2d2c60f4..b8f2d2c60f4 100644
--- a/pym/portage/tests/resolver/soname/test_reinstall.py
+++ b/lib/portage/tests/resolver/soname/test_reinstall.py
diff --git a/pym/portage/tests/resolver/soname/test_skip_update.py b/lib/portage/tests/resolver/soname/test_skip_update.py
index 67e1e024271..67e1e024271 100644
--- a/pym/portage/tests/resolver/soname/test_skip_update.py
+++ b/lib/portage/tests/resolver/soname/test_skip_update.py
diff --git a/pym/portage/tests/resolver/soname/test_slot_conflict_reinstall.py b/lib/portage/tests/resolver/soname/test_slot_conflict_reinstall.py
index f7154442e9f..f7154442e9f 100644
--- a/pym/portage/tests/resolver/soname/test_slot_conflict_reinstall.py
+++ b/lib/portage/tests/resolver/soname/test_slot_conflict_reinstall.py
diff --git a/pym/portage/tests/resolver/soname/test_slot_conflict_update.py b/lib/portage/tests/resolver/soname/test_slot_conflict_update.py
index c6074967a2e..c6074967a2e 100644
--- a/pym/portage/tests/resolver/soname/test_slot_conflict_update.py
+++ b/lib/portage/tests/resolver/soname/test_slot_conflict_update.py
diff --git a/pym/portage/tests/resolver/soname/test_soname_provided.py b/lib/portage/tests/resolver/soname/test_soname_provided.py
index 162da47d17b..162da47d17b 100644
--- a/pym/portage/tests/resolver/soname/test_soname_provided.py
+++ b/lib/portage/tests/resolver/soname/test_soname_provided.py
diff --git a/pym/portage/tests/resolver/soname/test_unsatisfiable.py b/lib/portage/tests/resolver/soname/test_unsatisfiable.py
index 039a9df26aa..039a9df26aa 100644
--- a/pym/portage/tests/resolver/soname/test_unsatisfiable.py
+++ b/lib/portage/tests/resolver/soname/test_unsatisfiable.py
diff --git a/pym/portage/tests/resolver/soname/test_unsatisfied.py b/lib/portage/tests/resolver/soname/test_unsatisfied.py
index 27cdcc4408f..27cdcc4408f 100644
--- a/pym/portage/tests/resolver/soname/test_unsatisfied.py
+++ b/lib/portage/tests/resolver/soname/test_unsatisfied.py
diff --git a/pym/portage/tests/resolver/test_autounmask.py b/lib/portage/tests/resolver/test_autounmask.py
index 809d4210405..809d4210405 100644
--- a/pym/portage/tests/resolver/test_autounmask.py
+++ b/lib/portage/tests/resolver/test_autounmask.py
diff --git a/pym/portage/tests/resolver/test_autounmask_binpkg_use.py b/lib/portage/tests/resolver/test_autounmask_binpkg_use.py
index 1ca4bf3d9e2..1ca4bf3d9e2 100644
--- a/pym/portage/tests/resolver/test_autounmask_binpkg_use.py
+++ b/lib/portage/tests/resolver/test_autounmask_binpkg_use.py
diff --git a/pym/portage/tests/resolver/test_autounmask_keep_keywords.py b/lib/portage/tests/resolver/test_autounmask_keep_keywords.py
index 79a4837a5a7..79a4837a5a7 100644
--- a/pym/portage/tests/resolver/test_autounmask_keep_keywords.py
+++ b/lib/portage/tests/resolver/test_autounmask_keep_keywords.py
diff --git a/pym/portage/tests/resolver/test_autounmask_multilib_use.py b/lib/portage/tests/resolver/test_autounmask_multilib_use.py
index e160c77ce07..e160c77ce07 100644
--- a/pym/portage/tests/resolver/test_autounmask_multilib_use.py
+++ b/lib/portage/tests/resolver/test_autounmask_multilib_use.py
diff --git a/pym/portage/tests/resolver/test_autounmask_parent.py b/lib/portage/tests/resolver/test_autounmask_parent.py
index 042acabb0f3..042acabb0f3 100644
--- a/pym/portage/tests/resolver/test_autounmask_parent.py
+++ b/lib/portage/tests/resolver/test_autounmask_parent.py
diff --git a/pym/portage/tests/resolver/test_autounmask_use_backtrack.py b/lib/portage/tests/resolver/test_autounmask_use_backtrack.py
index 83edeafa405..83edeafa405 100644
--- a/pym/portage/tests/resolver/test_autounmask_use_backtrack.py
+++ b/lib/portage/tests/resolver/test_autounmask_use_backtrack.py
diff --git a/pym/portage/tests/resolver/test_autounmask_use_breakage.py b/lib/portage/tests/resolver/test_autounmask_use_breakage.py
index 17394162963..17394162963 100644
--- a/pym/portage/tests/resolver/test_autounmask_use_breakage.py
+++ b/lib/portage/tests/resolver/test_autounmask_use_breakage.py
diff --git a/pym/portage/tests/resolver/test_backtracking.py b/lib/portage/tests/resolver/test_backtracking.py
index 656715347f2..656715347f2 100644
--- a/pym/portage/tests/resolver/test_backtracking.py
+++ b/lib/portage/tests/resolver/test_backtracking.py
diff --git a/pym/portage/tests/resolver/test_bdeps.py b/lib/portage/tests/resolver/test_bdeps.py
index c0d64991c80..c0d64991c80 100644
--- a/pym/portage/tests/resolver/test_bdeps.py
+++ b/lib/portage/tests/resolver/test_bdeps.py
diff --git a/pym/portage/tests/resolver/test_binary_pkg_ebuild_visibility.py b/lib/portage/tests/resolver/test_binary_pkg_ebuild_visibility.py
index 0d01d069676..0d01d069676 100644
--- a/pym/portage/tests/resolver/test_binary_pkg_ebuild_visibility.py
+++ b/lib/portage/tests/resolver/test_binary_pkg_ebuild_visibility.py
diff --git a/pym/portage/tests/resolver/test_blocker.py b/lib/portage/tests/resolver/test_blocker.py
index 94a88b8b4ba..94a88b8b4ba 100644
--- a/pym/portage/tests/resolver/test_blocker.py
+++ b/lib/portage/tests/resolver/test_blocker.py
diff --git a/pym/portage/tests/resolver/test_changed_deps.py b/lib/portage/tests/resolver/test_changed_deps.py
index 420a0017259..420a0017259 100644
--- a/pym/portage/tests/resolver/test_changed_deps.py
+++ b/lib/portage/tests/resolver/test_changed_deps.py
diff --git a/pym/portage/tests/resolver/test_circular_choices.py b/lib/portage/tests/resolver/test_circular_choices.py
index 33b73062726..33b73062726 100644
--- a/pym/portage/tests/resolver/test_circular_choices.py
+++ b/lib/portage/tests/resolver/test_circular_choices.py
diff --git a/pym/portage/tests/resolver/test_circular_dependencies.py b/lib/portage/tests/resolver/test_circular_dependencies.py
index f8331ac4ea2..f8331ac4ea2 100644
--- a/pym/portage/tests/resolver/test_circular_dependencies.py
+++ b/lib/portage/tests/resolver/test_circular_dependencies.py
diff --git a/pym/portage/tests/resolver/test_complete_graph.py b/lib/portage/tests/resolver/test_complete_graph.py
index 6b5f54a3a04..6b5f54a3a04 100644
--- a/pym/portage/tests/resolver/test_complete_graph.py
+++ b/lib/portage/tests/resolver/test_complete_graph.py
diff --git a/pym/portage/tests/resolver/test_complete_if_new_subslot_without_revbump.py b/lib/portage/tests/resolver/test_complete_if_new_subslot_without_revbump.py
index fddbead7cc9..fddbead7cc9 100644
--- a/pym/portage/tests/resolver/test_complete_if_new_subslot_without_revbump.py
+++ b/lib/portage/tests/resolver/test_complete_if_new_subslot_without_revbump.py
diff --git a/pym/portage/tests/resolver/test_depclean.py b/lib/portage/tests/resolver/test_depclean.py
index f3c4c638cd8..f3c4c638cd8 100644
--- a/pym/portage/tests/resolver/test_depclean.py
+++ b/lib/portage/tests/resolver/test_depclean.py
diff --git a/pym/portage/tests/resolver/test_depclean_order.py b/lib/portage/tests/resolver/test_depclean_order.py
index 9511d292c76..9511d292c76 100644
--- a/pym/portage/tests/resolver/test_depclean_order.py
+++ b/lib/portage/tests/resolver/test_depclean_order.py
diff --git a/pym/portage/tests/resolver/test_depclean_slot_unavailable.py b/lib/portage/tests/resolver/test_depclean_slot_unavailable.py
index 689392bb5be..689392bb5be 100644
--- a/pym/portage/tests/resolver/test_depclean_slot_unavailable.py
+++ b/lib/portage/tests/resolver/test_depclean_slot_unavailable.py
diff --git a/pym/portage/tests/resolver/test_depth.py b/lib/portage/tests/resolver/test_depth.py
index cb1e2dd5d90..cb1e2dd5d90 100644
--- a/pym/portage/tests/resolver/test_depth.py
+++ b/lib/portage/tests/resolver/test_depth.py
diff --git a/pym/portage/tests/resolver/test_disjunctive_depend_order.py b/lib/portage/tests/resolver/test_disjunctive_depend_order.py
index 88f6dac2d9f..88f6dac2d9f 100644
--- a/pym/portage/tests/resolver/test_disjunctive_depend_order.py
+++ b/lib/portage/tests/resolver/test_disjunctive_depend_order.py
diff --git a/pym/portage/tests/resolver/test_eapi.py b/lib/portage/tests/resolver/test_eapi.py
index 50b9d90da22..50b9d90da22 100644
--- a/pym/portage/tests/resolver/test_eapi.py
+++ b/lib/portage/tests/resolver/test_eapi.py
diff --git a/pym/portage/tests/resolver/test_features_test_use.py b/lib/portage/tests/resolver/test_features_test_use.py
index bdd179d7a09..bdd179d7a09 100644
--- a/pym/portage/tests/resolver/test_features_test_use.py
+++ b/lib/portage/tests/resolver/test_features_test_use.py
diff --git a/pym/portage/tests/resolver/test_imagemagick_graphicsmagick.py b/lib/portage/tests/resolver/test_imagemagick_graphicsmagick.py
index e5a3d7d7dc1..e5a3d7d7dc1 100644
--- a/pym/portage/tests/resolver/test_imagemagick_graphicsmagick.py
+++ b/lib/portage/tests/resolver/test_imagemagick_graphicsmagick.py
diff --git a/pym/portage/tests/resolver/test_keywords.py b/lib/portage/tests/resolver/test_keywords.py
index d59ea58816c..d59ea58816c 100644
--- a/pym/portage/tests/resolver/test_keywords.py
+++ b/lib/portage/tests/resolver/test_keywords.py
diff --git a/pym/portage/tests/resolver/test_merge_order.py b/lib/portage/tests/resolver/test_merge_order.py
index 5d000d12b1e..5d000d12b1e 100644
--- a/pym/portage/tests/resolver/test_merge_order.py
+++ b/lib/portage/tests/resolver/test_merge_order.py
diff --git a/pym/portage/tests/resolver/test_missing_iuse_and_evaluated_atoms.py b/lib/portage/tests/resolver/test_missing_iuse_and_evaluated_atoms.py
index a860e7bb6f0..a860e7bb6f0 100644
--- a/pym/portage/tests/resolver/test_missing_iuse_and_evaluated_atoms.py
+++ b/lib/portage/tests/resolver/test_missing_iuse_and_evaluated_atoms.py
diff --git a/pym/portage/tests/resolver/test_multirepo.py b/lib/portage/tests/resolver/test_multirepo.py
index dabec6af92e..dabec6af92e 100644
--- a/pym/portage/tests/resolver/test_multirepo.py
+++ b/lib/portage/tests/resolver/test_multirepo.py
diff --git a/pym/portage/tests/resolver/test_multislot.py b/lib/portage/tests/resolver/test_multislot.py
index cbb1beebb07..cbb1beebb07 100644
--- a/pym/portage/tests/resolver/test_multislot.py
+++ b/lib/portage/tests/resolver/test_multislot.py
diff --git a/pym/portage/tests/resolver/test_old_dep_chain_display.py b/lib/portage/tests/resolver/test_old_dep_chain_display.py
index 8aedf5999f8..8aedf5999f8 100644
--- a/pym/portage/tests/resolver/test_old_dep_chain_display.py
+++ b/lib/portage/tests/resolver/test_old_dep_chain_display.py
diff --git a/pym/portage/tests/resolver/test_onlydeps.py b/lib/portage/tests/resolver/test_onlydeps.py
index 986769aeebd..986769aeebd 100644
--- a/pym/portage/tests/resolver/test_onlydeps.py
+++ b/lib/portage/tests/resolver/test_onlydeps.py
diff --git a/pym/portage/tests/resolver/test_onlydeps_circular.py b/lib/portage/tests/resolver/test_onlydeps_circular.py
index ce35cee854d..ce35cee854d 100644
--- a/pym/portage/tests/resolver/test_onlydeps_circular.py
+++ b/lib/portage/tests/resolver/test_onlydeps_circular.py
diff --git a/pym/portage/tests/resolver/test_onlydeps_minimal.py b/lib/portage/tests/resolver/test_onlydeps_minimal.py
index efda02c591a..efda02c591a 100644
--- a/pym/portage/tests/resolver/test_onlydeps_minimal.py
+++ b/lib/portage/tests/resolver/test_onlydeps_minimal.py
diff --git a/pym/portage/tests/resolver/test_or_choices.py b/lib/portage/tests/resolver/test_or_choices.py
index 63e62d010d7..63e62d010d7 100644
--- a/pym/portage/tests/resolver/test_or_choices.py
+++ b/lib/portage/tests/resolver/test_or_choices.py
diff --git a/pym/portage/tests/resolver/test_or_downgrade_installed.py b/lib/portage/tests/resolver/test_or_downgrade_installed.py
index 22307a5bc4d..22307a5bc4d 100644
--- a/pym/portage/tests/resolver/test_or_downgrade_installed.py
+++ b/lib/portage/tests/resolver/test_or_downgrade_installed.py
diff --git a/pym/portage/tests/resolver/test_or_upgrade_installed.py b/lib/portage/tests/resolver/test_or_upgrade_installed.py
index 7018e08de00..7018e08de00 100644
--- a/pym/portage/tests/resolver/test_or_upgrade_installed.py
+++ b/lib/portage/tests/resolver/test_or_upgrade_installed.py
diff --git a/pym/portage/tests/resolver/test_output.py b/lib/portage/tests/resolver/test_output.py
index 34efe9c562b..34efe9c562b 100644
--- a/pym/portage/tests/resolver/test_output.py
+++ b/lib/portage/tests/resolver/test_output.py
diff --git a/pym/portage/tests/resolver/test_package_tracker.py b/lib/portage/tests/resolver/test_package_tracker.py
index 468c3d8a5c4..468c3d8a5c4 100644
--- a/pym/portage/tests/resolver/test_package_tracker.py
+++ b/lib/portage/tests/resolver/test_package_tracker.py
diff --git a/pym/portage/tests/resolver/test_profile_default_eapi.py b/lib/portage/tests/resolver/test_profile_default_eapi.py
index cc572194924..cc572194924 100644
--- a/pym/portage/tests/resolver/test_profile_default_eapi.py
+++ b/lib/portage/tests/resolver/test_profile_default_eapi.py
diff --git a/pym/portage/tests/resolver/test_profile_package_set.py b/lib/portage/tests/resolver/test_profile_package_set.py
index 88a2a825987..88a2a825987 100644
--- a/pym/portage/tests/resolver/test_profile_package_set.py
+++ b/lib/portage/tests/resolver/test_profile_package_set.py
diff --git a/pym/portage/tests/resolver/test_rebuild.py b/lib/portage/tests/resolver/test_rebuild.py
index 6f1a7834b44..6f1a7834b44 100644
--- a/pym/portage/tests/resolver/test_rebuild.py
+++ b/lib/portage/tests/resolver/test_rebuild.py
diff --git a/pym/portage/tests/resolver/test_regular_slot_change_without_revbump.py b/lib/portage/tests/resolver/test_regular_slot_change_without_revbump.py
index 415277bc7ae..415277bc7ae 100644
--- a/pym/portage/tests/resolver/test_regular_slot_change_without_revbump.py
+++ b/lib/portage/tests/resolver/test_regular_slot_change_without_revbump.py
diff --git a/pym/portage/tests/resolver/test_required_use.py b/lib/portage/tests/resolver/test_required_use.py
index c679ce3005f..c679ce3005f 100644
--- a/pym/portage/tests/resolver/test_required_use.py
+++ b/lib/portage/tests/resolver/test_required_use.py
diff --git a/pym/portage/tests/resolver/test_runtime_cycle_merge_order.py b/lib/portage/tests/resolver/test_runtime_cycle_merge_order.py
index 438d9cbfcee..438d9cbfcee 100644
--- a/pym/portage/tests/resolver/test_runtime_cycle_merge_order.py
+++ b/lib/portage/tests/resolver/test_runtime_cycle_merge_order.py
diff --git a/pym/portage/tests/resolver/test_simple.py b/lib/portage/tests/resolver/test_simple.py
index 324ffa2a6c6..324ffa2a6c6 100644
--- a/pym/portage/tests/resolver/test_simple.py
+++ b/lib/portage/tests/resolver/test_simple.py
diff --git a/pym/portage/tests/resolver/test_slot_abi.py b/lib/portage/tests/resolver/test_slot_abi.py
index 7dbbebe2f66..7dbbebe2f66 100644
--- a/pym/portage/tests/resolver/test_slot_abi.py
+++ b/lib/portage/tests/resolver/test_slot_abi.py
diff --git a/pym/portage/tests/resolver/test_slot_abi_downgrade.py b/lib/portage/tests/resolver/test_slot_abi_downgrade.py
index 08e9a9db202..08e9a9db202 100644
--- a/pym/portage/tests/resolver/test_slot_abi_downgrade.py
+++ b/lib/portage/tests/resolver/test_slot_abi_downgrade.py
diff --git a/pym/portage/tests/resolver/test_slot_change_without_revbump.py b/lib/portage/tests/resolver/test_slot_change_without_revbump.py
index 5cd8c53d1e5..5cd8c53d1e5 100644
--- a/pym/portage/tests/resolver/test_slot_change_without_revbump.py
+++ b/lib/portage/tests/resolver/test_slot_change_without_revbump.py
diff --git a/pym/portage/tests/resolver/test_slot_collisions.py b/lib/portage/tests/resolver/test_slot_collisions.py
index 430ccaad685..430ccaad685 100644
--- a/pym/portage/tests/resolver/test_slot_collisions.py
+++ b/lib/portage/tests/resolver/test_slot_collisions.py
diff --git a/pym/portage/tests/resolver/test_slot_conflict_force_rebuild.py b/lib/portage/tests/resolver/test_slot_conflict_force_rebuild.py
index 4170bfd9ddd..4170bfd9ddd 100644
--- a/pym/portage/tests/resolver/test_slot_conflict_force_rebuild.py
+++ b/lib/portage/tests/resolver/test_slot_conflict_force_rebuild.py
diff --git a/pym/portage/tests/resolver/test_slot_conflict_mask_update.py b/lib/portage/tests/resolver/test_slot_conflict_mask_update.py
index a90eeac295e..a90eeac295e 100644
--- a/pym/portage/tests/resolver/test_slot_conflict_mask_update.py
+++ b/lib/portage/tests/resolver/test_slot_conflict_mask_update.py
diff --git a/pym/portage/tests/resolver/test_slot_conflict_rebuild.py b/lib/portage/tests/resolver/test_slot_conflict_rebuild.py
index 95b6396ba2a..95b6396ba2a 100644
--- a/pym/portage/tests/resolver/test_slot_conflict_rebuild.py
+++ b/lib/portage/tests/resolver/test_slot_conflict_rebuild.py
diff --git a/pym/portage/tests/resolver/test_slot_conflict_unsatisfied_deep_deps.py b/lib/portage/tests/resolver/test_slot_conflict_unsatisfied_deep_deps.py
index 846ba0e59f3..846ba0e59f3 100644
--- a/pym/portage/tests/resolver/test_slot_conflict_unsatisfied_deep_deps.py
+++ b/lib/portage/tests/resolver/test_slot_conflict_unsatisfied_deep_deps.py
diff --git a/pym/portage/tests/resolver/test_slot_conflict_update.py b/lib/portage/tests/resolver/test_slot_conflict_update.py
index f251d01f115..f251d01f115 100644
--- a/pym/portage/tests/resolver/test_slot_conflict_update.py
+++ b/lib/portage/tests/resolver/test_slot_conflict_update.py
diff --git a/pym/portage/tests/resolver/test_slot_operator_autounmask.py b/lib/portage/tests/resolver/test_slot_operator_autounmask.py
index 624271b39cb..624271b39cb 100644
--- a/pym/portage/tests/resolver/test_slot_operator_autounmask.py
+++ b/lib/portage/tests/resolver/test_slot_operator_autounmask.py
diff --git a/pym/portage/tests/resolver/test_slot_operator_complete_graph.py b/lib/portage/tests/resolver/test_slot_operator_complete_graph.py
index 1d59bcef1b9..1d59bcef1b9 100644
--- a/pym/portage/tests/resolver/test_slot_operator_complete_graph.py
+++ b/lib/portage/tests/resolver/test_slot_operator_complete_graph.py
diff --git a/pym/portage/tests/resolver/test_slot_operator_exclusive_slots.py b/lib/portage/tests/resolver/test_slot_operator_exclusive_slots.py
index 689ed31d00e..689ed31d00e 100644
--- a/pym/portage/tests/resolver/test_slot_operator_exclusive_slots.py
+++ b/lib/portage/tests/resolver/test_slot_operator_exclusive_slots.py
diff --git a/pym/portage/tests/resolver/test_slot_operator_rebuild.py b/lib/portage/tests/resolver/test_slot_operator_rebuild.py
index 38168333170..38168333170 100644
--- a/pym/portage/tests/resolver/test_slot_operator_rebuild.py
+++ b/lib/portage/tests/resolver/test_slot_operator_rebuild.py
diff --git a/pym/portage/tests/resolver/test_slot_operator_required_use.py b/lib/portage/tests/resolver/test_slot_operator_required_use.py
index 9cc6dbad498..9cc6dbad498 100644
--- a/pym/portage/tests/resolver/test_slot_operator_required_use.py
+++ b/lib/portage/tests/resolver/test_slot_operator_required_use.py
diff --git a/pym/portage/tests/resolver/test_slot_operator_reverse_deps.py b/lib/portage/tests/resolver/test_slot_operator_reverse_deps.py
index ce614a4dc9a..ce614a4dc9a 100644
--- a/pym/portage/tests/resolver/test_slot_operator_reverse_deps.py
+++ b/lib/portage/tests/resolver/test_slot_operator_reverse_deps.py
diff --git a/pym/portage/tests/resolver/test_slot_operator_runtime_pkg_mask.py b/lib/portage/tests/resolver/test_slot_operator_runtime_pkg_mask.py
index 0a5a7fa787c..0a5a7fa787c 100644
--- a/pym/portage/tests/resolver/test_slot_operator_runtime_pkg_mask.py
+++ b/lib/portage/tests/resolver/test_slot_operator_runtime_pkg_mask.py
diff --git a/pym/portage/tests/resolver/test_slot_operator_unsatisfied.py b/lib/portage/tests/resolver/test_slot_operator_unsatisfied.py
index e3b53d159d0..e3b53d159d0 100644
--- a/pym/portage/tests/resolver/test_slot_operator_unsatisfied.py
+++ b/lib/portage/tests/resolver/test_slot_operator_unsatisfied.py
diff --git a/pym/portage/tests/resolver/test_slot_operator_unsolved.py b/lib/portage/tests/resolver/test_slot_operator_unsolved.py
index c19783ddfac..c19783ddfac 100644
--- a/pym/portage/tests/resolver/test_slot_operator_unsolved.py
+++ b/lib/portage/tests/resolver/test_slot_operator_unsolved.py
diff --git a/pym/portage/tests/resolver/test_slot_operator_update_probe_parent_downgrade.py b/lib/portage/tests/resolver/test_slot_operator_update_probe_parent_downgrade.py
index 2ec15b60276..2ec15b60276 100644
--- a/pym/portage/tests/resolver/test_slot_operator_update_probe_parent_downgrade.py
+++ b/lib/portage/tests/resolver/test_slot_operator_update_probe_parent_downgrade.py
diff --git a/pym/portage/tests/resolver/test_solve_non_slot_operator_slot_conflicts.py b/lib/portage/tests/resolver/test_solve_non_slot_operator_slot_conflicts.py
index c6024f404dc..c6024f404dc 100644
--- a/pym/portage/tests/resolver/test_solve_non_slot_operator_slot_conflicts.py
+++ b/lib/portage/tests/resolver/test_solve_non_slot_operator_slot_conflicts.py
diff --git a/pym/portage/tests/resolver/test_targetroot.py b/lib/portage/tests/resolver/test_targetroot.py
index db6c60de3b9..db6c60de3b9 100644
--- a/pym/portage/tests/resolver/test_targetroot.py
+++ b/lib/portage/tests/resolver/test_targetroot.py
diff --git a/pym/portage/tests/resolver/test_unpack_dependencies.py b/lib/portage/tests/resolver/test_unpack_dependencies.py
index cfceff4b16a..cfceff4b16a 100644
--- a/pym/portage/tests/resolver/test_unpack_dependencies.py
+++ b/lib/portage/tests/resolver/test_unpack_dependencies.py
diff --git a/pym/portage/tests/resolver/test_use_aliases.py b/lib/portage/tests/resolver/test_use_aliases.py
index 7c2debbb198..7c2debbb198 100644
--- a/pym/portage/tests/resolver/test_use_aliases.py
+++ b/lib/portage/tests/resolver/test_use_aliases.py
diff --git a/pym/portage/tests/resolver/test_use_dep_defaults.py b/lib/portage/tests/resolver/test_use_dep_defaults.py
index 7d171066e24..7d171066e24 100644
--- a/pym/portage/tests/resolver/test_use_dep_defaults.py
+++ b/lib/portage/tests/resolver/test_use_dep_defaults.py
diff --git a/pym/portage/tests/resolver/test_useflags.py b/lib/portage/tests/resolver/test_useflags.py
index 0a5f3b3ffde..0a5f3b3ffde 100644
--- a/pym/portage/tests/resolver/test_useflags.py
+++ b/lib/portage/tests/resolver/test_useflags.py
diff --git a/pym/portage/tests/resolver/test_virtual_minimize_children.py b/lib/portage/tests/resolver/test_virtual_minimize_children.py
index b566cb59214..b566cb59214 100644
--- a/pym/portage/tests/resolver/test_virtual_minimize_children.py
+++ b/lib/portage/tests/resolver/test_virtual_minimize_children.py
diff --git a/pym/portage/tests/resolver/test_virtual_slot.py b/lib/portage/tests/resolver/test_virtual_slot.py
index ef4bd367a45..ef4bd367a45 100644
--- a/pym/portage/tests/resolver/test_virtual_slot.py
+++ b/lib/portage/tests/resolver/test_virtual_slot.py
diff --git a/pym/portage/tests/resolver/test_with_test_deps.py b/lib/portage/tests/resolver/test_with_test_deps.py
index 5bfc6a8a260..5bfc6a8a260 100644
--- a/pym/portage/tests/resolver/test_with_test_deps.py
+++ b/lib/portage/tests/resolver/test_with_test_deps.py
diff --git a/pym/portage/tests/runTests.py b/lib/portage/tests/runTests.py
index d4d1f7c7632..d4d1f7c7632 100755
--- a/pym/portage/tests/runTests.py
+++ b/lib/portage/tests/runTests.py
diff --git a/pym/portage/tests/sets/__init__.py b/lib/portage/tests/sets/__init__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/pym/portage/tests/sets/__init__.py
+++ b/lib/portage/tests/sets/__init__.py
diff --git a/pym/portage/tests/sets/__test__.py b/lib/portage/tests/sets/__test__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/pym/portage/tests/sets/__test__.py
+++ b/lib/portage/tests/sets/__test__.py
diff --git a/pym/portage/tests/sets/base/__init__.py b/lib/portage/tests/sets/base/__init__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/pym/portage/tests/sets/base/__init__.py
+++ b/lib/portage/tests/sets/base/__init__.py
diff --git a/pym/portage/tests/sets/base/__test__.py b/lib/portage/tests/sets/base/__test__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/pym/portage/tests/sets/base/__test__.py
+++ b/lib/portage/tests/sets/base/__test__.py
diff --git a/pym/portage/tests/sets/base/testInternalPackageSet.py b/lib/portage/tests/sets/base/testInternalPackageSet.py
index e0a34787693..e0a34787693 100644
--- a/pym/portage/tests/sets/base/testInternalPackageSet.py
+++ b/lib/portage/tests/sets/base/testInternalPackageSet.py
diff --git a/pym/portage/tests/sets/files/__init__.py b/lib/portage/tests/sets/files/__init__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/pym/portage/tests/sets/files/__init__.py
+++ b/lib/portage/tests/sets/files/__init__.py
diff --git a/pym/portage/tests/sets/files/__test__.py b/lib/portage/tests/sets/files/__test__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/pym/portage/tests/sets/files/__test__.py
+++ b/lib/portage/tests/sets/files/__test__.py
diff --git a/pym/portage/tests/sets/files/testConfigFileSet.py b/lib/portage/tests/sets/files/testConfigFileSet.py
index 3ec26a07702..3ec26a07702 100644
--- a/pym/portage/tests/sets/files/testConfigFileSet.py
+++ b/lib/portage/tests/sets/files/testConfigFileSet.py
diff --git a/pym/portage/tests/sets/files/testStaticFileSet.py b/lib/portage/tests/sets/files/testStaticFileSet.py
index d515a6728b4..d515a6728b4 100644
--- a/pym/portage/tests/sets/files/testStaticFileSet.py
+++ b/lib/portage/tests/sets/files/testStaticFileSet.py
diff --git a/pym/portage/tests/sets/shell/__init__.py b/lib/portage/tests/sets/shell/__init__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/pym/portage/tests/sets/shell/__init__.py
+++ b/lib/portage/tests/sets/shell/__init__.py
diff --git a/pym/portage/tests/sets/shell/__test__.py b/lib/portage/tests/sets/shell/__test__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/pym/portage/tests/sets/shell/__test__.py
+++ b/lib/portage/tests/sets/shell/__test__.py
diff --git a/pym/portage/tests/sets/shell/testShell.py b/lib/portage/tests/sets/shell/testShell.py
index 2cdd833c32f..2cdd833c32f 100644
--- a/pym/portage/tests/sets/shell/testShell.py
+++ b/lib/portage/tests/sets/shell/testShell.py
diff --git a/pym/portage/tests/sync/__init__.py b/lib/portage/tests/sync/__init__.py
index 7cd880e11d9..7cd880e11d9 100644
--- a/pym/portage/tests/sync/__init__.py
+++ b/lib/portage/tests/sync/__init__.py
diff --git a/pym/portage/tests/sync/__test__.py b/lib/portage/tests/sync/__test__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/pym/portage/tests/sync/__test__.py
+++ b/lib/portage/tests/sync/__test__.py
diff --git a/pym/portage/tests/sync/test_sync_local.py b/lib/portage/tests/sync/test_sync_local.py
index 17ff6f200c9..17ff6f200c9 100644
--- a/pym/portage/tests/sync/test_sync_local.py
+++ b/lib/portage/tests/sync/test_sync_local.py
diff --git a/pym/portage/tests/unicode/__init__.py b/lib/portage/tests/unicode/__init__.py
index 21a391aeecf..21a391aeecf 100644
--- a/pym/portage/tests/unicode/__init__.py
+++ b/lib/portage/tests/unicode/__init__.py
diff --git a/pym/portage/tests/unicode/__test__.py b/lib/portage/tests/unicode/__test__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/pym/portage/tests/unicode/__test__.py
+++ b/lib/portage/tests/unicode/__test__.py
diff --git a/pym/portage/tests/unicode/test_string_format.py b/lib/portage/tests/unicode/test_string_format.py
index 9d4366a91b9..9d4366a91b9 100644
--- a/pym/portage/tests/unicode/test_string_format.py
+++ b/lib/portage/tests/unicode/test_string_format.py
diff --git a/pym/portage/tests/update/__init__.py b/lib/portage/tests/update/__init__.py
index 418ad862bbc..418ad862bbc 100644
--- a/pym/portage/tests/update/__init__.py
+++ b/lib/portage/tests/update/__init__.py
diff --git a/pym/portage/tests/update/__test__.py b/lib/portage/tests/update/__test__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/pym/portage/tests/update/__test__.py
+++ b/lib/portage/tests/update/__test__.py
diff --git a/pym/portage/tests/update/test_move_ent.py b/lib/portage/tests/update/test_move_ent.py
index d9647a95e83..d9647a95e83 100644
--- a/pym/portage/tests/update/test_move_ent.py
+++ b/lib/portage/tests/update/test_move_ent.py
diff --git a/pym/portage/tests/update/test_move_slot_ent.py b/lib/portage/tests/update/test_move_slot_ent.py
index 3e49e1144dc..3e49e1144dc 100644
--- a/pym/portage/tests/update/test_move_slot_ent.py
+++ b/lib/portage/tests/update/test_move_slot_ent.py
diff --git a/pym/portage/tests/update/test_update_dbentry.py b/lib/portage/tests/update/test_update_dbentry.py
index 88951149a45..88951149a45 100644
--- a/pym/portage/tests/update/test_update_dbentry.py
+++ b/lib/portage/tests/update/test_update_dbentry.py
diff --git a/pym/portage/tests/util/__init__.py b/lib/portage/tests/util/__init__.py
index 69ce1898d21..69ce1898d21 100644
--- a/pym/portage/tests/util/__init__.py
+++ b/lib/portage/tests/util/__init__.py
diff --git a/pym/portage/tests/util/__test__.py b/lib/portage/tests/util/__test__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/pym/portage/tests/util/__test__.py
+++ b/lib/portage/tests/util/__test__.py
diff --git a/pym/portage/tests/util/dyn_libs/__init__.py b/lib/portage/tests/util/dyn_libs/__init__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/pym/portage/tests/util/dyn_libs/__init__.py
+++ b/lib/portage/tests/util/dyn_libs/__init__.py
diff --git a/pym/portage/tests/util/dyn_libs/__test__.py b/lib/portage/tests/util/dyn_libs/__test__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/pym/portage/tests/util/dyn_libs/__test__.py
+++ b/lib/portage/tests/util/dyn_libs/__test__.py
diff --git a/pym/portage/tests/util/dyn_libs/test_soname_deps.py b/lib/portage/tests/util/dyn_libs/test_soname_deps.py
index 823890c910f..823890c910f 100644
--- a/pym/portage/tests/util/dyn_libs/test_soname_deps.py
+++ b/lib/portage/tests/util/dyn_libs/test_soname_deps.py
diff --git a/pym/portage/tests/util/eventloop/__init__.py b/lib/portage/tests/util/eventloop/__init__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/pym/portage/tests/util/eventloop/__init__.py
+++ b/lib/portage/tests/util/eventloop/__init__.py
diff --git a/pym/portage/tests/util/eventloop/__test__.py b/lib/portage/tests/util/eventloop/__test__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/pym/portage/tests/util/eventloop/__test__.py
+++ b/lib/portage/tests/util/eventloop/__test__.py
diff --git a/pym/portage/tests/util/eventloop/test_call_soon_fifo.py b/lib/portage/tests/util/eventloop/test_call_soon_fifo.py
index f970c67a132..f970c67a132 100644
--- a/pym/portage/tests/util/eventloop/test_call_soon_fifo.py
+++ b/lib/portage/tests/util/eventloop/test_call_soon_fifo.py
diff --git a/pym/portage/tests/util/file_copy/__init__.py b/lib/portage/tests/util/file_copy/__init__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/pym/portage/tests/util/file_copy/__init__.py
+++ b/lib/portage/tests/util/file_copy/__init__.py
diff --git a/pym/portage/tests/util/file_copy/__test__.py b/lib/portage/tests/util/file_copy/__test__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/pym/portage/tests/util/file_copy/__test__.py
+++ b/lib/portage/tests/util/file_copy/__test__.py
diff --git a/pym/portage/tests/util/file_copy/test_copyfile.py b/lib/portage/tests/util/file_copy/test_copyfile.py
index b900fdef0bd..b900fdef0bd 100644
--- a/pym/portage/tests/util/file_copy/test_copyfile.py
+++ b/lib/portage/tests/util/file_copy/test_copyfile.py
diff --git a/pym/portage/tests/util/futures/__init__.py b/lib/portage/tests/util/futures/__init__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/pym/portage/tests/util/futures/__init__.py
+++ b/lib/portage/tests/util/futures/__init__.py
diff --git a/pym/portage/tests/util/futures/__test__.py b/lib/portage/tests/util/futures/__test__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/pym/portage/tests/util/futures/__test__.py
+++ b/lib/portage/tests/util/futures/__test__.py
diff --git a/pym/portage/tests/util/futures/asyncio/__init__.py b/lib/portage/tests/util/futures/asyncio/__init__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/pym/portage/tests/util/futures/asyncio/__init__.py
+++ b/lib/portage/tests/util/futures/asyncio/__init__.py
diff --git a/pym/portage/tests/util/futures/asyncio/__test__.py b/lib/portage/tests/util/futures/asyncio/__test__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/pym/portage/tests/util/futures/asyncio/__test__.py
+++ b/lib/portage/tests/util/futures/asyncio/__test__.py
diff --git a/pym/portage/tests/util/futures/asyncio/test_child_watcher.py b/lib/portage/tests/util/futures/asyncio/test_child_watcher.py
index 0fc73ab497c..0fc73ab497c 100644
--- a/pym/portage/tests/util/futures/asyncio/test_child_watcher.py
+++ b/lib/portage/tests/util/futures/asyncio/test_child_watcher.py
diff --git a/pym/portage/tests/util/futures/asyncio/test_event_loop_in_fork.py b/lib/portage/tests/util/futures/asyncio/test_event_loop_in_fork.py
index 1779534379b..1779534379b 100644
--- a/pym/portage/tests/util/futures/asyncio/test_event_loop_in_fork.py
+++ b/lib/portage/tests/util/futures/asyncio/test_event_loop_in_fork.py
diff --git a/pym/portage/tests/util/futures/asyncio/test_pipe_closed.py b/lib/portage/tests/util/futures/asyncio/test_pipe_closed.py
index 507385c0465..507385c0465 100644
--- a/pym/portage/tests/util/futures/asyncio/test_pipe_closed.py
+++ b/lib/portage/tests/util/futures/asyncio/test_pipe_closed.py
diff --git a/pym/portage/tests/util/futures/asyncio/test_policy_wrapper_recursion.py b/lib/portage/tests/util/futures/asyncio/test_policy_wrapper_recursion.py
index d3cd94b351f..d3cd94b351f 100644
--- a/pym/portage/tests/util/futures/asyncio/test_policy_wrapper_recursion.py
+++ b/lib/portage/tests/util/futures/asyncio/test_policy_wrapper_recursion.py
diff --git a/pym/portage/tests/util/futures/asyncio/test_run_until_complete.py b/lib/portage/tests/util/futures/asyncio/test_run_until_complete.py
index c0e86ae5eac..c0e86ae5eac 100644
--- a/pym/portage/tests/util/futures/asyncio/test_run_until_complete.py
+++ b/lib/portage/tests/util/futures/asyncio/test_run_until_complete.py
diff --git a/pym/portage/tests/util/futures/asyncio/test_subprocess_exec.py b/lib/portage/tests/util/futures/asyncio/test_subprocess_exec.py
index 5a812ba6a6a..5a812ba6a6a 100644
--- a/pym/portage/tests/util/futures/asyncio/test_subprocess_exec.py
+++ b/lib/portage/tests/util/futures/asyncio/test_subprocess_exec.py
diff --git a/pym/portage/tests/util/futures/asyncio/test_wakeup_fd_sigchld.py b/lib/portage/tests/util/futures/asyncio/test_wakeup_fd_sigchld.py
index abc67c2412f..abc67c2412f 100644
--- a/pym/portage/tests/util/futures/asyncio/test_wakeup_fd_sigchld.py
+++ b/lib/portage/tests/util/futures/asyncio/test_wakeup_fd_sigchld.py
diff --git a/pym/portage/tests/util/futures/test_compat_coroutine.py b/lib/portage/tests/util/futures/test_compat_coroutine.py
index cbc07086948..cbc07086948 100644
--- a/pym/portage/tests/util/futures/test_compat_coroutine.py
+++ b/lib/portage/tests/util/futures/test_compat_coroutine.py
diff --git a/pym/portage/tests/util/futures/test_done_callback.py b/lib/portage/tests/util/futures/test_done_callback.py
index 76b727b09e3..76b727b09e3 100644
--- a/pym/portage/tests/util/futures/test_done_callback.py
+++ b/lib/portage/tests/util/futures/test_done_callback.py
diff --git a/pym/portage/tests/util/futures/test_iter_completed.py b/lib/portage/tests/util/futures/test_iter_completed.py
index 9ab410a9e6a..9ab410a9e6a 100644
--- a/pym/portage/tests/util/futures/test_iter_completed.py
+++ b/lib/portage/tests/util/futures/test_iter_completed.py
diff --git a/pym/portage/tests/util/futures/test_retry.py b/lib/portage/tests/util/futures/test_retry.py
index 7a1e76280bd..7a1e76280bd 100644
--- a/pym/portage/tests/util/futures/test_retry.py
+++ b/lib/portage/tests/util/futures/test_retry.py
diff --git a/pym/portage/tests/util/test_checksum.py b/lib/portage/tests/util/test_checksum.py
index 01ac8f9d02a..01ac8f9d02a 100644
--- a/pym/portage/tests/util/test_checksum.py
+++ b/lib/portage/tests/util/test_checksum.py
diff --git a/pym/portage/tests/util/test_digraph.py b/lib/portage/tests/util/test_digraph.py
index 01e075c9931..01e075c9931 100644
--- a/pym/portage/tests/util/test_digraph.py
+++ b/lib/portage/tests/util/test_digraph.py
diff --git a/pym/portage/tests/util/test_getconfig.py b/lib/portage/tests/util/test_getconfig.py
index e79fca4b972..e79fca4b972 100644
--- a/pym/portage/tests/util/test_getconfig.py
+++ b/lib/portage/tests/util/test_getconfig.py
diff --git a/pym/portage/tests/util/test_grabdict.py b/lib/portage/tests/util/test_grabdict.py
index e62a75dcce4..e62a75dcce4 100644
--- a/pym/portage/tests/util/test_grabdict.py
+++ b/lib/portage/tests/util/test_grabdict.py
diff --git a/pym/portage/tests/util/test_install_mask.py b/lib/portage/tests/util/test_install_mask.py
index f651eb4b754..f651eb4b754 100644
--- a/pym/portage/tests/util/test_install_mask.py
+++ b/lib/portage/tests/util/test_install_mask.py
diff --git a/pym/portage/tests/util/test_normalizedPath.py b/lib/portage/tests/util/test_normalizedPath.py
index f993886ac34..f993886ac34 100644
--- a/pym/portage/tests/util/test_normalizedPath.py
+++ b/lib/portage/tests/util/test_normalizedPath.py
diff --git a/pym/portage/tests/util/test_stackDictList.py b/lib/portage/tests/util/test_stackDictList.py
index 25a723c692c..25a723c692c 100644
--- a/pym/portage/tests/util/test_stackDictList.py
+++ b/lib/portage/tests/util/test_stackDictList.py
diff --git a/pym/portage/tests/util/test_stackDicts.py b/lib/portage/tests/util/test_stackDicts.py
index 0c1dcdb78b9..0c1dcdb78b9 100644
--- a/pym/portage/tests/util/test_stackDicts.py
+++ b/lib/portage/tests/util/test_stackDicts.py
diff --git a/pym/portage/tests/util/test_stackLists.py b/lib/portage/tests/util/test_stackLists.py
index 3ba69ecd2a8..3ba69ecd2a8 100644
--- a/pym/portage/tests/util/test_stackLists.py
+++ b/lib/portage/tests/util/test_stackLists.py
diff --git a/pym/portage/tests/util/test_uniqueArray.py b/lib/portage/tests/util/test_uniqueArray.py
index aae88cce892..aae88cce892 100644
--- a/pym/portage/tests/util/test_uniqueArray.py
+++ b/lib/portage/tests/util/test_uniqueArray.py
diff --git a/pym/portage/tests/util/test_varExpand.py b/lib/portage/tests/util/test_varExpand.py
index d8addf2de60..d8addf2de60 100644
--- a/pym/portage/tests/util/test_varExpand.py
+++ b/lib/portage/tests/util/test_varExpand.py
diff --git a/pym/portage/tests/util/test_whirlpool.py b/lib/portage/tests/util/test_whirlpool.py
index fbe7cae563a..fbe7cae563a 100644
--- a/pym/portage/tests/util/test_whirlpool.py
+++ b/lib/portage/tests/util/test_whirlpool.py
diff --git a/pym/portage/tests/util/test_xattr.py b/lib/portage/tests/util/test_xattr.py
index 2e2564a6e91..2e2564a6e91 100644
--- a/pym/portage/tests/util/test_xattr.py
+++ b/lib/portage/tests/util/test_xattr.py
diff --git a/pym/portage/tests/versions/__init__.py b/lib/portage/tests/versions/__init__.py
index 2b14180bcf4..2b14180bcf4 100644
--- a/pym/portage/tests/versions/__init__.py
+++ b/lib/portage/tests/versions/__init__.py
diff --git a/pym/portage/tests/versions/__test__.py b/lib/portage/tests/versions/__test__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/pym/portage/tests/versions/__test__.py
+++ b/lib/portage/tests/versions/__test__.py
diff --git a/pym/portage/tests/versions/test_cpv_sort_key.py b/lib/portage/tests/versions/test_cpv_sort_key.py
index eeb0eae697c..eeb0eae697c 100644
--- a/pym/portage/tests/versions/test_cpv_sort_key.py
+++ b/lib/portage/tests/versions/test_cpv_sort_key.py
diff --git a/pym/portage/tests/versions/test_vercmp.py b/lib/portage/tests/versions/test_vercmp.py
index b55518f0207..b55518f0207 100644
--- a/pym/portage/tests/versions/test_vercmp.py
+++ b/lib/portage/tests/versions/test_vercmp.py
diff --git a/pym/portage/tests/xpak/__init__.py b/lib/portage/tests/xpak/__init__.py
index 9c3f52476f9..9c3f52476f9 100644
--- a/pym/portage/tests/xpak/__init__.py
+++ b/lib/portage/tests/xpak/__init__.py
diff --git a/pym/portage/tests/xpak/__test__.py b/lib/portage/tests/xpak/__test__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/pym/portage/tests/xpak/__test__.py
+++ b/lib/portage/tests/xpak/__test__.py
diff --git a/pym/portage/tests/xpak/test_decodeint.py b/lib/portage/tests/xpak/test_decodeint.py
index 2da5735981f..2da5735981f 100644
--- a/pym/portage/tests/xpak/test_decodeint.py
+++ b/lib/portage/tests/xpak/test_decodeint.py
diff --git a/pym/portage/update.py b/lib/portage/update.py
index 83fc3d2b442..83fc3d2b442 100644
--- a/pym/portage/update.py
+++ b/lib/portage/update.py
diff --git a/pym/portage/util/ExtractKernelVersion.py b/lib/portage/util/ExtractKernelVersion.py
index af4a4fe6357..af4a4fe6357 100644
--- a/pym/portage/util/ExtractKernelVersion.py
+++ b/lib/portage/util/ExtractKernelVersion.py
diff --git a/pym/portage/util/SlotObject.py b/lib/portage/util/SlotObject.py
index ba6215874b3..ba6215874b3 100644
--- a/pym/portage/util/SlotObject.py
+++ b/lib/portage/util/SlotObject.py
diff --git a/pym/portage/util/_ShelveUnicodeWrapper.py b/lib/portage/util/_ShelveUnicodeWrapper.py
index adbd5199f4d..adbd5199f4d 100644
--- a/pym/portage/util/_ShelveUnicodeWrapper.py
+++ b/lib/portage/util/_ShelveUnicodeWrapper.py
diff --git a/pym/portage/util/__init__.py b/lib/portage/util/__init__.py
index d63d5f15628..d63d5f15628 100644
--- a/pym/portage/util/__init__.py
+++ b/lib/portage/util/__init__.py
diff --git a/pym/portage/util/_async/AsyncFunction.py b/lib/portage/util/_async/AsyncFunction.py
index ad3d8333f82..ad3d8333f82 100644
--- a/pym/portage/util/_async/AsyncFunction.py
+++ b/lib/portage/util/_async/AsyncFunction.py
diff --git a/pym/portage/util/_async/AsyncScheduler.py b/lib/portage/util/_async/AsyncScheduler.py
index c6b523eaa5e..c6b523eaa5e 100644
--- a/pym/portage/util/_async/AsyncScheduler.py
+++ b/lib/portage/util/_async/AsyncScheduler.py
diff --git a/pym/portage/util/_async/AsyncTaskFuture.py b/lib/portage/util/_async/AsyncTaskFuture.py
index 581f5ea662c..581f5ea662c 100644
--- a/pym/portage/util/_async/AsyncTaskFuture.py
+++ b/lib/portage/util/_async/AsyncTaskFuture.py
diff --git a/pym/portage/util/_async/FileCopier.py b/lib/portage/util/_async/FileCopier.py
index 27e5ab4c04c..27e5ab4c04c 100644
--- a/pym/portage/util/_async/FileCopier.py
+++ b/lib/portage/util/_async/FileCopier.py
diff --git a/pym/portage/util/_async/FileDigester.py b/lib/portage/util/_async/FileDigester.py
index 72f06759c9b..72f06759c9b 100644
--- a/pym/portage/util/_async/FileDigester.py
+++ b/lib/portage/util/_async/FileDigester.py
diff --git a/pym/portage/util/_async/ForkProcess.py b/lib/portage/util/_async/ForkProcess.py
index d84e9383392..d84e9383392 100644
--- a/pym/portage/util/_async/ForkProcess.py
+++ b/lib/portage/util/_async/ForkProcess.py
diff --git a/pym/portage/util/_async/PipeLogger.py b/lib/portage/util/_async/PipeLogger.py
index a4258f350ae..a4258f350ae 100644
--- a/pym/portage/util/_async/PipeLogger.py
+++ b/lib/portage/util/_async/PipeLogger.py
diff --git a/pym/portage/util/_async/PipeReaderBlockingIO.py b/lib/portage/util/_async/PipeReaderBlockingIO.py
index 6933c921673..6933c921673 100644
--- a/pym/portage/util/_async/PipeReaderBlockingIO.py
+++ b/lib/portage/util/_async/PipeReaderBlockingIO.py
diff --git a/pym/portage/util/_async/PopenProcess.py b/lib/portage/util/_async/PopenProcess.py
index c1931327a5f..c1931327a5f 100644
--- a/pym/portage/util/_async/PopenProcess.py
+++ b/lib/portage/util/_async/PopenProcess.py
diff --git a/pym/portage/util/_async/SchedulerInterface.py b/lib/portage/util/_async/SchedulerInterface.py
index ec6417da10e..ec6417da10e 100644
--- a/pym/portage/util/_async/SchedulerInterface.py
+++ b/lib/portage/util/_async/SchedulerInterface.py
diff --git a/pym/portage/util/_async/TaskScheduler.py b/lib/portage/util/_async/TaskScheduler.py
index 35b3875a421..35b3875a421 100644
--- a/pym/portage/util/_async/TaskScheduler.py
+++ b/lib/portage/util/_async/TaskScheduler.py
diff --git a/pym/portage/util/_async/__init__.py b/lib/portage/util/_async/__init__.py
index 418ad862bbc..418ad862bbc 100644
--- a/pym/portage/util/_async/__init__.py
+++ b/lib/portage/util/_async/__init__.py
diff --git a/pym/portage/util/_async/run_main_scheduler.py b/lib/portage/util/_async/run_main_scheduler.py
index 10fed34b360..10fed34b360 100644
--- a/pym/portage/util/_async/run_main_scheduler.py
+++ b/lib/portage/util/_async/run_main_scheduler.py
diff --git a/pym/portage/util/_ctypes.py b/lib/portage/util/_ctypes.py
index aeceebcca48..aeceebcca48 100644
--- a/pym/portage/util/_ctypes.py
+++ b/lib/portage/util/_ctypes.py
diff --git a/pym/portage/util/_desktop_entry.py b/lib/portage/util/_desktop_entry.py
index 45949215a2c..45949215a2c 100644
--- a/pym/portage/util/_desktop_entry.py
+++ b/lib/portage/util/_desktop_entry.py
diff --git a/pym/portage/util/_dyn_libs/LinkageMapELF.py b/lib/portage/util/_dyn_libs/LinkageMapELF.py
index a063621c156..a063621c156 100644
--- a/pym/portage/util/_dyn_libs/LinkageMapELF.py
+++ b/lib/portage/util/_dyn_libs/LinkageMapELF.py
diff --git a/pym/portage/util/_dyn_libs/NeededEntry.py b/lib/portage/util/_dyn_libs/NeededEntry.py
index c52cfce3cdb..c52cfce3cdb 100644
--- a/pym/portage/util/_dyn_libs/NeededEntry.py
+++ b/lib/portage/util/_dyn_libs/NeededEntry.py
diff --git a/pym/portage/util/_dyn_libs/PreservedLibsRegistry.py b/lib/portage/util/_dyn_libs/PreservedLibsRegistry.py
index f83b82a31f2..f83b82a31f2 100644
--- a/pym/portage/util/_dyn_libs/PreservedLibsRegistry.py
+++ b/lib/portage/util/_dyn_libs/PreservedLibsRegistry.py
diff --git a/pym/portage/util/_dyn_libs/__init__.py b/lib/portage/util/_dyn_libs/__init__.py
index 21a391aeecf..21a391aeecf 100644
--- a/pym/portage/util/_dyn_libs/__init__.py
+++ b/lib/portage/util/_dyn_libs/__init__.py
diff --git a/pym/portage/util/_dyn_libs/display_preserved_libs.py b/lib/portage/util/_dyn_libs/display_preserved_libs.py
index b16478d2b4b..b16478d2b4b 100644
--- a/pym/portage/util/_dyn_libs/display_preserved_libs.py
+++ b/lib/portage/util/_dyn_libs/display_preserved_libs.py
diff --git a/pym/portage/util/_dyn_libs/soname_deps.py b/lib/portage/util/_dyn_libs/soname_deps.py
index 544cbc8f124..544cbc8f124 100644
--- a/pym/portage/util/_dyn_libs/soname_deps.py
+++ b/lib/portage/util/_dyn_libs/soname_deps.py
diff --git a/pym/portage/util/_eventloop/EventLoop.py b/lib/portage/util/_eventloop/EventLoop.py
index ffd12cff949..ffd12cff949 100644
--- a/pym/portage/util/_eventloop/EventLoop.py
+++ b/lib/portage/util/_eventloop/EventLoop.py
diff --git a/pym/portage/util/_eventloop/PollConstants.py b/lib/portage/util/_eventloop/PollConstants.py
index d0270a996db..d0270a996db 100644
--- a/pym/portage/util/_eventloop/PollConstants.py
+++ b/lib/portage/util/_eventloop/PollConstants.py
diff --git a/pym/portage/util/_eventloop/PollSelectAdapter.py b/lib/portage/util/_eventloop/PollSelectAdapter.py
index 32b404b67f7..32b404b67f7 100644
--- a/pym/portage/util/_eventloop/PollSelectAdapter.py
+++ b/lib/portage/util/_eventloop/PollSelectAdapter.py
diff --git a/pym/portage/util/_eventloop/__init__.py b/lib/portage/util/_eventloop/__init__.py
index 418ad862bbc..418ad862bbc 100644
--- a/pym/portage/util/_eventloop/__init__.py
+++ b/lib/portage/util/_eventloop/__init__.py
diff --git a/pym/portage/util/_eventloop/asyncio_event_loop.py b/lib/portage/util/_eventloop/asyncio_event_loop.py
index ea0e03b23b3..ea0e03b23b3 100644
--- a/pym/portage/util/_eventloop/asyncio_event_loop.py
+++ b/lib/portage/util/_eventloop/asyncio_event_loop.py
diff --git a/pym/portage/util/_eventloop/global_event_loop.py b/lib/portage/util/_eventloop/global_event_loop.py
index 2f6371dc12d..2f6371dc12d 100644
--- a/pym/portage/util/_eventloop/global_event_loop.py
+++ b/lib/portage/util/_eventloop/global_event_loop.py
diff --git a/pym/portage/util/_get_vm_info.py b/lib/portage/util/_get_vm_info.py
index e8ad93805ec..e8ad93805ec 100644
--- a/pym/portage/util/_get_vm_info.py
+++ b/lib/portage/util/_get_vm_info.py
diff --git a/pym/portage/util/_info_files.py b/lib/portage/util/_info_files.py
index fabf74b0fb8..fabf74b0fb8 100644
--- a/pym/portage/util/_info_files.py
+++ b/lib/portage/util/_info_files.py
diff --git a/pym/portage/util/_path.py b/lib/portage/util/_path.py
index 6fbcb438c4b..6fbcb438c4b 100644
--- a/pym/portage/util/_path.py
+++ b/lib/portage/util/_path.py
diff --git a/pym/portage/util/_pty.py b/lib/portage/util/_pty.py
index 11c8b92afba..11c8b92afba 100644
--- a/pym/portage/util/_pty.py
+++ b/lib/portage/util/_pty.py
diff --git a/pym/portage/util/_urlopen.py b/lib/portage/util/_urlopen.py
index fc9db74a0ef..fc9db74a0ef 100644
--- a/pym/portage/util/_urlopen.py
+++ b/lib/portage/util/_urlopen.py
diff --git a/pym/portage/util/_xattr.py b/lib/portage/util/_xattr.py
index 9a8704d7025..9a8704d7025 100644
--- a/pym/portage/util/_xattr.py
+++ b/lib/portage/util/_xattr.py
diff --git a/pym/portage/util/backoff.py b/lib/portage/util/backoff.py
index ee39007efaa..ee39007efaa 100644
--- a/pym/portage/util/backoff.py
+++ b/lib/portage/util/backoff.py
diff --git a/pym/portage/util/changelog.py b/lib/portage/util/changelog.py
index 9fc5ab6dff3..9fc5ab6dff3 100644
--- a/pym/portage/util/changelog.py
+++ b/lib/portage/util/changelog.py
diff --git a/pym/portage/util/compression_probe.py b/lib/portage/util/compression_probe.py
index 29d0eedff1c..29d0eedff1c 100644
--- a/pym/portage/util/compression_probe.py
+++ b/lib/portage/util/compression_probe.py
diff --git a/pym/portage/util/configparser.py b/lib/portage/util/configparser.py
index c4c92a603d5..c4c92a603d5 100644
--- a/pym/portage/util/configparser.py
+++ b/lib/portage/util/configparser.py
diff --git a/pym/portage/util/cpuinfo.py b/lib/portage/util/cpuinfo.py
index 669e707b575..669e707b575 100644
--- a/pym/portage/util/cpuinfo.py
+++ b/lib/portage/util/cpuinfo.py
diff --git a/pym/portage/util/digraph.py b/lib/portage/util/digraph.py
index d279b7867a3..d279b7867a3 100644
--- a/pym/portage/util/digraph.py
+++ b/lib/portage/util/digraph.py
diff --git a/pym/portage/util/elf/__init__.py b/lib/portage/util/elf/__init__.py
index 4725d3317e6..4725d3317e6 100644
--- a/pym/portage/util/elf/__init__.py
+++ b/lib/portage/util/elf/__init__.py
diff --git a/pym/portage/util/elf/constants.py b/lib/portage/util/elf/constants.py
index 2704e85c3cc..2704e85c3cc 100644
--- a/pym/portage/util/elf/constants.py
+++ b/lib/portage/util/elf/constants.py
diff --git a/pym/portage/util/elf/header.py b/lib/portage/util/elf/header.py
index 3d2307402e6..3d2307402e6 100644
--- a/pym/portage/util/elf/header.py
+++ b/lib/portage/util/elf/header.py
diff --git a/pym/portage/util/endian/__init__.py b/lib/portage/util/endian/__init__.py
index 4725d3317e6..4725d3317e6 100644
--- a/pym/portage/util/endian/__init__.py
+++ b/lib/portage/util/endian/__init__.py
diff --git a/pym/portage/util/endian/decode.py b/lib/portage/util/endian/decode.py
index 9833b53ca69..9833b53ca69 100644
--- a/pym/portage/util/endian/decode.py
+++ b/lib/portage/util/endian/decode.py
diff --git a/pym/portage/util/env_update.py b/lib/portage/util/env_update.py
index 03210104377..03210104377 100644
--- a/pym/portage/util/env_update.py
+++ b/lib/portage/util/env_update.py
diff --git a/pym/portage/util/file_copy/__init__.py b/lib/portage/util/file_copy/__init__.py
index 3d9b745be0c..3d9b745be0c 100644
--- a/pym/portage/util/file_copy/__init__.py
+++ b/lib/portage/util/file_copy/__init__.py
diff --git a/pym/portage/util/formatter.py b/lib/portage/util/formatter.py
index ce6799e3feb..ce6799e3feb 100644
--- a/pym/portage/util/formatter.py
+++ b/lib/portage/util/formatter.py
diff --git a/pym/portage/util/futures/__init__.py b/lib/portage/util/futures/__init__.py
index bdeac90d5ae..bdeac90d5ae 100644
--- a/pym/portage/util/futures/__init__.py
+++ b/lib/portage/util/futures/__init__.py
diff --git a/pym/portage/util/futures/_asyncio/__init__.py b/lib/portage/util/futures/_asyncio/__init__.py
index acfd593966e..acfd593966e 100644
--- a/pym/portage/util/futures/_asyncio/__init__.py
+++ b/lib/portage/util/futures/_asyncio/__init__.py
diff --git a/pym/portage/util/futures/_asyncio/tasks.py b/lib/portage/util/futures/_asyncio/tasks.py
index b20765b7a74..b20765b7a74 100644
--- a/pym/portage/util/futures/_asyncio/tasks.py
+++ b/lib/portage/util/futures/_asyncio/tasks.py
diff --git a/pym/portage/util/futures/compat_coroutine.py b/lib/portage/util/futures/compat_coroutine.py
index 17400b74dea..17400b74dea 100644
--- a/pym/portage/util/futures/compat_coroutine.py
+++ b/lib/portage/util/futures/compat_coroutine.py
diff --git a/pym/portage/util/futures/events.py b/lib/portage/util/futures/events.py
index b772bc2423f..b772bc2423f 100644
--- a/pym/portage/util/futures/events.py
+++ b/lib/portage/util/futures/events.py
diff --git a/pym/portage/util/futures/executor/__init__.py b/lib/portage/util/futures/executor/__init__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/pym/portage/util/futures/executor/__init__.py
+++ b/lib/portage/util/futures/executor/__init__.py
diff --git a/pym/portage/util/futures/executor/fork.py b/lib/portage/util/futures/executor/fork.py
index 72844403c8b..72844403c8b 100644
--- a/pym/portage/util/futures/executor/fork.py
+++ b/lib/portage/util/futures/executor/fork.py
diff --git a/pym/portage/util/futures/extendedfutures.py b/lib/portage/util/futures/extendedfutures.py
index af384c74568..af384c74568 100644
--- a/pym/portage/util/futures/extendedfutures.py
+++ b/lib/portage/util/futures/extendedfutures.py
diff --git a/pym/portage/util/futures/futures.py b/lib/portage/util/futures/futures.py
index 9c9900d4c46..9c9900d4c46 100644
--- a/pym/portage/util/futures/futures.py
+++ b/lib/portage/util/futures/futures.py
diff --git a/pym/portage/util/futures/iter_completed.py b/lib/portage/util/futures/iter_completed.py
index 31b5e0c786d..31b5e0c786d 100644
--- a/pym/portage/util/futures/iter_completed.py
+++ b/lib/portage/util/futures/iter_completed.py
diff --git a/pym/portage/util/futures/retry.py b/lib/portage/util/futures/retry.py
index ccfc087ab91..ccfc087ab91 100644
--- a/pym/portage/util/futures/retry.py
+++ b/lib/portage/util/futures/retry.py
diff --git a/pym/portage/util/futures/transports.py b/lib/portage/util/futures/transports.py
index 60ea930737d..60ea930737d 100644
--- a/pym/portage/util/futures/transports.py
+++ b/lib/portage/util/futures/transports.py
diff --git a/pym/portage/util/futures/unix_events.py b/lib/portage/util/futures/unix_events.py
index 3381eaa7d3c..3381eaa7d3c 100644
--- a/pym/portage/util/futures/unix_events.py
+++ b/lib/portage/util/futures/unix_events.py
diff --git a/pym/portage/util/install_mask.py b/lib/portage/util/install_mask.py
index 32627eb05b8..32627eb05b8 100644
--- a/pym/portage/util/install_mask.py
+++ b/lib/portage/util/install_mask.py
diff --git a/pym/portage/util/iterators/MultiIterGroupBy.py b/lib/portage/util/iterators/MultiIterGroupBy.py
index 2c31f269f2d..2c31f269f2d 100644
--- a/pym/portage/util/iterators/MultiIterGroupBy.py
+++ b/lib/portage/util/iterators/MultiIterGroupBy.py
diff --git a/pym/portage/util/iterators/__init__.py b/lib/portage/util/iterators/__init__.py
index 7cd880e11d9..7cd880e11d9 100644
--- a/pym/portage/util/iterators/__init__.py
+++ b/lib/portage/util/iterators/__init__.py
diff --git a/pym/portage/util/lafilefixer.py b/lib/portage/util/lafilefixer.py
index 11001036386..11001036386 100644
--- a/pym/portage/util/lafilefixer.py
+++ b/lib/portage/util/lafilefixer.py
diff --git a/pym/portage/util/listdir.py b/lib/portage/util/listdir.py
index 2012e145f10..2012e145f10 100644
--- a/pym/portage/util/listdir.py
+++ b/lib/portage/util/listdir.py
diff --git a/pym/portage/util/locale.py b/lib/portage/util/locale.py
index 5b09945d66c..5b09945d66c 100644
--- a/pym/portage/util/locale.py
+++ b/lib/portage/util/locale.py
diff --git a/pym/portage/util/monotonic.py b/lib/portage/util/monotonic.py
index e50564851be..e50564851be 100644
--- a/pym/portage/util/monotonic.py
+++ b/lib/portage/util/monotonic.py
diff --git a/pym/portage/util/movefile.py b/lib/portage/util/movefile.py
index 5477a669f3b..5477a669f3b 100644
--- a/pym/portage/util/movefile.py
+++ b/lib/portage/util/movefile.py
diff --git a/pym/portage/util/mtimedb.py b/lib/portage/util/mtimedb.py
index 30922a90181..30922a90181 100644
--- a/pym/portage/util/mtimedb.py
+++ b/lib/portage/util/mtimedb.py
diff --git a/pym/portage/util/path.py b/lib/portage/util/path.py
index a0b96c7f3e2..a0b96c7f3e2 100644
--- a/pym/portage/util/path.py
+++ b/lib/portage/util/path.py
diff --git a/pym/portage/util/socks5.py b/lib/portage/util/socks5.py
index 74b0714eb79..74b0714eb79 100644
--- a/pym/portage/util/socks5.py
+++ b/lib/portage/util/socks5.py
diff --git a/pym/portage/util/whirlpool.py b/lib/portage/util/whirlpool.py
index 170ae73f804..170ae73f804 100644
--- a/pym/portage/util/whirlpool.py
+++ b/lib/portage/util/whirlpool.py
diff --git a/pym/portage/util/writeable_check.py b/lib/portage/util/writeable_check.py
index e5b14c02324..e5b14c02324 100644
--- a/pym/portage/util/writeable_check.py
+++ b/lib/portage/util/writeable_check.py
diff --git a/pym/portage/versions.py b/lib/portage/versions.py
index 0c21373cc2c..0c21373cc2c 100644
--- a/pym/portage/versions.py
+++ b/lib/portage/versions.py
diff --git a/pym/portage/xml/__init__.py b/lib/portage/xml/__init__.py
index 21a391aeecf..21a391aeecf 100644
--- a/pym/portage/xml/__init__.py
+++ b/lib/portage/xml/__init__.py
diff --git a/pym/portage/xml/metadata.py b/lib/portage/xml/metadata.py
index 9e48ddddebe..9e48ddddebe 100644
--- a/pym/portage/xml/metadata.py
+++ b/lib/portage/xml/metadata.py
diff --git a/pym/portage/xpak.py b/lib/portage/xpak.py
index e11f26e6c74..e11f26e6c74 100644
--- a/pym/portage/xpak.py
+++ b/lib/portage/xpak.py
diff --git a/man/color.map.5 b/man/color.map.5
index ee3fda983ff..288bf7fbdef 100644
--- a/man/color.map.5
+++ b/man/color.map.5
@@ -206,4 +206,4 @@ Contains other variables.
 .BR ebuild (1),
 .BR ebuild (5)
 .TP
-The \fI/usr/lib/portage/pym/portage/output.py\fR Python module.
+The \fI/usr/lib/portage/lib/portage/output.py\fR Python module.
diff --git a/man/ru/color.map.5 b/man/ru/color.map.5
index 804e7197c3f..7849ffdba83 100644
--- a/man/ru/color.map.5
+++ b/man/ru/color.map.5
@@ -209,7 +209,7 @@ Arfrever Frehtes Taifersar Arahesis <arfrever@apache.org>
 .BR ebuild (1),
 .BR ebuild (5)
 .TP
-Модуль \fIPython /usr/lib/portage/pym/portage/output.py\fR.
+Модуль \fIPython /usr/lib/portage/lib/portage/output.py\fR.
 .SH "ПЕРЕВОД"
 .nf
 \fRПереводчик\fR - Елена Гаврилова <e.vl.gavrilova@yandex.ru>
diff --git a/repoman/TEST-NOTES b/repoman/TEST-NOTES
index f9c6ab0cd2a..8be5f9cf340 100644
--- a/repoman/TEST-NOTES
+++ b/repoman/TEST-NOTES
@@ -4,7 +4,7 @@ UnitTests
 Portage has some tests that use the unittest framework that ships with python (2.3-2.4ish)
 Tests have a specific naming convention.
 
-in pym/portage/tests/ there is a runTest script that invokes pym/portage/tests/__init__.py
+in lib/portage/tests/ there is a runTest script that invokes lib/portage/tests/__init__.py
 
 This init looks at a hardcoded list of test dirs to search for tests.
 If you add a new dir and don't see your new tests, make sure that the dir is in this list.
@@ -15,14 +15,14 @@ you should have files of the form test_${function}.py.
 
 So if I was to write a vercmp test, and vercmp is in portage_versions.
 
-pym/portage/tests/portage_versions/test_vercmp.py
+lib/portage/tests/portage_versions/test_vercmp.py
 
 would be the filename.
 
 The __init__.py file now does recursive tests, but you need to tell it so.  For example, if
 you had cache tests the dir format would be something like...
 
-pym/portage/tests/cache/flat_hash/test_foo.py
+lib/portage/tests/cache/flat_hash/test_foo.py
 
 and you would put "cache/flat_hash" into the testDirs variable in __init__.py.
 
diff --git a/repoman/bin/repoman b/repoman/bin/repoman
index ab04d56ca77..873987f33c9 100755
--- a/repoman/bin/repoman
+++ b/repoman/bin/repoman
@@ -29,11 +29,11 @@ from os import path as osp
 here = osp.realpath(__file__)
 if osp.isfile(osp.join(osp.dirname(osp.dirname(here)), ".repoman_not_installed")):
 	# Add the repoman subpkg
-	pym_path = osp.join(osp.dirname(osp.dirname(here)), "pym")
+	pym_path = osp.join(osp.dirname(osp.dirname(here)), "lib")
 	sys.path.insert(0, pym_path)
 	if osp.isfile(osp.join(osp.dirname(osp.dirname(osp.dirname(here))), ".portage_not_installed")):
 		# Add the base portage pkg
-		pym_path = osp.join(osp.dirname(osp.dirname(osp.dirname(here))), "pym")
+		pym_path = osp.join(osp.dirname(osp.dirname(osp.dirname(here))), "lib")
 		sys.path.insert(0, pym_path)
 
 import portage
diff --git a/repoman/pym/repoman/__init__.py b/repoman/lib/repoman/__init__.py
index 89779b95ca0..89779b95ca0 100644
--- a/repoman/pym/repoman/__init__.py
+++ b/repoman/lib/repoman/__init__.py
diff --git a/repoman/pym/repoman/_portage.py b/repoman/lib/repoman/_portage.py
index 0f611f761db..0f611f761db 100644
--- a/repoman/pym/repoman/_portage.py
+++ b/repoman/lib/repoman/_portage.py
diff --git a/repoman/pym/repoman/_subprocess.py b/repoman/lib/repoman/_subprocess.py
index b6c19bda300..b6c19bda300 100644
--- a/repoman/pym/repoman/_subprocess.py
+++ b/repoman/lib/repoman/_subprocess.py
diff --git a/repoman/pym/repoman/actions.py b/repoman/lib/repoman/actions.py
index 8e23322c862..8e23322c862 100644
--- a/repoman/pym/repoman/actions.py
+++ b/repoman/lib/repoman/actions.py
diff --git a/repoman/pym/repoman/argparser.py b/repoman/lib/repoman/argparser.py
index b87df95cde9..b87df95cde9 100644
--- a/repoman/pym/repoman/argparser.py
+++ b/repoman/lib/repoman/argparser.py
diff --git a/repoman/pym/repoman/check_missingslot.py b/repoman/lib/repoman/check_missingslot.py
index 4a3c57b2cd2..4a3c57b2cd2 100644
--- a/repoman/pym/repoman/check_missingslot.py
+++ b/repoman/lib/repoman/check_missingslot.py
diff --git a/repoman/pym/repoman/checks/__init__.py b/repoman/lib/repoman/checks/__init__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/repoman/pym/repoman/checks/__init__.py
+++ b/repoman/lib/repoman/checks/__init__.py
diff --git a/repoman/pym/repoman/checks/herds/__init__.py b/repoman/lib/repoman/checks/herds/__init__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/repoman/pym/repoman/checks/herds/__init__.py
+++ b/repoman/lib/repoman/checks/herds/__init__.py
diff --git a/repoman/pym/repoman/checks/herds/herdbase.py b/repoman/lib/repoman/checks/herds/herdbase.py
index ebe6a19b406..ebe6a19b406 100644
--- a/repoman/pym/repoman/checks/herds/herdbase.py
+++ b/repoman/lib/repoman/checks/herds/herdbase.py
diff --git a/repoman/pym/repoman/checks/herds/metadata.py b/repoman/lib/repoman/checks/herds/metadata.py
index b4a433ed71f..b4a433ed71f 100644
--- a/repoman/pym/repoman/checks/herds/metadata.py
+++ b/repoman/lib/repoman/checks/herds/metadata.py
diff --git a/repoman/pym/repoman/config.py b/repoman/lib/repoman/config.py
index 578bbccdee2..578bbccdee2 100644
--- a/repoman/pym/repoman/config.py
+++ b/repoman/lib/repoman/config.py
diff --git a/repoman/pym/repoman/copyrights.py b/repoman/lib/repoman/copyrights.py
index 94257c942ff..94257c942ff 100644
--- a/repoman/pym/repoman/copyrights.py
+++ b/repoman/lib/repoman/copyrights.py
diff --git a/repoman/pym/repoman/errors.py b/repoman/lib/repoman/errors.py
index 9cf113ba0b6..9cf113ba0b6 100644
--- a/repoman/pym/repoman/errors.py
+++ b/repoman/lib/repoman/errors.py
diff --git a/repoman/pym/repoman/gpg.py b/repoman/lib/repoman/gpg.py
index a3c12b3c9a8..a3c12b3c9a8 100644
--- a/repoman/pym/repoman/gpg.py
+++ b/repoman/lib/repoman/gpg.py
diff --git a/repoman/pym/repoman/main.py b/repoman/lib/repoman/main.py
index 81e2ff61eee..81e2ff61eee 100755
--- a/repoman/pym/repoman/main.py
+++ b/repoman/lib/repoman/main.py
diff --git a/repoman/pym/repoman/metadata.py b/repoman/lib/repoman/metadata.py
index 11ec1aaf861..11ec1aaf861 100644
--- a/repoman/pym/repoman/metadata.py
+++ b/repoman/lib/repoman/metadata.py
diff --git a/repoman/pym/repoman/modules/__init__.py b/repoman/lib/repoman/modules/__init__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/repoman/pym/repoman/modules/__init__.py
+++ b/repoman/lib/repoman/modules/__init__.py
diff --git a/repoman/pym/repoman/modules/commit/__init__.py b/repoman/lib/repoman/modules/commit/__init__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/repoman/pym/repoman/modules/commit/__init__.py
+++ b/repoman/lib/repoman/modules/commit/__init__.py
diff --git a/repoman/pym/repoman/modules/commit/manifest.py b/repoman/lib/repoman/modules/commit/manifest.py
index b338a5b4067..b338a5b4067 100644
--- a/repoman/pym/repoman/modules/commit/manifest.py
+++ b/repoman/lib/repoman/modules/commit/manifest.py
diff --git a/repoman/pym/repoman/modules/commit/repochecks.py b/repoman/lib/repoman/modules/commit/repochecks.py
index bedbdaf3424..bedbdaf3424 100644
--- a/repoman/pym/repoman/modules/commit/repochecks.py
+++ b/repoman/lib/repoman/modules/commit/repochecks.py
diff --git a/repoman/pym/repoman/modules/linechecks/__init__.py b/repoman/lib/repoman/modules/linechecks/__init__.py
index 8b137891791..8b137891791 100644
--- a/repoman/pym/repoman/modules/linechecks/__init__.py
+++ b/repoman/lib/repoman/modules/linechecks/__init__.py
diff --git a/repoman/pym/repoman/modules/linechecks/assignment/__init__.py b/repoman/lib/repoman/modules/linechecks/assignment/__init__.py
index b95a25a743a..b95a25a743a 100644
--- a/repoman/pym/repoman/modules/linechecks/assignment/__init__.py
+++ b/repoman/lib/repoman/modules/linechecks/assignment/__init__.py
diff --git a/repoman/pym/repoman/modules/linechecks/assignment/assignment.py b/repoman/lib/repoman/modules/linechecks/assignment/assignment.py
index 33bef8a08e0..33bef8a08e0 100644
--- a/repoman/pym/repoman/modules/linechecks/assignment/assignment.py
+++ b/repoman/lib/repoman/modules/linechecks/assignment/assignment.py
diff --git a/repoman/pym/repoman/modules/linechecks/base.py b/repoman/lib/repoman/modules/linechecks/base.py
index 4e3d6f0b479..4e3d6f0b479 100644
--- a/repoman/pym/repoman/modules/linechecks/base.py
+++ b/repoman/lib/repoman/modules/linechecks/base.py
diff --git a/repoman/pym/repoman/modules/linechecks/config.py b/repoman/lib/repoman/modules/linechecks/config.py
index 6e4c5314e80..6e4c5314e80 100644
--- a/repoman/pym/repoman/modules/linechecks/config.py
+++ b/repoman/lib/repoman/modules/linechecks/config.py
diff --git a/repoman/pym/repoman/modules/linechecks/controller.py b/repoman/lib/repoman/modules/linechecks/controller.py
index 7082a5d02a1..7082a5d02a1 100644
--- a/repoman/pym/repoman/modules/linechecks/controller.py
+++ b/repoman/lib/repoman/modules/linechecks/controller.py
diff --git a/repoman/pym/repoman/modules/linechecks/depend/__init__.py b/repoman/lib/repoman/modules/linechecks/depend/__init__.py
index 2ea95347ef3..2ea95347ef3 100644
--- a/repoman/pym/repoman/modules/linechecks/depend/__init__.py
+++ b/repoman/lib/repoman/modules/linechecks/depend/__init__.py
diff --git a/repoman/pym/repoman/modules/linechecks/depend/implicit.py b/repoman/lib/repoman/modules/linechecks/depend/implicit.py
index f7b458b684f..f7b458b684f 100644
--- a/repoman/pym/repoman/modules/linechecks/depend/implicit.py
+++ b/repoman/lib/repoman/modules/linechecks/depend/implicit.py
diff --git a/repoman/pym/repoman/modules/linechecks/deprecated/__init__.py b/repoman/lib/repoman/modules/linechecks/deprecated/__init__.py
index 258683345b2..258683345b2 100644
--- a/repoman/pym/repoman/modules/linechecks/deprecated/__init__.py
+++ b/repoman/lib/repoman/modules/linechecks/deprecated/__init__.py
diff --git a/repoman/pym/repoman/modules/linechecks/deprecated/deprecated.py b/repoman/lib/repoman/modules/linechecks/deprecated/deprecated.py
index b33852e7464..b33852e7464 100644
--- a/repoman/pym/repoman/modules/linechecks/deprecated/deprecated.py
+++ b/repoman/lib/repoman/modules/linechecks/deprecated/deprecated.py
diff --git a/repoman/pym/repoman/modules/linechecks/deprecated/inherit.py b/repoman/lib/repoman/modules/linechecks/deprecated/inherit.py
index 77ad4f62587..77ad4f62587 100644
--- a/repoman/pym/repoman/modules/linechecks/deprecated/inherit.py
+++ b/repoman/lib/repoman/modules/linechecks/deprecated/inherit.py
diff --git a/repoman/pym/repoman/modules/linechecks/do/__init__.py b/repoman/lib/repoman/modules/linechecks/do/__init__.py
index dc5af701c25..dc5af701c25 100644
--- a/repoman/pym/repoman/modules/linechecks/do/__init__.py
+++ b/repoman/lib/repoman/modules/linechecks/do/__init__.py
diff --git a/repoman/pym/repoman/modules/linechecks/do/dosym.py b/repoman/lib/repoman/modules/linechecks/do/dosym.py
index bab4dad03a2..bab4dad03a2 100644
--- a/repoman/pym/repoman/modules/linechecks/do/dosym.py
+++ b/repoman/lib/repoman/modules/linechecks/do/dosym.py
diff --git a/repoman/pym/repoman/modules/linechecks/eapi/__init__.py b/repoman/lib/repoman/modules/linechecks/eapi/__init__.py
index 31993df2067..31993df2067 100644
--- a/repoman/pym/repoman/modules/linechecks/eapi/__init__.py
+++ b/repoman/lib/repoman/modules/linechecks/eapi/__init__.py
diff --git a/repoman/pym/repoman/modules/linechecks/eapi/checks.py b/repoman/lib/repoman/modules/linechecks/eapi/checks.py
index de899c061d8..de899c061d8 100644
--- a/repoman/pym/repoman/modules/linechecks/eapi/checks.py
+++ b/repoman/lib/repoman/modules/linechecks/eapi/checks.py
diff --git a/repoman/pym/repoman/modules/linechecks/eapi/definition.py b/repoman/lib/repoman/modules/linechecks/eapi/definition.py
index 410bad1c704..410bad1c704 100644
--- a/repoman/pym/repoman/modules/linechecks/eapi/definition.py
+++ b/repoman/lib/repoman/modules/linechecks/eapi/definition.py
diff --git a/repoman/pym/repoman/modules/linechecks/emake/__init__.py b/repoman/lib/repoman/modules/linechecks/emake/__init__.py
index cecdc5fcf18..cecdc5fcf18 100644
--- a/repoman/pym/repoman/modules/linechecks/emake/__init__.py
+++ b/repoman/lib/repoman/modules/linechecks/emake/__init__.py
diff --git a/repoman/pym/repoman/modules/linechecks/emake/emake.py b/repoman/lib/repoman/modules/linechecks/emake/emake.py
index e1e3e638ed7..e1e3e638ed7 100644
--- a/repoman/pym/repoman/modules/linechecks/emake/emake.py
+++ b/repoman/lib/repoman/modules/linechecks/emake/emake.py
diff --git a/repoman/pym/repoman/modules/linechecks/gentoo_header/__init__.py b/repoman/lib/repoman/modules/linechecks/gentoo_header/__init__.py
index 205cc32c2c9..205cc32c2c9 100644
--- a/repoman/pym/repoman/modules/linechecks/gentoo_header/__init__.py
+++ b/repoman/lib/repoman/modules/linechecks/gentoo_header/__init__.py
diff --git a/repoman/pym/repoman/modules/linechecks/gentoo_header/header.py b/repoman/lib/repoman/modules/linechecks/gentoo_header/header.py
index 4b75fc4b59e..4b75fc4b59e 100644
--- a/repoman/pym/repoman/modules/linechecks/gentoo_header/header.py
+++ b/repoman/lib/repoman/modules/linechecks/gentoo_header/header.py
diff --git a/repoman/pym/repoman/modules/linechecks/helpers/__init__.py b/repoman/lib/repoman/modules/linechecks/helpers/__init__.py
index 0f41f013632..0f41f013632 100644
--- a/repoman/pym/repoman/modules/linechecks/helpers/__init__.py
+++ b/repoman/lib/repoman/modules/linechecks/helpers/__init__.py
diff --git a/repoman/pym/repoman/modules/linechecks/helpers/offset.py b/repoman/lib/repoman/modules/linechecks/helpers/offset.py
index 5d7624a683e..5d7624a683e 100644
--- a/repoman/pym/repoman/modules/linechecks/helpers/offset.py
+++ b/repoman/lib/repoman/modules/linechecks/helpers/offset.py
diff --git a/repoman/pym/repoman/modules/linechecks/nested/__init__.py b/repoman/lib/repoman/modules/linechecks/nested/__init__.py
index 6c8a70a521a..6c8a70a521a 100644
--- a/repoman/pym/repoman/modules/linechecks/nested/__init__.py
+++ b/repoman/lib/repoman/modules/linechecks/nested/__init__.py
diff --git a/repoman/pym/repoman/modules/linechecks/nested/nested.py b/repoman/lib/repoman/modules/linechecks/nested/nested.py
index 06b2727720b..06b2727720b 100644
--- a/repoman/pym/repoman/modules/linechecks/nested/nested.py
+++ b/repoman/lib/repoman/modules/linechecks/nested/nested.py
diff --git a/repoman/pym/repoman/modules/linechecks/nested/nesteddie.py b/repoman/lib/repoman/modules/linechecks/nested/nesteddie.py
index 6c1e4be9ff1..6c1e4be9ff1 100644
--- a/repoman/pym/repoman/modules/linechecks/nested/nesteddie.py
+++ b/repoman/lib/repoman/modules/linechecks/nested/nesteddie.py
diff --git a/repoman/pym/repoman/modules/linechecks/patches/__init__.py b/repoman/lib/repoman/modules/linechecks/patches/__init__.py
index 4fe0fcf5e05..4fe0fcf5e05 100644
--- a/repoman/pym/repoman/modules/linechecks/patches/__init__.py
+++ b/repoman/lib/repoman/modules/linechecks/patches/__init__.py
diff --git a/repoman/pym/repoman/modules/linechecks/patches/patches.py b/repoman/lib/repoman/modules/linechecks/patches/patches.py
index 63651cd7c6d..63651cd7c6d 100644
--- a/repoman/pym/repoman/modules/linechecks/patches/patches.py
+++ b/repoman/lib/repoman/modules/linechecks/patches/patches.py
diff --git a/repoman/pym/repoman/modules/linechecks/phases/__init__.py b/repoman/lib/repoman/modules/linechecks/phases/__init__.py
index b3228c0f77f..b3228c0f77f 100644
--- a/repoman/pym/repoman/modules/linechecks/phases/__init__.py
+++ b/repoman/lib/repoman/modules/linechecks/phases/__init__.py
diff --git a/repoman/pym/repoman/modules/linechecks/phases/phase.py b/repoman/lib/repoman/modules/linechecks/phases/phase.py
index acc3a1e1da8..acc3a1e1da8 100644
--- a/repoman/pym/repoman/modules/linechecks/phases/phase.py
+++ b/repoman/lib/repoman/modules/linechecks/phases/phase.py
diff --git a/repoman/pym/repoman/modules/linechecks/portage/__init__.py b/repoman/lib/repoman/modules/linechecks/portage/__init__.py
index b9a84b50744..b9a84b50744 100644
--- a/repoman/pym/repoman/modules/linechecks/portage/__init__.py
+++ b/repoman/lib/repoman/modules/linechecks/portage/__init__.py
diff --git a/repoman/pym/repoman/modules/linechecks/portage/internal.py b/repoman/lib/repoman/modules/linechecks/portage/internal.py
index 86933722168..86933722168 100644
--- a/repoman/pym/repoman/modules/linechecks/portage/internal.py
+++ b/repoman/lib/repoman/modules/linechecks/portage/internal.py
diff --git a/repoman/pym/repoman/modules/linechecks/quotes/__init__.py b/repoman/lib/repoman/modules/linechecks/quotes/__init__.py
index 894ef58d2cf..894ef58d2cf 100644
--- a/repoman/pym/repoman/modules/linechecks/quotes/__init__.py
+++ b/repoman/lib/repoman/modules/linechecks/quotes/__init__.py
diff --git a/repoman/pym/repoman/modules/linechecks/quotes/quoteda.py b/repoman/lib/repoman/modules/linechecks/quotes/quoteda.py
index 7fd9ba797a3..7fd9ba797a3 100644
--- a/repoman/pym/repoman/modules/linechecks/quotes/quoteda.py
+++ b/repoman/lib/repoman/modules/linechecks/quotes/quoteda.py
diff --git a/repoman/pym/repoman/modules/linechecks/quotes/quotes.py b/repoman/lib/repoman/modules/linechecks/quotes/quotes.py
index e5ea4d0ca6c..e5ea4d0ca6c 100644
--- a/repoman/pym/repoman/modules/linechecks/quotes/quotes.py
+++ b/repoman/lib/repoman/modules/linechecks/quotes/quotes.py
diff --git a/repoman/pym/repoman/modules/linechecks/uri/__init__.py b/repoman/lib/repoman/modules/linechecks/uri/__init__.py
index e196172570f..e196172570f 100644
--- a/repoman/pym/repoman/modules/linechecks/uri/__init__.py
+++ b/repoman/lib/repoman/modules/linechecks/uri/__init__.py
diff --git a/repoman/pym/repoman/modules/linechecks/uri/uri.py b/repoman/lib/repoman/modules/linechecks/uri/uri.py
index 1a0afe68243..1a0afe68243 100644
--- a/repoman/pym/repoman/modules/linechecks/uri/uri.py
+++ b/repoman/lib/repoman/modules/linechecks/uri/uri.py
diff --git a/repoman/pym/repoman/modules/linechecks/use/__init__.py b/repoman/lib/repoman/modules/linechecks/use/__init__.py
index e97b0d61dc8..e97b0d61dc8 100644
--- a/repoman/pym/repoman/modules/linechecks/use/__init__.py
+++ b/repoman/lib/repoman/modules/linechecks/use/__init__.py
diff --git a/repoman/pym/repoman/modules/linechecks/use/builtwith.py b/repoman/lib/repoman/modules/linechecks/use/builtwith.py
index 0ec4fae2107..0ec4fae2107 100644
--- a/repoman/pym/repoman/modules/linechecks/use/builtwith.py
+++ b/repoman/lib/repoman/modules/linechecks/use/builtwith.py
diff --git a/repoman/pym/repoman/modules/linechecks/useless/__init__.py b/repoman/lib/repoman/modules/linechecks/useless/__init__.py
index 5cf97813773..5cf97813773 100644
--- a/repoman/pym/repoman/modules/linechecks/useless/__init__.py
+++ b/repoman/lib/repoman/modules/linechecks/useless/__init__.py
diff --git a/repoman/pym/repoman/modules/linechecks/useless/cd.py b/repoman/lib/repoman/modules/linechecks/useless/cd.py
index 3daa044517e..3daa044517e 100644
--- a/repoman/pym/repoman/modules/linechecks/useless/cd.py
+++ b/repoman/lib/repoman/modules/linechecks/useless/cd.py
diff --git a/repoman/pym/repoman/modules/linechecks/useless/dodoc.py b/repoman/lib/repoman/modules/linechecks/useless/dodoc.py
index 502bfbea885..502bfbea885 100644
--- a/repoman/pym/repoman/modules/linechecks/useless/dodoc.py
+++ b/repoman/lib/repoman/modules/linechecks/useless/dodoc.py
diff --git a/repoman/pym/repoman/modules/linechecks/whitespace/__init__.py b/repoman/lib/repoman/modules/linechecks/whitespace/__init__.py
index 716c5129cac..716c5129cac 100644
--- a/repoman/pym/repoman/modules/linechecks/whitespace/__init__.py
+++ b/repoman/lib/repoman/modules/linechecks/whitespace/__init__.py
diff --git a/repoman/pym/repoman/modules/linechecks/whitespace/blank.py b/repoman/lib/repoman/modules/linechecks/whitespace/blank.py
index 2ab4097a354..2ab4097a354 100644
--- a/repoman/pym/repoman/modules/linechecks/whitespace/blank.py
+++ b/repoman/lib/repoman/modules/linechecks/whitespace/blank.py
diff --git a/repoman/pym/repoman/modules/linechecks/whitespace/whitespace.py b/repoman/lib/repoman/modules/linechecks/whitespace/whitespace.py
index 556b2ab81cd..556b2ab81cd 100644
--- a/repoman/pym/repoman/modules/linechecks/whitespace/whitespace.py
+++ b/repoman/lib/repoman/modules/linechecks/whitespace/whitespace.py
diff --git a/repoman/pym/repoman/modules/linechecks/workaround/__init__.py b/repoman/lib/repoman/modules/linechecks/workaround/__init__.py
index 425085a5c7a..425085a5c7a 100644
--- a/repoman/pym/repoman/modules/linechecks/workaround/__init__.py
+++ b/repoman/lib/repoman/modules/linechecks/workaround/__init__.py
diff --git a/repoman/pym/repoman/modules/linechecks/workaround/workarounds.py b/repoman/lib/repoman/modules/linechecks/workaround/workarounds.py
index 37cb5431437..37cb5431437 100644
--- a/repoman/pym/repoman/modules/linechecks/workaround/workarounds.py
+++ b/repoman/lib/repoman/modules/linechecks/workaround/workarounds.py
diff --git a/repoman/pym/repoman/modules/scan/__init__.py b/repoman/lib/repoman/modules/scan/__init__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/repoman/pym/repoman/modules/scan/__init__.py
+++ b/repoman/lib/repoman/modules/scan/__init__.py
diff --git a/repoman/pym/repoman/modules/scan/depend/__init__.py b/repoman/lib/repoman/modules/scan/depend/__init__.py
index c3cc0ddeb5b..c3cc0ddeb5b 100644
--- a/repoman/pym/repoman/modules/scan/depend/__init__.py
+++ b/repoman/lib/repoman/modules/scan/depend/__init__.py
diff --git a/repoman/pym/repoman/modules/scan/depend/_depend_checks.py b/repoman/lib/repoman/modules/scan/depend/_depend_checks.py
index 690b95aa07d..690b95aa07d 100644
--- a/repoman/pym/repoman/modules/scan/depend/_depend_checks.py
+++ b/repoman/lib/repoman/modules/scan/depend/_depend_checks.py
diff --git a/repoman/pym/repoman/modules/scan/depend/_gen_arches.py b/repoman/lib/repoman/modules/scan/depend/_gen_arches.py
index 16b8dac5f3c..16b8dac5f3c 100644
--- a/repoman/pym/repoman/modules/scan/depend/_gen_arches.py
+++ b/repoman/lib/repoman/modules/scan/depend/_gen_arches.py
diff --git a/repoman/pym/repoman/modules/scan/depend/profile.py b/repoman/lib/repoman/modules/scan/depend/profile.py
index d980f4ecaa2..d980f4ecaa2 100644
--- a/repoman/pym/repoman/modules/scan/depend/profile.py
+++ b/repoman/lib/repoman/modules/scan/depend/profile.py
diff --git a/repoman/pym/repoman/modules/scan/directories/__init__.py b/repoman/lib/repoman/modules/scan/directories/__init__.py
index 276bc7ae9aa..276bc7ae9aa 100644
--- a/repoman/pym/repoman/modules/scan/directories/__init__.py
+++ b/repoman/lib/repoman/modules/scan/directories/__init__.py
diff --git a/repoman/pym/repoman/modules/scan/directories/files.py b/repoman/lib/repoman/modules/scan/directories/files.py
index 2aed26440a3..2aed26440a3 100644
--- a/repoman/pym/repoman/modules/scan/directories/files.py
+++ b/repoman/lib/repoman/modules/scan/directories/files.py
diff --git a/repoman/pym/repoman/modules/scan/directories/mtime.py b/repoman/lib/repoman/modules/scan/directories/mtime.py
index 134a86b80ff..134a86b80ff 100644
--- a/repoman/pym/repoman/modules/scan/directories/mtime.py
+++ b/repoman/lib/repoman/modules/scan/directories/mtime.py
diff --git a/repoman/pym/repoman/modules/scan/eapi/__init__.py b/repoman/lib/repoman/modules/scan/eapi/__init__.py
index 94759fdd741..94759fdd741 100644
--- a/repoman/pym/repoman/modules/scan/eapi/__init__.py
+++ b/repoman/lib/repoman/modules/scan/eapi/__init__.py
diff --git a/repoman/pym/repoman/modules/scan/eapi/eapi.py b/repoman/lib/repoman/modules/scan/eapi/eapi.py
index fbad502a98c..fbad502a98c 100644
--- a/repoman/pym/repoman/modules/scan/eapi/eapi.py
+++ b/repoman/lib/repoman/modules/scan/eapi/eapi.py
diff --git a/repoman/pym/repoman/modules/scan/ebuild/__init__.py b/repoman/lib/repoman/modules/scan/ebuild/__init__.py
index 328a0d6268d..328a0d6268d 100644
--- a/repoman/pym/repoman/modules/scan/ebuild/__init__.py
+++ b/repoman/lib/repoman/modules/scan/ebuild/__init__.py
diff --git a/repoman/pym/repoman/modules/scan/ebuild/ebuild.py b/repoman/lib/repoman/modules/scan/ebuild/ebuild.py
index d2715bc6ebf..d2715bc6ebf 100644
--- a/repoman/pym/repoman/modules/scan/ebuild/ebuild.py
+++ b/repoman/lib/repoman/modules/scan/ebuild/ebuild.py
diff --git a/repoman/pym/repoman/modules/scan/ebuild/multicheck.py b/repoman/lib/repoman/modules/scan/ebuild/multicheck.py
index 94526ae9e4d..94526ae9e4d 100644
--- a/repoman/pym/repoman/modules/scan/ebuild/multicheck.py
+++ b/repoman/lib/repoman/modules/scan/ebuild/multicheck.py
diff --git a/repoman/pym/repoman/modules/scan/eclasses/__init__.py b/repoman/lib/repoman/modules/scan/eclasses/__init__.py
index 234ef9fca09..234ef9fca09 100644
--- a/repoman/pym/repoman/modules/scan/eclasses/__init__.py
+++ b/repoman/lib/repoman/modules/scan/eclasses/__init__.py
diff --git a/repoman/pym/repoman/modules/scan/eclasses/live.py b/repoman/lib/repoman/modules/scan/eclasses/live.py
index dca10b583fc..dca10b583fc 100644
--- a/repoman/pym/repoman/modules/scan/eclasses/live.py
+++ b/repoman/lib/repoman/modules/scan/eclasses/live.py
diff --git a/repoman/pym/repoman/modules/scan/eclasses/ruby.py b/repoman/lib/repoman/modules/scan/eclasses/ruby.py
index c5adeedf1a1..c5adeedf1a1 100644
--- a/repoman/pym/repoman/modules/scan/eclasses/ruby.py
+++ b/repoman/lib/repoman/modules/scan/eclasses/ruby.py
diff --git a/repoman/pym/repoman/modules/scan/fetch/__init__.py b/repoman/lib/repoman/modules/scan/fetch/__init__.py
index 30db3f5298f..30db3f5298f 100644
--- a/repoman/pym/repoman/modules/scan/fetch/__init__.py
+++ b/repoman/lib/repoman/modules/scan/fetch/__init__.py
diff --git a/repoman/pym/repoman/modules/scan/fetch/fetches.py b/repoman/lib/repoman/modules/scan/fetch/fetches.py
index 5a958a46157..5a958a46157 100644
--- a/repoman/pym/repoman/modules/scan/fetch/fetches.py
+++ b/repoman/lib/repoman/modules/scan/fetch/fetches.py
diff --git a/repoman/pym/repoman/modules/scan/keywords/__init__.py b/repoman/lib/repoman/modules/scan/keywords/__init__.py
index d4c1281bc38..d4c1281bc38 100644
--- a/repoman/pym/repoman/modules/scan/keywords/__init__.py
+++ b/repoman/lib/repoman/modules/scan/keywords/__init__.py
diff --git a/repoman/pym/repoman/modules/scan/keywords/keywords.py b/repoman/lib/repoman/modules/scan/keywords/keywords.py
index 556f352adbe..556f352adbe 100644
--- a/repoman/pym/repoman/modules/scan/keywords/keywords.py
+++ b/repoman/lib/repoman/modules/scan/keywords/keywords.py
diff --git a/repoman/pym/repoman/modules/scan/manifest/__init__.py b/repoman/lib/repoman/modules/scan/manifest/__init__.py
index 9e05c5288bc..9e05c5288bc 100644
--- a/repoman/pym/repoman/modules/scan/manifest/__init__.py
+++ b/repoman/lib/repoman/modules/scan/manifest/__init__.py
diff --git a/repoman/pym/repoman/modules/scan/manifest/manifests.py b/repoman/lib/repoman/modules/scan/manifest/manifests.py
index dc2b338e412..dc2b338e412 100644
--- a/repoman/pym/repoman/modules/scan/manifest/manifests.py
+++ b/repoman/lib/repoman/modules/scan/manifest/manifests.py
diff --git a/repoman/pym/repoman/modules/scan/metadata/__init__.py b/repoman/lib/repoman/modules/scan/metadata/__init__.py
index fccde99b5b1..fccde99b5b1 100644
--- a/repoman/pym/repoman/modules/scan/metadata/__init__.py
+++ b/repoman/lib/repoman/modules/scan/metadata/__init__.py
diff --git a/repoman/pym/repoman/modules/scan/metadata/description.py b/repoman/lib/repoman/modules/scan/metadata/description.py
index 0ce81a2dc77..0ce81a2dc77 100644
--- a/repoman/pym/repoman/modules/scan/metadata/description.py
+++ b/repoman/lib/repoman/modules/scan/metadata/description.py
diff --git a/repoman/pym/repoman/modules/scan/metadata/ebuild_metadata.py b/repoman/lib/repoman/modules/scan/metadata/ebuild_metadata.py
index 4c35bbc1238..4c35bbc1238 100644
--- a/repoman/pym/repoman/modules/scan/metadata/ebuild_metadata.py
+++ b/repoman/lib/repoman/modules/scan/metadata/ebuild_metadata.py
diff --git a/repoman/pym/repoman/modules/scan/metadata/pkgmetadata.py b/repoman/lib/repoman/modules/scan/metadata/pkgmetadata.py
index 3c38697fe10..3c38697fe10 100644
--- a/repoman/pym/repoman/modules/scan/metadata/pkgmetadata.py
+++ b/repoman/lib/repoman/modules/scan/metadata/pkgmetadata.py
diff --git a/repoman/pym/repoman/modules/scan/metadata/restrict.py b/repoman/lib/repoman/modules/scan/metadata/restrict.py
index 99784f23187..99784f23187 100644
--- a/repoman/pym/repoman/modules/scan/metadata/restrict.py
+++ b/repoman/lib/repoman/modules/scan/metadata/restrict.py
diff --git a/repoman/pym/repoman/modules/scan/metadata/use_flags.py b/repoman/lib/repoman/modules/scan/metadata/use_flags.py
index 1738fd23e0b..1738fd23e0b 100644
--- a/repoman/pym/repoman/modules/scan/metadata/use_flags.py
+++ b/repoman/lib/repoman/modules/scan/metadata/use_flags.py
diff --git a/repoman/pym/repoman/modules/scan/module.py b/repoman/lib/repoman/modules/scan/module.py
index baed68989fc..baed68989fc 100644
--- a/repoman/pym/repoman/modules/scan/module.py
+++ b/repoman/lib/repoman/modules/scan/module.py
diff --git a/repoman/pym/repoman/modules/scan/options/__init__.py b/repoman/lib/repoman/modules/scan/options/__init__.py
index ffce474e548..ffce474e548 100644
--- a/repoman/pym/repoman/modules/scan/options/__init__.py
+++ b/repoman/lib/repoman/modules/scan/options/__init__.py
diff --git a/repoman/pym/repoman/modules/scan/options/options.py b/repoman/lib/repoman/modules/scan/options/options.py
index 443f01bd8b1..443f01bd8b1 100644
--- a/repoman/pym/repoman/modules/scan/options/options.py
+++ b/repoman/lib/repoman/modules/scan/options/options.py
diff --git a/repoman/pym/repoman/modules/scan/scan.py b/repoman/lib/repoman/modules/scan/scan.py
index d2a5f515ba3..d2a5f515ba3 100644
--- a/repoman/pym/repoman/modules/scan/scan.py
+++ b/repoman/lib/repoman/modules/scan/scan.py
diff --git a/repoman/pym/repoman/modules/scan/scanbase.py b/repoman/lib/repoman/modules/scan/scanbase.py
index aea1bb121da..aea1bb121da 100644
--- a/repoman/pym/repoman/modules/scan/scanbase.py
+++ b/repoman/lib/repoman/modules/scan/scanbase.py
diff --git a/repoman/pym/repoman/modules/vcs/None/__init__.py b/repoman/lib/repoman/modules/vcs/None/__init__.py
index 28593254139..28593254139 100644
--- a/repoman/pym/repoman/modules/vcs/None/__init__.py
+++ b/repoman/lib/repoman/modules/vcs/None/__init__.py
diff --git a/repoman/pym/repoman/modules/vcs/None/changes.py b/repoman/lib/repoman/modules/vcs/None/changes.py
index 46c38e25790..46c38e25790 100644
--- a/repoman/pym/repoman/modules/vcs/None/changes.py
+++ b/repoman/lib/repoman/modules/vcs/None/changes.py
diff --git a/repoman/pym/repoman/modules/vcs/None/status.py b/repoman/lib/repoman/modules/vcs/None/status.py
index d6e5ca0e43d..d6e5ca0e43d 100644
--- a/repoman/pym/repoman/modules/vcs/None/status.py
+++ b/repoman/lib/repoman/modules/vcs/None/status.py
diff --git a/repoman/pym/repoman/modules/vcs/__init__.py b/repoman/lib/repoman/modules/vcs/__init__.py
index 84e83740805..84e83740805 100644
--- a/repoman/pym/repoman/modules/vcs/__init__.py
+++ b/repoman/lib/repoman/modules/vcs/__init__.py
diff --git a/repoman/pym/repoman/modules/vcs/bzr/__init__.py b/repoman/lib/repoman/modules/vcs/bzr/__init__.py
index 4490ed86c90..4490ed86c90 100644
--- a/repoman/pym/repoman/modules/vcs/bzr/__init__.py
+++ b/repoman/lib/repoman/modules/vcs/bzr/__init__.py
diff --git a/repoman/pym/repoman/modules/vcs/bzr/changes.py b/repoman/lib/repoman/modules/vcs/bzr/changes.py
index 4d4808c0877..4d4808c0877 100644
--- a/repoman/pym/repoman/modules/vcs/bzr/changes.py
+++ b/repoman/lib/repoman/modules/vcs/bzr/changes.py
diff --git a/repoman/pym/repoman/modules/vcs/bzr/status.py b/repoman/lib/repoman/modules/vcs/bzr/status.py
index 199e7f3999e..199e7f3999e 100644
--- a/repoman/pym/repoman/modules/vcs/bzr/status.py
+++ b/repoman/lib/repoman/modules/vcs/bzr/status.py
diff --git a/repoman/pym/repoman/modules/vcs/changes.py b/repoman/lib/repoman/modules/vcs/changes.py
index aa4923f8f1a..aa4923f8f1a 100644
--- a/repoman/pym/repoman/modules/vcs/changes.py
+++ b/repoman/lib/repoman/modules/vcs/changes.py
diff --git a/repoman/pym/repoman/modules/vcs/cvs/__init__.py b/repoman/lib/repoman/modules/vcs/cvs/__init__.py
index 0b4587bc623..0b4587bc623 100644
--- a/repoman/pym/repoman/modules/vcs/cvs/__init__.py
+++ b/repoman/lib/repoman/modules/vcs/cvs/__init__.py
diff --git a/repoman/pym/repoman/modules/vcs/cvs/changes.py b/repoman/lib/repoman/modules/vcs/cvs/changes.py
index 583a96f7c6c..583a96f7c6c 100644
--- a/repoman/pym/repoman/modules/vcs/cvs/changes.py
+++ b/repoman/lib/repoman/modules/vcs/cvs/changes.py
diff --git a/repoman/pym/repoman/modules/vcs/cvs/status.py b/repoman/lib/repoman/modules/vcs/cvs/status.py
index 3ec88f12562..3ec88f12562 100644
--- a/repoman/pym/repoman/modules/vcs/cvs/status.py
+++ b/repoman/lib/repoman/modules/vcs/cvs/status.py
diff --git a/repoman/pym/repoman/modules/vcs/git/__init__.py b/repoman/lib/repoman/modules/vcs/git/__init__.py
index eecd4a1d006..eecd4a1d006 100644
--- a/repoman/pym/repoman/modules/vcs/git/__init__.py
+++ b/repoman/lib/repoman/modules/vcs/git/__init__.py
diff --git a/repoman/pym/repoman/modules/vcs/git/changes.py b/repoman/lib/repoman/modules/vcs/git/changes.py
index 7e9ac1eb5c3..7e9ac1eb5c3 100644
--- a/repoman/pym/repoman/modules/vcs/git/changes.py
+++ b/repoman/lib/repoman/modules/vcs/git/changes.py
diff --git a/repoman/pym/repoman/modules/vcs/git/status.py b/repoman/lib/repoman/modules/vcs/git/status.py
index e5aa9c741dc..e5aa9c741dc 100644
--- a/repoman/pym/repoman/modules/vcs/git/status.py
+++ b/repoman/lib/repoman/modules/vcs/git/status.py
diff --git a/repoman/pym/repoman/modules/vcs/hg/__init__.py b/repoman/lib/repoman/modules/vcs/hg/__init__.py
index 2e39970f721..2e39970f721 100644
--- a/repoman/pym/repoman/modules/vcs/hg/__init__.py
+++ b/repoman/lib/repoman/modules/vcs/hg/__init__.py
diff --git a/repoman/pym/repoman/modules/vcs/hg/changes.py b/repoman/lib/repoman/modules/vcs/hg/changes.py
index 867057545ff..867057545ff 100644
--- a/repoman/pym/repoman/modules/vcs/hg/changes.py
+++ b/repoman/lib/repoman/modules/vcs/hg/changes.py
diff --git a/repoman/pym/repoman/modules/vcs/hg/status.py b/repoman/lib/repoman/modules/vcs/hg/status.py
index 8443554f501..8443554f501 100644
--- a/repoman/pym/repoman/modules/vcs/hg/status.py
+++ b/repoman/lib/repoman/modules/vcs/hg/status.py
diff --git a/repoman/pym/repoman/modules/vcs/settings.py b/repoman/lib/repoman/modules/vcs/settings.py
index a8e91dd2743..a8e91dd2743 100644
--- a/repoman/pym/repoman/modules/vcs/settings.py
+++ b/repoman/lib/repoman/modules/vcs/settings.py
diff --git a/repoman/pym/repoman/modules/vcs/svn/__init__.py b/repoman/lib/repoman/modules/vcs/svn/__init__.py
index 6bb0b9af486..6bb0b9af486 100644
--- a/repoman/pym/repoman/modules/vcs/svn/__init__.py
+++ b/repoman/lib/repoman/modules/vcs/svn/__init__.py
diff --git a/repoman/pym/repoman/modules/vcs/svn/changes.py b/repoman/lib/repoman/modules/vcs/svn/changes.py
index dfed1655bd8..dfed1655bd8 100644
--- a/repoman/pym/repoman/modules/vcs/svn/changes.py
+++ b/repoman/lib/repoman/modules/vcs/svn/changes.py
diff --git a/repoman/pym/repoman/modules/vcs/svn/status.py b/repoman/lib/repoman/modules/vcs/svn/status.py
index 6575fe0b0f3..6575fe0b0f3 100644
--- a/repoman/pym/repoman/modules/vcs/svn/status.py
+++ b/repoman/lib/repoman/modules/vcs/svn/status.py
diff --git a/repoman/pym/repoman/modules/vcs/vcs.py b/repoman/lib/repoman/modules/vcs/vcs.py
index b4ff3dc9c3a..b4ff3dc9c3a 100644
--- a/repoman/pym/repoman/modules/vcs/vcs.py
+++ b/repoman/lib/repoman/modules/vcs/vcs.py
diff --git a/repoman/pym/repoman/profile.py b/repoman/lib/repoman/profile.py
index 50da917282d..50da917282d 100644
--- a/repoman/pym/repoman/profile.py
+++ b/repoman/lib/repoman/profile.py
diff --git a/repoman/pym/repoman/qa_data.py b/repoman/lib/repoman/qa_data.py
index 01141a61725..01141a61725 100644
--- a/repoman/pym/repoman/qa_data.py
+++ b/repoman/lib/repoman/qa_data.py
diff --git a/repoman/pym/repoman/qa_tracker.py b/repoman/lib/repoman/qa_tracker.py
index faaf8e398e6..faaf8e398e6 100644
--- a/repoman/pym/repoman/qa_tracker.py
+++ b/repoman/lib/repoman/qa_tracker.py
diff --git a/repoman/pym/repoman/repos.py b/repoman/lib/repoman/repos.py
index 9c820b08caa..9c820b08caa 100644
--- a/repoman/pym/repoman/repos.py
+++ b/repoman/lib/repoman/repos.py
diff --git a/repoman/pym/repoman/scanner.py b/repoman/lib/repoman/scanner.py
index c456bbde9f7..c456bbde9f7 100644
--- a/repoman/pym/repoman/scanner.py
+++ b/repoman/lib/repoman/scanner.py
diff --git a/repoman/pym/repoman/tests/__init__.py b/repoman/lib/repoman/tests/__init__.py
index d57ca9b1085..d57ca9b1085 100644
--- a/repoman/pym/repoman/tests/__init__.py
+++ b/repoman/lib/repoman/tests/__init__.py
diff --git a/repoman/pym/repoman/tests/__test__.py b/repoman/lib/repoman/tests/__test__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/repoman/pym/repoman/tests/__test__.py
+++ b/repoman/lib/repoman/tests/__test__.py
diff --git a/repoman/pym/repoman/tests/changelog/__init__.py b/repoman/lib/repoman/tests/changelog/__init__.py
index 532918b6a39..532918b6a39 100644
--- a/repoman/pym/repoman/tests/changelog/__init__.py
+++ b/repoman/lib/repoman/tests/changelog/__init__.py
diff --git a/repoman/pym/repoman/tests/changelog/__test__.py b/repoman/lib/repoman/tests/changelog/__test__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/repoman/pym/repoman/tests/changelog/__test__.py
+++ b/repoman/lib/repoman/tests/changelog/__test__.py
diff --git a/repoman/pym/repoman/tests/changelog/test_echangelog.py b/repoman/lib/repoman/tests/changelog/test_echangelog.py
index 1640be268fa..1640be268fa 100644
--- a/repoman/pym/repoman/tests/changelog/test_echangelog.py
+++ b/repoman/lib/repoman/tests/changelog/test_echangelog.py
diff --git a/repoman/pym/repoman/tests/commit/__init__.py b/repoman/lib/repoman/tests/commit/__init__.py
index d74fd94a7d8..d74fd94a7d8 100644
--- a/repoman/pym/repoman/tests/commit/__init__.py
+++ b/repoman/lib/repoman/tests/commit/__init__.py
diff --git a/repoman/pym/repoman/tests/commit/__test__.py b/repoman/lib/repoman/tests/commit/__test__.py
index 8b137891791..8b137891791 100644
--- a/repoman/pym/repoman/tests/commit/__test__.py
+++ b/repoman/lib/repoman/tests/commit/__test__.py
diff --git a/repoman/pym/repoman/tests/commit/test_commitmsg.py b/repoman/lib/repoman/tests/commit/test_commitmsg.py
index a734c1065a6..a734c1065a6 100644
--- a/repoman/pym/repoman/tests/commit/test_commitmsg.py
+++ b/repoman/lib/repoman/tests/commit/test_commitmsg.py
diff --git a/repoman/pym/repoman/tests/runTests.py b/repoman/lib/repoman/tests/runTests.py
index ed73592a1de..542acb87064 100644
--- a/repoman/pym/repoman/tests/runTests.py
+++ b/repoman/lib/repoman/tests/runTests.py
@@ -35,7 +35,7 @@ repoman_pym = osp.dirname(osp.dirname(osp.dirname(osp.realpath(__file__))))
 sys.path.insert(0, repoman_pym)
 
 # Add in the parent portage python modules
-portage_pym = osp.dirname(osp.dirname(repoman_pym)) + '/pym'
+portage_pym = osp.dirname(osp.dirname(repoman_pym)) + '/lib'
 sys.path.insert(0, portage_pym)
 
 # import our centrally initialized portage instance
diff --git a/repoman/pym/repoman/tests/simple/__init__.py b/repoman/lib/repoman/tests/simple/__init__.py
index 532918b6a39..532918b6a39 100644
--- a/repoman/pym/repoman/tests/simple/__init__.py
+++ b/repoman/lib/repoman/tests/simple/__init__.py
diff --git a/repoman/pym/repoman/tests/simple/__test__.py b/repoman/lib/repoman/tests/simple/__test__.py
index 8b137891791..8b137891791 100644
--- a/repoman/pym/repoman/tests/simple/__test__.py
+++ b/repoman/lib/repoman/tests/simple/__test__.py
diff --git a/repoman/pym/repoman/tests/simple/test_simple.py b/repoman/lib/repoman/tests/simple/test_simple.py
index 3d7a70ad037..3d7a70ad037 100644
--- a/repoman/pym/repoman/tests/simple/test_simple.py
+++ b/repoman/lib/repoman/tests/simple/test_simple.py
diff --git a/repoman/pym/repoman/utilities.py b/repoman/lib/repoman/utilities.py
index 1272f3fb6ee..1272f3fb6ee 100644
--- a/repoman/pym/repoman/utilities.py
+++ b/repoman/lib/repoman/utilities.py
diff --git a/repoman/runtests b/repoman/runtests
index c1825301a1e..2b8cb4c5e39 100755
--- a/repoman/runtests
+++ b/repoman/runtests
@@ -89,7 +89,7 @@ Run against specific versions of python.
 $ %(prog)s --python-versions '2.7 3.3'
 
 Run just one unittest.
-$ %(prog)s pym/portage/tests/xpak/test_decodeint.py
+$ %(prog)s lib/portage/tests/xpak/test_decodeint.py
 """
 	parser = argparse.ArgumentParser(
 		description=__doc__,
@@ -123,7 +123,7 @@ def main(argv):
 				pyversions.extend(ver.split())
 
 	here = os.path.dirname(__file__)
-	run_path = os.path.join(here, 'pym/repoman/tests/runTests.py')
+	run_path = os.path.join(here, 'lib/repoman/tests/runTests.py')
 	tempdir = None
 	try:
 		# Set up a single tempdir for all the tests to use.
diff --git a/repoman/setup.py b/repoman/setup.py
index 23abff9b994..23b106807c6 100755
--- a/repoman/setup.py
+++ b/repoman/setup.py
@@ -147,11 +147,6 @@ class x_clean(clean):
 			print('removing %s symlink' % repr(conf_dir))
 			os.unlink(conf_dir)
 
-		pym_dir = os.path.join(top_dir, 'pym')
-		if os.path.islink(pym_dir):
-			print('removing %s sylink' % repr(pym_dir))
-			os.unlink(pym_dir)
-
 		pni_file = os.path.join(top_dir, '.repoman_not_installed')
 		if os.path.exists(pni_file):
 			print('removing %s' % repr(pni_file))
@@ -397,17 +392,6 @@ class build_tests(x_build_scripts_custom):
 		print('Symlinking %s -> %s' % (conf_dir, conf_src))
 		os.symlink(conf_src, conf_dir)
 
-		# symlink 'pym' directory
-		pym_dir = os.path.join(self.top_dir, 'pym')
-		if os.path.exists(pym_dir):
-			if not os.path.islink(pym_dir):
-				raise SystemError('%s exists and is not a symlink (collision)'
-					% repr(pym_dir))
-			os.unlink(pym_dir)
-		pym_src = 'lib'
-		print('Symlinking %s -> %s' % (pym_dir, pym_src))
-		os.symlink(pym_src, pym_dir)
-
 		# create $build_lib/../.repoman_not_installed
 		# to enable proper paths in tests
 		with open(os.path.join(self.top_dir, '.repoman_not_installed'), 'w'):
@@ -435,9 +419,9 @@ class test(Command):
 
 
 def find_packages():
-	for dirpath, _dirnames, filenames in os.walk('pym'):
+	for dirpath, _dirnames, filenames in os.walk('lib'):
 		if '__init__.py' in filenames:
-			yield os.path.relpath(dirpath, 'pym')
+			yield os.path.relpath(dirpath, 'lib')
 
 
 def find_scripts():
@@ -471,7 +455,7 @@ setup(
 	author = 'Gentoo Portage Development Team',
 	author_email = 'dev-portage@gentoo.org',
 
-	package_dir = {'': 'pym'},
+	package_dir = {'': 'lib'},
 	packages = list(find_packages()),
 	# something to cheat build & install commands
 	scripts = list(find_scripts()),
diff --git a/runtests b/runtests
index 64e62bb6932..597ccaede61 100755
--- a/runtests
+++ b/runtests
@@ -89,7 +89,7 @@ Run against specific versions of python.
 $ %(prog)s --python-versions '2.7 3.3'
 
 Run just one unittest.
-$ %(prog)s pym/portage/tests/xpak/test_decodeint.py
+$ %(prog)s lib/portage/tests/xpak/test_decodeint.py
 """
 	parser = argparse.ArgumentParser(
 		description=__doc__,
@@ -133,7 +133,7 @@ def main(argv):
 		statuses = []
 		for ver in pyversions:
 			prog = get_python_executable(ver)
-			cmd = [prog, '-b', '-Wd', 'pym/portage/tests/runTests.py'] + args
+			cmd = [prog, '-b', '-Wd', 'lib/portage/tests/runTests.py'] + args
 			if os.access(prog, os.X_OK):
 				print('%sTesting with Python %s...%s' %
 					(colors.GOOD, ver, colors.NORMAL))
diff --git a/setup.py b/setup.py
index f50971f607f..b45a2962800 100755
--- a/setup.py
+++ b/setup.py
@@ -612,9 +612,9 @@ class test(Command):
 
 
 def find_packages():
-	for dirpath, _dirnames, filenames in os.walk('pym'):
+	for dirpath, _dirnames, filenames in os.walk('lib'):
 		if '__init__.py' in filenames:
-			yield os.path.relpath(dirpath, 'pym')
+			yield os.path.relpath(dirpath, 'lib')
 
 
 def find_scripts():
@@ -667,7 +667,7 @@ setup(
 	author = 'Gentoo Portage Development Team',
 	author_email = 'dev-portage@gentoo.org',
 
-	package_dir = {'': 'pym'},
+	package_dir = {'': 'lib'},
 	packages = list(find_packages()),
 	# something to cheat build & install commands
 	scripts = list(find_scripts()),
diff --git a/testpath b/testpath
index d9873011f61..332958613dd 100644
--- a/testpath
+++ b/testpath
@@ -8,9 +8,9 @@
 # ...
 if [[ "$SHELL" =~ "zsh" ]]; then
 	export PATH="$(dirname $0)/bin:${PATH}"
-	export PYTHONPATH=PYTHONPATH="$(dirname $0)/pym:${PYTHONPATH:+:}${PYTHONPATH}"
+	export PYTHONPATH=PYTHONPATH="$(dirname $0)/lib:${PYTHONPATH:+:}${PYTHONPATH}"
 else
 	export PATH="$(dirname ${BASH_SOURCE[0]})/bin:${PATH}"
-	export PYTHONPATH=PYTHONPATH="$(dirname $BASH_SOURCE[0])/pym:${PYTHONPATH:+:}${PYTHONPATH}"
+	export PYTHONPATH=PYTHONPATH="$(dirname $BASH_SOURCE[0])/lib:${PYTHONPATH:+:}${PYTHONPATH}"
 fi
 export PYTHONWARNINGS=d,i::ImportWarning