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

(Portage version: 2.1.10.41/cvs/Linux i686, RepoMan options: --force)

13 files changed, 52 insertions, 239 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/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"