X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mjo-overlay.git;a=blobdiff_plain;f=dev-lang%2Fphp%2Fphp-5.6.4-r1.ebuild;h=004aae4aae4466266dbf42a5c7354ef4a98e5d2a;hp=1f6d8e35b74e8e0d038c0255b241cdcc8846eafc;hb=a6b890046cd56f52b35727418a3876b7194d5920;hpb=203d6a6e24a3b0452bb364fda0d925c65a375932

diff --git a/dev-lang/php/php-5.6.4-r1.ebuild b/dev-lang/php/php-5.6.4-r1.ebuild
index 1f6d8e3..004aae4 100644
--- a/dev-lang/php/php-5.6.4-r1.ebuild
+++ b/dev-lang/php/php-5.6.4-r1.ebuild
@@ -69,9 +69,9 @@ 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
-	pdo-pgsql pdo-sqlite+phar +posix postgres qdbm readline recode selinux
-	+session sharedmem +simplexml snmp soap sockets spell sqlite ssl
+	oci8-instant-client odbc +opcache pcntl pdo pdo-dblib pdo-mysql 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
 	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
 
@@ -175,11 +175,13 @@ REQUIRED_USE="
 	libmysqlclient? ( || (
 		mysql
 		mysqli
-		pdo
+		pdo-mysql
 	) )
 
 	pdo-dblib? ( mssql )
+	pdo-oci? ( oci8-instant-client )
 	pdo-odbc? ( odbc )
+	pdo-mysql? ( mysql )
 	pdo-pgsql? ( postgres )
 	pdo-sqlite? ( sqlite )
 	qdbm? ( !gdbm )
@@ -379,6 +381,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)
@@ -466,14 +469,8 @@ src_configure() {
 		my_conf+="${mysqlsock}"
 	fi
 
-	# 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
+	# MySQL PDO support
+	my_conf+="$(use_with pdo-mysql pdo-mysql ${mysqllib})"
 
 	# Session support
 	if use session ; then