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

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

8 files changed, 25 insertions, 12 deletions

diff --git a/dev-php/dbunit/ChangeLog b/dev-php/dbunit/ChangeLog
index e16a5d88fa4d..beddb8f5f46d 100644
--- a/dev-php/dbunit/ChangeLog
+++ b/dev-php/dbunit/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-php/dbunit
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/dbunit/ChangeLog,v 1.6 2011/06/28 07:28:03 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/dbunit/ChangeLog,v 1.7 2011/12/14 22:51:00 mabi Exp $
+
+  14 Dec 2011; Matti Bickel <mabi@gentoo.org> dbunit-1.0.1.ebuild:
+  Merging categories dev-php5 and dev-php (bug #324665)
 
   28 Jun 2011; Ole Markus With <olemarkus@gentoo.org> dbunit-1.0.1.ebuild:
   Added missing PHP_PEAR_URI
diff --git a/dev-php/dbunit/dbunit-1.0.1.ebuild b/dev-php/dbunit/dbunit-1.0.1.ebuild
index 5c401db69fd8..7f70f77530fe 100644
--- a/dev-php/dbunit/dbunit-1.0.1.ebuild
+++ b/dev-php/dbunit/dbunit-1.0.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/dbunit/dbunit-1.0.1.ebuild,v 1.9 2011/09/18 10:53:55 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/dbunit/dbunit-1.0.1.ebuild,v 1.10 2011/12/14 22:51:00 mabi Exp $
 
 EAPI="3"
 PHP_PEAR_CHANNEL="${FILESDIR}/channel.xml"
@@ -17,7 +17,7 @@ HOMEPAGE="http://www.phpunit.de"
 
 RDEPEND="${RDEPEND}
 	!!<dev-php/phpunit-3.5
-	>=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-tokenstream/ChangeLog b/dev-php/php-tokenstream/ChangeLog
index 0bc298030969..72babcc0515a 100644
--- a/dev-php/php-tokenstream/ChangeLog
+++ b/dev-php/php-tokenstream/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-php/php-tokenstream
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php-tokenstream/ChangeLog,v 1.8 2011/11/12 17:23:39 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php-tokenstream/ChangeLog,v 1.9 2011/12/14 22:50:25 mabi Exp $
+
+  14 Dec 2011; Matti Bickel <mabi@gentoo.org> php-tokenstream-1.0.1.ebuild,
+  php-tokenstream-1.1.0.ebuild:
+  Merging categories dev-php5 and dev-php (bug #324665)
 
   12 Nov 2011; Ole Markus With <olemarkus@gentoo.org>
   php-tokenstream-1.1.0.ebuild:
diff --git a/dev-php/php-tokenstream/php-tokenstream-1.0.1.ebuild b/dev-php/php-tokenstream/php-tokenstream-1.0.1.ebuild
index 40689f0a6605..98cc3fdc9d5f 100644
--- a/dev-php/php-tokenstream/php-tokenstream-1.0.1.ebuild
+++ b/dev-php/php-tokenstream/php-tokenstream-1.0.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/php-tokenstream/php-tokenstream-1.0.1.ebuild,v 1.5 2011/06/28 07:34:43 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php-tokenstream/php-tokenstream-1.0.1.ebuild,v 1.6 2011/12/14 22:50:25 mabi Exp $
 
 PHP_PEAR_CHANNEL="${FILESDIR}/channel.xml"
 PHP_PEAR_URI="pear.phpunit.de"
@@ -13,5 +13,5 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 RDEPEND="${RDEPEND}
-	>=dev-php5/ezc-ConsoleTools-1.6"
+	>=dev-php/ezc-ConsoleTools-1.6"
 HOMEPAGE="http://pear.phpunit.de"
diff --git a/dev-php/phpcpd/ChangeLog b/dev-php/phpcpd/ChangeLog
index 77758a6ad629..a585f9a03d94 100644
--- a/dev-php/phpcpd/ChangeLog
+++ b/dev-php/phpcpd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-php/phpcpd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/phpcpd/ChangeLog,v 1.2 2011/07/21 11:36:14 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/phpcpd/ChangeLog,v 1.3 2011/12/14 22:51:50 mabi Exp $
+
+  14 Dec 2011; Matti Bickel <mabi@gentoo.org> phpcpd-1.3.2.ebuild:
+  Merging categories dev-php5 and dev-php (bug #324665)
 
   21 Jul 2011; <olemarkus@gentoo.org> phpcpd-1.3.2.ebuild:
   Fixed a dependency issue (bug 375839)
diff --git a/dev-php/phpcpd/phpcpd-1.3.2.ebuild b/dev-php/phpcpd/phpcpd-1.3.2.ebuild
index 7c76dcc63b00..78dbd0495789 100644
--- a/dev-php/phpcpd/phpcpd-1.3.2.ebuild
+++ b/dev-php/phpcpd/phpcpd-1.3.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/phpcpd/phpcpd-1.3.2.ebuild,v 1.3 2011/07/21 11:36:14 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/phpcpd/phpcpd-1.3.2.ebuild,v 1.4 2011/12/14 22:51:50 mabi Exp $
 
 EAPI="3"
 PHP_PEAR_CHANNEL="${FILESDIR}/channel.xml"
@@ -15,6 +15,6 @@ IUSE=""
 HOMEPAGE="http://www.phpunit.de"
 
 RDEPEND="${RDEPEND}
-	>=dev-php5/ezc-ConsoleTools-1.6
+	>=dev-php/ezc-ConsoleTools-1.6
 	>=dev-php/file-iterator-1.1.0
 	dev-php/php-timer"
diff --git a/dev-php/phploc/ChangeLog b/dev-php/phploc/ChangeLog
index 3ca981449a9c..e209db19b9a7 100644
--- a/dev-php/phploc/ChangeLog
+++ b/dev-php/phploc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-php/phploc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/phploc/ChangeLog,v 1.1 2011/03/25 13:53:02 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/phploc/ChangeLog,v 1.2 2011/12/14 22:51:26 mabi Exp $
+
+  14 Dec 2011; Matti Bickel <mabi@gentoo.org> phploc-1.6.1.ebuild:
+  Merging categories dev-php5 and dev-php (bug #324665)
 
 *phploc-1.6.1 (25 Mar 2011)
 
diff --git a/dev-php/phploc/phploc-1.6.1.ebuild b/dev-php/phploc/phploc-1.6.1.ebuild
index a925ef98a2f0..88f9cd6dbee7 100644
--- a/dev-php/phploc/phploc-1.6.1.ebuild
+++ b/dev-php/phploc/phploc-1.6.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/phploc/phploc-1.6.1.ebuild,v 1.2 2011/04/16 12:48:09 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/phploc/phploc-1.6.1.ebuild,v 1.3 2011/12/14 22:51:26 mabi Exp $
 
 EAPI="3"
 PHP_PEAR_CHANNEL="${FILESDIR}/channel.xml"
@@ -16,4 +16,4 @@ HOMEPAGE="http://www.phpunit.de"
 
 RDEPEND="${RDEPEND}
 	>=dev-php/file-iterator-1.1.0
-	>=dev-php5/ezc-ConsoleTools-1.6.0"
+	>=dev-php/ezc-ConsoleTools-1.6.0"