Added new ebuild for the new apache bug (resolves bug #79313), Fixed module config file for new module location, Fixed older ebuilds to point to the older module location, Stable for 1.06 on x86

(Portage version: 2.0.51.22-r2)

8 files changed, 74 insertions, 13 deletions

diff --git a/www-apache/mod_fcgid/ChangeLog b/www-apache/mod_fcgid/ChangeLog
index 0cc8a0b05dd9..5fd7848c9f77 100644
--- a/www-apache/mod_fcgid/ChangeLog
+++ b/www-apache/mod_fcgid/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for www-apache/mod_fcgid
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_fcgid/ChangeLog,v 1.7 2005/07/10 03:38:43 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_fcgid/ChangeLog,v 1.8 2005/09/23 01:18:48 ramereth Exp $
+
+*mod_fcgid-1.06-r1 (23 Sep 2005)
+
+  23 Sep 2005; Lance Albertson <ramereth@gentoo.org>
+  +files/20_mod_fcgid.conf-oldlayout, files/20_mod_fcgid.conf,
+  mod_fcgid-1.05-r2.ebuild, mod_fcgid-1.06.ebuild,
+  +mod_fcgid-1.06-r1.ebuild:
+  * Added new ebuild for the new apache bug (resolves bug #79313)
+  * Fixed module config file for new module location
+  * Fixed older ebuilds to point to the older module location
+  * Made 1.06 stable on x86
 
 *mod_fcgid-1.06 (10 Jul 2005)
 
diff --git a/www-apache/mod_fcgid/Manifest b/www-apache/mod_fcgid/Manifest
index 520e71702b24..d610d48de5c5 100644
--- a/www-apache/mod_fcgid/Manifest
+++ b/www-apache/mod_fcgid/Manifest
@@ -1,7 +1,10 @@
-MD5 d65b4367d418a70d65d4c7340e06a8fb ChangeLog 1301
+MD5 26bfb0c1cf2141f7b1b047dc8e68492b mod_fcgid-1.05-r2.ebuild 1206
 MD5 b04c3f93349f84b2bc615931f1c1d6c9 metadata.xml 483
-MD5 6a1a67ea5207ecd52a0b3226f1b091bd mod_fcgid-1.05-r2.ebuild 1185
-MD5 5d2ce8681d7a80a327df5f951d149959 mod_fcgid-1.06.ebuild 1183
-MD5 2f3017d748d633af44a9d82fa83cdef7 files/20_mod_fcgid.conf 197
+MD5 f4f846ee002500700c97e728fb1a8812 ChangeLog 1741
+MD5 fe0c30afba762caeb0916740412c360a mod_fcgid-1.06.ebuild 1203
+MD5 a788b06ee4f3c5443154129f4102a909 mod_fcgid-1.06-r1.ebuild 861
+MD5 afcfa360a9a77fd3bdb6c2ec89efa594 files/20_mod_fcgid.conf 192
 MD5 2d8046826f8e5dd7cc5256d4e8337275 files/digest-mod_fcgid-1.05-r2 65
 MD5 cafc8c22c15bd694177cb04afbc32d42 files/digest-mod_fcgid-1.06 65
+MD5 2f3017d748d633af44a9d82fa83cdef7 files/20_mod_fcgid.conf-oldlayout 197
+MD5 cafc8c22c15bd694177cb04afbc32d42 files/digest-mod_fcgid-1.06-r1 65
diff --git a/www-apache/mod_fcgid/files/20_mod_fcgid.conf b/www-apache/mod_fcgid/files/20_mod_fcgid.conf
index d70782fab4c2..75cb35a163d8 100644
--- a/www-apache/mod_fcgid/files/20_mod_fcgid.conf
+++ b/www-apache/mod_fcgid/files/20_mod_fcgid.conf
@@ -1,6 +1,6 @@
 <IfDefine FCGID>
     <IfModule !mod_fcgid.c>
-	LoadModule fcgid_module extramodules/mod_fcgid.so
+	LoadModule fcgid_module modules/mod_fcgid.so
     </IfModule>
     <IfModule mod_fcgid.c>
 	AddHandler fcgid-script .fcg
diff --git a/www-apache/mod_fcgid/files/20_mod_fcgid.conf-oldlayout b/www-apache/mod_fcgid/files/20_mod_fcgid.conf-oldlayout
new file mode 100644
index 000000000000..d70782fab4c2
--- /dev/null
+++ b/www-apache/mod_fcgid/files/20_mod_fcgid.conf-oldlayout
@@ -0,0 +1,8 @@
+<IfDefine FCGID>
+    <IfModule !mod_fcgid.c>
+	LoadModule fcgid_module extramodules/mod_fcgid.so
+    </IfModule>
+    <IfModule mod_fcgid.c>
+	AddHandler fcgid-script .fcg
+    </IfModule>
+</IfDefine>
diff --git a/www-apache/mod_fcgid/files/digest-mod_fcgid-1.06-r1 b/www-apache/mod_fcgid/files/digest-mod_fcgid-1.06-r1
new file mode 100644
index 000000000000..29cab2736d42
--- /dev/null
+++ b/www-apache/mod_fcgid/files/digest-mod_fcgid-1.06-r1
@@ -0,0 +1 @@
+MD5 96a4268c542bfe6a88379239c2d908c9 mod_fcgid.1.06.tar.gz 49112
diff --git a/www-apache/mod_fcgid/mod_fcgid-1.05-r2.ebuild b/www-apache/mod_fcgid/mod_fcgid-1.05-r2.ebuild
index 14e4fe484488..7f2922cab1cd 100644
--- a/www-apache/mod_fcgid/mod_fcgid-1.05-r2.ebuild
+++ b/www-apache/mod_fcgid/mod_fcgid-1.05-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.05-r2.ebuild,v 1.6 2005/09/10 20:50:35 vericgar Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_fcgid/mod_fcgid-1.05-r2.ebuild,v 1.7 2005/09/23 01:18:48 ramereth Exp $
 
 DESCRIPTION="mod_fcgid is a binary-compatible alternative to mod_fastcgi
 with better process management"
@@ -24,7 +24,7 @@ RDEPEND="<=net-www/apache-2.0.54-r30
 src_unpack() {
 	unpack ${MY_P}.tar.gz
 	cd ${WORKDIR}
-	mv ${MY_P} ${PN}-${PV}
+	mv ${MY_P} ${P}
 	cd ${S}
 	sed -i '/^include/s:$:\nINCLUDES=-I/usr/include/apache2:;/^top_dir/s:local:lib:' Makefile
 }
@@ -32,7 +32,8 @@ src_unpack() {
 src_install() {
 	dodoc AUTHOR ChangeLog INSTALL.txt
 	exeinto /usr/lib/apache2-extramodules ; doexe .libs/${PN}.so
-	insinto /etc/apache2/conf/modules.d ; doins ${FILESDIR}/20_mod_fcgid.conf
+	insinto /etc/apache2/conf/modules.d
+	newins ${FILESDIR}/20_mod_fcgid.conf-oldlayout 20_mod_fcgid.conf
 }
 
 pkg_postinst() {
diff --git a/www-apache/mod_fcgid/mod_fcgid-1.06-r1.ebuild b/www-apache/mod_fcgid/mod_fcgid-1.06-r1.ebuild
new file mode 100644
index 000000000000..d0064be973db
--- /dev/null
+++ b/www-apache/mod_fcgid/mod_fcgid-1.06-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2005 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.06-r1.ebuild,v 1.1 2005/09/23 01:18:48 ramereth Exp $
+
+inherit apache-module
+
+MY_P=${PN}.${PV}
+
+DESCRIPTION="mod_fcgid is an binary-compatible alternative to mod_fastcgi with
+better process management"
+KEYWORDS="~x86"
+IUSE=""
+HOMEPAGE="http://fastcgi.coremail.cn/"
+SRC_URI="http://fastcgi.coremail.cn/${MY_P}.tar.gz"
+SLOT="0"
+LICENSE="GPL-2"
+
+APACHE2_MOD_DEFINE="FCGID"
+APACHE2_MOD_CONF="20_${PN}"
+APXS2_ARGS="-I ${S} -c ${PN}.c fcgid_bridge.c \
+			fcgid_conf.c fcgid_pm_main.c \
+			fcgid_spawn_ctl.c mod_fcgid.rc fcgid_bucket.c \
+			fcgid_filter.c fcgid_protocol.c \
+			arch/unix/fcgid_pm_unix.c \
+			arch/unix/fcgid_proctbl_unix.c \
+			arch/unix/fcgid_proc_unix.c"
+
+DOCFILES="AUTHOR ChangeLog INSTALL.txt"
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+	cd ${WORKDIR}
+	mv ${MY_P} ${P}
+}
+
+need_apache2
diff --git a/www-apache/mod_fcgid/mod_fcgid-1.06.ebuild b/www-apache/mod_fcgid/mod_fcgid-1.06.ebuild
index edf6f08bfc37..c5a4ea2a2979 100644
--- a/www-apache/mod_fcgid/mod_fcgid-1.06.ebuild
+++ b/www-apache/mod_fcgid/mod_fcgid-1.06.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2005 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.06.ebuild,v 1.2 2005/09/10 20:50:35 vericgar Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_fcgid/mod_fcgid-1.06.ebuild,v 1.3 2005/09/23 01:18:48 ramereth Exp $
 
 DESCRIPTION="mod_fcgid is a binary-compatible alternative to mod_fastcgi
 with better process management"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 SLOT="0"
 
@@ -24,7 +24,7 @@ RDEPEND="<=net-www/apache-2.0.54-r30
 src_unpack() {
 	unpack ${MY_P}.tar.gz
 	cd ${WORKDIR}
-	mv ${MY_P} ${PN}-${PV}
+	mv ${MY_P} ${P}
 	cd ${S}
 	sed -i '/^include/s:$:\nINCLUDES=-I/usr/include/apache2:;/^top_dir/s:local:lib:' Makefile
 }
@@ -32,7 +32,8 @@ src_unpack() {
 src_install() {
 	dodoc AUTHOR ChangeLog INSTALL.txt
 	exeinto /usr/lib/apache2-extramodules ; doexe .libs/${PN}.so
-	insinto /etc/apache2/conf/modules.d ; doins ${FILESDIR}/20_mod_fcgid.conf
+	insinto /etc/apache2/conf/modules.d
+	newins ${FILESDIR}/20_mod_fcgid.conf-oldlayout 20_mod_fcgid.conf
 }
 
 pkg_postinst() {