summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Cakebread <pythonhead@gentoo.org>2005-03-19 17:51:20 +0000
committerRob Cakebread <pythonhead@gentoo.org>2005-03-19 17:51:20 +0000
commitdc92de072b156506c95000fd80de6cc01d05278d (patch)
treec6dfbd65596dc84706b0ef437ad9ee794b28a2ab /dev-lang/python/files
parentAdded ~sparc keyword wrt bug #84791. (diff)
downloadhistorical-dc92de072b156506c95000fd80de6cc01d05278d.tar.gz
historical-dc92de072b156506c95000fd80de6cc01d05278d.tar.bz2
historical-dc92de072b156506c95000fd80de6cc01d05278d.zip
Removed multiple dirs in sys path. bug# 83109
Package-Manager: portage-2.0.51.19
Diffstat (limited to 'dev-lang/python/files')
-rw-r--r--dev-lang/python/files/digest-python-2.4-r31
-rw-r--r--dev-lang/python/files/python-2.4-libdir.patch15
2 files changed, 11 insertions, 5 deletions
diff --git a/dev-lang/python/files/digest-python-2.4-r3 b/dev-lang/python/files/digest-python-2.4-r3
new file mode 100644
index 000000000000..f096fae6214a
--- /dev/null
+++ b/dev-lang/python/files/digest-python-2.4-r3
@@ -0,0 +1 @@
+MD5 44c2226eff0f3fc1f2fedaa1ce596533 Python-2.4.tar.bz2 7840762
diff --git a/dev-lang/python/files/python-2.4-libdir.patch b/dev-lang/python/files/python-2.4-libdir.patch
index 61ca31f58a53..d60605c4416d 100644
--- a/dev-lang/python/files/python-2.4-libdir.patch
+++ b/dev-lang/python/files/python-2.4-libdir.patch
@@ -35,10 +35,9 @@ diff -Naurp Python-2.4.orig/Lib/distutils/sysconfig.py Python-2.4/Lib/distutils/
if standard_lib:
return libpython
else:
-diff -Naurp Python-2.4.orig/Lib/site.py Python-2.4/Lib/site.py
---- Python-2.4.orig/Lib/site.py 2004-07-19 19:28:28.000000000 -0700
-+++ Python-2.4/Lib/site.py 2005-02-07 12:17:13.000000000 -0800
-@@ -179,9 +179,14 @@ def addsitepackages(known_paths):
+--- ./Lib/site.py 2005-03-17 09:55:19.295156312 -0800
++++ ./orgLib/site.py 2005-03-17 09:59:42.009217704 -0800
+@@ -179,10 +179,20 @@
sitedirs = [os.path.join(prefix, "Lib", "site-packages")]
elif os.sep == '/':
sitedirs = [os.path.join(prefix,
@@ -49,8 +48,14 @@ diff -Naurp Python-2.4.orig/Lib/site.py Python-2.4/Lib/site.py
"lib",
"python" + sys.version[:3],
"site-packages"),
-+ os.path.join(prefix, "lib64", "site-python"),
++ os.path.join(prefix, "lib64", "site-python"),
os.path.join(prefix, "lib", "site-python")]
++ tmp_sitedirs = []
++ for sdir in sitedirs:
++ if sdir not in tmp_sitedirs:
++ tmp_sitedirs.append(sdir)
++ sitedirs = tmp_sitedirs
+ sitedirs = [os.path.join(prefix,"lib","portage","pym")] + sitedirs
else:
sitedirs = [prefix, os.path.join(prefix, "lib", "site-packages")]
diff -Naurp Python-2.4.orig/Makefile.pre.in Python-2.4/Makefile.pre.in