Sync with overlay.

3 files changed, 17 insertions, 5 deletions

diff --git a/eclass/php4_4-sapi.eclass b/eclass/php4_4-sapi.eclass
index 4213807c7de2..96f4d4d2f71a 100644
--- a/eclass/php4_4-sapi.eclass
+++ b/eclass/php4_4-sapi.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php4_4-sapi.eclass,v 1.9 2006/01/10 18:38:06 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php4_4-sapi.eclass,v 1.10 2006/01/17 22:40:18 chtekk Exp $
 #
 # ########################################################################
 #
@@ -254,6 +254,7 @@ php4_4-sapi_src_unpack() {
 	# Patch PHP to support heimdal instead of mit-krb5
 	if has_version "app-crypt/heimdal" ; then
 		sed -e "s|gssapi_krb5|gssapi|g" -i acinclude.m4 || die "Failed to fix heimdal libname"
+		sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 || die "Failed to fix heimdal crypt lib"
 	fi
 
 	# Patch for PostgreSQL support
@@ -261,6 +262,9 @@ php4_4-sapi_src_unpack() {
 		sed -e 's|include/postgresql|include/postgresql include/postgresql/pgsql|g' -i ext/pgsql/config.m4 || die "Failed to fix PostgreSQL include paths"
 	fi
 
+	# Disable interactive make test
+	sed -e 's/'`echo "\!getenv('NO_INTERACTION')"`'/false/g' -i run-tests.php
+
 	# stop php from activating the apache config, as we will do that ourselves
 	for i in configure sapi/apache/config.m4 sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 ; do
 		sed -i.orig -e 's,-i -a -n php,-i -n php,g' ${i}
diff --git a/eclass/php5_0-sapi.eclass b/eclass/php5_0-sapi.eclass
index b6a2537f9782..f65eaa1757ef 100644
--- a/eclass/php5_0-sapi.eclass
+++ b/eclass/php5_0-sapi.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php5_0-sapi.eclass,v 1.11 2006/01/10 18:38:06 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5_0-sapi.eclass,v 1.12 2006/01/17 22:41:28 chtekk Exp $
 #
 # ########################################################################
 #
@@ -259,6 +259,7 @@ php5_0-sapi_src_unpack() {
 	# Patch PHP to support heimdal instead of mit-krb5
 	if has_version "app-crypt/heimdal" ; then
 		sed -e "s|gssapi_krb5|gssapi|g" -i acinclude.m4 || die "Failed to fix heimdal libname"
+		sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 || die "Failed to fix heimdal crypt lib"
 	fi
 
 	# Patch for PostgreSQL support
@@ -266,6 +267,9 @@ php5_0-sapi_src_unpack() {
 		sed -e 's|include/postgresql|include/postgresql include/postgresql/pgsql|g' -i ext/pgsql/config.m4 || die "Failed to fix PostgreSQL include paths"
 	fi
 
+	# Disable interactive make test
+	sed -e 's/'`echo "\!getenv('NO_INTERACTION')"`'/false/g' -i run-tests.php
+
 	# Patch for session persistence bug
 	epatch "${FILESDIR}/5.0-any/php5-soap_persistence_session.diff"
 
@@ -347,7 +351,7 @@ php5_0-sapi_src_compile() {
 	enable_extension_with		"gettext"		"nls"			1
 	enable_extension_with		"gmp"			"gmp"			1
 	enable_extension_with		"hwapi"			"hyperwave-api"	1
-	enable_extension_without	"iconv"			"iconv"			1
+	enable_extension_without	"iconv"			"iconv"			0
 	enable_extension_with		"informix"		"informix"		1
 	enable_extension_disable	"ipv6"			"ipv6"			0
 	# ircg extension not supported on Gentoo at this time
diff --git a/eclass/php5_1-sapi.eclass b/eclass/php5_1-sapi.eclass
index c650131e6b8d..0bb69c2c70f3 100644
--- a/eclass/php5_1-sapi.eclass
+++ b/eclass/php5_1-sapi.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php5_1-sapi.eclass,v 1.12 2006/01/11 06:39:42 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5_1-sapi.eclass,v 1.13 2006/01/17 22:45:09 chtekk Exp $
 #
 # ########################################################################
 #
@@ -266,6 +266,7 @@ php5_1-sapi_src_unpack() {
 	# Patch PHP to support heimdal instead of mit-krb5
 	if has_version "app-crypt/heimdal" ; then
 		sed -e "s|gssapi_krb5|gssapi|g" -i acinclude.m4 || die "Failed to fix heimdal libname"
+		sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 || die "Failed to fix heimdal crypt lib"
 	fi
 
 	# Patch for PostgreSQL support
@@ -273,6 +274,9 @@ php5_1-sapi_src_unpack() {
 		sed -e 's|include/postgresql|include/postgresql include/postgresql/pgsql|g' -i ext/pgsql/config.m4 || die "Failed to fix PostgreSQL include paths"
 	fi
 
+	# Disable interactive make test
+	sed -e 's/'`echo "\!getenv('NO_INTERACTION')"`'/false/g' -i run-tests.php
+
 	# Patch for session persistence bug
 	epatch "${FILESDIR}/5.1-any/php5-soap_persistence_session.diff"
 
@@ -355,7 +359,7 @@ php5_1-sapi_src_compile() {
 	enable_extension_with		"gettext"		"nls"			1
 	enable_extension_with		"gmp"			"gmp"			1
 	enable_extension_with		"hwapi"			"hyperwave-api"	1
-	enable_extension_without	"iconv"			"iconv"			1
+	enable_extension_without	"iconv"			"iconv"			0
 	enable_extension_with		"informix"		"informix"		1
 	enable_extension_disable	"ipv6"			"ipv6"			0
 	# ircg extension not supported on Gentoo at this time