The Great PHP ebuild cleanup.

53 files changed, 21 insertions, 2276 deletions

diff --git a/dev-php/mod_php/ChangeLog b/dev-php/mod_php/ChangeLog
index 6e0b56fb5881..c1cc24976c5f 100644
--- a/dev-php/mod_php/ChangeLog
+++ b/dev-php/mod_php/ChangeLog
@@ -1,6 +1,13 @@
 # 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.171 2004/08/03 16:50:22 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.172 2004/08/06 03:19:00 robbat2 Exp $
+
+  05 Aug 2004; Robin H. Johnson <robbat2@gentoo.org>
+  -files/mod_php-4.3.4-r3.diff, -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, -files/pear_config.diff:
+  The Great PHP ebuild cleanup.
 
   03 Aug 2004; <agriffis@gentoo.org> mod_php-4.3.8.ebuild:
   stable on ia64 for bug 56295
diff --git a/dev-php/mod_php/files/digest-mod_php-4.3.4-r4 b/dev-php/mod_php/files/digest-mod_php-4.3.4-r4
deleted file mode 100644
index 636668a87e84..000000000000
--- a/dev-php/mod_php/files/digest-mod_php-4.3.4-r4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b9dd601863e08e52e3c4d5e02c2627cf php-4.3.4.tar.bz2 3774324
-MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416
-MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285
diff --git a/dev-php/mod_php/files/digest-mod_php-4.3.5 b/dev-php/mod_php/files/digest-mod_php-4.3.5
deleted file mode 100644
index f948543203e1..000000000000
--- a/dev-php/mod_php/files/digest-mod_php-4.3.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 29e61c125ac6278897c6c219f5d100d1 php-4.3.5.tar.bz2 3947414
-MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416
-MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285
diff --git a/dev-php/mod_php/files/digest-mod_php-4.3.6 b/dev-php/mod_php/files/digest-mod_php-4.3.6
deleted file mode 100644
index 207932e5c9af..000000000000
--- a/dev-php/mod_php/files/digest-mod_php-4.3.6
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 79cde484e31871176137eb78014657fa php-4.3.6.tar.bz2 3957796
-MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416
-MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285
-MD5 0ed6c4e7dbba264521ab54d49f02912d php-4.3.6-pcrealloc.patch 1004
-MD5 3075036987c0582ec3b2ab81db727643 hardened-php-4.3.6-0.1.2.patch.gz 10446
diff --git a/dev-php/mod_php/files/digest-mod_php-4.3.6-r1 b/dev-php/mod_php/files/digest-mod_php-4.3.6-r1
deleted file mode 100644
index 207932e5c9af..000000000000
--- a/dev-php/mod_php/files/digest-mod_php-4.3.6-r1
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 79cde484e31871176137eb78014657fa php-4.3.6.tar.bz2 3957796
-MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416
-MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285
-MD5 0ed6c4e7dbba264521ab54d49f02912d php-4.3.6-pcrealloc.patch 1004
-MD5 3075036987c0582ec3b2ab81db727643 hardened-php-4.3.6-0.1.2.patch.gz 10446
diff --git a/dev-php/mod_php/files/digest-mod_php-4.3.6-r2 b/dev-php/mod_php/files/digest-mod_php-4.3.6-r2
deleted file mode 100644
index 207932e5c9af..000000000000
--- a/dev-php/mod_php/files/digest-mod_php-4.3.6-r2
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 79cde484e31871176137eb78014657fa php-4.3.6.tar.bz2 3957796
-MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416
-MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285
-MD5 0ed6c4e7dbba264521ab54d49f02912d php-4.3.6-pcrealloc.patch 1004
-MD5 3075036987c0582ec3b2ab81db727643 hardened-php-4.3.6-0.1.2.patch.gz 10446
diff --git a/dev-php/mod_php/files/digest-mod_php-4.3.6_rc2 b/dev-php/mod_php/files/digest-mod_php-4.3.6_rc2
deleted file mode 100644
index a111ce61cffb..000000000000
--- a/dev-php/mod_php/files/digest-mod_php-4.3.6_rc2
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 0bf89373a60f65cd37c1e3e652e278f5 php-4.3.6RC2.tar.bz2 3958337
-MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416
-MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285
-MD5 0ed6c4e7dbba264521ab54d49f02912d php-4.3.6-pcrealloc.patch 1004
diff --git a/dev-php/mod_php/files/digest-mod_php-4.3.7 b/dev-php/mod_php/files/digest-mod_php-4.3.7
deleted file mode 100644
index 5e33df889730..000000000000
--- a/dev-php/mod_php/files/digest-mod_php-4.3.7
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 5293fdc909a306a2636e0fafcc79442c php-4.3.7.tar.bz2 3963734
-MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416
-MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285
-MD5 85faf5afdf7dfcd0368a290a2e00e7d5 hardened-php-4.3.7-0.1.2.patch.gz 9592
diff --git a/dev-php/mod_php/files/digest-mod_php-4.3.7-r1 b/dev-php/mod_php/files/digest-mod_php-4.3.7-r1
deleted file mode 100644
index 5e33df889730..000000000000
--- a/dev-php/mod_php/files/digest-mod_php-4.3.7-r1
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 5293fdc909a306a2636e0fafcc79442c php-4.3.7.tar.bz2 3963734
-MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416
-MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285
-MD5 85faf5afdf7dfcd0368a290a2e00e7d5 hardened-php-4.3.7-0.1.2.patch.gz 9592
diff --git a/dev-php/mod_php/files/mod_php-4.3.4-r3.diff b/dev-php/mod_php/files/mod_php-4.3.4-r3.diff
deleted file mode 100644
index acd65e864c5a..000000000000
--- a/dev-php/mod_php/files/mod_php-4.3.4-r3.diff
+++ /dev/null
@@ -1,51 +0,0 @@
---- sapi/apache/mod_php4.c.old	2004-01-31 21:44:55.000000000 +0000
-+++ sapi/apache/mod_php4.c	2004-01-31 21:49:59.000000000 +0000
-@@ -822,6 +822,9 @@
- 
- 	if (!(r->finfo.st_mode & S_IXUSR)) {
- 		r->allowed |= (1 << METHODS) - 1;
-+		zend_try {
-+			zend_ini_deactivate(TSRMLS_C);
-+		} zend_end_try();
- 		return DECLINED;
- 	}
- 	per_dir_conf = (HashTable *) get_module_config(r->per_dir_config, &php4_module);
---- sapi/apache2handler/sapi_apache2.c.old	2004-01-31 21:55:21.000000000 +0000
-+++ sapi/apache2handler/sapi_apache2.c	2004-01-31 21:55:26.000000000 +0000
-@@ -465,6 +465,9 @@
- 	if (strcmp(r->handler, PHP_MAGIC_TYPE) && strcmp(r->handler, PHP_SOURCE_MAGIC_TYPE) && strcmp(r->handler, PHP_SCRIPT)) {
- 		/* Check for xbithack in this case. */
- 		if (!AP2(xbithack) || strcmp(r->handler, "text/html") || !(r->finfo.protection & APR_UEXECUTE)) {
-+			zend_try {
-+				zend_ini_deactivate(TSRMLS_C);
-+			} zend_end_try();
- 			return DECLINED;
- 		}
- 	}
---- sapi/apache2handler/sapi_apache2.c.old	2004-01-31 22:40:29.000000000 +0000
-+++ sapi/apache2handler/sapi_apache2.c	2004-01-31 22:42:23.000000000 +0000
-@@ -474,15 +474,24 @@
- 
- 	/* handle situations where user turns the engine off */
- 	if (!AP2(engine)) {
-+		zend_try {
-+			zend_ini_deactivate(TSRMLS_C);
-+		} zend_end_try();
- 		return DECLINED;
- 	}
- 
- 	if (r->finfo.filetype == 0) {
- 		php_apache_sapi_log_message("script not found or unable to stat");
-+		zend_try {
-+			zend_ini_deactivate(TSRMLS_C);
-+		} zend_end_try();
- 		return HTTP_NOT_FOUND;
- 	}
- 	if (r->finfo.filetype == APR_DIR) {
- 		php_apache_sapi_log_message("attempt to invoke directory as script");
-+		zend_try {
-+			zend_ini_deactivate(TSRMLS_C);
-+		} zend_end_try();
- 		return HTTP_FORBIDDEN;
- 	}
- 
diff --git a/dev-php/mod_php/files/pear_config.diff b/dev-php/mod_php/files/pear_config.diff
deleted file mode 100644
index 57761db6ac4a..000000000000
--- a/dev-php/mod_php/files/pear_config.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- pear/PEAR/Config.php	2002/12/22 01:43:20	1.35.2.2
-+++ pear/PEAR/Config.php	2003/01/07 23:12:06	1.41
-
-@@ -142,7 +142,7 @@ if (isset($_ENV['PHP_PEAR_PREFERRED_STAT
- if (isset($_ENV['PHP_PEAR_UMASK'])) {
-     define('PEAR_CONFIG_DEFAULT_UMASK', $_ENV['PHP_PEAR_UMASK']);
- } else {
--    define('PEAR_CONFIG_DEFAULT_UMASK', umask());
-+    define('PEAR_CONFIG_DEFAULT_UMASK', decoct(umask()));
- }
-
- // Default for cache_ttl
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
deleted file mode 100644
index 7c084d5b9227..000000000000
--- a/dev-php/mod_php/mod_php-4.3.4-r4.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# 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.11 2004/07/14 21:30:38 agriffis Exp $
-
-IUSE="apache2 debug"
-
-KEYWORDS="x86 ppc sparc alpha hppa ia64 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-sapi eutils
-DESCRIPTION="Apache module for PHP"
-
-DEPEND_EXTRA=">=net-www/apache-1.3.26-r2
-			  apache2? ( >=net-www/apache-2.0.43-r1 )"
-DEPEND="${DEPEND} ${DEPEND_EXTRA}"
-RDEPEND="${RDEPEND} ${DEPEND_EXTRA}"
-
-# Add a 'return 0' as we DON'T want the return code checked
-pkg_setup() {
-	use debug && einfo "Installing in SLOT=${SLOT}"
-	return 0
-}
-
-src_unpack() {
-	multiinstwarn
-	detectapache domsg
-	php-sapi_src_unpack
-	if [ "${ARCH}" == "amd64" ] ; then
-		epatch ${FILESDIR}/${P}-amd64hack.diff
-	fi
-
-	# bug fix for security problem - bug #39952
-	epatch ${FILESDIR}/mod_php-4.3.4-r3.diff
-}
-
-src_compile() {
-	# Every Apache2 MPM EXCEPT prefork needs Zend Thread Safety
-	if [ -n "${USE_APACHE2}" ]; then
-		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*) ;;
-			*) 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-sapi_src_compile
-}
-
-
-src_install() {
-	php-sapi_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 instances of mod_php installed. Please look at the autoclean"
-	ewarn "output at the end of the emerge and unmerge all but relevant"
-	ewarn "instances."
-}
-
-apache2fix() {
-	if egrep -q -- '-D PHP\>' /etc/conf.d/apache2; then
-		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
-	fi
-}
-
-
-pkg_preinst() {
-	multiinstwarn
-	[ "${APACHEVER}" -eq '2' ] && apache2fix
-	php-sapi_pkg_preinst
-}
-
-pkg_postinst() {
-	php-sapi_pkg_postinst
-	multiinstwarn
-	einfo "To have Apache run php programs, please do the following:"
-	if [ -n "${USE_APACHE2}" ]; then
-		apache2msg
-	else
-		einfo "1. Execute the command:"
-		einfo " \"ebuild /var/db/pkg/${CATEGORY}/${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.5.ebuild b/dev-php/mod_php/mod_php-4.3.5.ebuild
deleted file mode 100644
index 928a06c09b48..000000000000
--- a/dev-php/mod_php/mod_php-4.3.5.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# 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.10 2004/07/14 21:30:38 agriffis Exp $
-
-IUSE="apache2 debug"
-
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~ia64 ~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-sapi eutils
-
-DESCRIPTION="Apache module for PHP"
-
-DEPEND_EXTRA=">=net-www/apache-1.3.26-r2
-			  apache2? ( >=net-www/apache-2.0.43-r1 )"
-DEPEND="${DEPEND} ${DEPEND_EXTRA}"
-RDEPEND="${RDEPEND} ${DEPEND_EXTRA}"
-
-# Add a 'return 0' as we DON'T want the return code checked
-pkg_setup() {
-	use debug && einfo "Installing in SLOT=${SLOT}"
-	return 0
-}
-
-src_unpack() {
-	multiinstwarn
-	detectapache domsg
-	php-sapi_src_unpack
-	if [ "${ARCH}" == "amd64" ] ; then
-		epatch ${FILESDIR}/mod_php-4.3.4-amd64hack.diff
-	fi
-
-	# bug fix for security problem - bug #39952
-	# second revision as the apache2 stuff was resolved upstream
-	epatch ${FILESDIR}/mod_php-4.3.5-apache1security.diff
-
-	# stop php from activing 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 php4,-i -n php4,g' $i
-	done
-}
-
-src_compile() {
-	# Every Apache2 MPM EXCEPT prefork needs Zend Thread Safety
-	if [ -n "${USE_APACHE2}" ]; then
-		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*) ;;
-			*) 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-sapi_src_compile
-}
-
-
-src_install() {
-	PHP_INSTALLTARGETS="install"
-	php-sapi_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 instances of mod_php installed. Please look at the autoclean"
-	ewarn "output at the end of the emerge and unmerge all but relevant"
-	ewarn "instances."
-}
-
-apache2fix() {
-	if egrep -q -- '-D PHP\>' /etc/conf.d/apache2; then
-		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
-	fi
-}
-
-
-pkg_preinst() {
-	multiinstwarn
-	[ "${APACHEVER}" -eq '2' ] && apache2fix
-	php-sapi_pkg_preinst
-}
-
-pkg_postinst() {
-	php-sapi_pkg_postinst
-	multiinstwarn
-	einfo "To have Apache run php programs, please do the following:"
-	if [ -n "${USE_APACHE2}" ]; then
-		apache2msg
-	else
-		einfo "1. Execute the command:"
-		einfo " \"ebuild /var/db/pkg/${CATEGORY}/${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.6-r1.ebuild b/dev-php/mod_php/mod_php-4.3.6-r1.ebuild
deleted file mode 100644
index 4cb0c0aed786..000000000000
--- a/dev-php/mod_php/mod_php-4.3.6-r1.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# 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.8 2004/07/14 21:30:38 agriffis Exp $
-
-IUSE="apache2 debug"
-
-KEYWORDS="x86 ~ppc sparc ~alpha ~hppa ~ia64 ~amd64 s390"
-
-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-sapi eutils
-
-DESCRIPTION="Apache module for PHP"
-
-DEPEND_EXTRA=">=net-www/apache-1.3.26-r2
-			  apache2? ( >=net-www/apache-2.0.43-r1 )"
-DEPEND="${DEPEND} ${DEPEND_EXTRA}"
-RDEPEND="${RDEPEND} ${DEPEND_EXTRA}"
-
-# Add a 'return 0' as we DON'T want the return code checked
-pkg_setup() {
-	use debug && einfo "Installing in SLOT=${SLOT}"
-	return 0
-}
-
-src_unpack() {
-	multiinstwarn
-	detectapache domsg
-	php-sapi_src_unpack
-	if [ "${ARCH}" == "amd64" ] ; then
-		epatch ${FILESDIR}/mod_php-4.3.4-amd64hack.diff
-	fi
-
-	# bug fix for security problem - bug #39952
-	# second revision as the apache2 stuff was resolved upstream
-	epatch ${FILESDIR}/mod_php-4.3.5-apache1security.diff
-
-	# stop php from activing 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 php4,-i -n php4,g' $i
-	done
-}
-
-src_compile() {
-	# Every Apache2 MPM EXCEPT prefork needs Zend Thread Safety
-	if [ -n "${USE_APACHE2}" ]; then
-		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*) ;;
-			*) 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-sapi_src_compile
-}
-
-
-src_install() {
-	PHP_INSTALLTARGETS="install"
-	php-sapi_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 instances of mod_php installed. Please look at the autoclean"
-	ewarn "output at the end of the emerge and unmerge all but relevant"
-	ewarn "instances."
-}
-
-apache2fix() {
-	if egrep -q -- '-D PHP\>' /etc/conf.d/apache2; then
-		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
-	fi
-}
-
-
-pkg_preinst() {
-	multiinstwarn
-	[ "${APACHEVER}" -eq '2' ] && apache2fix
-	php-sapi_pkg_preinst
-}
-
-pkg_postinst() {
-	php-sapi_pkg_postinst
-	multiinstwarn
-	einfo "To have Apache run php programs, please do the following:"
-	if [ -n "${USE_APACHE2}" ]; then
-		apache2msg
-	else
-		einfo "1. Execute the command:"
-		einfo " \"ebuild /var/db/pkg/${CATEGORY}/${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.6-r2.ebuild b/dev-php/mod_php/mod_php-4.3.6-r2.ebuild
deleted file mode 100644
index 81e1e21cc81d..000000000000
--- a/dev-php/mod_php/mod_php-4.3.6-r2.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# 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.6 2004/07/04 23:44:14 robbat2 Exp $
-
-IUSE="${IUSE} apache2"
-
-KEYWORDS="x86 ~ppc sparc alpha hppa ~ia64 ~amd64 s390"
-
-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-sapi eutils
-
-DESCRIPTION="Apache module for PHP"
-
-DEPEND_EXTRA=">=net-www/apache-1.3.26-r2
-			  apache2? ( >=net-www/apache-2.0.43-r1 )"
-DEPEND="${DEPEND} ${DEPEND_EXTRA}"
-RDEPEND="${RDEPEND} ${DEPEND_EXTRA}"
-IUSE="${IUSE} debug"
-
-# Add a 'return 0' as we DON'T want the return code checked
-pkg_setup() {
-	use debug && einfo "Installing in SLOT=${SLOT}"
-	return 0
-}
-
-src_unpack() {
-	multiinstwarn
-	detectapache domsg
-	php-sapi_src_unpack
-	if [ "${ARCH}" == "amd64" ] ; then
-		epatch ${FILESDIR}/mod_php-4.3.4-amd64hack.diff
-	fi
-
-	# bug fix for security problem - bug #39952
-	# second revision as the apache2 stuff was resolved upstream
-	epatch ${FILESDIR}/mod_php-4.3.5-apache1security.diff
-
-	# stop php from activing 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 php4,-i -n php4,g' $i
-	done
-}
-
-src_compile() {
-	# Every Apache2 MPM EXCEPT prefork needs Zend Thread Safety
-	if [ -n "${USE_APACHE2}" ]; then
-		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*) ;;
-			*) 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-sapi_src_compile
-}
-
-
-src_install() {
-	PHP_INSTALLTARGETS="install"
-	php-sapi_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 instances of mod_php installed. Please look at the autoclean"
-	ewarn "output at the end of the emerge and unmerge all but relevant"
-	ewarn "instances."
-}
-
-apache2fix() {
-	if egrep -q -- '-D PHP\>' /etc/conf.d/apache2; then
-		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
-	fi
-}
-
-
-pkg_preinst() {
-	multiinstwarn
-	[ "${APACHEVER}" -eq '2' ] && apache2fix
-	php-sapi_pkg_preinst
-}
-
-pkg_postinst() {
-	php-sapi_pkg_postinst
-	multiinstwarn
-	einfo "To have Apache run php programs, please do the following:"
-	if [ -n "${USE_APACHE2}" ]; then
-		apache2msg
-	else
-		einfo "1. Execute the command:"
-		einfo " \"ebuild /var/db/pkg/${CATEGORY}/${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.6.ebuild b/dev-php/mod_php/mod_php-4.3.6.ebuild
deleted file mode 100644
index 4d49751bc20a..000000000000
--- a/dev-php/mod_php/mod_php-4.3.6.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# 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.5 2004/07/14 21:30:38 agriffis Exp $
-
-IUSE="apache2 debug"
-
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~ia64 ~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-sapi eutils
-
-DESCRIPTION="Apache module for PHP"
-
-DEPEND_EXTRA=">=net-www/apache-1.3.26-r2
-			  apache2? ( >=net-www/apache-2.0.43-r1 )"
-DEPEND="${DEPEND} ${DEPEND_EXTRA}"
-RDEPEND="${RDEPEND} ${DEPEND_EXTRA}"
-
-# Add a 'return 0' as we DON'T want the return code checked
-pkg_setup() {
-	use debug && einfo "Installing in SLOT=${SLOT}"
-	return 0
-}
-
-src_unpack() {
-	multiinstwarn
-	detectapache domsg
-	php-sapi_src_unpack
-	if [ "${ARCH}" == "amd64" ] ; then
-		epatch ${FILESDIR}/mod_php-4.3.4-amd64hack.diff
-	fi
-
-	# bug fix for security problem - bug #39952
-	# second revision as the apache2 stuff was resolved upstream
-	epatch ${FILESDIR}/mod_php-4.3.5-apache1security.diff
-
-	# stop php from activing 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 php4,-i -n php4,g' $i
-	done
-}
-
-src_compile() {
-	# Every Apache2 MPM EXCEPT prefork needs Zend Thread Safety
-	if [ -n "${USE_APACHE2}" ]; then
-		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*) ;;
-			*) 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-sapi_src_compile
-}
-
-
-src_install() {
-	PHP_INSTALLTARGETS="install"
-	php-sapi_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 instances of mod_php installed. Please look at the autoclean"
-	ewarn "output at the end of the emerge and unmerge all but relevant"
-	ewarn "instances."
-}
-
-apache2fix() {
-	if egrep -q -- '-D PHP\>' /etc/conf.d/apache2; then
-		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
-	fi
-}
-
-
-pkg_preinst() {
-	multiinstwarn
-	[ "${APACHEVER}" -eq '2' ] && apache2fix
-	php-sapi_pkg_preinst
-}
-
-pkg_postinst() {
-	php-sapi_pkg_postinst
-	multiinstwarn
-	einfo "To have Apache run php programs, please do the following:"
-	if [ -n "${USE_APACHE2}" ]; then
-		apache2msg
-	else
-		einfo "1. Execute the command:"
-		einfo " \"ebuild /var/db/pkg/${CATEGORY}/${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.6_rc2.ebuild b/dev-php/mod_php/mod_php-4.3.6_rc2.ebuild
deleted file mode 100644
index b86bad847479..000000000000
--- a/dev-php/mod_php/mod_php-4.3.6_rc2.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# 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.9 2004/07/14 21:30:38 agriffis Exp $
-
-IUSE="apache2 debug"
-
-KEYWORDS="x86 ~ppc sparc ~alpha hppa ~ia64 ~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}"
-
-SRC_URI_BASE="http://downloads.php.net/ilia/"
-# 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-sapi eutils
-
-DESCRIPTION="Apache module for PHP"
-
-DEPEND_EXTRA=">=net-www/apache-1.3.26-r2
-			  apache2? ( >=net-www/apache-2.0.43-r1 )"
-DEPEND="${DEPEND} ${DEPEND_EXTRA}"
-RDEPEND="${RDEPEND} ${DEPEND_EXTRA}"
-
-# Add a 'return 0' as we DON'T want the return code checked
-pkg_setup() {
-	use debug && einfo "Installing in SLOT=${SLOT}"
-	return 0
-}
-
-src_unpack() {
-	multiinstwarn
-	detectapache domsg
-	php-sapi_src_unpack
-	if [ "${ARCH}" == "amd64" ] ; then
-		epatch ${FILESDIR}/mod_php-4.3.4-amd64hack.diff
-	fi
-
-	# bug fix for security problem - bug #39952
-	# second revision as the apache2 stuff was resolved upstream
-	epatch ${FILESDIR}/mod_php-4.3.5-apache1security.diff
-
-	# stop php from activing 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 php4,-i -n php4,g' $i
-	done
-}
-
-src_compile() {
-	# Every Apache2 MPM EXCEPT prefork needs Zend Thread Safety
-	if [ -n "${USE_APACHE2}" ]; then
-		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*) ;;
-			*) 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-sapi_src_compile
-}
-
-
-src_install() {
-	PHP_INSTALLTARGETS="install"
-	php-sapi_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 instances of mod_php installed. Please look at the autoclean"
-	ewarn "output at the end of the emerge and unmerge all but relevant"
-	ewarn "instances."
-}
-
-apache2fix() {
-	if egrep -q -- '-D PHP\>' /etc/conf.d/apache2; then
-		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
-	fi
-}
-
-
-pkg_preinst() {
-	multiinstwarn
-	[ "${APACHEVER}" -eq '2' ] && apache2fix
-	php-sapi_pkg_preinst
-}
-
-pkg_postinst() {
-	php-sapi_pkg_postinst
-	multiinstwarn
-	einfo "To have Apache run php programs, please do the following:"
-	if [ -n "${USE_APACHE2}" ]; then
-		apache2msg
-	else
-		einfo "1. Execute the command:"
-		einfo " \"ebuild /var/db/pkg/${CATEGORY}/${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.7-r1.ebuild b/dev-php/mod_php/mod_php-4.3.7-r1.ebuild
deleted file mode 100644
index eae9fcabc809..000000000000
--- a/dev-php/mod_php/mod_php-4.3.7-r1.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# 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.6 2004/07/08 04:34:55 weeve Exp $
-
-IUSE="${IUSE} apache2"
-
-KEYWORDS="x86 sparc alpha ~hppa ~ia64 ~amd64 ~s390 ppc"
-
-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-sapi eutils
-
-DESCRIPTION="Apache module for PHP"
-
-DEPEND_EXTRA=">=net-www/apache-1.3.26-r2
-			  apache2? ( >=net-www/apache-2.0.43-r1 )"
-DEPEND="${DEPEND} ${DEPEND_EXTRA}"
-RDEPEND="${RDEPEND} ${DEPEND_EXTRA}"
-IUSE="${IUSE} debug"
-# for this revision only
-PDEPEND=">=${PHP_PROVIDER_PKG}-4.3.7-r1"
-
-# Add a 'return 0' as we DON'T want the return code checked
-pkg_setup() {
-	use debug && einfo "Installing in SLOT=${SLOT}"
-	return 0
-}
-
-src_unpack() {
-	multiinstwarn
-	detectapache domsg
-	php-sapi_src_unpack
-	if [ "${ARCH}" == "amd64" ] ; then
-		epatch ${FILESDIR}/mod_php-4.3.4-amd64hack.diff
-	fi
-
-	# bug fix for security problem - bug #39952
-	# second revision as the apache2 stuff was resolved upstream
-	epatch ${FILESDIR}/mod_php-4.3.5-apache1security.diff
-
-	# stop php from activing 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 php4,-i -n php4,g' $i
-	done
-}
-
-src_compile() {
-	# Every Apache2 MPM EXCEPT prefork needs Zend Thread Safety
-	if [ -n "${USE_APACHE2}" ]; then
-		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*) ;;
-			*) 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-sapi_src_compile
-}
-
-
-src_install() {
-	PHP_INSTALLTARGETS="install"
-	php-sapi_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 "Cleaning up a little"
-	rm -rf ${D}/usr/lib/apache${USE_APACHE2}/modules/libphp4.so
-	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 instances of mod_php installed. Please look at the autoclean"
-	ewarn "output at the end of the emerge and unmerge all but relevant"
-	ewarn "instances."
-}
-
-apache2fix() {
-	if egrep -q -- '-D PHP\>' /etc/conf.d/apache2; then
-		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
-	fi
-}
-
-
-pkg_preinst() {
-	multiinstwarn
-	[ "${APACHEVER}" -eq '2' ] && apache2fix
-	php-sapi_pkg_preinst
-}
-
-pkg_postinst() {
-	php-sapi_pkg_postinst
-	multiinstwarn
-	einfo "To have Apache run php programs, please do the following:"
-	if [ -n "${USE_APACHE2}" ]; then
-		apache2msg
-	else
-		einfo "1. Execute the command:"
-		einfo " \"ebuild /var/db/pkg/${CATEGORY}/${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.7.ebuild b/dev-php/mod_php/mod_php-4.3.7.ebuild
deleted file mode 100644
index c67ebd5b9a50..000000000000
--- a/dev-php/mod_php/mod_php-4.3.7.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# 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.4 2004/07/04 23:44:14 robbat2 Exp $
-
-IUSE="${IUSE} apache2"
-
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~ia64 ~amd64 ~s390"
-
-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-sapi eutils
-
-DESCRIPTION="Apache module for PHP"
-
-DEPEND_EXTRA=">=net-www/apache-1.3.26-r2
-			  apache2? ( >=net-www/apache-2.0.43-r1 )"
-DEPEND="${DEPEND} ${DEPEND_EXTRA}"
-RDEPEND="${RDEPEND} ${DEPEND_EXTRA}"
-IUSE="${IUSE} debug"
-
-# Add a 'return 0' as we DON'T want the return code checked
-pkg_setup() {
-	use debug && einfo "Installing in SLOT=${SLOT}"
-	return 0
-}
-
-src_unpack() {
-	multiinstwarn
-	detectapache domsg
-	php-sapi_src_unpack
-	if [ "${ARCH}" == "amd64" ] ; then
-		epatch ${FILESDIR}/mod_php-4.3.4-amd64hack.diff
-	fi
-
-	# bug fix for security problem - bug #39952
-	# second revision as the apache2 stuff was resolved upstream
-	epatch ${FILESDIR}/mod_php-4.3.5-apache1security.diff
-
-	# stop php from activing 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 php4,-i -n php4,g' $i
-	done
-}
-
-src_compile() {
-	# Every Apache2 MPM EXCEPT prefork needs Zend Thread Safety
-	if [ -n "${USE_APACHE2}" ]; then
-		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*) ;;
-			*) 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-sapi_src_compile
-}
-
-
-src_install() {
-	PHP_INSTALLTARGETS="install"
-	php-sapi_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 instances of mod_php installed. Please look at the autoclean"
-	ewarn "output at the end of the emerge and unmerge all but relevant"
-	ewarn "instances."
-}
-
-apache2fix() {
-	if egrep -q -- '-D PHP\>' /etc/conf.d/apache2; then
-		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
-	fi
-}
-
-
-pkg_preinst() {
-	multiinstwarn
-	[ "${APACHEVER}" -eq '2' ] && apache2fix
-	php-sapi_pkg_preinst
-}
-
-pkg_postinst() {
-	php-sapi_pkg_postinst
-	multiinstwarn
-	einfo "To have Apache run php programs, please do the following:"
-	if [ -n "${USE_APACHE2}" ]; then
-		apache2msg
-	else
-		einfo "1. Execute the command:"
-		einfo " \"ebuild /var/db/pkg/${CATEGORY}/${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/php-cgi/ChangeLog b/dev-php/php-cgi/ChangeLog
index a9a1c36e33bc..f9f86d987a2c 100644
--- a/dev-php/php-cgi/ChangeLog
+++ b/dev-php/php-cgi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-php/php-cgi
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/ChangeLog,v 1.30 2004/08/03 16:26:30 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/ChangeLog,v 1.31 2004/08/06 03:17:14 robbat2 Exp $
+
+  05 Aug 2004; Robin H. Johnson <robbat2@gentoo.org> -php-cgi-4.3.4-r2.ebuild,
+  -php-cgi-4.3.5.ebuild, -php-cgi-4.3.6-r1.ebuild, -php-cgi-4.3.6.ebuild,
+  -php-cgi-4.3.6_rc2.ebuild, -php-cgi-4.3.7-r1.ebuild, -php-cgi-4.3.7.ebuild:
+  The Great PHP ebuild cleanup.
 
   03 Aug 2004; <agriffis@gentoo.org> php-cgi-4.3.8.ebuild:
   stable on ia64 for bug 56295
diff --git a/dev-php/php-cgi/files/digest-php-cgi-4.3.4-r2 b/dev-php/php-cgi/files/digest-php-cgi-4.3.4-r2
deleted file mode 100644
index 76ff348f5e58..000000000000
--- a/dev-php/php-cgi/files/digest-php-cgi-4.3.4-r2
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 b9dd601863e08e52e3c4d5e02c2627cf php-4.3.4.tar.bz2 3774324
-MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416
-MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285
-MD5 3075036987c0582ec3b2ab81db727643 hardened-php-4.3.6-0.1.2.patch.gz 10446
diff --git a/dev-php/php-cgi/files/digest-php-cgi-4.3.5 b/dev-php/php-cgi/files/digest-php-cgi-4.3.5
deleted file mode 100644
index fbe6856b0a8e..000000000000
--- a/dev-php/php-cgi/files/digest-php-cgi-4.3.5
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 29e61c125ac6278897c6c219f5d100d1 php-4.3.5.tar.bz2 3947414
-MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416
-MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285
-MD5 3075036987c0582ec3b2ab81db727643 hardened-php-4.3.6-0.1.2.patch.gz 10446
diff --git a/dev-php/php-cgi/files/digest-php-cgi-4.3.6 b/dev-php/php-cgi/files/digest-php-cgi-4.3.6
deleted file mode 100644
index 207932e5c9af..000000000000
--- a/dev-php/php-cgi/files/digest-php-cgi-4.3.6
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 79cde484e31871176137eb78014657fa php-4.3.6.tar.bz2 3957796
-MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416
-MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285
-MD5 0ed6c4e7dbba264521ab54d49f02912d php-4.3.6-pcrealloc.patch 1004
-MD5 3075036987c0582ec3b2ab81db727643 hardened-php-4.3.6-0.1.2.patch.gz 10446
diff --git a/dev-php/php-cgi/files/digest-php-cgi-4.3.6-r1 b/dev-php/php-cgi/files/digest-php-cgi-4.3.6-r1
deleted file mode 100644
index 207932e5c9af..000000000000
--- a/dev-php/php-cgi/files/digest-php-cgi-4.3.6-r1
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 79cde484e31871176137eb78014657fa php-4.3.6.tar.bz2 3957796
-MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416
-MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285
-MD5 0ed6c4e7dbba264521ab54d49f02912d php-4.3.6-pcrealloc.patch 1004
-MD5 3075036987c0582ec3b2ab81db727643 hardened-php-4.3.6-0.1.2.patch.gz 10446
diff --git a/dev-php/php-cgi/files/digest-php-cgi-4.3.6_rc2 b/dev-php/php-cgi/files/digest-php-cgi-4.3.6_rc2
deleted file mode 100644
index 75255b425993..000000000000
--- a/dev-php/php-cgi/files/digest-php-cgi-4.3.6_rc2
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 0bf89373a60f65cd37c1e3e652e278f5 php-4.3.6RC2.tar.bz2 3958337
-MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416
-MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285
-MD5 0ed6c4e7dbba264521ab54d49f02912d php-4.3.6-pcrealloc.patch 1004
-MD5 3075036987c0582ec3b2ab81db727643 hardened-php-4.3.6-0.1.2.patch.gz 10446
diff --git a/dev-php/php-cgi/files/digest-php-cgi-4.3.7 b/dev-php/php-cgi/files/digest-php-cgi-4.3.7
deleted file mode 100644
index 5e33df889730..000000000000
--- a/dev-php/php-cgi/files/digest-php-cgi-4.3.7
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 5293fdc909a306a2636e0fafcc79442c php-4.3.7.tar.bz2 3963734
-MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416
-MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285
-MD5 85faf5afdf7dfcd0368a290a2e00e7d5 hardened-php-4.3.7-0.1.2.patch.gz 9592
diff --git a/dev-php/php-cgi/files/digest-php-cgi-4.3.7-r1 b/dev-php/php-cgi/files/digest-php-cgi-4.3.7-r1
deleted file mode 100644
index 5e33df889730..000000000000
--- a/dev-php/php-cgi/files/digest-php-cgi-4.3.7-r1
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 5293fdc909a306a2636e0fafcc79442c php-4.3.7.tar.bz2 3963734
-MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416
-MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285
-MD5 85faf5afdf7dfcd0368a290a2e00e7d5 hardened-php-4.3.7-0.1.2.patch.gz 9592
diff --git a/dev-php/php-cgi/files/pear_config.diff b/dev-php/php-cgi/files/pear_config.diff
deleted file mode 100644
index 57761db6ac4a..000000000000
--- a/dev-php/php-cgi/files/pear_config.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- pear/PEAR/Config.php	2002/12/22 01:43:20	1.35.2.2
-+++ pear/PEAR/Config.php	2003/01/07 23:12:06	1.41
-
-@@ -142,7 +142,7 @@ if (isset($_ENV['PHP_PEAR_PREFERRED_STAT
- if (isset($_ENV['PHP_PEAR_UMASK'])) {
-     define('PEAR_CONFIG_DEFAULT_UMASK', $_ENV['PHP_PEAR_UMASK']);
- } else {
--    define('PEAR_CONFIG_DEFAULT_UMASK', umask());
-+    define('PEAR_CONFIG_DEFAULT_UMASK', decoct(umask()));
- }
-
- // Default for cache_ttl
diff --git a/dev-php/php-cgi/php-cgi-4.3.4-r2.ebuild b/dev-php/php-cgi/php-cgi-4.3.4-r2.ebuild
deleted file mode 100644
index 5ee847a40930..000000000000
--- a/dev-php/php-cgi/php-cgi-4.3.4-r2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/php-cgi-4.3.4-r2.ebuild,v 1.4 2004/06/25 01:23:25 agriffis Exp $
-
-PHPSAPI="cgi"
-inherit php-sapi eutils
-
-DESCRIPTION="PHP CGI"
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha hppa"
-
-src_compile() {
-	# CLI needed to build stuff
-	myconf="${myconf} \
-		--enable-cgi \
-		--enable-cli \
-		--enable-fastcgi"
-
-	php-sapi_src_compile
-}
-
-
-src_install() {
-	PHP_INSTALLTARGETS="${PHP_INSTALLTARGETS} install-sapi"
-	php-sapi_src_install
-
-	# rename binary
-	mv ${D}/usr/bin/php ${D}/usr/bin/php-cgi
-}
-
-pkg_postinst() {
-	php-sapi_pkg_postinst
-	einfo "This is a CGI only build."
-}
diff --git a/dev-php/php-cgi/php-cgi-4.3.5.ebuild b/dev-php/php-cgi/php-cgi-4.3.5.ebuild
deleted file mode 100644
index 9e0a6c5f5422..000000000000
--- a/dev-php/php-cgi/php-cgi-4.3.5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/php-cgi-4.3.5.ebuild,v 1.2 2004/06/25 01:23:25 agriffis Exp $
-
-PHPSAPI="cgi"
-inherit php-sapi eutils
-
-DESCRIPTION="PHP CGI"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa"
-
-src_compile() {
-	# CLI needed to build stuff
-	myconf="${myconf} \
-		--enable-cgi \
-		--enable-cli \
-		--enable-fastcgi"
-
-	php-sapi_src_compile
-}
-
-
-src_install() {
-	PHP_INSTALLTARGETS="install"
-	php-sapi_src_install
-
-	# rename binary
-	mv ${D}/usr/bin/php ${D}/usr/bin/php-cgi
-}
-
-pkg_postinst() {
-	php-sapi_pkg_postinst
-	einfo "This is a CGI only build."
-}
diff --git a/dev-php/php-cgi/php-cgi-4.3.6-r1.ebuild b/dev-php/php-cgi/php-cgi-4.3.6-r1.ebuild
deleted file mode 100644
index 2736e7da77cb..000000000000
--- a/dev-php/php-cgi/php-cgi-4.3.6-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/php-cgi-4.3.6-r1.ebuild,v 1.3 2004/07/04 08:26:01 kloeri Exp $
-
-PHPSAPI="cgi"
-inherit php-sapi eutils
-
-DESCRIPTION="PHP CGI"
-SLOT="0"
-KEYWORDS="x86 ~ppc sparc alpha hppa"
-
-src_compile() {
-	# CLI needed to build stuff
-	myconf="${myconf} \
-		--enable-cgi \
-		--enable-cli \
-		--enable-fastcgi"
-
-	php-sapi_src_compile
-}
-
-
-src_install() {
-	PHP_INSTALLTARGETS="install"
-	php-sapi_src_install
-
-	# rename binary
-	mv ${D}/usr/bin/php ${D}/usr/bin/php-cgi
-}
-
-pkg_postinst() {
-	php-sapi_pkg_postinst
-	einfo "This is a CGI only build."
-}
diff --git a/dev-php/php-cgi/php-cgi-4.3.6.ebuild b/dev-php/php-cgi/php-cgi-4.3.6.ebuild
deleted file mode 100644
index 3d72ff573ead..000000000000
--- a/dev-php/php-cgi/php-cgi-4.3.6.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/php-cgi-4.3.6.ebuild,v 1.4 2004/06/25 01:23:25 agriffis Exp $
-
-PHPSAPI="cgi"
-inherit php-sapi eutils
-
-DESCRIPTION="PHP CGI"
-SLOT="0"
-KEYWORDS="x86 ~ppc sparc ~alpha hppa"
-
-src_compile() {
-	# CLI needed to build stuff
-	myconf="${myconf} \
-		--enable-cgi \
-		--enable-cli \
-		--enable-fastcgi"
-
-	php-sapi_src_compile
-}
-
-
-src_install() {
-	PHP_INSTALLTARGETS="install"
-	php-sapi_src_install
-
-	# rename binary
-	mv ${D}/usr/bin/php ${D}/usr/bin/php-cgi
-}
-
-pkg_postinst() {
-	php-sapi_pkg_postinst
-	einfo "This is a CGI only build."
-}
diff --git a/dev-php/php-cgi/php-cgi-4.3.6_rc2.ebuild b/dev-php/php-cgi/php-cgi-4.3.6_rc2.ebuild
deleted file mode 100644
index 81ae33183799..000000000000
--- a/dev-php/php-cgi/php-cgi-4.3.6_rc2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/php-cgi-4.3.6_rc2.ebuild,v 1.4 2004/06/25 01:23:25 agriffis Exp $
-
-PHPSAPI="cgi"
-SRC_URI_BASE="http://downloads.php.net/ilia/"
-inherit php-sapi eutils
-
-DESCRIPTION="PHP CGI"
-SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc ~alpha hppa"
-
-src_compile() {
-	# CLI needed to build stuff
-	myconf="${myconf} \
-		--enable-cgi \
-		--enable-cli \
-		--enable-fastcgi"
-
-	php-sapi_src_compile
-}
-
-
-src_install() {
-	PHP_INSTALLTARGETS="install"
-	php-sapi_src_install
-
-	# rename binary
-	mv ${D}/usr/bin/php ${D}/usr/bin/php-cgi
-}
-
-pkg_postinst() {
-	php-sapi_pkg_postinst
-	einfo "This is a CGI only build."
-}
diff --git a/dev-php/php-cgi/php-cgi-4.3.7-r1.ebuild b/dev-php/php-cgi/php-cgi-4.3.7-r1.ebuild
deleted file mode 100644
index b7ef779147aa..000000000000
--- a/dev-php/php-cgi/php-cgi-4.3.7-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/php-cgi-4.3.7-r1.ebuild,v 1.5 2004/07/08 04:39:16 weeve Exp $
-
-PHPSAPI="cgi"
-inherit php-sapi eutils
-
-DESCRIPTION="PHP CGI"
-SLOT="0"
-KEYWORDS="x86 sparc alpha ~hppa ppc"
-
-# for this revision only
-PDEPEND=">=${PHP_PROVIDER_PKG}-4.3.7-r1"
-
-src_compile() {
-	# CLI needed to build stuff
-	myconf="${myconf} \
-		--enable-cgi \
-		--enable-cli \
-		--enable-fastcgi"
-
-	php-sapi_src_compile
-}
-
-
-src_install() {
-	PHP_INSTALLTARGETS="install"
-	php-sapi_src_install
-
-	# rename binary
-	mv ${D}/usr/bin/php ${D}/usr/bin/php-cgi
-}
-
-pkg_postinst() {
-	php-sapi_pkg_postinst
-	einfo "This is a CGI only build."
-}
diff --git a/dev-php/php-cgi/php-cgi-4.3.7.ebuild b/dev-php/php-cgi/php-cgi-4.3.7.ebuild
deleted file mode 100644
index 9b859924af50..000000000000
--- a/dev-php/php-cgi/php-cgi-4.3.7.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/php-cgi-4.3.7.ebuild,v 1.3 2004/06/25 01:23:25 agriffis Exp $
-
-PHPSAPI="cgi"
-inherit php-sapi eutils
-
-DESCRIPTION="PHP CGI"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha hppa"
-
-src_compile() {
-	# CLI needed to build stuff
-	myconf="${myconf} \
-		--enable-cgi \
-		--enable-cli \
-		--enable-fastcgi"
-
-	php-sapi_src_compile
-}
-
-
-src_install() {
-	PHP_INSTALLTARGETS="install"
-	php-sapi_src_install
-
-	# rename binary
-	mv ${D}/usr/bin/php ${D}/usr/bin/php-cgi
-}
-
-pkg_postinst() {
-	php-sapi_pkg_postinst
-	einfo "This is a CGI only build."
-}
diff --git a/dev-php/php/ChangeLog b/dev-php/php/ChangeLog
index 4d9f6c1be7ae..5255166e8aaf 100644
--- a/dev-php/php/ChangeLog
+++ b/dev-php/php/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-php/php
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php/ChangeLog,v 1.110 2004/08/03 15:01:21 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/ChangeLog,v 1.111 2004/08/06 03:19:37 robbat2 Exp $
+
+  05 Aug 2004; Robin H. Johnson <robbat2@gentoo.org> -files/pear_config.diff,
+  -php-4.3.4-r4.ebuild, -php-4.3.5-r1.ebuild, -php-4.3.5.ebuild,
+  -php-4.3.6-r1.ebuild, -php-4.3.6.ebuild, -php-4.3.6_rc2.ebuild,
+  -php-4.3.7-r1.ebuild, -php-4.3.7.ebuild:
+  The Great PHP ebuild cleanup.
 
   03 Aug 2004; <agriffis@gentoo.org> php-4.3.7-r1.ebuild, php-4.3.8.ebuild:
   stable on ia64 for bug 56295
diff --git a/dev-php/php/files/digest-php-4.3.4-r4 b/dev-php/php/files/digest-php-4.3.4-r4
deleted file mode 100644
index 148cc4b71594..000000000000
--- a/dev-php/php/files/digest-php-4.3.4-r4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 b9dd601863e08e52e3c4d5e02c2627cf php-4.3.4.tar.bz2 3774324
-MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285
diff --git a/dev-php/php/files/digest-php-4.3.5 b/dev-php/php/files/digest-php-4.3.5
deleted file mode 100644
index 9b6b4ca86e74..000000000000
--- a/dev-php/php/files/digest-php-4.3.5
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 29e61c125ac6278897c6c219f5d100d1 php-4.3.5.tar.bz2 3947414
-MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285
diff --git a/dev-php/php/files/digest-php-4.3.5-r1 b/dev-php/php/files/digest-php-4.3.5-r1
deleted file mode 100644
index 9b6b4ca86e74..000000000000
--- a/dev-php/php/files/digest-php-4.3.5-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 29e61c125ac6278897c6c219f5d100d1 php-4.3.5.tar.bz2 3947414
-MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285
diff --git a/dev-php/php/files/digest-php-4.3.6 b/dev-php/php/files/digest-php-4.3.6
deleted file mode 100644
index 004ce03d63f9..000000000000
--- a/dev-php/php/files/digest-php-4.3.6
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 79cde484e31871176137eb78014657fa php-4.3.6.tar.bz2 3957796
-MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285
-MD5 0ed6c4e7dbba264521ab54d49f02912d php-4.3.6-pcrealloc.patch 1004
-MD5 3075036987c0582ec3b2ab81db727643 hardened-php-4.3.6-0.1.2.patch.gz 10446
diff --git a/dev-php/php/files/digest-php-4.3.6-r1 b/dev-php/php/files/digest-php-4.3.6-r1
deleted file mode 100644
index 004ce03d63f9..000000000000
--- a/dev-php/php/files/digest-php-4.3.6-r1
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 79cde484e31871176137eb78014657fa php-4.3.6.tar.bz2 3957796
-MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285
-MD5 0ed6c4e7dbba264521ab54d49f02912d php-4.3.6-pcrealloc.patch 1004
-MD5 3075036987c0582ec3b2ab81db727643 hardened-php-4.3.6-0.1.2.patch.gz 10446
diff --git a/dev-php/php/files/digest-php-4.3.6_rc2 b/dev-php/php/files/digest-php-4.3.6_rc2
deleted file mode 100644
index 83bfdd9c0b36..000000000000
--- a/dev-php/php/files/digest-php-4.3.6_rc2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0bf89373a60f65cd37c1e3e652e278f5 php-4.3.6RC2.tar.bz2 3958337
-MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285
-MD5 0ed6c4e7dbba264521ab54d49f02912d php-4.3.6-pcrealloc.patch 1004
diff --git a/dev-php/php/files/digest-php-4.3.7 b/dev-php/php/files/digest-php-4.3.7
deleted file mode 100644
index abd92d2f9274..000000000000
--- a/dev-php/php/files/digest-php-4.3.7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5293fdc909a306a2636e0fafcc79442c php-4.3.7.tar.bz2 3963734
-MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285
-MD5 85faf5afdf7dfcd0368a290a2e00e7d5 hardened-php-4.3.7-0.1.2.patch.gz 9592
diff --git a/dev-php/php/files/digest-php-4.3.7-r1 b/dev-php/php/files/digest-php-4.3.7-r1
deleted file mode 100644
index abd92d2f9274..000000000000
--- a/dev-php/php/files/digest-php-4.3.7-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5293fdc909a306a2636e0fafcc79442c php-4.3.7.tar.bz2 3963734
-MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285
-MD5 85faf5afdf7dfcd0368a290a2e00e7d5 hardened-php-4.3.7-0.1.2.patch.gz 9592
diff --git a/dev-php/php/files/pear_config.diff b/dev-php/php/files/pear_config.diff
deleted file mode 100644
index 57761db6ac4a..000000000000
--- a/dev-php/php/files/pear_config.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- pear/PEAR/Config.php	2002/12/22 01:43:20	1.35.2.2
-+++ pear/PEAR/Config.php	2003/01/07 23:12:06	1.41
-
-@@ -142,7 +142,7 @@ if (isset($_ENV['PHP_PEAR_PREFERRED_STAT
- if (isset($_ENV['PHP_PEAR_UMASK'])) {
-     define('PEAR_CONFIG_DEFAULT_UMASK', $_ENV['PHP_PEAR_UMASK']);
- } else {
--    define('PEAR_CONFIG_DEFAULT_UMASK', umask());
-+    define('PEAR_CONFIG_DEFAULT_UMASK', decoct(umask()));
- }
-
- // Default for cache_ttl
diff --git a/dev-php/php/php-4.3.4-r4.ebuild b/dev-php/php/php-4.3.4-r4.ebuild
deleted file mode 100644
index 88d85db155f6..000000000000
--- a/dev-php/php/php-4.3.4-r4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-4.3.4-r4.ebuild,v 1.6 2004/07/14 21:34:29 agriffis Exp $
-
-PHPSAPI="cli"
-inherit php-sapi eutils
-
-DESCRIPTION="PHP Shell Interpreter"
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64"
-IUSE=""
-
-src_unpack() {
-	php-sapi_src_unpack
-	if [ "${ARCH}" == "amd64" ] ; then
-		epatch ${FILESDIR}/${P}-amd64hack.diff
-	fi
-}
-
-src_compile() {
-	myconf="${myconf} \
-		--disable-cgi \
-		--enable-cli"
-
-	php-sapi_src_compile
-}
-
-
-src_install() {
-	PHP_INSTALLTARGETS="${PHP_INSTALLTARGETS} install-cli install-programs install-pear install-build install-headers"
-	php-sapi_src_install
-
-	einfo "Fixing PEAR cache location"
-	local oldloc="${T}/pear/cache"
-	local old="s:${#oldloc}:\"${oldloc}\""
-	local newloc="/tmp/pear/cache"
-	local new="s:${#newloc}:\"${newloc}\""
-	sed "s|${old}|${new}|" -i ${D}/etc/pear.conf
-	keepdir /tmp/pear/cache
-
-	einfo "Installing manpage"
-	doman sapi/cli/php.1
-}
-
-pkg_postinst() {
-	php-sapi_pkg_postinst
-	einfo "This is a CLI only build."
-	einfo "You cannot use it on a webserver."
-
-	if [ -f "${ROOT}/root/.pearrc" -a "`md5sum ${ROOT}/root/.pearrc`" = "f0243f51b2457bc545158cf066e4e7a2  ${ROOT}/root/.pearrc" ]; then
-		einfo "Cleaning up an old PEAR install glitch"
-		mv ${ROOT}/root/.pearrc ${ROOT}/root/.pearrc.`date +%Y%m%d%H%M%S`
-	fi
-}
diff --git a/dev-php/php/php-4.3.5-r1.ebuild b/dev-php/php/php-4.3.5-r1.ebuild
deleted file mode 100644
index c2bdc31bfeae..000000000000
--- a/dev-php/php/php-4.3.5-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-4.3.5-r1.ebuild,v 1.4 2004/07/14 21:34:29 agriffis Exp $
-
-PHPSAPI="cli"
-inherit php-sapi eutils
-
-DESCRIPTION="PHP Shell Interpreter"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64"
-IUSE=""
-
-src_unpack() {
-	php-sapi_src_unpack
-	if [ "${ARCH}" == "amd64" ] ; then
-		epatch ${FILESDIR}/php-4.3.4-amd64hack.diff
-	fi
-}
-
-src_compile() {
-	myconf="${myconf} \
-		--disable-cgi \
-		--enable-cli"
-
-	php-sapi_src_compile
-}
-
-
-src_install() {
-	PHP_INSTALLTARGETS="install"
-	php-sapi_src_install
-
-	einfo "Installing manpage"
-	doman sapi/cli/php.1
-}
-
-pkg_postinst() {
-	php-sapi_pkg_postinst
-	einfo "This is a CLI only build."
-	einfo "You cannot use it on a webserver."
-
-	if [ -f "${ROOT}/root/.pearrc" -a "`md5sum ${ROOT}/root/.pearrc`" = "f0243f51b2457bc545158cf066e4e7a2  ${ROOT}/root/.pearrc" ]; then
-		einfo "Cleaning up an old PEAR install glitch"
-		mv ${ROOT}/root/.pearrc ${ROOT}/root/.pearrc.`date +%Y%m%d%H%M%S`
-	fi
-}
diff --git a/dev-php/php/php-4.3.5.ebuild b/dev-php/php/php-4.3.5.ebuild
deleted file mode 100644
index 5445e14ef878..000000000000
--- a/dev-php/php/php-4.3.5.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-4.3.5.ebuild,v 1.6 2004/07/14 21:34:29 agriffis Exp $
-
-PHPSAPI="cli"
-inherit php-sapi eutils
-
-DESCRIPTION="PHP Shell Interpreter"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64"
-IUSE=""
-
-src_unpack() {
-	php-sapi_src_unpack
-	if [ "${ARCH}" == "amd64" ] ; then
-		epatch ${FILESDIR}/php-4.3.4-amd64hack.diff
-	fi
-}
-
-src_compile() {
-	myconf="${myconf} \
-		--disable-cgi \
-		--enable-cli"
-
-	php-sapi_src_compile
-}
-
-
-src_install() {
-	PHP_INSTALLTARGETS="install"
-	php-sapi_src_install
-
-	einfo "Fixing PEAR cache location"
-	local oldloc="${T}/pear/cache"
-	local old="s:${#oldloc}:\"${oldloc}\""
-	local newloc="/tmp/pear/cache"
-	local new="s:${#newloc}:\"${newloc}\""
-	sed "s|${old}|${new}|" -i ${D}/etc/pear.conf
-	keepdir /tmp/pear/cache
-
-	einfo "Installing manpage"
-	doman sapi/cli/php.1
-}
-
-pkg_postinst() {
-	php-sapi_pkg_postinst
-	einfo "This is a CLI only build."
-	einfo "You cannot use it on a webserver."
-
-	if [ -f "${ROOT}/root/.pearrc" -a "`md5sum ${ROOT}/root/.pearrc`" = "f0243f51b2457bc545158cf066e4e7a2  ${ROOT}/root/.pearrc" ]; then
-		einfo "Cleaning up an old PEAR install glitch"
-		mv ${ROOT}/root/.pearrc ${ROOT}/root/.pearrc.`date +%Y%m%d%H%M%S`
-	fi
-}
diff --git a/dev-php/php/php-4.3.6-r1.ebuild b/dev-php/php/php-4.3.6-r1.ebuild
deleted file mode 100644
index 48fa529f8710..000000000000
--- a/dev-php/php/php-4.3.6-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-4.3.6-r1.ebuild,v 1.5 2004/07/14 21:34:29 agriffis Exp $
-
-PHPSAPI="cli"
-inherit php-sapi eutils
-
-DESCRIPTION="PHP Shell Interpreter"
-SLOT="0"
-KEYWORDS="x86 ~ppc sparc alpha hppa ~amd64 ~ia64 s390"
-IUSE=""
-
-src_unpack() {
-	php-sapi_src_unpack
-	if [ "${ARCH}" == "amd64" ] ; then
-		epatch ${FILESDIR}/php-4.3.4-amd64hack.diff
-	fi
-}
-
-src_compile() {
-	myconf="${myconf} \
-		--disable-cgi \
-		--enable-cli"
-
-	php-sapi_src_compile
-}
-
-
-src_install() {
-	PHP_INSTALLTARGETS="install"
-	php-sapi_src_install
-
-	einfo "Installing manpage"
-	doman sapi/cli/php.1
-}
-
-pkg_postinst() {
-	php-sapi_pkg_postinst
-	einfo "This is a CLI only build."
-	einfo "You cannot use it on a webserver."
-
-	if [ -f "${ROOT}/root/.pearrc" -a "`md5sum ${ROOT}/root/.pearrc`" = "f0243f51b2457bc545158cf066e4e7a2  ${ROOT}/root/.pearrc" ]; then
-		einfo "Cleaning up an old PEAR install glitch"
-		mv ${ROOT}/root/.pearrc ${ROOT}/root/.pearrc.`date +%Y%m%d%H%M%S`
-	fi
-}
diff --git a/dev-php/php/php-4.3.6.ebuild b/dev-php/php/php-4.3.6.ebuild
deleted file mode 100644
index e10bd490f89e..000000000000
--- a/dev-php/php/php-4.3.6.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-4.3.6.ebuild,v 1.6 2004/07/14 21:34:29 agriffis Exp $
-
-PHPSAPI="cli"
-inherit php-sapi eutils
-
-DESCRIPTION="PHP Shell Interpreter"
-SLOT="0"
-KEYWORDS="x86 ~ppc sparc ~alpha ~hppa ~amd64 ~ia64 s390"
-IUSE=""
-
-src_unpack() {
-	php-sapi_src_unpack
-	if [ "${ARCH}" == "amd64" ] ; then
-		epatch ${FILESDIR}/php-4.3.4-amd64hack.diff
-	fi
-}
-
-src_compile() {
-	myconf="${myconf} \
-		--disable-cgi \
-		--enable-cli"
-
-	php-sapi_src_compile
-}
-
-
-src_install() {
-	PHP_INSTALLTARGETS="install"
-	php-sapi_src_install
-
-	einfo "Installing manpage"
-	doman sapi/cli/php.1
-}
-
-pkg_postinst() {
-	php-sapi_pkg_postinst
-	einfo "This is a CLI only build."
-	einfo "You cannot use it on a webserver."
-
-	if [ -f "${ROOT}/root/.pearrc" -a "`md5sum ${ROOT}/root/.pearrc`" = "f0243f51b2457bc545158cf066e4e7a2  ${ROOT}/root/.pearrc" ]; then
-		einfo "Cleaning up an old PEAR install glitch"
-		mv ${ROOT}/root/.pearrc ${ROOT}/root/.pearrc.`date +%Y%m%d%H%M%S`
-	fi
-}
diff --git a/dev-php/php/php-4.3.6_rc2.ebuild b/dev-php/php/php-4.3.6_rc2.ebuild
deleted file mode 100644
index dc079446185a..000000000000
--- a/dev-php/php/php-4.3.6_rc2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-4.3.6_rc2.ebuild,v 1.4 2004/07/14 21:34:29 agriffis Exp $
-
-PHPSAPI="cli"
-SRC_URI_BASE="http://downloads.php.net/ilia/"
-inherit php-sapi eutils
-
-DESCRIPTION="PHP Shell Interpreter"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64"
-IUSE=""
-
-src_unpack() {
-	php-sapi_src_unpack
-	if [ "${ARCH}" == "amd64" ] ; then
-		epatch ${FILESDIR}/php-4.3.4-amd64hack.diff
-	fi
-}
-
-src_compile() {
-	myconf="${myconf} \
-		--disable-cgi \
-		--enable-cli"
-
-	php-sapi_src_compile
-}
-
-
-src_install() {
-	PHP_INSTALLTARGETS="install"
-	php-sapi_src_install
-
-	einfo "Installing manpage"
-	doman sapi/cli/php.1
-}
-
-pkg_postinst() {
-	php-sapi_pkg_postinst
-	einfo "This is a CLI only build."
-	einfo "You cannot use it on a webserver."
-
-	if [ -f "${ROOT}/root/.pearrc" -a "`md5sum ${ROOT}/root/.pearrc`" = "f0243f51b2457bc545158cf066e4e7a2  ${ROOT}/root/.pearrc" ]; then
-		einfo "Cleaning up an old PEAR install glitch"
-		mv ${ROOT}/root/.pearrc ${ROOT}/root/.pearrc.`date +%Y%m%d%H%M%S`
-	fi
-}
diff --git a/dev-php/php/php-4.3.7-r1.ebuild b/dev-php/php/php-4.3.7-r1.ebuild
deleted file mode 100644
index 1be96b5e5691..000000000000
--- a/dev-php/php/php-4.3.7-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-4.3.7-r1.ebuild,v 1.7 2004/08/03 15:01:21 agriffis Exp $
-
-PHPSAPI="cli"
-inherit php-sapi eutils
-
-DESCRIPTION="PHP Shell Interpreter"
-SLOT="0"
-KEYWORDS="x86 sparc alpha ~hppa ~amd64 ia64 s390 ppc"
-IUSE=""
-
-src_unpack() {
-	php-sapi_src_unpack
-	if [ "${ARCH}" == "amd64" ] ; then
-		epatch ${FILESDIR}/php-4.3.4-amd64hack.diff
-	fi
-}
-
-src_compile() {
-	myconf="${myconf} \
-		--disable-cgi \
-		--enable-cli"
-
-	php-sapi_src_compile
-}
-
-
-src_install() {
-	PHP_INSTALLTARGETS="install"
-	php-sapi_src_install
-
-	einfo "Installing manpage"
-	doman sapi/cli/php.1
-}
-
-pkg_postinst() {
-	php-sapi_pkg_postinst
-	einfo "This is a CLI only build."
-	einfo "You cannot use it on a webserver."
-
-	if [ -f "${ROOT}/root/.pearrc" -a "`md5sum ${ROOT}/root/.pearrc`" = "f0243f51b2457bc545158cf066e4e7a2  ${ROOT}/root/.pearrc" ]; then
-		einfo "Cleaning up an old PEAR install glitch"
-		mv ${ROOT}/root/.pearrc ${ROOT}/root/.pearrc.`date +%Y%m%d%H%M%S`
-	fi
-}
diff --git a/dev-php/php/php-4.3.7.ebuild b/dev-php/php/php-4.3.7.ebuild
deleted file mode 100644
index c4296c8ad5b6..000000000000
--- a/dev-php/php/php-4.3.7.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-4.3.7.ebuild,v 1.5 2004/07/14 21:34:29 agriffis Exp $
-
-PHPSAPI="cli"
-inherit php-sapi eutils
-
-DESCRIPTION="PHP Shell Interpreter"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 s390"
-IUSE=""
-
-src_unpack() {
-	php-sapi_src_unpack
-	if [ "${ARCH}" == "amd64" ] ; then
-		epatch ${FILESDIR}/php-4.3.4-amd64hack.diff
-	fi
-}
-
-src_compile() {
-	myconf="${myconf} \
-		--disable-cgi \
-		--enable-cli"
-
-	php-sapi_src_compile
-}
-
-
-src_install() {
-	PHP_INSTALLTARGETS="install"
-	php-sapi_src_install
-
-	einfo "Installing manpage"
-	doman sapi/cli/php.1
-}
-
-pkg_postinst() {
-	php-sapi_pkg_postinst
-	einfo "This is a CLI only build."
-	einfo "You cannot use it on a webserver."
-
-	if [ -f "${ROOT}/root/.pearrc" -a "`md5sum ${ROOT}/root/.pearrc`" = "f0243f51b2457bc545158cf066e4e7a2  ${ROOT}/root/.pearrc" ]; then
-		einfo "Cleaning up an old PEAR install glitch"
-		mv ${ROOT}/root/.pearrc ${ROOT}/root/.pearrc.`date +%Y%m%d%H%M%S`
-	fi
-}