Fix from jakub on IRC

Package-Manager: portage-2.1.2.9

4 files changed, 22 insertions, 18 deletions

diff --git a/net-www/apache/ChangeLog b/net-www/apache/ChangeLog
index c8fd79c76b04..57a4b5fb7bd4 100644
--- a/net-www/apache/ChangeLog
+++ b/net-www/apache/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-www/apache
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.533 2007/06/05 16:41:01 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.534 2007/06/05 23:34:59 jokey Exp $
+
+  05 Jun 2007; Markus Ullmann <jokey@gentoo.org> -apache-2.2.4-r5.ebuild
+  +apache-2.2.4-r6.ebuild:
+  Fix from jakub on IRC
 
 *apache-2.2.4-r5 (05 Jun 2007)
 
diff --git a/net-www/apache/Manifest b/net-www/apache/Manifest
index d464f625554a..74309c13d8e7 100644
--- a/net-www/apache/Manifest
+++ b/net-www/apache/Manifest
@@ -30,14 +30,14 @@ EBUILD apache-2.0.59-r2.ebuild 14079 RMD160 c9be7324ff9eaeb62c6a7667f7339c3e7d3e
 MD5 6dcdc4563ddbbc21f13ed8aa24f5242d apache-2.0.59-r2.ebuild 14079
 RMD160 c9be7324ff9eaeb62c6a7667f7339c3e7d3ecc32 apache-2.0.59-r2.ebuild 14079
 SHA256 7f4d8e4095e0e785ebb2e9b73b3702494157dfbb6125d0ee98041eacc79b6378 apache-2.0.59-r2.ebuild 14079
-EBUILD apache-2.2.4-r5.ebuild 14887 RMD160 543c861794909e99924ae17f2bd9ae052a2066b5 SHA1 c5a15b8d5cfc9d7df0217dc1c33c31351f443271 SHA256 10bb86076f10082779aa1e7760f414e53c0f05866f86444d35983802baba23bd
-MD5 eafe683e0f8148984a8857550f6f4585 apache-2.2.4-r5.ebuild 14887
-RMD160 543c861794909e99924ae17f2bd9ae052a2066b5 apache-2.2.4-r5.ebuild 14887
-SHA256 10bb86076f10082779aa1e7760f414e53c0f05866f86444d35983802baba23bd apache-2.2.4-r5.ebuild 14887
-MISC ChangeLog 92027 RMD160 20b15e8cf7328b0e1dfaad20318696c1701769fe SHA1 df5884fcaf165f7c58e04d371a7e7016050e8cb0 SHA256 273d589b2f07700a2f5115a911a1cc4d9b819ed7afe8cda4efb79e730a18d129
-MD5 3fc8cff4730bc29dd4a9022c7c32a10c ChangeLog 92027
-RMD160 20b15e8cf7328b0e1dfaad20318696c1701769fe ChangeLog 92027
-SHA256 273d589b2f07700a2f5115a911a1cc4d9b819ed7afe8cda4efb79e730a18d129 ChangeLog 92027
+EBUILD apache-2.2.4-r6.ebuild 14880 RMD160 7535feeb56fb05cd5cb14a6846579df1cf16601c SHA1 d4c45fece7c3ecd5947e905fffe5caa9fd10bd17 SHA256 05f00d1444a8ed6c88461f105e259e35cd2b2ae75e51b5ed0d8a43f696148eb5
+MD5 431a3eda10f5616618b2a7ddac2d2ba7 apache-2.2.4-r6.ebuild 14880
+RMD160 7535feeb56fb05cd5cb14a6846579df1cf16601c apache-2.2.4-r6.ebuild 14880
+SHA256 05f00d1444a8ed6c88461f105e259e35cd2b2ae75e51b5ed0d8a43f696148eb5 apache-2.2.4-r6.ebuild 14880
+MISC ChangeLog 92151 RMD160 a59aa3dc84eaf2fe2086b83ebad3d3083a4cd535 SHA1 cde33584a1c7212f498c1fa704a3c395aacf17d7 SHA256 908142cbb275f27eeccaf065ce69377189ecaf4ff03742301993377fd4781cce
+MD5 7d3fecd265ad1567dcaac0a93b4b7f54 ChangeLog 92151
+RMD160 a59aa3dc84eaf2fe2086b83ebad3d3083a4cd535 ChangeLog 92151
+SHA256 908142cbb275f27eeccaf065ce69377189ecaf4ff03742301993377fd4781cce ChangeLog 92151
 MISC metadata.xml 551 RMD160 1b31261c043e57cabc9bd8582f9b34c09d92d108 SHA1 68bb286a67452c3dae7525195c60b8637cca9b81 SHA256 646729a42ddffcbde3426dd6aa9a77fab923bc348c5b34c9d24083d86fbb15eb
 MD5 0f28752ee3545b3fd8e28ee656e62f4b metadata.xml 551
 RMD160 1b31261c043e57cabc9bd8582f9b34c09d92d108 metadata.xml 551
@@ -54,13 +54,13 @@ SHA256 a168cb54770884f50f48411842613b904f1cbf24ca9596ea43b28eeed7688936 files/di
 MD5 fb6513d7e3c17a25d505a7c7a06d43d7 files/digest-apache-2.0.59-r2 542
 RMD160 124580b340dddc55cb1c92565a0de043a9b27ab1 files/digest-apache-2.0.59-r2 542
 SHA256 d3d9b85e6d0dc1610726f52d7f45f34e144351cf96d449bdabcd362482405cb5 files/digest-apache-2.0.59-r2 542
-MD5 3685a5e5ea27be4a736dc1ce919ae3c6 files/digest-apache-2.2.4-r5 536
-RMD160 643d3dfa434f0f243edbfef1da50bd19fc80c3c1 files/digest-apache-2.2.4-r5 536
-SHA256 1c6148391d382b0c388801c54fd831c9172e4063d03dd0c4c9a5c8b2dff6d027 files/digest-apache-2.2.4-r5 536
+MD5 3685a5e5ea27be4a736dc1ce919ae3c6 files/digest-apache-2.2.4-r6 536
+RMD160 643d3dfa434f0f243edbfef1da50bd19fc80c3c1 files/digest-apache-2.2.4-r6 536
+SHA256 1c6148391d382b0c388801c54fd831c9172e4063d03dd0c4c9a5c8b2dff6d027 files/digest-apache-2.2.4-r6 536
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGZZIpyuNVb5qfaOYRApsIAJ9UVPF9x9I9clGXVtTILitBvQAzrACgrTt7
-z7xGtpabr/dGBtyktAo5I1Y=
-=spjU
+iD8DBQFGZfMxz974XjDVpbkRAomSAJ9ZgIyP/70+c1xAu/ym+v6Q2wfC2QCgn5Vd
+N+QiiZjz/dj2/UNPhVIcUQA=
+=6XVv
 -----END PGP SIGNATURE-----
diff --git a/net-www/apache/apache-2.2.4-r5.ebuild b/net-www/apache/apache-2.2.4-r6.ebuild
index 0ed62a46e7a5..234e5c26c2e7 100644
--- a/net-www/apache/apache-2.2.4-r5.ebuild
+++ b/net-www/apache/apache-2.2.4-r6.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.2.4-r5.ebuild,v 1.1 2007/06/05 16:41:01 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.2.4-r6.ebuild,v 1.1 2007/06/05 23:34:59 jokey Exp $
 
 inherit eutils flag-o-matic gnuconfig multilib autotools
 
 # latest gentoo apache files
-GENTOO_PATCHNAME="gentoo-${PF}"
+GENTOO_PATCHNAME="gentoo-${P}-r5"
 GENTOO_PATCHSTAMP="20070605"
 GENTOO_DEVSPACE="phreak"
 GENTOO_PATCHDIR="${WORKDIR}/${GENTOO_PATCHNAME}"
@@ -141,7 +141,7 @@ src_unpack() {
 }
 
 src_compile() {
-	local modtype="shared" myconf="" mods=""
+	local modtype="shared" myconf=""
 	cd "${S}"
 
 	# Instead of filtering --as-needed (bug #128505), append --no-as-needed
diff --git a/net-www/apache/files/digest-apache-2.2.4-r5 b/net-www/apache/files/digest-apache-2.2.4-r6
index 9f9a3b4d896b..9f9a3b4d896b 100644
--- a/net-www/apache/files/digest-apache-2.2.4-r5
+++ b/net-www/apache/files/digest-apache-2.2.4-r6