cleanup, version bump, eapi bump

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 17 insertions, 28 deletions

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