dev-perl/mod_perl -> www-apache/mod_perl

Package-Manager: portage-2.0.51.21-r1

27 files changed, 1265 insertions, 6 deletions

diff --git a/www-apache/mod_perl/ChangeLog b/www-apache/mod_perl/ChangeLog
new file mode 100644
index 000000000000..9ceac91d22e4
--- /dev/null
+++ b/www-apache/mod_perl/ChangeLog
@@ -0,0 +1,231 @@
+# ChangeLog for dev-perl/mod_perl
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/ChangeLog,v 1.1 2005/05/09 10:20:52 beu Exp $
+
+*mod_perl-1.99.17-r1 (09 May 2005)
+*mod_perl-1.99.17 (09 May 2005)
+*mod_perl-1.99.16 (09 May 2005)
+*mod_perl-1.99.11 (09 May 2005)
+*mod_perl-1.99.10 (09 May 2005)
+*mod_perl-1.29 (09 May 2005)
+*mod_perl-1.27-r4 (09 May 2005)
+*mod_perl-1.27-r2 (09 May 2005)
+*mod_perl-1.27-r1 (09 May 2005)
+
+  09 May 2005; Elfyn McBratney <beu@gentoo.org>
+  +files/mod_perl-1.99.16-sneak-tmpdir.patch, +files/75_mod_perl.conf,
+  +files/apache2-mod_perl-startup.pl, +files/mod_perl-1.99.17-Apache2.pm,
+  +metadata.xml, +mod_perl-1.27-r1.ebuild, +mod_perl-1.27-r2.ebuild,
+  +mod_perl-1.27-r4.ebuild, +mod_perl-1.29.ebuild, +mod_perl-1.99.10.ebuild,
+  +mod_perl-1.99.11.ebuild, +mod_perl-1.99.16.ebuild,
+  +mod_perl-1.99.17.ebuild, +mod_perl-1.99.17-r1.ebuild:
+  dev-perl/mod_perl -> www-apache/mod_perl
+
+  20 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org> mod_perl-1.29.ebuild:
+  Stable on sparc
+
+  11 Apr 2005; Markus Rothe <corsair@gentoo.org> mod_perl-1.29.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  01 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> mod_perl-1.27-r4.ebuild:
+  Stable on ppc.
+
+  01 Apr 2005; Aron Griffis <agriffis@gentoo.org> mod_perl-1.99.11.ebuild:
+  stable on ia64
+
+*mod_perl-1.27-r1 (19 Mar 2005)
+
+  19 Mar 2005; Elfyn McBratney <beu@gentoo.org> +mod_perl-1.27-r1.ebuild,
+  +mod_perl-1.27-r2.ebuild, +mod_perl-1.99.10.ebuild,
+  +mod_perl-1.99.11.ebuild:
+  Tree break #1 - re-add.
+
+  16 Mar 2005; Elfyn McBratney <beu@gentoo.org> mod_perl-1.27-r4.ebuild,
+  mod_perl-1.29.ebuild, mod_perl-1.99.16.ebuild, mod_perl-1.99.17-r1.ebuild,
+  mod_perl-1.99.17.ebuild:
+  Drop sys-apps/sed from DEPEND.
+
+  16 Mar 2005; Elfyn McBratney <beu@gentoo.org>
+  -files/mod_perl-1.99.10-nonukes.patch, -mod_perl-1.27-r1.ebuild,
+  -mod_perl-1.27-r2.ebuild, -mod_perl-1.27.ebuild, -mod_perl-1.99.08.ebuild,
+  -mod_perl-1.99.09.ebuild, -mod_perl-1.99.10.ebuild,
+  -mod_perl-1.99.11.ebuild:
+  Remove old versions.
+
+  11 Mar 2005; Elfyn McBratney <beu@gentoo.org>
+  -files/mod_perl-1.27-ipv6.patch, -files/mod_perl-1.29-ipv6.patch,
+  mod_perl-1.27-r2.ebuild, mod_perl-1.27-r4.ebuild, mod_perl-1.29.ebuild:
+  Drop the IPv6 patches (which don't add functionality as Apache 1.3 isn't
+  IPv6-aware).
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*mod_perl-1.99.17-r1 (13 Nov 2004)
+
+  13 Nov 2004; Robert Coie <rac@gentoo.org>
+  +files/mod_perl-1.99.17-Apache2.pm, +mod_perl-1.99.17-r1.ebuild:
+  Replace Apache2.pm to set @INC up properly
+
+*mod_perl-1.99.17 (27 Oct 2004)
+
+  27 Oct 2004; Doug Goldstein <cardoe@gentoo.org> +mod_perl-1.99.17.ebuild:
+  revision bump... works here.. leaving it masked though
+
+*mod_perl-1.99.16 (28 Sep 2004)
+
+  28 Sep 2004; Robert Coie <rac@gentoo.org>
+  +files/mod_perl-1.99.16-sneak-tmpdir.patch, +mod_perl-1.99.16.ebuild:
+  New upstream, maketest has some inconsistent problems, reliability suspect
+
+  21 Sep 2004; Michael Cummings <mcummings@gentoo.org>
+  +files/mod_perl-1.29-ipv6.patch:
+  Added missing patch for 1.29. Still applies cleanly. Closes bug 53094.
+
+  03 Sep 2004; Caleb Tennis <caleb@gentoo.org> -mod_perl-1.27-r3.ebuild:
+  Removing package.masked version
+
+  28 Aug 2004; David Holm <dholm@gentoo.org> mod_perl-1.99.11.ebuild:
+  Added to ~ppc.
+
+  07 Aug 2004; Jason Wever <weeve@gentoo.org> mod_perl-1.99.11.ebuild:
+  Added ~sparc keyword, resolves bug #59331.
+
+  30 May 2004; Bryan Østergaard <kloeri@gentoo.org> mod_perl-1.99.11.ebuild:
+  Stable on alpha.
+
+  20 Apr 2004; Michael Cummings <mcummings@gentoo.org>
+  mod_perl-1.99.09.ebuild, mod_perl-1.99.10.ebuild, mod_perl-1.99.11.ebuild:
+  Syntax fixes from bug 48373.
+
+  16 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  mod_perl-1.27-r3.ebuild, mod_perl-1.27-r4.ebuild, mod_perl-1.29.ebuild:
+  move inherit to the right place
+
+  01 Mar 2004; Michael Cummings <mcummings@gentoo.org> mod_perl-1.29.ebuild:
+  Fixed bad packlist info. This may affect (in a postive way) other problems
+  with mod_perl. Will bump if it proves to be effective.
+
+  29 Feb 2004; Jason Wever <weeve@gentoo.org> mod_perl-1.27-r4.ebuild:
+  Marked stable on sparc.
+
+  24 Feb 2004; <agriffis@gentoo.org> mod_perl-1.29.ebuild:
+  stable on alpha and ia64
+
+  18 Feb 2004; Aron Griffis <agriffis@gentoo.org> mod_perl-1.99.11.ebuild:
+  add ~alpha and ~ia64
+
+  18 Jan 2004; <tuxus@gentoo.org> mod_perl-1.27-r4.ebuild:
+  Added ~mips to KEYWORDS.
+
+*mod_perl-1.29 (23 Dec 2003)
+
+  23 Dec 2003; <rac@gentoo.org> mod_perl-1.29.ebuild:
+  Upstream bump.
+
+*mod_perl-1.99.11 (16 Dec 2003)
+
+  16 Dec 2003; <rac@gentoo.org> mod_perl-1.99.11.ebuild:
+  New upstream bump, fix bug 30257 by disabling parallel make
+
+*mod_perl-1.99.10 (31 Oct 2003)
+*mod_perl-1.27-r4 (14 Oct 2003)
+
+  14 Oct 2003; <rac@gentoo.org> mod_perl-1.27-r4.ebuild:
+  sed-fu to fix deprecated use of tail -1 in a couple of places, solves build
+  problems on machines with new coreutils, including the amd64 port
+
+*mod_perl-1.27-r1 (24 Jun 2003)
+ 
+  12 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Added missing changelog entry.
+
+  25 Jun 2003; <rac@gentoo.org> mod_perl-1.27-r2.ebuild,
+  mod_perl-1.27-r3.ebuild:
+  Fine-tune ipv6 patch application using has_version because the apache dep has
+  been relaxed.  Addresses bug #23332.
+
+*mod_perl-1.27-r3 (24 Jun 2003)
+
+  24 Jun 2003; <rac@gentoo.org> mod_perl-1.27-r3.ebuild:
+  Move to vendor directory, change how prefixes are defined in an attempt to
+  avoid problems mholzer and others were reporting with inability to find
+  Apache.pm
+
+  22 Jun 2003; <rac@gentoo.org> mod_perl-1.99.08.ebuild,
+  mod_perl-1.99.09.ebuild:
+  revert to ~x86
+
+  10 Jun 2003; Michael Cummings <mcummings@gentoo.org>
+  mod_perl-1.27-r2.ebuild:
+  mod-perl-1.27 doesn't work well with apache 2. the lock for apache 1 wasn't
+  carried over to the r2 ebuild - fixed
+
+  06 Jun 2003; <rac@gentoo.org> mod_perl-1.99.09.ebuild:
+  Add sed-4 dependency, make sed die on failure
+
+  20 May 2003; <rac@gentoo.org> mod_perl-1.99.09.ebuild:
+  Eliminate "|| die" from the make test line, to address bug #21325.
+
+*mod_perl-1.99.09 (19 May 2003)
+
+  19 May 2003; <rac@gentoo.org> mod_perl-1.99.09.ebuild:
+  Upstream version bump, enable "make test". Major kudos to Corporate Gadfly
+  <corporate_gadfly@hotmail.com> in bugs #19951 and #20124.
+
+*mod_perl-1.99.08 (24 Jun 2003)
+ 
+  12 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Added missing changelog entry.
+
+*mod_perl-1.27-r2 (01 Mar 2003)
+
+  01 Mar 2003; Robert Coie <rac@gentoo.org> mod_perl-1.27-r2.ebuild,
+  files/mod_perl-1.27-ipv6.patch:
+  Add patch originally from
+  http://pasky.ji.cz/~pasky/dev/apache/mod_perl-1.27+ipv6.patch, to
+  allow building against an IPv6-enabled Apache (bug #6986).  Changed
+  dependency on Apache to be >=1.3.27-r4, as that is the first version
+  in which the ipv6 USE variable is employed by the Apache ebuild, and
+  that is necessary for this patch to operate correctly.
+
+  24 Jan 2003; <woodchip@gentoo.org> mod_perl-1.99.08 : version bump; #14503.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*mod_perl-1.99.07 (29 Nov 2002)
+
+  17 Dec 2002; Brandon Low <lostlogic@gentoo.org> :
+  This should be a new slot. marked slot=1.
+
+  29 Nov 2002; Donny Davies <woodchip@gentoo.org> :
+  New development version for Apache2.
+
+  29 Oct 2002; Seemant Kulleen <seemant@gentoo.org> ChangeLog  :
+  forced version bump to install into correct locations
+
+*mod_perl-1.27 (20 Jun 2002)
+
+  15 Sep 2002; Ryan Phillips <rphillips@gentoo.org> mod_perl-1.27.ebuild :
+  Added libwww-perl depedency... Hopefully fixes #7867
+
+  9 Sep 2002; <mcummings@gentoo.org> mod_perl-1.27.ebuild :
+  Corrected build syntax
+
+  1 Aug 2002; Calum Selkirk <cselkirk@gentoo.org> mod_perl-1.27.ebuild :
+  Added ppc to KEYWORDS.
+
+  20 Jun 2002; Thilo Bangert <bangert@gentoo.org> mod_perl-1.27.ebuild :
+  version bump
+
+*mod_perl-1.26 (7 May 2002)
+
+*mod_perl-1.25-r2 (9 Apr 2002)
+
+  9 Apr 2002; Donny Davies <woodchip@gentoo.org> :
+  Small updates to fit in with the reworked apache package.
+
+*mod_perl-1.25-r1 (27 Mar 2002)
+
+  27 Mar 2002; Seemant Kulleen <seemant@gentoo.org> mod_perl-1.25-r1.ebuild :
+  Updated the ebuild to new syntax, and ungzipped HTML documentation.
diff --git a/www-apache/mod_perl/Manifest b/www-apache/mod_perl/Manifest
new file mode 100644
index 000000000000..5e8121994854
--- /dev/null
+++ b/www-apache/mod_perl/Manifest
@@ -0,0 +1,34 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a9949c15b0558867e3c8220102d73143 mod_perl-1.27-r2.ebuild 1437
+MD5 3f2cb99ef028dafbe783268d9bb5f8a8 mod_perl-1.99.17.ebuild 3804
+MD5 0c6cd64050430b1fa431bce203230e00 mod_perl-1.99.10.ebuild 3819
+MD5 c0558b464d3400478955c6fbb98ddc0d mod_perl-1.27-r1.ebuild 1418
+MD5 f0e7831d70a57fef5e4277f4cc791eec mod_perl-1.99.11.ebuild 3786
+MD5 7efadfe82991cfc24a4307826a2dd6ec mod_perl-1.99.17-r1.ebuild 4199
+MD5 655bd0ea1903744bdc153426f5e8896a ChangeLog 7555
+MD5 c8cba37890916ea37fd7a8542a621124 mod_perl-1.99.16.ebuild 3795
+MD5 b791ba3d98ee1642da9a8f8ffe38b634 mod_perl-1.29.ebuild 2115
+MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
+MD5 1e5e5d4ed1f791ff7728f1246a55d684 mod_perl-1.27-r4.ebuild 1814
+MD5 05455750ba5b64e18dbcfd113193e7cd files/digest-mod_perl-1.27-r1 65
+MD5 33270eaaa2c9bc9cef3a4a45afaeca34 files/digest-mod_perl-1.29 65
+MD5 5ff16293368688eefecc4a6066eb8914 files/digest-mod_perl-1.99.10 69
+MD5 300bce7b1dad6fda0b18cfdbf592a828 files/mod_perl-1.99.17-Apache2.pm 1149
+MD5 05455750ba5b64e18dbcfd113193e7cd files/digest-mod_perl-1.27-r4 65
+MD5 278c6266498d8bef49b54f30774aa305 files/digest-mod_perl-1.99.11 69
+MD5 2937c8efc4e2d9dd8fff843ab63f5c14 files/digest-mod_perl-1.99.17 69
+MD5 2937c8efc4e2d9dd8fff843ab63f5c14 files/digest-mod_perl-1.99.17-r1 69
+MD5 05455750ba5b64e18dbcfd113193e7cd files/digest-mod_perl-1.27-r2 65
+MD5 2415e6be73ba155382b34b5e2fad4951 files/75_mod_perl.conf 247
+MD5 39a4d91d1d90d32f90dea3c00a1680d7 files/apache2-mod_perl-startup.pl 483
+MD5 8c8ec63f03d3ffb51fa26b6df03a5710 files/mod_perl-1.99.16-sneak-tmpdir.patch 395
+MD5 13d314750ba5772dc7de4d9023d137ad files/digest-mod_perl-1.99.16 69
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCZcR+KRy60XGEcJIRAlYPAJ4jsLLqDq0JLhPetvWkRiGHHSh33QCcDkts
+iM46AcIr/OsjeuFa7Yqv2Lk=
+=Amuf
+-----END PGP SIGNATURE-----
diff --git a/www-apache/mod_perl/files/75_mod_perl.conf b/www-apache/mod_perl/files/75_mod_perl.conf
new file mode 100644
index 000000000000..4933e9af9fef
--- /dev/null
+++ b/www-apache/mod_perl/files/75_mod_perl.conf
@@ -0,0 +1,11 @@
+<IfDefine PERL>
+  <IfModule !mod_perl.c>
+    LoadModule perl_module    extramodules/mod_perl.so
+  </IfModule>
+</IfDefine>
+
+<IfModule mod_perl.c>
+  #PerlTrace all
+  PerlRequire "/etc/apache2/conf/modules.d/apache2-mod_perl-startup.pl"
+</ifModule>
+
diff --git a/www-apache/mod_perl/files/apache2-mod_perl-startup.pl b/www-apache/mod_perl/files/apache2-mod_perl-startup.pl
new file mode 100644
index 000000000000..8e8fca3b24f5
--- /dev/null
+++ b/www-apache/mod_perl/files/apache2-mod_perl-startup.pl
@@ -0,0 +1,26 @@
+use Apache2 ();
+
+use lib qw(/home/httpd/perl);
+
+# enable if the mod_perl 1.0 compatibility is needed
+#use Apache::compat ();
+
+use ModPerl::Util (); #for CORE::GLOBAL::exit
+
+use Apache::RequestRec ();
+use Apache::RequestIO ();
+use Apache::RequestUtil ();
+
+use Apache::Server ();
+use Apache::ServerUtil ();
+use Apache::Connection ();
+use Apache::Log ();
+
+use APR::Table ();
+
+use ModPerl::Registry ();
+
+use Apache::Const -compile => ':common';
+use APR::Const -compile => ':common';
+
+1;
diff --git a/www-apache/mod_perl/files/digest-mod_perl-1.27-r1 b/www-apache/mod_perl/files/digest-mod_perl-1.27-r1
new file mode 100644
index 000000000000..100b74cf1c13
--- /dev/null
+++ b/www-apache/mod_perl/files/digest-mod_perl-1.27-r1
@@ -0,0 +1 @@
+MD5 bd07f4f1065eb0d0a8d8004219357d8c mod_perl-1.27.tar.gz 372525
diff --git a/www-apache/mod_perl/files/digest-mod_perl-1.27-r2 b/www-apache/mod_perl/files/digest-mod_perl-1.27-r2
new file mode 100644
index 000000000000..100b74cf1c13
--- /dev/null
+++ b/www-apache/mod_perl/files/digest-mod_perl-1.27-r2
@@ -0,0 +1 @@
+MD5 bd07f4f1065eb0d0a8d8004219357d8c mod_perl-1.27.tar.gz 372525
diff --git a/www-apache/mod_perl/files/digest-mod_perl-1.27-r4 b/www-apache/mod_perl/files/digest-mod_perl-1.27-r4
new file mode 100644
index 000000000000..100b74cf1c13
--- /dev/null
+++ b/www-apache/mod_perl/files/digest-mod_perl-1.27-r4
@@ -0,0 +1 @@
+MD5 bd07f4f1065eb0d0a8d8004219357d8c mod_perl-1.27.tar.gz 372525
diff --git a/www-apache/mod_perl/files/digest-mod_perl-1.29 b/www-apache/mod_perl/files/digest-mod_perl-1.29
new file mode 100644
index 000000000000..0fcee8122ce2
--- /dev/null
+++ b/www-apache/mod_perl/files/digest-mod_perl-1.29
@@ -0,0 +1 @@
+MD5 1491931790509b9af06fc037d02b0e7a mod_perl-1.29.tar.gz 378877
diff --git a/www-apache/mod_perl/files/digest-mod_perl-1.99.10 b/www-apache/mod_perl/files/digest-mod_perl-1.99.10
new file mode 100644
index 000000000000..36c0d74770ac
--- /dev/null
+++ b/www-apache/mod_perl/files/digest-mod_perl-1.99.10
@@ -0,0 +1 @@
+MD5 55345e460b5976b39da9aeb3b5a3b5db mod_perl-1.99_10.tar.gz 1063061
diff --git a/www-apache/mod_perl/files/digest-mod_perl-1.99.11 b/www-apache/mod_perl/files/digest-mod_perl-1.99.11
new file mode 100644
index 000000000000..f2a9965e0454
--- /dev/null
+++ b/www-apache/mod_perl/files/digest-mod_perl-1.99.11
@@ -0,0 +1 @@
+MD5 855adb033de193dc999a5a2bd714f675 mod_perl-1.99_11.tar.gz 1093014
diff --git a/www-apache/mod_perl/files/digest-mod_perl-1.99.16 b/www-apache/mod_perl/files/digest-mod_perl-1.99.16
new file mode 100644
index 000000000000..e2aa17a19fc2
--- /dev/null
+++ b/www-apache/mod_perl/files/digest-mod_perl-1.99.16
@@ -0,0 +1 @@
+MD5 94da0f0301e127e8ef8cf77f7c11b1b4 mod_perl-1.99_16.tar.gz 1352516
diff --git a/www-apache/mod_perl/files/digest-mod_perl-1.99.17 b/www-apache/mod_perl/files/digest-mod_perl-1.99.17
new file mode 100644
index 000000000000..86a6705614f1
--- /dev/null
+++ b/www-apache/mod_perl/files/digest-mod_perl-1.99.17
@@ -0,0 +1 @@
+MD5 ffb9d5c825b93d91e6c3a8885f7d5296 mod_perl-1.99_17.tar.gz 1368804
diff --git a/www-apache/mod_perl/files/digest-mod_perl-1.99.17-r1 b/www-apache/mod_perl/files/digest-mod_perl-1.99.17-r1
new file mode 100644
index 000000000000..86a6705614f1
--- /dev/null
+++ b/www-apache/mod_perl/files/digest-mod_perl-1.99.17-r1
@@ -0,0 +1 @@
+MD5 ffb9d5c825b93d91e6c3a8885f7d5296 mod_perl-1.99_17.tar.gz 1368804
diff --git a/www-apache/mod_perl/files/mod_perl-1.99.16-sneak-tmpdir.patch b/www-apache/mod_perl/files/mod_perl-1.99.16-sneak-tmpdir.patch
new file mode 100644
index 000000000000..a2fb226ed323
--- /dev/null
+++ b/www-apache/mod_perl/files/mod_perl-1.99.16-sneak-tmpdir.patch
@@ -0,0 +1,11 @@
+--- t/conf/modperl_extra.pl.orig	2004-09-23 21:56:23.443749414 -0700
++++ t/conf/modperl_extra.pl	2004-09-23 21:55:22.149258138 -0700
+@@ -52,6 +52,8 @@
+ 
+ #see t/response/TestModperl/env.pm
+ $ENV{MODPERL_EXTRA_PL} = __FILE__;
++$ENV{TMPDIR} = __FILE__;
++$ENV{TMPDIR} =~ s,/work/.*,/temp,;
+ 
+ my $ap_mods  = scalar grep { /^Apache/ } keys %INC;
+ my $apr_mods = scalar grep { /^APR/    } keys %INC;
diff --git a/www-apache/mod_perl/files/mod_perl-1.99.17-Apache2.pm b/www-apache/mod_perl/files/mod_perl-1.99.17-Apache2.pm
new file mode 100644
index 000000000000..a06332a2287f
--- /dev/null
+++ b/www-apache/mod_perl/files/mod_perl-1.99.17-Apache2.pm
@@ -0,0 +1,48 @@
+package Apache2;
+
+sub BEGIN {
+  use Config;
+
+  @inc = ( '/etc/perl',
+	   $Config{sitearchexp},
+	   $Config{sitelibexp},
+	   $Config{vendorarchexp},
+	   $Config{vendorlibexp},
+	   $Config{archlibexp},
+	   $Config{privlibexp},
+	 );
+
+  my @sfxs = split( / /, $Config{inc_version_list} );
+
+  # this fails if we have numbers over 9. the goal is to get newer
+  # versions earlier in the list.
+  @sfxs = sort { $b cmp $a } @sfxs;
+
+  my $site_pfx = $Config{sitelib_stem};
+  my $vend_pfx = $Config{vendorlib_stem};
+  for my $sfx ( @sfxs ) {
+    push( @inc, "$site_pfx/$sfx", "$vend_pfx/$sfx" );
+  }
+
+  push( @inc,
+	"/usr/local/lib/site_perl",
+	"/usr/lib/apache2",
+	"/usr/lib/apache2/lib/perl",
+      );
+
+  # no . here because it doesn't make sense for us
+
+  # ok, now prepend Apache2 subdirectories of anything and take out
+  # nonexistent directories.  a case could be made that leaving
+  # nonexistent directories on here would be a good idea, but i'm
+  # going to go with the "reduce clutter" goal for now.
+
+  @INC = ();
+  for my $cd ( @inc ) {
+    next unless -d $cd;
+    push( @INC, "$cd/Apache2" ) if -d "$cd/Apache2";
+    push( @INC, $cd );
+  }
+}
+
+1;
diff --git a/www-apache/mod_perl/metadata.xml b/www-apache/mod_perl/metadata.xml
new file mode 100644
index 000000000000..86672fe64c10
--- /dev/null
+++ b/www-apache/mod_perl/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>perl</herd>
+	<maintainer>
+		<email>perl@gentoo.org</email>
+		<description>Primary Maintainer</description>
+	</maintainer>
+	<longdescription></longdescription>
+</pkgmetadata>
diff --git a/www-apache/mod_perl/mod_perl-1.27-r1.ebuild b/www-apache/mod_perl/mod_perl-1.27-r1.ebuild
new file mode 100644
index 000000000000..e0398d085862
--- /dev/null
+++ b/www-apache/mod_perl/mod_perl-1.27-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/mod_perl-1.27-r1.ebuild,v 1.1 2005/05/09 10:20:52 beu Exp $
+
+DESCRIPTION="A Perl Module for Apache"
+SRC_URI="http://perl.apache.org/dist/${P}.tar.gz"
+HOMEPAGE="http://perl.apache.org/"
+
+SLOT="0"
+LICENSE="Apache-1.1 as-is"
+KEYWORDS="x86 amd64 ppc sparc alpha"
+IUSE=""
+
+DEPEND="dev-lang/perl
+	dev-perl/libwww-perl
+	=net-www/apache-1*"
+
+src_compile() {
+	perl Makefile.PL USE_APXS=1 \
+		PREFIX=${D}/usr	\
+		WITH_APXS=/usr/sbin/apxs EVERYTHING=1
+
+	cp Makefile Makefile.orig
+	sed -e "s:apxs_install doc_install:doc_install:" Makefile.orig > Makefile
+	emake || die
+}
+
+src_install() {
+	make \
+		PREFIX=${D}/usr	\
+		INSTALLMAN1DIR=${D}/usr/share/man/man1	\
+		INSTALLMAN3DIR=${D}/usr/share/man/man3	\
+		install || die
+
+	dodoc Changes CREDITS MANIFEST README SUPPORT ToDo
+	dohtml -r ./
+
+	cd apaci
+	exeinto /usr/lib/apache-extramodules
+	doexe libperl.so
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Execute \"ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config\""
+	einfo "to have your apache.conf auto-updated for use with this module."
+	einfo "You should then edit your /etc/conf.d/apache file to suit."
+	einfo
+}
+
+pkg_config() {
+	${ROOT}/usr/sbin/apacheaddmod \
+		${ROOT}/etc/apache/conf/apache.conf \
+		extramodules/libperl.so mod_perl.c perl_module \
+		define=PERL
+	:;
+}
diff --git a/www-apache/mod_perl/mod_perl-1.27-r2.ebuild b/www-apache/mod_perl/mod_perl-1.27-r2.ebuild
new file mode 100644
index 000000000000..253a2c687437
--- /dev/null
+++ b/www-apache/mod_perl/mod_perl-1.27-r2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/mod_perl-1.27-r2.ebuild,v 1.1 2005/05/09 10:20:52 beu Exp $
+
+inherit eutils
+
+DESCRIPTION="A Perl Module for Apache"
+SRC_URI="http://perl.apache.org/dist/${P}.tar.gz"
+HOMEPAGE="http://perl.apache.org/"
+
+SLOT="0"
+LICENSE="Apache-1.1 as-is"
+KEYWORDS="x86 amd64 ~ppc ~sparc ~alpha"
+IUSE=""
+
+DEPEND="dev-lang/perl
+	dev-perl/libwww-perl
+	=net-www/apache-1*"
+
+src_compile() {
+	perl Makefile.PL USE_APXS=1 \
+		PREFIX=${D}/usr	\
+		WITH_APXS=/usr/sbin/apxs EVERYTHING=1
+
+	cp Makefile Makefile.orig
+	sed -e "s:apxs_install doc_install:doc_install:" Makefile.orig > Makefile
+	emake || die
+}
+
+src_install() {
+	make \
+		PREFIX=${D}/usr	\
+		INSTALLMAN1DIR=${D}/usr/share/man/man1	\
+		INSTALLMAN3DIR=${D}/usr/share/man/man3	\
+		install || die
+
+	dodoc Changes CREDITS MANIFEST README SUPPORT ToDo
+	dohtml -r ./
+
+	cd apaci
+	exeinto /usr/lib/apache-extramodules
+	doexe libperl.so
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Execute \"ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config\""
+	einfo "to have your apache.conf auto-updated for use with this module."
+	einfo "You should then edit your /etc/conf.d/apache file to suit."
+	einfo
+}
+
+pkg_config() {
+	${ROOT}/usr/sbin/apacheaddmod \
+		${ROOT}/etc/apache/conf/apache.conf \
+		extramodules/libperl.so mod_perl.c perl_module \
+		define=PERL
+	:;
+}
diff --git a/www-apache/mod_perl/mod_perl-1.27-r4.ebuild b/www-apache/mod_perl/mod_perl-1.27-r4.ebuild
new file mode 100644
index 000000000000..e28dde299445
--- /dev/null
+++ b/www-apache/mod_perl/mod_perl-1.27-r4.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/mod_perl-1.27-r4.ebuild,v 1.1 2005/05/09 10:20:52 beu Exp $
+
+inherit eutils
+
+DESCRIPTION="A Perl Module for Apache"
+SRC_URI="http://perl.apache.org/dist/${P}.tar.gz"
+HOMEPAGE="http://perl.apache.org"
+
+SLOT="0"
+LICENSE="Apache-1.1 as-is"
+KEYWORDS="x86 amd64 ppc sparc ~alpha ~mips"
+
+DEPEND="dev-lang/perl dev-perl/libwww-perl =net-www/apache-1*"
+
+IUSE=""
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	for f in "apaci/mod_perl.config.sh" "apaci/libperl.module"
+	do
+		echo "tail -1 fix in ${f}"
+		sed -i -e "s/tail -1/tail -n1/" ${f}
+	done
+}
+
+src_compile() {
+	perl Makefile.PL USE_APXS=1 \
+		INSTALLDIRS=vendor \
+		WITH_APXS=/usr/sbin/apxs EVERYTHING=1
+
+	cp Makefile Makefile.orig
+	sed -e "s:apxs_install doc_install:doc_install:" Makefile.orig > Makefile
+	emake || die
+}
+
+src_install () {
+	eval `perl '-V:installvendorarch'`
+	eval `perl '-V:installvendorlib'`
+
+	make \
+		PREFIX=${D}/usr	\
+		INSTALLVENDORARCH=${D}/${installvendorarch}	\
+		INSTALLVENDORLIB=${D}/${installvendorlib}	\
+		INSTALLVENDORMAN1DIR=${D}/usr/share/man/man1	\
+		INSTALLVENDORMAN3DIR=${D}/usr/share/man/man3	\
+		pure_vendor_install || die
+
+	dodoc Changes CREDITS MANIFEST README SUPPORT ToDo
+	dohtml -r ./
+
+	cd apaci
+	exeinto /usr/lib/apache-extramodules
+	doexe libperl.so
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Execute \"ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config\""
+	einfo "to have your apache.conf auto-updated for use with this module."
+	einfo "You should then edit your /etc/conf.d/apache file to suit."
+	einfo
+}
+
+pkg_config() {
+	${ROOT}/usr/sbin/apacheaddmod \
+		${ROOT}/etc/apache/conf/apache.conf \
+		extramodules/libperl.so mod_perl.c perl_module \
+		define=PERL
+	:;
+}
diff --git a/www-apache/mod_perl/mod_perl-1.29.ebuild b/www-apache/mod_perl/mod_perl-1.29.ebuild
new file mode 100644
index 000000000000..e4453665b90f
--- /dev/null
+++ b/www-apache/mod_perl/mod_perl-1.29.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/mod_perl-1.29.ebuild,v 1.1 2005/05/09 10:20:52 beu Exp $
+
+inherit eutils
+
+DESCRIPTION="A Perl Module for Apache"
+SRC_URI="http://perl.apache.org/dist/${P}.tar.gz"
+HOMEPAGE="http://perl.apache.org"
+
+SLOT="0"
+LICENSE="Apache-1.1 as-is"
+KEYWORDS="~x86 ~amd64 ~ppc sparc alpha ia64 ~ppc64"
+
+DEPEND="dev-lang/perl dev-perl/libwww-perl =net-www/apache-1*"
+
+IUSE=""
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	for f in "apaci/mod_perl.config.sh" "apaci/libperl.module"
+	do
+		echo "tail -1 fix in ${f}"
+		sed -i -e "s/tail -1/tail -n1/" ${f}
+	done
+}
+
+src_compile() {
+	perl Makefile.PL USE_APXS=1 \
+		INSTALLDIRS=vendor \
+		WITH_APXS=/usr/sbin/apxs EVERYTHING=1 PERL_DEBUG=1
+
+	cp Makefile Makefile.orig
+	sed -e "s:apxs_install doc_install:doc_install:" Makefile.orig > Makefile
+	emake || die
+}
+
+src_install () {
+	eval `perl '-V:installvendorarch'`
+	eval `perl '-V:installvendorlib'`
+
+	make \
+		PREFIX=${D}/usr	\
+		INSTALLVENDORARCH=${D}/${installvendorarch}	\
+		INSTALLVENDORLIB=${D}/${installvendorlib}	\
+		INSTALLVENDORMAN1DIR=${D}/usr/share/man/man1	\
+		INSTALLVENDORMAN3DIR=${D}/usr/share/man/man3	\
+		pure_vendor_install || die
+
+	dodoc Changes CREDITS MANIFEST README SUPPORT ToDo
+	dohtml -r ./
+	# The following kludge is from the perl-module eclass to correct
+	# the packlist file. packlist is used by other apps to determine
+	# where to find parts of mod-perl
+	for FILE in `find ${D} -type f -name "*.html" -o -name ".packlist"`; do
+		sed -i -e "s:${D}:/:g" ${FILE}
+	done
+
+
+	cd apaci
+	exeinto /usr/lib/apache-extramodules
+	doexe libperl.so
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Execute \"ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config\""
+	einfo "to have your apache.conf auto-updated for use with this module."
+	einfo "You should then edit your /etc/conf.d/apache file to suit."
+	einfo
+}
+
+pkg_config() {
+	${ROOT}/usr/sbin/apacheaddmod \
+		${ROOT}/etc/apache/conf/apache.conf \
+		extramodules/libperl.so mod_perl.c perl_module \
+		define=PERL
+	:;
+}
diff --git a/www-apache/mod_perl/mod_perl-1.99.10.ebuild b/www-apache/mod_perl/mod_perl-1.99.10.ebuild
new file mode 100644
index 000000000000..2c244bfa7be8
--- /dev/null
+++ b/www-apache/mod_perl/mod_perl-1.99.10.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/mod_perl-1.99.10.ebuild,v 1.1 2005/05/09 10:20:52 beu Exp $
+
+inherit eutils
+
+front=${PV%\.*}
+back=\_${PV##*\.}
+MY_PV=${PV:0:${#front}}${back}
+
+MY_P=${PN}-${MY_PV}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="An embedded Perl interpreter for Apache2"
+SRC_URI="http://perl.apache.org/dist/${MY_P}.tar.gz"
+HOMEPAGE="http://perl.apache.org/"
+
+LICENSE="GPL-2"
+KEYWORDS="~x86 amd64"
+IUSE=""
+SLOT="1"
+
+# see bug 30087 for why sudo is in here
+
+DEPEND="dev-lang/perl
+	=net-www/apache-2*
+	>=dev-perl/CGI-2.93
+	>=sys-apps/sed-4
+	app-admin/sudo"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+
+	# I am not entirely happy with this solution, but here's what's
+	# going on here if someone wants to take a stab at another
+	# approach.  When userpriv compilation is off, then the make
+	# process drops to user "nobody" to run the test servers.  This
+	# server is closed, and then the socket is rebound using
+	# SO_REUSEADDR.  If the same user does this, there is no problem,
+	# and the socket may be rebound immediately.  If a different user
+	# (yes, in my testing, even root) attempts to rebind, it fails.
+	# Since the "is the socket available yet" code and the
+	# second-batch bind call both run as root, this will fail.  
+
+	# The upstream settings on my test machine cause the second batch
+	# of tests to fail, believing the socket to still be in use.  I
+	# tried patching various parts to make them run as the user
+	# specified in $config->{vars}{user} using getpwnam, but found
+	# this patch to be fairly intrusive, because the userid must be
+	# restored and the patch must be applied to multiple places.
+
+	# For now, we will simply extend the timeout in hopes that in the
+	# non-userpriv case, the socket will clear from the kernel tables
+	# normally, and the tests will proceed.
+
+	# If anybody is still having problems, then commenting out "make
+	# test" below should allow the software to build properly.
+
+	# Robert Coie <rac@gentoo.org> 2003.05.06
+
+	sed -i -e "s/sleep \$_/sleep \$_ << 2/" ${S}/Apache-Test/lib/Apache/TestServer.pm || die "problem editing TestServer.pm"
+
+	# this one is because of sandbox problems trying to uninstall test.pm
+
+	epatch ${FILESDIR}/${P}-nonukes.patch || die
+}
+
+src_compile() {
+	perl Makefile.PL \
+		PREFIX=${D}/usr \
+		MP_TRACE=1 \
+		MP_DEBUG=1 \
+		MP_AP_PREFIX=/usr \
+		MP_USE_DSO=1 \
+		MP_INST_APACHE2=1 \
+		MP_APXS=/usr/sbin/apxs2  \
+		CCFLAGS="${CFLAGS} -fPIC" \
+		INSTALLDIRS=vendor </dev/null || die
+
+	emake || die
+
+	# make test notes whether it is running as root, and drops
+	# privileges all the way to "nobody" if so, so we must adjust
+	# write permissions accordingly in this case.
+
+	if [ "`id -u`" == '0' ]; then
+		chown nobody:nobody ${WORKDIR}
+		chown nobody:nobody ${T}
+	fi
+
+	# these next two stanzas avoid sandbox problems with make test
+	# tell mod_cgid to make the socket here instead of /var/run/cgisock
+	echo -e "\nScriptSock logs/cgisock" >> ${S}/t/conf/extra.conf.in
+	echo -e "\nScriptSock logs/cgisock" >> ${S}/ModPerl-Registry/t/conf/extra.conf.in
+	# tell CGI.pm to create new tmpfiles in this directory
+	echo -e "\nSetEnv TMPDIR ${T}" >> ${S}/t/conf/extra.conf.in
+
+	# this does not || die because of bug 21325.
+
+	make test
+}
+
+src_install() {
+	dodir /usr/lib/apache2-extramodules
+	make install \
+		MODPERL_AP_LIBEXECDIR=${D}/usr/lib/apache2-extramodules \
+		MODPERL_AP_INCLUDEDIR=${D}/usr/include/apache2 \
+		MP_INST_APACHE2=1 \
+		INSTALLDIRS=vendor || die
+
+	insinto /etc/apache2/conf/modules.d
+	doins ${FILESDIR}/75_mod_perl.conf \
+		${FILESDIR}/apache2-mod_perl-startup.pl
+
+	dodoc ${FILESDIR}/75_mod_perl.conf Changes \
+		INSTALL LICENSE README STATUS
+	cp -a docs ${D}/usr/share/doc/${PF}
+	cp -a todo ${D}/usr/share/doc/${PF}
+}
diff --git a/www-apache/mod_perl/mod_perl-1.99.11.ebuild b/www-apache/mod_perl/mod_perl-1.99.11.ebuild
new file mode 100644
index 000000000000..f61c2279fce2
--- /dev/null
+++ b/www-apache/mod_perl/mod_perl-1.99.11.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/mod_perl-1.99.11.ebuild,v 1.1 2005/05/09 10:20:52 beu Exp $
+
+inherit eutils
+
+front=${PV%\.*}
+back=\_${PV##*\.}
+MY_PV=${PV:0:${#front}}${back}
+MY_P=${PN}-${MY_PV}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="An embedded Perl interpreter for Apache2"
+SRC_URI="http://perl.apache.org/dist/${MY_P}.tar.gz"
+HOMEPAGE="http://perl.apache.org/"
+
+LICENSE="GPL-2"
+KEYWORDS="~x86 amd64 alpha ia64 ~sparc ~ppc"
+IUSE=""
+SLOT="1"
+
+# see bug 30087 for why sudo is in here
+
+DEPEND="dev-lang/perl
+	=net-www/apache-2*
+	>=dev-perl/CGI-2.93
+	>=sys-apps/sed-4
+	app-admin/sudo"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+
+	# I am not entirely happy with this solution, but here's what's
+	# going on here if someone wants to take a stab at another
+	# approach.  When userpriv compilation is off, then the make
+	# process drops to user "nobody" to run the test servers.  This
+	# server is closed, and then the socket is rebound using
+	# SO_REUSEADDR.  If the same user does this, there is no problem,
+	# and the socket may be rebound immediately.  If a different user
+	# (yes, in my testing, even root) attempts to rebind, it fails.
+	# Since the "is the socket available yet" code and the
+	# second-batch bind call both run as root, this will fail.  
+
+	# The upstream settings on my test machine cause the second batch
+	# of tests to fail, believing the socket to still be in use.  I
+	# tried patching various parts to make them run as the user
+	# specified in $config->{vars}{user} using getpwnam, but found
+	# this patch to be fairly intrusive, because the userid must be
+	# restored and the patch must be applied to multiple places.
+
+	# For now, we will simply extend the timeout in hopes that in the
+	# non-userpriv case, the socket will clear from the kernel tables
+	# normally, and the tests will proceed.
+
+	# If anybody is still having problems, then commenting out "make
+	# test" below should allow the software to build properly.
+
+	# Robert Coie <rac@gentoo.org> 2003.05.06
+
+	sed -i -e "s/sleep \$_/sleep \$_ << 2/" ${S}/Apache-Test/lib/Apache/TestServer.pm || die "problem editing TestServer.pm"
+}
+
+src_compile() {
+	perl Makefile.PL \
+		PREFIX=${D}/usr \
+		MP_TRACE=1 \
+		MP_DEBUG=1 \
+		MP_AP_PREFIX=/usr \
+		MP_USE_DSO=1 \
+		MP_INST_APACHE2=1 \
+		MP_APXS=/usr/sbin/apxs2  \
+		CCFLAGS="${CFLAGS} -fPIC" \
+		INSTALLDIRS=vendor </dev/null || die
+
+	# reported that parallel make is broken in bug 30257
+	emake -j1 || die
+
+	# make test notes whether it is running as root, and drops
+	# privileges all the way to "nobody" if so, so we must adjust
+	# write permissions accordingly in this case.
+
+	if [ "`id -u`" == '0' ]; then
+		chown nobody:nobody ${WORKDIR}
+		chown nobody:nobody ${T}
+	fi
+
+	# these next two stanzas avoid sandbox problems with make test
+	# tell mod_cgid to make the socket here instead of /var/run/cgisock
+	echo -e "\nScriptSock logs/cgisock" >> ${S}/t/conf/extra.conf.in
+	echo -e "\nScriptSock logs/cgisock" >> ${S}/ModPerl-Registry/t/conf/extra.conf.in
+	# tell CGI.pm to create new tmpfiles in this directory
+	echo -e "\nSetEnv TMPDIR ${T}" >> ${S}/t/conf/extra.conf.in
+
+	# this does not || die because of bug 21325.
+
+	make test
+}
+
+src_install() {
+	dodir /usr/lib/apache2-extramodules
+	make install \
+		MODPERL_AP_LIBEXECDIR=${D}/usr/lib/apache2-extramodules \
+		MODPERL_AP_INCLUDEDIR=${D}/usr/include/apache2 \
+		MP_INST_APACHE2=1 \
+		INSTALLDIRS=vendor || die
+
+	insinto /etc/apache2/conf/modules.d
+	doins ${FILESDIR}/75_mod_perl.conf \
+		${FILESDIR}/apache2-mod_perl-startup.pl
+
+	dodoc ${FILESDIR}/75_mod_perl.conf Changes \
+		INSTALL LICENSE README STATUS
+	cp -a docs ${D}/usr/share/doc/${PF}
+	cp -a todo ${D}/usr/share/doc/${PF}
+}
diff --git a/www-apache/mod_perl/mod_perl-1.99.16.ebuild b/www-apache/mod_perl/mod_perl-1.99.16.ebuild
new file mode 100644
index 000000000000..6789e63f7133
--- /dev/null
+++ b/www-apache/mod_perl/mod_perl-1.99.16.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/mod_perl-1.99.16.ebuild,v 1.1 2005/05/09 10:20:52 beu Exp $
+
+inherit eutils
+
+front=${PV%\.*}
+back=\_${PV##*\.}
+MY_PV=${PV:0:${#front}}${back}
+MY_P=${PN}-${MY_PV}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="An embedded Perl interpreter for Apache2"
+SRC_URI="http://perl.apache.org/dist/${MY_P}.tar.gz"
+HOMEPAGE="http://perl.apache.org/"
+
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~amd64 ~alpha ~ia64 ~sparc ~ppc"
+IUSE=""
+SLOT="1"
+
+# see bug 30087 for why sudo is in here
+
+DEPEND="dev-lang/perl
+	=net-www/apache-2*
+	>=dev-perl/CGI-2.93
+	app-admin/sudo"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+
+	# I am not entirely happy with this solution, but here's what's
+	# going on here if someone wants to take a stab at another
+	# approach.  When userpriv compilation is off, then the make
+	# process drops to user "nobody" to run the test servers.  This
+	# server is closed, and then the socket is rebound using
+	# SO_REUSEADDR.  If the same user does this, there is no problem,
+	# and the socket may be rebound immediately.  If a different user
+	# (yes, in my testing, even root) attempts to rebind, it fails.
+	# Since the "is the socket available yet" code and the
+	# second-batch bind call both run as root, this will fail.  
+
+	# The upstream settings on my test machine cause the second batch
+	# of tests to fail, believing the socket to still be in use.  I
+	# tried patching various parts to make them run as the user
+	# specified in $config->{vars}{user} using getpwnam, but found
+	# this patch to be fairly intrusive, because the userid must be
+	# restored and the patch must be applied to multiple places.
+
+	# For now, we will simply extend the timeout in hopes that in the
+	# non-userpriv case, the socket will clear from the kernel tables
+	# normally, and the tests will proceed.
+
+	# If anybody is still having problems, then commenting out "make
+	# test" below should allow the software to build properly.
+
+	# Robert Coie <rac@gentoo.org> 2003.05.06
+
+	sed -i -e "s/sleep \$_/sleep \$_ << 2/" ${S}/Apache-Test/lib/Apache/TestServer.pm || die "problem editing TestServer.pm"
+
+	# i wonder if this is the same sandbox issue, but TMPDIR is not
+	# getting through via SetEnv.  sneak it through here.
+
+	epatch ${FILESDIR}/${P}-sneak-tmpdir.patch
+}
+
+src_compile() {
+	perl Makefile.PL \
+		PREFIX=${D}/usr \
+		MP_TRACE=1 \
+		MP_DEBUG=1 \
+		MP_USE_DSO=3 \
+		MP_INST_APACHE2=1 \
+		MP_APXS=/usr/sbin/apxs2  \
+		CCFLAGS="${CFLAGS} -fPIC" \
+		INSTALLDIRS=vendor </dev/null || die
+
+	# reported that parallel make is broken in bug 30257
+	emake -j1 || die
+
+	hasq maketest $FEATURES && src_test
+}
+
+src_test() {
+	# make test notes whether it is running as root, and drops
+	# privileges all the way to "nobody" if so, so we must adjust
+	# write permissions accordingly in this case.
+
+	if [ "`id -u`" == '0' ]; then
+		chown nobody:nobody ${WORKDIR}
+		chown nobody:nobody ${T}
+	fi
+
+	# this does not || die because of bug 21325.  kudos to smark for
+	# the idea of setting HOME.
+
+	HOME="${T}/" make test
+}
+
+src_install() {
+	dodir /usr/lib/apache2-extramodules
+	make install \
+		MODPERL_AP_LIBEXECDIR=${D}/usr/lib/apache2-extramodules \
+		MODPERL_AP_INCLUDEDIR=${D}/usr/include/apache2 \
+		MP_INST_APACHE2=1 \
+		INSTALLDIRS=vendor || die
+
+	insinto /etc/apache2/conf/modules.d
+	doins ${FILESDIR}/75_mod_perl.conf \
+		${FILESDIR}/apache2-mod_perl-startup.pl
+
+	# take this out once all <15 versions are out of the tree
+	sed -i -e 's/Apache::Server /Apache::ServerRec /' ${D}/etc/apache2/conf/modules.d/apache2-mod_perl-startup.pl
+
+	dodoc ${FILESDIR}/75_mod_perl.conf Changes \
+		INSTALL LICENSE README STATUS
+	cp -a docs ${D}/usr/share/doc/${PF}
+	cp -a todo ${D}/usr/share/doc/${PF}
+}
diff --git a/www-apache/mod_perl/mod_perl-1.99.17-r1.ebuild b/www-apache/mod_perl/mod_perl-1.99.17-r1.ebuild
new file mode 100644
index 000000000000..2fc981b19c58
--- /dev/null
+++ b/www-apache/mod_perl/mod_perl-1.99.17-r1.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/mod_perl-1.99.17-r1.ebuild,v 1.1 2005/05/09 10:20:52 beu Exp $
+
+inherit eutils
+
+front=${PV%\.*}
+back=\_${PV##*\.}
+MY_PV=${PV:0:${#front}}${back}
+MY_P=${PN}-${MY_PV}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="An embedded Perl interpreter for Apache2"
+SRC_URI="http://perl.apache.org/dist/${MY_P}.tar.gz"
+HOMEPAGE="http://perl.apache.org/"
+
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~amd64 ~alpha ~ia64 ~sparc ~ppc"
+IUSE=""
+SLOT="1"
+
+# see bug 30087 for why sudo is in here
+
+DEPEND="dev-lang/perl
+	=net-www/apache-2*
+	>=dev-perl/CGI-2.93
+	app-admin/sudo"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+
+	# I am not entirely happy with this solution, but here's what's
+	# going on here if someone wants to take a stab at another
+	# approach.  When userpriv compilation is off, then the make
+	# process drops to user "nobody" to run the test servers.  This
+	# server is closed, and then the socket is rebound using
+	# SO_REUSEADDR.  If the same user does this, there is no problem,
+	# and the socket may be rebound immediately.  If a different user
+	# (yes, in my testing, even root) attempts to rebind, it fails.
+	# Since the "is the socket available yet" code and the
+	# second-batch bind call both run as root, this will fail.  
+
+	# The upstream settings on my test machine cause the second batch
+	# of tests to fail, believing the socket to still be in use.  I
+	# tried patching various parts to make them run as the user
+	# specified in $config->{vars}{user} using getpwnam, but found
+	# this patch to be fairly intrusive, because the userid must be
+	# restored and the patch must be applied to multiple places.
+
+	# For now, we will simply extend the timeout in hopes that in the
+	# non-userpriv case, the socket will clear from the kernel tables
+	# normally, and the tests will proceed.
+
+	# If anybody is still having problems, then commenting out "make
+	# test" below should allow the software to build properly.
+
+	# Robert Coie <rac@gentoo.org> 2003.05.06
+
+	sed -i -e "s/sleep \$_/sleep \$_ << 2/" ${S}/Apache-Test/lib/Apache/TestServer.pm || die "problem editing TestServer.pm"
+
+	# i wonder if this is the same sandbox issue, but TMPDIR is not
+	# getting through via SetEnv.  sneak it through here.
+
+	epatch ${FILESDIR}/${PN}-1.99.16-sneak-tmpdir.patch
+}
+
+src_compile() {
+	perl Makefile.PL \
+		PREFIX=${D}/usr \
+		MP_TRACE=1 \
+		MP_DEBUG=1 \
+		MP_USE_DSO=3 \
+		MP_INST_APACHE2=1 \
+		MP_APXS=/usr/sbin/apxs2  \
+		CCFLAGS="${CFLAGS} -fPIC" \
+		INSTALLDIRS=vendor </dev/null || die
+
+	# reported that parallel make is broken in bug 30257
+	emake -j1 || die
+
+	hasq maketest $FEATURES && src_test
+}
+
+src_test() {
+	# make test notes whether it is running as root, and drops
+	# privileges all the way to "nobody" if so, so we must adjust
+	# write permissions accordingly in this case.
+
+	if [ "`id -u`" == '0' ]; then
+		chown nobody:nobody ${WORKDIR}
+		chown nobody:nobody ${T}
+	fi
+
+	# this does not || die because of bug 21325.  kudos to smark for
+	# the idea of setting HOME.
+
+	HOME="${T}/" make test
+}
+
+src_install() {
+	dodir /usr/lib/apache2-extramodules
+	make install \
+		MODPERL_AP_LIBEXECDIR=${D}/usr/lib/apache2-extramodules \
+		MODPERL_AP_INCLUDEDIR=${D}/usr/include/apache2 \
+		MP_INST_APACHE2=1 \
+		INSTALLDIRS=vendor || die
+
+	# this is an attempt to get @INC in line with /usr/bin/perl.
+	# there is blib garbage in the mainstream one that can only be
+	# useful during internal testing, so we wait until here and then
+	# just go with a clean slate.  should be much easier to see what's
+	# happening and revert if problematic.
+
+	eval $(perl -V:vendorarch)
+	cp ${FILESDIR}/${P}-Apache2.pm ${D}/${vendorarch}/Apache2.pm
+
+	insinto /etc/apache2/conf/modules.d
+	doins ${FILESDIR}/75_mod_perl.conf \
+		${FILESDIR}/apache2-mod_perl-startup.pl
+
+	# take this out once all <15 versions are out of the tree
+	sed -i -e 's/Apache::Server /Apache::ServerRec /' ${D}/etc/apache2/conf/modules.d/apache2-mod_perl-startup.pl
+
+	dodoc ${FILESDIR}/75_mod_perl.conf Changes \
+		INSTALL LICENSE README STATUS
+	cp -a docs ${D}/usr/share/doc/${PF}
+	cp -a todo ${D}/usr/share/doc/${PF}
+}
diff --git a/www-apache/mod_perl/mod_perl-1.99.17.ebuild b/www-apache/mod_perl/mod_perl-1.99.17.ebuild
new file mode 100644
index 000000000000..70bcbd9cb85a
--- /dev/null
+++ b/www-apache/mod_perl/mod_perl-1.99.17.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/mod_perl-1.99.17.ebuild,v 1.1 2005/05/09 10:20:52 beu Exp $
+
+inherit eutils
+
+front=${PV%\.*}
+back=\_${PV##*\.}
+MY_PV=${PV:0:${#front}}${back}
+MY_P=${PN}-${MY_PV}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="An embedded Perl interpreter for Apache2"
+SRC_URI="http://perl.apache.org/dist/${MY_P}.tar.gz"
+HOMEPAGE="http://perl.apache.org/"
+
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~amd64 ~alpha ~ia64 ~sparc ~ppc"
+IUSE=""
+SLOT="1"
+
+# see bug 30087 for why sudo is in here
+
+DEPEND="dev-lang/perl
+	=net-www/apache-2*
+	>=dev-perl/CGI-2.93
+	app-admin/sudo"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+
+	# I am not entirely happy with this solution, but here's what's
+	# going on here if someone wants to take a stab at another
+	# approach.  When userpriv compilation is off, then the make
+	# process drops to user "nobody" to run the test servers.  This
+	# server is closed, and then the socket is rebound using
+	# SO_REUSEADDR.  If the same user does this, there is no problem,
+	# and the socket may be rebound immediately.  If a different user
+	# (yes, in my testing, even root) attempts to rebind, it fails.
+	# Since the "is the socket available yet" code and the
+	# second-batch bind call both run as root, this will fail.  
+
+	# The upstream settings on my test machine cause the second batch
+	# of tests to fail, believing the socket to still be in use.  I
+	# tried patching various parts to make them run as the user
+	# specified in $config->{vars}{user} using getpwnam, but found
+	# this patch to be fairly intrusive, because the userid must be
+	# restored and the patch must be applied to multiple places.
+
+	# For now, we will simply extend the timeout in hopes that in the
+	# non-userpriv case, the socket will clear from the kernel tables
+	# normally, and the tests will proceed.
+
+	# If anybody is still having problems, then commenting out "make
+	# test" below should allow the software to build properly.
+
+	# Robert Coie <rac@gentoo.org> 2003.05.06
+
+	sed -i -e "s/sleep \$_/sleep \$_ << 2/" ${S}/Apache-Test/lib/Apache/TestServer.pm || die "problem editing TestServer.pm"
+
+	# i wonder if this is the same sandbox issue, but TMPDIR is not
+	# getting through via SetEnv.  sneak it through here.
+
+	epatch ${FILESDIR}/${PN}-1.99.16-sneak-tmpdir.patch
+}
+
+src_compile() {
+	perl Makefile.PL \
+		PREFIX=${D}/usr \
+		MP_TRACE=1 \
+		MP_DEBUG=1 \
+		MP_USE_DSO=3 \
+		MP_INST_APACHE2=1 \
+		MP_APXS=/usr/sbin/apxs2  \
+		CCFLAGS="${CFLAGS} -fPIC" \
+		INSTALLDIRS=vendor </dev/null || die
+
+	# reported that parallel make is broken in bug 30257
+	emake -j1 || die
+
+	hasq maketest $FEATURES && src_test
+}
+
+src_test() {
+	# make test notes whether it is running as root, and drops
+	# privileges all the way to "nobody" if so, so we must adjust
+	# write permissions accordingly in this case.
+
+	if [ "`id -u`" == '0' ]; then
+		chown nobody:nobody ${WORKDIR}
+		chown nobody:nobody ${T}
+	fi
+
+	# this does not || die because of bug 21325.  kudos to smark for
+	# the idea of setting HOME.
+
+	HOME="${T}/" make test
+}
+
+src_install() {
+	dodir /usr/lib/apache2-extramodules
+	make install \
+		MODPERL_AP_LIBEXECDIR=${D}/usr/lib/apache2-extramodules \
+		MODPERL_AP_INCLUDEDIR=${D}/usr/include/apache2 \
+		MP_INST_APACHE2=1 \
+		INSTALLDIRS=vendor || die
+
+	insinto /etc/apache2/conf/modules.d
+	doins ${FILESDIR}/75_mod_perl.conf \
+		${FILESDIR}/apache2-mod_perl-startup.pl
+
+	# take this out once all <15 versions are out of the tree
+	sed -i -e 's/Apache::Server /Apache::ServerRec /' ${D}/etc/apache2/conf/modules.d/apache2-mod_perl-startup.pl
+
+	dodoc ${FILESDIR}/75_mod_perl.conf Changes \
+		INSTALL LICENSE README STATUS
+	cp -a docs ${D}/usr/share/doc/${PF}
+	cp -a todo ${D}/usr/share/doc/${PF}
+}
diff --git a/www-apache/mod_survey/ChangeLog b/www-apache/mod_survey/ChangeLog
index a90bce448221..bc6fa35cac00 100644
--- a/www-apache/mod_survey/ChangeLog
+++ b/www-apache/mod_survey/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-apache/mod_survey
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_survey/ChangeLog,v 1.4 2004/11/30 22:31:30 swegener Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_survey/ChangeLog,v 1.5 2005/05/09 10:25:17 beu Exp $
+
+  09 May 2005; Elfyn McBratney <beu@gentoo.org> mod_survey-3.2.0.ebuild:
+  dev-perl/mod_perl -> www-apache/mod_perl
 
   30 Nov 2004; Sven Wegener <swegener@gentoo.org> mod_survey-3.2.0.ebuild:
   Fixed invalid atoms in *DEPEND.
diff --git a/www-apache/mod_survey/mod_survey-3.2.0.ebuild b/www-apache/mod_survey/mod_survey-3.2.0.ebuild
index d92554c67569..c4aa06ac543a 100644
--- a/www-apache/mod_survey/mod_survey-3.2.0.ebuild
+++ b/www-apache/mod_survey/mod_survey-3.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_survey/mod_survey-3.2.0.ebuild,v 1.4 2004/11/30 22:31:30 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_survey/mod_survey-3.2.0.ebuild,v 1.5 2005/05/09 10:25:17 beu Exp $
 
 inherit webapp
 
@@ -15,8 +15,8 @@ SRC_URI="http://gathering.itm.mh.se/modsurvey/download/${MY_P}.tar.gz"
 
 DEPEND=">=dev-lang/perl-5.6.1"
 RDEPEND="${DEPEND}
-		apache2? ( >=net-www/apache-2 >=dev-perl/mod_perl-1.99 )
-		!apache2? ( >=net-www/apache-1 >=dev-perl/mod_perl-1.27 )
+		apache2? ( >=net-www/apache-2 >=www-apache/mod_perl-1.99 )
+		!apache2? ( >=net-www/apache-1 >=www-apache/mod_perl-1.27 )
 		postgres? ( >=dev-perl/DBI-1.38	dev-perl/DBD-Pg )
 		mysql? ( >=dev-perl/DBI-1.38 dev-perl/DBD-mysql )
 		>=dev-perl/CGI-3.0.0"