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=e7b309815812523bfb8f39773eeecfdcd91e8533;hp=82182e2f37fca52185487a439a391c0e989fda87;hb=50325f4107ee8ed353944b921defb968763c2b3a;hpb=57f70319ca5889723d8027a61296716e948b93ff

diff --git a/dev-lang/php/php-5.6.4-r1.ebuild b/dev-lang/php/php-5.6.4-r1.ebuild
index 82182e2..e7b3098 100644
--- a/dev-lang/php/php-5.6.4-r1.ebuild
+++ b/dev-lang/php/php-5.6.4-r1.ebuild
@@ -69,12 +69,14 @@ 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-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"
 
+# See REQUIRED_USE for an explanation of why we duplicate dependencies
+# for USE=pdo-foo.
 DEPEND="
 	>=app-admin/eselect-php-0.7.1-r3[apache2?,fpm?]
 	>=dev-libs/libpcre-8.32[unicode]
@@ -111,11 +113,17 @@ DEPEND="
 	mssql? ( dev-db/freetds[mssql] )
 	libmysqlclient? (
 		mysql? ( virtual/mysql )
-		mysqli? ( >=virtual/mysql-4.1 )
+		mysqli? ( virtual/mysql )
 	)
 	nls? ( sys-devel/gettext )
 	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
 	odbc? ( >=dev-db/unixODBC-1.8.13 )
+	pdo-dblib? ( dev-db/freetds[mssql] )
+	pdo-oci? ( dev-db/oracle-instantclient-basic )
+	pdo-odbc? ( >=dev-db/unixODBC-1.8.13 )
+	pdo-mysql? ( virtual/mysql )
+	pdo-pgsql? ( dev-db/postgresql )
+	pdo-sqlite? ( >=dev-db/sqlite-3.7.6.3 )
 	postgres? ( dev-db/postgresql )
 	qdbm? ( dev-db/qdbm )
 	readline? ( sys-libs/readline )
@@ -155,6 +163,13 @@ DEPEND="
 
 php="=${CATEGORY}/${PF}"
 
+# All of the pdo-foo USE flags could require USE=foo, but this has an
+# unwanted side effect. USE=mysql, for example, also enables the old
+# deprecated mysql database driver. We would like it to be possible to
+# install pdo-mysql without the deprecated mysql driver, so we don't
+# require USE=mysql with USE=pdo-mysql. This means that we have to
+# reproduce the mysql? (...) dependencies for pdo-mysql in (R)DEPEND
+# above.
 REQUIRED_USE="
 	truetype? ( gd )
 	vpx? ( gd )
@@ -175,9 +190,15 @@ REQUIRED_USE="
 	libmysqlclient? ( || (
 		mysql
 		mysqli
-		pdo
+		pdo-mysql
 	) )
 
+	pdo-dblib? ( pdo )
+	pdo-oci? ( pdo )
+	pdo-odbc? ( pdo )
+	pdo-mysql? ( pdo )
+	pdo-pgsql? ( pdo )
+	pdo-sqlite? ( pdo )
 	qdbm? ( !gdbm )
 	readline? ( !libedit )
 	recode? ( !imap !mysql !mysqli )
@@ -357,11 +378,15 @@ src_configure() {
 	$(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)
@@ -370,10 +395,16 @@ src_configure() {
 	$(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 )
@@ -432,18 +463,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
-
-	# 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
@@ -455,32 +477,14 @@ src_configure() {
 	my_conf+=" $(use_with mysql mysql $mysqllib)"
 	my_conf+=" $(use_with mysqli mysqli $mysqlilib)"
 
-	local mysqlsock=" $(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)"
-	if use mysql ; then
-		my_conf+="${mysqlsock}"
-	elif use mysqli ; then
-		my_conf+="${mysqlsock}"
-	fi
+	# MySQL PDO support
+	my_conf+=" $(use_with pdo-mysql pdo-mysql ${mysqllib})"
 
-	# 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
+	# If MySQL is enabled in any way, pass --with-mysql-sock to ./configure.
+	if use mysql || use mysqli || use pdo-mysql ; then
+		my_conf+=" --with-mysql-sock=${EPREFIX}/var/run/mysqld/mysqld.sock"
 	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+="