Fix bug #130980, as QA wants this fixed quickly.

(Portage version: 2.1_pre7-r5)

5 files changed, 36 insertions, 19 deletions

diff --git a/www-servers/monkeyd/ChangeLog b/www-servers/monkeyd/ChangeLog
index 3751dc5e40bd..51fb3f05bc50 100644
--- a/www-servers/monkeyd/ChangeLog
+++ b/www-servers/monkeyd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-servers/monkeyd
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v 1.12 2006/01/21 07:42:17 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v 1.13 2006/04/27 18:49:02 chtekk Exp $
+
+  27 Apr 2006; Luca Longinotti <chtekk@gentoo.org> monkeyd-0.9.0-r1.ebuild:
+  Fix bug #130980, as QA wants this fixed quickly.
 
   21 Jan 2006; Sebastian Bergmann <sebastian@gentoo.org>
   monkeyd-0.9.1.ebuild:
diff --git a/www-servers/monkeyd/Manifest b/www-servers/monkeyd/Manifest
index 5e094f6368bd..2f8bf4084bc7 100644
--- a/www-servers/monkeyd/Manifest
+++ b/www-servers/monkeyd/Manifest
@@ -1,18 +1,24 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 9acf7a0058075895d6d05707155530d1 ChangeLog 3264
-MD5 b4069bcda46c5e3e1d3811511b4d9594 files/digest-monkeyd-0.9.0-r1 63
-MD5 810e268a8cb64ca8f70e205ab8e1d5e2 files/digest-monkeyd-0.9.1 63
+MD5 eefe4c5e883fdac08fd32db436c71279 ChangeLog 3392
+RMD160 ed84329fb60be0727bb7d99ebee7a79e0d434c3e ChangeLog 3392
+SHA256 624d380a9122cc80e254b361c0bc75160b841ca9dd3d0530c96e488dec8fc315 ChangeLog 3392
+MD5 c300802a58af26e4533bbbbd2ba6b183 files/digest-monkeyd-0.9.0-r1 235
+RMD160 445badba9085472eafb23007dd94a234996bbc9d files/digest-monkeyd-0.9.0-r1 235
+SHA256 c623213349333936bf5990b36293c065c63bb23114521f7a4c02d2bab9ef50d9 files/digest-monkeyd-0.9.0-r1 235
+MD5 fce975a2bc6495384d95a74fc7ad5e7d files/digest-monkeyd-0.9.1 235
+RMD160 9e894204d03e802877b7e142a27c24bfce6c6fe1 files/digest-monkeyd-0.9.1 235
+SHA256 032fcfd3ceac0c279a8133d43b68811aa1428068684446262ff3ff7b4471e938 files/digest-monkeyd-0.9.1 235
 MD5 744c1e82caccabdc0a9a61e81dabef4c files/monkeyd.conf.d 278
+RMD160 cb1c63336d326d53385745979d7323ab6382809f files/monkeyd.conf.d 278
+SHA256 403fd75c0a9dbdd6994e6b3dea2583f01c50a048fe2a904be305890b406d5074 files/monkeyd.conf.d 278
 MD5 69c4c944e7c908857c48df0e8b8a1eb4 files/monkeyd.init.d 484
+RMD160 c25ab63ecb67d6d97698f7d1451093ed2f418bd2 files/monkeyd.init.d 484
+SHA256 a3f1f888cde204182a984138d4b33d3fa6e6a20570012a4a0809d50a27734db8 files/monkeyd.init.d 484
 MD5 291658390dada237b2e8533a44409448 metadata.xml 164
-MD5 1b406a89dcd194302ffe13c0dafcb81e monkeyd-0.9.0-r1.ebuild 2047
+RMD160 898ac97013b213230bb265ed2ace7751bc5421bc metadata.xml 164
+SHA256 23f2af7dc1d37e6e2c95358cd2399e487ebf8858a7e6f1798018196ade3132aa metadata.xml 164
+MD5 4138385683508fcb7e1721b6ce8d3359 monkeyd-0.9.0-r1.ebuild 2105
+RMD160 3176ffaeb49ec59d7fc4bcf60f1c7d0848ba3f67 monkeyd-0.9.0-r1.ebuild 2105
+SHA256 94872d724d8d7ae763b35ce05e646e85143109abdc877875add57c85225449bc monkeyd-0.9.0-r1.ebuild 2105
 MD5 9f2f7d5de03e3b00f7ef0018494a6d5f monkeyd-0.9.1.ebuild 2136
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD0eXmaGfFFLhbXWkRAtzYAJoDPB9EbX9R67nZYEhek2FtjhD53wCfQhxT
-q1tLubuVoFnMs58o0QKll44=
-=F6UA
------END PGP SIGNATURE-----
+RMD160 e19aa37ff7eaf7b8d1a7aebd29247e5965b1db96 monkeyd-0.9.1.ebuild 2136
+SHA256 1aca00c1add6ead79ed6a66d1b12c28d14a73f217650f78b3b47b7aa15aec4c6 monkeyd-0.9.1.ebuild 2136
diff --git a/www-servers/monkeyd/files/digest-monkeyd-0.9.0-r1 b/www-servers/monkeyd/files/digest-monkeyd-0.9.0-r1
index 657420e08189..cf988f4300e6 100644
--- a/www-servers/monkeyd/files/digest-monkeyd-0.9.0-r1
+++ b/www-servers/monkeyd/files/digest-monkeyd-0.9.0-r1
@@ -1 +1,3 @@
 MD5 e8bcde30b93b84656897bcd60683bcf0 monkey-0.9.0.tar.gz 84170
+RMD160 ce117c8591fd3c7e3528c382d78bd0cabbe8b3fd monkey-0.9.0.tar.gz 84170
+SHA256 2ecce702401486d4fa364bfcfca53e326414826cf02ae26ee90aaff23417e550 monkey-0.9.0.tar.gz 84170
diff --git a/www-servers/monkeyd/files/digest-monkeyd-0.9.1 b/www-servers/monkeyd/files/digest-monkeyd-0.9.1
index 4ade6423d3f1..55961292cf17 100644
--- a/www-servers/monkeyd/files/digest-monkeyd-0.9.1
+++ b/www-servers/monkeyd/files/digest-monkeyd-0.9.1
@@ -1 +1,3 @@
 MD5 e4febf180e9a708fa9eccc9286c02eab monkey-0.9.1.tar.gz 84389
+RMD160 71fc6e81aa755b5b5f449b213181d1c90ca4a9db monkey-0.9.1.tar.gz 84389
+SHA256 4fe2dbc41d5de1415a07ff9eae442be7ac42e64fe6b3d17d098849753744fc7a monkey-0.9.1.tar.gz 84389
diff --git a/www-servers/monkeyd/monkeyd-0.9.0-r1.ebuild b/www-servers/monkeyd/monkeyd-0.9.0-r1.ebuild
index 28e43f440494..10d683bad248 100644
--- a/www-servers/monkeyd/monkeyd-0.9.0-r1.ebuild
+++ b/www-servers/monkeyd/monkeyd-0.9.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/monkeyd-0.9.0-r1.ebuild,v 1.1 2005/02/20 22:47:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/monkeyd-0.9.0-r1.ebuild,v 1.2 2006/04/27 18:49:03 chtekk Exp $
 
-inherit toolchain-funcs
+inherit toolchain-funcs depend.php
 
 WEBROOT=/var/www/localhost
 
@@ -19,10 +19,14 @@ IUSE="php"
 DEPEND="virtual/libc
 	>=sys-apps/portage-2.0.51"
 RDEPEND="virtual/libc
-	php? ( dev-php/php-cgi )"
+	php? ( virtual/httpd-php )"
 
 S=${WORKDIR}/${MY_P}
 
+pkg_setup() {
+	use php && require_php_cgi
+}
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}