Fix the init script so that is works with older versions of baselayout. Removed 2.0.59-r1 because it needed a newer baselayout and it's environment handling was buggy.

(Portage version: 2.1.2_pre2-r5)
 (Unsigned Manifest commit)

3 files changed, 12 insertions, 479 deletions

diff --git a/net-www/apache/Manifest b/net-www/apache/Manifest
index 703e5f999619..95b3029e4b13 100644
--- a/net-www/apache/Manifest
+++ b/net-www/apache/Manifest
@@ -8,7 +8,7 @@ DIST gentoo-apache-2.0.54-r31-20050918-02.tar.bz2 52990 RMD160 bc85ac9de56e017c0
 DIST gentoo-apache-2.0.58-20060515.tar.bz2 51174 RMD160 e029caa8107e37b66999935d6c1e9ed2e95351f0 SHA1 c88f42534f7419517905679f028be8b5754af962 SHA256 3d11702d3fd6b5c143b1c238e9b4a0d4bed2b3c4b9834efa6a3436cca492c0e5
 DIST gentoo-apache-2.0.58-r2-20060726.tar.bz2 58758 RMD160 46c6da577db444a6553b60d3ae30c61ae3b741fa SHA1 5399c6076fbccc36b1d8a5ed783f77918c3398eb SHA256 b8e0356e87fdd7b55fcecbee804c9a41525b3e6fe8309f87f2509abd161c8e6b
 DIST gentoo-apache-2.0.59-20060729.tar.bz2 58736 RMD160 f722780db04484f80caea7a6977017a7216e1344 SHA1 085c76939be1d3d77c615033b5c15a8b8c7b23cb SHA256 10ef9a3279bbe25b302ae72b3dbe0d91d24d163d23526287626669b9c0cc0c62
-DIST gentoo-apache-2.0.59-r1-20061101.tar.bz2 58646 RMD160 974f2884451f6adb3103a7f59ffe9a79a0b64adb SHA1 089a29afffc64444b2846ba077186f797af97cc6 SHA256 1becf13bcf151a72d9e6ab457037ab7e2083f93bc9dd894aaf8a3dea4f7192f7
+DIST gentoo-apache-2.0.59-r2-20061102.tar.bz2 58768 RMD160 d20d39e66e3cb52befeb697133172c8d494e2c78 SHA1 1f8543ecdba7cef911456757a0d12e9c15abe355 SHA256 c8de97abe4077e2f6d827726a5fb0b03f6e8bd9514d8f9b9ca2a35a1c9698518
 DIST gentoo-apache-2.2.2-r1-20060726.tar.bz2 51572 RMD160 247f5766d7875f6f3a9c8b64170fa8354b33b661 SHA1 d73224457a307c71ddd30a6f9cdc31de8e855bcd SHA256 17e23002ac5fb31f07a02577bf78e9d5ea7fb6d8317743591baf68abefb37ab0
 DIST gentoo-apache-2.2.3-20060729.tar.bz2 51526 RMD160 c5f1e367e73090d378c461134961bc8c0a95396a SHA1 3088502349dd8df36bb97708bbc7bebef11709f0 SHA256 5194ef7b23b18b333b2864ccb45f90cf5bca1cfc4e65f6552eaa4561c107d24c
 DIST httpd-2.0.54.tar.bz2 5566979 RMD160 c511cb2fa396ba04caf77bfc6ca03413df48ea08 SHA1 15b4fc3024cceea6562fb03383fd624e84e5e35a SHA256 55a3d1c3fc4ff5ed5a4c4a20050ab68d98a10b2ab7d52f02a485da1a0fb060e3
@@ -47,10 +47,10 @@ EBUILD apache-2.0.58.ebuild 13744 RMD160 a6d9f7ab7374b9172e2305791c6e40bd3985257
 MD5 838b96605f46629201c50f460b083eb6 apache-2.0.58.ebuild 13744
 RMD160 a6d9f7ab7374b9172e2305791c6e40bd39852576 apache-2.0.58.ebuild 13744
 SHA256 01008d6dd3283c582fb476ace5d8d229aa357ddc62d6a7a6f758ce764a9ae693 apache-2.0.58.ebuild 13744
-EBUILD apache-2.0.59-r1.ebuild 14070 RMD160 4f07d35535df15f924104816b87dc14d330ae37d SHA1 f9b213a289f4989ce49b945630158bd42e9410cf SHA256 6483ae56c72f68716b518fc8647d65dff7e28bcc0685a8a5dc63a2d7e5f7df18
-MD5 3c2f825a6bd5103768443d1e195b1662 apache-2.0.59-r1.ebuild 14070
-RMD160 4f07d35535df15f924104816b87dc14d330ae37d apache-2.0.59-r1.ebuild 14070
-SHA256 6483ae56c72f68716b518fc8647d65dff7e28bcc0685a8a5dc63a2d7e5f7df18 apache-2.0.59-r1.ebuild 14070
+EBUILD apache-2.0.59-r2.ebuild 14070 RMD160 242378f61d0ab8247c56e8ab0a668fcef24c5c97 SHA1 02cf82f9bd851f7238712e5d49bce3f28fba3565 SHA256 917ebe9bdf0fb4badc32868a1933c566702f957b0354416b043c14bd78f43229
+MD5 154e3b9b3191e0d2ccfd532e46ab37b2 apache-2.0.59-r2.ebuild 14070
+RMD160 242378f61d0ab8247c56e8ab0a668fcef24c5c97 apache-2.0.59-r2.ebuild 14070
+SHA256 917ebe9bdf0fb4badc32868a1933c566702f957b0354416b043c14bd78f43229 apache-2.0.59-r2.ebuild 14070
 EBUILD apache-2.0.59.ebuild 14067 RMD160 46f7a4bd32e7be999927c0a746deed4e8ad520c0 SHA1 cb214610a19618a643225548460c540e062d2225 SHA256 8e28ec93914c9cbbc773f24810c2606494feb93366e503407bf44e09b87e526c
 MD5 e55308c6b2ff469c644ce70fe20ea3ad apache-2.0.59.ebuild 14067
 RMD160 46f7a4bd32e7be999927c0a746deed4e8ad520c0 apache-2.0.59.ebuild 14067
@@ -63,10 +63,10 @@ EBUILD apache-2.2.3.ebuild 13978 RMD160 b606ac2f5fb0ba7ff0cbdd9c5e13547b212a8e2f
 MD5 63eb4103c9d36639f2893fefa0313dae apache-2.2.3.ebuild 13978
 RMD160 b606ac2f5fb0ba7ff0cbdd9c5e13547b212a8e2f apache-2.2.3.ebuild 13978
 SHA256 5108612084de298195dc646be0e3f0a09818f205c918b451ee142b08c00ab46d apache-2.2.3.ebuild 13978
-MISC ChangeLog 85808 RMD160 414e59156a4ba71004bfc9429d59939d67f64ec0 SHA1 e62c00396014cd05fd9bb7bafd90bae09331d120 SHA256 ce4c07ba4894d102d2e98c5bedee59f4adb4dc965f7ad3bd258e823e0e3f0b66
-MD5 0dd2dd5a74c1d52404636a271e557a2d ChangeLog 85808
-RMD160 414e59156a4ba71004bfc9429d59939d67f64ec0 ChangeLog 85808
-SHA256 ce4c07ba4894d102d2e98c5bedee59f4adb4dc965f7ad3bd258e823e0e3f0b66 ChangeLog 85808
+MISC ChangeLog 86123 RMD160 c3b99c6333a6804e7d02420a4c14d3a78dc904b1 SHA1 9659fa56185c189a597e3aae72513e45ac4b34ba SHA256 e02c8787d0d7721a7e2ee6d00c812fd0f819707dca8acf19f1f35d34644c25a6
+MD5 2b8ec153372be07f008ce4d0b625bfdc ChangeLog 86123
+RMD160 c3b99c6333a6804e7d02420a4c14d3a78dc904b1 ChangeLog 86123
+SHA256 e02c8787d0d7721a7e2ee6d00c812fd0f819707dca8acf19f1f35d34644c25a6 ChangeLog 86123
 MISC metadata.xml 566 RMD160 8aad2cbb313fa91b77c6f4891f8d3483d1460adc SHA1 cfaab8d65125c65cb5c66c37dd200f7b3586baf9 SHA256 9826f38d29b803e954faa6fafffc4d6f197bfcb0e14cc76af891c41081d948e2
 MD5 27c9cb37c510e08bb69df277229a03ea metadata.xml 566
 RMD160 8aad2cbb313fa91b77c6f4891f8d3483d1460adc metadata.xml 566
@@ -95,9 +95,9 @@ SHA256 a168cb54770884f50f48411842613b904f1cbf24ca9596ea43b28eeed7688936 files/di
 MD5 16816198f966a70f500b1b460ed40199 files/digest-apache-2.0.59 533
 RMD160 bab9bfe89f7a544c37105d66a10e01a0bc941356 files/digest-apache-2.0.59 533
 SHA256 9873a7f70a367c81172ae495807b3a2433c2b5006070489381e1a2f6cd9e4411 files/digest-apache-2.0.59 533
-MD5 67920f3baa24d24f76a978e53c966907 files/digest-apache-2.0.59-r1 542
-RMD160 1642eeb2e5a5b042937fadef56b9b5a660acb598 files/digest-apache-2.0.59-r1 542
-SHA256 dd37e8f0d96c603b43d5ac3ec31b880a1fce8eceed573776ff1b44bf2e24205c files/digest-apache-2.0.59-r1 542
+MD5 fb6513d7e3c17a25d505a7c7a06d43d7 files/digest-apache-2.0.59-r2 542
+RMD160 124580b340dddc55cb1c92565a0de043a9b27ab1 files/digest-apache-2.0.59-r2 542
+SHA256 d3d9b85e6d0dc1610726f52d7f45f34e144351cf96d449bdabcd362482405cb5 files/digest-apache-2.0.59-r2 542
 MD5 f79fabc348ee9af7b4453493774e66d0 files/digest-apache-2.2.2-r1 536
 RMD160 35e1b80804733777550c22cb6bee1f48e6f89546 files/digest-apache-2.2.2-r1 536
 SHA256 ccf6b0ba8e729efd9a1837791145dd2dc056339b58ae166e677993500d22f971 files/digest-apache-2.2.2-r1 536
diff --git a/net-www/apache/apache-2.0.59-r1.ebuild b/net-www/apache/apache-2.0.59-r1.ebuild
deleted file mode 100644
index 31911f69f32c..000000000000
--- a/net-www/apache/apache-2.0.59-r1.ebuild
+++ /dev/null
@@ -1,461 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.59-r1.ebuild,v 1.2 2006/11/01 17:38:43 vericgar Exp $
-
-inherit eutils flag-o-matic gnuconfig multilib
-
-# latest gentoo apache files
-GENTOO_PATCHNAME="gentoo-apache-${PVR}"
-GENTOO_PATCHSTAMP="20061101"
-GENTOO_DEVSPACE="vericgar"
-GENTOO_PATCHDIR="${WORKDIR}/${GENTOO_PATCHNAME}"
-
-DESCRIPTION="The Apache Web Server"
-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 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="apache2 debug doc ldap mpm-itk mpm-leader mpm-peruser mpm-prefork mpm-threadpool mpm-worker ssl static-modules threads selinux"
-
-RDEPEND="dev-lang/perl
-	~dev-libs/apr-0.9.12
-	~dev-libs/apr-util-0.9.12
-	dev-libs/expat
-	app-misc/mime-types
-	sys-libs/zlib
-	mpm-itk? ( sys-libs/libcap )
-	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 ldap && ! built_with_use 'dev-libs/apr-util' ldap; then
-		eerror "dev-libs/apr-util is missing LDAP support. For apache to have"
-		eerror "ldap support, apr-util must be built with the ldap USE-flag"
-		eerror "enabled."
-		die "ldap USE-flag enabled while not supported in apr-util"
-	fi
-
-	if use mpm-peruser || use mpm-itk; then
-		ewarn "-BIG- -FAT- -WARNING-"
-		ewarn
-		ewarn "The peruser (USE=mpm-peruser) and itk (USE=mpm-itk) MPMs are considered"
-		ewarn "highly experimental and are not (yet) supported, nor are they recommended"
-		ewarn "for production use. You have been warned!"
-		ewarn
-		ewarn "Continuing in 5 seconds ..."
-		sleep 5
-	fi
-
-}
-
-pkg_setup() {
-	big_fat_warnings
-	select_mpms
-
-	# 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"
-
-	EPATCH_SUFFIX="patch"
-	epatch ${GENTOO_PATCHDIR}/patches/[0-8]* || die "internal ebuild error"
-
-	# 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
-
-	# 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() {
-
-	# bug 128505
-	filter-ldflags -Wl,--as-needed --as-needed
-
-	# 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
-	USERDIR="${USERDIR:-public_html}"
-
-	einfo "USERDIR is set to: ${USERDIR}"
-
-	select_mpms
-
-	# 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}"
-	useq ssl || myconf="${myconf} --disable-ssl"
-
-	# 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
-
-# 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} --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/$(get_libdir)" || die
-		mv ab ab-ssl
-		rm -f ab.lo ab.o
-		make ab || die
-	fi
-}
-
-src_install () {
-	# 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/$(get_libdir) /usr/$(get_libdir)/apache2/lib
-	dosym /var/log/apache2 /usr/$(get_libdir)/apache2/logs
-	dosym /etc/apache2 /usr/$(get_libdir)/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/$(get_libdir)/apache2/build
-	dodoc etc/apache2/*-std.conf
-	rm -f etc/apache2/*.conf
-	rm -f etc/apache2/mime.types
-	rm -rf var/run var/log
-
-	# the default webroot gets stored in /usr/share/doc
-	einfo "Installing default webroot to /usr/share/doc/${PF}"
-	mv ${D}/var/www/localhost ${D}/usr/share/doc/${PF}/webroot
-
-	# config files
-	newconfd ${GENTOO_PATCHDIR}/init/apache2.confd apache2
-	newinitd ${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 being set
-	if useq ssl -a !-e ${ROOT}/etc/apache2/ssl/server.crt; 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
-
-	# we do this here because the default webroot is a copy of the files
-	# that exist elsewhere and we don't want them managed/removed by portage
-	# when apache is upgraded.
-	if [ -e "${ROOT}/var/www/localhost" ]; then
-		einfo "The default webroot has not been installed into"
-		einfo "${ROOT}/var/www/localhost because the directory already exists"
-		einfo "and we do not want to overwrite any files you have put there."
-		einfo
-		einfo "If you would like to install the latest webroot, please run"
-		einfo "emerge --config =${PF}"
-	else
-		einfo "Installing default webroot to ${ROOT}/var/www/localhost"
-		mkdir -p ${ROOT}/var/www/localhost
-		cp -r ${ROOT}/usr/share/doc/${PF}/webroot/* ${ROOT}/var/www/localhost
-		chown -R apache: ${ROOT}/var/www/localhost
-	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-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."
-		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
-}
-
-pkg_config() {
-
-	einfo "Installing default webroot to ${ROOT}/var/www/localhost"
-	mkdir -p ${ROOT}/var/www/localhost
-	cp -r ${ROOT}/usr/share/doc/${PF}/webroot/* ${ROOT}/var/www/localhost
-	chown -R apache: ${ROOT}/var/www/localhost
-
-}
-
-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."
-}
-
-select_mpms() {
-
-	mpm=""
-
-	for trympm in prefork worker peruser threadpool leader itk; do
-		if useq mpm-${trympm}; then
-			if [ "x${mpm}" = "x" ]; then
-				mpm=${trympm}
-			else
-				mpm_die ${trympm} ${mpm}
-			fi
-		fi
-	done
-
-	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/files/digest-apache-2.0.59-r1 b/net-www/apache/files/digest-apache-2.0.59-r1
deleted file mode 100644
index 8c95d185847b..000000000000
--- a/net-www/apache/files/digest-apache-2.0.59-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 c14eceded529579e16d4f229b885ad8c gentoo-apache-2.0.59-r1-20061101.tar.bz2 58646
-RMD160 974f2884451f6adb3103a7f59ffe9a79a0b64adb gentoo-apache-2.0.59-r1-20061101.tar.bz2 58646
-SHA256 1becf13bcf151a72d9e6ab457037ab7e2083f93bc9dd894aaf8a3dea4f7192f7 gentoo-apache-2.0.59-r1-20061101.tar.bz2 58646
-MD5 b0200a497d1c89daad680c676d32a6df httpd-2.0.59.tar.bz2 4743549
-RMD160 78b802354e338798a6978ece8b3568be97542174 httpd-2.0.59.tar.bz2 4743549
-SHA256 bbac543ca9f80826f71eb16945610f8f90a36b346efc658be3b466ec0c990c0d httpd-2.0.59.tar.bz2 4743549