Fix printing of python-updater warning.

Package-Manager: portage-HEAD/cvs/Linux x86_64

diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 345a0f079e2e6f0336902ca14cc8fb4613b718e2..52ff04f0a67419e6020be89857bd408a88b93a51 100644 (file)
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -17,11 +17,11 @@ DIST python-gentoo-patches-2.6.4-r1.tar.bz2 12570 RMD160 2a58eb651ce5adc68c4667f
 DIST python-gentoo-patches-2.6.5-r4.tar.bz2 68611 RMD160 63a67a772df32dcf1977c1060228f5282a332a41 SHA1 e29469ff9800ff3125d203eea152bfdf378b7234 SHA256 7497892864469a9ff8698dcd6467cb6ddadd3b8472e8847b9e27f738ff7962ab
 DIST python-gentoo-patches-2.7.tar.bz2 11803 RMD160 a4bef5c904859f530f6cf5009ac60d171c34af00 SHA1 06b3f6077febed0aa807cb81cd689215efc430c6 SHA256 c72446007ab1b4dd0d8702b0901a8b5e8eadb1ce6872e7f99e12f4eb97874b0f
 DIST python-gentoo-patches-3.1.2-r5.tar.bz2 67359 RMD160 0ee5576b7de728a0840c6020d8403b94a883eeaa SHA1 5900a751c7e6fea512f79e045aa2f7870e378595 SHA256 fa5eabe0cc84789e9ed2fd6140dfdf08ca29de00474b117b9998b0eefc2e850a
-EBUILD python-2.4.6.ebuild 9184 RMD160 a5cebd322bbab8e64f1688976b5a84e17ff3b12d SHA1 de4be7ee9bede5bf8e9c689eb564e20dbc970bb1 SHA256 37adf541525518259373843162850e50dbde0d2413f431dc8070e059da2e0d48
-EBUILD python-2.5.4-r4.ebuild 9575 RMD160 1fd4a6bf4fe43a394e6ce4a976982a08df93e2cb SHA1 6da7997f7a68fe0900be339f122880a27616af3e SHA256 5cb1db017d7076e56a185b2bbd9fb76048a37abd7a18870cd02e703a6feff289
+EBUILD python-2.4.6.ebuild 9295 RMD160 ceafad3166524ebb3bb89c58efb8aff255053dd1 SHA1 8545e8b5671180216a863170213bd3f95666518c SHA256 03b17693ea85c22aeb13c3105330cf0aebaf9f9e241b0cc81a03c39cf5c959e0
+EBUILD python-2.5.4-r4.ebuild 9645 RMD160 21881a4d1f0e8245b1821109ab26e775d55e94c6 SHA1 2c1b8b54b5ec5902521d9e9017d669c67ae15160 SHA256 c6dc2f20bf1edbbdee06ab87ed5618d0f5e07172c212a51cb44a86df706591c1
 EBUILD python-2.6.4-r1.ebuild 9579 RMD160 63713df2187e8f3adc35038b26e58fc8e4cf8e4f SHA1 05640ba05170caff47cf8998d6ac1ad127a682a2 SHA256 5fb3de2f4f6b9b13c16c8f0b452bde4057a8a889a828920762b4c4c02e2aad98
-EBUILD python-2.6.5-r2.ebuild 9428 RMD160 4f1c4c26c3437f8c33fad2aa911d370c74d959ed SHA1 d1f3ea2cbc88dd5388d537bc9571353dc7c0ee46 SHA256 1bc2056a9afb804e0a045bbf7cd73a2fd7829d5011bab468df7b26b13acdf19c
-EBUILD python-2.7.ebuild 9755 RMD160 06a2f2b98b31f33cbc2491a700a2c8df97554a6f SHA1 5ec045ae25458aae22614ac4406349ff43fc791f SHA256 6d62f0325ff91dace12e4d026d200510186b79508ef04360f0498d0fb92b07bf
+EBUILD python-2.6.5-r2.ebuild 9457 RMD160 fb08e8c4752c4315bf13c5b48e72c3b07b9ea78d SHA1 bce39b4bfd449cd99a84ab6dbf57c8d0ad239c2e SHA256 3f10f5e35d942dfce1262ab067b257e158f0a8738f3e55361914dc711437aca8
+EBUILD python-2.7.ebuild 9743 RMD160 43381e34f2e2494b348c4e26365e8579642deac8 SHA1 5061119a80c0992bd83805210029c5dad88cdfbb SHA256 92bc8e51588d143647f42b52cf867efdcc57a044c1b06f285ee6b7fe3f414af3
 EBUILD python-3.1.2-r3.ebuild 9256 RMD160 98cc9afd66714d449f272fac82fcaff9d74e499f SHA1 382ee98785de1f57cff37ef63efb9477e7c96413 SHA256 e39e3dde3e40b6fca08cf681a32fdb126be1ae8f6f7ff4ac75c207d7a5e893ba
 MISC ChangeLog 84599 RMD160 c4536e24c621c5a9495ce5c07983b084cbb2b753 SHA1 0d747eea895eb42af3eeb48be13b5158cb559e3f SHA256 c7e91a69fbc70c5435a1c20ccfc7e310e6d911eecd37038739cd7dd9e121cc9a
 MISC metadata.xml 661 RMD160 54831d16b8807086bfabdbb3df9d33336b5d42a0 SHA1 9867c337fe9e6f4e967004fc9409763e0fedf43b SHA256 2c6c3407251f7ccd6501dee49494e539a9544f2fbae99a4373eefdf4e83e8908

diff --git a/dev-lang/python/python-2.4.6.ebuild b/dev-lang/python/python-2.4.6.ebuild
index 8902f27a2930a14efc2d0b4492fbc440d0f9420a..e9bdff7f00e5ae9468f64e890e96f00a8b6903bc 100644 (file)
--- a/dev-lang/python/python-2.4.6.ebuild
+++ b/dev-lang/python/python-2.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.6.ebuild,v 1.40 2010/07/04 21:14:58 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.6.ebuild,v 1.41 2010/07/10 13:06:28 arfrever Exp $
 
 EAPI="1"
 
@@ -264,7 +264,7 @@ src_install() {
 }
 
 pkg_preinst() {
-       if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version ">=${CATEGORY}/${PN}-${SLOT}_alpha"; then
+       if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version "${CATEGORY}/${PN}:2.4" && ! has_version "${CATEGORY}/${PN}:2.5" && ! has_version "${CATEGORY}/${PN}:2.6" && ! has_version "${CATEGORY}/${PN}:2.7"; then
                python_updater_warning="1"
        fi
 }

diff --git a/dev-lang/python/python-2.5.4-r4.ebuild b/dev-lang/python/python-2.5.4-r4.ebuild
index 180645833d86c9cfb39da687abbbcd4a6a0728b6..adef9a92d6a13160219721a62c1ca95d0964328c 100644 (file)
--- a/dev-lang/python/python-2.5.4-r4.ebuild
+++ b/dev-lang/python/python-2.5.4-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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-r4.ebuild,v 1.22 2010/07/04 21:14:58 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.4-r4.ebuild,v 1.23 2010/07/10 13:06:28 arfrever Exp $
 
 EAPI="1"
 
@@ -279,7 +279,7 @@ src_install() {
 }
 
 pkg_preinst() {
-       if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version ">=${CATEGORY}/${PN}-${SLOT}_alpha"; then
+       if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version "${CATEGORY}/${PN}:2.5" && ! has_version "${CATEGORY}/${PN}:2.6" && ! has_version "${CATEGORY}/${PN}:2.7"; then
                python_updater_warning="1"
        fi
 }

diff --git a/dev-lang/python/python-2.6.5-r2.ebuild b/dev-lang/python/python-2.6.5-r2.ebuild
index 36bb9ab51ab2f32f837d885b0a090f10c6b1d9e5..c6c3abe185e0e4edd0334d8201b97fd792397be4 100644 (file)
--- a/dev-lang/python/python-2.6.5-r2.ebuild
+++ b/dev-lang/python/python-2.6.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.5-r2.ebuild,v 1.13 2010/07/04 21:14:58 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.5-r2.ebuild,v 1.14 2010/07/10 13:06:28 arfrever Exp $
 
 EAPI="2"
 
@@ -271,7 +271,7 @@ src_install() {
 }
 
 pkg_preinst() {
-       if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version ">=${CATEGORY}/${PN}-${SLOT}_alpha"; then
+       if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version "${CATEGORY}/${PN}:2.6" && ! has_version "${CATEGORY}/${PN}:2.7"; then
                python_updater_warning="1"
        fi
 }

diff --git a/dev-lang/python/python-2.7.ebuild b/dev-lang/python/python-2.7.ebuild
index 2085ee9fe4efe664a50582fbf63e8b122e33e3e9..dc4096ce96480fe26d66c7417784199153615c2b 100644 (file)
--- a/dev-lang/python/python-2.7.ebuild
+++ b/dev-lang/python/python-2.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.7.ebuild,v 1.1 2010/07/04 21:16:21 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.7.ebuild,v 1.2 2010/07/10 13:06:28 arfrever Exp $
 
 EAPI="2"
 
@@ -285,7 +285,7 @@ src_install() {
 }
 
 pkg_preinst() {
-       if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version ">=${CATEGORY}/${PN}-${SLOT}_alpha"; then
+       if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version "${CATEGORY}/${PN}:2.7"; then
                python_updater_warning="1"
        fi
 }