Rename pym→lib, for better distutils-r1 interoperability

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

15 files changed, 15 insertions, 15 deletions

diff --git a/bin/archive-conf b/bin/archive-conf
index 59350a0f8..8341ffe73 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 4130e75ae..d677e7568 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 fb245972f..94ba4c606 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 49e7774bf..32a0a731e 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 710257549..a49e28b99 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 1f323bdc5..d68d3f05e 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 70fb5aa00..d172319f8 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 a26dae1e7..df904f7c0 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 e1262d544..e372f5e9e 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 03fc5849f..2256b37f5 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 70ca9fc90..a291e013d 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 afc8eb84b..b5b76aae2 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 35499afd2..c63591a77 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 f071dd904..c28a3e382 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 eef4cfdfa..bedc58bda 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