fix bug #55634.

10 files changed, 32 insertions, 26 deletions

diff --git a/dev-php/mod_php/ChangeLog b/dev-php/mod_php/ChangeLog
index 2930e3c542cf..d658107a8d24 100644
--- a/dev-php/mod_php/ChangeLog
+++ b/dev-php/mod_php/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-php/mod_php
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.156 2004/07/04 23:30:33 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.157 2004/07/04 23:44:14 robbat2 Exp $
+
+  04 Jul 2004; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.4-r4.ebuild,
+  mod_php-4.3.5.ebuild, mod_php-4.3.6-r1.ebuild, mod_php-4.3.6-r2.ebuild,
+  mod_php-4.3.6.ebuild, mod_php-4.3.6_rc2.ebuild, mod_php-4.3.7-r1.ebuild,
+  mod_php-4.3.7.ebuild:
+  fix bug #55634.
 
   04 Jul 2004; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.7-r1.ebuild:
   stable on x86.
diff --git a/dev-php/mod_php/Manifest b/dev-php/mod_php/Manifest
index a4819e2085c7..ec12951b604e 100644
--- a/dev-php/mod_php/Manifest
+++ b/dev-php/mod_php/Manifest
@@ -1,13 +1,13 @@
-MD5 e0264ff0ce8780f86999c915fe6f37dd mod_php-4.3.7.ebuild 5755
-MD5 5ed4ab150fa7c3f102c409d13ca5e022 mod_php-4.3.6-r2.ebuild 5751
-MD5 5e05bd9216655049d27158914044efdc mod_php-4.3.7-r1.ebuild 5913
-MD5 62416e36a0f7a081b1d17f83879b014b mod_php-4.3.6.ebuild 5728
-MD5 3abd216bcec4851443ed867c82f11a51 mod_php-4.3.6-r1.ebuild 5734
-MD5 724533152eb2e4dd32a16a966c088fd8 mod_php-4.3.5.ebuild 5728
-MD5 582a9886541e0442041b1756b0a1e7cd ChangeLog 29498
+MD5 cc17e8ea8901d70410bd47fef4a7a8d3 mod_php-4.3.7.ebuild 5764
+MD5 fe620542393d33e74a2fc3c39c39b679 mod_php-4.3.6-r2.ebuild 5762
+MD5 8b793254a49299ae128ac67f3203116f mod_php-4.3.7-r1.ebuild 5923
+MD5 21988ad06da36da4ffbd7415c946893c mod_php-4.3.6.ebuild 5737
+MD5 477decdfa7b921810928b478c0101e58 mod_php-4.3.6-r1.ebuild 5743
+MD5 e322d1800900e6b8c76c0a3cd02e78ef mod_php-4.3.5.ebuild 5737
+MD5 66fe15fed44db3a3a84e77a1b41da14a ChangeLog 29768
 MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
-MD5 941132c445d2a1e105363147b4876c70 mod_php-4.3.6_rc2.ebuild 5775
-MD5 c84c1daa721ac0302ef398f55f3799ad mod_php-4.3.4-r4.ebuild 5372
+MD5 442a975588910dfa87c4cf9bf1dc0b52 mod_php-4.3.6_rc2.ebuild 5784
+MD5 c1070d3ccea0824a852244946e5c77ba mod_php-4.3.4-r4.ebuild 5382
 MD5 7515e9b1dc298a0fb1c12d35a58c265d files/mod_php-4.3.4-amd64hack.diff 1028
 MD5 cceddd5c262e0ffef31d45b7da269851 files/mod_php.conf 148
 MD5 0c2e81f561985f3749c37cf525de7583 files/70_mod_php.conf 1364
diff --git a/dev-php/mod_php/mod_php-4.3.4-r4.ebuild b/dev-php/mod_php/mod_php-4.3.4-r4.ebuild
index 35518982443c..4d6dedd5fbf7 100644
--- a/dev-php/mod_php/mod_php-4.3.4-r4.ebuild
+++ b/dev-php/mod_php/mod_php-4.3.4-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.4-r4.ebuild,v 1.9 2004/06/25 01:17:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.4-r4.ebuild,v 1.10 2004/07/04 23:44:14 robbat2 Exp $
 
 IUSE="${IUSE} apache2"
 
@@ -77,7 +77,7 @@ src_unpack() {
 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'|cut -d. -f1|sed -e 's/^[[:space:]]*//g;s/[[:space:]]+/ /g;'`"
+		APACHE2_MPM="`/usr/sbin/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*) ;;
diff --git a/dev-php/mod_php/mod_php-4.3.5.ebuild b/dev-php/mod_php/mod_php-4.3.5.ebuild
index e72053048e7f..08730196965a 100644
--- a/dev-php/mod_php/mod_php-4.3.5.ebuild
+++ b/dev-php/mod_php/mod_php-4.3.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.5.ebuild,v 1.8 2004/06/25 01:17:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.5.ebuild,v 1.9 2004/07/04 23:44:14 robbat2 Exp $
 
 IUSE="${IUSE} apache2"
 
@@ -84,7 +84,7 @@ src_unpack() {
 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'|cut -d. -f1|sed -e 's/^[[:space:]]*//g;s/[[:space:]]+/ /g;'`"
+		APACHE2_MPM="`/usr/sbin/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*) ;;
diff --git a/dev-php/mod_php/mod_php-4.3.6-r1.ebuild b/dev-php/mod_php/mod_php-4.3.6-r1.ebuild
index 2d4cf0d74a44..4fd1bea6465c 100644
--- a/dev-php/mod_php/mod_php-4.3.6-r1.ebuild
+++ b/dev-php/mod_php/mod_php-4.3.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.6-r1.ebuild,v 1.6 2004/06/25 01:17:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.6-r1.ebuild,v 1.7 2004/07/04 23:44:14 robbat2 Exp $
 
 IUSE="${IUSE} apache2"
 
@@ -84,7 +84,7 @@ src_unpack() {
 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'|cut -d. -f1|sed -e 's/^[[:space:]]*//g;s/[[:space:]]+/ /g;'`"
+		APACHE2_MPM="`/usr/sbin/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*) ;;
diff --git a/dev-php/mod_php/mod_php-4.3.6-r2.ebuild b/dev-php/mod_php/mod_php-4.3.6-r2.ebuild
index b3062c53c23e..81e1e21cc81d 100644
--- a/dev-php/mod_php/mod_php-4.3.6-r2.ebuild
+++ b/dev-php/mod_php/mod_php-4.3.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.6-r2.ebuild,v 1.5 2004/07/04 08:24:42 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.6-r2.ebuild,v 1.6 2004/07/04 23:44:14 robbat2 Exp $
 
 IUSE="${IUSE} apache2"
 
@@ -85,7 +85,7 @@ src_unpack() {
 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'|cut -d. -f1|sed -e 's/^[[:space:]]*//g;s/[[:space:]]+/ /g;'`"
+		APACHE2_MPM="`/usr/sbin/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*) ;;
diff --git a/dev-php/mod_php/mod_php-4.3.6.ebuild b/dev-php/mod_php/mod_php-4.3.6.ebuild
index 5501597aabda..920e0911042a 100644
--- a/dev-php/mod_php/mod_php-4.3.6.ebuild
+++ b/dev-php/mod_php/mod_php-4.3.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.6.ebuild,v 1.3 2004/06/25 01:17:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.6.ebuild,v 1.4 2004/07/04 23:44:14 robbat2 Exp $
 
 IUSE="${IUSE} apache2"
 
@@ -84,7 +84,7 @@ src_unpack() {
 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'|cut -d. -f1|sed -e 's/^[[:space:]]*//g;s/[[:space:]]+/ /g;'`"
+		APACHE2_MPM="`/usr/sbin/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*) ;;
diff --git a/dev-php/mod_php/mod_php-4.3.6_rc2.ebuild b/dev-php/mod_php/mod_php-4.3.6_rc2.ebuild
index f610091fa91b..9a8cee9221a9 100644
--- a/dev-php/mod_php/mod_php-4.3.6_rc2.ebuild
+++ b/dev-php/mod_php/mod_php-4.3.6_rc2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.6_rc2.ebuild,v 1.7 2004/06/25 01:17:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.6_rc2.ebuild,v 1.8 2004/07/04 23:44:14 robbat2 Exp $
 
 IUSE="${IUSE} apache2"
 
@@ -85,7 +85,7 @@ src_unpack() {
 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'|cut -d. -f1|sed -e 's/^[[:space:]]*//g;s/[[:space:]]+/ /g;'`"
+		APACHE2_MPM="`/usr/sbin/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*) ;;
diff --git a/dev-php/mod_php/mod_php-4.3.7-r1.ebuild b/dev-php/mod_php/mod_php-4.3.7-r1.ebuild
index de6d67085cc2..2c6565eef814 100644
--- a/dev-php/mod_php/mod_php-4.3.7-r1.ebuild
+++ b/dev-php/mod_php/mod_php-4.3.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.7-r1.ebuild,v 1.2 2004/07/04 23:30:33 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.7-r1.ebuild,v 1.3 2004/07/04 23:44:14 robbat2 Exp $
 
 IUSE="${IUSE} apache2"
 
@@ -87,7 +87,7 @@ src_unpack() {
 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'|cut -d. -f1|sed -e 's/^[[:space:]]*//g;s/[[:space:]]+/ /g;'`"
+		APACHE2_MPM="`/usr/sbin/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*) ;;
diff --git a/dev-php/mod_php/mod_php-4.3.7.ebuild b/dev-php/mod_php/mod_php-4.3.7.ebuild
index 6c11e08c6cca..c67ebd5b9a50 100644
--- a/dev-php/mod_php/mod_php-4.3.7.ebuild
+++ b/dev-php/mod_php/mod_php-4.3.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.7.ebuild,v 1.3 2004/06/25 01:17:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.7.ebuild,v 1.4 2004/07/04 23:44:14 robbat2 Exp $
 
 IUSE="${IUSE} apache2"
 
@@ -85,7 +85,7 @@ src_unpack() {
 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'|cut -d. -f1|sed -e 's/^[[:space:]]*//g;s/[[:space:]]+/ /g;'`"
+		APACHE2_MPM="`/usr/sbin/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*) ;;