Remove apache SAPI.

4 files changed, 8 insertions, 17 deletions

diff --git a/eclass/php4_4-sapi.eclass b/eclass/php4_4-sapi.eclass
index bd1ba95898d1..5f77dd986801 100644
--- a/eclass/php4_4-sapi.eclass
+++ b/eclass/php4_4-sapi.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.35 2007/05/10 15:02:01 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php4_4-sapi.eclass,v 1.36 2007/05/12 04:59:41 chtekk Exp $
 
 # ========================================================================
 #
@@ -245,9 +245,6 @@ php4_4-sapi_install_ini() {
 	elif [[ "${PHPSAPI}" == "cgi" ]] ; then
 		phpmycnfcharset="`php_get_mycnf_charset cgi-fcgi`"
 		einfo "MySQL extension charset for 'cgi' SAPI is: ${phpmycnfcharset}"
-	elif [[ "${PHPSAPI}" == "apache" ]] ; then
-		phpmycnfcharset="`php_get_mycnf_charset apache`"
-		einfo "MySQL extension charset for 'apache' SAPI is: ${phpmycnfcharset}"
 	elif [[ "${PHPSAPI}" == "apache2" ]] ; then
 		phpmycnfcharset="`php_get_mycnf_charset apache2handler`"
 		einfo "MySQL extension charset for 'apache2' SAPI is: ${phpmycnfcharset}"
@@ -328,7 +325,7 @@ php4_4-sapi_src_unpack() {
 	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
+	for i in configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 ; do
 		sed -i.orig -e 's,-i -a -n php,-i -n php,g' ${i}
 		sed -i.orig -e 's,-i -A -n php,-i -n php,g' ${i}
 	done
diff --git a/eclass/php5_0-sapi.eclass b/eclass/php5_0-sapi.eclass
index 5840e8a84e87..ea94a4d401b3 100644
--- a/eclass/php5_0-sapi.eclass
+++ b/eclass/php5_0-sapi.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.35 2007/05/10 15:02:01 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5_0-sapi.eclass,v 1.36 2007/05/12 04:59:41 chtekk Exp $
 
 # ========================================================================
 #
@@ -297,7 +297,7 @@ php5_0-sapi_src_unpack() {
 	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
+	for i in configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 ; do
 		sed -i.orig -e 's,-i -a -n php5,-i -n php5,g' ${i}
 		sed -i.orig -e 's,-i -A -n php5,-i -n php5,g' ${i}
 	done
diff --git a/eclass/php5_1-sapi.eclass b/eclass/php5_1-sapi.eclass
index e6c073c3b5db..69ac1a8b281b 100644
--- a/eclass/php5_1-sapi.eclass
+++ b/eclass/php5_1-sapi.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.42 2007/05/10 15:02:01 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5_1-sapi.eclass,v 1.43 2007/05/12 04:59:41 chtekk Exp $
 
 # ========================================================================
 #
@@ -258,9 +258,6 @@ php5_1-sapi_install_ini() {
 	elif [[ "${PHPSAPI}" == "cgi" ]] ; then
 		phpmycnfcharset="`php_get_mycnf_charset cgi-fcgi`"
 		einfo "MySQL extensions charset for 'cgi' SAPI is: ${phpmycnfcharset}"
-	elif [[ "${PHPSAPI}" == "apache" ]] ; then
-		phpmycnfcharset="`php_get_mycnf_charset apache`"
-		einfo "MySQL extensions charset for 'apache' SAPI is: ${phpmycnfcharset}"
 	elif [[ "${PHPSAPI}" == "apache2" ]] ; then
 		phpmycnfcharset="`php_get_mycnf_charset apache2handler`"
 		einfo "MySQL extensions charset for 'apache2' SAPI is: ${phpmycnfcharset}"
@@ -342,7 +339,7 @@ php5_1-sapi_src_unpack() {
 	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
+	for i in configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 ; do
 		sed -i.orig -e 's,-i -a -n php5,-i -n php5,g' ${i}
 		sed -i.orig -e 's,-i -A -n php5,-i -n php5,g' ${i}
 	done
diff --git a/eclass/php5_2-sapi.eclass b/eclass/php5_2-sapi.eclass
index 871c91280df7..237715b43e45 100644
--- a/eclass/php5_2-sapi.eclass
+++ b/eclass/php5_2-sapi.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v 1.5 2007/05/10 15:02:01 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v 1.6 2007/05/12 04:59:41 chtekk Exp $
 
 # ========================================================================
 #
@@ -263,9 +263,6 @@ php5_2-sapi_install_ini() {
 	elif [[ "${PHPSAPI}" == "cgi" ]] ; then
 		phpmycnfcharset="`php_get_mycnf_charset cgi-fcgi`"
 		einfo "MySQL extensions charset for 'cgi' SAPI is: ${phpmycnfcharset}"
-	elif [[ "${PHPSAPI}" == "apache" ]] ; then
-		phpmycnfcharset="`php_get_mycnf_charset apache`"
-		einfo "MySQL extensions charset for 'apache' SAPI is: ${phpmycnfcharset}"
 	elif [[ "${PHPSAPI}" == "apache2" ]] ; then
 		phpmycnfcharset="`php_get_mycnf_charset apache2handler`"
 		einfo "MySQL extensions charset for 'apache2' SAPI is: ${phpmycnfcharset}"
@@ -347,7 +344,7 @@ php5_2-sapi_src_unpack() {
 	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
+	for i in configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 ; do
 		sed -i.orig -e 's,-i -a -n php5,-i -n php5,g' ${i}
 		sed -i.orig -e 's,-i -A -n php5,-i -n php5,g' ${i}
 	done