Removing old versions and revisions. Note that new-style for apache is now -r30 and above.

(Portage version: 2.0.51.22-r2)

29 files changed, 15 insertions, 5474 deletions

diff --git a/net-www/apache/ChangeLog b/net-www/apache/ChangeLog
index a48aead48c5a..fb094fc73347 100644
--- a/net-www/apache/ChangeLog
+++ b/net-www/apache/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-www/apache
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.404 2005/09/10 19:58:24 vericgar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.405 2005/09/10 20:30:07 vericgar Exp $
+
+  10 Sep 2005; Michael Stewart <vericgar@gentoo.org> -apache-2.0.50.ebuild,
+  -apache-2.0.51.ebuild, -apache-2.0.51-r1.ebuild, -apache-2.0.52.ebuild,
+  -apache-2.0.52-r1.ebuild, -apache-2.0.52-r2.ebuild,
+  -apache-2.0.54-r7.ebuild, -apache-2.0.54-r8.ebuild,
+  -apache-2.0.54-r10.ebuild, -apache-2.0.54-r11.ebuild,
+  -apache-2.0.54-r12.ebuild, -apache-2.0.54-r13.ebuild,
+  -apache-2.0.54-r14.ebuild:
+  Removing old versions and revisions. Note that new-style for apache is now
+  -r30 and above.
 
 *apache-2.0.54-r30 (10 Sep 2005)
 
diff --git a/net-www/apache/Manifest b/net-www/apache/Manifest
index a90a74ed4f3d..b62fdbccba0b 100644
--- a/net-www/apache/Manifest
+++ b/net-www/apache/Manifest
@@ -12,23 +12,10 @@ MD5 7ffd5d16d8cb2f8192d1fc48b75371df apache-1.3.33-r3.ebuild 6952
 MD5 2c34b40a3fe461014b19ca5e4763203e apache-1.3.33-r4.ebuild 8673
 MD5 eb173dd548089cf594c543d29b48948c apache-1.3.33-r5.ebuild 7105
 MD5 ca6b47f0c2a0006b71fc1153937824e5 apache-1.3.33.ebuild 6927
-MD5 1e34ebcb3af5040c59f77dcb26faf53a apache-2.0.50.ebuild 12912
-MD5 e89db5b90b1db0adeb25fc77840d4e4d apache-2.0.51-r1.ebuild 12864
-MD5 ef3bd6fff8727f55a996d2ab32ee3f88 apache-2.0.51.ebuild 12855
-MD5 2fd63d87bf209b47757a0267f98e914a apache-2.0.52-r1.ebuild 13208
-MD5 996748170bc5ec8a2c230f8df8cff2f9 apache-2.0.52-r2.ebuild 12318
-MD5 7ad73fb027e9bc2dcda86b448a76450d apache-2.0.52.ebuild 12887
-MD5 0801d1f7a964ac3e07f1758b51cb8e8d apache-2.0.54-r10.ebuild 12816
-MD5 6176f8c77394fa2b355e7eb7a38f0b04 apache-2.0.54-r11.ebuild 12814
-MD5 0de97d0f4abaea688e5c532605f57bf1 ChangeLog 68215
-MD5 4003f8561ac1d6abec33916647691263 apache-2.0.54-r7.ebuild 12518
-MD5 3da3861fe4c224bb8144fa4167f2817e apache-2.0.54-r8.ebuild 12613
+MD5 21ebbd20c5794130e9a3658a9a1212bf apache-2.0.54-r30.ebuild 12649
+MD5 62596204c23211d1ac803d1c4a51399e ChangeLog 68710
 MD5 37f5ed6f2423381241b029e6685bcdd2 metadata.xml 493
-MD5 4155675e67edb93a1a82505f140092c3 apache-2.0.54-r12.ebuild 12916
-MD5 9a2279df8a07b2d79f0ea9e91a3a70f2 apache-2.0.54-r13.ebuild 12649
-MD5 7ed9459c9900a7128b51e259e2977bc7 apache-2.0.54-r14.ebuild 12647
 MD5 6984dca404209fbedd4492e8ffdd8298 apache-2.0.54-r9.ebuild 12609
-MD5 02cbde35966481c587ad6e2aa02758ed apache-2.0.54-r30.ebuild 12649
 MD5 8b12871dd74fcd3f4fdf451c9d8c259e files/00_apache_manual.conf 781
 MD5 998b4b7df08eb15641e0b9132443b365 files/apache-1.3.27-apachectl.patch 1328
 MD5 37d2c4ea8e1a6725deaca42b6aa22c69 files/apache-1.3.27_db4_gentoo.patch 1006
@@ -59,25 +46,12 @@ MD5 7534b79d78a91297c44cc69ac4545cc8 files/digest-apache-1.3.33-r2 286
 MD5 bb9ffec6d5f5d409b6705a2d8c19bc6a files/digest-apache-1.3.33-r3 212
 MD5 0282c9d20ad05b752812c62f655b50ce files/digest-apache-1.3.33-r4 286
 MD5 b75d2bfc008916e050f1bafb8a04c944 files/digest-apache-1.3.33-r5 221
-MD5 cb82ab66045d6f309af686c0206fc3c0 files/digest-apache-2.0.50 201
-MD5 69d40992fa9301ce3198a0115fa1f31c files/digest-apache-2.0.51 137
-MD5 0eb9067bb4f2c2495069deaa9d7fce1b files/digest-apache-2.0.51-r1 140
-MD5 baf37cd1bc61f76ac73edd301f52decb files/digest-apache-2.0.52 201
-MD5 44fc8ddc9a05a056d8a08e6d843c997c files/digest-apache-2.0.52-r1 204
-MD5 710e7291039a6cba132568e32daede8a files/digest-apache-2.0.52-r2 213
-MD5 f0386414da0ae14678d2875eb947d99d files/digest-apache-2.0.54-r10 151
-MD5 326a59d4f3d30e34f7b61550f9466328 files/digest-apache-2.0.54-r11 151
-MD5 2a290bf8617837e695c7971fdfef1766 files/digest-apache-2.0.54-r12 151
-MD5 4f6de1cd192882313d41650cf23eb26a files/digest-apache-2.0.54-r7 214
-MD5 eb8a02a66654924ac00333c33066c8a5 files/digest-apache-2.0.54-r8 214
 MD5 b9ff3534313dae1b8ac96df0e3e01373 files/httpd-2.0.48-ipv6.patch 865
 MD5 d52999376f67a872ee48cbae72db0160 files/httpd-2.0.49-cgi.patch 10319
 MD5 8cb4313e58d7bd5dc369eb92f75daa2b files/httpd-2.0.49-ipv6.patch 788
 MD5 59a6ba7dcde461f5350af41e6aff92b1 files/robots.txt 342
 MD5 d3626a1e31a675c60d066c111d552adf files/suexec.pam 59
 MD5 161245c7aa1eb785db53b34d6a10be43 files/suexec_pam_gentoo.patch 2149
-MD5 1df975bb7cce6581ee241ea8a13a3e87 files/digest-apache-2.0.54-r13 151
-MD5 12525c2392680eadcdccabcf53590247 files/digest-apache-2.0.54-r14 151
 MD5 35d8cf2217559d96a69696d69f4c85cc files/digest-apache-2.0.54-r9 214
 MD5 b9925be24e72acc1031f76a8bc0a07cb files/digest-apache-2.0.54-r30 151
 MD5 3d94c56af17136b6c408f076c32e0362 files/2.0.49/40_mod_ssl.conf 3213
diff --git a/net-www/apache/apache-2.0.50.ebuild b/net-www/apache/apache-2.0.50.ebuild
deleted file mode 100644
index c05d00167830..000000000000
--- a/net-www/apache/apache-2.0.50.ebuild
+++ /dev/null
@@ -1,407 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.50.ebuild,v 1.22 2005/07/05 22:59:08 swegener Exp $
-
-inherit flag-o-matic eutils fixheadtails gnuconfig
-
-PATCH_LEVEL="${PV}"
-S="${WORKDIR}/httpd-${PV}"
-DESCRIPTION="Apache Web Server, Version 2.0.x"
-HOMEPAGE="http://www.apache.org/"
-SRC_URI="http://www.apache.org/dist/httpd/httpd-${PV}.tar.gz
-	http://dev.gentoo.org/~zul/apache/apache-patches-${PV}.tar.bz2
-	http://dev.gentoo.org/~kloeri/apache_patches/apache2-conf.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="x86 ppc sparc mips alpha arm hppa ~amd64 ia64 ~s390 ~ppc64"
-IUSE="berkdb gdbm ldap threads ipv6 doc static ssl selinux"
-
-#Standard location for Gentoo Linux
-DATADIR="/var/www/localhost"
-
-DEPEND="dev-util/yacc
-	dev-lang/perl
-	sys-libs/zlib
-	dev-libs/expat
-	dev-libs/openssl
-	berkdb? ( sys-libs/db )
-	gdbm? ( sys-libs/gdbm )
-	!mips? ( ldap? ( =net-nds/openldap-2* ) )
-	selinux? ( sec-policy/selinux-apache )
-	!dev-libs/apr
-	!dev-libs/apr-util"
-
-apache_setup_vars() {
-	# Sets the USERDIR to default.
-	USERDIR="public_html"
-	einfo "DATADIR is set to: ${DATADIR}"
-	einfo "USERDIR is set to: $USERDIR"
-}
-
-set_filter_flags() {
-	CFLAGS="${CFLAGS/  / }"
-	has_version =sys-libs/glibc-2.2* && filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-}
-
-src_unpack() {
-	set_filter_flags
-
-	unpack ${A} || die
-	cd ${S} || die
-	epatch ${WORKDIR}/00_gentoo_base.patch || die
-	epatch ${WORKDIR}/03_redhat_xfsz.patch || die
-	epatch ${WORKDIR}/04_ssl_makefile.patch || die
-
-	if use ipv6; then
-		epatch ${WORKDIR}/01_gentoo_ipv6.patch || die
-	fi
-
-	if use berkdb; then
-		einfo "Enabling berkdb."
-		if has_version '=sys-libs/db-4*'; then
-			einfo "Enabling db4"
-			myconf="${myconf} --with-dbm=db4 --with-berkely-db=/usr"
-		elif has_version '=sys-libs/db-3*'; then
-			einfo "Enabling db3"
-			myconf="${myconf} --with-dbm=db3 --with-berkely-db=/usr"
-		elif has_version '=sys-libs/db-2'; then
-			einfo "Enabling db2"
-			myconf="${myconf} --with-dbm=db2 --with-berkely-db=/usr"
-		fi
-	else
-		echo "Disabling berkdb"
-	fi
-
-	#avoid utf-8 charset problems
-	export LC_CTYPE=C
-
-	ht_fix_file srclib/apr/build/buildcheck.sh
-
-	#give it the stamp
-	sed -i -e 's:(" PLATFORM "):(Gentoo/Linux):g' server/core.c
-
-	#fix perl with perl!
-	find . -type f | xargs perl -pi -e \
-		"s|/usr/local/bin/perl|/usr/bin/perl|g; \
-		s|/usr/local/bin/perl5|/usr/bin/perl|g; \
-		s|/path/to/bin/perl|/usr/bin/perl|g;"
-	#dont want this cruft in /usr/bin
-	sed -i -e 's:@exp_bindir@:@exp_installbuilddir:g' support/apachectl.in
-
-	#setup the filesystem layout config
-	cat ${FILESDIR}/common/config.layout >> config.layout
-	sed -i -e 's:version:${PF}:g' config.layout
-
-	cat ${FILESDIR}/common/apr-config.layout >> srclib/apr/config.layout
-	cat ${FILESDIR}/common/apr-util-config.layout >> srclib/apr-util/config.layout
-
-	sed -i -e "s:/var/www/localhost:${DATADIR}:g" srclib/apr/config.layout
-	sed -i -e "s:/var/www/localhost:${DATADIR}:g" srclib/apr-util/config.layout
-
-	WANT_AUTOCONF=2.5 ./buildconf || die "buildconf failed"
-}
-
-src_compile() {
-	set_filter_flags
-	apache_setup_vars
-
-	# Detect mips and uclibc systems properly
-	gnuconfig_update
-
-	local myconf
-	if use ldap; then
-		if use mips; then
-			eerror "Sorry, LDAP support isn't available yet for MIPS"
-			eerror "Test out OpenLDAP and report it via BugZilla!"
-			eerror "Continuing in 5 seconds"
-			epause 5
-		else
-			einfo "Enabling LDAP"
-			if use static; then
-			  myconf="--with-ldap --enable-auth-ldap=static --enable-ldap=static"
-			else
-			  myconf="--with-ldap --enable-auth-ldap=shared --enable-ldap=shared"
-			fi
-		fi
-	fi
-
-	if use ipv6; then
-		einfo "Enabling ipv6"
-		myconf="${myconf} --enable-vp4"
-	else
-		myconf="${myconf} --disable-ipv6"
-	fi
-
-	if use threads; then
-		einfo "Enabling threads support"
-		myconf="${myconf} --with-mpm=worker"
-	else
-		myconf="${myconf} --with-mpm=${MPM:=prefork}"
-	fi
-
-	select_modules_config || die "determining modules"
-
-	# Fix for bug #24215 - robbat2@gentoo.org, 30 Oct 2003
-	# We pre-load the cache with the correct answer!  This avoids
-	# it violating the sandbox.  This may have to be changed for
-	# non-Linux systems or if sem_open changes on Linux.  This
-	# hack is built around documentation in /usr/include/semaphore.h
-	# and the glibc (pthread) source
-	echo 'ac_cv_func_sem_open=${ac_cv_func_sem_open=no}' >> ${S}/config.cache
-
-	# Workaround for bug #32444 - robbat2@gentoo.org, 28 Nov 2003
-	# Apache2 tries to build SCTP support even when all the parts of it aren't there
-	# So for the moment we tell it to ignore SCTP support
-	echo 'ac_cv_sctp=${ac_cv_sctp=no}' >> ${S}/config.cache
-	echo 'ac_cv_header_netinet_sctp_h=${ac_cv_header_netinet_sctp_h=no}' >> ${S}/config.cache
-	echo 'ac_cv_header_netinet_sctp_uio_h=${ac_cv_header_netinet_sctp_uio_h=no}' >> ${S}/config.cache
-
-	SSL_BASE="SYSTEM" \
-	WANT_AUTOCONF_2_5=1 WANT_AUTOCONF=2.5
-	./configure \
-		--with-suexec-safepath="/usr/local/bin:/usr/bin:/bin" \
-		--with-suexec-logfile=/var/log/apache2/suexec_log \
-		--with-suexec-bin=/usr/sbin/suexec2 \
-		--with-suexec-userdir=${USERDIR} \
-		--with-suexec-caller=apache \
-		--with-suexec-docroot=/var/www \
-		--with-suexec-uidmin=1000 \
-		--with-suexec-gidmin=100 \
-		--with-suexec-umask=077 \
-		--enable-suexec=shared \
-		\
-		${MY_BUILTINS} \
-		\
-		--cache-file=${S}/config.cache \
-		--with-perl=/usr/bin/perl \
-		--with-expat=/usr \
-		--with-ssl=/usr \
-		--with-z=/usr \
-		--with-port=80 \
-		--enable-layout=Gentoo \
-		--with-program-name=apache2 \
-		--with-devrandom=/dev/urandom \
-		--host=${CHOST} ${myconf} || die "bad ./configure please submit bug report to bugs.gentoo.org. Include your config.layout."
-		#--with-mpm={worker|prefork|perchild|leader|threadpool}
-
-	# we don't want to try and recompile the ssl_expr_parse.c file, because
-	# the lex source is broken
-	touch modules/ssl/ssl_expr_scan.c
-
-	emake || die "problem compiling Apache2 :("
-
-	#build ssl version of apache bench (ab-ssl)
-	cd support; rm -f ab .libs/ab ab.lo ab.o
-	make ab CFLAGS="${CFLAGS} -DUSE_SSL -lcrypto -lssl \
-		-I/usr/include/openssl -L/usr/lib" || die
-	mv ab ab-ssl; mv .libs/ab .libs/ab-ssl; rm -f ab.lo ab.o
-	make ab || die
-}
-
-src_install () {
-	set_filter_flags
-
-	local i
-	make DESTDIR=${D} install || die
-	dodoc ABOUT_APACHE CHANGES INSTALL LAYOUT \
-		LICENSE README* ${FILESDIR}/robots.txt
-
-	#bogus values pointing at /var/tmp/portage
-	sed -i -e 's:APR_SOURCE_DIR=.*:APR_SOURCE_DIR=:g' ${D}/usr/bin/apr-config
-	sed -i -e 's:APU_SOURCE_DIR=.*:APU_SOURCE_DIR=:g' ${D}/usr/bin/apu-config
-	sed -i -e 's:APU_BUILD_DIR=.*:APU_BUILD_DIR=:g' ${D}/usr/bin/apu-config
-
-	#protect the suexec binary
-	local gid=`id -g apache`
-	[ -z "${gid}" ] && gid=81
-	fowners root:${gid} /usr/sbin/suexec
-	fperms 4710 /usr/sbin/suexec
-
-	#apxs needs this to pickup the right lib for install
-	dosym /usr/lib /usr/lib/apache2/lib
-	dosym /var/log/apache2 /usr/lib/apache2/logs
-	dosym /usr/lib/apache2-extramodules /usr/lib/apache2/extramodules
-	dosym /etc/apache2/conf /usr/lib/apache2/conf
-
-	cd ${S}
-	#Credits to advx.org people for these scripts. Heck, thanks for
-	#the nice layout and everything else ;-)
-	exeinto /usr/sbin
-	for i in apache2logserverstatus apache2splitlogfile
-	do
-		doexe ${FILESDIR}/2.0.49/$i
-	done
-	exeinto /usr/lib/ssl/apache2-mod_ssl
-	doexe ${FILESDIR}/2.0.49/gentestcrt.sh
-
-	#some more scripts
-	exeinto /usr/sbin
-	for i in split-logfile list_hooks.pl logresolve.pl log_server_status
-	do
-		doexe ${S}/support/$i
-	done
-	#the ssl version of apache bench
-	doexe support/.libs/ab-ssl
-
-	#move some mods to extramodules
-	dodir /usr/lib/apache2-extramodules
-	for i in mod_ssl.so mod_ldap.so mod_auth_ldap.so
-	do
-		[ -x ${D}/usr/lib/apache2/modules/$i ] && \
-		mv ${D}/usr/lib/apache2/modules/$i ${D}/usr/lib/apache2-extramodules
-	done
-
-	#modules.d config file snippets
-	insinto /etc/apache2/conf/modules.d
-	for i in 40_mod_ssl.conf 41_mod_ssl.default-vhost.conf 45_mod_dav.conf
-	do
-		doins ${FILESDIR}/2.0.49/$i
-	done
-	use !mips && use ldap && doins ${FILESDIR}/2.0.49/46_mod_ldap.conf
-
-	#drop in a convenient link to the manual
-	if use doc; then
-		MANUAL_VERSION="2.0.50"
-		insinto /etc/apache2/conf/modules.d
-		doins ${FILESDIR}/00_apache_manual.conf
-		dosym /usr/share/doc/${PF}/manual ${DATADIR}/htdocs/manual
-		sed -i -e "s:2.0.49:${MANUAL_VERSION}:" ${D}/etc/apache2/conf/modules.d/00_apache_manual.conf
-		else
-		rm -rf ${D}/usr/share/doc/${PF}/manual
-	fi
-
-	#SLOT=2!!!
-	cd ${D}
-	mv -v usr/sbin/apachectl usr/sbin/apache2ctl
-	mv -v usr/sbin/htdigest usr/sbin/htdigest2
-	mv -v usr/sbin/htpasswd usr/sbin/htpasswd2
-	mv -v usr/sbin/logresolve usr/sbin/logresolve2
-	mv -v usr/sbin/apxs usr/sbin/apxs2
-	mv -v usr/sbin/ab usr/sbin/ab2
-	mv -v usr/sbin/ab-ssl usr/sbin/ab2-ssl
-	mv -v usr/sbin/suexec usr/sbin/suexec2
-	mv -v usr/sbin/rotatelogs usr/sbin/rotatelogs2
-	mv -v usr/sbin/dbmmanage usr/sbin/dbmmanage2
-	mv -v usr/sbin/checkgid usr/sbin/checkgid2
-	mv -v usr/sbin/split-logfile usr/sbin/split-logfile2
-	mv -v usr/sbin/list_hooks.pl usr/sbin/list_hooks2.pl
-	mv -v usr/sbin/logresolve.pl usr/sbin/logresolve2.pl
-
-	# do the man pages
-	mv -v usr/share/man/man1/htdigest.1 usr/share/man/man1/htdigest2.1
-	mv -v usr/share/man/man1/htpasswd.1 usr/share/man/man1/htpasswd2.1
-	mv -v usr/share/man/man1/dbmmanage.1 usr/share/man/man1/dbmmanage2.1
-	mv -v usr/share/man/man8/ab.8 usr/share/man/man8/ab2.8
-	mv -v usr/share/man/man8/apxs.8 usr/share/man/man8/apxs2.8
-	mv -v usr/share/man/man8/apachectl.8 usr/share/man/man8/apache2ctl.8
-	mv -v usr/share/man/man8/httpd.8 usr/share/man/man8/apache2.8
-	mv -v usr/share/man/man8/logresolve.8 usr/share/man/man8/logresolve2.8
-	mv -v usr/share/man/man8/rotatelogs.8 usr/share/man/man8/rotatelogs2.8
-	mv -v usr/share/man/man8/suexec.8 usr/share/man/man8/suexec2.8
-
-	#tidy up
-	mv ${D}/usr/sbin/envvars* ${D}/usr/lib/apache2/build
-	dodoc ${D}/etc/apache2/conf/*-std.conf
-	rm -f ${D}/etc/apache2/conf/*.conf
-	rm -rf ${D}/var/run ${D}/var/log
-
-	#config files
-	insinto /etc/conf.d; newins ${FILESDIR}/2.0.49/apache2.confd apache2
-	exeinto /etc/init.d; newexe ${FILESDIR}/2.0.49/apache2.initd apache2
-	insinto /etc/apache2; doins ${FILESDIR}/2.0.49/apache2-builtin-mods
-	insinto /etc/apache2/conf
-	doins ${WORKDIR}/commonapache2.conf
-	doins ${WORKDIR}/apache2.conf
-	insinto /etc/apache2/conf/vhosts
-	doins ${WORKDIR}/virtual-homepages.conf
-	doins ${WORKDIR}/dynamic-vhosts.conf
-	doins ${WORKDIR}/vhosts.conf
-
-	# Added by Jason Wever <weeve@gentoo.org>
-	# A little sedfu to fix bug #7172 for sparc64s
-	if [ ${ARCH} = "sparc" ]
-	then
-		sed -i -e '13a\AcceptMutex fcntl' \
-			${D}/etc/apache2/conf/apache2.conf
-	fi
-}
-
-parse_modules_config() {
-	set_filter_flags
-
-	local filename=$1
-	local name=""
-	local dso=""
-	local disable=""
-	[ -f ${filename} ] || return 1
-	for i in `cat $filename | sed "s/^#.*//"` ; do
-		if [ $i == "-" ] ; then
-			disable="true"
-		elif [ -z "$name" ] && [ ! -z "`echo $i | grep "mod_"`" ] ; then
-			name=`echo $i | sed "s/mod_//"`
-		elif [ "$disable" ] && ( [ $i == "static" ] || [ $i == "shared" ] ) ; then
-			MY_BUILTINS="${MY_BUILTINS} --disable-$name"
-			name="" ; disable=""
-		elif [ $i == "static" ] ; then
-			MY_BUILTINS="${MY_BUILTINS} --enable-$name=yes"
-			name="" ; disable=""
-		elif [ $i == "shared" ] ; then
-			MY_BUILTINS="${MY_BUILTINS} --enable-$name=shared"
-			name="" ; disable=""
-		fi
-	done
-	einfo "${filename} options:\n${MY_BUILTINS}"
-}
-
-select_modules_config() {
-	parse_modules_config /etc/apache2/apache2-builtin-mods || \
-	parse_modules_config ${FILESDIR}/2.0.49/apache2-builtin-mods || \
-	return 1
-}
-
-pkg_postinst() {
-	set_filter_flags
-
-	#empty dirs...
-	install -d -m0755 -o apache -g apache ${ROOT}/var/lib/dav
-	install -d -m0755 -o root -g root ${ROOT}/var/log/apache2
-	install -d -m0755 -o apache -g apache ${ROOT}/var/cache/apache2
-
-	if use ssl; then
-	#	install -d -m0755 -o root -g root ${ROOT}/etc/apache2/conf/ssl
-	install -d -m0755 -o root -g root ${ROOT}/etc/apache2/conf/ssl
-		cd ${ROOT}/etc/apache2/conf/ssl
-		einfo
-		einfo "Generating self-signed test certificate in /etc/apache2/conf/ssl..."
-		yes "" 2>/dev/null | ${ROOT}/usr/lib/ssl/apache2-mod_ssl/gentestcrt.sh >/dev/null 2>&1
-		einfo
-	fi
-
-	if has_version '=net-www/apache-1*' ; then
-	ewarn
-	ewarn "Please add the 'apache2' flag to your USE variable and (re)install"
-	ewarn "any additional DSO modules you may wish to use with Apache-2.x."
-	ewarn "Addon modules are configured in /etc/apache2/conf/modules.d/"
-	ewarn
-	fi
-
-	# Check to see if this is an upgrade
-	if [ -d /home/httpd ];
-	then
-	einfo
-	einfo "Please remember to update your config files in /etc/apache2"
-	einfo "as --datadir has been changed to ${DATADIR}, and ServerRoot"
-	einfo "has changed to /usr/lib/apache2!"
-	einfo
-	fi
-
-	local list=""
-	for i in lib logs modules extramodules; do
-		local d="/etc/apache2/${i}"
-		[ -s "${d}" ] && list="${list} ${d}"
-	done
-	if [ -n "${list}" ]; then
-		einfo "You should delete these old symlinks: ${list}"
-	fi
-}
diff --git a/net-www/apache/apache-2.0.51-r1.ebuild b/net-www/apache/apache-2.0.51-r1.ebuild
deleted file mode 100644
index 4bff5bece707..000000000000
--- a/net-www/apache/apache-2.0.51-r1.ebuild
+++ /dev/null
@@ -1,406 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.51-r1.ebuild,v 1.16 2005/07/05 22:59:08 swegener Exp $
-
-inherit flag-o-matic eutils fixheadtails gnuconfig
-
-PATCH_LEVEL="${PV}"
-S="${WORKDIR}/httpd-${PV}"
-DESCRIPTION="Apache Web Server, Version 2.0.x"
-HOMEPAGE="http://www.apache.org/"
-SRC_URI="http://www.apache.org/dist/httpd/httpd-${PV}.tar.gz
-	http://dev.gentoo.org/~stuart/apache/apache-patches-${PVR}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ~ppc64 s390 sparc x86"
-IUSE="berkdb gdbm ldap threads ipv6 doc static ssl selinux"
-
-#Standard location for Gentoo Linux
-DATADIR="/var/www/localhost"
-
-DEPEND="dev-util/yacc
-	dev-lang/perl
-	sys-libs/zlib
-	dev-libs/expat
-	dev-libs/openssl
-	>=sys-devel/autoconf-2.59-r4
-	berkdb? ( sys-libs/db )
-	gdbm? ( sys-libs/gdbm )
-	!mips? ( ldap? ( =net-nds/openldap-2* ) )
-	selinux? ( sec-policy/selinux-apache )
-	!dev-libs/apr
-	!dev-libs/apr-util"
-
-apache_setup_vars() {
-	# Sets the USERDIR to default.
-	USERDIR="public_html"
-	einfo "DATADIR is set to: ${DATADIR}"
-	einfo "USERDIR is set to: $USERDIR"
-}
-
-set_filter_flags() {
-	CFLAGS="${CFLAGS/  / }"
-	has_version =sys-libs/glibc-2.2* && filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-}
-
-src_unpack() {
-	set_filter_flags
-
-	unpack ${A} || die
-	cd ${S} || die
-
-	# which muppet decided that epatch would default to applying compressed
-	# patches?
-
-	EPATCH_SUFFIX="patch"
-	epatch ${WORKDIR}/apache-patches-${PVR} || die
-
-	if use berkdb; then
-		einfo "Enabling berkdb."
-		if has_version '=sys-libs/db-4*'; then
-			einfo "Enabling db4"
-			myconf="${myconf} --with-dbm=db4 --with-berkely-db=/usr"
-		elif has_version '=sys-libs/db-3*'; then
-			einfo "Enabling db3"
-			myconf="${myconf} --with-dbm=db3 --with-berkely-db=/usr"
-		elif has_version '=sys-libs/db-2'; then
-			einfo "Enabling db2"
-			myconf="${myconf} --with-dbm=db2 --with-berkely-db=/usr"
-		fi
-	else
-		echo "Disabling berkdb"
-	fi
-
-	#avoid utf-8 charset problems
-	export LC_CTYPE=C
-
-	ht_fix_file srclib/apr/build/buildcheck.sh
-
-	#give it the stamp
-	sed -i -e 's:(" PLATFORM "):(Gentoo/Linux):g' server/core.c
-
-	#fix perl with perl!
-	find . -type f | xargs perl -pi -e \
-		"s|/usr/local/bin/perl|/usr/bin/perl|g; \
-		s|/usr/local/bin/perl5|/usr/bin/perl|g; \
-		s|/path/to/bin/perl|/usr/bin/perl|g;"
-	#dont want this cruft in /usr/bin
-	sed -i -e 's:@exp_bindir@:@exp_installbuilddir:g' support/apachectl.in
-
-	#setup the filesystem layout config
-	cat ${FILESDIR}/common/config.layout >> config.layout
-	sed -i -e 's:version:${PF}:g' config.layout
-
-	cat ${FILESDIR}/common/apr-config.layout >> srclib/apr/config.layout
-	cat ${FILESDIR}/common/apr-util-config.layout >> srclib/apr-util/config.layout
-
-	sed -i -e "s:/var/www/localhost:${DATADIR}:g" srclib/apr/config.layout
-	sed -i -e "s:/var/www/localhost:${DATADIR}:g" srclib/apr-util/config.layout
-
-	WANT_AUTOCONF=2.5 ./buildconf || die "buildconf failed"
-}
-
-src_compile() {
-	set_filter_flags
-	apache_setup_vars
-
-	# Detect mips and uclibc systems properly
-	gnuconfig_update
-
-	local myconf
-	if use ldap; then
-		if use mips; then
-			eerror "Sorry, LDAP support isn't available yet for MIPS"
-			eerror "Test out OpenLDAP and report it via BugZilla!"
-			eerror "Continuing in 5 seconds"
-			sleep 5s
-		else
-			einfo "Enabling LDAP"
-			if use static; then
-			  myconf="--with-ldap --enable-auth-ldap=static --enable-ldap=static"
-			else
-			  myconf="--with-ldap --enable-auth-ldap=shared --enable-ldap=shared"
-			fi
-		fi
-	fi
-
-	if use ipv6; then
-		einfo "Enabling ipv6"
-		myconf="${myconf} --enable-vp4"
-	else
-		myconf="${myconf} --disable-ipv6"
-	fi
-
-	if use threads; then
-		einfo "Enabling threads support"
-		myconf="${myconf} --with-mpm=worker"
-	else
-		myconf="${myconf} --with-mpm=${MPM:=prefork}"
-	fi
-
-	select_modules_config || die "determining modules"
-
-	# Fix for bug #24215 - robbat2@gentoo.org, 30 Oct 2003
-	# We pre-load the cache with the correct answer!  This avoids
-	# it violating the sandbox.  This may have to be changed for
-	# non-Linux systems or if sem_open changes on Linux.  This
-	# hack is built around documentation in /usr/include/semaphore.h
-	# and the glibc (pthread) source
-	echo 'ac_cv_func_sem_open=${ac_cv_func_sem_open=no}' >> ${S}/config.cache
-
-	# Workaround for bug #32444 - robbat2@gentoo.org, 28 Nov 2003
-	# Apache2 tries to build SCTP support even when all the parts of it aren't there
-	# So for the moment we tell it to ignore SCTP support
-	echo 'ac_cv_sctp=${ac_cv_sctp=no}' >> ${S}/config.cache
-	echo 'ac_cv_header_netinet_sctp_h=${ac_cv_header_netinet_sctp_h=no}' >> ${S}/config.cache
-	echo 'ac_cv_header_netinet_sctp_uio_h=${ac_cv_header_netinet_sctp_uio_h=no}' >> ${S}/config.cache
-
-	SSL_BASE="SYSTEM" \
-	WANT_AUTOCONF_2_5=1 WANT_AUTOCONF=2.5
-	./configure \
-		--with-suexec-safepath="/usr/local/bin:/usr/bin:/bin" \
-		--with-suexec-logfile=/var/log/apache2/suexec_log \
-		--with-suexec-bin=/usr/sbin/suexec2 \
-		--with-suexec-userdir=${USERDIR} \
-		--with-suexec-caller=apache \
-		--with-suexec-docroot=/var/www \
-		--with-suexec-uidmin=1000 \
-		--with-suexec-gidmin=100 \
-		--with-suexec-umask=077 \
-		--enable-suexec=shared \
-		\
-		${MY_BUILTINS} \
-		\
-		--cache-file=${S}/config.cache \
-		--with-perl=/usr/bin/perl \
-		--with-expat=/usr \
-		--with-ssl=/usr \
-		--with-z=/usr \
-		--with-port=80 \
-		--enable-layout=Gentoo \
-		--with-program-name=apache2 \
-		--with-devrandom=/dev/urandom \
-		--host=${CHOST} ${myconf} || die "bad ./configure please submit bug report to bugs.gentoo.org. Include your config.layout."
-		#--with-mpm={worker|prefork|perchild|leader|threadpool}
-
-	# we don't want to try and recompile the ssl_expr_parse.c file, because
-	# the lex source is broken
-	touch modules/ssl/ssl_expr_scan.c
-
-	emake || die "problem compiling Apache2 :("
-
-	#build ssl version of apache bench (ab-ssl)
-	cd support; rm -f ab .libs/ab ab.lo ab.o
-	make ab CFLAGS="${CFLAGS} -DUSE_SSL -lcrypto -lssl \
-		-I/usr/include/openssl -L/usr/lib" || die
-	mv ab ab-ssl; mv .libs/ab .libs/ab-ssl; rm -f ab.lo ab.o
-	make ab || die
-}
-
-src_install () {
-	set_filter_flags
-
-	local i
-	make DESTDIR=${D} install || die
-	dodoc ABOUT_APACHE CHANGES INSTALL LAYOUT \
-		LICENSE README* ${FILESDIR}/robots.txt
-
-	#bogus values pointing at /var/tmp/portage
-	sed -i -e 's:APR_SOURCE_DIR=.*:APR_SOURCE_DIR=:g' ${D}/usr/bin/apr-config
-	sed -i -e 's:APU_SOURCE_DIR=.*:APU_SOURCE_DIR=:g' ${D}/usr/bin/apu-config
-	sed -i -e 's:APU_BUILD_DIR=.*:APU_BUILD_DIR=:g' ${D}/usr/bin/apu-config
-
-	#protect the suexec binary
-	local gid=`id -g apache`
-	[ -z "${gid}" ] && gid=81
-	fowners root:${gid} /usr/sbin/suexec
-	fperms 4710 /usr/sbin/suexec
-
-	#apxs needs this to pickup the right lib for install
-	dosym /usr/lib /usr/lib/apache2/lib
-	dosym /var/log/apache2 /usr/lib/apache2/logs
-	dosym /usr/lib/apache2-extramodules /usr/lib/apache2/extramodules
-	dosym /etc/apache2/conf /usr/lib/apache2/conf
-
-	cd ${S}
-	#Credits to advx.org people for these scripts. Heck, thanks for
-	#the nice layout and everything else ;-)
-	exeinto /usr/sbin
-	for i in apache2logserverstatus apache2splitlogfile
-	do
-		doexe ${FILESDIR}/2.0.49/$i
-	done
-	exeinto /usr/lib/ssl/apache2-mod_ssl
-	doexe ${FILESDIR}/2.0.49/gentestcrt.sh
-
-	#some more scripts
-	exeinto /usr/sbin
-	for i in split-logfile list_hooks.pl logresolve.pl log_server_status
-	do
-		doexe ${S}/support/$i
-	done
-	#the ssl version of apache bench
-	doexe support/.libs/ab-ssl
-
-	#move some mods to extramodules
-	dodir /usr/lib/apache2-extramodules
-	for i in mod_ssl.so mod_ldap.so mod_auth_ldap.so
-	do
-		[ -x ${D}/usr/lib/apache2/modules/$i ] && \
-		mv ${D}/usr/lib/apache2/modules/$i ${D}/usr/lib/apache2-extramodules
-	done
-
-	#modules.d config file snippets
-	insinto /etc/apache2/conf/modules.d
-	for i in 40_mod_ssl.conf 41_mod_ssl.default-vhost.conf 45_mod_dav.conf
-	do
-		doins ${FILESDIR}/2.0.49/$i
-	done
-	use !mips && use ldap && doins ${FILESDIR}/2.0.49/46_mod_ldap.conf
-
-	#drop in a convenient link to the manual
-	if use doc; then
-		MANUAL_VERSION="2.0.50"
-		insinto /etc/apache2/conf/modules.d
-		doins ${FILESDIR}/00_apache_manual.conf
-		dosym /usr/share/doc/${PF}/manual ${DATADIR}/htdocs/manual
-		sed -i -e "s:2.0.49:${MANUAL_VERSION}:" ${D}/etc/apache2/conf/modules.d/00_apache_manual.conf
-		else
-		rm -rf ${D}/usr/share/doc/${PF}/manual
-	fi
-
-	#SLOT=2!!!
-	cd ${D}
-	mv -v usr/sbin/apachectl usr/sbin/apache2ctl
-	mv -v usr/sbin/htdigest usr/sbin/htdigest2
-	mv -v usr/sbin/htpasswd usr/sbin/htpasswd2
-	mv -v usr/sbin/logresolve usr/sbin/logresolve2
-	mv -v usr/sbin/apxs usr/sbin/apxs2
-	mv -v usr/sbin/ab usr/sbin/ab2
-	mv -v usr/sbin/ab-ssl usr/sbin/ab2-ssl
-	mv -v usr/sbin/suexec usr/sbin/suexec2
-	mv -v usr/sbin/rotatelogs usr/sbin/rotatelogs2
-	mv -v usr/sbin/dbmmanage usr/sbin/dbmmanage2
-	mv -v usr/sbin/checkgid usr/sbin/checkgid2
-	mv -v usr/sbin/split-logfile usr/sbin/split-logfile2
-	mv -v usr/sbin/list_hooks.pl usr/sbin/list_hooks2.pl
-	mv -v usr/sbin/logresolve.pl usr/sbin/logresolve2.pl
-
-	# do the man pages
-	mv -v usr/share/man/man1/htdigest.1 usr/share/man/man1/htdigest2.1
-	mv -v usr/share/man/man1/htpasswd.1 usr/share/man/man1/htpasswd2.1
-	mv -v usr/share/man/man1/dbmmanage.1 usr/share/man/man1/dbmmanage2.1
-	mv -v usr/share/man/man8/ab.8 usr/share/man/man8/ab2.8
-	mv -v usr/share/man/man8/apxs.8 usr/share/man/man8/apxs2.8
-	mv -v usr/share/man/man8/apachectl.8 usr/share/man/man8/apache2ctl.8
-	mv -v usr/share/man/man8/httpd.8 usr/share/man/man8/apache2.8
-	mv -v usr/share/man/man8/logresolve.8 usr/share/man/man8/logresolve2.8
-	mv -v usr/share/man/man8/rotatelogs.8 usr/share/man/man8/rotatelogs2.8
-	mv -v usr/share/man/man8/suexec.8 usr/share/man/man8/suexec2.8
-
-	#tidy up
-	mv ${D}/usr/sbin/envvars* ${D}/usr/lib/apache2/build
-	dodoc ${D}/etc/apache2/conf/*-std.conf
-	rm -f ${D}/etc/apache2/conf/*.conf
-	rm -rf ${D}/var/run ${D}/var/log
-
-	#config files
-	insinto /etc/conf.d; newins ${FILESDIR}/2.0.49/apache2.confd apache2
-	exeinto /etc/init.d; newexe ${FILESDIR}/2.0.49/apache2.initd apache2
-	insinto /etc/apache2; doins ${FILESDIR}/2.0.49/apache2-builtin-mods
-	insinto /etc/apache2/conf
-	doins ${FILESDIR}/2.0.49/commonapache2.conf
-	doins ${FILESDIR}/2.0.49/apache2.conf
-	insinto /etc/apache2/conf/vhosts
-	doins ${FILESDIR}/2.0.49/virtual-homepages.conf
-	doins ${FILESDIR}/2.0.49/dynamic-vhosts.conf
-	doins ${FILESDIR}/2.0.49/vhosts.conf
-
-	# Added by Jason Wever <weeve@gentoo.org>
-	# A little sedfu to fix bug #7172 for sparc64s
-	if [ ${ARCH} = "sparc" ]
-	then
-		sed -i -e '13a\AcceptMutex fcntl' \
-			${D}/etc/apache2/conf/apache2.conf
-	fi
-}
-
-parse_modules_config() {
-	set_filter_flags
-
-	local filename=$1
-	local name=""
-	local dso=""
-	local disable=""
-	[ -f ${filename} ] || return 1
-	for i in `cat $filename | sed "s/^#.*//"` ; do
-		if [ $i == "-" ] ; then
-			disable="true"
-		elif [ -z "$name" ] && [ ! -z "`echo $i | grep "mod_"`" ] ; then
-			name=`echo $i | sed "s/mod_//"`
-		elif [ "$disable" ] && ( [ $i == "static" ] || [ $i == "shared" ] ) ; then
-			MY_BUILTINS="${MY_BUILTINS} --disable-$name"
-			name="" ; disable=""
-		elif [ $i == "static" ] ; then
-			MY_BUILTINS="${MY_BUILTINS} --enable-$name=yes"
-			name="" ; disable=""
-		elif [ $i == "shared" ] ; then
-			MY_BUILTINS="${MY_BUILTINS} --enable-$name=shared"
-			name="" ; disable=""
-		fi
-	done
-	einfo "${filename} options:\n${MY_BUILTINS}"
-}
-
-select_modules_config() {
-	parse_modules_config /etc/apache2/apache2-builtin-mods || \
-	parse_modules_config ${FILESDIR}/2.0.49/apache2-builtin-mods || \
-	return 1
-}
-
-pkg_postinst() {
-	set_filter_flags
-
-	#empty dirs...
-	install -d -m0755 -o apache -g apache ${ROOT}/var/lib/dav
-	install -d -m0755 -o root -g root ${ROOT}/var/log/apache2
-	install -d -m0755 -o apache -g apache ${ROOT}/var/cache/apache2
-
-	if use ssl; then
-	#	install -d -m0755 -o root -g root ${ROOT}/etc/apache2/conf/ssl
-	install -d -m0755 -o root -g root ${ROOT}/etc/apache2/conf/ssl
-		cd ${ROOT}/etc/apache2/conf/ssl
-		einfo
-		einfo "Generating self-signed test certificate in /etc/apache2/conf/ssl..."
-		yes "" 2>/dev/null | ${ROOT}/usr/lib/ssl/apache2-mod_ssl/gentestcrt.sh >/dev/null 2>&1
-		einfo
-	fi
-
-	if has_version '=net-www/apache-1*' ; then
-	ewarn
-	ewarn "Please add the 'apache2' flag to your USE variable and (re)install"
-	ewarn "any additional DSO modules you may wish to use with Apache-2.x."
-	ewarn "Addon modules are configured in /etc/apache2/conf/modules.d/"
-	ewarn
-	fi
-
-	# Check to see if this is an upgrade
-	if [ -d /home/httpd ];
-	then
-	einfo
-	einfo "Please remember to update your config files in /etc/apache2"
-	einfo "as --datadir has been changed to ${DATADIR}, and ServerRoot"
-	einfo "has changed to /usr/lib/apache2!"
-	einfo
-	fi
-
-	local list=""
-	for i in lib logs modules extramodules; do
-		local d="/etc/apache2/${i}"
-		[ -s "${d}" ] && list="${list} ${d}"
-	done
-	if [ -n "${list}" ]; then
-		einfo "You should delete these old symlinks: ${list}"
-	fi
-}
diff --git a/net-www/apache/apache-2.0.51.ebuild b/net-www/apache/apache-2.0.51.ebuild
deleted file mode 100644
index 7ac5bf869fe6..000000000000
--- a/net-www/apache/apache-2.0.51.ebuild
+++ /dev/null
@@ -1,406 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.51.ebuild,v 1.19 2005/07/05 22:59:08 swegener Exp $
-
-inherit flag-o-matic eutils fixheadtails gnuconfig
-
-PATCH_LEVEL="${PV}"
-S="${WORKDIR}/httpd-${PV}"
-DESCRIPTION="Apache Web Server, Version 2.0.x"
-HOMEPAGE="http://www.apache.org/"
-SRC_URI="http://www.apache.org/dist/httpd/httpd-${PV}.tar.gz
-	http://dev.gentoo.org/~stuart/apache/apache-patches-${PVR}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
-IUSE="berkdb gdbm ldap threads ipv6 doc static ssl selinux"
-
-#Standard location for Gentoo Linux
-DATADIR="/var/www/localhost"
-
-DEPEND="dev-util/yacc
-	dev-lang/perl
-	sys-libs/zlib
-	dev-libs/expat
-	dev-libs/openssl
-	>=sys-devel/autoconf-2.59-r4
-	berkdb? ( sys-libs/db )
-	gdbm? ( sys-libs/gdbm )
-	!mips? ( ldap? ( =net-nds/openldap-2* ) )
-	selinux? ( sec-policy/selinux-apache )
-	!dev-libs/apr
-	!dev-libs/apr-util"
-
-apache_setup_vars() {
-	# Sets the USERDIR to default.
-	USERDIR="public_html"
-	einfo "DATADIR is set to: ${DATADIR}"
-	einfo "USERDIR is set to: $USERDIR"
-}
-
-set_filter_flags() {
-	CFLAGS="${CFLAGS/  / }"
-	has_version =sys-libs/glibc-2.2* && filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-}
-
-src_unpack() {
-	set_filter_flags
-
-	unpack ${A} || die
-	cd ${S} || die
-
-	# which muppet decided that epatch would default to applying compressed
-	# patches?
-
-	EPATCH_SUFFIX="patch"
-	epatch ${WORKDIR}/apache-patches-${PVR} || die
-
-	if use berkdb; then
-		einfo "Enabling berkdb."
-		if has_version '=sys-libs/db-4*'; then
-			einfo "Enabling db4"
-			myconf="${myconf} --with-dbm=db4 --with-berkely-db=/usr"
-		elif has_version '=sys-libs/db-3*'; then
-			einfo "Enabling db3"
-			myconf="${myconf} --with-dbm=db3 --with-berkely-db=/usr"
-		elif has_version '=sys-libs/db-2'; then
-			einfo "Enabling db2"
-			myconf="${myconf} --with-dbm=db2 --with-berkely-db=/usr"
-		fi
-	else
-		echo "Disabling berkdb"
-	fi
-
-	#avoid utf-8 charset problems
-	export LC_CTYPE=C
-
-	ht_fix_file srclib/apr/build/buildcheck.sh
-
-	#give it the stamp
-	sed -i -e 's:(" PLATFORM "):(Gentoo/Linux):g' server/core.c
-
-	#fix perl with perl!
-	find . -type f | xargs perl -pi -e \
-		"s|/usr/local/bin/perl|/usr/bin/perl|g; \
-		s|/usr/local/bin/perl5|/usr/bin/perl|g; \
-		s|/path/to/bin/perl|/usr/bin/perl|g;"
-	#dont want this cruft in /usr/bin
-	sed -i -e 's:@exp_bindir@:@exp_installbuilddir:g' support/apachectl.in
-
-	#setup the filesystem layout config
-	cat ${FILESDIR}/common/config.layout >> config.layout
-	sed -i -e 's:version:${PF}:g' config.layout
-
-	cat ${FILESDIR}/common/apr-config.layout >> srclib/apr/config.layout
-	cat ${FILESDIR}/common/apr-util-config.layout >> srclib/apr-util/config.layout
-
-	sed -i -e "s:/var/www/localhost:${DATADIR}:g" srclib/apr/config.layout
-	sed -i -e "s:/var/www/localhost:${DATADIR}:g" srclib/apr-util/config.layout
-
-	WANT_AUTOCONF=2.5 ./buildconf || die "buildconf failed"
-}
-
-src_compile() {
-	set_filter_flags
-	apache_setup_vars
-
-	# Detect mips and uclibc systems properly
-	gnuconfig_update
-
-	local myconf
-	if use ldap; then
-		if use mips; then
-			eerror "Sorry, LDAP support isn't available yet for MIPS"
-			eerror "Test out OpenLDAP and report it via BugZilla!"
-			eerror "Continuing in 5 seconds"
-			sleep 5s
-		else
-			einfo "Enabling LDAP"
-			if use static; then
-			  myconf="--with-ldap --enable-auth-ldap=static --enable-ldap=static"
-			else
-			  myconf="--with-ldap --enable-auth-ldap=shared --enable-ldap=shared"
-			fi
-		fi
-	fi
-
-	if use ipv6; then
-		einfo "Enabling ipv6"
-		myconf="${myconf} --enable-vp4"
-	else
-		myconf="${myconf} --disable-ipv6"
-	fi
-
-	if use threads; then
-		einfo "Enabling threads support"
-		myconf="${myconf} --with-mpm=worker"
-	else
-		myconf="${myconf} --with-mpm=${MPM:=prefork}"
-	fi
-
-	select_modules_config || die "determining modules"
-
-	# Fix for bug #24215 - robbat2@gentoo.org, 30 Oct 2003
-	# We pre-load the cache with the correct answer!  This avoids
-	# it violating the sandbox.  This may have to be changed for
-	# non-Linux systems or if sem_open changes on Linux.  This
-	# hack is built around documentation in /usr/include/semaphore.h
-	# and the glibc (pthread) source
-	echo 'ac_cv_func_sem_open=${ac_cv_func_sem_open=no}' >> ${S}/config.cache
-
-	# Workaround for bug #32444 - robbat2@gentoo.org, 28 Nov 2003
-	# Apache2 tries to build SCTP support even when all the parts of it aren't there
-	# So for the moment we tell it to ignore SCTP support
-	echo 'ac_cv_sctp=${ac_cv_sctp=no}' >> ${S}/config.cache
-	echo 'ac_cv_header_netinet_sctp_h=${ac_cv_header_netinet_sctp_h=no}' >> ${S}/config.cache
-	echo 'ac_cv_header_netinet_sctp_uio_h=${ac_cv_header_netinet_sctp_uio_h=no}' >> ${S}/config.cache
-
-	SSL_BASE="SYSTEM" \
-	WANT_AUTOCONF_2_5=1 WANT_AUTOCONF=2.5
-	./configure \
-		--with-suexec-safepath="/usr/local/bin:/usr/bin:/bin" \
-		--with-suexec-logfile=/var/log/apache2/suexec_log \
-		--with-suexec-bin=/usr/sbin/suexec2 \
-		--with-suexec-userdir=${USERDIR} \
-		--with-suexec-caller=apache \
-		--with-suexec-docroot=/var/www \
-		--with-suexec-uidmin=1000 \
-		--with-suexec-gidmin=100 \
-		--with-suexec-umask=077 \
-		--enable-suexec=shared \
-		\
-		${MY_BUILTINS} \
-		\
-		--cache-file=${S}/config.cache \
-		--with-perl=/usr/bin/perl \
-		--with-expat=/usr \
-		--with-ssl=/usr \
-		--with-z=/usr \
-		--with-port=80 \
-		--enable-layout=Gentoo \
-		--with-program-name=apache2 \
-		--with-devrandom=/dev/urandom \
-		--host=${CHOST} ${myconf} || die "bad ./configure please submit bug report to bugs.gentoo.org. Include your config.layout."
-		#--with-mpm={worker|prefork|perchild|leader|threadpool}
-
-	# we don't want to try and recompile the ssl_expr_parse.c file, because
-	# the lex source is broken
-	touch modules/ssl/ssl_expr_scan.c
-
-	emake || die "problem compiling Apache2 :("
-
-	#build ssl version of apache bench (ab-ssl)
-	cd support; rm -f ab .libs/ab ab.lo ab.o
-	make ab CFLAGS="${CFLAGS} -DUSE_SSL -lcrypto -lssl \
-		-I/usr/include/openssl -L/usr/lib" || die
-	mv ab ab-ssl; mv .libs/ab .libs/ab-ssl; rm -f ab.lo ab.o
-	make ab || die
-}
-
-src_install () {
-	set_filter_flags
-
-	local i
-	make DESTDIR=${D} install || die
-	dodoc ABOUT_APACHE CHANGES INSTALL LAYOUT \
-		LICENSE README* ${FILESDIR}/robots.txt
-
-	#bogus values pointing at /var/tmp/portage
-	sed -i -e 's:APR_SOURCE_DIR=.*:APR_SOURCE_DIR=:g' ${D}/usr/bin/apr-config
-	sed -i -e 's:APU_SOURCE_DIR=.*:APU_SOURCE_DIR=:g' ${D}/usr/bin/apu-config
-	sed -i -e 's:APU_BUILD_DIR=.*:APU_BUILD_DIR=:g' ${D}/usr/bin/apu-config
-
-	#protect the suexec binary
-	local gid=`id -g apache`
-	[ -z "${gid}" ] && gid=81
-	fowners root:${gid} /usr/sbin/suexec
-	fperms 4710 /usr/sbin/suexec
-
-	#apxs needs this to pickup the right lib for install
-	dosym /usr/lib /usr/lib/apache2/lib
-	dosym /var/log/apache2 /usr/lib/apache2/logs
-	dosym /usr/lib/apache2-extramodules /usr/lib/apache2/extramodules
-	dosym /etc/apache2/conf /usr/lib/apache2/conf
-
-	cd ${S}
-	#Credits to advx.org people for these scripts. Heck, thanks for
-	#the nice layout and everything else ;-)
-	exeinto /usr/sbin
-	for i in apache2logserverstatus apache2splitlogfile
-	do
-		doexe ${FILESDIR}/2.0.49/$i
-	done
-	exeinto /usr/lib/ssl/apache2-mod_ssl
-	doexe ${FILESDIR}/2.0.49/gentestcrt.sh
-
-	#some more scripts
-	exeinto /usr/sbin
-	for i in split-logfile list_hooks.pl logresolve.pl log_server_status
-	do
-		doexe ${S}/support/$i
-	done
-	#the ssl version of apache bench
-	doexe support/.libs/ab-ssl
-
-	#move some mods to extramodules
-	dodir /usr/lib/apache2-extramodules
-	for i in mod_ssl.so mod_ldap.so mod_auth_ldap.so
-	do
-		[ -x ${D}/usr/lib/apache2/modules/$i ] && \
-		mv ${D}/usr/lib/apache2/modules/$i ${D}/usr/lib/apache2-extramodules
-	done
-
-	#modules.d config file snippets
-	insinto /etc/apache2/conf/modules.d
-	for i in 40_mod_ssl.conf 41_mod_ssl.default-vhost.conf 45_mod_dav.conf
-	do
-		doins ${FILESDIR}/2.0.49/$i
-	done
-	use !mips && use ldap && doins ${FILESDIR}/2.0.49/46_mod_ldap.conf
-
-	#drop in a convenient link to the manual
-	if use doc; then
-		MANUAL_VERSION="2.0.50"
-		insinto /etc/apache2/conf/modules.d
-		doins ${FILESDIR}/00_apache_manual.conf
-		dosym /usr/share/doc/${PF}/manual ${DATADIR}/htdocs/manual
-		sed -i -e "s:2.0.49:${MANUAL_VERSION}:" ${D}/etc/apache2/conf/modules.d/00_apache_manual.conf
-		else
-		rm -rf ${D}/usr/share/doc/${PF}/manual
-	fi
-
-	#SLOT=2!!!
-	cd ${D}
-	mv -v usr/sbin/apachectl usr/sbin/apache2ctl
-	mv -v usr/sbin/htdigest usr/sbin/htdigest2
-	mv -v usr/sbin/htpasswd usr/sbin/htpasswd2
-	mv -v usr/sbin/logresolve usr/sbin/logresolve2
-	mv -v usr/sbin/apxs usr/sbin/apxs2
-	mv -v usr/sbin/ab usr/sbin/ab2
-	mv -v usr/sbin/ab-ssl usr/sbin/ab2-ssl
-	mv -v usr/sbin/suexec usr/sbin/suexec2
-	mv -v usr/sbin/rotatelogs usr/sbin/rotatelogs2
-	mv -v usr/sbin/dbmmanage usr/sbin/dbmmanage2
-	mv -v usr/sbin/checkgid usr/sbin/checkgid2
-	mv -v usr/sbin/split-logfile usr/sbin/split-logfile2
-	mv -v usr/sbin/list_hooks.pl usr/sbin/list_hooks2.pl
-	mv -v usr/sbin/logresolve.pl usr/sbin/logresolve2.pl
-
-	# do the man pages
-	mv -v usr/share/man/man1/htdigest.1 usr/share/man/man1/htdigest2.1
-	mv -v usr/share/man/man1/htpasswd.1 usr/share/man/man1/htpasswd2.1
-	mv -v usr/share/man/man1/dbmmanage.1 usr/share/man/man1/dbmmanage2.1
-	mv -v usr/share/man/man8/ab.8 usr/share/man/man8/ab2.8
-	mv -v usr/share/man/man8/apxs.8 usr/share/man/man8/apxs2.8
-	mv -v usr/share/man/man8/apachectl.8 usr/share/man/man8/apache2ctl.8
-	mv -v usr/share/man/man8/httpd.8 usr/share/man/man8/apache2.8
-	mv -v usr/share/man/man8/logresolve.8 usr/share/man/man8/logresolve2.8
-	mv -v usr/share/man/man8/rotatelogs.8 usr/share/man/man8/rotatelogs2.8
-	mv -v usr/share/man/man8/suexec.8 usr/share/man/man8/suexec2.8
-
-	#tidy up
-	mv ${D}/usr/sbin/envvars* ${D}/usr/lib/apache2/build
-	dodoc ${D}/etc/apache2/conf/*-std.conf
-	rm -f ${D}/etc/apache2/conf/*.conf
-	rm -rf ${D}/var/run ${D}/var/log
-
-	#config files
-	insinto /etc/conf.d; newins ${FILESDIR}/2.0.49/apache2.confd apache2
-	exeinto /etc/init.d; newexe ${FILESDIR}/2.0.49/apache2.initd apache2
-	insinto /etc/apache2; doins ${FILESDIR}/2.0.49/apache2-builtin-mods
-	insinto /etc/apache2/conf
-	doins ${FILESDIR}/2.0.49/commonapache2.conf
-	doins ${FILESDIR}/2.0.49/apache2.conf
-	insinto /etc/apache2/conf/vhosts
-	doins ${FILESDIR}/2.0.49/virtual-homepages.conf
-	doins ${FILESDIR}/2.0.49/dynamic-vhosts.conf
-	doins ${FILESDIR}/2.0.49/vhosts.conf
-
-	# Added by Jason Wever <weeve@gentoo.org>
-	# A little sedfu to fix bug #7172 for sparc64s
-	if [ ${ARCH} = "sparc" ]
-	then
-		sed -i -e '13a\AcceptMutex fcntl' \
-			${D}/etc/apache2/conf/apache2.conf
-	fi
-}
-
-parse_modules_config() {
-	set_filter_flags
-
-	local filename=$1
-	local name=""
-	local dso=""
-	local disable=""
-	[ -f ${filename} ] || return 1
-	for i in `cat $filename | sed "s/^#.*//"` ; do
-		if [ $i == "-" ] ; then
-			disable="true"
-		elif [ -z "$name" ] && [ ! -z "`echo $i | grep "mod_"`" ] ; then
-			name=`echo $i | sed "s/mod_//"`
-		elif [ "$disable" ] && ( [ $i == "static" ] || [ $i == "shared" ] ) ; then
-			MY_BUILTINS="${MY_BUILTINS} --disable-$name"
-			name="" ; disable=""
-		elif [ $i == "static" ] ; then
-			MY_BUILTINS="${MY_BUILTINS} --enable-$name=yes"
-			name="" ; disable=""
-		elif [ $i == "shared" ] ; then
-			MY_BUILTINS="${MY_BUILTINS} --enable-$name=shared"
-			name="" ; disable=""
-		fi
-	done
-	einfo "${filename} options:\n${MY_BUILTINS}"
-}
-
-select_modules_config() {
-	parse_modules_config /etc/apache2/apache2-builtin-mods || \
-	parse_modules_config ${FILESDIR}/2.0.49/apache2-builtin-mods || \
-	return 1
-}
-
-pkg_postinst() {
-	set_filter_flags
-
-	#empty dirs...
-	install -d -m0755 -o apache -g apache ${ROOT}/var/lib/dav
-	install -d -m0755 -o root -g root ${ROOT}/var/log/apache2
-	install -d -m0755 -o apache -g apache ${ROOT}/var/cache/apache2
-
-	if use ssl; then
-	#	install -d -m0755 -o root -g root ${ROOT}/etc/apache2/conf/ssl
-	install -d -m0755 -o root -g root ${ROOT}/etc/apache2/conf/ssl
-		cd ${ROOT}/etc/apache2/conf/ssl
-		einfo
-		einfo "Generating self-signed test certificate in /etc/apache2/conf/ssl..."
-		yes "" 2>/dev/null | ${ROOT}/usr/lib/ssl/apache2-mod_ssl/gentestcrt.sh >/dev/null 2>&1
-		einfo
-	fi
-
-	if has_version '=net-www/apache-1*' ; then
-	ewarn
-	ewarn "Please add the 'apache2' flag to your USE variable and (re)install"
-	ewarn "any additional DSO modules you may wish to use with Apache-2.x."
-	ewarn "Addon modules are configured in /etc/apache2/conf/modules.d/"
-	ewarn
-	fi
-
-	# Check to see if this is an upgrade
-	if [ -d /home/httpd ];
-	then
-	einfo
-	einfo "Please remember to update your config files in /etc/apache2"
-	einfo "as --datadir has been changed to ${DATADIR}, and ServerRoot"
-	einfo "has changed to /usr/lib/apache2!"
-	einfo
-	fi
-
-	local list=""
-	for i in lib logs modules extramodules; do
-		local d="/etc/apache2/${i}"
-		[ -s "${d}" ] && list="${list} ${d}"
-	done
-	if [ -n "${list}" ]; then
-		einfo "You should delete these old symlinks: ${list}"
-	fi
-}
diff --git a/net-www/apache/apache-2.0.52-r1.ebuild b/net-www/apache/apache-2.0.52-r1.ebuild
deleted file mode 100644
index 58dd58f12499..000000000000
--- a/net-www/apache/apache-2.0.52-r1.ebuild
+++ /dev/null
@@ -1,424 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.52-r1.ebuild,v 1.20 2005/07/05 22:59:08 swegener Exp $
-
-inherit flag-o-matic eutils fixheadtails gnuconfig
-
-PATCH_LEVEL="${PV}"
-S="${WORKDIR}/httpd-${PV}"
-DESCRIPTION="Apache Web Server, Version 2.0.x"
-HOMEPAGE="http://www.apache.org/"
-SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.gz
-	http://dev.gentoo.org/~urilith/apache/apache-patches-${PVR}.tar.bz2
-	http://dev.gentoo.org/~kloeri/apache_patches/apache2-conf.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
-IUSE="berkdb gdbm ldap threads ipv6 doc static ssl selinux"
-
-#Standard location for Gentoo Linux
-DATADIR="/var/www/localhost"
-
-DEPEND="dev-util/yacc
-	dev-lang/perl
-	sys-libs/zlib
-	dev-libs/expat
-	dev-libs/openssl
-	>=sys-devel/autoconf-2.59-r4
-	berkdb? ( sys-libs/db )
-	gdbm? ( sys-libs/gdbm )
-	!mips? ( ldap? ( =net-nds/openldap-2* ) )
-	selinux? ( sec-policy/selinux-apache )
-	!dev-libs/apr
-	!dev-libs/apr-util"
-
-apache_setup_vars() {
-	# Sets the USERDIR to default.
-	USERDIR="public_html"
-	einfo "DATADIR is set to: ${DATADIR}"
-	einfo "USERDIR is set to: $USERDIR"
-}
-
-set_filter_flags() {
-	CFLAGS="${CFLAGS/  / }"
-	has_version =sys-libs/glibc-2.2* && filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-}
-
-src_unpack() {
-	set_filter_flags
-
-	unpack ${A} || die
-	cd ${S} || die
-
-	# which muppet decided that epatch would default to applying compressed
-	# patches?
-
-	EPATCH_SUFFIX="patch"
-	epatch ${WORKDIR}/apache-patches-${PVR} || die
-
-	if use berkdb; then
-		einfo "Enabling berkdb."
-		if has_version '=sys-libs/db-4*'; then
-			einfo "Enabling db4"
-			myconf="${myconf} --with-dbm=db4 --with-berkely-db=/usr"
-		elif has_version '=sys-libs/db-3*'; then
-			einfo "Enabling db3"
-			myconf="${myconf} --with-dbm=db3 --with-berkely-db=/usr"
-		elif has_version '=sys-libs/db-2'; then
-			einfo "Enabling db2"
-			myconf="${myconf} --with-dbm=db2 --with-berkely-db=/usr"
-		fi
-	else
-		echo "Disabling berkdb"
-	fi
-
-	#avoid utf-8 charset problems
-	export LC_CTYPE=C
-
-	ht_fix_file srclib/apr/build/buildcheck.sh
-
-	#give it the stamp
-	sed -i -e 's:(" PLATFORM "):(Gentoo/Linux):g' server/core.c
-
-	#fix perl with perl!
-	find . -type f | xargs perl -pi -e \
-		"s|/usr/local/bin/perl|/usr/bin/perl|g; \
-		s|/usr/local/bin/perl5|/usr/bin/perl|g; \
-		s|/path/to/bin/perl|/usr/bin/perl|g;"
-	#dont want this cruft in /usr/bin
-	sed -i -e 's:@exp_bindir@:@exp_installbuilddir:g' support/apachectl.in
-
-	#setup the filesystem layout config
-	cat ${FILESDIR}/common/config.layout >> config.layout
-	sed -i -e 's:version:${PF}:g' config.layout
-
-	cat ${FILESDIR}/common/apr-config.layout >> srclib/apr/config.layout
-	cat ${FILESDIR}/common/apr-util-config.layout >> srclib/apr-util/config.layout
-
-	sed -i -e "s:/var/www/localhost:${DATADIR}:g" srclib/apr/config.layout
-	sed -i -e "s:/var/www/localhost:${DATADIR}:g" srclib/apr-util/config.layout
-
-	WANT_AUTOCONF=2.5 ./buildconf || die "buildconf failed"
-}
-
-src_compile() {
-	set_filter_flags
-	apache_setup_vars
-
-	# Detect mips and uclibc systems properly
-	gnuconfig_update
-
-	local myconf
-	if use ldap; then
-		if use mips; then
-			eerror "Sorry, LDAP support isn't available yet for MIPS"
-			eerror "Test out OpenLDAP and report it via BugZilla!"
-			eerror "Continuing in 5 seconds"
-			sleep 5s
-		else
-			einfo "Enabling LDAP"
-			if use static; then
-			  myconf="--with-ldap --enable-auth-ldap=static --enable-ldap=static"
-			else
-			  myconf="--with-ldap --enable-auth-ldap=shared --enable-ldap=shared"
-			fi
-		fi
-	fi
-
-	if use ipv6; then
-		einfo "Enabling ipv6"
-		myconf="${myconf} --enable-vp4"
-	else
-		myconf="${myconf} --disable-ipv6"
-	fi
-
-	if use threads; then
-		einfo "Enabling threads support"
-		myconf="${myconf} --with-mpm=worker"
-	else
-		myconf="${myconf} --with-mpm=${MPM:=prefork}"
-	fi
-
-	select_modules_config || die "determining modules"
-
-	# Fix for bug #24215 - robbat2@gentoo.org, 30 Oct 2003
-	# We pre-load the cache with the correct answer!  This avoids
-	# it violating the sandbox.  This may have to be changed for
-	# non-Linux systems or if sem_open changes on Linux.  This
-	# hack is built around documentation in /usr/include/semaphore.h
-	# and the glibc (pthread) source
-	echo 'ac_cv_func_sem_open=${ac_cv_func_sem_open=no}' >> ${S}/config.cache
-
-	# Workaround for bug #32444 - robbat2@gentoo.org, 28 Nov 2003
-	# Apache2 tries to build SCTP support even when all the parts of it aren't there
-	# So for the moment we tell it to ignore SCTP support
-	echo 'ac_cv_sctp=${ac_cv_sctp=no}' >> ${S}/config.cache
-	echo 'ac_cv_header_netinet_sctp_h=${ac_cv_header_netinet_sctp_h=no}' >> ${S}/config.cache
-	echo 'ac_cv_header_netinet_sctp_uio_h=${ac_cv_header_netinet_sctp_uio_h=no}' >> ${S}/config.cache
-
-	SSL_BASE="SYSTEM" \
-	WANT_AUTOCONF_2_5=1 WANT_AUTOCONF=2.5
-	./configure \
-		--with-suexec-safepath="/usr/local/bin:/usr/bin:/bin" \
-		--with-suexec-logfile=/var/log/apache2/suexec_log \
-		--with-suexec-bin=/usr/sbin/suexec2 \
-		--with-suexec-userdir=${USERDIR} \
-		--with-suexec-caller=apache \
-		--with-suexec-docroot=/var/www \
-		--with-suexec-uidmin=1000 \
-		--with-suexec-gidmin=100 \
-		--with-suexec-umask=077 \
-		--enable-suexec=shared \
-		\
-		${MY_BUILTINS} \
-		\
-		--cache-file=${S}/config.cache \
-		--with-perl=/usr/bin/perl \
-		--with-expat=/usr \
-		--with-ssl=/usr \
-		--with-z=/usr \
-		--with-port=80 \
-		--enable-layout=Gentoo \
-		--with-program-name=apache2 \
-		--with-devrandom=/dev/urandom \
-		--host=${CHOST} ${myconf} || die "bad ./configure please submit bug report to bugs.gentoo.org. Include your config.layout."
-		#--with-mpm={worker|prefork|perchild|leader|threadpool}
-
-	# we don't want to try and recompile the ssl_expr_parse.c file, because
-	# the lex source is broken
-	touch modules/ssl/ssl_expr_scan.c
-
-	emake || die "problem compiling Apache2 :("
-
-	#build ssl version of apache bench (ab-ssl)
-	cd support; rm -f ab .libs/ab ab.lo ab.o
-	make ab CFLAGS="${CFLAGS} -DUSE_SSL -lcrypto -lssl \
-		-I/usr/include/openssl -L/usr/lib" || die
-	mv ab ab-ssl; mv .libs/ab .libs/ab-ssl; rm -f ab.lo ab.o
-	make ab || die
-}
-
-src_install () {
-	set_filter_flags
-
-	local i
-	make DESTDIR=${D} install || die
-	dodoc ABOUT_APACHE CHANGES INSTALL LAYOUT \
-		LICENSE README* ${FILESDIR}/robots.txt
-
-	#bogus values pointing at /var/tmp/portage
-	sed -i -e 's:APR_SOURCE_DIR=.*:APR_SOURCE_DIR=:g' ${D}/usr/bin/apr-config
-	sed -i -e 's:APU_SOURCE_DIR=.*:APU_SOURCE_DIR=:g' ${D}/usr/bin/apu-config
-	sed -i -e 's:APU_BUILD_DIR=.*:APU_BUILD_DIR=:g' ${D}/usr/bin/apu-config
-
-	#protect the suexec binary
-	local gid=`id -g apache`
-	[ -z "${gid}" ] && gid=81
-	fowners root:${gid} /usr/sbin/suexec
-	fperms 4710 /usr/sbin/suexec
-
-	#apxs needs this to pickup the right lib for install
-	dosym /usr/lib /usr/lib/apache2/lib
-	dosym /var/log/apache2 /usr/lib/apache2/logs
-	dosym /usr/lib/apache2-extramodules /usr/lib/apache2/extramodules
-	dosym /etc/apache2/conf /usr/lib/apache2/conf
-
-	cd ${S}
-	#Credits to advx.org people for these scripts. Heck, thanks for
-	#the nice layout and everything else ;-)
-	exeinto /usr/sbin
-	for i in apache2logserverstatus apache2splitlogfile
-	do
-		doexe ${FILESDIR}/2.0.49/$i
-	done
-	exeinto /usr/lib/ssl/apache2-mod_ssl
-	doexe ${FILESDIR}/2.0.49/gentestcrt.sh
-
-	#some more scripts
-	exeinto /usr/sbin
-	for i in split-logfile list_hooks.pl logresolve.pl log_server_status
-	do
-		doexe ${S}/support/$i
-	done
-	#the ssl version of apache bench
-	doexe support/.libs/ab-ssl
-
-	#move some mods to extramodules
-	dodir /usr/lib/apache2-extramodules
-	for i in mod_ssl.so mod_ldap.so mod_auth_ldap.so
-	do
-		[ -x ${D}/usr/lib/apache2/modules/$i ] && \
-		mv ${D}/usr/lib/apache2/modules/$i ${D}/usr/lib/apache2-extramodules
-	done
-
-	#modules.d config file snippets
-	insinto /etc/apache2/conf/modules.d
-	for i in 40_mod_ssl.conf 41_mod_ssl.default-vhost.conf 45_mod_dav.conf
-	do
-		doins ${FILESDIR}/2.0.49/$i
-	done
-	use !mips && use ldap && doins ${FILESDIR}/2.0.49/46_mod_ldap.conf
-
-	#drop in a convenient link to the manual
-	if use doc; then
-		MANUAL_VERSION="2.0.50"
-		insinto /etc/apache2/conf/modules.d
-		doins ${FILESDIR}/00_apache_manual.conf
-		dosym /usr/share/doc/${PF}/manual ${DATADIR}/htdocs/manual
-		sed -i -e "s:2.0.49:${MANUAL_VERSION}:" ${D}/etc/apache2/conf/modules.d/00_apache_manual.conf
-		else
-		rm -rf ${D}/usr/share/doc/${PF}/manual
-	fi
-
-	#SLOT=2!!!
-	cd ${D}
-	mv -v usr/sbin/apachectl usr/sbin/apache2ctl
-	mv -v usr/sbin/htdigest usr/sbin/htdigest2
-	mv -v usr/sbin/htpasswd usr/sbin/htpasswd2
-	mv -v usr/sbin/logresolve usr/sbin/logresolve2
-	mv -v usr/sbin/apxs usr/sbin/apxs2
-	mv -v usr/sbin/ab usr/sbin/ab2
-	mv -v usr/sbin/ab-ssl usr/sbin/ab2-ssl
-	mv -v usr/sbin/suexec usr/sbin/suexec2
-	mv -v usr/sbin/rotatelogs usr/sbin/rotatelogs2
-	mv -v usr/sbin/dbmmanage usr/sbin/dbmmanage2
-	mv -v usr/sbin/checkgid usr/sbin/checkgid2
-	mv -v usr/sbin/split-logfile usr/sbin/split-logfile2
-	mv -v usr/sbin/list_hooks.pl usr/sbin/list_hooks2.pl
-	mv -v usr/sbin/logresolve.pl usr/sbin/logresolve2.pl
-
-	# do the man pages
-	mv -v usr/share/man/man1/htdigest.1 usr/share/man/man1/htdigest2.1
-	mv -v usr/share/man/man1/htpasswd.1 usr/share/man/man1/htpasswd2.1
-	mv -v usr/share/man/man1/dbmmanage.1 usr/share/man/man1/dbmmanage2.1
-	mv -v usr/share/man/man8/ab.8 usr/share/man/man8/ab2.8
-	mv -v usr/share/man/man8/apxs.8 usr/share/man/man8/apxs2.8
-	mv -v usr/share/man/man8/apachectl.8 usr/share/man/man8/apache2ctl.8
-	mv -v usr/share/man/man8/httpd.8 usr/share/man/man8/apache2.8
-	mv -v usr/share/man/man8/logresolve.8 usr/share/man/man8/logresolve2.8
-	mv -v usr/share/man/man8/rotatelogs.8 usr/share/man/man8/rotatelogs2.8
-	mv -v usr/share/man/man8/suexec.8 usr/share/man/man8/suexec2.8
-
-	#tidy up
-	mv ${D}/usr/sbin/envvars* ${D}/usr/lib/apache2/build
-	dodoc ${D}/etc/apache2/conf/*-std.conf
-	rm -f ${D}/etc/apache2/conf/*.conf
-	rm -rf ${D}/var/run ${D}/var/log
-
-	#config files
-	insinto /etc/conf.d; newins ${FILESDIR}/2.0.49/apache2.confd apache2
-	exeinto /etc/init.d; newexe ${FILESDIR}/2.0.49/apache2.initd apache2
-	insinto /etc/apache2; doins ${FILESDIR}/2.0.49/apache2-builtin-mods
-	insinto /etc/apache2/conf
-	doins ${WORKDIR}/commonapache2.conf
-	doins ${WORKDIR}/apache2.conf
-	insinto /etc/apache2/conf/vhosts
-	doins ${WORKDIR}/virtual-homepages.conf
-	doins ${WORKDIR}/dynamic-vhosts.conf
-	doins ${WORKDIR}/vhosts.conf
-
-	# Added by Jason Wever <weeve@gentoo.org>
-	# A little sedfu to fix bug #7172 for sparc64s
-	if [ ${ARCH} = "sparc" ]
-	then
-		sed -i -e '13a\AcceptMutex fcntl' \
-			${D}/etc/apache2/conf/apache2.conf
-	fi
-
-	# /var/log is removed above - re-create it (fixes bug #76044)
-	# /etc/apache2/conf/ssl and /var/cache/apache2 are also needed in
-	# pkg_postinst if (the latter only if USE=ssl)
-	dodir /var/log/apache2 /var/cache/apache2
-	use ssl && dodir /etc/apache2/conf/ssl
-}
-
-parse_modules_config() {
-	set_filter_flags
-
-	local filename=$1
-	local name=""
-	local dso=""
-	local disable=""
-	[ -f ${filename} ] || return 1
-	for i in `cat $filename | sed "s/^#.*//"` ; do
-		if [ $i == "-" ] ; then
-			disable="true"
-		elif [ -z "$name" ] && [ ! -z "`echo $i | grep "mod_"`" ] ; then
-			name=`echo $i | sed "s/mod_//"`
-		elif [ "$disable" ] && ( [ $i == "static" ] || [ $i == "shared" ] ) ; then
-			MY_BUILTINS="${MY_BUILTINS} --disable-$name"
-			name="" ; disable=""
-		elif [ $i == "static" ] ; then
-			MY_BUILTINS="${MY_BUILTINS} --enable-$name=yes"
-			name="" ; disable=""
-		elif [ $i == "shared" ] ; then
-			MY_BUILTINS="${MY_BUILTINS} --enable-$name=shared"
-			name="" ; disable=""
-		fi
-	done
-	einfo "${filename} options:\n${MY_BUILTINS}"
-}
-
-select_modules_config() {
-	parse_modules_config /etc/apache2/apache2-builtin-mods || \
-	parse_modules_config ${FILESDIR}/2.0.49/apache2-builtin-mods || \
-	return 1
-}
-
-pkg_postinst() {
-	set_filter_flags
-
-	# Fix for bug #65006 (urilith@gentoo.org)
-	#empty dirs...
-	keepdir /var/lib/dav
-	fowners apache:apache /var/lib/dav
-	fperms 755 /var/lib/dav
-
-	keepdir /var/log/apache2
-	fowners apache:apache /var/log/apache2
-	fperms 755 /var/log/apache2
-
-	keepdir /var/cache/apache2
-	fowners apache:apache /var/cache/apache2
-	fperms 755 /var/cache/apache2
-
-	if use ssl; then
-		keepdir /etc/apache2/conf/ssl
-	fi
-
-	if use ssl; then
-		cd ${ROOT}/etc/apache2/conf/ssl
-		einfo
-		einfo "Generating self-signed test certificate in /etc/apache2/conf/ssl..."
-		yes "" 2>/dev/null | ${ROOT}/usr/lib/ssl/apache2-mod_ssl/gentestcrt.sh >/dev/null 2>&1
-		einfo
-	fi
-
-	if has_version '=net-www/apache-1*' ; then
-	ewarn
-	ewarn "Please add the 'apache2' flag to your USE variable and (re)install"
-	ewarn "any additional DSO modules you may wish to use with Apache-2.x."
-	ewarn "Addon modules are configured in /etc/apache2/conf/modules.d/"
-	ewarn
-	fi
-
-	# Check to see if this is an upgrade
-	if [ -d /home/httpd ];
-	then
-	einfo
-	einfo "Please remember to update your config files in /etc/apache2"
-	einfo "as --datadir has been changed to ${DATADIR}, and ServerRoot"
-	einfo "has changed to /usr/lib/apache2!"
-	einfo
-	fi
-
-	local list=""
-	for i in lib logs modules extramodules; do
-		local d="/etc/apache2/${i}"
-		[ -s "${d}" ] && list="${list} ${d}"
-	done
-	if [ -n "${list}" ]; then
-		einfo "You should delete these old symlinks: ${list}"
-	fi
-}
diff --git a/net-www/apache/apache-2.0.52-r2.ebuild b/net-www/apache/apache-2.0.52-r2.ebuild
deleted file mode 100644
index 8af3ba1bf282..000000000000
--- a/net-www/apache/apache-2.0.52-r2.ebuild
+++ /dev/null
@@ -1,400 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.52-r2.ebuild,v 1.8 2005/07/05 22:59:08 swegener Exp $
-
-inherit flag-o-matic eutils fixheadtails gnuconfig
-
-PATCH_LEVEL="${PV}"
-S="${WORKDIR}/httpd-${PV}"
-DESCRIPTION="Apache Web Server, Version 2.0.x"
-HOMEPAGE="http://www.apache.org/"
-SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.gz
-	http://dev.gentoo.org/~stuart/apache/apache-patches-${PVR}.tar.bz2
-	http://dev.gentoo.org/~stuart/apache/apache-conf-${PVR}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 arm hppa ia64 ~mips ~ppc ~ppc64 s390 ~sparc ~x86"
-IUSE="berkdb gdbm ldap threads ipv6 doc static ssl php selinux"
-
-#Standard location for Gentoo Linux
-DATADIR="/var/www/localhost"
-
-# Location for the two additional tarballs
-APACHE_PATCHDIR=${WORKDIR}/apache-patches-${PVR}
-APACHE_CONFDIR=${WORKDIR}/apache-conf-${PVR}
-
-DEPEND="dev-util/yacc
-	dev-lang/perl
-	sys-libs/zlib
-	dev-libs/expat
-	dev-libs/openssl
-	>=sys-devel/autoconf-2.59-r4
-	berkdb? ( sys-libs/db )
-	gdbm? ( sys-libs/gdbm )
-	!mips? ( ldap? ( =net-nds/openldap-2* ) )
-	selinux? ( sec-policy/selinux-apache )
-	!dev-libs/apr
-	!dev-libs/apr-util"
-
-PDEPEND="$DEPEND
-	php? ( dev-php/mod_php )"
-
-apache_setup_vars() {
-	# Sets the USERDIR to default.
-	USERDIR="public_html"
-	einfo "DATADIR is set to: ${DATADIR}"
-	einfo "USERDIR is set to: $USERDIR"
-}
-
-set_filter_flags() {
-	CFLAGS="${CFLAGS/  / }"
-	has_version =sys-libs/glibc-2.2* && filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-}
-
-src_unpack() {
-	set_filter_flags
-
-	unpack ${A} || die
-	cd ${S} || die
-
-	# apply the patches from the patch tarball
-	EPATCH_SUFFIX="patch"
-	epatch ${APACHE_PATCHDIR} || die
-
-	if use berkdb; then
-		einfo "Enabling berkdb."
-		if has_version '=sys-libs/db-4*'; then
-			einfo "Enabling db4"
-			myconf="${myconf} --with-dbm=db4 --with-berkely-db=/usr"
-		elif has_version '=sys-libs/db-3*'; then
-			einfo "Enabling db3"
-			myconf="${myconf} --with-dbm=db3 --with-berkely-db=/usr"
-		elif has_version '=sys-libs/db-2'; then
-			einfo "Enabling db2"
-			myconf="${myconf} --with-dbm=db2 --with-berkely-db=/usr"
-		fi
-	else
-		echo "Disabling berkdb"
-	fi
-
-	#avoid utf-8 charset problems
-	export LC_CTYPE=C
-
-	ht_fix_file srclib/apr/build/buildcheck.sh
-
-	#give it the stamp
-	sed -i -e 's:(" PLATFORM "):(Gentoo/Linux):g' server/core.c
-
-	#fix perl with perl!
-	find . -type f | xargs perl -pi -e \
-		"s|/usr/local/bin/perl|/usr/bin/perl|g; \
-		s|/usr/local/bin/perl5|/usr/bin/perl|g; \
-		s|/path/to/bin/perl|/usr/bin/perl|g;"
-	#dont want this cruft in /usr/bin
-	sed -i -e 's:@exp_bindir@:@exp_installbuilddir:g' support/apachectl.in
-
-	#setup the filesystem layout config
-	cat ${FILESDIR}/common/config.layout >> config.layout
-	sed -i -e 's:version:${PF}:g' config.layout
-
-	cat ${FILESDIR}/common/apr-config.layout >> srclib/apr/config.layout
-	cat ${FILESDIR}/common/apr-util-config.layout >> srclib/apr-util/config.layout
-
-	sed -i -e "s:/var/www/localhost:${DATADIR}:g" srclib/apr/config.layout
-	sed -i -e "s:/var/www/localhost:${DATADIR}:g" srclib/apr-util/config.layout
-
-	WANT_AUTOCONF=2.5 ./buildconf || die "buildconf failed"
-}
-
-src_compile() {
-	set_filter_flags
-	apache_setup_vars
-
-	# Detect mips and uclibc systems properly
-	gnuconfig_update
-
-	local myconf
-	if use ldap; then
-		if use mips; then
-			eerror "Sorry, LDAP support isn't available yet for MIPS"
-			eerror "Test out OpenLDAP and report it via BugZilla!"
-			eerror "Continuing in 5 seconds"
-			sleep 5s
-		else
-			einfo "Enabling LDAP"
-			if use static; then
-			  myconf="--with-ldap --enable-auth-ldap=static --enable-ldap=static"
-			else
-			  myconf="--with-ldap --enable-auth-ldap=shared --enable-ldap=shared"
-			fi
-		fi
-	fi
-
-	if use ipv6; then
-		einfo "Enabling ipv6"
-		myconf="${myconf} --enable-vp4"
-	else
-		myconf="${myconf} --disable-ipv6"
-	fi
-
-	if use threads; then
-		einfo "Enabling threads support"
-		myconf="${myconf} --with-mpm=worker"
-	else
-		myconf="${myconf} --with-mpm=${MPM:=prefork}"
-	fi
-
-	select_modules_config || die "determining modules"
-
-	# Fix for bug #24215 - robbat2@gentoo.org, 30 Oct 2003
-	# We pre-load the cache with the correct answer!  This avoids
-	# it violating the sandbox.  This may have to be changed for
-	# non-Linux systems or if sem_open changes on Linux.  This
-	# hack is built around documentation in /usr/include/semaphore.h
-	# and the glibc (pthread) source
-	echo 'ac_cv_func_sem_open=${ac_cv_func_sem_open=no}' >> ${S}/config.cache
-
-	# Workaround for bug #32444 - robbat2@gentoo.org, 28 Nov 2003
-	# Apache2 tries to build SCTP support even when all the parts of it aren't there
-	# So for the moment we tell it to ignore SCTP support
-	echo 'ac_cv_sctp=${ac_cv_sctp=no}' >> ${S}/config.cache
-	echo 'ac_cv_header_netinet_sctp_h=${ac_cv_header_netinet_sctp_h=no}' >> ${S}/config.cache
-	echo 'ac_cv_header_netinet_sctp_uio_h=${ac_cv_header_netinet_sctp_uio_h=no}' >> ${S}/config.cache
-
-	SSL_BASE="SYSTEM" \
-	WANT_AUTOCONF_2_5=1 WANT_AUTOCONF=2.5
-	./configure \
-		--with-suexec-safepath="/usr/local/bin:/usr/bin:/bin" \
-		--with-suexec-logfile=/var/log/apache2/suexec_log \
-		--with-suexec-bin=/usr/sbin/suexec2 \
-		--with-suexec-userdir=${USERDIR} \
-		--with-suexec-caller=apache \
-		--with-suexec-docroot=/var/www \
-		--with-suexec-uidmin=1000 \
-		--with-suexec-gidmin=100 \
-		--with-suexec-umask=077 \
-		--enable-suexec=shared \
-		\
-		${MY_BUILTINS} \
-		\
-		--cache-file=${S}/config.cache \
-		--with-perl=/usr/bin/perl \
-		--with-expat=/usr \
-		--with-ssl=/usr \
-		--with-z=/usr \
-		--with-port=80 \
-		--enable-layout=Gentoo \
-		--with-program-name=apache2 \
-		--with-devrandom=/dev/urandom \
-		--host=${CHOST} ${myconf} || die "bad ./configure please submit bug report to bugs.gentoo.org. Include your config.layout."
-		#--with-mpm={worker|prefork|perchild|leader|threadpool}
-
-	# we don't want to try and recompile the ssl_expr_parse.c file, because
-	# the lex source is broken
-	touch modules/ssl/ssl_expr_scan.c
-
-	emake || die "problem compiling Apache2 :("
-
-	#build ssl version of apache bench (ab-ssl)
-	cd support; rm -f ab .libs/ab ab.lo ab.o
-	make ab CFLAGS="${CFLAGS} -DUSE_SSL -lcrypto -lssl \
-		-I/usr/include/openssl -L/usr/lib" || die
-	mv ab ab-ssl; mv .libs/ab .libs/ab-ssl; rm -f ab.lo ab.o
-	make ab || die
-}
-
-src_install () {
-	set_filter_flags
-
-	local i
-	make DESTDIR=${D} install || die
-	dodoc ABOUT_APACHE CHANGES INSTALL LAYOUT \
-		LICENSE README* ${FILESDIR}/robots.txt
-
-	#bogus values pointing at /var/tmp/portage
-	sed -i -e 's:APR_SOURCE_DIR=.*:APR_SOURCE_DIR=:g' ${D}/usr/bin/apr-config
-	sed -i -e 's:APU_SOURCE_DIR=.*:APU_SOURCE_DIR=:g' ${D}/usr/bin/apu-config
-	sed -i -e 's:APU_BUILD_DIR=.*:APU_BUILD_DIR=:g' ${D}/usr/bin/apu-config
-
-	#protect the suexec binary
-	local gid=`id -g apache`
-	[ -z "${gid}" ] && gid=81
-	fowners root:${gid} /usr/sbin/suexec
-	fperms 4710 /usr/sbin/suexec
-
-	#apxs needs this to pickup the right lib for install
-	dosym /usr/lib /usr/lib/apache2/lib
-	dosym /var/log/apache2 /usr/lib/apache2/logs
-	dosym /usr/lib/apache2-extramodules /usr/lib/apache2/extramodules
-	dosym /etc/apache2/conf /usr/lib/apache2/conf
-
-	cd ${S}
-	#Credits to advx.org people for these scripts. Heck, thanks for
-	#the nice layout and everything else ;-)
-	for i in apache2logserverstatus apache2splitlogfile
-	do
-		dosbin ${APACHE_CONFDIR}/usr/sbin/$i
-	done
-	exeinto /usr/lib/ssl/apache2-mod_ssl
-	doexe ${APACHE_CONFDIR}/usr/lib/ssl/apache2-mod_ssl/gentestcrt.sh
-
-	#some more scripts
-	for i in split-logfile list_hooks.pl logresolve.pl log_server_status
-	do
-		dosbin ${S}/support/$i
-	done
-	#the ssl version of apache bench
-	dosbin support/.libs/ab-ssl
-
-	#move some mods to extramodules
-	dodir /usr/lib/apache2-extramodules
-	for i in mod_ssl.so mod_ldap.so mod_auth_ldap.so
-	do
-		[ -x ${D}/usr/lib/apache2/modules/$i ] && \
-		mv ${D}/usr/lib/apache2/modules/$i ${D}/usr/lib/apache2-extramodules
-	done
-
-	#tidy up
-	mv ${D}/usr/sbin/envvars* ${D}/usr/lib/apache2/build
-	dodoc ${D}/etc/apache2/conf/*-std.conf
-	rm -f ${D}/etc/apache2/conf/*.conf
-	rm -rf ${D}/var/log ${D}/var/run
-
-	# install our default config files
-	cd ${D}
-	( cd ${APACHE_CONFDIR} && tar -cpvf - * ) | tar -xpvf -
-	find etc/apache2 -type f -exec chmod 644 {} \;
-	find etc/apache2 -type f -exec chown apache:apache {} \;
-
-	#drop in a convenient link to the manual
-	if use doc; then
-		dosym /usr/share/doc/${PF}/manual ${DATADIR}/htdocs/manual
-	else
-		rm -rf ${D}/usr/share/doc/${PF}/manual
-	fi
-
-	#SLOT=2!!!
-	cd ${D}
-	mv -v usr/sbin/apachectl usr/sbin/apache2ctl
-	mv -v usr/sbin/htdigest usr/sbin/htdigest2
-	mv -v usr/sbin/htpasswd usr/sbin/htpasswd2
-	mv -v usr/sbin/logresolve usr/sbin/logresolve2
-	mv -v usr/sbin/apxs usr/sbin/apxs2
-	mv -v usr/sbin/ab usr/sbin/ab2
-	mv -v usr/sbin/ab-ssl usr/sbin/ab2-ssl
-	mv -v usr/sbin/suexec usr/sbin/suexec2
-	mv -v usr/sbin/rotatelogs usr/sbin/rotatelogs2
-	mv -v usr/sbin/dbmmanage usr/sbin/dbmmanage2
-	mv -v usr/sbin/checkgid usr/sbin/checkgid2
-	mv -v usr/sbin/split-logfile usr/sbin/split-logfile2
-	mv -v usr/sbin/list_hooks.pl usr/sbin/list_hooks2.pl
-	mv -v usr/sbin/logresolve.pl usr/sbin/logresolve2.pl
-
-	# do the man pages
-	mv -v usr/share/man/man1/htdigest.1 usr/share/man/man1/htdigest2.1
-	mv -v usr/share/man/man1/htpasswd.1 usr/share/man/man1/htpasswd2.1
-	mv -v usr/share/man/man1/dbmmanage.1 usr/share/man/man1/dbmmanage2.1
-	mv -v usr/share/man/man8/ab.8 usr/share/man/man8/ab2.8
-	mv -v usr/share/man/man8/apxs.8 usr/share/man/man8/apxs2.8
-	mv -v usr/share/man/man8/apachectl.8 usr/share/man/man8/apache2ctl.8
-	mv -v usr/share/man/man8/httpd.8 usr/share/man/man8/apache2.8
-	mv -v usr/share/man/man8/logresolve.8 usr/share/man/man8/logresolve2.8
-	mv -v usr/share/man/man8/rotatelogs.8 usr/share/man/man8/rotatelogs2.8
-	mv -v usr/share/man/man8/suexec.8 usr/share/man/man8/suexec2.8
-
-	# Fix for dav and SSL dirs
-	keepdir /var/lib/dav
-	fowners apache:apache /var/lib/dav
-	fperms 755 /var/lib/dav
-
-	keepdir /var/log/apache2
-	fowners apache:apache /var/log/apache2
-	fperms 755 /var/log/apache2
-
-	keepdir /var/cache/apache2
-	fowners apache:apache /var/cache/apache2
-	fperms 755 /var/cache/apache2
-
-	keepdir /etc/apache2/conf/ssl
-
-	# Added by Jason Wever <weeve@gentoo.org>
-	# A little sedfu to fix bug #7172 for sparc64s
-	if [ ${ARCH} = "sparc" ]
-	then
-		sed -i -e '13a\AcceptMutex fcntl' \
-			${D}/etc/apache2/conf/apache2.conf
-	fi
-}
-
-parse_modules_config() {
-	set_filter_flags
-
-	local filename=$1
-	local name=""
-	local dso=""
-	local disable=""
-	[ -f ${filename} ] || return 1
-	for i in `cat $filename | sed "s/^#.*//"` ; do
-		if [ $i == "-" ] ; then
-			disable="true"
-		elif [ -z "$name" ] && [ ! -z "`echo $i | grep "mod_"`" ] ; then
-			name=`echo $i | sed "s/mod_//"`
-		elif [ "$disable" ] && ( [ $i == "static" ] || [ $i == "shared" ] ) ; then
-			MY_BUILTINS="${MY_BUILTINS} --disable-$name"
-			name="" ; disable=""
-		elif [ $i == "static" ] ; then
-			MY_BUILTINS="${MY_BUILTINS} --enable-$name=yes"
-			name="" ; disable=""
-		elif [ $i == "shared" ] ; then
-			MY_BUILTINS="${MY_BUILTINS} --enable-$name=shared"
-			name="" ; disable=""
-		fi
-	done
-	einfo "${filename} options:\n${MY_BUILTINS}"
-}
-
-select_modules_config() {
-	parse_modules_config /etc/apache2/apache2-builtin-mods || \
-	parse_modules_config ${FILESDIR}/2.0.49/apache2-builtin-mods || \
-	return 1
-}
-
-pkg_postinst() {
-	set_filter_flags
-
-	if use ssl; then
-		cd ${ROOT}/etc/apache2/conf/ssl
-		einfo
-		einfo "Generating self-signed test certificate in /etc/apache2/conf/ssl..."
-		yes "" 2>/dev/null | ${ROOT}/usr/lib/ssl/apache2-mod_ssl/gentestcrt.sh >/dev/null 2>&1
-		einfo
-	fi
-
-	if has_version '=net-www/apache-1*' ; then
-	ewarn
-	ewarn "Please add the 'apache2' flag to your USE variable and (re)install"
-	ewarn "any additional DSO modules you may wish to use with Apache-2.x."
-	ewarn "Addon modules are configured in /etc/apache2/conf/modules.d/"
-	ewarn
-	fi
-
-	# Check to see if this is an upgrade
-	if [ -d /home/httpd ];
-	then
-	einfo
-	einfo "Please remember to update your config files in /etc/apache2"
-	einfo "as --datadir has been changed to ${DATADIR}, and ServerRoot"
-	einfo "has changed to /usr/lib/apache2!"
-	einfo
-	fi
-
-	local list=""
-	for i in lib logs modules extramodules; do
-		local d="/etc/apache2/${i}"
-		[ -s "${d}" ] && list="${list} ${d}"
-	done
-	if [ -n "${list}" ]; then
-		einfo "You should delete these old symlinks: ${list}"
-	fi
-}
diff --git a/net-www/apache/apache-2.0.52.ebuild b/net-www/apache/apache-2.0.52.ebuild
deleted file mode 100644
index 8a5497e5b1e9..000000000000
--- a/net-www/apache/apache-2.0.52.ebuild
+++ /dev/null
@@ -1,407 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.52.ebuild,v 1.18 2005/07/05 22:59:08 swegener Exp $
-
-inherit flag-o-matic eutils fixheadtails gnuconfig
-
-PATCH_LEVEL="${PV}"
-S="${WORKDIR}/httpd-${PV}"
-DESCRIPTION="Apache Web Server, Version 2.0.x"
-HOMEPAGE="http://www.apache.org/"
-SRC_URI="http://www.apache.org/dist/httpd/httpd-${PV}.tar.gz
-	http://dev.gentoo.org/~stuart/apache/apache-patches-${PVR}.tar.bz2
-	http://dev.gentoo.org/~kloeri/apache_patches/apache2-conf.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
-IUSE="berkdb gdbm ldap threads ipv6 doc static ssl selinux"
-
-#Standard location for Gentoo Linux
-DATADIR="/var/www/localhost"
-
-DEPEND="dev-util/yacc
-	dev-lang/perl
-	sys-libs/zlib
-	dev-libs/expat
-	dev-libs/openssl
-	>=sys-devel/autoconf-2.59-r4
-	berkdb? ( sys-libs/db )
-	gdbm? ( sys-libs/gdbm )
-	!mips? ( ldap? ( =net-nds/openldap-2* ) )
-	selinux? ( sec-policy/selinux-apache )
-	!dev-libs/apr
-	!dev-libs/apr-util"
-
-apache_setup_vars() {
-	# Sets the USERDIR to default.
-	USERDIR="public_html"
-	einfo "DATADIR is set to: ${DATADIR}"
-	einfo "USERDIR is set to: $USERDIR"
-}
-
-set_filter_flags() {
-	CFLAGS="${CFLAGS/  / }"
-	has_version =sys-libs/glibc-2.2* && filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-}
-
-src_unpack() {
-	set_filter_flags
-
-	unpack ${A} || die
-	cd ${S} || die
-
-	# which muppet decided that epatch would default to applying compressed
-	# patches?
-
-	EPATCH_SUFFIX="patch"
-	epatch ${WORKDIR}/apache-patches-${PVR} || die
-
-	if use berkdb; then
-		einfo "Enabling berkdb."
-		if has_version '=sys-libs/db-4*'; then
-			einfo "Enabling db4"
-			myconf="${myconf} --with-dbm=db4 --with-berkely-db=/usr"
-		elif has_version '=sys-libs/db-3*'; then
-			einfo "Enabling db3"
-			myconf="${myconf} --with-dbm=db3 --with-berkely-db=/usr"
-		elif has_version '=sys-libs/db-2'; then
-			einfo "Enabling db2"
-			myconf="${myconf} --with-dbm=db2 --with-berkely-db=/usr"
-		fi
-	else
-		echo "Disabling berkdb"
-	fi
-
-	#avoid utf-8 charset problems
-	export LC_CTYPE=C
-
-	ht_fix_file srclib/apr/build/buildcheck.sh
-
-	#give it the stamp
-	sed -i -e 's:(" PLATFORM "):(Gentoo/Linux):g' server/core.c
-
-	#fix perl with perl!
-	find . -type f | xargs perl -pi -e \
-		"s|/usr/local/bin/perl|/usr/bin/perl|g; \
-		s|/usr/local/bin/perl5|/usr/bin/perl|g; \
-		s|/path/to/bin/perl|/usr/bin/perl|g;"
-	#dont want this cruft in /usr/bin
-	sed -i -e 's:@exp_bindir@:@exp_installbuilddir:g' support/apachectl.in
-
-	#setup the filesystem layout config
-	cat ${FILESDIR}/common/config.layout >> config.layout
-	sed -i -e 's:version:${PF}:g' config.layout
-
-	cat ${FILESDIR}/common/apr-config.layout >> srclib/apr/config.layout
-	cat ${FILESDIR}/common/apr-util-config.layout >> srclib/apr-util/config.layout
-
-	sed -i -e "s:/var/www/localhost:${DATADIR}:g" srclib/apr/config.layout
-	sed -i -e "s:/var/www/localhost:${DATADIR}:g" srclib/apr-util/config.layout
-
-	WANT_AUTOCONF=2.5 ./buildconf || die "buildconf failed"
-}
-
-src_compile() {
-	set_filter_flags
-	apache_setup_vars
-
-	# Detect mips and uclibc systems properly
-	gnuconfig_update
-
-	local myconf
-	if use ldap; then
-		if use mips; then
-			eerror "Sorry, LDAP support isn't available yet for MIPS"
-			eerror "Test out OpenLDAP and report it via BugZilla!"
-			eerror "Continuing in 5 seconds"
-			sleep 5s
-		else
-			einfo "Enabling LDAP"
-			if use static; then
-			  myconf="--with-ldap --enable-auth-ldap=static --enable-ldap=static"
-			else
-			  myconf="--with-ldap --enable-auth-ldap=shared --enable-ldap=shared"
-			fi
-		fi
-	fi
-
-	if use ipv6; then
-		einfo "Enabling ipv6"
-		myconf="${myconf} --enable-vp4"
-	else
-		myconf="${myconf} --disable-ipv6"
-	fi
-
-	if use threads; then
-		einfo "Enabling threads support"
-		myconf="${myconf} --with-mpm=worker"
-	else
-		myconf="${myconf} --with-mpm=${MPM:=prefork}"
-	fi
-
-	select_modules_config || die "determining modules"
-
-	# Fix for bug #24215 - robbat2@gentoo.org, 30 Oct 2003
-	# We pre-load the cache with the correct answer!  This avoids
-	# it violating the sandbox.  This may have to be changed for
-	# non-Linux systems or if sem_open changes on Linux.  This
-	# hack is built around documentation in /usr/include/semaphore.h
-	# and the glibc (pthread) source
-	echo 'ac_cv_func_sem_open=${ac_cv_func_sem_open=no}' >> ${S}/config.cache
-
-	# Workaround for bug #32444 - robbat2@gentoo.org, 28 Nov 2003
-	# Apache2 tries to build SCTP support even when all the parts of it aren't there
-	# So for the moment we tell it to ignore SCTP support
-	echo 'ac_cv_sctp=${ac_cv_sctp=no}' >> ${S}/config.cache
-	echo 'ac_cv_header_netinet_sctp_h=${ac_cv_header_netinet_sctp_h=no}' >> ${S}/config.cache
-	echo 'ac_cv_header_netinet_sctp_uio_h=${ac_cv_header_netinet_sctp_uio_h=no}' >> ${S}/config.cache
-
-	SSL_BASE="SYSTEM" \
-	WANT_AUTOCONF_2_5=1 WANT_AUTOCONF=2.5
-	./configure \
-		--with-suexec-safepath="/usr/local/bin:/usr/bin:/bin" \
-		--with-suexec-logfile=/var/log/apache2/suexec_log \
-		--with-suexec-bin=/usr/sbin/suexec2 \
-		--with-suexec-userdir=${USERDIR} \
-		--with-suexec-caller=apache \
-		--with-suexec-docroot=/var/www \
-		--with-suexec-uidmin=1000 \
-		--with-suexec-gidmin=100 \
-		--with-suexec-umask=077 \
-		--enable-suexec=shared \
-		\
-		${MY_BUILTINS} \
-		\
-		--cache-file=${S}/config.cache \
-		--with-perl=/usr/bin/perl \
-		--with-expat=/usr \
-		--with-ssl=/usr \
-		--with-z=/usr \
-		--with-port=80 \
-		--enable-layout=Gentoo \
-		--with-program-name=apache2 \
-		--with-devrandom=/dev/urandom \
-		--host=${CHOST} ${myconf} || die "bad ./configure please submit bug report to bugs.gentoo.org. Include your config.layout."
-		#--with-mpm={worker|prefork|perchild|leader|threadpool}
-
-	# we don't want to try and recompile the ssl_expr_parse.c file, because
-	# the lex source is broken
-	touch modules/ssl/ssl_expr_scan.c
-
-	emake || die "problem compiling Apache2 :("
-
-	#build ssl version of apache bench (ab-ssl)
-	cd support; rm -f ab .libs/ab ab.lo ab.o
-	make ab CFLAGS="${CFLAGS} -DUSE_SSL -lcrypto -lssl \
-		-I/usr/include/openssl -L/usr/lib" || die
-	mv ab ab-ssl; mv .libs/ab .libs/ab-ssl; rm -f ab.lo ab.o
-	make ab || die
-}
-
-src_install () {
-	set_filter_flags
-
-	local i
-	make DESTDIR=${D} install || die
-	dodoc ABOUT_APACHE CHANGES INSTALL LAYOUT \
-		LICENSE README* ${FILESDIR}/robots.txt
-
-	#bogus values pointing at /var/tmp/portage
-	sed -i -e 's:APR_SOURCE_DIR=.*:APR_SOURCE_DIR=:g' ${D}/usr/bin/apr-config
-	sed -i -e 's:APU_SOURCE_DIR=.*:APU_SOURCE_DIR=:g' ${D}/usr/bin/apu-config
-	sed -i -e 's:APU_BUILD_DIR=.*:APU_BUILD_DIR=:g' ${D}/usr/bin/apu-config
-
-	#protect the suexec binary
-	local gid=`id -g apache`
-	[ -z "${gid}" ] && gid=81
-	fowners root:${gid} /usr/sbin/suexec
-	fperms 4710 /usr/sbin/suexec
-
-	#apxs needs this to pickup the right lib for install
-	dosym /usr/lib /usr/lib/apache2/lib
-	dosym /var/log/apache2 /usr/lib/apache2/logs
-	dosym /usr/lib/apache2-extramodules /usr/lib/apache2/extramodules
-	dosym /etc/apache2/conf /usr/lib/apache2/conf
-
-	cd ${S}
-	#Credits to advx.org people for these scripts. Heck, thanks for
-	#the nice layout and everything else ;-)
-	exeinto /usr/sbin
-	for i in apache2logserverstatus apache2splitlogfile
-	do
-		doexe ${FILESDIR}/2.0.49/$i
-	done
-	exeinto /usr/lib/ssl/apache2-mod_ssl
-	doexe ${FILESDIR}/2.0.49/gentestcrt.sh
-
-	#some more scripts
-	exeinto /usr/sbin
-	for i in split-logfile list_hooks.pl logresolve.pl log_server_status
-	do
-		doexe ${S}/support/$i
-	done
-	#the ssl version of apache bench
-	doexe support/.libs/ab-ssl
-
-	#move some mods to extramodules
-	dodir /usr/lib/apache2-extramodules
-	for i in mod_ssl.so mod_ldap.so mod_auth_ldap.so
-	do
-		[ -x ${D}/usr/lib/apache2/modules/$i ] && \
-		mv ${D}/usr/lib/apache2/modules/$i ${D}/usr/lib/apache2-extramodules
-	done
-
-	#modules.d config file snippets
-	insinto /etc/apache2/conf/modules.d
-	for i in 40_mod_ssl.conf 41_mod_ssl.default-vhost.conf 45_mod_dav.conf
-	do
-		doins ${FILESDIR}/2.0.49/$i
-	done
-	use !mips && use ldap && doins ${FILESDIR}/2.0.49/46_mod_ldap.conf
-
-	#drop in a convenient link to the manual
-	if use doc; then
-		MANUAL_VERSION="2.0.50"
-		insinto /etc/apache2/conf/modules.d
-		doins ${FILESDIR}/00_apache_manual.conf
-		dosym /usr/share/doc/${PF}/manual ${DATADIR}/htdocs/manual
-		sed -i -e "s:2.0.49:${MANUAL_VERSION}:" ${D}/etc/apache2/conf/modules.d/00_apache_manual.conf
-		else
-		rm -rf ${D}/usr/share/doc/${PF}/manual
-	fi
-
-	#SLOT=2!!!
-	cd ${D}
-	mv -v usr/sbin/apachectl usr/sbin/apache2ctl
-	mv -v usr/sbin/htdigest usr/sbin/htdigest2
-	mv -v usr/sbin/htpasswd usr/sbin/htpasswd2
-	mv -v usr/sbin/logresolve usr/sbin/logresolve2
-	mv -v usr/sbin/apxs usr/sbin/apxs2
-	mv -v usr/sbin/ab usr/sbin/ab2
-	mv -v usr/sbin/ab-ssl usr/sbin/ab2-ssl
-	mv -v usr/sbin/suexec usr/sbin/suexec2
-	mv -v usr/sbin/rotatelogs usr/sbin/rotatelogs2
-	mv -v usr/sbin/dbmmanage usr/sbin/dbmmanage2
-	mv -v usr/sbin/checkgid usr/sbin/checkgid2
-	mv -v usr/sbin/split-logfile usr/sbin/split-logfile2
-	mv -v usr/sbin/list_hooks.pl usr/sbin/list_hooks2.pl
-	mv -v usr/sbin/logresolve.pl usr/sbin/logresolve2.pl
-
-	# do the man pages
-	mv -v usr/share/man/man1/htdigest.1 usr/share/man/man1/htdigest2.1
-	mv -v usr/share/man/man1/htpasswd.1 usr/share/man/man1/htpasswd2.1
-	mv -v usr/share/man/man1/dbmmanage.1 usr/share/man/man1/dbmmanage2.1
-	mv -v usr/share/man/man8/ab.8 usr/share/man/man8/ab2.8
-	mv -v usr/share/man/man8/apxs.8 usr/share/man/man8/apxs2.8
-	mv -v usr/share/man/man8/apachectl.8 usr/share/man/man8/apache2ctl.8
-	mv -v usr/share/man/man8/httpd.8 usr/share/man/man8/apache2.8
-	mv -v usr/share/man/man8/logresolve.8 usr/share/man/man8/logresolve2.8
-	mv -v usr/share/man/man8/rotatelogs.8 usr/share/man/man8/rotatelogs2.8
-	mv -v usr/share/man/man8/suexec.8 usr/share/man/man8/suexec2.8
-
-	#tidy up
-	mv ${D}/usr/sbin/envvars* ${D}/usr/lib/apache2/build
-	dodoc ${D}/etc/apache2/conf/*-std.conf
-	rm -f ${D}/etc/apache2/conf/*.conf
-	rm -rf ${D}/var/run ${D}/var/log
-
-	#config files
-	insinto /etc/conf.d; newins ${FILESDIR}/2.0.49/apache2.confd apache2
-	exeinto /etc/init.d; newexe ${FILESDIR}/2.0.49/apache2.initd apache2
-	insinto /etc/apache2; doins ${FILESDIR}/2.0.49/apache2-builtin-mods
-	insinto /etc/apache2/conf
-	doins ${WORKDIR}/commonapache2.conf
-	doins ${WORKDIR}/apache2.conf
-	insinto /etc/apache2/conf/vhosts
-	doins ${WORKDIR}/virtual-homepages.conf
-	doins ${WORKDIR}/dynamic-vhosts.conf
-	doins ${WORKDIR}/vhosts.conf
-
-	# Added by Jason Wever <weeve@gentoo.org>
-	# A little sedfu to fix bug #7172 for sparc64s
-	if [ ${ARCH} = "sparc" ]
-	then
-		sed -i -e '13a\AcceptMutex fcntl' \
-			${D}/etc/apache2/conf/apache2.conf
-	fi
-}
-
-parse_modules_config() {
-	set_filter_flags
-
-	local filename=$1
-	local name=""
-	local dso=""
-	local disable=""
-	[ -f ${filename} ] || return 1
-	for i in `cat $filename | sed "s/^#.*//"` ; do
-		if [ $i == "-" ] ; then
-			disable="true"
-		elif [ -z "$name" ] && [ ! -z "`echo $i | grep "mod_"`" ] ; then
-			name=`echo $i | sed "s/mod_//"`
-		elif [ "$disable" ] && ( [ $i == "static" ] || [ $i == "shared" ] ) ; then
-			MY_BUILTINS="${MY_BUILTINS} --disable-$name"
-			name="" ; disable=""
-		elif [ $i == "static" ] ; then
-			MY_BUILTINS="${MY_BUILTINS} --enable-$name=yes"
-			name="" ; disable=""
-		elif [ $i == "shared" ] ; then
-			MY_BUILTINS="${MY_BUILTINS} --enable-$name=shared"
-			name="" ; disable=""
-		fi
-	done
-	einfo "${filename} options:\n${MY_BUILTINS}"
-}
-
-select_modules_config() {
-	parse_modules_config /etc/apache2/apache2-builtin-mods || \
-	parse_modules_config ${FILESDIR}/2.0.49/apache2-builtin-mods || \
-	return 1
-}
-
-pkg_postinst() {
-	set_filter_flags
-
-	#empty dirs...
-	install -d -m0755 -o apache -g apache ${ROOT}/var/lib/dav
-	install -d -m0755 -o root -g root ${ROOT}/var/log/apache2
-	install -d -m0755 -o apache -g apache ${ROOT}/var/cache/apache2
-
-	if use ssl; then
-	#	install -d -m0755 -o root -g root ${ROOT}/etc/apache2/conf/ssl
-	install -d -m0755 -o root -g root ${ROOT}/etc/apache2/conf/ssl
-		cd ${ROOT}/etc/apache2/conf/ssl
-		einfo
-		einfo "Generating self-signed test certificate in /etc/apache2/conf/ssl..."
-		yes "" 2>/dev/null | ${ROOT}/usr/lib/ssl/apache2-mod_ssl/gentestcrt.sh >/dev/null 2>&1
-		einfo
-	fi
-
-	if has_version '=net-www/apache-1*' ; then
-	ewarn
-	ewarn "Please add the 'apache2' flag to your USE variable and (re)install"
-	ewarn "any additional DSO modules you may wish to use with Apache-2.x."
-	ewarn "Addon modules are configured in /etc/apache2/conf/modules.d/"
-	ewarn
-	fi
-
-	# Check to see if this is an upgrade
-	if [ -d /home/httpd ];
-	then
-	einfo
-	einfo "Please remember to update your config files in /etc/apache2"
-	einfo "as --datadir has been changed to ${DATADIR}, and ServerRoot"
-	einfo "has changed to /usr/lib/apache2!"
-	einfo
-	fi
-
-	local list=""
-	for i in lib logs modules extramodules; do
-		local d="/etc/apache2/${i}"
-		[ -s "${d}" ] && list="${list} ${d}"
-	done
-	if [ -n "${list}" ]; then
-		einfo "You should delete these old symlinks: ${list}"
-	fi
-}
diff --git a/net-www/apache/apache-2.0.54-r10.ebuild b/net-www/apache/apache-2.0.54-r10.ebuild
deleted file mode 100644
index 8b6bcdb8f2f9..000000000000
--- a/net-www/apache/apache-2.0.54-r10.ebuild
+++ /dev/null
@@ -1,432 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.54-r10.ebuild,v 1.4 2005/08/23 17:09:10 vericgar Exp $
-
-inherit eutils gnuconfig
-
-# latest gentoo apache files
-GENTOO_PATCHNAME="gentoo-apache-${PVR}"
-GENTOO_PATCHSTAMP="20050607"
-GENTOO_DEVSPACE="vericgar"
-GENTOO_PATCHDIR="${WORKDIR}/${GENTOO_PATCHNAME}"
-
-DESCRIPTION="The Apache Web Server, Version 2.0.x"
-HOMEPAGE="http://httpd.apache.org/"
-SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2
-	http://dev.gentoo.org/~${GENTOO_DEVSPACE}/dist/apache/${GENTOO_PATCHNAME}-${GENTOO_PATCHSTAMP}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="apache2 debug doc ldap mpm-leader mpm-peruser mpm-prefork mpm-threadpool mpm-worker no-suexec ssl static-modules threads selinux"
-
-RDEPEND="dev-lang/perl
-	~dev-libs/apr-0.9.6
-	~dev-libs/apr-util-0.9.6
-	dev-libs/expat
-	net-www/gentoo-webroot-default
-	app-misc/mime-types
-	sys-libs/zlib
-	ssl? ( dev-libs/openssl )
-	selinux? ( sec-policy/selinux-apache )
-	!mips? ( ldap? ( =net-nds/openldap-2* ) )"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.59-r4"
-
-S="${WORKDIR}/httpd-${PV}"
-
-big_fat_warnings() {
-	if use mpm-peruser; then
-		ewarn " -BIG- -FAT- -WARNING-"
-		ewarn ""
-		ewarn "The peruser (USE=mpm-peruser) MPM is considered highly experimental"
-		ewarn "and are not (yet) supported, nor are they recommended for production"
-		ewarn "use.  You have been warned!"
-		ewarn
-		ewarn "Continuing in 5 seconds.."
-		sleep 5
-	fi
-
-	ewarn ""
-	ewarn "LFS support has been removed due to incompatibilites with other packages."
-	ewarn "You _will_ have to re-emerge any Apache modules you have installed, or"
-	ewarn "they will likely misbehave/segfault."
-	ewarn ""
-	ewarn ""
-	ewarn "Multiple MPM support has been disabled due to problems with external"
-	ewarn "modules.  If you have relied on this functionality you will need"
-	ewarn "to find another solution.  The Gentoo Apache team apologizes for"
-	ewarn "any inconvienence this may cause you."
-	ewarn ""
-}
-
-pkg_setup() {
-	big_fat_warnings
-	select_mpms
-}
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S} || die
-
-	EPATCH_SUFFIX="patch"
-	epatch ${GENTOO_PATCHDIR}/patches/[0-2]* || die "internal ebuild error"
-
-	# avoid utf-8 charset problems
-	export LC_CTYPE=C
-
-	# setup the filesystem layout config
-	cat ${GENTOO_PATCHDIR}/patches/config.layout >> config.layout
-	sed -i -e 's:version:${PF}:g' config.layout
-
-	# peruser need to build conf
-	WANT_AUTOCONF=2.5 ./buildconf || die "buildconf failed"
-}
-
-src_compile() {
-	setup_apache_vars
-
-	# Detect mips and uclibc systems properly
-	gnuconfig_update
-
-	local modtype
-	if useq static-modules; then
-		modtype="static"
-	else
-		modtype="shared"
-	fi
-
-	select_modules_config || die "determining modules"
-
-	local myconf
-	useq ldap && myconf="${myconf} --enable-auth-ldap=${modtype} --enable-ldap=${modtype}"
-	useq ssl && myconf="${myconf} --with-ssl=/usr  --enable-ssl=${modtype}"
-
-	# Fix for bug #24215 - robbat2@gentoo.org, 30 Oct 2003
-	# We pre-load the cache with the correct answer!  This avoids
-	# it violating the sandbox.  This may have to be changed for
-	# non-Linux systems or if sem_open changes on Linux.  This
-	# hack is built around documentation in /usr/include/semaphore.h
-	# and the glibc (pthread) source
-	echo 'ac_cv_func_sem_open=${ac_cv_func_sem_open=no}' >> ${S}/config.cache
-
-	if useq no-suexec; then
-		myconf="${myconf} --disable-suexec"
-	else
-		myconf="${myconf}
-				--with-suexec-safepath="/usr/local/bin:/usr/bin:/bin" \
-				--with-suexec-logfile=/var/log/apache2/suexec_log \
-				--with-suexec-bin=/usr/sbin/suexec2 \
-				--with-suexec-userdir=${USERDIR} \
-				--with-suexec-caller=apache \
-				--with-suexec-docroot=/var/www \
-				--with-suexec-uidmin=1000 \
-				--with-suexec-gidmin=100 \
-				--with-suexec-umask=077 \
-				--enable-suexec=shared"
-	fi
-
-	# common confopts
-	myconf="${myconf} \
-			--with-apr=/usr \
-			--with-apr-util=/usr \
-			--cache-file=${S}/config.cache \
-			--with-perl=/usr/bin/perl \
-			--with-expat=/usr \
-			--with-z=/usr \
-			--with-port=80 \
-			--enable-layout=Gentoo \
-			--with-program-name=apache2 \
-			--with-devrandom=/dev/urandom \
-			--host=${CHOST} ${MY_BUILTINS}"
-
-	# debugging support
-	if useq debug ; then
-		myconf="${myconf} --enable-maintainer-mode"
-	fi
-
-	./configure --with-mpm=${mpm} ${myconf} || die "bad ./configure please submit bug report to bugs.gentoo.org. Include your config.layout and config.log"
-
-	# we don't want to try and recompile the ssl_expr_parse.c file, because
-	# the lex source is broken
-	touch modules/ssl/ssl_expr_scan.c
-
-	# as decided on IRC-AGENDA-10.2004, we use httpd.conf as standard config file name
-	sed -i -e 's:apache2\.conf:httpd.conf:' include/ap_config_auto.h
-
-	emake || die "problem compiling apache2"
-
-	# build ssl version of apache bench (ab-ssl)
-	if useq ssl; then
-		cd support
-		rm -f ab .libs/ab ab.lo ab.o
-		make ab CFLAGS="${CFLAGS} -DUSE_SSL -lcrypto -lssl -I/usr/include/openssl -L/usr/lib" || die
-		mv ab ab-ssl
-		rm -f ab.lo ab.o
-		make ab || die
-	fi
-}
-
-src_install () {
-	# setup apache user and group
-	enewgroup apache 81
-	enewuser apache 81 -1 /var/www apache
-
-	# general install
-	make DESTDIR=${D} install || die
-	dodoc ABOUT_APACHE CHANGES INSTALL LAYOUT LICENSE README* ${GENTOO_PATCHDIR}/docs/robots.txt
-
-	# protect the suexec binary
-	if ! useq no-suexec; then
-		fowners root:apache /usr/sbin/suexec
-		fperms 4710 /usr/sbin/suexec
-	fi
-
-	# apxs needs this to pickup the right lib for install
-	dosym /usr/lib /usr/lib/apache2/lib
-	dosym /var/log/apache2 /usr/lib/apache2/logs
-	dosym /etc/apache2 /usr/lib/apache2/conf
-
-	# Credits to advx.org people for these scripts. Heck, thanks for
-	# the nice layout and everything else ;-)
-	exeinto /usr/sbin
-	for i in apache2logserverstatus apache2splitlogfile; do
-		doexe ${GENTOO_PATCHDIR}/scripts/${i}
-	done
-	# gentestcrt.sh only if USE=ssl
-	useq ssl && doexe ${GENTOO_PATCHDIR}/scripts/gentestcrt.sh
-
-	# some more scripts
-	for i in split-logfile list_hooks.pl logresolve.pl log_server_status; do
-		doexe ${S}/support/${i}
-	done
-
-	# the ssl version of apache bench
-	useq ssl && doexe support/ab-ssl
-
-	# install mpm bins
-	doexe ${S}/apache2
-
-	# modules.d config file snippets
-	insinto /etc/apache2/modules.d
-	doins ${GENTOO_PATCHDIR}/conf/modules.d/45_mod_dav.conf
-	useq ldap && doins ${GENTOO_PATCHDIR}/conf/modules.d/46_mod_ldap.conf
-	if useq ssl; then
-		doins ${GENTOO_PATCHDIR}/conf/modules.d/40_mod_ssl.conf
-		doins ${GENTOO_PATCHDIR}/conf/modules.d/41_mod_ssl.default-vhost.conf
-	fi
-
-	# drop in a convenient link to the manual
-	if useq doc; then
-		insinto /etc/apache2/modules.d
-		doins ${GENTOO_PATCHDIR}/conf/modules.d/00_apache_manual.conf
-		sed -i -e "s:2.0.49:${PVR}:" ${D}/etc/apache2/modules.d/00_apache_manual.conf
-	else
-		rm -rf ${D}/usr/share/doc/${PF}/manual
-	fi
-
-	# SLOT=2
-	cd ${D}
-	for i in htdigest htpasswd logresolve apxs ab rotatelogs dbmmanage checkgid split-logfile; do
-		mv -v usr/sbin/${i} usr/sbin/${i}2
-	done
-	mv -v usr/sbin/apachectl usr/sbin/apache2ctl
-	mv -v usr/sbin/list_hooks.pl usr/sbin/list_hooks2.pl
-	mv -v usr/sbin/logresolve.pl usr/sbin/logresolve2.pl
-	useq ssl && mv -v usr/sbin/ab-ssl usr/sbin/ab2-ssl
-	useq no-suexec || mv -v usr/sbin/suexec usr/sbin/suexec2
-
-	# do the man pages
-	for i in htdigest.1 htpasswd.1 dbmmanage.1; do
-		mv -v usr/share/man/man1/${i} usr/share/man/man1/${i/./2.}
-	done
-	for i in ab.8 apxs.8 logresolve.8 rotatelogs.8; do
-		mv -v usr/share/man/man8/${i} usr/share/man/man8/${i/./2.}
-	done
-	useq no-suexec || mv -v usr/share/man/man8/suexec.8 usr/share/man/man8/suexec2.8
-	mv -v usr/share/man/man8/apachectl.8 usr/share/man/man8/apache2ctl.8
-	mv -v usr/share/man/man8/httpd.8 usr/share/man/man8/apache2.8
-
-	# tidy up
-	mv usr/sbin/envvars* usr/lib/apache2/build
-	dodoc etc/apache2/*-std.conf
-	rm -f etc/apache2/*.conf
-	rm -rf var/run var/log
-
-	# we DEPEND on net-www/gentoo-webroot-default for sharing this by now
-	rm -rf var/www/localhost
-
-	# config files
-	insinto /etc/conf.d
-	newins ${GENTOO_PATCHDIR}/init/apache2.confd apache2
-
-	exeinto /etc/init.d
-	newexe ${GENTOO_PATCHDIR}/init/apache2.initd apache2
-
-	insinto /etc/logrotate.d
-	newins ${GENTOO_PATCHDIR}/scripts/apache2-logrotate apache2
-
-	insinto /etc/apache2
-	doins ${GENTOO_PATCHDIR}/conf/apache2-builtin-mods
-	doins ${GENTOO_PATCHDIR}/conf/httpd.conf
-
-	keepdir /etc/apache2/vhosts.d
-	keepdir /etc/apache2/modules.d
-
-	# fix bug 92348
-	fperms 755 /usr/sbin/apache2logserverstatus
-	fperms 755 /usr/sbin/apache2splitlogfile
-
-	# empty dirs
-	for i in /var/lib/dav /var/log/apache2 /var/cache/apache2; do
-		keepdir ${i}
-		fowners apache:apache ${i}
-		fperms 755 ${i}
-	done
-
-	# We'll be needing /etc/apache2/ssl if USE=ssl
-	useq ssl && keepdir /etc/apache2/ssl
-
-}
-
-pkg_postinst() {
-
-	# Automatically generate test ceritificates if ssl USE flag is beeing set
-	if useq ssl; then
-		cd ${ROOT}/etc/apache2/ssl
-		einfo
-		einfo "Generating self-signed test certificate in /etc/apache2/ssl..."
-		yes "" 2>/dev/null | \
-			${ROOT}/usr/sbin/gentestcrt.sh >/dev/null 2>&1 || \
-			die "gentestcrt.sh failed"
-		einfo
-	fi
-
-	# Check for dual/upgrade install
-	if has_version '=net-www/apache-1*' || ! use apache2 ; then
-		ewarn
-		ewarn "Please add the 'apache2' flag to your USE variable and (re)install"
-		ewarn "any additional DSO modules you may wish to use with Apache-2.x."
-		ewarn "Addon modules are configured in /etc/apache2/modules.d/"
-		ewarn
-	fi
-
-	# Check to see if this is an upgrade
-	if [ -d /home/httpd ]; then
-		einfo
-		einfo "Please remember to update your config files in /etc/apache2"
-		einfo "as --datadir has been changed to ${DATADIR}, and ServerRoot"
-		einfo "has changed to /usr/lib/apache2!"
-		einfo
-	fi
-
-	# Check for obsolete symlinks
-	local list=""
-	for i in lib logs modules extramodules; do
-		local d="/etc/apache2/${i}"
-		[ -s "${d}" ] && list="${list} ${d}"
-	done
-	[ -n "${list}" ] && einfo "You should delete these old symlinks: ${list}"
-
-	if has_version '<net-www/apache-2.0.52-r3' && has_version '>=net-www/apache-2.0.0' ; then
-		einfo "Configuration locations have changed, you will need to migrate"
-		einfo "your configuration from /etc/apache2/conf/apache2.conf and"
-		einfo "/etc/apache2/conf/commonapache2.conf to /etc/apache2/httpd.conf."
-		einfo
-		einfo "Apache now checks for the old configuration and refuses to start"
-		einfo "if it exists. You must remove the old configuration first"
-		einfo
-		einfo "You should also at this time rebuild all your modules"
-		einfo
-		einfo "For more information, see"
-		einfo "  http://www.gentoo.org/doc/en/apache-upgrading.xml"
-		einfo
-	fi
-
-	big_fat_warnings
-}
-
-setup_apache_vars() {
-	# actually we do not provide a very dynamic way of those vars
-	# however, you may predefine them in shell before emerging
-	# to override the official default locations
-
-	# standard location for Gentoo Linux
-	DATADIR="${DATADIR:-/var/www/localhost}"
-	USERDIR="${USERDIR:-public_html}"
-
-	einfo "DATADIR is set to: ${DATADIR}"
-	einfo "USERDIR is set to: ${USERDIR}"
-}
-
-mpm_die() {
-	eerror "You attempted to specify the MPM $1, but MPM $2 was already specified."
-	eerror "The apache ebuilds no longer support multiple MPM installations.  Please choose"
-	eerror "one MPM and reinstall."
-	die "More than one MPM was specified."
-}
-
-try_mpm() {
-	local nmpm=$1
-
-	if [ -z "${nmpm}" ]; then
-		die "mpm to try not specified!"
-	fi
-
-	if [ -n "${mpm}" ]; then
-		mpm_die ${nmpm} ${mpm}
-	fi
-
-	mpm="${nmpm}"
-}
-
-select_mpms() {
-	useq mpm-prefork && try_mpm prefork
-	useq mpm-worker && try_mpm worker
-	useq mpm-peruser && try_mpm peruser
-	useq mpm-threadpool && try_mpm threadpool
-	useq mpm-leader && try_mpm leader
-
-	if [ "x${mpm}" = "x" ]; then
-		if useq threads; then
-			einfo "Threads specified without a mpm-specification, using mpm-worker."
-			mpm="worker"
-		else
-			einfo "No MPM style was specified, defaulting to mpm-prefork."
-			mpm="prefork"
-		fi
-	fi
-}
-
-parse_modules_config() {
-	local name=""
-	local disable=""
-	[ -f ${1} ] || return 1
-
-	for i in `cat $1 | sed "s/^#.*//"`; do
-		if [ $i == "-" ]; then
-			disable="true"
-		elif [ -z "$name" ] && [ ! -z "`echo $i | grep "mod_"`" ]; then
-			name=`echo $i | sed "s/mod_//"`
-		elif [ "$disable" ] && ( [ $i == "static" ] || [ $i == "shared" ] ); then
-			MY_BUILTINS="${MY_BUILTINS} --disable-$name"
-			name="" ; disable=""
-		elif [ $i == "static" ] || useq static-modules; then
-			MY_BUILTINS="${MY_BUILTINS} --enable-$name=yes"
-			name="" ; disable=""
-		elif [ $i == "shared" ]; then
-			MY_BUILTINS="${MY_BUILTINS} --enable-$name=shared"
-			name="" ; disable=""
-		fi
-	done
-
-	einfo "${1} options:\n${MY_BUILTINS}"
-}
-
-select_modules_config() {
-	parse_modules_config /etc/apache2/apache2-builtin-mods || \
-	parse_modules_config ${GENTOO_PATCHDIR}/conf/apache2-builtin-mods || \
-	return 1
-}
-
-# vim:ts=4
diff --git a/net-www/apache/apache-2.0.54-r11.ebuild b/net-www/apache/apache-2.0.54-r11.ebuild
deleted file mode 100644
index e7cf156a1470..000000000000
--- a/net-www/apache/apache-2.0.54-r11.ebuild
+++ /dev/null
@@ -1,432 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.54-r11.ebuild,v 1.4 2005/08/23 17:09:10 vericgar Exp $
-
-inherit eutils gnuconfig
-
-# latest gentoo apache files
-GENTOO_PATCHNAME="gentoo-apache-${PVR}"
-GENTOO_PATCHSTAMP="20050608"
-GENTOO_DEVSPACE="kloeri"
-GENTOO_PATCHDIR="${WORKDIR}/${GENTOO_PATCHNAME}"
-
-DESCRIPTION="The Apache Web Server, Version 2.0.x"
-HOMEPAGE="http://httpd.apache.org/"
-SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2
-	http://dev.gentoo.org/~${GENTOO_DEVSPACE}/dist/apache/${GENTOO_PATCHNAME}-${GENTOO_PATCHSTAMP}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="apache2 debug doc ldap mpm-leader mpm-peruser mpm-prefork mpm-threadpool mpm-worker no-suexec ssl static-modules threads selinux"
-
-RDEPEND="dev-lang/perl
-	~dev-libs/apr-0.9.6
-	~dev-libs/apr-util-0.9.6
-	dev-libs/expat
-	net-www/gentoo-webroot-default
-	app-misc/mime-types
-	sys-libs/zlib
-	ssl? ( dev-libs/openssl )
-	selinux? ( sec-policy/selinux-apache )
-	!mips? ( ldap? ( =net-nds/openldap-2* ) )"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.59-r4"
-
-S="${WORKDIR}/httpd-${PV}"
-
-big_fat_warnings() {
-	if use mpm-peruser; then
-		ewarn " -BIG- -FAT- -WARNING-"
-		ewarn ""
-		ewarn "The peruser (USE=mpm-peruser) MPM is considered highly experimental"
-		ewarn "and are not (yet) supported, nor are they recommended for production"
-		ewarn "use.  You have been warned!"
-		ewarn
-		ewarn "Continuing in 5 seconds.."
-		sleep 5
-	fi
-
-	ewarn ""
-	ewarn "LFS support has been removed due to incompatibilites with other packages."
-	ewarn "You _will_ have to re-emerge any Apache modules you have installed, or"
-	ewarn "they will likely misbehave/segfault."
-	ewarn ""
-	ewarn ""
-	ewarn "Multiple MPM support has been disabled due to problems with external"
-	ewarn "modules.  If you have relied on this functionality you will need"
-	ewarn "to find another solution.  The Gentoo Apache team apologizes for"
-	ewarn "any inconvienence this may cause you."
-	ewarn ""
-}
-
-pkg_setup() {
-	big_fat_warnings
-	select_mpms
-}
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S} || die
-
-	EPATCH_SUFFIX="patch"
-	epatch ${GENTOO_PATCHDIR}/patches/[0-2]* || die "internal ebuild error"
-
-	# avoid utf-8 charset problems
-	export LC_CTYPE=C
-
-	# setup the filesystem layout config
-	cat ${GENTOO_PATCHDIR}/patches/config.layout >> config.layout
-	sed -i -e 's:version:${PF}:g' config.layout
-
-	# peruser need to build conf
-	WANT_AUTOCONF=2.5 ./buildconf || die "buildconf failed"
-}
-
-src_compile() {
-	setup_apache_vars
-
-	# Detect mips and uclibc systems properly
-	gnuconfig_update
-
-	local modtype
-	if useq static-modules; then
-		modtype="static"
-	else
-		modtype="shared"
-	fi
-
-	select_modules_config || die "determining modules"
-
-	local myconf
-	useq ldap && myconf="${myconf} --enable-auth-ldap=${modtype} --enable-ldap=${modtype}"
-	useq ssl && myconf="${myconf} --with-ssl=/usr  --enable-ssl=${modtype}"
-
-	# Fix for bug #24215 - robbat2@gentoo.org, 30 Oct 2003
-	# We pre-load the cache with the correct answer!  This avoids
-	# it violating the sandbox.  This may have to be changed for
-	# non-Linux systems or if sem_open changes on Linux.  This
-	# hack is built around documentation in /usr/include/semaphore.h
-	# and the glibc (pthread) source
-	echo 'ac_cv_func_sem_open=${ac_cv_func_sem_open=no}' >> ${S}/config.cache
-
-	if useq no-suexec; then
-		myconf="${myconf} --disable-suexec"
-	else
-		myconf="${myconf}
-				--with-suexec-safepath="/usr/local/bin:/usr/bin:/bin" \
-				--with-suexec-logfile=/var/log/apache2/suexec_log \
-				--with-suexec-bin=/usr/sbin/suexec2 \
-				--with-suexec-userdir=${USERDIR} \
-				--with-suexec-caller=apache \
-				--with-suexec-docroot=/var/www \
-				--with-suexec-uidmin=1000 \
-				--with-suexec-gidmin=100 \
-				--with-suexec-umask=077 \
-				--enable-suexec=shared"
-	fi
-
-	# common confopts
-	myconf="${myconf} \
-			--with-apr=/usr \
-			--with-apr-util=/usr \
-			--cache-file=${S}/config.cache \
-			--with-perl=/usr/bin/perl \
-			--with-expat=/usr \
-			--with-z=/usr \
-			--with-port=80 \
-			--enable-layout=Gentoo \
-			--with-program-name=apache2 \
-			--with-devrandom=/dev/urandom \
-			--host=${CHOST} ${MY_BUILTINS}"
-
-	# debugging support
-	if useq debug ; then
-		myconf="${myconf} --enable-maintainer-mode"
-	fi
-
-	./configure --with-mpm=${mpm} ${myconf} || die "bad ./configure please submit bug report to bugs.gentoo.org. Include your config.layout and config.log"
-
-	# we don't want to try and recompile the ssl_expr_parse.c file, because
-	# the lex source is broken
-	touch modules/ssl/ssl_expr_scan.c
-
-	# as decided on IRC-AGENDA-10.2004, we use httpd.conf as standard config file name
-	sed -i -e 's:apache2\.conf:httpd.conf:' include/ap_config_auto.h
-
-	emake || die "problem compiling apache2"
-
-	# build ssl version of apache bench (ab-ssl)
-	if useq ssl; then
-		cd support
-		rm -f ab .libs/ab ab.lo ab.o
-		make ab CFLAGS="${CFLAGS} -DUSE_SSL -lcrypto -lssl -I/usr/include/openssl -L/usr/lib" || die
-		mv ab ab-ssl
-		rm -f ab.lo ab.o
-		make ab || die
-	fi
-}
-
-src_install () {
-	# setup apache user and group
-	enewgroup apache 81
-	enewuser apache 81 -1 /var/www apache
-
-	# general install
-	make DESTDIR=${D} install || die
-	dodoc ABOUT_APACHE CHANGES INSTALL LAYOUT LICENSE README* ${GENTOO_PATCHDIR}/docs/robots.txt
-
-	# protect the suexec binary
-	if ! useq no-suexec; then
-		fowners root:apache /usr/sbin/suexec
-		fperms 4710 /usr/sbin/suexec
-	fi
-
-	# apxs needs this to pickup the right lib for install
-	dosym /usr/lib /usr/lib/apache2/lib
-	dosym /var/log/apache2 /usr/lib/apache2/logs
-	dosym /etc/apache2 /usr/lib/apache2/conf
-
-	# Credits to advx.org people for these scripts. Heck, thanks for
-	# the nice layout and everything else ;-)
-	exeinto /usr/sbin
-	for i in apache2logserverstatus apache2splitlogfile; do
-		doexe ${GENTOO_PATCHDIR}/scripts/${i}
-	done
-	# gentestcrt.sh only if USE=ssl
-	useq ssl && doexe ${GENTOO_PATCHDIR}/scripts/gentestcrt.sh
-
-	# some more scripts
-	for i in split-logfile list_hooks.pl logresolve.pl log_server_status; do
-		doexe ${S}/support/${i}
-	done
-
-	# the ssl version of apache bench
-	useq ssl && doexe support/ab-ssl
-
-	# install mpm bins
-	doexe ${S}/apache2
-
-	# modules.d config file snippets
-	insinto /etc/apache2/modules.d
-	doins ${GENTOO_PATCHDIR}/conf/modules.d/45_mod_dav.conf
-	useq ldap && doins ${GENTOO_PATCHDIR}/conf/modules.d/46_mod_ldap.conf
-	if useq ssl; then
-		doins ${GENTOO_PATCHDIR}/conf/modules.d/40_mod_ssl.conf
-		doins ${GENTOO_PATCHDIR}/conf/modules.d/41_mod_ssl.default-vhost.conf
-	fi
-
-	# drop in a convenient link to the manual
-	if useq doc; then
-		insinto /etc/apache2/modules.d
-		doins ${GENTOO_PATCHDIR}/conf/modules.d/00_apache_manual.conf
-		sed -i -e "s:2.0.49:${PVR}:" ${D}/etc/apache2/modules.d/00_apache_manual.conf
-	else
-		rm -rf ${D}/usr/share/doc/${PF}/manual
-	fi
-
-	# SLOT=2
-	cd ${D}
-	for i in htdigest htpasswd logresolve apxs ab rotatelogs dbmmanage checkgid split-logfile; do
-		mv -v usr/sbin/${i} usr/sbin/${i}2
-	done
-	mv -v usr/sbin/apachectl usr/sbin/apache2ctl
-	mv -v usr/sbin/list_hooks.pl usr/sbin/list_hooks2.pl
-	mv -v usr/sbin/logresolve.pl usr/sbin/logresolve2.pl
-	useq ssl && mv -v usr/sbin/ab-ssl usr/sbin/ab2-ssl
-	useq no-suexec || mv -v usr/sbin/suexec usr/sbin/suexec2
-
-	# do the man pages
-	for i in htdigest.1 htpasswd.1 dbmmanage.1; do
-		mv -v usr/share/man/man1/${i} usr/share/man/man1/${i/./2.}
-	done
-	for i in ab.8 apxs.8 logresolve.8 rotatelogs.8; do
-		mv -v usr/share/man/man8/${i} usr/share/man/man8/${i/./2.}
-	done
-	useq no-suexec || mv -v usr/share/man/man8/suexec.8 usr/share/man/man8/suexec2.8
-	mv -v usr/share/man/man8/apachectl.8 usr/share/man/man8/apache2ctl.8
-	mv -v usr/share/man/man8/httpd.8 usr/share/man/man8/apache2.8
-
-	# tidy up
-	mv usr/sbin/envvars* usr/lib/apache2/build
-	dodoc etc/apache2/*-std.conf
-	rm -f etc/apache2/*.conf
-	rm -rf var/run var/log
-
-	# we DEPEND on net-www/gentoo-webroot-default for sharing this by now
-	rm -rf var/www/localhost
-
-	# config files
-	insinto /etc/conf.d
-	newins ${GENTOO_PATCHDIR}/init/apache2.confd apache2
-
-	exeinto /etc/init.d
-	newexe ${GENTOO_PATCHDIR}/init/apache2.initd apache2
-
-	insinto /etc/logrotate.d
-	newins ${GENTOO_PATCHDIR}/scripts/apache2-logrotate apache2
-
-	insinto /etc/apache2
-	doins ${GENTOO_PATCHDIR}/conf/apache2-builtin-mods
-	doins ${GENTOO_PATCHDIR}/conf/httpd.conf
-
-	keepdir /etc/apache2/vhosts.d
-	keepdir /etc/apache2/modules.d
-
-	# fix bug 92348
-	fperms 755 /usr/sbin/apache2logserverstatus
-	fperms 755 /usr/sbin/apache2splitlogfile
-
-	# empty dirs
-	for i in /var/lib/dav /var/log/apache2 /var/cache/apache2; do
-		keepdir ${i}
-		fowners apache:apache ${i}
-		fperms 755 ${i}
-	done
-
-	# We'll be needing /etc/apache2/ssl if USE=ssl
-	useq ssl && keepdir /etc/apache2/ssl
-
-}
-
-pkg_postinst() {
-
-	# Automatically generate test ceritificates if ssl USE flag is beeing set
-	if useq ssl; then
-		cd ${ROOT}/etc/apache2/ssl
-		einfo
-		einfo "Generating self-signed test certificate in /etc/apache2/ssl..."
-		yes "" 2>/dev/null | \
-			${ROOT}/usr/sbin/gentestcrt.sh >/dev/null 2>&1 || \
-			die "gentestcrt.sh failed"
-		einfo
-	fi
-
-	# Check for dual/upgrade install
-	if has_version '=net-www/apache-1*' || ! use apache2 ; then
-		ewarn
-		ewarn "Please add the 'apache2' flag to your USE variable and (re)install"
-		ewarn "any additional DSO modules you may wish to use with Apache-2.x."
-		ewarn "Addon modules are configured in /etc/apache2/modules.d/"
-		ewarn
-	fi
-
-	# Check to see if this is an upgrade
-	if [ -d /home/httpd ]; then
-		einfo
-		einfo "Please remember to update your config files in /etc/apache2"
-		einfo "as --datadir has been changed to ${DATADIR}, and ServerRoot"
-		einfo "has changed to /usr/lib/apache2!"
-		einfo
-	fi
-
-	# Check for obsolete symlinks
-	local list=""
-	for i in lib logs modules extramodules; do
-		local d="/etc/apache2/${i}"
-		[ -s "${d}" ] && list="${list} ${d}"
-	done
-	[ -n "${list}" ] && einfo "You should delete these old symlinks: ${list}"
-
-	if has_version '<net-www/apache-2.0.52-r3' && has_version '>=net-www/apache-2.0.0' ; then
-		einfo "Configuration locations have changed, you will need to migrate"
-		einfo "your configuration from /etc/apache2/conf/apache2.conf and"
-		einfo "/etc/apache2/conf/commonapache2.conf to /etc/apache2/httpd.conf."
-		einfo
-		einfo "Apache now checks for the old configuration and refuses to start"
-		einfo "if it exists. You must remove the old configuration first"
-		einfo
-		einfo "You should also at this time rebuild all your modules"
-		einfo
-		einfo "For more information, see"
-		einfo "  http://www.gentoo.org/doc/en/apache-upgrading.xml"
-		einfo
-	fi
-
-	big_fat_warnings
-}
-
-setup_apache_vars() {
-	# actually we do not provide a very dynamic way of those vars
-	# however, you may predefine them in shell before emerging
-	# to override the official default locations
-
-	# standard location for Gentoo Linux
-	DATADIR="${DATADIR:-/var/www/localhost}"
-	USERDIR="${USERDIR:-public_html}"
-
-	einfo "DATADIR is set to: ${DATADIR}"
-	einfo "USERDIR is set to: ${USERDIR}"
-}
-
-mpm_die() {
-	eerror "You attempted to specify the MPM $1, but MPM $2 was already specified."
-	eerror "The apache ebuilds no longer support multiple MPM installations.  Please choose"
-	eerror "one MPM and reinstall."
-	die "More than one MPM was specified."
-}
-
-try_mpm() {
-	local nmpm=$1
-
-	if [ -z "${nmpm}" ]; then
-		die "mpm to try not specified!"
-	fi
-
-	if [ -n "${mpm}" ]; then
-		mpm_die ${nmpm} ${mpm}
-	fi
-
-	mpm="${nmpm}"
-}
-
-select_mpms() {
-	useq mpm-prefork && try_mpm prefork
-	useq mpm-worker && try_mpm worker
-	useq mpm-peruser && try_mpm peruser
-	useq mpm-threadpool && try_mpm threadpool
-	useq mpm-leader && try_mpm leader
-
-	if [ "x${mpm}" = "x" ]; then
-		if useq threads; then
-			einfo "Threads specified without a mpm-specification, using mpm-worker."
-			mpm="worker"
-		else
-			einfo "No MPM style was specified, defaulting to mpm-prefork."
-			mpm="prefork"
-		fi
-	fi
-}
-
-parse_modules_config() {
-	local name=""
-	local disable=""
-	[ -f ${1} ] || return 1
-
-	for i in `cat $1 | sed "s/^#.*//"`; do
-		if [ $i == "-" ]; then
-			disable="true"
-		elif [ -z "$name" ] && [ ! -z "`echo $i | grep "mod_"`" ]; then
-			name=`echo $i | sed "s/mod_//"`
-		elif [ "$disable" ] && ( [ $i == "static" ] || [ $i == "shared" ] ); then
-			MY_BUILTINS="${MY_BUILTINS} --disable-$name"
-			name="" ; disable=""
-		elif [ $i == "static" ] || useq static-modules; then
-			MY_BUILTINS="${MY_BUILTINS} --enable-$name=yes"
-			name="" ; disable=""
-		elif [ $i == "shared" ]; then
-			MY_BUILTINS="${MY_BUILTINS} --enable-$name=shared"
-			name="" ; disable=""
-		fi
-	done
-
-	einfo "${1} options:\n${MY_BUILTINS}"
-}
-
-select_modules_config() {
-	parse_modules_config /etc/apache2/apache2-builtin-mods || \
-	parse_modules_config ${GENTOO_PATCHDIR}/conf/apache2-builtin-mods || \
-	return 1
-}
-
-# vim:ts=4
diff --git a/net-www/apache/apache-2.0.54-r12.ebuild b/net-www/apache/apache-2.0.54-r12.ebuild
deleted file mode 100644
index d70d9d592f6a..000000000000
--- a/net-www/apache/apache-2.0.54-r12.ebuild
+++ /dev/null
@@ -1,435 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.54-r12.ebuild,v 1.5 2005/08/23 17:09:10 vericgar Exp $
-
-inherit eutils gnuconfig
-
-# latest gentoo apache files
-GENTOO_PATCHNAME="gentoo-apache-${PVR}"
-GENTOO_PATCHSTAMP="20050712"
-GENTOO_DEVSPACE="vericgar"
-GENTOO_PATCHDIR="${WORKDIR}/${GENTOO_PATCHNAME}"
-
-DESCRIPTION="The Apache Web Server, Version 2.0.x"
-HOMEPAGE="http://httpd.apache.org/"
-SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2
-	http://dev.gentoo.org/~${GENTOO_DEVSPACE}/dist/apache/${GENTOO_PATCHNAME}-${GENTOO_PATCHSTAMP}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="apache2 debug doc ldap mpm-leader mpm-peruser mpm-prefork mpm-threadpool mpm-worker no-suexec ssl static-modules threads selinux"
-
-RDEPEND="dev-lang/perl
-	~dev-libs/apr-0.9.6
-	~dev-libs/apr-util-0.9.6
-	dev-libs/expat
-	net-www/gentoo-webroot-default
-	app-misc/mime-types
-	sys-libs/zlib
-	ssl? ( dev-libs/openssl )
-	selinux? ( sec-policy/selinux-apache )
-	!mips? ( ldap? ( =net-nds/openldap-2* ) )"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.59-r4"
-
-S="${WORKDIR}/httpd-${PV}"
-
-big_fat_warnings() {
-	if use mpm-peruser; then
-		ewarn " -BIG- -FAT- -WARNING-"
-		ewarn ""
-		ewarn "The peruser (USE=mpm-peruser) MPM is considered highly experimental"
-		ewarn "and are not (yet) supported, nor are they recommended for production"
-		ewarn "use.  You have been warned!"
-		ewarn
-		ewarn "Continuing in 5 seconds.."
-		sleep 5
-	fi
-
-	ewarn ""
-	ewarn "LFS support has been removed due to incompatibilites with other packages."
-	ewarn "You _will_ have to re-emerge any Apache modules you have installed, or"
-	ewarn "they will likely misbehave/segfault."
-	ewarn ""
-	ewarn ""
-	ewarn "Multiple MPM support has been disabled due to problems with external"
-	ewarn "modules.  If you have relied on this functionality you will need"
-	ewarn "to find another solution.  The Gentoo Apache team apologizes for"
-	ewarn "any inconvienence this may cause you."
-	ewarn ""
-}
-
-pkg_setup() {
-	big_fat_warnings
-	select_mpms
-}
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S} || die
-
-	EPATCH_SUFFIX="patch"
-	epatch ${GENTOO_PATCHDIR}/patches/[0-2]* || die "internal ebuild error"
-
-	# avoid utf-8 charset problems
-	export LC_CTYPE=C
-
-	# setup the filesystem layout config
-	cat ${GENTOO_PATCHDIR}/patches/config.layout >> config.layout
-	sed -i -e 's:version:${PF}:g' config.layout
-
-	# peruser need to build conf
-	WANT_AUTOCONF=2.5 ./buildconf || die "buildconf failed"
-}
-
-src_compile() {
-	setup_apache_vars
-
-	# Detect mips and uclibc systems properly
-	gnuconfig_update
-
-	local modtype
-	if useq static-modules; then
-		modtype="static"
-	else
-		modtype="shared"
-	fi
-
-	select_modules_config || die "determining modules"
-
-	local myconf
-	useq ldap && myconf="${myconf} --enable-auth-ldap=${modtype} --enable-ldap=${modtype}"
-	useq ssl && myconf="${myconf} --with-ssl=/usr  --enable-ssl=${modtype}"
-
-	# Fix for bug #24215 - robbat2@gentoo.org, 30 Oct 2003
-	# We pre-load the cache with the correct answer!  This avoids
-	# it violating the sandbox.  This may have to be changed for
-	# non-Linux systems or if sem_open changes on Linux.  This
-	# hack is built around documentation in /usr/include/semaphore.h
-	# and the glibc (pthread) source
-	echo 'ac_cv_func_sem_open=${ac_cv_func_sem_open=no}' >> ${S}/config.cache
-
-	if useq no-suexec; then
-		myconf="${myconf} --disable-suexec"
-	else
-		myconf="${myconf}
-				--with-suexec-safepath="/usr/local/bin:/usr/bin:/bin" \
-				--with-suexec-logfile=/var/log/apache2/suexec_log \
-				--with-suexec-bin=/usr/sbin/suexec2 \
-				--with-suexec-userdir=${USERDIR} \
-				--with-suexec-caller=apache \
-				--with-suexec-docroot=/var/www \
-				--with-suexec-uidmin=1000 \
-				--with-suexec-gidmin=100 \
-				--with-suexec-umask=077 \
-				--enable-suexec=shared"
-	fi
-
-	# common confopts
-	myconf="${myconf} \
-			--with-apr=/usr \
-			--with-apr-util=/usr \
-			--cache-file=${S}/config.cache \
-			--with-perl=/usr/bin/perl \
-			--with-expat=/usr \
-			--with-z=/usr \
-			--with-port=80 \
-			--enable-layout=Gentoo \
-			--with-program-name=apache2 \
-			--with-devrandom=/dev/urandom \
-			--host=${CHOST} ${MY_BUILTINS}"
-
-	# debugging support
-	if useq debug ; then
-		myconf="${myconf} --enable-maintainer-mode"
-	fi
-
-	./configure --with-mpm=${mpm} ${myconf} || die "bad ./configure please submit bug report to bugs.gentoo.org. Include your config.layout and config.log"
-
-	# we don't want to try and recompile the ssl_expr_parse.c file, because
-	# the lex source is broken
-	touch modules/ssl/ssl_expr_scan.c
-
-	# as decided on IRC-AGENDA-10.2004, we use httpd.conf as standard config file name
-	sed -i -e 's:apache2\.conf:httpd.conf:' include/ap_config_auto.h
-
-	emake || die "problem compiling apache2"
-
-	# build ssl version of apache bench (ab-ssl)
-	if useq ssl; then
-		cd support
-		rm -f ab .libs/ab ab.lo ab.o
-		make ab CFLAGS="${CFLAGS} -DUSE_SSL -lcrypto -lssl -I/usr/include/openssl -L/usr/lib" || die
-		mv ab ab-ssl
-		rm -f ab.lo ab.o
-		make ab || die
-	fi
-}
-
-src_install () {
-	# setup apache user and group
-	enewgroup apache 81
-	enewuser apache 81 -1 /var/www apache
-
-	# general install
-	make DESTDIR=${D} install || die
-	dodoc ABOUT_APACHE CHANGES INSTALL LAYOUT LICENSE README* ${GENTOO_PATCHDIR}/docs/robots.txt
-
-	# protect the suexec binary
-	if ! useq no-suexec; then
-		fowners root:apache /usr/sbin/suexec
-		fperms 4710 /usr/sbin/suexec
-	fi
-
-	# apxs needs this to pickup the right lib for install
-	dosym /usr/lib /usr/lib/apache2/lib
-	dosym /var/log/apache2 /usr/lib/apache2/logs
-	dosym /etc/apache2 /usr/lib/apache2/conf
-
-	# Credits to advx.org people for these scripts. Heck, thanks for
-	# the nice layout and everything else ;-)
-	exeinto /usr/sbin
-	for i in apache2logserverstatus apache2splitlogfile; do
-		doexe ${GENTOO_PATCHDIR}/scripts/${i}
-	done
-	# gentestcrt.sh only if USE=ssl
-	useq ssl && doexe ${GENTOO_PATCHDIR}/scripts/gentestcrt.sh
-
-	# some more scripts
-	for i in split-logfile list_hooks.pl logresolve.pl log_server_status; do
-		doexe ${S}/support/${i}
-	done
-
-	# the ssl version of apache bench
-	useq ssl && doexe support/ab-ssl
-
-	# install mpm bins
-	doexe ${S}/apache2
-
-	# modules.d config file snippets
-	insinto /etc/apache2/modules.d
-	doins ${GENTOO_PATCHDIR}/conf/modules.d/45_mod_dav.conf
-	useq ldap && doins ${GENTOO_PATCHDIR}/conf/modules.d/46_mod_ldap.conf
-	if useq ssl; then
-		doins ${GENTOO_PATCHDIR}/conf/modules.d/40_mod_ssl.conf
-		doins ${GENTOO_PATCHDIR}/conf/modules.d/41_mod_ssl.default-vhost.conf
-	fi
-
-	# drop in a convenient link to the manual
-	if useq doc; then
-		insinto /etc/apache2/modules.d
-		doins ${GENTOO_PATCHDIR}/conf/modules.d/00_apache_manual.conf
-		sed -i -e "s:2.0.49:${PVR}:" ${D}/etc/apache2/modules.d/00_apache_manual.conf
-	else
-		rm -rf ${D}/usr/share/doc/${PF}/manual
-	fi
-
-	# SLOT=2
-	cd ${D}
-	for i in htdigest htpasswd logresolve apxs ab rotatelogs dbmmanage checkgid split-logfile; do
-		mv -v usr/sbin/${i} usr/sbin/${i}2
-	done
-	mv -v usr/sbin/apachectl usr/sbin/apache2ctl
-	mv -v usr/sbin/list_hooks.pl usr/sbin/list_hooks2.pl
-	mv -v usr/sbin/logresolve.pl usr/sbin/logresolve2.pl
-	useq ssl && mv -v usr/sbin/ab-ssl usr/sbin/ab2-ssl
-	useq no-suexec || mv -v usr/sbin/suexec usr/sbin/suexec2
-
-	# do the man pages
-	for i in htdigest.1 htpasswd.1 dbmmanage.1; do
-		mv -v usr/share/man/man1/${i} usr/share/man/man1/${i/./2.}
-	done
-	for i in ab.8 apxs.8 logresolve.8 rotatelogs.8; do
-		mv -v usr/share/man/man8/${i} usr/share/man/man8/${i/./2.}
-	done
-	useq no-suexec || mv -v usr/share/man/man8/suexec.8 usr/share/man/man8/suexec2.8
-	mv -v usr/share/man/man8/apachectl.8 usr/share/man/man8/apache2ctl.8
-	mv -v usr/share/man/man8/httpd.8 usr/share/man/man8/apache2.8
-
-	# tidy up
-	mv usr/sbin/envvars* usr/lib/apache2/build
-	dodoc etc/apache2/*-std.conf
-	rm -f etc/apache2/*.conf
-	rm -rf var/run var/log
-
-	# we DEPEND on net-www/gentoo-webroot-default for sharing this by now
-	rm -rf var/www/localhost
-
-	# config files
-	insinto /etc/conf.d
-	newins ${GENTOO_PATCHDIR}/init/apache2.confd apache2
-
-	exeinto /etc/init.d
-	newexe ${GENTOO_PATCHDIR}/init/apache2.initd apache2
-
-	insinto /etc/logrotate.d
-	newins ${GENTOO_PATCHDIR}/scripts/apache2-logrotate apache2
-
-	insinto /etc/apache2
-	doins ${GENTOO_PATCHDIR}/conf/apache2-builtin-mods
-	doins ${GENTOO_PATCHDIR}/conf/httpd.conf
-
-	insinto /etc/apache2/vhosts.d
-	doins ${GENTOO_PATCHDIR}/conf/vhosts.d/00_default_vhost.conf
-
-	keepdir /etc/apache2/vhosts.d
-	keepdir /etc/apache2/modules.d
-
-	# fix bug 92348
-	fperms 755 /usr/sbin/apache2logserverstatus
-	fperms 755 /usr/sbin/apache2splitlogfile
-
-	# empty dirs
-	for i in /var/lib/dav /var/log/apache2 /var/cache/apache2; do
-		keepdir ${i}
-		fowners apache:apache ${i}
-		fperms 755 ${i}
-	done
-
-	# We'll be needing /etc/apache2/ssl if USE=ssl
-	useq ssl && keepdir /etc/apache2/ssl
-
-}
-
-pkg_postinst() {
-
-	# Automatically generate test ceritificates if ssl USE flag is beeing set
-	if useq ssl; then
-		cd ${ROOT}/etc/apache2/ssl
-		einfo
-		einfo "Generating self-signed test certificate in /etc/apache2/ssl..."
-		yes "" 2>/dev/null | \
-			${ROOT}/usr/sbin/gentestcrt.sh >/dev/null 2>&1 || \
-			die "gentestcrt.sh failed"
-		einfo
-	fi
-
-	# Check for dual/upgrade install
-	if has_version '=net-www/apache-1*' || ! use apache2 ; then
-		ewarn
-		ewarn "Please add the 'apache2' flag to your USE variable and (re)install"
-		ewarn "any additional DSO modules you may wish to use with Apache-2.x."
-		ewarn "Addon modules are configured in /etc/apache2/modules.d/"
-		ewarn
-	fi
-
-	# Check to see if this is an upgrade
-	if [ -d /home/httpd ]; then
-		einfo
-		einfo "Please remember to update your config files in /etc/apache2"
-		einfo "as --datadir has been changed to ${DATADIR}, and ServerRoot"
-		einfo "has changed to /usr/lib/apache2!"
-		einfo
-	fi
-
-	# Check for obsolete symlinks
-	local list=""
-	for i in lib logs modules extramodules; do
-		local d="/etc/apache2/${i}"
-		[ -s "${d}" ] && list="${list} ${d}"
-	done
-	[ -n "${list}" ] && einfo "You should delete these old symlinks: ${list}"
-
-	if has_version '<net-www/apache-2.0.52-r3' && has_version '>=net-www/apache-2.0.0' ; then
-		einfo "Configuration locations have changed, you will need to migrate"
-		einfo "your configuration from /etc/apache2/conf/apache2.conf and"
-		einfo "/etc/apache2/conf/commonapache2.conf to /etc/apache2/httpd.conf."
-		einfo
-		einfo "Apache now checks for the old configuration and refuses to start"
-		einfo "if it exists. You must remove the old configuration first"
-		einfo
-		einfo "You should also at this time rebuild all your modules"
-		einfo
-		einfo "For more information, see"
-		einfo "  http://www.gentoo.org/doc/en/apache-upgrading.xml"
-		einfo
-	fi
-
-	big_fat_warnings
-}
-
-setup_apache_vars() {
-	# actually we do not provide a very dynamic way of those vars
-	# however, you may predefine them in shell before emerging
-	# to override the official default locations
-
-	# standard location for Gentoo Linux
-	DATADIR="${DATADIR:-/var/www/localhost}"
-	USERDIR="${USERDIR:-public_html}"
-
-	einfo "DATADIR is set to: ${DATADIR}"
-	einfo "USERDIR is set to: ${USERDIR}"
-}
-
-mpm_die() {
-	eerror "You attempted to specify the MPM $1, but MPM $2 was already specified."
-	eerror "The apache ebuilds no longer support multiple MPM installations.  Please choose"
-	eerror "one MPM and reinstall."
-	die "More than one MPM was specified."
-}
-
-try_mpm() {
-	local nmpm=$1
-
-	if [ -z "${nmpm}" ]; then
-		die "mpm to try not specified!"
-	fi
-
-	if [ -n "${mpm}" ]; then
-		mpm_die ${nmpm} ${mpm}
-	fi
-
-	mpm="${nmpm}"
-}
-
-select_mpms() {
-	useq mpm-prefork && try_mpm prefork
-	useq mpm-worker && try_mpm worker
-	useq mpm-peruser && try_mpm peruser
-	useq mpm-threadpool && try_mpm threadpool
-	useq mpm-leader && try_mpm leader
-
-	if [ "x${mpm}" = "x" ]; then
-		if useq threads; then
-			einfo "Threads specified without a mpm-specification, using mpm-worker."
-			mpm="worker"
-		else
-			einfo "No MPM style was specified, defaulting to mpm-prefork."
-			mpm="prefork"
-		fi
-	fi
-}
-
-parse_modules_config() {
-	local name=""
-	local disable=""
-	[ -f ${1} ] || return 1
-
-	for i in `cat $1 | sed "s/^#.*//"`; do
-		if [ $i == "-" ]; then
-			disable="true"
-		elif [ -z "$name" ] && [ ! -z "`echo $i | grep "mod_"`" ]; then
-			name=`echo $i | sed "s/mod_//"`
-		elif [ "$disable" ] && ( [ $i == "static" ] || [ $i == "shared" ] ); then
-			MY_BUILTINS="${MY_BUILTINS} --disable-$name"
-			name="" ; disable=""
-		elif [ $i == "static" ] || useq static-modules; then
-			MY_BUILTINS="${MY_BUILTINS} --enable-$name=yes"
-			name="" ; disable=""
-		elif [ $i == "shared" ]; then
-			MY_BUILTINS="${MY_BUILTINS} --enable-$name=shared"
-			name="" ; disable=""
-		fi
-	done
-
-	einfo "${1} options:\n${MY_BUILTINS}"
-}
-
-select_modules_config() {
-	parse_modules_config /etc/apache2/apache2-builtin-mods || \
-	parse_modules_config ${GENTOO_PATCHDIR}/conf/apache2-builtin-mods || \
-	return 1
-}
-
-# vim:ts=4
diff --git a/net-www/apache/apache-2.0.54-r13.ebuild b/net-www/apache/apache-2.0.54-r13.ebuild
deleted file mode 100644
index 13c2995aede8..000000000000
--- a/net-www/apache/apache-2.0.54-r13.ebuild
+++ /dev/null
@@ -1,426 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.54-r13.ebuild,v 1.3 2005/08/23 17:09:10 vericgar Exp $
-
-inherit eutils gnuconfig
-
-# latest gentoo apache files
-GENTOO_PATCHNAME="gentoo-apache-${PVR}"
-GENTOO_PATCHSTAMP="20050815"
-GENTOO_DEVSPACE="vericgar"
-GENTOO_PATCHDIR="${WORKDIR}/${GENTOO_PATCHNAME}"
-
-DESCRIPTION="The Apache Web Server, Version 2.0.x"
-HOMEPAGE="http://httpd.apache.org/"
-SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2
-	http://dev.gentoo.org/~${GENTOO_DEVSPACE}/dist/apache/${GENTOO_PATCHNAME}-${GENTOO_PATCHSTAMP}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="apache2 debug doc ldap mpm-leader mpm-peruser mpm-prefork mpm-threadpool mpm-worker no-suexec ssl static-modules threads selinux"
-
-RDEPEND="dev-lang/perl
-	~dev-libs/apr-0.9.6
-	~dev-libs/apr-util-0.9.6
-	dev-libs/expat
-	net-www/gentoo-webroot-default
-	app-misc/mime-types
-	sys-libs/zlib
-	ssl? ( dev-libs/openssl )
-	selinux? ( sec-policy/selinux-apache )
-	!mips? ( ldap? ( =net-nds/openldap-2* ) )"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.59-r4"
-
-S="${WORKDIR}/httpd-${PV}"
-
-big_fat_warnings() {
-	if use mpm-peruser; then
-		ewarn " -BIG- -FAT- -WARNING-"
-		ewarn ""
-		ewarn "The peruser (USE=mpm-peruser) MPM is considered highly experimental"
-		ewarn "and are not (yet) supported, nor are they recommended for production"
-		ewarn "use.  You have been warned!"
-		ewarn
-		ewarn "Continuing in 5 seconds.."
-		sleep 5
-	fi
-
-	ewarn ""
-	ewarn "LFS support has been removed due to incompatibilites with other packages."
-	ewarn "You _will_ have to re-emerge any Apache modules you have installed, or"
-	ewarn "they will likely misbehave/segfault."
-	ewarn ""
-	ewarn ""
-	ewarn "Multiple MPM support has been disabled due to problems with external"
-	ewarn "modules.  If you have relied on this functionality you will need"
-	ewarn "to find another solution.  The Gentoo Apache team apologizes for"
-	ewarn "any inconvienence this may cause you."
-	ewarn ""
-}
-
-pkg_setup() {
-	big_fat_warnings
-	select_mpms
-}
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S} || die
-
-	EPATCH_SUFFIX="patch"
-	epatch ${GENTOO_PATCHDIR}/patches/[0-2]* || die "internal ebuild error"
-
-	# avoid utf-8 charset problems
-	export LC_CTYPE=C
-
-	# setup the filesystem layout config
-	cat ${GENTOO_PATCHDIR}/patches/config.layout >> config.layout
-	sed -i -e 's:version:${PF}:g' config.layout
-
-	# peruser need to build conf
-	WANT_AUTOCONF=2.5 ./buildconf || die "buildconf failed"
-}
-
-src_compile() {
-	setup_apache_vars
-
-	# Detect mips and uclibc systems properly
-	gnuconfig_update
-
-	local modtype
-	if useq static-modules; then
-		modtype="static"
-	else
-		modtype="shared"
-	fi
-
-	select_modules_config || die "determining modules"
-
-	local myconf
-	useq ldap && myconf="${myconf} --enable-auth-ldap=${modtype} --enable-ldap=${modtype}"
-	useq ssl && myconf="${myconf} --with-ssl=/usr  --enable-ssl=${modtype}"
-
-	# Fix for bug #24215 - robbat2@gentoo.org, 30 Oct 2003
-	# We pre-load the cache with the correct answer!  This avoids
-	# it violating the sandbox.  This may have to be changed for
-	# non-Linux systems or if sem_open changes on Linux.  This
-	# hack is built around documentation in /usr/include/semaphore.h
-	# and the glibc (pthread) source
-	echo 'ac_cv_func_sem_open=${ac_cv_func_sem_open=no}' >> ${S}/config.cache
-
-	if useq no-suexec; then
-		myconf="${myconf} --disable-suexec"
-	else
-		myconf="${myconf}
-				--with-suexec-safepath="/usr/local/bin:/usr/bin:/bin" \
-				--with-suexec-logfile=/var/log/apache2/suexec_log \
-				--with-suexec-bin=/usr/sbin/suexec2 \
-				--with-suexec-userdir=${USERDIR} \
-				--with-suexec-caller=apache \
-				--with-suexec-docroot=/var/www \
-				--with-suexec-uidmin=1000 \
-				--with-suexec-gidmin=100 \
-				--with-suexec-umask=077 \
-				--enable-suexec=shared"
-	fi
-
-	# common confopts
-	myconf="${myconf} \
-			--with-apr=/usr \
-			--with-apr-util=/usr \
-			--cache-file=${S}/config.cache \
-			--with-perl=/usr/bin/perl \
-			--with-expat=/usr \
-			--with-z=/usr \
-			--with-port=80 \
-			--enable-layout=Gentoo \
-			--with-program-name=apache2 \
-			--with-devrandom=/dev/urandom \
-			--host=${CHOST} ${MY_BUILTINS}"
-
-	# debugging support
-	if useq debug ; then
-		myconf="${myconf} --enable-maintainer-mode"
-	fi
-
-	./configure --with-mpm=${mpm} ${myconf} || die "bad ./configure please submit bug report to bugs.gentoo.org. Include your config.layout and config.log"
-
-	# we don't want to try and recompile the ssl_expr_parse.c file, because
-	# the lex source is broken
-	touch modules/ssl/ssl_expr_scan.c
-
-	# as decided on IRC-AGENDA-10.2004, we use httpd.conf as standard config file name
-	sed -i -e 's:apache2\.conf:httpd.conf:' include/ap_config_auto.h
-
-	emake || die "problem compiling apache2"
-
-	# build ssl version of apache bench (ab-ssl)
-	if useq ssl; then
-		cd support
-		rm -f ab .libs/ab ab.lo ab.o
-		make ab CFLAGS="${CFLAGS} -DUSE_SSL -lcrypto -lssl -I/usr/include/openssl -L/usr/lib" || die
-		mv ab ab-ssl
-		rm -f ab.lo ab.o
-		make ab || die
-	fi
-}
-
-src_install () {
-	# setup apache user and group
-	enewgroup apache 81
-	enewuser apache 81 -1 /var/www apache
-
-	# general install
-	make DESTDIR=${D} install || die
-	dodoc ABOUT_APACHE CHANGES INSTALL LAYOUT LICENSE README* ${GENTOO_PATCHDIR}/docs/robots.txt
-
-	# protect the suexec binary
-	if ! useq no-suexec; then
-		fowners root:apache /usr/sbin/suexec
-		fperms 4710 /usr/sbin/suexec
-	fi
-
-	# apxs needs this to pickup the right lib for install
-	dosym /usr/lib /usr/lib/apache2/lib
-	dosym /var/log/apache2 /usr/lib/apache2/logs
-	dosym /etc/apache2 /usr/lib/apache2/conf
-
-	# Credits to advx.org people for these scripts. Heck, thanks for
-	# the nice layout and everything else ;-)
-	exeinto /usr/sbin
-	for i in apache2logserverstatus apache2splitlogfile; do
-		doexe ${GENTOO_PATCHDIR}/scripts/${i}
-	done
-	# gentestcrt.sh only if USE=ssl
-	useq ssl && doexe ${GENTOO_PATCHDIR}/scripts/gentestcrt.sh
-
-	# some more scripts
-	for i in split-logfile list_hooks.pl logresolve.pl log_server_status; do
-		doexe ${S}/support/${i}
-	done
-
-	# the ssl version of apache bench
-	useq ssl && doexe support/ab-ssl
-
-	# install mpm bins
-	doexe ${S}/apache2
-
-	# modules.d config file snippets
-	insinto /etc/apache2/modules.d
-	doins ${GENTOO_PATCHDIR}/conf/modules.d/45_mod_dav.conf
-	useq ldap && doins ${GENTOO_PATCHDIR}/conf/modules.d/46_mod_ldap.conf
-	if useq ssl; then
-		doins ${GENTOO_PATCHDIR}/conf/modules.d/40_mod_ssl.conf
-		doins ${GENTOO_PATCHDIR}/conf/modules.d/41_mod_ssl.default-vhost.conf
-	fi
-
-	# drop in a convenient link to the manual
-	if useq doc; then
-		insinto /etc/apache2/modules.d
-		doins ${GENTOO_PATCHDIR}/conf/modules.d/00_apache_manual.conf
-		sed -i -e "s:2.0.49:${PVR}:" ${D}/etc/apache2/modules.d/00_apache_manual.conf
-	else
-		rm -rf ${D}/usr/share/doc/${PF}/manual
-	fi
-
-	# SLOT=2
-	cd ${D}
-	for i in htdigest htpasswd logresolve apxs ab rotatelogs dbmmanage checkgid split-logfile; do
-		mv -v usr/sbin/${i} usr/sbin/${i}2
-	done
-	mv -v usr/sbin/apachectl usr/sbin/apache2ctl
-	mv -v usr/sbin/list_hooks.pl usr/sbin/list_hooks2.pl
-	mv -v usr/sbin/logresolve.pl usr/sbin/logresolve2.pl
-	useq ssl && mv -v usr/sbin/ab-ssl usr/sbin/ab2-ssl
-	useq no-suexec || mv -v usr/sbin/suexec usr/sbin/suexec2
-
-	# do the man pages
-	for i in htdigest.1 htpasswd.1 dbmmanage.1; do
-		mv -v usr/share/man/man1/${i} usr/share/man/man1/${i/./2.}
-	done
-	for i in ab.8 apxs.8 logresolve.8 rotatelogs.8; do
-		mv -v usr/share/man/man8/${i} usr/share/man/man8/${i/./2.}
-	done
-	useq no-suexec || mv -v usr/share/man/man8/suexec.8 usr/share/man/man8/suexec2.8
-	mv -v usr/share/man/man8/apachectl.8 usr/share/man/man8/apache2ctl.8
-	mv -v usr/share/man/man8/httpd.8 usr/share/man/man8/apache2.8
-
-	# tidy up
-	mv usr/sbin/envvars* usr/lib/apache2/build
-	dodoc etc/apache2/*-std.conf
-	rm -f etc/apache2/*.conf
-	rm -rf var/run var/log
-
-	# we DEPEND on net-www/gentoo-webroot-default for sharing this by now
-	rm -rf var/www/localhost
-
-	# config files
-	insinto /etc/conf.d
-	newins ${GENTOO_PATCHDIR}/init/apache2.confd apache2
-
-	exeinto /etc/init.d
-	newexe ${GENTOO_PATCHDIR}/init/apache2.initd apache2
-
-	insinto /etc/logrotate.d
-	newins ${GENTOO_PATCHDIR}/scripts/apache2-logrotate apache2
-
-	insinto /etc/apache2
-	doins ${GENTOO_PATCHDIR}/conf/apache2-builtin-mods
-	doins ${GENTOO_PATCHDIR}/conf/httpd.conf
-
-	insinto /etc/apache2/vhosts.d
-	doins ${GENTOO_PATCHDIR}/conf/vhosts.d/00_default_vhost.conf
-
-	keepdir /etc/apache2/vhosts.d
-	keepdir /etc/apache2/modules.d
-
-	# fix bug 92348
-	fperms 755 /usr/sbin/apache2logserverstatus
-	fperms 755 /usr/sbin/apache2splitlogfile
-
-	# empty dirs
-	for i in /var/lib/dav /var/log/apache2 /var/cache/apache2; do
-		keepdir ${i}
-		fowners apache:apache ${i}
-		fperms 755 ${i}
-	done
-
-	# We'll be needing /etc/apache2/ssl if USE=ssl
-	useq ssl && keepdir /etc/apache2/ssl
-
-}
-
-pkg_postinst() {
-
-	# Automatically generate test ceritificates if ssl USE flag is beeing set
-	if useq ssl; then
-		cd ${ROOT}/etc/apache2/ssl
-		einfo
-		einfo "Generating self-signed test certificate in /etc/apache2/ssl..."
-		yes "" 2>/dev/null | \
-			${ROOT}/usr/sbin/gentestcrt.sh >/dev/null 2>&1 || \
-			die "gentestcrt.sh failed"
-		einfo
-	fi
-
-	# Check for dual/upgrade install
-	if has_version '=net-www/apache-1*' || ! use apache2 ; then
-		ewarn
-		ewarn "Please add the 'apache2' flag to your USE variable and (re)install"
-		ewarn "any additional DSO modules you may wish to use with Apache-2.x."
-		ewarn "Addon modules are configured in /etc/apache2/modules.d/"
-		ewarn
-	fi
-
-	# Check for obsolete symlinks
-	local list=""
-	for i in lib logs modules extramodules; do
-		local d="/etc/apache2/${i}"
-		[ -s "${d}" ] && list="${list} ${d}"
-	done
-	[ -n "${list}" ] && einfo "You should delete these old symlinks: ${list}"
-
-	if has_version '<net-www/apache-2.0.54-r10' && has_version '>=net-www/apache-2.0.0' ; then
-		einfo "Configuration locations have changed, you will need to migrate"
-		einfo "your configuration from /etc/apache2/conf/apache2.conf and"
-		einfo "/etc/apache2/conf/commonapache2.conf to /etc/apache2/httpd.conf."
-		einfo
-		einfo "Apache now checks for the old configuration and refuses to start"
-		einfo "if it exists. You must remove the old configuration first"
-		einfo
-		einfo "You should also at this time rebuild all your modules"
-		einfo
-		einfo "For more information, see"
-		einfo "    http://www.gentoo.org/proj/en/apache/upgrading.xml"
-		einfo
-	fi
-
-	big_fat_warnings
-}
-
-setup_apache_vars() {
-	# actually we do not provide a very dynamic way of those vars
-	# however, you may predefine them in shell before emerging
-	# to override the official default locations
-
-	# standard location for Gentoo Linux
-	DATADIR="${DATADIR:-/var/www/localhost}"
-	USERDIR="${USERDIR:-public_html}"
-
-	einfo "DATADIR is set to: ${DATADIR}"
-	einfo "USERDIR is set to: ${USERDIR}"
-}
-
-mpm_die() {
-	eerror "You attempted to specify the MPM $1, but MPM $2 was already specified."
-	eerror "The apache ebuilds no longer support multiple MPM installations.  Please choose"
-	eerror "one MPM and reinstall."
-	die "More than one MPM was specified."
-}
-
-try_mpm() {
-	local nmpm=$1
-
-	if [ -z "${nmpm}" ]; then
-		die "mpm to try not specified!"
-	fi
-
-	if [ -n "${mpm}" ]; then
-		mpm_die ${nmpm} ${mpm}
-	fi
-
-	mpm="${nmpm}"
-}
-
-select_mpms() {
-	useq mpm-prefork && try_mpm prefork
-	useq mpm-worker && try_mpm worker
-	useq mpm-peruser && try_mpm peruser
-	useq mpm-threadpool && try_mpm threadpool
-	useq mpm-leader && try_mpm leader
-
-	if [ "x${mpm}" = "x" ]; then
-		if useq threads; then
-			einfo "Threads specified without a mpm-specification, using mpm-worker."
-			mpm="worker"
-		else
-			einfo "No MPM style was specified, defaulting to mpm-prefork."
-			mpm="prefork"
-		fi
-	fi
-}
-
-parse_modules_config() {
-	local name=""
-	local disable=""
-	[ -f ${1} ] || return 1
-
-	for i in `cat $1 | sed "s/^#.*//"`; do
-		if [ $i == "-" ]; then
-			disable="true"
-		elif [ -z "$name" ] && [ ! -z "`echo $i | grep "mod_"`" ]; then
-			name=`echo $i | sed "s/mod_//"`
-		elif [ "$disable" ] && ( [ $i == "static" ] || [ $i == "shared" ] ); then
-			MY_BUILTINS="${MY_BUILTINS} --disable-$name"
-			name="" ; disable=""
-		elif [ $i == "static" ] || useq static-modules; then
-			MY_BUILTINS="${MY_BUILTINS} --enable-$name=yes"
-			name="" ; disable=""
-		elif [ $i == "shared" ]; then
-			MY_BUILTINS="${MY_BUILTINS} --enable-$name=shared"
-			name="" ; disable=""
-		fi
-	done
-
-	einfo "${1} options:\n${MY_BUILTINS}"
-}
-
-select_modules_config() {
-	parse_modules_config /etc/apache2/apache2-builtin-mods || \
-	parse_modules_config ${GENTOO_PATCHDIR}/conf/apache2-builtin-mods || \
-	return 1
-}
-
-# vim:ts=4
diff --git a/net-www/apache/apache-2.0.54-r14.ebuild b/net-www/apache/apache-2.0.54-r14.ebuild
deleted file mode 100644
index d3e9c5b18e44..000000000000
--- a/net-www/apache/apache-2.0.54-r14.ebuild
+++ /dev/null
@@ -1,426 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.54-r14.ebuild,v 1.3 2005/08/23 17:09:10 vericgar Exp $
-
-inherit eutils gnuconfig
-
-# latest gentoo apache files
-GENTOO_PATCHNAME="gentoo-apache-${PVR}"
-GENTOO_PATCHSTAMP="20050822"
-GENTOO_DEVSPACE="hollow"
-GENTOO_PATCHDIR="${WORKDIR}/${GENTOO_PATCHNAME}"
-
-DESCRIPTION="The Apache Web Server, Version 2.0.x"
-HOMEPAGE="http://httpd.apache.org/"
-SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2
-	http://dev.gentoo.org/~${GENTOO_DEVSPACE}/dist/apache/${GENTOO_PATCHNAME}-${GENTOO_PATCHSTAMP}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="apache2 debug doc ldap mpm-leader mpm-peruser mpm-prefork mpm-threadpool mpm-worker no-suexec ssl static-modules threads selinux"
-
-RDEPEND="dev-lang/perl
-	~dev-libs/apr-0.9.6
-	~dev-libs/apr-util-0.9.6
-	dev-libs/expat
-	net-www/gentoo-webroot-default
-	app-misc/mime-types
-	sys-libs/zlib
-	ssl? ( dev-libs/openssl )
-	selinux? ( sec-policy/selinux-apache )
-	!mips? ( ldap? ( =net-nds/openldap-2* ) )"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.59-r4"
-
-S="${WORKDIR}/httpd-${PV}"
-
-big_fat_warnings() {
-	if use mpm-peruser; then
-		ewarn " -BIG- -FAT- -WARNING-"
-		ewarn ""
-		ewarn "The peruser (USE=mpm-peruser) MPM is considered highly experimental"
-		ewarn "and are not (yet) supported, nor are they recommended for production"
-		ewarn "use.  You have been warned!"
-		ewarn
-		ewarn "Continuing in 5 seconds.."
-		sleep 5
-	fi
-
-	ewarn ""
-	ewarn "LFS support has been removed due to incompatibilites with other packages."
-	ewarn "You _will_ have to re-emerge any Apache modules you have installed, or"
-	ewarn "they will likely misbehave/segfault."
-	ewarn ""
-	ewarn ""
-	ewarn "Multiple MPM support has been disabled due to problems with external"
-	ewarn "modules.  If you have relied on this functionality you will need"
-	ewarn "to find another solution.  The Gentoo Apache team apologizes for"
-	ewarn "any inconvienence this may cause you."
-	ewarn ""
-}
-
-pkg_setup() {
-	big_fat_warnings
-	select_mpms
-}
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S} || die
-
-	EPATCH_SUFFIX="patch"
-	epatch ${GENTOO_PATCHDIR}/patches/[0-2]* || die "internal ebuild error"
-
-	# avoid utf-8 charset problems
-	export LC_CTYPE=C
-
-	# setup the filesystem layout config
-	cat ${GENTOO_PATCHDIR}/patches/config.layout >> config.layout
-	sed -i -e 's:version:${PF}:g' config.layout
-
-	# peruser need to build conf
-	WANT_AUTOCONF=2.5 ./buildconf || die "buildconf failed"
-}
-
-src_compile() {
-	setup_apache_vars
-
-	# Detect mips and uclibc systems properly
-	gnuconfig_update
-
-	local modtype
-	if useq static-modules; then
-		modtype="static"
-	else
-		modtype="shared"
-	fi
-
-	select_modules_config || die "determining modules"
-
-	local myconf
-	useq ldap && myconf="${myconf} --enable-auth-ldap=${modtype} --enable-ldap=${modtype}"
-	useq ssl && myconf="${myconf} --with-ssl=/usr  --enable-ssl=${modtype}"
-
-	# Fix for bug #24215 - robbat2@gentoo.org, 30 Oct 2003
-	# We pre-load the cache with the correct answer!  This avoids
-	# it violating the sandbox.  This may have to be changed for
-	# non-Linux systems or if sem_open changes on Linux.  This
-	# hack is built around documentation in /usr/include/semaphore.h
-	# and the glibc (pthread) source
-	echo 'ac_cv_func_sem_open=${ac_cv_func_sem_open=no}' >> ${S}/config.cache
-
-	if useq no-suexec; then
-		myconf="${myconf} --disable-suexec"
-	else
-		myconf="${myconf}
-				--with-suexec-safepath="/usr/local/bin:/usr/bin:/bin" \
-				--with-suexec-logfile=/var/log/apache2/suexec_log \
-				--with-suexec-bin=/usr/sbin/suexec2 \
-				--with-suexec-userdir=${USERDIR} \
-				--with-suexec-caller=apache \
-				--with-suexec-docroot=/var/www \
-				--with-suexec-uidmin=1000 \
-				--with-suexec-gidmin=100 \
-				--with-suexec-umask=077 \
-				--enable-suexec=shared"
-	fi
-
-	# common confopts
-	myconf="${myconf} \
-			--with-apr=/usr \
-			--with-apr-util=/usr \
-			--cache-file=${S}/config.cache \
-			--with-perl=/usr/bin/perl \
-			--with-expat=/usr \
-			--with-z=/usr \
-			--with-port=80 \
-			--enable-layout=Gentoo \
-			--with-program-name=apache2 \
-			--with-devrandom=/dev/urandom \
-			--host=${CHOST} ${MY_BUILTINS}"
-
-	# debugging support
-	if useq debug ; then
-		myconf="${myconf} --enable-maintainer-mode"
-	fi
-
-	./configure --with-mpm=${mpm} ${myconf} || die "bad ./configure please submit bug report to bugs.gentoo.org. Include your config.layout and config.log"
-
-	# we don't want to try and recompile the ssl_expr_parse.c file, because
-	# the lex source is broken
-	touch modules/ssl/ssl_expr_scan.c
-
-	# as decided on IRC-AGENDA-10.2004, we use httpd.conf as standard config file name
-	sed -i -e 's:apache2\.conf:httpd.conf:' include/ap_config_auto.h
-
-	emake || die "problem compiling apache2"
-
-	# build ssl version of apache bench (ab-ssl)
-	if useq ssl; then
-		cd support
-		rm -f ab .libs/ab ab.lo ab.o
-		make ab CFLAGS="${CFLAGS} -DUSE_SSL -lcrypto -lssl -I/usr/include/openssl -L/usr/lib" || die
-		mv ab ab-ssl
-		rm -f ab.lo ab.o
-		make ab || die
-	fi
-}
-
-src_install () {
-	# setup apache user and group
-	enewgroup apache 81
-	enewuser apache 81 -1 /var/www apache
-
-	# general install
-	make DESTDIR=${D} install || die
-	dodoc ABOUT_APACHE CHANGES INSTALL LAYOUT LICENSE README* ${GENTOO_PATCHDIR}/docs/robots.txt
-
-	# protect the suexec binary
-	if ! useq no-suexec; then
-		fowners root:apache /usr/sbin/suexec
-		fperms 4710 /usr/sbin/suexec
-	fi
-
-	# apxs needs this to pickup the right lib for install
-	dosym /usr/lib /usr/lib/apache2/lib
-	dosym /var/log/apache2 /usr/lib/apache2/logs
-	dosym /etc/apache2 /usr/lib/apache2/conf
-
-	# Credits to advx.org people for these scripts. Heck, thanks for
-	# the nice layout and everything else ;-)
-	exeinto /usr/sbin
-	for i in apache2logserverstatus apache2splitlogfile; do
-		doexe ${GENTOO_PATCHDIR}/scripts/${i}
-	done
-	# gentestcrt.sh only if USE=ssl
-	useq ssl && doexe ${GENTOO_PATCHDIR}/scripts/gentestcrt.sh
-
-	# some more scripts
-	for i in split-logfile list_hooks.pl logresolve.pl log_server_status; do
-		doexe ${S}/support/${i}
-	done
-
-	# the ssl version of apache bench
-	useq ssl && doexe support/ab-ssl
-
-	# install mpm bins
-	doexe ${S}/apache2
-
-	# modules.d config file snippets
-	insinto /etc/apache2/modules.d
-	doins ${GENTOO_PATCHDIR}/conf/modules.d/45_mod_dav.conf
-	useq ldap && doins ${GENTOO_PATCHDIR}/conf/modules.d/46_mod_ldap.conf
-	if useq ssl; then
-		doins ${GENTOO_PATCHDIR}/conf/modules.d/40_mod_ssl.conf
-		doins ${GENTOO_PATCHDIR}/conf/modules.d/41_mod_ssl.default-vhost.conf
-	fi
-
-	# drop in a convenient link to the manual
-	if useq doc; then
-		insinto /etc/apache2/modules.d
-		doins ${GENTOO_PATCHDIR}/conf/modules.d/00_apache_manual.conf
-		sed -i -e "s:2.0.49:${PVR}:" ${D}/etc/apache2/modules.d/00_apache_manual.conf
-	else
-		rm -rf ${D}/usr/share/doc/${PF}/manual
-	fi
-
-	# SLOT=2
-	cd ${D}
-	for i in htdigest htpasswd logresolve apxs ab rotatelogs dbmmanage checkgid split-logfile; do
-		mv -v usr/sbin/${i} usr/sbin/${i}2
-	done
-	mv -v usr/sbin/apachectl usr/sbin/apache2ctl
-	mv -v usr/sbin/list_hooks.pl usr/sbin/list_hooks2.pl
-	mv -v usr/sbin/logresolve.pl usr/sbin/logresolve2.pl
-	useq ssl && mv -v usr/sbin/ab-ssl usr/sbin/ab2-ssl
-	useq no-suexec || mv -v usr/sbin/suexec usr/sbin/suexec2
-
-	# do the man pages
-	for i in htdigest.1 htpasswd.1 dbmmanage.1; do
-		mv -v usr/share/man/man1/${i} usr/share/man/man1/${i/./2.}
-	done
-	for i in ab.8 apxs.8 logresolve.8 rotatelogs.8; do
-		mv -v usr/share/man/man8/${i} usr/share/man/man8/${i/./2.}
-	done
-	useq no-suexec || mv -v usr/share/man/man8/suexec.8 usr/share/man/man8/suexec2.8
-	mv -v usr/share/man/man8/apachectl.8 usr/share/man/man8/apache2ctl.8
-	mv -v usr/share/man/man8/httpd.8 usr/share/man/man8/apache2.8
-
-	# tidy up
-	mv usr/sbin/envvars* usr/lib/apache2/build
-	dodoc etc/apache2/*-std.conf
-	rm -f etc/apache2/*.conf
-	rm -rf var/run var/log
-
-	# we DEPEND on net-www/gentoo-webroot-default for sharing this by now
-	rm -rf var/www/localhost
-
-	# config files
-	insinto /etc/conf.d
-	newins ${GENTOO_PATCHDIR}/init/apache2.confd apache2
-
-	exeinto /etc/init.d
-	newexe ${GENTOO_PATCHDIR}/init/apache2.initd apache2
-
-	insinto /etc/logrotate.d
-	newins ${GENTOO_PATCHDIR}/scripts/apache2-logrotate apache2
-
-	insinto /etc/apache2
-	doins ${GENTOO_PATCHDIR}/conf/apache2-builtin-mods
-	doins ${GENTOO_PATCHDIR}/conf/httpd.conf
-
-	insinto /etc/apache2/vhosts.d
-	doins ${GENTOO_PATCHDIR}/conf/vhosts.d/00_default_vhost.conf
-
-	keepdir /etc/apache2/vhosts.d
-	keepdir /etc/apache2/modules.d
-
-	# fix bug 92348
-	fperms 755 /usr/sbin/apache2logserverstatus
-	fperms 755 /usr/sbin/apache2splitlogfile
-
-	# empty dirs
-	for i in /var/lib/dav /var/log/apache2 /var/cache/apache2; do
-		keepdir ${i}
-		fowners apache:apache ${i}
-		fperms 755 ${i}
-	done
-
-	# We'll be needing /etc/apache2/ssl if USE=ssl
-	useq ssl && keepdir /etc/apache2/ssl
-
-}
-
-pkg_postinst() {
-
-	# Automatically generate test ceritificates if ssl USE flag is beeing set
-	if useq ssl; then
-		cd ${ROOT}/etc/apache2/ssl
-		einfo
-		einfo "Generating self-signed test certificate in /etc/apache2/ssl..."
-		yes "" 2>/dev/null | \
-			${ROOT}/usr/sbin/gentestcrt.sh >/dev/null 2>&1 || \
-			die "gentestcrt.sh failed"
-		einfo
-	fi
-
-	# Check for dual/upgrade install
-	if has_version '=net-www/apache-1*' || ! use apache2 ; then
-		ewarn
-		ewarn "Please add the 'apache2' flag to your USE variable and (re)install"
-		ewarn "any additional DSO modules you may wish to use with Apache-2.x."
-		ewarn "Addon modules are configured in /etc/apache2/modules.d/"
-		ewarn
-	fi
-
-	# Check for obsolete symlinks
-	local list=""
-	for i in lib logs modules extramodules; do
-		local d="/etc/apache2/${i}"
-		[ -s "${d}" ] && list="${list} ${d}"
-	done
-	[ -n "${list}" ] && einfo "You should delete these old symlinks: ${list}"
-
-	if has_version '<net-www/apache-2.0.54-r10' && has_version '>=net-www/apache-2.0.0' ; then
-		einfo "Configuration locations have changed, you will need to migrate"
-		einfo "your configuration from /etc/apache2/conf/apache2.conf and"
-		einfo "/etc/apache2/conf/commonapache2.conf to /etc/apache2/httpd.conf."
-		einfo
-		einfo "Apache now checks for the old configuration and refuses to start"
-		einfo "if it exists. You must remove the old configuration first"
-		einfo
-		einfo "You should also at this time rebuild all your modules"
-		einfo
-		einfo "For more information, see"
-		einfo "    http://www.gentoo.org/proj/en/apache/upgrading.xml"
-		einfo
-	fi
-
-	big_fat_warnings
-}
-
-setup_apache_vars() {
-	# actually we do not provide a very dynamic way of those vars
-	# however, you may predefine them in shell before emerging
-	# to override the official default locations
-
-	# standard location for Gentoo Linux
-	DATADIR="${DATADIR:-/var/www/localhost}"
-	USERDIR="${USERDIR:-public_html}"
-
-	einfo "DATADIR is set to: ${DATADIR}"
-	einfo "USERDIR is set to: ${USERDIR}"
-}
-
-mpm_die() {
-	eerror "You attempted to specify the MPM $1, but MPM $2 was already specified."
-	eerror "The apache ebuilds no longer support multiple MPM installations.  Please choose"
-	eerror "one MPM and reinstall."
-	die "More than one MPM was specified."
-}
-
-try_mpm() {
-	local nmpm=$1
-
-	if [ -z "${nmpm}" ]; then
-		die "mpm to try not specified!"
-	fi
-
-	if [ -n "${mpm}" ]; then
-		mpm_die ${nmpm} ${mpm}
-	fi
-
-	mpm="${nmpm}"
-}
-
-select_mpms() {
-	useq mpm-prefork && try_mpm prefork
-	useq mpm-worker && try_mpm worker
-	useq mpm-peruser && try_mpm peruser
-	useq mpm-threadpool && try_mpm threadpool
-	useq mpm-leader && try_mpm leader
-
-	if [ "x${mpm}" = "x" ]; then
-		if useq threads; then
-			einfo "Threads specified without a mpm-specification, using mpm-worker."
-			mpm="worker"
-		else
-			einfo "No MPM style was specified, defaulting to mpm-prefork."
-			mpm="prefork"
-		fi
-	fi
-}
-
-parse_modules_config() {
-	local name=""
-	local disable=""
-	[ -f ${1} ] || return 1
-
-	for i in `cat $1 | sed "s/^#.*//"`; do
-		if [ $i == "-" ]; then
-			disable="true"
-		elif [ -z "$name" ] && [ ! -z "`echo $i | grep "mod_"`" ]; then
-			name=`echo $i | sed "s/mod_//"`
-		elif [ "$disable" ] && ( [ $i == "static" ] || [ $i == "shared" ] ); then
-			MY_BUILTINS="${MY_BUILTINS} --disable-$name"
-			name="" ; disable=""
-		elif [ $i == "static" ] || useq static-modules; then
-			MY_BUILTINS="${MY_BUILTINS} --enable-$name=yes"
-			name="" ; disable=""
-		elif [ $i == "shared" ]; then
-			MY_BUILTINS="${MY_BUILTINS} --enable-$name=shared"
-			name="" ; disable=""
-		fi
-	done
-
-	einfo "${1} options:\n${MY_BUILTINS}"
-}
-
-select_modules_config() {
-	parse_modules_config /etc/apache2/apache2-builtin-mods || \
-	parse_modules_config ${GENTOO_PATCHDIR}/conf/apache2-builtin-mods || \
-	return 1
-}
-
-# vim:ts=4
diff --git a/net-www/apache/apache-2.0.54-r30.ebuild b/net-www/apache/apache-2.0.54-r30.ebuild
index 7951d0ca108f..2312128299c3 100644
--- a/net-www/apache/apache-2.0.54-r30.ebuild
+++ b/net-www/apache/apache-2.0.54-r30.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.54-r30.ebuild,v 1.1 2005/09/10 19:58:24 vericgar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.54-r30.ebuild,v 1.2 2005/09/10 20:30:07 vericgar Exp $
 
 inherit eutils gnuconfig
 
@@ -322,7 +322,7 @@ pkg_postinst() {
 	done
 	[ -n "${list}" ] && einfo "You should delete these old symlinks: ${list}"
 
-	if has_version '<net-www/apache-2.0.54-r10' && has_version '>=net-www/apache-2.0.0' ; then
+	if has_version '<net-www/apache-2.0.54-r30' && has_version '>=net-www/apache-2.0.0' ; then
 		einfo "Configuration locations have changed, you will need to migrate"
 		einfo "your configuration from /etc/apache2/conf/apache2.conf and"
 		einfo "/etc/apache2/conf/commonapache2.conf to /etc/apache2/httpd.conf."
diff --git a/net-www/apache/apache-2.0.54-r7.ebuild b/net-www/apache/apache-2.0.54-r7.ebuild
deleted file mode 100644
index 2f0a152a1378..000000000000
--- a/net-www/apache/apache-2.0.54-r7.ebuild
+++ /dev/null
@@ -1,403 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.54-r7.ebuild,v 1.5 2005/07/08 02:52:40 vapier Exp $
-
-inherit flag-o-matic eutils fixheadtails gnuconfig
-
-PATCH_LEVEL="2.0.54-r7"
-S="${WORKDIR}/httpd-${PV}"
-DESCRIPTION="Apache Web Server, Version 2.0.x"
-HOMEPAGE="http://www.apache.org/"
-SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2
-	http://dev.gentoo.org/~vericgar/dist/apache/old/apache-patches-${PATCH_LEVEL}.tar.bz2
-	http://dev.gentoo.org/~vericgar/dist/apache/old/apache-conf-${PATCH_LEVEL}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
-IUSE="berkdb gdbm ldap threads ipv6 doc static ssl selinux"
-
-#Standard location for Gentoo Linux
-DATADIR="/var/www/localhost"
-
-# Location for the two additional tarballs
-APACHE_PATCHDIR=${WORKDIR}/apache-patches-${PATCH_LEVEL}
-APACHE_CONFDIR=${WORKDIR}/apache-conf-${PATCH_LEVEL}
-
-DEPEND="dev-util/yacc
-	dev-lang/perl
-	sys-libs/zlib
-	dev-libs/expat
-	dev-libs/openssl
-	>=sys-devel/autoconf-2.59-r4
-	berkdb? ( sys-libs/db )
-	gdbm? ( sys-libs/gdbm )
-	!mips? ( ldap? ( =net-nds/openldap-2* ) )
-	selinux? ( sec-policy/selinux-apache )
-	!dev-libs/apr
-	!dev-libs/apr-util"
-
-apache_setup_vars() {
-	# Sets the USERDIR to default.
-	USERDIR="public_html"
-	einfo "DATADIR is set to: ${DATADIR}"
-	einfo "USERDIR is set to: $USERDIR"
-}
-
-set_filter_flags() {
-	CFLAGS="${CFLAGS/  / }"
-	has_version =sys-libs/glibc-2.2* && filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-}
-
-src_unpack() {
-	set_filter_flags
-
-	unpack ${A} || die
-	cd ${S} || die
-
-	# apply the patches from the patch tarball
-	EPATCH_SUFFIX="patch"
-	epatch ${APACHE_PATCHDIR} || die
-
-	if use berkdb; then
-		einfo "Enabling berkdb."
-		if has_version '=sys-libs/db-4*'; then
-			einfo "Enabling db4"
-			myconf="${myconf} --with-dbm=db4 --with-berkely-db=/usr"
-		elif has_version '=sys-libs/db-3*'; then
-			einfo "Enabling db3"
-			myconf="${myconf} --with-dbm=db3 --with-berkely-db=/usr"
-		elif has_version '=sys-libs/db-2'; then
-			einfo "Enabling db2"
-			myconf="${myconf} --with-dbm=db2 --with-berkely-db=/usr"
-		fi
-	else
-		echo "Disabling berkdb"
-	fi
-
-	#avoid utf-8 charset problems
-	export LC_CTYPE=C
-
-	ht_fix_file srclib/apr/build/buildcheck.sh
-
-	#give it the stamp
-	sed -i -e 's:(" PLATFORM "):(Gentoo/Linux):g' server/core.c
-
-	#fix perl with perl!
-	find . -type f | xargs perl -pi -e \
-		"s|/usr/local/bin/perl|/usr/bin/perl|g; \
-		s|/usr/local/bin/perl5|/usr/bin/perl|g; \
-		s|/path/to/bin/perl|/usr/bin/perl|g;"
-	#dont want this cruft in /usr/bin
-	sed -i -e 's:@exp_bindir@:@exp_installbuilddir:g' support/apachectl.in
-
-	#setup the filesystem layout config
-	cat ${FILESDIR}/common/config.layout >> config.layout
-	sed -i -e 's:version:${PF}:g' config.layout
-
-	cat ${FILESDIR}/common/apr-config.layout >> srclib/apr/config.layout
-	cat ${FILESDIR}/common/apr-util-config.layout >> srclib/apr-util/config.layout
-
-	sed -i -e "s:/var/www/localhost:${DATADIR}:g" srclib/apr/config.layout
-	sed -i -e "s:/var/www/localhost:${DATADIR}:g" srclib/apr-util/config.layout
-
-	WANT_AUTOCONF=2.5 ./buildconf || die "buildconf failed"
-}
-
-src_compile() {
-	set_filter_flags
-	apache_setup_vars
-
-	# Detect mips and uclibc systems properly
-	gnuconfig_update
-
-	local myconf
-	if use ldap; then
-		if use mips; then
-			eerror "Sorry, LDAP support isn't available yet for MIPS"
-			eerror "Test out OpenLDAP and report it via BugZilla!"
-			eerror "Continuing in 5 seconds"
-			sleep 5s
-		else
-			einfo "Enabling LDAP"
-			if use static; then
-			  myconf="--with-ldap --enable-auth-ldap=static --enable-ldap=static"
-			else
-			  myconf="--with-ldap --enable-auth-ldap=shared --enable-ldap=shared"
-			fi
-		fi
-	fi
-
-	if use ipv6; then
-		einfo "Enabling ipv6"
-		myconf="${myconf} --enable-vp4"
-	else
-		myconf="${myconf} --disable-ipv6"
-	fi
-
-	if use threads; then
-		einfo "Enabling threads support"
-		myconf="${myconf} --with-mpm=worker"
-	else
-		myconf="${myconf} --with-mpm=${MPM:=prefork}"
-	fi
-
-	select_modules_config || die "determining modules"
-
-	# Fix for bug #24215 - robbat2@gentoo.org, 30 Oct 2003
-	# We pre-load the cache with the correct answer!  This avoids
-	# it violating the sandbox.  This may have to be changed for
-	# non-Linux systems or if sem_open changes on Linux.  This
-	# hack is built around documentation in /usr/include/semaphore.h
-	# and the glibc (pthread) source
-	echo 'ac_cv_func_sem_open=${ac_cv_func_sem_open=no}' >> ${S}/config.cache
-
-	# Workaround for bug #32444 - robbat2@gentoo.org, 28 Nov 2003
-	# Apache2 tries to build SCTP support even when all the parts of it aren't there
-	# So for the moment we tell it to ignore SCTP support
-	echo 'ac_cv_sctp=${ac_cv_sctp=no}' >> ${S}/config.cache
-	echo 'ac_cv_header_netinet_sctp_h=${ac_cv_header_netinet_sctp_h=no}' >> ${S}/config.cache
-	echo 'ac_cv_header_netinet_sctp_uio_h=${ac_cv_header_netinet_sctp_uio_h=no}' >> ${S}/config.cache
-
-	SSL_BASE="SYSTEM" \
-	WANT_AUTOCONF_2_5=1 WANT_AUTOCONF=2.5
-	./configure \
-		--with-suexec-safepath="/usr/local/bin:/usr/bin:/bin" \
-		--with-suexec-logfile=/var/log/apache2/suexec_log \
-		--with-suexec-bin=/usr/sbin/suexec2 \
-		--with-suexec-userdir=${USERDIR} \
-		--with-suexec-caller=apache \
-		--with-suexec-docroot=/var/www \
-		--with-suexec-uidmin=1000 \
-		--with-suexec-gidmin=100 \
-		--with-suexec-umask=077 \
-		--enable-suexec=shared \
-		\
-		${MY_BUILTINS} \
-		\
-		--cache-file=${S}/config.cache \
-		--with-perl=/usr/bin/perl \
-		--with-expat=/usr \
-		--with-ssl=/usr \
-		--with-z=/usr \
-		--with-port=80 \
-		--enable-layout=Gentoo \
-		--with-program-name=apache2 \
-		--with-devrandom=/dev/urandom \
-		--host=${CHOST} ${myconf} || die "bad ./configure please submit bug report to bugs.gentoo.org. Include your config.layout."
-		#--with-mpm={worker|prefork|perchild|leader|threadpool}
-
-	# we don't want to try and recompile the ssl_expr_parse.c file, because
-	# the lex source is broken
-	touch modules/ssl/ssl_expr_scan.c
-
-	emake || die "problem compiling Apache2 :("
-
-	#build ssl version of apache bench (ab-ssl)
-	cd support; rm -f ab .libs/ab ab.lo ab.o
-	make ab CFLAGS="${CFLAGS} -DUSE_SSL -lcrypto -lssl \
-		-I/usr/include/openssl -L/usr/lib" || die
-	mv ab ab-ssl; mv .libs/ab .libs/ab-ssl; rm -f ab.lo ab.o
-	make ab || die
-}
-
-src_install () {
-	set_filter_flags
-
-	local i
-	make DESTDIR=${D} install || die
-	dodoc ABOUT_APACHE CHANGES INSTALL LAYOUT \
-		LICENSE README* ${FILESDIR}/robots.txt
-
-	#bogus values pointing at /var/tmp/portage
-	sed -i -e 's:APR_SOURCE_DIR=.*:APR_SOURCE_DIR=:g' ${D}/usr/bin/apr-config
-	sed -i -e 's:APU_SOURCE_DIR=.*:APU_SOURCE_DIR=:g' ${D}/usr/bin/apu-config
-	sed -i -e 's:APU_BUILD_DIR=.*:APU_BUILD_DIR=:g' ${D}/usr/bin/apu-config
-
-	#protect the suexec binary
-	local gid=`id -g apache`
-	[ -z "${gid}" ] && gid=81
-	fowners root:${gid} /usr/sbin/suexec
-	fperms 4710 /usr/sbin/suexec
-
-	#apxs needs this to pickup the right lib for install
-	dosym /usr/lib /usr/lib/apache2/lib
-	dosym /var/log/apache2 /usr/lib/apache2/logs
-	dosym /usr/lib/apache2-extramodules /usr/lib/apache2/extramodules
-	dosym /etc/apache2/conf /usr/lib/apache2/conf
-
-	cd ${S}
-	#Credits to advx.org people for these scripts. Heck, thanks for
-	#the nice layout and everything else ;-)
-	for i in apache2logserverstatus apache2splitlogfile
-	do
-		dosbin ${APACHE_CONFDIR}/usr/sbin/$i
-	done
-	exeinto /usr/lib/ssl/apache2-mod_ssl
-	doexe ${APACHE_CONFDIR}/usr/lib/ssl/apache2-mod_ssl/gentestcrt.sh
-
-	#some more scripts
-	for i in split-logfile list_hooks.pl logresolve.pl log_server_status
-	do
-		dosbin ${S}/support/$i
-	done
-	#the ssl version of apache bench
-	dosbin support/.libs/ab-ssl
-
-	#move some mods to extramodules
-	dodir /usr/lib/apache2-extramodules
-	for i in mod_ssl.so mod_ldap.so mod_auth_ldap.so
-	do
-		[ -x ${D}/usr/lib/apache2/modules/$i ] && \
-		mv ${D}/usr/lib/apache2/modules/$i ${D}/usr/lib/apache2-extramodules
-	done
-
-	#tidy up
-	mv ${D}/usr/sbin/envvars* ${D}/usr/lib/apache2/build
-	dodoc ${D}/etc/apache2/conf/*-std.conf
-	rm -f ${D}/etc/apache2/conf/*.conf
-	rm -rf ${D}/var/log ${D}/var/run
-
-	# install our default config files
-	cd ${D}
-	( cd ${APACHE_CONFDIR} && tar -cpvf - * ) | tar -xpvf -
-	find etc/apache2 -type f -exec chmod 644 {} \;
-	find etc/apache2 -type f -exec chown root: {} \;
-
-	#drop in a convenient link to the manual
-	if use doc; then
-		dosym /usr/share/doc/${PF}/manual ${DATADIR}/htdocs/manual
-	else
-		rm -rf ${D}/usr/share/doc/${PF}/manual
-	fi
-
-	#SLOT=2!!!
-	cd ${D}
-	mv -v usr/sbin/apachectl usr/sbin/apache2ctl
-	mv -v usr/sbin/htdigest usr/sbin/htdigest2
-	mv -v usr/sbin/htpasswd usr/sbin/htpasswd2
-	mv -v usr/sbin/logresolve usr/sbin/logresolve2
-	mv -v usr/sbin/apxs usr/sbin/apxs2
-	mv -v usr/sbin/ab usr/sbin/ab2
-	mv -v usr/sbin/ab-ssl usr/sbin/ab2-ssl
-	mv -v usr/sbin/suexec usr/sbin/suexec2
-	mv -v usr/sbin/rotatelogs usr/sbin/rotatelogs2
-	mv -v usr/sbin/dbmmanage usr/sbin/dbmmanage2
-	mv -v usr/sbin/checkgid usr/sbin/checkgid2
-	mv -v usr/sbin/split-logfile usr/sbin/split-logfile2
-	mv -v usr/sbin/list_hooks.pl usr/sbin/list_hooks2.pl
-	mv -v usr/sbin/logresolve.pl usr/sbin/logresolve2.pl
-
-	# do the man pages
-	mv -v usr/share/man/man1/htdigest.1 usr/share/man/man1/htdigest2.1
-	mv -v usr/share/man/man1/htpasswd.1 usr/share/man/man1/htpasswd2.1
-	mv -v usr/share/man/man1/dbmmanage.1 usr/share/man/man1/dbmmanage2.1
-	mv -v usr/share/man/man8/ab.8 usr/share/man/man8/ab2.8
-	mv -v usr/share/man/man8/apxs.8 usr/share/man/man8/apxs2.8
-	mv -v usr/share/man/man8/apachectl.8 usr/share/man/man8/apache2ctl.8
-	mv -v usr/share/man/man8/httpd.8 usr/share/man/man8/apache2.8
-	mv -v usr/share/man/man8/logresolve.8 usr/share/man/man8/logresolve2.8
-	mv -v usr/share/man/man8/rotatelogs.8 usr/share/man/man8/rotatelogs2.8
-	mv -v usr/share/man/man8/suexec.8 usr/share/man/man8/suexec2.8
-
-	# Fix for dav and SSL dirs
-	keepdir /var/lib/dav
-	fowners apache:apache /var/lib/dav
-	fperms 755 /var/lib/dav
-
-	keepdir /var/log/apache2
-	fowners apache:apache /var/log/apache2
-	fperms 755 /var/log/apache2
-
-	keepdir /var/cache/apache2
-	fowners apache:apache /var/cache/apache2
-	fperms 755 /var/cache/apache2
-
-	keepdir /etc/apache2/conf/ssl
-
-	# fix bug 92348
-	fperms 755 /usr/sbin/apache2logserverstatus
-	fperms 755 /usr/sbin/apache2splitlogfile
-
-	# Added by Jason Wever <weeve@gentoo.org>
-	# A little sedfu to fix bug #7172 for sparc64s
-	if [ ${ARCH} = "sparc" ]
-	then
-		sed -i -e '13a\AcceptMutex fcntl' \
-			${D}/etc/apache2/conf/apache2.conf
-	fi
-}
-
-parse_modules_config() {
-	set_filter_flags
-
-	local filename=$1
-	local name=""
-	local dso=""
-	local disable=""
-	[ -f ${filename} ] || return 1
-	for i in `cat $filename | sed "s/^#.*//"` ; do
-		if [ $i == "-" ] ; then
-			disable="true"
-		elif [ -z "$name" ] && [ ! -z "`echo $i | grep "mod_"`" ] ; then
-			name=`echo $i | sed "s/mod_//"`
-		elif [ "$disable" ] && ( [ $i == "static" ] || [ $i == "shared" ] ) ; then
-			MY_BUILTINS="${MY_BUILTINS} --disable-$name"
-			name="" ; disable=""
-		elif [ $i == "static" ] ; then
-			MY_BUILTINS="${MY_BUILTINS} --enable-$name=yes"
-			name="" ; disable=""
-		elif [ $i == "shared" ] ; then
-			MY_BUILTINS="${MY_BUILTINS} --enable-$name=shared"
-			name="" ; disable=""
-		fi
-	done
-	einfo "${filename} options:\n${MY_BUILTINS}"
-}
-
-select_modules_config() {
-	parse_modules_config /etc/apache2/apache2-builtin-mods || \
-	parse_modules_config ${FILESDIR}/2.0.49/apache2-builtin-mods || \
-	return 1
-}
-
-pkg_postinst() {
-	set_filter_flags
-
-	if use ssl; then
-		cd ${ROOT}/etc/apache2/conf/ssl
-		einfo
-		einfo "Generating self-signed test certificate in /etc/apache2/conf/ssl..."
-		yes "" 2>/dev/null | ${ROOT}/usr/lib/ssl/apache2-mod_ssl/gentestcrt.sh >/dev/null 2>&1
-		einfo
-	fi
-
-	if has_version '=net-www/apache-1*' ; then
-	ewarn
-	ewarn "Please add the 'apache2' flag to your USE variable and (re)install"
-	ewarn "any additional DSO modules you may wish to use with Apache-2.x."
-	ewarn "Addon modules are configured in /etc/apache2/conf/modules.d/"
-	ewarn
-	fi
-
-	if [ -d /home/httpd ];
-	then
-	einfo
-	einfo "Please remember to update your config files in /etc/apache2"
-	einfo "as --datadir has been changed to ${DATADIR}, and ServerRoot"
-	einfo "has changed to /usr/lib/apache2!"
-	einfo
-	fi
-
-	einfo "Fixing permissions problem introduced in previous revision"
-	find ${ROOT}/etc/apache2 -type f -user apache -exec chown root: {} \;
-
-	local list=""
-	for i in lib logs modules extramodules; do
-		local d="/etc/apache2/${i}"
-		[ -s "${d}" ] && list="${list} ${d}"
-	done
-	if [ -n "${list}" ]; then
-		einfo "You should delete these old symlinks: ${list}"
-	fi
-}
diff --git a/net-www/apache/apache-2.0.54-r8.ebuild b/net-www/apache/apache-2.0.54-r8.ebuild
deleted file mode 100644
index 99c1e1ce7164..000000000000
--- a/net-www/apache/apache-2.0.54-r8.ebuild
+++ /dev/null
@@ -1,407 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.54-r8.ebuild,v 1.12 2005/08/23 17:09:10 vericgar Exp $
-
-inherit flag-o-matic eutils fixheadtails gnuconfig
-
-PATCH_LEVEL="2.0.54-r8"
-S="${WORKDIR}/httpd-${PV}"
-DESCRIPTION="Apache Web Server, Version 2.0.x"
-HOMEPAGE="http://www.apache.org/"
-SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2
-	http://dev.gentoo.org/~vericgar/dist/apache/old/apache-patches-${PATCH_LEVEL}.tar.bz2
-	http://dev.gentoo.org/~vericgar/dist/apache/old/apache-conf-${PATCH_LEVEL}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
-IUSE="berkdb gdbm ldap threads ipv6 doc static ssl selinux"
-
-#Standard location for Gentoo Linux
-DATADIR="/var/www/localhost"
-
-# Location for the two additional tarballs
-APACHE_PATCHDIR=${WORKDIR}/apache-patches-${PATCH_LEVEL}
-APACHE_CONFDIR=${WORKDIR}/apache-conf-${PATCH_LEVEL}
-
-DEPEND="dev-util/yacc
-	dev-lang/perl
-	sys-libs/zlib
-	dev-libs/expat
-	dev-libs/openssl
-	>=sys-devel/autoconf-2.59-r4
-	berkdb? ( sys-libs/db )
-	gdbm? ( sys-libs/gdbm )
-	!mips? ( ldap? ( =net-nds/openldap-2* ) )
-	selinux? ( sec-policy/selinux-apache )
-	!dev-libs/apr
-	!dev-libs/apr-util"
-
-apache_setup_vars() {
-	# Sets the USERDIR to default.
-	USERDIR="public_html"
-	einfo "DATADIR is set to: ${DATADIR}"
-	einfo "USERDIR is set to: $USERDIR"
-}
-
-set_filter_flags() {
-	CFLAGS="${CFLAGS/  / }"
-	has_version =sys-libs/glibc-2.2* && filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-}
-
-src_unpack() {
-	set_filter_flags
-
-	unpack ${A} || die
-	cd ${S} || die
-
-	# apply the patches from the patch tarball
-	EPATCH_SUFFIX="patch"
-	epatch ${APACHE_PATCHDIR} || die
-
-	if use berkdb; then
-		einfo "Enabling berkdb."
-		if has_version '=sys-libs/db-4*'; then
-			einfo "Enabling db4"
-			myconf="${myconf} --with-dbm=db4 --with-berkely-db=/usr"
-		elif has_version '=sys-libs/db-3*'; then
-			einfo "Enabling db3"
-			myconf="${myconf} --with-dbm=db3 --with-berkely-db=/usr"
-		elif has_version '=sys-libs/db-2'; then
-			einfo "Enabling db2"
-			myconf="${myconf} --with-dbm=db2 --with-berkely-db=/usr"
-		fi
-	else
-		echo "Disabling berkdb"
-	fi
-
-	#avoid utf-8 charset problems
-	export LC_CTYPE=C
-
-	ht_fix_file srclib/apr/build/buildcheck.sh
-
-	#give it the stamp
-	sed -i -e 's:(" PLATFORM "):(Gentoo/Linux):g' server/core.c
-
-	#fix perl with perl!
-	find . -type f | xargs perl -pi -e \
-		"s|/usr/local/bin/perl|/usr/bin/perl|g; \
-		s|/usr/local/bin/perl5|/usr/bin/perl|g; \
-		s|/path/to/bin/perl|/usr/bin/perl|g;"
-	#dont want this cruft in /usr/bin
-	sed -i -e 's:@exp_bindir@:@exp_installbuilddir:g' support/apachectl.in
-
-	#setup the filesystem layout config
-	cat ${FILESDIR}/common/config.layout >> config.layout
-	sed -i -e 's:version:${PF}:g' config.layout
-
-	cat ${FILESDIR}/common/apr-config.layout >> srclib/apr/config.layout
-	cat ${FILESDIR}/common/apr-util-config.layout >> srclib/apr-util/config.layout
-
-	sed -i -e "s:/var/www/localhost:${DATADIR}:g" srclib/apr/config.layout
-	sed -i -e "s:/var/www/localhost:${DATADIR}:g" srclib/apr-util/config.layout
-
-	WANT_AUTOCONF=2.5 ./buildconf || die "buildconf failed"
-}
-
-src_compile() {
-	set_filter_flags
-	apache_setup_vars
-
-	# Detect mips and uclibc systems properly
-	gnuconfig_update
-
-	local myconf
-	if use ldap; then
-		if use mips; then
-			eerror "Sorry, LDAP support isn't available yet for MIPS"
-			eerror "Test out OpenLDAP and report it via BugZilla!"
-			eerror "Continuing in 5 seconds"
-			sleep 5s
-		else
-			einfo "Enabling LDAP"
-			if use static; then
-			  myconf="--with-ldap --enable-auth-ldap=static --enable-ldap=static"
-			else
-			  myconf="--with-ldap --enable-auth-ldap=shared --enable-ldap=shared"
-			fi
-		fi
-	fi
-
-	if use ipv6; then
-		einfo "Enabling ipv6"
-		myconf="${myconf} --enable-vp4"
-	else
-		myconf="${myconf} --disable-ipv6"
-	fi
-
-	if use threads; then
-		einfo "Enabling threads support"
-		myconf="${myconf} --with-mpm=worker"
-	else
-		myconf="${myconf} --with-mpm=${MPM:=prefork}"
-	fi
-
-	select_modules_config || die "determining modules"
-
-	# Fix for bug #24215 - robbat2@gentoo.org, 30 Oct 2003
-	# We pre-load the cache with the correct answer!  This avoids
-	# it violating the sandbox.  This may have to be changed for
-	# non-Linux systems or if sem_open changes on Linux.  This
-	# hack is built around documentation in /usr/include/semaphore.h
-	# and the glibc (pthread) source
-	echo 'ac_cv_func_sem_open=${ac_cv_func_sem_open=no}' >> ${S}/config.cache
-
-	# Workaround for bug #32444 - robbat2@gentoo.org, 28 Nov 2003
-	# Apache2 tries to build SCTP support even when all the parts of it aren't there
-	# So for the moment we tell it to ignore SCTP support
-	echo 'ac_cv_sctp=${ac_cv_sctp=no}' >> ${S}/config.cache
-	echo 'ac_cv_header_netinet_sctp_h=${ac_cv_header_netinet_sctp_h=no}' >> ${S}/config.cache
-	echo 'ac_cv_header_netinet_sctp_uio_h=${ac_cv_header_netinet_sctp_uio_h=no}' >> ${S}/config.cache
-
-	SSL_BASE="SYSTEM" \
-	WANT_AUTOCONF_2_5=1 WANT_AUTOCONF=2.5
-	./configure \
-		--with-suexec-safepath="/usr/local/bin:/usr/bin:/bin" \
-		--with-suexec-logfile=/var/log/apache2/suexec_log \
-		--with-suexec-bin=/usr/sbin/suexec2 \
-		--with-suexec-userdir=${USERDIR} \
-		--with-suexec-caller=apache \
-		--with-suexec-docroot=/var/www \
-		--with-suexec-uidmin=1000 \
-		--with-suexec-gidmin=100 \
-		--with-suexec-umask=077 \
-		--enable-suexec=shared \
-		\
-		${MY_BUILTINS} \
-		\
-		--cache-file=${S}/config.cache \
-		--with-perl=/usr/bin/perl \
-		--with-expat=/usr \
-		--with-ssl=/usr \
-		--with-z=/usr \
-		--with-port=80 \
-		--enable-layout=Gentoo \
-		--with-program-name=apache2 \
-		--with-devrandom=/dev/urandom \
-		--host=${CHOST} ${myconf} || die "bad ./configure please submit bug report to bugs.gentoo.org. Include your config.layout."
-		#--with-mpm={worker|prefork|perchild|leader|threadpool}
-
-	# we don't want to try and recompile the ssl_expr_parse.c file, because
-	# the lex source is broken
-	touch modules/ssl/ssl_expr_scan.c
-
-	emake || die "problem compiling Apache2 :("
-
-	#build ssl version of apache bench (ab-ssl)
-	cd support; rm -f ab .libs/ab ab.lo ab.o
-	make ab CFLAGS="${CFLAGS} -DUSE_SSL -lcrypto -lssl \
-		-I/usr/include/openssl -L/usr/lib" || die
-	mv ab ab-ssl; mv .libs/ab .libs/ab-ssl; rm -f ab.lo ab.o
-	make ab || die
-}
-
-src_install () {
-	set_filter_flags
-
-	# setup apache user and group
-	enewgroup apache 81
-	enewuser apache 81 -1 /var/www apache
-
-	local i
-	make DESTDIR=${D} install || die
-	dodoc ABOUT_APACHE CHANGES INSTALL LAYOUT \
-		LICENSE README* ${FILESDIR}/robots.txt
-
-	#bogus values pointing at /var/tmp/portage
-	sed -i -e 's:APR_SOURCE_DIR=.*:APR_SOURCE_DIR=:g' ${D}/usr/bin/apr-config
-	sed -i -e 's:APU_SOURCE_DIR=.*:APU_SOURCE_DIR=:g' ${D}/usr/bin/apu-config
-	sed -i -e 's:APU_BUILD_DIR=.*:APU_BUILD_DIR=:g' ${D}/usr/bin/apu-config
-
-	#protect the suexec binary
-	local gid=`id -g apache`
-	[ -z "${gid}" ] && gid=81
-	fowners root:${gid} /usr/sbin/suexec
-	fperms 4710 /usr/sbin/suexec
-
-	#apxs needs this to pickup the right lib for install
-	dosym /usr/lib /usr/lib/apache2/lib
-	dosym /var/log/apache2 /usr/lib/apache2/logs
-	dosym /usr/lib/apache2-extramodules /usr/lib/apache2/extramodules
-	dosym /etc/apache2/conf /usr/lib/apache2/conf
-
-	cd ${S}
-	#Credits to advx.org people for these scripts. Heck, thanks for
-	#the nice layout and everything else ;-)
-	for i in apache2logserverstatus apache2splitlogfile
-	do
-		dosbin ${APACHE_CONFDIR}/usr/sbin/$i
-	done
-	exeinto /usr/lib/ssl/apache2-mod_ssl
-	doexe ${APACHE_CONFDIR}/usr/lib/ssl/apache2-mod_ssl/gentestcrt.sh
-
-	#some more scripts
-	for i in split-logfile list_hooks.pl logresolve.pl log_server_status
-	do
-		dosbin ${S}/support/$i
-	done
-	#the ssl version of apache bench
-	dosbin support/.libs/ab-ssl
-
-	#move some mods to extramodules
-	dodir /usr/lib/apache2-extramodules
-	for i in mod_ssl.so mod_ldap.so mod_auth_ldap.so
-	do
-		[ -x ${D}/usr/lib/apache2/modules/$i ] && \
-		mv ${D}/usr/lib/apache2/modules/$i ${D}/usr/lib/apache2-extramodules
-	done
-
-	#tidy up
-	mv ${D}/usr/sbin/envvars* ${D}/usr/lib/apache2/build
-	dodoc ${D}/etc/apache2/conf/*-std.conf
-	rm -f ${D}/etc/apache2/conf/*.conf
-	rm -rf ${D}/var/log ${D}/var/run
-
-	# install our default config files
-	cd ${D}
-	( cd ${APACHE_CONFDIR} && tar -cpvf - * ) | tar -xpvf -
-	find etc/apache2 -type f -exec chmod 644 {} \;
-	find etc/apache2 -type f -exec chown root: {} \;
-
-	#drop in a convenient link to the manual
-	if use doc; then
-		dosym /usr/share/doc/${PF}/manual ${DATADIR}/htdocs/manual
-	else
-		rm -rf ${D}/usr/share/doc/${PF}/manual
-	fi
-
-	#SLOT=2!!!
-	cd ${D}
-	mv -v usr/sbin/apachectl usr/sbin/apache2ctl
-	mv -v usr/sbin/htdigest usr/sbin/htdigest2
-	mv -v usr/sbin/htpasswd usr/sbin/htpasswd2
-	mv -v usr/sbin/logresolve usr/sbin/logresolve2
-	mv -v usr/sbin/apxs usr/sbin/apxs2
-	mv -v usr/sbin/ab usr/sbin/ab2
-	mv -v usr/sbin/ab-ssl usr/sbin/ab2-ssl
-	mv -v usr/sbin/suexec usr/sbin/suexec2
-	mv -v usr/sbin/rotatelogs usr/sbin/rotatelogs2
-	mv -v usr/sbin/dbmmanage usr/sbin/dbmmanage2
-	mv -v usr/sbin/checkgid usr/sbin/checkgid2
-	mv -v usr/sbin/split-logfile usr/sbin/split-logfile2
-	mv -v usr/sbin/list_hooks.pl usr/sbin/list_hooks2.pl
-	mv -v usr/sbin/logresolve.pl usr/sbin/logresolve2.pl
-
-	# do the man pages
-	mv -v usr/share/man/man1/htdigest.1 usr/share/man/man1/htdigest2.1
-	mv -v usr/share/man/man1/htpasswd.1 usr/share/man/man1/htpasswd2.1
-	mv -v usr/share/man/man1/dbmmanage.1 usr/share/man/man1/dbmmanage2.1
-	mv -v usr/share/man/man8/ab.8 usr/share/man/man8/ab2.8
-	mv -v usr/share/man/man8/apxs.8 usr/share/man/man8/apxs2.8
-	mv -v usr/share/man/man8/apachectl.8 usr/share/man/man8/apache2ctl.8
-	mv -v usr/share/man/man8/httpd.8 usr/share/man/man8/apache2.8
-	mv -v usr/share/man/man8/logresolve.8 usr/share/man/man8/logresolve2.8
-	mv -v usr/share/man/man8/rotatelogs.8 usr/share/man/man8/rotatelogs2.8
-	mv -v usr/share/man/man8/suexec.8 usr/share/man/man8/suexec2.8
-
-	# Fix for dav and SSL dirs
-	keepdir /var/lib/dav
-	fowners apache:apache /var/lib/dav
-	fperms 755 /var/lib/dav
-
-	keepdir /var/log/apache2
-	fowners apache:apache /var/log/apache2
-	fperms 755 /var/log/apache2
-
-	keepdir /var/cache/apache2
-	fowners apache:apache /var/cache/apache2
-	fperms 755 /var/cache/apache2
-
-	keepdir /etc/apache2/conf/ssl
-
-	# fix bug 92348
-	fperms 755 /usr/sbin/apache2logserverstatus
-	fperms 755 /usr/sbin/apache2splitlogfile
-
-	# Added by Jason Wever <weeve@gentoo.org>
-	# A little sedfu to fix bug #7172 for sparc64s
-	if [ ${ARCH} = "sparc" ]
-	then
-		sed -i -e '13a\AcceptMutex fcntl' \
-			${D}/etc/apache2/conf/apache2.conf
-	fi
-}
-
-parse_modules_config() {
-	set_filter_flags
-
-	local filename=$1
-	local name=""
-	local dso=""
-	local disable=""
-	[ -f ${filename} ] || return 1
-	for i in `cat $filename | sed "s/^#.*//"` ; do
-		if [ $i == "-" ] ; then
-			disable="true"
-		elif [ -z "$name" ] && [ ! -z "`echo $i | grep "mod_"`" ] ; then
-			name=`echo $i | sed "s/mod_//"`
-		elif [ "$disable" ] && ( [ $i == "static" ] || [ $i == "shared" ] ) ; then
-			MY_BUILTINS="${MY_BUILTINS} --disable-$name"
-			name="" ; disable=""
-		elif [ $i == "static" ] ; then
-			MY_BUILTINS="${MY_BUILTINS} --enable-$name=yes"
-			name="" ; disable=""
-		elif [ $i == "shared" ] ; then
-			MY_BUILTINS="${MY_BUILTINS} --enable-$name=shared"
-			name="" ; disable=""
-		fi
-	done
-	einfo "${filename} options:\n${MY_BUILTINS}"
-}
-
-select_modules_config() {
-	parse_modules_config /etc/apache2/apache2-builtin-mods || \
-	parse_modules_config ${FILESDIR}/2.0.49/apache2-builtin-mods || \
-	return 1
-}
-
-pkg_postinst() {
-	set_filter_flags
-
-	if use ssl; then
-		cd ${ROOT}/etc/apache2/conf/ssl
-		einfo
-		einfo "Generating self-signed test certificate in /etc/apache2/conf/ssl..."
-		yes "" 2>/dev/null | ${ROOT}/usr/lib/ssl/apache2-mod_ssl/gentestcrt.sh >/dev/null 2>&1
-		einfo
-	fi
-
-	if has_version '=net-www/apache-1*' ; then
-	ewarn
-	ewarn "Please add the 'apache2' flag to your USE variable and (re)install"
-	ewarn "any additional DSO modules you may wish to use with Apache-2.x."
-	ewarn "Addon modules are configured in /etc/apache2/conf/modules.d/"
-	ewarn
-	fi
-
-	if [ -d /home/httpd ];
-	then
-	einfo
-	einfo "Please remember to update your config files in /etc/apache2"
-	einfo "as --datadir has been changed to ${DATADIR}, and ServerRoot"
-	einfo "has changed to /usr/lib/apache2!"
-	einfo
-	fi
-
-	einfo "Fixing permissions problem introduced in previous revision"
-	find ${ROOT}/etc/apache2 -type f -user apache -exec chown root: {} \;
-
-	local list=""
-	for i in lib logs modules extramodules; do
-		local d="/etc/apache2/${i}"
-		[ -s "${d}" ] && list="${list} ${d}"
-	done
-	if [ -n "${list}" ]; then
-		einfo "You should delete these old symlinks: ${list}"
-	fi
-}
diff --git a/net-www/apache/files/digest-apache-2.0.50 b/net-www/apache/files/digest-apache-2.0.50
deleted file mode 100644
index 3e785a637987..000000000000
--- a/net-www/apache/files/digest-apache-2.0.50
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8b251767212aebf41a13128bb70c0b41 httpd-2.0.50.tar.gz 6338536
-MD5 a23b66c33ea361ead38ad883958bac01 apache-patches-2.0.50.tar.bz2 7986
-MD5 23c09a899866fc5c7f097c17552eb0f4 apache2-conf.tar.bz2 13204
diff --git a/net-www/apache/files/digest-apache-2.0.51 b/net-www/apache/files/digest-apache-2.0.51
deleted file mode 100644
index 4cf0cc705b16..000000000000
--- a/net-www/apache/files/digest-apache-2.0.51
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 ab93c56b88ca1b9ce71ba12e74bbc5de httpd-2.0.51.tar.gz 6735558
-MD5 e24f0fe9cbca06a0478971a9270e5d52 apache-patches-2.0.51.tar.bz2 7893
diff --git a/net-www/apache/files/digest-apache-2.0.51-r1 b/net-www/apache/files/digest-apache-2.0.51-r1
deleted file mode 100644
index 69429ef1ee60..000000000000
--- a/net-www/apache/files/digest-apache-2.0.51-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 ab93c56b88ca1b9ce71ba12e74bbc5de httpd-2.0.51.tar.gz 6735558
-MD5 b23e0f462dc57cf41d183ab861568d26 apache-patches-2.0.51-r1.tar.bz2 8156
diff --git a/net-www/apache/files/digest-apache-2.0.52 b/net-www/apache/files/digest-apache-2.0.52
deleted file mode 100644
index 11d4a054cf78..000000000000
--- a/net-www/apache/files/digest-apache-2.0.52
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 eba528fa8613dc5bfb0615a69c11f053 httpd-2.0.52.tar.gz 6918995
-MD5 b90a99f0377a33f4dbde8875ea22952c apache-patches-2.0.52.tar.bz2 8478
-MD5 23c09a899866fc5c7f097c17552eb0f4 apache2-conf.tar.bz2 13204
diff --git a/net-www/apache/files/digest-apache-2.0.52-r1 b/net-www/apache/files/digest-apache-2.0.52-r1
deleted file mode 100644
index b026a0c7cc40..000000000000
--- a/net-www/apache/files/digest-apache-2.0.52-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 eba528fa8613dc5bfb0615a69c11f053 httpd-2.0.52.tar.gz 6918995
-MD5 c5843846dd3ac492198799c60ead4c31 apache-patches-2.0.52-r1.tar.bz2 9611
-MD5 23c09a899866fc5c7f097c17552eb0f4 apache2-conf.tar.bz2 13204
diff --git a/net-www/apache/files/digest-apache-2.0.52-r2 b/net-www/apache/files/digest-apache-2.0.52-r2
deleted file mode 100644
index d6c22ea1d150..000000000000
--- a/net-www/apache/files/digest-apache-2.0.52-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 eba528fa8613dc5bfb0615a69c11f053 httpd-2.0.52.tar.gz 6918995
-MD5 3c02b6fc43cbf6c5c651db01fad6d914 apache-patches-2.0.52-r2.tar.bz2 8474
-MD5 b1bd32f413c13d6c70ca2e86b04e2353 apache-conf-2.0.52-r2.tar.bz2 25041
diff --git a/net-www/apache/files/digest-apache-2.0.54-r10 b/net-www/apache/files/digest-apache-2.0.54-r10
deleted file mode 100644
index 5615a1339b7b..000000000000
--- a/net-www/apache/files/digest-apache-2.0.54-r10
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 4ae8a38c6b5db9046616ce10a0d551a2 httpd-2.0.54.tar.bz2 5566979
-MD5 8358ebed387664a5855fcec541d4c797 gentoo-apache-2.0.54-r10-20050607.tar.bz2 50185
diff --git a/net-www/apache/files/digest-apache-2.0.54-r11 b/net-www/apache/files/digest-apache-2.0.54-r11
deleted file mode 100644
index e8b1656490c2..000000000000
--- a/net-www/apache/files/digest-apache-2.0.54-r11
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 4ae8a38c6b5db9046616ce10a0d551a2 httpd-2.0.54.tar.bz2 5566979
-MD5 2dab3f6a2cd3253303a6a50338b81829 gentoo-apache-2.0.54-r11-20050608.tar.bz2 50216
diff --git a/net-www/apache/files/digest-apache-2.0.54-r12 b/net-www/apache/files/digest-apache-2.0.54-r12
deleted file mode 100644
index 033453426e67..000000000000
--- a/net-www/apache/files/digest-apache-2.0.54-r12
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 4ae8a38c6b5db9046616ce10a0d551a2 httpd-2.0.54.tar.bz2 5566979
-MD5 8a7788baf46453e26e548b0462838626 gentoo-apache-2.0.54-r12-20050712.tar.bz2 50892
diff --git a/net-www/apache/files/digest-apache-2.0.54-r13 b/net-www/apache/files/digest-apache-2.0.54-r13
deleted file mode 100644
index dc60e15a5629..000000000000
--- a/net-www/apache/files/digest-apache-2.0.54-r13
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 4ae8a38c6b5db9046616ce10a0d551a2 httpd-2.0.54.tar.bz2 5566979
-MD5 e1711c732a2dc115032c7b4cc1aca4f9 gentoo-apache-2.0.54-r13-20050815.tar.bz2 51170
diff --git a/net-www/apache/files/digest-apache-2.0.54-r14 b/net-www/apache/files/digest-apache-2.0.54-r14
deleted file mode 100644
index 2df8a76354af..000000000000
--- a/net-www/apache/files/digest-apache-2.0.54-r14
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 4ae8a38c6b5db9046616ce10a0d551a2 httpd-2.0.54.tar.bz2 5566979
-MD5 b57d0b2f5024a368955c577906f52744 gentoo-apache-2.0.54-r14-20050822.tar.bz2 52315
diff --git a/net-www/apache/files/digest-apache-2.0.54-r7 b/net-www/apache/files/digest-apache-2.0.54-r7
deleted file mode 100644
index e6455c57f9ab..000000000000
--- a/net-www/apache/files/digest-apache-2.0.54-r7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4ae8a38c6b5db9046616ce10a0d551a2 httpd-2.0.54.tar.bz2 5566979
-MD5 fff90ca8fd36b0d5421d5e5259f40f7b apache-patches-2.0.54-r7.tar.bz2 7913
-MD5 4a257c4bc6a39af44c5c304576fecd9f apache-conf-2.0.54-r7.tar.bz2 24855
diff --git a/net-www/apache/files/digest-apache-2.0.54-r8 b/net-www/apache/files/digest-apache-2.0.54-r8
deleted file mode 100644
index c7ad9550b059..000000000000
--- a/net-www/apache/files/digest-apache-2.0.54-r8
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4ae8a38c6b5db9046616ce10a0d551a2 httpd-2.0.54.tar.bz2 5566979
-MD5 cf2ef29036071ea1e3343b3e8aa442da apache-patches-2.0.54-r8.tar.bz2 8520
-MD5 dbf1d1cc607ec0627b2a5d2c4fcac523 apache-conf-2.0.54-r8.tar.bz2 24850