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

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x8883FA56A308A8D7!

diff --git a/app-admin/chef/ChangeLog b/app-admin/chef/ChangeLog
index 803d4b7bcf2e6fb6be6eb976b964a4acfd974dda..3ebd5ef640a0fb86ca64f13a25f6b63a1ee6a29f 100644 (file)
--- 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/Manifest b/app-admin/chef/Manifest
index 7bf9af8e9a0714bc868d66cd72d6164b66e3cca4..171b3b14ac8e2622640521c03964827f88fe9424 100644 (file)
--- a/app-admin/chef/Manifest
+++ b/app-admin/chef/Manifest
@@ -1,8 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX client.rb 2491 SHA256 12fd8d9f944da3cc902acb0b8aee5a13202b8f7edd107d72db219b7349bc46ff SHA512 df809167c123543f55e6eb76114b2bf57b3fe895ac127f8a5dfb342212a268c5eccb99b2cf000baf5f81a2adbe3beeef34e233dedde0c6ce5f0bbbc3916d8b58 WHIRLPOOL 663a73722183968f3c50721737eefb9c66b3ba4cf4aaa6baa1a35e7c1676eb646b9edc10240db6c25a4bb6125dca51c165de484912a5434456e9ebab4fc301cb
 AUX confd/chef-client 477 SHA256 87ae3fc931df89fc890d1b976c9596a078780ecf95c1fac4f08cad08f8e89a90 SHA512 74a0ca55eea1ac9d6a519d9c4088f24d02bdff365165b9f740f24ae5468d8ce6de8412072ec4d62db4e3d297cd85d1bca125e994471475bf1adff622c59184d0 WHIRLPOOL f5998ad339fe76d61f41d560c3512c320a2649b090497f8d439ce55e734bd074248f8d6b02cd03abe0b7eb308fd495d3363e4db2948f76adb8cda30975dcfaff
 AUX initd/chef-client 555 SHA256 7035c82bdabc5804fa6a8d99f40b72e7bb0c2b0045ce95ed1692476cd2dfbcc0 SHA512 8a35dfe52ca0d4561646c27cf22a18d6e70c0db93644698cb4bd217114c96045729d2cc6208dbe69f3e9d3436af6f73986a2122119e7ae66329b2500c345d8a5 WHIRLPOOL ef8977bcba8a5f077dec3af878a78fa375cdf4797c869bd2601fa74c8d0d069b7c389864b5b4176d322b8156d5944fb1708274ca90ab73e642ebd7abb114a422
 AUX solo.rb 2023 SHA256 48e1863e4cbcdbf935ea4c9e29514c825c04ff35d68cb6bf8b8f246cd4b6a815 SHA512 bf37ffc2107233b80c467d2c4de6fbeda75a3518e713fb19af623c4594859c23d48ac9b8aba797f6a84f92c96c5cb668071c3d9f199e62aad99192765d9eaa2f WHIRLPOOL a8ba9a84691850e8b843febc049e98edff0b872131efd12d730d6991ab10cc7eab076cb1d037dbf52295c1a3f7d37c29b3b04b62d646f217919cf5cd73136f6d
 DIST chef-10.24.0.gem 823296 SHA256 896945deb09cb35ea370186e7f5380e7b61728ce85dfd7ee79de50506a516a89 SHA512 6027a4cd96da418dc18061611ff8c3461f236a088c3213f54f8828d63abe3575962fcb94ae91b5285f6f2168ef4204738d327781c3195151cf708b82cb9666d6 WHIRLPOOL a34e15688e99116909e326b40bd96246234e9c1eae592d34cc1cfa8396b56f7bfb54cfcd3917b1b21853f7a9d6dc143cf55bc4c899131a240f00a2d8249e8ef9
+EBUILD chef-10.24.0-r1.ebuild 2142 SHA256 4dff94ed4a394028e6f75ce6d1869e59ba3dc932fed90278b2dabb10605b0620 SHA512 dbe1137ec317e12b1eee5cec0215336cb3fad0c53b15a6c6d91ab6044b4dc06c6692cab57e25d6c7769809839016e12d6b763c38ad33e8cb0d9af9891447bf35 WHIRLPOOL 7169c08faa0156a5fbb63bd9f5966863c62c71f0b80e41211cd42fc711501f6c34d47b10455c1b77c6a4f0cc1c9a8a40e048b1f4f8e2deab82f271c301b28532
 EBUILD chef-10.24.0.ebuild 2113 SHA256 247aa3cf4524777ca61a9532077bcd7d4137afdb6c455437d483b0b6f1857b1a SHA512 1a792ce434a9bc626194f05af29c2d70599ea4b61296b77626a6a27f9acced9d73945d1c049def8d4501417b2a01f5207109c89f15f498027ebfb50f5c38b2bd WHIRLPOOL f178aca2fea8febb4ea2e0510d8b6473e728cd24143a2ad69e3bf82f86b3e174d21cb34dc05748b9e9ce297dccc6a04a28252eb06844793b6104fa713a2ed954
-MISC ChangeLog 2923 SHA256 d378984723b3069339c46f9562c5ab82e973854aedaf4a18d94ac55e32116392 SHA512 5f26a5384588b9431231faee3c09a6ca25dc9aa93e7f646000b450b952598cb16be772fee8681f3e5111e1c35fa317b1af6a5aaa43046468945b99f02c11288e WHIRLPOOL 20e5a89b3955aedf70b200242494d8bdc62d251f8002f09e9c8adcb292afbde520069c59c8f05ced8dd94c62446b068ea54bb6bffbc66859236e649955916e7f
+MISC ChangeLog 3106 SHA256 5cc3854602df64cf25d76e7d615f504007a8679738395c163544ce149de03d4c SHA512 f1c2685f53a9293e2969cac12a210aee2aefee9d7dc9392eeef07852b08aa53c2166ba30c7a2809ef479e4f4eb5c9a320a1383c135f196d5cb04ecfb5e4a9737 WHIRLPOOL 787eac4e427c3161d600b359affe753522fdf3f1c01711a49c2b4cddbff50981bfa3f3adb806895ff13f42a5d7a22525c5e3fddbb8942e1e17ea307b4b197a50
 MISC metadata.xml 214 SHA256 0e019c1dee563e5b23815be471ae1b65fcaf721a91ec48037446d41ca787d3e5 SHA512 701b8c51f43f8660d40700929c243a2dae9f19dcbc7b8eca877e20eadc1ae2e0c84f7c7d8c3cb576055c1a49a55e9c759ef469eeda67026ce252d341937f6691 WHIRLPOOL 977119e736e0795137df14faae681f7fa07ba8297a19ef4a7d7b93de7efceaed16f7103f179a762be41b8849c33c535b55d16d2fd0ea795df0525592752e0156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iF4EAREIAAYFAlSNZogACgkQiIP6VqMIqNcEFwD/R8/Maob/0KY4DG43v4Bwx45L
+rtYgrRTZwcgzIlf3M4oA/1jhBgeEU3HN3kMV9yRAfqsLjwrnp11lECRaF9ELwJ5H
+=fFG5
+-----END PGP SIGNATURE-----

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 (file)
index 0000000..f0c6043
--- /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
+}