With help from rendhalver, split out the mod-perl2 conf/files so that both older and newer versions were available

(Portage version: 2.0.51.22-r1)

5 files changed, 110 insertions, 57 deletions

diff --git a/www-apache/mod_perl/files/2.0.1/75_mod_perl.conf b/www-apache/mod_perl/files/2.0.1/75_mod_perl.conf
new file mode 100644
index 000000000000..96455b51e209
--- /dev/null
+++ b/www-apache/mod_perl/files/2.0.1/75_mod_perl.conf
@@ -0,0 +1,56 @@
+<IfDefine PERL>
+  <IfModule !mod_perl.c>
+    LoadModule perl_module    modules/mod_perl.so
+  </IfModule>
+</IfDefine>
+
+<IfModule mod_perl.c>
+	#PerlTrace all
+	PerlRequire "/etc/apache2/modules.d/apache2-mod_perl-startup.pl"
+
+	#Provide two aliases to the same cgi-bin directory,
+	#to see the effects of the 2 different mod_perl modes
+	#for Apache2::Registry Mode
+	Alias /perl/ /var/www/localhost/perl/
+	#for Apache2::Perlrun Mode
+	Alias /cgi-perl/ /var/www/localhost/perl/
+
+	<IfModule mod_access.c>
+	<Location /perl-status>
+        	SetHandler perl-script
+		PerlResponseHandler Apache2::Status
+        	Order deny,allow
+        	Deny from all
+        	Allow from 127.0.0.1
+	</Location>
+	</IfModule>
+
+    <Directory /home/*/public_html/perl>
+        SetHandler perl-script
+        PerlResponseHandler ModPerl::PerlRun
+        Options -Indexes ExecCGI
+		PerlOptions +ParseHeaders
+    </Directory>
+
+    PerlModule ModPerl::Registry
+    #set Apache::Registry Mode for /perl Alias
+    # To set subdirectories to use perl set the following 
+    # and comment the orignial:
+    # <Location ~ "^/perl/.*\.pl$">
+    <Location  "^/perl/*.pl>
+        SetHandler perl-script
+        PerlResponseHandler ModPerl::Registry
+        Options -Indexes ExecCGI
+        PerlSendHeader On
+    </Location>
+
+    #set Apache::PerlRun Mode for /cgi-perl Alias
+    <Location /cgi-perl/*.pl>
+        SetHandler perl-script
+        PerlResponseHandler ModPerl::PerlRun
+        Options -Indexes ExecCGI
+        PerlSendHeader On
+    </Location>
+
+</ifModule>
+
diff --git a/www-apache/mod_perl/files/2.0.1/apache2-mod_perl-startup.pl b/www-apache/mod_perl/files/2.0.1/apache2-mod_perl-startup.pl
new file mode 100644
index 000000000000..afc048ac125b
--- /dev/null
+++ b/www-apache/mod_perl/files/2.0.1/apache2-mod_perl-startup.pl
@@ -0,0 +1,24 @@
+use lib qw(/home/httpd/perl);
+
+# enable if the mod_perl 1.0 compatibility is needed
+#use Apache2::compat ();
+
+use ModPerl::Util (); #for CORE::GLOBAL::exit
+
+use Apache2::RequestRec ();
+use Apache2::RequestIO ();
+use Apache2::RequestUtil ();
+
+use Apache2::ServerRec ();
+use Apache2::ServerUtil ();
+use Apache2::Connection ();
+use Apache2::Log ();
+
+use APR::Table ();
+
+use ModPerl::Registry ();
+
+use Apache2::Const -compile => ':common';
+use APR::Const -compile => ':common';
+
+1;
diff --git a/www-apache/mod_perl/files/75_mod_perl.conf b/www-apache/mod_perl/files/75_mod_perl.conf
index 96455b51e209..4933e9af9fef 100644
--- a/www-apache/mod_perl/files/75_mod_perl.conf
+++ b/www-apache/mod_perl/files/75_mod_perl.conf
@@ -1,56 +1,11 @@
 <IfDefine PERL>
   <IfModule !mod_perl.c>
-    LoadModule perl_module    modules/mod_perl.so
+    LoadModule perl_module    extramodules/mod_perl.so
   </IfModule>
 </IfDefine>
 
 <IfModule mod_perl.c>
-	#PerlTrace all
-	PerlRequire "/etc/apache2/modules.d/apache2-mod_perl-startup.pl"
-
-	#Provide two aliases to the same cgi-bin directory,
-	#to see the effects of the 2 different mod_perl modes
-	#for Apache2::Registry Mode
-	Alias /perl/ /var/www/localhost/perl/
-	#for Apache2::Perlrun Mode
-	Alias /cgi-perl/ /var/www/localhost/perl/
-
-	<IfModule mod_access.c>
-	<Location /perl-status>
-        	SetHandler perl-script
-		PerlResponseHandler Apache2::Status
-        	Order deny,allow
-        	Deny from all
-        	Allow from 127.0.0.1
-	</Location>
-	</IfModule>
-
-    <Directory /home/*/public_html/perl>
-        SetHandler perl-script
-        PerlResponseHandler ModPerl::PerlRun
-        Options -Indexes ExecCGI
-		PerlOptions +ParseHeaders
-    </Directory>
-
-    PerlModule ModPerl::Registry
-    #set Apache::Registry Mode for /perl Alias
-    # To set subdirectories to use perl set the following 
-    # and comment the orignial:
-    # <Location ~ "^/perl/.*\.pl$">
-    <Location  "^/perl/*.pl>
-        SetHandler perl-script
-        PerlResponseHandler ModPerl::Registry
-        Options -Indexes ExecCGI
-        PerlSendHeader On
-    </Location>
-
-    #set Apache::PerlRun Mode for /cgi-perl Alias
-    <Location /cgi-perl/*.pl>
-        SetHandler perl-script
-        PerlResponseHandler ModPerl::PerlRun
-        Options -Indexes ExecCGI
-        PerlSendHeader On
-    </Location>
-
+  #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
index afc048ac125b..7e784cab5f04 100644
--- a/www-apache/mod_perl/files/apache2-mod_perl-startup.pl
+++ b/www-apache/mod_perl/files/apache2-mod_perl-startup.pl
@@ -1,24 +1,41 @@
+use Apache2 ();
+
 use lib qw(/home/httpd/perl);
 
 # enable if the mod_perl 1.0 compatibility is needed
-#use Apache2::compat ();
+use Apache::compat ();
+# preload all mp2 modules
+use ModPerl::MethodLookup;
+ModPerl::MethodLookup::preload_all_modules();
 
 use ModPerl::Util (); #for CORE::GLOBAL::exit
 
-use Apache2::RequestRec ();
-use Apache2::RequestIO ();
-use Apache2::RequestUtil ();
+use Apache::RequestRec ();
+use Apache::RequestIO ();
+use Apache::RequestUtil ();
 
-use Apache2::ServerRec ();
-use Apache2::ServerUtil ();
-use Apache2::Connection ();
-use Apache2::Log ();
+use Apache::ServerRec ();
+use Apache::ServerUtil ();
+use Apache::Connection ();
+use Apache::Log ();
 
 use APR::Table ();
 
 use ModPerl::Registry ();
 
-use Apache2::Const -compile => ':common';
+use Apache::Const -compile => ':common';
 use APR::Const -compile => ':common';
 
+# end of mod_perl2 stuff
+
+#use Apache::Session ();
+use CGI ();
+use CGI::Cookie ();
+use DBI;
+#use Apache::Perldoc ();
+use Apache::Status ();
+use HTML::Mason ();
+use HTML::Mason::ApacheHandler ();
+use MasonX::Apache2Handler ();
+
 1;
diff --git a/www-apache/mod_perl/files/digest-mod_perl-2.0.1-r2 b/www-apache/mod_perl/files/digest-mod_perl-2.0.1-r2
new file mode 100644
index 000000000000..9357f7c53bb0
--- /dev/null
+++ b/www-apache/mod_perl/files/digest-mod_perl-2.0.1-r2
@@ -0,0 +1 @@
+MD5 fd9cb8ce794bb3ae3c8c288e18bf5b8f mod_perl-2.0.1.tar.gz 3694355