cleanup, version bump, eapi bump, updated keywords

(Portage version: 2.1.8.3/cvs/Linux x86_64)

5 files changed, 29 insertions, 57 deletions

diff --git a/dev-php/PEAR-MDB2_Driver_oci8/ChangeLog b/dev-php/PEAR-MDB2_Driver_oci8/ChangeLog
index 020324e042e8..e79f114af38c 100644
--- a/dev-php/PEAR-MDB2_Driver_oci8/ChangeLog
+++ b/dev-php/PEAR-MDB2_Driver_oci8/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-php/PEAR-MDB2_Driver_oci8
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-MDB2_Driver_oci8/ChangeLog,v 1.17 2009/08/26 21:15:07 beandog Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-MDB2_Driver_oci8/ChangeLog,v 1.18 2010/09/12 11:28:35 mabi Exp $
+
+*PEAR-MDB2_Driver_oci8-1.5.0_beta3 (11 Sep 2010)
+
+  11 Sep 2010; Matti Bickel <mabi@gentoo.org>
+  -PEAR-MDB2_Driver_oci8-1.5.0_alpha1.ebuild,
+  -PEAR-MDB2_Driver_oci8-1.5.0_beta1.ebuild,
+  -PEAR-MDB2_Driver_oci8-1.5.0_beta2.ebuild,
+  +PEAR-MDB2_Driver_oci8-1.5.0_beta3.ebuild:
+  cleanup, version bump, eapi bump, updated keywords b/c oci8 is only available
+  on amd64, x86
 
 *PEAR-MDB2_Driver_oci8-1.5.0_beta2 (26 Aug 2009)
 
diff --git a/dev-php/PEAR-MDB2_Driver_oci8/PEAR-MDB2_Driver_oci8-1.5.0_alpha1.ebuild b/dev-php/PEAR-MDB2_Driver_oci8/PEAR-MDB2_Driver_oci8-1.5.0_alpha1.ebuild
deleted file mode 100644
index 4f062e582283..000000000000
--- a/dev-php/PEAR-MDB2_Driver_oci8/PEAR-MDB2_Driver_oci8-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_oci8/PEAR-MDB2_Driver_oci8-1.5.0_alpha1.ebuild,v 1.7 2008/01/31 23:17:52 ranger Exp $
-
-inherit php-pear-r1 depend.php
-
-DESCRIPTION="Database Abstraction Layer, oci8 driver"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ppc -ppc64 ~sparc x86"
-IUSE=""
-
-DEPEND=">=dev-php/PEAR-MDB2-2.5.0_alpha1"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	has_php
-	require_php_with_any_use oci8 oci8-instant-client
-}
diff --git a/dev-php/PEAR-MDB2_Driver_oci8/PEAR-MDB2_Driver_oci8-1.5.0_beta1.ebuild b/dev-php/PEAR-MDB2_Driver_oci8/PEAR-MDB2_Driver_oci8-1.5.0_beta1.ebuild
deleted file mode 100644
index 26a568c4a42f..000000000000
--- a/dev-php/PEAR-MDB2_Driver_oci8/PEAR-MDB2_Driver_oci8-1.5.0_beta1.ebuild
+++ /dev/null
@@ -1,18 +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_oci8/PEAR-MDB2_Driver_oci8-1.5.0_beta1.ebuild,v 1.1 2008/03/17 12:47:18 jokey Exp $
-
-inherit php-pear-r1 depend.php
-
-DESCRIPTION="Database Abstraction Layer, oci8 driver"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 -ppc -ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND=">=dev-php/PEAR-MDB2-2.5.0_beta1"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	require_php_with_any_use oci8 oci8-instant-client
-}
diff --git a/dev-php/PEAR-MDB2_Driver_oci8/PEAR-MDB2_Driver_oci8-1.5.0_beta2.ebuild b/dev-php/PEAR-MDB2_Driver_oci8/PEAR-MDB2_Driver_oci8-1.5.0_beta2.ebuild
deleted file mode 100644
index b6313f174e73..000000000000
--- a/dev-php/PEAR-MDB2_Driver_oci8/PEAR-MDB2_Driver_oci8-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_oci8/PEAR-MDB2_Driver_oci8-1.5.0_beta2.ebuild,v 1.1 2009/08/26 21:15:07 beandog Exp $
-
-inherit php-pear-r1 depend.php
-
-DESCRIPTION="Database Abstraction Layer, oci8 driver"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 -ppc -ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND=">=dev-php/PEAR-MDB2-2.5.0_beta2"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	require_php_with_any_use oci8 oci8-instant-client
-}
diff --git a/dev-php/PEAR-MDB2_Driver_oci8/PEAR-MDB2_Driver_oci8-1.5.0_beta3.ebuild b/dev-php/PEAR-MDB2_Driver_oci8/PEAR-MDB2_Driver_oci8-1.5.0_beta3.ebuild
new file mode 100644
index 000000000000..cee4eb1f2425
--- /dev/null
+++ b/dev-php/PEAR-MDB2_Driver_oci8/PEAR-MDB2_Driver_oci8-1.5.0_beta3.ebuild
@@ -0,0 +1,17 @@
+# 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_oci8/PEAR-MDB2_Driver_oci8-1.5.0_beta3.ebuild,v 1.1 2010/09/12 11:28:35 mabi Exp $
+
+EAPI="2"
+
+inherit php-pear-r1
+
+DESCRIPTION="Database Abstraction Layer, oci8 driver"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=dev-php/PEAR-MDB2-2.5.0_beta3
+		|| ( dev-lang/php[oci8] dev-lang/php[oci8-instant-client] )"
+RDEPEND="${DEPEND}"