Corrected apache2-*.pl

Package-Manager: portage-2.0.51.22-r1

3 files changed, 12 insertions, 23 deletions

diff --git a/www-apache/mod_perl/ChangeLog b/www-apache/mod_perl/ChangeLog
index ed77430ef065..0ae8cd22cd3b 100644
--- a/www-apache/mod_perl/ChangeLog
+++ b/www-apache/mod_perl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apache/mod_perl
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/ChangeLog,v 1.8 2005/08/08 09:35:43 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/ChangeLog,v 1.9 2005/08/08 09:38:32 mcummings Exp $
+
+  08 Aug 2005; Michael Cummings <mcummings@gentoo.org>
+  files/apache2-mod_perl-startup.pl:
+  Corrected apache2-*.pl
 
 *mod_perl-2.0.1-r2 (08 Aug 2005)
 
diff --git a/www-apache/mod_perl/Manifest b/www-apache/mod_perl/Manifest
index 6bdbb600a79f..3520c7f6a852 100644
--- a/www-apache/mod_perl/Manifest
+++ b/www-apache/mod_perl/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 53c2cf52a85c45d8829eb69353315c25 ChangeLog 10390
+MD5 0fe989294eba7b3f528afa4bd5509299 ChangeLog 10508
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
 MD5 03b7e719ebc03b0bbdb703ce809b510b mod_perl-1.27-r1.ebuild 1419
 MD5 77e5ef5905ee1527577ba7b9c27328d7 mod_perl-1.27-r2.ebuild 1438
@@ -12,7 +12,7 @@ MD5 8a3282dd3a16deb4647459f81ad70abe mod_perl-1.99.11.ebuild 3789
 MD5 05f614537c52c42b923462192096468e mod_perl-1.99.16.ebuild 3804
 MD5 b2abdb1abcc3c0ce6f3a6277a08194d9 mod_perl-2.0.1-r2.ebuild 4826
 MD5 2415e6be73ba155382b34b5e2fad4951 files/75_mod_perl.conf 247
-MD5 bd8c3a03d35a34c5dc23ffdc76faa5cc files/apache2-mod_perl-startup.pl 811
+MD5 6dbf85f6df302959fc9decf11eb6e5f5 files/apache2-mod_perl-startup.pl 485
 MD5 05455750ba5b64e18dbcfd113193e7cd files/digest-mod_perl-1.27-r1 65
 MD5 05455750ba5b64e18dbcfd113193e7cd files/digest-mod_perl-1.27-r2 65
 MD5 05455750ba5b64e18dbcfd113193e7cd files/digest-mod_perl-1.27-r4 65
@@ -29,7 +29,7 @@ MD5 4dcf07748f65bc0682e4d739ec14535d files/2.0.1/75_mod_perl.conf 1527
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFC9yeBtG5z4I8BtQoRAg3bAJ9BLyQ+G1VLuwZoaembzGgmZ6nu3wCdFlEe
-K3wyXfHpzBQLfBO0AG1ma1w=
-=Km+R
+iD8DBQFC9ygqtG5z4I8BtQoRAo34AJ4o4AehpAJt2c/CUmYafpaYXsDGjwCfaKOS
+HTmWmxaWKMw9Fu5jmrAurdU=
+=BFYC
 -----END PGP SIGNATURE-----
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 7e784cab5f04..73740597c108 100644
--- a/www-apache/mod_perl/files/apache2-mod_perl-startup.pl
+++ b/www-apache/mod_perl/files/apache2-mod_perl-startup.pl
@@ -3,10 +3,7 @@ use Apache2 ();
 use lib qw(/home/httpd/perl);
 
 # enable if the mod_perl 1.0 compatibility is needed
-use Apache::compat ();
-# preload all mp2 modules
-use ModPerl::MethodLookup;
-ModPerl::MethodLookup::preload_all_modules();
+# #use Apache::compat ();
 
 use ModPerl::Util (); #for CORE::GLOBAL::exit
 
@@ -14,7 +11,7 @@ use Apache::RequestRec ();
 use Apache::RequestIO ();
 use Apache::RequestUtil ();
 
-use Apache::ServerRec ();
+use Apache::Server ();
 use Apache::ServerUtil ();
 use Apache::Connection ();
 use Apache::Log ();
@@ -26,16 +23,4 @@ use ModPerl::Registry ();
 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;