Removed old style virtual virtual/php. Bug 358845

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

8 files changed, 15 insertions, 49 deletions

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 569c05f73778..29b743f3ba33 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -47,13 +47,14 @@ DIST suhosin-patch-5.2.14-0.9.7.patch.gz 23057 RMD160 bc7790cd36dc4101322684b754
 DIST suhosin-patch-5.2.16-0.9.7.patch.gz 23069 RMD160 b28b70faf136b3e04c5b483da0f4c2279378f43a SHA1 fec10b2b81582d06bb0d0a96ea55c525afc8ab29 SHA256 aae115a318d80b3f32cedf876e7a8e4b932febb1b0c743c0b398003ebe122f91
 DIST suhosin-patch-5.3.3-0.9.10.patch.gz 41298 RMD160 8dcd8b51ea0357b6cc51e70e495e18f341c62f7c SHA1 76675242cfdeff763767900213346af622002490 SHA256 f48489ff7d3fd3fc30429f7349f181c84caf2e03e672eb2d2b55b46adf6f602c
 DIST suhosin-patch-5.3.4-0.9.10.patch.gz 41092 RMD160 e5105397a9e41997ad11d2a0be01c7e3c9d06c6e SHA1 a2ab4bd03a329ec56a1f8b99e12e59f1838e0da6 SHA256 6c920803f6a9f43881c7d8a938716cb572c2f43181fe5cd71f7bfb486825fddf
-EBUILD php-5.2.14.ebuild 9127 RMD160 43dfd03ccea9c069f64d79c34a73e34b40fc73b2 SHA1 d7df720d6655d4857a518c4d504407e3528b8bf1 SHA256 53fa1a3c108a65bfb78a48b9d8174ce73240365fda2cc349382cacc877e4b74f
-EBUILD php-5.2.16.ebuild 9713 RMD160 ec439c4d6addae9261ca1cfee1f3f9588e319f60 SHA1 a4917ab85dae1095ff55756d9887db019d0b6461 SHA256 6675db9c1b35220773f9375d95bb6c258c405fc4fcacda6961457d906c68d472
+EBUILD php-5.2.14.ebuild 8950 RMD160 2351679e1e8f2947abbe02ab6cd85f6cb8f2e64a SHA1 a6a3ebeaffd5eb0a1d24c720308641002149428e SHA256 987c916733c45c5639d6571c80c5b224e283c623120e979cf5b4e7179ce3c170
+EBUILD php-5.2.16.ebuild 9537 RMD160 f7c67b4b0b2c49f697ae9908603a54a71a48a836 SHA1 5c86a87ae24f63355ae5a4537ec1d6870864923f SHA256 e16e7fc9d9505ad3c6a67e1cedd6500dd2a0065d0eed3ddc59f2b7ef66dd5331
 EBUILD php-5.2.17.ebuild 9739 RMD160 480e65e148b8c0bbbd796f837ac81b05443a5e4d SHA1 cda60b9700d2f7aaef196566463be50504d88964 SHA256 03d503fc6b8dbe28f14f17e2222337d6af41c5079d8b2dd2fe23b1e4f84410e6
-EBUILD php-5.3.3-r1.ebuild 9476 RMD160 85c12c9010df014ec40590ad82251205dbd59ce0 SHA1 4883ddde7ba89602263c19262417f2d46f79a053 SHA256 c0309ab8d91106783084e7f0168937ee46795c358c630c0c034a6d3bbdeca957
-EBUILD php-5.3.4.ebuild 9884 RMD160 db528694043e91c768be90a52f7859a6503dd265 SHA1 89cfa02e98539df7fe006407428c52231e88d5a7 SHA256 989994d4450cf8ff9d54fcf30f333fc6dea10f19e5149158c5e9315743ecfc56
-EBUILD php-5.3.5-r1.ebuild 9933 RMD160 6e48885c668620e3a1b3a0545a1734047b16bed8 SHA1 cf069ae24f07461d00ba9536544abc36a8a4ff67 SHA256 bab021a98aac63d49bc1351bf032c718637181a3562421aff1475b00d0f70f63
-EBUILD php-5.3.5.ebuild 9885 RMD160 aff975b485dbfa19d9122b961f303c8973aba55d SHA1 01416fee8225f13a1880cba41f792f0d93bebded SHA256 3d7a70399bdba558b8b63e18b287987d85bb5643dd409941d52825d895e2e05a
-EBUILD php-5.3.6_rc3.ebuild 9987 RMD160 4ae2c165223f0ec621357f1a8108b93b27ad8e23 SHA1 66cad0d0aa4550ee389ac800d53f81c59e6ecebb SHA256 9c79e9749c7b9d0eb7ff3d16121fe277ee7a164f6c42799cc252171716697cc9
+EBUILD php-5.3.3-r1.ebuild 9299 RMD160 1ecccc367906bdb7bdc1d3a97282887309459ac4 SHA1 7abed74e6514163c7a6b5d84e5620d987cc34874 SHA256 8a956443d9a4dd1d4556879339c8992f3564316460f7104d5f951e9f2a542cbb
+EBUILD php-5.3.4.ebuild 9708 RMD160 d989d31deac27651fd85944665d387fb881470ec SHA1 239adce33a259c120d0b346b3cfed8861a09c443 SHA256 1d64cb3064eae330a644ec926e7c0a817e00445a3cf1768546b1059d844c752e
+EBUILD php-5.3.5-r1.ebuild 9756 RMD160 fa2bc357cdc0367639019a181475dad9e636a7b9 SHA1 d0cca6779e204af986e803770cb2bcf38eceb1d3 SHA256 4ee0da384cefa1e0e6791c4e4d5ba1d03ed0c1424d7452101e9f6ca6927fe7a0
+EBUILD php-5.3.5.ebuild 9706 RMD160 c71887f13341b29323927fe6e736f40d756ad85d SHA1 42e92711c3b508c6f8568e9a79bee223ddd2c8f8 SHA256 ceb595c20787a98886a9e6eb1641f736096b18f50327b3baf84d99ee271dbec5
+EBUILD php-5.3.6_rc3.ebuild 9808 RMD160 6177313919d159bc8d60ff9f37320e1ff4a562dc SHA1 970c3ca3831c845820f86085a2b80cc5e2f2efca SHA256 9381767d5e0e8f562571d5fdbf40e22488fbc1c56515bd706fa4c0f374c184ba
 MISC ChangeLog 80764 RMD160 00b0543dc57393810765fe0c061318f62ccff3d7 SHA1 244507a95eafe68dc7286b65700a24fcb875b847 SHA256 4ce270a3b01122422258f187ea7585924d102cb2be828fd88d90946a6d1ca736
 MISC metadata.xml 2212 RMD160 e26ea7f6831acb23854f018fe6d00c213bf62e5a SHA1 25500969d6ef6c1918a8e6abbb04e0553806dee2 SHA256 6fdbba214ce15fae4a1e2eb086586008377fff85e67e38b1e2232a9745432674
+MISC php-5.2.16.ebuild.orig 9713 RMD160 ec439c4d6addae9261ca1cfee1f3f9588e319f60 SHA1 a4917ab85dae1095ff55756d9887db019d0b6461 SHA256 6675db9c1b35220773f9375d95bb6c258c405fc4fcacda6961457d906c68d472
diff --git a/dev-lang/php/php-5.2.14.ebuild b/dev-lang/php/php-5.2.14.ebuild
index 5ccaceada59b..c3340d0454c9 100644
--- a/dev-lang/php/php-5.2.14.ebuild
+++ b/dev-lang/php/php-5.2.14.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/php/php-5.2.14.ebuild,v 1.12 2011/02/25 19:00:15 signals Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.14.ebuild,v 1.13 2011/03/14 22:31:20 olemarkus Exp $
 
 EAPI=2
 
@@ -232,11 +232,6 @@ PDEPEND="doc? ( app-doc/php-docs )
 	mcve? ( dev-php${PHP_MV}/pecl-mcve )
 	yaz? ( dev-php${PHP_MV}/pecl-yaz )"
 
-# Portage doesn't support setting PROVIDE based on the USE flags that
-# have been enabled, so we have to PROVIDE everything for now and hope
-# for the best
-PROVIDE="virtual/php"
-
 SLOT="${PHP_MV}"
 S="${WORKDIR}/${PHP_P}"
 
diff --git a/dev-lang/php/php-5.2.16.ebuild b/dev-lang/php/php-5.2.16.ebuild
index 58adc3a9a413..d4dce7041928 100644
--- a/dev-lang/php/php-5.2.16.ebuild
+++ b/dev-lang/php/php-5.2.16.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/php/php-5.2.16.ebuild,v 1.9 2011/02/25 19:00:15 signals Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.16.ebuild,v 1.10 2011/03/14 22:31:20 olemarkus Exp $
 
 EAPI=2
 
@@ -243,11 +243,6 @@ PDEPEND="doc? ( app-doc/php-docs )
 
 [[ -n $SUHOSIN_VERSION ]] && PDEPEND="${PDEPEND} suhosin? ( dev-php${PHP_MV}/suhosin )"
 
-# Portage doesn't support setting PROVIDE based on the USE flags that
-# have been enabled, so we have to PROVIDE everything for now and hope
-# for the best
-PROVIDE="virtual/php"
-
 SLOT="$(get_version_component_range 1-2)"
 S="${WORKDIR}/${PHP_P}"
 
diff --git a/dev-lang/php/php-5.3.3-r1.ebuild b/dev-lang/php/php-5.3.3-r1.ebuild
index 4b34fbb21b1f..065a23889a5a 100644
--- a/dev-lang/php/php-5.3.3-r1.ebuild
+++ b/dev-lang/php/php-5.3.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/php/php-5.3.3-r1.ebuild,v 1.10 2011/02/25 19:00:15 signals Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.3-r1.ebuild,v 1.11 2011/03/14 22:31:20 olemarkus Exp $
 
 EAPI=2
 
@@ -252,11 +252,6 @@ DEPEND="${DEPEND}
 PDEPEND="doc? ( app-doc/php-docs )
 	suhosin? ( dev-php${PHP_MV}/suhosin )"
 
-# Portage doesn't support setting PROVIDE based on the USE flags that
-# have been enabled, so we have to PROVIDE everything for now and hope
-# for the best
-PROVIDE="virtual/php"
-
 SLOT="${PHP_MV}"
 S="${WORKDIR}/${PHP_P}"
 
diff --git a/dev-lang/php/php-5.3.4.ebuild b/dev-lang/php/php-5.3.4.ebuild
index 9deefcdb67f9..82c0f11f166f 100644
--- a/dev-lang/php/php-5.3.4.ebuild
+++ b/dev-lang/php/php-5.3.4.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/php/php-5.3.4.ebuild,v 1.9 2011/01/30 16:00:34 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.4.ebuild,v 1.10 2011/03/14 22:31:20 olemarkus Exp $
 
 EAPI=2
 
@@ -259,11 +259,6 @@ PDEPEND="doc? ( app-doc/php-docs )"
 
 [[ -n $SUHOSIN_VERSION ]] && PDEPEND="${PDEPEND} suhosin? ( dev-php${PHP_MV}/suhosin )"
 
-# Portage doesn't support setting PROVIDE based on the USE flags that
-# have been enabled, so we have to PROVIDE everything for now and hope
-# for the best
-PROVIDE="virtual/php"
-
 SLOT="$(get_version_component_range 1-2)"
 S="${WORKDIR}/${PHP_P}"
 
diff --git a/dev-lang/php/php-5.3.5-r1.ebuild b/dev-lang/php/php-5.3.5-r1.ebuild
index 1cca2ee78ffb..fa85d92c63c6 100644
--- a/dev-lang/php/php-5.3.5-r1.ebuild
+++ b/dev-lang/php/php-5.3.5-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/php/php-5.3.5-r1.ebuild,v 1.2 2011/01/30 16:00:34 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.5-r1.ebuild,v 1.3 2011/03/14 22:31:20 olemarkus Exp $
 
 EAPI=2
 
@@ -263,11 +263,6 @@ PDEPEND="doc? ( app-doc/php-docs )"
 
 [[ -n $SUHOSIN_VERSION ]] && PDEPEND="${PDEPEND} suhosin? ( dev-php${PHP_MV}/suhosin )"
 
-# Portage doesn't support setting PROVIDE based on the USE flags that
-# have been enabled, so we have to PROVIDE everything for now and hope
-# for the best
-PROVIDE="virtual/php"
-
 # Allow users to install production version if they want to
 
 case "${PHP_INI_VERSION}" in
diff --git a/dev-lang/php/php-5.3.5.ebuild b/dev-lang/php/php-5.3.5.ebuild
index 396d18cfd61d..c7e7f4f6fc5b 100644
--- a/dev-lang/php/php-5.3.5.ebuild
+++ b/dev-lang/php/php-5.3.5.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/php/php-5.3.5.ebuild,v 1.11 2011/03/02 18:33:15 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.5.ebuild,v 1.12 2011/03/14 22:31:20 olemarkus Exp $
 
 EAPI=2
 
@@ -262,11 +262,6 @@ PDEPEND="doc? ( app-doc/php-docs )"
 
 [[ -n $SUHOSIN_VERSION ]] && PDEPEND="${PDEPEND} suhosin? ( dev-php${PHP_MV}/suhosin )"
 
-# Portage doesn't support setting PROVIDE based on the USE flags that
-# have been enabled, so we have to PROVIDE everything for now and hope
-# for the best
-PROVIDE="virtual/php"
-
 # Allow users to install production version if they want to
 
 case "${PHP_INI_VERSION}" in
diff --git a/dev-lang/php/php-5.3.6_rc3.ebuild b/dev-lang/php/php-5.3.6_rc3.ebuild
index 93a6f43f6116..efc1a28f34bf 100644
--- a/dev-lang/php/php-5.3.6_rc3.ebuild
+++ b/dev-lang/php/php-5.3.6_rc3.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/php/php-5.3.6_rc3.ebuild,v 1.2 2011/03/13 09:48:06 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.6_rc3.ebuild,v 1.3 2011/03/14 22:31:20 olemarkus Exp $
 
 EAPI=2
 
@@ -264,11 +264,6 @@ PDEPEND="doc? ( app-doc/php-docs )"
 # patch
 #[[ -n $SUHOSIN_VERSION ]] && PDEPEND="${PDEPEND} suhosin? ( dev-php${PHP_MV}/suhosin )"
 
-# Portage doesn't support setting PROVIDE based on the USE flags that
-# have been enabled, so we have to PROVIDE everything for now and hope
-# for the best
-PROVIDE="virtual/php"
-
 # Allow users to install production version if they want to
 
 case "${PHP_INI_VERSION}" in