Fixed php dependency wrt bug #102857.

(Portage version: 2.0.51.22-r2)

4 files changed, 27 insertions, 25 deletions

diff --git a/net-www/spawn-fcgi/ChangeLog b/net-www/spawn-fcgi/ChangeLog
index a84ba7eb2eac..ae8c4bfc9c48 100644
--- a/net-www/spawn-fcgi/ChangeLog
+++ b/net-www/spawn-fcgi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-www/spawn-fcgi
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/spawn-fcgi/ChangeLog,v 1.7 2005/04/19 12:32:11 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/spawn-fcgi/ChangeLog,v 1.8 2005/09/11 13:41:03 rl03 Exp $
+
+  11 Sep 2005; Renat Lumpau <rl03@gentoo.org> spawn-fcgi-1.1.0.ebuild,
+  spawn-fcgi-1.2.0.ebuild:
+  Fixed php dependency wrt bug #102857.
 
   19 Apr 2005; Simon Stelling <blubb@gentoo.org> spawn-fcgi-1.2.0.ebuild:
   added ~amd64
diff --git a/net-www/spawn-fcgi/Manifest b/net-www/spawn-fcgi/Manifest
index 2d9193ff966e..8b382160fedb 100644
--- a/net-www/spawn-fcgi/Manifest
+++ b/net-www/spawn-fcgi/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 da90c277b8cf4934b71913a331037f94 spawn-fcgi-1.1.0.ebuild 902
+MD5 9c374d542a75caca37df9964cb04976c spawn-fcgi-1.2.0.ebuild 921
 MD5 3917aa19ea4f7344fde5f4bc5c08a51c ChangeLog 1179
-MD5 177bc4801d074bf86a89089bf4447fc0 files/digest-spawn-fcgi-1.1.0 67
-MD5 b0bdc732195e524c776e4ace877d7a06 files/digest-spawn-fcgi-1.2.0 67
+MD5 4defd726d2b03decc5b7ff21b0aac1a3 metadata.xml 225
 MD5 297d2df57766c1f90de329d23f81e03e files/spawn-fcgi-1.1.0.conf 1080
 MD5 b771211dd5ddda119c692db878b9b7cc files/spawn-fcgi-1.1.0.initd 1237
-MD5 4defd726d2b03decc5b7ff21b0aac1a3 metadata.xml 225
-MD5 3f69f41dde1d03f58b0a61cdc6c0d5be spawn-fcgi-1.1.0.ebuild 868
-MD5 4b391f1118cc5d7d198c77e62bbcdf95 spawn-fcgi-1.2.0.ebuild 873
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC0HI7I1lqEGTUzyQRAtqEAKC88dFs/P5XJoUnNLMtw6N5PDgiSgCePEeo
-hjKOEphp2OzJxEO0OnbjdQM=
-=61Dk
------END PGP SIGNATURE-----
+MD5 177bc4801d074bf86a89089bf4447fc0 files/digest-spawn-fcgi-1.1.0 67
+MD5 b0bdc732195e524c776e4ace877d7a06 files/digest-spawn-fcgi-1.2.0 67
diff --git a/net-www/spawn-fcgi/spawn-fcgi-1.1.0.ebuild b/net-www/spawn-fcgi/spawn-fcgi-1.1.0.ebuild
index f7a327f218a9..0185f2d5d771 100644
--- a/net-www/spawn-fcgi/spawn-fcgi-1.1.0.ebuild
+++ b/net-www/spawn-fcgi/spawn-fcgi-1.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/spawn-fcgi/spawn-fcgi-1.1.0.ebuild,v 1.4 2005/07/10 00:56:13 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/spawn-fcgi/spawn-fcgi-1.1.0.ebuild,v 1.5 2005/09/11 13:41:03 rl03 Exp $
 
-inherit eutils
+inherit eutils depend.php
 
 URI_ROOT="http://jan.kneschke.de/projects/lighttpd/download/"
 DESCRIPTION="fast-cgi server for php and lighttpd"
@@ -17,13 +17,17 @@ DEPEND="virtual/libc
 		>=sys-libs/zlib-1.1"
 RDEPEND=">=sys-libs/zlib-1.1
 		 >=sys-devel/libtool-1.4
-		 >=dev-php/php-cgi-4.3.0"
+		 virtual/httpd-php"
+
+pkg_setup() {
+	require_php_with_use cgi
+}
 
 src_install() {
 	make DESTDIR=${D} install || die
 	insinto /etc/conf.d
-	newins ${FILESDIR}/${PN}-${PV}.conf ${PN}.conf
+	newins ${FILESDIR}/${P}.conf ${PN}.conf
 	exeinto /etc/init.d
-	newexe ${FILESDIR}/${PN}-${PV}.initd ${PN}
+	newexe ${FILESDIR}/${P}.initd ${PN}
 	dodoc README doc/handbook.txt
 }
diff --git a/net-www/spawn-fcgi/spawn-fcgi-1.2.0.ebuild b/net-www/spawn-fcgi/spawn-fcgi-1.2.0.ebuild
index 4fb74bbf392a..7f4a37353e5a 100644
--- a/net-www/spawn-fcgi/spawn-fcgi-1.2.0.ebuild
+++ b/net-www/spawn-fcgi/spawn-fcgi-1.2.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/spawn-fcgi/spawn-fcgi-1.2.0.ebuild,v 1.3 2005/07/10 00:56:13 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/spawn-fcgi/spawn-fcgi-1.2.0.ebuild,v 1.4 2005/09/11 13:41:03 rl03 Exp $
 
-inherit eutils
+inherit eutils depend.php
 
 URI_ROOT="http://jan.kneschke.de/projects/lighttpd/download/"
 DESCRIPTION="fast-cgi server for php and lighttpd"
@@ -17,7 +17,11 @@ DEPEND="virtual/libc
 		>=sys-devel/libtool-1.4
 		>=sys-libs/zlib-1.1"
 RDEPEND=">=sys-libs/zlib-1.1
-		 >=dev-php/php-cgi-4.3.0"
+		 virtual/httpd-php"
+
+pkg_setup() {
+	require_php_with_use cgi
+}
 
 src_install() {
 	make DESTDIR=${D} install || die