Merging categories dev-php5 and dev-php (bug #324665)

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64

7 files changed, 46 insertions, 55 deletions

diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index 14fb094534f8..5eb2bbe7602e 100644
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/php
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.527 2011/12/09 20:19:24 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.528 2011/12/14 22:48:49 mabi Exp $
+
+  14 Dec 2011; Matti Bickel <mabi@gentoo.org> php-5.2.17.ebuild,
+  php-5.3.8.ebuild, php-5.3.9_rc1.ebuild, php-5.3.9_rc2.ebuild,
+  php-5.4.0_rc3.ebuild:
+  Merging categories dev-php5 and dev-php (bug #324665)
 
   09 Dec 2011; Ole Markus With <olemarkus@gentoo.org>
   -files/eblits/pkg_postinst-v2.eblit, php-5.2.17.ebuild, php-5.3.8.ebuild,
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 04d4361b42ab..156da433e4d7 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 20php5-envd 145 RMD160 8c81fb7dc1d1ddf16fd956d748514db3bcb27603 SHA1 f1cef57c0def8e2c5422aaf136f40b4ff47801d2 SHA256 efaae9e6ae5f7010e073c2ab6d8a9dda009f0707c7d7b0c027e142c94f7041a4
 AUX 70_mod_php5.conf-apache2 348 RMD160 9f3f49a52ebf92c2650501c5ceb6f95ce4bb2e76 SHA1 62992e793446b4a9a64900d1ecba7bae06873382 SHA256 5bb8a45570582b4389a7d3feea0398e1c13ed4ced96e559b9406ed8c965dea8c
 AUX eblits/common-v2.eblit 379 RMD160 595fd6c6be1e0ac15012ea78497a4d2c287c6754 SHA1 98e28261e32bda53c7dfef88def615f633af7c44 SHA256 8c15442b04b0216342ef6f2b8565cb3510f6850fe67745d5697861e2f7759194
@@ -32,21 +29,10 @@ DIST php-patchset-5.3.9_rc2-r0.tar.bz2 7515 RMD160 c3aca464d04df468fc8aaf6237be4
 DIST php-patchset-5.4.0_rc3-r0.tar.bz2 6001 RMD160 0200e6ada41e471a30bfddeeb166d3254a9e2856 SHA1 3b1f71255db1c003f452c2fe41f93284a50967c4 SHA256 06834d624ce6269aa8005a28ccc0e55b2e8d500af57e4392e641978d5993a3ea
 DIST suhosin-patch-5.2.16-0.9.7.patch.gz 23069 RMD160 b28b70faf136b3e04c5b483da0f4c2279378f43a SHA1 fec10b2b81582d06bb0d0a96ea55c525afc8ab29 SHA256 aae115a318d80b3f32cedf876e7a8e4b932febb1b0c743c0b398003ebe122f91
 DIST suhosin-patch-5.3.7-0.9.10.patch.gz 41175 RMD160 19f789bf49a5fed2cd88b199fd8ac5d1ffa9bdc8 SHA1 3c38e873584b8f9e325a813cc9b197a342595099 SHA256 0a0dac0e4343596f2bfcef27dcf7180524b78bb1d2d2ca878370a7d0f8313d26
-EBUILD php-5.2.17.ebuild 11394 RMD160 65f1b169b64c96cbb8c20fe68b5eb7764ae938a7 SHA1 643825308163b7aa86f8dfd36c14e85424e1c001 SHA256 a98528b76f0babcda8c2d3e7e0ec604b4312305c416c441c4fa0873133b2cb17
-EBUILD php-5.3.8.ebuild 11639 RMD160 fc5bd64a7fce23c8d81394df537745bd0da52f95 SHA1 1061d87837a47e58c547d82879ccd0cab4c0b9d1 SHA256 d00245d3ef7bc88946c30e4a3f66d3fa7c0058dfe9133f645e4d0f543af8796b
-EBUILD php-5.3.9_rc1.ebuild 11661 RMD160 402de47bdec0ea824f6c6a76be16ad19fac83808 SHA1 2fe55ef34c604bedb91b410603a2e25711784701 SHA256 e0c0cd8ab24538c783b5f2d293fee74f1a5f360d3883c0befc9e00e2dfc61b5f
-EBUILD php-5.3.9_rc2.ebuild 11661 RMD160 c60fe840dc0d1f46fefbda93aba565e54937ada3 SHA1 9867084bd34f936442d8d2c80a2c1a33dc687edf SHA256 783e383b26d685f78990d6dbf810bc7d67c70b0a5f647e2713adf370a623a96c
-EBUILD php-5.4.0_rc3.ebuild 10620 RMD160 2e01f78f011ec2d3abb5931d8c1e387b105b32d3 SHA1 4527f30975ec9bfe2218e21086bc9ef257824179 SHA256 239cbeb214361901302f1f74e044e7146d125e0a2a2ebce5b9881d43e641950d
-MISC ChangeLog 90110 RMD160 d0d4fbdf351255120ee4c437693f0e9d6003d6dd SHA1 ecc33107aa154d29f78d9e2c02430994ed7735c4 SHA256 c6b82ed7800b21a29fc5d81979cf20259291502081445b9e3b758b9b7607c7b3
+EBUILD php-5.2.17.ebuild 11388 RMD160 13e05493c05d46ff503788226ddfc57c94066cbe SHA1 36fbc0193ba05f1600c6509aeb61739c1fbf1222 SHA256 90dad7f95742df4ac3f45c50ba059851b0c1e7b52fc550744290b005bfe3abc0
+EBUILD php-5.3.8.ebuild 11627 RMD160 ba0e75c495295b27c725db1bc1a3e3a7ff9c628f SHA1 5b79321fe0b37ef88b70bb971a8b74f2d4b0c85e SHA256 6ce6b8947720c94fe2b2883c38844bea3ad1dfc93026bda92ff275383c0bced3
+EBUILD php-5.3.9_rc1.ebuild 11649 RMD160 97f3550b242af2e4c53f54b06960467d5e813922 SHA1 654f0c7259e90cf0e041367af9b84aaa6b858acf SHA256 7c6bd39881d6b846aa2e5eb0b50a1d174d7aba1c4eb60a0660408f2f24160658
+EBUILD php-5.3.9_rc2.ebuild 11649 RMD160 56a12297d94a7482790e8e7ae0f3c4e3e1f8c421 SHA1 b0e12600d9ce4ce8714fd1199fc673f3133a10bc SHA256 05551ed04efcd6ea761fdfe4810e11dc581dae3c29ebba446ca55ca90cd92e62
+EBUILD php-5.4.0_rc3.ebuild 10608 RMD160 c936918e92ef4d67be70164d79aa06d5a44a7b38 SHA1 9431298824ec3ea28527c990ee7d94b6d21d5813 SHA256 9cd25543d48b7d64a5559a88225c48c2170ad70da0aa14d3cf7fbf400fca0cbe
+MISC ChangeLog 90315 RMD160 60394a0cb3081b9210cdd253737a5b531c9173d4 SHA1 6bd8c6dcb7206929bce6776f61c56ddae89bd0f0 SHA256 923496976f57a877500916f4e867e66d2d81e50856554e127bb25998f26c2e11
 MISC metadata.xml 2075 RMD160 e2eb44e39169dc2ff8e099d670a222e7102b1aea SHA1 9cebbc373dc8441aa0374132a3b5d87df6d37ffc SHA256 3d8bc9305be300ef7ef92d18ba5476927ec90a5b6d43c2408936229590ff5ac5
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQEcBAEBAgAGBQJO4m1eAAoJEGurSuXEqSv1px0H/1fBFQoEZ6GCc1WJrDSlKsyH
-88vJOnIDQqDek4FkaGtKIc0a/z3AuukcX+ubUhl84gX6f+NM1u1ohzZda9vYJ9R0
-CGdm66sGOlh9k7Y0uxiJGnNWmGAp79IltsMg5JjOTi315B3onlyFhzUZFlHlwK/l
-E5ccdIMsIpHtdvJ1+E/anzdRCrA8fI2pH+NY9kCdJPRQ6KcOqr5hky6DUaqxxkUH
-o8NKfT4Kn9eZRr3KgIOA7X0LGRIuriwENI52600fD5tk/w1KwzJ5i48yhPLeyX2I
-YzsDDNIOQxkXsh+nn3bRLkYy8pglhfGKgTC+BJHbqI8UBYF5opUKkgq0Q9qnxAg=
-=ScHq
------END PGP SIGNATURE-----
diff --git a/dev-lang/php/php-5.2.17.ebuild b/dev-lang/php/php-5.2.17.ebuild
index f94ccdc1ddc3..58fc056a8edc 100644
--- a/dev-lang/php/php-5.2.17.ebuild
+++ b/dev-lang/php/php-5.2.17.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.17.ebuild,v 1.16 2011/12/09 20:19:24 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.17.ebuild,v 1.17 2011/12/14 22:48:49 mabi Exp $
 
 EAPI=2
 
@@ -383,7 +383,7 @@ pkg_postinst() {
 	if ( [[ -z SUHOSIN_VERSION ]] && use suhosin && version_is_at_least 5.3.6_rc1 ) ; then
 		ewarn "The suhosin USE flag now only installs the suhosin patch!"
 		ewarn "If you want the suhosin extension, make sure you install"
-		ewarn " dev-php5/suhosin"
+		ewarn " dev-php/suhosin"
 		ewarn
 	fi
 }
diff --git a/dev-lang/php/php-5.3.8.ebuild b/dev-lang/php/php-5.3.8.ebuild
index 159630d3fecc..15cdb1c503cd 100644
--- a/dev-lang/php/php-5.3.8.ebuild
+++ b/dev-lang/php/php-5.3.8.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.8.ebuild,v 1.11 2011/12/09 20:19:24 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.8.ebuild,v 1.12 2011/12/14 22:48:49 mabi Exp $
 
 EAPI=4
 
@@ -247,12 +247,12 @@ REQUIRED_USE="
 	!cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
 
 DEPEND="${DEPEND}
-	enchant? ( !dev-php5/pecl-enchant )
-	fileinfo? ( !<dev-php5/pecl-fileinfo-1.0.4-r2 )
-	filter? ( !dev-php5/pecl-filter )
-	json? ( !dev-php5/pecl-json )
-	phar? ( !dev-php5/pecl-phar )
-	zip? ( !dev-php5/pecl-zip )"
+	enchant? ( !dev-php/pecl-enchant )
+	fileinfo? ( !<dev-php/pecl-fileinfo-1.0.4-r2 )
+	filter? ( !dev-php/pecl-filter )
+	json? ( !dev-php/pecl-json )
+	phar? ( !dev-php/pecl-phar )
+	zip? ( !dev-php/pecl-zip )"
 
 [[ -n $SUHOSIN_VERSION ]] && RDEPEND="${RDEPEND} suhosin? (
 =${CATEGORY}/${PN}-${SLOT}*[unicode] )"
@@ -408,7 +408,7 @@ pkg_postinst() {
 	if ( [[ -z SUHOSIN_VERSION ]] && use suhosin && version_is_at_least 5.3.6_rc1 ) ; then
 		ewarn "The suhosin USE flag now only installs the suhosin patch!"
 		ewarn "If you want the suhosin extension, make sure you install"
-		ewarn " dev-php5/suhosin"
+		ewarn " dev-php/suhosin"
 		ewarn
 	fi
 }
diff --git a/dev-lang/php/php-5.3.9_rc1.ebuild b/dev-lang/php/php-5.3.9_rc1.ebuild
index 1e3860f3a807..a2530e1ae8c6 100644
--- a/dev-lang/php/php-5.3.9_rc1.ebuild
+++ b/dev-lang/php/php-5.3.9_rc1.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.9_rc1.ebuild,v 1.3 2011/12/09 18:23:44 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.9_rc1.ebuild,v 1.4 2011/12/14 22:48:49 mabi Exp $
 
 EAPI=4
 
@@ -247,12 +247,12 @@ REQUIRED_USE="
 	!cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
 
 DEPEND="${DEPEND}
-	enchant? ( !dev-php5/pecl-enchant )
-	fileinfo? ( !<dev-php5/pecl-fileinfo-1.0.4-r2 )
-	filter? ( !dev-php5/pecl-filter )
-	json? ( !dev-php5/pecl-json )
-	phar? ( !dev-php5/pecl-phar )
-	zip? ( !dev-php5/pecl-zip )"
+	enchant? ( !dev-php/pecl-enchant )
+	fileinfo? ( !<dev-php/pecl-fileinfo-1.0.4-r2 )
+	filter? ( !dev-php/pecl-filter )
+	json? ( !dev-php/pecl-json )
+	phar? ( !dev-php/pecl-phar )
+	zip? ( !dev-php/pecl-zip )"
 
 [[ -n $SUHOSIN_VERSION ]] && RDEPEND="${RDEPEND} suhosin? (
 =${CATEGORY}/${PN}-${SLOT}*[unicode] )"
@@ -408,7 +408,7 @@ pkg_postinst() {
 	if ( [[ -z SUHOSIN_VERSION ]] && use suhosin && version_is_at_least 5.3.6_rc1 ) ; then
 		ewarn "The suhosin USE flag now only installs the suhosin patch!"
 		ewarn "If you want the suhosin extension, make sure you install"
-		ewarn " dev-php5/suhosin"
+		ewarn " dev-php/suhosin"
 		ewarn
 	fi
 }
diff --git a/dev-lang/php/php-5.3.9_rc2.ebuild b/dev-lang/php/php-5.3.9_rc2.ebuild
index 7c1777036345..dd7ff88c664f 100644
--- a/dev-lang/php/php-5.3.9_rc2.ebuild
+++ b/dev-lang/php/php-5.3.9_rc2.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.9_rc2.ebuild,v 1.2 2011/12/09 18:23:44 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.9_rc2.ebuild,v 1.3 2011/12/14 22:48:49 mabi Exp $
 
 EAPI=4
 
@@ -247,12 +247,12 @@ REQUIRED_USE="
 	!cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
 
 DEPEND="${DEPEND}
-	enchant? ( !dev-php5/pecl-enchant )
-	fileinfo? ( !<dev-php5/pecl-fileinfo-1.0.4-r2 )
-	filter? ( !dev-php5/pecl-filter )
-	json? ( !dev-php5/pecl-json )
-	phar? ( !dev-php5/pecl-phar )
-	zip? ( !dev-php5/pecl-zip )"
+	enchant? ( !dev-php/pecl-enchant )
+	fileinfo? ( !<dev-php/pecl-fileinfo-1.0.4-r2 )
+	filter? ( !dev-php/pecl-filter )
+	json? ( !dev-php/pecl-json )
+	phar? ( !dev-php/pecl-phar )
+	zip? ( !dev-php/pecl-zip )"
 
 [[ -n $SUHOSIN_VERSION ]] && RDEPEND="${RDEPEND} suhosin? (
 =${CATEGORY}/${PN}-${SLOT}*[unicode] )"
@@ -408,7 +408,7 @@ pkg_postinst() {
 	if ( [[ -z SUHOSIN_VERSION ]] && use suhosin && version_is_at_least 5.3.6_rc1 ) ; then
 		ewarn "The suhosin USE flag now only installs the suhosin patch!"
 		ewarn "If you want the suhosin extension, make sure you install"
-		ewarn " dev-php5/suhosin"
+		ewarn " dev-php/suhosin"
 		ewarn
 	fi
 }
diff --git a/dev-lang/php/php-5.4.0_rc3.ebuild b/dev-lang/php/php-5.4.0_rc3.ebuild
index fce8dd393735..90134440e661 100644
--- a/dev-lang/php/php-5.4.0_rc3.ebuild
+++ b/dev-lang/php/php-5.4.0_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.4.0_rc3.ebuild,v 1.2 2011/12/09 20:19:24 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.0_rc3.ebuild,v 1.3 2011/12/14 22:48:49 mabi Exp $
 
 EAPI=4
 
@@ -225,12 +225,12 @@ REQUIRED_USE="
 	!cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
 
 DEPEND="${DEPEND}
-	enchant? ( !dev-php5/pecl-enchant )
-	fileinfo? ( !<dev-php5/pecl-fileinfo-1.0.4-r2 )
-	filter? ( !dev-php5/pecl-filter )
-	json? ( !dev-php5/pecl-json )
-	phar? ( !dev-php5/pecl-phar )
-	zip? ( !dev-php5/pecl-zip )"
+	enchant? ( !dev-php/pecl-enchant )
+	fileinfo? ( !<dev-php/pecl-fileinfo-1.0.4-r2 )
+	filter? ( !dev-php/pecl-filter )
+	json? ( !dev-php/pecl-json )
+	phar? ( !dev-php/pecl-phar )
+	zip? ( !dev-php/pecl-zip )"
 
 [[ -n $SUHOSIN_VERSION ]] && RDEPEND="${RDEPEND} suhosin? (
 =${CATEGORY}/${PN}-${SLOT}*[unicode] )"
@@ -384,7 +384,7 @@ pkg_postinst() {
 	if ( [[ -z SUHOSIN_VERSION ]] && use suhosin && version_is_at_least 5.3.6_rc1 ) ; then
 		ewarn "The suhosin USE flag now only installs the suhosin patch!"
 		ewarn "If you want the suhosin extension, make sure you install"
-		ewarn " dev-php5/suhosin"
+		ewarn " dev-php/suhosin"
 		ewarn
 	fi
 }