version bump

(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, unsigned Manifest commit)

3 files changed, 104 insertions, 6 deletions

diff --git a/app-admin/chef/ChangeLog b/app-admin/chef/ChangeLog
index 359ba0e4cb78..d420ecf31621 100644
--- a/app-admin/chef/ChangeLog
+++ b/app-admin/chef/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/chef
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/chef/ChangeLog,v 1.18 2012/12/27 07:13:11 hollow Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chef/ChangeLog,v 1.19 2013/02/10 20:00:15 hollow Exp $
+
+*chef-10.20.0 (10 Feb 2013)
+
+  10 Feb 2013; Benedikt Böhm <hollow@gentoo.org> +chef-10.20.0.ebuild,
+  files/initd/chef-client:
+  version bump
 
   27 Dec 2012; Benedikt Böhm <hollow@gentoo.org> chef-10.16.4.ebuild:
   restrict to moneta < 0.7 due to API incompatibilities
diff --git a/app-admin/chef/chef-10.20.0.ebuild b/app-admin/chef/chef-10.20.0.ebuild
new file mode 100644
index 000000000000..acc98bc9690f
--- /dev/null
+++ b/app-admin/chef/chef-10.20.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chef/chef-10.20.0.ebuild,v 1.1 2013/02/10 20:00:15 hollow Exp $
+
+EAPI=4
+USE_RUBY="ruby19"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST="spec"
+
+RUBY_FAKEGEM_EXTRADOC="README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC=${RUBY_FAKEGEM_NAME}.gemspec
+
+inherit ruby-fakegem user
+
+DESCRIPTION="Chef is a systems integration framework"
+HOMEPAGE="http://wiki.opscode.com/display/chef"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# specs have various indempotency issues which result in the global Chef::Config
+# object to be replaced and subsequently fails other specs. Revisit this later.
+RESTRICT="test"
+
+ruby_add_rdepend ">=dev-ruby/bunny-0.6.0
+	dev-ruby/erubis
+	>=dev-ruby/highline-1.6.9
+	>=dev-ruby/json-1.4.4
+	>=dev-ruby/mixlib-authentication-1.3.0
+	>=dev-ruby/mixlib-cli-1.1.0
+	>=dev-ruby/mixlib-config-1.1.2
+	>=dev-ruby/mixlib-log-1.3.0
+	dev-ruby/mixlib-shellout
+	<dev-ruby/moneta-0.7.0
+	>=dev-ruby/net-ssh-2.6
+	<dev-ruby/net-ssh-2.7
+	>=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
+	dev-ruby/ruby-shadow
+	>=dev-ruby/treetop-1.4.9
+	<dev-ruby/treetop-1.5
+	dev-ruby/uuidtools
+	>=dev-ruby/yajl-ruby-1.1
+	<dev-ruby/yajl-ruby-2"
+
+each_ruby_prepare() {
+	epatch "${FILESDIR}"/chef-10.18.2-remove-clone-warnings.patch
+
+	ruby_fakegem_metadata_gemspec ../metadata ${RUBY_FAKEGEM_GEMSPEC}
+
+	# bunny
+	sed -i -e 's/"< 0.8.0", //' ${RUBY_FAKEGEM_GEMSPEC} || die "Unable to fix up dependencies."
+
+	# json
+	sed -i -e 's/"<= 1.6.1", //' ${RUBY_FAKEGEM_GEMSPEC} || die "Unable to fix up dependencies."
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	keepdir /etc/chef /var/lib/chef /var/log/chef
+
+	doinitd "${FILESDIR}/initd/chef-client"
+	doconfd "${FILESDIR}/confd/chef-client"
+
+	insinto /etc/chef
+	doins "${FILESDIR}/client.rb"
+	doins "${FILESDIR}/solo.rb"
+
+	doman distro/common/man/man1/*.1
+	doman distro/common/man/man8/*.8
+}
+
+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"
+	elog "/etc/init.d/chef-client start"
+	elog
+}
diff --git a/app-admin/chef/files/initd/chef-client b/app-admin/chef/files/initd/chef-client
index 27a4d0dab17e..35652fa38352 100644
--- a/app-admin/chef/files/initd/chef-client
+++ b/app-admin/chef/files/initd/chef-client
@@ -1,19 +1,20 @@
 #!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 CONFIGFILE=${CONFIGFILE:-/etc/chef/client.rb}
 INTERVAL=${INTERVAL:-1800}
 SPLAY=${SPLAY:-20}
+ENCODING=${ENCODING:-UTF-8}
 
-command=${CHEF_CLIENT_BINARY:-/usr/bin/chef-client}
-command_args="-d -c ${CONFIGFILE} -i ${INTERVAL} -s ${SPLAY} ${CHEF_CLIENT_OPTS}"
 pidfile=${CHEF_CLIENT_PIDFILE:-/var/run/chef/client.pid}
+command=${CHEF_CLIENT_BINARY:-/usr/bin/ruby19}
+command_args="-E ${ENCODING} /usr/bin/chef-client -d -c ${CONFIGFILE} -i ${INTERVAL} -s ${SPLAY} -P ${pidfile} ${CHEF_CLIENT_OPTS}"
 
 depend() {
 	need net
 }
 
 start_pre() {
-	checkpath -q -d -m 0755 -o chef:chef /var/run/chef
+	checkpath -q -d /var/run/chef
 }