Don't PROVIDE virtual/python, bug 358849.

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

11 files changed, 29 insertions, 41 deletions

diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index 75bddea520c1..5fd8b8c9482d 100644
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/python
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.531 2011/04/04 22:47:43 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.532 2011/04/05 06:01:55 ulm Exp $
+
+  05 Apr 2011; Ulrich Mueller <ulm@gentoo.org> python-2.4.6.ebuild,
+  python-2.5.4-r4.ebuild, python-2.6.5-r3.ebuild, python-2.6.6-r1.ebuild,
+  python-2.6.6-r2.ebuild, python-2.7.1-r1.ebuild, python-3.1.2-r4.ebuild,
+  python-3.1.3-r1.ebuild, python-3.2.ebuild:
+  Don't PROVIDE virtual/python, bug 358849.
 
   04 Apr 2011; Jeroen Roovers <jer@gentoo.org> python-2.7.1-r1.ebuild:
   Stable for HPPA (bug #358717).
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 367e718cadbb..c996d102ec3f 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -25,21 +25,21 @@ DIST python-gentoo-patches-2.7.1-r1.tar.bz2 13384 RMD160 d79de2520244a8b9c5de61c
 DIST python-gentoo-patches-3.1.2-r6.tar.bz2 1285912 RMD160 a525679255b2dcb0a65d00792a8c247742e94923 SHA1 7ab91a40074f33b08b805b2cce54dc32c1f596b1 SHA256 45a4368f537b2d92ead296dd600207313a20a8027dcaeaa2a0c71dcf8ecb9899
 DIST python-gentoo-patches-3.1.3-r1.tar.bz2 13730 RMD160 73f922d850e464e589c7a3cfb8f755d36167d156 SHA1 9228b63c980b80dd7e8dd9e0276c29af18692e33 SHA256 f23056436b298ed0ff9823b52902aaaa63eae0c4585a4a19e47571685127631e
 DIST python-gentoo-patches-3.2.tar.bz2 11826 RMD160 8d450939f3f2f7f5c779b8701097fcf92909c36b SHA1 bdc922a4b94bbb616dbf702e913f74984ad8bda5 SHA256 43799206ed8c81936e3b3e68e8c562334b346652d30383c5b7b93fe9741ad0db
-EBUILD python-2.4.6.ebuild 9249 RMD160 00460907d8536a93819a3a641ac1f40ae9cfa1dd SHA1 f2fe57964bbe045ef9ede1796f9c214760b0b530 SHA256 8430cfff381ec7dcd7ba4e18fcc27d6af0984afc3dc571b840440f56a727f38d
-EBUILD python-2.5.4-r4.ebuild 9599 RMD160 ef3792197e32a0ac3029ac8af0926abef4e31fe9 SHA1 6a74a17d5d7d9f739918bd013f99162e9326a661 SHA256 74d1c3c3aa66685834c2fc48b651a6609cd05d4f3f7e151ae8a4e11c997ff5d1
-EBUILD python-2.6.5-r3.ebuild 9395 RMD160 6eae717771c59d51313ec6edba7f5afb1c8834cc SHA1 807084fd83973148c7864f6388b0a0f3873bf482 SHA256 b52fb071663343d31b2565945ae7d6236e45d33c128cfcd2042f36480cfb14d7
-EBUILD python-2.6.6-r1.ebuild 9576 RMD160 c8723e856e9091d66b22fe9576e2eb196d036280 SHA1 06a98ee83cfe0c73580e5385cea6dcf8804a76c1 SHA256 12696a39ab62d3815014021e24c31bc693033804797a8bb15be0a1df7ee11460
-EBUILD python-2.6.6-r2.ebuild 10443 RMD160 e74e06bc2818b4bcc0500067c41ae7f361150608 SHA1 15d29be44d45c952af4fdbeb4d9c0139cba52cdb SHA256 40ebed4da0e98ec0d427d4fc7b1c06d4a86e1c6d2356da1e262ec9558c3631bc
-EBUILD python-2.7.1-r1.ebuild 11020 RMD160 42f426ddde58e7f321fc213aa652b2e2dab98ef9 SHA1 7feebe5f09897161e9732ba4501dbb65a7cf2d68 SHA256 3c0c5ea32ecc9998e750a9008fbc73c5403fafa3c31e68e8d58dfa4fbbe35ec5
-EBUILD python-3.1.2-r4.ebuild 9486 RMD160 a5f2b8a21e419d3ac2f1036d9274a618098371b1 SHA1 701d65460d6c7bc6fd853a2a7324d57aae7c03bd SHA256 73a71052e4cce5cae6429c9a334f3623c08346e690136171fecb1963b3a27eea
-EBUILD python-3.1.3-r1.ebuild 9733 RMD160 4bab4b1dbc5c36bb74c84ed74c812ee2f3ce98dd SHA1 9ed2afbe659c37d99228c53d868e13c24d35c3b4 SHA256 a6076d9341674c1c24adccbbd099d7b52aa305574cfcd08c9e246e671410c5d3
-EBUILD python-3.2.ebuild 10059 RMD160 b3114a607e689e1daec77724b51980e3859f2120 SHA1 4766832439957c43541ee622ff01365f76618ec1 SHA256 e6af9014c98f895ec834debebf7219b30be7d1a7fe10f6853edf0947dd6a0260
-MISC ChangeLog 94557 RMD160 5ccce75cb92bd0249064b3e21b99440096fc6104 SHA1 767c5228867881254f2e822b0be4a7fbee3d17c1 SHA256 f8ffb0d956498b101fa2d63bdf8043472de693cbafd5b71c47975fe506b66975
+EBUILD python-2.4.6.ebuild 9220 RMD160 1d8d11abfdec1a1fe9aa1f2a156e88aa5b2ccd8c SHA1 ff3519d9e343158b3c28798c92cc6b9cff6e1677 SHA256 059c2c520a908888f8073d9cdd955138c119232969018b07bdb5f7df0e496927
+EBUILD python-2.5.4-r4.ebuild 9570 RMD160 2728a627e55360fefeabd135740e64214522f94a SHA1 00d1bf2ae833c7936ab6b55b3850d17e0a69b4b1 SHA256 4b2dc5a62b416f13d207994066faba6d32727dba731cb5cee2c88e82b0098f7b
+EBUILD python-2.6.5-r3.ebuild 9366 RMD160 3a22472409d3121e56b833d5ddb506fe3a5466d3 SHA1 4028e186dda3236c4d3d64afdd420397f03bb6b6 SHA256 5524ed7a4caf7146caecf506e5548557dcb35b2cd37ad4abc833fac64b3c9cac
+EBUILD python-2.6.6-r1.ebuild 9547 RMD160 c0d9b794307c5cfd9f4196afc0a2c7f1c8afffdf SHA1 d910e739e5480f1628bd94bf85e4ac150fe87b7d SHA256 9f82696fd40b199b8e2851c98eae667f0691ad88a0743bfa472ff94c401aed85
+EBUILD python-2.6.6-r2.ebuild 10414 RMD160 47fcb0bbb7bd7c420d3ae6eaec7d055e43914441 SHA1 dc075ef98d7ffed53387d380f0ec18e958f679ca SHA256 bceff90a6b2010ab84d9fc53b64b536039086cfb0d5dd9bb40ef52767a595a8b
+EBUILD python-2.7.1-r1.ebuild 10994 RMD160 3d61dbf6452dcfd75f2005c758901848c2f7f837 SHA1 35e17088d388ec27136857c931b5353a95fbca2a SHA256 bd5360efc98a95d11654bb35e96be6cb76f24e853340b3b0fee9b51a0e3ed631
+EBUILD python-3.1.2-r4.ebuild 9457 RMD160 ce8a7df4650c8474c79e5d53dc4c0fff729584b6 SHA1 925922c06f195615f6ed82d593004a0a341188a7 SHA256 230aca0a26b610ff572a25ae3abc1ec7bbddc7a4997df7811b1b35afb09a611f
+EBUILD python-3.1.3-r1.ebuild 9704 RMD160 c5fa27effa63b0eaf876e3222d26c4532c7191b5 SHA1 fce5eea37742e59a3c9087a22764607fe5780c19 SHA256 00cf56abd74cc3acf869cb86c7b9fe78f9286518cc09c1b63b97e86f83d8f125
+EBUILD python-3.2.ebuild 10030 RMD160 932fe44751adb15bf1999b21930107c9fb048676 SHA1 e6815b73b6d50a350c62d5bc265559f3884151d0 SHA256 98fb0d66cce65f7f4a13973b7c6281ace75ceb3c6831e3a108e804c63d4ae9e5
+MISC ChangeLog 94863 RMD160 05a503d6dc2f9b6a1be078d5d3d227ad996498a9 SHA1 f02b0f35246795528356c9b81eba5cc2579245ad SHA256 b1b1fd478c6e9e71da64b1c40df88e2b699d49cdce4196729104ac1e146879cb
 MISC metadata.xml 661 RMD160 54831d16b8807086bfabdbb3df9d33336b5d42a0 SHA1 9867c337fe9e6f4e967004fc9409763e0fedf43b SHA256 2c6c3407251f7ccd6501dee49494e539a9544f2fbae99a4373eefdf4e83e8908
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2aSpUACgkQVWmRsqeSphOetwCfaBlJSiifpwIvdUJtooLXfOFz
-I6cAn3N2edRug/D1AkK/82b4Cehp5vUd
-=IMU6
+iEYEARECAAYFAk2asJUACgkQOeoy/oIi7uzNfACcD577YX/DuZNOKJDd/xLIP2dk
+0PoAoJl+AiEk0ueFEXj/2dLCycOb5/AY
+=xxvX
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/python/python-2.4.6.ebuild b/dev-lang/python/python-2.4.6.ebuild
index ee6e1f8e7e1e..a8ecdc02c493 100644
--- a/dev-lang/python/python-2.4.6.ebuild
+++ b/dev-lang/python/python-2.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.45 2011/03/18 21:52:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.6.ebuild,v 1.46 2011/04/05 06:01:55 ulm Exp $
 
 EAPI="1"
 
@@ -43,8 +43,6 @@ DEPEND="${RDEPEND}"
 RDEPEND+=" !build? ( app-misc/mime-types )"
 PDEPEND="app-admin/python-updater"
 
-PROVIDE="virtual/python"
-
 S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
diff --git a/dev-lang/python/python-2.5.4-r4.ebuild b/dev-lang/python/python-2.5.4-r4.ebuild
index e82c2bfd12b5..23b0bc9f1934 100644
--- 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-2011 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.27 2011/03/18 21:52:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.4-r4.ebuild,v 1.28 2011/04/05 06:01:55 ulm Exp $
 
 EAPI="1"
 
@@ -51,8 +51,6 @@ DEPEND="${RDEPEND}
 RDEPEND+=" !build? ( app-misc/mime-types )"
 PDEPEND="app-admin/python-updater"
 
-PROVIDE="virtual/python"
-
 S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
diff --git a/dev-lang/python/python-2.6.5-r3.ebuild b/dev-lang/python/python-2.6.5-r3.ebuild
index 55fba1479b99..d50b60fbe754 100644
--- a/dev-lang/python/python-2.6.5-r3.ebuild
+++ b/dev-lang/python/python-2.6.5-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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-r3.ebuild,v 1.12 2011/03/18 21:52:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.5-r3.ebuild,v 1.13 2011/04/05 06:01:55 ulm Exp $
 
 EAPI="2"
 
@@ -51,8 +51,6 @@ DEPEND="${RDEPEND}
 RDEPEND+=" !build? ( app-misc/mime-types )"
 PDEPEND="app-admin/python-updater"
 
-PROVIDE="virtual/python"
-
 S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
diff --git a/dev-lang/python/python-2.6.6-r1.ebuild b/dev-lang/python/python-2.6.6-r1.ebuild
index 62cd7d07dff0..5a9e3e87c734 100644
--- a/dev-lang/python/python-2.6.6-r1.ebuild
+++ b/dev-lang/python/python-2.6.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.6-r1.ebuild,v 1.16 2011/03/18 21:52:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.6-r1.ebuild,v 1.17 2011/04/05 06:01:55 ulm Exp $
 
 EAPI="2"
 
@@ -53,8 +53,6 @@ DEPEND="${RDEPEND}
 RDEPEND+=" !build? ( app-misc/mime-types )"
 PDEPEND="app-admin/python-updater"
 
-PROVIDE="virtual/python"
-
 S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
diff --git a/dev-lang/python/python-2.6.6-r2.ebuild b/dev-lang/python/python-2.6.6-r2.ebuild
index d324dbf5d054..27055ea49e55 100644
--- a/dev-lang/python/python-2.6.6-r2.ebuild
+++ b/dev-lang/python/python-2.6.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.6-r2.ebuild,v 1.7 2011/03/18 21:52:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.6-r2.ebuild,v 1.8 2011/04/05 06:01:55 ulm Exp $
 
 EAPI="2"
 WANT_AUTOMAKE="none"
@@ -68,8 +68,6 @@ RDEPEND+=" !build? ( app-misc/mime-types )
 		$([[ "${PV}" =~ ^[[:digit:]]+\.[[:digit:]]+_pre ]] || echo "doc? ( dev-python/python-docs:${SLOT} )")"
 PDEPEND="app-admin/python-updater"
 
-PROVIDE="virtual/python"
-
 if [[ "${PV}" != *_pre* ]]; then
 	S="${WORKDIR}/${MY_P}"
 fi
diff --git a/dev-lang/python/python-2.7.1-r1.ebuild b/dev-lang/python/python-2.7.1-r1.ebuild
index ce6c0bc919f0..67b942f1d7b0 100644
--- a/dev-lang/python/python-2.7.1-r1.ebuild
+++ b/dev-lang/python/python-2.7.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.7.1-r1.ebuild,v 1.7 2011/04/04 22:47:43 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.7.1-r1.ebuild,v 1.8 2011/04/05 06:01:55 ulm Exp $
 
 EAPI="2"
 WANT_AUTOMAKE="none"
@@ -69,8 +69,6 @@ RDEPEND+=" !build? ( app-misc/mime-types )
 		$([[ "${PV}" =~ ^[[:digit:]]+\.[[:digit:]]+_pre ]] || echo "doc? ( dev-python/python-docs:${SLOT} )")"
 PDEPEND="app-admin/python-updater"
 
-PROVIDE="virtual/python"
-
 if [[ "${PV}" != *_pre* ]]; then
 	S="${WORKDIR}/${MY_P}"
 fi
diff --git a/dev-lang/python/python-3.1.2-r4.ebuild b/dev-lang/python/python-3.1.2-r4.ebuild
index 82636e40fc29..d45d75d3bb86 100644
--- a/dev-lang/python/python-3.1.2-r4.ebuild
+++ b/dev-lang/python/python-3.1.2-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.2-r4.ebuild,v 1.14 2011/03/18 21:52:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.2-r4.ebuild,v 1.15 2011/04/05 06:01:55 ulm Exp $
 
 EAPI="3"
 
@@ -47,8 +47,6 @@ PDEPEND=">=app-admin/python-updater-0.8
 			dev-lang/python:2.6[gdbm?,ipv6?,ncurses?,readline?,sqlite?,ssl?,threads?,tk?,xml?]
 		)"
 
-PROVIDE="virtual/python"
-
 S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
diff --git a/dev-lang/python/python-3.1.3-r1.ebuild b/dev-lang/python/python-3.1.3-r1.ebuild
index e5a947d28552..7dedceade501 100644
--- a/dev-lang/python/python-3.1.3-r1.ebuild
+++ b/dev-lang/python/python-3.1.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.3-r1.ebuild,v 1.6 2011/03/18 21:52:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.3-r1.ebuild,v 1.7 2011/04/05 06:01:55 ulm Exp $
 
 EAPI="3"
 WANT_AUTOMAKE="none"
@@ -59,8 +59,6 @@ RDEPEND+=" !build? ( app-misc/mime-types )
 		$([[ "${PV}" =~ ^[[:digit:]]+\.[[:digit:]]+_pre ]] || echo "doc? ( dev-python/python-docs:${SLOT} )")"
 PDEPEND="app-admin/python-updater"
 
-PROVIDE="virtual/python"
-
 if [[ "${PV}" != *_pre* ]]; then
 	S="${WORKDIR}/${MY_P}"
 fi
diff --git a/dev-lang/python/python-3.2.ebuild b/dev-lang/python/python-3.2.ebuild
index ea254d1ab4d3..8380ebab5e99 100644
--- a/dev-lang/python/python-3.2.ebuild
+++ b/dev-lang/python/python-3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.2.ebuild,v 1.2 2011/03/18 21:52:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.2.ebuild,v 1.3 2011/04/05 06:01:55 ulm Exp $
 
 EAPI="3"
 WANT_AUTOMAKE="none"
@@ -63,8 +63,6 @@ RDEPEND+=" !build? ( app-misc/mime-types )
 		$([[ "${PV}" =~ ^[[:digit:]]+\.[[:digit:]]+_pre ]] || echo "doc? ( dev-python/python-docs:${SLOT} )")"
 PDEPEND="app-admin/python-updater"
 
-PROVIDE="virtual/python"
-
 if [[ "${PV}" != *_pre* ]]; then
 	S="${WORKDIR}/${MY_P}"
 fi