Removing old ebuilds.

8 files changed, 6 insertions, 1056 deletions

diff --git a/net-www/apache/ChangeLog b/net-www/apache/ChangeLog
index d5447b245a78..c5ce391d9f62 100644
--- a/net-www/apache/ChangeLog
+++ b/net-www/apache/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-www/apache
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.187 2004/06/03 16:25:51 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.188 2004/06/05 15:59:27 zul Exp $
+
+  05 Jun 2004; Chuck Short <zul@gentoo.org> apache-1.3.29-r1.ebuild,
+  apache-2.0.48-r4.ebuild, apache-2.0.49.ebuild:
+  Removed old ebuilds.
 
   03 Jun 2004; Chuck Short <zul@gentoo.org> files/2.0.49/commonapache2.conf,
   files/conf/commonapache.conf:
diff --git a/net-www/apache/Manifest b/net-www/apache/Manifest
index 7e4d3ee217bf..1e64a6a7bac8 100644
--- a/net-www/apache/Manifest
+++ b/net-www/apache/Manifest
@@ -2,21 +2,16 @@ MD5 79e24dc87473b2e25beda69780168694 apache-2.0.49-r2.ebuild 12918
 MD5 dd23c6c6f8cdaeff6319e358601547be apache-1.3.29-r2.ebuild 7144
 MD5 9d7d4e87f62b4c1667fb9016fd36b9d9 apache-1.3.31.ebuild 6701
 MD5 b5761918f0ae5bd1e2eda8c3b259dc65 apache-2.0.49-r1.ebuild 12505
-MD5 738de16a708fdae922876faebfa4ddd7 apache-2.0.48-r4.ebuild 12398
 MD5 49e75f661e5197d265ea264a3100a734 apache-2.0.49-r3.ebuild 12818
-MD5 e0f991e03523c04fc281041e5a6c88c6 apache-1.3.29-r1.ebuild 7442
-MD5 393a81b82d3926a4118bc16e885c57f6 apache-2.0.49.ebuild 12811
 MD5 c57c6cdcf528ca5d01fa13e8e8436c5e apache-1.3.31-r1.ebuild 6703
-MD5 445f5b44f2bf56d8b4720cb84ec86040 ChangeLog 34265
+MD5 cadd95e20b0c7fba66f367edce5637dc ChangeLog 34407
 MD5 5b6dd438f81019e56fa641841c0c13fe metadata.xml 501
 MD5 d4b8a4908870107e15cc1edbd0ec6ebb files/apache-1.3.29_mod_auth_db.patch 729
 MD5 161245c7aa1eb785db53b34d6a10be43 files/suexec_pam_gentoo.patch 2149
 MD5 97c7a2efed7a3fd05614167426c495d9 files/apache-builtin-mods 2465
-MD5 589e8773eb94f785be510f74b2e39ad0 files/digest-apache-1.3.29-r1 211
 MD5 589e8773eb94f785be510f74b2e39ad0 files/digest-apache-1.3.29-r2 211
 MD5 7d4cec8690cb2c6406b84990d8365587 files/digest-apache-1.3.31-r1 139
 MD5 d3626a1e31a675c60d066c111d552adf files/suexec.pam 59
-MD5 4cc91d25cf4117b8db0fec344bebec4d files/digest-apache-2.0.48-r4 65
 MD5 3a7818b24f0952694c7b878ba3d8e79a files/digest-apache-2.0.49-r1 65
 MD5 3a7818b24f0952694c7b878ba3d8e79a files/digest-apache-2.0.49-r2 65
 MD5 3a7818b24f0952694c7b878ba3d8e79a files/digest-apache-2.0.49-r3 65
@@ -34,7 +29,6 @@ MD5 bae4b9d941cd38a32943533e958aa1b3 files/apachedelmod 3185
 MD5 c4738c2f22a613ee5701ccdf61d9f7ce files/apache2 324
 MD5 bb36b429c433a5cbf2712605a76ce8fb files/digest-apache-1.3.31 139
 MD5 d3339c25967ce7b36ef24495542f044a files/apachesplitlogfile 4948
-MD5 3a7818b24f0952694c7b878ba3d8e79a files/digest-apache-2.0.49 65
 MD5 b9ff3534313dae1b8ac96df0e3e01373 files/httpd-2.0.48-ipv6.patch 865
 MD5 17aee0f7a9de0f390fa046bc82436309 files/apache.confd 998
 MD5 d52999376f67a872ee48cbae72db0160 files/httpd-2.0.49-cgi.patch 10319
diff --git a/net-www/apache/apache-1.3.29-r1.ebuild b/net-www/apache/apache-1.3.29-r1.ebuild
deleted file mode 100644
index 7c75af36447f..000000000000
--- a/net-www/apache/apache-1.3.29-r1.ebuild
+++ /dev/null
@@ -1,257 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.29-r1.ebuild,v 1.14 2004/05/24 01:11:03 zul Exp $
-
-inherit eutils
-
-#IUSE="ipv6 pam"
-IUSE="pam"
-
-mod_ssl_ver=2.8.16
-
-S=${WORKDIR}/${PN}_${PV}
-DESCRIPTION="The Apache Web Server"
-HOMEPAGE="http://www.apache.org http://www.modssl.org"
-KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64 mips"
-SRC_URI="http://httpd.apache.org/dist/httpd/apache_${PV}.tar.gz
-	mirror://gentoo/${P}-gentoo.diff.bz2
-	ftp://ftp.modssl.org/source/mod_ssl-${mod_ssl_ver}-${PV}.tar.gz"
-#	ipv6? http://motoyuki.bsdclub.org/data/IPv6/apache-${PV}-mod_ssl-${mod_ssl_ver}-v6-20021004.diff.gz"
-# The mod_ssl archive is only for providing the EAPI patch in here.
-# You should install the net-www/mod_ssl package for the actual DSO.
-
-DEPEND="dev-lang/perl <=sys-libs/db-4.1
-	>=dev-libs/mm-1.1.3
-	>=sys-libs/gdbm-1.8
-	sys-libs/db
-	>=dev-libs/expat-1.95.2"
-LICENSE="Apache-1.1"
-SLOT="1"
-
-#Standard location for Gentoo Linux
-DATADIR="/var/www/localhost"
-
-src_unpack() {
-	local myssl
-	unpack ${A} || die
-	cd ${S} || die
-	patch -p1 <${WORKDIR}/${P}-gentoo.diff || die
-
-	#Obsolete 'head -1' and 'tail -1' calls.
-	perl -pi -e 's|tail -1|tail -n 1|;' \
-		src/Configure src/helpers/getuid.sh
-	perl -pi -e 's|head -1|head -n 1|;' \
-		src/Configure src/helpers/buildinfo.sh src/helpers/fmn.sh
-
-	#Make apachectl read /etc/conf.d/apache
-	patch -p1 <${FILESDIR}/apache-1.3.27-apachectl.patch || die
-
-	sed -i "s:/usr/local/bin/perl5:/usr/bin/perl:" \
-		htdocs/manual/search/manual-index.cgi
-
-	# setup eapi...
-	myssl=${WORKDIR}/mod_ssl-${mod_ssl_ver}-${PV}
-	cp ${myssl}/pkg.eapi/*.h src/include
-	cp ${myssl}/pkg.eapi/*.c src/ap
-	patch -p0 < ${myssl}/pkg.eapi/eapi.patch || die "eapi"
-
-	# set a reasonable MM_CORE_PATH location..
-	sed -i 's:logs/mm:/var/cache/apache-mm/mm:' \
-		src/include/httpd.h
-
-#	# thanks drey@rt.mipt.ru for these two ...
-#	if use ipv6; then
-#		zcat ${DISTDIR}/apache-${PV}-mod_ssl-${mod_ssl_ver}-v6-20021004.diff.gz | patch -p0 || die
-#	fi
-
-	if use pam; then
-		patch -p1 <${FILESDIR}/suexec_pam_gentoo.patch || die
-	fi
-
-	# Detect db4 correctly
-	patch -p1 <${FILESDIR}/apache-1.3.27_db4_gentoo.patch || die
-
-	# Fixes mod_auth_db compile breakages with db4.0
-	epatch ${FILESDIR}/apache-1.3.29_mod_auth_db.patch
-}
-
-src_compile() {
-	local myconf mycflags
-	mycflags="${CFLAGS}"
-	unset CFLAGS ; unset CXXFLAGS
-#	use ipv6 && myconf="--enable-rule=INET6"
-
-	select_modules_config || die "determining modules"
-
-	#-DBUFFERED_LOGS
-	OPTIM="${mycflags} -DHARD_SERVER_LIMIT=${HARD_SERVER_LIMIT:=512} \
-		-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" \
-	LIBS="-lgdbm -lpthread" \
-	EAPI_MM=SYSTEM \
-	./configure \
-		--prefix=/usr \
-		--exec-prefix=/usr \
-		--bindir=/usr/bin \
-		--sbindir=/usr/sbin \
-		--libexecdir=/usr/lib/apache \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/apache/conf \
-		--datadir=${DATADIR} \
-		--cgidir=${DATADIR}/cgi-bin \
-		--iconsdir=${DATADIR}/icons \
-		--htdocsdir=${DATADIR}/htdocs \
-		--manualdir=/usr/share/doc/${PF}/manual \
-		--includedir=/usr/include/apache \
-		--localstatedir=/var \
-		--runtimedir=/var/run \
-		--logfiledir=/var/log/apache \
-		--proxycachedir=/var/cache/apache \
-		--serverroot=/etc/apache \
-		\
-		--target=apache \
-		--server-uid=apache \
-		--server-gid=apache \
-		--enable-rule=EAPI \
-		--enable-rule=SHARED_CHAIN \
-		--with-perl=/usr/bin/perl \
-		\
-		${MY_BUILTINS} \
-		\
-		--enable-suexec \
-		--suexec-uidmin=1000 \
-		--suexec-gidmin=100 \
-		--suexec-caller=apache \
-		--suexec-userdir=public_html \
-		--suexec-docroot=/var/www \
-		--suexec-safepath="/bin:/usr/bin" \
-		--suexec-logfile=/var/log/apache/suexec_log \
-		\
-		${myconf} || die "bad ./configure"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	local myfile
-
-	GID=`getent group apache | cut -d: -f3`
-	if [ -z "${GID}" ]; then
-		einfo "Using default GID of 81 for Apache"
-		GID=81
-	fi
-
-	make install-quiet root=${D} || die
-	dodoc ABOUT_APACHE Announcement INSTALL* LICENSE* README* WARNING* \
-		${FILESDIR}/robots.txt
-
-	#protect the suexec binary
-	fowners root:${GID} /usr/sbin/suexec
-	fperms 4710 /usr/sbin/suexec
-
-	# nice support scripts..
-	for myfile in apacheaddmod apachedelmod \
-		apachelogserverstatus apachesplitlogfile
-	do
-		exeinto /usr/sbin
-		doexe ${FILESDIR}/$myfile
-	done
-
-	# setup links in /etc/apache..
-	cd ${D}/etc/apache
-	ln -sf ../../usr/lib/apache modules
-	# apxs needs this to pickup the right lib for install..
-	ln -sf ../../usr/lib lib
-	ln -sf ../../var/log/apache logs
-	ln -sf ../../usr/lib/apache-extramodules extramodules
-
-	# drop in a convenient link to the manual
-	dosym /usr/share/doc/${PF}/manual ${DATADIR}/htdocs/manual
-
-	# deprecated config files, empty dirs..
-	rm -f ${D}/etc/apache/conf/apache.conf.default
-	rm -f ${D}/etc/apache/conf/access.conf*
-	rm -f ${D}/etc/apache/conf/srm.conf*
-
-	# now the config files..
-	insinto /etc/apache/conf
-	doins ${FILESDIR}/conf/commonapache.conf
-	doins ${FILESDIR}/conf/apache.conf
-
-	# Added by Jason Wever <weeve@gentoo.org>
-	# A little sedfu to fix bug #7172 for sparc64s
-	if [ ${ARCH} = "sparc" ]
-	then
-		sed -i -e '15a\AcceptMutex fcntl' \
-		${D}/etc/apache/conf/apache.conf
-	fi
-
-	insinto /etc/apache/conf/vhosts
-	doins ${FILESDIR}/conf/VirtualHomePages.conf
-	doins ${FILESDIR}/conf/DynamicVhosts.conf
-	doins ${FILESDIR}/conf/Vhosts.conf
-
-	exeinto /etc/init.d ; newexe ${FILESDIR}/apache.rc6 apache
-	insinto /etc/conf.d ; newins ${FILESDIR}/apache.confd apache
-	insinto /etc/apache ; doins ${FILESDIR}/apache-builtin-mods
-
-	if use pam; then
-		insinto /etc/pam.d ; newins ${FILESDIR}/suexec.pam suexec
-	fi
-
-	#empty dirs
-	keepdir /var/cache/apache /var/cache/apache-mm /usr/lib/apache-extramodules /etc/apache/conf/addon-modules /var/log/apache
-}
-
-pkg_postinst() {
-	# these are in baselayout now; it will not hurt to leave them here though
-	# moved to pkg_postinst by jnelson, moved to pkg_preinst by lostlogic
-	getent group apache >/dev/null 2>&1
-	if [ $? -ne 0 ]; then
-		groupadd -g 81 apache || die "problem adding group apache"
-	fi
-
-	# usermod returns 2 on user-exists-but-no-flags-given
-	#usermod apache &>/dev/null
-	#if [ $? != 2 ]; then
-	getent passwd apache >/dev/null 2>&1
-	if [ $? -ne 0 ]; then
-		useradd -u 81 -g apache -s /bin/false -d /var/www/localhost -c "apache" apache
-		assert "problem adding user apache"
-	fi
-
-	einfo
-	einfo "Please remember to update your config files in /etc/apache"
-	einfo "as --datadir has been changed to ${DATADIR}!"
-	einfo
-}
-
-parse_modules_config() {
-	local filename=$1
-	local name=""
-	local dso=""
-	local disable=""
-	[ -f ${filename} ] || return 1
-	einfo "Using ${filename} for builtins."
-	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-module=$name"
-			name="" ; disable=""
-		elif [ $i == "static" ] ; then
-			MY_BUILTINS="${MY_BUILTINS} --enable-module=$name --disable-shared=$name"
-			name="" ; disable=""
-		elif [ $i == "shared" ] ; then
-			MY_BUILTINS="${MY_BUILTINS} --enable-module=$name --enable-shared=$name"
-			name="" ; disable=""
-		fi
-	done
-}
-
-select_modules_config() {
-	parse_modules_config /etc/apache/apache-builtin-mods || \
-	parse_modules_config ${FILESDIR}/apache-builtin-mods || \
-	return 1
-}
diff --git a/net-www/apache/apache-2.0.48-r4.ebuild b/net-www/apache/apache-2.0.48-r4.ebuild
deleted file mode 100644
index 852ec30b1293..000000000000
--- a/net-www/apache/apache-2.0.48-r4.ebuild
+++ /dev/null
@@ -1,384 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.48-r4.ebuild,v 1.7 2004/04/24 13:04:20 zul Exp $
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="Apache Web Server, Version 2.0.x"
-HOMEPAGE="http://www.apache.org/"
-
-S="${WORKDIR}/httpd-${PV}"
-SRC_URI="http://www.apache.org/dist/httpd/httpd-${PV}.tar.gz"
-KEYWORDS="~x86 ppc ~alpha ~hppa ~mips ~sparc ~amd64 s390"
-LICENSE="Apache-1.1"
-SLOT="2"
-
-#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* ) )"
-IUSE="berkdb gdbm ldap"
-
-pkg_setup() {
-	has_version =sys-libs/glibc-2.2* && filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGE
-	FILE_SOURCE
-}
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S} || die
-	patch -p1 <${FILESDIR}/apache-2.0.48-gentoo.diff || die
-	epatch ${FILESDIR}/apache-2.0.48-export.diff
-
-	if use ipv6
-	then
-		epatch ${FILESDIR}/httpd-2.0.48-ipv6.patch || die
-	fi
-
-	#avoid utf-8 charset problems
-	export LC_CTYPE=C
-
-	#the -1 shortcut is obsolete
-	perl -pi -e 's|head -1|head -n 1|;' srclib/apr/build/buildcheck.sh
-
-	#give it the stamp
-	perl -pi -e 's|" PLATFORM "|Gentoo/Linux|;' 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
-	perl -pi -e 's|\@exp_bindir\@(/envvars)|\@exp_installbuilddir\@\1|;' \
-		support/apachectl.in
-
-	#setup the filesystem layout config
-	local prefix=/usr
-	cat >>config.layout <<-EOF
-	<Layout Gentoo>
-	prefix:          ${prefix}
-	exec_prefix:     ${prefix}
-	bindir:          ${prefix}/bin
-	sbindir:         ${prefix}/sbin
-	libdir:          ${prefix}/lib
-	libexecdir:      ${prefix}/lib/apache2/modules
-	mandir:          ${prefix}/share/man
-	infodir:         ${prefix}/share/info
-	includedir:      ${prefix}/include/apache2
-	installbuilddir: ${prefix}/lib/apache2/build
-	datadir:         ${DATADIR}
-	errordir:        ${DATADIR}/error
-	iconsdir:        ${DATADIR}/icons
-	htdocsdir:       ${DATADIR}/htdocs
-	cgidir:          ${DATADIR}/cgi-bin
-	manualdir:       /usr/share/doc/${PF}/manual
-	sysconfdir:      /etc/apache2/conf
-	localstatedir:   /var
-	runtimedir:      /var/run
-	logfiledir:      /var/log/apache2
-	proxycachedir:   /var/cache/apache2
-	</Layout>
-	EOF
-
-	#gotta do these next two as well :\
-	cat >>srclib/apr/config.layout <<-EOF
-	<Layout Gentoo>
-	prefix:          ${prefix}
-	exec_prefix:     ${prefix}
-	bindir:          ${prefix}/bin
-	sbindir:         ${prefix}/sbin
-	libdir:          ${prefix}/lib
-	libexecdir:      ${prefix}/lib/apache2/modules
-	mandir:          ${prefix}/share/man
-	sysconfdir:      /etc/apache2/conf
-	datadir:         ${DATADIR}
-	installbuilddir: ${prefix}/lib/apache2/build
-	includedir:      ${prefix}/include/apache2
-	localstatedir:   /var
-	libsuffix:       -\${APR_MAJOR_VERSION}
-	</Layout>
-	EOF
-
-	cat >>srclib/apr-util/config.layout <<-EOF
-	<Layout Gentoo>
-	prefix:          ${prefix}
-	exec_prefix:     ${prefix}
-	bindir:          ${prefix}/bin
-	sbindir:         ${prefix}/sbin
-	libdir:          ${prefix}/lib
-	libexecdir:      ${prefix}/lib/apache2/modules
-	mandir:          ${prefix}/share/man
-	sysconfdir:      /etc/apache2/conf
-	datadir:         ${DATADIR}
-	installbuilddir: ${prefix}/lib/apache2/build
-	includedir:      ${prefix}/include/apache2
-	localstatedir:   /var
-	libsuffix:       -\${APRUTIL_MAJOR_VERSION}
-	</Layout>
-	EOF
-
-	./buildconf || die "buildconf failed"
-}
-
-src_compile() {
-	get_number_of_jobs
-	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"
-			myconf="--with-ldap --enable-auth-ldap=shared --enable-ldap=shared"
-		fi
-	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" \
-	./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=public_html \
-		--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 \
-		--with-mpm=${MPM:=prefork} \
-		--enable-layout=Gentoo \
-		--with-program-name=apache2 \
-		--host=${CHOST} ${myconf} || die "bad ./configure"
-		#--with-mpm={worker|prefork|perchild|leader|threadpool}
-
-	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 () {
-	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
-	perl -pi -e "s/(APR_SOURCE_DIR=).*/\1\"\"/" ${D}/usr/bin/apr-config
-	perl -pi -e "s/(APU_SOURCE_DIR=).*/\1\"\"/" ${D}/usr/bin/apu-config
-	perl -pi -e "s/(APU_BUILD_DIR=).*/\1\"\"/" ${D}/usr/bin/apu-config
-
-	#protect the suexec binary
-	local gid=`getent group apache |cut -d: -f3`
-	[ -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.40/$i
-	done
-	exeinto /usr/lib/ssl/apache2-mod_ssl
-	doexe ${FILESDIR}/2.0.40/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.40/$i
-	done
-	use !mips && use ldap && doins ${FILESDIR}/2.0.40/46_mod_ldap.conf
-
-	#drop in a convenient link to the manual
-	dosym /usr/share/doc/${PF}/manual ${DATADIR}/htdocs/manual
-
-	#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
-	mv -v usr/sbin/log_server_status usr/sbin/log_server_status2
-	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.48-r1/apache2.confd apache2
-	exeinto /etc/init.d; newexe ${FILESDIR}/2.0.48-r1/apache2.initd apache2
-	insinto /etc/apache2; doins ${FILESDIR}/2.0.40/apache2-builtin-mods
-	insinto /etc/apache2/conf
-	doins ${FILESDIR}/2.0.40/commonapache2.conf
-	doins ${FILESDIR}/2.0.48-r1/apache2.conf
-	insinto /etc/apache2/conf/vhosts
-	doins ${FILESDIR}/2.0.40/virtual-homepages.conf
-	doins ${FILESDIR}/2.0.40/dynamic-vhosts.conf
-	doins ${FILESDIR}/2.0.40/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() {
-	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.40/apache2-builtin-mods || \
-	return 1
-}
-
-pkg_postinst() {
-	#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 root -g root ${ROOT}/var/cache/apache2
-
-	if use ssl; then
-		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
-
-	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
-
-	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.49.ebuild b/net-www/apache/apache-2.0.49.ebuild
deleted file mode 100644
index 75efde902a6d..000000000000
--- a/net-www/apache/apache-2.0.49.ebuild
+++ /dev/null
@@ -1,402 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.49.ebuild,v 1.14 2004/05/29 16:39:44 zul Exp $
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="Apache Web Server, Version 2.0.x"
-HOMEPAGE="http://www.apache.org/"
-
-S="${WORKDIR}/httpd-${PV}"
-SRC_URI="http://www.apache.org/dist/httpd/httpd-${PV}.tar.gz"
-KEYWORDS="x86 ppc alpha hppa mips sparc amd64 ia64"
-LICENSE="Apache-2.0"
-SLOT="2"
-
-#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* ) )"
-IUSE="berkdb gdbm ldap"
-
-set_filter_flags () {
-	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
-	patch -p1 <${FILESDIR}/apache-2.0.49-gentoo.diff || die
-	epatch ${FILESDIR}/httpd-2.0.49-ssl_engine_kernel.patch || die
-	epatch ${FIESDIR}/httpd-2.0.49-cgi.patch || die
-
-	# integrated upstream
-	#epatch ${FILESDIR}/apache-2.0.48-export.diff
-
-	#avoid utf-8 charset problems
-	export LC_CTYPE=C
-
-	#the -1 shortcut is obsolete
-	perl -pi -e 's|head -1|head -n 1|;' srclib/apr/build/buildcheck.sh
-
-	#give it the stamp
-	perl -pi -e 's|" PLATFORM "|Gentoo/Linux|;' 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
-	perl -pi -e 's|\@exp_bindir\@(/envvars)|\@exp_installbuilddir\@\1|;' \
-		support/apachectl.in
-
-	#setup the filesystem layout config
-	local prefix=/usr
-	cat >>config.layout <<-EOF
-	<Layout Gentoo>
-	prefix:          ${prefix}
-	exec_prefix:     ${prefix}
-	bindir:          ${prefix}/bin
-	sbindir:         ${prefix}/sbin
-	libdir:          ${prefix}/lib
-	libexecdir:      ${prefix}/lib/apache2/modules
-	mandir:          ${prefix}/share/man
-	infodir:         ${prefix}/share/info
-	includedir:      ${prefix}/include/apache2
-	installbuilddir: ${prefix}/lib/apache2/build
-	datadir:         ${DATADIR}
-	errordir:        ${DATADIR}/error
-	iconsdir:        ${DATADIR}/icons
-	htdocsdir:       ${DATADIR}/htdocs
-	cgidir:          ${DATADIR}/cgi-bin
-	manualdir:       /usr/share/doc/${PF}/manual
-	sysconfdir:      /etc/apache2/conf
-	localstatedir:   /var
-	runtimedir:      /var/run
-	logfiledir:      /var/log/apache2
-	proxycachedir:   /var/cache/apache2
-	</Layout>
-	EOF
-
-	#gotta do these next two as well :\
-	cat >>srclib/apr/config.layout <<-EOF
-	<Layout Gentoo>
-	prefix:          ${prefix}
-	exec_prefix:     ${prefix}
-	bindir:          ${prefix}/bin
-	sbindir:         ${prefix}/sbin
-	libdir:          ${prefix}/lib
-	libexecdir:      ${prefix}/lib/apache2/modules
-	mandir:          ${prefix}/share/man
-	sysconfdir:      /etc/apache2/conf
-	datadir:         ${DATADIR}
-	installbuilddir: ${prefix}/lib/apache2/build
-	includedir:      ${prefix}/include/apache2
-	localstatedir:   /var
-	libsuffix:       -\${APR_MAJOR_VERSION}
-	</Layout>
-	EOF
-
-	cat >>srclib/apr-util/config.layout <<-EOF
-	<Layout Gentoo>
-	prefix:          ${prefix}
-	exec_prefix:     ${prefix}
-	bindir:          ${prefix}/bin
-	sbindir:         ${prefix}/sbin
-	libdir:          ${prefix}/lib
-	libexecdir:      ${prefix}/lib/apache2/modules
-	mandir:          ${prefix}/share/man
-	sysconfdir:      /etc/apache2/conf
-	datadir:         ${DATADIR}
-	installbuilddir: ${prefix}/lib/apache2/build
-	includedir:      ${prefix}/include/apache2
-	localstatedir:   /var
-	libsuffix:       -\${APRUTIL_MAJOR_VERSION}
-	</Layout>
-	EOF
-
-	WANT_AUTOCONF_2_5=1 WANT_AUTOCONF=2.5 ./buildconf || die "buildconf failed"
-}
-
-src_compile() {
-	set_filter_flags
-	get_number_of_jobs
-
-	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"
-			myconf="--with-ldap --enable-auth-ldap=shared --enable-ldap=shared"
-		fi
-	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
-
-	# fix bug #46585
-	CFLAGS="`echo ${CFLAGS} | xargs`"
-	CXXFLAGS="`echo ${CXXFLAGS} | xargs`"
-	LDFLAGS="`echo ${LDFLAGS} | xargs`"
-
-	SSL_BASE="SYSTEM" \
-	./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=public_html \
-		--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 \
-		--with-mpm=${MPM:=prefork} \
-		--enable-layout=Gentoo \
-		--with-program-name=apache2 \
-		--host=${CHOST} ${myconf} || die "bad ./configure submit bug report to bugs.gentoo.org. Include your config.log."
-
-	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
-	perl -pi -e "s/(APR_SOURCE_DIR=).*/\1\"\"/" ${D}/usr/bin/apr-config
-	perl -pi -e "s/(APU_SOURCE_DIR=).*/\1\"\"/" ${D}/usr/bin/apu-config
-	perl -pi -e "s/(APU_BUILD_DIR=).*/\1\"\"/" ${D}/usr/bin/apu-config
-
-	#protect the suexec binary
-	local gid=`getent group apache |cut -d: -f3`
-	[ -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
-	dosym /usr/share/doc/${PF}/manual ${DATADIR}/htdocs/manual
-
-	if [ -d /etc/logrotate.d ]
-	then
-		insinto /etc/logrotate.d
-		doins ${FILESDIR}/apache2
-	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
-	mv -v usr/sbin/log_server_status usr/sbin/log_server_status2
-	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 root -g root ${ROOT}/var/cache/apache2
-
-	if use ssl; then
-		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
-
-	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
-
-	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-1.3.29-r1 b/net-www/apache/files/digest-apache-1.3.29-r1
deleted file mode 100644
index a5423284e321..000000000000
--- a/net-www/apache/files/digest-apache-1.3.29-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e97fe9bf51dc2c9c233d53f63b1347e3 apache_1.3.29.tar.gz 2435809
-MD5 2faa15ad074ab273af41496a1afa527f apache-1.3.29-gentoo.diff.bz2 6862
-MD5 4f6c580ffa07d33e8584406132b98e86 mod_ssl-2.8.16-1.3.29.tar.gz 754325
diff --git a/net-www/apache/files/digest-apache-2.0.48-r4 b/net-www/apache/files/digest-apache-2.0.48-r4
deleted file mode 100644
index 1b6f6924c8bf..000000000000
--- a/net-www/apache/files/digest-apache-2.0.48-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 466c63bb71b710d20a5c353df8c1a19c httpd-2.0.48.tar.gz 6258490
diff --git a/net-www/apache/files/digest-apache-2.0.49 b/net-www/apache/files/digest-apache-2.0.49
deleted file mode 100644
index caa6620e2194..000000000000
--- a/net-www/apache/files/digest-apache-2.0.49
+++ /dev/null
@@ -1 +0,0 @@
-MD5 275d3d37eed1b070f333d3618f7d1954 httpd-2.0.49.tar.gz 5919279