Fixing so it only installs if you're using the current stable apache2

(Portage version: 2.0.51.19)

6 files changed, 17 insertions, 50 deletions

diff --git a/www-apache/mod_fcgid/ChangeLog b/www-apache/mod_fcgid/ChangeLog
index 4dfd76e31c8c..62e587a9677e 100644
--- a/www-apache/mod_fcgid/ChangeLog
+++ b/www-apache/mod_fcgid/ChangeLog
@@ -1,6 +1,12 @@
 # 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.2 2005/04/15 23:14:56 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_fcgid/ChangeLog,v 1.3 2005/04/17 19:13:17 ramereth Exp $
+
+*mod_fcgid-1.05-r2 (17 Apr 2005)
+
+  17 Apr 2005; Lance Albertson <ramereth@gentoo.org> -mod_fcgid-1.05.ebuild,
+  -mod_fcgid-1.05-r1.ebuild, +mod_fcgid-1.05-r2.ebuild:
+  Only install for current stable apache
 
 *mod_fcgid-1.05-r1 (15 Apr 2005)
 
@@ -12,5 +18,5 @@
 
   14 Apr 2005; Lance Albertson <ramereth@gentoo.org>
   +files/20_mod_fcgid.conf, +metadata.xml, +mod_fcgid-1.05.ebuild:
-  New ebuild from nesyx, closes #79313
+  New ebuild from neysx, closes #79313
 
diff --git a/www-apache/mod_fcgid/Manifest b/www-apache/mod_fcgid/Manifest
index 852981538851..5a87f238c059 100644
--- a/www-apache/mod_fcgid/Manifest
+++ b/www-apache/mod_fcgid/Manifest
@@ -1,7 +1,5 @@
-MD5 0a83fc20e332398a4f61d4c8fa229c44 mod_fcgid-1.05.ebuild 1050
+MD5 e777902b5dea221c9a70b96dcceae8f0 mod_fcgid-1.05-r2.ebuild 1128
 MD5 b04c3f93349f84b2bc615931f1c1d6c9 metadata.xml 483
-MD5 a1a05ace9adf51bd2e428731dcac8742 ChangeLog 599
-MD5 cc2549a67c5710be5124c148c661f2a9 mod_fcgid-1.05-r1.ebuild 1053
+MD5 b4d30a49998784f2df1e26d5a7df8db7 ChangeLog 599
 MD5 2f3017d748d633af44a9d82fa83cdef7 files/20_mod_fcgid.conf 197
-MD5 2d8046826f8e5dd7cc5256d4e8337275 files/digest-mod_fcgid-1.05 65
-MD5 2d8046826f8e5dd7cc5256d4e8337275 files/digest-mod_fcgid-1.05-r1 65
+MD5 2d8046826f8e5dd7cc5256d4e8337275 files/digest-mod_fcgid-1.05-r2 65
diff --git a/www-apache/mod_fcgid/files/digest-mod_fcgid-1.05-r1 b/www-apache/mod_fcgid/files/digest-mod_fcgid-1.05-r1
deleted file mode 100644
index 93e0ea511fd3..000000000000
--- a/www-apache/mod_fcgid/files/digest-mod_fcgid-1.05-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7b10df1aa78e0e56c4068559c2e2119d mod_fcgid.1.05.tar.gz 47144
diff --git a/www-apache/mod_fcgid/files/digest-mod_fcgid-1.05 b/www-apache/mod_fcgid/files/digest-mod_fcgid-1.05-r2
index 93e0ea511fd3..93e0ea511fd3 100644
--- a/www-apache/mod_fcgid/files/digest-mod_fcgid-1.05
+++ b/www-apache/mod_fcgid/files/digest-mod_fcgid-1.05-r2
diff --git a/www-apache/mod_fcgid/mod_fcgid-1.05-r1.ebuild b/www-apache/mod_fcgid/mod_fcgid-1.05-r2.ebuild
index 94acd75346de..28837eef41b6 100644
--- a/www-apache/mod_fcgid/mod_fcgid-1.05-r1.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-r1.ebuild,v 1.1 2005/04/15 23:14:56 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_fcgid/mod_fcgid-1.05-r2.ebuild,v 1.1 2005/04/17 19:13:17 ramereth Exp $
 
 DESCRIPTION="mod_fcgid is a binary-compatible alternative to mod_fastcgi
 with better process management"
@@ -13,10 +13,11 @@ MY_P=${PN}.${PV}
 HOMEPAGE="http://fastcgi.coremail.cn/"
 SRC_URI="http://fastcgi.coremail.cn/${MY_P}.tar.gz"
 LICENSE="GPL-2"
-DEPEND=">=net-www/apache-2
-	!<=net-www/apache-1"
-RDEPEND=">=net-www/apache-2
-	!<=net-www/apache-1"
+# For now, I only support the 'stable' layout for apache
+DEPEND="<=net-www/apache-2.0.52-r2
+	!<=net-www/apache-1*"
+RDEPEND="<=net-www/apache-2.0.52-r2
+	!<=net-www/apache-1*"
 
 src_unpack() {
 	unpack ${MY_P}.tar.gz
diff --git a/www-apache/mod_fcgid/mod_fcgid-1.05.ebuild b/www-apache/mod_fcgid/mod_fcgid-1.05.ebuild
deleted file mode 100644
index 24c1d41c4a33..000000000000
--- a/www-apache/mod_fcgid/mod_fcgid-1.05.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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.ebuild,v 1.1 2005/04/14 17:54:54 ramereth Exp $
-
-DESCRIPTION="mod_fcgid is a binary-compatible alternative to mod_fastcgi
-with better process management"
-KEYWORDS="~x86"
-IUSE=""
-SLOT="0"
-
-MY_P=${PN}.${PV}
-
-HOMEPAGE="http://fastcgi.coremail.cn/"
-SRC_URI="http://fastcgi.coremail.cn/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-DEPEND=">=net-www/apache-2
-	!<=net-www/apache-1"
-RDEPEND=">=net-www/apache-2
-	!<=net-www/apache-1"
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-	cd ${WORKDIR}
-	mv ${MY_P} ${PN}-${PV}
-	cd ${S}
-	sed -i '/^include/s:$:\nINCLUDES=-I/usr/include/apache2:;/^top_dir/s:local:lib:' Makefile
-}
-
-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
-}
-
-pkg_postinst() {
-	einfo "Add '-D FCGID' to your APACHE2_OPTS in /etc/conf.d/apache2"
-}