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=13728e1364674e6275e908319fb3e0efcfdc4789;hp=ee5945936a8d34751e4eab0ec54d81dd21fbcbbb;hb=2c55097bbd37a4f9f118765049be8539ad564c0c;hpb=27a7240724474d8b43a69b191e9b75d19eac0d05

diff --git a/dev-lang/php/php-5.6.4-r1.ebuild b/dev-lang/php/php-5.6.4-r1.ebuild
index ee59459..13728e1 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-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-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"
 
@@ -179,6 +179,8 @@ REQUIRED_USE="
 	) )
 
 	pdo-dblib? ( mssql )
+	pdo-oci? ( oci8-instant-client )
+	pdo-odbc? ( odbc )
 	pdo-pgsql? ( postgres )
 	pdo-sqlite? ( sqlite )
 	qdbm? ( !gdbm )
@@ -378,6 +380,8 @@ 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)
 	$(use_enable phar phar )
@@ -466,13 +470,7 @@ src_configure() {
 
 	# PDO support
 	if use pdo ; then
-		my_conf+="
-		$(use_with mysql pdo-mysql ${mysqllib})
-		$(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)"
-		if use oci8-instant-client ; then
-			my_conf+="
-			$(use_with oci8-instant-client pdo-oci)"
-		fi
+		my_conf+="$(use_with mysql pdo-mysql ${mysqllib})"
 	fi
 
 	# Session support