fix #178407 again

Package-Manager: portage-2.1.3_rc9

6 files changed, 46 insertions, 24 deletions

diff --git a/www-apache/mod_fcgid/ChangeLog b/www-apache/mod_fcgid/ChangeLog
index d0b733529df5..3bcfedf6328a 100644
--- a/www-apache/mod_fcgid/ChangeLog
+++ b/www-apache/mod_fcgid/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apache/mod_fcgid
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_fcgid/ChangeLog,v 1.31 2007/07/29 16:02:08 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_fcgid/ChangeLog,v 1.32 2007/07/30 08:57:08 hollow Exp $
+
+  30 Jul 2007; Benedikt Böhm <hollow@gentoo.org>
+  +files/1.10/20_mod_fcgid.conf, +files/2.1/20_mod_fcgid.conf,
+  -files/20_mod_fcgid.conf, mod_fcgid-1.10.ebuild, mod_fcgid-2.1-r2.ebuild:
+  fix #178407 again
 
   29 Jul 2007; Benedikt Böhm <hollow@gentoo.org> -mod_fcgid-2.1-r1.ebuild:
   remove old ebuild
diff --git a/www-apache/mod_fcgid/Manifest b/www-apache/mod_fcgid/Manifest
index d72b610145d4..e4eacadbf6c9 100644
--- a/www-apache/mod_fcgid/Manifest
+++ b/www-apache/mod_fcgid/Manifest
@@ -1,21 +1,28 @@
-AUX 20_mod_fcgid.conf 75 RMD160 b89f7be034a4d0331b26f3476bca4ec378019d1e SHA1 76b07fe41032a2a21357ec8385c9cf331c11ad8a SHA256 1dd1b5a71604df6d205769225244ab7312890408dfa911d235e8fae12e1adc0f
-MD5 b90dde3aa4651ba71699d0e299fe7f29 files/20_mod_fcgid.conf 75
-RMD160 b89f7be034a4d0331b26f3476bca4ec378019d1e files/20_mod_fcgid.conf 75
-SHA256 1dd1b5a71604df6d205769225244ab7312890408dfa911d235e8fae12e1adc0f files/20_mod_fcgid.conf 75
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 1.10/20_mod_fcgid.conf 114 RMD160 73bd7f9451c50bd0daced03cefde2e085805f207 SHA1 8ba28abd4e1826c32bd07f8deedef3ad0c86e353 SHA256 48dd2a8bdd8fb1538127f6bfeda80a3c41fff4ec6624866d2505c5f4e50ffc26
+MD5 e38d90cf47ccb6c28fc3afbd6af65bd1 files/1.10/20_mod_fcgid.conf 114
+RMD160 73bd7f9451c50bd0daced03cefde2e085805f207 files/1.10/20_mod_fcgid.conf 114
+SHA256 48dd2a8bdd8fb1538127f6bfeda80a3c41fff4ec6624866d2505c5f4e50ffc26 files/1.10/20_mod_fcgid.conf 114
+AUX 2.1/20_mod_fcgid.conf 155 RMD160 83640b4d1a90515772b76a303f1e20546c34dcdb SHA1 d37fdda0ef31bf66177188b86e9b5c40898abb0b SHA256 0f077bd955bc45533c120f9a5c40f1f9c867d5e563fc0c2225bf97defd42ca00
+MD5 b9fa7188e6154a1eb12df30cc26ff7ad files/2.1/20_mod_fcgid.conf 155
+RMD160 83640b4d1a90515772b76a303f1e20546c34dcdb files/2.1/20_mod_fcgid.conf 155
+SHA256 0f077bd955bc45533c120f9a5c40f1f9c867d5e563fc0c2225bf97defd42ca00 files/2.1/20_mod_fcgid.conf 155
 DIST mod_fcgid.1.10.tar.gz 51547 RMD160 17ff09a4006ee10f5c47e045df34985d0c53880b SHA1 e762889d046ddec3aa52361e5996c30973ea9079 SHA256 13b1e2197aff37f14c05cfb4e795cfe77ca36fc25d59b5ccfbe7ac8917fc705a
 DIST mod_fcgid.2.1.tar.gz 54359 RMD160 cf8ec344ad2e108ad0b47085b0509e2c13a062c1 SHA1 4d69edaadaed11753254bd8b37a355c1151d8225 SHA256 9d847f66f8067c5b8de06088a04356d22cee9ced2db7d04be6d6a7613c6b83df
-EBUILD mod_fcgid-1.10.ebuild 918 RMD160 c55a6dc253b0439fff3f35631bec4049799a7586 SHA1 712d1b7b2d5e0e294aaa7b1e0be404cbac791196 SHA256 01595687db68b483061960b36e463288439a085495ea4948c8f570d5749e662c
-MD5 3750857370aa43a6cf534e35a4102c21 mod_fcgid-1.10.ebuild 918
-RMD160 c55a6dc253b0439fff3f35631bec4049799a7586 mod_fcgid-1.10.ebuild 918
-SHA256 01595687db68b483061960b36e463288439a085495ea4948c8f570d5749e662c mod_fcgid-1.10.ebuild 918
-EBUILD mod_fcgid-2.1-r2.ebuild 986 RMD160 bbfea6418085fe59989e19c999687e1da8194410 SHA1 7aa560e14e4ad922442100a6a2dcb963c7a5ba4f SHA256 aebc17037dc62cc56c7c948f20ddba49aaae034cbcf803b7daa78da6975f7859
-MD5 cccb3c2334daeb2bfc9de856e1c43213 mod_fcgid-2.1-r2.ebuild 986
-RMD160 bbfea6418085fe59989e19c999687e1da8194410 mod_fcgid-2.1-r2.ebuild 986
-SHA256 aebc17037dc62cc56c7c948f20ddba49aaae034cbcf803b7daa78da6975f7859 mod_fcgid-2.1-r2.ebuild 986
-MISC ChangeLog 5946 RMD160 d6e27add73761622db9b69610e90681ab1e781cb SHA1 1faf08a6209233db904f883cb7150dca00b4205b SHA256 0b6affa6e1b9f6a46bf769d10401a9b72fb7f754788b6c3e231a50cf463a5c1e
-MD5 e526e12a0c56cab2980df0a914ce74c6 ChangeLog 5946
-RMD160 d6e27add73761622db9b69610e90681ab1e781cb ChangeLog 5946
-SHA256 0b6affa6e1b9f6a46bf769d10401a9b72fb7f754788b6c3e231a50cf463a5c1e ChangeLog 5946
+EBUILD mod_fcgid-1.10.ebuild 923 RMD160 99bba55f9fbb84da1f4a069ae2a5e8980bde8ec5 SHA1 8943b2476538194a50c7900c36b7f3ca6fc61b0c SHA256 bea1ab3d98f4b714b62e238595919a53d2e545c8795b4dfb9ad5a563cb9dbd91
+MD5 bb41c28497503b364bbc95282efaa493 mod_fcgid-1.10.ebuild 923
+RMD160 99bba55f9fbb84da1f4a069ae2a5e8980bde8ec5 mod_fcgid-1.10.ebuild 923
+SHA256 bea1ab3d98f4b714b62e238595919a53d2e545c8795b4dfb9ad5a563cb9dbd91 mod_fcgid-1.10.ebuild 923
+EBUILD mod_fcgid-2.1-r2.ebuild 945 RMD160 08bcac80d51ea56bb5fad0d48e16ccbd50051236 SHA1 01dea146e42dd28ccfa61ec9e7730c9839756b2a SHA256 bb4f5a86874a84067362884e11200669538b6add9676bb467d23b08f0f70601f
+MD5 d76515d55c83bb1b2f476e8adc8de4f0 mod_fcgid-2.1-r2.ebuild 945
+RMD160 08bcac80d51ea56bb5fad0d48e16ccbd50051236 mod_fcgid-2.1-r2.ebuild 945
+SHA256 bb4f5a86874a84067362884e11200669538b6add9676bb467d23b08f0f70601f mod_fcgid-2.1-r2.ebuild 945
+MISC ChangeLog 6156 RMD160 a0aaea4922d6e4f434dc559445fab3d2d163947d SHA1 1b49e9258ad600d7aaad486fb78f023f35160d9c SHA256 fab3ccc850e057616e78b90463f5262f4701aa6284c202a30b5a3eb1f3c74ecb
+MD5 1e688d8aab1318246a5fd23e3d7fde79 ChangeLog 6156
+RMD160 a0aaea4922d6e4f434dc559445fab3d2d163947d ChangeLog 6156
+SHA256 fab3ccc850e057616e78b90463f5262f4701aa6284c202a30b5a3eb1f3c74ecb ChangeLog 6156
 MISC metadata.xml 483 RMD160 56be90c965ab5663636d639624c7778409e72347 SHA1 4704b1f7b6e558722c8613e66df8d148165d7a64 SHA256 9acd2c7ac26a99c1ba655aa7912526906c3e5d03529aeadcb08f9b40373244bc
 MD5 b04c3f93349f84b2bc615931f1c1d6c9 metadata.xml 483
 RMD160 56be90c965ab5663636d639624c7778409e72347 metadata.xml 483
@@ -26,3 +33,10 @@ SHA256 03226104e0c41b539d58b2f65d9698ff65d5d5461701f313732d998071c52969 files/di
 MD5 c332373544b3839233ac7199b1b3048c files/digest-mod_fcgid-2.1-r2 238
 RMD160 b8344a3f713ccefee2f752a5b31259a52f19d67d files/digest-mod_fcgid-2.1-r2 238
 SHA256 cc68ac5febecd1750373fb497c2f00536f093a83f0f19efd5d7b174d3c2d97fa files/digest-mod_fcgid-2.1-r2 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.5 (GNU/Linux)
+
+iD8DBQFGrafwmPFBzbX68WERArbSAJ9sts4D4f9ceJlS3D714ccI+qPwtQCfb+7b
+JL0/tbnIX+OTQK9RUGhCv6U=
+=c/tO
+-----END PGP SIGNATURE-----
diff --git a/www-apache/mod_fcgid/files/20_mod_fcgid.conf b/www-apache/mod_fcgid/files/1.10/20_mod_fcgid.conf
index e67b20ec68e5..6bcf22b12b7d 100644
--- a/www-apache/mod_fcgid/files/20_mod_fcgid.conf
+++ b/www-apache/mod_fcgid/files/1.10/20_mod_fcgid.conf
@@ -1,3 +1,4 @@
 <IfDefine FCGID>
 	LoadModule fcgid_module modules/mod_fcgid.so
+	SocketPath /var/log/apache2/fcgidsock
 </IfDefine>
diff --git a/www-apache/mod_fcgid/files/2.1/20_mod_fcgid.conf b/www-apache/mod_fcgid/files/2.1/20_mod_fcgid.conf
new file mode 100644
index 000000000000..d3d35bf15807
--- /dev/null
+++ b/www-apache/mod_fcgid/files/2.1/20_mod_fcgid.conf
@@ -0,0 +1,5 @@
+<IfDefine FCGID>
+	LoadModule fcgid_module modules/mod_fcgid.so
+	SocketPath /var/log/apache2/fcgidsock
+	SharememPath /var/log/apache2/fcgid_shm
+</IfDefine>
diff --git a/www-apache/mod_fcgid/mod_fcgid-1.10.ebuild b/www-apache/mod_fcgid/mod_fcgid-1.10.ebuild
index f81d00e550b7..1458ad24d8ee 100644
--- a/www-apache/mod_fcgid/mod_fcgid-1.10.ebuild
+++ b/www-apache/mod_fcgid/mod_fcgid-1.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_fcgid/mod_fcgid-1.10.ebuild,v 1.5 2007/02/03 23:35:58 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_fcgid/mod_fcgid-1.10.ebuild,v 1.6 2007/07/30 08:57:08 hollow Exp $
 
 inherit apache-module
 
@@ -15,7 +15,7 @@ IUSE=""
 
 S="${WORKDIR}/${PN}.${PV}"
 
-APACHE2_MOD_CONF="20_${PN}"
+APACHE2_MOD_CONF="${PV}/20_${PN}"
 APACHE2_MOD_DEFINE="FCGID"
 
 APXS2_ARGS="-I ${S} -c ${PN}.c fcgid_bridge.c \
diff --git a/www-apache/mod_fcgid/mod_fcgid-2.1-r2.ebuild b/www-apache/mod_fcgid/mod_fcgid-2.1-r2.ebuild
index 44fd8294ca6d..53433730ecca 100644
--- a/www-apache/mod_fcgid/mod_fcgid-2.1-r2.ebuild
+++ b/www-apache/mod_fcgid/mod_fcgid-2.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_fcgid/mod_fcgid-2.1-r2.ebuild,v 1.1 2007/07/29 15:58:50 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_fcgid/mod_fcgid-2.1-r2.ebuild,v 1.2 2007/07/30 08:57:08 hollow Exp $
 
 inherit apache-module eutils multilib
 
@@ -13,12 +13,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
-DEPEND="=dev-libs/apr-1*"
-RDEPEND="${DEPEND}"
-
 S="${WORKDIR}/${PN}.${PV}"
 
-APACHE2_MOD_CONF="20_${PN}"
+APACHE2_MOD_CONF="${PV}/20_${PN}"
 APACHE2_MOD_DEFINE="FCGID"
 
 APXS2_ARGS="-I ${S} -c ${PN}.c fcgid_bridge.c \