large cleanups of xargs usage per bug #31794, and a bump to force it in with the new eclass

13 files changed, 233 insertions, 44 deletions

diff --git a/dev-php/mod_php/Manifest b/dev-php/mod_php/Manifest
index 8eb89e92962b..032d2f31e971 100644
--- a/dev-php/mod_php/Manifest
+++ b/dev-php/mod_php/Manifest
@@ -1,16 +1,16 @@
-MD5 35f1d2a4a4f7a112d2971c7406661e5c mod_php-4.3.2.ebuild 3396
-MD5 d7eb82100229b97c0fe4c1260a3a9749 mod_php-4.3.3-r2.ebuild 5287
-MD5 fda4cb6a471505af3c19408c3698c39e mod_php-4.3.2-r5.ebuild 5114
-MD5 b23dbb4a5212fd37ac5a8f8f461bf203 mod_php-4.3.3_rc3.ebuild 5133
-MD5 3904f19d1d8b487bfcf4568bfdba0acf mod_php-4.3.2-r2.ebuild 3700
-MD5 aa58d288d44f0daaadce7d96ab949058 mod_php-4.3.3-r1.ebuild 4942
-MD5 d8bbddf5312806d4b46f644f3c9adddb mod_php-4.3.2-r4.ebuild 4983
-MD5 71710e0b92dd3a9055db6c87951b11fd mod_php-4.3.3.ebuild 4903
-MD5 d7eb82100229b97c0fe4c1260a3a9749 mod_php-4.3.3-r3.ebuild 5287
-MD5 487b002a83a6dbccf107161e5472098a mod_php-4.3.2-r1.ebuild 2764
-MD5 9023a34f40a6f45a81387a0af5ff1696 ChangeLog 21997
+MD5 ad12767019b879b7c9fdd216bf02992c mod_php-4.3.2.ebuild 3396
+MD5 9a9440cc176c36cf06f31d0a2cd96129 mod_php-4.3.3-r2.ebuild 5287
+MD5 2ffcbd3deb771e2765ea62a15aa6160f mod_php-4.3.2-r5.ebuild 5113
+MD5 baaa4e7f9b1f85ece366d0a48203ffd4 mod_php-4.3.3_rc3.ebuild 5132
+MD5 70c4a70166685022a7ef99e972141843 mod_php-4.3.2-r2.ebuild 3699
+MD5 304e7c5b3bd5f88890ae9da627c78499 mod_php-4.3.3-r1.ebuild 4942
+MD5 36eecb3ee3e24ff2838a2d43cc09dc54 mod_php-4.3.2-r4.ebuild 4982
+MD5 97acd0f21caff5ff8dde4e11fc76a00b mod_php-4.3.3.ebuild 4902
+MD5 f362d6c76c11f46f9148233b937f60f9 mod_php-4.3.3-r3.ebuild 5287
+MD5 5580ac72681bb57c10b3e8f86e88c0d1 mod_php-4.3.2-r1.ebuild 2763
+MD5 78806aac5e2a947f56994e89f2014a84 ChangeLog 21997
 MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
-MD5 e0b3dbc2aebcf0e550d149eeb8c8541a mod_php-4.3.2-r3.ebuild 4943
+MD5 4cb22f3a36dbc2cc5a6d5a2f3e02b567 mod_php-4.3.2-r3.ebuild 4942
 MD5 cceddd5c262e0ffef31d45b7da269851 files/mod_php.conf 148
 MD5 c0f86a4fc233945f1db33bd39abe22ab files/70_mod_php.conf 1065
 MD5 63f7765d77e10eeef4b306480cd5d200 files/digest-mod_php-4.3.2 137
diff --git a/dev-php/mod_php/files/digest-mod_php-4.3.3-r3 b/dev-php/mod_php/files/digest-mod_php-4.3.3-r3
new file mode 100644
index 000000000000..1fecdf01d76d
--- /dev/null
+++ b/dev-php/mod_php/files/digest-mod_php-4.3.3-r3
@@ -0,0 +1,2 @@
+MD5 1171d96104e2ff2cff9e19789a4a1536 php-4.3.3.tar.bz2 3711877
+MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416
diff --git a/dev-php/mod_php/mod_php-4.3.2-r1.ebuild b/dev-php/mod_php/mod_php-4.3.2-r1.ebuild
index 6c86e1317e20..44a2cb292b14 100644
--- a/dev-php/mod_php/mod_php-4.3.2-r1.ebuild
+++ b/dev-php/mod_php/mod_php-4.3.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.2-r1.ebuild,v 1.5 2003/09/08 04:45:56 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.2-r1.ebuild,v 1.6 2003/10/26 03:33:13 robbat2 Exp $
 
 use apache2 && PHPSAPI="apache2" || PHPSAPI="apache1"
 inherit php eutils
@@ -27,9 +27,9 @@ src_compile() {
 
 	# Every Apache2 MPM EXCEPT prefork needs Zend Thread Safety
 	if [ -n "${USE_APACHE2}" ]; then
-		APACHE2_MPM="`apache2 -l |egrep 'worker|perchild|leader|threadpool|prefork'|xargs|cut -d. -f1`"
+		APACHE2_MPM="`apache2 -l |egrep 'worker|perchild|leader|threadpool|prefork'|cut -d. -f1|sed -e 's/^[[:space:]]*//g;s/[[:space:]]+/ /g;'`"
 		case "${APACHE2_MPM}" in
-			prefork) ;;
+			*prefork*) ;;
 			*) myconf="${myconf} --enable-experimental-zts" ;;
 		esac;
 	fi
diff --git a/dev-php/mod_php/mod_php-4.3.2-r2.ebuild b/dev-php/mod_php/mod_php-4.3.2-r2.ebuild
index 5a5a07885263..7d06d75015d9 100644
--- a/dev-php/mod_php/mod_php-4.3.2-r2.ebuild
+++ b/dev-php/mod_php/mod_php-4.3.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.2-r2.ebuild,v 1.8 2003/09/08 04:45:56 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.2-r2.ebuild,v 1.9 2003/10/26 03:33:13 robbat2 Exp $
 
 use apache2 && PHPSAPI="apache2" || PHPSAPI="apache1"
 inherit php eutils
@@ -64,9 +64,9 @@ src_compile() {
 
 	# Every Apache2 MPM EXCEPT prefork needs Zend Thread Safety
 	if [ -n "${USE_APACHE2}" ]; then
-		APACHE2_MPM="`apache2 -l |egrep 'worker|perchild|leader|threadpool|prefork'|xargs|cut -d. -f1`"
+		APACHE2_MPM="`apache2 -l |egrep 'worker|perchild|leader|threadpool|prefork'|cut -d. -f1|sed -e 's/^[[:space:]]*//g;s/[[:space:]]+/ /g;'`"
 		case "${APACHE2_MPM}" in
-			prefork) ;;
+			*prefork*) ;;
 			*) myconf="${myconf} --enable-experimental-zts" ;;
 		esac;
 	fi
diff --git a/dev-php/mod_php/mod_php-4.3.2-r3.ebuild b/dev-php/mod_php/mod_php-4.3.2-r3.ebuild
index 8944e7a88cf5..c1f5474ac07c 100644
--- a/dev-php/mod_php/mod_php-4.3.2-r3.ebuild
+++ b/dev-php/mod_php/mod_php-4.3.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.2-r3.ebuild,v 1.7 2003/09/08 04:45:56 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.2-r3.ebuild,v 1.8 2003/10/26 03:33:13 robbat2 Exp $
 
 IUSE="${IUSE} apache2"
 
@@ -65,9 +65,9 @@ src_compile() {
 
 	# Every Apache2 MPM EXCEPT prefork needs Zend Thread Safety
 	if [ -n "${USE_APACHE2}" ]; then
-		APACHE2_MPM="`apache2 -l |egrep 'worker|perchild|leader|threadpool|prefork'|xargs|cut -d. -f1`"
+		APACHE2_MPM="`apache2 -l |egrep 'worker|perchild|leader|threadpool|prefork'|cut -d. -f1|sed -e 's/^[[:space:]]*//g;s/[[:space:]]+/ /g;'`"
 		case "${APACHE2_MPM}" in
-			prefork) ;;
+			*prefork*) ;;
 			*) myconf="${myconf} --enable-experimental-zts" ;;
 		esac;
 	fi
diff --git a/dev-php/mod_php/mod_php-4.3.2-r4.ebuild b/dev-php/mod_php/mod_php-4.3.2-r4.ebuild
index 96ea4976328d..320535d234ac 100644
--- a/dev-php/mod_php/mod_php-4.3.2-r4.ebuild
+++ b/dev-php/mod_php/mod_php-4.3.2-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.2-r4.ebuild,v 1.5 2003/09/08 04:45:56 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.2-r4.ebuild,v 1.6 2003/10/26 03:33:13 robbat2 Exp $
 
 IUSE="${IUSE} apache2"
 
@@ -66,9 +66,9 @@ src_compile() {
 
 	# Every Apache2 MPM EXCEPT prefork needs Zend Thread Safety
 	if [ -n "${USE_APACHE2}" ]; then
-		APACHE2_MPM="`apache2 -l |egrep 'worker|perchild|leader|threadpool|prefork'|xargs|cut -d. -f1`"
+		APACHE2_MPM="`apache2 -l |egrep 'worker|perchild|leader|threadpool|prefork'|cut -d. -f1|sed -e 's/^[[:space:]]*//g;s/[[:space:]]+/ /g;'`"
 		case "${APACHE2_MPM}" in
-			prefork) ;;
+			*prefork*) ;;
 			*) myconf="${myconf} --enable-experimental-zts" ;;
 		esac;
 	fi
diff --git a/dev-php/mod_php/mod_php-4.3.2-r5.ebuild b/dev-php/mod_php/mod_php-4.3.2-r5.ebuild
index fafba9d958b4..d58623f05298 100644
--- a/dev-php/mod_php/mod_php-4.3.2-r5.ebuild
+++ b/dev-php/mod_php/mod_php-4.3.2-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.2-r5.ebuild,v 1.5 2003/09/08 04:45:56 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.2-r5.ebuild,v 1.6 2003/10/26 03:33:13 robbat2 Exp $
 
 IUSE="${IUSE} apache2"
 
@@ -69,9 +69,9 @@ src_compile() {
 
 	# Every Apache2 MPM EXCEPT prefork needs Zend Thread Safety
 	if [ -n "${USE_APACHE2}" ]; then
-		APACHE2_MPM="`apache2 -l |egrep 'worker|perchild|leader|threadpool|prefork'|xargs|cut -d. -f1`"
+		APACHE2_MPM="`apache2 -l |egrep 'worker|perchild|leader|threadpool|prefork'|cut -d. -f1|sed -e 's/^[[:space:]]*//g;s/[[:space:]]+/ /g;'`"
 		case "${APACHE2_MPM}" in
-			prefork) ;;
+			*prefork*) ;;
 			*) myconf="${myconf} --enable-experimental-zts" ;;
 		esac;
 	fi
diff --git a/dev-php/mod_php/mod_php-4.3.2.ebuild b/dev-php/mod_php/mod_php-4.3.2.ebuild
index 58a34733707f..950fda832f89 100644
--- a/dev-php/mod_php/mod_php-4.3.2.ebuild
+++ b/dev-php/mod_php/mod_php-4.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.2.ebuild,v 1.9 2003/09/08 04:45:56 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.2.ebuild,v 1.10 2003/10/26 03:33:13 robbat2 Exp $
 
 use apache2 && PHPSAPI="apache2" || PHPSAPI="apache1"
 inherit php eutils
@@ -26,9 +26,9 @@ src_compile() {
 
 	# Every Apache2 MPM EXCEPT prefork needs Zend Thread Safety
 	if [ "`use apache2`" ]; then
-		APACHE2_MPM="`apache2 -l |egrep 'worker|perchild|leader|threadpool|prefork'|xargs|cut -d. -f1`"
+		APACHE2_MPM="`apache2 -l |egrep 'worker|perchild|leader|threadpool|prefork'|cut -d. -f1|sed -e 's/^[[:space:]]*//g;s/[[:space:]]+/ /g;'`"
 		case "${APACHE2_MPM}" in
-			prefork) ;;
+			*prefork*) ;;
 			*) myconf="${myconf} --enable-experimental-zts" ;;
 		esac;
 	fi
diff --git a/dev-php/mod_php/mod_php-4.3.3-r1.ebuild b/dev-php/mod_php/mod_php-4.3.3-r1.ebuild
index 45dfd9940604..375bce47956c 100644
--- a/dev-php/mod_php/mod_php-4.3.3-r1.ebuild
+++ b/dev-php/mod_php/mod_php-4.3.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.3-r1.ebuild,v 1.3 2003/10/10 19:58:16 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.3-r1.ebuild,v 1.4 2003/10/26 03:33:13 robbat2 Exp $
 
 IUSE="${IUSE} apache2"
 
@@ -69,9 +69,9 @@ src_compile() {
 
 	# Every Apache2 MPM EXCEPT prefork needs Zend Thread Safety
 	if [ -n "${USE_APACHE2}" ]; then
-		APACHE2_MPM="`apache2 -l |egrep 'worker|perchild|leader|threadpool|prefork'|xargs|cut -d. -f1`"
+		APACHE2_MPM="`apache2 -l |egrep 'worker|perchild|leader|threadpool|prefork'|cut -d. -f1|sed -e 's/^[[:space:]]*//g;s/[[:space:]]+/ /g;'`"
 		case "${APACHE2_MPM}" in
-			prefork) ;;
+			*prefork*) ;;
 			*) myconf="${myconf} --enable-experimental-zts" ;;
 		esac;
 	fi
diff --git a/dev-php/mod_php/mod_php-4.3.3-r2.ebuild b/dev-php/mod_php/mod_php-4.3.3-r2.ebuild
index 859424a4750a..53c38a8db080 100644
--- a/dev-php/mod_php/mod_php-4.3.3-r2.ebuild
+++ b/dev-php/mod_php/mod_php-4.3.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.3-r2.ebuild,v 1.1 2003/10/23 02:08:18 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.3-r2.ebuild,v 1.2 2003/10/26 03:33:13 robbat2 Exp $
 
 IUSE="${IUSE} apache2"
 
@@ -53,7 +53,18 @@ inherit php eutils
 
 DEPEND="${DEPEND}
 	>=net-www/apache-1.3.26-r2
-	apache2? ( >=net-www/apache-2.0.43-r1 )"
+	apache2? ( >=net-www/apache-2.0.43-r1 )
+	>=sys-apps/findutils-4.1.7-r5
+	"
+
+pkg_setup() {
+	if has_version '=sys-apps/findutils-4.1.20'; then
+		eerror "Sorry, you need to have >=sys-apps/findutils-4.1.20-r1"
+		eerror "installed, due to a shortcoming in Portage we can't"
+		eerror "put it into the DEPEND list yet (to be fixed soon)..."
+		die
+	fi
+}
 
 src_unpack() {
 	multiinstwarn
@@ -67,10 +78,11 @@ src_compile() {
 
 	# Every Apache2 MPM EXCEPT prefork needs Zend Thread Safety
 	if [ -n "${USE_APACHE2}" ]; then
-		APACHE2_MPM="`apache2 -l |egrep 'worker|perchild|leader|threadpool|prefork'|xargs|cut -d. -f1`"
+		APACHE2_MPM="`apache2 -l |egrep 'worker|perchild|leader|threadpool|prefork'|cut -d. -f1|sed -e 's/^[[:space:]]*//g;s/[[:space:]]+/ /g;'`"
+		einfo "Apache2 MPM: ${APACHE2_MPM}"
 		case "${APACHE2_MPM}" in
-			prefork) ;;
-			*) myconf="${myconf} --enable-experimental-zts" ;;
+			*prefork*) ;;
+			*) myconf="${myconf} --enable-experimental-zts" ; ewarn "Enabling ZTS for Apache2 MPM" ;;
 		esac;
 	fi
 
diff --git a/dev-php/mod_php/mod_php-4.3.3-r3.ebuild b/dev-php/mod_php/mod_php-4.3.3-r3.ebuild
new file mode 100644
index 000000000000..9625c0a029b0
--- /dev/null
+++ b/dev-php/mod_php/mod_php-4.3.3-r3.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.3-r3.ebuild,v 1.1 2003/10/26 03:33:13 robbat2 Exp $
+
+IUSE="${IUSE} apache2"
+
+DESCRIPTION="Apache module for PHP"
+KEYWORDS="x86 ~sparc ~ppc ~alpha ~hppa ~arm ~amd64"
+
+detectapache() {
+	local domsg=
+	[ -n "$1" ] && domsg=1
+	HAVE_APACHE1=
+	HAVE_APACHE2=
+	has_version '=net-www/apache-1*' && HAVE_APACHE1=1
+	has_version '=net-www/apache-2*' && HAVE_APACHE2=1
+
+	[ -n "${HAVE_APACHE1}" ] && APACHEVER=1
+	[ -n "${HAVE_APACHE2}" ] && APACHEVER=2
+	[ -n "${HAVE_APACHE1}" ] && [ -n "${HAVE_APACHE2}" ] && APACHEVER='both'
+
+	case "${APACHEVER}" in
+	1) [ -n "${domsg}" ] && einfo 'Apache1 only detected' ;;
+	2) [ -n "${domsg}" ] && einfo 'Apache2 only detected';;
+	both)
+		if [ "`use apache2`" ]; then
+			[ -n "${domsg}" ] && einfo "Multiple Apache versions detected, using Apache2 (USE=apache2)"
+			APACHEVER=2
+		else
+			[ -n "${domsg}" ] && einfo 'Multiple Apache versions detected, using Apache1 (USE=-apache2)'
+			APACHEVER=1
+		fi ;;
+	*) if [ -n "${domsg}" ]; then
+			MSG="Unknown Apache version!"; eerror $MSG ; die $MSG
+	   else
+			APACHEVER=0
+	   fi; ;;
+	esac
+}
+
+detectapache
+
+SLOT="${APACHEVER}"
+[ "${APACHEVER}" -eq '2' ] && USE_APACHE2='2' || USE_APACHE2=''
+
+PHPSAPI="apache${APACHEVER}"
+
+# BIG FAT WARNING!
+# the php eclass requires the PHPSAPI setting!
+# In this case the PHPSAPI setting is dependant on the detectapache function
+# above this point as well!
+inherit php eutils
+
+DEPEND="${DEPEND}
+	>=net-www/apache-1.3.26-r2
+	apache2? ( >=net-www/apache-2.0.43-r1 )
+	>=sys-apps/findutils-4.1.7-r5
+	"
+
+pkg_setup() {
+	if has_version '=sys-apps/findutils-4.1.20'; then
+		eerror "Sorry, you need to have >=sys-apps/findutils-4.1.20-r1"
+		eerror "installed, due to a shortcoming in Portage we can't"
+		eerror "put it into the DEPEND list yet (to be fixed soon)..."
+		die
+	fi
+}
+
+src_unpack() {
+	multiinstwarn
+	detectapache domsg
+	php_src_unpack
+}
+
+src_compile() {
+	#no readline on server SAPI
+	myconf="${myconf} --without-readline"
+
+	# Every Apache2 MPM EXCEPT prefork needs Zend Thread Safety
+	if [ -n "${USE_APACHE2}" ]; then
+		APACHE2_MPM="`apache2 -l |egrep 'worker|perchild|leader|threadpool|prefork'|cut -d. -f1|sed -e 's/^[[:space:]]*//g;s/[[:space:]]+/ /g;'`"
+		einfo "Apache2 MPM: ${APACHE2_MPM}"
+		case "${APACHE2_MPM}" in
+			*prefork*) ;;
+			*) myconf="${myconf} --enable-experimental-zts" ; ewarn "Enabling ZTS for Apache2 MPM" ;;
+		esac;
+	fi
+
+	#use apache2 \
+	myconf="${myconf} --with-apxs${USE_APACHE2}=/usr/sbin/apxs${USE_APACHE2}"
+
+	php_src_compile
+}
+
+
+src_install() {
+	php_src_install
+	einfo "Adding extra symlink to php.ini for Apache${USE_APACHE2}"
+	dodir /etc/apache${USE_APACHE2}/conf/
+	dodir ${PHPINIDIRECTORY}
+	dosym ${PHPINIDIRECTORY}/${PHPINIFILENAME} /etc/apache${USE_APACHE2}/conf/${PHPINIFILENAME}
+
+	einfo "Adding extra symlink to Apache${USE_APACHE2} extramodules for PHP"
+	dosym /usr/lib/apache${USE_APACHE2}-extramodules ${PHPINIDIRECTORY}/lib
+	exeinto /usr/lib/apache${USE_APACHE2}-extramodules
+	einfo "Installing mod_php shared object now"
+	doexe .libs/libphp4.so
+
+	if [ -n "${USE_APACHE2}" ] ; then
+		einfo "Installing a Apache2 config for PHP (70_mod_php.conf)"
+		insinto /etc/apache2/conf/modules.d
+		doins ${FILESDIR}/70_mod_php.conf
+	else
+		einfo "Installing a Apache config for PHP (mod_php.conf)"
+		insinto /etc/apache/conf/addon-modules
+		doins ${FILESDIR}/mod_php.conf
+		dosym ${PHPINIDIRECTORY}/${PHPINIFILENAME} /etc/apache/conf/addon-modules/${PHPINIFILENAME}
+	fi
+}
+
+apache2msg() {
+	einfo "Edit /etc/conf.d/apache2 and add \"-D PHP4\" to APACHE2_OPTS"
+	ewarn "This is a CHANGE from previous behavior, which was \"-D PHP\""
+	ewarn "This is for the upcoming PHP5 support. The ebuild will attempt"
+	ewarn "to make this update between PHP and PHP4 automatically"
+}
+
+multiinstwarn() {
+	ewarn "Due to some previous bloopers with PHP and slotting, you may have"
+	ewarn "multiple copies of mod_php installed. Please look at the autoclean"
+	ewarn "output at the end of the emerge and unmerge all but relevant"
+	ewarn "copies."
+}
+
+apache2fix() {
+	einfo "Attemping to update /etc/conf.d/apache2 automatically for the PHP/PHP4 change."
+	local oldfile="/etc/conf.d/apache2.old.`date +%Y%m%d%H%M%S`"
+	cp /etc/conf.d/apache2 ${oldfile}
+	sed -re 's,-D PHP\>,-D PHP4,g' ${oldfile}  <${oldfile} >/etc/conf.d/apache2
+}
+
+
+pkg_preinst() {
+	multiinstwarn
+	[ "${APACHEVER}" -eq '2' ] && apache2fix
+	php_pkg_preinst
+}
+
+pkg_postinst() {
+	php_pkg_postinst
+	multiinstwarn
+	einfo "To have Apache run php programs, please do the following:"
+	if [ "`use apache2`" ] ; then
+		apache2msg
+	else
+		einfo "1. Execute the command:"
+		einfo " \"ebuild /var/db/pkg/dev-php/${PF}/${PF}.ebuild config\""
+		einfo "2. Edit /etc/conf.d/apache and add \"-D PHP4\" to APACHE_OPTS"
+		einfo "That will include the php mime types in your configuration"
+		einfo "automagically and setup Apache to load php when it starts."
+	fi
+}
+
+pkg_config() {
+	multiinstwarn
+	if [ -n "${USE_APACHE2}" ] ; then
+		apache2msg
+	else
+		${ROOT}/usr/sbin/apacheaddmod \
+			${ROOT}/etc/apache/conf/apache.conf \
+			extramodules/libphp4.so mod_php4.c php4_module \
+			before=perl define=PHP4 addconf=conf/addon-modules/mod_php.conf
+			:;
+	fi
+}
diff --git a/dev-php/mod_php/mod_php-4.3.3.ebuild b/dev-php/mod_php/mod_php-4.3.3.ebuild
index 16bc04894987..610f361cf837 100644
--- a/dev-php/mod_php/mod_php-4.3.3.ebuild
+++ b/dev-php/mod_php/mod_php-4.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.3.ebuild,v 1.3 2003/09/08 04:45:56 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.3.ebuild,v 1.4 2003/10/26 03:33:13 robbat2 Exp $
 
 IUSE="${IUSE} apache2"
 
@@ -69,9 +69,9 @@ src_compile() {
 
 	# Every Apache2 MPM EXCEPT prefork needs Zend Thread Safety
 	if [ -n "${USE_APACHE2}" ]; then
-		APACHE2_MPM="`apache2 -l |egrep 'worker|perchild|leader|threadpool|prefork'|xargs|cut -d. -f1`"
+		APACHE2_MPM="`apache2 -l |egrep 'worker|perchild|leader|threadpool|prefork'|cut -d. -f1|sed -e 's/^[[:space:]]*//g;s/[[:space:]]+/ /g;'`"
 		case "${APACHE2_MPM}" in
-			prefork) ;;
+			*prefork*) ;;
 			*) myconf="${myconf} --enable-experimental-zts" ;;
 		esac;
 	fi
diff --git a/dev-php/mod_php/mod_php-4.3.3_rc3.ebuild b/dev-php/mod_php/mod_php-4.3.3_rc3.ebuild
index 655de10443a4..84f802e84dc0 100644
--- a/dev-php/mod_php/mod_php-4.3.3_rc3.ebuild
+++ b/dev-php/mod_php/mod_php-4.3.3_rc3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.3_rc3.ebuild,v 1.3 2003/09/08 04:45:56 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.3_rc3.ebuild,v 1.4 2003/10/26 03:33:13 robbat2 Exp $
 
 IUSE="${IUSE} apache2"
 
@@ -70,9 +70,9 @@ src_compile() {
 
 	# Every Apache2 MPM EXCEPT prefork needs Zend Thread Safety
 	if [ -n "${USE_APACHE2}" ]; then
-		APACHE2_MPM="`apache2 -l |egrep 'worker|perchild|leader|threadpool|prefork'|xargs|cut -d. -f1`"
+		APACHE2_MPM="`apache2 -l |egrep 'worker|perchild|leader|threadpool|prefork'|cut -d. -f1|sed -e 's/^[[:space:]]*//g;s/[[:space:]]+/ /g;'`"
 		case "${APACHE2_MPM}" in
-			prefork) ;;
+			*prefork*) ;;
 			*) myconf="${myconf} --enable-experimental-zts" ;;
 		esac;
 	fi