Fix chef gemspec to match the available json versions, fixing bug 532162.

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x8883FA56A308A8D7!)

2 files changed, 92 insertions, 1 deletions

diff --git a/app-admin/chef/ChangeLog b/app-admin/chef/ChangeLog
index 803d4b7bcf2e..3ebd5ef640a0 100644
--- a/app-admin/chef/ChangeLog
+++ b/app-admin/chef/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/chef
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/chef/ChangeLog,v 1.26 2014/12/11 05:53:57 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chef/ChangeLog,v 1.27 2014/12/14 10:29:27 graaff Exp $
+
+*chef-10.24.0-r1 (14 Dec 2014)
+
+  14 Dec 2014; Hans de Graaff <graaff@gentoo.org> +chef-10.24.0-r1.ebuild:
+  Fix chef gemspec to match the available json versions, fixing bug 532162.
 
   11 Dec 2014; Patrick Lauer <patrick@gentoo.org> chef-10.24.0.ebuild:
   Unrestrict dev-ruby/json dep #484348
diff --git a/app-admin/chef/chef-10.24.0-r1.ebuild b/app-admin/chef/chef-10.24.0-r1.ebuild
new file mode 100644
index 000000000000..f0c60436816c
--- /dev/null
+++ b/app-admin/chef/chef-10.24.0-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chef/chef-10.24.0-r1.ebuild,v 1.1 2014/12/14 10:29:27 graaff 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() {
+	ruby_fakegem_metadata_gemspec ../metadata ${RUBY_FAKEGEM_GEMSPEC}
+
+	# bunny, json
+	sed -i -e 's/"< 0.8.0", //' -e 's/<= 1.7.7/< 2/' ${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
+}