Revbump. Don't use deprecated start-stop-daemon options, bug 392777.

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

5 files changed, 16 insertions, 7 deletions

diff --git a/app-admin/chef-solr/ChangeLog b/app-admin/chef-solr/ChangeLog
index d7e2f7353c5b..251fe56a3502 100644
--- a/app-admin/chef-solr/ChangeLog
+++ b/app-admin/chef-solr/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-admin/chef-solr
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-solr/ChangeLog,v 1.6 2011/07/25 09:19:37 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-solr/ChangeLog,v 1.7 2011/12/31 20:07:50 idl0r Exp $
+
+*chef-solr-0.10.2-r1 (31 Dec 2011)
+*chef-solr-0.9.12-r1 (31 Dec 2011)
+
+  31 Dec 2011; Christian Ruppert <idl0r@gentoo.org> -chef-solr-0.9.12.ebuild,
+  +chef-solr-0.9.12-r1.ebuild, -chef-solr-0.10.2.ebuild,
+  +chef-solr-0.10.2-r1.ebuild, files/initd/chef-solr,
+  files/initd/chef-solr-indexer:
+  Revbump. Don't use deprecated start-stop-daemon options, bug 392777.
 
 *chef-solr-0.10.2 (25 Jul 2011)
 
diff --git a/app-admin/chef-solr/chef-solr-0.10.2.ebuild b/app-admin/chef-solr/chef-solr-0.10.2-r1.ebuild
index 79482860df7e..efbc6f28cbe3 100644
--- a/app-admin/chef-solr/chef-solr-0.10.2.ebuild
+++ b/app-admin/chef-solr/chef-solr-0.10.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-solr/chef-solr-0.10.2.ebuild,v 1.1 2011/07/25 09:19:37 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-solr/chef-solr-0.10.2-r1.ebuild,v 1.1 2011/12/31 20:07:50 idl0r Exp $
 
 EAPI="2"
 USE_RUBY="ruby18"
diff --git a/app-admin/chef-solr/chef-solr-0.9.12.ebuild b/app-admin/chef-solr/chef-solr-0.9.12-r1.ebuild
index d988867c83e4..c4fd166f39fd 100644
--- a/app-admin/chef-solr/chef-solr-0.9.12.ebuild
+++ b/app-admin/chef-solr/chef-solr-0.9.12-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-solr/chef-solr-0.9.12.ebuild,v 1.1 2011/01/07 14:19:52 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-solr/chef-solr-0.9.12-r1.ebuild,v 1.1 2011/12/31 20:07:50 idl0r Exp $
 
 EAPI="2"
 USE_RUBY="ruby18"
diff --git a/app-admin/chef-solr/files/initd/chef-solr b/app-admin/chef-solr/files/initd/chef-solr
index 1c48727f562a..edde4b2ed276 100644
--- a/app-admin/chef-solr/files/initd/chef-solr
+++ b/app-admin/chef-solr/files/initd/chef-solr
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {
@@ -26,7 +26,7 @@ fix_owners() {
 start() {
 	ebegin "Starting Chef SOLR"
 	fix_owners
-	start-stop-daemon --start --quiet --chuid ${CHEF_USER}:${CHEF_GROUP} \
+	start-stop-daemon --start --quiet --user ${CHEF_USER} --group ${CHEF_GROUP} \
 		--pidfile ${CHEF_SOLR_PIDFILE} --name java --exec \
 		${CHEF_SOLR_BINARY} -- -d -P ${CHEF_SOLR_PIDFILE} -c ${CONFIGFILE} \
 		-L ${CHEF_SOLR_LOGFILE} ${CHEF_SOLR_OPTS} > /dev/null
diff --git a/app-admin/chef-solr/files/initd/chef-solr-indexer b/app-admin/chef-solr/files/initd/chef-solr-indexer
index 09772bab0886..6b30113423bd 100644
--- a/app-admin/chef-solr/files/initd/chef-solr-indexer
+++ b/app-admin/chef-solr/files/initd/chef-solr-indexer
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {
@@ -25,7 +25,7 @@ fix_owners() {
 start() {
 	ebegin "Starting Chef SOLR indexer"
 	fix_owners
-	start-stop-daemon --start --quiet --chuid ${CHEF_USER}:${CHEF_GROUP} \
+	start-stop-daemon --start --quiet --user ${CHEF_USER} --group ${CHEF_GROUP} \
 		--pidfile ${CHEF_SOLR_INDEXER_PIDFILE} --exec ${CHEF_SOLR_INDEXER_BINARY} \
 		-- -d -P ${CHEF_SOLR_INDEXER_PIDFILE} -L ${CHEF_SOLR_INDEXER_LOGFILE} \
 		-c ${CONFIGFILE} ${CHEF_SOLR_INDEXER_OPTS}