Sync with overlay.

(Portage version: 2.0.53)

5 files changed, 29 insertions, 24 deletions

diff --git a/dev-php5/pecl-pdo-oci/ChangeLog b/dev-php5/pecl-pdo-oci/ChangeLog
index a27ece4d180b..e031fbe8c5a5 100644
--- a/dev-php5/pecl-pdo-oci/ChangeLog
+++ b/dev-php5/pecl-pdo-oci/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-php5/pecl-pdo-oci
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo-oci/ChangeLog,v 1.2 2005/09/16 23:15:35 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo-oci/ChangeLog,v 1.3 2005/12/18 01:42:49 chtekk Exp $
+
+*pecl-pdo-oci-1.0 (18 Dec 2005)
+
+  18 Dec 2005; Luca Longinotti <chtekk@gentoo.org> -pecl-pdo-oci-0.9.ebuild,
+  +pecl-pdo-oci-1.0.ebuild:
+  Sync with overlay, add oci8-instant-client USE flag to support
+  dev-db/oracle-instantclient-basic, update to release 1.0.
 
   16 Sep 2005; Christian Parpart <trapni@gentoo.org>
   pecl-pdo-oci-0.9.ebuild:
diff --git a/dev-php5/pecl-pdo-oci/Manifest b/dev-php5/pecl-pdo-oci/Manifest
index 860e67bc90f7..b6592fb8ea7a 100644
--- a/dev-php5/pecl-pdo-oci/Manifest
+++ b/dev-php5/pecl-pdo-oci/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 0f725ffb180387a55bafaafe19884901 ChangeLog 414
-MD5 46efeed99abc481a1e2edfd1995dfec9 files/digest-pecl-pdo-oci-0.9 59
+MD5 5d720e011251f2e623589bd83c3bedcc ChangeLog 678
+MD5 0f8397a8d55a3d4107c3f210c0284a91 files/digest-pecl-pdo-oci-1.0 59
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
-MD5 3e70185ca72e233a6e64ffcc3ad87868 pecl-pdo-oci-0.9.ebuild 1034
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDc/4wgIKl8Uu19MoRApTAAJ440ppJbTUW1tOAx4DH17dj6NyG7ACZAT6t
-Lr0KjuCPmD5l/VXb2VIFDRc=
-=Y/oV
------END PGP SIGNATURE-----
+MD5 016379c129923eb12e77248e3635b050 pecl-pdo-oci-1.0.ebuild 1269
diff --git a/dev-php5/pecl-pdo-oci/files/digest-pecl-pdo-oci-0.9 b/dev-php5/pecl-pdo-oci/files/digest-pecl-pdo-oci-0.9
deleted file mode 100644
index f6a852e27d3a..000000000000
--- a/dev-php5/pecl-pdo-oci/files/digest-pecl-pdo-oci-0.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 34e2601e814d0a63e7c1120e2081d73c PDO_OCI-0.9.tgz 11914
diff --git a/dev-php5/pecl-pdo-oci/files/digest-pecl-pdo-oci-1.0 b/dev-php5/pecl-pdo-oci/files/digest-pecl-pdo-oci-1.0
new file mode 100644
index 000000000000..74001c2c5893
--- /dev/null
+++ b/dev-php5/pecl-pdo-oci/files/digest-pecl-pdo-oci-1.0
@@ -0,0 +1 @@
+MD5 b90477850a337fa24f556451917e8186 PDO_OCI-1.0.tgz 13679
diff --git a/dev-php5/pecl-pdo-oci/pecl-pdo-oci-0.9.ebuild b/dev-php5/pecl-pdo-oci/pecl-pdo-oci-1.0.ebuild
index f00157582e93..87c7dc8457e4 100644
--- a/dev-php5/pecl-pdo-oci/pecl-pdo-oci-0.9.ebuild
+++ b/dev-php5/pecl-pdo-oci/pecl-pdo-oci-1.0.ebuild
@@ -1,21 +1,23 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo-oci/pecl-pdo-oci-0.9.ebuild,v 1.3 2005/11/11 02:12:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo-oci/pecl-pdo-oci-1.0.ebuild,v 1.1 2005/12/18 01:42:49 chtekk Exp $
 
-PHP_EXT_ZENDEXT="no"
-PHP_EXT_PECL_PKG="PDO_OCI"
 PHP_EXT_NAME="pdo_oci"
+PHP_EXT_PECL_PKG="PDO_OCI"
 PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
 
 inherit php-ext-pecl-r1
 
-IUSE=""
-DESCRIPTION="PHP Data Objects (PDO) Driver For Oracle Call Interface (OCI)"
-SLOT="0"
-LICENSE="PHP"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86"
+DESCRIPTION="PHP Data Objects (PDO) Driver For Oracle Call Interface (OCI)."
+LICENSE="PHP"
+SLOT="0"
+IUSE="oci8-instant-client"
+
 DEPEND="${DEPEND}
-		dev-php5/pecl-pdo"
+		dev-php5/pecl-pdo
+		oci8-instant-client? ( dev-db/oracle-instantclient-basic )"
 
 need_php_by_category
 
@@ -35,6 +37,12 @@ pkg_setup() {
 
 src_compile() {
 	has_php
-	my_conf="--with-pdo-oci"
+	if useq oci8-instant-client ; then
+		OCI8IC_PKG="`best_version dev-db/oracle-instantclient-basic`"
+		OCI8IC_PKG="`printf ${OCI8IC_PKG} | sed -e 's|dev-db/oracle-instantclient-basic-||g'`"
+		my_conf="--with-pdo-oci=instantclient,/usr,${OCI8IC_PKG}"
+	else
+		my_conf="--with-pdo-oci"
+	fi
 	php-ext-pecl-r1_src_compile
 }