Removing apache-2.0.59-r3, as it was kinda buggy (thanks to me -- see #189916).

Package-Manager: portage-2.1.3.7

4 files changed, 11 insertions, 482 deletions

diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog
index e092d9f7680c..2080190a02cc 100644
--- a/www-servers/apache/ChangeLog
+++ b/www-servers/apache/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-servers/apache
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.7 2007/08/26 15:41:53 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.8 2007/08/27 08:41:50 phreak Exp $
+
+  27 Aug 2007; Christian Heim <phreak@gentoo.org> -apache-2.0.59-r3.ebuild:
+  Removing apache-2.0.59-r3, as it was kinda buggy (thanks to me -- see #189916).
 
 *apache-2.0.59-r4 (26 Aug 2007)
 
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index 23daf3c33386..6d41bfdb24a7 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -18,10 +18,6 @@ EBUILD apache-2.0.59-r2.ebuild 14093 RMD160 eee8d8679b13720e68c3ddd5dd9b3dec0996
 MD5 e6e116e6998d69e12d2e918994f922a6 apache-2.0.59-r2.ebuild 14093
 RMD160 eee8d8679b13720e68c3ddd5dd9b3dec09960764 apache-2.0.59-r2.ebuild 14093
 SHA256 35c4371b02d57a5fd6869695f2b0757d447fccc27c7b3783f4c7613909b806ca apache-2.0.59-r2.ebuild 14093
-EBUILD apache-2.0.59-r3.ebuild 14091 RMD160 c30469dc798cef5f6d111383b3b1145492042076 SHA1 1b6047fc1961fd7c53c2c432d3ca8f472a50f2eb SHA256 4ac407227a92c83a7c500c5e90b4470daf3ff12cdcf3b00e167232f2429675b6
-MD5 59dacc1bf962169ca36ee8ec8b006649 apache-2.0.59-r3.ebuild 14091
-RMD160 c30469dc798cef5f6d111383b3b1145492042076 apache-2.0.59-r3.ebuild 14091
-SHA256 4ac407227a92c83a7c500c5e90b4470daf3ff12cdcf3b00e167232f2429675b6 apache-2.0.59-r3.ebuild 14091
 EBUILD apache-2.0.59-r4.ebuild 15377 RMD160 20ee1c8529b26331a579f74700b0a243c4e6df2f SHA1 3404f63c64ac3f8556d373aecc1e24713f964ecc SHA256 c652101fae236adeed4786dbfac356a77b5bf8da264442faaea46579ba68054d
 MD5 6826f754cafd66f15d4e7576631ac9d2 apache-2.0.59-r4.ebuild 15377
 RMD160 20ee1c8529b26331a579f74700b0a243c4e6df2f apache-2.0.59-r4.ebuild 15377
@@ -38,10 +34,10 @@ EBUILD apache-2.2.4-r12.ebuild 15123 RMD160 1c375c4965efdec1764a89f888e5be24d6ce
 MD5 9017561663bf243098d09f15a97a1bad apache-2.2.4-r12.ebuild 15123
 RMD160 1c375c4965efdec1764a89f888e5be24d6ce36d8 apache-2.2.4-r12.ebuild 15123
 SHA256 30faae5a1d27f16cd828dc40bb6c897c98c5fa8e5b93f7f3f2441e1b4d57c17b apache-2.2.4-r12.ebuild 15123
-MISC ChangeLog 94651 RMD160 a78363efa7e4b8e58a5a03e51688c252a6ee1bff SHA1 b9c66ef51198310df1840aa7ee53d7d4a95ed012 SHA256 a980b40c763b61a2e9ab367a5a11586d8c64ea49aa9a53c7002618aca0b6de76
-MD5 3118350f9a73653a7cfb6559b7aedf4c ChangeLog 94651
-RMD160 a78363efa7e4b8e58a5a03e51688c252a6ee1bff ChangeLog 94651
-SHA256 a980b40c763b61a2e9ab367a5a11586d8c64ea49aa9a53c7002618aca0b6de76 ChangeLog 94651
+MISC ChangeLog 94810 RMD160 55ecc769a753926767393153de8539912e8cb203 SHA1 47d2adb926dc8f00c193fe75c6825d7b2d186408 SHA256 136cb245aa64b637a0e2c3493fc194d2e71a5587ff064de8e734d4b1da9aefb6
+MD5 3aef1a8e87ca48760e3055cfe35a85ff ChangeLog 94810
+RMD160 55ecc769a753926767393153de8539912e8cb203 ChangeLog 94810
+SHA256 136cb245aa64b637a0e2c3493fc194d2e71a5587ff064de8e734d4b1da9aefb6 ChangeLog 94810
 MISC metadata.xml 551 RMD160 1b31261c043e57cabc9bd8582f9b34c09d92d108 SHA1 68bb286a67452c3dae7525195c60b8637cca9b81 SHA256 646729a42ddffcbde3426dd6aa9a77fab923bc348c5b34c9d24083d86fbb15eb
 MD5 0f28752ee3545b3fd8e28ee656e62f4b metadata.xml 551
 RMD160 1b31261c043e57cabc9bd8582f9b34c09d92d108 metadata.xml 551
@@ -52,9 +48,6 @@ SHA256 a168cb54770884f50f48411842613b904f1cbf24ca9596ea43b28eeed7688936 files/di
 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 74bb8b97bb11278581bc7dc8a1584cdc files/digest-apache-2.0.59-r3 542
-RMD160 98ddcafeea6d46b90e63ee41afa7695dc933a323 files/digest-apache-2.0.59-r3 542
-SHA256 708b9b7422c872280a160711c38483f32629902debf3f5387b5b5df2f805ed60 files/digest-apache-2.0.59-r3 542
 MD5 74bb8b97bb11278581bc7dc8a1584cdc files/digest-apache-2.0.59-r4 542
 RMD160 98ddcafeea6d46b90e63ee41afa7695dc933a323 files/digest-apache-2.0.59-r4 542
 SHA256 708b9b7422c872280a160711c38483f32629902debf3f5387b5b5df2f805ed60 files/digest-apache-2.0.59-r4 542
@@ -70,7 +63,7 @@ SHA256 11c48e69c33b119d3890350bfda7fa96943c00014bfd9039f8ede53a556275c5 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.6 (GNU/Linux)
 
-iD8DBQFG0Z9KyuNVb5qfaOYRAskyAKCfK4ynxUUp8kYJgUWrPdByCj+OtwCeJHnx
-RZ/AQoJQdCZD+f3BELDXfIM=
-=KZDm
+iD8DBQFG0o5ZyuNVb5qfaOYRAoaOAJ9+pNh2VYRhmJJ0KmHXqf0Mh/b+UwCgt8cm
+vT0/aabMTqRgYUqPHpy5r1c=
+=HLWA
 -----END PGP SIGNATURE-----
diff --git a/www-servers/apache/apache-2.0.59-r3.ebuild b/www-servers/apache/apache-2.0.59-r3.ebuild
deleted file mode 100644
index 2e96f29e782c..000000000000
--- a/www-servers/apache/apache-2.0.59-r3.ebuild
+++ /dev/null
@@ -1,461 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.0.59-r3.ebuild,v 1.1 2007/08/21 00:40:22 hollow Exp $
-
-inherit eutils flag-o-matic gnuconfig multilib
-
-# latest gentoo apache files
-GENTOO_PATCHNAME="gentoo-apache-${PVR}"
-GENTOO_PATCHSTAMP="20070821"
-GENTOO_DEVSPACE="hollow"
-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*
-	=dev-libs/apr-util-0*
-	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-0*' 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} ${EXTRA_ECONF} || 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 '=www-servers/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 '<www-servers/apache-2.0.54-r30' && has_version '>=www-servers/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/www-servers/apache/files/digest-apache-2.0.59-r3 b/www-servers/apache/files/digest-apache-2.0.59-r3
deleted file mode 100644
index bc0b5aea6b83..000000000000
--- a/www-servers/apache/files/digest-apache-2.0.59-r3
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 4d0f677e031b146747d35183d7c069de gentoo-apache-2.0.59-r3-20070821.tar.bz2 64859
-RMD160 1e8b961ebc151e2544ec9bf19ef973b4933edae8 gentoo-apache-2.0.59-r3-20070821.tar.bz2 64859
-SHA256 8afc3115ca6e1aa98c07b736fc86c7abefdafac89d3b0d0c45e9a1bf2296bd84 gentoo-apache-2.0.59-r3-20070821.tar.bz2 64859
-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