version bumps

Package-Manager: portage-2.1.3.7

7 files changed, 535 insertions, 22 deletions

diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog
index 777f20ae47c8..21d2504c4996 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.16 2007/09/04 18:37:12 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.17 2007/09/07 21:46:27 hollow Exp $
+
+*apache-2.2.6 (07 Sep 2007)
+*apache-2.0.61 (07 Sep 2007)
+
+  07 Sep 2007; Benedikt Böhm <hollow@gentoo.org> -apache-2.0.59-r2.ebuild,
+  +apache-2.0.61.ebuild, +apache-2.2.6.ebuild:
+  version bumps
 
   04 Sep 2007; Raúl Porcel <armin76@gentoo.org> apache-2.0.59-r5.ebuild,
   apache-2.2.4-r12.ebuild:
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index 9a13747759a3..2acda219e1bf 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -1,30 +1,40 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+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-r5-20070828.tar.bz2 63913 RMD160 c0cfc72d0316b0a977296a08932bebe6a7547c7b SHA1 e7e7ae28b0427c9b61895f3356307df5d6bcc324 SHA256 fa188f4f7e26b7277a8a1858c449766bc997c1f9cf1ee2a5f9fdbfda5dabcccb
+DIST gentoo-apache-2.0.61-20070907.tar.bz2 58543 RMD160 3d40fd2e793bfedbca0410e6aa31ec7cabd404ef SHA1 060eea0df3dc6674cb35e5c873469d20c7955a21 SHA256 f981b2627edace251a12a58fb22dacd98e6beb764b092db518ee3dac0045420e
 DIST gentoo-apache-2.2.4-r12-20070819.tar.bz2 67075 RMD160 90d6c6b15abd0d4074438cabdbb9a396123021a3 SHA1 b7d1a31a4e2b664de6bd8d79e2f9c798582f01d8 SHA256 62ad3eada46acf60441facd33f1a64ed535d7b2051354708e4e6db4bbf2d5efd
+DIST gentoo-apache-2.2.6-20070907.tar.bz2 58121 RMD160 d0e5f55a8985f97fcdf646e04d92f6519f968104 SHA1 f9fd830bfb8e6c6e3cbac9d8342cc981032d20c5 SHA256 56f809f93fdcba204e6be271f195095d8ad033aa61447dab607af91d95cde8e6
 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.0.61.tar.bz2 4580339 RMD160 a2c2c90976a967112a9129b9716d880d71261882 SHA1 665017829022d287ffe3cec749e2b5b61252d7b4 SHA256 c257d3a6c120a21a637b422cf9973be2fca9bee58ae70478f5235adb5fac8899
 DIST httpd-2.2.4.tar.bz2 4930375 RMD160 bb6e8a7447fa8e8f629010f30b548068de518523 SHA1 64ceae373434a986dc99b8ed953afa0d4fad85ce SHA256 08ab82eae6418e265d361730e7eadc7d6966dffdb66ee07bd4d9af3f2b28dfc8
+DIST httpd-2.2.6.tar.bz2 4717066 RMD160 5ae895c6898213e1e3b7e7b02cdfcbe5b36a108f SHA1 e6ef926ecd1f9a412af8c266239f0a6f58c63854 SHA256 f27cd9df50a2acd9df8f37520f62f6ce51758689d425ead5883e75ff5ed6548c
 EBUILD apache-2.0.58-r2.ebuild 13842 RMD160 11b3dfbda6ed7e7cc6c98ab098f9cdc904ab662c SHA1 3942a7ccb874f04ce92bfd563c00039010d7c6eb SHA256 a74f1417f7ed037e9542c0205a4f5548e811ac212550c2f7cedd4b40a54222f9
 MD5 2a0234fd1ed3e5e45468195f74f267d1 apache-2.0.58-r2.ebuild 13842
 RMD160 11b3dfbda6ed7e7cc6c98ab098f9cdc904ab662c apache-2.0.58-r2.ebuild 13842
 SHA256 a74f1417f7ed037e9542c0205a4f5548e811ac212550c2f7cedd4b40a54222f9 apache-2.0.58-r2.ebuild 13842
-EBUILD apache-2.0.59-r2.ebuild 14093 RMD160 eee8d8679b13720e68c3ddd5dd9b3dec09960764 SHA1 ea80baf8c1b79418cc795785cb47d7f284819103 SHA256 35c4371b02d57a5fd6869695f2b0757d447fccc27c7b3783f4c7613909b806ca
-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-r5.ebuild 14138 RMD160 4cacb29f5dafbb2677f77f0e6c7ecc3c058b6f07 SHA1 3c6d5cb3b018d7dfbab77127044e1e881a1dd179 SHA256 29c7b0b866e3d1a9f39fbedf76956c8304d0c3d4d230ed8f8d00b31e25eef32c
 MD5 ee86d599b810583af894b55812cd611f apache-2.0.59-r5.ebuild 14138
 RMD160 4cacb29f5dafbb2677f77f0e6c7ecc3c058b6f07 apache-2.0.59-r5.ebuild 14138
 SHA256 29c7b0b866e3d1a9f39fbedf76956c8304d0c3d4d230ed8f8d00b31e25eef32c apache-2.0.59-r5.ebuild 14138
+EBUILD apache-2.0.61.ebuild 14088 RMD160 fe8a01870c9fcd9e430868a17d34c66da11a98c0 SHA1 303b03cdca96c85edc32d6fa0a686b04439099f0 SHA256 0512d26993651760cab77fd34bf23d97a1af44bea0e47fecbd95dafc4ed2486e
+MD5 8c115594589918ad062f8585b81bf337 apache-2.0.61.ebuild 14088
+RMD160 fe8a01870c9fcd9e430868a17d34c66da11a98c0 apache-2.0.61.ebuild 14088
+SHA256 0512d26993651760cab77fd34bf23d97a1af44bea0e47fecbd95dafc4ed2486e apache-2.0.61.ebuild 14088
 EBUILD apache-2.2.4-r12.ebuild 15118 RMD160 59d5e549974bdb836fed8dcca8eaca9e7576db99 SHA1 db764c814ce9e60744d458d442761766f8dc36de SHA256 200ff3d5169337571b844a70357773e11389a988df8f09b48ef4fd04a90c4348
 MD5 4af25013d18133b80758c6b16be12368 apache-2.2.4-r12.ebuild 15118
 RMD160 59d5e549974bdb836fed8dcca8eaca9e7576db99 apache-2.2.4-r12.ebuild 15118
 SHA256 200ff3d5169337571b844a70357773e11389a988df8f09b48ef4fd04a90c4348 apache-2.2.4-r12.ebuild 15118
-MISC ChangeLog 95728 RMD160 fb03451c3536def3daac3ac389eb0eb70af65c49 SHA1 73b2e360154f2b44f72642115b960b6e7473b3db SHA256 d3b6616b10eacab0d2bf78a20ff19009a15fd1accbc121a9f8efdb5fc5afeed5
-MD5 5d22d64d570e82ef1e23f30c7305d97c ChangeLog 95728
-RMD160 fb03451c3536def3daac3ac389eb0eb70af65c49 ChangeLog 95728
-SHA256 d3b6616b10eacab0d2bf78a20ff19009a15fd1accbc121a9f8efdb5fc5afeed5 ChangeLog 95728
+EBUILD apache-2.2.6.ebuild 15286 RMD160 102e88267b94f72c617285742e575afce79aea3e SHA1 afeb514693eb1571883c0a77b39c84f7ab58c981 SHA256 76497591f849f2ddbd2d533df6cef0fa3e0f14295a38b261d65cc6a5891a2cf3
+MD5 9805bafa3d53bd4151e0c70a40066c42 apache-2.2.6.ebuild 15286
+RMD160 102e88267b94f72c617285742e575afce79aea3e apache-2.2.6.ebuild 15286
+SHA256 76497591f849f2ddbd2d533df6cef0fa3e0f14295a38b261d65cc6a5891a2cf3 apache-2.2.6.ebuild 15286
+MISC ChangeLog 95925 RMD160 f87396f8d2fd1d8b8bb5b959248b2c64d7e7f1a5 SHA1 5f9bbf6b70e5d49f1fd0b3751d667a0b53f560f4 SHA256 7fd0272e8014e81b6ed54b37630e84a564ca4a16d53f8f027023d9cbc0aea2aa
+MD5 0930f74cd133dd60e516155b081a6123 ChangeLog 95925
+RMD160 f87396f8d2fd1d8b8bb5b959248b2c64d7e7f1a5 ChangeLog 95925
+SHA256 7fd0272e8014e81b6ed54b37630e84a564ca4a16d53f8f027023d9cbc0aea2aa ChangeLog 95925
 MISC metadata.xml 551 RMD160 1b31261c043e57cabc9bd8582f9b34c09d92d108 SHA1 68bb286a67452c3dae7525195c60b8637cca9b81 SHA256 646729a42ddffcbde3426dd6aa9a77fab923bc348c5b34c9d24083d86fbb15eb
 MD5 0f28752ee3545b3fd8e28ee656e62f4b metadata.xml 551
 RMD160 1b31261c043e57cabc9bd8582f9b34c09d92d108 metadata.xml 551
@@ -32,12 +42,22 @@ SHA256 646729a42ddffcbde3426dd6aa9a77fab923bc348c5b34c9d24083d86fbb15eb metadata
 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 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 814a758b1333fb3b30a950fdc9493a27 files/digest-apache-2.0.61 533
+RMD160 fddd1da023e5dc1d75f03129efb6cb38c674b798 files/digest-apache-2.0.61 533
+SHA256 8ad4c288c951fd89f7f251f441fb4e357e58f1d570c798be0b4cf73ae2a1c061 files/digest-apache-2.0.61 533
 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
+MD5 bf89379d611a34d10b6e0a55eee69f9b files/digest-apache-2.2.6 527
+RMD160 77f2fce54301244724ec61c4a3e0b96dc7106b33 files/digest-apache-2.2.6 527
+SHA256 69de15f758686c7f7977e0b75dd988e247162fb97fb394be4efe40997a53e308 files/digest-apache-2.2.6 527
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.6 (GNU/Linux)
+
+iD8DBQFG4ca9mPFBzbX68WERAsrQAJ97eBXLbWHE+rysEZexuqknTUSdxwCfe/V9
+ShwVByNytq6KPLn9gXUmRQ8=
+=RSVS
+-----END PGP SIGNATURE-----
diff --git a/www-servers/apache/apache-2.0.59-r2.ebuild b/www-servers/apache/apache-2.0.61.ebuild
index 897a5698cdd9..6ba06f6d502c 100644
--- a/www-servers/apache/apache-2.0.59-r2.ebuild
+++ b/www-servers/apache/apache-2.0.61.ebuild
@@ -1,13 +1,13 @@
 # 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-r2.ebuild,v 1.2 2007/07/29 17:23:43 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.0.61.ebuild,v 1.1 2007/09/07 21:46:27 hollow Exp $
 
 inherit eutils flag-o-matic gnuconfig multilib
 
 # latest gentoo apache files
 GENTOO_PATCHNAME="gentoo-apache-${PVR}"
-GENTOO_PATCHSTAMP="20061102"
-GENTOO_DEVSPACE="vericgar"
+GENTOO_PATCHSTAMP="20070907"
+GENTOO_DEVSPACE="hollow"
 GENTOO_PATCHDIR="${WORKDIR}/${GENTOO_PATCHNAME}"
 
 DESCRIPTION="The Apache Web Server"
diff --git a/www-servers/apache/apache-2.2.6.ebuild b/www-servers/apache/apache-2.2.6.ebuild
new file mode 100644
index 000000000000..5668dc0bedeb
--- /dev/null
+++ b/www-servers/apache/apache-2.2.6.ebuild
@@ -0,0 +1,480 @@
+# 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.6.ebuild,v 1.1 2007/09/07 21:46:27 hollow Exp $
+
+inherit eutils flag-o-matic gnuconfig multilib autotools
+
+# latest gentoo apache files
+GENTOO_PATCHNAME="gentoo-${PF}"
+GENTOO_PATCHSTAMP="20070907"
+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 threads; then
+		mods="${mods} cgid"
+		myconf="${myconf} --enable-cgid=${modtype}"
+	else
+		mods="${mods} cgi"
+		myconf="${myconf} --enable-cgi=${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-r2 b/www-servers/apache/files/digest-apache-2.0.59-r2
deleted file mode 100644
index 802a5aad07c6..000000000000
--- a/www-servers/apache/files/digest-apache-2.0.59-r2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 7be495c004a0d36df22c4ac4c3ef4f40 gentoo-apache-2.0.59-r2-20061102.tar.bz2 58768
-RMD160 d20d39e66e3cb52befeb697133172c8d494e2c78 gentoo-apache-2.0.59-r2-20061102.tar.bz2 58768
-SHA256 c8de97abe4077e2f6d827726a5fb0b03f6e8bd9514d8f9b9ca2a35a1c9698518 gentoo-apache-2.0.59-r2-20061102.tar.bz2 58768
-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.61 b/www-servers/apache/files/digest-apache-2.0.61
new file mode 100644
index 000000000000..e90f3b9d76ee
--- /dev/null
+++ b/www-servers/apache/files/digest-apache-2.0.61
@@ -0,0 +1,6 @@
+MD5 fc102409c88cecd17823cfd5493e1ee9 gentoo-apache-2.0.61-20070907.tar.bz2 58543
+RMD160 3d40fd2e793bfedbca0410e6aa31ec7cabd404ef gentoo-apache-2.0.61-20070907.tar.bz2 58543
+SHA256 f981b2627edace251a12a58fb22dacd98e6beb764b092db518ee3dac0045420e gentoo-apache-2.0.61-20070907.tar.bz2 58543
+MD5 7d78bbaa17adc16ce4e0303a4fb87247 httpd-2.0.61.tar.bz2 4580339
+RMD160 a2c2c90976a967112a9129b9716d880d71261882 httpd-2.0.61.tar.bz2 4580339
+SHA256 c257d3a6c120a21a637b422cf9973be2fca9bee58ae70478f5235adb5fac8899 httpd-2.0.61.tar.bz2 4580339
diff --git a/www-servers/apache/files/digest-apache-2.2.6 b/www-servers/apache/files/digest-apache-2.2.6
new file mode 100644
index 000000000000..0462cc82a6d9
--- /dev/null
+++ b/www-servers/apache/files/digest-apache-2.2.6
@@ -0,0 +1,6 @@
+MD5 e7ebbbfdb900ab1550abd5ae5753910b gentoo-apache-2.2.6-20070907.tar.bz2 58121
+RMD160 d0e5f55a8985f97fcdf646e04d92f6519f968104 gentoo-apache-2.2.6-20070907.tar.bz2 58121
+SHA256 56f809f93fdcba204e6be271f195095d8ad033aa61447dab607af91d95cde8e6 gentoo-apache-2.2.6-20070907.tar.bz2 58121
+MD5 203bea91715064f0c787f6499d33a377 httpd-2.2.6.tar.bz2 4717066
+RMD160 5ae895c6898213e1e3b7e7b02cdfcbe5b36a108f httpd-2.2.6.tar.bz2 4717066
+SHA256 f27cd9df50a2acd9df8f37520f62f6ce51758689d425ead5883e75ff5ed6548c httpd-2.2.6.tar.bz2 4717066