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=6bff755d8a4c434289c3772e9d40eefb1f5f4229;hb=2c55097bbd37a4f9f118765049be8539ad564c0c;hpb=a7c76483853462a46896bd5feb979022972756d1

diff --git a/dev-lang/php/php-5.6.4-r1.ebuild b/dev-lang/php/php-5.6.4-r1.ebuild
index 6bff755..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 +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"
 
@@ -178,6 +178,11 @@ REQUIRED_USE="
 		pdo
 	) )
 
+	pdo-dblib? ( mssql )
+	pdo-oci? ( oci8-instant-client )
+	pdo-odbc? ( odbc )
+	pdo-pgsql? ( postgres )
+	pdo-sqlite? ( sqlite )
 	qdbm? ( !gdbm )
 	readline? ( !libedit )
 	recode? ( !imap !mysql !mysqli )
@@ -352,25 +357,38 @@ src_configure() {
 	$(use_enable exif exif )
 	$(use_enable fileinfo fileinfo )
 	$(use_enable filter filter )
+	$(use_with   firebird interbase "${EPREFIX}"/usr)
 	$(use_enable ftp ftp )
 	$(use_with   gmp gmp "${EPREFIX}"/usr)
 	$(use_enable hash hash )
 	$(use_with   iconv iconv $(use elibc_glibc || echo "${EPREFIX}"/usr))
+	$(use_with   imap imap "${EPREFIX}"/usr)
 	$(use_enable intl intl )
+	$(use_with   iodbc iodbc "${EPREFIX}"/usr)
 	$(use_enable ipv6 ipv6 )
 	$(use_enable json json )
 	$(use_with   kerberos kerberos "${EPREFIX}"/usr)
+	$(use_with   ldap ldap "${EPREFIX}"/usr)
+	$(use_with   ldap-sasl ldap-sasl "${EPREFIX}"/usr)
+	$(use_with   libedit libedit "${EPREFIX}"/usr)
 	$(use_with   mhash mhash "${EPREFIX}"/usr)
 	$(use_with   mssql mssql "${EPREFIX}"/usr)
 	$(use_with   nls gettext "${EPREFIX}"/usr)
+	$(use_with   oci8-instant-client oci8)
 	$(use_with   odbc unixODBC "${EPREFIX}"/usr)
 	$(use_enable opcache opcache )
 	$(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 )
 	$(use_enable posix posix )
 	$(use_with   postgres pgsql "${EPREFIX}"/usr)
 	$(use_with   spell pspell "${EPREFIX}"/usr)
+	$(use_with   readline readline "${EPREFIX}"/usr)
 	$(use_with   recode recode "${EPREFIX}"/usr)
 	$(use_enable sharedmem shmop )
 	$(use_enable simplexml simplexml )
@@ -429,25 +447,9 @@ src_configure() {
 	my_conf+="
 	$(use_with gd gd)"
 
-	# IMAP support
+	# IMAP SSL support
 	if use imap ; then
-		my_conf+="
-		$(use_with imap imap ${EPREFIX}/usr)
-		$(use_with ssl imap-ssl ${EPREFIX}/usr)"
-	fi
-
-	# Interbase/firebird support
-
-	if use firebird ; then
-		my_conf+="
-		$(use_with firebird interbase ${EPREFIX}/usr)"
-	fi
-
-	# LDAP support
-	if use ldap ; then
-		my_conf+="
-		$(use_with ldap ldap ${EPREFIX}/usr)
-		$(use_with ldap-sasl ldap-sasl ${EPREFIX}/usr)"
+		my_conf+="$(use_with ssl imap-ssl ${EPREFIX}/usr)"
 	fi
 
 	# MySQL support
@@ -466,36 +468,11 @@ src_configure() {
 		my_conf+="${mysqlsock}"
 	fi
 
-	if use iodbc ; then
-		my_conf+="
-		$(use_with iodbc iodbc ${EPREFIX}/usr)"
-	fi
-
-	# Oracle support
-	if use oci8-instant-client ; then
-		my_conf+="
-		$(use_with oci8-instant-client oci8)"
-	fi
-
 	# PDO support
 	if use pdo ; then
-		my_conf+="
-		$(use_with mssql pdo-dblib )
-		$(use_with mysql pdo-mysql ${mysqllib})
-		$(use_with postgres pdo-pgsql )
-		$(use_with sqlite pdo-sqlite ${EPREFIX}/usr)
-		$(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
 
-	# readline/libedit support
-	my_conf+="
-	$(use_with readline readline ${EPREFIX}/usr)
-	$(use_with libedit libedit ${EPREFIX}/usr)"
-
 	# Session support
 	if use session ; then
 		my_conf+="