Rename pym→lib, for better distutils-r1 interoperability

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

143 files changed, 11 insertions, 27 deletions

diff --git a/repoman/TEST-NOTES b/repoman/TEST-NOTES
index f9c6ab0cd..8be5f9cf3 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 ab04d56ca..873987f33 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 89779b95c..89779b95c 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 0f611f761..0f611f761 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 b6c19bda3..b6c19bda3 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 8e23322c8..8e23322c8 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 b87df95cd..b87df95cd 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 4a3c57b2c..4a3c57b2c 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 e69de29bb..e69de29bb 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 e69de29bb..e69de29bb 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 ebe6a19b4..ebe6a19b4 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 b4a433ed7..b4a433ed7 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 578bbccde..578bbccde 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 94257c942..94257c942 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 9cf113ba0..9cf113ba0 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 a3c12b3c9..a3c12b3c9 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 81e2ff61e..81e2ff61e 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 11ec1aaf8..11ec1aaf8 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 e69de29bb..e69de29bb 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 e69de29bb..e69de29bb 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 b338a5b40..b338a5b40 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 bedbdaf34..bedbdaf34 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 8b1378917..8b1378917 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 b95a25a74..b95a25a74 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 33bef8a08..33bef8a08 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 4e3d6f0b4..4e3d6f0b4 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 6e4c5314e..6e4c5314e 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 7082a5d02..7082a5d02 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 2ea95347e..2ea95347e 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 f7b458b68..f7b458b68 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 258683345..258683345 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 b33852e74..b33852e74 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 77ad4f625..77ad4f625 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 dc5af701c..dc5af701c 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 bab4dad03..bab4dad03 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 31993df20..31993df20 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 de899c061..de899c061 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 410bad1c7..410bad1c7 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 cecdc5fcf..cecdc5fcf 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 e1e3e638e..e1e3e638e 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 205cc32c2..205cc32c2 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 4b75fc4b5..4b75fc4b5 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 0f41f0136..0f41f0136 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 5d7624a68..5d7624a68 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 6c8a70a52..6c8a70a52 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 06b272772..06b272772 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 6c1e4be9f..6c1e4be9f 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 4fe0fcf5e..4fe0fcf5e 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 63651cd7c..63651cd7c 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 b3228c0f7..b3228c0f7 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 acc3a1e1d..acc3a1e1d 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 b9a84b507..b9a84b507 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 869337221..869337221 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 894ef58d2..894ef58d2 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 7fd9ba797..7fd9ba797 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 e5ea4d0ca..e5ea4d0ca 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 e19617257..e19617257 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 1a0afe682..1a0afe682 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 e97b0d61d..e97b0d61d 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 0ec4fae21..0ec4fae21 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 5cf978137..5cf978137 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 3daa04451..3daa04451 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 502bfbea8..502bfbea8 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 716c5129c..716c5129c 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 2ab4097a3..2ab4097a3 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 556b2ab81..556b2ab81 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 425085a5c..425085a5c 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 37cb54314..37cb54314 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 e69de29bb..e69de29bb 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 c3cc0ddeb..c3cc0ddeb 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 690b95aa0..690b95aa0 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 16b8dac5f..16b8dac5f 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 d980f4eca..d980f4eca 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 276bc7ae9..276bc7ae9 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 2aed26440..2aed26440 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 134a86b80..134a86b80 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 94759fdd7..94759fdd7 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 fbad502a9..fbad502a9 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 328a0d626..328a0d626 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 d2715bc6e..d2715bc6e 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 94526ae9e..94526ae9e 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 234ef9fca..234ef9fca 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 dca10b583..dca10b583 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 c5adeedf1..c5adeedf1 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 30db3f529..30db3f529 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 5a958a461..5a958a461 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 d4c1281bc..d4c1281bc 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 556f352ad..556f352ad 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 9e05c5288..9e05c5288 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 dc2b338e4..dc2b338e4 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 fccde99b5..fccde99b5 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 0ce81a2dc..0ce81a2dc 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 4c35bbc12..4c35bbc12 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 3c38697fe..3c38697fe 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 99784f231..99784f231 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 1738fd23e..1738fd23e 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 baed68989..baed68989 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 ffce474e5..ffce474e5 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 443f01bd8..443f01bd8 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 d2a5f515b..d2a5f515b 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 aea1bb121..aea1bb121 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 285932541..285932541 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 46c38e257..46c38e257 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 d6e5ca0e4..d6e5ca0e4 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 84e837408..84e837408 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 4490ed86c..4490ed86c 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 4d4808c08..4d4808c08 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 199e7f399..199e7f399 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 aa4923f8f..aa4923f8f 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 0b4587bc6..0b4587bc6 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 583a96f7c..583a96f7c 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 3ec88f125..3ec88f125 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 eecd4a1d0..eecd4a1d0 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 7e9ac1eb5..7e9ac1eb5 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 e5aa9c741..e5aa9c741 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 2e39970f7..2e39970f7 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 867057545..867057545 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 8443554f5..8443554f5 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 a8e91dd27..a8e91dd27 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 6bb0b9af4..6bb0b9af4 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 dfed1655b..dfed1655b 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 6575fe0b0..6575fe0b0 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 b4ff3dc9c..b4ff3dc9c 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 50da91728..50da91728 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 01141a617..01141a617 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 faaf8e398..faaf8e398 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 9c820b08c..9c820b08c 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 c456bbde9..c456bbde9 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 d57ca9b10..d57ca9b10 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 e69de29bb..e69de29bb 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 532918b6a..532918b6a 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 e69de29bb..e69de29bb 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 1640be268..1640be268 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 d74fd94a7..d74fd94a7 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 8b1378917..8b1378917 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 a734c1065..a734c1065 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 ed73592a1..542acb870 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 532918b6a..532918b6a 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 8b1378917..8b1378917 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 3d7a70ad0..3d7a70ad0 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 1272f3fb6..1272f3fb6 100644
--- a/repoman/pym/repoman/utilities.py
+++ b/repoman/lib/repoman/utilities.py
diff --git a/repoman/runtests b/repoman/runtests
index c1825301a..2b8cb4c5e 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 23abff9b9..23b106807 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()),