summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven J Newbury <steve@snewbury.org.uk>2009-04-26 13:45:37 +0100
committerSteven J Newbury <steve@snewbury.org.uk>2009-04-26 13:45:37 +0100
commitbff5fafb67b1175f2c3f995034d52c74e00b6a56 (patch)
tree37b8a1d424f772c45062ec0b4d039a79cfb2832b /dev-lang
parentFix sandbox violation from java-utils-2.eclass when gcj-jdk isn't (diff)
downloadmultilib-portage-bff5fafb67b1175f2c3f995034d52c74e00b6a56.tar.gz
multilib-portage-bff5fafb67b1175f2c3f995034d52c74e00b6a56.tar.bz2
multilib-portage-bff5fafb67b1175f2c3f995034d52c74e00b6a56.zip
dev-lang/python: Add a couple of extra GENTOO_LIBDIR changes, currently only for
2.5.4-r2 but will update the others shortly
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/python/Manifest3
-rw-r--r--dev-lang/python/files/python-2.5.4-distutils-multilib.patch26
-rw-r--r--dev-lang/python/python-2.5.4-r2.ebuild2
3 files changed, 30 insertions, 1 deletions
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 21c0d3a41..e0ed20c45 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -7,6 +7,7 @@ AUX python-2.4.2-gentoo_obsd.patch 1554 RMD160 c93e34df155440e68e7db283d709c3ef3
AUX python-2.4.4-test-cross.patch 977 RMD160 8fdcd45dc202993988f7a1c2b3d918068883b99e SHA1 96f25777150ba05765282a43f08da6b6fab3cb73 SHA256 ff2a131776d560d188ec5069e17fea3eb09c26fdd02124ae5ff34d791c9fd9f6
AUX python-2.5-cross-printf.patch 903 RMD160 8dc0ee148120aaf7667624bdb5574bb6af5d2a00 SHA1 596e05be8cde43e4cdd87c8ed06ebb40828f7cea SHA256 1e91e5123d74d89aa8fc9dc60d98516b785f851e43da9b634ae535130e24e780
AUX python-2.5.2_turkish.patch 4882 RMD160 69486e369849e0706f4261410f231649397cf793 SHA1 1dc369bdfb10bc9ddb63a5672fa561acf8dee32c SHA256 bf4019ae2acd4b6868db0b625910f668f857711ae00b29f638d038611444b169
+AUX python-2.5.4-distutils-multilib.patch 1054 RMD160 c196fe861bf696557f0eb76363868b856d9a136b SHA1 204737fc529779260399e384fa8394afa264321f SHA256 5f8f9e3a9e088bb98894ee0a5432ed929ee5c82fc63c38fb77c2fbfa4ef24d46
AUX python-2.6-chflags-cross.patch 1716 RMD160 b0ec772a41a24d51f4c7430b19bcc6251cd6be87 SHA1 4745cd53cef503c41c50573ad97f40eb89fd4bcd SHA256 7c36689db47720052069725036983c2fb6959f425e3777aae55976b2788d463f
AUX python-2.6-cross-patch-tweak.patch 717 RMD160 4791a798b494de925100c33ad42c214038414d7f SHA1 c84d19c2846136eb5cfb2da6a316f7d9688b7c90 SHA256 9a5c4142738daf1fe0f78747ee4b03c4402c2b84f1349150dce99f6631688abd
AUX python-2.6-test-cross.patch 914 RMD160 1f421b5565d39a24b887e85cbecaf3857741f756 SHA1 9c05fbe28aac6373f24317db5c277bc4549dde0c SHA256 8264f6ffe5aedcce67bea00b0346e5416a5486da2229bf82fe748d87ec65c4de
@@ -24,6 +25,6 @@ DIST python-gentoo-patches-2.5.4.tar.bz2 19474 RMD160 00bb0918414db251b11b7f19a9
DIST python-gentoo-patches-2.6-r5.tar.bz2 7431 RMD160 dbfc0715773446614843b45818d4152ca133140a SHA1 495cbfbf333052faf6860cf2d682f249a787557c SHA256 ef81eac97d933c77afcfd2434f44132717cd0a1550d1092e388e3c2f3dd5f3cf
DIST python-gentoo-patches-2.6.2.tar.bz2 8848 RMD160 e3cf700fd8966a6bd6e3e4b64534b72e56863819 SHA1 e073af86f27db77d2eb396ff78814f2b8920811b SHA256 9178be1a77893dc2c74e40073095bbc560d02e5456f1e6be6da20930470950f7
EBUILD python-2.5.2-r7.ebuild 10730 RMD160 93627852adbd2e41c4e5342840ca2b49f2a98405 SHA1 2eb26b8b69f62d5d981c79f6ea7e3a79b7884741 SHA256 986687608226bff47761fb44210e158a83badff0a856fbf89cdb360e0b846e35
-EBUILD python-2.5.4-r2.ebuild 10837 RMD160 29f73f461fa8e93ff44db67004303fcca2fcb558 SHA1 ee319c6f3058d6003f0a402de7a7005cd2874585 SHA256 9a5dd5b4d3ed4a93bd9b2393e4590f3d5cbaea3c555b2332df158200a41b42ec
+EBUILD python-2.5.4-r2.ebuild 10890 RMD160 35b94ddda2bb5953626c7f6c4e325b6e58e1bbe7 SHA1 fe20c4f6986a9a1183bb13aa13666c29266bab8d SHA256 07eab80bc5c982c4afe8d3195699b2732bf4ee2bdbb2b49dbfa233adf33a2d47
EBUILD python-2.6.1-r1.ebuild 9268 RMD160 8fe543b70cdf557b504e21b31e0cc6acd111c7ee SHA1 9851b055d3667e49a86449db076e97efca0441a5 SHA256 21570141e43249e646e3a120c4ee47d85f9b2b10b286783192265b0a04bb4e3f
EBUILD python-2.6.2.ebuild 8807 RMD160 65c8f5acdbb991181afb84722d1b046b2d783a41 SHA1 2157346cd4d5fc574c2b77e5216a8bd6155a53df SHA256 3d0e4bd59cd6e29e1abfa84e0d5e9a8b8363cc5b4995693ee2c69c1b86eb61d8
diff --git a/dev-lang/python/files/python-2.5.4-distutils-multilib.patch b/dev-lang/python/files/python-2.5.4-distutils-multilib.patch
new file mode 100644
index 000000000..da8734313
--- /dev/null
+++ b/dev-lang/python/files/python-2.5.4-distutils-multilib.patch
@@ -0,0 +1,26 @@
+--- ./Lib/distutils/command/install.py~ 2009-04-24 22:52:33.000000000 +0100
++++ ./Lib/distutils/command/install.py 2009-04-24 22:56:25.227771188 +0100
+@@ -45,8 +45,8 @@
+ 'data' : '$base',
+ },
+ 'unix_home': {
+- 'purelib': '$base/lib/python',
+- 'platlib': '$base/lib/python',
++ 'purelib': '$base/@@GENTOO_LIBDIR@@/python',
++ 'platlib': '$base/@@GENTOO_LIBDIR@@/python',
+ 'headers': '$base/include/python/$dist_name',
+ 'scripts': '$base/bin',
+ 'data' : '$base',
+--- ./Lib/distutils/sysconfig.py~ 2009-04-24 23:12:06.000000000 +0100
++++ ./Lib/distutils/sysconfig.py 2009-04-24 23:26:42.073760340 +0100
+@@ -99,6 +99,10 @@
+ prefix = plat_specific and EXEC_PREFIX or PREFIX
+
+ if os.name == "posix":
++ if plat_specific or standard_lib:
++ lib = '@@GENTOO_LIBDIR@@'
++ else:
++ lib = 'lib'
+ libpython = os.path.join(prefix,
+ "lib",
+ "python" + get_python_version())
diff --git a/dev-lang/python/python-2.5.4-r2.ebuild b/dev-lang/python/python-2.5.4-r2.ebuild
index 41488a659..7ba7eaa59 100644
--- a/dev-lang/python/python-2.5.4-r2.ebuild
+++ b/dev-lang/python/python-2.5.4-r2.ebuild
@@ -63,6 +63,8 @@ multilib-native_src_prepare_internal() {
rm "${WORKDIR}/${PV}"/*_all_crosscompile.patch
fi
+ epatch "${FILESDIR}"/${P}-distutils-multilib.patch
+
EPATCH_SUFFIX="patch" epatch "${WORKDIR}/${PV}"
sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
Lib/distutils/command/install.py \