Use phpconfutils, fix bug #120088, fix bug #122379.

(Portage version: 2.1_pre5-r4)

11 files changed, 59 insertions, 361 deletions

diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index 126270d9f4ae..cf2368ab2822 100644
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-lang/php
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.80 2006/03/14 06:05:56 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.81 2006/03/24 23:04:27 chtekk Exp $
+
+  24 Mar 2006; Luca Longinotti <chtekk@gentoo.org>
+  files/70_mod_php.conf-apache1, files/70_mod_php5.conf-apache1,
+  files/70_mod_php5.conf-apache2, php-4.3.11-r5.ebuild,
+  -php-4.4.1-r3.ebuild, php-4.4.2.ebuild, php-5.0.5-r5.ebuild,
+  php-5.1.2.ebuild:
+  Introduce usage of phpconfutils eclass to handle USE flag dependencies
+  automatically, allowing to build dev-lang/php without intervention on
+  default USE flags, solves bug #120088. Fix bug #122379.
 
   14 Mar 2006; Joshua Jackson <tsunam@gentoo.org> php-4.4.2.ebuild,
   php-5.1.2.ebuild:
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 78f4ec98f765..e7204a1d40fc 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,27 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 7cb1459a0f4fb5f6d26db6dfd9957807 ChangeLog 18414
-RMD160 1520796d72be2f7b7630f644771f8542bbfd2a88 ChangeLog 18414
-SHA256 11b19acaf50ae6165ed8b8eb4fc12348486fbd59b8e30c48f091a9267b4b7d2c ChangeLog 18414
-MD5 028492a70fa9f5eef1d4e5fb1993214e files/70_mod_php.conf-apache1 457
-RMD160 cba11929fc8fce91753b89fd468362fc24a4c42a files/70_mod_php.conf-apache1 457
-SHA256 b8f860a576b78ab9636ff551c56509ca52a9204d127452625e23c88b32ef4806 files/70_mod_php.conf-apache1 457
+MD5 a1155fbffb723b5d6e869a3d1b0a3860 ChangeLog 18873
+RMD160 08f326cc284f83a72e5a8a33149f13d06d908dc8 ChangeLog 18873
+SHA256 8387ce3c322caceeeb57161a1aeeb72c5f40db6714845d064f168804c16d376e ChangeLog 18873
+MD5 6171c7aa95f69b8a54b0f29bd1056d2b files/70_mod_php.conf-apache1 454
+RMD160 869b5c225782690889bdfa5227a8f46c33ac71d3 files/70_mod_php.conf-apache1 454
+SHA256 9e6227e508f0c297f48c667e2135c7692f7943b3d0cd2ffdbdcca0bad5220343 files/70_mod_php.conf-apache1 454
 MD5 4a84c92760a7758b6446a62cabb8beed files/70_mod_php.conf-apache2 458
 RMD160 d2de515f92639d817a67c3a44db3e3dff4864974 files/70_mod_php.conf-apache2 458
 SHA256 06e3046fa7352eb2349967382bff711c01f6600688b8f49569ceacf2a31b130a files/70_mod_php.conf-apache2 458
-MD5 89eebb502d9fe877f974543630df8d44 files/70_mod_php5.conf-apache1 497
-RMD160 8906581f5f6698aed33b7710042936f7904df197 files/70_mod_php5.conf-apache1 497
-SHA256 2ae3f97a49e86b079d7b6d48e5fde0d3d18841c78a9373fa24500f31f52110e6 files/70_mod_php5.conf-apache1 497
-MD5 6d7e37faeb0e0ce557bae6a76888b261 files/70_mod_php5.conf-apache2 498
-RMD160 60b32c16c251db9685bba23d82bf8e749a1d0223 files/70_mod_php5.conf-apache2 498
-SHA256 08db825992b8f62e03a6e9f54db1b7947b615655cda915dc00b901a479585a02 files/70_mod_php5.conf-apache2 498
+MD5 acdac68b3a1afd99aaf37e818bc921e3 files/70_mod_php5.conf-apache1 494
+RMD160 52b3137709eaa38a5a024d8d76f9970ca49b5485 files/70_mod_php5.conf-apache1 494
+SHA256 d6755b60c2d22b315e3affe501a5c4883180736d3b46839b89334a1123ecfe52 files/70_mod_php5.conf-apache1 494
+MD5 acdac68b3a1afd99aaf37e818bc921e3 files/70_mod_php5.conf-apache2 494
+RMD160 52b3137709eaa38a5a024d8d76f9970ca49b5485 files/70_mod_php5.conf-apache2 494
+SHA256 d6755b60c2d22b315e3affe501a5c4883180736d3b46839b89334a1123ecfe52 files/70_mod_php5.conf-apache2 494
 MD5 7ac3f86eb868abf5bcb23a3a758d82dc files/digest-php-4.3.11-r5 1093
 RMD160 4de7599dea4b17a9eaee8987512ca0d2ed596c69 files/digest-php-4.3.11-r5 1093
 SHA256 9476ccfbeb934abc7dc1973013e0dc5f185246168dbd6d668c88eb6bb5365494 files/digest-php-4.3.11-r5 1093
-MD5 0dfd3cbffff685c6a22926dce7bcbe2a files/digest-php-4.4.1-r3 807
-RMD160 c8d3f8c721620a4b1dddcb5fdd58b2348644276d files/digest-php-4.4.1-r3 807
-SHA256 0cea1ba92bd0f4426e9f2cf6450c9e9ff380ea38cde09d2d6e2ba180b47e0713 files/digest-php-4.4.1-r3 807
 MD5 a7ac0298702473c115fd1bd2410f0152 files/digest-php-4.4.2 807
 RMD160 e0111c53e805340c3b9e4243edd537652a2b2b9d files/digest-php-4.4.2 807
 SHA256 c6eaf4c85fa86b3254f0f61c8127956d0b8ab0c8d6292ae9cab3ebbc03f832b3 files/digest-php-4.4.2 807
@@ -34,25 +28,15 @@ SHA256 c5796a8c5be891a50b66433f00df75607a22c5155bfae2527f657cc870f433e4 files/di
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a metadata.xml 157
 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1 metadata.xml 157
-MD5 08faf252d954004ef58b7d8ab251e26a php-4.3.11-r5.ebuild 8568
-RMD160 2e8f485904f50fa07d73a31b5628aebb0246425f php-4.3.11-r5.ebuild 8568
-SHA256 28cfee0e2c2d276c031e08bca43ab260ac8cbbe9df7b90a7fdaaeb5e702c187c php-4.3.11-r5.ebuild 8568
-MD5 3d71ed11d45be6af5fbbe24f916d5a53 php-4.4.1-r3.ebuild 7853
-RMD160 514bd3d0a833d45c3727bd64f8ad5c73333601c0 php-4.4.1-r3.ebuild 7853
-SHA256 4a8f663ddada066e3348f173e86cc8584fe4c78c8c09af210a0080ff78e42814 php-4.4.1-r3.ebuild 7853
-MD5 2b044f30de37eecdcf84774e5fa0a62b php-4.4.2.ebuild 7849
-RMD160 029d531c53d5a0acee21e3ea42582428d9cacb7a php-4.4.2.ebuild 7849
-SHA256 eed9d5e88dc4dbf7881efefad30d759aabdc71872515f85ec2cd6aa21a0bc571 php-4.4.2.ebuild 7849
-MD5 d1b5299df3e797cc883b95970a47b22c php-5.0.5-r5.ebuild 4678
-RMD160 5997eca0ee7809c92d13f464f50326f30888eec5 php-5.0.5-r5.ebuild 4678
-SHA256 9dc9b9f4f2334a0a662f934f3ab6e1592d8f0fafda2f7abdeb6a60d8b1086019 php-5.0.5-r5.ebuild 4678
-MD5 9d7ef36e7eaf8ed3f52bf7817a9bdd0c php-5.1.2.ebuild 7857
-RMD160 7ede746ee5cdf22d905820bd04b1db75a8c22ca3 php-5.1.2.ebuild 7857
-SHA256 e8d93d2a234abedb9c046271cf26a10a5b7810f7fcfa1576d28d72697b173a80 php-5.1.2.ebuild 7857
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEHPth2+ySkm8kpY0RAtm6AKC3TSqS0RduozCJLGGApDHPT+64oACgiPVy
-zrNqIyqanALvOUCqzNIUH2E=
-=z6Ds
------END PGP SIGNATURE-----
+MD5 66c0212000dd1fa424be555f7d932a50 php-4.3.11-r5.ebuild 8500
+RMD160 62ee9daa521598d2a28e6929f0c71e1beb46da7f php-4.3.11-r5.ebuild 8500
+SHA256 2c00b108ceb9c447e8a18e2a838058f78735ce42827122af6352c99fe13ec620 php-4.3.11-r5.ebuild 8500
+MD5 26f356e38e2115500c014b477179819e php-4.4.2.ebuild 7785
+RMD160 783254a6942f8fe4ce9915b63b7d371b777c8a17 php-4.4.2.ebuild 7785
+SHA256 d4152733465dd8677f5caeeebe3fb27f155c3f9a8cb808624a3c0427868b665f php-4.4.2.ebuild 7785
+MD5 45069fb29c6312e0f0c1f28d0e36b29e php-5.0.5-r5.ebuild 4598
+RMD160 4440ec88533b1c8539762419513ceef617624722 php-5.0.5-r5.ebuild 4598
+SHA256 79f51c9fa1c1c57c9f31fdb0ec30b278584987d74b48b6d1d0edc6a72a058ed4 php-5.0.5-r5.ebuild 4598
+MD5 a83b00cea3ee271c5abb60fadc264de4 php-5.1.2.ebuild 7793
+RMD160 17c8c507fd1fbe83002429f2574248885765ced9 php-5.1.2.ebuild 7793
+SHA256 d2908fbde1616947b896dc6e475684d4619e54081ea0b0659b31eb1cb3b1fd26 php-5.1.2.ebuild 7793
diff --git a/dev-lang/php/files/70_mod_php.conf-apache1 b/dev-lang/php/files/70_mod_php.conf-apache1
index 60a1fe63a1c1..6d352b03b303 100644
--- a/dev-lang/php/files/70_mod_php.conf-apache1
+++ b/dev-lang/php/files/70_mod_php.conf-apache1
@@ -1,7 +1,7 @@
 <IfDefine PHP4>
 
 	# Load the module first
-	<IfModule !sapi_apache.c>
+	<IfModule !mod_php4.c>
 		LoadModule php4_module    modules/libphp4.so
 	</IfModule>
 
diff --git a/dev-lang/php/files/70_mod_php5.conf-apache1 b/dev-lang/php/files/70_mod_php5.conf-apache1
index 1aee813559e6..e7604dffb042 100644
--- a/dev-lang/php/files/70_mod_php5.conf-apache1
+++ b/dev-lang/php/files/70_mod_php5.conf-apache1
@@ -1,7 +1,7 @@
 <IfDefine PHP5>
 
 	# Load the module first
-	<IfModule !sapi_apache.c>
+	<IfModule !mod_php5.c>
 		LoadModule php5_module    modules/libphp5.so
 	</IfModule>
 
diff --git a/dev-lang/php/files/70_mod_php5.conf-apache2 b/dev-lang/php/files/70_mod_php5.conf-apache2
index ecf115236f73..e7604dffb042 100644
--- a/dev-lang/php/files/70_mod_php5.conf-apache2
+++ b/dev-lang/php/files/70_mod_php5.conf-apache2
@@ -1,7 +1,7 @@
 <IfDefine PHP5>
 
 	# Load the module first
-	<IfModule !sapi_apache2.c>
+	<IfModule !mod_php5.c>
 		LoadModule php5_module    modules/libphp5.so
 	</IfModule>
 
diff --git a/dev-lang/php/files/digest-php-4.4.1-r3 b/dev-lang/php/files/digest-php-4.4.1-r3
deleted file mode 100644
index 44ca504a0081..000000000000
--- a/dev-lang/php/files/digest-php-4.4.1-r3
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 615d27d7c39017e1e45f15bc8eed3c94 hardening-patch-4.4.1-0.4.8-gentoo.patch.gz 59878
-RMD160 bba3eeab2a33b34a73322d23bf60bf37dc8ff72b hardening-patch-4.4.1-0.4.8-gentoo.patch.gz 59878
-SHA256 83797ef76b564c5e74f1cdf6328e71ee4955e1e9fb748da5bc73d92267f27fe1 hardening-patch-4.4.1-0.4.8-gentoo.patch.gz 59878
-MD5 6b5726471189f8a1f26dd7cc5e19b442 php-4.4.1.tar.bz2 4157749
-RMD160 fb7f5b90d05a2efa8f0122740e2c27a29f28574e php-4.4.1.tar.bz2 4157749
-SHA256 c3010a85089bd464d5bbdda63dd253e0cf779db9670accf1ea5355de7ba448f8 php-4.4.1.tar.bz2 4157749
-MD5 0f43b1e41ce3093e8f4813a0b8219c44 php-patchset-4.4.1-r2.tar.bz2 17535
-RMD160 f152c779ee7aeeebc3c68bcd70de386aa20b4551 php-patchset-4.4.1-r2.tar.bz2 17535
-SHA256 a33cc8ede8ef8c7b9541e71cd65f19b87bc55054dd4cbc1a69acdd14b048761c php-patchset-4.4.1-r2.tar.bz2 17535
diff --git a/dev-lang/php/php-4.3.11-r5.ebuild b/dev-lang/php/php-4.3.11-r5.ebuild
index e47f71909896..dca430732d7e 100644
--- a/dev-lang/php/php-4.3.11-r5.ebuild
+++ b/dev-lang/php/php-4.3.11-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-4.3.11-r5.ebuild,v 1.9 2006/03/12 13:25:34 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-4.3.11-r5.ebuild,v 1.10 2006/03/24 23:04:27 chtekk Exp $
 
 IUSE="cgi cli discard-path force-cgi-redirect"
 KEYWORDS="~alpha arm ia64 ~ppc s390 sh sparc x86"
@@ -43,7 +43,7 @@ SRC_URI="${SRC_URI} http://gentoo.longitekk.com/php-pcrelib-new-secpatch.tar.bz2
 pkg_setup() {
 	# make sure the user has specified a SAPI
 	einfo "Determining SAPI(s) to build"
-	confutils_require_any "  Enabled  SAPI:" "  Disabled SAPI:" cli cgi apache apache2
+	phpconfutils_require_any "  Enabled  SAPI:" "  Disabled SAPI:" cli cgi apache apache2
 
 	if useq apache2 ; then
 		if [[ "${APACHE_VERSION}" != "0" ]] ; then
@@ -157,8 +157,8 @@ src_compile_fastbuild() {
 
 	if [[ ${build_cgi} = 1 ]] ; then
 		my_conf="${my_conf} --enable-cgi --enable-fastcgi"
-		enable_extension_enable "discard-path" "discard-path" 0
-		enable_extension_enable "force-cgi-redirect" "force-cgi-redirect" 0
+		phpconfutils_extension_enable "discard-path" "discard-path" 0
+		phpconfutils_extension_enable "force-cgi-redirect" "force-cgi-redirect" 0
 	else
 		my_conf="${my_conf} --disable-cgi"
 	fi
@@ -235,8 +235,8 @@ src_compile_normal() {
 				;;
 			cgi)
 				my_conf="--disable-cli --enable-cgi --enable-fastcgi"
-				enable_extension_enable "discard-path" "discard-path" 0
-				enable_extension_enable "force-cgi-redirect" "force-cgi-redirect" 0
+				phpconfutils_extension_enable "discard-path" "discard-path" 0
+				phpconfutils_extension_enable "force-cgi-redirect" "force-cgi-redirect" 0
 				php4_4-sapi_src_compile
 				cp sapi/cgi/php php-cgi
 				;;
diff --git a/dev-lang/php/php-4.4.1-r3.ebuild b/dev-lang/php/php-4.4.1-r3.ebuild
deleted file mode 100644
index bc42bcf5bb8d..000000000000
--- a/dev-lang/php/php-4.4.1-r3.ebuild
+++ /dev/null
@@ -1,286 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-4.4.1-r3.ebuild,v 1.11 2006/03/12 13:25:34 chtekk Exp $
-
-IUSE="cgi cli discard-path force-cgi-redirect"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
-
-# NOTE: Portage doesn't support setting PROVIDE based on the USE flags
-#		that have been enabled, so we have to PROVIDE everything for now
-#		and hope for the best
-PROVIDE="virtual/php virtual/httpd-php"
-
-# php package settings
-SLOT="4"
-MY_PHP_PV="${PV}"
-MY_PHP_P="php-${MY_PHP_PV}"
-PHP_PACKAGE=1
-
-# php patch settings
-PHP_PATCHSET_REV="2"
-HARDENEDPHP_PATCH="hardening-patch-${MY_PHP_PV}-0.4.8-gentoo.patch.gz"
-MULTILIB_PATCH="${MY_PHP_PV}/opt/php${MY_PHP_PV}-multilib-search-path.patch"
-FASTBUILD_PATCH="${MY_PHP_PV}/opt/php${MY_PHP_PV}-fastbuild.patch"
-
-inherit php4_4-sapi apache-module
-
-want_apache
-
-DESCRIPTION="The PHP language runtime engine."
-
-DEPEND="${DEPEND} app-admin/php-toolkit"
-RDEPEND="${RDEPEND} app-admin/php-toolkit"
-
-# PHP patchsets
-SRC_URI="${SRC_URI} http://gentoo.longitekk.com/php-patchset-${MY_PHP_PV}-r${PHP_PATCHSET_REV}.tar.bz2"
-
-# Hardened-PHP patch
-[[ -n "${HARDENEDPHP_PATCH}" ]] && SRC_URI="${SRC_URI} hardenedphp? ( http://gentoo.longitekk.com/${HARDENEDPHP_PATCH} )"
-
-pkg_setup() {
-	# make sure the user has specified a SAPI
-	einfo "Determining SAPI(s) to build"
-	confutils_require_any "  Enabled  SAPI:" "  Disabled SAPI:" cli cgi apache apache2
-
-	if useq apache2 ; then
-		if [[ "${APACHE_VERSION}" != "0" ]] ; then
-			if ! useq threads ; then
-				APACHE2_SAFE_MPMS="peruser prefork"
-			else
-				APACHE2_SAFE_MPMS="event leader metuxmpm perchild threadpool worker"
-			fi
-
-			ewarn
-			ewarn "If this package fails with a fatal error about Apache2 not having"
-			ewarn "been compiled with a compatible MPM, this is normally because you"
-			ewarn "need to toggle the 'threads' USE flag."
-			ewarn
-			ewarn "If 'threads' is off, try switching it on."
-			ewarn "If 'threads' is on, try switching it off."
-			ewarn
-
-			apache-module_pkg_setup
-		fi
-	fi
-
-	if useq fastbuild ; then
-		ewarn
-		ewarn "'fastbuild' attempts to build all SAPIs in a single pass."
-		ewarn "This is an experimental feature, which may fail to compile"
-		ewarn "and may produce PHP binaries which are broken."
-		ewarn
-		ewarn "Rebuild without 'fastbuild' and reproduce any bugs before filing"
-		ewarn "any bugs in Gentoo's Bugzilla or bugs.php.net."
-		ewarn
-	fi
-
-	php4_4-sapi_pkg_setup
-}
-
-php_determine_sapis() {
-	# holds the list of sapis that we want to build
-	PHPSAPIS=
-
-	if useq cli ; then
-		PHPSAPIS="${PHPSAPIS} cli"
-	fi
-
-	if useq cgi ; then
-		PHPSAPIS="${PHPSAPIS} cgi"
-	fi
-
-	# note - we can only build one apache sapi for now
-	# note - apache SAPI comes after the simpler cli/cgi sapis
-	if useq apache || useq apache2 ; then
-		if [[ "${APACHE_VERSION}" != "0" ]] ; then
-			PHPSAPIS="${PHPSAPIS} apache${APACHE_VERSION}"
-		fi
-	fi
-}
-
-src_compile() {
-	if useq fastbuild && [[ -n "${FASTBUILD_PATCH}" ]] ; then
-		src_compile_fastbuild
-	else
-		src_compile_normal
-	fi
-}
-
-src_compile_fastbuild() {
-	php_determine_sapis
-
-	build_cli=0
-	build_cgi=0
-	build_apache=0
-
-	for x in ${PHPSAPIS} ; do
-		case ${x} in
-			cli)
-				build_cli=1
-				;;
-			cgi)
-				build_cgi=1
-				;;
-			apache*)
-				build_apache=1
-				;;
-		esac
-	done
-
-	if [[ ${build_cli} = 1 ]] ; then
-		my_conf="${my_conf} --enable-cli"
-	else
-		my_conf="${my_conf} --disable-cli"
-	fi
-
-	if [[ ${build_cgi} = 1 ]] ; then
-		my_conf="${my_conf} --enable-cgi --enable-fastcgi"
-		enable_extension_enable "discard-path" "discard-path" 0
-		enable_extension_enable "force-cgi-redirect" "force-cgi-redirect" 0
-	else
-		my_conf="${my_conf} --disable-cgi"
-	fi
-
-	if [[ ${build_apache} = 1 ]] ; then
-		my_conf="${my_conf} --with-apxs${USE_APACHE2}=/usr/sbin/apxs${USE_APACHE2}"
-	fi
-
-	# now we know what we are building, build it
-	php4_4-sapi_src_compile
-
-	# to keep the separate php.ini files for each SAPI, we change the
-	# build-defs.h and recompile
-
-	if [[ ${build_cli} = 1 ]] ; then
-		einfo
-		einfo "Building CLI SAPI"
-		einfo
-
-		sed -e 's|^#define PHP_CONFIG_FILE_PATH.*|#define PHP_CONFIG_FILE_PATH "/etc/php/cli-php4"|g;' -i main/build-defs.h
-		sed -e 's|^#define PHP_CONFIG_FILE_SCAN_DIR.*|#define PHP_CONFIG_FILE_SCAN_DIR "/etc/php/cli-php4/ext-active"|g;' -i main/build-defs.h
-		for x in main/main.o main/main.lo main/php_ini.o main/php_ini.lo ; do
-			[[ -f ${x} ]] && rm -f ${x}
-		done
-		make sapi/cli/php || die "Unable to make CLI SAPI"
-		cp sapi/cli/php php-cli || die "Unable to copy CLI SAPI"
-	fi
-
-	if [[ ${build_cgi} = 1 ]] ; then
-		einfo
-		einfo "Building CGI SAPI"
-		einfo
-
-		sed -e 's|^#define PHP_CONFIG_FILE_PATH.*|#define PHP_CONFIG_FILE_PATH "/etc/php/cgi-php4"|g;' -i main/build-defs.h
-		sed -e 's|^#define PHP_CONFIG_FILE_SCAN_DIR.*|#define PHP_CONFIG_FILE_SCAN_DIR "/etc/php/cgi-php4/ext-active"|g;' -i main/build-defs.h
-		for x in main/main.o main/main.lo main/php_ini.o main/php_ini.lo ; do
-			[[ -f ${x} ]] && rm -f ${x}
-		done
-		make sapi/cgi/php || die "Unable to make CGI SAPI"
-		cp sapi/cgi/php php-cgi || die "Unable to copy CGI SAPI"
-	fi
-
-	if [[ ${build_apache} = 1 ]] ; then
-		einfo
-		einfo "Building apache${USE_APACHE2} SAPI"
-		einfo
-
-		sed -e "s|^#define PHP_CONFIG_FILE_PATH.*|#define PHP_CONFIG_FILE_PATH \"/etc/php/apache${APACHE_VERSION}-php4\"|g;" -i main/build-defs.h
-		sed -e "s|^#define PHP_CONFIG_FILE_SCAN_DIR.*|#define PHP_CONFIG_FILE_SCAN_DIR \"/etc/php/apache${APACHE_VERSION}-php4/ext-active\"|g;" -i main/build-defs.h
-		for x in main/main.o main/main.lo main/php_ini.o main/php_ini.lo ; do
-			[[ -f ${x} ]] && rm -f ${x}
-		done
-		make || die "Unable to build mod_php"
-	fi
-}
-
-src_compile_normal() {
-	php_determine_sapis
-
-	CLEAN_REQUIRED=0
-
-	for x in ${PHPSAPIS} ; do
-		if [[ "${CLEAN_REQUIRED}" = 1 ]] ; then
-			make clean
-		fi
-
-		PHPSAPI=${x}
-
-		case ${x} in
-			cli)
-				my_conf="--enable-cli --disable-cgi"
-				php4_4-sapi_src_compile
-				cp sapi/cli/php php-cli
-				;;
-			cgi)
-				my_conf="--disable-cli --enable-cgi --enable-fastcgi"
-				enable_extension_enable "discard-path" "discard-path" 0
-				enable_extension_enable "force-cgi-redirect" "force-cgi-redirect" 0
-				php4_4-sapi_src_compile
-				cp sapi/cgi/php php-cgi
-				;;
-			apache*)
-				my_conf="--disable-cli --with-apxs${USE_APACHE2}=/usr/sbin/apxs${USE_APACHE2}"
-				php4_4-sapi_src_compile
-				;;
-		esac
-
-		CLEAN_REQUIRED=1
-	done
-}
-
-src_install() {
-	php_determine_sapis
-
-	destdir=/usr/$(get_libdir)/php4
-
-	# let the eclass do the heavy lifting
-	php4_4-sapi_src_install
-
-	einfo
-	einfo "Installing SAPI(s) ${PHPSAPIS}"
-	einfo
-
-	for x in ${PHPSAPIS} ; do
-		PHPSAPI=${x}
-		case ${x} in
-			cli)
-				einfo "Installing CLI SAPI"
-				into ${destdir}
-				newbin php-cli php || die "Unable to install ${x} sapi"
-				php4_4-sapi_install_ini
-				;;
-			cgi)
-				einfo "Installing CGI SAPI"
-				into ${destdir}
-				dobin php-cgi || die "Unable to install ${x} sapi"
-				php4_4-sapi_install_ini
-				;;
-			apache*)
-				einfo "Installing apache${USE_APACHE2} SAPI"
-				make INSTALL_ROOT="${D}" install-sapi || die "Unable to install ${x} SAPI"
-				if [[ -n "${USE_APACHE2}" ]] ; then
-					einfo "Installing Apache2 config file for PHP4 (70_mod_php.conf)"
-					insinto ${APACHE_MODULES_CONFDIR}
-					newins "${FILESDIR}/70_mod_php.conf-apache2" "70_mod_php.conf"
-				else
-					einfo "Installing Apache config file for PHP4 (70_mod_php.conf)"
-					insinto ${APACHE_MODULES_CONFDIR}
-					newins "${FILESDIR}/70_mod_php.conf-apache1" "70_mod_php.conf"
-				fi
-				php4_4-sapi_install_ini
-				;;
-		esac
-	done
-}
-
-pkg_postinst() {
-	# Output some general info to the user
-	if useq apache || useq apache2 ; then
-		APACHE1_MOD_DEFINE="PHP4"
-		APACHE1_MOD_CONF="70_mod_php"
-		APACHE2_MOD_DEFINE="PHP4"
-		APACHE2_MOD_CONF="70_mod_php"
-		apache-module_pkg_postinst
-	fi
-	php4_4-sapi_pkg_postinst
-}
diff --git a/dev-lang/php/php-4.4.2.ebuild b/dev-lang/php/php-4.4.2.ebuild
index 3516bbd516f0..62132e6e5358 100644
--- a/dev-lang/php/php-4.4.2.ebuild
+++ b/dev-lang/php/php-4.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-4.4.2.ebuild,v 1.9 2006/03/19 06:33:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-4.4.2.ebuild,v 1.10 2006/03/24 23:04:27 chtekk Exp $
 
 IUSE="cgi cli discard-path force-cgi-redirect"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
@@ -40,7 +40,7 @@ SRC_URI="${SRC_URI} http://gentoo.longitekk.com/php-patchset-${MY_PHP_PV}-r${PHP
 pkg_setup() {
 	# make sure the user has specified a SAPI
 	einfo "Determining SAPI(s) to build"
-	confutils_require_any "  Enabled  SAPI:" "  Disabled SAPI:" cli cgi apache apache2
+	phpconfutils_require_any "  Enabled  SAPI:" "  Disabled SAPI:" cli cgi apache apache2
 
 	if useq apache2 ; then
 		if [[ "${APACHE_VERSION}" != "0" ]] ; then
@@ -135,8 +135,8 @@ src_compile_fastbuild() {
 
 	if [[ ${build_cgi} = 1 ]] ; then
 		my_conf="${my_conf} --enable-cgi --enable-fastcgi"
-		enable_extension_enable "discard-path" "discard-path" 0
-		enable_extension_enable "force-cgi-redirect" "force-cgi-redirect" 0
+		phpconfutils_extension_enable "discard-path" "discard-path" 0
+		phpconfutils_extension_enable "force-cgi-redirect" "force-cgi-redirect" 0
 	else
 		my_conf="${my_conf} --disable-cgi"
 	fi
@@ -213,8 +213,8 @@ src_compile_normal() {
 				;;
 			cgi)
 				my_conf="--disable-cli --enable-cgi --enable-fastcgi"
-				enable_extension_enable "discard-path" "discard-path" 0
-				enable_extension_enable "force-cgi-redirect" "force-cgi-redirect" 0
+				phpconfutils_extension_enable "discard-path" "discard-path" 0
+				phpconfutils_extension_enable "force-cgi-redirect" "force-cgi-redirect" 0
 				php4_4-sapi_src_compile
 				cp sapi/cgi/php php-cgi
 				;;
diff --git a/dev-lang/php/php-5.0.5-r5.ebuild b/dev-lang/php/php-5.0.5-r5.ebuild
index d625eb6f96f0..a5b03c210c28 100644
--- a/dev-lang/php/php-5.0.5-r5.ebuild
+++ b/dev-lang/php/php-5.0.5-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.0.5-r5.ebuild,v 1.12 2006/03/12 13:25:34 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.0.5-r5.ebuild,v 1.13 2006/03/24 23:04:27 chtekk Exp $
 
 IUSE="cgi cli discard-path force-cgi-redirect"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
@@ -39,7 +39,7 @@ SRC_URI="${SRC_URI} http://gentoo.longitekk.com/php-patchset-${MY_PHP_PV}-r${PHP
 pkg_setup() {
 	# make sure the user has specified a SAPI
 	einfo "Determining SAPI(s) to build"
-	confutils_require_any "  Enabled  SAPI:" "  Disabled SAPI:" cli cgi apache apache2
+	phpconfutils_require_any "  Enabled  SAPI:" "  Disabled SAPI:" cli cgi apache apache2
 
 	if useq apache2 ; then
 		if [[ "${APACHE_VERSION}" != "0" ]] ; then
@@ -106,8 +106,8 @@ src_compile() {
 				;;
 			cgi)
 				my_conf="--disable-cli --enable-cgi --enable-fastcgi"
-				enable_extension_enable "discard-path" "discard-path" 0
-				enable_extension_enable "force-cgi-redirect" "force-cgi-redirect" 0
+				phpconfutils_extension_enable "discard-path" "discard-path" 0
+				phpconfutils_extension_enable "force-cgi-redirect" "force-cgi-redirect" 0
 				php5_0-sapi_src_compile
 				cp sapi/cgi/php php-cgi
 				;;
diff --git a/dev-lang/php/php-5.1.2.ebuild b/dev-lang/php/php-5.1.2.ebuild
index b171434b4383..1e88d5fadcc0 100644
--- a/dev-lang/php/php-5.1.2.ebuild
+++ b/dev-lang/php/php-5.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.1.2.ebuild,v 1.9 2006/03/19 06:33:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.1.2.ebuild,v 1.10 2006/03/24 23:04:27 chtekk Exp $
 
 IUSE="cgi cli discard-path force-cgi-redirect"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
@@ -40,7 +40,7 @@ SRC_URI="${SRC_URI} http://gentoo.longitekk.com/php-patchset-${MY_PHP_PV}-r${PHP
 pkg_setup() {
 	# make sure the user has specified a SAPI
 	einfo "Determining SAPI(s) to build"
-	confutils_require_any "  Enabled  SAPI:" "  Disabled SAPI:" cli cgi apache apache2
+	phpconfutils_require_any "  Enabled  SAPI:" "  Disabled SAPI:" cli cgi apache apache2
 
 	if useq apache2 ; then
 		if [[ "${APACHE_VERSION}" != "0" ]] ; then
@@ -135,8 +135,8 @@ src_compile_fastbuild() {
 
 	if [[ ${build_cgi} = 1 ]] ; then
 		my_conf="${my_conf} --enable-cgi --enable-fastcgi"
-		enable_extension_enable "discard-path" "discard-path" 0
-		enable_extension_enable "force-cgi-redirect" "force-cgi-redirect" 0
+		phpconfutils_extension_enable "discard-path" "discard-path" 0
+		phpconfutils_extension_enable "force-cgi-redirect" "force-cgi-redirect" 0
 	else
 		my_conf="${my_conf} --disable-cgi"
 	fi
@@ -213,8 +213,8 @@ src_compile_normal() {
 				;;
 			cgi)
 				my_conf="--disable-cli --enable-cgi --enable-fastcgi"
-				enable_extension_enable "discard-path" "discard-path" 0
-				enable_extension_enable "force-cgi-redirect" "force-cgi-redirect" 0
+				phpconfutils_extension_enable "discard-path" "discard-path" 0
+				phpconfutils_extension_enable "force-cgi-redirect" "force-cgi-redirect" 0
 				php5_1-sapi_src_compile
 				cp sapi/cgi/php php-cgi
 				;;