Copy eselect_python logic from more recent ebuilds.

Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

3 files changed, 19 insertions, 22 deletions

diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index 5efb63f78a59..5139560fb33c 100644
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lang/python
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.625 2012/12/02 18:21:49 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.626 2012/12/03 04:14:58 floppym Exp $
+
+  03 Dec 2012; Mike Gilbert <floppym@gentoo.org> python-2.5.4-r5.ebuild:
+  Copy eselect_python logic from more recent ebuilds.
 
   02 Dec 2012; Michał Górny <mgorny@gentoo.org> python-2.5.4-r5.ebuild,
   python-2.6.8-r1.ebuild, python-2.7.3-r3.ebuild, python-3.1.5-r1.ebuild,
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 4a159296b5fd..cf06347e7d89 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -25,7 +25,7 @@ DIST python-gentoo-patches-3.1.5-0.tar.bz2 16939 SHA256 ceacc96a370dfaa232d0a623
 DIST python-gentoo-patches-3.2.3-0.tar.bz2 14265 SHA256 2ad8829aa6594edc405afd0ed148a2b4b608d7c6f09ea90bfb90d87580a4784b SHA512 1ea0c8711ec5952a8c0bafeaceec0d8f8821123fe4f622626b57c6e0b1065c349885537b933a4ef22c29e6c8f6c44f44dec587892a2b13dbfe92ec342f16197d WHIRLPOOL b6f6a4d8e7dcafbf944266d1b5744c71568ddb0c21c5b54c5e041ef8bfd5e1fc5a1e68fa3083d8a466182022a07ebe88d536a4742a5fe0443e5d73d5d4bc64ed
 DIST python-gentoo-patches-3.3.0-1.tar.bz2 11974 SHA256 bb2d066277a3802e6ea18eebddf42134b44cda25b5201b755628d497be28c488 SHA512 e0522c7924e8cf5af3ea42727d277e44691cc11926c77b8fdcdb21687a9ff1b2fa953bfc1b3cd8d3a01c8dea757735b1aadb3b7e0c804068763052316f7e7858 WHIRLPOOL 091b3c2b87e27a68ddba2e2076a20c25aaedc84055c1d336d93ccdc609cd06ab2eea8b17a34008d5eb27e8d9e5677dca8756aa4f06a6cb95329de912e9c06005
 EBUILD python-2.5.4-r4.ebuild 9900 SHA256 8acf8c08e6ef79524b548d30c0971f49ef3adf69c1d216d54f433dab00d42ab7 SHA512 ddd05933feeaabb7b2d5d15e3db74431163b38643b00955c27dedf3b08d8d39ee8e8737b852dca67b209aa045044d93c3b55ca1d6aa1c2a6fd7ded1bd5dc8ca4 WHIRLPOOL 31512099a4493bb1fa733651ae722f7e73c70ff543a26c2ade4f9ebba1039f380830f08c63ea1bd1b704e8a30e9e88cb36baad198d3cf63ca280c0edc519e101
-EBUILD python-2.5.4-r5.ebuild 10021 SHA256 209e6d8fa1a65a25b32043f4da86d011bec6e646b922c99ce03d724acd19677e SHA512 6965849db94ec3e5786d7f41a8bf45ae8ff2bb9ebe24bb179c52a3501676fc5d331787f360de018a278e826302720f7202b3aac9d8485f3b7c2c99a583c71ae4 WHIRLPOOL 87864683e60350327a5d537f25bea4dbfee2d64f65ccb4bbc92c364261e76df86b2af57ab33c31b5f07237544440c8f33986022d54c9b2f28088618b15cc51e0
+EBUILD python-2.5.4-r5.ebuild 9991 SHA256 a1aaa693ba6ee805b934f3f6d4aeece404d49b1ce5f6eeb18893c2390cef7738 SHA512 2a23300c61a7605f3d4dc4879aefc6473a4733c0fae383510e695946dbf5748153ef4e61d59fa2976b574da6c840523444e3bf4a5df8db34e4e9f45fd801fcdf WHIRLPOOL 269b3d05695488ef5d622ab6071c804959e7956534406f81a21b230f3cd7734690c767c668789fedb9d71cc68879061ee93e7cf25f5b24a23842b91c4c8ff025
 EBUILD python-2.6.8-r1.ebuild 9552 SHA256 052b3b377448c092790c84aee70ba796ebb436c70886695338801eb1b014427a SHA512 1c03bc014bba9652136bd5b0de3eb67b55b46a1bf2e5ede0c8413316bd8467e26021189a3b5e86859e6f92008bdddf4f8783ae73ec512d3fbc0e478aab70fe2f WHIRLPOOL 0332b771bb83e603455da58cfce80395341bdacbc0af711df4264086c2083b4a122a4a6dd5b8e53371bb6760eb09898316a6d0d54b0d029f8ff854a81778ff10
 EBUILD python-2.6.8.ebuild 9434 SHA256 5192994b217db28509225c2b35347a24af7ecd16330fe25f3f978382c79de52a SHA512 1b7fa17f0a25756d8e674b631c646c38dfa0d193fe1418dc1ca1728272ee42392a3ac66349549fcd0d87f624a084c14679c985d9178c7b3e48112905f298c3f9 WHIRLPOOL 4d698b2409a2ea6f788c017ddf3e33fd1b260e5a17b81ea353c2eedfc97c76b944aff3626415fef3668ff7ade381a461debcf587cc631ce4ca6b08b1166680a7
 EBUILD python-2.7.3-r2.ebuild 9754 SHA256 5af662c2cd3e985e8c3bcf32a5338911b3ab4e01793bf191c663ae9a8cf72d6d SHA512 c8db2dc3c2f6331dc459990d3b560fa8e5b61680cafc3f2c04cb0e097c31aa0b5e4d9eaf3f71a76a5c9c3ecb3ffd467abde1054a122e9efdca0b945dae73766e WHIRLPOOL 0c91c7dffd5a6ab67c049e03d6db8cfa4c7dd000fe054f88ad59bf266b5effce2d95cc6b7efd0365486f0f8a3f8e5f9b76f303054fc3832675b9123a18473c64
@@ -37,15 +37,13 @@ EBUILD python-3.2.3-r2.ebuild 8906 SHA256 89e933433995fb91a1e5198900116dd4363712
 EBUILD python-3.2.3.ebuild 8710 SHA256 c4994db3ce2262589a68b9ee61ae5aa5c650973a24e5a6f4932240a2f8d73dc4 SHA512 7c66fc64eb95c865d9eb9be6218a40455c45e845b4ac1f78e94df1e5d6a7fe7b8d7f201ee6f621882a435966c53534ea66676482e94ea5d7e7e987069d77448f WHIRLPOOL 397499e7106161a3199c3a3097426226bfb76ca9cec726bf673c754269a123e90af134ca5d79fc62510d2e73b75a471f54098534e603db5a26557d38a8a0ca76
 EBUILD python-3.3.0-r1.ebuild 8544 SHA256 cf19d5f6883c4055c7ef37a89b41dd2873d7afe41b56d1d2452c38f99cef9b56 SHA512 6281c7bbf4eb92f3c9dae2ca88d281392223b5715270f91cfae340412c5c2fdbc17dde6e6a339f3d29cb4d45a6b8839f6e1442d8f1262c972c0aa6b94b1fd6dc WHIRLPOOL d5b6901541a223dcf5315260af5bf0b49a602a6cd4e15251832c55cd87ec84e7ae840d6aac6313d29ca6f97c45c61024fbb8bfbfa90ebabeaf9c1c4cd748f458
 EBUILD python-3.3.0.ebuild 8339 SHA256 7ed60cb09463b2f56c9f796a4afad278cc09b2594051d8d5125c98d4d5ba988c SHA512 6512597ded770e07082f9f883c1dea0a3245264e04f31f8191a7c74bcda9b71ad085d254f57c0b7cd469caa02f1aefd9e75166adf6eea750ed76df56b73a9b20 WHIRLPOOL f61186f7d535fb41e183bc532612348923f413945c3e2a7a6933a96780d6769b5853826891d0aab63debe1e004bf04388b6552377841c8a5c3703165eb6e1cad
-MISC ChangeLog 10579 SHA256 587cfefd56c38acec7a48465287f429742c93fb342880a457c2956fb8bef3f90 SHA512 34d870a2ba3edb9612913129fd4a59a052de14a6a389157d04924c1a3184549f61374764bf630eeef970d98f7dfbc9455a9ac16be73e32f06f2765f91fcfd4b0 WHIRLPOOL 6db497acc49cbabf3af2a602589874242959e12c9b832b675a1ebabc6d2a4714abe969d1d86417078377d438e989b899649454bd861f787c00cbc9477bbb9bb4
+MISC ChangeLog 10708 SHA256 c850d0bb021dbbc59e0bda2486f348f261c7997411a9154ff9f8c0119e1bcb6d SHA512 86f5492d39dfe1f32da58cd00b6b64e3ef418b233f2fea9e1924505e8896565847fa6f5ac5d3307ee7dc12eb06fbc3ef1f8bdef0a94d08720e14a668c1be60ea WHIRLPOOL 2d1bc07a18264432186b914c4be7a42f9b70550bbbab2c3acd6f13a5e7f4b9ec3afcfbe2e53d3bf72e59acca3976614003bcbd214312ba507a5d2df7008ce5b5
 MISC ChangeLog-2011 100599 SHA256 23129cb47321b2a6b1cb9323f1815d0cd11d6f30c3893908ed51575c270a0cc8 SHA512 4181ba9d965139ba58218da5b960c87b7a611b27606a1ab1ce1b4c3c9255b4e0e2947307cbfffc531f0f8b6b545ee11e083fcb29dc7b2b7ba31c6bb40b8ab128 WHIRLPOOL 4ceebb6a6ed58b906d3a7331795748ac6e4fe2e1401bcccae9024a8e81e2c444aebc5fec610398cfe6002354ad3b10487484598da5091867874727f07e239c56
 MISC metadata.xml 661 SHA256 2c6c3407251f7ccd6501dee49494e539a9544f2fbae99a4373eefdf4e83e8908 SHA512 871989a29417ce20d95da950fa385f1a958139de7b1567beb9cda28a1217901243cd9d25235fe3c7b0e43a82176d72286e31e4e97310b26488d2a3252ef3a8a0 WHIRLPOOL b694b1b4270ba15640d04a3b0b26a08575ea4afc9be256717f7f3b1768d75da9f71ceca6afd2f69971906227d5ba42263d2df2fc9387441aa240222d39fd094e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iJwEAQEIAAYFAlC7nEYACgkQfXuS5UK5QB00sgP/TIhJevunv274pgEmjCyZ8vOK
-6CAdx5FtMkc3YkfW1aKuJYbkVzSgYya3f/A8EEzNSRgYKB5ryNgUC/UeWPAkZcbi
-PA5UAQ/KBndZgW6FBLh0HYjTXKCUfMc2U4JVyPbBn47DNnLWphbp5ltr/bywpqbS
-/0hY00cMCbC20JJiHVc=
-=0UWr
+iF4EAREIAAYFAlC8J0cACgkQC77qH+pIQ6SVUQD+JWqOAYTMJq7N1BGSIbLplD7r
+LZzrPlghXdOcTaizJZYA/1W69PzKPShXGiSCFK74zYI0CPnO64pssVj6nSgNH8PM
+=fwrK
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/python/python-2.5.4-r5.ebuild b/dev-lang/python/python-2.5.4-r5.ebuild
index 071474c5b7e6..97299f27c6d9 100644
--- a/dev-lang/python/python-2.5.4-r5.ebuild
+++ b/dev-lang/python/python-2.5.4-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.4-r5.ebuild,v 1.4 2012/12/02 18:21:49 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.4-r5.ebuild,v 1.5 2012/12/03 04:14:58 floppym Exp $
 
 EAPI="1"
 
@@ -300,28 +300,24 @@ pkg_preinst() {
 }
 
 eselect_python_update() {
-	local eselect_python_options
-	[[ "$(eselect python show)" == "python2."* ]] && eselect_python_options="--python2"
+	[[ -z "${EROOT}" || (! -d "${EROOT}" && -d "${ROOT}") ]] && EROOT="${ROOT%/}${EPREFIX}/"
 
-	# Create python2 symlink.
-	eselect python update --python2 > /dev/null
+	if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then
+		eselect python update
+	fi
 
-	eselect python update ${eselect_python_options}
+	if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then
+		eselect python update --python${PV%%.*}
+	fi
 }
 
 pkg_postinst() {
 	eselect_python_update
 
 	if [[ "${python_updater_warning}" == "1" ]]; then
-		ewarn
-		ewarn "\e[1;31m************************************************************************\e[0m"
-		ewarn
 		ewarn "You have just upgraded from an older version of Python."
-		ewarn "You should run 'python-updater \${options}' to rebuild Python modules."
-		ewarn
-		ewarn "\e[1;31m************************************************************************\e[0m"
-		ewarn
-		ebeep 12
+		ewarn "You should switch active version of Python ${PV%%.*} and run"
+		ewarn "'python-updater [options]' to rebuild Python modules."
 	fi
 }