fix #205169

Package-Manager: portage-2.1.4_rc11

5 files changed, 53 insertions, 44 deletions

diff --git a/www-apache/mod_backtrace/Manifest b/www-apache/mod_backtrace/Manifest
index 96b727e8dc2a..ab533ded0a90 100644
--- a/www-apache/mod_backtrace/Manifest
+++ b/www-apache/mod_backtrace/Manifest
@@ -1,19 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 10_mod_backtrace.conf 202 RMD160 492bf47f6b55d72a6cedb1e8041613a544c02849 SHA1 8c1ca825bb86f3b5b98f1fbd9571eb3fdf273047 SHA256 56f07755d3e82592e8bb56863054b144b1129d96e41eb33e3347b7f6b725b5bb
-MD5 b566345e09fbf4c2de3de0e0a034ce16 files/10_mod_backtrace.conf 202
-RMD160 492bf47f6b55d72a6cedb1e8041613a544c02849 files/10_mod_backtrace.conf 202
-SHA256 56f07755d3e82592e8bb56863054b144b1129d96e41eb33e3347b7f6b725b5bb files/10_mod_backtrace.conf 202
+AUX 10_mod_backtrace.conf 156 RMD160 c2c7782afd92d31ddda4b7f8c2f95b3abdee1a62 SHA1 e7a9bc4657eb657b648734e16472802d9890262d SHA256 bb50499c56faa3f0792b0ede342e4b9c27b8201b37da09ed53b2f894fe92176d
+MD5 a4e58970b698d681c9405093e799d190 files/10_mod_backtrace.conf 156
+RMD160 c2c7782afd92d31ddda4b7f8c2f95b3abdee1a62 files/10_mod_backtrace.conf 156
+SHA256 bb50499c56faa3f0792b0ede342e4b9c27b8201b37da09ed53b2f894fe92176d files/10_mod_backtrace.conf 156
 DIST mod_backtrace-0.0.1.c 5965 RMD160 3b2665c632d01c14dd7b30a0b27feae24d52696d SHA1 47decaf6570455cc420bb4069e43537af7fbca5a SHA256 56fd08206e5b5a2b6258dc2b48e0466010640ddac12dcc153e65c455f294e900
-EBUILD mod_backtrace-0.0.1.ebuild 719 RMD160 38a9b95384d652f5956786bc961777d4aec6eabd SHA1 4d8169e895314d560556ce32904344d6341a9e35 SHA256 1f613f4c0782b85ddfd87962847e6097779d3e47567b317594e06f99da0d7565
-MD5 606c654761a655c3b4b93267ef75bd8c mod_backtrace-0.0.1.ebuild 719
-RMD160 38a9b95384d652f5956786bc961777d4aec6eabd mod_backtrace-0.0.1.ebuild 719
-SHA256 1f613f4c0782b85ddfd87962847e6097779d3e47567b317594e06f99da0d7565 mod_backtrace-0.0.1.ebuild 719
-MISC ChangeLog 402 RMD160 b0c140b83f806c5cb37908945b1214fc5693257e SHA1 f3b2efa4e16e81a880341f2189a599a09b7d42b8 SHA256 41eccf4234389fdf18d8ed83f81e14b02db34b4f88f71c1ba200819f11087aad
-MD5 f5dc3a5b17edb249131179d2a101ae58 ChangeLog 402
-RMD160 b0c140b83f806c5cb37908945b1214fc5693257e ChangeLog 402
-SHA256 41eccf4234389fdf18d8ed83f81e14b02db34b4f88f71c1ba200819f11087aad ChangeLog 402
+EBUILD mod_backtrace-0.0.1.ebuild 877 RMD160 c03e4f3cdf589c361590af314fa1a6ba45919981 SHA1 1c84b88e3926f9e40174f4eb55a3427804dcb1f9 SHA256 c61c9aea760a9848e2cb7ab81caf834e1e22f05447c0b3a4659b49801eb602e9
+MD5 2a8ded1c132687d6bae2048e0844ee75 mod_backtrace-0.0.1.ebuild 877
+RMD160 c03e4f3cdf589c361590af314fa1a6ba45919981 mod_backtrace-0.0.1.ebuild 877
+SHA256 c61c9aea760a9848e2cb7ab81caf834e1e22f05447c0b3a4659b49801eb602e9 mod_backtrace-0.0.1.ebuild 877
+MISC ChangeLog 526 RMD160 a3d18051007b1259912905eb6526a78f291e6292 SHA1 1b353d141d49ce702d317f0e8e31c494d72df23c SHA256 5b2b372d43c0331f00349502dcf296884bfdcc8bd5f5200a8c93275f8feeea1b
+MD5 fa222497dd392b70dfe52f9d77731c6f ChangeLog 526
+RMD160 a3d18051007b1259912905eb6526a78f291e6292 ChangeLog 526
+SHA256 5b2b372d43c0331f00349502dcf296884bfdcc8bd5f5200a8c93275f8feeea1b ChangeLog 526
 MISC metadata.xml 229 RMD160 bb816bd761846ad578f8c1521a1f1ec6297410f4 SHA1 92fdbcb6a85ece96506733ad67a5e4e74a58a529 SHA256 8e1aafc5385805d45759406a60df79f0ce88aa1df1a58d44b596405d64c9226d
 MD5 17bfbf436c6d4afc4dea019597d048d1 metadata.xml 229
 RMD160 bb816bd761846ad578f8c1521a1f1ec6297410f4 metadata.xml 229
@@ -22,9 +22,9 @@ MD5 2ed9ec3523ca7a1696f94a63fe20e4d0 files/digest-mod_backtrace-0.0.1 238
 RMD160 8f02166af5efe4ec8af209780b36760cb41ca02d files/digest-mod_backtrace-0.0.1 238
 SHA256 c6a1dfa28704df58e57b011291aa8632dad8bebb46ca2f2747d9eb432d5b8f5e files/digest-mod_backtrace-0.0.1 238
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.6 (GNU/Linux)
+Version: GnuPG v2.0.8 (GNU/Linux)
 
-iD8DBQFG4teVmPFBzbX68WERAiReAJ9DMU+dnrZgxVgzISnBE+nSlumJrgCeI0/o
-zJKXIiB/bwYN+fUdw3IhQdM=
-=m+vR
+iEYEARECAAYFAkeGPqcACgkQmPFBzbX68WHwmQCfd/SMgpyH/4SdypMyACrUVTEr
+qbQAn1ynWwyEiZ4UmLe74cns593emi7E
+=rpTD
 -----END PGP SIGNATURE-----
diff --git a/www-apache/mod_whatkilledus/ChangeLog b/www-apache/mod_whatkilledus/ChangeLog
index 800d858292ae..19c9c0a51dd8 100644
--- a/www-apache/mod_whatkilledus/ChangeLog
+++ b/www-apache/mod_whatkilledus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apache/mod_whatkilledus
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_whatkilledus/ChangeLog,v 1.1 2007/09/08 17:04:32 hollow Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_whatkilledus/ChangeLog,v 1.2 2008/01/10 15:47:30 hollow Exp $
+
+  10 Jan 2008; Benedikt Böhm <hollow@gentoo.org>
+  files/10_mod_whatkilledus.conf, mod_whatkilledus-0.0.1.ebuild:
+  fix #205169
 
 *mod_whatkilledus-0.0.1 (08 Sep 2007)
 
diff --git a/www-apache/mod_whatkilledus/Manifest b/www-apache/mod_whatkilledus/Manifest
index 5ac4e38dbf45..c3f65f532aa6 100644
--- a/www-apache/mod_whatkilledus/Manifest
+++ b/www-apache/mod_whatkilledus/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 10_mod_whatkilledus.conf 220 RMD160 b99a7482ed996acdfb3a5c0df0033e268fbbd7eb SHA1 3827e499bac823f85743824514a9135444089328 SHA256 22191e35fb94323b5bba16657aa63680d7f069c748a3024a2bfc87a39e38fb01
-MD5 1e4889e2737fb16172ede37560567699 files/10_mod_whatkilledus.conf 220
-RMD160 b99a7482ed996acdfb3a5c0df0033e268fbbd7eb files/10_mod_whatkilledus.conf 220
-SHA256 22191e35fb94323b5bba16657aa63680d7f069c748a3024a2bfc87a39e38fb01 files/10_mod_whatkilledus.conf 220
+AUX 10_mod_whatkilledus.conf 168 RMD160 a3a0b5bcfe799b1b53832b5d22b595537a9a2bb3 SHA1 c02f1f81f234fa8dadb7d47eabcaf68d86744086 SHA256 0f1176f4586e8390bc0e7757e8abe95a13b1e993a34fabd56010d50ee9c03a88
+MD5 dfd94ff05923758975efe480a0289c9d files/10_mod_whatkilledus.conf 168
+RMD160 a3a0b5bcfe799b1b53832b5d22b595537a9a2bb3 files/10_mod_whatkilledus.conf 168
+SHA256 0f1176f4586e8390bc0e7757e8abe95a13b1e993a34fabd56010d50ee9c03a88 files/10_mod_whatkilledus.conf 168
 AUX gen_test_char.c 4220 RMD160 c0982e39a04a499e0d0798bb770e1c9f79f2b599 SHA1 365816992f88eeec9764f4a197405d31520257e9 SHA256 389348d0235fe77be73e8fbf3fcf52c2559b372098f40f62fbc106913533ea86
 MD5 7c4e734d1afc695a5be53581998f3700 files/gen_test_char.c 4220
 RMD160 c0982e39a04a499e0d0798bb770e1c9f79f2b599 files/gen_test_char.c 4220
 SHA256 389348d0235fe77be73e8fbf3fcf52c2559b372098f40f62fbc106913533ea86 files/gen_test_char.c 4220
 DIST mod_whatkilledus-0.0.1.c 12244 RMD160 8ad16837732302db4a2d0f2715fd2dfd5743125e SHA1 27b3d36d67b24a0242a82b683b872705de114d63 SHA256 940fed942ed5880ca885fae4fefc5dcb8167cb80c7dc6cfd4a58689714b3d779
-EBUILD mod_whatkilledus-0.0.1.ebuild 972 RMD160 576c423cf6e8ecbbd2d0f23fdad29d42c426180a SHA1 79c2f3864ffd940138814ea5321a62fd08ad964e SHA256 f999771353d5bc5f5462755990358642cefe7ade4f5f47f887294df27c9ef43d
-MD5 6c7cebb755df340b3dcfe2908a59f7dc mod_whatkilledus-0.0.1.ebuild 972
-RMD160 576c423cf6e8ecbbd2d0f23fdad29d42c426180a mod_whatkilledus-0.0.1.ebuild 972
-SHA256 f999771353d5bc5f5462755990358642cefe7ade4f5f47f887294df27c9ef43d mod_whatkilledus-0.0.1.ebuild 972
-MISC ChangeLog 443 RMD160 4b7768ca73ff8b50a5e5004b162c7e83f1f0f755 SHA1 eeeaeb3922cc61a11945987e3c261e8cfdd072ca SHA256 86c2b7259d6c6251cd0868b7a194454b772b2161ef9ffa7b829b234a4451ab01
-MD5 96450a789fb2a09b1c041c723797a4b7 ChangeLog 443
-RMD160 4b7768ca73ff8b50a5e5004b162c7e83f1f0f755 ChangeLog 443
-SHA256 86c2b7259d6c6251cd0868b7a194454b772b2161ef9ffa7b829b234a4451ab01 ChangeLog 443
+EBUILD mod_whatkilledus-0.0.1.ebuild 1148 RMD160 196f09b7b5a7ac845e20a77997a5d892c901c262 SHA1 82d8fd47cad3d40230b758959f8bae2722c4140a SHA256 d4652532ba7d02acc841efcef419993e6a62aa88241302f33e8b06763816987c
+MD5 47aff56015a35a4c790260dc74fd4702 mod_whatkilledus-0.0.1.ebuild 1148
+RMD160 196f09b7b5a7ac845e20a77997a5d892c901c262 mod_whatkilledus-0.0.1.ebuild 1148
+SHA256 d4652532ba7d02acc841efcef419993e6a62aa88241302f33e8b06763816987c mod_whatkilledus-0.0.1.ebuild 1148
+MISC ChangeLog 573 RMD160 33d99fc4ddde73ad9377d5536398d613a7f4ab28 SHA1 7b360109ac29f3ea1a4311b95eb6cc3329af9c6b SHA256 5758f5c5012817b086e56a05e86638c760dcbf7214d491b003637b33f088300f
+MD5 cc9ba2ee238da80668f40c304e749eee ChangeLog 573
+RMD160 33d99fc4ddde73ad9377d5536398d613a7f4ab28 ChangeLog 573
+SHA256 5758f5c5012817b086e56a05e86638c760dcbf7214d491b003637b33f088300f ChangeLog 573
 MISC metadata.xml 229 RMD160 bb816bd761846ad578f8c1521a1f1ec6297410f4 SHA1 92fdbcb6a85ece96506733ad67a5e4e74a58a529 SHA256 8e1aafc5385805d45759406a60df79f0ce88aa1df1a58d44b596405d64c9226d
 MD5 17bfbf436c6d4afc4dea019597d048d1 metadata.xml 229
 RMD160 bb816bd761846ad578f8c1521a1f1ec6297410f4 metadata.xml 229
@@ -26,9 +26,9 @@ MD5 8f572b27e5331c30cdcc77af8462e3db files/digest-mod_whatkilledus-0.0.1 250
 RMD160 1cb1e6714281a5ebed7bf1ae67b3e02ee84e9186 files/digest-mod_whatkilledus-0.0.1 250
 SHA256 2260bc399bd239b48371c0502a4478881e2bd99ff06b43b88f1f97bed0d7a6ba files/digest-mod_whatkilledus-0.0.1 250
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.6 (GNU/Linux)
+Version: GnuPG v2.0.8 (GNU/Linux)
 
-iD8DBQFG4tYsmPFBzbX68WERAnPmAKCNMR7iB8PT/7qlbYvkU2qj/yGikACdHi9D
-IFpPo9TLH/6PEw9xjEGN8VY=
-=9PTW
+iEYEARECAAYFAkeGPh4ACgkQmPFBzbX68WG0PACgk3XGUEcfgW8VwcrSPmP4BRIx
+vNIAnjaYXW5oVi6DcKl1D8en7spASDNF
+=WuLM
 -----END PGP SIGNATURE-----
diff --git a/www-apache/mod_whatkilledus/files/10_mod_whatkilledus.conf b/www-apache/mod_whatkilledus/files/10_mod_whatkilledus.conf
index 70122847a2f2..80fbe3bbed4b 100644
--- a/www-apache/mod_whatkilledus/files/10_mod_whatkilledus.conf
+++ b/www-apache/mod_whatkilledus/files/10_mod_whatkilledus.conf
@@ -1,7 +1,5 @@
 <IfDefine WHATKILLEDUS>
-	<IfModule !mod_whatkilledus.c>
-		LoadModule whatkilledus_module    modules/mod_whatkilledus.so
-	</IfModule>
-	EnableExceptionHook On
-	WhatKilledUsLog /var/log/apache2/whatkilledus_log
+LoadModule whatkilledus_module modules/mod_whatkilledus.so
+EnableExceptionHook On
+WhatKilledUsLog /var/log/apache2/whatkilledus_log
 </IfDefine>
diff --git a/www-apache/mod_whatkilledus/mod_whatkilledus-0.0.1.ebuild b/www-apache/mod_whatkilledus/mod_whatkilledus-0.0.1.ebuild
index 9143f047be2d..04443aab9c5d 100644
--- a/www-apache/mod_whatkilledus/mod_whatkilledus-0.0.1.ebuild
+++ b/www-apache/mod_whatkilledus/mod_whatkilledus-0.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_whatkilledus/mod_whatkilledus-0.0.1.ebuild,v 1.1 2007/09/08 17:04:32 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_whatkilledus/mod_whatkilledus-0.0.1.ebuild,v 1.2 2008/01/10 15:47:30 hollow Exp $
 
 inherit apache-module eutils toolchain-funcs
 
@@ -19,7 +19,14 @@ RDEPEND=""
 APACHE2_MOD_CONF="10_${PN}"
 APACHE2_MOD_DEFINE="WHATKILLEDUS"
 
-need_apache2
+need_apache2_2
+
+pkg_setup() {
+	apache-module_pkg_setup
+	if ! built_with_use www-servers/apache debug; then
+		die "you need to build www-servers/apache with USE=debug"
+	fi
+}
 
 src_unpack() {
 	mkdir -p "${S}" || die "mkdir S failed"
@@ -28,8 +35,8 @@ src_unpack() {
 
 src_compile() {
 	$(tc-getCC) \
-		$($(apr_config) --includes) \
-		$($(apr_config) --cppflags) \
+		$(/usr/bin/apr-1-config --includes) \
+		$(/usr/bin/apr-1-config --cppflags) \
 		-o "${S}"/gen_test_char \
 		"${FILESDIR}"/gen_test_char.c
 	"${S}"/gen_test_char > "${S}"/test_char.h