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

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

8 files changed, 22 insertions, 14 deletions

diff --git a/dev-php/php-codecoverage/ChangeLog b/dev-php/php-codecoverage/ChangeLog
index c54c99ac6957..5b2fbe734721 100644
--- a/dev-php/php-codecoverage/ChangeLog
+++ b/dev-php/php-codecoverage/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-php/php-codecoverage
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php-codecoverage/ChangeLog,v 1.6 2011/11/24 15:25:18 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php-codecoverage/ChangeLog,v 1.7 2011/12/14 22:58:36 mabi Exp $
+
+  14 Dec 2011; Matti Bickel <mabi@gentoo.org> php-codecoverage-1.0.0.ebuild,
+  php-codecoverage-1.0.4.ebuild, php-codecoverage-1.1.0.ebuild:
+  Merging categories dev-php5 and dev-php (bug #324665)
 
   24 Nov 2011; Ole Markus With <olemarkus@gentoo.org>
   php-codecoverage-1.1.0.ebuild:
diff --git a/dev-php/php-codecoverage/php-codecoverage-1.0.0.ebuild b/dev-php/php-codecoverage/php-codecoverage-1.0.0.ebuild
index 66ba88d634c0..d006aa7bf5ed 100644
--- a/dev-php/php-codecoverage/php-codecoverage-1.0.0.ebuild
+++ b/dev-php/php-codecoverage/php-codecoverage-1.0.0.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-php/php-codecoverage/php-codecoverage-1.0.0.ebuild,v 1.4 2011/09/18 10:55:36 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php-codecoverage/php-codecoverage-1.0.0.ebuild,v 1.5 2011/12/14 22:58:36 mabi Exp $
 
 inherit php-pear-r1 depend.php eutils
 
@@ -12,7 +12,7 @@ IUSE=""
 SRC_URI="http://pear.phpunit.de/get/PHP_CodeCoverage-${PV}.tgz"
 
 RDEPEND="${RDEPEND}
-	>=dev-php5/ezc-ConsoleTools-1.6
+	>=dev-php/ezc-ConsoleTools-1.6
 	>=dev-php/file-iterator-1.2.2
 	dev-php/php-tokenstream
 	dev-php/php-texttemplate
diff --git a/dev-php/php-codecoverage/php-codecoverage-1.0.4.ebuild b/dev-php/php-codecoverage/php-codecoverage-1.0.4.ebuild
index 003646db6665..49e3d9bd5209 100644
--- a/dev-php/php-codecoverage/php-codecoverage-1.0.4.ebuild
+++ b/dev-php/php-codecoverage/php-codecoverage-1.0.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-php/php-codecoverage/php-codecoverage-1.0.4.ebuild,v 1.7 2011/09/18 10:55:36 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php-codecoverage/php-codecoverage-1.0.4.ebuild,v 1.8 2011/12/14 22:58:36 mabi Exp $
 
 PHP_PEAR_CHANNEL="${FILESDIR}/channel.xml"
 PHP_PEAR_PN="PHP_CodeCoverage"
@@ -14,7 +14,7 @@ IUSE=""
 HOMEPAGE="http://pear.phpunit.de"
 
 RDEPEND="${RDEPEND}
-	>=dev-php5/ezc-ConsoleTools-1.6
+	>=dev-php/ezc-ConsoleTools-1.6
 	>=dev-php/file-iterator-1.2.2
 	dev-php/php-tokenstream
 	dev-php/php-texttemplate
diff --git a/dev-php/php-codecoverage/php-codecoverage-1.1.0.ebuild b/dev-php/php-codecoverage/php-codecoverage-1.1.0.ebuild
index 0084fba45952..6a76381667e9 100644
--- a/dev-php/php-codecoverage/php-codecoverage-1.1.0.ebuild
+++ b/dev-php/php-codecoverage/php-codecoverage-1.1.0.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-php/php-codecoverage/php-codecoverage-1.1.0.ebuild,v 1.2 2011/11/24 15:25:18 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php-codecoverage/php-codecoverage-1.1.0.ebuild,v 1.3 2011/12/14 22:58:36 mabi Exp $
 
 PHP_PEAR_CHANNEL="${FILESDIR}/channel.xml"
 PHP_PEAR_URI="pear.phpunit.de"
@@ -15,7 +15,7 @@ IUSE=""
 HOMEPAGE="http://pear.phpunit.de"
 
 RDEPEND="${RDEPEND}
-	>=dev-php5/ezc-ConsoleTools-1.6
+	>=dev-php/ezc-ConsoleTools-1.6
 	>=dev-php/file-iterator-1.3.0
 	>=dev-php/php-tokenstream-1.1.0
 	>=dev-php/php-texttemplate-1.1.1"
diff --git a/dev-php/xdebug/ChangeLog b/dev-php/xdebug/ChangeLog
index 77853cc41c3b..ec5d0449f9dd 100644
--- a/dev-php/xdebug/ChangeLog
+++ b/dev-php/xdebug/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-php/xdebug
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/xdebug/ChangeLog,v 1.30 2011/07/29 14:17:09 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/xdebug/ChangeLog,v 1.31 2011/12/14 22:57:57 mabi Exp $
+
+  14 Dec 2011; Matti Bickel <mabi@gentoo.org> xdebug-2.1.0-r1.ebuild,
+  xdebug-2.1.1.ebuild, xdebug-2.1.2.ebuild:
+  Merging categories dev-php5 and dev-php (bug #324665)
 
 *xdebug-2.1.2 (29 Jul 2011)
 
diff --git a/dev-php/xdebug/xdebug-2.1.0-r1.ebuild b/dev-php/xdebug/xdebug-2.1.0-r1.ebuild
index f472b57a5ad9..84b81cb94122 100644
--- a/dev-php/xdebug/xdebug-2.1.0-r1.ebuild
+++ b/dev-php/xdebug/xdebug-2.1.0-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-php/xdebug/xdebug-2.1.0-r1.ebuild,v 1.1 2011/03/03 18:17:09 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/xdebug/xdebug-2.1.0-r1.ebuild,v 1.2 2011/12/14 22:57:57 mabi Exp $
 
 PHP_EXT_NAME="xdebug"
 PHP_EXT_INI="yes"
@@ -23,7 +23,7 @@ IUSE=""
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
-DEPEND="!dev-php5/ZendOptimizer"
+DEPEND="!dev-php/ZendOptimizer"
 RDEPEND="${DEPEND}
 		~dev-php/xdebug-client-${PV}"
 
diff --git a/dev-php/xdebug/xdebug-2.1.1.ebuild b/dev-php/xdebug/xdebug-2.1.1.ebuild
index 7e564de25c74..ad963a02d3d9 100644
--- a/dev-php/xdebug/xdebug-2.1.1.ebuild
+++ b/dev-php/xdebug/xdebug-2.1.1.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-php/xdebug/xdebug-2.1.1.ebuild,v 1.1 2011/03/28 17:04:57 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/xdebug/xdebug-2.1.1.ebuild,v 1.2 2011/12/14 22:57:57 mabi Exp $
 
 PHP_EXT_NAME="xdebug"
 PHP_EXT_INI="yes"
@@ -23,7 +23,7 @@ IUSE=""
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
-DEPEND="!dev-php5/ZendOptimizer"
+DEPEND="!dev-php/ZendOptimizer"
 RDEPEND="${DEPEND}
 		~dev-php/xdebug-client-${PV}"
 
diff --git a/dev-php/xdebug/xdebug-2.1.2.ebuild b/dev-php/xdebug/xdebug-2.1.2.ebuild
index 4d8c1567aab5..49c872274539 100644
--- a/dev-php/xdebug/xdebug-2.1.2.ebuild
+++ b/dev-php/xdebug/xdebug-2.1.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-php/xdebug/xdebug-2.1.2.ebuild,v 1.1 2011/07/29 14:17:09 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/xdebug/xdebug-2.1.2.ebuild,v 1.2 2011/12/14 22:57:57 mabi Exp $
 
 PHP_EXT_NAME="xdebug"
 PHP_EXT_INI="yes"
@@ -23,7 +23,7 @@ IUSE=""
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
-DEPEND="!dev-php5/ZendOptimizer"
+DEPEND="!dev-php/ZendOptimizer"
 RDEPEND="${DEPEND}
 		~dev-php/xdebug-client-${PV}"