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=a0e6dae00ee0a68792155f802ccfb72f2783bad7;hp=5b3b76b40d658584406c1555b426433f22bfb216;hb=ba8d84360c502e972de82401d80ba3c073741817;hpb=127ec29f9230f2bffb2cd8f0bd9ca3f12a015a8f

diff --git a/dev-lang/php/php-5.6.4-r1.ebuild b/dev-lang/php/php-5.6.4-r1.ebuild
index 5b3b76b..a0e6dae 100644
--- a/dev-lang/php/php-5.6.4-r1.ebuild
+++ b/dev-lang/php/php-5.6.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.6.4.ebuild,v 1.2 2014/12/28 15:27:17 titanofold Exp $
+# $Header: $
 
 EAPI=5
 
@@ -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 pdo-pgsql
+	+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,8 @@ REQUIRED_USE="
 		pdo
 	) )
 
+	pdo-dblib? ( mssql )
+	pdo-pgsql? ( postgres )
 	qdbm? ( !gdbm )
 	readline? ( !libedit )
 	recode? ( !imap !mysql !mysqli )
@@ -342,63 +344,74 @@ src_configure() {
 	#                             extension		  USE flag        shared
 	my_conf+="
 	$(use_enable bcmath bcmath )
-	$(use_with bzip2 bz2 "${EPREFIX}"/usr)
+	$(use_with   bzip2 bz2 "${EPREFIX}"/usr)
 	$(use_enable calendar calendar )
+	$(use_with   crypt mcrypt "${EPREFIX}"/usr)
 	$(use_enable ctype ctype )
-	$(use_with curl curl "${EPREFIX}"/usr)
-	$(use_enable xml dom )
-	$(use_with enchant enchant "${EPREFIX}"/usr)
+	$(use_with   curl curl "${EPREFIX}"/usr)
+	$(use_enable debug debug )
+	$(use_with   enchant enchant "${EPREFIX}"/usr)
 	$(use_enable exif exif )
 	$(use_enable fileinfo fileinfo )
 	$(use_enable filter filter )
+	$(use_with   firebird interbase "${EPREFIX}"/usr)
 	$(use_enable ftp ftp )
-	$(use_with nls gettext "${EPREFIX}"/usr)
-	$(use_with gmp gmp "${EPREFIX}"/usr)
+	$(use_with   gmp gmp "${EPREFIX}"/usr)
 	$(use_enable hash hash )
-	$(use_with mhash mhash "${EPREFIX}"/usr)
-	$(use_with iconv iconv $(use elibc_glibc || echo "${EPREFIX}"/usr))
+	$(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_enable xml libxml )
-	$(use_with xml libxml-dir "${EPREFIX}"/usr)
-	$(use_enable unicode mbstring )
-	$(use_with crypt mcrypt "${EPREFIX}"/usr)
-	$(use_with mssql mssql "${EPREFIX}"/usr)
-	$(use_with unicode onig "${EPREFIX}"/usr)
-	$(use_with ssl openssl "${EPREFIX}"/usr)
-	$(use_with ssl openssl-dir "${EPREFIX}"/usr)
+	$(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 phar phar )
 	$(use_enable pdo pdo )
-	$(use_enable opcache opcache )
-	$(use_with postgres pgsql "${EPREFIX}"/usr)
+	$(use_with   pdo-dblib pdo-dblib )
+	$(use_with   pdo-pgsql pdo-pgsql )
+	$(use_enable phar phar )
 	$(use_enable posix posix )
-	$(use_with spell pspell "${EPREFIX}"/usr)
-	$(use_with recode recode "${EPREFIX}"/usr)
-	$(use_enable simplexml simplexml )
+	$(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_with snmp snmp "${EPREFIX}"/usr)
+	$(use_enable simplexml simplexml )
+	$(use_with   snmp snmp "${EPREFIX}"/usr)
 	$(use_enable soap soap )
 	$(use_enable sockets sockets )
-	$(use_with sqlite sqlite3 "${EPREFIX}"/usr)
-	$(use_with sybase-ct sybase-ct "${EPREFIX}"/usr)
+	$(use_with   sqlite sqlite3 "${EPREFIX}"/usr)
+	$(use_with   ssl openssl "${EPREFIX}"/usr)
+	$(use_with   ssl openssl-dir "${EPREFIX}"/usr)
+	$(use_with   sybase-ct sybase-ct "${EPREFIX}"/usr)
+	$(use_with   systemd fpm-systemd)
 	$(use_enable sysvipc sysvmsg )
 	$(use_enable sysvipc sysvsem )
 	$(use_enable sysvipc sysvshm )
-	$(use_with systemd fpm-systemd)
-	$(use_with tidy tidy "${EPREFIX}"/usr)
+	$(use_with   tidy tidy "${EPREFIX}"/usr)
 	$(use_enable tokenizer tokenizer )
+	$(use_enable unicode mbstring )
+	$(use_with   unicode onig "${EPREFIX}"/usr)
 	$(use_enable wddx wddx )
+	$(use_enable xml dom )
+	$(use_enable xml libxml )
+	$(use_with   xml libxml-dir "${EPREFIX}"/usr)
 	$(use_enable xml xml )
 	$(use_enable xmlreader xmlreader )
+	$(use_with   xmlrpc xmlrpc)
 	$(use_enable xmlwriter xmlwriter )
-	$(use_with xmlrpc xmlrpc)
-	$(use_with xslt xsl "${EPREFIX}"/usr)
+	$(use_with   xslt xsl "${EPREFIX}"/usr)
 	$(use_enable zip zip )
-	$(use_with zlib zlib "${EPREFIX}"/usr)
-	$(use_enable debug debug )"
+	$(use_with   zlib zlib "${EPREFIX}"/usr)"
 
 	# DBA support
 	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
@@ -428,25 +441,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
@@ -465,29 +462,10 @@ src_configure() {
 		my_conf+="${mysqlsock}"
 	fi
 
-	# ODBC support
-	if use odbc ; then
-		my_conf+="
-		$(use_with odbc unixODBC ${EPREFIX}/usr)"
-	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
@@ -496,11 +474,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+="