X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mjo-overlay.git;a=blobdiff_plain;f=dev-lang%2Fphp%2Fphp-5.6.9.ebuild;h=f1492eba3bbf5892ac7d421d36ccb99baa6d6ff5;hp=72cb4cf797a0cfe11bf774f11f2d72ee1c4d48b3;hb=3159f43d1af846567d1b5c6bec4fbbfa0e62b1bf;hpb=5fc77b34f0e4ca4531638f8b5722467b8ed50540

diff --git a/dev-lang/php/php-5.6.9.ebuild b/dev-lang/php/php-5.6.9.ebuild
index 72cb4cf..f1492eb 100644
--- a/dev-lang/php/php-5.6.9.ebuild
+++ b/dev-lang/php/php-5.6.9.ebuild
@@ -116,7 +116,7 @@ DEPEND="
 	nls? ( sys-devel/gettext )
 	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
 	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	postgres? ( dev-db/postgresql )
+	postgres? ( dev-db/postgresql:* )
 	qdbm? ( dev-db/qdbm )
 	readline? ( sys-libs/readline )
 	recode? ( app-text/recode )
@@ -406,7 +406,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
@@ -467,18 +467,12 @@ src_configure() {
 
 	# ODBC support
 	my_conf+="
-	$(use_with odbc unixODBC ${EPREFIX}/usr)"
-
-	if use iodbc ; then
-		my_conf+="
-		$(use_with iodbc iodbc ${EPREFIX}/usr)"
-	fi
+	$(use_with odbc unixODBC ${EPREFIX}/usr)
+	$(use_with iodbc iodbc ${EPREFIX}/usr)"
 
 	# Oracle support
-	if use oci8-instant-client ; then
-		my_conf+="
-		$(use_with oci8-instant-client oci8)"
-	fi
+	my_conf+="
+	$(use_with oci8-instant-client oci8)"
 
 	# PDO support
 	if use pdo ; then
@@ -487,11 +481,8 @@ src_configure() {
 		$(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
+		$(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)
+		$(use_with oci8-instant-client pdo-oci)"
 	fi
 
 	# readline/libedit support
@@ -509,12 +500,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.
@@ -522,7 +513,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