Don't PROVIDE virtual/python, bug 358849.

(Portage version: 2.1.9.45/cvs/Linux x86_64)

10 files changed, 16 insertions, 28 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/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