Bug #93028, clean up PROVIDE instances.

(Portage version: 2.0.51.22-r1)

34 files changed, 86 insertions, 65 deletions

diff --git a/dev-php/mod_php/ChangeLog b/dev-php/mod_php/ChangeLog
index 080a0372dcd8..83b7b6dc7236 100644
--- a/dev-php/mod_php/ChangeLog
+++ b/dev-php/mod_php/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-php/mod_php
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.232 2005/05/19 06:59:05 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.233 2005/05/19 20:23:05 robbat2 Exp $
+
+  19 May 2005; Robin H. Johnson <robbat2@gentoo.org>
+  mod_php-4.3.9_rc1.ebuild, mod_php-4.3.9.ebuild, mod_php-4.3.10.ebuild,
+  mod_php-4.3.10-r1.ebuild, mod_php-4.3.11.ebuild, mod_php-4.3.11-r1.ebuild,
+  mod_php-4.3.11-r2.ebuild, mod_php-5.0.0.ebuild, mod_php-5.0.0-r1.ebuild,
+  mod_php-5.0.1.ebuild, mod_php-5.0.2.ebuild, mod_php-5.0.2-r1.ebuild,
+  mod_php-5.0.3.ebuild, mod_php-5.0.3-r1.ebuild, mod_php-5.0.3-r2.ebuild,
+  mod_php-5.0.4.ebuild:
+  Bug #93028, clean up PROVIDE instances.
 
   19 May 2005; Markus Rothe <corsair@gentoo.org> mod_php-5.0.4.ebuild:
   Added ~ppc64 to KEYWORDS
diff --git a/dev-php/mod_php/mod_php-4.3.10-r1.ebuild b/dev-php/mod_php/mod_php-4.3.10-r1.ebuild
index d4d90e9c214c..14369f0c1921 100644
--- a/dev-php/mod_php/mod_php-4.3.10-r1.ebuild
+++ b/dev-php/mod_php/mod_php-4.3.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.10-r1.ebuild,v 1.6 2005/05/12 19:21:20 beu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.10-r1.ebuild,v 1.7 2005/05/19 20:23:05 robbat2 Exp $
 
 IUSE="${IUSE} apache2"
 
@@ -60,7 +60,7 @@ RDEPEND="${RDEPEND} ${DEPEND_EXTRA}"
 IUSE="${IUSE} debug"
 # for this revision only
 PDEPEND=">=${PHP_PROVIDER_PKG}-4.3.10"
-PROVIDE="${PROVIDE} virtual/httpd-php-${PV}"
+PROVIDE="${PROVIDE} virtual/httpd-php"
 
 # generalize some apache{,2} vars (defined by apache-module.eclass)
 if [ -n ${USE_APACHE2} ]; then
diff --git a/dev-php/mod_php/mod_php-4.3.10.ebuild b/dev-php/mod_php/mod_php-4.3.10.ebuild
index da3caa3af1e4..7d56d1444467 100644
--- a/dev-php/mod_php/mod_php-4.3.10.ebuild
+++ b/dev-php/mod_php/mod_php-4.3.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.10.ebuild,v 1.13 2005/05/12 19:21:20 beu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.10.ebuild,v 1.14 2005/05/19 20:23:05 robbat2 Exp $
 
 IUSE="${IUSE} apache2"
 
@@ -61,7 +61,7 @@ RDEPEND="${RDEPEND} ${DEPEND_EXTRA}"
 IUSE="${IUSE} debug"
 # for this revision only
 PDEPEND=">=${PHP_PROVIDER_PKG}-4.3.10"
-PROVIDE="${PROVIDE} virtual/httpd-php-${PV}"
+PROVIDE="${PROVIDE} virtual/httpd-php"
 
 # Add a 'return 0' as we DON'T want the return code checked
 pkg_setup() {
diff --git a/dev-php/mod_php/mod_php-4.3.11-r1.ebuild b/dev-php/mod_php/mod_php-4.3.11-r1.ebuild
index 056fbdb7b511..ef61184a3bf9 100644
--- a/dev-php/mod_php/mod_php-4.3.11-r1.ebuild
+++ b/dev-php/mod_php/mod_php-4.3.11-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.11-r1.ebuild,v 1.7 2005/05/12 19:21:20 beu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.11-r1.ebuild,v 1.8 2005/05/19 20:23:05 robbat2 Exp $
 
 IUSE="${IUSE} apache2"
 
@@ -60,7 +60,7 @@ RDEPEND="${RDEPEND} ${DEPEND_EXTRA}"
 IUSE="${IUSE} debug"
 # for this revision only
 PDEPEND=">=${PHP_PROVIDER_PKG}-4.3.10"
-PROVIDE="${PROVIDE} virtual/httpd-php-${PV}"
+PROVIDE="${PROVIDE} virtual/httpd-php"
 
 # generalize some apache{,2} vars (defined by apache-module.eclass)
 if [ -n ${USE_APACHE2} ]; then
diff --git a/dev-php/mod_php/mod_php-4.3.11-r2.ebuild b/dev-php/mod_php/mod_php-4.3.11-r2.ebuild
index bf90b003c536..6618892653b3 100644
--- a/dev-php/mod_php/mod_php-4.3.11-r2.ebuild
+++ b/dev-php/mod_php/mod_php-4.3.11-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.11-r2.ebuild,v 1.6 2005/05/12 19:52:04 beu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.11-r2.ebuild,v 1.7 2005/05/19 20:23:05 robbat2 Exp $
 
 IUSE="${IUSE} apache2"
 
@@ -60,7 +60,7 @@ RDEPEND="${RDEPEND} ${DEPEND_EXTRA}"
 IUSE="${IUSE} debug"
 # for this revision only
 PDEPEND=">=${PHP_PROVIDER_PKG}-4.3.10"
-PROVIDE="${PROVIDE} virtual/httpd-php-${PV}"
+PROVIDE="${PROVIDE} virtual/httpd-php"
 
 # generalize some apache{,2} vars (defined by apache-module.eclass)
 if [ -n ${USE_APACHE2} ]; then
diff --git a/dev-php/mod_php/mod_php-4.3.11.ebuild b/dev-php/mod_php/mod_php-4.3.11.ebuild
index 2ef2cbf354f3..4accd7440b74 100644
--- a/dev-php/mod_php/mod_php-4.3.11.ebuild
+++ b/dev-php/mod_php/mod_php-4.3.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.11.ebuild,v 1.13 2005/05/12 19:21:20 beu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.11.ebuild,v 1.14 2005/05/19 20:23:05 robbat2 Exp $
 
 IUSE="${IUSE} apache2"
 
@@ -61,7 +61,7 @@ RDEPEND="${RDEPEND} ${DEPEND_EXTRA}"
 IUSE="${IUSE} debug"
 # for this revision only
 PDEPEND=">=${PHP_PROVIDER_PKG}-4.3.11"
-PROVIDE="${PROVIDE} virtual/httpd-php-${PV}"
+PROVIDE="${PROVIDE} virtual/httpd-php"
 
 # Add a 'return 0' as we DON'T want the return code checked
 pkg_setup() {
diff --git a/dev-php/mod_php/mod_php-4.3.9.ebuild b/dev-php/mod_php/mod_php-4.3.9.ebuild
index 91427d3cdde9..5b959acbd78a 100644
--- a/dev-php/mod_php/mod_php-4.3.9.ebuild
+++ b/dev-php/mod_php/mod_php-4.3.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.9.ebuild,v 1.14 2005/05/12 19:21:20 beu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.9.ebuild,v 1.15 2005/05/19 20:23:05 robbat2 Exp $
 
 IUSE="${IUSE} apache2"
 
@@ -61,7 +61,7 @@ RDEPEND="${RDEPEND} ${DEPEND_EXTRA}"
 IUSE="${IUSE} debug"
 # for this revision only
 PDEPEND=">=${PHP_PROVIDER_PKG}-4.3.9"
-PROVIDE="${PROVIDE} virtual/httpd-php-${PV}"
+PROVIDE="${PROVIDE} virtual/httpd-php"
 
 # Add a 'return 0' as we DON'T want the return code checked
 pkg_setup() {
diff --git a/dev-php/mod_php/mod_php-4.3.9_rc1.ebuild b/dev-php/mod_php/mod_php-4.3.9_rc1.ebuild
index f792d98c6e33..9e3f0f0886a3 100644
--- a/dev-php/mod_php/mod_php-4.3.9_rc1.ebuild
+++ b/dev-php/mod_php/mod_php-4.3.9_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.9_rc1.ebuild,v 1.5 2005/05/12 19:21:20 beu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.9_rc1.ebuild,v 1.6 2005/05/19 20:23:05 robbat2 Exp $
 
 IUSE="${IUSE} apache2"
 
@@ -61,7 +61,7 @@ RDEPEND="${RDEPEND} ${DEPEND_EXTRA}"
 IUSE="${IUSE} debug"
 # for this revision only
 PDEPEND=">=${PHP_PROVIDER_PKG}-4.3.8"
-PROVIDE="${PROVIDE} virtual/httpd-php-${PV}"
+PROVIDE="${PROVIDE} virtual/httpd-php"
 
 # Add a 'return 0' as we DON'T want the return code checked
 pkg_setup() {
diff --git a/dev-php/mod_php/mod_php-5.0.0-r1.ebuild b/dev-php/mod_php/mod_php-5.0.0-r1.ebuild
index 97ef7e14d828..62415a37e341 100644
--- a/dev-php/mod_php/mod_php-5.0.0-r1.ebuild
+++ b/dev-php/mod_php/mod_php-5.0.0-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-5.0.0-r1.ebuild,v 1.5 2005/01/09 20:58:25 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-5.0.0-r1.ebuild,v 1.6 2005/05/19 20:23:05 robbat2 Exp $
 
 IUSE="${IUSE} apache2"
 
 KEYWORDS="~x86"
-PROVIDE="virtual/php-${PV} virtual/httpd-php-${PV}"
+PROVIDE="virtual/php virtual/httpd-php"
 
 detectapache() {
 	local domsg=
diff --git a/dev-php/mod_php/mod_php-5.0.0.ebuild b/dev-php/mod_php/mod_php-5.0.0.ebuild
index 575209ec936e..3e4783a17cf0 100644
--- a/dev-php/mod_php/mod_php-5.0.0.ebuild
+++ b/dev-php/mod_php/mod_php-5.0.0.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-5.0.0.ebuild,v 1.5 2005/01/09 20:58:25 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-5.0.0.ebuild,v 1.6 2005/05/19 20:23:05 robbat2 Exp $
 
 IUSE="${IUSE} apache2"
 
 KEYWORDS="-x86 -ppc -sparc -alpha -hppa -ia64 -amd64 -s390"
-PROVIDE="virtual/php-${PV}"
+PROVIDE="virtual/php"
 
 detectapache() {
 	local domsg=
diff --git a/dev-php/mod_php/mod_php-5.0.1.ebuild b/dev-php/mod_php/mod_php-5.0.1.ebuild
index 27f218511e07..04ea69cc5667 100644
--- a/dev-php/mod_php/mod_php-5.0.1.ebuild
+++ b/dev-php/mod_php/mod_php-5.0.1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-5.0.1.ebuild,v 1.5 2005/01/09 20:58:25 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-5.0.1.ebuild,v 1.6 2005/05/19 20:23:05 robbat2 Exp $
 
 IUSE="${IUSE} apache2"
 
 KEYWORDS="~x86 ~ppc"
-PROVIDE="virtual/php-${PV} virtual/httpd-php-${PV}"
+PROVIDE="virtual/php virtual/httpd-php"
 
 detectapache() {
 	local domsg=
diff --git a/dev-php/mod_php/mod_php-5.0.2-r1.ebuild b/dev-php/mod_php/mod_php-5.0.2-r1.ebuild
index 2e12b5ef562c..eba40492965e 100644
--- a/dev-php/mod_php/mod_php-5.0.2-r1.ebuild
+++ b/dev-php/mod_php/mod_php-5.0.2-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-5.0.2-r1.ebuild,v 1.2 2005/01/14 14:42:46 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-5.0.2-r1.ebuild,v 1.3 2005/05/19 20:23:05 robbat2 Exp $
 
 IUSE="${IUSE} apache2"
 
 KEYWORDS="~x86"
-PROVIDE="virtual/php-${PV} virtual/httpd-php-${PV}"
+PROVIDE="virtual/php virtual/httpd-php"
 
 detectapache() {
 	local domsg=
diff --git a/dev-php/mod_php/mod_php-5.0.2.ebuild b/dev-php/mod_php/mod_php-5.0.2.ebuild
index 1c3d25701303..16008c67b8b6 100644
--- a/dev-php/mod_php/mod_php-5.0.2.ebuild
+++ b/dev-php/mod_php/mod_php-5.0.2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-5.0.2.ebuild,v 1.6 2005/01/09 20:58:25 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-5.0.2.ebuild,v 1.7 2005/05/19 20:23:05 robbat2 Exp $
 
 IUSE="${IUSE} apache2"
 
 KEYWORDS="~ia64 ~ppc ~x86 ~ppc64"
-PROVIDE="virtual/php-${PV} virtual/httpd-php-${PV}"
+PROVIDE="virtual/php virtual/httpd-php"
 
 detectapache() {
 	local domsg=
diff --git a/dev-php/mod_php/mod_php-5.0.3-r1.ebuild b/dev-php/mod_php/mod_php-5.0.3-r1.ebuild
index 3a0352e4664f..9493d11f41bc 100644
--- a/dev-php/mod_php/mod_php-5.0.3-r1.ebuild
+++ b/dev-php/mod_php/mod_php-5.0.3-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-5.0.3-r1.ebuild,v 1.7 2005/03/06 19:12:12 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-5.0.3-r1.ebuild,v 1.8 2005/05/19 20:23:05 robbat2 Exp $
 
 IUSE="${IUSE} apache2"
 
 KEYWORDS="~x86 ~amd64 ~ppc"
-PROVIDE="virtual/php-${PV} virtual/httpd-php-${PV}"
+PROVIDE="virtual/php virtual/httpd-php"
 
 detectapache() {
 	local domsg=
diff --git a/dev-php/mod_php/mod_php-5.0.3-r2.ebuild b/dev-php/mod_php/mod_php-5.0.3-r2.ebuild
index 7452c09a953d..174b9b0ba815 100644
--- a/dev-php/mod_php/mod_php-5.0.3-r2.ebuild
+++ b/dev-php/mod_php/mod_php-5.0.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-5.0.3-r2.ebuild,v 1.2 2005/05/03 02:03:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-5.0.3-r2.ebuild,v 1.3 2005/05/19 20:23:05 robbat2 Exp $
 
 IUSE="${IUSE} apache2"
 
@@ -14,7 +14,7 @@ else
 fi
 
 KEYWORDS="~x86 ~amd64"
-PROVIDE="virtual/httpd-php-${PV}"
+PROVIDE="virtual/httpd-php"
 
 SLOT="${APACHE_VERSION}"
 
diff --git a/dev-php/mod_php/mod_php-5.0.3.ebuild b/dev-php/mod_php/mod_php-5.0.3.ebuild
index 9c3719ddf22d..be2c185d1083 100644
--- a/dev-php/mod_php/mod_php-5.0.3.ebuild
+++ b/dev-php/mod_php/mod_php-5.0.3.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-5.0.3.ebuild,v 1.4 2005/02/11 23:02:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-5.0.3.ebuild,v 1.5 2005/05/19 20:23:05 robbat2 Exp $
 
 IUSE="${IUSE} apache2"
 
 KEYWORDS="~ia64 ~ppc ~x86 ~ppc64 ~sparc ~amd64"
-PROVIDE="virtual/php-${PV} virtual/httpd-php-${PV}"
+PROVIDE="virtual/php virtual/httpd-php"
 
 detectapache() {
 	local domsg=
diff --git a/dev-php/mod_php/mod_php-5.0.4.ebuild b/dev-php/mod_php/mod_php-5.0.4.ebuild
index 0e81120908de..702b60278217 100644
--- a/dev-php/mod_php/mod_php-5.0.4.ebuild
+++ b/dev-php/mod_php/mod_php-5.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-5.0.4.ebuild,v 1.2 2005/05/19 06:59:05 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-5.0.4.ebuild,v 1.3 2005/05/19 20:23:05 robbat2 Exp $
 
 IUSE="${IUSE} apache2"
 
@@ -14,7 +14,7 @@ else
 fi
 
 KEYWORDS="~x86 ~amd64 ~ppc64"
-PROVIDE="virtual/httpd-php-${PV}"
+PROVIDE="virtual/httpd-php"
 
 SLOT="${APACHE_VERSION}"
 
diff --git a/dev-php/php-cgi/ChangeLog b/dev-php/php-cgi/ChangeLog
index 0a77f16ae9f1..fd8dac908cdf 100644
--- a/dev-php/php-cgi/ChangeLog
+++ b/dev-php/php-cgi/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-php/php-cgi
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/ChangeLog,v 1.69 2005/05/17 18:40:17 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/ChangeLog,v 1.70 2005/05/19 20:25:58 robbat2 Exp $
+
+  19 May 2005; Robin H. Johnson <robbat2@gentoo.org>
+  php-cgi-4.3.9_rc1.ebuild, php-cgi-4.3.9_rc1-r1.ebuild,
+  php-cgi-4.3.9.ebuild, php-cgi-4.3.9-r1.ebuild, php-cgi-4.3.10.ebuild,
+  php-cgi-4.3.11.ebuild, php-cgi-4.3.11-r1.ebuild, php-cgi-5.0.0-r1.ebuild,
+  php-cgi-5.0.1.ebuild, php-cgi-5.0.2.ebuild, php-cgi-5.0.3.ebuild,
+  php-cgi-5.0.3-r1.ebuild:
+  Bug #93028, clean up PROVIDE instances.
 
   17 May 2005; Robin H. Johnson <robbat2@gentoo.org>
   php-cgi-4.3.11-r1.ebuild:
diff --git a/dev-php/php-cgi/php-cgi-4.3.10.ebuild b/dev-php/php-cgi/php-cgi-4.3.10.ebuild
index 7b8180d01abe..124cd4e5252a 100644
--- a/dev-php/php-cgi/php-cgi-4.3.10.ebuild
+++ b/dev-php/php-cgi/php-cgi-4.3.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/php-cgi-4.3.10.ebuild,v 1.9 2005/02/21 21:34:38 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/php-cgi-4.3.10.ebuild,v 1.10 2005/05/19 20:25:58 robbat2 Exp $
 
 PHPSAPI="cgi"
 inherit php-sapi eutils
@@ -11,7 +11,7 @@ KEYWORDS="x86 sparc alpha hppa ppc ~ia64 ~amd64 ~mips"
 
 # for this revision only
 PDEPEND=">=${PHP_PROVIDER_PKG}-4.3.10"
-PROVIDE="${PROVIDE} virtual/httpd-php-${PV}"
+PROVIDE="${PROVIDE} virtual/httpd-php"
 
 src_unpack() {
 	php-sapi_src_unpack
diff --git a/dev-php/php-cgi/php-cgi-4.3.11-r1.ebuild b/dev-php/php-cgi/php-cgi-4.3.11-r1.ebuild
index 9475cc3d69a1..480da8a38959 100644
--- a/dev-php/php-cgi/php-cgi-4.3.11-r1.ebuild
+++ b/dev-php/php-cgi/php-cgi-4.3.11-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/php-cgi-4.3.11-r1.ebuild,v 1.3 2005/05/17 18:40:17 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/php-cgi-4.3.11-r1.ebuild,v 1.4 2005/05/19 20:25:58 robbat2 Exp $
 
 PHPSAPI="cgi"
 inherit php-sapi eutils
@@ -12,7 +12,7 @@ KEYWORDS="x86 sparc alpha hppa ppc ia64 amd64 ~mips"
 
 # for this revision only
 PDEPEND=">=${PHP_PROVIDER_PKG}-4.3.11"
-PROVIDE="${PROVIDE} virtual/httpd-php-${PV}"
+PROVIDE="${PROVIDE} virtual/httpd-php"
 
 src_unpack() {
 	php-sapi_src_unpack
diff --git a/dev-php/php-cgi/php-cgi-4.3.11.ebuild b/dev-php/php-cgi/php-cgi-4.3.11.ebuild
index 3b3c734c1449..3131e2ab69e8 100644
--- a/dev-php/php-cgi/php-cgi-4.3.11.ebuild
+++ b/dev-php/php-cgi/php-cgi-4.3.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/php-cgi-4.3.11.ebuild,v 1.10 2005/05/06 09:46:49 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/php-cgi-4.3.11.ebuild,v 1.11 2005/05/19 20:25:58 robbat2 Exp $
 
 PHPSAPI="cgi"
 inherit php-sapi eutils
@@ -11,7 +11,7 @@ KEYWORDS="x86 sparc alpha hppa ppc ia64 amd64 ~mips"
 
 # for this revision only
 PDEPEND=">=${PHP_PROVIDER_PKG}-4.3.11"
-PROVIDE="${PROVIDE} virtual/httpd-php-${PV}"
+PROVIDE="${PROVIDE} virtual/httpd-php"
 
 src_unpack() {
 	php-sapi_src_unpack
diff --git a/dev-php/php-cgi/php-cgi-4.3.9-r1.ebuild b/dev-php/php-cgi/php-cgi-4.3.9-r1.ebuild
index d357bbeb393d..d9010a8b206e 100644
--- a/dev-php/php-cgi/php-cgi-4.3.9-r1.ebuild
+++ b/dev-php/php-cgi/php-cgi-4.3.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/php-cgi-4.3.9-r1.ebuild,v 1.3 2005/01/09 21:02:39 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/php-cgi-4.3.9-r1.ebuild,v 1.4 2005/05/19 20:25:58 robbat2 Exp $
 
 PHPSAPI="cgi"
 inherit php-sapi eutils
@@ -11,7 +11,7 @@ KEYWORDS="x86 sparc alpha hppa ppc ia64"
 
 # for this revision only
 PDEPEND=">=${PHP_PROVIDER_PKG}-4.3.9"
-PROVIDE="${PROVIDE} virtual/httpd-php-${PV}"
+PROVIDE="${PROVIDE} virtual/httpd-php"
 
 src_compile() {
 	# CLI needed to build stuff
diff --git a/dev-php/php-cgi/php-cgi-4.3.9.ebuild b/dev-php/php-cgi/php-cgi-4.3.9.ebuild
index c7034339ab01..3367b6978843 100644
--- a/dev-php/php-cgi/php-cgi-4.3.9.ebuild
+++ b/dev-php/php-cgi/php-cgi-4.3.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/php-cgi-4.3.9.ebuild,v 1.8 2005/01/09 21:02:39 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/php-cgi-4.3.9.ebuild,v 1.9 2005/05/19 20:25:58 robbat2 Exp $
 
 PHPSAPI="cgi"
 inherit php-sapi eutils
@@ -11,7 +11,7 @@ KEYWORDS="x86 sparc alpha hppa ppc ia64"
 
 # for this revision only
 PDEPEND=">=${PHP_PROVIDER_PKG}-4.3.9"
-PROVIDE="${PROVIDE} virtual/httpd-php-${PV}"
+PROVIDE="${PROVIDE} virtual/httpd-php"
 
 src_compile() {
 	# CLI needed to build stuff
diff --git a/dev-php/php-cgi/php-cgi-4.3.9_rc1-r1.ebuild b/dev-php/php-cgi/php-cgi-4.3.9_rc1-r1.ebuild
index 0c5674239001..c0bb31499113 100644
--- a/dev-php/php-cgi/php-cgi-4.3.9_rc1-r1.ebuild
+++ b/dev-php/php-cgi/php-cgi-4.3.9_rc1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/php-cgi-4.3.9_rc1-r1.ebuild,v 1.3 2005/01/09 21:02:39 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/php-cgi-4.3.9_rc1-r1.ebuild,v 1.4 2005/05/19 20:25:58 robbat2 Exp $
 
 PHPSAPI="cgi"
 SRC_URI_BASE="http://downloads.php.net/ilia/" # for RC only
@@ -12,7 +12,7 @@ KEYWORDS="~x86 ~sparc ~alpha ~hppa ~ppc ~ia64"
 
 # for this revision only
 PDEPEND=">=${PHP_PROVIDER_PKG}-4.3.8"
-PROVIDE="${PROVIDE} virtual/httpd-php-${PV}"
+PROVIDE="${PROVIDE} virtual/httpd-php"
 
 src_compile() {
 	# CLI needed to build stuff
diff --git a/dev-php/php-cgi/php-cgi-4.3.9_rc1.ebuild b/dev-php/php-cgi/php-cgi-4.3.9_rc1.ebuild
index 9e468b707f55..a3b053b7a2e9 100644
--- a/dev-php/php-cgi/php-cgi-4.3.9_rc1.ebuild
+++ b/dev-php/php-cgi/php-cgi-4.3.9_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/php-cgi-4.3.9_rc1.ebuild,v 1.2 2005/01/09 21:02:39 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/php-cgi-4.3.9_rc1.ebuild,v 1.3 2005/05/19 20:25:58 robbat2 Exp $
 
 PHPSAPI="cgi"
 SRC_URI_BASE="http://downloads.php.net/ilia/" # for RC only
@@ -12,7 +12,7 @@ KEYWORDS="~x86 ~sparc ~alpha ~hppa ~ppc ~ia64"
 
 # for this revision only
 PDEPEND=">=${PHP_PROVIDER_PKG}-4.3.8"
-PROVIDE="${PROVIDE} virtual/httpd-php-${PV}"
+PROVIDE="${PROVIDE} virtual/httpd-php"
 
 src_compile() {
 	# CLI needed to build stuff
diff --git a/dev-php/php-cgi/php-cgi-5.0.0-r1.ebuild b/dev-php/php-cgi/php-cgi-5.0.0-r1.ebuild
index 9eca7bf05f5a..7bd5380f05a5 100644
--- a/dev-php/php-cgi/php-cgi-5.0.0-r1.ebuild
+++ b/dev-php/php-cgi/php-cgi-5.0.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/php-cgi-5.0.0-r1.ebuild,v 1.4 2005/01/09 21:02:39 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/php-cgi-5.0.0-r1.ebuild,v 1.5 2005/05/19 20:25:58 robbat2 Exp $
 
 PHPSAPI="cgi"
 MY_P="php-${PV}"
@@ -16,7 +16,7 @@ DEPEND_PHP=">=${PHP_PROVIDER_PKG}-5.0.0-r1"
 DEPEND="${DEPEND} ${DEPEND_PHP}"
 RDEPEND="${RDEPEND} ${DEPEND_PHP}"
 
-PROVIDE="virtual/php-${PV} virtual/httpd-php-${PV}"
+PROVIDE="virtual/php virtual/httpd-php"
 
 src_compile() {
 	# CLI needed to build stuff
diff --git a/dev-php/php-cgi/php-cgi-5.0.1.ebuild b/dev-php/php-cgi/php-cgi-5.0.1.ebuild
index afcf1431e171..cd9c26008a06 100644
--- a/dev-php/php-cgi/php-cgi-5.0.1.ebuild
+++ b/dev-php/php-cgi/php-cgi-5.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/php-cgi-5.0.1.ebuild,v 1.4 2005/01/09 21:02:39 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/php-cgi-5.0.1.ebuild,v 1.5 2005/05/19 20:25:58 robbat2 Exp $
 
 PHPSAPI="cgi"
 MY_P="php-${PV}"
@@ -16,7 +16,7 @@ DEPEND_PHP=">=${PHP_PROVIDER_PKG}-5.0.1"
 DEPEND="${DEPEND} ${DEPEND_PHP}"
 RDEPEND="${RDEPEND} ${DEPEND_PHP}"
 
-PROVIDE="virtual/php-${PV} virtual/httpd-php-${PV}"
+PROVIDE="virtual/php virtual/httpd-php"
 
 src_compile() {
 	# CLI needed to build stuff
diff --git a/dev-php/php-cgi/php-cgi-5.0.2.ebuild b/dev-php/php-cgi/php-cgi-5.0.2.ebuild
index 2b1b1858ff6f..663f2b057daf 100644
--- a/dev-php/php-cgi/php-cgi-5.0.2.ebuild
+++ b/dev-php/php-cgi/php-cgi-5.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/php-cgi-5.0.2.ebuild,v 1.4 2005/01/09 21:02:39 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/php-cgi-5.0.2.ebuild,v 1.5 2005/05/19 20:25:58 robbat2 Exp $
 
 PHPSAPI="cgi"
 MY_P="php-${PV}"
@@ -16,7 +16,7 @@ DEPEND_PHP=">=${PHP_PROVIDER_PKG}-5.0.2"
 DEPEND="${DEPEND} ${DEPEND_PHP}"
 RDEPEND="${RDEPEND} ${DEPEND_PHP}"
 
-PROVIDE="virtual/php-${PV} virtual/httpd-php-${PV}"
+PROVIDE="virtual/php virtual/httpd-php"
 
 src_compile() {
 	# CLI needed to build stuff
diff --git a/dev-php/php-cgi/php-cgi-5.0.3-r1.ebuild b/dev-php/php-cgi/php-cgi-5.0.3-r1.ebuild
index e6cc21a0c798..14712bff6223 100644
--- a/dev-php/php-cgi/php-cgi-5.0.3-r1.ebuild
+++ b/dev-php/php-cgi/php-cgi-5.0.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/php-cgi-5.0.3-r1.ebuild,v 1.2 2005/05/12 13:41:42 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/php-cgi-5.0.3-r1.ebuild,v 1.3 2005/05/19 20:25:58 robbat2 Exp $
 
 PHPSAPI="cgi"
 MY_P="php-${PV}"
@@ -17,7 +17,7 @@ DEPEND_PHP=">=${PHP_PROVIDER_PKG}-5.0.3"
 DEPEND="${DEPEND} ${DEPEND_PHP}"
 RDEPEND="${RDEPEND} ${DEPEND_PHP}"
 
-PROVIDE="virtual/php-${PV} virtual/httpd-php-${PV}"
+PROVIDE="virtual/php virtual/httpd-php"
 
 src_unpack() {
 	php5-sapi_src_unpack
diff --git a/dev-php/php-cgi/php-cgi-5.0.3.ebuild b/dev-php/php-cgi/php-cgi-5.0.3.ebuild
index df46220dead5..d0ec7818eb09 100644
--- a/dev-php/php-cgi/php-cgi-5.0.3.ebuild
+++ b/dev-php/php-cgi/php-cgi-5.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/php-cgi-5.0.3.ebuild,v 1.4 2005/02/11 23:00:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/php-cgi-5.0.3.ebuild,v 1.5 2005/05/19 20:25:58 robbat2 Exp $
 
 PHPSAPI="cgi"
 MY_P="php-${PV}"
@@ -16,7 +16,7 @@ DEPEND_PHP=">=${PHP_PROVIDER_PKG}-5.0.3"
 DEPEND="${DEPEND} ${DEPEND_PHP}"
 RDEPEND="${RDEPEND} ${DEPEND_PHP}"
 
-PROVIDE="virtual/php-${PV} virtual/httpd-php-${PV}"
+PROVIDE="virtual/php virtual/httpd-php"
 
 src_unpack() {
 	php5-sapi_src_unpack
diff --git a/dev-php/php/ChangeLog b/dev-php/php/ChangeLog
index 8c582b663bbf..1871aa8708a4 100644
--- a/dev-php/php/ChangeLog
+++ b/dev-php/php/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-php/php
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php/ChangeLog,v 1.155 2005/05/06 09:44:27 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/ChangeLog,v 1.156 2005/05/19 20:21:05 robbat2 Exp $
+
+  19 May 2005; Robin H. Johnson <robbat2@gentoo.org> php-5.0.2-r1.ebuild,
+  php-5.0.3.ebuild, php-5.0.3-r1.ebuild:
+  Bug #93028, clean up PROVIDE instances.
 
   06 May 2005; Sebastian Bergmann <sebastian@gentoo.org>
   +files/php-4.3.11-flash.patch, php-4.3.11.ebuild:
diff --git a/dev-php/php/php-5.0.2-r1.ebuild b/dev-php/php/php-5.0.2-r1.ebuild
index 4a720254db0d..5c2963bab9aa 100644
--- a/dev-php/php/php-5.0.2-r1.ebuild
+++ b/dev-php/php/php-5.0.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-5.0.2-r1.ebuild,v 1.5 2005/01/09 20:51:40 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-5.0.2-r1.ebuild,v 1.6 2005/05/19 20:21:05 robbat2 Exp $
 
 PHPSAPI="cli"
 MY_P="${PN}-${PV}"
@@ -11,7 +11,7 @@ LICENSE="PHP"
 KEYWORDS="~arm ~hppa ~ia64 ~ppc ~x86 ~ppc64"
 DEPEND="$DEPEND"
 RDEPEND="$RDEPEND"
-PROVIDE="virtual/php-${PV}"
+PROVIDE="virtual/php"
 SLOT="0"
 
 # PHP_INSTALLTARGETS="${PHP_INSTALLTARGETS} install-cli"
diff --git a/dev-php/php/php-5.0.3-r1.ebuild b/dev-php/php/php-5.0.3-r1.ebuild
index bf6b5c2507d3..41a0939020e5 100644
--- a/dev-php/php/php-5.0.3-r1.ebuild
+++ b/dev-php/php/php-5.0.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-5.0.3-r1.ebuild,v 1.1 2005/02/28 06:07:54 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-5.0.3-r1.ebuild,v 1.2 2005/05/19 20:21:05 robbat2 Exp $
 
 PHPSAPI="cli"
 MY_P="${PN}-${PV}"
@@ -11,7 +11,7 @@ LICENSE="PHP"
 KEYWORDS="~arm ~hppa ~ia64 ~ppc ~x86 ~ppc64 ~sparc ~amd64"
 DEPEND="$DEPEND"
 RDEPEND="$RDEPEND"
-PROVIDE="virtual/php-${PV}"
+PROVIDE="virtual/php"
 SLOT="0"
 
 # PHP_INSTALLTARGETS="${PHP_INSTALLTARGETS} install-cli"
diff --git a/dev-php/php/php-5.0.3.ebuild b/dev-php/php/php-5.0.3.ebuild
index 03c0592ffa35..184cbce7eb18 100644
--- a/dev-php/php/php-5.0.3.ebuild
+++ b/dev-php/php/php-5.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-5.0.3.ebuild,v 1.4 2005/02/11 23:01:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-5.0.3.ebuild,v 1.5 2005/05/19 20:21:05 robbat2 Exp $
 
 PHPSAPI="cli"
 MY_P="${PN}-${PV}"
@@ -11,7 +11,7 @@ LICENSE="PHP"
 KEYWORDS="~arm ~hppa ~ia64 ~ppc ~x86 ~ppc64 ~sparc ~amd64"
 DEPEND="$DEPEND"
 RDEPEND="$RDEPEND"
-PROVIDE="virtual/php-${PV}"
+PROVIDE="virtual/php"
 SLOT="0"
 
 # PHP_INSTALLTARGETS="${PHP_INSTALLTARGETS} install-cli"