summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven J Newbury <steve@snewbury.org.uk>2009-04-07 05:07:33 +0100
committerSteven J Newbury <steve@snewbury.org.uk>2009-04-07 05:07:33 +0100
commit9dc11080eeba38aaf4016f551772d0373b73cdc3 (patch)
tree4ec2e69f4ebb5fcc60adea33a03c51664ecf3af6 /dev-lang
parentUse config-*-${ABI} only when not building the final ABI, also add (diff)
downloadmultilib-portage-9dc11080eeba38aaf4016f551772d0373b73cdc3.tar.gz
multilib-portage-9dc11080eeba38aaf4016f551772d0373b73cdc3.tar.bz2
multilib-portage-9dc11080eeba38aaf4016f551772d0373b73cdc3.zip
Keep non final ABI python binaries, packages use the binary to find the
python build time configuration
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/python/Manifest6
-rw-r--r--dev-lang/python/python-2.5.2-r7.ebuild3
-rw-r--r--dev-lang/python/python-2.5.4-r2.ebuild3
-rw-r--r--dev-lang/python/python-2.6.1-r1.ebuild3
4 files changed, 12 insertions, 3 deletions
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 32a9b3b99..cf4acab70 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -19,6 +19,6 @@ DIST Python-2.6.1.tar.bz2 10960385 RMD160 497dafaca9c150fca611b0175eeb13c2fc4d3e
DIST python-gentoo-patches-2.5.2-r7.tar.bz2 28160 RMD160 c2a8c71f464f1cf0cd8e3d142a3f3454de46bc55 SHA1 b64fc90f331e42ea2c364fd61d13b515300fdcbf SHA256 8afff4ed12c3c5ca4418da657617317a8c646a69ae341a3d494747659825355f
DIST python-gentoo-patches-2.5.4.tar.bz2 19474 RMD160 00bb0918414db251b11b7f19a9f8a112c9e49fbd SHA1 fd4955f7da3049abecc4df0e203e783a90390cf8 SHA256 6e050dd8e8a90655bf935af99ad1ae6456bc072f075ddb9bcd532201bbb37274
DIST python-gentoo-patches-2.6-r5.tar.bz2 7431 RMD160 dbfc0715773446614843b45818d4152ca133140a SHA1 495cbfbf333052faf6860cf2d682f249a787557c SHA256 ef81eac97d933c77afcfd2434f44132717cd0a1550d1092e388e3c2f3dd5f3cf
-EBUILD python-2.5.2-r7.ebuild 8987 RMD160 46860edf93cb730d3b287e0107b0d143bfde2387 SHA1 a43cd0cb0423f7b00d39b3c072c703f90ba68fa1 SHA256 123983b40c035d89a3274a08ca2180b1dd91696fbbef0f0c045f410fb7563693
-EBUILD python-2.5.4-r2.ebuild 8996 RMD160 a1359f4ddbecf68eff2a9c56b6897c76ebef985b SHA1 25fd5463056fdb27b626ea6cc23d2a0ab1b55a28 SHA256 445c4375e7ebd5c55e4c8ac26391cf4af7f115b92d34203cff6eee419662231d
-EBUILD python-2.6.1-r1.ebuild 9071 RMD160 cb8444e3343d94c167a2ae1668cb151513d1f415 SHA1 b5846dfdc5ece608fd2f780608ab3bf176863bae SHA256 3f971760495e02a5b2c3c5f8f35d3a3a2d806e5cd2ce9070337e8f4000490061
+EBUILD python-2.5.2-r7.ebuild 9125 RMD160 aec8cd3b33f589ca4fa067778cc8f9506d9f795b SHA1 68e99c703dfe2e29d5707e6b732df37ff23b9e3a SHA256 3bd498dc2531801f2aed47cd880ede34d13a80d7df7cd33142ca4e0cf4c98097
+EBUILD python-2.5.4-r2.ebuild 9134 RMD160 5e143bbbd29d39ebf86032364a2a8856748c58fd SHA1 3b042e3885d8104a831edaa36e69338db523fd87 SHA256 badb7ae1db177e117651450c0474ee7279bf82f81739eca21f8a9a7a21165e28
+EBUILD python-2.6.1-r1.ebuild 9209 RMD160 466694abd36d1ba29f82bd2902fb402aa35705f4 SHA1 a8d79f68b6ed8516a1f06e35330f368901b44dfe SHA256 ac26547932f5eb1945094894b3fd2833304b7b313338f2326e9efe6462b9cf1a
diff --git a/dev-lang/python/python-2.5.2-r7.ebuild b/dev-lang/python/python-2.5.2-r7.ebuild
index 513ae228b..8cd0d9d77 100644
--- a/dev-lang/python/python-2.5.2-r7.ebuild
+++ b/dev-lang/python/python-2.5.2-r7.ebuild
@@ -176,6 +176,9 @@ multilib-native_src_install_internal() {
emake DESTDIR="${D}" altinstall maninstall || die
mv "${D}"/usr/bin/python${PYVER}-config "${D}"/usr/bin/python-config-${PYVER}
+ if [[ $(number_abis) -gt 1 ]] && ! is_final_abi; then
+ mv "${D}"/usr/bin/python${PYVER} "${D}"/usr/bin/python${PYVER}-${ABI}
+ fi
# Fix slotted collisions
mv "${D}"/usr/bin/2to3 "${D}"/usr/bin/2to3-${PYVER}
diff --git a/dev-lang/python/python-2.5.4-r2.ebuild b/dev-lang/python/python-2.5.4-r2.ebuild
index 19a637fc0..7dc27f44e 100644
--- a/dev-lang/python/python-2.5.4-r2.ebuild
+++ b/dev-lang/python/python-2.5.4-r2.ebuild
@@ -176,6 +176,9 @@ multilib-native_src_install_internal() {
emake DESTDIR="${D}" altinstall maninstall || die
mv "${D}"/usr/bin/python${PYVER}-config "${D}"/usr/bin/python-config-${PYVER}
+ if [[ $(number_abis) -gt 1 ]] && ! is_final_abi; then
+ mv "${D}"/usr/bin/python${PYVER} "${D}"/usr/bin/python${PYVER}-${ABI}
+ fi
# Fix slotted collisions
mv "${D}"/usr/bin/2to3 "${D}"/usr/bin/2to3-${PYVER}
diff --git a/dev-lang/python/python-2.6.1-r1.ebuild b/dev-lang/python/python-2.6.1-r1.ebuild
index d50b39272..81a239ff7 100644
--- a/dev-lang/python/python-2.6.1-r1.ebuild
+++ b/dev-lang/python/python-2.6.1-r1.ebuild
@@ -179,6 +179,9 @@ multilib-native_src_install_internal() {
emake DESTDIR="${D}" altinstall maninstall || die
mv "${D}"/usr/bin/python${PYVER}-config "${D}"/usr/bin/python-config-${PYVER}
+ if [[ $(number_abis) -gt 1 ]] && ! is_final_abi; then
+ mv "${D}"/usr/bin/python${PYVER} "${D}"/usr/bin/python${PYVER}-${ABI}
+ fi
# Fix slotted collisions
mv "${D}"/usr/bin/2to3 "${D}"/usr/bin/2to3-${PYVER}