cleanup, version bump, eapi bump

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

27 files changed, 126 insertions, 320 deletions

diff --git a/dev-php/PEAR-MDB2/ChangeLog b/dev-php/PEAR-MDB2/ChangeLog
index 0835c5be4593..0d0ddac84adf 100644
--- a/dev-php/PEAR-MDB2/ChangeLog
+++ b/dev-php/PEAR-MDB2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-php/PEAR-MDB2
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-MDB2/ChangeLog,v 1.33 2009/08/26 21:07:51 beandog Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-MDB2/ChangeLog,v 1.34 2010/09/11 14:26:17 mabi Exp $
+
+*PEAR-MDB2-2.5.0_beta3 (11 Sep 2010)
+
+  11 Sep 2010; Matti Bickel <mabi@gentoo.org>
+  -PEAR-MDB2-2.5.0_alpha1.ebuild, -PEAR-MDB2-2.5.0_beta1.ebuild,
+  -PEAR-MDB2-2.5.0_beta2.ebuild, +PEAR-MDB2-2.5.0_beta3.ebuild:
+  cleanup, version bump, eapi bump
 
 *PEAR-MDB2-2.5.0_beta2 (26 Aug 2009)
 
diff --git a/dev-php/PEAR-MDB2/PEAR-MDB2-2.5.0_alpha1.ebuild b/dev-php/PEAR-MDB2/PEAR-MDB2-2.5.0_alpha1.ebuild
deleted file mode 100644
index 02a083cd234c..000000000000
--- a/dev-php/PEAR-MDB2/PEAR-MDB2-2.5.0_alpha1.ebuild
+++ /dev/null
@@ -1,19 +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/PEAR-MDB2/PEAR-MDB2-2.5.0_alpha1.ebuild,v 1.7 2008/01/10 10:06:19 vapier Exp $
-
-inherit php-pear-r1
-
-DESCRIPTION="Database Abstraction Layer"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
-IUSE="mssql mysql mysqli oci8 oci8-instant-client postgres sqlite"
-
-PDEPEND="mssql? ( >=dev-php/PEAR-MDB2_Driver_mssql-1.3.0_alpha1 )
-		mysql? ( >=dev-php/PEAR-MDB2_Driver_mysql-1.5.0_alpha1 )
-		mysqli? ( >=dev-php/PEAR-MDB2_Driver_mysqli-1.5.0_alpha1 )
-		oci8? ( >=dev-php/PEAR-MDB2_Driver_oci8-1.5.0_alpha1 )
-		oci8-instant-client? ( >=dev-php/PEAR-MDB2_Driver_oci8-1.5.0_alpha1 )
-		postgres? ( >=dev-php/PEAR-MDB2_Driver_pgsql-1.5.0_alpha1 )
-		sqlite? ( >=dev-php/PEAR-MDB2_Driver_sqlite-1.5.0_alpha1 )"
diff --git a/dev-php/PEAR-MDB2/PEAR-MDB2-2.5.0_beta1.ebuild b/dev-php/PEAR-MDB2/PEAR-MDB2-2.5.0_beta1.ebuild
deleted file mode 100644
index 81653cfb269e..000000000000
--- a/dev-php/PEAR-MDB2/PEAR-MDB2-2.5.0_beta1.ebuild
+++ /dev/null
@@ -1,20 +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/PEAR-MDB2/PEAR-MDB2-2.5.0_beta1.ebuild,v 1.1 2008/03/17 12:51:13 jokey Exp $
-
-inherit php-pear-r1
-
-DESCRIPTION="Database Abstraction Layer"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="firebird mssql mysql mysqli oci8 oci8-instant-client postgres sqlite"
-
-PDEPEND="firebird? ( >=dev-php/PEAR-MDB2_Driver_ibase-1.5.0_beta1 )
-		mssql? ( >=dev-php/PEAR-MDB2_Driver_mssql-1.3.0_beta1 )
-		mysql? ( >=dev-php/PEAR-MDB2_Driver_mysql-1.5.0_beta1 )
-		mysqli? ( >=dev-php/PEAR-MDB2_Driver_mysqli-1.5.0_beta1 )
-		oci8? ( >=dev-php/PEAR-MDB2_Driver_oci8-1.5.0_beta1 )
-		oci8-instant-client? ( >=dev-php/PEAR-MDB2_Driver_oci8-1.5.0_beta1 )
-		postgres? ( >=dev-php/PEAR-MDB2_Driver_pgsql-1.5.0_beta1 )
-		sqlite? ( >=dev-php/PEAR-MDB2_Driver_sqlite-1.5.0_beta1 )"
diff --git a/dev-php/PEAR-MDB2/PEAR-MDB2-2.5.0_beta2.ebuild b/dev-php/PEAR-MDB2/PEAR-MDB2-2.5.0_beta3.ebuild
index 596fe331efd7..a2869f38b4a8 100644
--- a/dev-php/PEAR-MDB2/PEAR-MDB2-2.5.0_beta2.ebuild
+++ b/dev-php/PEAR-MDB2/PEAR-MDB2-2.5.0_beta3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-MDB2/PEAR-MDB2-2.5.0_beta2.ebuild,v 1.1 2009/08/26 21:07:51 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-MDB2/PEAR-MDB2-2.5.0_beta3.ebuild,v 1.1 2010/09/11 14:26:17 mabi Exp $
 
 inherit php-pear-r1
 
@@ -10,11 +10,11 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="firebird mssql mysql mysqli oci8 oci8-instant-client postgres sqlite"
 
-PDEPEND="firebird? ( >=dev-php/PEAR-MDB2_Driver_ibase-1.5.0_beta2 )
-	mssql? ( >=dev-php/PEAR-MDB2_Driver_mssql-1.3.0_beta2 )
-	mysql? ( >=dev-php/PEAR-MDB2_Driver_mysql-1.5.0_beta2 )
-	mysqli? ( >=dev-php/PEAR-MDB2_Driver_mysqli-1.5.0_beta2 )
-	oci8? ( >=dev-php/PEAR-MDB2_Driver_oci8-1.5.0_beta2 )
-	oci8-instant-client? ( >=dev-php/PEAR-MDB2_Driver_oci8-1.5.0_beta2 )
-	postgres? ( >=dev-php/PEAR-MDB2_Driver_pgsql-1.5.0_beta2 )
-	sqlite? ( >=dev-php/PEAR-MDB2_Driver_sqlite-1.5.0_beta2 )"
+PDEPEND="firebird? ( >=dev-php/PEAR-MDB2_Driver_ibase-1.5.0_beta3 )
+	mssql? ( >=dev-php/PEAR-MDB2_Driver_mssql-1.3.0_beta3 )
+	mysql? ( >=dev-php/PEAR-MDB2_Driver_mysql-1.5.0_beta3 )
+	mysqli? ( >=dev-php/PEAR-MDB2_Driver_mysqli-1.5.0_beta3 )
+	oci8? ( >=dev-php/PEAR-MDB2_Driver_oci8-1.5.0_beta3 )
+	oci8-instant-client? ( >=dev-php/PEAR-MDB2_Driver_oci8-1.5.0_beta3 )
+	postgres? ( >=dev-php/PEAR-MDB2_Driver_pgsql-1.5.0_beta3 )
+	sqlite? ( >=dev-php/PEAR-MDB2_Driver_sqlite-1.5.0_beta3 )"
diff --git a/dev-php/PEAR-MDB2_Driver_ibase/ChangeLog b/dev-php/PEAR-MDB2_Driver_ibase/ChangeLog
index fd5617506399..a7a51d6de255 100644
--- a/dev-php/PEAR-MDB2_Driver_ibase/ChangeLog
+++ b/dev-php/PEAR-MDB2_Driver_ibase/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-php/PEAR-MDB2_Driver_ibase
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-MDB2_Driver_ibase/ChangeLog,v 1.2 2009/08/26 21:09:23 beandog Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-MDB2_Driver_ibase/ChangeLog,v 1.3 2010/09/11 14:27:07 mabi Exp $
+
+*PEAR-MDB2_Driver_ibase-1.5.0_beta3 (11 Sep 2010)
+
+  11 Sep 2010; Matti Bickel <mabi@gentoo.org>
+  -PEAR-MDB2_Driver_ibase-1.5.0_beta1.ebuild,
+  -PEAR-MDB2_Driver_ibase-1.5.0_beta2.ebuild,
+  +PEAR-MDB2_Driver_ibase-1.5.0_beta3.ebuild:
+  cleanup, version bump, eapi bump
 
 *PEAR-MDB2_Driver_ibase-1.5.0_beta2 (26 Aug 2009)
 
diff --git a/dev-php/PEAR-MDB2_Driver_ibase/PEAR-MDB2_Driver_ibase-1.5.0_beta2.ebuild b/dev-php/PEAR-MDB2_Driver_ibase/PEAR-MDB2_Driver_ibase-1.5.0_beta2.ebuild
deleted file mode 100644
index 96d6f9346f98..000000000000
--- a/dev-php/PEAR-MDB2_Driver_ibase/PEAR-MDB2_Driver_ibase-1.5.0_beta2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-MDB2_Driver_ibase/PEAR-MDB2_Driver_ibase-1.5.0_beta2.ebuild,v 1.1 2009/08/26 21:09:23 beandog Exp $
-
-inherit php-pear-r1 depend.php
-
-DESCRIPTION="Database Abstraction Layer, ibase driver"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-php/PEAR-MDB2-2.5.0_beta2"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	require_php_with_any_use firebird interbase
-}
diff --git a/dev-php/PEAR-MDB2_Driver_ibase/PEAR-MDB2_Driver_ibase-1.5.0_beta1.ebuild b/dev-php/PEAR-MDB2_Driver_ibase/PEAR-MDB2_Driver_ibase-1.5.0_beta3.ebuild
index aed83cf23ba0..3cc0cfe50c9e 100644
--- a/dev-php/PEAR-MDB2_Driver_ibase/PEAR-MDB2_Driver_ibase-1.5.0_beta1.ebuild
+++ b/dev-php/PEAR-MDB2_Driver_ibase/PEAR-MDB2_Driver_ibase-1.5.0_beta3.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-MDB2_Driver_ibase/PEAR-MDB2_Driver_ibase-1.5.0_beta1.ebuild,v 1.1 2008/03/17 12:45:53 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-MDB2_Driver_ibase/PEAR-MDB2_Driver_ibase-1.5.0_beta3.ebuild,v 1.1 2010/09/11 14:27:07 mabi Exp $
 
-inherit php-pear-r1 depend.php
+EAPI="2"
+
+inherit php-pear-r1
 
 DESCRIPTION="Database Abstraction Layer, ibase driver"
 LICENSE="BSD"
@@ -10,9 +12,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND=">=dev-php/PEAR-MDB2-2.5.0_beta1"
+DEPEND=">=dev-php/PEAR-MDB2-2.5.0_beta3
+		|| ( dev-lang/php[firebird] dev-lang/php[interbase] )"
 RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	require_php_with_any_use firebird interbase
-}
diff --git a/dev-php/PEAR-MDB2_Driver_mssql/ChangeLog b/dev-php/PEAR-MDB2_Driver_mssql/ChangeLog
index 1ee40e69e42e..a22d40f2bec3 100644
--- a/dev-php/PEAR-MDB2_Driver_mssql/ChangeLog
+++ b/dev-php/PEAR-MDB2_Driver_mssql/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-php/PEAR-MDB2_Driver_mssql
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-MDB2_Driver_mssql/ChangeLog,v 1.25 2009/08/26 21:10:31 beandog Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-MDB2_Driver_mssql/ChangeLog,v 1.26 2010/09/11 14:27:35 mabi Exp $
+
+*PEAR-MDB2_Driver_mssql-1.5.0_beta3 (11 Sep 2010)
+
+  11 Sep 2010; Matti Bickel <mabi@gentoo.org>
+  -PEAR-MDB2_Driver_mssql-1.3.0_alpha1.ebuild,
+  -PEAR-MDB2_Driver_mssql-1.3.0_beta1.ebuild,
+  -PEAR-MDB2_Driver_mssql-1.3.0_beta2.ebuild,
+  +PEAR-MDB2_Driver_mssql-1.5.0_beta3.ebuild:
+  cleanup, version bump, eapi bump
 
 *PEAR-MDB2_Driver_mssql-1.3.0_beta2 (26 Aug 2009)
 
diff --git a/dev-php/PEAR-MDB2_Driver_mssql/PEAR-MDB2_Driver_mssql-1.3.0_alpha1.ebuild b/dev-php/PEAR-MDB2_Driver_mssql/PEAR-MDB2_Driver_mssql-1.3.0_alpha1.ebuild
deleted file mode 100644
index b68985082a5f..000000000000
--- a/dev-php/PEAR-MDB2_Driver_mssql/PEAR-MDB2_Driver_mssql-1.3.0_alpha1.ebuild
+++ /dev/null
@@ -1,19 +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/PEAR-MDB2_Driver_mssql/PEAR-MDB2_Driver_mssql-1.3.0_alpha1.ebuild,v 1.9 2008/01/10 10:06:24 vapier Exp $
-
-inherit php-pear-r1 depend.php
-
-DESCRIPTION="Database Abstraction Layer, mssql driver"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-DEPEND=">=dev-php/PEAR-MDB2-2.5.0_alpha1"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	has_php
-	require_php_with_use mssql
-}
diff --git a/dev-php/PEAR-MDB2_Driver_mssql/PEAR-MDB2_Driver_mssql-1.3.0_beta2.ebuild b/dev-php/PEAR-MDB2_Driver_mssql/PEAR-MDB2_Driver_mssql-1.3.0_beta2.ebuild
deleted file mode 100644
index d7369e4c3f9d..000000000000
--- a/dev-php/PEAR-MDB2_Driver_mssql/PEAR-MDB2_Driver_mssql-1.3.0_beta2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-MDB2_Driver_mssql/PEAR-MDB2_Driver_mssql-1.3.0_beta2.ebuild,v 1.1 2009/08/26 21:10:31 beandog Exp $
-
-inherit php-pear-r1 depend.php
-
-DESCRIPTION="Database Abstraction Layer, mssql driver"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-DEPEND=">=dev-php/PEAR-MDB2-2.5.0_beta2"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	require_php_with_use mssql
-}
diff --git a/dev-php/PEAR-MDB2_Driver_mssql/PEAR-MDB2_Driver_mssql-1.3.0_beta1.ebuild b/dev-php/PEAR-MDB2_Driver_mssql/PEAR-MDB2_Driver_mssql-1.5.0_beta3.ebuild
index 6a023687164c..7729597c6cc3 100644
--- a/dev-php/PEAR-MDB2_Driver_mssql/PEAR-MDB2_Driver_mssql-1.3.0_beta1.ebuild
+++ b/dev-php/PEAR-MDB2_Driver_mssql/PEAR-MDB2_Driver_mssql-1.5.0_beta3.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-MDB2_Driver_mssql/PEAR-MDB2_Driver_mssql-1.3.0_beta1.ebuild,v 1.1 2008/03/17 12:46:14 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-MDB2_Driver_mssql/PEAR-MDB2_Driver_mssql-1.5.0_beta3.ebuild,v 1.1 2010/09/11 14:27:35 mabi Exp $
 
-inherit php-pear-r1 depend.php
+EAPI="2"
+
+inherit php-pear-r1
 
 DESCRIPTION="Database Abstraction Layer, mssql driver"
 LICENSE="BSD"
@@ -10,9 +12,6 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE=""
 
-DEPEND=">=dev-php/PEAR-MDB2-2.5.0_beta1"
+DEPEND=">=dev-php/PEAR-MDB2-2.5.0_beta3
+		dev-lang/php[mssql]"
 RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	require_php_with_use mssql
-}
diff --git a/dev-php/PEAR-MDB2_Driver_mysql/ChangeLog b/dev-php/PEAR-MDB2_Driver_mysql/ChangeLog
index e9d6af96619d..2ba26037f891 100644
--- a/dev-php/PEAR-MDB2_Driver_mysql/ChangeLog
+++ b/dev-php/PEAR-MDB2_Driver_mysql/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-php/PEAR-MDB2_Driver_mysql
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-MDB2_Driver_mysql/ChangeLog,v 1.30 2009/08/26 21:12:52 beandog Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-MDB2_Driver_mysql/ChangeLog,v 1.31 2010/09/11 14:28:03 mabi Exp $
+
+*PEAR-MDB2_Driver_mysql-1.5.0_beta3 (11 Sep 2010)
+
+  11 Sep 2010; Matti Bickel <mabi@gentoo.org>
+  -PEAR-MDB2_Driver_mysql-1.5.0_alpha1.ebuild,
+  -PEAR-MDB2_Driver_mysql-1.5.0_beta1.ebuild,
+  -PEAR-MDB2_Driver_mysql-1.5.0_beta2.ebuild,
+  +PEAR-MDB2_Driver_mysql-1.5.0_beta3.ebuild:
+  cleanup, version bump, eapi bump
 
 *PEAR-MDB2_Driver_mysql-1.5.0_beta2 (26 Aug 2009)
 
diff --git a/dev-php/PEAR-MDB2_Driver_mysql/PEAR-MDB2_Driver_mysql-1.5.0_alpha1.ebuild b/dev-php/PEAR-MDB2_Driver_mysql/PEAR-MDB2_Driver_mysql-1.5.0_alpha1.ebuild
deleted file mode 100644
index 23270e1bfbc1..000000000000
--- a/dev-php/PEAR-MDB2_Driver_mysql/PEAR-MDB2_Driver_mysql-1.5.0_alpha1.ebuild
+++ /dev/null
@@ -1,19 +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/PEAR-MDB2_Driver_mysql/PEAR-MDB2_Driver_mysql-1.5.0_alpha1.ebuild,v 1.9 2008/01/10 10:06:34 vapier Exp $
-
-inherit php-pear-r1 depend.php
-
-DESCRIPTION="Database Abstraction Layer, mysql driver"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-DEPEND=">=dev-php/PEAR-MDB2-2.5.0_alpha1"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	has_php
-	require_php_with_use mysql
-}
diff --git a/dev-php/PEAR-MDB2_Driver_mysql/PEAR-MDB2_Driver_mysql-1.5.0_beta2.ebuild b/dev-php/PEAR-MDB2_Driver_mysql/PEAR-MDB2_Driver_mysql-1.5.0_beta2.ebuild
deleted file mode 100644
index f81c8ce9f4ae..000000000000
--- a/dev-php/PEAR-MDB2_Driver_mysql/PEAR-MDB2_Driver_mysql-1.5.0_beta2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-MDB2_Driver_mysql/PEAR-MDB2_Driver_mysql-1.5.0_beta2.ebuild,v 1.1 2009/08/26 21:12:52 beandog Exp $
-
-inherit php-pear-r1 depend.php
-
-DESCRIPTION="Database Abstraction Layer, mysql driver"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-DEPEND=">=dev-php/PEAR-MDB2-2.5.0_beta2"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	require_php_with_use mysql
-}
diff --git a/dev-php/PEAR-MDB2_Driver_mysql/PEAR-MDB2_Driver_mysql-1.5.0_beta1.ebuild b/dev-php/PEAR-MDB2_Driver_mysql/PEAR-MDB2_Driver_mysql-1.5.0_beta3.ebuild
index 793d925f9abb..0415f4ca7c8c 100644
--- a/dev-php/PEAR-MDB2_Driver_mysql/PEAR-MDB2_Driver_mysql-1.5.0_beta1.ebuild
+++ b/dev-php/PEAR-MDB2_Driver_mysql/PEAR-MDB2_Driver_mysql-1.5.0_beta3.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-MDB2_Driver_mysql/PEAR-MDB2_Driver_mysql-1.5.0_beta1.ebuild,v 1.1 2008/03/17 12:46:37 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-MDB2_Driver_mysql/PEAR-MDB2_Driver_mysql-1.5.0_beta3.ebuild,v 1.1 2010/09/11 14:28:03 mabi Exp $
 
-inherit php-pear-r1 depend.php
+EAPI="2"
+
+inherit php-pear-r1
 
 DESCRIPTION="Database Abstraction Layer, mysql driver"
 LICENSE="BSD"
@@ -10,9 +12,6 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE=""
 
-DEPEND=">=dev-php/PEAR-MDB2-2.5.0_beta1"
+DEPEND=">=dev-php/PEAR-MDB2-2.5.0_beta3
+		dev-lang/php[mysql]"
 RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	require_php_with_use mysql
-}
diff --git a/dev-php/PEAR-MDB2_Driver_mysqli/ChangeLog b/dev-php/PEAR-MDB2_Driver_mysqli/ChangeLog
index 245a4195fac0..cdc61ada8bbf 100644
--- a/dev-php/PEAR-MDB2_Driver_mysqli/ChangeLog
+++ b/dev-php/PEAR-MDB2_Driver_mysqli/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-php/PEAR-MDB2_Driver_mysqli
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-MDB2_Driver_mysqli/ChangeLog,v 1.28 2009/08/26 21:14:02 beandog Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-MDB2_Driver_mysqli/ChangeLog,v 1.29 2010/09/11 14:28:32 mabi Exp $
+
+*PEAR-MDB2_Driver_mysqli-1.5.0_beta3 (11 Sep 2010)
+
+  11 Sep 2010; Matti Bickel <mabi@gentoo.org>
+  -PEAR-MDB2_Driver_mysqli-1.5.0_alpha1.ebuild,
+  -PEAR-MDB2_Driver_mysqli-1.5.0_beta1.ebuild,
+  -PEAR-MDB2_Driver_mysqli-1.5.0_beta2.ebuild,
+  +PEAR-MDB2_Driver_mysqli-1.5.0_beta3.ebuild:
+  cleanup, version bump, eapi bump
 
 *PEAR-MDB2_Driver_mysqli-1.5.0_beta2 (26 Aug 2009)
 
diff --git a/dev-php/PEAR-MDB2_Driver_mysqli/PEAR-MDB2_Driver_mysqli-1.5.0_alpha1.ebuild b/dev-php/PEAR-MDB2_Driver_mysqli/PEAR-MDB2_Driver_mysqli-1.5.0_alpha1.ebuild
deleted file mode 100644
index 39be16a171d9..000000000000
--- a/dev-php/PEAR-MDB2_Driver_mysqli/PEAR-MDB2_Driver_mysqli-1.5.0_alpha1.ebuild
+++ /dev/null
@@ -1,21 +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/PEAR-MDB2_Driver_mysqli/PEAR-MDB2_Driver_mysqli-1.5.0_alpha1.ebuild,v 1.9 2008/01/10 10:06:23 vapier Exp $
-
-inherit php-pear-r1 depend.php
-
-DESCRIPTION="Database Abstraction Layer, mysqli driver"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-DEPEND=">=dev-php/PEAR-MDB2-2.5.0_alpha1"
-RDEPEND="${DEPEND}"
-
-need_php5
-
-pkg_setup() {
-	has_php
-	require_php_with_use mysqli
-}
diff --git a/dev-php/PEAR-MDB2_Driver_mysqli/PEAR-MDB2_Driver_mysqli-1.5.0_beta2.ebuild b/dev-php/PEAR-MDB2_Driver_mysqli/PEAR-MDB2_Driver_mysqli-1.5.0_beta2.ebuild
deleted file mode 100644
index 3d0f6209a1d4..000000000000
--- a/dev-php/PEAR-MDB2_Driver_mysqli/PEAR-MDB2_Driver_mysqli-1.5.0_beta2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-MDB2_Driver_mysqli/PEAR-MDB2_Driver_mysqli-1.5.0_beta2.ebuild,v 1.1 2009/08/26 21:14:02 beandog Exp $
-
-inherit php-pear-r1 depend.php
-
-DESCRIPTION="Database Abstraction Layer, mysqli driver"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-DEPEND=">=dev-php/PEAR-MDB2-2.5.0_beta2"
-RDEPEND="${DEPEND}"
-
-need_php5
-
-pkg_setup() {
-	require_php_with_use mysqli
-}
diff --git a/dev-php/PEAR-MDB2_Driver_mysqli/PEAR-MDB2_Driver_mysqli-1.5.0_beta1.ebuild b/dev-php/PEAR-MDB2_Driver_mysqli/PEAR-MDB2_Driver_mysqli-1.5.0_beta3.ebuild
index 4a0591575795..2e69b92f4996 100644
--- a/dev-php/PEAR-MDB2_Driver_mysqli/PEAR-MDB2_Driver_mysqli-1.5.0_beta1.ebuild
+++ b/dev-php/PEAR-MDB2_Driver_mysqli/PEAR-MDB2_Driver_mysqli-1.5.0_beta3.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-MDB2_Driver_mysqli/PEAR-MDB2_Driver_mysqli-1.5.0_beta1.ebuild,v 1.1 2008/03/17 12:46:59 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-MDB2_Driver_mysqli/PEAR-MDB2_Driver_mysqli-1.5.0_beta3.ebuild,v 1.1 2010/09/11 14:28:32 mabi Exp $
 
-inherit php-pear-r1 depend.php
+EAPI="2"
+
+inherit php-pear-r1
 
 DESCRIPTION="Database Abstraction Layer, mysqli driver"
 LICENSE="BSD"
@@ -10,11 +12,6 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE=""
 
-DEPEND=">=dev-php/PEAR-MDB2-2.5.0_beta1"
+DEPEND=">=dev-php/PEAR-MDB2-2.5.0_beta3
+		dev-lang/php:5[mysqli]"
 RDEPEND="${DEPEND}"
-
-need_php5
-
-pkg_setup() {
-	require_php_with_use mysqli
-}
diff --git a/dev-php/PEAR-MDB2_Driver_pgsql/ChangeLog b/dev-php/PEAR-MDB2_Driver_pgsql/ChangeLog
index 909a68a30298..b4ddc5b70171 100644
--- a/dev-php/PEAR-MDB2_Driver_pgsql/ChangeLog
+++ b/dev-php/PEAR-MDB2_Driver_pgsql/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-php/PEAR-MDB2_Driver_pgsql
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-MDB2_Driver_pgsql/ChangeLog,v 1.27 2009/08/27 19:29:07 beandog Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-MDB2_Driver_pgsql/ChangeLog,v 1.28 2010/09/11 14:29:13 mabi Exp $
+
+*PEAR-MDB2_Driver_pgsql-1.5.0_beta3 (11 Sep 2010)
+
+  11 Sep 2010; Matti Bickel <mabi@gentoo.org>
+  -PEAR-MDB2_Driver_pgsql-1.5.0_alpha1.ebuild,
+  -PEAR-MDB2_Driver_pgsql-1.5.0_beta1.ebuild,
+  -PEAR-MDB2_Driver_pgsql-1.5.0_beta2.ebuild,
+  +PEAR-MDB2_Driver_pgsql-1.5.0_beta3.ebuild:
+  cleanup, version bump, eapi bump
 
 *PEAR-MDB2_Driver_pgsql-1.5.0_beta2 (27 Aug 2009)
 
diff --git a/dev-php/PEAR-MDB2_Driver_pgsql/PEAR-MDB2_Driver_pgsql-1.5.0_alpha1.ebuild b/dev-php/PEAR-MDB2_Driver_pgsql/PEAR-MDB2_Driver_pgsql-1.5.0_alpha1.ebuild
deleted file mode 100644
index b03c62faea19..000000000000
--- a/dev-php/PEAR-MDB2_Driver_pgsql/PEAR-MDB2_Driver_pgsql-1.5.0_alpha1.ebuild
+++ /dev/null
@@ -1,19 +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/PEAR-MDB2_Driver_pgsql/PEAR-MDB2_Driver_pgsql-1.5.0_alpha1.ebuild,v 1.9 2008/01/10 10:06:26 vapier Exp $
-
-inherit php-pear-r1 depend.php
-
-DESCRIPTION="Database Abstraction Layer, pgsql driver"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-DEPEND=">=dev-php/PEAR-MDB2-2.5.0_alpha1"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	has_php
-	require_php_with_use postgres
-}
diff --git a/dev-php/PEAR-MDB2_Driver_pgsql/PEAR-MDB2_Driver_pgsql-1.5.0_beta2.ebuild b/dev-php/PEAR-MDB2_Driver_pgsql/PEAR-MDB2_Driver_pgsql-1.5.0_beta2.ebuild
deleted file mode 100644
index d6d0ce1a7946..000000000000
--- a/dev-php/PEAR-MDB2_Driver_pgsql/PEAR-MDB2_Driver_pgsql-1.5.0_beta2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-MDB2_Driver_pgsql/PEAR-MDB2_Driver_pgsql-1.5.0_beta2.ebuild,v 1.1 2009/08/27 19:29:07 beandog Exp $
-
-inherit php-pear-r1 depend.php
-
-DESCRIPTION="Database Abstraction Layer, pgsql driver"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-DEPEND=">=dev-php/PEAR-MDB2-2.5.0_beta2"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	require_php_with_use postgres
-}
diff --git a/dev-php/PEAR-MDB2_Driver_pgsql/PEAR-MDB2_Driver_pgsql-1.5.0_beta1.ebuild b/dev-php/PEAR-MDB2_Driver_pgsql/PEAR-MDB2_Driver_pgsql-1.5.0_beta3.ebuild
index d6b102584c41..1dbd04b7cf42 100644
--- a/dev-php/PEAR-MDB2_Driver_pgsql/PEAR-MDB2_Driver_pgsql-1.5.0_beta1.ebuild
+++ b/dev-php/PEAR-MDB2_Driver_pgsql/PEAR-MDB2_Driver_pgsql-1.5.0_beta3.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-MDB2_Driver_pgsql/PEAR-MDB2_Driver_pgsql-1.5.0_beta1.ebuild,v 1.1 2008/03/17 12:47:40 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-MDB2_Driver_pgsql/PEAR-MDB2_Driver_pgsql-1.5.0_beta3.ebuild,v 1.1 2010/09/11 14:29:13 mabi Exp $
 
-inherit php-pear-r1 depend.php
+EAPI="2"
+
+inherit php-pear-r1
 
 DESCRIPTION="Database Abstraction Layer, pgsql driver"
 LICENSE="BSD"
@@ -10,9 +12,6 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE=""
 
-DEPEND=">=dev-php/PEAR-MDB2-2.5.0_beta1"
+DEPEND=">=dev-php/PEAR-MDB2-2.5.0_beta3
+		dev-lang/php[postgres]"
 RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	require_php_with_use postgres
-}
diff --git a/dev-php/PEAR-MDB2_Driver_sqlite/ChangeLog b/dev-php/PEAR-MDB2_Driver_sqlite/ChangeLog
index b2b42439db90..3e6e1da09987 100644
--- a/dev-php/PEAR-MDB2_Driver_sqlite/ChangeLog
+++ b/dev-php/PEAR-MDB2_Driver_sqlite/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-php/PEAR-MDB2_Driver_sqlite
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-MDB2_Driver_sqlite/ChangeLog,v 1.26 2009/08/26 21:17:08 beandog Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-MDB2_Driver_sqlite/ChangeLog,v 1.27 2010/09/11 14:30:46 mabi Exp $
+
+*PEAR-MDB2_Driver_sqlite-1.5.0_beta3 (11 Sep 2010)
+
+  11 Sep 2010; Matti Bickel <mabi@gentoo.org>
+  -PEAR-MDB2_Driver_sqlite-1.5.0_alpha1.ebuild,
+  -PEAR-MDB2_Driver_sqlite-1.5.0_beta1.ebuild,
+  -PEAR-MDB2_Driver_sqlite-1.5.0_beta2.ebuild,
+  +PEAR-MDB2_Driver_sqlite-1.5.0_beta3.ebuild:
+  cleanup, version bump, eapi bump
 
 *PEAR-MDB2_Driver_sqlite-1.5.0_beta2 (26 Aug 2009)
 
diff --git a/dev-php/PEAR-MDB2_Driver_sqlite/PEAR-MDB2_Driver_sqlite-1.5.0_alpha1.ebuild b/dev-php/PEAR-MDB2_Driver_sqlite/PEAR-MDB2_Driver_sqlite-1.5.0_alpha1.ebuild
deleted file mode 100644
index 853eb24f45c5..000000000000
--- a/dev-php/PEAR-MDB2_Driver_sqlite/PEAR-MDB2_Driver_sqlite-1.5.0_alpha1.ebuild
+++ /dev/null
@@ -1,19 +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/PEAR-MDB2_Driver_sqlite/PEAR-MDB2_Driver_sqlite-1.5.0_alpha1.ebuild,v 1.7 2008/01/10 10:06:32 vapier Exp $
-
-inherit php-pear-r1 depend.php
-
-DESCRIPTION="Database Abstraction Layer, sqlite driver"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-DEPEND=">=dev-php/PEAR-MDB2-2.5.0_alpha1"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	has_php
-	require_sqlite
-}
diff --git a/dev-php/PEAR-MDB2_Driver_sqlite/PEAR-MDB2_Driver_sqlite-1.5.0_beta2.ebuild b/dev-php/PEAR-MDB2_Driver_sqlite/PEAR-MDB2_Driver_sqlite-1.5.0_beta2.ebuild
deleted file mode 100644
index 835ac3476e8d..000000000000
--- a/dev-php/PEAR-MDB2_Driver_sqlite/PEAR-MDB2_Driver_sqlite-1.5.0_beta2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-MDB2_Driver_sqlite/PEAR-MDB2_Driver_sqlite-1.5.0_beta2.ebuild,v 1.1 2009/08/26 21:17:08 beandog Exp $
-
-inherit php-pear-r1 depend.php
-
-DESCRIPTION="Database Abstraction Layer, sqlite driver"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-DEPEND=">=dev-php/PEAR-MDB2-2.5.0_beta2"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	require_sqlite
-}
diff --git a/dev-php/PEAR-MDB2_Driver_sqlite/PEAR-MDB2_Driver_sqlite-1.5.0_beta1.ebuild b/dev-php/PEAR-MDB2_Driver_sqlite/PEAR-MDB2_Driver_sqlite-1.5.0_beta3.ebuild
index 76c57fcf78d0..e114dd203ee5 100644
--- a/dev-php/PEAR-MDB2_Driver_sqlite/PEAR-MDB2_Driver_sqlite-1.5.0_beta1.ebuild
+++ b/dev-php/PEAR-MDB2_Driver_sqlite/PEAR-MDB2_Driver_sqlite-1.5.0_beta3.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-MDB2_Driver_sqlite/PEAR-MDB2_Driver_sqlite-1.5.0_beta1.ebuild,v 1.1 2008/03/17 12:48:01 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-MDB2_Driver_sqlite/PEAR-MDB2_Driver_sqlite-1.5.0_beta3.ebuild,v 1.1 2010/09/11 14:30:46 mabi Exp $
 
-inherit php-pear-r1 depend.php
+EAPI="2"
+
+inherit php-pear-r1
 
 DESCRIPTION="Database Abstraction Layer, sqlite driver"
 LICENSE="BSD"
@@ -10,9 +12,6 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE=""
 
-DEPEND=">=dev-php/PEAR-MDB2-2.5.0_beta1"
+DEPEND=">=dev-php/PEAR-MDB2-2.5.0_beta3
+		dev-lang/php[sqlite]"
 RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	require_sqlite
-}