Remove old versions.

(Portage version: 2.0.51.22-r1)

13 files changed, 7 insertions, 1237 deletions

diff --git a/dev-php/mod_php/ChangeLog b/dev-php/mod_php/ChangeLog
index f77b4cfd16d9..645f1e56747f 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.247 2005/07/11 14:49:06 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.248 2005/07/11 15:05:07 sebastian Exp $
+
+  11 Jul 2005; Sebastian Bergmann <sebastian@gentoo.org>
+  -mod_php-4.3.8.ebuild, -mod_php-4.3.9.ebuild, -mod_php-4.3.10.ebuild,
+  -mod_php-4.3.10-r1.ebuild, -mod_php-4.3.11-r1.ebuild,
+  -mod_php-4.3.11-r2.ebuild:
+  Remove old versions.
 
 *mod_php-4.4.0 (11 Jul 2005)
 
diff --git a/dev-php/mod_php/files/digest-mod_php-4.3.10 b/dev-php/mod_php/files/digest-mod_php-4.3.10
deleted file mode 100644
index 947e89e09f88..000000000000
--- a/dev-php/mod_php/files/digest-mod_php-4.3.10
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 7e56824dae9679c59a8234eb848aa542 php-4.3.10.tar.bz2 4026148
-MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416
-MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285
-MD5 1735561010834da1a5f7889d21b8fb4f hardened-php-4.3.10-0.2.7.patch.gz 35745
diff --git a/dev-php/mod_php/files/digest-mod_php-4.3.10-r1 b/dev-php/mod_php/files/digest-mod_php-4.3.10-r1
deleted file mode 100644
index 947e89e09f88..000000000000
--- a/dev-php/mod_php/files/digest-mod_php-4.3.10-r1
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 7e56824dae9679c59a8234eb848aa542 php-4.3.10.tar.bz2 4026148
-MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416
-MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285
-MD5 1735561010834da1a5f7889d21b8fb4f hardened-php-4.3.10-0.2.7.patch.gz 35745
diff --git a/dev-php/mod_php/files/digest-mod_php-4.3.11-r1 b/dev-php/mod_php/files/digest-mod_php-4.3.11-r1
deleted file mode 100644
index 56f35b38ea94..000000000000
--- a/dev-php/mod_php/files/digest-mod_php-4.3.11-r1
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 fbc67d240812136a9842bc1f2a217b7a php-4.3.11.tar.bz2 4012575
-MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416
-MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285
-MD5 611cdddabfd71ffb724c428be33c14cb hardening-patch-4.3.11-0.3.2.patch.gz 80613
diff --git a/dev-php/mod_php/files/digest-mod_php-4.3.11-r2 b/dev-php/mod_php/files/digest-mod_php-4.3.11-r2
deleted file mode 100644
index 56f35b38ea94..000000000000
--- a/dev-php/mod_php/files/digest-mod_php-4.3.11-r2
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 fbc67d240812136a9842bc1f2a217b7a php-4.3.11.tar.bz2 4012575
-MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416
-MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285
-MD5 611cdddabfd71ffb724c428be33c14cb hardening-patch-4.3.11-0.3.2.patch.gz 80613
diff --git a/dev-php/mod_php/files/digest-mod_php-4.3.8 b/dev-php/mod_php/files/digest-mod_php-4.3.8
deleted file mode 100644
index 32ce7de3a557..000000000000
--- a/dev-php/mod_php/files/digest-mod_php-4.3.8
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 e8ab484fcb94cd2e0d7ecfd0762cfd33 php-4.3.8.tar.bz2 3963437
-MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416
-MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285
-MD5 394389c893680d8a0cea7e6c974e8619 hardened-php-4.3.8-0.2.2.patch.gz 17178
diff --git a/dev-php/mod_php/files/digest-mod_php-4.3.9 b/dev-php/mod_php/files/digest-mod_php-4.3.9
deleted file mode 100644
index ea145fab1e6a..000000000000
--- a/dev-php/mod_php/files/digest-mod_php-4.3.9
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 b799bbb330da60324d972641baab693c php-4.3.9.tar.bz2 4001681
-MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416
-MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285
-MD5 bba759ec8e12ccaee852d628e6107c04 hardened-php-4.3.9-0.2.6.patch.gz 28586
diff --git a/dev-php/mod_php/mod_php-4.3.10-r1.ebuild b/dev-php/mod_php/mod_php-4.3.10-r1.ebuild
deleted file mode 100644
index 52af00475dae..000000000000
--- a/dev-php/mod_php/mod_php-4.3.10-r1.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2005 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.10-r1.ebuild,v 1.8 2005/06/07 22:02:24 vericgar Exp $
-
-IUSE="${IUSE} apache2"
-
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~ppc64"
-
-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/" # for RC only
-
-# 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 apache-module flag-o-matic
-
-DESCRIPTION="Apache module for PHP"
-
-DEPEND_EXTRA=">=net-www/apache-1.3.33-r2
-			  apache2? ( >=net-www/apache-2.0.54-r10 )"
-DEPEND="${DEPEND} ${DEPEND_EXTRA}"
-RDEPEND="${RDEPEND} ${DEPEND_EXTRA}"
-IUSE="${IUSE} debug"
-# for this revision only
-PDEPEND=">=${PHP_PROVIDER_PKG}-4.3.10"
-PROVIDE="${PROVIDE} virtual/httpd-php"
-
-# generalize some apache{,2} vars (defined by apache-module.eclass)
-if [ -n ${USE_APACHE2} ]; then
-	APACHE_MODULESDIR=${APACHE2_MODULESDIR}
-	APACHE_CONFDIR=${APACHE2_CONFDIR}
-else
-	APACHE_MODULESDIR=${APACHE_MODULESDIR}
-	APACHE_CONFDIR=${APACHE_CONFDIR}
-fi
-
-# 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
-	[ "${ARCH}" == "sparc" ] && epatch ${FILESDIR}/stdint.diff
-
-	# 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
-}
-
-setup_environ() {
-	append-flags `apr-config --cppflags --cflags`
-}
-
-src_compile() {
-	setup_environ
-
-	# 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 ${APACHE_CONFDIR}
-	dodir ${PHPINIDIRECTORY}
-	dosym ${PHPINIDIRECTORY}/${PHPINIFILENAME} ${APACHE_CONFDIR}/${PHPINIFILENAME}
-
-	einfo "Cleaning up a little"
-	rm -rf ${D}${APACHE_MODULESDIR}/libphp4.so
-
-	einfo "Adding symlink to Apache${USE_APACHE2} modules for PHP"
-	dosym ${APACHE_MODULESDIR} ${PHPINIDIRECTORY}/lib
-	exeinto ${APACHE_MODULESDIR}
-
-	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 ${APACHE2_MODULES_CONFDIR}
-		doins "${FILESDIR}/4.3.10-r1/70_mod_php.conf"
-	else
-		einfo "Installing a Apache config for PHP (mod_php.conf)"
-		insinto ${APACHE1_MODULES_CONFDIR}
-		doins ${FILESDIR}/mod_php.conf
-		dosym ${PHPINIDIRECTORY}/${PHPINIFILENAME} ${APACHE1_MODULES_CONFDIR}/${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/apache.conf \
-			modules/libphp4.so mod_php4.c php4_module \
-			before=perl define=PHP4 addconf=addon-modules/mod_php.conf
-			:;
-	fi
-}
diff --git a/dev-php/mod_php/mod_php-4.3.10.ebuild b/dev-php/mod_php/mod_php-4.3.10.ebuild
deleted file mode 100644
index 260fd574528b..000000000000
--- a/dev-php/mod_php/mod_php-4.3.10.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2005 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.10.ebuild,v 1.15 2005/06/07 22:02:24 vericgar Exp $
-
-IUSE="${IUSE} apache2"
-
-KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64 s390 ppc64 mips"
-
-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/" # for RC only
-
-# 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
-			            !>=net-www/apache-2.0.54-r10 )"
-DEPEND="${DEPEND} ${DEPEND_EXTRA}"
-RDEPEND="${RDEPEND} ${DEPEND_EXTRA}"
-IUSE="${IUSE} debug"
-# for this revision only
-PDEPEND=">=${PHP_PROVIDER_PKG}-4.3.10"
-PROVIDE="${PROVIDE} virtual/httpd-php"
-
-# 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
-	[ "${ARCH}" == "sparc" ] && epatch ${FILESDIR}/stdint.diff
-
-	# 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.11-r1.ebuild b/dev-php/mod_php/mod_php-4.3.11-r1.ebuild
deleted file mode 100644
index 1ca173f7f344..000000000000
--- a/dev-php/mod_php/mod_php-4.3.11-r1.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2005 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.11-r1.ebuild,v 1.9 2005/06/07 22:02:24 vericgar Exp $
-
-IUSE="${IUSE} apache2"
-
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~ppc64"
-
-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/" # for RC only
-
-# 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 apache-module flag-o-matic
-
-DESCRIPTION="Apache module for PHP"
-
-DEPEND_EXTRA=">=net-www/apache-1.3.33-r2
-			  apache2? ( >=net-www/apache-2.0.54-r10 )"
-DEPEND="${DEPEND} ${DEPEND_EXTRA}"
-RDEPEND="${RDEPEND} ${DEPEND_EXTRA}"
-IUSE="${IUSE} debug"
-# for this revision only
-PDEPEND=">=${PHP_PROVIDER_PKG}-4.3.10"
-PROVIDE="${PROVIDE} virtual/httpd-php"
-
-# generalize some apache{,2} vars (defined by apache-module.eclass)
-if [ -n ${USE_APACHE2} ]; then
-	APACHE_MODULESDIR=${APACHE2_MODULESDIR}
-	APACHE_CONFDIR=${APACHE2_CONFDIR}
-else
-	APACHE_MODULESDIR=${APACHE_MODULESDIR}
-	APACHE_CONFDIR=${APACHE_CONFDIR}
-fi
-
-# 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
-
-	# Bug 88756
-	use flash && epatch ${FILESDIR}/php-4.3.11-flash.patch
-
-	# Bug 88795
-	use gmp && epatch ${FILESDIR}/php-4.3.11-gmp.patch
-
-	# 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
-}
-
-setup_environ() {
-	append-flags `apr-config --cppflags --cflags`
-}
-
-src_compile() {
-	setup_environ
-
-	# 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 ${APACHE_CONFDIR}
-	dodir ${PHPINIDIRECTORY}
-	dosym ${PHPINIDIRECTORY}/${PHPINIFILENAME} ${APACHE_CONFDIR}/${PHPINIFILENAME}
-
-	einfo "Cleaning up a little"
-	rm -rf ${D}${APACHE_MODULESDIR}/libphp4.so
-
-	einfo "Adding symlink to Apache${USE_APACHE2} modules for PHP"
-	dosym ${APACHE_MODULESDIR} ${PHPINIDIRECTORY}/lib
-	exeinto ${APACHE_MODULESDIR}
-
-	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 ${APACHE2_MODULES_CONFDIR}
-		doins "${FILESDIR}/4.3.10-r1/70_mod_php.conf"
-	else
-		einfo "Installing a Apache config for PHP (mod_php.conf)"
-		insinto ${APACHE1_MODULES_CONFDIR}
-		doins ${FILESDIR}/mod_php.conf
-		dosym ${PHPINIDIRECTORY}/${PHPINIFILENAME} ${APACHE1_MODULES_CONFDIR}/${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/apache.conf \
-			modules/libphp4.so mod_php4.c php4_module \
-			before=perl define=PHP4 addconf=addon-modules/mod_php.conf
-			:;
-	fi
-}
diff --git a/dev-php/mod_php/mod_php-4.3.11-r2.ebuild b/dev-php/mod_php/mod_php-4.3.11-r2.ebuild
deleted file mode 100644
index 360b8c8250fc..000000000000
--- a/dev-php/mod_php/mod_php-4.3.11-r2.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2005 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.11-r2.ebuild,v 1.8 2005/06/07 22:02:24 vericgar Exp $
-
-IUSE="${IUSE} apache2"
-
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~ppc64"
-
-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/" # for RC only
-
-# 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 apache-module flag-o-matic
-
-DESCRIPTION="Apache module for PHP"
-
-DEPEND_EXTRA=">=net-www/apache-1.3.33-r2
-			  apache2? ( >=net-www/apache-2.0.54-r10 )"
-DEPEND="${DEPEND} ${DEPEND_EXTRA}"
-RDEPEND="${RDEPEND} ${DEPEND_EXTRA}"
-IUSE="${IUSE} debug"
-# for this revision only
-PDEPEND=">=${PHP_PROVIDER_PKG}-4.3.10"
-PROVIDE="${PROVIDE} virtual/httpd-php"
-
-# generalize some apache{,2} vars (defined by apache-module.eclass)
-if [ -n ${USE_APACHE2} ]; then
-	APACHE_MODULESDIR=${APACHE2_MODULESDIR}
-	APACHE_CONFDIR=${APACHE2_CONFDIR}
-else
-	APACHE_MODULESDIR=${APACHE_MODULESDIR}
-	APACHE_CONFDIR=${APACHE_CONFDIR}
-fi
-
-# 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
-
-	# Bug 88756
-	use flash && epatch ${FILESDIR}/php-4.3.11-flash.patch
-
-	# Bug 88795
-	use gmp && epatch ${FILESDIR}/php-4.3.11-gmp.patch
-
-	# 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
-}
-
-setup_environ() {
-	append-flags `apr-config --cppflags --cflags`
-}
-
-src_compile() {
-	setup_environ
-
-	# 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 ${APACHE_CONFDIR}
-	dodir ${PHPINIDIRECTORY}
-	dosym ${PHPINIDIRECTORY}/${PHPINIFILENAME} ${APACHE_CONFDIR}/${PHPINIFILENAME}
-
-	einfo "Cleaning up a little"
-	rm -rf ${D}${APACHE_MODULESDIR}/libphp4.so
-
-	einfo "Adding symlink to Apache${USE_APACHE2} modules for PHP"
-	dosym ${APACHE_MODULESDIR} ${PHPINIDIRECTORY}/lib
-	exeinto ${APACHE_MODULESDIR}
-
-	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 ${APACHE2_MODULES_CONFDIR}
-		doins "${FILESDIR}/4.3.11-r2/70_mod_php.conf"
-	else
-		einfo "Installing a Apache config for PHP (mod_php.conf)"
-		insinto ${APACHE1_MODULES_CONFDIR}
-		doins ${FILESDIR}/mod_php.conf
-		dosym ${PHPINIDIRECTORY}/${PHPINIFILENAME} ${APACHE1_MODULES_CONFDIR}/${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/apache.conf \
-			modules/libphp4.so mod_php4.c php4_module \
-			before=perl define=PHP4 addconf=addon-modules/mod_php.conf
-			:;
-	fi
-}
diff --git a/dev-php/mod_php/mod_php-4.3.8.ebuild b/dev-php/mod_php/mod_php-4.3.8.ebuild
deleted file mode 100644
index 093187dfd310..000000000000
--- a/dev-php/mod_php/mod_php-4.3.8.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2005 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.8.ebuild,v 1.14 2005/06/07 22:02:24 vericgar Exp $
-
-IUSE="${IUSE} apache2"
-
-KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64 ~s390 ppc64"
-
-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
-			            !>=net-www/apache-2.0.54-r10 )"
-DEPEND="${DEPEND} ${DEPEND_EXTRA}"
-RDEPEND="${RDEPEND} ${DEPEND_EXTRA}"
-IUSE="${IUSE} debug"
-# for this revision only
-PDEPEND=">=${PHP_PROVIDER_PKG}-4.3.8"
-
-# 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.9.ebuild b/dev-php/mod_php/mod_php-4.3.9.ebuild
deleted file mode 100644
index 5137809b71e5..000000000000
--- a/dev-php/mod_php/mod_php-4.3.9.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2005 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.9.ebuild,v 1.16 2005/06/07 22:02:24 vericgar Exp $
-
-IUSE="${IUSE} apache2"
-
-KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64 ~s390 ppc64 ~mips"
-
-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/" # for RC only
-
-# 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
-			            !>=net-www/apache-2.0.54-r10 )"
-DEPEND="${DEPEND} ${DEPEND_EXTRA}"
-RDEPEND="${RDEPEND} ${DEPEND_EXTRA}"
-IUSE="${IUSE} debug"
-# for this revision only
-PDEPEND=">=${PHP_PROVIDER_PKG}-4.3.9"
-PROVIDE="${PROVIDE} virtual/httpd-php"
-
-# 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
-}