version bump wrt #396693

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

3 files changed, 23 insertions, 23 deletions

diff --git a/app-admin/chef-solr/ChangeLog b/app-admin/chef-solr/ChangeLog
index 251fe56a3502..7866cf2a3e70 100644
--- a/app-admin/chef-solr/ChangeLog
+++ b/app-admin/chef-solr/ChangeLog
@@ -1,6 +1,12 @@
 # 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.7 2011/12/31 20:07:50 idl0r Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-solr/ChangeLog,v 1.8 2012/01/29 12:11:53 hollow Exp $
+
+*chef-solr-0.10.8 (29 Jan 2012)
+
+  29 Jan 2012; Benedikt Böhm <hollow@gentoo.org> -chef-solr-0.9.12-r1.ebuild,
+  +chef-solr-0.10.8.ebuild, files/initd/chef-solr:
+  version bump wrt #396693
 
 *chef-solr-0.10.2-r1 (31 Dec 2011)
 *chef-solr-0.9.12-r1 (31 Dec 2011)
diff --git a/app-admin/chef-solr/chef-solr-0.9.12-r1.ebuild b/app-admin/chef-solr/chef-solr-0.10.8.ebuild
index c4fd166f39fd..17e31c70cb72 100644
--- a/app-admin/chef-solr/chef-solr-0.9.12-r1.ebuild
+++ b/app-admin/chef-solr/chef-solr-0.10.8.ebuild
@@ -1,8 +1,8 @@
-# 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/app-admin/chef-solr/chef-solr-0.9.12-r1.ebuild,v 1.1 2011/12/31 20:07:50 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-solr/chef-solr-0.10.8.ebuild,v 1.1 2012/01/29 12:11:53 hollow Exp $
 
-EAPI="2"
+EAPI="4"
 USE_RUBY="ruby18"
 
 RUBY_FAKEGEM_TASK_DOC=""
@@ -18,17 +18,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=net-misc/rabbitmq-server-1.7.0
+RDEPEND=">=net-misc/rabbitmq-server-1.7.2
 	virtual/jre:1.6"
 
-ruby_add_rdepend "~app-admin/chef-${PV}
-	>=dev-ruby/libxml-1.1.3
-	>=dev-ruby/uuidtools-2.0.0"
-
-pkg_setup() {
-	enewgroup chef
-	enewuser chef -1 -1 /var/lib/chef chef
-}
+ruby_add_rdepend "~app-admin/chef-${PV}"
 
 each_ruby_install() {
 	each_fakegem_install
@@ -41,9 +34,6 @@ all_ruby_install() {
 	doinitd "${FILESDIR}/initd/chef-solr"
 	doconfd "${FILESDIR}/confd/chef-solr"
 
-	doinitd "${FILESDIR}/initd/chef-solr-indexer"
-	doconfd "${FILESDIR}/confd/chef-solr-indexer"
-
 	keepdir /etc/chef /var/lib/chef /var/log/chef /var/run/chef
 
 	insinto /etc/chef
diff --git a/app-admin/chef-solr/files/initd/chef-solr b/app-admin/chef-solr/files/initd/chef-solr
index edde4b2ed276..c83f60bbaa2b 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-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {
@@ -26,15 +26,19 @@ fix_owners() {
 start() {
 	ebegin "Starting Chef SOLR"
 	fix_owners
-	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
+	start-stop-daemon --start \
+		--pidfile ${CHEF_SOLR_PIDFILE} \
+		--user ${CHEF_USER}:${CHEF_GROUP} \
+		--name java --exec ${CHEF_SOLR_BINARY} \
+		-- \
+		-d -P ${CHEF_SOLR_PIDFILE} -L ${CHEF_SOLR_LOGFILE} \
+		-c ${CONFIGFILE} \
+		${CHEF_SOLR_OPTS}
 	eend $?
 }
 
 stop() {
 	ebegin "Shutting down Chef SOLR"
-	start-stop-daemon --stop --quiet --pidfile ${CHEF_SOLR_PIDFILE}
+	start-stop-daemon --stop --pidfile ${CHEF_SOLR_PIDFILE}
 	eend $?
 }