fix #204916

Package-Manager: portage-2.1.4

4 files changed, 30 insertions, 22 deletions

diff --git a/www-apache/mod_perl/ChangeLog b/www-apache/mod_perl/ChangeLog
index fb1d5346a546..ac44eee99990 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/ChangeLog,v 1.53 2008/01/06 21:02:10 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/ChangeLog,v 1.54 2008/01/27 20:11:46 hollow Exp $
+
+  27 Jan 2008; Benedikt Böhm <hollow@gentoo.org>
+  files/2.0.3/75_mod_perl.conf, mod_perl-2.0.3-r2.ebuild:
+  fix #204916
 
 *mod_perl-2.0.3-r2 (06 Jan 2008)
 
diff --git a/www-apache/mod_perl/Manifest b/www-apache/mod_perl/Manifest
index 6f6af323763b..10f59860f26e 100644
--- a/www-apache/mod_perl/Manifest
+++ b/www-apache/mod_perl/Manifest
@@ -1,10 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 2.0.3/75_mod_perl.conf 1192 RMD160 5232def2ea41d7263da6c2adccd679ec295c7d73 SHA1 3e3f569b9440bb0ef398f8af716b15415836a104 SHA256 6831925bb284b9ce73c41aeb767b7673014f2a6148f389a28f29bb3aec07b734
-MD5 dfd7e0ee2ddf944950a4c297c300f873 files/2.0.3/75_mod_perl.conf 1192
-RMD160 5232def2ea41d7263da6c2adccd679ec295c7d73 files/2.0.3/75_mod_perl.conf 1192
-SHA256 6831925bb284b9ce73c41aeb767b7673014f2a6148f389a28f29bb3aec07b734 files/2.0.3/75_mod_perl.conf 1192
+AUX 2.0.3/75_mod_perl.conf 1221 RMD160 5fe4dee7d3123be5f3cd8cd41bb54fd1b63f0328 SHA1 068bf3f674a13e1db51046851a837ee7501353b7 SHA256 e7c2f4b84e9c9fc73e421740736f67674ebc7e7f13f8b2f71c9360f746fd441a
+MD5 4f7c75db873c2f84bc6820fad9354986 files/2.0.3/75_mod_perl.conf 1221
+RMD160 5fe4dee7d3123be5f3cd8cd41bb54fd1b63f0328 files/2.0.3/75_mod_perl.conf 1221
+SHA256 e7c2f4b84e9c9fc73e421740736f67674ebc7e7f13f8b2f71c9360f746fd441a files/2.0.3/75_mod_perl.conf 1221
 AUX 2.0.3/apache2-mod_perl-startup.pl 478 RMD160 ef12070dd5e5707286e3c714ec3aeae78ce5cfd4 SHA1 80ece64910771b6c36d7b2d30373287bc1bf4b87 SHA256 f77741fb3bb18928fb15f95c6908a17d8f06d7efbb6785e0732f201347e26544
 MD5 39bbf08146125b9be7559d5c2d16b400 files/2.0.3/apache2-mod_perl-startup.pl 478
 RMD160 ef12070dd5e5707286e3c714ec3aeae78ce5cfd4 files/2.0.3/apache2-mod_perl-startup.pl 478
@@ -22,14 +22,14 @@ EBUILD mod_perl-2.0.3-r1.ebuild 5297 RMD160 999a76d7bd87b18294fc8ee7e01abd54af8d
 MD5 2ff103c966c5e45d6171d7c4c49089d0 mod_perl-2.0.3-r1.ebuild 5297
 RMD160 999a76d7bd87b18294fc8ee7e01abd54af8d08ae mod_perl-2.0.3-r1.ebuild 5297
 SHA256 8a503f3f1f9c8458f164257b60a79b1118f1c649c7d6c8d265d677a2af91b924 mod_perl-2.0.3-r1.ebuild 5297
-EBUILD mod_perl-2.0.3-r2.ebuild 4578 RMD160 0c05f086e7f59ae97dd9492102cf9505459c4ff6 SHA1 2a2d254fc0f93a8d7fc2b93dc13ea956f4e1e5e3 SHA256 f4ee54bb51271e603ac4989b474b42ea97591a9263ab5f13759e833806983b70
-MD5 3edb60ac2a5adc4f0024bb02942dc54e mod_perl-2.0.3-r2.ebuild 4578
-RMD160 0c05f086e7f59ae97dd9492102cf9505459c4ff6 mod_perl-2.0.3-r2.ebuild 4578
-SHA256 f4ee54bb51271e603ac4989b474b42ea97591a9263ab5f13759e833806983b70 mod_perl-2.0.3-r2.ebuild 4578
-MISC ChangeLog 17667 RMD160 846bce123fda9c9011a09ef102807d83793fbdc5 SHA1 bf7db362e62af6c10e88a39d822c22bce86a70a5 SHA256 187ea4cb583e617d2be70b6ea07cb78b24e026b8b24c29a32a9e45b9818bb7f1
-MD5 61934387df9e3dec8cbd32ba31220e12 ChangeLog 17667
-RMD160 846bce123fda9c9011a09ef102807d83793fbdc5 ChangeLog 17667
-SHA256 187ea4cb583e617d2be70b6ea07cb78b24e026b8b24c29a32a9e45b9818bb7f1 ChangeLog 17667
+EBUILD mod_perl-2.0.3-r2.ebuild 4649 RMD160 20668fed83938ad98e5825687aa7eb9869986e66 SHA1 1d635a54805f78295efbcc00d804beaaf459ca0e SHA256 fbc55bed8f88360bd48a98c4c73d154275c1380ebc4c67ddc59b2f9535c12414
+MD5 4dee989002c15b6d367145ce0ab3aa97 mod_perl-2.0.3-r2.ebuild 4649
+RMD160 20668fed83938ad98e5825687aa7eb9869986e66 mod_perl-2.0.3-r2.ebuild 4649
+SHA256 fbc55bed8f88360bd48a98c4c73d154275c1380ebc4c67ddc59b2f9535c12414 mod_perl-2.0.3-r2.ebuild 4649
+MISC ChangeLog 17790 RMD160 79bd1cfb3c419b346dcb2d714d6bffe62dd43e84 SHA1 8ebba649c22afc511fd7261997decf31a2252314 SHA256 005b8d33b4ac7bfb192fead42e16aad53a407f3e23e50ed82bc5accf5a73019a
+MD5 4c2403bab8fa9ac25943e49441f3a6d9 ChangeLog 17790
+RMD160 79bd1cfb3c419b346dcb2d714d6bffe62dd43e84 ChangeLog 17790
+SHA256 005b8d33b4ac7bfb192fead42e16aad53a407f3e23e50ed82bc5accf5a73019a ChangeLog 17790
 MISC metadata.xml 289 RMD160 490c4256f14e1d9f37d432f700d4daea64a76b7c SHA1 e17d9d05b33898dddf745543d699ccb7348afc0a SHA256 a6c8f7ccb9eed3ab8dc936a39b96af61d48b48734852c78b80d85979508a13ce
 MD5 842a29d05716f8b272ce39f7c4992d4b metadata.xml 289
 RMD160 490c4256f14e1d9f37d432f700d4daea64a76b7c metadata.xml 289
@@ -43,7 +43,7 @@ SHA256 8fa24b53fca491ae5c32d3ca402e74417c2d1cb21be10cbd73319ca869b154ba files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.8 (GNU/Linux)
 
-iEYEARECAAYFAkeBQdcACgkQmPFBzbX68WFW/gCfVji1iFioYrkobj558SDIYzw6
-D1wAoIgMBjLNRRgNQQipEmApk/h2W1zt
-=KEbH
+iEYEARECAAYFAkec5YsACgkQmPFBzbX68WHL2wCfbS45DIgD+FYgeR9iBa+uHrPF
+gM0AoISN8FYKl0xpU0IX2pGWntC4zJh1
+=sXo9
 -----END PGP SIGNATURE-----
diff --git a/www-apache/mod_perl/files/2.0.3/75_mod_perl.conf b/www-apache/mod_perl/files/2.0.3/75_mod_perl.conf
index 470bc45345ab..596d2cc73c6e 100644
--- a/www-apache/mod_perl/files/2.0.3/75_mod_perl.conf
+++ b/www-apache/mod_perl/files/2.0.3/75_mod_perl.conf
@@ -46,3 +46,5 @@ Alias /cgi-perl/ /var/www/localhost/perl/
 	Allow from all
 </Location>
 </IfDefine>
+
+# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_perl/mod_perl-2.0.3-r2.ebuild b/www-apache/mod_perl/mod_perl-2.0.3-r2.ebuild
index c367f6829c1d..94a005720ad1 100644
--- a/www-apache/mod_perl/mod_perl-2.0.3-r2.ebuild
+++ b/www-apache/mod_perl/mod_perl-2.0.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/mod_perl-2.0.3-r2.ebuild,v 1.1 2008/01/06 21:02:10 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/mod_perl-2.0.3-r2.ebuild,v 1.2 2008/01/27 20:11:46 hollow Exp $
 
 inherit apache-module perl-module eutils multilib
 
@@ -29,10 +29,10 @@ DOCFILES="Changes INSTALL LICENSE README STATUS"
 need_apache2
 
 pkg_setup() {
-	if built_with_use dev-lang/perl ithreads; then
-		APACHE2_SAFE_MPMS="event worker"
-	else
-		APACHE2_SAFE_MPMS="prefork itk peruser"
+	if built_with_use www-servers/apache threads \
+			&& ! built_with_use dev-lang/perl ithreads; then
+		eerror "threaded MPMs require threaded perl"
+		die "emerge dev-lang/perl with USE=ithreads"
 	fi
 	apache-module_pkg_setup
 }
@@ -68,7 +68,9 @@ src_unpack() {
 
 	# 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"
+	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. Bug 172676