Moving net-www/apache to www-servers/apache (#78622).

Package-Manager: portage-2.1.3_rc9

17 files changed, 5826 insertions, 0 deletions

diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog
new file mode 100644
index 000000000000..20594d567e2a
--- /dev/null
+++ b/www-servers/apache/ChangeLog
@@ -0,0 +1,2448 @@
+# ChangeLog for net-www/apache
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.1 2007/07/29 16:32:00 phreak Exp $
+
+*apache-2.2.4-r6 (29 Jul 2007)
+
+  29 Jul 2007; Christian Heim <phreak@gentoo.org> +metadata.xml,
+  +apache-2.0.58-r2.ebuild, +apache-2.0.59-r2.ebuild,
+  +apache-2.2.4-r6.ebuild, +apache-2.2.4-r7.ebuild, +apache-2.2.4-r8.ebuild,
+  +apache-2.2.4-r9.ebuild, +apache-2.2.4-r10.ebuild:
+  Moving net-www/apache to www-servers/apache (#78622).
+
+*apache-2.2.4-r10 (12 Jul 2007)
+
+  12 Jul 2007; Christian Heim <phreak@gentoo.org> +apache-2.2.4-r10.ebuild:
+  Yet another revision bump, pulling back in the DEFAULT_VHOST changes. Also
+  updating the postinst user notification.
+
+*apache-2.2.4-r9 (10 Jul 2007)
+
+  10 Jul 2007; Christian Heim <phreak@gentoo.org> +apache-2.2.4-r9.ebuild:
+  Revision bump to force the removal of *.conf~ files in
+  /etc/apache2/modules.d, which seem to have slipped in with the -r7
+  patchtarball.
+
+*apache-2.2.4-r8 (08 Jul 2007)
+
+  08 Jul 2007; Christian Heim <phreak@gentoo.org> +apache-2.2.4-r8.ebuild:
+  Fixing SUEXEC_SAFEPATH (erroneous quotes for SUEXEC SAFEPATH - #182451,
+  thanks to Martin von Gagern <Martin.vGagern at gmx.net>). Making
+  SUEXEC_SAFEPATH configureable too.
+
+*apache-2.2.4-r7 (15 Jun 2007)
+
+  15 Jun 2007; Benedikt Böhm <hollow@gentoo.org> +apache-2.2.4-r7.ebuild:
+  fix #178966
+
+  13 Jun 2007; Luca Longinotti <chtekk@gentoo.org>
+  -apache-1.3.34-r14.ebuild, -apache-1.3.37.ebuild:
+  Remove Apache1.
+
+  05 Jun 2007; Markus Ullmann <jokey@gentoo.org> -apache-2.2.4-r5.ebuild
+  +apache-2.2.4-r6.ebuild:
+  Fix from jakub on IRC
+
+*apache-2.2.4-r5 (05 Jun 2007)
+
+  05 Jun 2007; Christian Heim <phreak@gentoo.org> -apache-2.2.4-r4.ebuild,
+  +apache-2.2.4-r5.ebuild:
+  Yet another revision bump, removing the previously installed original apache
+  configs (install-conf), some config changes (Yet again, yes), adding a patch
+  to fix the case where indexing would be *veery* slow (bug 139451 - thanks to
+  Joshua Pettett <bugs.gentoo.devel at homelinkcs.com>); adding support for
+  /etc/init.d/apache2 modules showing a list of present (as in loaded and
+  compiled-in) modules.
+
+  02 Jun 2007; Luca Longinotti <chtekk@gentoo.org> apache-2.2.4-r4.ebuild:
+  Expand elog message for upgrades.
+
+  02 Jun 2007; Christian Heim <phreak@gentoo.org> apache-2.2.4-r4.ebuild:
+  Adding the missing mods="${mods} suexec" declaration to the ebuild, fixing
+  #180544 (thanks to Lada Durchanek).
+
+  02 Jun 2007; Christian Heim <phreak@gentoo.org> apache-2.2.4-r4.ebuild:
+  Adding a blocker, due to apxs.8 previously belonging to apache-tools, which
+  needs to be in apache now.
+
+*apache-2.2.4-r4 (27 May 2007)
+
+  27 May 2007; Christian Heim <phreak@gentoo.org> -apache-2.2.4-r3.ebuild,
+  +apache-2.2.4-r4.ebuild:
+  Fixing the installation of apxs(2), reported in bug #177697 and bug #180006.
+  I'm really sorry for this, I kinda forgot to add apxs to the PROGRAMS
+  definition in support/Makefile.in when rewriting it.
+
+  26 May 2007; Christian Heim <phreak@gentoo.org> apache-2.2.4-r3.ebuild:
+  Restrict to primaryuri for now, as the patchtarball on the mirrors is broken.
+
+*apache-2.2.4-r3 (26 May 2007)
+
+  26 May 2007; Christian Heim <phreak@gentoo.org> -apache-2.2.4-r2.ebuild,
+  +apache-2.2.4-r3.ebuild:
+  Updated ebuild, including an updated patch tarball. Fixing bug #110556, bug
+  #178457, bug #179445, bug #179522.
+
+  23 May 2007; Luca Longinotti <chtekk@gentoo.org> -apache-2.2.4.ebuild,
+  -apache-2.2.4-r1.ebuild, apache-2.2.4-r2.ebuild:
+  Cleanup outdated ebuilds. Readd libcap dep for mpm-itk on 2.2.
+
+*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
+
+  18 May 2007; Christian Heim <phreak@gentoo.org> apache-2.2.4-r1.ebuild:
+  Fix the chmod's for suexec, as chmod can't be used on symlinks (triggers a
+  sandbox violation).
+
+  18 May 2007; Christian Heim <phreak@gentoo.org> apache-2.2.4-r1.ebuild:
+  Updated patchtarball, including updated peruser and itk patches.
+
+  18 May 2007; Christian Heim <phreak@gentoo.org> apache-2.2.4-r1.ebuild:
+  Explicitly mention USERDIR in pkg_postinst since users keep overlooking it.
+
+  18 May 2007; Christian Heim <phreak@gentoo.org> apache-2.2.4-r1.ebuild:
+  Renaming /usr/sbin/suexec to /usr/sbin/suexec2 in src_install (#178295 -
+  thanks to Rajiv Aaron Managlani <rajiv at gentoo.org>).
+
+  18 May 2007; Christian Heim <phreak@gentoo.org> apache-2.2.4-r1.ebuild:
+  Adding mpm-itk back.
+
+*apache-2.2.4-r1 (09 May 2007)
+
+  09 May 2007; Bryan Østergaard <kloeri@gentoo.org>
+  +apache-2.2.4-r1.ebuild:
+  Throw in some symlinks to solve bug 177697.
+
+  07 May 2007; Bryan Østergaard <kloeri@gentoo.org> apache-2.2.4.ebuild:
+  Fix SLOT.
+
+  07 May 2007; Christian Heim <phreak@gentoo.org> apache-2.2.4.ebuild:
+  Importing Luca's and my work from the overlay, apache-2.2.4 should now be
+  ready and should be fixing all those open bugreports.
+
+  21 Apr 2007; Christian Heim <phreak@gentoo.org> apache-1.3.34-r14.ebuild,
+  apache-1.3.37.ebuild:
+  Stop using insinto /etc/conf.d and use the newconfd function instead, #174266.
+
+  09 Apr 2007; Christian Heim <phreak@gentoo.org> apache-2.0.59-r2.ebuild:
+  Fixing the built_with_use for apache-2.0.59, since apache-2.0 only supports
+  apr-0* for now. Thanks to Marijn for the bugreport and Jakub for the diff.
+  Fixing #173750.
+
+  31 Jan 2007; Luca Longinotti <chtekk@gentoo.org> -apache-2.2.3-r2.ebuild:
+  Remove old 2.2 version.
+
+  28 Jan 2007; Luca Longinotti <chtekk@gentoo.org> apache-2.0.58-r2.ebuild,
+  apache-2.0.59-r2.ebuild, apache-2.2.3-r2.ebuild, apache-2.2.4.ebuild:
+  Fix apr deps.
+
+*apache-2.2.4 (21 Jan 2007)
+
+  21 Jan 2007; Christian Heim <phreak@gentoo.org> +apache-2.2.4.ebuild:
+  Version bump (thanks to Dean Baender <dcb at baender.com> and Kalin
+  Kozhuharov <kalin at ThinRope.net> in #114232).
+
+  20 Jan 2007; Christian Heim <phreak@gentoo.org> apache-2.2.3-r2.ebuild:
+  Fixing a small typo in =net-www/apache-2.2.3-r2.
+
+  18 Jan 2007; Luca Longinotti <chtekk@gentoo.org> apache-2.2.3-r2.ebuild:
+  Fix quoting, fix ldap dep, use econf correctly, thanks to phreak.
+
+*apache-2.2.3-r2 (15 Jan 2007)
+
+  15 Jan 2007; Luca Longinotti <chtekk@gentoo.org> metadata.xml,
+  -apache-2.2.3.ebuild, -apache-2.2.3-r1.ebuild, +apache-2.2.3-r2.ebuild:
+  Fix bug #161700, remove srvdir USE flag, misc cleanup.
+
+  11 Jan 2007; Christian Heim <phreak@gentoo.org> apache-1.3.34-r14.ebuild,
+  apache-1.3.37.ebuild, apache-2.0.58-r2.ebuild, apache-2.0.59-r2.ebuild,
+  apache-2.2.3.ebuild, apache-2.2.3-r1.ebuild:
+  Adding EXTRA_ECONF to the ./configure usage (fixes #125798 - thanks to samLT
+  <samuelethiec at hotmail.com>).
+
+  09 Jan 2007; Bryan Østergaard <kloeri@gentoo.org>
+  -apache-1.3.34-r10.ebuild, -apache-1.3.34-r11.ebuild,
+  -apache-2.0.54-r31.ebuild, -apache-2.0.58.ebuild, -apache-2.0.59.ebuild,
+  -apache-2.2.2-r1.ebuild:
+  Clean out old versions.
+
+  08 Jan 2007; Christian Heim <phreak@gentoo.org> apache-2.2.2-r1.ebuild,
+  apache-2.2.3.ebuild, apache-2.2.3-r1.ebuild:
+  Fixing IUSE (#161029) and WANT_AUTOCONF (#161027) for apache-2.2.
+
+*apache-2.2.3-r1 (27 Nov 2006)
+
+  27 Nov 2006; Michael Stewart <vericgar@gentoo.org>
+  +apache-2.2.3-r1.ebuild:
+  This should now be feature complete: Completed init script, linked
+  apache2ctl to init script, added example virtual host configurations, added
+  USE=srvdir support
+
+*apache-2.0.59-r2 (02 Nov 2006)
+
+  02 Nov 2006; Michael Stewart <vericgar@gentoo.org>
+  -apache-2.0.59-r1.ebuild, +apache-2.0.59-r2.ebuild:
+  Fix the init script so that is works with older versions of baselayout.
+  Removed 2.0.59-r1 because it needed a newer baselayout and it's environment
+  handling was buggy.
+
+  01 Nov 2006; Michael Stewart <vericgar@gentoo.org>
+  apache-2.0.59-r1.ebuild:
+  New tarball that fixes a typo with environment handling in the init script.
+
+*apache-2.0.59-r1 (15 Oct 2006)
+
+  15 Oct 2006; Michael Stewart <vericgar@gentoo.org>
+  +apache-2.0.59-r1.ebuild:
+  Updated init script to use start-stop-daemon so that apache stops correctly
+  instead of just exiting after the signal is sent
+
+  20 Sep 2006; Michael Stewart <vericgar@gentoo.org>
+  apache-1.3.34-r10.ebuild, apache-1.3.34-r11.ebuild,
+  apache-1.3.34-r14.ebuild, apache-1.3.37.ebuild, apache-2.0.54-r31.ebuild,
+  apache-2.0.58.ebuild, apache-2.0.58-r2.ebuild, apache-2.0.59.ebuild:
+  Remove no-suexec USE-flag from 1.3 and 2.0 as it's broken and requires
+  modification to configuration to get it working. Fixes bug 148082.
+
+  10 Sep 2006; Javier Villavicencio <the_paya@gentoo.org>
+  apache-2.2.3.ebuild:
+  Add ~x86-fbsd keyword.
+
+  08 Sep 2006; Bryan Østergaard <kloeri@gentoo.org>
+  apache-1.3.34-r14.ebuild, apache-2.0.58-r2.ebuild:
+  Stable on ia64.
+
+  05 Sep 2006; Joshua Kinard <kumba@gentoo.org> apache-2.0.58-r2.ebuild:
+  Marked stable on mips.
+
+  02 Sep 2006; Michael Stewart <vericgar@gentoo.org> apache-1.3.37.ebuild:
+  Remove dependency on db-1.85 for ndbm because apache doesn't detect db
+  correctly on amd64. This leave gdbm as the sole provider for ndbm on apache.
+  See bug 145931
+
+  16 Aug 2006; Michael Stewart <vericgar@gentoo.org>
+  -apache-1.3.34-r12.ebuild, -apache-1.3.34-r13.ebuild,
+  -apache-2.0.55-r1.ebuild, -apache-2.0.58-r1.ebuild,
+  -apache-2.2.0-r1.ebuild, -apache-2.2.0-r2.ebuild, -apache-2.2.2.ebuild:
+  Remove old versions
+
+  02 Aug 2006; Michael Stewart <vericgar@gentoo.org> apache-2.2.3.ebuild:
+  Actually create /var/www/localhost before trying to put stuff in it. Thanks
+  to Conrad Kostecki for the report
+
+*apache-2.2.3 (30 Jul 2006)
+
+  30 Jul 2006; Michael Stewart <vericgar@gentoo.org> +apache-2.2.3.ebuild:
+  Version Bump
+
+*apache-2.0.59 (30 Jul 2006)
+
+  30 Jul 2006; Michael Stewart <vericgar@gentoo.org> +apache-2.0.59.ebuild:
+  Version Bump
+
+  29 Jul 2006; Bryan Østergaard <kloeri@gentoo.org>
+  apache-1.3.34-r14.ebuild, apache-2.0.58-r2.ebuild:
+  Stable on alpha.
+
+*apache-1.3.37 (29 Jul 2006)
+
+  29 Jul 2006; Bryan Østergaard <kloeri@gentoo.org> +apache-1.3.37.ebuild:
+  Bump version, bug 141986.
+
+*apache-2.2.2-r1 (26 Jul 2006)
+*apache-2.0.58-r2 (26 Jul 2006)
+*apache-1.3.34-r14 (26 Jul 2006)
+
+  26 Jul 2006; Michael Stewart <vericgar@gentoo.org>
+  +apache-1.3.34-r14.ebuild, +apache-2.0.58-r2.ebuild,
+  +apache-2.2.2-r1.ebuild:
+  New revisions to address CVE-2006-3747. Fixes bug 141986
+
+  21 Jul 2006; Michael Stewart <vericgar@gentoo.org>
+  apache-1.3.34-r10.ebuild, apache-1.3.34-r11.ebuild,
+  apache-1.3.34-r12.ebuild, apache-1.3.34-r13.ebuild,
+  apache-2.0.54-r31.ebuild, apache-2.0.55-r1.ebuild, apache-2.0.58.ebuild,
+  apache-2.0.58-r1.ebuild, apache-2.2.0-r1.ebuild, apache-2.2.0-r2.ebuild,
+  apache-2.2.2.ebuild:
+  Moved enewuser/enewgroup to pkg_setup so that src_install has the user and
+  group setup
+
+*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:
+  ppc stable, #138011
+
+  28 Jun 2006; Joshua Jackson <tsunam@gentoo.org> apache-2.0.58.ebuild:
+  Stable x86; bug #138011
+
+  27 Jun 2006; Marcus D. Hanwell <cryos@gentoo.org> apache-2.0.58.ebuild:
+  Marked stable on amd64, bug 138011.
+
+  27 Jun 2006; Guy Martin <gmsoft@gentoo.org> apache-2.0.58.ebuild:
+  Stable on hppa.
+
+  26 Jun 2006; Markus Rothe <corsair@gentoo.org> apache-2.0.58.ebuild:
+  Stable on ppc64; bug #138011
+
+  26 Jun 2006; Gustavo Zacarias <gustavoz@gentoo.org> apache-2.0.58.ebuild:
+  Stable on sparc wrt #138011
+
+*apache-2.2.2 (07 Jun 2006)
+
+  07 Jun 2006; Michael Stewart <vericgar@gentoo.org> +apache-2.2.2.ebuild:
+  Version Bump. Includes now complete suexec-config utility. Also now uses the
+  already installed libpcre rather then the bundled one. Refer to bug 114232.
+  Fixes bugs 124599, 133036, 133191.
+
+  06 Jun 2006; Michael Stewart <vericgar@gentoo.org> apache-2.2.0-r2.ebuild:
+  Remove as-needed filtering
+
+*apache-1.3.34-r13 (05 Jun 2006)
+
+  05 Jun 2006; Benedikt Böhm <hollow@gentoo.org> +apache-1.3.34-r13.ebuild:
+  fix #112919 and #106455
+
+  05 Jun 2006; Michael Stewart <vericgar@gentoo.org>
+  -files/apache-2.0.48-export.diff, -files/apache-2.0.48-gentoo.diff,
+  -files/httpd-2.0.48-ipv6.patch, -files/httpd-2.0.49-cgi.patch,
+  -files/apache-2.0.49-gentoo.diff, -files/2.0.49/40_mod_ssl.conf,
+  -files/httpd-2.0.49-ipv6.patch,
+  -files/2.0.49/41_mod_ssl.default-vhost.conf,
+  -files/2.0.49/45_mod_dav.conf, -files/2.0.49/46_mod_ldap.conf,
+  -files/00_apache_manual.conf, -files/2.0.49/apache2-builtin-mods,
+  -files/2.0.49/apache2.confd, -files/2.0.49/apache2.initd,
+  -files/2.0.49/apache2logserverstatus, -files/2.0.49/apache2splitlogfile,
+  -files/2.0.49/gentestcrt.sh, -files/apache.confd, -files/apache.rc6,
+  -files/apache-builtin-mods, -files/apache2, -files/apacheaddmod,
+  -files/apachedelmod, -files/apachelogserverstatus,
+  -files/apachesplitlogfile, -files/common/apr-config.layout,
+  -files/common/apr-util-config.layout, -files/common/config.layout,
+  -files/conf/DynamicVhosts.conf, -files/conf/Vhosts.conf,
+  -files/conf/VirtualHomePages.conf, -files/conf/apache.conf,
+  -files/conf/commonapache.conf,
+  -files/patches/2.0.49-r1/00_ssl_verify_client.patch,
+  -files/patches/2.0.49-r1/01_apache_ldap_fixes.patch,
+  -files/patches/2.0.49-r1/04_ssl_makefile.patch,
+  -files/patches/2.0.49-r1/Readme.PATCHES,
+  -files/patches/2.0.49-r2/01_gentoo_cgi.patch, -files/robots.txt,
+  -files/suexec.pam, -files/suexec_pam_gentoo.patch,
+  -apache-1.3.32-r1.ebuild, -apache-1.3.33-r6.ebuild,
+  -apache-1.3.33-r13.ebuild, -apache-1.3.34-r1.ebuild,
+  -apache-1.3.34-r2.ebuild, -apache-2.0.54-r9.ebuild,
+  -apache-2.0.54-r15.ebuild, -apache-2.0.54-r16.ebuild,
+  -apache-2.0.54-r30.ebuild, -apache-2.0.55.ebuild,
+  -apache-2.0.55-r2.ebuild:
+  Remove old-style ebuilds and clean out files directory
+
+*apache-2.0.58 (16 May 2006)
+
+  16 May 2006; Michael Stewart <vericgar@gentoo.org> +apache-2.0.58.ebuild:
+  Version Bump. Resynced the configuration with upstream. Reworked
+  /var/www/localhost handling and removed dependency on
+  gentoo-webroot-default. Updated mpm-peruser to 0.2.0. This fixes several
+  bugs: 90748, 105778, 107299, 110864, 117106, 124857, 125244, 130078, 132669
+
+  27 Apr 2006; Alec Warner <antarus@gentoo.org> Manifest:
+  Fixing SHA256 digest, pass four
+
+  22 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  apache-2.0.55-r2.ebuild:
+  Add ~x86-fbsd keyword.
+
+  19 Apr 2006; Luca Longinotti <chtekk@gentoo.org> apache-1.3.33-r13.ebuild,
+  apache-1.3.34-r10.ebuild, apache-1.3.34-r11.ebuild,
+  apache-1.3.34-r12.ebuild, apache-2.0.54-r9.ebuild,
+  apache-2.0.54-r15.ebuild, apache-2.0.54-r16.ebuild,
+  apache-2.0.54-r30.ebuild, apache-2.0.54-r31.ebuild, apache-2.0.55.ebuild,
+  apache-2.0.55-r1.ebuild, apache-2.0.55-r2.ebuild, apache-2.2.0-r1.ebuild,
+  apache-2.2.0-r2.ebuild:
+  Fix bug #130459, move enewuser/enewgroup from src_install() to pkg_preinst().
+
+*apache-1.3.34-r12 (01 Apr 2006)
+
+  01 Apr 2006; Michael Stewart <vericgar@gentoo.org>
+  +apache-1.3.34-r12.ebuild:
+  Replace the patch for AddDirectoryIndex with a rewritten one. This should
+  fix the segfaults reported in bug 106808
+
+*apache-2.0.55-r2 (31 Mar 2006)
+
+  31 Mar 2006; Michael Stewart <vericgar@gentoo.org>
+  +apache-2.0.55-r2.ebuild:
+  Replace the patch for AddDirectoryIndex with a rewritten one. This should
+  fix the segfaults reported in bug 106808
+
+  08 Mar 2006; Michael Stewart <vericgar@gentoo.org> apache-2.2.0-r2.ebuild:
+  Actually install apache2-builtin-mods to the location where we expect it.
+  This should fix bug 124930.
+
+*apache-2.2.0-r2 (06 Mar 2006)
+
+  06 Mar 2006; Benedikt Boehm <hollow@gentoo.org> +apache-2.2.0-r2.ebuild:
+  Add peruser MPM
+
+  28 Feb 2006; Michael Stewart <vericgar@gentoo.org> -apache-2.2.0.ebuild,
+  apache-2.2.0-r1.ebuild:
+  Fix an issue where LoadModule lines weren't created on systems that use
+  /usr/lib64 instead of /usr/lib.
+
+*apache-2.2.0-r1 (27 Feb 2006)
+
+  27 Feb 2006; Michael Stewart <vericgar@gentoo.org>
+  +apache-2.2.0-r1.ebuild:
+  Fix parse_modules_config so that it correctly detects an upgrade. Thanks to
+  bemis for helping debug this. Fixes bug 124245
+
+*apache-2.2.0 (15 Feb 2006)
+
+  15 Feb 2006; Michael Stewart <vericgar@gentoo.org> +apache-2.2.0.ebuild:
+  Add a testing build for apache-2.2. See bug 114232.
+
+  06 Feb 2006; Simon Stelling <blubb@gentoo.org> apache-1.3.34-r2.ebuild,
+  apache-1.3.34-r11.ebuild:
+  stable on amd64 wrt bug 118875
+
+  01 Feb 2006; Bryan Østergaard <kloeri@gentoo.org apache-1.3.34-r2.ebuild,
+  apache-1.3.34-r11.ebuild:
+  Stable on x86, bug 118875.
+
+  01 Feb 2006; Aron Griffis <agriffis@gentoo.org> apache-1.3.34-r2.ebuild,
+  apache-1.3.34-r11.ebuild:
+  Mark 1.3.34-r11 1.3.34-r2 stable on alpha/ia64 #118875
+
+  01 Feb 2006; Tobias Scherbaum <dertobi123@gentoo.org>
+  apache-1.3.34-r2.ebuild, apache-1.3.34-r11.ebuild:
+  ppc stable, bug #118875
+
+  01 Feb 2006; Gustavo Zacarias <gustavoz@gentoo.org>
+  apache-1.3.34-r2.ebuild, apache-1.3.34-r11.ebuild:
+  Stable on sparc wrt security #118875
+
+  01 Feb 2006; Rene Nussbaumer <killerfox@gentoo.org>
+  apache-1.3.34-r2.ebuild, apache-1.3.34-r11.ebuild:
+  Stable on hppa. See bug #118875.
+
+  01 Feb 2006; Markus Rothe <corsair@gentoo.org> apache-1.3.34-r2.ebuild,
+  apache-1.3.34-r11.ebuild:
+  Stable on ppc64: bug #118875
+
+*apache-1.3.34-r11 (31 Jan 2006)
+*apache-1.3.34-r2 (31 Jan 2006)
+
+  31 Jan 2006; Michael Stewart <vericgar@gentoo.org>
+  +apache-1.3.34-r2.ebuild, +apache-1.3.34-r11.ebuild:
+  Security bump to address CVE-2005-3352. Fixes bug 118875
+
+  19 Jan 2006; Bryan Østergaard <kloeri@gentoo.org
+  apache-2.0.54-r16.ebuild, apache-2.0.55-r1.ebuild:
+  Stable on alpha and ia64.
+
+  19 Jan 2006; Mark Loeser <halcy0n@gentoo.org> apache-2.0.54-r16.ebuild,
+  apache-2.0.55-r1.ebuild:
+  Stable on x86; bug #118875
+
+  19 Jan 2006; Marcus D. Hanwell <cryos@gentoo.org>
+  apache-2.0.54-r16.ebuild, apache-2.0.55-r1.ebuild:
+  Stable on amd64, bug 118875.
+
+  18 Jan 2006; Rene Nussbaumer <killerfox@gentoo.org>
+  apache-2.0.54-r16.ebuild, apache-2.0.55-r1.ebuild:
+  Stable on hppa. See bug #118875.
+
+  18 Jan 2006; Markus Rothe <corsair@gentoo.org> apache-2.0.54-r16.ebuild,
+  apache-2.0.55-r1.ebuild:
+  Stable on ppc64; bug #118875
+
+  18 Jan 2006; Gustavo Zacarias <gustavoz@gentoo.org>
+  apache-2.0.54-r16.ebuild, apache-2.0.55-r1.ebuild:
+  Stable on sparc wrt security #118875
+
+  18 Jan 2006; Tobias Scherbaum <dertobi123@gentoo.org>
+  apache-2.0.54-r16.ebuild, apache-2.0.55-r1.ebuild:
+  ppc stable, bug #118875
+
+*apache-2.0.55-r1 (16 Jan 2006)
+*apache-2.0.54-r16 (16 Jan 2006)
+
+  16 Jan 2006; Michael Stewart <vericgar@gentoo.org>
+  +apache-2.0.54-r16.ebuild, +apache-2.0.55-r1.ebuild:
+  Security bump. Fixes bugs 115324 and 118875.
+
+  15 Jan 2006; Marcus D. Hanwell <cryos@gentoo.org> apache-2.0.55.ebuild:
+  Stable on amd64, bug 117835.
+
+  13 Jan 2006; Tobias Scherbaum <dertobi123@gentoo.org>
+  apache-2.0.55.ebuild:
+  ppc stable, bug #117835
+
+  12 Jan 2006; Markus Rothe <corsair@gentoo.org> apache-2.0.55.ebuild:
+  Stable on ppc64; bug #117835
+
+  10 Jan 2006; Gustavo Zacarias <gustavoz@gentoo.org> apache-2.0.55.ebuild:
+  Stable on sparc wrt #117835
+
+  09 Jan 2006; Bryan Østergaard <kloeri@gentoo.org apache-2.0.55.ebuild:
+  Stable on x86, alpha and ia64, bug 117835.
+
+  23 Dec 2005; Markus Rothe <corsair@gentoo.org> apache-1.3.34-r10.ebuild:
+  Stable on ppc64
+
+  21 Dec 2005; Markus Rothe <corsair@gentoo.org> apache-1.3.34-r1.ebuild:
+  Stable on ppc64; bug #109895
+
+  19 Dec 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  apache-1.3.34-r1.ebuild, apache-1.3.34-r10.ebuild:
+  Stable on sparc wrt security #109895
+
+  19 Dec 2005; Danny van Dyk <kugelfang@gentoo.org> apache-1.3.34-r1.ebuild,
+  apache-1.3.34-r10.ebuild:
+  Marked stable on amd64 wrt security bug #109895.
+
+  19 Dec 2005; Michael Hanselmann <hansmi@gentoo.org>
+  apache-1.3.34-r1.ebuild, apache-1.3.34-r10.ebuild:
+  Stable on hppa, ppc. See bug #109895.
+
+  15 Dec 2005; Bryan Østergaard <kloeri@gentoo.org apache-1.3.34-r1.ebuild,
+  apache-1.3.34-r10.ebuild:
+  Stable on alpha, ia64 and x86, bug 109895.
+
+*apache-1.3.34-r1 (14 Dec 2005)
+
+  14 Dec 2005; Michael Stewart <vericgar@gentoo.org>
+  +apache-1.3.34-r1.ebuild:
+  Version bump for old-style configuration. Fixes bug 109895
+
+*apache-1.3.34-r10 (13 Dec 2005)
+
+  13 Dec 2005; Michael Stewart <vericgar@gentoo.org> -apache-1.3.34.ebuild,
+  +apache-1.3.34-r10.ebuild:
+  Bump new-style 1.3.34 to -r10 to make room for supporting old-style security
+  bug
+
+  12 Dec 2005; Michael Hanselmann <hansmi@gentoo.org> apache-1.3.34.ebuild:
+  Stable on hppa, ppc.
+
+  12 Dec 2005; Gustavo Zacarias <gustavoz@gentoo.org> apache-1.3.34.ebuild:
+  Stable on sparc wrt #109895
+
+*apache-1.3.34 (11 Dec 2005)
+
+  11 Dec 2005; Michael Stewart <vericgar@gentoo.org> +apache-1.3.34.ebuild:
+  Version Bump.
+
+  11 Dec 2005; Michael Stewart <vericgar@gentoo.org>
+  apache-2.0.54-r31.ebuild, apache-2.0.55.ebuild:
+  Remove generated/unused mime.types to fix bug 108200. Fix enewgroup/enewuser
+  call location so that we work when installed from a binary package - fixes
+  bug 110636.
+
+*apache-1.3.33-r13 (04 Dec 2005)
+
+  04 Dec 2005; Michael Stewart <vericgar@gentoo.org>
+  +apache-1.3.33-r13.ebuild:
+  Fixed detection/dependency on ndbm.h. Closes bug #95140
+
+  23 Oct 2005; Michael Stewart <vericgar@gentoo.org>
+  apache-1.3.33-r12.ebuild, apache-2.0.55.ebuild:
+  New tarball with patch fixing QA lazybinding issue, fixes bugs 95532 and 110236
+
+*apache-2.0.55 (22 Oct 2005)
+
+  22 Oct 2005; Michael Stewart <vericgar@gentoo.org> +apache-2.0.55.ebuild:
+  Version Bump
+
+  07 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  apache-1.3.33-r12.ebuild, apache-2.0.54-r31.ebuild:
+  Stable on sparc wrt #106421
+
+  02 Oct 2005; MATSUU Takuto <matsuu@gentoo.org> apache-2.0.54-r31.ebuild:
+  Stable on sh.
+
+  02 Oct 2005; Bryan Østergaard <kloeri@gentoo.org>
+  apache-1.3.33-r12.ebuild, apache-2.0.54-r31.ebuild:
+  ia64 stable.
+
+  24 Sep 2005; Bryan Østergaard <kloeri@gentoo.org>
+  apache-2.0.54-r31.ebuild:
+  Fix link to apache-upgrading doc.
+
+  24 Sep 2005; Bryan Østergaard <kloeri@gentoo.org>
+  apache-1.3.33-r12.ebuild, apache-2.0.54-r31.ebuild:
+  Stable on alpha.
+
+  20 Sep 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  apache-1.3.33-r12.ebuild:
+  Stable on amd64, bug 106421, thanks to aja@gentoo.org.
+
+  19 Sep 2005; Michael Hanselmann <hansmi@gentoo.org>
+  apache-1.3.33-r12.ebuild:
+  Stable on hppa, ppc.
+
+  19 Sep 2005; Michael Hanselmann <hansmi@gentoo.org>
+  apache-2.0.54-r31.ebuild:
+  Stable on hppa and ppc.
+
+  19 Sep 2005; Markus Rothe <corsair@gentoo.org> apache-1.3.33-r12.ebuild,
+  apache-2.0.54-r31.ebuild:
+  Stable on ppc64 (bug #106421)
+
+  18 Sep 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  apache-2.0.54-r31.ebuild:
+  Stable on amd64, bug 106421.
+
+  18 Sep 2005; Michael Stewart <vericgar@gentoo.org>
+  apache-2.0.54-r31.ebuild:
+  New tarball to fix ExtendedStatus issue
+
+  18 Sep 2005; Michael Stewart <vericgar@gentoo.org>
+  apache-1.3.33-r12.ebuild:
+  Stable on x86
+
+*apache-2.0.54-r31 (18 Sep 2005)
+*apache-1.3.33-r12 (18 Sep 2005)
+
+  18 Sep 2005; Michael Stewart <vericgar@gentoo.org>
+  +apache-1.3.33-r12.ebuild, +apache-2.0.54-r31.ebuild:
+  Apache is now multilib aware
+
+  18 Sep 2005; Bryan Østergaard <kloeri@gentoo.org>
+  apache-1.3.33-r6.ebuild:
+  Stable on ia64, bug 104807.
+
+  17 Sep 2005; Michael Stewart <vericgar@gentoo.org> ChangeLog:
+  Modify incremental DirectoryIndex patch to work with gcc-2. Fixes bug 100025
+
+  17 Sep 2005; Aron Griffis <agriffis@gentoo.org> ChangeLog:
+  Mark 2.0.54-r15 stable on ia64
+
+  16 Sep 2005; Simon Stelling <blubb@gentoo.org> apache-1.3.33-r6.ebuild,
+  apache-2.0.54-r15.ebuild:
+  stable on amd64 wrt bug 104807
+
+  15 Sep 2005; Bryan Østergaard <kloeri@gentoo.org>
+  apache-1.3.33-r6.ebuild, apache-2.0.54-r15.ebuild:
+  Stable on alpha, bug 104807.
+
+  15 Sep 2005; Michael Stewart <vericgar@gentoo.org>
+  apache-2.0.54-r30.ebuild:
+  Added error checking for ldap USE-flag. Fixes bug #105972.
+
+  12 Sep 2005; Jason Wever <weeve@gentoo.org> apache-1.3.33-r6.ebuild,
+  apache-2.0.54-r15.ebuild:
+  Marked stable on SPARC wrt security bug #104807.
+
+  11 Sep 2005; Michael Hanselmann <hansmi@gentoo.org>
+  apache-1.3.33-r6.ebuild, apache-2.0.54-r15.ebuild:
+  Stable on hppa and ppc.
+
+  11 Sep 2005; Markus Rothe <corsair@gentoo.org> apache-1.3.33-r6.ebuild,
+  apache-2.0.54-r15.ebuild:
+  Stable on ppc64
+
+*apache-2.0.54-r15 (10 Sep 2005)
+
+  10 Sep 2005; Michael Stewart <vericgar@gentoo.org>
+  +apache-2.0.54-r15.ebuild:
+  Security bump for CAN-2005-2491 and CAN-2005-2700. Fixes bugs 103554 and 104807
+
+*apache-1.3.33-r11 (10 Sep 2005)
+*apache-1.3.33-r6 (10 Sep 2005)
+
+  10 Sep 2005; Michael Stewart <vericgar@gentoo.org>
+  +apache-1.3.33-r6.ebuild, +apache-1.3.33-r11.ebuild:
+  Security bump to address CAN-2005-2700. Fixes bug 104807
+
+  10 Sep 2005; Michael Stewart <vericgar@gentoo.org> -apache-2.0.50.ebuild,
+  -apache-2.0.51.ebuild, -apache-2.0.51-r1.ebuild, -apache-2.0.52.ebuild,
+  -apache-2.0.52-r1.ebuild, -apache-2.0.52-r2.ebuild,
+  -apache-2.0.54-r7.ebuild, -apache-2.0.54-r8.ebuild,
+  -apache-2.0.54-r10.ebuild, -apache-2.0.54-r11.ebuild,
+  -apache-2.0.54-r12.ebuild, -apache-2.0.54-r13.ebuild,
+  -apache-2.0.54-r14.ebuild:
+  Removing old versions and revisions. Note that new-style for apache is now
+  -r30 and above.
+
+*apache-2.0.54-r30 (10 Sep 2005)
+
+  10 Sep 2005; Michael Stewart <vericgar@gentoo.org>
+  +apache-2.0.54-r30.ebuild:
+  Security bump for CAN-2005-2491 and CAN-2005-2700. Fixes bugs 103554 and 104807 for new-style.
+
+  04 Sep 2005; Hardave Riar <hardave@gentoo.org> apache-2.0.54-r9.ebuild:
+  Stable on mips, bug #102991.
+
+  21 Aug 2005; Luis Medinas <metalgod@gentoo.org> apache-2.0.54-r9.ebuild:
+  Marked Stable on AMD64. Fixes bug #102991.
+
+  21 Aug 2005; Markus Rothe <corsair@gentoo.org> apache-2.0.54-r9.ebuild:
+  Stable on ppc64 (bug #102991)
+
+  21 Aug 2005; Fernando J. Pereda <ferdy@gentoo.org> Manifest:
+  fix manifest
+
+  21 Aug 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  apache-2.0.54-r9.ebuild:
+  alpha stable wrt bug #102991
+
+  20 Aug 2005; Josh Grebe <squash@gentoo.org> apache-2.0.54-r9.ebuild:
+  -m Stable on sparc, bug #102991
+
+  20 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+  apache-2.0.54-r9.ebuild:
+  Stable on ppc and hppa.
+
+*apache-2.0.54-r14 (20 Aug 2005)
+*apache-2.0.54-r9 (20 Aug 2005)
+
+  20 Aug 2005; Michael Stewart <vericgar@gentoo.org>
+  +apache-2.0.54-r9.ebuild, +apache-2.0.54-r14.ebuild:
+  Add patch to fix byterange bug that can cause a DoS. Fixes bug 102991
+
+  28 Jul 2005; Michael Stewart <vericgar@gentoo.org>
+  +apache-2.0.54-r13.ebuild:
+  Check to see if apache is running on reload, error out if it isn't. Fixes
+  bugs 98496 and 99987
+
+*apache-2.0.54-r13 (28 Jul 2005)
+
+  28 Jul 2005; Michael Stewart <vericgar@gentoo.org>
+  +apache-2.0.54-r13.ebuild:
+  Added IfDefines around the default virtual host and default SSL virtual
+  host. Fixes bug 100624. Note that this breaks backwards compatibility with
+  previous revisions, users will need to add DEFAULT_VHOST and
+  SSL_DEFAULT_VHOST to APACHE2_OPTS in /etc/conf.d/apache2 after running
+  etc-update
+
+  16 Jul 2005; Joseph Jezak <josejx@gentoo.org> apache-1.3.33-r1.ebuild:
+  Marked ppc stable for bug #86052.
+
+  13 Jul 2005; Bryan Østergaard <kloeri@gentoo.org>
+  apache-2.0.54-r8.ebuild:
+  Stable on alpha + ia64, bug 98358.
+
+  13 Jul 2005; Simon Stelling <blubb@gentoo.org> apache-2.0.54-r8.ebuild:
+  stable on amd64 per bug 98358
+
+  13 Jul 2005; bret curtis <psi29a@gentoo.org> apache-2.0.54-r12.ebuild:
+  added to ~mips
+
+  13 Jul 2005; Michael Stewart <vericgar@gentoo.org>
+  apache-1.3.33-r10.ebuild, apache-2.0.54-r12.ebuild:
+  New tarball: Splits the default vhost into it's own file, makes all
+  references to configuration files absolute, clears up general user
+  confusion. Fixes bugs 84133, 91745, 92024, 92891, 94168.
+
+  12 Jul 2005; Michael Stewart <vericgar@gentoo.org>
+  apache-2.0.54-r8.ebuild:
+  Added apache user creation as it's no longer in baselayout. Fixed bug 98755
+
+*apache-1.3.33-r10 (12 Jul 2005)
+*apache-1.3.33-r5 (12 Jul 2005)
+
+  12 Jul 2005; Michael Stewart <vericgar@gentoo.org>
+  +apache-1.3.33-r5.ebuild, +apache-1.3.33-r10.ebuild:
+  Support systems that don't use PAM, fixes bug 75922
+
+  11 Jul 2005; Hardave Riar <hardave@gentoo.org> apache-2.0.54-r8.ebuild:
+  Stable on mips, bug #98358.
+
+  11 Jul 2005; Markus Rothe <corsair@gentoo.org> apache-2.0.54-r8.ebuild:
+  Stable on ppc64 (bug #98358)
+
+  10 Jul 2005; Jason Wever <weeve@gentoo.org> apache-2.0.54-r8.ebuild:
+  Stable on SPARC wrt security bug #98358.
+
+  10 Jul 2005; Tobias Scherbaum <dertobi123@gentoo.org>
+  apache-2.0.54-r8.ebuild:
+  ppc stable, bug #98358
+
+  10 Jul 2005; Rene Nussbaumer <killerfox@gentoo.org>
+  apache-2.0.54-r8.ebuild:
+  Stable on hppa. bug #98358
+
+*apache-2.0.54-r12 (10 Jul 2005)
+*apache-2.0.54-r8 (10 Jul 2005)
+
+  10 Jul 2005; Michael Stewart <vericgar@gentoo.org>
+  +apache-2.0.54-r8.ebuild, +apache-2.0.54-r12.ebuild:
+  Security fix: added patch to address CAN-2005-2088, bug 98358
+
+  08 Jul 2005; Hardave Riar <hardave@gentoo.org> apache-2.0.54-r7.ebuild:
+  Stable on mips.
+
+  07 Jul 2005; Michael Stewart <vericgar@gentoo.org>
+  apache-2.0.54-r7.ebuild:
+  Removed 00_apache_manual.conf as a simpler solution is already in place.
+  Fixes bug #98162
+
+  05 Jul 2005; Sven Wegener <swegener@gentoo.org> apache-1.3.29-r2.ebuild,
+  apache-1.3.31-r1.ebuild, apache-1.3.31-r2.ebuild, apache-1.3.31-r3.ebuild,
+  apache-1.3.32.ebuild, apache-1.3.32-r1.ebuild, apache-1.3.33.ebuild,
+  apache-1.3.33-r1.ebuild, apache-1.3.33-r2.ebuild, apache-1.3.33-r3.ebuild,
+  apache-1.3.33-r4.ebuild, apache-2.0.50.ebuild, apache-2.0.51.ebuild,
+  apache-2.0.51-r1.ebuild, apache-2.0.52.ebuild, apache-2.0.52-r1.ebuild,
+  apache-2.0.52-r2.ebuild, apache-2.0.54-r7.ebuild,
+  apache-2.0.54-r10.ebuild, apache-2.0.54-r11.ebuild:
+  Added selinux to IUSE.
+
+  27 Jun 2005; Simon Stelling <blubb@gentoo.org> apache-1.3.33-r1.ebuild:
+  stable on amd64
+
+*apache-2.0.54-r11 (08 Jun 2005)
+
+  08 Jun 2005; Bryan Østergaard <kloeri@gentoo.org>
+  +apache-2.0.54-r11.ebuild:
+  Fix </IfDefine INFO> issue reported by Seemant Kulleen.
+
+*apache-2.0.54-r10 (07 Jun 2005)
+
+  07 Jun 2005; Michael Stewart <vericgar@gentoo.org> +apache-2.0.54-r10.ebuild:
+  New tarball: Made it easier to enable /server-info for troubleshooting
+  New style will now always be > -r10 until it's marked stable
+
+*apache-2.0.54-r7 (07 Jun 2005)
+
+  07 Jun 2005; Michael Stewart <vericgar@gentoo.org> +apache-2.0.54-r7.ebuild:
+  Fix installation of configuration so that it's now owned by root instead of
+  apache
+
+  01 Jun 2005; Michael Tindal <urilith@gentoo.org> apache-2.0.54-r6.ebuild:
+  Bail if more than one MPM is specified.
+
+  01 Jun 2005; Michael Tindal <urilith@gentoo.org> apache-2.0.54-r6.ebuild:
+  Fix the ebuild not selecting a default MPM if no MPM use flags are present.
+
+*apache-2.0.54-r6 (01 Jun 2005)
+
+  01 Jun 2005; Michael Tindal <urilith@gentoo.org> +apache-2.0.54-r6.ebuild:
+  Removed multiple MPM support from apache due to problems it was causing
+  external modules. Revision bumped from r5 to r6.
+
+  21 May 2005; Jan Brinkmann <luckyduck@gentoo.org> apache-2.0.54-r4.ebuild:
+  stable on amd64
+
+  18 May 2005; Rene Nussbaumer <killerfox@gentoo.org>
+  apache-1.3.33-r1.ebuild:
+  stable on hppa; bug #86052
+
+  18 May 2005; Markus Rothe <corsair@gentoo.org> apache-1.3.33-r1.ebuild:
+  Stable on ppc64
+
+  13 May 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  apache-2.0.54-r4.ebuild:
+  Stable on sparc
+
+  13 May 2005; Markus Rothe <corsair@gentoo.org> apache-2.0.54-r4.ebuild:
+  Stable on ppc64
+
+  13 May 2005; Lars Weiler <pylon@gentoo.org> apache-2.0.54-r4.ebuild:
+  Stable on ppc; bug #91737 (again).
+
+  12 May 2005; Bryan Østergaard <kloeri@gentoo.org>
+  apache-2.0.54-r4.ebuild:
+  Stable on ia64, bug 91737.
+
+  12 May 2005; Bryan Østergaard <kloeri@gentoo.org>
+  apache-2.0.54-r4.ebuild:
+  Stable on alpha, bug 91737.
+
+  12 May 2005; Guy Martin <gmsoft@gentoo.org> apache-2.0.54-r4.ebuild:
+  Stable on hppa.
+
+  12 May 2005; Elfyn McBratney <beu@gentoo.org> apache-2.0.54-r4.ebuild:
+  Stable on x86, bug #91737.
+
+*apache-2.0.54-r5 (12 May 2005)
+*apache-2.0.54-r4 (12 May 2005)
+
+  12 May 2005; Bryan Østergaard <kloeri@gentoo.org>
+  +apache-2.0.54-r4.ebuild, +apache-2.0.54-r5.ebuild:
+  Fixed ebuilds, bug 92348 and bug 91737.
+
+  12 May 2005; Lars Weiler <pylon@gentoo.org> apache-2.0.54-r2.ebuild:
+  Stable on ppc; bug #91737.
+
+  12 May 2005; Markus Rothe <corsair@gentoo.org> apache-2.0.54-r2.ebuild:
+  Stable on ppc64; bug #91737
+
+*apache-2.0.54-r3 (12 May 2005)
+*apache-2.0.54-r2 (12 May 2005)
+
+  12 May 2005; Elfyn McBratney <beu@gentoo.org> +apache-2.0.54-r2.ebuild,
+  +apache-2.0.54-r3.ebuild:
+  Revision bumps to satisfy security bug #91737. 2.0.54-r2 is the (old-style)
+  ebuild going stable, 2.0.54-r3 is the new-style ebuild. -r2 stable on x86.
+
+  11 May 2005; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
+  apache is a group effort so remove Hollow as maintainer.
+
+  10 May 2005; Elfyn McBratney <beu@gentoo.org> :
+  Fix digest.
+
+  10 May 2005; Bret Curtis <psi29a@gentoo.org> apache-2.0.52-r3.ebuild:
+  marked for testing, ~mips
+
+*apache-2.0.54-r1 (10 May 2005)
+*apache-2.0.53-r1 (10 May 2005)
+*apache-2.0.52-r4 (10 May 2005)
+
+  10 May 2005; Elfyn McBratney <beu@gentoo.org> +apache-2.0.52-r4.ebuild,
+  +apache-2.0.53-r1.ebuild, +apache-2.0.54-r1.ebuild:
+  Version bumps for LFS-removal.
+
+  09 May 2005; Aron Griffis <agriffis@gentoo.org> apache-1.3.33-r1.ebuild:
+  stable on ia64 #86052
+
+  06 May 2005; Bryan Østergaard <kloeri@gentoo.org> apache-2.0.54.ebuild:
+  Fix broken SRC_URI.
+
+  05 May 2005; Bryan Østergaard <kloeri@gentoo.org>
+  apache-1.3.29-r2.ebuild, apache-1.3.33-r2.ebuild, apache-1.3.33-r4.ebuild,
+  apache-2.0.50.ebuild, apache-2.0.52.ebuild, apache-2.0.52-r1.ebuild,
+  apache-2.0.52-r3.ebuild, apache-2.0.53.ebuild, apache-2.0.54.ebuild:
+  Update SRC_URI for patches.
+
+  04 May 2005; Elfyn McBratney <beu@gentoo.org> apache-2.0.54.ebuild:
+  Move to mirror://apache.
+
+*apache-1.3.33-r4 (03 May 2005)
+*apache-1.3.33-r3 (03 May 2005)
+
+  03 May 2005; Elfyn McBratney <beu@gentoo.org> +apache-1.3.33-r3.ebuild,
+  +apache-1.3.33-r4.ebuild:
+  More bumps - the -r1 and -r2 bumps didn't play nicely together what with -r1
+  existing as new- and old-style with the same name.
+
+  25 Apr 2005; Elfyn McBratney <beu@gentoo.org> apache-2.0.51.ebuild,
+  apache-2.0.52.ebuild, apache-2.0.52-r1.ebuild, apache-2.0.52-r3.ebuild,
+  apache-2.0.53.ebuild, apache-2.0.54.ebuild:
+  Add missing openldap dependency and drop the whitespace in function
+  declarations to make gentoo-syntax happy.
+
+  20 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  apache-1.3.33-r1.ebuild:
+  Stable on sparc wrt #86052
+
+  16 Apr 2005; Benedikt Boehm <hollow@gentoo.org> apache-2.0.54.ebuild:
+  Added logrotate script - bug 80263
+
+  14 Apr 2005; Markus Rothe <corsair@gentoo.org> apache-1.3.33-r2.ebuild:
+  Back to ~ppc64, as hollow sais this version isn't stable - bug #88639
+
+*apache-2.0.54 (13 Apr 2005)
+
+  13 Apr 2005; Christian Parpart <trapni@gentoo.org> +apache-2.0.54.ebuild:
+  version bump. not yet released, so hard masked anyway. Needs a SRC_URI
+  adjustment on official release as well.
+
+  11 Apr 2005; Markus Rothe <corsair@gentoo.org> apache-1.3.33-r2.ebuild:
+  Stable on ppc64; bug #88639
+
+  09 Apr 2005; Christian Parpart <trapni@gentoo.org>
+  apache-1.3.29-r2.ebuild, apache-1.3.31.ebuild, apache-1.3.31-r1.ebuild,
+  apache-1.3.31-r2.ebuild, apache-1.3.31-r3.ebuild, apache-1.3.32.ebuild,
+  apache-1.3.32-r1.ebuild, apache-1.3.33.ebuild, apache-1.3.33-r1.ebuild:
+  adding blocks to apr and apr-util for obsolete apache1 ebuilds as well, so,
+  that users wanting to upgrade are enforced to unmerge their old apache
+  before they emerge the newer versions
+
+  09 Apr 2005; Christian Parpart <trapni@gentoo.org> apache-2.0.50.ebuild,
+  apache-2.0.51.ebuild, apache-2.0.51-r1.ebuild, apache-2.0.52.ebuild,
+  apache-2.0.52-r1.ebuild, apache-2.0.52-r2.ebuild:
+  adding blocks to apr and apr-util for obsolete apache2 ebuilds, so, that
+  users wanting to upgrad are enforced to unmerge before they emerge the newer
+  versions
+
+  09 Apr 2005; Benedikt Boehm <hollow@gentoo.org> apache-1.3.33-r1.ebuild:
+  fixed dependency issues, see bug #86052 and mod_ssl changelog for details
+
+  03 Apr 2005; Elfyn McBratney <beu@gentoo.org> apache-1.3.33-r1.ebuild:
+  Back into testing for you - hard masked; going back in once arches
+  have confirmed that it's working correctly with mod_ssl (or someone
+  from the apache herd nurses its stabilisation *wink* ;)
+
+  21 Mar 2005; Elfyn McBratney <beu@gentoo.org> apache-1.3.33-r1.ebuild:
+  Stable on x86 (bug #86052).
+
+*apache-1.3.33-r2 (20 Mar 2005)
+
+  20 Mar 2005; Elfyn McBratney <beu@gentoo.org> apache-1.3.33-r1.ebuild,
+  +apache-1.3.33-r2.ebuild:
+  Version bump to fix incompatabilities with mod_ssl and older dbm libs.
+  1.3.33-r1 -> -r2.  Marked stable on x86 for bug #86052.
+
+  20 Mar 2005; Elfyn McBratney <beu@gentoo.org> apache-1.3.29-r2.ebuild,
+  apache-1.3.31-r1.ebuild, apache-1.3.31-r2.ebuild, apache-1.3.31-r3.ebuild,
+  apache-1.3.31.ebuild, apache-1.3.32-r1.ebuild, apache-1.3.32.ebuild,
+  apache-1.3.33-r1.ebuild, apache-1.3.33.ebuild, apache-2.0.50.ebuild,
+  apache-2.0.51-r1.ebuild, apache-2.0.51.ebuild, apache-2.0.52-r1.ebuild,
+  apache-2.0.52-r2.ebuild, apache-2.0.52.ebuild:
+  Ebuild cleanup; drop sys-apps/sed from DEPEND and ht_fix_file a few more
+  helper scripts.
+
+  20 Mar 2005; Elfyn McBratney <beu@gentoo.org> apache-2.0.52-r3.ebuild,
+  apache-2.0.53.ebuild:
+  Make it a little more clearer that the metux and peruser MPM's are not
+	in the slightest bit supported.
+
+  09 Mar 2005; Markus Rothe <corsair@gentoo.org> apache-1.3.33-r1.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  07 Mar 2005; Elfyn McBratney <beu@gentoo.org> apache-2.0.53.ebuild:
+  Remove all traces of metuxmpm. ;-)
+
+  05 Mar 2005; Elfyn McBratney <beu@gentoo.org> apache-2.0.52-r3.ebuild,
+  apache-2.0.53.ebuild:
+  Depend on the 'best version' of apr-util, too.
+
+  05 Mar 2005; Elfyn McBratney <beu@gentoo.org> apache-2.0.52-r3.ebuild,
+  apache-2.0.53.ebuild:
+  Depend on the 'best version' of apr.
+
+  04 Mar 2005; Elfyn McBratney <beu@gentoo.org> apache-2.0.53.ebuild:
+  Drop metux MPM support.
+
+*apache-2.0.53 (04 Mar 2005)
+
+  04 Mar 2005; Elfyn McBratney <beu@gentoo.org> +apache-2.0.53.ebuild:
+  Version bump, closes bug #81267
+
+  27 Feb 2005; Michael Stewart <vericgar@gentoo.org> apache-2.0.52-r3.ebuild:
+  Remove mips, s390, arm due to apr and apr-util dependency. Bug 77455
+
+  26 Feb 2005; Michael Stewart <vericgar@gentoo.org> apache-2.0.52-r3.ebuild:
+  Adding debugging support
+
+  24 Feb 2005; Elfyn McBratney <beu@gentoo.org> apache-2.0.52-r1.ebuild:
+  Always create /var/cache/apache2 (closes bug #83187).
+
+  24 Feb 2005; Elfyn McBratney <beu@gentoo.org> apache-2.0.52-r1.ebuild:
+  Create /var/log/apache2 and /etc/apache2/conf/ssl (former closes bug #76044).
+
+  21 Feb 2005; Elfyn McBratney <beu@gentoo.org> apache-2.0.52-r3.ebuild:
+  Call gentestcrt.sh in pkg_postinst (thanks to Seemant for noticing).
+
+  20 Feb 2005; Michael Stewart <vericgar@gentoo.org> apache-1.3.33-r1.ebuild,
+  apache-2.0.52-r3.ebuild:
+  Fix SSL test certificate generation; New patch that creates AddDirectoryIndex
+  and RemoveDirectoryIndex directives - fixes bug #50611
+
+  18 Feb 2005; Elfyn McBratney <beu@gentoo.org> apache-1.3.33-r1.ebuild,
+  apache-2.0.52-r3.ebuild:
+  Only reference the gentoo mirrors for the patchball's.
+
+  18 Feb 2005; Elfyn McBratney <beu@gentoo.org> apache-1.3.33-r1.ebuild,
+  apache-2.0.52-r3.ebuild:
+  Updated patchball (apachectl now exits with an error if lynx is not installed).
+
+  05 Feb 2005; Christian Parpart <trapni@gentoo.org>
+  apache-1.3.33-r1.ebuild, apache-2.0.52-r3.ebuild:
+  Added enewgroup/enewuser for apache
+
+  01 Feb 2005; Christian Parpart <trapni@gentoo.org> :
+  dropping php useflag and DEPEND
+
+  22 Jan 2005; Christian Parpart <trapni@gentoo.org> :
+  apache now DEPENDs on new net-www/gentoo-webroot-default
+
+  10 Jan 2005; Michael Stewart <vericgar@gentoo.org> apache-2.0.52-r3.ebuild:
+  Updating keywords on 2.0.52-r3 to match -r2, not sure how I missed this before
+  the merge
+
+  09 Jan 2005; Sven Wegener <swegener@gentoo.org> apache-1.3.33-r1.ebuild:
+  Added missing parentheses in SRC_URI/*DEPEND/LICENSE.
+
+*apache-2.0.52-r3 (08 Jan 2005)
+
+  08 Jan 2005; Michael Stewart <vericgar@gentoo.org> +apache-2.0.52-r3.ebuild:
+  Apache herd package refresh
+
+*apache-1.3.33-r1 (09 Jan 2005)
+
+  09 Jan 2005; Benedikt Boehm <hollow@gentoo.org> metadata.xml,
+  +apache-1.3.33-r1.ebuild:
+  Apache herd package refresh
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*apache-2.0.52-r2 (23 Dec 2004)
+
+  23 Dec 2004; Stuart Herbert <stuart@gentoo.org> apache-2.0.52-r2.ebuild:
+  Improvements for first-time installation of Apache
+
+  15 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> :
+  Fix broken digest, bug 74531.
+
+  14 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> apache-1.3.33.ebuild:
+  Also fix src_uri in apache-1.x.
+
+  14 Dec 2004; Bryan Østergaard <kloeri@gentoo.org>
+  apache-2.0.52-r1.ebuild:
+  Use mirror://apache/.. in SRC_URI.
+
+  14 Dec 2004; Stuart Herbert <stuart@gentoo.org> :
+  Fix for SSL directory bug + moved all configuration files out of CVS and into
+  the apache-conf tarball created by urilith.
+
+  24 Nov 2004; Sven Wegener <swegener@gentoo.org> :
+  Removed unused digest entries. Added missing digest entries.
+
+  09 Nov 2004; Simon Stelling <blubb@gentoo.org> apache-2.0.52-r1.ebuild:
+  stable on amd64. bug #70138
+
+  09 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org> apache-1.3.33.ebuild:
+  Stable on sparc wrt Stuart ;)
+
+  09 Nov 2004; Michael Tindal <urilith@gentoo.org>
+  files/2.0.49/40_mod_ssl.conf:
+  SELinux fixes for bugs
+
+  07 Nov 2004; Joshua Kinard <kumba@gentoo.org> apache-1.3.32-r1.ebuild,
+  apache-2.0.52-r1.ebuild:
+  Marked stable on mips (Bugs #68564, #70138).
+
+  05 Nov 2004; Michael Tindal <urilith@gentoo.org> :
+  Fix circular dependency on mod_ssl, bug #69793
+
+  05 Nov 2004; Olivier Crete <tester@gentoo.org> apache-2.0.52-r1.ebuild:
+  Stable on x86 wrt security bug 70138
+
+  06 Nov 2004; Bryan Østergaard <kloeri@gentoo.org>
+  apache-2.0.52-r1.ebuild:
+  Stable on alpha, bug 70138.
+
+  05 Nov 2004; Markus Rothe <corsair@gentoo.org> apache-2.0.52-r1.ebuild:
+  Stable on ppc64; bug #70138
+
+  05 Nov 2004; <SeJo@gentoo.org> apache-2.0.52-r1.ebuild:
+  stable on ppc gdsla: 70138
+
+  05 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org> apache-2.0.52-r1.ebuild:
+  Stable on sparc wrt #70138
+
+*apache-2.0.52-r1 (05 Nov 2004)
+
+  05 Nov 2004; Michael Tindal <urilith@gentoo.org> +apache-2.0.52-r1.ebuild:
+  Security fix for CAN-2004-0942, bug
+
+  05 Nov 2004; Michael Tindal <urilith@gentoo.org>
+  -files/2.0.40/40_mod_ssl.conf,
+  -files/2.0.40/41_mod_ssl.default-vhost.conf,
+  -files/2.0.40/45_mod_dav.conf, -files/2.0.40/46_mod_ldap.conf,
+  -files/2.0.40/apache2-builtin-mods, -files/2.0.40/apache2.conf,
+  -files/2.0.40/apache2.confd, -files/2.0.40/apache2.initd,
+  -files/2.0.40/apache2logserverstatus, -files/2.0.40/apache2splitlogfile,
+  -files/2.0.40/commonapache2.conf, -files/2.0.40/dynamic-vhosts.conf,
+  -files/2.0.40/gentestcrt.sh, -files/2.0.40/highperformance.conf,
+  -files/2.0.40/httpd.conf, -files/2.0.40/ssl.conf,
+  -files/2.0.40/vhosts.conf, -files/2.0.40/virtual-homepages.conf,
+  -files/2.0.48-r1/apache2.conf, -files/2.0.48-r1/apache2.confd,
+  -files/2.0.48-r1/apache2.initd, -files/2.0.48-r1/commonapache2.conf,
+  -files/2.0.49/apache2.conf, -files/2.0.49/commonapache2.conf,
+  -files/2.0.49/dynamic-vhosts.conf, -files/2.0.49/vhosts.conf,
+  -files/2.0.49/virtual-homepages.conf:
+  More cleanups to make repoman happy.  Cleaning out some stale files in files/.
+  Configuration has been moved to apache2-conf.tar.bz2 on the mirrors to stop
+  repoman from complaining about file size.  Ill get to 1.3.x later tonight.
+
+  04 Nov 2004; Michael Tindal <urilith@gentoo.org>
+  -files/httpd-2.0.49-ssl_engine_kernel.patch,
+  -files/patches/2.0.49-r1/00_ssl_engine.patch,
+  -files/patches/2.0.49-r1/01_ssl_engine_kernel.patch,
+  -files/patches/2.0.50-r1/00_ssl_engine.patch:
+  Removed old patches repoman was complaining about.
+
+  30 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> apache-1.3.33.ebuild:
+  Stable on alpha, bug 68564.
+
+  29 Oct 2004; Michael Hanselmann <hansmi@gentoo.org> apache-1.3.33.ebuild:
+  Stable on ppc.
+
+  29 Oct 2004; Stuart Herbert <stuart@gentoo.org> apache-1.3.32-r1.ebuild,
+  apache-1.3.33.ebuild:
+  Added ssl USE flag support
+
+  29 Oct 2004; Stuart Herbert <stuart@gentoo.org> apache-1.3.32-r1.ebuild,
+  apache-1.3.33.ebuild:
+  Marked stable on x86
+
+  29 Oct 2004; Stuart Herbert <stuart@gentoo.org> apache-1.3.33.ebuild:
+  Updated to use existing mod_ssl for now
+
+*apache-1.3.33 (29 Oct 2004)
+
+  29 Oct 2004; Stuart Herbert <stuart@gentoo.org> +apache-1.3.33.ebuild:
+  Added masked ebuild, pending release of upstream's mod_ssl
+
+  26 Oct 2004; Bryan Østergaard <kloeri@gentoo.org>
+  apache-1.3.32-r1.ebuild:
+  Stable on alpha, bug 68564.
+
+  26 Oct 2004; <SeJo@gentoo.org> apache-1.3.32-r1.ebuild:
+  stable on ppc gsla: 68564
+
+  26 Oct 2004; Karol Wojtaszek <sekretarz@gentoo.org>
+  apache-1.3.32-r1.ebuild:
+  Stable on amd64, bug #68564
+
+  25 Oct 2004; Jason Wever <weeve@gentoo.org> apache-1.3.32-r1.ebuild:
+  Stable on sparc wrt security bug #68564.
+
+*apache-1.3.32-r1 (25 Oct 2004)
+
+  25 Oct 2004; Rob Holland <tigger@gentoo.org> +apache-1.3.32-r1.ebuild:
+  Security fix. #68564. Work done on behalf of stuart@gentoo.org
+
+*apache-1.3.32 (23 Oct 2004)
+
+  23 Oct 2004; Stuart Herbert <stuart@gentoo.org> +apache-1.3.32.ebuild:
+  Version bump
+
+  15 Oct 2004; Danny van Dyk <kugelfang@gentoo.org> apache-2.0.52.ebuild:
+  Marked stable on amd64.
+
+  14 Oct 2004; Hardave Riar <hardave@gentoo.org> apache-2.0.52.ebuild:
+  stable on mips, bug #66807
+
+  13 Oct 2004; Olivier Crete <tester@gentoo.org> apache-2.0.52.ebuild:
+  Marking stable on x86 wrt security bug #66807
+
+  09 Oct 2004; Tom Gall <tgall@gentoo.org> apache-2.0.52.ebuild:
+  stable on ppc64, bug #66807
+
+  09 Oct 2004; <SeJo@gentoo.org> apache-2.0.52.ebuild:
+  stable ppc gsla: 66807
+
+  09 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> apache-2.0.52.ebuild:
+  Stable on alpha, bug 66807.
+
+*apache-2.0.52 (08 Oct 2004)
+
+  08 Oct 2004; Jason Wever <weeve@gentoo.org> apache-2.0.52.ebuild:
+  Stable on sparc wrt security bug #66807.
+
+  23 Sep 2004; Olivier Crete <tester@gentoo.org> apache-2.0.51-r1.ebuild:
+  Stable on x86 wrt security bug #64804
+
+  22 Sep 2004; Bryan Østergaard <kloeri@gentoo.org>
+  apache-2.0.51-r1.ebuild:
+  Stable on alpha, bug 64804.
+
+  22 Sep 2004; Joshua Kinard <kumba@gentoo.org> apache-2.0.51-r1.ebuild:
+  Marked stable on mips.
+
+  21 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org> apache-2.0.51-r1.ebuild:
+  Stable on sparc wrt #64804
+
+  21 Sep 2004; Stuart Herbert <stuart@gentoo.org> apache-2.0.51-r1.ebuild,
+  apache-2.0.51.ebuild:
+  Added dep on autconf-2.59-r4; fixes bug #64365; thanks to Thomas Stein
+  <himbeere@leowol.com> for the fix
+
+  21 Sep 2004; <SeJo@gentoo.org> apache-2.0.51-r1.ebuild:
+  stable on ppc gsla bug: 64804
+
+*apache-2.0.51-r1 (21 Sep 2004)
+
+  21 Sep 2004; Stuart Herbert <stuart@gentoo.org> +apache-2.0.51-r1.ebuild:
+  Added security patch from UPSTREAM for security issue CAN-2004-0811; thanks to
+  chipig for the heads up
+
+  17 Sep 2004; Bryan Østergaard,,, <kloeri@gentoo.org> apache-2.0.51.ebuild:
+  Stable on alpha.
+
+  16 Sep 2004; Stephen P. Becker <geoman@gentoo.org> apache-2.0.51.ebuild:
+  Stable on mips.
+
+  16 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org> apache-2.0.51.ebuild:
+  Stable on ppc64 wrt #62626 #63948 #64145 and Stuart
+
+  16 Sep 2004; Guy Martin <gmsoft@gentoo.org> apache-2.0.51.ebuild:
+  Stable on hppa.
+
+  16 Sep 2004; Danny van Dyk <kugelfang@gentoo.org> apache-2.0.51.ebuild:
+  Marked stable on amd64.
+
+  16 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org> apache-2.0.51.ebuild:
+  Stable on sparc wrt #62626
+
+  16 Sep 2004; Stuart Herbert <stuart@gentoo.org> apache-2.0.51.ebuild:
+  Stable on x86
+
+  16 Sep 2004; <SeJo@gentoo.org> apache-2.0.51.ebuild:
+  stable ppc bug: 62626
+
+  16 Sep 2004; Stuart Herbert <stuart@gentoo.org> -apache-2.0.49-r3.ebuild,
+  -apache-2.0.49-r4.ebuild, -apache-2.0.50-r1.ebuild,
+  -apache-2.0.50-r2.ebuild, -apache-2.0.50-r3.ebuild, -apache-2.0.50.ebuild:
+  Obsolete version; removed by eversionrm tool
+
+  16 Sep 2004; Stuart Herbert <stuart@gentoo.org> -apache-2.0.49-r3.ebuild,
+  -apache-2.0.49-r4.ebuild, -apache-2.0.50-r1.ebuild,
+  -apache-2.0.50-r2.ebuild, -apache-2.0.50.ebuild:
+  Obsolete version; removed by eversionrm tool
+
+  16 Sep 2004; Stuart Herbert <stuart@gentoo.org> -apache-2.0.49-r3.ebuild,
+  -apache-2.0.49-r4.ebuild, -apache-2.0.50-r1.ebuild, -apache-2.0.50.ebuild:
+  Obsolete version; removed by eversionrm tool
+
+  16 Sep 2004; Stuart Herbert <stuart@gentoo.org> -apache-2.0.49-r3.ebuild,
+  -apache-2.0.49-r4.ebuild, -apache-2.0.50.ebuild:
+  Obsolete version; removed by eversionrm tool
+
+  16 Sep 2004; Stuart Herbert <stuart@gentoo.org> -apache-2.0.49-r3.ebuild,
+  -apache-2.0.49-r4.ebuild:
+  Obsolete version; removed by eversionrm tool
+
+  16 Sep 2004; Stuart Herbert <stuart@gentoo.org> -apache-2.0.49-r3.ebuild:
+  Obsolete version; removed by eversionrm tool
+
+*apache-2.0.51 (15 Sep 2004)
+
+  15 Sep 2004; Stuart Herbert <stuart@gentoo.org> +apache-2.0.51.ebuild:
+  Version bump
+
+  15 Sep 2004; Danny van Dyk <kugelfang@gentoo.org> apache-2.0.50-r3.ebuild:
+  Stable on amd64. BUG #62626.
+
+  14 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org> apache-2.0.50-r3.ebuild:
+  Stable on sparc wrt #62626 take 2, #63948
+
+  14 Sep 2004; Danny van Dyk <kugelfang@gentoo.org> apache-2.0.50-r2.ebuild:
+  Marked stable on amd64.
+
+  13 Sep 2004; Guy Martin <gmsoft@gentoo.org> apache-2.0.50-r2.ebuild:
+  Stable on hppa.
+
+  13 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org> apache-2.0.50-r2.ebuild:
+  Stable on sparc wrt #62626
+
+*apache-2.0.50-r3 (14 Sep 2004)
+
+  14 Sep 2004; Stuart Herbert <stuart@gentoo.org> +apache-2.0.50-r3.ebuild:
+  Added patch for security issue CAN-2004-0809; see bug #63948
+
+*apache-2.0.50-r2 (13 Sep 2004)
+
+  13 Sep 2004; Stuart Herbert <stuart@gentoo.org> +apache-2.0.50-r2.ebuild:
+  Fix for CAN-2004-0751 (see Gentoo bug #62626)
+
+  08 Sep 2004; Joshua Kinard <kumba@gentoo.org> apache-2.0.50-r1.ebuild:
+  Marked stable on mips.
+
+  09 Sep 2004; Bryan Østergaard <kloeri@gentoo.org> apache-2.0.50-r1.ebuild:
+  Stable on alpha, bug 62626.
+
+  08 Sep 2004; Olivier Crete <tester@gentoo.org> apache-2.0.50-r1.ebuild:
+  Marking stable on x86 per bug 62626
+
+  08 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org> apache-2.0.50-r1.ebuild:
+  Stable on sparc wrt #62626
+
+*apache-2.0.50-r1 (07 Sep 2004)
+
+  07 Sep 2004; Stuart Herbert <stuart@gentoo.org>
+  +files/patches/2.0.50-r1/00_ssl_engine.patch,
+  +files/patches/2.0.50-r1/Readme.PATCHES, +apache-2.0.50-r1.ebuild:
+  Fix for bug #62626
+
+  06 Sep 2004; Ciaran McCreesh <ciaranm@gentoo.org> apache-2.0.49-r3.ebuild,
+  apache-2.0.49-r4.ebuild, apache-2.0.50.ebuild:
+  Switch to use epause and ebeep, bug #62950
+
+  01 Sep 2004; Travis Tilley <lv@gentoo.org> apache-1.3.31-r3.ebuild:
+  stable on amd64
+
+  30 Aug 2004; <solar@gentoo.org> apache-1.3.29-r2.ebuild,
+  apache-1.3.31-r1.ebuild, apache-1.3.31-r2.ebuild, apache-1.3.31-r3.ebuild:
+  QA fix: add whitespace to DEPENDS
+
+  28 Aug 2004; Guy Martin <gmsoft@gentoo.org> apache-1.3.31-r3.ebuild:
+  Marked stable on hppa.
+
+  21 Aug 2004; Joshua Kinard <kumba@gentoo.org> apache-2.0.50.ebuild:
+  Marked stable on mips.
+
+  18 Aug 2004; Jason Wever <weeve@gentoo.org> apache-1.3.31-r3.ebuild:
+  Stable on sparc wrt security bug #59715.
+
+  18 Aug 2004; Hardave Riar <hardave@gentoo.org> apache-1.3.31-r3.ebuild:
+  Stable on mips. Bug #59715
+
+  18 Aug 2004; Aron Griffis <agriffis@gentoo.org> apache-1.3.31-r3.ebuild:
+  stable on alpha and ia64 #59715
+
+  17 Aug 2004; Stuart Herbert <stuart@gentoo.org> apache-1.3.31-r3.ebuild:
+  Stable on x86
+
+  17 Aug 2004; Stuart Herbert <stuart@gentoo.org> apache-1.3.31-r3.ebuild:
+  Fixed problem with looking for a patch in the wrong place
+
+*apache-1.3.31-r3 (17 Aug 2004)
+
+  17 Aug 2004; Stuart Herbert <stuart@gentoo.org> +apache-1.3.31-r3.ebuild:
+  Bumped the mod_ssl patch to match the separate mod_ssl package
+
+  11 Aug 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  apache-2.0.49-r3.ebuild, apache-2.0.49-r4.ebuild:
+  gnuconfig_update in src_unpack
+
+  03 Aug 2004; <agriffis@gentoo.org> apache-1.3.31-r2.ebuild,
+  apache-2.0.50.ebuild:
+  stable on alpha and ia64
+
+  02 Aug 2004; Chuck Short <zul@gentoo.org> apache-2.0.50.ebuild:
+  -doc fix. Closes #50060.
+
+  27 Jul 2004; Chuck Short <zul@gentoo.org> files/00_apache_manual.conf:
+  Added multiviews support for manual. Closes #57792.
+
+  27 Jul 2004; Chuck Short <zul@gentoo.org> apache-2.0.49-r3.ebuild,
+  apache-2.0.49-r4.ebuild, apache-2.0.50.ebuild:
+  Uclibc support. Patch from solar@gentoo.org
+
+  21 Jul 2004; Gustavo Zacarias <gustavoz@gentoo.org> apache-2.0.50.ebuild:
+  Stable on hppa
+
+  10 Jul 2004; Chuck Short <zul@gentoo.org> apache-2.0.50.ebuild:
+  Marked stable for x86 and sparc.
+
+  10 Jul 2004; Chuck Short <zul@gentoo.org> apache-2.0.49-r4.ebuild:
+  Apparently I cant spell.
+
+  09 Jul 2004; Chuck Short <zul@gentoo.org> files/2.0.49/commonapache2.conf:
+  Fixed buglet. Closes #56457.
+
+  09 Jul 2004; Chuck Short <zul@gentoo.org> apache-1.3.29-r2.ebuild,
+  apache-1.3.31-r1.ebuild, apache-1.3.31-r2.ebuild, apache-2.0.49-r3.ebuild,
+  apache-2.0.49-r4.ebuild, apache-2.0.50.ebuild:
+  Added selinux support. Closes #56380.
+
+  07 Jul 2004; Aron Griffis <agriffis@gentoo.org> apache-2.0.49-r4.ebuild:
+  stable on ia64 #5541
+
+  04 Jul 2004; Michael Hanselmann <hansmi@gentoo.org> apache-2.0.49-r4.ebuild:
+  Stable on ppc.
+
+  03 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> apache-2.0.49-r4.ebuild:
+  Stable on alpha, bug #55441.
+
+  02 Jul 2004; Gustavo Zacarias <gustavoz@gentoo.org> apache-2.0.49-r4.ebuild:
+  Stable on hppa
+
+*apache-2.0.50 (02 Jul 2004)
+
+  02 Jul 2004; Chuck Short <zul@gentoo.org> apache-2.0.50.ebuild:
+  Version bump, closes #5570
+  Mod_proxy updates, closes #55599
+
+  29 Jun 2004; Ian Leitch <port001@gentoo.org> apache-2.0.49-r4.ebuild:
+  Marked stable on x86 - #55441
+
+  29 Jun 2004; Ciaran McCreesh <ciaranm@gentoo.org> apache-2.0.49-r4.ebuild:
+  Stable on mips, bug #55441
+
+  29 Jun 2004; Ciaran McCreesh <ciaranm@gentoo.org> apache-2.0.49-r4.ebuild:
+  Stable on sparc, bug #55441
+
+  29 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  apache-2.0.49-r4.ebuild:
+  Stable amd64.  Fixed MANUAL_VERSION.
+
+*apache-2.0.49-r4 (28 Jun 2004)
+
+  28 Jun 2004; Chuck Short <zul@gentoo.org> apache-2.0.49-r4.ebuild:
+  Version bump. Closes #5541.
+  - Added patch to fix apache dos. CAN-2004-0493.
+
+  28 Jun 2004; Chuck Short <zul@gentoo.org> apache-2.0.49-r1.ebuild:
+  Removed old versions.
+
+  25 Jun 2004; Chuck Short <zul@gentoo.org> apache-2.0.49-r3.ebuild:
+  Replaced version berkdb detection with something that is much more smarter.
+  Shamelessly taken from the php.eclass. Closes #54932.
+
+  21 Jun 2004; Danny van Dyk <kugelfang@gentoo.org> apache-1.3.31-r2.ebuild:
+  Marked stable on amd64.
+
+  21 Jun 2004; Luca Barbato <lu_zero@gentoo.org> apache-1.3.31-r2.ebuild:
+  Marked ppc
+
+  19 Jun 2004; Chuck Short <zul@gentoo.org> apache-2.0.49-r2.ebuild,
+  files/patches/2.0.49-r2/00_gentoo_base.patch,
+  files/patches/2.0.49-r2/01_apache_ldap_fixes.patch,
+  files/patches/2.0.49-r2/01_gentoo_cvs_sync.patch,
+  files/patches/2.0.49-r2/01_gentoo_ipv6.patch,
+  files/patches/2.0.49-r2/01_ssl_engine_kernel.patch,
+  files/patches/2.0.49-r2/01_ssl_verify_client.patch,
+  files/patches/2.0.49-r2/03_redhat_xfsz.patch,
+  files/patches/2.0.49-r2/04_ssl_makefile.patch,
+  files/patches/2.0.49-r2/Readme.PATCHES:
+  Ebuild cleanup. -r2 was marked unstable while -r3 was marked stable. Removed
+  -r2.
+
+  19 Jun 2004; Chuck Short <zul@gentoo.org> apache-2.0.49-r3.ebuild,
+  files/patches/2.0.49-r3/00_gentoo_base.patch,
+  files/patches/2.0.49-r3/01_apache_ldap_fixes.patch,
+  files/patches/2.0.49-r3/01_gentoo_cgi.patch,
+  files/patches/2.0.49-r3/01_gentoo_cvs_sync.patch,
+  files/patches/2.0.49-r3/01_gentoo_ipv6.patch,
+  files/patches/2.0.49-r3/01_ssl_engine_kernel.patch,
+  files/patches/2.0.49-r3/01_ssl_verify_client.patch,
+  files/patches/2.0.49-r3/03_redhat_xfsz.patch,
+  files/patches/2.0.49-r3/04_ssl_makefile.patch:
+  Moved patches to mirror://gentoo at seemants request.
+
+  16 Jun 2004; Guy Martin <gmsoft@gentoo.org> apache-1.3.31-r2.ebuild:
+  Marked stable on hppa.
+
+  15 Jun 2004; Brandon Hale <tseng@gentoo.org> apache-1.3.31-r2.ebuild:
+  Stable on x86, bug #53544
+
+  14 Jun 2004; Chuck Short <zul@gentoo.org> files/apachesplitlogfile:
+  Fixed typo.
+
+  13 Jun 2004; Chuck Short <zul@gentoo.org> files/apachesplitlogfile,
+  files/2.0.49/apache2splitlogfile:
+  Added change from Phillip Gaschuetz <pg@corpex.de> Use strtime rather than the
+  date command. Closes #53350.
+
+  12 Jun 2004; Joshua Kinard <kumba@gentoo.org> apache-1.3.31-r2.ebuild:
+  Marked stable on mips.
+
+  12 Jun 2004; Jason Wever <weeve@gentoo.org> apache-1.3.31-r2.ebuild:
+  Stable on sparc wrt bug #53544.
+
+  12 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> apache-1.3.31-r2.ebuild:
+  Stable on alpha, bug #53544.
+
+*apache-1.3.31-r2 (11 Jun 2004)
+
+  11 Jun 2004; Chuck Short <zul@gentoo.org> apache-1.3.31-r2.ebuild,
+  files/patches/1.3.31-r2/00_apache_proxy_security_fix.patch,
+  files/patches/1.3.31-r2/00_gentoo_apachectl.patch,
+  files/patches/1.3.31-r2/00_gentoo_base.patch,
+  files/patches/1.3.31-r2/00_gentoo_db4_detect.patch,
+  files/patches/1.3.31-r2/00_gentoo_suexec_pam.patch:
+  Added patch for mod_proxy security hole. Closes #53544.
+
+  09 Jun 2004; Guy Martin <gmsoft@gentoo.org> apache-1.3.31-r1.ebuild,
+  apache-2.0.49-r3.ebuild:
+  Marked stable on hppa.
+
+  08 Jun 2004; Daniel Ostrow <dostrow@gentoo.org> apache-1.3.31-r1.ebuild,
+  apache-2.0.49-r3.ebuild:
+  Stable on ppc.
+
+  10 Jun 2004; Chuck Short <zul@gentoo.org> apache-2.0.49-r1.ebuild,
+  apache-2.0.49-r2.ebuild, apache-2.0.49-r3.ebuild,
+  files/00_apache_manual.conf:
+  Make apache easier to maintain.
+
+  07 Jun 2004; Aron Griffis <agriffis@gentoo.org> apache-1.3.31-r1.ebuild,
+  apache-2.0.49-r3.ebuild:
+  Stable on ia64
+
+  06 Jun 2004; Chuck Short <zul@gentoo.org> apache-1.3.31-r1.ebuild:
+  mod_rewrite needs db-1.85-r1 to compile properly. Closes #52201.
+
+  06 Jun 2004; Chuck Short <zul@gentoo.org> apache-1.3.31.ebuild:
+  Added dependency on sys-libs/db-1.85-r1.
+
+  06 Jun 2004; Chuck Short <zul@gentoo.org> apache-1.3.29-r1.ebuild:
+  Ebuild cleanup. We dont want 1.3.29-r1.
+
+*apache-1.3.29-r1 (06 Jun 2004)
+
+  06 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  apache-1.3.29-r1.ebuild:
+  resurrect apache-1.3.29-r1.ebuild since the deps for net-www/mod_ssl were
+  broken
+
+  06 Jun 2004; Chuck Short <zul@gentoo.org> apache-2.0.49-r1.ebuild,
+  apache-2.0.49-r2.ebuild, apache-2.0.49-r3.ebuild:
+  Strip out in CFLAGS that apache doesnt like. If you must know apache configure
+  bails out saying that the CFLAGS have changed between the buildconf and
+  configure if there are any extra spaces in the CFLAGS. :-).
+
+  05 Jun 2004; Chuck Short <zul@gentoo.org> apache-1.3.29-r1.ebuild,
+  apache-2.0.48-r4.ebuild, apache-2.0.49.ebuild:
+  Removed old ebuilds.
+
+  03 Jun 2004; Chuck Short <zul@gentoo.org> files/2.0.49/commonapache2.conf,
+  files/conf/commonapache.conf:
+  Added option to execute perl scripts in subdirs. Closes #38130. Option is
+  turned off by default.
+
+  03 Jun 2004; Chuck Short <zul@gentoo.org> apache-1.3.31-r1.ebuild,
+  apache-2.0.49-r3.ebuild:
+  Marked stable for x86.
+
+  03 Jun 2004; Chuck Short <zul@gentoo.org> apache-2.0.49-r3.ebuild,
+  files/patches/2.0.49-r3/00_gentoo_base.patch,
+  files/patches/2.0.49-r3/01_apache_ldap_fixes.patch,
+  files/patches/2.0.49-r3/01_gentoo_cgi.patch,
+  files/patches/2.0.49-r3/01_gentoo_cvs_sync.patch,
+  files/patches/2.0.49-r3/01_gentoo_ipv6.patch,
+  files/patches/2.0.49-r3/01_ssl_engine_kernel.patch,
+  files/patches/2.0.49-r3/01_ssl_verify_client.patch,
+  files/patches/2.0.49-r3/03_redhat_xfsz.patch,
+  files/patches/2.0.49-r3/04_ssl_makefile.patch:
+  Changed patch location.
+
+  02 Jun 2004; Danny van Dyk <kugelfang@gentoo.org> apache-1.3.31-r1.ebuild,
+  apache-2.0.49-r3.ebuild:
+  Marked stable on amd64.
+
+  01 Jun 2004; Tom Gall <tgall@gentoo.org> apache-2.0.49-r3.ebuild:
+  marked stable on ppc64, bug #52719 
+
+  01 Jun 2004; Joshua Kinard <kumba@gentoo.org> apache-1.3.31-r1.ebuild,
+  apache-2.0.49-r3.ebuild:
+  Marked stable on sparc and mips.
+
+  02 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> apache-1.3.31-r1.ebuild,
+  apache-2.0.49-r3.ebuild:
+  Stable on alpha, bug 51368.
+
+  01 Jun 2004; Grant Goodyear <g2boojum@gentoo.org> apache-2.0.49-r3.ebuild:
+  Fixed ebuild to use the -r2 patch directory for patches.
+
+*apache-2.0.49-r3 (01 Jun 2004)
+
+  01 Jun 2004; Chuck Short <zul@gentoo.org> apache-2.0.49-r3.ebuild:
+  Version bump.
+
+  29 May 2004; Chuck Short <zul@gentoo.org>
+  files/patches/1.3.31-r1/00_gentoo_apachectl.patch,
+  files/patches/1.3.31-r1/00_gentoo_base.patch,
+  files/patches/1.3.31-r1/00_gentoo_db4_detect.patch,
+  files/patches/1.3.31-r1/00_gentoo_suexec_pam.patch:
+  Re-added patches for 1.3.31-r1.
+
+  29 May 2004; Chuck Short <zul@gentoo.org> apache-2.0.49-r1.ebuild,
+  apache-2.0.49-r2.ebuild, apache-2.0.49.ebuild,
+  files/httpd-2.0.49-ssl_engine_kernel.patch,
+  files/patches/2.0.49-r1/01_ssl_engine_kernel.patch,
+  files/patches/2.0.49-r2/01_ssl_engine_kernel.patch:
+  Added ssl patch. Helps close #51368.
+
+*apache-1.3.31-r1 (29 May 2004)
+
+  29 May 2004; Chuck Short <zul@gentoo.org> apache-1.3.31-r1.ebuild:
+  Version bump, to use the new mod_ssl whitch takes cares of some security
+  holes. See #51638.
+
+  26 May 2004; Stuart Herbert <stuart@gentoo.org> apache-2.0.49-r1.ebuild,
+  apache-2.0.49-r2.ebuild, files/patches/2.0.49-r1/04_ssl_makefile.patch,
+  files/patches/2.0.49-r1/Readme.PATCHES,
+  files/patches/2.0.49-r2/04_ssl_makefile.patch,
+  files/patches/2.0.49-r2/Readme.PATCHES:
+  Fix for bug #52065; thanks to tigger^ for the details
+
+  25 May 2004; Danny van Dyk <kugelfang@gentoo.org> apache-1.3.31.ebuild:
+  Marked stable on amd64.
+
+  25 May 2004; Guy Martin <gmsoft@gentoo.org> apache-1.3.31.ebuild:
+  Marked stable on hppa.
+
+  25 May 2004; Chuck Short <zul@gentoo.org> apache-2.0.49-r2.ebuild:
+  Fix repoman error.
+
+  25 May 2004; Chuck Short <zul@gentoo.org> apache-2.0.49-r2.ebuild:
+  Added static support for adding mod_ldap.
+
+  24 May 2004; Bryan Østergaard <kloeri@gentoo.org> apache-1.3.31.ebuild:
+  Stable on alpha.
+
+  23 May 2004; Christian Birchinger <joker@gentoo.org> apache-1.3.31.ebuild:
+  Added sparc stable keyword
+
+  25 May 2004; Chuck Short <zul@gentoo.org> apache-1.3.29-r1.ebuild,
+  apache-1.3.29-r2.ebuild:
+  Updated depends.
+
+  23 May 2004; Luca Barbato <lu_zero@gentoo.org> apache-1.3.31.ebuild:
+  Marked ppc
+
+  23 May 2004; Joshua Kinard <kumba@gentoo.org> apache-1.3.31.ebuild:
+  Marked stable on mips.
+
+  25 May 2004; Chuck Short <zul@gentoo.org> apache-2.0.49-r1.ebuild,
+  apache-2.0.49-r2.ebuild:
+  Fixed possible bug if DATADIR had changed.
+
+  25 May 2004; Chuck Short <zul@gentoo.org> apache-1.3.31.ebuild:
+  Marked stable for x86.
+
+  21 May 2004; Michael McCabe <randy@gentoo.org> apache-2.0.49-r2.ebuild:
+  Stable on s390
+
+  23 May 2004; Chuck Short <zul@gentoo.org> apache-2.0.49-r1.ebuild,
+  apache-2.0.49-r2.ebuild, files/patches/2.0.49-r1/01_apache_ldap_fixes.patch,
+  files/patches/2.0.49-r2/01_apache_ldap_fixes.patch,
+  files/patches/2.0.49-r2/Readme.PATCHES:
+  Added upstream patches for LDAP.
+
+  23 May 2004; Chuck Short <zul@gentoo.org> apache-2.0.49-r1.ebuild,
+  apache-2.0.49-r2.ebuild, files/patches/2.0.49-r1/01_apache_ldap_fixes.patch:
+  Added upstream patches for LDAP. Closes #51683.
+
+  20 May 2004; Joshua Kinard <kumba@gentoo.org> apache-2.0.49-r1.ebuild,
+  apache-2.0.49-r2.ebuild:
+  Added gnuconfig support for mips.
+
+  21 May 2004; Chuck Short <zul@gentoo.org> files/2.0.48-r1/apache2.conf:
+  Commented out the experimental modules for 2.0.48-r1. Closes #51188.
+
+*apache-2.0.49-r2 (21 May 2004)
+
+  21 May 2004; Chuck Short <zul@gentoo.org> apache-2.0.49-r2.ebuild,
+  files/patches/2.0.49-r2/00_gentoo_base.patch,
+  files/patches/2.0.49-r2/01_gentoo_cgi.patch,
+  files/patches/2.0.49-r2/01_gentoo_cvs_sync.patch,
+  files/patches/2.0.49-r2/01_gentoo_ipv6.patch,
+  files/patches/2.0.49-r2/01_ssl_verify_client.patch,
+  files/patches/2.0.49-r2/03_redhat_xfsz.patch,
+  files/patches/2.0.49-r2/Readme.PATCHES:
+  New version.
+  - Bugfixes from upstream.
+  - Added support for large log files. ( > 2GB ).
+  - Added fedora core patches.
+
+  17 May 2004; Chuck Short <zul@gentoo.org> apache-2.0.49-r1.ebuild,
+  apache-2.0.49.ebuild, files/httpd-2.0.49-cgi.patch:
+  Added fix for mod_cgi vulnerability. Closes 29893.
+
+  17 May 2004; Chuck Short <zul@gentoo.org> files/2.0.49/apache2.initd:
+  Fix typo in init script.
+
+  14 May 2004; Joshua Kinard <kumba@gentoo.org> apache-1.3.29-r2.ebuild,
+  apache-2.0.49-r1.ebuild:
+  Marked Stable on mips.
+
+  15 May 2004; Chuck Short <zul@gentoo.org> files/2.0.49/apache2.initd:
+  apache2 init scripts for 2.0.49 now executes /usr/lib/apache2/envvars for
+  apache2 environment variables. If you need to add environments variables for
+  this is the place to do it. Closes #46925 and #30616.
+
+*apache-1.3.31 (12 May 2004)
+
+  12 May 2004; Chuck Short <zul@gentoo.org> apache-1.3.31.ebuild:
+  Re-added EAPI and SHARED_CORE.
+
+  12 May 2004; Chuck Short <zul@gentoo.org> apache-1.3.31.ebuild:
+  To trigger happy. removed.
+
+*apache-1.3.31 (12 May 2004)
+
+  12 May 2004; Chuck Short <zul@gentoo.org> apache-1.3.31.ebuild:
+  - Version bump
+  - Added support for db4.1
+  - Patches are now located in patches/${PV}.
+
+  08 May 2004; David Holm <dholm@gentoo.org> apache-2.0.49-r1.ebuild:
+  Stable on ppc.
+
+  09 May 2004; Chuck Short <zul@gentoo.org>
+  files/patches/1.3.31/00_gentoo_apachectl.patch,
+  files/patches/1.3.31/00_gentoo_base.patch,
+  files/patches/1.3.31/00_gentoo_db4_detect.patch,
+  files/patches/1.3.31/00_gentoo_suexec_pam.patch,
+  files/patches/1.3.31/Readme.PATCHES:
+  Added patches for 1.3.31 in readyness for relase next week.
+
+  06 May 2004; Aron Griffis <agriffis@gentoo.org> apache-2.0.49-r1.ebuild:
+  Stable on ia64
+
+  06 May 2004; Jon Portnoy <avenj@gentoo.org> apache-2.0.49-r1.ebuild :
+  Stable on AMD64.
+
+  07 May 2004; Chuck Short <zul@gentoo.org> apache-2.0.49-r1.ebuild,
+  apache-2.0.49.ebuild:
+  Improved error message on what to do if ./configure failed.
+
+  06 May 2004; Chuck Short <zul@gentoo.org> apache-2.0.49-r1.ebuild:
+  If use docs is enabled make the symlink for apache-manual if not. Dont. The
+  manual is going to be installed anyways because its apart of the setup for
+  apache. Closes #50060.
+
+  06 May 2004; <zul@gentoo.org> apache-1.3.29-r1.ebuild:
+  Added dependency on db. Closes #49556.
+
+  04 May 2004; Jason Wever <weeve@gentoo.org> apache-2.0.49-r1.ebuild:
+  Stable on sparc.
+
+  04 May 2004; Chuck Short <zul@gentoo.org> apache-2.0.49-r1.ebuild:
+  Makeopts fix. Closes #49843.
+
+  04 May 2004; Chuck Short <zul@gentoo.org> files/2.0.49/apache2.initd:
+  Added postgres to init script.
+
+  04 May 2004; Chuck Short <zul@gentoo.org> files/apache.rc6:
+  Added postgres to init script.
+
+  02 May 2004; Chuck Short <zul@gentoo.org> apache-2.0.49-r1.ebuild:
+  Backed out patches.
+
+  02 May 2004; Chuck Short <zul@gentoo.org> apache-2.0.49-r1.ebuild,
+  files/patches/2.0.49-r1/Readme.PATCHES:
+  Updated patches readme.
+
+  02 May 2004; Chuck Short <zul@gentoo.org> apache-2.0.49-r1.ebuild:
+  Marked stable on alpha.
+
+  02 May 2004; Chuck Short <zul@gentoo.org> apache-2.0.49-r1.ebuild,
+  files/patches/2.0.49-r1/00_ssl_engine.patch,
+  files/patches/2.0.49-r1/Readme.PATCHES:
+  Added two patches for ssl issues.
+
+  01 May 2004; Chuck Short <zul@gentoo.org> apache-2.0.49-r1.ebuild:
+  Marked stable for x86.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> apache-1.3.29-r1.ebuild:
+  Add inherit eutils
+
+  29 Apr 2004; Chuck Short <zul@gentoo.org> apache-2.0.49-r1.ebuild:
+  Added support for the apache-manual wrapper. To enable it. Add "doc" to your
+  use-flags. Closes #48066.
+
+*apache-1.3.29-r2 (26 Apr 2004)
+
+  26 Apr 2004; Chuck Short <zul@gentoo.org> apache-1.3.29-r2.ebuild,
+  files/apache-1.3.29-usertrack_bug.patch:
+  Ebuild cleanup. Added workaround patch work CookieName patch.
+
+  24 Apr 2004; Chuck Short <zul@gentoo.org> apache-2.0.48-r4.ebuild,
+  apache-2.0.49-r1.ebuild, apache-2.0.49.ebuild:
+  Added get_number_of_jobs to make sure that makeopts are sane. Closes #38299.
+
+  23 Apr 2004; Chuck Short <zul@gentoo.org>
+  files/apache-1.3.27_db4_gentoo.patch:
+  Updated 1.3.29 db4 patch to support db4.1. Closes #48795.
+
+  22 Apr 2004; Chuck Short <zul@gentoo.org> files/apachesplitlogfile:
+  Fixed error message in apachesplitlogfiles to make it more understandable.
+  Closes #48499.
+
+  20 Apr 2004; Chuck Short <zul@gentoo.org> files/common/config.layout:
+  Fix another typo.
+
+  20 Apr 2004; Chuck Short <zul@gentoo.org> apache-2.0.48-r4.ebuild:
+  Fixes qa issue in 48335.
+
+  20 Apr 2004; Chuck Short <zul@gentoo.org> apache-2.0.49-r1.ebuild:
+  Changed --with-random to --with-devrandom, closes #48432.
+
+  17 Apr 2004; Chuck Short <zul@gentoo.org> apache-2.0.49-r1.ebuild:
+  Reverted back to install syntax for /var/log/apache2. Closes #48063.
+
+  16 Apr 2004; Chuck Short <zul@gentoo.org> files/2.0.49/commonapache2.conf:
+  Fixed typo, closes #46028.
+
+  15 Apr 2004; Chuck Short <zul@gentoo.org> files/2.0.49/commonapache2.conf:
+  Added mod_perl2 support to commonapache2.conf. Closes #33149.
+
+  15 Apr 2004; Chuck Short <zul@gentoo.org> apache-2.0.49-r1.ebuild:
+  Added missing ipv6 patch.
+
+*apache-2.0.49-r1 (15 Apr 2004)
+
+  15 Apr 2004; Chuck Short <zul@gentoo.org> apache-2.0.49-r1.ebuild,
+  files/httpd-2.0.49-ipv6.patch, files/common/apr-config.layout,
+  files/common/apr-util-config.layout, files/common/config.layout:
+  Version bump.
+  Bunch of fixes for reported bugs with apache:
+  - Added ipv6 patch. Closes 42007.
+  - Added UserDIR detection. Closes #46772.
+  - Added the threads use flag. Closes #35568.
+  - Added berkely db version detection. Closes #39562.
+  Ebuild cleanus as well.
+
+  10 Apr 2004; Chuck Short <zul@gentoo.org> files/apache2:
+  Improved apache2 rottelog format.
+
+  09 Apr 2004; Robin H. Johnson <robbat2@gentoo.org> apache-1.3.27-r3.ebuild,
+  apache-1.3.27-r4.ebuild, apache-1.3.28-r1.ebuild, apache-1.3.28.ebuild,
+  apache-1.3.29.ebuild, apache-2.0.46.ebuild, apache-2.0.47-r1.ebuild,
+  apache-2.0.47.ebuild, apache-2.0.48-r1.ebuild, apache-2.0.48-r2.ebuild,
+  apache-2.0.48-r3.ebuild, apache-2.0.48.ebuild,
+  files/apache-1.3.28-zombie-cgi.patch, files/apache-2.0.44-gentoo.diff,
+  files/apache-2.0.45-gentoo.diff, files/apache-2.0.46-gentoo.diff,
+  files/apache-2.0.47-gentoo.diff:
+  remove old ebuilds, keep latest stable and unstable for each arch
+
+  09 Apr 2004; Joshua Kinard <kumba@gentoo.org> apache-1.3.29-r1.ebuild,
+  apache-2.0.49.ebuild:
+  Marked stable on mips.
+
+  08 Apr 2004; Stuart Herbert <stuart@gentoo.org> files/2.0.49/apache2.initd:
+  Fix for bug #44559 - problems with apache2 init script
+
+  05 Apr 2004; Chuck Short <zul@gentoo.org> apache-2.0.48-r1.ebuild,
+  apache-2.0.48-r2.ebuild, apache-2.0.48-r3.ebuild, apache-2.0.48-r4.ebuild,
+  apache-2.0.48.ebuild, files/httpd-2.0.48-ipv6.patch:
+  Fixed IPV6 start error. IPV6 works as expected under 2.0.48. Closes #32389.
+
+  04 Apr 2004; Chuck Short <zul@gentoo.org> files/apache.confd,
+  files/apache.rc6:
+  Keep the $PERL5LIB sane when starting apache. Closes #34615.
+
+  04 Apr 2004; Chuck Short <zul@gentoo.org> files/conf/apache.conf:
+  Added LimitRequestBody directive, commented out ofcourse, since it 
+  might affect other applications if it wasnt. Closes #34516.
+
+  03 Apr 2004; Chuck Short <zul@gentoo.org> apache-2.0.48.ebuild,
+  files/conf/commonapache.conf:
+  Added multiviews for /usr/share/doc. Closes #30862.
+
+  02 Apr 2004; Robin H. Johnson <robbat2@gentoo.org> apache-2.0.49.ebuild:
+  fix bug #46585.
+
+  02 Apr 2004; Chuck Short <zul@gentoo.org> apache-2.0.49.ebuild,
+  files/apache2:
+  Added apache2 log rotate. Closes #42537.
+
+  01 Apr 2004; Chuck Short <zul@gentoo.org> metadata.xml:
+  Updated metadata.xml.
+
+  01 Apr 2004; Chuck Short <zul@gentoo.org> apache-1.3.29.ebuild:
+  mod_db_auth patch backported to apache_1.3.29.
+  Closes #43558.
+
+  01 Apr 2004; Chuck Short <zul@gentoo.org> apache-1.3.29-r1.ebuild,
+  files/apache-1.3.29_mod_auth_db.patch:
+  Added patch so that mod_auth_db will compile with db4.1 and above. This patch
+  should not be needed in the next release.
+
+  29 Mar 2004; Chuck Short <zul@gentoo.org> files/conf/Vhosts.conf:
+  Fixed typo in Vhosts.conf config file, closes #34335.
+
+  28 Mar 2004; <randy@gentoo.org> apache-2.0.48-r4.ebuild:
+  adding s390 keywords
+
+  26 Mar 2004; <zul@gentoo.org> files/2.0.49/gentestcrt.sh:
+  Copied missing gentestcrt.sh from ${FILESDIR}/2.0.40. Closes #45786.
+
+  26 Mar 2004; Robin H. Johnson <robbat2@gentoo.org>
+  files/2.0.49/apache2.initd:
+  fix bug #45774.
+
+  24 Mar 2004; Chris Aniszczyk <zx@gentoo.org> apache-2.0.49.ebuild:
+  Marking stable on hppa.
+
+  23 Mar 2004; Brandon Hale <tseng@gentoo.org> apache-2.0.49.ebuild:
+  Marked stable on x86 for Ms. A Escriva-Sammer. Hugs all around.
+
+  23 Mar 2004; Aron Griffis <agriffis@gentoo.org> apache-2.0.49.ebuild:
+  stable on alpha and ia64
+
+  23 Mar 2004; Luca Barbato <lu_zero@gentoo.org> apache-2.0.49.ebuild:
+  Stable on ppc
+
+  22 Mar 2004; Jon Portnoy <avenj@gentoo.org> apache-2.0.49.ebuild :
+  Stable on AMD64.
+
+*apache-2.0.49 (22 Mar 2004)
+
+  22 Mar 2004; Jason Wever <weeve@gentoo.org> apache-2.0.49.ebuild:
+  Marked stable on sparc wrt bug #45206.
+
+  22 Mar 2004; Stuart Herbert <stuart@gentoo.org>
+  files/2.0.49/40_mod_ssl.conf, files/2.0.49/41_mod_ssl.default-vhost.conf,
+  files/2.0.49/45_mod_dav.conf, files/2.0.49/46_mod_ldap.conf,
+  files/2.0.49/apache2-builtin-mods, files/2.0.49/apache2.conf,
+  files/2.0.49/apache2.confd, files/2.0.49/apache2.initd,
+  files/2.0.49/apache2logserverstatus, files/2.0.49/apache2splitlogfile,
+  files/2.0.49/commonapache2.conf, files/2.0.49/dynamic-vhosts.conf,
+  files/2.0.49/vhosts.conf, files/2.0.49/virtual-homepages.conf:
+  Version bump - fixes security bug 45206, and bug #45418
+  
+  Updated ebuild to no longer rely on files in files/2.0.40 directory.  We
+  can get rid of that once we're happy that this ebuild is stable.
+  
+  Changed the vhosts configuration.  Now ships with all vhost config files
+  commented out by default.
+
+  Fixed the 'has_version in global scope' warning.
+
+  11 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  apache-1.3.29-r1.ebuild:
+  ppc64 needs dev-libs/mm first
+
+  06 Feb 2004; Lars Weiler <pylon@gentoo.org> apache-2.0.48-r4.ebuild:
+  Tested on ppc.  Making stable.
+
+*apache-2.0.48-r4 (28 Jan 2004)
+
+  28 Jan 2004; Robin H. Johnson <robbat2@gentoo.org> apache-2.0.48-r4.ebuild:
+  fix bug #39027 for old versions of portage.
+
+  20 Jan 2004; Robin H. Johnson <robbat2@gentoo.org>
+  files/2.0.48-r1/apache2.initd:
+  fix bug #38787, remember to always update your conf.d files!
+  
+  19 Jan 2004; <tuxus@gentoo.org> apache-1.3.29-r1.ebuild:
+  Added ~mips to KEYWORDS.
+
+  17 Jan 2004; Robin H. Johnson <robbat2@gentoo.org>
+  files/2.0.48-r1/apache2.initd:
+  add some catches/warnings to .48-r2 init.d script
+
+*apache-2.0.48-r3 (18 Jan 2004)
+
+  18 Jan 2004; rob holland <tigger@gentoo.org> apache-2.0.48-r1.ebuild,
+  apache-2.0.48-r3.ebuild, files/apache-2.0.48-export.diff:
+  Added export patch to fix compilation on some boxes. #32588.
+  Reported by marco@md2.ath.cx. Pointer from Chris Nott.
+
+  14 Jan 2004; Robin H. Johnson <robbat2@gentoo.org> apache-1.3.27-r3.ebuild,
+  apache-1.3.27-r4.ebuild, apache-1.3.28-r1.ebuild, apache-1.3.28.ebuild,
+  apache-1.3.29-r1.ebuild, apache-1.3.29.ebuild, apache-2.0.46.ebuild,
+  apache-2.0.47-r1.ebuild, apache-2.0.47.ebuild, apache-2.0.48-r1.ebuild,
+  apache-2.0.48-r2.ebuild, apache-2.0.48.ebuild:
+  fix bug #38040. cleanup all apache2 DEPENDS to block mips from ldap until they
+  have openldap supported.
+
+*apache-2.0.48-r2 (12 Jan 2004)
+
+  12 Jan 2004; Robin H. Johnson <robbat2@gentoo.org> apache-2.0.48-r2.ebuild,
+  files/2.0.48-r1/apache2.conf, files/2.0.48-r1/apache2.confd,
+  files/2.0.48-r1/apache2.initd, files/2.0.48-r1/commonapache2.conf:
+  change ServerRoot to /usr/lib/apache2 to get rid of all access to binaries via
+  /etc. fix bug #37962 by improving the init/conf files.
+
+  10 Jan 2004; <agriffis@gentoo.org> apache-1.3.29-r1.ebuild,
+  apache-2.0.48-r1.ebuild:
+  stable on ia64
+
+  25 Dec 2003; Robin H. Johnson <robbat2@gentoo.org> apache-1.3.27-r3.ebuild,
+  apache-1.3.27-r4.ebuild, apache-1.3.28-r1.ebuild, apache-1.3.28.ebuild,
+  apache-1.3.29-r1.ebuild, apache-1.3.29.ebuild:
+  change to keepdir as per bug #35308
+
+  15 Dec 2003; Guy Martin <gmsoft@gentoo.org> apache-2.0.48-r1.ebuild:
+  Marked stable on hppa.
+
+  03 Dec 2003; Robin H. Johnson <robbat2@gentoo.org> apache-2.0.48-r1.ebuild:
+  properly fix bug #32444
+
+  28 Nov 2003; Robin H. Johnson <robbat2@gentoo.org> apache-2.0.48-r1.ebuild:
+  workaround for  bug #32444 - disable SCTP support
+
+  19 Nov 2003; Daniel Robbins <drobbins@gentoo.org> apache-1.3.29-r1.ebuild:
+  unmasking on all arches so we can get out the much-delayed GLSA 200310-03.
+  
+  16 Nov 2003; Aron Griffis <agriffis@gentoo.org> apache-2.0.48-r1.ebuild:
+  Stable on alpha
+
+*apache-1.3.29-r1 (04 Nov 2003)
+*apache-2.0.48-r1 (04 Nov 2003)
+
+  04 Nov 2003; Donny Davies <woodchip@gentoo.org> apache-1.3.29-r1.ebuild,
+  apache-2.0.48-r1.ebuild:
+  Fix/close #32361.
+
+*apache-1.3.29 (02 Nov 2003)
+
+  02 Nov 2003; Martin Holzer <mholzer@gentoo.org> apache-1.3.29.ebuild:
+  Version bumped.
+
+  31 Oct 2003; Jason Wever <weeve@gentoo.org> apache-2.0.48.ebuild:
+  Marked stable on sparc in accordance with GLSA 200310-04.
+
+  30 Oct 2003; Robin H. Johnson <robbat2@gentoo.org> apache-2.0.48.ebuild:
+  fix for bug #24215, be aware that it may break on non-Linux Portage.
+
+  30 Oct 2003; Rajiv Aaron Manglani <rajiv@gentoo.org> files/apache.rc6,
+  files/2.0.40/apache2.initd:
+  initscript fixes.
+
+  30 Oct 2003; Donny Davies <woodchip@gentoo.org> files/apache.rc6,
+  files/2.0.40/apache2.initd:
+  Fixo; Use full path to start-stop-daemon.  Thanks klieber.
+
+*apache-2.0.48 (30 Oct 2003)
+
+  30 Oct 2003; Donny Davies <woodchip@gentoo.org> apache-2.0.48.ebuild,
+  files/apache-2.0.48-gentoo.diff, files/2.0.40/40_mod_ssl.conf,
+  files/2.0.40/apache2-builtin-mods, files/2.0.40/apache2.initd,
+  files/2.0.40/vhosts.con, files/apache.rc6:
+  Bump for security fixes.  Remove dupe 'mod_alias' from apache2-builtin-mods.
+  Re-diff our patch; added two mod_ssl fixes from Rawhide and fix hardcoded
+  path to /usr/sbin/suexec2.  Fix/close #31427, #32035, #31787, #31503, #30161.
+  Added comments to the patchfile (please maintain these).
+
+  30 Oct 2003; Jason Wever <weeve@gentoo.org> apache-2.0.47.ebuild:
+  Marked stable for sparc.
+
+  16 Oct 2003; Paul de Vrieze <pauldv@gentoo.org> apache-1.3.28-r1.ebuild,
+  files/apache-1.3.27_db4_gentoo.patch:
+  Make sure that a db version lower than 4.1 is installed and fix the checking
+  script to get the right headers.
+
+  06 Oct 2003; Jason Wever <weeve@gentoo.org> apache-1.3.28.ebuild:
+  Marked stable for sparc.
+
+  04 Oct 2003; Brad House <brad_mssw@gentoo.org> apache-1.3.28.ebuild:
+  add ~amd64 flag
+
+  29 Sep 2003; Donny Davies <woodchip@gentoo.org> apache-1.3.28.ebuild,
+  metadata.xml:
+  Add metadata and repoman fix.
+
+  29 Sep 2003; Donny Davies <woodchip@gentoo.org> apache-1.3.27-r4.ebuild,
+  apache-1.3.28.ebuild, apache-2.0.46.ebuild, apache-2.0.47.ebuild:
+  Cleanup for #29843.
+
+*apache-1.3.28-r1 (27 Sep 2003)
+
+  27 Sep 2003; Donny Davies <woodchip@gentoo.org> apache-1.3.28-r1.ebuild,
+  files/apache-1.3.27_db4_gentoo.patch, files/apache-1.3.28-zombie-cgi.patch,
+  files/apache.rc6, files/2.0.40/apache2.confd,
+  files/2.0.40/commonapache2.conf, files/conf/apache.conf,
+  files/conf/commonapache.conf:
+  Move --datadir to /var/www/localhost; prepare for the upcoming vhost-config
+  and webapp-config tools.  Added patches to fix #26632 and #29124.  Hopefully
+  fix #28552 and #28619.  Fix #29606 and #29329.
+
+*apache-2.0.47-r1 (24 Sep 2003)
+
+  24 Sep 2003; Donny Davies <woodchip@gentoo.org> apache-2.0.47-r1.ebuild,
+  files/apache-2.0.47-gentoo.diff, files/2.0.40/41_mod_ssl.default-vhost.conf,
+  files/2.0.40/apache2.conf, files/2.0.40/apache2.confd,
+  files/2.0.40/apache2.initd, files/2.0.40/commonapache2.conf:
+  Fix #25258, #25999.  Add RH patches to fix parallel build and *.conf crash.
+  Move --datadir to /var/www/localhost; prepare for the upcoming vhost-config
+  and webapp-config tools.
+
+  25 Aug 2003; Jason Wever <weeve@gentoo.org> apache-1.3.27-r3.ebuild,
+  apache-1.3.27-r4.ebuild, apache-1.3.28.ebuild, apache-2.0.46.ebuild,
+  apache-2.0.47.ebuild:
+  Added AcceptMutex fixes for sparcs for bug #7172.
+
+  26 Jul 2003; Donny Davies <woodchip@gentoo.org> apache-1.3.28.ebuild:
+  Fix #25212.  Mark x86 stable.
+
+*apache-1.3.28 (23 Jul 2003)
+
+  25 Jul 2003; Guy Martin <gmsoft@gentoo.org> apache-1.3.28.ebuild :
+  Marked stable on hppa.
+
+  23 Jul 2003; Donny Davies <woodchip@gentoo.org> apache-1.3.28.ebuild:
+  Security update.  Will un-arch-mask after a few "it works for me" reports.
+
+  20 Jul 2003; Donny Davies <woodchip@gentoo.org>
+  files/2.0.40/commonapache2.conf:
+  Close #24627, two smallish typos.
+
+  14 Jul 2003; Donny Davies <woodchip@gentoo.org> apache-2.0.47.ebuild:
+  Re-add dev-util/yacc; modules/ssl calls yacc on modules/ssl/ssl_expr_parse.y
+
+  12 Jul 2003; Donny Davies <woodchip@gentoo.org> apache-2.0.47.ebuild:
+  Marked x86 stable.
+
+  11 Jul 2003; Donny Davies <woodchip@gentoo.org> apache-1.3.27-r4.ebuild,
+  files/apache-1.3.27-apachectl.patch:
+  Tidy the user/group bits and apachectl.
+
+  11 Jul 2003; Donny Davies <woodchip@gentoo.org> files/apache.rc6,
+  files/2.0.40/apache2.initd:
+  Close #23854.
+
+*apache-2.0.47 (09 Jul 2003)
+
+  25 Jul 2003; Guy Martin <gmsoft@gentoo.org> apache-2.0.47.ebuild :
+  Marked stable on hppa.
+
+  09 Jul 2003; Mike Frysinger <vapier@gentoo.org> :
+  Filter out largefile support on glibc-2.2.x
+
+  09 Jul 2003; Donny Davies <woodchip@gentoo.org> apache-1.3.27-r1.ebuild,
+  apache-1.3.27-r2.ebuild, apache-1.3.27.ebuild, apache-2.0.43-r1.ebuild,
+  apache-2.0.44.ebuild, apache-2.0.45.ebuild, apache-2.0.47.ebuild:
+  Bump to latest release.  Remove dev-util/yacc from DEPEND (I dont see
+  what needs this).  Cosmetic clean-up of certificate creation message.
+
+  22 Jun 2003; Paul de Vrieze <pauldv@gentoo.org> apache-1.3.27-r4.ebuild:
+  Fix the compilation with versioned symbols in db
+
+  17 Jun 2003; Donny Davies <woodchip@gentoo.org> apache-2.0.46.ebuild:
+  Close #13191; GNU deprecated the -1 shortcuts (/me shakes head).
+  Add fixes to use `getent' instead of grepping through /etc/{passwd,group}.
+
+*apache-2.0.46 (28 May 2003)
+
+  04 Jun 2003; Donny Davies <woodchip@gentoo.org> apache-2.0.46.ebuild:
+  Close #12637.
+
+  28 May 2003; Donny Davies <woodchip@gentoo.org> Manifest, apache-2.0.46.ebuild,
+  files/apache-2.0.46-gentoo.diff:
+  Chase latest release; re-diff the patch.
+
+*apache-2.0.45 (06 Apr 2003)
+
+  22 May 2003; Donny Davies <woodchip@gentoo.org> commonapache2.conf:
+  Close #12006.
+
+  06 Apr 2003; Donny Davies <woodchip@gentoo.org> apache-2.0.45.ebuild,
+  files/apache-2.0.45-gentoo.diff, files/2.0.40/40_mod_ssl.conf,
+  files/2.0.40/apache2.initd, files/2.0.40/commonapache2.conf:
+  New version.  Added optional ldap mods, couple of small config
+  file cleanups.  Fix bugs #17651, 17145. 
+
+*apache-1.3.27-r4 (23 Feb 2003)
+
+  26 Mar 2003; Thomas Raschbacher <lordvan@gentoo.org> apache-1.3.27-r[34].ebuild:
+  changed mod_ssl_ver to 2.8.14 fixing bug #18172
+  changed mod_ssl_ver in -r4 so that it doesn't contain apache version for ipv6 patch use
+	
+  25 Feb 2003; Donny Davies <woodchip@gentoo.org> apache.rc6, apache2.initd :
+  Send USR1 signal only to parent in reload(); #16326.
+
+  12 Mar 2003; Zach Welch <zwelch@gentoo.org> apache-1.3.27-r4.ebuild:
+  add arm keyword
+
+  23 Feb 2003; Martin Holzer <mholzer@gentoo.org> apache-1.3.27-r4.ebuild files/digest-apache-1.3.27-r4 ChangeLog :
+  Added openssl to DEPEND.
+
+  24 Feb 2003; Martin Holzer <mholzer@gentoo.org> apache-1.3.27-r4.ebuild ChangeLog :
+  Removed Changes done from -r2 to -r4.
+
+*apache-1.3.27-r3 (23 Feb 2003)
+
+  24 Feb 2003; Martin Holzer <mholzer@gentoo.org> apache-1.3.27-r3.ebuild ChangeLog :
+  Removed Changes done from -r1 to -r3.
+
+  23 Feb 2003; Martin Holzer <mholzer@gentoo.org> apache-1.3.27-r3.ebuild files/digest-apache-1.3.27-r3 ChangeLog :
+  Added openssl to DEPEND.
+
+  23 Feb 2003; Donny Davies <woodchip@gentoo.org> :
+  Fix #14561, #14589, #14724, #14818, #15592, #15806, #16158.
+
+*apache-2.0.44 (21 Jan 2003)
+
+  26 Mar 2003; Jason Wever <weeve@gentoo.org> apache-2.0.44.ebuild:
+  Added ~sparc to keywords.
+
+  15 Mar 2003; Jan Seidel <tuxus@gentoo.org> :
+  Added ~mips to KEYWORDS
+
+  18 Feb 2003;  <seemant@gentoo.org> apache-2.0.44.ebuild :
+  added yacc as a DEPEND
+
+  12 Feb 2003; Guy Martin <gmsoft@gentoo.org> :
+  Added hppa to keywords.
+
+  21 Jan 2003; Donny Davies <woodchip@gentoo.org> apache-2.0.44.ebuild,
+  commonapache2.conf :  Version bump, #14300, add fix for #13152, close #13304.
+
+*apache-1.3.27-r2 (16 Dec 2002)
+
+  16 Dec 2002; Donny Davies <woodchip@gentoo.org> : #11209; Added pam support
+  to suexec, and ipv6 support/patch. Thanks to Andrey Ulanov <drey@rt.mipt.ru>.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*apache-2.0.43-r1 (28 Nov 2002)
+
+  12 Feb 2003; Seemant Kulleen <seemant@gentoo.org> apache-2.0.43-r1.ebuild :
+  cosmetic fixes
+
+  15 Dec 2002; Bjoern Brauel <bjb@gentoo.org> apache-2.0.43-r1.ebuild :
+  Add alpha to KEYWORDS
+
+  28 Nov 2002; Donny Davies <woodchip@gentoo.org> : Updated layout!
+  Getting closer to fully deprecating Apache1.  Third party module
+  integration is now somewhat simplified; simply install the desired
+  module and edit /etc/conf.d/apache2.  There's no longer the need
+  for the 'ebuild /var/db/pkg/.../foo.ebuild config' dance.  Yay.
+
+*apache-2.0.43 (02 Nov 2002)
+
+  02 Nov 2002; Donny Davies <woodchip@gentoo.org> : Chase latest; #9967.
+
+*apache-1.3.27-r1 (12 Oct 2002)
+
+  12 Oct 2002; Donny Davies <woodchip@gentoo.org> :
+  Added redhat db-4 patch, tweaked sys-libs/db dependency to make things
+  more sane.  Swept up patches into a single diff.  Added (Gentoo/Linux)
+  to the server_version string.  Clean out old junk.  Help out with #8759.
+
+*apache-1.3.27 (06 Oct 2002)
+
+  06 Oct 2002; Nicholas Jones <carpaski@gentoo.org> :
+  GLSA update. Version Bump with files dir moved to gentoo mirrors.
+
+*apache-2.0.40-r1 (04 Sept 2002)
+
+  14 Sep 2002; Nicholas Jones <carpaski@gentoo.org> :
+  Added the capability for a graceful restart. Should ensure that
+  the server, when restarted, actually dies before it's started again.
+
+  04 Sep 2002; Nicholas Jones <carpaski@gentoo.org> :
+  Made it path compliant. Fixed the modules files. Fixed the init.d and
+  conf.d files. Still needs default configs and more tuning.
+
+*apache-2.0.40 (15 Aug 2002)
+
+  15 Aug 2002; Michael J. Cohen <mjc@gentoo.org> :
+  Initial release, needs a few modules cleaned up as well as paths
+
+*apache-1.3.26-r4 (3 Jul 2002)
+
+  02 Oct 2002; Donny Davies <woodchip@gentoo.org> apache-1.3.26-r4.ebuild :
+  Fix for #6149.
+
+  28 Sep 2002; Daniel Ahlberg <aliz@gentoo.org> files/apache.rc6 :
+  Made restart send signal to  apache processes instead of httpd processes. Thanks to ska-fan
+  in #gentoo-dev for finding this.
+
+  19 Sep 2002; Michael Frysinger <vapier@gentoo.org> apache-1.3.26-r4.ebuild files/apache.rc6 :
+  Fixed the grep expressions for DATA_DIR and GID ... #8124
+  Fixed 'use named' (was already added to 2.0.x just not 1.3.x) ... #5556
+
+  17 Sep 2002; Nicholas Jones <carpaski@gentoo.org> :
+  Fixed the graceful restart... It wasn't paying heed to ${APACHE_OPTS}
+
+  14 Sep 2002; Nicholas Jones <carpaski@gentoo.org> :
+  Added the capability for a graceful restart. Should ensure that
+  the server, when restarted, actually dies before it's started again.
+
+  14 Sep 2002; Donny Davies <woodchip@gentoo.org> mime_type_fix :
+  Add x-ogg; #7245.  Cleanup.
+
+  14 Aug 2002; Pieter Van den Abeele <pvdabeel@gentoo.org> :
+  Added ppc keyword
+
+  14 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> apache-1.3.26.ebuild :
+  Added KEYWORDS.
+
+  14 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> apache-1.3.26-r4.ebuild :
+  Added KEYWORDS.
+
+  3 Jul 2002; Brandon Low <lostlogic@gentoo.org> apache-1.3.26-r4.ebuild:
+  Just .keep some directories we make so that they will be handled more 
+  sanely in unmerge and clean operations.
+
+*apache-1.3.26-r3 (2 Jul 2002)
+
+  19 Sep 2002; Michael Frysinger <vapier@gentoo.org> apache-1.3.26-r3.ebuild :
+  Fixed the grep expressions for DATA_DIR ... #8124
+
+  14 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> apache-1.3.26-r3.ebuild :
+  Added KEYWORDS.
+
+  2 Jul 2002; Jon Nelson <jnelson@gentoo.org> apache-1.3.26-r3.ebuild:
+  Basically, move stuff from pkg_setup() to postinst.
+
+*apache-1.3.26-r2 (22 Jun 2002)
+
+  14 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> apache-1.3.26-r2.ebuild :
+  Added KEYWORDS.
+
+  22 Jun 2002; Nicholas Jones <carpaski@gentoo.org> :
+  Bugfix... Configs weren't actually changed properly.
+  Moved sed on DATA_DIR after configs were coppied from ${FILESDIR} 
+
+*apache-1.3.26-r1 (20 Jun 2002)
+
+  14 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> apache-1.3.26-r1.ebuild :
+  Added KEYWORDS.
+
+  20 Jun 2002; Nicholas Jones <carpaski@gentoo.org> :
+  Another attempt at fixing the LDAP user issue. Change the user check.
+  Also added in checks to make sure that DATA_DIR is set.
+
+  Turn 'install-quiet' back on.	
+
+*apache-1.3.26 (19 Jun 2002)
+
+  19 Jun 2002; Nicholas Jones <carpaski@gentoo.org> :
+  The real exploit fix. Also patched a mdk patch so that it applied.
+
+*apache-1.3.24-r6 (18 Jun 2002)
+
+  14 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> apache-1.3.24-r6.ebuild :
+  Added KEYWORDS.
+
+  18 Jun 2002; Nicholas Jones <carpaski@gentoo.org> :
+  ADDED PATCH FOR PROXY-HTTP1.1-CHUNKS EXPLOIT
+  Fixed bug #2313 -- Better checks for group/user
+  Fixed bug #3533 -- User can setup user/group and the homedir
+                     of the apache user will be the data directory
+
+*apache-1.3.24-r2 (4 May 2002)
+
+  14 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> apache-1.3.24-r2.ebuild :
+  Added KEYWORDS.
+
+  4 May 2002; Donny Davies <woodchip@gentoo.org> :
+  Added LICENSE, SLOT, $Headers.
+
+  26 Apr 2002; Donny Davies <woodchip@gentoo.org> :
+  Made the user/group id's 81 in pkg_setup after thusly adding them to
+  Gentoo's baselayout.  No need to upgrade folks; cosmetic-only fix.
+
+  10 Apr 2002; Donny Davies <woodchip@gentoo.org> apache-1.3.24-r1.ebuild,
+  files/conf/commonapache.conf :
+  Corrected the apache user's home directory (/var/www -> /home/httpd).
+  Corrected the icons directory (/var/www/icons -> /home/httpd/icons).
+  Ripped the php mime types from the commonapache.conf file.  I moved
+  them to the php package, as an addon config snippet.
+  (/etc/apache/conf/mod_php.conf)
+
+*apache-1.3.24-r1 (9 Apr 2002)
+
+  9 Apr 2002; Donny Davies <woodchip@gentoo.org> apache-1.3.24-r1.ebuild :
+  data is now in /home/httpd/{htdocs,icons,cgi-bin} (new standard location for Gentoo)
+  server now runs as user/group apache
+  mod_ssl was split into a separate package
+  link with the mm library; provides modules with shared memory pools (EAPI_MM=SYSTEM)
+  link with the system expat library
+  all modules are now built using SHARED_CHAIN (smaller mod sizes)
+  several patches from debian/mandrake are included.  the most interesting one is the
+  mandrake serverroot patch which makes configuring and organizing apache easier.
+  the EAPI patch is now unconditionally included.  previously you only got it if you
+  had ssl in your USE variable.
+  provide an easy way to tune up the HARD_SERVER_LIMIT
+  created a build-time config file for the modules distributed with apache.  now you
+  can finely tune your own modules selection, and have your choices preserved across
+  upgrades.  a gentoo-only feature ;)
+  suexec is now fixed and restricted to user/group apache.
+  added some support scripts (from mandrake).  two of these allow easy addition and
+  removal of third-party modules into your apache.conf.  this should make writing
+  ebuilds for extra mods easier.  see net-www/mod_* for examples.
+  the config files are now in /etc/apache/conf, conveniently organized into
+  separate directories for addon-modules and vhosts.  this simplifies things for
+  everybody and especially for those with complicated/large sites.
+
+*apache-1.3.24 (27 Mar 2002)
+
+  27 Mar 2002; Donny Davies <woodchip@gentoo.org> apache-1.3.24.ebuild :
+  Bump up to apache-1.3.24, mod_ssl-2.8.8; fixes some security issues. This port is
+  being re-written, will be ready soon.
+
+*apache-1.3.23 (4 Feb 2002)
+
+  4 Feb 2002; Donny Davies <woodchip@gentoo.org> apache-1.3.23.ebuild :
+  Bump apache to 1.3.23, mod_ssl to 2.8.6-1.3.23.
+
+*apache-1.3.22-r6 (1 Feb 2002)
+
+  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :  
+  Added initial ChangeLog which should be updated whenever the package is
+  updated in any way. This changelog is targetted to users. This means that the
+  comments should well explained and written in clean English. The details about
+  writing correct changelogs are explained in the skel.ChangeLog file which you
+  can find in the root directory of the portage repository.
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
new file mode 100644
index 000000000000..1b2e40ac65a6
--- /dev/null
+++ b/www-servers/apache/Manifest
@@ -0,0 +1,76 @@
+-----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.2.4-r10-20070712.tar.bz2 57172 RMD160 13da6d348d39ccd9a0fbe48e13e396236b38fa35 SHA1 5a8344af48dc3a3c8095882030ebf5578a899cab SHA256 9e57aa981f7b0e368b898471f92e2bb206c92d173169bcb0fa00dd037d9b36e7
+DIST gentoo-apache-2.2.4-r5-20070605.tar.bz2 57317 RMD160 d5ef8bddc1a470d0a5ef41b1d7d3423054c90626 SHA1 7ff6af17fe342fab96718b7b2fcd4db1c5af1d25 SHA256 507327d1a0029b7583c842b5f9d15a2be54226befe4fe1c32969d267de138363
+DIST gentoo-apache-2.2.4-r7-20070615.tar.bz2 57925 RMD160 973faaa7d64b6b8fc72218082ffdec408efe5e7a SHA1 9d56394d51e3aef09e57a6fe6405ffe688ebcd64 SHA256 307d499a6493cbd63ed85c6af3e79c380628dc7c34655ac2a0f0108851f1e13e
+DIST gentoo-apache-2.2.4-r9-20070710.tar.bz2 57164 RMD160 d23cb1c572a0ebfaf17fe2061ac44334c1cd65ff SHA1 0c35df13b5d71ab4c9fd64d56c99a56caafa585b SHA256 90c54e2fb025fa4d7c85254b2fccc0a0000e85e7e2547de102eafa61ed46618a
+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
+EBUILD apache-2.0.58-r2.ebuild 13830 RMD160 6f33e145d1d9b919749301652a8f6ad47059c380 SHA1 0806125dfeb36c477285b2212974e3e1b6496173 SHA256 284ed961632dc2655ae220e308cc53981aefa8c97052c8c102abff137fe2363e
+MD5 4575698d278d946e976869005edc2b21 apache-2.0.58-r2.ebuild 13830
+RMD160 6f33e145d1d9b919749301652a8f6ad47059c380 apache-2.0.58-r2.ebuild 13830
+SHA256 284ed961632dc2655ae220e308cc53981aefa8c97052c8c102abff137fe2363e apache-2.0.58-r2.ebuild 13830
+EBUILD apache-2.0.59-r2.ebuild 14081 RMD160 4f7f589bc2780bb94142c3cecaf90811f03e28b9 SHA1 2d1c881fddbc1e7e50ce57be40fc2abb32a6ec9a SHA256 60b184e892221e5f62599d97054e12e996d070ec6dac36a5eab0807741fde460
+MD5 9fc0eaceec6ef392bea67f762419538d apache-2.0.59-r2.ebuild 14081
+RMD160 4f7f589bc2780bb94142c3cecaf90811f03e28b9 apache-2.0.59-r2.ebuild 14081
+SHA256 60b184e892221e5f62599d97054e12e996d070ec6dac36a5eab0807741fde460 apache-2.0.59-r2.ebuild 14081
+EBUILD apache-2.2.4-r10.ebuild 15358 RMD160 0fa0f04a2aa7a036ff058de92ae404eddd533a80 SHA1 06bf6b53e7e8138a03ed8349661bccd97be5851a SHA256 197c7ce7312f5679ef7d4f4eaec5c80dd398e49b39b8dd4dfe5afb58a245b6a5
+MD5 95566f76e548f190f6c1f4d3e83deb7b apache-2.2.4-r10.ebuild 15358
+RMD160 0fa0f04a2aa7a036ff058de92ae404eddd533a80 apache-2.2.4-r10.ebuild 15358
+SHA256 197c7ce7312f5679ef7d4f4eaec5c80dd398e49b39b8dd4dfe5afb58a245b6a5 apache-2.2.4-r10.ebuild 15358
+EBUILD apache-2.2.4-r6.ebuild 14885 RMD160 061ff6dbeceec9078bf2cfe291a0fd783af4e982 SHA1 d072ecace75d8623a48f2c2bb007838855fdc894 SHA256 d086d3dc66b70762096f8490d3a5056962c9b5ea8d7b5322dd076d443ec4f1b4
+MD5 b87f10794667d2c63ffd92d774809f85 apache-2.2.4-r6.ebuild 14885
+RMD160 061ff6dbeceec9078bf2cfe291a0fd783af4e982 apache-2.2.4-r6.ebuild 14885
+SHA256 d086d3dc66b70762096f8490d3a5056962c9b5ea8d7b5322dd076d443ec4f1b4 apache-2.2.4-r6.ebuild 14885
+EBUILD apache-2.2.4-r7.ebuild 15234 RMD160 5db2aefeb0166abed6908c726fc42753c31ce21e SHA1 a23e51e5bda8bfda67ac903efc049915789f9c17 SHA256 5000b4b57986c56afc9ba448e5bc0cfa43c868d61ef6e2fc12e8a5e7a6892d56
+MD5 99e52eaf6dc264a1d824cc039f4a1f90 apache-2.2.4-r7.ebuild 15234
+RMD160 5db2aefeb0166abed6908c726fc42753c31ce21e apache-2.2.4-r7.ebuild 15234
+SHA256 5000b4b57986c56afc9ba448e5bc0cfa43c868d61ef6e2fc12e8a5e7a6892d56 apache-2.2.4-r7.ebuild 15234
+EBUILD apache-2.2.4-r8.ebuild 15345 RMD160 369b447c95e1c1f4c5076184bfb3a98b17b95e6c SHA1 c5edeca76226990c08a61de01e3a9c60b1089b5c SHA256 af81fa6b78cfe5c0cb34553661369c8e8f0c30c04446a284a9c6414c7a758dce
+MD5 85a2b360696501dbcf120aad45bfe75c apache-2.2.4-r8.ebuild 15345
+RMD160 369b447c95e1c1f4c5076184bfb3a98b17b95e6c apache-2.2.4-r8.ebuild 15345
+SHA256 af81fa6b78cfe5c0cb34553661369c8e8f0c30c04446a284a9c6414c7a758dce apache-2.2.4-r8.ebuild 15345
+EBUILD apache-2.2.4-r9.ebuild 15509 RMD160 6404eb8a7955099b62608077a47afe0d70866d95 SHA1 ee22b022e43fdfd05b947b37ded85507ccf7a81f SHA256 ecaf9f835cde5d44e9aaa50c60bd7db4c6a1c8c44b6246e7d2d5f72b4c373a4d
+MD5 d16bcdbd7a9cc22844c1a0ea83ebf8f0 apache-2.2.4-r9.ebuild 15509
+RMD160 6404eb8a7955099b62608077a47afe0d70866d95 apache-2.2.4-r9.ebuild 15509
+SHA256 ecaf9f835cde5d44e9aaa50c60bd7db4c6a1c8c44b6246e7d2d5f72b4c373a4d apache-2.2.4-r9.ebuild 15509
+MISC ChangeLog 93502 RMD160 40822b2dbfb1cb0a8bf5dc13abf828815389d312 SHA1 0d282504cd8197addf98e710f04e6269257167a7 SHA256 6e8a5bcd3b49318f310b745b3e2e3ba4ad5800b74e5880505026c41ca66a1fb8
+MD5 ff47166598cd7e7dee3b486fda9e0b52 ChangeLog 93502
+RMD160 40822b2dbfb1cb0a8bf5dc13abf828815389d312 ChangeLog 93502
+SHA256 6e8a5bcd3b49318f310b745b3e2e3ba4ad5800b74e5880505026c41ca66a1fb8 ChangeLog 93502
+MISC metadata.xml 551 RMD160 1b31261c043e57cabc9bd8582f9b34c09d92d108 SHA1 68bb286a67452c3dae7525195c60b8637cca9b81 SHA256 646729a42ddffcbde3426dd6aa9a77fab923bc348c5b34c9d24083d86fbb15eb
+MD5 0f28752ee3545b3fd8e28ee656e62f4b metadata.xml 551
+RMD160 1b31261c043e57cabc9bd8582f9b34c09d92d108 metadata.xml 551
+SHA256 646729a42ddffcbde3426dd6aa9a77fab923bc348c5b34c9d24083d86fbb15eb metadata.xml 551
+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 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 3685a5e5ea27be4a736dc1ce919ae3c6 files/digest-apache-2.2.4-r6 536
+RMD160 643d3dfa434f0f243edbfef1da50bd19fc80c3c1 files/digest-apache-2.2.4-r6 536
+SHA256 1c6148391d382b0c388801c54fd831c9172e4063d03dd0c4c9a5c8b2dff6d027 files/digest-apache-2.2.4-r6 536
+MD5 dabadb92943b5af0cda4248c84f45869 files/digest-apache-2.2.4-r7 536
+RMD160 143b01d363ab92a5676dc52599a4959886c1481e files/digest-apache-2.2.4-r7 536
+SHA256 7d24e0c773a201961123b6e407ac1d2b56edc0917dca464e44e79ce74475a4c7 files/digest-apache-2.2.4-r7 536
+MD5 dabadb92943b5af0cda4248c84f45869 files/digest-apache-2.2.4-r8 536
+RMD160 143b01d363ab92a5676dc52599a4959886c1481e files/digest-apache-2.2.4-r8 536
+SHA256 7d24e0c773a201961123b6e407ac1d2b56edc0917dca464e44e79ce74475a4c7 files/digest-apache-2.2.4-r8 536
+MD5 c6c86f6e5f68f762e9cef3a476ae2e2d files/digest-apache-2.2.4-r9 536
+RMD160 536d5403a7de4002d36c078d337a07ceb464bed0 files/digest-apache-2.2.4-r9 536
+SHA256 4837f60e7b96c75190dcc06fc9643c944a8a59827e777f8c2711924f3f089882 files/digest-apache-2.2.4-r9 536
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.5 (GNU/Linux)
+
+iD8DBQFGrMEOyuNVb5qfaOYRAu7oAKCXfc9gC/ejdyh8eXYGAAhGSSLIJgCgvre7
+sBtrR/sfy81d9fvdcaWtYkg=
+=96td
+-----END PGP SIGNATURE-----
diff --git a/www-servers/apache/apache-2.0.58-r2.ebuild b/www-servers/apache/apache-2.0.58-r2.ebuild
new file mode 100644
index 000000000000..6e0872f3581f
--- /dev/null
+++ b/www-servers/apache/apache-2.0.58-r2.ebuild
@@ -0,0 +1,454 @@
+# 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.58-r2.ebuild,v 1.1 2007/07/29 16:32:00 phreak Exp $
+
+inherit eutils flag-o-matic gnuconfig multilib
+
+# latest gentoo apache files
+GENTOO_PATCHNAME="gentoo-apache-${PVR}"
+GENTOO_PATCHSTAMP="20060726"
+GENTOO_DEVSPACE="vericgar"
+GENTOO_PATCHDIR="${WORKDIR}/${GENTOO_PATCHNAME}"
+
+DESCRIPTION="The Apache Web Server"
+HOMEPAGE="http://httpd.apache.org/"
+SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2
+	http://dev.gentoo.org/~${GENTOO_DEVSPACE}/dist/apache/${GENTOO_PATCHNAME}-${GENTOO_PATCHSTAMP}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+IUSE="apache2 debug doc ldap mpm-itk mpm-leader mpm-peruser mpm-prefork mpm-threadpool mpm-worker ssl static-modules threads selinux"
+
+RDEPEND="dev-lang/perl
+	=dev-libs/apr-0*
+	=dev-libs/apr-util-0*
+	dev-libs/expat
+	app-misc/mime-types
+	sys-libs/zlib
+	mpm-itk? ( sys-libs/libcap )
+	ssl? ( dev-libs/openssl )
+	selinux? ( sec-policy/selinux-apache )
+	!mips? ( ldap? ( =net-nds/openldap-2* ) )"
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.59-r4"
+
+S="${WORKDIR}/httpd-${PV}"
+
+big_fat_warnings() {
+
+	if use ldap && ! built_with_use 'dev-libs/apr-util' ldap; then
+		eerror "dev-libs/apr-util is missing LDAP support. For apache to have"
+		eerror "ldap support, apr-util must be built with the ldap USE-flag"
+		eerror "enabled."
+		die "ldap USE-flag enabled while not supported in apr-util"
+	fi
+
+	if use mpm-peruser || use mpm-itk; then
+		ewarn "-BIG- -FAT- -WARNING-"
+		ewarn
+		ewarn "The peruser (USE=mpm-peruser) and itk (USE=mpm-itk) MPMs are considered"
+		ewarn "highly experimental and are not (yet) supported, nor are they recommended"
+		ewarn "for production use. You have been warned!"
+		ewarn
+		ewarn "Continuing in 5 seconds ..."
+		sleep 5
+	fi
+
+}
+
+pkg_setup() {
+	big_fat_warnings
+	select_mpms
+
+	# setup apache user and group
+	enewgroup apache 81
+	enewuser apache 81 -1 /var/www apache
+
+}
+
+src_unpack() {
+	unpack ${A} || die
+	cd ${S} || die
+
+	# Use correct multilib libdir in gentoo patches
+	sed -i -e "s:/usr/lib:/usr/$(get_libdir):g" \
+		${GENTOO_PATCHDIR}/{conf/httpd.conf,init/*,patches/config.layout} \
+		|| die "sed failed"
+
+	EPATCH_SUFFIX="patch"
+	epatch ${GENTOO_PATCHDIR}/patches/[0-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
+
+# no more USE=no-suexec because of bug 148082
+# see the 2.2 ebuilds for how this can be done cleanly with a working system
+# "out of the box"
+#	if useq no-suexec; then
+#		myconf="${myconf} --disable-suexec"
+#	else
+		myconf="${myconf}
+				--with-suexec-safepath="/usr/local/bin:/usr/bin:/bin" \
+				--with-suexec-logfile=/var/log/apache2/suexec_log \
+				--with-suexec-bin=/usr/sbin/suexec2 \
+				--with-suexec-userdir=${USERDIR} \
+				--with-suexec-caller=apache \
+				--with-suexec-docroot=/var/www \
+				--with-suexec-uidmin=1000 \
+				--with-suexec-gidmin=100 \
+				--with-suexec-umask=077 \
+				--enable-suexec=shared"
+#	fi
+
+	# common confopts
+	myconf="${myconf} \
+			--with-apr=/usr \
+			--with-apr-util=/usr \
+			--cache-file=${S}/config.cache \
+			--with-perl=/usr/bin/perl \
+			--with-expat=/usr \
+			--with-z=/usr \
+			--with-port=80 \
+			--enable-layout=Gentoo \
+			--with-program-name=apache2 \
+			--with-devrandom=/dev/urandom \
+			--host=${CHOST} ${MY_BUILTINS}"
+
+	# debugging support
+	if useq debug ; then
+		myconf="${myconf} --enable-maintainer-mode"
+	fi
+
+	./configure --with-mpm=${mpm} ${myconf} ${EXTRA_ECONF} || die "bad ./configure please submit bug report to bugs.gentoo.org. Include your config.layout and config.log"
+
+	# we don't want to try and recompile the ssl_expr_parse.c file, because
+	# the lex source is broken
+	touch modules/ssl/ssl_expr_scan.c
+
+	# as decided on IRC-AGENDA-10.2004, we use httpd.conf as standard config file name
+	sed -i -e 's:apache2\.conf:httpd.conf:' include/ap_config_auto.h
+
+	emake || die "problem compiling apache2"
+
+	# build ssl version of apache bench (ab-ssl)
+	if useq ssl; then
+		cd support
+		rm -f ab .libs/ab ab.lo ab.o
+		make ab CFLAGS="${CFLAGS} -DUSE_SSL -lcrypto -lssl -I/usr/include/openssl -L/usr/$(get_libdir)" || die
+		mv ab ab-ssl
+		rm -f ab.lo ab.o
+		make ab || die
+	fi
+}
+
+src_install () {
+	# general install
+	make DESTDIR=${D} install || die
+	dodoc ABOUT_APACHE CHANGES INSTALL LAYOUT LICENSE README* ${GENTOO_PATCHDIR}/docs/robots.txt
+
+	# protect the suexec binary
+#	if ! useq no-suexec; then
+		fowners root:apache /usr/sbin/suexec
+		fperms 4710 /usr/sbin/suexec
+#	fi
+
+	# apxs needs this to pickup the right lib for install
+	dosym /usr/$(get_libdir) /usr/$(get_libdir)/apache2/lib
+	dosym /var/log/apache2 /usr/$(get_libdir)/apache2/logs
+	dosym /etc/apache2 /usr/$(get_libdir)/apache2/conf
+
+	# Credits to advx.org people for these scripts. Heck, thanks for
+	# the nice layout and everything else ;-)
+	exeinto /usr/sbin
+	for i in apache2logserverstatus apache2splitlogfile; do
+		doexe ${GENTOO_PATCHDIR}/scripts/${i}
+	done
+	# gentestcrt.sh only if USE=ssl
+	useq ssl && doexe ${GENTOO_PATCHDIR}/scripts/gentestcrt.sh
+
+	# some more scripts
+	for i in split-logfile list_hooks.pl logresolve.pl log_server_status; do
+		doexe ${S}/support/${i}
+	done
+
+	# the ssl version of apache bench
+	useq ssl && doexe support/ab-ssl
+
+	# install mpm bins
+	doexe ${S}/apache2
+
+	# modules.d config file snippets
+	insinto /etc/apache2/modules.d
+	doins ${GENTOO_PATCHDIR}/conf/modules.d/45_mod_dav.conf
+	useq ldap && doins ${GENTOO_PATCHDIR}/conf/modules.d/46_mod_ldap.conf
+	if useq ssl; then
+		doins ${GENTOO_PATCHDIR}/conf/modules.d/40_mod_ssl.conf
+		doins ${GENTOO_PATCHDIR}/conf/modules.d/41_mod_ssl.default-vhost.conf
+	fi
+
+	# drop in a convenient link to the manual
+	if useq doc; then
+		insinto /etc/apache2/modules.d
+		doins ${GENTOO_PATCHDIR}/conf/modules.d/00_apache_manual.conf
+		sed -i -e "s:2.0.49:${PVR}:" ${D}/etc/apache2/modules.d/00_apache_manual.conf
+	else
+		rm -rf ${D}/usr/share/doc/${PF}/manual
+	fi
+
+	# SLOT=2
+	cd ${D}
+	for i in htdigest htpasswd logresolve apxs ab rotatelogs dbmmanage checkgid split-logfile; do
+		mv -v usr/sbin/${i} usr/sbin/${i}2
+	done
+	mv -v usr/sbin/apachectl usr/sbin/apache2ctl
+	mv -v usr/sbin/list_hooks.pl usr/sbin/list_hooks2.pl
+	mv -v usr/sbin/logresolve.pl usr/sbin/logresolve2.pl
+	useq ssl && mv -v usr/sbin/ab-ssl usr/sbin/ab2-ssl
+#	useq no-suexec ||
+	mv -v usr/sbin/suexec usr/sbin/suexec2
+
+	# do the man pages
+	for i in htdigest.1 htpasswd.1 dbmmanage.1; do
+		mv -v usr/share/man/man1/${i} usr/share/man/man1/${i/./2.}
+	done
+	for i in ab.8 apxs.8 logresolve.8 rotatelogs.8; do
+		mv -v usr/share/man/man8/${i} usr/share/man/man8/${i/./2.}
+	done
+	#useq no-suexec ||
+	mv -v usr/share/man/man8/suexec.8 usr/share/man/man8/suexec2.8
+
+	mv -v usr/share/man/man8/apachectl.8 usr/share/man/man8/apache2ctl.8
+	mv -v usr/share/man/man8/httpd.8 usr/share/man/man8/apache2.8
+
+	# tidy up
+	mv usr/sbin/envvars* usr/$(get_libdir)/apache2/build
+	dodoc etc/apache2/*-std.conf
+	rm -f etc/apache2/*.conf
+	rm -f etc/apache2/mime.types
+	rm -rf var/run var/log
+
+	# the default webroot gets stored in /usr/share/doc
+	einfo "Installing default webroot to /usr/share/doc/${PF}"
+	mv ${D}/var/www/localhost ${D}/usr/share/doc/${PF}/webroot
+
+	# config files
+	newconfd ${GENTOO_PATCHDIR}/init/apache2.confd apache2
+	newinitd ${GENTOO_PATCHDIR}/init/apache2.initd apache2
+
+	insinto /etc/logrotate.d
+	newins ${GENTOO_PATCHDIR}/scripts/apache2-logrotate apache2
+
+	insinto /etc/apache2
+	doins ${GENTOO_PATCHDIR}/conf/apache2-builtin-mods
+	doins ${GENTOO_PATCHDIR}/conf/httpd.conf
+
+	insinto /etc/apache2/vhosts.d
+	doins ${GENTOO_PATCHDIR}/conf/vhosts.d/00_default_vhost.conf
+
+	keepdir /etc/apache2/vhosts.d
+	keepdir /etc/apache2/modules.d
+
+	# fix bug 92348
+	fperms 755 /usr/sbin/apache2logserverstatus
+	fperms 755 /usr/sbin/apache2splitlogfile
+
+	# empty dirs
+	for i in /var/lib/dav /var/log/apache2 /var/cache/apache2; do
+		keepdir ${i}
+		fowners apache:apache ${i}
+		fperms 755 ${i}
+	done
+
+	# We'll be needing /etc/apache2/ssl if USE=ssl
+	useq ssl && keepdir /etc/apache2/ssl
+
+}
+
+pkg_postinst() {
+	# Automatically generate test ceritificates if ssl USE flag is being set
+	if useq ssl -a !-e ${ROOT}/etc/apache2/ssl/server.crt; then
+		cd ${ROOT}/etc/apache2/ssl
+		einfo
+		einfo "Generating self-signed test certificate in /etc/apache2/ssl..."
+		yes "" 2>/dev/null | \
+			${ROOT}/usr/sbin/gentestcrt.sh >/dev/null 2>&1 || \
+			die "gentestcrt.sh failed"
+		einfo
+	fi
+
+	# we do this here because the default webroot is a copy of the files
+	# that exist elsewhere and we don't want them managed/removed by portage
+	# when apache is upgraded.
+	if [ -e "${ROOT}/var/www/localhost" ]; then
+		einfo "The default webroot has not been installed into"
+		einfo "${ROOT}/var/www/localhost because the directory already exists"
+		einfo "and we do not want to overwrite any files you have put there."
+		einfo
+		einfo "If you would like to install the latest webroot, please run"
+		einfo "emerge --config =${PF}"
+	else
+		einfo "Installing default webroot to ${ROOT}/var/www/localhost"
+		mkdir -p ${ROOT}/var/www/localhost
+		cp -r ${ROOT}/usr/share/doc/${PF}/webroot/* ${ROOT}/var/www/localhost
+		chown -R apache: ${ROOT}/var/www/localhost
+	fi
+
+	# Check for dual/upgrade install
+	if has_version '=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/www-servers/apache/apache-2.0.59-r2.ebuild b/www-servers/apache/apache-2.0.59-r2.ebuild
new file mode 100644
index 000000000000..dffabf82e3a8
--- /dev/null
+++ b/www-servers/apache/apache-2.0.59-r2.ebuild
@@ -0,0 +1,461 @@
+# 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.1 2007/07/29 16:32:00 phreak Exp $
+
+inherit eutils flag-o-matic gnuconfig multilib
+
+# latest gentoo apache files
+GENTOO_PATCHNAME="gentoo-apache-${PVR}"
+GENTOO_PATCHSTAMP="20061102"
+GENTOO_DEVSPACE="vericgar"
+GENTOO_PATCHDIR="${WORKDIR}/${GENTOO_PATCHNAME}"
+
+DESCRIPTION="The Apache Web Server"
+HOMEPAGE="http://httpd.apache.org/"
+SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2
+	http://dev.gentoo.org/~${GENTOO_DEVSPACE}/dist/apache/${GENTOO_PATCHNAME}-${GENTOO_PATCHSTAMP}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="apache2 debug doc ldap mpm-itk mpm-leader mpm-peruser mpm-prefork mpm-threadpool mpm-worker ssl static-modules threads selinux"
+
+RDEPEND="dev-lang/perl
+	=dev-libs/apr-0*
+	=dev-libs/apr-util-0*
+	dev-libs/expat
+	app-misc/mime-types
+	sys-libs/zlib
+	mpm-itk? ( sys-libs/libcap )
+	ssl? ( dev-libs/openssl )
+	selinux? ( sec-policy/selinux-apache )
+	!mips? ( ldap? ( =net-nds/openldap-2* ) )"
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.59-r4"
+
+S="${WORKDIR}/httpd-${PV}"
+
+big_fat_warnings() {
+
+	if use ldap && ! built_with_use '=dev-libs/apr-util-0*' ldap; then
+		eerror "dev-libs/apr-util is missing LDAP support. For apache to have"
+		eerror "ldap support, apr-util must be built with the ldap USE-flag"
+		eerror "enabled."
+		die "ldap USE-flag enabled while not supported in apr-util"
+	fi
+
+	if use mpm-peruser || use mpm-itk; then
+		ewarn "-BIG- -FAT- -WARNING-"
+		ewarn
+		ewarn "The peruser (USE=mpm-peruser) and itk (USE=mpm-itk) MPMs are considered"
+		ewarn "highly experimental and are not (yet) supported, nor are they recommended"
+		ewarn "for production use. You have been warned!"
+		ewarn
+		ewarn "Continuing in 5 seconds ..."
+		sleep 5
+	fi
+
+}
+
+pkg_setup() {
+	big_fat_warnings
+	select_mpms
+
+	# setup apache user and group
+	enewgroup apache 81
+	enewuser apache 81 -1 /var/www apache
+
+}
+
+src_unpack() {
+	unpack ${A} || die
+	cd ${S} || die
+
+	# Use correct multilib libdir in gentoo patches
+	sed -i -e "s:/usr/lib:/usr/$(get_libdir):g" \
+		${GENTOO_PATCHDIR}/{conf/httpd.conf,init/*,patches/config.layout} \
+		|| die "sed failed"
+
+	EPATCH_SUFFIX="patch"
+	epatch ${GENTOO_PATCHDIR}/patches/[0-8]* || die "internal ebuild error"
+
+	# security patches are version based
+	# 99_all_${PV}_Name.patch
+	if $(ls ${GENTOO_PATCHDIR}/patches/9?_*_${PV}_* &>/dev/null); then
+		epatch ${GENTOO_PATCHDIR}/patches/9?_*_${PV}_* || \
+			die "Patching for version ${PV} failed"
+	fi
+
+	# avoid utf-8 charset problems
+	export LC_CTYPE=C
+
+	# setup the filesystem layout config
+	cat ${GENTOO_PATCHDIR}/patches/config.layout >> config.layout
+	sed -i -e 's:version:${PF}:g' config.layout
+
+	# peruser need to build conf
+	WANT_AUTOCONF=2.5 ./buildconf || die "buildconf failed"
+}
+
+src_compile() {
+
+	# bug 128505
+	filter-ldflags -Wl,--as-needed --as-needed
+
+	# actually we do not provide a very dynamic way of those vars
+	# however, you may predefine them in shell before emerging
+	# to override the official default locations
+
+	# standard location for Gentoo Linux
+	USERDIR="${USERDIR:-public_html}"
+
+	einfo "USERDIR is set to: ${USERDIR}"
+
+	select_mpms
+
+	# Detect mips and uclibc systems properly
+	gnuconfig_update
+
+	local modtype
+	if useq static-modules; then
+		modtype="static"
+	else
+		modtype="shared"
+	fi
+
+	select_modules_config || die "determining modules"
+
+	local myconf
+	useq ldap && myconf="${myconf} --enable-auth-ldap=${modtype} --enable-ldap=${modtype}"
+	useq ssl && myconf="${myconf} --with-ssl=/usr  --enable-ssl=${modtype}"
+	useq ssl || myconf="${myconf} --disable-ssl"
+
+	# Fix for bug #24215 - robbat2@gentoo.org, 30 Oct 2003
+	# We pre-load the cache with the correct answer!  This avoids
+	# it violating the sandbox.  This may have to be changed for
+	# non-Linux systems or if sem_open changes on Linux.  This
+	# hack is built around documentation in /usr/include/semaphore.h
+	# and the glibc (pthread) source
+	echo 'ac_cv_func_sem_open=${ac_cv_func_sem_open=no}' >> ${S}/config.cache
+
+# no more USE=no-suexec because of bug 148082
+# see the 2.2 ebuilds for how this can be done cleanly with a working system
+# "out of the box"
+#	if useq no-suexec; then
+#		myconf="${myconf} --disable-suexec"
+#	else
+		myconf="${myconf}
+				--with-suexec-safepath="/usr/local/bin:/usr/bin:/bin" \
+				--with-suexec-logfile=/var/log/apache2/suexec_log \
+				--with-suexec-bin=/usr/sbin/suexec2 \
+				--with-suexec-userdir=${USERDIR} \
+				--with-suexec-caller=apache \
+				--with-suexec-docroot=/var/www \
+				--with-suexec-uidmin=1000 \
+				--with-suexec-gidmin=100 \
+				--with-suexec-umask=077 \
+				--enable-suexec=shared"
+#	fi
+
+	# common confopts
+	myconf="${myconf} \
+			--with-apr=/usr \
+			--with-apr-util=/usr \
+			--cache-file=${S}/config.cache \
+			--with-perl=/usr/bin/perl \
+			--with-expat=/usr \
+			--with-z=/usr \
+			--with-port=80 \
+			--enable-layout=Gentoo \
+			--with-program-name=apache2 \
+			--with-devrandom=/dev/urandom \
+			--host=${CHOST} ${MY_BUILTINS}"
+
+	# debugging support
+	if useq debug ; then
+		myconf="${myconf} --enable-maintainer-mode"
+	fi
+
+	./configure --with-mpm=${mpm} ${myconf} ${EXTRA_ECONF} || die "bad ./configure please submit bug report to bugs.gentoo.org. Include your config.layout and config.log"
+
+	# we don't want to try and recompile the ssl_expr_parse.c file, because
+	# the lex source is broken
+	touch modules/ssl/ssl_expr_scan.c
+
+	# as decided on IRC-AGENDA-10.2004, we use httpd.conf as standard config file name
+	sed -i -e 's:apache2\.conf:httpd.conf:' include/ap_config_auto.h
+
+	emake || die "problem compiling apache2"
+
+	# build ssl version of apache bench (ab-ssl)
+	if useq ssl; then
+		cd support
+		rm -f ab .libs/ab ab.lo ab.o
+		make ab CFLAGS="${CFLAGS} -DUSE_SSL -lcrypto -lssl -I/usr/include/openssl -L/usr/$(get_libdir)" || die
+		mv ab ab-ssl
+		rm -f ab.lo ab.o
+		make ab || die
+	fi
+}
+
+src_install () {
+	# general install
+	make DESTDIR=${D} install || die
+	dodoc ABOUT_APACHE CHANGES INSTALL LAYOUT LICENSE README* ${GENTOO_PATCHDIR}/docs/robots.txt
+
+	# protect the suexec binary
+#	if ! useq no-suexec; then
+		fowners root:apache /usr/sbin/suexec
+		fperms 4710 /usr/sbin/suexec
+#	fi
+
+	# apxs needs this to pickup the right lib for install
+	dosym /usr/$(get_libdir) /usr/$(get_libdir)/apache2/lib
+	dosym /var/log/apache2 /usr/$(get_libdir)/apache2/logs
+	dosym /etc/apache2 /usr/$(get_libdir)/apache2/conf
+
+	# Credits to advx.org people for these scripts. Heck, thanks for
+	# the nice layout and everything else ;-)
+	exeinto /usr/sbin
+	for i in apache2logserverstatus apache2splitlogfile; do
+		doexe ${GENTOO_PATCHDIR}/scripts/${i}
+	done
+	# gentestcrt.sh only if USE=ssl
+	useq ssl && doexe ${GENTOO_PATCHDIR}/scripts/gentestcrt.sh
+
+	# some more scripts
+	for i in split-logfile list_hooks.pl logresolve.pl log_server_status; do
+		doexe ${S}/support/${i}
+	done
+
+	# the ssl version of apache bench
+	useq ssl && doexe support/ab-ssl
+
+	# install mpm bins
+	doexe ${S}/apache2
+
+	# modules.d config file snippets
+	insinto /etc/apache2/modules.d
+	doins ${GENTOO_PATCHDIR}/conf/modules.d/45_mod_dav.conf
+	useq ldap && doins ${GENTOO_PATCHDIR}/conf/modules.d/46_mod_ldap.conf
+	if useq ssl; then
+		doins ${GENTOO_PATCHDIR}/conf/modules.d/40_mod_ssl.conf
+		doins ${GENTOO_PATCHDIR}/conf/modules.d/41_mod_ssl.default-vhost.conf
+	fi
+
+	# drop in a convenient link to the manual
+	if useq doc; then
+		insinto /etc/apache2/modules.d
+		doins ${GENTOO_PATCHDIR}/conf/modules.d/00_apache_manual.conf
+		sed -i -e "s:2.0.49:${PVR}:" ${D}/etc/apache2/modules.d/00_apache_manual.conf
+	else
+		rm -rf ${D}/usr/share/doc/${PF}/manual
+	fi
+
+	# SLOT=2
+	cd ${D}
+	for i in htdigest htpasswd logresolve apxs ab rotatelogs dbmmanage checkgid split-logfile; do
+		mv -v usr/sbin/${i} usr/sbin/${i}2
+	done
+	mv -v usr/sbin/apachectl usr/sbin/apache2ctl
+	mv -v usr/sbin/list_hooks.pl usr/sbin/list_hooks2.pl
+	mv -v usr/sbin/logresolve.pl usr/sbin/logresolve2.pl
+	useq ssl && mv -v usr/sbin/ab-ssl usr/sbin/ab2-ssl
+#	useq no-suexec ||
+	mv -v usr/sbin/suexec usr/sbin/suexec2
+
+	# do the man pages
+	for i in htdigest.1 htpasswd.1 dbmmanage.1; do
+		mv -v usr/share/man/man1/${i} usr/share/man/man1/${i/./2.}
+	done
+	for i in ab.8 apxs.8 logresolve.8 rotatelogs.8; do
+		mv -v usr/share/man/man8/${i} usr/share/man/man8/${i/./2.}
+	done
+	#useq no-suexec ||
+	mv -v usr/share/man/man8/suexec.8 usr/share/man/man8/suexec2.8
+
+	mv -v usr/share/man/man8/apachectl.8 usr/share/man/man8/apache2ctl.8
+	mv -v usr/share/man/man8/httpd.8 usr/share/man/man8/apache2.8
+
+	# tidy up
+	mv usr/sbin/envvars* usr/$(get_libdir)/apache2/build
+	dodoc etc/apache2/*-std.conf
+	rm -f etc/apache2/*.conf
+	rm -f etc/apache2/mime.types
+	rm -rf var/run var/log
+
+	# the default webroot gets stored in /usr/share/doc
+	einfo "Installing default webroot to /usr/share/doc/${PF}"
+	mv ${D}/var/www/localhost ${D}/usr/share/doc/${PF}/webroot
+
+	# config files
+	newconfd ${GENTOO_PATCHDIR}/init/apache2.confd apache2
+	newinitd ${GENTOO_PATCHDIR}/init/apache2.initd apache2
+
+	insinto /etc/logrotate.d
+	newins ${GENTOO_PATCHDIR}/scripts/apache2-logrotate apache2
+
+	insinto /etc/apache2
+	doins ${GENTOO_PATCHDIR}/conf/apache2-builtin-mods
+	doins ${GENTOO_PATCHDIR}/conf/httpd.conf
+
+	insinto /etc/apache2/vhosts.d
+	doins ${GENTOO_PATCHDIR}/conf/vhosts.d/00_default_vhost.conf
+
+	keepdir /etc/apache2/vhosts.d
+	keepdir /etc/apache2/modules.d
+
+	# fix bug 92348
+	fperms 755 /usr/sbin/apache2logserverstatus
+	fperms 755 /usr/sbin/apache2splitlogfile
+
+	# empty dirs
+	for i in /var/lib/dav /var/log/apache2 /var/cache/apache2; do
+		keepdir ${i}
+		fowners apache:apache ${i}
+		fperms 755 ${i}
+	done
+
+	# We'll be needing /etc/apache2/ssl if USE=ssl
+	useq ssl && keepdir /etc/apache2/ssl
+
+}
+
+pkg_postinst() {
+	# Automatically generate test ceritificates if ssl USE flag is being set
+	if useq ssl -a !-e ${ROOT}/etc/apache2/ssl/server.crt; then
+		cd ${ROOT}/etc/apache2/ssl
+		einfo
+		einfo "Generating self-signed test certificate in /etc/apache2/ssl..."
+		yes "" 2>/dev/null | \
+			${ROOT}/usr/sbin/gentestcrt.sh >/dev/null 2>&1 || \
+			die "gentestcrt.sh failed"
+		einfo
+	fi
+
+	# we do this here because the default webroot is a copy of the files
+	# that exist elsewhere and we don't want them managed/removed by portage
+	# when apache is upgraded.
+	if [ -e "${ROOT}/var/www/localhost" ]; then
+		einfo "The default webroot has not been installed into"
+		einfo "${ROOT}/var/www/localhost because the directory already exists"
+		einfo "and we do not want to overwrite any files you have put there."
+		einfo
+		einfo "If you would like to install the latest webroot, please run"
+		einfo "emerge --config =${PF}"
+	else
+		einfo "Installing default webroot to ${ROOT}/var/www/localhost"
+		mkdir -p ${ROOT}/var/www/localhost
+		cp -r ${ROOT}/usr/share/doc/${PF}/webroot/* ${ROOT}/var/www/localhost
+		chown -R apache: ${ROOT}/var/www/localhost
+	fi
+
+	# Check for dual/upgrade install
+	if has_version '=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/www-servers/apache/apache-2.2.4-r10.ebuild b/www-servers/apache/apache-2.2.4-r10.ebuild
new file mode 100644
index 000000000000..08050e31dae4
--- /dev/null
+++ b/www-servers/apache/apache-2.2.4-r10.ebuild
@@ -0,0 +1,467 @@
+# 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.1 2007/07/29 16:32:00 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 )
+	!=net-www/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 '>=net-www/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 '<net-www/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 '<net-www/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 '<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 "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-r6.ebuild b/www-servers/apache/apache-2.2.4-r6.ebuild
new file mode 100644
index 000000000000..180308154b8d
--- /dev/null
+++ b/www-servers/apache/apache-2.2.4-r6.ebuild
@@ -0,0 +1,457 @@
+# 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-r6.ebuild,v 1.1 2007/07/29 16:32:00 phreak Exp $
+
+inherit eutils flag-o-matic gnuconfig multilib autotools
+
+# latest gentoo apache files
+GENTOO_PATCHNAME="gentoo-${P}-r5"
+GENTOO_PATCHSTAMP="20070605"
+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 )
+	!=net-www/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_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='/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 '>=net-www/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 user of the config changes
+	if has_version '<net-www/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 '<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 "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
+		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/www-servers/apache/apache-2.2.4-r7.ebuild b/www-servers/apache/apache-2.2.4-r7.ebuild
new file mode 100644
index 000000000000..77fd2aec629f
--- /dev/null
+++ b/www-servers/apache/apache-2.2.4-r7.ebuild
@@ -0,0 +1,467 @@
+# 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-r7.ebuild,v 1.1 2007/07/29 16:32:00 phreak Exp $
+
+inherit eutils flag-o-matic gnuconfig multilib autotools
+
+# latest gentoo apache files
+GENTOO_PATCHNAME="gentoo-${PF}"
+GENTOO_PATCHSTAMP="20070615"
+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*
+	!=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_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='/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 '>=net-www/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 for new location of Listen
+	if has_version '<net-www/apache-2.2.4-r7' ; then
+		elog
+		elog "Listen directives have been moved into the default virtual host"
+		elog "configuation. Therefore you have to enabled at least one of"
+		elog "DEFAULT_VHOST or SSL_DEFAULT_VHOST, otherwise no listening"
+		elog "sockets would be available."
+		elog
+	fi
+
+	# Note the user of the config changes
+	if has_version '<net-www/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 '<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 "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
+		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/www-servers/apache/apache-2.2.4-r8.ebuild b/www-servers/apache/apache-2.2.4-r8.ebuild
new file mode 100644
index 000000000000..d7e318aa2b2e
--- /dev/null
+++ b/www-servers/apache/apache-2.2.4-r8.ebuild
@@ -0,0 +1,468 @@
+# 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-r8.ebuild,v 1.1 2007/07/29 16:32:00 phreak Exp $
+
+inherit eutils flag-o-matic gnuconfig multilib autotools
+
+# latest gentoo apache files
+GENTOO_PATCHNAME="gentoo-${P}-r7"
+GENTOO_PATCHSTAMP="20070615"
+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*
+	!=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 '>=net-www/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 for new location of Listen
+	if has_version '<net-www/apache-2.2.4-r7' ; then
+		elog
+		elog "Listen directives have been moved into the default virtual host"
+		elog "configuation. Therefore you have to enabled at least one of"
+		elog "DEFAULT_VHOST or SSL_DEFAULT_VHOST, otherwise no listening"
+		elog "sockets would be available."
+		elog
+	fi
+
+	# Note the user of the config changes
+	if has_version '<net-www/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 '<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 "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
+		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/www-servers/apache/apache-2.2.4-r9.ebuild b/www-servers/apache/apache-2.2.4-r9.ebuild
new file mode 100644
index 000000000000..00a7581d259e
--- /dev/null
+++ b/www-servers/apache/apache-2.2.4-r9.ebuild
@@ -0,0 +1,472 @@
+# 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-r9.ebuild,v 1.1 2007/07/29 16:32:00 phreak Exp $
+
+inherit eutils flag-o-matic gnuconfig multilib autotools
+
+# latest gentoo apache files
+GENTOO_PATCHNAME="gentoo-${PF}"
+GENTOO_PATCHSTAMP="20070710"
+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 )
+	!=net-www/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 '>=net-www/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 for new location of Listen
+	if has_version '<net-www/apache-2.2.4-r7' ; then
+		elog
+		elog "Listen directives have been moved into the default virtual host"
+		elog "configuation. Therefore you have to enabled at least one of"
+		elog "DEFAULT_VHOST or SSL_DEFAULT_VHOST, otherwise no listening"
+		elog "sockets would be available."
+		elog
+	fi
+
+	# Note the user of the config changes
+	if has_version '<net-www/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 '<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 "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
+		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
+
+	# 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/files/digest-apache-2.0.58-r2 b/www-servers/apache/files/digest-apache-2.0.58-r2
new file mode 100644
index 000000000000..66dad7a8187d
--- /dev/null
+++ b/www-servers/apache/files/digest-apache-2.0.58-r2
@@ -0,0 +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 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/www-servers/apache/files/digest-apache-2.0.59-r2 b/www-servers/apache/files/digest-apache-2.0.59-r2
new file mode 100644
index 000000000000..802a5aad07c6
--- /dev/null
+++ b/www-servers/apache/files/digest-apache-2.0.59-r2
@@ -0,0 +1,6 @@
+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.2.4-r10 b/www-servers/apache/files/digest-apache-2.2.4-r10
new file mode 100644
index 000000000000..48da053ddf20
--- /dev/null
+++ b/www-servers/apache/files/digest-apache-2.2.4-r10
@@ -0,0 +1,6 @@
+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-r6 b/www-servers/apache/files/digest-apache-2.2.4-r6
new file mode 100644
index 000000000000..9f9a3b4d896b
--- /dev/null
+++ b/www-servers/apache/files/digest-apache-2.2.4-r6
@@ -0,0 +1,6 @@
+MD5 b1df5f894ba9b0c8ce2235160037d68e gentoo-apache-2.2.4-r5-20070605.tar.bz2 57317
+RMD160 d5ef8bddc1a470d0a5ef41b1d7d3423054c90626 gentoo-apache-2.2.4-r5-20070605.tar.bz2 57317
+SHA256 507327d1a0029b7583c842b5f9d15a2be54226befe4fe1c32969d267de138363 gentoo-apache-2.2.4-r5-20070605.tar.bz2 57317
+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-r7 b/www-servers/apache/files/digest-apache-2.2.4-r7
new file mode 100644
index 000000000000..5987b78a7209
--- /dev/null
+++ b/www-servers/apache/files/digest-apache-2.2.4-r7
@@ -0,0 +1,6 @@
+MD5 0be9d5c1475bb0631da7016651c17f23 gentoo-apache-2.2.4-r7-20070615.tar.bz2 57925
+RMD160 973faaa7d64b6b8fc72218082ffdec408efe5e7a gentoo-apache-2.2.4-r7-20070615.tar.bz2 57925
+SHA256 307d499a6493cbd63ed85c6af3e79c380628dc7c34655ac2a0f0108851f1e13e gentoo-apache-2.2.4-r7-20070615.tar.bz2 57925
+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-r8 b/www-servers/apache/files/digest-apache-2.2.4-r8
new file mode 100644
index 000000000000..5987b78a7209
--- /dev/null
+++ b/www-servers/apache/files/digest-apache-2.2.4-r8
@@ -0,0 +1,6 @@
+MD5 0be9d5c1475bb0631da7016651c17f23 gentoo-apache-2.2.4-r7-20070615.tar.bz2 57925
+RMD160 973faaa7d64b6b8fc72218082ffdec408efe5e7a gentoo-apache-2.2.4-r7-20070615.tar.bz2 57925
+SHA256 307d499a6493cbd63ed85c6af3e79c380628dc7c34655ac2a0f0108851f1e13e gentoo-apache-2.2.4-r7-20070615.tar.bz2 57925
+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-r9 b/www-servers/apache/files/digest-apache-2.2.4-r9
new file mode 100644
index 000000000000..226a9495f954
--- /dev/null
+++ b/www-servers/apache/files/digest-apache-2.2.4-r9
@@ -0,0 +1,6 @@
+MD5 d3c169793e47df0a033d3863049f7c94 gentoo-apache-2.2.4-r9-20070710.tar.bz2 57164
+RMD160 d23cb1c572a0ebfaf17fe2061ac44334c1cd65ff gentoo-apache-2.2.4-r9-20070710.tar.bz2 57164
+SHA256 90c54e2fb025fa4d7c85254b2fccc0a0000e85e7e2547de102eafa61ed46618a gentoo-apache-2.2.4-r9-20070710.tar.bz2 57164
+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/metadata.xml b/www-servers/apache/metadata.xml
new file mode 100644
index 000000000000..52a2377bb02c
--- /dev/null
+++ b/www-servers/apache/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>apache</herd>
+	<maintainer>
+		<email>apache-bugs@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		The Apache HTTP Server Project is an effort to develop and maintain an
+		open-source HTTP server for modern operating systems. The goal of this
+		project is to provide a secure, efficient and extensible server that
+		provides HTTP services in sync with the current HTTP standards.
+	</longdescription>
+</pkgmetadata>