do not provide virtual/httpd-php any longer

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

diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index d771a01f024ee31997b88722cb92ed39e4c65f7d..31fa2bfacb12bbc465ea7b0b3f195223dcf34fce 100644 (file)
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lang/php
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.386 2010/07/04 22:40:19 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.387 2010/07/05 14:10:06 mabi Exp $
+
+  05 Jul 2010; Matti Bickel <mabi@gentoo.org> php-5.3.2.ebuild:
+  introduced new style virtual httpd-php (bug #319623)
 
   04 Jul 2010; Matti Bickel <mabi@gentoo.org> php-5.3.2.ebuild:
   include patch to compile with gmp-5* (bug #322303)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 66c36b90c5a0cc3cf8f30d12263d8ed1855af21d..282d45c05190f7d680ac976a80a93532a1670904 100644 (file)
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -41,6 +41,6 @@ EBUILD php-5.2.11.ebuild 16796 RMD160 4d55fe8a9787c726a23a426e891ceffbb44faef6 S
 EBUILD php-5.2.12.ebuild 16901 RMD160 42ad4d01a89392445e491f1d784a7f23028fb0dc SHA1 17f6e1da1793a06c10636e332440c37535262a7d SHA256 cbab429ae3fe5bc0fe4cb961dbb1df91be35c04f7c8340cfee39117afcfeddcc
 EBUILD php-5.2.13.ebuild 16879 RMD160 c580f3e8de5be0a3338ae3f816153c1d42b4337f SHA1 4bc3f1792d3f85a96ecbf538f97c76d1de8dda4a SHA256 811314bfdf521766794650581c963b31d81c10071311e20121e4a1ca5458a51f
 EBUILD php-5.2.9-r2.ebuild 16727 RMD160 aa0e1af3e50b550111c3d1490adc9e8ed2432b34 SHA1 1e4b46b562d74e758db1ec52751419cd02333878 SHA256 7187f6feedc92c355543713cb07218a48f1cd45e9394fa6d4a00bbe7e5b3010b
-EBUILD php-5.3.2.ebuild 9333 RMD160 afec93efe73ad056e5bd4156480d73de3b36f023 SHA1 8b055998fa7b72c4cb14c3db836a2f04df515009 SHA256 12bdab76b4f658f86b6276d01fa215e1aa80e3c9b1518b854e34b374e4780b4b
-MISC ChangeLog 66962 RMD160 ab46e4dff960ee05a5a42fe8076b7c4aa3c7e537 SHA1 0983bf2990b13ff3f2b86b3974c05b112a1e5171 SHA256 dfffdfe8a1dfb4a9aec489ef2486f1288050383c36d0290e5e777eeaeaaa921c
+EBUILD php-5.3.2.ebuild 9365 RMD160 afe466f09d14dc5ee20f8a55ba153500e115babe SHA1 37be3c2c873b0ac97c8f2fd0598f0af18e5ae01f SHA256 fc26ce0a37c9e2bce49b9b29fe7fa2daef76ef9075103f8e4b80eda1378ff35c
+MISC ChangeLog 67082 RMD160 28359b6ad8a0bdcd05d9ee93e4e20fa5efa4467d SHA1 48c2d66455700488adf06b4d8359783758294bdf SHA256 413fc096596900e1949c6a0cb65543584a372303e33552287d25e0885ce11393
 MISC metadata.xml 2185 RMD160 2e1d4afa19f7370b62080f3f62bc0f8e525b82bd SHA1 2b758e52eb1e1130fffe162e6cd2122deaf18bf3 SHA256 8a8be20f80edd56dd9f16b90f4ff91fde426b05861e737750664223801e2c667

diff --git a/dev-lang/php/php-5.3.2.ebuild b/dev-lang/php/php-5.3.2.ebuild
index ddb850d18071cf6d47912bd9f49f7a03a22c7890..2e4983f5d0ca04a285e56cc9b7a8901fcc20d85e 100644 (file)
--- a/dev-lang/php/php-5.3.2.ebuild
+++ b/dev-lang/php/php-5.3.2.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/php/php-5.3.2.ebuild,v 1.10 2010/07/04 22:40:19 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.2.ebuild,v 1.11 2010/07/05 14:10:06 mabi Exp $
 
 EAPI=2
 
@@ -255,7 +255,8 @@ PDEPEND="doc? ( app-doc/php-docs )
 # 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 virtual/httpd-php"
+# see bug #319623 and new style virtual/httpd-php
+PROVIDE="virtual/php"
 
 SLOT="${PHP_MV}"
 S="${WORKDIR}/${PHP_P}"