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

Package-Manager: portage-2.1_pre7-r5

8 files changed, 41 insertions, 37 deletions

diff --git a/www-servers/lighttpd/ChangeLog b/www-servers/lighttpd/ChangeLog
index 8e67b7463ec8..91acdec05298 100644
--- a/www-servers/lighttpd/ChangeLog
+++ b/www-servers/lighttpd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-servers/lighttpd
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.64 2006/04/15 00:42:39 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.65 2006/04/27 18:35:38 chtekk Exp $
+
+  27 Apr 2006; Luca Longinotti <chtekk@gentoo.org>
+  lighttpd-1.3.13-r3.ebuild:
+  Fix bug #130980, as QA wants this fixed quickly.
 
   15 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
   lighttpd-1.4.10-r1.ebuild:
diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index a5d0b8adcd5c..790301abdc24 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -1,9 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 98efb382def699acda4384fcc3655eaf ChangeLog 19351
-RMD160 18e1cad040e750ef865fcb5dd98760688303a307 ChangeLog 19351
-SHA256 15824e08fbf2d756b3ea4a923a915c7ae4f49fa30be25b5daddf6d9f6b61a931 ChangeLog 19351
+MD5 6a00a9b3b7d4621e394d0e7defd2d435 ChangeLog 19480
+RMD160 6ccbe6ea16869dabba29c5787247dbc9992ded83 ChangeLog 19480
+SHA256 e7b1f3e470fb302189870b58a312c1fc217cf729039c38337f4c2593f470195b ChangeLog 19480
 MD5 24669453e8f69faf4212dfa43e90e3dd files/1.4.10/01_all_r990_mod_cgi_dont_reset_physical_path.diff 517
 RMD160 b0e9a693102fb2ea4e6cf750cd4559f9c25a7834 files/1.4.10/01_all_r990_mod_cgi_dont_reset_physical_path.diff 517
 SHA256 9f3d49f04b3b8423b06f0ddf35cce855c2187d3f0a84f22479aa5df871901144 files/1.4.10/01_all_r990_mod_cgi_dont_reset_physical_path.diff 517
@@ -58,21 +55,21 @@ SHA256 322656b4cfd22ca9f1f8ab160e0b932f1646622422fd49c6fc82ab416223eecf files/co
 MD5 b4c80dba9c626d5f89d3c3797ac6670c files/conf/mod_fastcgi.conf 661
 RMD160 83b4126a4b0537fcd04db607a53e4742ceae039b files/conf/mod_fastcgi.conf 661
 SHA256 61daa2ffac9e948d9d5130cc43f560a18c8dfb052cb7e3d4c6bd1decb6c9fd06 files/conf/mod_fastcgi.conf 661
-MD5 77ba3937d1e8762f8d8b6b2ea9ee1aaa files/digest-lighttpd-1.3.13-r3 67
-RMD160 326221d3cb81ea0d7214db0ce968142abea2f78f files/digest-lighttpd-1.3.13-r3 67
-SHA256 455ca66be0f20c44a6966f6724ca82a7198e791c4e5631f333d397ded79a0dce files/digest-lighttpd-1.3.13-r3 67
-MD5 c54a6d92e91493bbb27e8f346f6ac342 files/digest-lighttpd-1.3.16 67
-RMD160 225bb2c6bbc9f6064dc695384d3d964b7bc73d8c files/digest-lighttpd-1.3.16 67
-SHA256 0ea2d4682dbdb6965b5b66b1ef395eb36569ef1260f5077af08ae07096d8cb04 files/digest-lighttpd-1.3.16 67
-MD5 cd139d14d98253eb909f04df5c9a0ab6 files/digest-lighttpd-1.4.10-r1 247
-RMD160 f5f7956f14ff203a55fefe3c46b96902f35e1e0d files/digest-lighttpd-1.4.10-r1 247
-SHA256 9018fab4a8bdf87db18949575c021b3501247a550b84c93095d6e9d5ecbf2f8d files/digest-lighttpd-1.4.10-r1 247
-MD5 422bbab47d465847a64bdb2c2ebcc02d files/digest-lighttpd-1.4.7 66
-RMD160 b8174cc2d8579513075a36fa4124a55e66e186bc files/digest-lighttpd-1.4.7 66
-SHA256 e8cb8cfff25a4c72a24a0077958a2e96da192f0f1f359a09009c9c3b436860b1 files/digest-lighttpd-1.4.7 66
-MD5 b56de1ec97859b70fc860de8468e3984 files/digest-lighttpd-1.4.8 66
-RMD160 9287301206003247c2925e8b52fe576592a1bb0a files/digest-lighttpd-1.4.8 66
-SHA256 6b700175f7ca1b1bea1c1af312b2a7c1ddb8d7731ba3df54ee3118b86aa970f4 files/digest-lighttpd-1.4.8 66
+MD5 16c832beb1879cbc2cc6814d1a2786a1 files/digest-lighttpd-1.3.13-r3 247
+RMD160 265939f5e40f16a2e7d54416ea77b423dce564e7 files/digest-lighttpd-1.3.13-r3 247
+SHA256 c4600f6bfc225279523380ee1ee240161a51f8e7ea2d00f2f9df3f06918f902b files/digest-lighttpd-1.3.13-r3 247
+MD5 669eed61cca360d002ddb0c7efe0afe5 files/digest-lighttpd-1.3.16 247
+RMD160 0dc0c93bf17aeb37c6bf4b65a89bbd7ebca92779 files/digest-lighttpd-1.3.16 247
+SHA256 05b2e71115907704f12a708d993134f4bd9dff1da997f25bf66fdf92a651a793 files/digest-lighttpd-1.3.16 247
+MD5 03f615e79bba7ff75a6ba9a3e486fec4 files/digest-lighttpd-1.4.10-r1 247
+RMD160 29eb75dc48a62eaaebe7eaa6552e779f19386b1f files/digest-lighttpd-1.4.10-r1 247
+SHA256 0363ec995df0e4b7ffbfa4c4625cb9753311c6f9f7f831925600b0b33dd6df18 files/digest-lighttpd-1.4.10-r1 247
+MD5 485267c1ac751168ebdd83d45237cfa7 files/digest-lighttpd-1.4.7 244
+RMD160 d4724987691a1932e72fcde598bc07572f2d3062 files/digest-lighttpd-1.4.7 244
+SHA256 3be8309f81c257309efc4e6b2fce741cad8b6e4a4871b8a314d5d9bdbe661c57 files/digest-lighttpd-1.4.7 244
+MD5 07e5b40d581e4881f7e8fbb6277b4ad3 files/digest-lighttpd-1.4.8 244
+RMD160 a3bb226209fad4615bd999bcc4b443b36c3a6bf7 files/digest-lighttpd-1.4.8 244
+SHA256 c47016ee385d1a94c3bcad00b949430691d4506bd013361f39c686774580b536 files/digest-lighttpd-1.4.8 244
 MD5 7fdb430fc7240e6e6a9078e4e57f6322 files/lighttpd-1.3.10.initd 666
 RMD160 b665f80ae5b58bd0c8d42793d28bc40443923605 files/lighttpd-1.3.10.initd 666
 SHA256 f4a3170795681ec8101d8048df1e5d23b690b6ca1a1e702722fa1f6c58c59731 files/lighttpd-1.3.10.initd 666
@@ -109,9 +106,9 @@ SHA256 bfa452a849165f921a2febf0b06879db18c4c921f156b1452d06bb821063f768 files/sp
 MD5 e605a4ead0ce7b1e0788c0b0b1161871 files/spawn-fcgi.initd 1383
 RMD160 4f604c9c54aca1bc58b171121e8ce823561e6694 files/spawn-fcgi.initd 1383
 SHA256 ad2582f8b05523a13c147d57b948e58ba31758cd8af0a45cbf39964ac094a2f6 files/spawn-fcgi.initd 1383
-MD5 49ded22216ffc6092d1a1e04a6e420c1 lighttpd-1.3.13-r3.ebuild 2607
-RMD160 a6e0d913e94cf2ee41c22826a92d0b38c87c319e lighttpd-1.3.13-r3.ebuild 2607
-SHA256 d2d37a8b2a2f7441fdb4975154cd4d0c37e561db26811709160ea155e564cbe7 lighttpd-1.3.13-r3.ebuild 2607
+MD5 f18029dea31126d04d7287f80610b2ca lighttpd-1.3.13-r3.ebuild 2649
+RMD160 e730704a620f2aedfb9ad9afedfed2584553a11e lighttpd-1.3.13-r3.ebuild 2649
+SHA256 2e06d17378daad7baac91efd04e8fa2f2b581fb39a532c92eeb75d2b11ea5c26 lighttpd-1.3.13-r3.ebuild 2649
 MD5 0df89754aec138ad20821ef93c45833b lighttpd-1.3.16.ebuild 2589
 RMD160 3ff48e9342813af77cc82ff0c6b4dad51dc6ab2e lighttpd-1.3.16.ebuild 2589
 SHA256 1e35432b058eb98b7344d34bcef5272a85ba761afb7d9d10fdf57ec56a03a9b4 lighttpd-1.3.16.ebuild 2589
@@ -127,10 +124,3 @@ SHA256 959cce5be5a7c371e76b7193d63f9431f384336fa381a7021b90d40c56dfac41 lighttpd
 MD5 6a9d4814404d8d51327e5b8306ee3d7e metadata.xml 726
 RMD160 a4e58899dbe2a328fe699a564a67666809b385fc metadata.xml 726
 SHA256 c99edd41b36c5354a29c2fa2e37fccd83568d306d1531f0ce7bbaebf703f2a56 metadata.xml 726
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEQEGQAiZjviIA2XgRAp+6AJ9UUCr+bi3klwaP3uWxrHJQy52TCwCeMATw
-2y2gcYJ7MZkVaKMsSXUrC6w=
-=4uO2
------END PGP SIGNATURE-----
diff --git a/www-servers/lighttpd/files/digest-lighttpd-1.3.13-r3 b/www-servers/lighttpd/files/digest-lighttpd-1.3.13-r3
index d17be2479447..0d3d9a53d059 100644
--- a/www-servers/lighttpd/files/digest-lighttpd-1.3.13-r3
+++ b/www-servers/lighttpd/files/digest-lighttpd-1.3.13-r3
@@ -1 +1,3 @@
 MD5 2f017b936be376ad6f6c2ee26db93467 lighttpd-1.3.13.tar.gz 680068
+RMD160 f70e11933f324447232ef9aaf3d905ba85e47e91 lighttpd-1.3.13.tar.gz 680068
+SHA256 74a93e37cd6c3e9a931dba8fc038e26e1d01c752896233a1bf728a9f6e011c03 lighttpd-1.3.13.tar.gz 680068
diff --git a/www-servers/lighttpd/files/digest-lighttpd-1.3.16 b/www-servers/lighttpd/files/digest-lighttpd-1.3.16
index 42a48002fd67..c7a2c30d4284 100644
--- a/www-servers/lighttpd/files/digest-lighttpd-1.3.16
+++ b/www-servers/lighttpd/files/digest-lighttpd-1.3.16
@@ -1 +1,3 @@
 MD5 b73f7a7ace4901b6417b0e450aaa5df5 lighttpd-1.3.16.tar.gz 706362
+RMD160 3bf9b50be2e2d9b83f6fe4fe1b8bf5d8dca417d9 lighttpd-1.3.16.tar.gz 706362
+SHA256 92f90ef3db84c4ebaf8f1fecc82547c2e99c95b3f4cce429e07a58d7440c2369 lighttpd-1.3.16.tar.gz 706362
diff --git a/www-servers/lighttpd/files/digest-lighttpd-1.4.10-r1 b/www-servers/lighttpd/files/digest-lighttpd-1.4.10-r1
index 4ed69406d0b1..a30cb8a2393a 100644
--- a/www-servers/lighttpd/files/digest-lighttpd-1.4.10-r1
+++ b/www-servers/lighttpd/files/digest-lighttpd-1.4.10-r1
@@ -1,3 +1,3 @@
+MD5 51e42c2cc98a1f9986b9f232ff5a01f2 lighttpd-1.4.10.tar.gz 777853
 RMD160 e7d1eeab33a0cb47eeed7f9499c894fd2aea5445 lighttpd-1.4.10.tar.gz 777853
 SHA256 fdde0c08d3e1883c04ddc97a22916b063b2679f5fcfbda81436ff4e85db18160 lighttpd-1.4.10.tar.gz 777853
-MD5 51e42c2cc98a1f9986b9f232ff5a01f2 lighttpd-1.4.10.tar.gz 777853
diff --git a/www-servers/lighttpd/files/digest-lighttpd-1.4.7 b/www-servers/lighttpd/files/digest-lighttpd-1.4.7
index 5423b8aa3952..bc028499de64 100644
--- a/www-servers/lighttpd/files/digest-lighttpd-1.4.7
+++ b/www-servers/lighttpd/files/digest-lighttpd-1.4.7
@@ -1 +1,3 @@
 MD5 4d1b02e2008e5f35e4df7defee186fdd lighttpd-1.4.7.tar.gz 778982
+RMD160 fdbd3b215845570374bea0533971558c9d113df0 lighttpd-1.4.7.tar.gz 778982
+SHA256 b1d2793d1dc15c6176b3b666e7617f841e06005528223d56d5171a99294df199 lighttpd-1.4.7.tar.gz 778982
diff --git a/www-servers/lighttpd/files/digest-lighttpd-1.4.8 b/www-servers/lighttpd/files/digest-lighttpd-1.4.8
index 01485db52d50..63ecb3a836ec 100644
--- a/www-servers/lighttpd/files/digest-lighttpd-1.4.8
+++ b/www-servers/lighttpd/files/digest-lighttpd-1.4.8
@@ -1 +1,3 @@
 MD5 7d7790ef95ff5755f73bfcda4f13696d lighttpd-1.4.8.tar.gz 769111
+RMD160 3998bbc4565ca3dc59a3be1abaf7a98623dc52ae lighttpd-1.4.8.tar.gz 769111
+SHA256 f3115cb4b9f9805c9a9e7d6cdc97512adaaebde01a84122fcbd1c0ca16bc2d69 lighttpd-1.4.8.tar.gz 769111
diff --git a/www-servers/lighttpd/lighttpd-1.3.13-r3.ebuild b/www-servers/lighttpd/lighttpd-1.3.13-r3.ebuild
index fec8cff52e02..98a36c25be70 100644
--- a/www-servers/lighttpd/lighttpd-1.3.13-r3.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.3.13-r3.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/lighttpd/lighttpd-1.3.13-r3.ebuild,v 1.10 2005/08/20 14:34:37 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.3.13-r3.ebuild,v 1.11 2006/04/27 18:35:39 chtekk Exp $
 
-inherit eutils
+inherit eutils depend.php
 
 RESTRICT="test"
 
@@ -23,7 +23,7 @@ RDEPEND="app-arch/bzip2
 		mysql? ( >=dev-db/mysql-4.0.0 )
 		ssl? ( >=dev-libs/openssl-0.9.7 )
 		php? (
-			>=dev-php/php-cgi-4.3.0
+			virtual/httpd-php
 			!net-www/spawn-fcgi
 		)"
 
@@ -33,6 +33,8 @@ LOG_DIR="/var/log/lighttpd/"
 pkg_setup() {
 	enewgroup lighttpd
 	enewuser lighttpd -1 -1 "${LIGHTTPD_DIR}" lighttpd
+
+	use php && require_php_with_use cgi
 }
 
 src_unpack() {