version bump wrt #396693

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

3 files changed, 33 insertions, 14 deletions

diff --git a/app-admin/chef/ChangeLog b/app-admin/chef/ChangeLog
index 1381f319d585..e0d15ccbf573 100644
--- a/app-admin/chef/ChangeLog
+++ b/app-admin/chef/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/chef
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/chef/ChangeLog,v 1.7 2011/07/25 09:06:18 hollow Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chef/ChangeLog,v 1.8 2012/01/29 12:07:26 hollow Exp $
+
+*chef-0.10.8 (29 Jan 2012)
+
+  29 Jan 2012; Benedikt Böhm <hollow@gentoo.org> -chef-0.9.12.ebuild,
+  +chef-0.10.8.ebuild, files/initd/chef-client:
+  version bump wrt #396693
 
 *chef-0.10.2 (25 Jul 2011)
 
diff --git a/app-admin/chef/chef-0.9.12.ebuild b/app-admin/chef/chef-0.10.8.ebuild
index b7e79c186a7a..e3f04b9bb86c 100644
--- a/app-admin/chef/chef-0.9.12.ebuild
+++ b/app-admin/chef/chef-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/chef-0.9.12.ebuild,v 1.2 2011/01/07 17:16:31 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chef/chef-0.10.8.ebuild,v 1.1 2012/01/29 12:07:26 hollow Exp $
 
-EAPI="2"
+EAPI="4"
 USE_RUBY="ruby18"
 
 RUBY_FAKEGEM_TASK_DOC=""
@@ -20,19 +20,24 @@ IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/bunny-0.6.0
 	dev-ruby/erubis
-	dev-ruby/extlib
 	dev-ruby/highline
 	>=dev-ruby/json-1.4.4
-	<dev-ruby/json-1.4.7
+	<=dev-ruby/json-1.6.1
 	>=dev-ruby/mixlib-authentication-1.1.0
 	>=dev-ruby/mixlib-cli-1.1.0
 	>=dev-ruby/mixlib-config-1.1.2
-	>=dev-ruby/mixlib-log-1.2.0
+	>=dev-ruby/mixlib-log-1.3.0
 	dev-ruby/moneta
-	>=dev-ruby/ohai-0.5.7
+	>=dev-ruby/net-ssh-2.1.3
+	<dev-ruby/net-ssh-2.2
+	>=dev-ruby/net-ssh-multi-1.1
+	<dev-ruby/net-ssh-multi-1.2
+	>=dev-ruby/ohai-0.6.0
 	>=dev-ruby/rest-client-1.0.4
 	<dev-ruby/rest-client-1.7.0
 	dev-ruby/ruby-shadow
+	>=dev-ruby/treetop-1.4.9
+	<dev-ruby/treetop-1.5
 	dev-ruby/uuidtools"
 
 all_ruby_install() {
@@ -48,6 +53,11 @@ all_ruby_install() {
 	doins "${FILESDIR}/solo.rb"
 }
 
+pkg_setup() {
+	enewgroup chef
+	enewuser chef -1 -1 /var/lib/chef chef
+}
+
 pkg_postinst() {
 	elog
 	elog "You should edit /etc/chef/client.rb before starting the service with"
diff --git a/app-admin/chef/files/initd/chef-client b/app-admin/chef/files/initd/chef-client
index 4c50564abf5b..0194561e905a 100644
--- a/app-admin/chef/files/initd/chef-client
+++ b/app-admin/chef/files/initd/chef-client
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {
@@ -14,14 +14,17 @@ SPLAY=${SPLAY:-20}
 
 start() {
 	ebegin "Starting Chef client"
-	start-stop-daemon --start --quiet --pidfile ${CHEF_CLIENT_PIDFILE} \
-		--exec ${CHEF_CLIENT_BINARY} -- -d -c ${CONFIGFILE} \
-		-i ${INTERVAL} -s ${SPLAY} ${CHEF_CLIENT_OPTS}
+	start-stop-daemon --start \
+		--pidfile ${CHEF_CLIENT_PIDFILE} \
+		--exec ${CHEF_CLIENT_BINARY} \
+		-- \
+		-d -c ${CONFIGFILE} -i ${INTERVAL} -s ${SPLAY} \
+		${CHEF_CLIENT_OPTS}
 	eend $?
 }
 
 stop() {
 	ebegin "Shutting down Chef client"
-	start-stop-daemon --stop --quiet --pidfile ${CHEF_CLIENT_PIDFILE}
+	start-stop-daemon --stop --pidfile ${CHEF_CLIENT_PIDFILE}
 	eend $?
 }