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=8d1918f9c66004a6784f24c473a5616c6c3a2316;hp=79be81f97897977f85ac5da95f6671ae1db0f4aa;hb=3c35271233cd3cbfc52b808b5a94e5ca4255c0c2;hpb=dd563773ce0c672a3d9fa5841e118b902ecbc692

diff --git a/dev-lang/php/php-5.6.4-r1.ebuild b/dev-lang/php/php-5.6.4-r1.ebuild
index 79be81f..8d1918f 100644
--- a/dev-lang/php/php-5.6.4-r1.ebuild
+++ b/dev-lang/php/php-5.6.4-r1.ebuild
@@ -69,8 +69,8 @@ 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
+	oci8-instant-client odbc +opcache pcntl pdo pdo-dblib +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,7 @@ REQUIRED_USE="
 		pdo
 	) )
 
+	pdo-dblib? ( mssql )
 	qdbm? ( !gdbm )
 	readline? ( !libedit )
 	recode? ( !imap !mysql !mysqli )
@@ -352,26 +353,34 @@ 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_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 )
@@ -430,25 +439,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
@@ -467,16 +460,9 @@ src_configure() {
 		my_conf+="${mysqlsock}"
 	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)
@@ -487,11 +473,6 @@ src_configure() {
 		fi
 	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+="