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=f7a181aae946f88a7da6ff584ed3fd785d03d02c;hp=75631afce7d98a8c24eae9d6510567bc69692538;hb=ce0702e4f9bbec9acd50e03beb8a37829e7bfa57;hpb=f51715779cd47de107fa5cb852cb08dca6b0cef1

diff --git a/dev-lang/php/php-5.6.4-r1.ebuild b/dev-lang/php/php-5.6.4-r1.ebuild
index 75631af..f7a181a 100644
--- a/dev-lang/php/php-5.6.4-r1.ebuild
+++ b/dev-lang/php/php-5.6.4-r1.ebuild
@@ -75,6 +75,8 @@ IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
 	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 )
@@ -178,12 +193,12 @@ REQUIRED_USE="
 		pdo-mysql
 	) )
 
-	pdo-dblib? ( pdo mssql )
-	pdo-oci? ( pdo oci8-instant-client )
-	pdo-odbc? ( pdo odbc )
-	pdo-mysql? ( pdo mysql )
-	pdo-pgsql? ( pdo postgres )
-	pdo-sqlite? ( pdo sqlite )
+	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 )
@@ -423,7 +438,7 @@ src_configure() {
 	# DBA support
 	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
 		|| use qdbm ; then
-		my_conf="${my_conf} --enable-dba${shared}"
+		my_conf+=" --enable-dba${shared}"
 	fi
 
 	# DBA drivers support
@@ -462,16 +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})"
 
+	# 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
+
 	# Session support
 	if use session ; then
 		my_conf+="
@@ -482,12 +495,12 @@ src_configure() {
 	fi
 
 	# Use pic for shared modules such as apache2's mod_php
-	my_conf="${my_conf} --with-pic"
+	my_conf+=" --with-pic"
 
 	# we use the system copy of pcre
 	# --with-pcre-regex affects ext/pcre
 	# --with-pcre-dir affects ext/filter and ext/zip
-	my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr"
+	my_conf+=" --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr"
 
 	# Catch CFLAGS problems
 	# Fixes bug #14067.
@@ -495,7 +508,7 @@ src_configure() {
 	replace-cpu-flags "k6*" "i586"
 
 	# Support user-passed configuration parameters
-	my_conf="${my_conf} ${EXTRA_ECONF:-}"
+	my_conf+=" ${EXTRA_ECONF:-}"
 
 	# Support the Apache2 extras, they must be set globally for all
 	# SAPIs to work correctly, especially for external PHP extensions