From: Michael Orlitzky <michael@orlitzky.com>
Date: Mon, 12 Jan 2015 20:00:25 +0000 (-0500)
Subject: Add the pdo-oci USE flag.
X-Git-Url: https://gitweb.michael.orlitzky.com/?a=commitdiff_plain;h=2c55097bbd37a4f9f118765049be8539ad564c0c;p=mjo-overlay.git

Add the pdo-oci USE flag.
---

diff --git a/dev-lang/php/metadata.xml b/dev-lang/php/metadata.xml
index 662f6b6..ff6b6d4 100644
--- a/dev-lang/php/metadata.xml
+++ b/dev-lang/php/metadata.xml
@@ -19,6 +19,7 @@
 		<flag name='opcache'>Enables built-in opcode cache, replacing pecl-apc et.al</flag>
 		<flag name='pdo'>Enable the bundled PDO extensions</flag>
 		<flag name='pdo-dblib'>Enable the DBLIB (MSSQL) PDO driver</flag>
+		<flag name='pdo-oci'>Enable the Oracle PDO driver</flag>
 		<flag name='pdo-odbc'>Enable the ODBC PDO driver</flag>
 		<flag name='pdo-pgsql'>Enable the PostgreSQL PDO driver</flag>
 		<flag name='pdo-sqlite'>Enable the SQLite PDO driver</flag>
diff --git a/dev-lang/php/php-5.6.4-r1.ebuild b/dev-lang/php/php-5.6.4-r1.ebuild
index 1f6d8e3..13728e1 100644
--- a/dev-lang/php/php-5.6.4-r1.ebuild
+++ b/dev-lang/php/php-5.6.4-r1.ebuild
@@ -69,7 +69,7 @@ IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
 	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
 	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
 	mssql mysql libmysqlclient mysqli nls
-	oci8-instant-client odbc +opcache pcntl pdo pdo-dblib pdo-odbc
+	oci8-instant-client odbc +opcache pcntl pdo pdo-dblib pdo-oci pdo-odbc
 	pdo-pgsql pdo-sqlite+phar +posix postgres qdbm readline recode selinux
 	+session sharedmem +simplexml snmp soap sockets spell sqlite ssl
 	sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx
@@ -179,6 +179,7 @@ REQUIRED_USE="
 	) )
 
 	pdo-dblib? ( mssql )
+	pdo-oci? ( oci8-instant-client )
 	pdo-odbc? ( odbc )
 	pdo-pgsql? ( postgres )
 	pdo-sqlite? ( sqlite )
@@ -379,6 +380,7 @@ src_configure() {
 	$(use_enable pcntl pcntl )
 	$(use_enable pdo pdo )
 	$(use_with   pdo-dblib pdo-dblib )
+	$(use_with   pdo-oci pdo-oci )
 	$(use_with   pdo-odbc pdo-odbc unixODBC,"${EPREFIX}"/usr)
 	$(use_with   pdo-pgsql pdo-pgsql )
 	$(use_with   pdo-sqlite pdo-sqlite "${EPREFIX}"/usr)
@@ -469,10 +471,6 @@ src_configure() {
 	# PDO support
 	if use pdo ; then
 		my_conf+="$(use_with mysql pdo-mysql ${mysqllib})"
-		if use oci8-instant-client ; then
-			my_conf+="
-			$(use_with oci8-instant-client pdo-oci)"
-		fi
 	fi
 
 	# Session support