fix the config backport mess

Package-Manager: portage-2.1.3.7

9 files changed, 46 insertions, 1052 deletions

diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog
index 2080190a02cc..b3dc72ad0d3f 100644
--- a/www-servers/apache/ChangeLog
+++ b/www-servers/apache/ChangeLog
@@ -1,6 +1,13 @@
 # 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.8 2007/08/27 08:41:50 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.9 2007/08/28 08:02:29 hollow Exp $
+
+*apache-2.0.59-r5 (28 Aug 2007)
+
+  28 Aug 2007; Benedikt Böhm <hollow@gentoo.org> -apache-2.0.59-r4.ebuild,
+  +apache-2.0.59-r5.ebuild, -apache-2.2.4-r10.ebuild,
+  -apache-2.2.4-r11.ebuild:
+  fix the config backport mess
 
   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).
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index 6d41bfdb24a7..fa5e9cdd5292 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -3,9 +3,7 @@ Hash: SHA1
 
 DIST gentoo-apache-2.0.58-r2-20060726.tar.bz2 58758 RMD160 46c6da577db444a6553b60d3ae30c61ae3b741fa SHA1 5399c6076fbccc36b1d8a5ed783f77918c3398eb SHA256 b8e0356e87fdd7b55fcecbee804c9a41525b3e6fe8309f87f2509abd161c8e6b
 DIST gentoo-apache-2.0.59-r2-20061102.tar.bz2 58768 RMD160 d20d39e66e3cb52befeb697133172c8d494e2c78 SHA1 1f8543ecdba7cef911456757a0d12e9c15abe355 SHA256 c8de97abe4077e2f6d827726a5fb0b03f6e8bd9514d8f9b9ca2a35a1c9698518
-DIST gentoo-apache-2.0.59-r3-20070821.tar.bz2 64859 RMD160 1e8b961ebc151e2544ec9bf19ef973b4933edae8 SHA1 eb212eb42d26afad2127b273e4da8e4764fc90a3 SHA256 8afc3115ca6e1aa98c07b736fc86c7abefdafac89d3b0d0c45e9a1bf2296bd84
-DIST gentoo-apache-2.2.4-r10-20070712.tar.bz2 57172 RMD160 13da6d348d39ccd9a0fbe48e13e396236b38fa35 SHA1 5a8344af48dc3a3c8095882030ebf5578a899cab SHA256 9e57aa981f7b0e368b898471f92e2bb206c92d173169bcb0fa00dd037d9b36e7
-DIST gentoo-apache-2.2.4-r11-20070802.tar.bz2 59461 RMD160 bd23851238656d83916e35c6b706f3e830b2763d SHA1 85d4033189c8c66c99f78abcb1c625b9b9615a7a SHA256 b529cf31fb67ebc10e15a52a04035503a4518429f6afa9ce018cd31df3550945
+DIST gentoo-apache-2.0.59-r5-20070828.tar.bz2 63913 RMD160 c0cfc72d0316b0a977296a08932bebe6a7547c7b SHA1 e7e7ae28b0427c9b61895f3356307df5d6bcc324 SHA256 fa188f4f7e26b7277a8a1858c449766bc997c1f9cf1ee2a5f9fdbfda5dabcccb
 DIST gentoo-apache-2.2.4-r12-20070819.tar.bz2 67075 RMD160 90d6c6b15abd0d4074438cabdbb9a396123021a3 SHA1 b7d1a31a4e2b664de6bd8d79e2f9c798582f01d8 SHA256 62ad3eada46acf60441facd33f1a64ed535d7b2051354708e4e6db4bbf2d5efd
 DIST httpd-2.0.58.tar.bz2 4704318 RMD160 2ff44b2254552db908f1defd09e3142527f9bf83 SHA1 697e1674f8efbbe05b9f6c1ba00cd28a37293229 SHA256 4f746715c408f4cac48099ea72560c50ef190568dfcfa8e0762bae66c0398029
 DIST httpd-2.0.59.tar.bz2 4743549 RMD160 78b802354e338798a6978ece8b3568be97542174 SHA1 908209cd6e52f700d2a841a25de36e44d469c376 SHA256 bbac543ca9f80826f71eb16945610f8f90a36b346efc658be3b466ec0c990c0d
@@ -18,26 +16,18 @@ 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-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
-SHA256 c652101fae236adeed4786dbfac356a77b5bf8da264442faaea46579ba68054d apache-2.0.59-r4.ebuild 15377
-EBUILD apache-2.2.4-r10.ebuild 15378 RMD160 3d6d96562f104a3df05f2fbc3adc18720ebb08c3 SHA1 148888b035537ecbab0427b53eb23dd7c926ebb7 SHA256 cfa72f63d6893628588eb29f88ea71823d96ab1e724dce984f96e5bac639b15f
-MD5 9f610208cdd05358a0c42a99d29796ae apache-2.2.4-r10.ebuild 15378
-RMD160 3d6d96562f104a3df05f2fbc3adc18720ebb08c3 apache-2.2.4-r10.ebuild 15378
-SHA256 cfa72f63d6893628588eb29f88ea71823d96ab1e724dce984f96e5bac639b15f apache-2.2.4-r10.ebuild 15378
-EBUILD apache-2.2.4-r11.ebuild 15123 RMD160 8ad01cfdde7c88c9f60d6d5afce1d2743e47ec8c SHA1 ba0a7030b77ab1e44ee10656213cbb8aaa6c7fac SHA256 950542ca1e414a8f45e39834c8e6d9c739c6fc2cfd5b7bc2d6fd2eccb2404d8a
-MD5 863556eeae1d9345e10e751937e0cd53 apache-2.2.4-r11.ebuild 15123
-RMD160 8ad01cfdde7c88c9f60d6d5afce1d2743e47ec8c apache-2.2.4-r11.ebuild 15123
-SHA256 950542ca1e414a8f45e39834c8e6d9c739c6fc2cfd5b7bc2d6fd2eccb2404d8a apache-2.2.4-r11.ebuild 15123
+EBUILD apache-2.0.59-r5.ebuild 14091 RMD160 38fceb0bfd0e541a8e8c2b7db0ca0a6076882f7c SHA1 4ce5018d359ed8495adcb544321ac7d87707de3a SHA256 5374e323009e58c7dc773b4486b7bd543ad49b8e4fd9ef6537f04b687a2bb78e
+MD5 1ce7da54b756a1aac270fcd0c9857724 apache-2.0.59-r5.ebuild 14091
+RMD160 38fceb0bfd0e541a8e8c2b7db0ca0a6076882f7c apache-2.0.59-r5.ebuild 14091
+SHA256 5374e323009e58c7dc773b4486b7bd543ad49b8e4fd9ef6537f04b687a2bb78e apache-2.0.59-r5.ebuild 14091
 EBUILD apache-2.2.4-r12.ebuild 15123 RMD160 1c375c4965efdec1764a89f888e5be24d6ce36d8 SHA1 3449df4c8655a0c11bfaa0f2150a8337c8f20bf1 SHA256 30faae5a1d27f16cd828dc40bb6c897c98c5fa8e5b93f7f3f2441e1b4d57c17b
 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 94810 RMD160 55ecc769a753926767393153de8539912e8cb203 SHA1 47d2adb926dc8f00c193fe75c6825d7b2d186408 SHA256 136cb245aa64b637a0e2c3493fc194d2e71a5587ff064de8e734d4b1da9aefb6
-MD5 3aef1a8e87ca48760e3055cfe35a85ff ChangeLog 94810
-RMD160 55ecc769a753926767393153de8539912e8cb203 ChangeLog 94810
-SHA256 136cb245aa64b637a0e2c3493fc194d2e71a5587ff064de8e734d4b1da9aefb6 ChangeLog 94810
+MISC ChangeLog 95033 RMD160 c487f9b86bdf7d28e305e3f58953c9b69e2da472 SHA1 72686d60fd89fa629290471b386f57b01d4856f9 SHA256 c944071c5bfa1a9b1e0d2418a4cd91de27382c7288f9b58e9b08eefe42071fdc
+MD5 76a3519a9c5a10b60735e85adc4949f1 ChangeLog 95033
+RMD160 c487f9b86bdf7d28e305e3f58953c9b69e2da472 ChangeLog 95033
+SHA256 c944071c5bfa1a9b1e0d2418a4cd91de27382c7288f9b58e9b08eefe42071fdc ChangeLog 95033
 MISC metadata.xml 551 RMD160 1b31261c043e57cabc9bd8582f9b34c09d92d108 SHA1 68bb286a67452c3dae7525195c60b8637cca9b81 SHA256 646729a42ddffcbde3426dd6aa9a77fab923bc348c5b34c9d24083d86fbb15eb
 MD5 0f28752ee3545b3fd8e28ee656e62f4b metadata.xml 551
 RMD160 1b31261c043e57cabc9bd8582f9b34c09d92d108 metadata.xml 551
@@ -48,22 +38,16 @@ 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-r4 542
-RMD160 98ddcafeea6d46b90e63ee41afa7695dc933a323 files/digest-apache-2.0.59-r4 542
-SHA256 708b9b7422c872280a160711c38483f32629902debf3f5387b5b5df2f805ed60 files/digest-apache-2.0.59-r4 542
-MD5 e5f5aa3b57426d2009745d7c936571a2 files/digest-apache-2.2.4-r10 539
-RMD160 a878b175ef84ae8e958ba6cef858e82865750027 files/digest-apache-2.2.4-r10 539
-SHA256 c2dff058f74b6cf185737201f79a0a1666ac43e9317b2b49998acd7720f2ebdc files/digest-apache-2.2.4-r10 539
-MD5 977b01a50ed8b902a2dc18680ad70bc1 files/digest-apache-2.2.4-r11 539
-RMD160 5a491e67ea0306b2c5874fb4b696119fc4b8b594 files/digest-apache-2.2.4-r11 539
-SHA256 4b4afb5714197f9cf564a263aeac66728e6370c804f98fe4f580048c24df8756 files/digest-apache-2.2.4-r11 539
+MD5 d9a684f6afeaa0f5626fa09543623162 files/digest-apache-2.0.59-r5 542
+RMD160 12c166ddfa8ca8740663c74990fd1d015685ba95 files/digest-apache-2.0.59-r5 542
+SHA256 fa34c2ed61bffcd60f9ab545475f5045420105e88a6310786fd1dda5cc198880 files/digest-apache-2.0.59-r5 542
 MD5 6f3a8e960a7a6d99e7ef2f8e1e6e45ea files/digest-apache-2.2.4-r12 539
 RMD160 78e11a1319c0b7e34f209bc7b2f632bf58a5dffa files/digest-apache-2.2.4-r12 539
 SHA256 11c48e69c33b119d3890350bfda7fa96943c00014bfd9039f8ede53a556275c5 files/digest-apache-2.2.4-r12 539
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.6 (GNU/Linux)
+Version: GnuPG v2.0.5 (GNU/Linux)
 
-iD8DBQFG0o5ZyuNVb5qfaOYRAoaOAJ9+pNh2VYRhmJJ0KmHXqf0Mh/b+UwCgt8cm
-vT0/aabMTqRgYUqPHpy5r1c=
-=HLWA
+iD8DBQFG09afmPFBzbX68WERAsL1AJ9ik76MQexnzRDWp0CoYoDqbBftUACfa3Hm
+E7v847XVKb50Mi3KxadfCko=
+=PvN4
 -----END PGP SIGNATURE-----
diff --git a/www-servers/apache/apache-2.0.59-r4.ebuild b/www-servers/apache/apache-2.0.59-r5.ebuild
index 0e9e5da91110..01a554a52c68 100644
--- a/www-servers/apache/apache-2.0.59-r4.ebuild
+++ b/www-servers/apache/apache-2.0.59-r5.ebuild
@@ -1,13 +1,12 @@
 # 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-r4.ebuild,v 1.1 2007/08/26 15:41:53 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.0.59-r5.ebuild,v 1.1 2007/08/28 08:02:29 hollow Exp $
 
 inherit eutils flag-o-matic gnuconfig multilib
 
 # latest gentoo apache files
-#GENTOO_PATCHNAME="gentoo-apache-${PVR}"
-GENTOO_PATCHNAME="gentoo-apache-${PV}-r3"
-GENTOO_PATCHSTAMP="20070821"
+GENTOO_PATCHNAME="gentoo-apache-${PVR}"
+GENTOO_PATCHSTAMP="20070828"
 GENTOO_DEVSPACE="hollow"
 GENTOO_PATCHDIR="${WORKDIR}/${GENTOO_PATCHNAME}"
 
@@ -296,30 +295,6 @@ src_install () {
 	insinto /etc/logrotate.d
 	newins ${GENTOO_PATCHDIR}/scripts/apache2-logrotate apache2
 
-	# create our LoadModule lines
-	if ! use static-modules ; then
-		load_module=""
-		moddir="${D}/usr/$(get_libdir)/apache2/modules"
-		for m in ${mods} ; do
-			endid="no"
-
-			if [[ -e "${moddir}/mod_${m}.so" ]] ; then
-				for def in ${mod_defines} ; do
-					if [[ "${m}" == "${def%:*}" ]] ; then
-						load_module="${load_module}\n<IfDefine ${def#*:}>"
-						endid="yes"
-					fi
-				done
-				load_module="${load_module}\nLoadModule ${m}_module modules/mod_${m}.so"
-				if [[ "${endid}" == "yes" ]] ; then
-					load_module="${load_module}\n</IfDefine>"
-				fi
-			fi
-		done
-	fi
-	sed -i -e "s:%%LOAD_MODULE%%:${load_module}:" \
-		"${GENTOO_PATCHDIR}"/conf/httpd.conf || die "sed failed"
-
 	insinto /etc/apache2
 	doins ${GENTOO_PATCHDIR}/conf/apache2-builtin-mods
 	doins ${GENTOO_PATCHDIR}/conf/httpd.conf
@@ -455,47 +430,26 @@ select_mpms() {
 parse_modules_config() {
 	local name=""
 	local disable=""
-	local version="undef"
-	MY_BUILTINS=""
-	mods=""
-	[[ -f "${1}" ]] || return 1
-
-	for i in $(sed 's/#.*//' < $1) ; do
-		if [[ "$i" == "VERSION:" ]] ; then
-			version="select"
-		elif [[ "${version}" == "select" ]] ; then
-			version="$i"
-		# start with - option for backwards compatibility only
-		elif [[ "$i" == "-" ]] ; then
+	[ -f ${1} ] || return 1
+
+	for i in `cat $1 | sed "s/^#.*//"`; do
+		if [ $i == "-" ]; then
 			disable="true"
-		elif [[ -z "${name}" ]] && [[ "$i" != "${i/mod_/}" ]] ; then
-			name="${i/mod_/}"
-		elif [[ -n "${disable}" ]] || [[ "$i" == "disabled" ]] ; then
-			MY_BUILTINS="${MY_BUILTINS} --disable-${name}"
+		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" ]] || use static-modules ; then
-			MY_BUILTINS="${MY_BUILTINS} --enable-${name}=static"
+		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"
-			mods="${mods} ${name}"
+		elif [ $i == "shared" ]; then
+			MY_BUILTINS="${MY_BUILTINS} --enable-$name=shared"
 			name="" ; disable=""
-		else
-			ewarn "Parse error in ${1} - unknown option: $i"
 		fi
 	done
 
-	# reject the file if it's unversioned or doesn't match our
-	# package major.minor. This is to make upgrading work smoothly.
-	if [[ "${version}" != "${PV%.*}" ]] ; then
-		mods=""
-		MY_BUILTINS=""
-		return 1
-	fi
-
-	einfo "Using ${1}"
-	einfo "options: ${MY_BUILTINS}"
-	einfo "LoadModules: ${mods}"
+	einfo "${1} options:\n${MY_BUILTINS}"
 }
 
 select_modules_config() {
diff --git a/www-servers/apache/apache-2.2.4-r10.ebuild b/www-servers/apache/apache-2.2.4-r10.ebuild
deleted file mode 100644
index f1c16cb49c2d..000000000000
--- a/www-servers/apache/apache-2.2.4-r10.ebuild
+++ /dev/null
@@ -1,467 +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.2.4-r10.ebuild,v 1.2 2007/07/29 17:23:43 phreak Exp $
-
-inherit eutils flag-o-matic gnuconfig multilib autotools
-
-# latest gentoo apache files
-GENTOO_PATCHNAME="gentoo-${PF}"
-GENTOO_PATCHSTAMP="20070712"
-GENTOO_DEVSPACE="phreak"
-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"
-
-# some helper scripts are apache-1.1, thus both are here
-LICENSE="Apache-2.0 Apache-1.1"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug doc ldap mpm-event mpm-itk mpm-peruser mpm-prefork mpm-worker no-suexec selinux ssl static-modules threads"
-
-DEPEND="dev-lang/perl
-	=dev-libs/apr-1*
-	=dev-libs/apr-util-1*
-	dev-libs/expat
-	dev-libs/libpcre
-	sys-libs/zlib
-	ldap? ( =net-nds/openldap-2* )
-	selinux? ( sec-policy/selinux-apache )
-	ssl? ( dev-libs/openssl )
-	!=www-servers/apache-1*
-	!=app-admin/apache-tools-2.2.4-r2"
-
-RDEPEND="${DEPEND}
-	app-misc/mime-types"
-
-PDEPEND="~app-admin/apache-tools-${PV}"
-
-S="${WORKDIR}/httpd-${PV}"
-
-pkg_setup() {
-	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
-
-	# Select the default MPM module
-	MPM_LIST="event itk peruser prefork worker"
-	for x in ${MPM_LIST} ; do
-		if use mpm-${x} ; then
-			if [[ "x${mpm}" == "x" ]] ; then
-				mpm=${x}
-				elog
-				elog "Selected MPM: ${mpm}"
-				elog
-			else
-				eerror "You have selected more then one mpm USE-flag."
-				eerror "Only one MPM is supported."
-				die "more then one mpm was specified"
-			fi
-		fi
-	done
-
-	if [[ "x${mpm}" == "x" ]] ; then
-		if use threads ; then
-			mpm=worker
-			elog
-			elog "Selected default threaded MPM: ${mpm}";
-			elog
-		else
-			mpm=prefork
-			elog
-			elog "Selected default MPM: ${mpm}";
-			elog
-		fi
-	fi
-
-	# setup apache user and group
-	enewgroup apache 81
-	enewuser apache 81 -1 /var/www apache
-
-	if ! use no-suexec ; then
-		elog
-		elog "You can manipulate several configure options of suexec"
-		elog "through the following environment variables:"
-		elog
-		elog " SUEXEC_SAFEPATH: Default PATH for suexec (default: /usr/local/bin:/usr/bin:/bin)"
-		elog "  SUEXEC_LOGFILE: Path to the suexec logfile (default: /var/log/apache2/suexec_log)"
-		elog "   SUEXEC_CALLER: Name of the user Apache is running as (default: apache)"
-		elog "  SUEXEC_DOCROOT: Directory in which suexec will run scripts (default: /var/www)"
-		elog "   SUEXEC_MINUID: Minimum UID, which is allowed to run scripts via suexec (default: 1000)"
-		elog "   SUEXEC_MINGID: Minimum GID, which is allowed to run scripts via suexec (default: 100)"
-		elog "  SUEXEC_USERDIR: User subdirectories (like /home/user/html) (default: public_html)"
-		elog "    SUEXEC_UMASK: Umask for the suexec process (default: 077)"
-		elog
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# 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 "libdir sed failed"
-
-	#### Patch Organization
-	# 00-19 Gentoo specific  (00_all_some-title.patch)
-	# 20-39 Additional MPMs  (20_all_${MPM}_some-title.patch)
-	# 40-59 USE-flag based   (40_all_${USE}_some-title.patch)
-	# 60-79 Version specific (60_all_${PV}_some-title.patch)
-	# 80-99 Security patches (80_all_${PV}_cve-####-####.patch)
-
-	EPATCH_SUFFIX="patch"
-	epatch "${GENTOO_PATCHDIR}"/patches/[0-1]*
-	if $(ls "${GENTOO_PATCHDIR}"/patches/[2-3]?_*_${mpm}_* &>/dev/null) ; then
-		epatch "${GENTOO_PATCHDIR}"/patches/[2-3]?_*_${mpm}_*
-	fi
-	for uf in ${IUSE} ; do
-		if use ${uf} && $(ls "${GENTOO_PATCHDIR}"/patches/[4-5]?_*_${uf}_* &>/dev/null) ; then
-			epatch "${GENTOO_PATCHDIR}"/patches/[4-5]?_*_${uf}_*
-		fi
-	done
-	if $(ls "${GENTOO_PATCHDIR}"/patches/[6-9]?_*_${PV}_* &>/dev/null) ; then
-		epatch "${GENTOO_PATCHDIR}"/patches/[6-9]?_*_${PV}_*
-	fi
-
-	# setup the filesystem layout config
-	cat "${GENTOO_PATCHDIR}"/patches/config.layout >> "${S}"/config.layout || \
-		die "Failed preparing config.layout!"
-	sed -i -e "s:version:${PF}:g" "${S}"/config.layout
-
-	# patched-in MPMs need the build environment rebuilt
-	sed -i -e '/sinclude/d' configure.in
-	AT_GNUCONF_UPDATE=yes AT_M4DIR=build eautoreconf
-}
-
-src_compile() {
-	local modtype="shared" myconf=""
-	cd "${S}"
-
-	# Instead of filtering --as-needed (bug #128505), append --no-as-needed
-	# Thanks to Harald van Dijk
-	append-ldflags -Wl,--no-as-needed
-
-	use static-modules && modtype="static"
-	select_modules_config || die "determining modules failed"
-
-	if use ldap ; then
-		mods="${mods} ldap authnz_ldap"
-		myconf="${myconf} --enable-authnz-ldap=${modtype} --enable-ldap=${modtype}"
-	fi
-
-	if use ssl; then
-		mods="${mods} ssl"
-		myconf="${myconf} --with-ssl=/usr --enable-ssl=${modtype}"
-	fi
-
-	# Only build suexec with USE=-no-suexec
-	if use no-suexec ; then
-		myconf="${myconf} --disable-suexec"
-	else
-		myconf="${myconf} --with-suexec-safepath=${SUEXEC_SAFEPATH:-/usr/local/bin:/usr/bin:/bin}"
-		myconf="${myconf} --with-suexec-logfile=${SUEXEC_LOGFILE:-/var/log/apache2/suexec_log}"
-		myconf="${myconf} --with-suexec-bin=/usr/sbin/suexec"
-		myconf="${myconf} --with-suexec-userdir=${SUEXEC_USERDIR:-public_html}"
-		myconf="${myconf} --with-suexec-caller=${SUEXEC_CALLER:-apache}"
-		myconf="${myconf} --with-suexec-docroot=${SUEXEC_DOCROOT:-/var/www}"
-		myconf="${myconf} --with-suexec-uidmin=${SUEXEC_MINUID:-1000}"
-		myconf="${myconf} --with-suexec-gidmin=${SUEXEC_MINGID:-100}"
-		myconf="${myconf} --with-suexec-umask=${SUEXEC_UMASK:-077}"
-		myconf="${myconf} --enable-suexec=${modtype}"
-		mods="${mods} suexec"
-	fi
-
-	# econf overwrites the stuff from config.layout, so we have to put them into
-	# our myconf line too
-
-	econf \
-		--includedir=/usr/include/apache2 \
-		--libexecdir=/usr/$(get_libdir)/apache2/modules \
-		--datadir=/var/www/localhost \
-		--sysconfdir=/etc/apache2 \
-		--localstatedir=/var \
-		--with-mpm=${mpm} \
-		--with-perl=/usr/bin/perl \
-		--with-expat=/usr \
-		--with-z=/usr \
-		--with-apr=/usr \
-		--with-apr-util=/usr \
-		--with-pcre=/usr \
-		--with-port=80 \
-		--with-program-name=apache2 \
-		--enable-layout=Gentoo \
-		$( use_enable debug maintainer-mode ) \
-		${myconf} ${MY_BUILTINS} || die "econf failed!"
-
-	sed -i -e 's:apache2\.conf:httpd.conf:' include/ap_config_auto.h
-
-	emake || die "emake failed"
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	# This is a mapping of module names to the -D options in APACHE2_OPTS
-	# Used for creating optional LoadModule lines
-	mod_defines="info:INFO status:INFO
-				ldap:LDAP authnz_ldap:AUTH_LDAP
-				proxy:PROXY proxy_connect:PROXY proxy_http:PROXY
-				proxy_ajp:PROXY proxy_balancer:PROXY
-				ssl:SSL
-				suexec:SUEXEC
-				userdir:USERDIR"
-
-	# create our LoadModule lines
-	if ! use static-modules ; then
-		load_module=""
-		moddir="${D}/usr/$(get_libdir)/apache2/modules"
-		for m in ${mods} ; do
-			endid="no"
-
-			if [[ -e "${moddir}/mod_${m}.so" ]] ; then
-				for def in ${mod_defines} ; do
-					if [[ "${m}" == "${def%:*}" ]] ; then
-						load_module="${load_module}\n<IfDefine ${def#*:}>"
-						endid="yes"
-					fi
-				done
-				load_module="${load_module}\nLoadModule ${m}_module modules/mod_${m}.so"
-				if [[ "${endid}" == "yes" ]] ; then
-					load_module="${load_module}\n</IfDefine>"
-				fi
-			fi
-		done
-	fi
-	sed -i -e "s:%%LOAD_MODULE%%:${load_module}:" \
-		"${GENTOO_PATCHDIR}"/conf/httpd.conf || die "sed failed"
-
-	# Install our configuration files
-	insinto /etc/apache2
-	doins docs/conf/magic
-	doins -r "${GENTOO_PATCHDIR}"/conf/*
-	insinto /etc/logrotate.d
-	newins "${GENTOO_PATCHDIR}"/scripts/apache2-logrotate apache2
-
-	# generate a sane default APACHE2_OPTS
-	APACHE2_OPTS="-D DEFAULT_VHOST -D INFO -D LANGUAGE"
-	use doc && APACHE2_OPTS="${APACHE2_OPTS} -D MANUAL"
-	use ssl && APACHE2_OPTS="${APACHE2_OPTS} -D SSL -D SSL_DEFAULT_VHOST"
-	use no-suexec || APACHE2_OPTS="${APACHE2_OPTS} -D SUEXEC"
-
-	sed -i -e "s:APACHE2_OPTS=\".*\":APACHE2_OPTS=\"${APACHE2_OPTS}\":" \
-		"${GENTOO_PATCHDIR}"/init/apache2.confd || die "sed failed"
-
-	newconfd "${GENTOO_PATCHDIR}"/init/apache2.confd apache2
-	newinitd "${GENTOO_PATCHDIR}"/init/apache2.initd apache2
-
-	# Link apache2ctl to the init script
-	dosym /etc/init.d/apache2 /usr/sbin/apache2ctl
-
-	# provide symlinks for all the stuff we no longer rename, bug 177697
-	for i in suexec apxs; do
-		dosym /usr/sbin/${i} /usr/sbin/${i}2
-	done
-
-	# Install some thirdparty scripts
-	exeinto /usr/sbin
-	for i in apache2logserverstatus apache2splitlogfile ; do
-		doexe "${GENTOO_PATCHDIR}"/scripts/${i}
-	done
-	use ssl && doexe "${GENTOO_PATCHDIR}"/scripts/gentestcrt.sh
-
-	# Install some documentation
-	dodoc ABOUT_APACHE CHANGES LAYOUT README README.platforms VERSIONING
-
-	# drop in a convenient link to the manual
-	if use doc ; then
-		sed -i -e "s:VERSION:${PVR}:" "${D}/etc/apache2/modules.d/00_apache_manual.conf"
-	else
-		rm -f "${D}/etc/apache2/modules.d/00_apache_manual.conf"
-		rm -Rf "${D}/usr/share/doc/${PF}/manual"
-	fi
-
-	# the default webroot gets stored in /usr/share/doc
-	ebegin "Installing default webroot to /usr/share/doc/${PF}"
-	mv -f "${D}/var/www/localhost" "${D}/usr/share/doc/${PF}/webroot"
-	eend $?
-
-	if ! use no-suexec ; then
-		# Set some sane permissions for suexec
-		fowners 0:apache /usr/sbin/suexec
-		fperms 4710 /usr/sbin/suexec
-	fi
-
-	keepdir /etc/apache2/vhosts.d
-	keepdir /etc/apache2/modules.d
-
-	# empty dirs
-	for i in /var/lib/dav /var/log/apache2 /var/cache/apache2 ; do
-		keepdir ${i}
-		fowners apache:apache ${i}
-		fperms 0755 ${i}
-	done
-
-	# We'll be needing /etc/apache2/ssl if USE=ssl
-	use ssl && keepdir /etc/apache2/ssl
-}
-
-pkg_postinst() {
-	# Automatically generate test certificates if ssl USE flag is being set
-	if use ssl && [[ ! -e "${ROOT}/etc/apache2/ssl/server.crt" ]] ; then
-		cd "${ROOT}"/etc/apache2/ssl
-		einfo
-		einfo "Generating self-signed test certificate in ${ROOT}/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
-		elog "The default webroot has not been installed into"
-		elog "${ROOT}/var/www/localhost because the directory already exists"
-		elog "and we do not want to overwrite any files you have put there."
-		elog
-		elog "If you would like to install the latest webroot, please run"
-		elog "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:0 "${ROOT}"/var/www/localhost
-	fi
-
-	# Previous installations of apache-2.2 installed the upstream configuration
-	# files, which shouldn't even have been installed!
-	if has_version '>=www-servers/apache-2.2.4' ; then
-		[ -f "${ROOT}"/etc/apache2/apache2.conf ] && \
-			rm -f "${ROOT}"/etc/apache2/apache2.conf >/dev/null 2>&1
-
-		for i in extra original ; do
-			[ -d "${ROOT}"/etc/apache2/$i ] && \
-				rm -rf "${ROOT}"/etc/apache2/$i >/dev/null 2>&1
-		done
-	fi
-
-	# Note the changes regarding DEFAULT_VHOST and SSL_DEFAULT_VHOST
-	if has_version '<www-servers/apache-2.2.4-r7' ; then
-		elog
-		elog "Listen directives have been moved into the default virtual host"
-		elog "configuation. At least DEFAULT_VHOST has been enabled for you"
-		elog "(depending on your USE-flags."
-		elog
-		elog "If you disable DEFAULT_VHOST or SSL_DEFAULT_VHOST, there would"
-		elog "be no listening sockets available."
-		elog
-	fi
-
-	# Note the user of the config changes
-	if has_version '<www-servers/apache-2.2.4-r5' ; then
-		elog
-		elog "Please make sure that you update your /etc directory."
-		elog "Between the versions, we had to changes some config files"
-		elog "and move some stuff out of the main httpd.conf file to a seperate"
-		elog "modules.d entry."
-		elog
-		elog "Thus please update your /etc directory either via etc-update,"
-		elog "dispatch-conf or conf-update !"
-		elog
-	fi
-
-	# Check for dual/upgrade install
-	if has_version '<www-servers/apache-2.2.0' ; then
-		elog
-		elog "When upgrading from versions below 2.2.0 to this version, you"
-		elog "need to rebuild all your modules. Please do so for your modules"
-		elog "to continue working correctly."
-		elog
-		elog "Also note that some configuration directives have been"
-		elog "split into their own files under ${ROOT}/etc/apache2/modules.d/"
-		elog "and that some modules, foremost the authentication related ones,"
-		elog "have been renamed."
-		elog
-		elog "Some examples:"
-		elog "  - USERDIR is now configureable in ${ROOT}etc/apache2/modules.d/00_mod_userdir.conf."
-		elog
-		elog "For more information on what you may need to change, please"
-		elog "see the overview of changes at:"
-		elog "http://httpd.apache.org/docs/2.2/new_features_2_2.html"
-		elog "and the upgrading guide at:"
-		elog "http://httpd.apache.org/docs/2.2/upgrading.html"
-		elog
-	fi
-
-	# Cleanup the vim backup files, placed in /etc/apache2 by the last
-	# patchtarball (gentoo-apache-2.2.4-r7-20070615)
-	rm -f "${ROOT}/etc/apache2/modules.d/*.conf~"
-}
-
-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:0 "${ROOT}"/var/www/localhost
-}
-
-parse_modules_config() {
-	local name=""
-	local disable=""
-	local version="undef"
-	MY_BUILTINS=""
-	mods=""
-	[[ -f "${1}" ]] || return 1
-
-	for i in $(sed 's/#.*//' < $1) ; do
-		if [[ "$i" == "VERSION:" ]] ; then
-			version="select"
-		elif [[ "${version}" == "select" ]] ; then
-			version="$i"
-		# start with - option for backwards compatibility only
-		elif [[ "$i" == "-" ]] ; then
-			disable="true"
-		elif [[ -z "${name}" ]] && [[ "$i" != "${i/mod_/}" ]] ; then
-			name="${i/mod_/}"
-		elif [[ -n "${disable}" ]] || [[ "$i" == "disabled" ]] ; then
-			MY_BUILTINS="${MY_BUILTINS} --disable-${name}"
-			name="" ; disable=""
-		elif [[ "$i" == "static" ]] || use static-modules ; then
-			MY_BUILTINS="${MY_BUILTINS} --enable-${name}=static"
-			name="" ; disable=""
-		elif [[ "$i" == "shared" ]] ; then
-			MY_BUILTINS="${MY_BUILTINS} --enable-${name}=shared"
-			mods="${mods} ${name}"
-			name="" ; disable=""
-		else
-			ewarn "Parse error in ${1} - unknown option: $i"
-		fi
-	done
-
-	# reject the file if it's unversioned or doesn't match our
-	# package major.minor. This is to make upgrading work smoothly.
-	if [[ "${version}" != "${PV%.*}" ]] ; then
-		mods=""
-		MY_BUILTINS=""
-		return 1
-	fi
-
-	einfo "Using ${1}"
-	einfo "options: ${MY_BUILTINS}"
-	einfo "LoadModules: ${mods}"
-}
-
-select_modules_config() {
-	parse_modules_config "${ROOT}"/etc/apache2/apache2-builtin-mods || \
-	parse_modules_config "${GENTOO_PATCHDIR}"/conf/apache2-builtin-mods || \
-	return 1
-}
diff --git a/www-servers/apache/apache-2.2.4-r11.ebuild b/www-servers/apache/apache-2.2.4-r11.ebuild
deleted file mode 100644
index 3cedbd3b188a..000000000000
--- a/www-servers/apache/apache-2.2.4-r11.ebuild
+++ /dev/null
@@ -1,472 +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.2.4-r11.ebuild,v 1.1 2007/08/01 22:42:13 hollow Exp $
-
-inherit eutils flag-o-matic gnuconfig multilib autotools
-
-# latest gentoo apache files
-GENTOO_PATCHNAME="gentoo-${PF}"
-GENTOO_PATCHSTAMP="20070802"
-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"
-
-# some helper scripts are apache-1.1, thus both are here
-LICENSE="Apache-2.0 Apache-1.1"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug doc ldap mpm-event mpm-itk mpm-peruser mpm-prefork mpm-worker no-suexec selinux ssl static-modules threads"
-
-DEPEND="dev-lang/perl
-	=dev-libs/apr-1*
-	=dev-libs/apr-util-1*
-	dev-libs/expat
-	dev-libs/libpcre
-	sys-libs/zlib
-	ldap? ( =net-nds/openldap-2* )
-	selinux? ( sec-policy/selinux-apache )
-	ssl? ( dev-libs/openssl )
-	!=www-servers/apache-1*
-	!=app-admin/apache-tools-2.2.4-r2"
-
-RDEPEND="${DEPEND}
-	app-misc/mime-types"
-
-PDEPEND="~app-admin/apache-tools-${PV}"
-
-S="${WORKDIR}/httpd-${PV}"
-
-pkg_setup() {
-	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
-
-	# Select the default MPM module
-	MPM_LIST="event itk peruser prefork worker"
-	for x in ${MPM_LIST} ; do
-		if use mpm-${x} ; then
-			if [[ "x${mpm}" == "x" ]] ; then
-				mpm=${x}
-				elog
-				elog "Selected MPM: ${mpm}"
-				elog
-			else
-				eerror "You have selected more then one mpm USE-flag."
-				eerror "Only one MPM is supported."
-				die "more then one mpm was specified"
-			fi
-		fi
-	done
-
-	if [[ "x${mpm}" == "x" ]] ; then
-		if use threads ; then
-			mpm=worker
-			elog
-			elog "Selected default threaded MPM: ${mpm}";
-			elog
-		else
-			mpm=prefork
-			elog
-			elog "Selected default MPM: ${mpm}";
-			elog
-		fi
-	fi
-
-	# setup apache user and group
-	enewgroup apache 81
-	enewuser apache 81 -1 /var/www apache
-
-	if ! use no-suexec ; then
-		elog
-		elog "You can manipulate several configure options of suexec"
-		elog "through the following environment variables:"
-		elog
-		elog " SUEXEC_SAFEPATH: Default PATH for suexec (default: /usr/local/bin:/usr/bin:/bin)"
-		elog "  SUEXEC_LOGFILE: Path to the suexec logfile (default: /var/log/apache2/suexec_log)"
-		elog "   SUEXEC_CALLER: Name of the user Apache is running as (default: apache)"
-		elog "  SUEXEC_DOCROOT: Directory in which suexec will run scripts (default: /var/www)"
-		elog "   SUEXEC_MINUID: Minimum UID, which is allowed to run scripts via suexec (default: 1000)"
-		elog "   SUEXEC_MINGID: Minimum GID, which is allowed to run scripts via suexec (default: 100)"
-		elog "  SUEXEC_USERDIR: User subdirectories (like /home/user/html) (default: public_html)"
-		elog "    SUEXEC_UMASK: Umask for the suexec process (default: 077)"
-		elog
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# 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 "libdir sed failed"
-
-	#### Patch Organization
-	# 00-19 Gentoo specific  (00_all_some-title.patch)
-	# 20-39 Additional MPMs  (20_all_${MPM}_some-title.patch)
-	# 40-59 USE-flag based   (40_all_${USE}_some-title.patch)
-	# 60-79 Version specific (60_all_${PV}_some-title.patch)
-	# 80-99 Security patches (80_all_${PV}_cve-####-####.patch)
-
-	epatch "${GENTOO_PATCHDIR}"/patches/*.patch
-
-	# setup the filesystem layout config
-	cat "${GENTOO_PATCHDIR}"/patches/config.layout >> "${S}"/config.layout || \
-		die "Failed preparing config.layout!"
-	sed -i -e "s:version:${PF}:g" "${S}"/config.layout
-
-	# patched-in MPMs need the build environment rebuilt
-	sed -i -e '/sinclude/d' configure.in
-	AT_GNUCONF_UPDATE=yes AT_M4DIR=build eautoreconf
-}
-
-src_compile() {
-	local modtype="shared" myconf=""
-	cd "${S}"
-
-	# Instead of filtering --as-needed (bug #128505), append --no-as-needed
-	# Thanks to Harald van Dijk
-	append-ldflags -Wl,--no-as-needed
-
-	# peruser MPM debugging with -X is nearly impossible
-	use mpm-peruser && use debug && append-flags -DMPM_PERUSER_DEBUG
-
-	use static-modules && modtype="static"
-	select_modules_config || die "determining modules failed"
-
-	if use ldap ; then
-		mods="${mods} ldap authnz_ldap"
-		myconf="${myconf} --enable-authnz-ldap=${modtype} --enable-ldap=${modtype}"
-	fi
-
-	if use ssl; then
-		mods="${mods} ssl"
-		myconf="${myconf} --with-ssl=/usr --enable-ssl=${modtype}"
-	fi
-
-	# Only build suexec with USE=-no-suexec
-	if use no-suexec ; then
-		myconf="${myconf} --disable-suexec"
-	else
-		myconf="${myconf} --with-suexec-safepath=${SUEXEC_SAFEPATH:-/usr/local/bin:/usr/bin:/bin}"
-		myconf="${myconf} --with-suexec-logfile=${SUEXEC_LOGFILE:-/var/log/apache2/suexec_log}"
-		myconf="${myconf} --with-suexec-bin=/usr/sbin/suexec"
-		myconf="${myconf} --with-suexec-userdir=${SUEXEC_USERDIR:-public_html}"
-		myconf="${myconf} --with-suexec-caller=${SUEXEC_CALLER:-apache}"
-		myconf="${myconf} --with-suexec-docroot=${SUEXEC_DOCROOT:-/var/www}"
-		myconf="${myconf} --with-suexec-uidmin=${SUEXEC_MINUID:-1000}"
-		myconf="${myconf} --with-suexec-gidmin=${SUEXEC_MINGID:-100}"
-		myconf="${myconf} --with-suexec-umask=${SUEXEC_UMASK:-077}"
-		myconf="${myconf} --enable-suexec=${modtype}"
-		mods="${mods} suexec"
-	fi
-
-	# econf overwrites the stuff from config.layout, so we have to put them into
-	# our myconf line too
-
-	econf \
-		--includedir=/usr/include/apache2 \
-		--libexecdir=/usr/$(get_libdir)/apache2/modules \
-		--datadir=/var/www/localhost \
-		--sysconfdir=/etc/apache2 \
-		--localstatedir=/var \
-		--with-mpm=${mpm} \
-		--with-perl=/usr/bin/perl \
-		--with-expat=/usr \
-		--with-z=/usr \
-		--with-apr=/usr \
-		--with-apr-util=/usr \
-		--with-pcre=/usr \
-		--with-port=80 \
-		--with-program-name=apache2 \
-		--enable-layout=Gentoo \
-		$( use_enable debug maintainer-mode ) \
-		${myconf} ${MY_BUILTINS} || die "econf failed!"
-
-	sed -i -e 's:apache2\.conf:httpd.conf:' include/ap_config_auto.h
-
-	emake || die "emake failed"
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	# This is a mapping of module names to the -D options in APACHE2_OPTS
-	# Used for creating optional LoadModule lines
-	mod_defines="
-		authnz_ldap:AUTH_LDAP
-		cache:CACHE
-		dav:DAV
-		dav_fs:DAV
-		dav_lock:DAV
-		disk_cache:CACHE
-		file_cache:CACHE
-		info:INFO
-		ldap:LDAP
-		mem_cache:CACHE
-		proxy:PROXY
-		proxy_ajp:PROXY
-		proxy_balancer:PROXY
-		proxy_connect:PROXY
-		proxy_http:PROXY
-		ssl:SSL
-		status:INFO
-		suexec:SUEXEC
-		userdir:USERDIR
-	"
-
-	# create our LoadModule lines
-	if ! use static-modules ; then
-		load_module=""
-		moddir="${D}/usr/$(get_libdir)/apache2/modules"
-		for m in ${mods} ; do
-			endid="no"
-
-			if [[ -e "${moddir}/mod_${m}.so" ]] ; then
-				for def in ${mod_defines} ; do
-					if [[ "${m}" == "${def%:*}" ]] ; then
-						load_module="${load_module}\n<IfDefine ${def#*:}>"
-						endid="yes"
-					fi
-				done
-				load_module="${load_module}\nLoadModule ${m}_module modules/mod_${m}.so"
-				if [[ "${endid}" == "yes" ]] ; then
-					load_module="${load_module}\n</IfDefine>"
-				fi
-			fi
-		done
-	fi
-	sed -i -e "s:%%LOAD_MODULE%%:${load_module}:" \
-		"${GENTOO_PATCHDIR}"/conf/httpd.conf || die "sed failed"
-
-	# Install our configuration files
-	insinto /etc/apache2
-	doins docs/conf/magic
-	doins -r "${GENTOO_PATCHDIR}"/conf/*
-	insinto /etc/logrotate.d
-	newins "${GENTOO_PATCHDIR}"/scripts/apache2-logrotate apache2
-
-	# generate a sane default APACHE2_OPTS
-	APACHE2_OPTS="-D DEFAULT_VHOST -D INFO -D LANGUAGE"
-	use doc && APACHE2_OPTS="${APACHE2_OPTS} -D MANUAL"
-	use ssl && APACHE2_OPTS="${APACHE2_OPTS} -D SSL -D SSL_DEFAULT_VHOST"
-	use no-suexec || APACHE2_OPTS="${APACHE2_OPTS} -D SUEXEC"
-
-	sed -i -e "s:APACHE2_OPTS=\".*\":APACHE2_OPTS=\"${APACHE2_OPTS}\":" \
-		"${GENTOO_PATCHDIR}"/init/apache2.confd || die "sed failed"
-
-	newconfd "${GENTOO_PATCHDIR}"/init/apache2.confd apache2
-	newinitd "${GENTOO_PATCHDIR}"/init/apache2.initd apache2
-
-	# Link apache2ctl to the init script
-	dosym /etc/init.d/apache2 /usr/sbin/apache2ctl
-
-	# provide symlinks for all the stuff we no longer rename, bug 177697
-	for i in suexec apxs; do
-		dosym /usr/sbin/${i} /usr/sbin/${i}2
-	done
-
-	# Install some thirdparty scripts
-	exeinto /usr/sbin
-	for i in apache2logserverstatus apache2splitlogfile ; do
-		doexe "${GENTOO_PATCHDIR}"/scripts/${i}
-	done
-	use ssl && doexe "${GENTOO_PATCHDIR}"/scripts/gentestcrt.sh
-
-	# Install some documentation
-	dodoc ABOUT_APACHE CHANGES LAYOUT README README.platforms VERSIONING
-	dodoc "${GENTOO_PATCHDIR}"/docs/*
-
-	# drop in a convenient link to the manual
-	if use doc ; then
-		sed -i -e "s:VERSION:${PVR}:" "${D}/etc/apache2/modules.d/00_apache_manual.conf"
-	else
-		rm -f "${D}/etc/apache2/modules.d/00_apache_manual.conf"
-		rm -Rf "${D}/usr/share/doc/${PF}/manual"
-	fi
-
-	# the default webroot gets stored in /usr/share/doc
-	ebegin "Installing default webroot to /usr/share/doc/${PF}"
-	mv -f "${D}/var/www/localhost" "${D}/usr/share/doc/${PF}/webroot"
-	eend $?
-	keepdir /var/www/localhost/htdocs
-
-	if ! use no-suexec ; then
-		# Set some sane permissions for suexec
-		fowners 0:apache /usr/sbin/suexec
-		fperms 4710 /usr/sbin/suexec
-	fi
-
-	keepdir /etc/apache2/vhosts.d
-	keepdir /etc/apache2/modules.d
-
-	# empty dirs
-	for i in /var/lib/dav /var/log/apache2 /var/cache/apache2 ; do
-		keepdir ${i}
-		fowners apache:apache ${i}
-		fperms 0755 ${i}
-	done
-
-	# We'll be needing /etc/apache2/ssl if USE=ssl
-	use ssl && keepdir /etc/apache2/ssl
-}
-
-pkg_postinst() {
-	# Automatically generate test certificates if ssl USE flag is being set
-	if use ssl && [[ ! -e "${ROOT}/etc/apache2/ssl/server.crt" ]] ; then
-		cd "${ROOT}"/etc/apache2/ssl
-		einfo
-		einfo "Generating self-signed test certificate in ${ROOT}/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
-		elog "The default webroot has not been installed into"
-		elog "${ROOT}/var/www/localhost because the directory already exists"
-		elog "and we do not want to overwrite any files you have put there."
-		elog
-		elog "If you would like to install the latest webroot, please run"
-		elog "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:0 "${ROOT}"/var/www/localhost
-	fi
-
-	# Previous installations of apache-2.2 installed the upstream configuration
-	# files, which shouldn't even have been installed!
-	if has_version '>=www-servers/apache-2.2.4' ; then
-		[ -f "${ROOT}"/etc/apache2/apache2.conf ] && \
-			rm -f "${ROOT}"/etc/apache2/apache2.conf >/dev/null 2>&1
-
-		for i in extra original ; do
-			[ -d "${ROOT}"/etc/apache2/$i ] && \
-				rm -rf "${ROOT}"/etc/apache2/$i >/dev/null 2>&1
-		done
-	fi
-
-	# Note the changes regarding DEFAULT_VHOST and SSL_DEFAULT_VHOST
-	if has_version '<www-servers/apache-2.2.4-r7' ; then
-		elog
-		elog "Listen directives have been moved into the default virtual host"
-		elog "configuation. At least DEFAULT_VHOST has been enabled for you"
-		elog "(depending on your USE-flags."
-		elog
-		elog "If you disable DEFAULT_VHOST or SSL_DEFAULT_VHOST, there would"
-		elog "be no listening sockets available."
-		elog
-	fi
-
-	# Note the user of the config changes
-	if has_version '<www-servers/apache-2.2.4-r5' ; then
-		elog
-		elog "Please make sure that you update your /etc directory."
-		elog "Between the versions, we had to changes some config files"
-		elog "and move some stuff out of the main httpd.conf file to a seperate"
-		elog "modules.d entry."
-		elog
-		elog "Thus please update your /etc directory either via etc-update,"
-		elog "dispatch-conf or conf-update !"
-		elog
-	fi
-
-	# Check for dual/upgrade install
-	if has_version '<www-servers/apache-2.2.0' ; then
-		elog
-		elog "When upgrading from versions below 2.2.0 to this version, you"
-		elog "need to rebuild all your modules. Please do so for your modules"
-		elog "to continue working correctly."
-		elog
-		elog "Also note that some configuration directives have been"
-		elog "split into their own files under ${ROOT}/etc/apache2/modules.d/"
-		elog "and that some modules, foremost the authentication related ones,"
-		elog "have been renamed."
-		elog
-		elog "Some examples:"
-		elog "  - USERDIR is now configureable in ${ROOT}etc/apache2/modules.d/00_mod_userdir.conf."
-		elog
-		elog "For more information on what you may need to change, please"
-		elog "see the overview of changes at:"
-		elog "http://httpd.apache.org/docs/2.2/new_features_2_2.html"
-		elog "and the upgrading guide at:"
-		elog "http://httpd.apache.org/docs/2.2/upgrading.html"
-		elog
-	fi
-
-	# Cleanup the vim backup files, placed in /etc/apache2 by the last
-	# patchtarball (gentoo-apache-2.2.4-r7-20070615)
-	rm -f "${ROOT}/etc/apache2/modules.d/*.conf~"
-}
-
-pkg_config() {
-	einfo "Installing default webroot to ${ROOT}/var/www/localhost"
-	cp -R "${ROOT}"/usr/share/doc/${PF}/webroot/* "${ROOT}"/var/www/localhost
-}
-
-parse_modules_config() {
-	local name=""
-	local disable=""
-	local version="undef"
-	MY_BUILTINS=""
-	mods=""
-	[[ -f "${1}" ]] || return 1
-
-	for i in $(sed 's/#.*//' < $1) ; do
-		if [[ "$i" == "VERSION:" ]] ; then
-			version="select"
-		elif [[ "${version}" == "select" ]] ; then
-			version="$i"
-		# start with - option for backwards compatibility only
-		elif [[ "$i" == "-" ]] ; then
-			disable="true"
-		elif [[ -z "${name}" ]] && [[ "$i" != "${i/mod_/}" ]] ; then
-			name="${i/mod_/}"
-		elif [[ -n "${disable}" ]] || [[ "$i" == "disabled" ]] ; then
-			MY_BUILTINS="${MY_BUILTINS} --disable-${name}"
-			name="" ; disable=""
-		elif [[ "$i" == "static" ]] || use static-modules ; then
-			MY_BUILTINS="${MY_BUILTINS} --enable-${name}=static"
-			name="" ; disable=""
-		elif [[ "$i" == "shared" ]] ; then
-			MY_BUILTINS="${MY_BUILTINS} --enable-${name}=shared"
-			mods="${mods} ${name}"
-			name="" ; disable=""
-		else
-			ewarn "Parse error in ${1} - unknown option: $i"
-		fi
-	done
-
-	# reject the file if it's unversioned or doesn't match our
-	# package major.minor. This is to make upgrading work smoothly.
-	if [[ "${version}" != "${PV%.*}" ]] ; then
-		mods=""
-		MY_BUILTINS=""
-		return 1
-	fi
-
-	einfo "Using ${1}"
-	einfo "options: ${MY_BUILTINS}"
-	einfo "LoadModules: ${mods}"
-}
-
-select_modules_config() {
-	parse_modules_config "${ROOT}"/etc/apache2/apache2-builtin-mods || \
-	parse_modules_config "${GENTOO_PATCHDIR}"/conf/apache2-builtin-mods || \
-	return 1
-}
diff --git a/www-servers/apache/files/digest-apache-2.0.59-r4 b/www-servers/apache/files/digest-apache-2.0.59-r4
deleted file mode 100644
index bc0b5aea6b83..000000000000
--- a/www-servers/apache/files/digest-apache-2.0.59-r4
+++ /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
diff --git a/www-servers/apache/files/digest-apache-2.0.59-r5 b/www-servers/apache/files/digest-apache-2.0.59-r5
new file mode 100644
index 000000000000..71e056c2bfbe
--- /dev/null
+++ b/www-servers/apache/files/digest-apache-2.0.59-r5
@@ -0,0 +1,6 @@
+MD5 26d265c1b3622f9594adf49296e56334 gentoo-apache-2.0.59-r5-20070828.tar.bz2 63913
+RMD160 c0cfc72d0316b0a977296a08932bebe6a7547c7b gentoo-apache-2.0.59-r5-20070828.tar.bz2 63913
+SHA256 fa188f4f7e26b7277a8a1858c449766bc997c1f9cf1ee2a5f9fdbfda5dabcccb gentoo-apache-2.0.59-r5-20070828.tar.bz2 63913
+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
diff --git a/www-servers/apache/files/digest-apache-2.2.4-r10 b/www-servers/apache/files/digest-apache-2.2.4-r10
deleted file mode 100644
index 48da053ddf20..000000000000
--- a/www-servers/apache/files/digest-apache-2.2.4-r10
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 363503604161176c140774691a689fcb gentoo-apache-2.2.4-r10-20070712.tar.bz2 57172
-RMD160 13da6d348d39ccd9a0fbe48e13e396236b38fa35 gentoo-apache-2.2.4-r10-20070712.tar.bz2 57172
-SHA256 9e57aa981f7b0e368b898471f92e2bb206c92d173169bcb0fa00dd037d9b36e7 gentoo-apache-2.2.4-r10-20070712.tar.bz2 57172
-MD5 536c86c7041515a25dd8bad3611da9a3 httpd-2.2.4.tar.bz2 4930375
-RMD160 bb6e8a7447fa8e8f629010f30b548068de518523 httpd-2.2.4.tar.bz2 4930375
-SHA256 08ab82eae6418e265d361730e7eadc7d6966dffdb66ee07bd4d9af3f2b28dfc8 httpd-2.2.4.tar.bz2 4930375
diff --git a/www-servers/apache/files/digest-apache-2.2.4-r11 b/www-servers/apache/files/digest-apache-2.2.4-r11
deleted file mode 100644
index f9830a5b8593..000000000000
--- a/www-servers/apache/files/digest-apache-2.2.4-r11
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 dd60f2d5d6021ddee4dd076097155b36 gentoo-apache-2.2.4-r11-20070802.tar.bz2 59461
-RMD160 bd23851238656d83916e35c6b706f3e830b2763d gentoo-apache-2.2.4-r11-20070802.tar.bz2 59461
-SHA256 b529cf31fb67ebc10e15a52a04035503a4518429f6afa9ce018cd31df3550945 gentoo-apache-2.2.4-r11-20070802.tar.bz2 59461
-MD5 536c86c7041515a25dd8bad3611da9a3 httpd-2.2.4.tar.bz2 4930375
-RMD160 bb6e8a7447fa8e8f629010f30b548068de518523 httpd-2.2.4.tar.bz2 4930375
-SHA256 08ab82eae6418e265d361730e7eadc7d6966dffdb66ee07bd4d9af3f2b28dfc8 httpd-2.2.4.tar.bz2 4930375