cleanup, version bump, eapi bump

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

4 files changed, 18 insertions, 53 deletions

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
-}