Remove Apache1.

(Portage version: 2.1.2.7)

5 files changed, 5 insertions, 643 deletions

diff --git a/net-www/apache/ChangeLog b/net-www/apache/ChangeLog
index 57a4b5fb7bd4..830bf48d636f 100644
--- a/net-www/apache/ChangeLog
+++ b/net-www/apache/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-www/apache
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.534 2007/06/05 23:34:59 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.535 2007/06/13 14:20:19 chtekk Exp $
+
+  13 Jun 2007; Luca Longinotti <chtekk@gentoo.org>
+  -apache-1.3.34-r14.ebuild, -apache-1.3.37.ebuild:
+  Remove Apache1.
 
   05 Jun 2007; Markus Ullmann <jokey@gentoo.org> -apache-2.2.4-r5.ebuild
   +apache-2.2.4-r6.ebuild:
diff --git a/net-www/apache/apache-1.3.34-r14.ebuild b/net-www/apache/apache-1.3.34-r14.ebuild
deleted file mode 100644
index ae92f2b80641..000000000000
--- a/net-www/apache/apache-1.3.34-r14.ebuild
+++ /dev/null
@@ -1,306 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.34-r14.ebuild,v 1.7 2007/04/21 21:28:48 phreak Exp $
-
-inherit eutils fixheadtails multilib
-
-# latest gentoo apache files
-GENTOO_PATCHNAME="gentoo-apache-${PVR}"
-GENTOO_PATCHSTAMP="20060726"
-GENTOO_DEVSPACE="vericgar"
-GENTOO_PATCHDIR="${WORKDIR}/${GENTOO_PATCHNAME}"
-
-# 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.
-mod_ssl_ver=2.8.25
-lingerd_ver=0.94
-
-DESCRIPTION="The Apache Web Server"
-HOMEPAGE="http://httpd.apache.org"
-SRC_URI="mirror://apache/httpd/apache_${PV}.tar.gz
-		ssl? ( ftp://ftp.modssl.org/source/mod_ssl-${mod_ssl_ver}-${PV}.tar.gz )
-		lingerd? ( http://images.iagora.com/media/software/lingerd/lingerd-${lingerd_ver}.tar.gz )
-		http://dev.gentoo.org/~${GENTOO_DEVSPACE}/dist/apache/${GENTOO_PATCHNAME}-${GENTOO_PATCHSTAMP}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="doc ssl pam lingerd static-modules selinux"
-
-DEPEND="dev-lang/perl
-		|| ( sys-libs/gdbm ~sys-libs/db-1.85 )
-		sys-libs/db
-		>=dev-libs/mm-1.1.3
-		>=dev-libs/expat-1.95.2
-		net-www/gentoo-webroot-default
-		app-misc/mime-types
-		selinux? ( sec-policy/selinux-apache )
-		lingerd? ( =net-www/lingerd-${lingerd_ver} )"
-
-# so leave it out until it's available
-PDEPEND="ssl? ( =net-www/mod_ssl-${mod_ssl_ver}-r10 )"
-
-S=${WORKDIR}/${PN}_${PV}
-
-pkg_setup() {
-	# setup apache user and group
-	enewgroup apache 81
-	enewuser apache 81 -1 /var/www apache
-}
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S} || die
-
-	# Use correct multilib libdir in gentoo patches
-	sed -i -e "s:/usr/lib:/usr/$(get_libdir):g" \
-		${GENTOO_PATCHDIR}/{conf/httpd.conf,init/*,patches/config.layout} \
-		|| die "sed failed"
-
-	# patch codes:
-	# 00-29 patches to work with gentoo
-	# 30-89 USE-flag patches
-	# 90-99 security patches
-	EPATCH_SUFFIX="patch"
-	epatch ${GENTOO_PATCHDIR}/patches/[0-2]*
-	epatch ${GENTOO_PATCHDIR}/patches/9*
-
-	# setup the filesystem layout config
-	cat ${GENTOO_PATCHDIR}/patches/config.layout >> config.layout
-	sed -i -e 's:version:${PF}:g' config.layout
-
-	if useq pam; then
-		epatch ${GENTOO_PATCHDIR}/patches/31_all_gentoo_suexec_pam.patch || die "pam patch failed"
-	fi
-
-	# fix obsolete 'head -1' and 'tail -1' calls
-	ht_fix_file src/Configure src/helpers/getuid.sh src/helpers/buildinfo.sh src/helpers/fmn.sh
-
-	# setup mod_ssl eapi
-	if useq ssl; then
-		local myssl
-		myssl=${WORKDIR}/mod_ssl-${mod_ssl_ver}-${PV}
-		cp ${myssl}/pkg.eapi/*.h src/include
-		cp ${myssl}/pkg.eapi/*.c src/ap
-		epatch ${myssl}/pkg.eapi/eapi.patch || die "failed to setup mod_ssl eapi"
-	fi
-
-	# set a reasonable MM_CORE_PATH location..
-	sed -i -e 's:logs/mm:/var/cache/apache-mm/mm:' src/include/httpd.h
-
-	if useq lingerd; then
-		local mylingerd=${WORKDIR}/lingerd-${lingerd_ver}
-		cp ${mylingerd}/apache-1.3/ap_lingerd.c ${mylingerd}/li_config.h src/main
-		cd src
-		if useq ssl; then
-			epatch ${mylingerd}/apache-1.3/aplinger-ssl.diff
-		else
-			epatch ${mylingerd}/apache-1.3/aplinger.diff
-		fi
-		cd ..
-	fi
-}
-
-src_compile() {
-	local myconf
-
-	setup_apache_vars
-
-	select_modules_config || die "determining modules"
-
-# no more USE=no-suexec because of bug 148082
-# see the 2.2 ebuilds for how this can be done cleanly with a working system
-# "out of the box"
-#	if ! useq no-suexec; then
-		myconf="${myconf}
-				--enable-suexec
-				--suexec-uidmin=1000 \
-				--suexec-gidmin=100 \
-				--suexec-caller=apache \
-				--suexec-userdir=public_html \
-				--suexec-docroot=/var/www \
-				--suexec-safepath="/usr/local/bin:/usr/bin:/bin" \
-				--suexec-logfile=/var/log/apache/suexec_log"
-#	fi
-
-	if useq ssl; then
-		myconf="${myconf} --enable-rule=EAPI"
-	fi
-
-	OPTIM="${MY_CFLAGS} -DHARD_SERVER_LIMIT=${HARD_SERVER_LIMIT:=512} \
-		-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" \
-	LIBS="-ldb -lgdbm -lgdbm_compat -lpthread" \
-	EAPI_MM=SYSTEM \
-	./configure \
-		--with-layout=Gentoo \
-		--target=apache \
-		--server-uid=apache \
-		--server-gid=apache \
-		--with-perl=/usr/bin/perl \
-		--enable-rule=SHARED_CHAIN \
-		${MY_BUILTINS} ${myconf} ${EXTRA_ECONF} || die "bad ./configure please submit bug report to bugs.gentoo.org. Include your config.layout and config.log"
-
-	emake || die "problem compiling apache"
-
-	# build ssl version of apache bench (ab-ssl)
-	if useq ssl; then
-		cd src/support
-		rm -f ab ab.o
-		make ab CFLAGS="${CFLAGS} -DUSE_SSL -lcrypto -lssl -I/usr/include/openssl -L/usr/$(get_libdir)" || die
-		mv ab ab-ssl
-		rm -f ab.o
-		make ab || die
-	fi
-}
-
-src_install() {
-	# general install
-	make install-quiet root=${D} || die
-	dodoc ABOUT_APACHE Announcement INSTALL 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/$(get_libdir) /usr/$(get_libdir)/apache/lib
-	dosym /var/log/apache /usr/$(get_libdir)/apache/logs
-	dosym /etc/apache /usr/$(get_libdir)/apache/conf
-
-	# nice support scripts
-	exeinto /usr/sbin
-	for i in apachelogserverstatus apachesplitlogfile; do
-		doexe ${GENTOO_PATCHDIR}/scripts/${i}
-	done
-
-	# some more scripts
-	for i in split-logfile logresolve.pl log_server_status; do
-		doexe ${S}/src/support/${i}
-	done
-
-	# the ssl version of apache bench
-	if useq ssl; then
-		doexe src/support/ab-ssl
-	fi
-
-	# drop in a convenient link to the manual
-	if useq doc; then
-		insinto /etc/apache/modules.d
-		doins ${GENTOO_PATCHDIR}/conf/modules.d/00_apache_manual.conf
-		sed -i -e "s:1.3.32:${PVR}:" ${D}/etc/apache/modules.d/00_apache_manual.conf
-	else
-		rm -rf ${D}/usr/share/doc/${PF}/manual
-	fi
-
-	# tidy up
-	cd ${D}
-	dodoc etc/apache/*.default
-	rm -f etc/apache/*.default
-	rm -f etc/apache/*.conf
-	rm -f etc/apache/mime.types
-
-	# we DEPEND on net-www/gentoo-webroot-default for sharing this by now
-	rm -rf var/www/localhost
-
-	# config files
-	newconfd ${GENTOO_PATCHDIR}/init/apache.confd apache
-	newinitd ${GENTOO_PATCHDIR}/init/apache.initd apache
-
-	insinto /etc/apache
-	doins ${GENTOO_PATCHDIR}/conf/apache-builtin-mods
-	doins ${GENTOO_PATCHDIR}/conf/httpd.conf
-
-	insinto /etc/apache/vhosts.d
-	doins ${GENTOO_PATCHDIR}/conf/vhosts.d/00_default_vhost.conf
-
-	keepdir /etc/apache/vhosts.d
-	keepdir /etc/apache/modules.d
-
-	# 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/httpd.conf
-	fi
-
-	if useq lingerd; then
-		sed -i 's:\(need net.*\):\1 lingerd:g' ${D}/etc/init.d/apache
-	fi
-
-	if useq pam; then
-		insinto /etc/pam.d
-		newins ${GENTOO_PATCHDIR}/patches/suexec.pam suexec
-	fi
-
-	# empty dirs
-	for i in /var/log/apache /var/cache/apache /var/cache/apache-mm; do
-		keepdir ${i}
-		fowners apache:apache ${i}
-		fperms 755 ${i}
-	done
-}
-
-pkg_postinst() {
-
-	if has_version '<net-www/apache-1.3.33-r10' ; then
-		einfo "Configuration locations have changed, you will need to migrate"
-		einfo "your configuration from /etc/apache/conf/apache.conf and"
-		einfo "/etc/apache/conf/commonapache.conf to /etc/apache/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 "For more information, see"
-		einfo "  http://www.gentoo.org/doc/en/apache-upgrading.xml"
-		einfo
-	fi
-
-	einfo "If you want modules to be installed for this version of apache"
-	einfo "then please ensure that apache2 is not in your USE flags. To remove"
-	einfo "the USE-flag, add '-apache2' to USE in /etc/make.conf."
-
-}
-
-setup_apache_vars() {
-	MY_CFLAGS="${CFLAGS}"
-	unset CFLAGS
-	unset CXXFLAGS
-
-	# standard location for Gentoo Linux
-	DATADIR="${DATADIR:-/var/www/localhost}"
-	einfo "DATADIR is set to: ${DATADIR}"
-}
-
-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-module=$name"
-			name="" ; disable=""
-		elif [ $i == "static" ] || useq static-modules; 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
-
-	einfo "${1} options:\n${MY_BUILTINS}"
-}
-
-select_modules_config() {
-	parse_modules_config /etc/apache/apache-builtin-mods || \
-	parse_modules_config ${GENTOO_PATCHDIR}/conf/apache-builtin-mods || \
-	return 1
-}
-
-# vim:ts=4
diff --git a/net-www/apache/apache-1.3.37.ebuild b/net-www/apache/apache-1.3.37.ebuild
deleted file mode 100644
index 95dc397cea6d..000000000000
--- a/net-www/apache/apache-1.3.37.ebuild
+++ /dev/null
@@ -1,312 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.37.ebuild,v 1.6 2007/04/21 21:28:48 phreak Exp $
-
-inherit eutils fixheadtails multilib
-
-# latest gentoo apache files
-GENTOO_PATCHNAME="gentoo-apache-${PVR}"
-GENTOO_PATCHSTAMP="20060729"
-GENTOO_DEVSPACE="vericgar"
-GENTOO_PATCHDIR="${WORKDIR}/${GENTOO_PATCHNAME}"
-
-# 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.
-mod_ssl_ver=2.8.28
-lingerd_ver=0.94
-
-DESCRIPTION="The Apache Web Server"
-HOMEPAGE="http://httpd.apache.org"
-SRC_URI="mirror://apache/httpd/apache_${PV}.tar.gz
-		ssl? ( ftp://ftp.modssl.org/source/mod_ssl-${mod_ssl_ver}-${PV}.tar.gz )
-		lingerd? ( http://images.iagora.com/media/software/lingerd/lingerd-${lingerd_ver}.tar.gz )
-		http://dev.gentoo.org/~${GENTOO_DEVSPACE}/dist/apache/${GENTOO_PATCHNAME}-${GENTOO_PATCHSTAMP}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="doc ssl pam lingerd static-modules selinux"
-
-DEPEND="dev-lang/perl
-		sys-libs/gdbm
-		sys-libs/db
-		>=dev-libs/mm-1.1.3
-		>=dev-libs/expat-1.95.2
-		net-www/gentoo-webroot-default
-		app-misc/mime-types
-		selinux? ( sec-policy/selinux-apache )
-		lingerd? ( =net-www/lingerd-${lingerd_ver} )"
-
-# so leave it out until it's available
-PDEPEND="ssl? ( =net-www/mod_ssl-${mod_ssl_ver} )"
-
-S=${WORKDIR}/${PN}_${PV}
-
-pkg_setup() {
-	# setup apache user and group
-	enewgroup apache 81
-	enewuser apache 81 -1 /var/www apache
-}
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S} || die
-
-	# Use correct multilib libdir in gentoo patches
-	sed -i -e "s:/usr/lib:/usr/$(get_libdir):g" \
-		${GENTOO_PATCHDIR}/{conf/httpd.conf,init/*,patches/config.layout} \
-		|| die "sed failed"
-
-	# patch codes:
-	# 00-29 patches to work with gentoo
-	# 30-89 USE-flag patches
-	# 90-99 security patches
-	EPATCH_SUFFIX="patch"
-	epatch ${GENTOO_PATCHDIR}/patches/[0-2]*
-
-	# security patches are version based
-	# 99_all_${PV}_Name.patch
-	if $(ls ${GENTOO_PATCHDIR}/patches/9?_*_${PV}_* &>/dev/null); then
-		epatch ${GENTOO_PATCHDIR}/patches/9?_*_${PV}_* || \
-			die "Patching for version ${PV} failed"
-	fi
-
-	# setup the filesystem layout config
-	cat ${GENTOO_PATCHDIR}/patches/config.layout >> config.layout
-	sed -i -e 's:version:${PF}:g' config.layout
-
-	if useq pam; then
-		epatch ${GENTOO_PATCHDIR}/patches/31_all_gentoo_suexec_pam.patch || die "pam patch failed"
-	fi
-
-	# fix obsolete 'head -1' and 'tail -1' calls
-	ht_fix_file src/Configure src/helpers/getuid.sh src/helpers/buildinfo.sh src/helpers/fmn.sh
-
-	# setup mod_ssl eapi
-	if useq ssl; then
-		local myssl
-		myssl=${WORKDIR}/mod_ssl-${mod_ssl_ver}-${PV}
-		cp ${myssl}/pkg.eapi/*.h src/include
-		cp ${myssl}/pkg.eapi/*.c src/ap
-		epatch ${myssl}/pkg.eapi/eapi.patch || die "failed to setup mod_ssl eapi"
-	fi
-
-	# set a reasonable MM_CORE_PATH location..
-	sed -i -e 's:logs/mm:/var/cache/apache-mm/mm:' src/include/httpd.h
-
-	if useq lingerd; then
-		local mylingerd=${WORKDIR}/lingerd-${lingerd_ver}
-		cp ${mylingerd}/apache-1.3/ap_lingerd.c ${mylingerd}/li_config.h src/main
-		cd src
-		if useq ssl; then
-			epatch ${mylingerd}/apache-1.3/aplinger-ssl.diff
-		else
-			epatch ${mylingerd}/apache-1.3/aplinger.diff
-		fi
-		cd ..
-	fi
-}
-
-src_compile() {
-	local myconf
-
-	setup_apache_vars
-
-	select_modules_config || die "determining modules"
-
-# no more USE=no-suexec because of bug 148082
-# see the 2.2 ebuilds for how this can be done cleanly with a working system
-# "out of the box"
-#	if ! useq no-suexec; then
-		myconf="${myconf}
-				--enable-suexec
-				--suexec-uidmin=1000 \
-				--suexec-gidmin=100 \
-				--suexec-caller=apache \
-				--suexec-userdir=public_html \
-				--suexec-docroot=/var/www \
-				--suexec-safepath="/usr/local/bin:/usr/bin:/bin" \
-				--suexec-logfile=/var/log/apache/suexec_log"
-#	fi
-
-	if useq ssl; then
-		myconf="${myconf} --enable-rule=EAPI"
-	fi
-
-	OPTIM="${MY_CFLAGS} -DHARD_SERVER_LIMIT=${HARD_SERVER_LIMIT:=512} \
-		-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" \
-	LIBS="-ldb -lgdbm -lgdbm_compat -lpthread" \
-	EAPI_MM=SYSTEM \
-	./configure \
-		--with-layout=Gentoo \
-		--target=apache \
-		--server-uid=apache \
-		--server-gid=apache \
-		--with-perl=/usr/bin/perl \
-		--enable-rule=SHARED_CHAIN \
-		${MY_BUILTINS} ${myconf} ${EXTRA_ECONF} || die "bad ./configure please submit bug report to bugs.gentoo.org. Include your config.layout and config.log"
-
-	emake || die "problem compiling apache"
-
-	# build ssl version of apache bench (ab-ssl)
-	if useq ssl; then
-		cd src/support
-		rm -f ab ab.o
-		make ab CFLAGS="${CFLAGS} -DUSE_SSL -lcrypto -lssl -I/usr/include/openssl -L/usr/$(get_libdir)" || die
-		mv ab ab-ssl
-		rm -f ab.o
-		make ab || die
-	fi
-}
-
-src_install() {
-	# general install
-	make install-quiet root=${D} || die
-	dodoc ABOUT_APACHE Announcement INSTALL 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/$(get_libdir) /usr/$(get_libdir)/apache/lib
-	dosym /var/log/apache /usr/$(get_libdir)/apache/logs
-	dosym /etc/apache /usr/$(get_libdir)/apache/conf
-
-	# nice support scripts
-	exeinto /usr/sbin
-	for i in apachelogserverstatus apachesplitlogfile; do
-		doexe ${GENTOO_PATCHDIR}/scripts/${i}
-	done
-
-	# some more scripts
-	for i in split-logfile logresolve.pl log_server_status; do
-		doexe ${S}/src/support/${i}
-	done
-
-	# the ssl version of apache bench
-	if useq ssl; then
-		doexe src/support/ab-ssl
-	fi
-
-	# drop in a convenient link to the manual
-	if useq doc; then
-		insinto /etc/apache/modules.d
-		doins ${GENTOO_PATCHDIR}/conf/modules.d/00_apache_manual.conf
-		sed -i -e "s:1.3.32:${PVR}:" ${D}/etc/apache/modules.d/00_apache_manual.conf
-	else
-		rm -rf ${D}/usr/share/doc/${PF}/manual
-	fi
-
-	# tidy up
-	cd ${D}
-	dodoc etc/apache/*.default
-	rm -f etc/apache/*.default
-	rm -f etc/apache/*.conf
-	rm -f etc/apache/mime.types
-
-	# we DEPEND on net-www/gentoo-webroot-default for sharing this by now
-	rm -rf var/www/localhost
-
-	# config files
-	doconfd ${GENTOO_PATCHDIR}/init/apache.confd apache
-	doinitd ${GENTOO_PATCHDIR}/init/apache.initd apache
-
-	insinto /etc/apache
-	doins ${GENTOO_PATCHDIR}/conf/apache-builtin-mods
-	doins ${GENTOO_PATCHDIR}/conf/httpd.conf
-
-	insinto /etc/apache/vhosts.d
-	doins ${GENTOO_PATCHDIR}/conf/vhosts.d/00_default_vhost.conf
-
-	keepdir /etc/apache/vhosts.d
-	keepdir /etc/apache/modules.d
-
-	# 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/httpd.conf
-	fi
-
-	if useq lingerd; then
-		sed -i 's:\(need net.*\):\1 lingerd:g' ${D}/etc/init.d/apache
-	fi
-
-	if useq pam; then
-		insinto /etc/pam.d
-		newins ${GENTOO_PATCHDIR}/patches/suexec.pam suexec
-	fi
-
-	# empty dirs
-	for i in /var/log/apache /var/cache/apache /var/cache/apache-mm; do
-		keepdir ${i}
-		fowners apache:apache ${i}
-		fperms 755 ${i}
-	done
-}
-
-pkg_postinst() {
-
-	if has_version '<net-www/apache-1.3.33-r10' ; then
-		einfo "Configuration locations have changed, you will need to migrate"
-		einfo "your configuration from /etc/apache/conf/apache.conf and"
-		einfo "/etc/apache/conf/commonapache.conf to /etc/apache/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 "For more information, see"
-		einfo "  http://www.gentoo.org/doc/en/apache-upgrading.xml"
-		einfo
-	fi
-
-	einfo "If you want modules to be installed for this version of apache"
-	einfo "then please ensure that apache2 is not in your USE flags. To remove"
-	einfo "the USE-flag, add '-apache2' to USE in /etc/make.conf."
-
-}
-
-setup_apache_vars() {
-	MY_CFLAGS="${CFLAGS}"
-	unset CFLAGS
-	unset CXXFLAGS
-
-	# standard location for Gentoo Linux
-	DATADIR="${DATADIR:-/var/www/localhost}"
-	einfo "DATADIR is set to: ${DATADIR}"
-}
-
-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-module=$name"
-			name="" ; disable=""
-		elif [ $i == "static" ] || useq static-modules; 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
-
-	einfo "${1} options:\n${MY_BUILTINS}"
-}
-
-select_modules_config() {
-	parse_modules_config /etc/apache/apache-builtin-mods || \
-	parse_modules_config ${GENTOO_PATCHDIR}/conf/apache-builtin-mods || \
-	return 1
-}
-
-# vim:ts=4
diff --git a/net-www/apache/files/digest-apache-1.3.34-r14 b/net-www/apache/files/digest-apache-1.3.34-r14
deleted file mode 100644
index e0706667948a..000000000000
--- a/net-www/apache/files/digest-apache-1.3.34-r14
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 9978cc552b423f0015c1052d23ab619e apache_1.3.34.tar.gz 2468056
-RMD160 e39dfc57b7f9164aa76641de3fa74f0314c9ec9e apache_1.3.34.tar.gz 2468056
-SHA256 ceed243f4f98e4323b48e5f7f80e306d1abb00c592e18de5575983db42d6f8d4 apache_1.3.34.tar.gz 2468056
-MD5 3d78704e3f95fe59bf0e0ac1060444fd gentoo-apache-1.3.34-r14-20060726.tar.bz2 28001
-RMD160 955a0ba00287db8859ce03ba6ccfdc2cfaa3bd12 gentoo-apache-1.3.34-r14-20060726.tar.bz2 28001
-SHA256 808e88b32d9ee7181d1cb789f24da21ccd059c8789eff9989bd92826fe826149 gentoo-apache-1.3.34-r14-20060726.tar.bz2 28001
-MD5 6401015bafad4f44fdf8a9a1795d9258 lingerd-0.94.tar.gz 33938
-RMD160 2d7363b763a68c0c7acdadc23779929f4d02153f lingerd-0.94.tar.gz 33938
-SHA256 632030f9c1b9e8f817ee19bad74988f3dce7f6ec617677ad5a522e8d491382a0 lingerd-0.94.tar.gz 33938
-MD5 1ef2a6cb47573444779b2fd10502514b mod_ssl-2.8.25-1.3.34.tar.gz 820352
-RMD160 90a3913d30c7f4d194907463125c90101005837a mod_ssl-2.8.25-1.3.34.tar.gz 820352
-SHA256 832b240157666efdbdfc1a2fd593ee4eebbc9441ec48ece8276660092b974d07 mod_ssl-2.8.25-1.3.34.tar.gz 820352
diff --git a/net-www/apache/files/digest-apache-1.3.37 b/net-www/apache/files/digest-apache-1.3.37
deleted file mode 100644
index 0558f91b506a..000000000000
--- a/net-www/apache/files/digest-apache-1.3.37
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 b278f0969a9ccadeb781316e79e3520f apache_1.3.37.tar.gz 2665370
-RMD160 de84adf2fd0a745c32072ca5dc5e1374cfcf04f7 apache_1.3.37.tar.gz 2665370
-SHA256 9f27889bfbf418b987a892160e52fd217d66391df2870f3ecac877ef565c4bfc apache_1.3.37.tar.gz 2665370
-MD5 7f991bd4d1ce19222a54b6e241ce04a2 gentoo-apache-1.3.37-20060729.tar.bz2 27992
-RMD160 fdb8c3690c8daad501339545b2e348d533d1be09 gentoo-apache-1.3.37-20060729.tar.bz2 27992
-SHA256 00d759d184bec0c2aafbfaba2b748247ceae54bc04570d47979dc237b028ef2b gentoo-apache-1.3.37-20060729.tar.bz2 27992
-MD5 6401015bafad4f44fdf8a9a1795d9258 lingerd-0.94.tar.gz 33938
-RMD160 2d7363b763a68c0c7acdadc23779929f4d02153f lingerd-0.94.tar.gz 33938
-SHA256 632030f9c1b9e8f817ee19bad74988f3dce7f6ec617677ad5a522e8d491382a0 lingerd-0.94.tar.gz 33938
-MD5 5e9486a86fcd4efef395f58fd795aaea mod_ssl-2.8.28-1.3.37.tar.gz 820417
-RMD160 6b12c0a52fe0fbb7b91221d1cb37f93fbe59bb11 mod_ssl-2.8.28-1.3.37.tar.gz 820417
-SHA256 76437105b5b5593a7dbd8ee45af417233897dcaf910cbc337a68b0db24e35489 mod_ssl-2.8.28-1.3.37.tar.gz 820417