cleanup, version bump, eapi bump, updated keywords

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

6 files changed, 32 insertions, 64 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/Manifest b/dev-php/PEAR-MDB2_Driver_oci8/Manifest
index fb8c72b1bf1a..19fcdcf6b17c 100644
--- a/dev-php/PEAR-MDB2_Driver_oci8/Manifest
+++ b/dev-php/PEAR-MDB2_Driver_oci8/Manifest
@@ -1,12 +1,8 @@
 DIST MDB2_Driver_oci8-1.4.1.tgz 37027 RMD160 e2a3fed1a6029f91e78bc009b3a921b8c0628638 SHA1 8e82e179f153bb78348814e090e231f31009121e SHA256 556b04b135232c77f78a650f5a8c4a92e74c557d6163bd20ac3dd882ed5eb8f9
-DIST MDB2_Driver_oci8-1.5.0a1.tgz 39444 RMD160 d4b4ba236ba5248c8e361ce90fcc134cf02b5979 SHA1 7147f2139389720614dde8212cf8a84e84ee9a72 SHA256 da043fa7588c25af11359eb82ced23378d0ea81990b3e6169ab01d3e9eaf8faa
 DIST MDB2_Driver_oci8-1.5.0a2.tgz 40200 RMD160 07c3137ecd45b17a6286434c1833c5f7f50f216d SHA1 9d31f317bf889c076bebb0c64fe45ffaa3b4d81b SHA256 1f1aac483f57aca75e6b13bf570412c9d4aacdd53494a10ca949e45c0079c4e9
-DIST MDB2_Driver_oci8-1.5.0b1.tgz 43736 RMD160 bca474d54b194dc7f80ec52235f214d7d3bb91b5 SHA1 36b619d572393f97d7e6bbd344c183e5e9ca46b4 SHA256 36be4534690f9b32d51eef5ea91c935bb012cc2f4656e25bf96d84e8fa8a850d
-DIST MDB2_Driver_oci8-1.5.0b2.tgz 43954 RMD160 96df6f4ae233d855f888edc077c72ffdb8f9a283 SHA1 7d46cd823fffa477b437885c5b4db877ffdc73d7 SHA256 d57febe1dd46ff89f8843c9fb1353c57d0bf5f17d07aa85ccad05399297534c4
+DIST MDB2_Driver_oci8-1.5.0b3.tgz 43707 RMD160 1a481cba0df73b29710ec95ad8f827f35c99fe16 SHA1 d35feff1b764e0512267f258c7b9e2d95966322a SHA256 def17cedeca82c7170ac091f6525313f4fce324dcf8f8f4af65a877263e1ea97
 EBUILD PEAR-MDB2_Driver_oci8-1.4.1.ebuild 529 RMD160 3318495df7aa86eb1afae5b4c548a62d87a5947b SHA1 c92fa0394536d686d0e7db9b65235523eaaba0f8 SHA256 5190e1f83568aa8aa906b7b6f855542cedb4d82a8c101608acb4b467146478cf
-EBUILD PEAR-MDB2_Driver_oci8-1.5.0_alpha1.ebuild 551 RMD160 a767a400d456261e03b4c8a4c1742c5d9c875227 SHA1 e69320477116a072fe34f4c01fc2dc5d3f305b30 SHA256 6bc4b12fc1a16585effefa3d04e79e1c213a3061c5741a91b99772fd266766f6
 EBUILD PEAR-MDB2_Driver_oci8-1.5.0_alpha2.ebuild 542 RMD160 ac6cd5d82be9648e02ea5e18ad763305fbf628bc SHA1 c29bd18d791eb8a04b05fc20d243fb8b7a9c24bf SHA256 f69da5633ae5ad973c3d3d58b4b87ceaa19975a0f02eda2e3cd1f7a659d74643
-EBUILD PEAR-MDB2_Driver_oci8-1.5.0_beta1.ebuild 541 RMD160 48dab8478c7c23627a53bc01ff99b46394ad2535 SHA1 8de835664f733036c739ddef477761865e67a499 SHA256 b0c1b1a42af773da1df8db5abc49006c057be7579760597b37700b0c049eb746
-EBUILD PEAR-MDB2_Driver_oci8-1.5.0_beta2.ebuild 543 RMD160 8cc4382c2e4ca097b593563b5a3403f9c128df8e SHA1 7858370ddb5fb5d90764b3a715e01db4424130f7 SHA256 3f972b04e03c3321075d2182b4b9de92988f1cb941c60c02bb4618bcb0df5e19
-MISC ChangeLog 3102 RMD160 7281e3da049c2af55b1b70413f421e26d1c1e125 SHA1 d5ab02e91ce8467bed74137386b6406b4f39574c SHA256 ad718a65515e85e5e20603d61be37b53ddfe11431d03113b55b479853e495a3a
+EBUILD PEAR-MDB2_Driver_oci8-1.5.0_beta3.ebuild 517 RMD160 384b69b2392c91c5452aa7b925d55f1ef39ccc17 SHA1 8caab0f93193aee88bc179f88ebf044a98a0b435 SHA256 ef450d05661e232d68ee67d29fe929bbbaf562ff4345a246a194fcad724aaeb3
+MISC ChangeLog 3473 RMD160 18f4c097c88822e252038029352b28d048c2129b SHA1 a15c8f0ffdcd5691d17068e534841ad09d3badf9 SHA256 9b4ddc3a018f99ca604231d2aa6c947cd985c4878293153b823a71c8a5803942
 MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1
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}"