9 files changed, 36 insertions, 70 deletions
diff --git a/dev-php/ezc-Database/ChangeLog b/dev-php/ezc-Database/ChangeLog
index 2aa88e1054ef..d5e40bf6527b 100644
--- a/dev-php/ezc-Database/ChangeLog
+++ b/dev-php/ezc-Database/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-php5/ezc-Database
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/ezc-Database/ChangeLog,v 1.1 2011/12/14 22:05:31 mabi Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/ezc-Database/ChangeLog,v 1.2 2012/01/29 16:19:57 mabi Exp $
+
+  29 Jan 2012; Matti Bickel <mabi@gentoo.org> -ezc-Database-1.3.4.ebuild,
+  ezc-Database-1.4.7.ebuild:
+  remove unneeded depend.php reference, EAPI bump
 
 *ezc-Database-1.4.7 (20 May 2010)
 
diff --git a/dev-php/ezc-Database/ezc-Database-1.3.4.ebuild b/dev-php/ezc-Database/ezc-Database-1.3.4.ebuild
deleted file mode 100644
index 783877b755e8..000000000000
--- a/dev-php/ezc-Database/ezc-Database-1.3.4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/ezc-Database/ezc-Database-1.3.4.ebuild,v 1.1 2011/12/14 22:05:31 mabi Exp $
-
-EZC_BASE_MIN="1.4.1"
-inherit php-ezc depend.php
-
-DESCRIPTION="This eZ component provides a lightweight database layer on top of PDO."
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~sparc ~x86"
-IUSE=""
-
-pkg_setup() {
-	require_php_with_use pdo
-}
diff --git a/dev-php/ezc-Database/ezc-Database-1.4.7.ebuild b/dev-php/ezc-Database/ezc-Database-1.4.7.ebuild
index b26004a3907f..7245bfced34a 100644
--- a/dev-php/ezc-Database/ezc-Database-1.4.7.ebuild
+++ b/dev-php/ezc-Database/ezc-Database-1.4.7.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/ezc-Database/ezc-Database-1.4.7.ebuild,v 1.1 2011/12/14 22:05:31 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/ezc-Database/ezc-Database-1.4.7.ebuild,v 1.2 2012/01/29 16:19:57 mabi Exp $
+
+EAPI=4
 
 EZC_BASE_MIN="1.8"
-inherit php-ezc depend.php
+inherit php-ezc
 
 DESCRIPTION="This eZ component provides a lightweight database layer on top of PDO."
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~sparc ~x86"
 IUSE=""
 
-pkg_setup() {
-	require_php_with_use pdo
-}
+RDEPEND="dev-lang/php[pdo]"
diff --git a/dev-php/ezc-Translation/ChangeLog b/dev-php/ezc-Translation/ChangeLog
index 471a7468094c..d222c716d6d0 100644
--- a/dev-php/ezc-Translation/ChangeLog
+++ b/dev-php/ezc-Translation/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-php5/ezc-Translation
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/ezc-Translation/ChangeLog,v 1.1 2011/12/14 22:22:20 mabi Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/ezc-Translation/ChangeLog,v 1.2 2012/01/29 16:21:39 mabi Exp $
+
+  29 Jan 2012; Matti Bickel <mabi@gentoo.org> -ezc-Translation-1.1.6.ebuild,
+  ezc-Translation-1.3.2.ebuild:
+  remove unneeded depend.php reference, EAPI bump
 
 *ezc-Translation-1.3.2 (20 May 2010)
 
diff --git a/dev-php/ezc-Translation/ezc-Translation-1.1.6.ebuild b/dev-php/ezc-Translation/ezc-Translation-1.1.6.ebuild
deleted file mode 100644
index 651800977655..000000000000
--- a/dev-php/ezc-Translation/ezc-Translation-1.1.6.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/ezc-Translation/ezc-Translation-1.1.6.ebuild,v 1.1 2011/12/14 22:22:20 mabi Exp $
-
-EZC_BASE_MIN="1.3.1"
-inherit php-ezc depend.php
-
-DESCRIPTION="This eZ component reads XML translation definitions (the Qt Linguist format)
-and presents you with a class to apply translations to strings."
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~sparc ~x86"
-IUSE=""
-
-pkg_setup() {
-	require_php_with_use xml
-}
diff --git a/dev-php/ezc-Translation/ezc-Translation-1.3.2.ebuild b/dev-php/ezc-Translation/ezc-Translation-1.3.2.ebuild
index e997ee8e4665..7c9f9c4f2242 100644
--- a/dev-php/ezc-Translation/ezc-Translation-1.3.2.ebuild
+++ b/dev-php/ezc-Translation/ezc-Translation-1.3.2.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/ezc-Translation/ezc-Translation-1.3.2.ebuild,v 1.1 2011/12/14 22:22:20 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/ezc-Translation/ezc-Translation-1.3.2.ebuild,v 1.2 2012/01/29 16:21:39 mabi Exp $
+
+EAPI=4
 
 EZC_BASE_MIN="1.8"
-inherit php-ezc depend.php
+inherit php-ezc
 
 DESCRIPTION="This eZ component presents you with a class to apply XML translations (QT) to strings"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~sparc ~x86"
 IUSE=""
 
-pkg_setup() {
-	require_php_with_use xml
-}
+RDEPEND="dev-lang/php[xml]"
diff --git a/dev-php/ezc-UserInput/ChangeLog b/dev-php/ezc-UserInput/ChangeLog
index 66240459709c..554efe5bf921 100644
--- a/dev-php/ezc-UserInput/ChangeLog
+++ b/dev-php/ezc-UserInput/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-php5/ezc-UserInput
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/ezc-UserInput/ChangeLog,v 1.1 2011/12/14 22:26:07 mabi Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/ezc-UserInput/ChangeLog,v 1.2 2012/01/29 16:25:32 mabi Exp $
+
+  29 Jan 2012; Matti Bickel <mabi@gentoo.org> -ezc-UserInput-1.2.ebuild,
+  ezc-UserInput-1.4.ebuild:
+  remove unneeded depend.php reference, EAPI bump
 
 *ezc-UserInput-1.4 (20 May 2010)
 
diff --git a/dev-php/ezc-UserInput/ezc-UserInput-1.2.ebuild b/dev-php/ezc-UserInput/ezc-UserInput-1.2.ebuild
deleted file mode 100644
index 008ef14c8e07..000000000000
--- a/dev-php/ezc-UserInput/ezc-UserInput-1.2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/ezc-UserInput/ezc-UserInput-1.2.ebuild,v 1.1 2011/12/14 22:26:07 mabi Exp $
-
-EZC_BASE_MIN="1.4"
-inherit php-ezc depend.php
-
-DESCRIPTION="This eZ component assists you to safely import user input variables into your application."
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~sparc ~x86"
-IUSE=""
-
-pkg_setup() {
-	require_php_with_use filter
-}
diff --git a/dev-php/ezc-UserInput/ezc-UserInput-1.4.ebuild b/dev-php/ezc-UserInput/ezc-UserInput-1.4.ebuild
index 7b8c7c3a55f5..76635417d75c 100644
--- a/dev-php/ezc-UserInput/ezc-UserInput-1.4.ebuild
+++ b/dev-php/ezc-UserInput/ezc-UserInput-1.4.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/ezc-UserInput/ezc-UserInput-1.4.ebuild,v 1.1 2011/12/14 22:26:07 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/ezc-UserInput/ezc-UserInput-1.4.ebuild,v 1.2 2012/01/29 16:25:32 mabi Exp $
+
+EAPI=4
 
 EZC_BASE_MIN="1.8"
-inherit php-ezc depend.php
+inherit php-ezc
 
 DESCRIPTION="This eZ component assists you to safely import user input variables into your application."
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~sparc ~x86"
 IUSE=""
 
-pkg_setup() {
-	require_php_with_use filter
-}
+RDEPEND="dev-lang/php[filter]"