Add mpm-itk support to Apache 2.0.

Package-Manager: portage-2.1.1_pre2-r5

4 files changed, 478 insertions, 15 deletions

diff --git a/net-www/apache/ChangeLog b/net-www/apache/ChangeLog
index 9739edb0a44e..fcec70ce0f6d 100644
--- a/net-www/apache/ChangeLog
+++ b/net-www/apache/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-www/apache
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.485 2006/06/28 18:56:38 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.486 2006/07/08 17:03:17 chtekk Exp $
+
+*apache-2.0.58-r1 (08 Jul 2006)
+
+  08 Jul 2006; Luca Longinotti <chtekk@gentoo.org> +apache-2.0.58-r1.ebuild:
+  Update patchset and configuration to support MPM-itk, closing bug #139623.
 
   28 Jun 2006; Tobias Scherbaum <dertobi123@gentoo.org>
   apache-2.0.58.ebuild:
diff --git a/net-www/apache/Manifest b/net-www/apache/Manifest
index 8fa59feb5925..d13e9dd9b2b6 100644
--- a/net-www/apache/Manifest
+++ b/net-www/apache/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST apache_1.3.34.tar.gz 2468056 RMD160 e39dfc57b7f9164aa76641de3fa74f0314c9ec9e SHA1 df082b73f1220555dc416c0c5afa746e30a9e0de SHA256 ceed243f4f98e4323b48e5f7f80e306d1abb00c592e18de5575983db42d6f8d4
 DIST gentoo-apache-1.3.34-r10-20051213.tar.bz2 27570 RMD160 a45c59edcd7f5744f52ebced3ffb7f6b67e21a23 SHA1 9934fc84f3879e26347ed3f3fa7ff56dfd26f1c8 SHA256 111d9cdfac6782bc8720acc6b20d2a1de9c310f0d2f18228f29bf3824c74635f
 DIST gentoo-apache-1.3.34-r11-20060131.tar.bz2 27897 RMD160 bbb33be5ac758f71041fc6a1b0eb79f24a235ea3 SHA1 50c51fd4429df080c74b1c87faea6e3396cd01c1 SHA256 aad479c67c8ffe59312d107094f86d4cf76fe2e046cb98d297d8e526fc85f9a7
@@ -9,6 +6,7 @@ DIST gentoo-apache-1.3.34-r13-20060605.tar.bz2 27627 RMD160 2b95dc6413f93d6aeb10
 DIST gentoo-apache-2.0.54-r31-20050918-02.tar.bz2 52990 RMD160 bc85ac9de56e017c035d798d9aa45cabab265006 SHA1 7ec8eb508404f572ad581446b12cf189c9e1c38c SHA256 23f2431f6285a24959a99ab9d55d52cef349e828bcb0e7bea026bbae14695ce5
 DIST gentoo-apache-2.0.55-r1-20060115.tar.bz2 51735 RMD160 18902966bdce2cbe67ba15b6eb66e311657a8d6d SHA1 2d0a84e20b575177dde67e0c644b82de5db60f33 SHA256 712fb5e292e87bdad0de984085837b5bb974ab57447e5e28356d0041cbb404e3
 DIST gentoo-apache-2.0.58-20060515.tar.bz2 51174 RMD160 e029caa8107e37b66999935d6c1e9ed2e95351f0 SHA1 c88f42534f7419517905679f028be8b5754af962 SHA256 3d11702d3fd6b5c143b1c238e9b4a0d4bed2b3c4b9834efa6a3436cca492c0e5
+DIST gentoo-apache-2.0.58-r1-20060708.tar.bz2 58287 RMD160 ca1c78c12c9956ce6b974bd2f491bf622a9a555d SHA1 9712ecedb4c6055e367b72b7648d47f48d491463 SHA256 5ff82023081b8f6ec9f8115cd6da8209f0a523c11453c723d7303fcfabba3f57
 DIST gentoo-apache-2.2.0-r1-20060227.tar.bz2 27114 RMD160 f51361add210ec0e3737c77c3b81e6b8657e3acb SHA1 cdcf4e276030ee7922b2293d867b3c4b75be9634 SHA256 89096d554838016e282b1374ea02719389f0b04a9b92bbded5cd2e5f5bcc816f
 DIST gentoo-apache-2.2.0-r2-20060306.tar.bz2 48730 RMD160 adee915809097479cd0ed03012194351b7218732 SHA1 50ca64fba157a0490be537a1993ae9fe1077e10d SHA256 c6e054757a04d6d81b16e32caa2e88f9e9a61a68c560aa83654624b7c2fce068
 DIST gentoo-apache-2.2.2-20060606.tar.bz2 51183 RMD160 23b975aa7b24b8eb8f929b4e22af51057270b6ea SHA1 e29bdd31ac6e545784eaf82ddd81be3eaa2b94bd SHA256 75cc1b48361c5024faa2499f78fb5427d75010f4cc7f712b875c36bd8633e44e
@@ -43,6 +41,10 @@ EBUILD apache-2.0.55-r1.ebuild 13452 RMD160 2fa50978daa576cc8addfd2b60b1afdba879
 MD5 3c5d2b5cf8f50612a9681b4a056e871e apache-2.0.55-r1.ebuild 13452
 RMD160 2fa50978daa576cc8addfd2b60b1afdba8797c9f apache-2.0.55-r1.ebuild 13452
 SHA256 fd56390d3246d98cabafd9e4453f3917abdc3aa989b5f78ce5824d676d23bc4e apache-2.0.55-r1.ebuild 13452
+EBUILD apache-2.0.58-r1.ebuild 13835 RMD160 59716b78c6fd473ecc8266b6b88bfd36c225963f SHA1 435dc6d4b69db2b4455d4afa447adb8c6700d5d0 SHA256 93f0ecba33da07043301a09c32b58d84f17281cffe63fbe4cb66980beee181ff
+MD5 e9e20a9e12018c4b53504ea96bbcf2cc apache-2.0.58-r1.ebuild 13835
+RMD160 59716b78c6fd473ecc8266b6b88bfd36c225963f apache-2.0.58-r1.ebuild 13835
+SHA256 93f0ecba33da07043301a09c32b58d84f17281cffe63fbe4cb66980beee181ff apache-2.0.58-r1.ebuild 13835
 EBUILD apache-2.0.58.ebuild 13746 RMD160 f0d598bbde14c00332c53bd893eb7dac1993887b SHA1 2ceb7b7288ba649fb51deabd2b2fc0ee6d920a0c SHA256 31ebbb215ce07e40c7eb28620fd3104b80f778e0afae9faf3d6712d48f3bc3b6
 MD5 560b4ced9e9a283450e074ec358e13f5 apache-2.0.58.ebuild 13746
 RMD160 f0d598bbde14c00332c53bd893eb7dac1993887b apache-2.0.58.ebuild 13746
@@ -59,10 +61,10 @@ EBUILD apache-2.2.2.ebuild 14005 RMD160 37d65c90e42c330236355964e35a8ab92796b304
 MD5 86c4eb151620c92dbbb1d9b71e619f86 apache-2.2.2.ebuild 14005
 RMD160 37d65c90e42c330236355964e35a8ab92796b304 apache-2.2.2.ebuild 14005
 SHA256 712e68dded3982ba5fbf91f75ca10e74bee9cddec0d18f2a5f2f1e3b2a96a1d2 apache-2.2.2.ebuild 14005
-MISC ChangeLog 82576 RMD160 2b3f75140be6dd5bef4bcf4c33ce463d4925b4c3 SHA1 1a505d31dce9acff2ee91adfe97f4ea9422f7ccb SHA256 dece8edb0541e4f21b9cfab24b5c00a825d55037fbf7b1d03914e505815b27ac
-MD5 d0ac69b7e6f08d09c10d432b877ee841 ChangeLog 82576
-RMD160 2b3f75140be6dd5bef4bcf4c33ce463d4925b4c3 ChangeLog 82576
-SHA256 dece8edb0541e4f21b9cfab24b5c00a825d55037fbf7b1d03914e505815b27ac ChangeLog 82576
+MISC ChangeLog 82760 RMD160 31d07208be5456d947ed146a428152085d66fae0 SHA1 a334d50963c6cb804e61b094e40c48a4f11a9888 SHA256 0475213d1858cc98bb779019f65842308007f53c2e565573a86d1c8600f312b5
+MD5 83facaf8ef38a1633acacc3630cf237f ChangeLog 82760
+RMD160 31d07208be5456d947ed146a428152085d66fae0 ChangeLog 82760
+SHA256 0475213d1858cc98bb779019f65842308007f53c2e565573a86d1c8600f312b5 ChangeLog 82760
 MISC metadata.xml 566 RMD160 8aad2cbb313fa91b77c6f4891f8d3483d1460adc SHA1 cfaab8d65125c65cb5c66c37dd200f7b3586baf9 SHA256 9826f38d29b803e954faa6fafffc4d6f197bfcb0e14cc76af891c41081d948e2
 MD5 27c9cb37c510e08bb69df277229a03ea metadata.xml 566
 RMD160 8aad2cbb313fa91b77c6f4891f8d3483d1460adc metadata.xml 566
@@ -88,6 +90,9 @@ SHA256 3223af521a47cf5070058b5de2786c9728b3e73edcf66788063d9939c8611c5a files/di
 MD5 94120ca6b923f693aef55ff4e4447af3 files/digest-apache-2.0.58 533
 RMD160 f6edd42fab09e51d82ed4c7b3c774e0d5ededece files/digest-apache-2.0.58 533
 SHA256 8c8a5e62f68298c10276419f3a8f791a600110fa2f0645495aa47eaa609a84a8 files/digest-apache-2.0.58 533
+MD5 33c105b83125d1910609c5bd5b42742d files/digest-apache-2.0.58-r1 542
+RMD160 86cabf99a94890890414e617b560c99bc9c40f93 files/digest-apache-2.0.58-r1 542
+SHA256 128c1151005d385c0370c6e922b34af0f5abe0d81d0f226c90210484ce5109ee files/digest-apache-2.0.58-r1 542
 MD5 658a784ac412b6489bad9d6522ad214c files/digest-apache-2.2.0-r1 536
 RMD160 250f73fa520dacab1f72303a2b78297311793c9b files/digest-apache-2.2.0-r1 536
 SHA256 33e99840918bb5d10d5d4ecf2368b3246cd91a640e0c9a094256e4025ca0425b files/digest-apache-2.2.0-r1 536
@@ -97,10 +102,3 @@ SHA256 da35bf941e330235aa37b4fffe5d32cb6c006f12f754ac7ee7955e171f51b6e3 files/di
 MD5 acbe49d5cc1970e0ccb40c0ce74307e1 files/digest-apache-2.2.2 527
 RMD160 8fb87b136255e5ca6d1c9d4b5ee410efd97a8dbb files/digest-apache-2.2.2 527
 SHA256 0b557e84751b1903abe7da1eb561cba43a0c471c2fe07304b22e6e3c31f0df78 files/digest-apache-2.2.2 527
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
-
-iD8DBQFEqC1gamhnQswr0vIRAsNjAJsGifLemPNBLPlOk0EfsSJjR7pxrACcC7wz
-UE2j2T5DRmYdecYF6KZkc1E=
-=dieI
------END PGP SIGNATURE-----
diff --git a/net-www/apache/apache-2.0.58-r1.ebuild b/net-www/apache/apache-2.0.58-r1.ebuild
new file mode 100644
index 000000000000..2eb7d500029e
--- /dev/null
+++ b/net-www/apache/apache-2.0.58-r1.ebuild
@@ -0,0 +1,454 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.58-r1.ebuild,v 1.1 2006/07/08 17:03:17 chtekk Exp $
+
+inherit eutils flag-o-matic gnuconfig multilib
+
+# latest gentoo apache files
+GENTOO_PATCHNAME="gentoo-apache-${PVR}"
+GENTOO_PATCHSTAMP="20060708"
+GENTOO_DEVSPACE="chtekk"
+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 no-suexec ssl static-modules threads selinux"
+
+RDEPEND="dev-lang/perl
+	~dev-libs/apr-0.9.12
+	~dev-libs/apr-util-0.9.12
+	dev-libs/expat
+	app-misc/mime-types
+	sys-libs/zlib
+	mpm-itk? ( sys-libs/libcap )
+	ssl? ( dev-libs/openssl )
+	selinux? ( sec-policy/selinux-apache )
+	!mips? ( ldap? ( =net-nds/openldap-2* ) )"
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.59-r4"
+
+S="${WORKDIR}/httpd-${PV}"
+
+big_fat_warnings() {
+
+	if use ldap && ! built_with_use 'dev-libs/apr-util' ldap; then
+		eerror "dev-libs/apr-util is missing LDAP support. For apache to have"
+		eerror "ldap support, apr-util must be built with the ldap USE-flag"
+		eerror "enabled."
+		die "ldap USE-flag enabled while not supported in apr-util"
+	fi
+
+	if use mpm-peruser || use mpm-itk; then
+		ewarn "-BIG- -FAT- -WARNING-"
+		ewarn
+		ewarn "The peruser (USE=mpm-peruser) and itk (USE=mpm-itk) MPMs are considered"
+		ewarn "highly experimental and are not (yet) supported, nor are they recommended"
+		ewarn "for production use. You have been warned!"
+		ewarn
+		ewarn "Continuing in 5 seconds ..."
+		sleep 5
+	fi
+
+}
+
+pkg_setup() {
+	big_fat_warnings
+	select_mpms
+}
+
+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-9]* || die "internal ebuild error"
+
+	# 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
+
+	if useq no-suexec; then
+		myconf="${myconf} --disable-suexec"
+	else
+		myconf="${myconf}
+				--with-suexec-safepath="/usr/local/bin:/usr/bin:/bin" \
+				--with-suexec-logfile=/var/log/apache2/suexec_log \
+				--with-suexec-bin=/usr/sbin/suexec2 \
+				--with-suexec-userdir=${USERDIR} \
+				--with-suexec-caller=apache \
+				--with-suexec-docroot=/var/www \
+				--with-suexec-uidmin=1000 \
+				--with-suexec-gidmin=100 \
+				--with-suexec-umask=077 \
+				--enable-suexec=shared"
+	fi
+
+	# common confopts
+	myconf="${myconf} \
+			--with-apr=/usr \
+			--with-apr-util=/usr \
+			--cache-file=${S}/config.cache \
+			--with-perl=/usr/bin/perl \
+			--with-expat=/usr \
+			--with-z=/usr \
+			--with-port=80 \
+			--enable-layout=Gentoo \
+			--with-program-name=apache2 \
+			--with-devrandom=/dev/urandom \
+			--host=${CHOST} ${MY_BUILTINS}"
+
+	# debugging support
+	if useq debug ; then
+		myconf="${myconf} --enable-maintainer-mode"
+	fi
+
+	./configure --with-mpm=${mpm} ${myconf} || die "bad ./configure please submit bug report to bugs.gentoo.org. Include your config.layout and config.log"
+
+	# we don't want to try and recompile the ssl_expr_parse.c file, because
+	# the lex source is broken
+	touch modules/ssl/ssl_expr_scan.c
+
+	# as decided on IRC-AGENDA-10.2004, we use httpd.conf as standard config file name
+	sed -i -e 's:apache2\.conf:httpd.conf:' include/ap_config_auto.h
+
+	emake || die "problem compiling apache2"
+
+	# build ssl version of apache bench (ab-ssl)
+	if useq ssl; then
+		cd support
+		rm -f ab .libs/ab ab.lo ab.o
+		make ab CFLAGS="${CFLAGS} -DUSE_SSL -lcrypto -lssl -I/usr/include/openssl -L/usr/$(get_libdir)" || die
+		mv ab ab-ssl
+		rm -f ab.lo ab.o
+		make ab || die
+	fi
+}
+
+pkg_preinst() {
+	# setup apache user and group
+	enewgroup apache 81
+	enewuser apache 81 -1 /var/www apache
+}
+
+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() {
+	# setup apache user and group
+	# we do this twice for binary packages
+	enewgroup apache 81
+	enewuser apache 81 -1 /var/www apache
+
+	# Automatically generate test ceritificates if ssl USE flag is being set
+	if useq ssl -a !-e ${ROOT}/etc/apache2/ssl/server.crt; then
+		cd ${ROOT}/etc/apache2/ssl
+		einfo
+		einfo "Generating self-signed test certificate in /etc/apache2/ssl..."
+		yes "" 2>/dev/null | \
+			${ROOT}/usr/sbin/gentestcrt.sh >/dev/null 2>&1 || \
+			die "gentestcrt.sh failed"
+		einfo
+	fi
+
+	# we do this here because the default webroot is a copy of the files
+	# that exist elsewhere and we don't want them managed/removed by portage
+	# when apache is upgraded.
+	if [ -e "${ROOT}/var/www/localhost" ]; then
+		einfo "The default webroot has not been installed into"
+		einfo "${ROOT}/var/www/localhost because the directory already exists"
+		einfo "and we do not want to overwrite any files you have put there."
+		einfo
+		einfo "If you would like to install the latest webroot, please run"
+		einfo "emerge --config =${PF}"
+	else
+		einfo "Installing default webroot to ${ROOT}/var/www/localhost"
+		mkdir -p ${ROOT}/var/www/localhost
+		cp -r ${ROOT}/usr/share/doc/${PF}/webroot/* ${ROOT}/var/www/localhost
+		chown -R apache: ${ROOT}/var/www/localhost
+	fi
+
+	# Check for dual/upgrade install
+	if has_version '=net-www/apache-1*' || ! use apache2 ; then
+		ewarn
+		ewarn "Please add the 'apache2' flag to your USE variable and (re)install"
+		ewarn "any additional DSO modules you may wish to use with Apache-2.x."
+		ewarn "Addon modules are configured in /etc/apache2/modules.d/"
+		ewarn
+	fi
+
+	# Check for obsolete symlinks
+	local list=""
+	for i in lib logs modules extramodules; do
+		local d="/etc/apache2/${i}"
+		[ -s "${d}" ] && list="${list} ${d}"
+	done
+	[ -n "${list}" ] && einfo "You should delete these old symlinks: ${list}"
+
+	if has_version '<net-www/apache-2.0.54-r30' && has_version '>=net-www/apache-2.0.0' ; then
+		einfo "Configuration locations have changed, you will need to migrate"
+		einfo "your configuration from /etc/apache2/conf/apache2.conf and"
+		einfo "/etc/apache2/conf/commonapache2.conf to /etc/apache2/httpd.conf."
+		einfo
+		einfo "Apache now checks for the old configuration and refuses to start"
+		einfo "if it exists. You must remove the old configuration first"
+		einfo
+		einfo "You should also at this time rebuild all your modules"
+		einfo
+		einfo "For more information, see"
+		einfo "    http://www.gentoo.org/doc/en/apache-upgrading.xml"
+		einfo
+	fi
+
+	big_fat_warnings
+}
+
+pkg_config() {
+
+	einfo "Installing default webroot to ${ROOT}/var/www/localhost"
+	mkdir -p ${ROOT}/var/www/localhost
+	cp -r ${ROOT}/usr/share/doc/${PF}/webroot/* ${ROOT}/var/www/localhost
+	chown -R apache: ${ROOT}/var/www/localhost
+
+}
+
+mpm_die() {
+	eerror "You attempted to specify the MPM $1, but MPM $2 was already specified."
+	eerror "The apache ebuilds no longer support multiple MPM installations.  Please choose"
+	eerror "one MPM and reinstall."
+	die "More than one MPM was specified."
+}
+
+select_mpms() {
+
+	mpm=""
+
+	for trympm in prefork worker peruser threadpool leader itk; do
+		if useq mpm-${trympm}; then
+			if [ "x${mpm}" = "x" ]; then
+				mpm=${trympm}
+			else
+				mpm_die ${trympm} ${mpm}
+			fi
+		fi
+	done
+
+	if [ "x${mpm}" = "x" ]; then
+		if useq threads; then
+			einfo "Threads specified without a mpm-specification, using mpm-worker."
+			mpm="worker"
+		else
+			einfo "No MPM style was specified, defaulting to mpm-prefork."
+			mpm="prefork"
+		fi
+	fi
+
+}
+
+parse_modules_config() {
+	local name=""
+	local disable=""
+	[ -f ${1} ] || return 1
+
+	for i in `cat $1 | sed "s/^#.*//"`; do
+		if [ $i == "-" ]; then
+			disable="true"
+		elif [ -z "$name" ] && [ ! -z "`echo $i | grep "mod_"`" ]; then
+			name=`echo $i | sed "s/mod_//"`
+		elif [ "$disable" ] && ( [ $i == "static" ] || [ $i == "shared" ] ); then
+			MY_BUILTINS="${MY_BUILTINS} --disable-$name"
+			name="" ; disable=""
+		elif [ $i == "static" ] || useq static-modules; then
+			MY_BUILTINS="${MY_BUILTINS} --enable-$name=yes"
+			name="" ; disable=""
+		elif [ $i == "shared" ]; then
+			MY_BUILTINS="${MY_BUILTINS} --enable-$name=shared"
+			name="" ; disable=""
+		fi
+	done
+
+	einfo "${1} options:\n${MY_BUILTINS}"
+}
+
+select_modules_config() {
+	parse_modules_config /etc/apache2/apache2-builtin-mods || \
+	parse_modules_config ${GENTOO_PATCHDIR}/conf/apache2-builtin-mods || \
+	return 1
+}
+
+# vim:ts=4
diff --git a/net-www/apache/files/digest-apache-2.0.58-r1 b/net-www/apache/files/digest-apache-2.0.58-r1
new file mode 100644
index 000000000000..1e53c6169f77
--- /dev/null
+++ b/net-www/apache/files/digest-apache-2.0.58-r1
@@ -0,0 +1,6 @@
+MD5 0fc23e7eba19c5f2d06820e4ee4593e8 gentoo-apache-2.0.58-r1-20060708.tar.bz2 58287
+RMD160 ca1c78c12c9956ce6b974bd2f491bf622a9a555d gentoo-apache-2.0.58-r1-20060708.tar.bz2 58287
+SHA256 5ff82023081b8f6ec9f8115cd6da8209f0a523c11453c723d7303fcfabba3f57 gentoo-apache-2.0.58-r1-20060708.tar.bz2 58287
+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