fix digests; whitespace cleanups; remove apache-tools at patch level

Package-Manager: portage-2.1.2.7

7 files changed, 481 insertions, 30 deletions

diff --git a/net-www/apache/ChangeLog b/net-www/apache/ChangeLog
index 272da66d0a6a..244596e707c5 100644
--- a/net-www/apache/ChangeLog
+++ b/net-www/apache/ChangeLog
@@ -1,6 +1,11 @@
 # 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.524 2007/05/22 10:52:42 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.525 2007/05/22 20:52:35 hollow Exp $
+
+*apache-2.2.4-r2 (22 May 2007)
+
+  22 May 2007; Benedikt Böhm <hollow@gentoo.org> +apache-2.2.4-r2.ebuild:
+  fix digests; whitespace cleanups; remove apache-tools at patch level
 
   22 May 2007; Benedikt Böhm <hollow@gentoo.org> apache-2.2.4-r1.ebuild:
   fix itk patch name
diff --git a/net-www/apache/Manifest b/net-www/apache/Manifest
index 4cf51c3ed672..ca0b96dce9e3 100644
--- a/net-www/apache/Manifest
+++ b/net-www/apache/Manifest
@@ -1,17 +1,18 @@
 DIST apache_1.3.34.tar.gz 2468056 RMD160 e39dfc57b7f9164aa76641de3fa74f0314c9ec9e SHA1 df082b73f1220555dc416c0c5afa746e30a9e0de SHA256 ceed243f4f98e4323b48e5f7f80e306d1abb00c592e18de5575983db42d6f8d4
-DIST apache_1.3.37.tar.gz 38988 RMD160 a8951bac1ca0e58da840fb1941d2094079cc1edf SHA1 4b6055c2157daa705ad08cab5a0074503244b4ee SHA256 34cdd1d909a9d931c38a8a025c4880b4b1c91cb5098d2dc099e321d72f3800c5
+DIST apache_1.3.37.tar.gz 2665370 RMD160 de84adf2fd0a745c32072ca5dc5e1374cfcf04f7 SHA1 b422fac1dda10baa483e8f4378dff58faf3f85b4 SHA256 9f27889bfbf418b987a892160e52fd217d66391df2870f3ecac877ef565c4bfc
 DIST gentoo-apache-1.3.34-r14-20060726.tar.bz2 28001 RMD160 955a0ba00287db8859ce03ba6ccfdc2cfaa3bd12 SHA1 d05f1d554bc5b7021fa89750cd47e79aeecc94f7 SHA256 808e88b32d9ee7181d1cb789f24da21ccd059c8789eff9989bd92826fe826149
 DIST gentoo-apache-1.3.37-20060729.tar.bz2 27992 RMD160 fdb8c3690c8daad501339545b2e348d533d1be09 SHA1 05d3d2b4309365de54adfc5d1aba9ff4758fc3fc SHA256 00d759d184bec0c2aafbfaba2b748247ceae54bc04570d47979dc237b028ef2b
 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.2.4-20070121.tar.bz2 2880 RMD160 6347059db86785fabd6844c4a8b8c025b0191135 SHA1 64dc804d529a8f3c1ebd5b4aba642b637c501404 SHA256 d99179ae89d5cbeed16a6f30f4105e8f39eac9baefd7dfac5221b5a4479e31c3
+DIST gentoo-apache-2.2.4-20070121.tar.bz2 53108 RMD160 180aaef9d7a174bf917d7cecac467c3a541901ce SHA1 e83669c06241586703431a18aa4dab4b55ebb0f5 SHA256 0cd381f4aee3795529bc27fe1926e9b20423931a26e508368b98ba38c29a6421
 DIST gentoo-apache-2.2.4-r1-20070522.tar.bz2 61598 RMD160 87939e578b45d49e80c848f4429b8312cc634988 SHA1 9ce01f3394de16ca555058752e746e5ce2211949 SHA256 300c024020bc24fde03c8f32657dd08122abb90f8da0267e268b24be9f67e5bf
-DIST httpd-2.0.58.tar.bz2 694080 RMD160 36a5f3a42e43e775bd683daf8209038067ce95dd SHA1 75db9624a2dfa68d803491c802cac40ed157fa77 SHA256 81fb04b3e56d120eae850c96aad271399b6cf3e50106e6451d6a166ca7661526
+DIST gentoo-apache-2.2.4-r2-20070522.tar.bz2 62135 RMD160 d66461ad1930b2449a06f2d26e92b3918e362a86 SHA1 115c3eddb02efdcd52466bf29c9f1ad598b9ac58 SHA256 6e2c2b25810ac1ac5f77841975208462a162fea70409b51df98797f1e2622dc9
+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
 DIST httpd-2.2.4.tar.bz2 4930375 RMD160 bb6e8a7447fa8e8f629010f30b548068de518523 SHA1 64ceae373434a986dc99b8ed953afa0d4fad85ce SHA256 08ab82eae6418e265d361730e7eadc7d6966dffdb66ee07bd4d9af3f2b28dfc8
 DIST lingerd-0.94.tar.gz 33938 RMD160 2d7363b763a68c0c7acdadc23779929f4d02153f SHA1 25d32aca3f03fbc9273fca6491444d1920818a1c SHA256 632030f9c1b9e8f817ee19bad74988f3dce7f6ec617677ad5a522e8d491382a0
 DIST mod_ssl-2.8.25-1.3.34.tar.gz 820352 RMD160 90a3913d30c7f4d194907463125c90101005837a SHA1 150f726539d74c0d2af02e482be78bbcdb811395 SHA256 832b240157666efdbdfc1a2fd593ee4eebbc9441ec48ece8276660092b974d07
-DIST mod_ssl-2.8.28-1.3.37.tar.gz 740772 RMD160 12b94f310431bfca79d10b1e0385de75bb1cedab SHA1 12a45d3e4f0ac10b8a1ae4bb9457c822a6947bed SHA256 3eab92cb013b0cc8100068297d69621735aa657cc4683994a2b7dfb6912d860f
+DIST mod_ssl-2.8.28-1.3.37.tar.gz 820417 RMD160 6b12c0a52fe0fbb7b91221d1cb37f93fbe59bb11 SHA1 9db2a7240e499da2b99d0df9c1a6fbae0580ba0b SHA256 76437105b5b5593a7dbd8ee45af417233897dcaf910cbc337a68b0db24e35489
 EBUILD apache-1.3.34-r14.ebuild 8852 RMD160 daeef12d95f43f3d671d7075da05958e7f16d23f SHA1 c405e9aac5e311afae4ed33d1f1fd8487c2f8a45 SHA256 f45dae7acfe637946cdecd9968deddca51b4abdc2f7a61139fb7d848776eca38
 MD5 7a4326454025a68fb7ac584619dc71e0 apache-1.3.34-r14.ebuild 8852
 RMD160 daeef12d95f43f3d671d7075da05958e7f16d23f apache-1.3.34-r14.ebuild 8852
@@ -32,14 +33,18 @@ EBUILD apache-2.2.4-r1.ebuild 13790 RMD160 5c9f16d3bee7170528e73d0c7234e7bc74b7e
 MD5 2aafd4aedd5f670a721ea23eec2d8992 apache-2.2.4-r1.ebuild 13790
 RMD160 5c9f16d3bee7170528e73d0c7234e7bc74b7e72d apache-2.2.4-r1.ebuild 13790
 SHA256 908887c25087fdbd860d2921086aa8a4d00f8ad868dba22df206e1883f0d9c14 apache-2.2.4-r1.ebuild 13790
+EBUILD apache-2.2.4-r2.ebuild 13741 RMD160 e7793bc682c1827b1d7edf9df947950bc8a776da SHA1 5be97bec14341eaa8a048faece0798945435b174 SHA256 81d1bf473e5a8418ae718cbe84e51bcc002546231e834b4a58257190519d017c
+MD5 027a311767def059ce9a4d3047076558 apache-2.2.4-r2.ebuild 13741
+RMD160 e7793bc682c1827b1d7edf9df947950bc8a776da apache-2.2.4-r2.ebuild 13741
+SHA256 81d1bf473e5a8418ae718cbe84e51bcc002546231e834b4a58257190519d017c apache-2.2.4-r2.ebuild 13741
 EBUILD apache-2.2.4.ebuild 13458 RMD160 db4e70cd09ef15811f1c123c29d0c3c1d597918c SHA1 d3fd31d60b5e284fbc7eb2f80071205c876126ce SHA256 f53dfad01d60a22190883fd857da7ea6a1b13e4056f774a76f550d9c3b9b3072
 MD5 d90b381fd065a099ec213990fad55cbc apache-2.2.4.ebuild 13458
 RMD160 db4e70cd09ef15811f1c123c29d0c3c1d597918c apache-2.2.4.ebuild 13458
 SHA256 f53dfad01d60a22190883fd857da7ea6a1b13e4056f774a76f550d9c3b9b3072 apache-2.2.4.ebuild 13458
-MISC ChangeLog 89882 RMD160 d7ddc63e841d22ccd7cbd3b6a1bd23fcdaaf7e2e SHA1 25a9e5c1c73c6c9bf38c06cbbeedb80d1360b8ec SHA256 97e173bd340d00e8b6265aca65584f8b20055d574a8f1416ecde07c347f2efbc
-MD5 eb8bf52cd73025542d39127e04b992eb ChangeLog 89882
-RMD160 d7ddc63e841d22ccd7cbd3b6a1bd23fcdaaf7e2e ChangeLog 89882
-SHA256 97e173bd340d00e8b6265aca65584f8b20055d574a8f1416ecde07c347f2efbc ChangeLog 89882
+MISC ChangeLog 90061 RMD160 d3c25d150701e0c56dccb14e9fc731912d084c3b SHA1 d559a99e2f270b5bd2236562161798c572741891 SHA256 050e2ff03899c0d84d362e0df15279a9b68c8d8ce12a9d7e90b883b59663ba4e
+MD5 3f02a38f700861a302db240c3ff0dd84 ChangeLog 90061
+RMD160 d3c25d150701e0c56dccb14e9fc731912d084c3b ChangeLog 90061
+SHA256 050e2ff03899c0d84d362e0df15279a9b68c8d8ce12a9d7e90b883b59663ba4e ChangeLog 90061
 MISC metadata.xml 551 RMD160 1b31261c043e57cabc9bd8582f9b34c09d92d108 SHA1 68bb286a67452c3dae7525195c60b8637cca9b81 SHA256 646729a42ddffcbde3426dd6aa9a77fab923bc348c5b34c9d24083d86fbb15eb
 MD5 0f28752ee3545b3fd8e28ee656e62f4b metadata.xml 551
 RMD160 1b31261c043e57cabc9bd8582f9b34c09d92d108 metadata.xml 551
@@ -47,18 +52,21 @@ SHA256 646729a42ddffcbde3426dd6aa9a77fab923bc348c5b34c9d24083d86fbb15eb metadata
 MD5 9898e1d5318e43832fc20c4e71e49110 files/digest-apache-1.3.34-r14 1045
 RMD160 e3177b6c4899756c982888044d1c321733d121ef files/digest-apache-1.3.34-r14 1045
 SHA256 06ec0bcb6e35bc9e1cb81c6d264bb4684bd766fda12aa1d788c1c2d35a9173dc files/digest-apache-1.3.34-r14 1045
-MD5 4ef61e07eff83534e2987aff4f5ccf4c files/digest-apache-1.3.37 1027
-RMD160 253a159016f0d88050571ecefa1331198fb34111 files/digest-apache-1.3.37 1027
-SHA256 67eed3405147725dbc25a649ff84b5914860403ffa66c8dc72117255fc61a23c files/digest-apache-1.3.37 1027
-MD5 8b60aafc9a626ae60e686c360c559f72 files/digest-apache-2.0.58-r2 539
-RMD160 599729abf0321de286932c00c6ac7a6a49eafcb7 files/digest-apache-2.0.58-r2 539
-SHA256 635e462ac19b804498fd9b932089d306e3c5265c608a43f839114e9f3f5a57d3 files/digest-apache-2.0.58-r2 539
+MD5 9f2ae7acf0bff8d41440c7060bc8e3e9 files/digest-apache-1.3.37 1033
+RMD160 b5831b6b0f2a18f0319f68e8ca60fc93a3fff3b1 files/digest-apache-1.3.37 1033
+SHA256 03b05d6906fa667af8af8d84f5a3150ccd924dedbb8c3dc8777a1a9381c95012 files/digest-apache-1.3.37 1033
+MD5 0524614b17efc5f1bfa0d40607b87f41 files/digest-apache-2.0.58-r2 542
+RMD160 032bc41c0d58aa7e02d26e6798494cf838af864c files/digest-apache-2.0.58-r2 542
+SHA256 a168cb54770884f50f48411842613b904f1cbf24ca9596ea43b28eeed7688936 files/digest-apache-2.0.58-r2 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 b83a271f0a0650814af46f5ab3e7a9ce files/digest-apache-2.2.4 524
-RMD160 23cb4900251e84e56b23a7c0491490a64c313d63 files/digest-apache-2.2.4 524
-SHA256 8387c391fc78f9e3f9bb7c7d1d3fdfca1753732847570bf3453e2767a65eface files/digest-apache-2.2.4 524
+MD5 13fe4f2b1ea9abdd5a6d21b4fd951557 files/digest-apache-2.2.4 527
+RMD160 2da3967ecb466b7b592acd289d45a246486017b3 files/digest-apache-2.2.4 527
+SHA256 26585f0ead7cab908a161a06863837680a1c66fbf2fbd3a5eff27049ab17c4f2 files/digest-apache-2.2.4 527
 MD5 44254da94f0b05989be2b607e48ed3fc files/digest-apache-2.2.4-r1 536
 RMD160 f2be1049d951becb7826d125f47e5e0fa611f2be files/digest-apache-2.2.4-r1 536
 SHA256 65626277840a95db01655ad62ea471196d0e01a67cb210273c06c6c1b6bfaa10 files/digest-apache-2.2.4-r1 536
+MD5 afedb71c3f9bee57c8007a45d0172cbb files/digest-apache-2.2.4-r2 536
+RMD160 cd8c7c435eb70a1db1f9b913a7919c0f50988f50 files/digest-apache-2.2.4-r2 536
+SHA256 f44888869d9cfcd4a57e93893c65e60f88af4d0a723deed74b66616ecc7d8c61 files/digest-apache-2.2.4-r2 536
diff --git a/net-www/apache/apache-2.2.4-r2.ebuild b/net-www/apache/apache-2.2.4-r2.ebuild
new file mode 100644
index 000000000000..29de90aadacc
--- /dev/null
+++ b/net-www/apache/apache-2.2.4-r2.ebuild
@@ -0,0 +1,432 @@
+# 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-2.2.4-r2.ebuild,v 1.1 2007/05/22 20:52:35 hollow Exp $
+
+inherit eutils flag-o-matic gnuconfig multilib autotools
+
+# latest gentoo apache files
+GENTOO_PATCHNAME="gentoo-${PF}"
+GENTOO_PATCHSTAMP="20070522"
+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 )
+	!=net-www/apache-1*"
+
+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 our MPM
+	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}
+				einfo "Selected MPM: ${mpm}"
+			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
+			einfo "Selected default threaded MPM: ${mpm}";
+		else
+			mpm=prefork
+			einfo "Selected default MPM: ${mpm}";
+		fi
+	fi
+
+	# setup apache user and group
+	enewgroup apache 81
+	enewuser apache 81 -1 /var/www apache
+}
+
+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,scripts/Makefile.suexec,scripts/suexec2-config} \
+		|| 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
+	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
+
+	# 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}' >> config.cache
+
+	if use no-suexec ; then
+		myconf="${myconf} --disable-suexec"
+	else
+		mods="${mods} suexec"
+		myconf="${myconf} $(${GENTOO_PATCHDIR}/scripts/suexec2-config --config)"
+		myconf="${myconf} \
+				--with-suexec-bin=/usr/sbin/suexec2 \
+				--enable-suexec=${modtype}"
+	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 \
+		--cache-file="${S}/config.cache" \
+		--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"
+
+	# Remove some of the default files installed by `make install'
+	# and those binaries/manpages, that belong to app-admin/apache-tools now
+	rm -Rf "${D}"/etc \
+		"${D}"/usr/sbin/{envvars*,apachectl} \
+		"${D}"/usr/share/man/man1/{htdigest,htpasswd,htdbm}.1* \
+		"${D}"/usr/share/man/man8/ab.8*
+
+	# 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 logresolve apxs rotatelogs dbmmanage checkgid split-logfile suexec; do
+		dosym /usr/sbin/${i} /usr/sbin/${i}2
+	done
+
+	# Install some thirdparty scripts
+	exeinto /usr/sbin
+	for i in apache2logserverstatus apache2splitlogfile suexec2-config ; do
+		doexe "${GENTOO_PATCHDIR}"/scripts/${i}
+	done
+	use ssl && doexe "${GENTOO_PATCHDIR}"/scripts/gentestcrt.sh
+
+	for i in logresolve.pl split-logfile log_server_status ; do
+		doexe support/${i}
+	done
+
+	# needed for suexec2-config
+	insinto /usr/$(get_libdir)/apache2/build
+	doins "${GENTOO_PATCHDIR}"/scripts/Makefile.suexec
+	doins support/suexec.c
+
+	# we don't use apachectl anymore, it's symlinked to the init script now
+	rm -f usr/share/man/man8/apachectl.8
+
+	# 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 $?
+
+	# Set up some sane permissions
+	if ! use no-suexec ; then
+		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
+
+	fperms 0755 /usr/sbin/apache2logserverstatus
+	fperms 0755 /usr/sbin/apache2splitlogfile
+}
+
+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
+
+	# Check for dual/upgrade install
+	# The hasq is a hack so we don't throw QA warnings for not putting
+	# apache2 in IUSE - the only use of the flag is this warning
+
+	if has_version '<net-www/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
+		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
+		elog "Some modules do not yet work with Apache 2.2."
+		elog "To keep from accidentally downgrading to Apache 2.0, you should"
+		elog "add the following to ${ROOT}/etc/portage/package.mask:"
+		elog
+		elog "    <net-www/apache-2.2.0"
+		elog
+	fi
+}
+
+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/net-www/apache/files/digest-apache-1.3.37 b/net-www/apache/files/digest-apache-1.3.37
index ea121fefb83a..0558f91b506a 100644
--- a/net-www/apache/files/digest-apache-1.3.37
+++ b/net-www/apache/files/digest-apache-1.3.37
@@ -1,12 +1,12 @@
-MD5 8240344a8d03a3e4158363390b2a7077 apache_1.3.37.tar.gz 38988
-RMD160 a8951bac1ca0e58da840fb1941d2094079cc1edf apache_1.3.37.tar.gz 38988
-SHA256 34cdd1d909a9d931c38a8a025c4880b4b1c91cb5098d2dc099e321d72f3800c5 apache_1.3.37.tar.gz 38988
+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 fd82f2965a6c8a79c28be1e0f322dda0 mod_ssl-2.8.28-1.3.37.tar.gz 740772
-RMD160 12b94f310431bfca79d10b1e0385de75bb1cedab mod_ssl-2.8.28-1.3.37.tar.gz 740772
-SHA256 3eab92cb013b0cc8100068297d69621735aa657cc4683994a2b7dfb6912d860f mod_ssl-2.8.28-1.3.37.tar.gz 740772
+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
diff --git a/net-www/apache/files/digest-apache-2.0.58-r2 b/net-www/apache/files/digest-apache-2.0.58-r2
index 1056791e09d4..66dad7a8187d 100644
--- a/net-www/apache/files/digest-apache-2.0.58-r2
+++ b/net-www/apache/files/digest-apache-2.0.58-r2
@@ -1,6 +1,6 @@
 MD5 37fca7f4496cb8e7304f52e9e998ce3f gentoo-apache-2.0.58-r2-20060726.tar.bz2 58758
 RMD160 46c6da577db444a6553b60d3ae30c61ae3b741fa gentoo-apache-2.0.58-r2-20060726.tar.bz2 58758
 SHA256 b8e0356e87fdd7b55fcecbee804c9a41525b3e6fe8309f87f2509abd161c8e6b gentoo-apache-2.0.58-r2-20060726.tar.bz2 58758
-MD5 6de86243748f392374fe6a96c2edd2ec httpd-2.0.58.tar.bz2 694080
-RMD160 36a5f3a42e43e775bd683daf8209038067ce95dd httpd-2.0.58.tar.bz2 694080
-SHA256 81fb04b3e56d120eae850c96aad271399b6cf3e50106e6451d6a166ca7661526 httpd-2.0.58.tar.bz2 694080
+MD5 ac732a8b3ec5760baa582888f5dbad66 httpd-2.0.58.tar.bz2 4704318
+RMD160 2ff44b2254552db908f1defd09e3142527f9bf83 httpd-2.0.58.tar.bz2 4704318
+SHA256 4f746715c408f4cac48099ea72560c50ef190568dfcfa8e0762bae66c0398029 httpd-2.0.58.tar.bz2 4704318
diff --git a/net-www/apache/files/digest-apache-2.2.4 b/net-www/apache/files/digest-apache-2.2.4
index 9f954c2e70c0..f5127e69739f 100644
--- a/net-www/apache/files/digest-apache-2.2.4
+++ b/net-www/apache/files/digest-apache-2.2.4
@@ -1,6 +1,6 @@
-MD5 876519f04b21d149c368fd4bd840e5b7 gentoo-apache-2.2.4-20070121.tar.bz2 2880
-RMD160 6347059db86785fabd6844c4a8b8c025b0191135 gentoo-apache-2.2.4-20070121.tar.bz2 2880
-SHA256 d99179ae89d5cbeed16a6f30f4105e8f39eac9baefd7dfac5221b5a4479e31c3 gentoo-apache-2.2.4-20070121.tar.bz2 2880
+MD5 067c25a353dd885b26253cda77771d98 gentoo-apache-2.2.4-20070121.tar.bz2 53108
+RMD160 180aaef9d7a174bf917d7cecac467c3a541901ce gentoo-apache-2.2.4-20070121.tar.bz2 53108
+SHA256 0cd381f4aee3795529bc27fe1926e9b20423931a26e508368b98ba38c29a6421 gentoo-apache-2.2.4-20070121.tar.bz2 53108
 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/net-www/apache/files/digest-apache-2.2.4-r2 b/net-www/apache/files/digest-apache-2.2.4-r2
new file mode 100644
index 000000000000..57bf08b2bc3a
--- /dev/null
+++ b/net-www/apache/files/digest-apache-2.2.4-r2
@@ -0,0 +1,6 @@
+MD5 ec143196757648016d1d5e2da4e0d311 gentoo-apache-2.2.4-r2-20070522.tar.bz2 62135
+RMD160 d66461ad1930b2449a06f2d26e92b3918e362a86 gentoo-apache-2.2.4-r2-20070522.tar.bz2 62135
+SHA256 6e2c2b25810ac1ac5f77841975208462a162fea70409b51df98797f1e2622dc9 gentoo-apache-2.2.4-r2-20070522.tar.bz2 62135
+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