Revbump. Don't use deprecated start-stop-daemon options and deprecated $opts variable, bug 395945.

Package-Manager: portage-2.1.10.41/cvs/Linux i686
RepoMan-Options: --force

14 files changed, 64 insertions, 262 deletions

diff --git a/www-servers/lighttpd/ChangeLog b/www-servers/lighttpd/ChangeLog
index 8306c22a7b25..5bf5b7d2771b 100644
--- a/www-servers/lighttpd/ChangeLog
+++ b/www-servers/lighttpd/ChangeLog
@@ -1,6 +1,30 @@
 # ChangeLog for www-servers/lighttpd
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.268 2011/12/27 20:39:29 jer Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.269 2012/01/01 00:03:46 idl0r Exp $
+
+*lighttpd-1.4.30-r1 (01 Jan 2012)
+*lighttpd-1.4.29-r4 (01 Jan 2012)
+*lighttpd-1.4.28-r5 (01 Jan 2012)
+*lighttpd-1.4.28-r4 (01 Jan 2012)
+*lighttpd-1.4.28-r3 (01 Jan 2012)
+*lighttpd-1.4.26-r2 (01 Jan 2012)
+*lighttpd-1.4.25-r3 (01 Jan 2012)
+*lighttpd-1.4.25-r2 (01 Jan 2012)
+*lighttpd-1.4.23-r1 (01 Jan 2012)
+
+  01 Jan 2012; Christian Ruppert <idl0r@gentoo.org> -lighttpd-1.4.23.ebuild,
+  +lighttpd-1.4.23-r1.ebuild, -lighttpd-1.4.25.ebuild,
+  -lighttpd-1.4.25-r1.ebuild, +lighttpd-1.4.25-r2.ebuild,
+  +lighttpd-1.4.25-r3.ebuild, -lighttpd-1.4.26.ebuild,
+  -lighttpd-1.4.26-r1.ebuild, +lighttpd-1.4.26-r2.ebuild,
+  -lighttpd-1.4.28.ebuild, -lighttpd-1.4.28-r1.ebuild,
+  -lighttpd-1.4.28-r2.ebuild, +lighttpd-1.4.28-r3.ebuild,
+  +lighttpd-1.4.28-r4.ebuild, +lighttpd-1.4.28-r5.ebuild,
+  -lighttpd-1.4.29-r3.ebuild, +lighttpd-1.4.29-r4.ebuild,
+  -lighttpd-1.4.30.ebuild, +lighttpd-1.4.30-r1.ebuild,
+  files/lighttpd.initd-1.4.13-r3, files/lighttpd.initd:
+  Revbump. Don't use deprecated start-stop-daemon options and deprecated $opts
+  variable, bug 395945.
 
   27 Dec 2011; Jeroen Roovers <jer@gentoo.org> lighttpd-1.4.30.ebuild:
   Stable for HPPA (bug #392581).
diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index a5f6226f050c..1129b05bce12 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.4.25-fix-CVE-2010-0295.patch 6237 RMD160 cd9ce4410ed805d28899b0207bbc670e04491315 SHA1 2ba33d94f5628d97cb606ad97ef9630eef5191c4 SHA256 d4d269d993396cfd9146de621e0a3d5e9203ac7f6b2b6f351f9013dbbe956a4e
 AUX 1.4.25-fix-unknown-AM_SILENT_RULES.patch 744 RMD160 5da8bdca1728f2de730e90de4fb7e93a274406e8 SHA1 8ae6849a88aaaca76c1b8c13a62cc266dbebc2a7 SHA256 a1cf7c77b7ee1cbe9bf3efbb7704b8582c480ae69fd70934597d24ff3fddf663
 AUX 1.4.26-fix-ssl-return-check-r2716.patch 562 RMD160 81b5fc8f13e3fbca8a48fd1f954ae7e165b261b1 SHA1 60c3665d0a4f46df1da80338970c7ce6efab64fe SHA256 28391235c48d4dc686d060bbafd711e028a07b68065f40346dc40ca242f4285c
@@ -13,8 +10,8 @@ AUX lighttpd-1.4.28-detect-libev.patch 441 RMD160 e65051bd918d784d3333dd0f6cde2c
 AUX lighttpd-1.4.29-mod_uploadprogress.patch 22472 RMD160 595f07b55bbfac3d9fc41888f3e057a9e54bc1eb SHA1 c55e5eb72ebec2f933bdf9e2061fbeb47a72ba11 SHA256 b7b13ae1de4bbe2cf2687686ae4921d4ae2f66fc524703b3c63924b6d888934f
 AUX lighttpd-1.4.29-ssl-no-ecdh.patch 352 RMD160 bc56bda005d2913189634e9712b525380ac56f10 SHA1 4d40845ffe65aaa070a79248cf11cfe1f893242d SHA256 2d01aa866d0c9843b51bf2c9b1f01d495f5febe9a0a7fd39fabf4cb695336d60
 AUX lighttpd.confd 383 RMD160 e7b5d446dcbb55c7855706aa566bf87ab0bad911 SHA1 c300230745dd060dc2b16000270dd33def6df6a7 SHA256 bb6e6721f33e6582a91025f3500e159a599fb856d699e9394093e1018c7925e0
-AUX lighttpd.initd 1599 RMD160 913d21a360cf2e74bfbaabb4ac8568dbbcb58693 SHA1 979c70ce5af081e71741f231c0001731bf7ac122 SHA256 c6142438381506a38f930c2a0a50622cf1c52df4ae80a754c117c8634866c287
-AUX lighttpd.initd-1.4.13-r3 1454 RMD160 287b7b5626559f61b17e113ca00ef0cee6c63962 SHA1 e9a0f6880e03db27082177634d9974bb7f4b3406 SHA256 9dfda47a18f3e7beada18cfec37b39c66d3029b6bde42c538d82cd1292c7616a
+AUX lighttpd.initd 1614 RMD160 1ffd1742064c03fb1613be42341cc76985175bb6 SHA1 dcf26def9668998d6ea96ae16f1aca60708ebbdd SHA256 518b5542e0659a60957076e07840d4a2fbd4439ee0e391975c6dba35879d46f0
+AUX lighttpd.initd-1.4.13-r3 1438 RMD160 f62f42e11b1fcc72e99d5bd48ca50d3c671cc4b9 SHA1 e66a54915caf56a8ae52def32038adc771d029c4 SHA256 1d42b8d63f56a212fcce3091193b8e8af82823a2dda40a49336dd73e83eb1ca3
 AUX lighttpd.logrotate 487 RMD160 2edb8b4abf75031af0a3b4182efb5b589dfa0d3c SHA1 24e1b048d7be5520ca5ef8ce31b55df13cc8d72b SHA256 503ee1cd454e2c0f9a212ef60dc8321893eda06ccf721ecbe94d189a09e0bc6c
 AUX spawn-fcgi.confd 1076 RMD160 9468249fdedc39fa762a569622bae93f8b3481f9 SHA1 81bad945fc016275873e01e5f69838f73b275a3a SHA256 bfa452a849165f921a2febf0b06879db18c4c921f156b1452d06bb821063f768
 AUX spawn-fcgi.initd 1398 RMD160 3fd0fa41d100629e85960034237abc0866ec3d38 SHA1 9c07c9fd59ec73d5f37df109b188b8a7d691f949 SHA256 ae10c764e2bde9bfc483c57ca94a63d87c24cba00b4c06917885c533d2d245b1
@@ -24,22 +21,14 @@ DIST lighttpd-1.4.26.tar.bz2 627971 RMD160 2d294083fbcd4040dc8efec06090cf1c1bf66
 DIST lighttpd-1.4.28.tar.bz2 641702 RMD160 5af6c848dd251c9d15f5185f54411744ae41c67b SHA1 42915dffe2af4f870cc1cdc0218edb60a0a315c2 SHA256 7e55747a4feb74545d80a1f2d85b5866b8600705eac946e4402e3364b0666ed2
 DIST lighttpd-1.4.29.tar.bz2 659974 RMD160 d4369e8970001d2ebe4e49767053c341c4bd2f27 SHA1 fe8ee6dc5f5302bffef905fcdf0b35f255e59b32 SHA256 afd8af213e65afb48b397d004696c6620a7ae7f3d4f162ec46a04b9b9dbfd599
 DIST lighttpd-1.4.30.tar.bz2 664697 RMD160 3d54d76c8530c556e13bf189ba85ecf6a0e8e38d SHA1 70f88e6059da6e04514cc211dd5064a2413b5406 SHA256 0d795597e4666dbf6ffe44b4a42f388ddb44736ddfab0b1ac091e5bb35212c2d
-EBUILD lighttpd-1.4.23.ebuild 5785 RMD160 9329db0ea573b13e5764c6a173b5af3f53bb5d0b SHA1 674020a06fa14101d24faf13ebe034ef7a852358 SHA256 5ab87c04a35cb8a00460150402ddd82586e7f0e3eea8381dd0738ee69d73f459
-EBUILD lighttpd-1.4.25-r1.ebuild 5876 RMD160 5634e49a7eef011d5ae68a9c804df24e36b3f442 SHA1 e1fec940f7ad0d6dab262a91fdb82d726eb2ce5d SHA256 ec001e91cd40d3793d34d8d6aabc411d0f6bddbd34b8335efdde09258d4b33c1
-EBUILD lighttpd-1.4.25.ebuild 5829 RMD160 365b1ea4415d2667fcef3a7af08fec29edcf596f SHA1 002a05ab99b4f3c15c8da95fa764fbfb8d84757c SHA256 cc5b0e4170cf4ef91b8043504c4b28e677c5d0d92039cbbe897c00d1a61bcce5
-EBUILD lighttpd-1.4.26-r1.ebuild 5825 RMD160 16be303cda3100f66640258f7e9e454536de3e0a SHA1 fde7db27fe91f3f5288fb77239ccc45c5b3fbbdd SHA256 040d20f3c6051a35d0ec075b545be236c3e05091bf7c8c3487e89ff2cde1effa
-EBUILD lighttpd-1.4.26.ebuild 5770 RMD160 163db40627952a781db876216682589e7e493789 SHA1 c3c430d49799fa2644dbdd07833d0a42f8065efd SHA256 0a990bb6fa0cbb78ef493807d59badafb9d7e83cb54fc7d31b65ad3748ec371d
-EBUILD lighttpd-1.4.28-r1.ebuild 5739 RMD160 39f13a4f941e4f54f2ce1e15972c7df3327af6f0 SHA1 61b83b7f7f38a7868f552ab8c48905ffdc9dc022 SHA256 9a905d74a2367e00c00708efb099755a9614c6e6b5896726f05f9e405195e50f
-EBUILD lighttpd-1.4.28-r2.ebuild 5724 RMD160 010553db292467d43cfbbd06549f0e13004cc6c6 SHA1 537d4b521740bcface141649dbce3df0048af7cb SHA256 0e19a6c294ea24f88a99a8f1f5425eda89596d60176c7920a3ab0d90efc3c73f
-EBUILD lighttpd-1.4.28.ebuild 5676 RMD160 551c7b19158096b60f350f8db80ac6e61312af42 SHA1 005e0a5ed111b6cda8eb22c9cff9280e4542d3eb SHA256 8fb37b0afc97e260ffda15acc288f8e75418b84cfab9de0a9d62fc1a91f83bac
-EBUILD lighttpd-1.4.29-r3.ebuild 6526 RMD160 eb5af7eadf35ce0fd46e242cc8b930c16fe2a509 SHA1 a5cde2fd4f158c3be0ad34fdf62d3ee486bc03f6 SHA256 c59a91cea6fcb4c36759a26730354f2fd81ee936ffe9949fef39ad6381b9578a
-EBUILD lighttpd-1.4.30.ebuild 6485 RMD160 426b44a32219b0fcd60e1cd331033dc0647ca8db SHA1 35b3ff12c58cb69be5560dd241b1f7f940bd5a89 SHA256 a0e40821227a50a0f090dcf8ce7f0d14d36845daa14434df4075fbe3ba8680d7
-MISC ChangeLog 56585 RMD160 de438691824304a963aaf14cd1e76d343966c741 SHA1 9a6da82903dc5aa064e3057030166b670541f629 SHA256 7ba62a3bf276aa483a7da8661461c6861c0dc52b810be37a428690ce224967cc
+EBUILD lighttpd-1.4.23-r1.ebuild 5786 RMD160 d5d8eeda7a625d77bd81aed45931d0333410360c SHA1 4cf458bb728e3a03e979c6e843a3d646f383b3fc SHA256 b35c8303ebe888c4d172310a8c71d2b0c08cf9773b209af842bf41b97aeebb73
+EBUILD lighttpd-1.4.25-r2.ebuild 5831 RMD160 a048c2cfa34deb1963308e82cc570d87bad17d22 SHA1 83de37ce40e082b103ffe72b722e1baa566d2b46 SHA256 13a12da49f4a3daeded637a9634048c444ef13634780140f0c4b62ffcf8bcb6c
+EBUILD lighttpd-1.4.25-r3.ebuild 5878 RMD160 0743c80bc3bebc17ad91a9c8b3f22db36244e981 SHA1 2a4cd834627739278244b5d22cd59b1f8ad5a876 SHA256 6936f3ca05ebe90a1236fb064a70dff48d978cfde09e5bea47e3bda4a04db752
+EBUILD lighttpd-1.4.26-r2.ebuild 5824 RMD160 0053c06a7e1695b9aafea919f9aa54c257d85237 SHA1 c41ab2ad81a94bb5a87987ee42ee1a8b7261d444 SHA256 dc1eb942a8b2be5eb1f587ce002df7d3ec1b776073f3e3125d3d6da02f7ad694
+EBUILD lighttpd-1.4.28-r3.ebuild 5673 RMD160 71fd184fc49dc353103a078f556e999a70092fdb SHA1 0b30e62da8b40cf9ec860111624effd365165e15 SHA256 18d7ac892093a4e7343421db95c4bd483544a5af262a647cf0afcbd60497277a
+EBUILD lighttpd-1.4.28-r4.ebuild 5736 RMD160 0919fbfad330c82d086f503d600eedf6a02ecedc SHA1 7c294ae75eb49a516d597ce0af77140d1e54ecef SHA256 a37e61826839cd960ad4164c8c1c6757479272dc273c2f91d95519d2c76e2e78
+EBUILD lighttpd-1.4.28-r5.ebuild 5726 RMD160 6acb6ab49caa9e82017d9a1da461dbad56d088e1 SHA1 bc07e4b5256f56dd1421c3a11b58c6374734c40b SHA256 29abbc7ee5427bbed1d309ba8ed41efbc0a062b710233921bb76bbcdb3e5f7ae
+EBUILD lighttpd-1.4.29-r4.ebuild 6524 RMD160 98d91bea3168ac5e65ce6b5901abde1bff0895eb SHA1 bb3a1380d0f0343d704b4e1e7b9a274a6a92e065 SHA256 5aa4bcaefefc7afc915f946d1524ac9ab9ff2721055e524f7d77e84b0cbf3bab
+EBUILD lighttpd-1.4.30-r1.ebuild 6490 RMD160 84203453aaf241a8d1fa17e4481a73d9b9075d74 SHA1 e9822c08a58f64b4834ab84f61ea6b5b3069b667 SHA256 1f8932877104f790665e4b8d4e2c5ec1f6420b3ae26cb9be9517ca1170d7f92b
+MISC ChangeLog 57641 RMD160 43cbf31e8a9abc8980bfad9d654bacb40c4a1c5a SHA1 35f15fcc3d0180ca0d5dd2a85b933742b773ee56 SHA256 2ea85646154adc87654c7e816df9bb77291ef0400c1b2d9d9bb44c05b9658abd
 MISC metadata.xml 1193 RMD160 1fdffaaf6f865686842c2328277899a20c3ff4f1 SHA1 4c92866074579331b95b656e3eed56a5fd698c37 SHA256 bd3dbe66a93023547bd9cc688b51c050a1184d4a18d40f82171c5ca76757424e
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk76LQcACgkQVWmRsqeSphM9WQCfU/7h94Ezs0KxVh4pi5ftkl6W
-zpoAnihxyEgYN/bXXKiZLWpKLSnTP2yJ
-=pEwK
------END PGP SIGNATURE-----
diff --git a/www-servers/lighttpd/files/lighttpd.initd b/www-servers/lighttpd/files/lighttpd.initd
index 908e17619369..9bb087af1cf4 100644
--- a/www-servers/lighttpd/files/lighttpd.initd
+++ b/www-servers/lighttpd/files/lighttpd.initd
@@ -1,9 +1,9 @@
 #!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/lighttpd.initd,v 1.19 2011/09/27 00:53:18 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/lighttpd.initd,v 1.20 2012/01/01 00:03:47 idl0r Exp $
 
-opts="reload graceful"
+extra_started_commands="reload graceful"
 
 depend() {
 	need net
diff --git a/www-servers/lighttpd/files/lighttpd.initd-1.4.13-r3 b/www-servers/lighttpd/files/lighttpd.initd-1.4.13-r3
index 56c25d8c59e8..124becec7f79 100644
--- a/www-servers/lighttpd/files/lighttpd.initd-1.4.13-r3
+++ b/www-servers/lighttpd/files/lighttpd.initd-1.4.13-r3
@@ -1,9 +1,9 @@
 #!/sbin/runscript
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/lighttpd.initd-1.4.13-r3,v 1.3 2009/04/01 19:03:46 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/lighttpd.initd-1.4.13-r3,v 1.4 2012/01/01 00:03:47 idl0r Exp $
 
-opts="reload graceful"
+extra_started_commands="reload graceful"
 
 depend() {
 	need net
@@ -45,7 +45,7 @@ reload() {
 	checkconfig || return 1
 
 	ebegin "Re-opening lighttpd log files"
-	start-stop-daemon --stop --oknodo --quiet --pidfile "${LIGHTTPD_PID}" \
+	start-stop-daemon --quiet --pidfile "${LIGHTTPD_PID}" \
 		--signal HUP
 	eend $?
 }
@@ -58,7 +58,7 @@ graceful() {
 	checkconfig || return 1
 
 	ebegin "Gracefully stopping lighttpd"
-	start-stop-daemon --stop --oknodo --quiet --pidfile "${LIGHTTPD_PID}" \
+	start-stop-daemon --quiet --pidfile "${LIGHTTPD_PID}" \
 		--signal INT
 	if eend $? ; then
 		rm -f "${LIGHTTPD_PID}"
diff --git a/www-servers/lighttpd/lighttpd-1.4.23.ebuild b/www-servers/lighttpd/lighttpd-1.4.23-r1.ebuild
index 03da50ad53ec..e0976324f49c 100644
--- a/www-servers/lighttpd/lighttpd-1.4.23.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.23-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.23.ebuild,v 1.10 2010/02/01 19:53:41 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.23-r1.ebuild,v 1.1 2012/01/01 00:03:46 idl0r Exp $
 
 EAPI="2"
 
diff --git a/www-servers/lighttpd/lighttpd-1.4.25.ebuild b/www-servers/lighttpd/lighttpd-1.4.25-r2.ebuild
index 1865dc1b0448..b98ffa30f165 100644
--- a/www-servers/lighttpd/lighttpd-1.4.25.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.25-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.25.ebuild,v 1.5 2010/01/24 23:05:09 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.25-r2.ebuild,v 1.1 2012/01/01 00:03:46 idl0r Exp $
 
 EAPI="2"
 
diff --git a/www-servers/lighttpd/lighttpd-1.4.25-r1.ebuild b/www-servers/lighttpd/lighttpd-1.4.25-r3.ebuild
index 6753f38631d7..cac14e5ef15c 100644
--- a/www-servers/lighttpd/lighttpd-1.4.25-r1.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.25-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.25-r1.ebuild,v 1.6 2010/02/04 00:06:02 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.25-r3.ebuild,v 1.1 2012/01/01 00:03:46 idl0r Exp $
 
 EAPI="2"
 
diff --git a/www-servers/lighttpd/lighttpd-1.4.26-r1.ebuild b/www-servers/lighttpd/lighttpd-1.4.26-r2.ebuild
index ae4338eb24e3..7fc10d560e68 100644
--- a/www-servers/lighttpd/lighttpd-1.4.26-r1.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.26-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.26-r1.ebuild,v 1.7 2010/05/13 16:18:03 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.26-r2.ebuild,v 1.1 2012/01/01 00:03:46 idl0r Exp $
 
 EAPI="2"
 
diff --git a/www-servers/lighttpd/lighttpd-1.4.26.ebuild b/www-servers/lighttpd/lighttpd-1.4.26.ebuild
deleted file mode 100644
index 34dabbeab691..000000000000
--- a/www-servers/lighttpd/lighttpd-1.4.26.ebuild
+++ /dev/null
@@ -1,211 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.26.ebuild,v 1.1 2010/02/09 23:18:25 hoffie Exp $
-
-EAPI="2"
-
-inherit eutils autotools depend.php
-
-DESCRIPTION="Lightweight high-performance web server"
-HOMEPAGE="http://www.lighttpd.net/"
-SRC_URI="http://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="bzip2 doc fam fastcgi gdbm ipv6 ldap lua minimal memcache mysql pcre php rrdtool ssl test webdav xattr"
-
-RDEPEND="
-	>=sys-libs/zlib-1.1
-	bzip2?    ( app-arch/bzip2 )
-	fam?      ( virtual/fam )
-	gdbm?     ( sys-libs/gdbm )
-	ldap?     ( >=net-nds/openldap-2.1.26 )
-	lua?      ( >=dev-lang/lua-5.1 )
-	memcache? ( dev-libs/libmemcache )
-	mysql?    ( >=virtual/mysql-4.0 )
-	pcre?     ( >=dev-libs/libpcre-3.1 )
-	php?      ( virtual/httpd-php )
-	rrdtool?  ( net-analyzer/rrdtool )
-	ssl?    ( >=dev-libs/openssl-0.9.7 )
-	webdav? (
-		dev-libs/libxml2
-		>=dev-db/sqlite-3
-		sys-fs/e2fsprogs
-	)
-	xattr? ( kernel_linux? ( sys-apps/attr ) )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc?  ( dev-python/docutils )
-	test? (
-		virtual/perl-Test-Harness
-		dev-libs/fcgi
-	)"
-
-# update certain parts of lighttpd.conf based on conditionals
-update_config() {
-	local config="/etc/lighttpd/lighttpd.conf"
-
-	# enable php/mod_fastcgi settings
-	use php && \
-		dosed 's|#.*\(include.*fastcgi.*$\)|\1|' ${config}
-
-	# enable stat() caching
-	use fam && \
-		dosed 's|#\(.*stat-cache.*$\)|\1|' ${config}
-}
-
-# remove non-essential stuff (for USE=minimal)
-remove_non_essential() {
-	local libdir="${D}/usr/$(get_libdir)/${PN}"
-
-	# text docs
-	use doc || rm -fr "${D}"/usr/share/doc/${PF}/txt
-
-	# non-essential modules
-	rm -f \
-		${libdir}/mod_{compress,evhost,expire,proxy,scgi,secdownload,simple_vhost,status,setenv,trigger*,usertrack}.*
-
-	# allow users to keep some based on USE flags
-	use pcre    || rm -f ${libdir}/mod_{ssi,re{direct,write}}.*
-	use webdav  || rm -f ${libdir}/mod_webdav.*
-	use mysql   || rm -f ${libdir}/mod_mysql_vhost.*
-	use lua     || rm -f ${libdir}/mod_{cml,magnet}.*
-	use rrdtool || rm -f ${libdir}/mod_rrdtool.*
-
-	if ! use fastcgi ; then
-		rm -f ${libdir}/mod_fastcgi.*
-	fi
-}
-
-pkg_setup() {
-	if ! use pcre ; then
-		ewarn "It is highly recommended that you build ${PN}"
-		ewarn "with perl regular expressions support via USE=pcre."
-		ewarn "Otherwise you lose support for some core options such"
-		ewarn "as conditionals and modules such as mod_re{write,direct}"
-		ewarn "and mod_ssi."
-		ebeep 5
-	fi
-
-	use php && require_php_with_use cgi
-
-	enewgroup lighttpd
-	enewuser lighttpd -1 -1 /var/www/localhost/htdocs lighttpd
-}
-
-src_prepare() {
-	# dev-python/docutils installs rst2html.py not rst2html
-	sed -i -e 's|\(rst2html\)|\1.py|g' doc/Makefile.am || \
-		die "sed doc/Makefile.am failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	econf --libdir=/usr/$(get_libdir)/${PN} \
-		--enable-lfs \
-		$(use_enable ipv6) \
-		$(use_with bzip2) \
-		$(use_with fam) \
-		$(use_with gdbm) \
-		$(use_with lua) \
-		$(use_with ldap) \
-		$(use_with memcache) \
-		$(use_with mysql) \
-		$(use_with pcre) \
-		$(use_with ssl openssl) \
-		$(use_with webdav webdav-props) \
-		$(use_with webdav webdav-locks) \
-		$(use_with xattr attr)
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	if use doc ; then
-		einfo "Building HTML documentation"
-		cd doc
-		emake html || die "failed to build HTML documentation"
-	fi
-}
-
-src_test() {
-	if [[ ${EUID} -eq 0 ]]; then
-		default_src_test
-	else
-		ewarn "test skipped, please re-run as root if you wish to test ${PN}"
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	# init script stuff
-	newinitd "${FILESDIR}"/lighttpd.initd lighttpd || die
-	newconfd "${FILESDIR}"/lighttpd.confd lighttpd || die
-	use fam && has_version app-admin/fam && \
-		sed -i 's/after famd/need famd/g' "${D}"/etc/init.d/lighttpd
-
-	# configs
-	insinto /etc/lighttpd
-	doins "${FILESDIR}"/conf/lighttpd.conf
-	doins "${FILESDIR}"/conf/mime-types.conf
-	doins "${FILESDIR}"/conf/mod_cgi.conf
-	doins "${FILESDIR}"/conf/mod_fastcgi.conf
-	# Secure directory for fastcgi sockets
-	keepdir /var/run/lighttpd/
-	fperms 0750 /var/run/lighttpd/
-	fowners lighttpd:lighttpd /var/run/lighttpd/
-
-	# update lighttpd.conf directives based on conditionals
-	update_config
-
-	# docs
-	dodoc AUTHORS README NEWS doc/*.sh
-	newdoc doc/lighttpd.conf lighttpd.conf.distrib
-
-	use doc && dohtml -r doc/*
-
-	docinto txt
-	dodoc doc/*.txt
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/lighttpd.logrotate lighttpd || die
-
-	keepdir /var/l{ib,og}/lighttpd /var/www/localhost/htdocs
-	fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd
-	fperms 0750 /var/l{ib,og}/lighttpd
-
-	#spawn-fcgi may optionally be installed via www-servers/spawn-fcgi
-	rm -f "${D}"/usr/bin/spawn-fcgi "${D}"/usr/share/man/man1/spawn-fcgi.*
-
-	use minimal && remove_non_essential
-}
-
-pkg_postinst () {
-	echo
-	if [[ -f ${ROOT}etc/conf.d/spawn-fcgi.conf ]] ; then
-		einfo "spawn-fcgi is now provided by www-servers/spawn-fcgi."
-		einfo "spawn-fcgi's init script configuration is now located"
-		einfo "at /etc/conf.d/spawn-fcgi."
-		echo
-	fi
-
-	if [[ -f ${ROOT}etc/lighttpd.conf ]] ; then
-		ewarn "Gentoo has a customized configuration,"
-		ewarn "which is now located in /etc/lighttpd.  Please migrate your"
-		ewarn "existing configuration."
-		ebeep 5
-	fi
-
-	if use fastcgi; then
-		ewarn "As of lighttpd-1.4.22, spawn-fcgi is provided by the separate"
-		ewarn "www-servers/spawn-fcgi package. Please install it manually, if"
-		ewarn "you use spawn-fcgi."
-		ewarn "It features a new, more featurefull init script - please migrate"
-		ewarn "your configuration!"
-	fi
-}
diff --git a/www-servers/lighttpd/lighttpd-1.4.28.ebuild b/www-servers/lighttpd/lighttpd-1.4.28-r3.ebuild
index e14616666705..ed3a6872a113 100644
--- a/www-servers/lighttpd/lighttpd-1.4.28.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.28-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.28.ebuild,v 1.10 2011/03/16 19:52:53 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.28-r3.ebuild,v 1.1 2012/01/01 00:03:46 idl0r Exp $
 
 EAPI="2"
 
diff --git a/www-servers/lighttpd/lighttpd-1.4.28-r1.ebuild b/www-servers/lighttpd/lighttpd-1.4.28-r4.ebuild
index 44445a4a856f..23e427910c86 100644
--- a/www-servers/lighttpd/lighttpd-1.4.28-r1.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.28-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.28-r1.ebuild,v 1.1 2011/02/23 12:16:13 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.28-r4.ebuild,v 1.1 2012/01/01 00:03:46 idl0r Exp $
 
 EAPI="2"
 
diff --git a/www-servers/lighttpd/lighttpd-1.4.28-r2.ebuild b/www-servers/lighttpd/lighttpd-1.4.28-r5.ebuild
index 6e631d173986..2a82a34a4628 100644
--- a/www-servers/lighttpd/lighttpd-1.4.28-r2.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.28-r5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.28-r2.ebuild,v 1.6 2011/08/29 06:39:13 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.28-r5.ebuild,v 1.1 2012/01/01 00:03:46 idl0r Exp $
 
 EAPI="2"
 
diff --git a/www-servers/lighttpd/lighttpd-1.4.29-r3.ebuild b/www-servers/lighttpd/lighttpd-1.4.29-r4.ebuild
index 08cf68a83c5e..43a9273eadda 100644
--- a/www-servers/lighttpd/lighttpd-1.4.29-r3.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.29-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.29-r3.ebuild,v 1.4 2011/10/23 16:41:34 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.29-r4.ebuild,v 1.1 2012/01/01 00:03:46 idl0r Exp $
 
 EAPI="4"
 
diff --git a/www-servers/lighttpd/lighttpd-1.4.30.ebuild b/www-servers/lighttpd/lighttpd-1.4.30-r1.ebuild
index 68a4f5570ccd..997ef4725215 100644
--- a/www-servers/lighttpd/lighttpd-1.4.30.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.30-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.30.ebuild,v 1.5 2011/12/27 20:39:29 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.30-r1.ebuild,v 1.1 2012/01/01 00:03:46 idl0r Exp $
 
 EAPI="4"