version bump

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

4 files changed, 108 insertions, 8 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/Manifest b/app-admin/chef/Manifest
index 034f5817771f..08a9591b9152 100644
--- a/app-admin/chef/Manifest
+++ b/app-admin/chef/Manifest
@@ -1,10 +1,12 @@
 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 503 SHA256 96e5bec730ce2f6d037d23fc22d40b30faddd8256e84b04fbc258f01c344f396 SHA512 a2acaa8f82a2b97a4158d066c33ccf476fa180db1295c76ca5080d3bab85aee90b9b51469123644d4a8970ae9a8c6c51af0f4c3db0839beb841119e2d16d1feb WHIRLPOOL 94f58ad3970840bcda59d1dbd9ff7437b6cab74d14af652b3d42b814df27683f9f37521535d9f5f852afc7689478e22d1094e84747aa23fdcd5cf3affe593515
+AUX initd/chef-client 555 SHA256 7035c82bdabc5804fa6a8d99f40b72e7bb0c2b0045ce95ed1692476cd2dfbcc0 SHA512 8a35dfe52ca0d4561646c27cf22a18d6e70c0db93644698cb4bd217114c96045729d2cc6208dbe69f3e9d3436af6f73986a2122119e7ae66329b2500c345d8a5 WHIRLPOOL ef8977bcba8a5f077dec3af878a78fa375cdf4797c869bd2601fa74c8d0d069b7c389864b5b4176d322b8156d5944fb1708274ca90ab73e642ebd7abb114a422
 AUX solo.rb 2023 SHA256 48e1863e4cbcdbf935ea4c9e29514c825c04ff35d68cb6bf8b8f246cd4b6a815 SHA512 bf37ffc2107233b80c467d2c4de6fbeda75a3518e713fb19af623c4594859c23d48ac9b8aba797f6a84f92c96c5cb668071c3d9f199e62aad99192765d9eaa2f WHIRLPOOL a8ba9a84691850e8b843febc049e98edff0b872131efd12d730d6991ab10cc7eab076cb1d037dbf52295c1a3f7d37c29b3b04b62d646f217919cf5cd73136f6d
 DIST chef-10.12.0.gem 429056 SHA256 dac132f5b91f90f37b95b964ee213bb936ee07aaceb23cb24b9c7a9fcb20377b SHA512 fd227a325874013ce764d79a3eb250626c0370b50447caa445c2a7e502121c3cbf29832c96ad266b1730fe0cdcac86767d7b55e2594ccbb57c09fee4f395ee0c WHIRLPOOL bfd03dcc4a15e3cc4f141d31af441123a0653e7cb0fa26cc46ccfbe7bda0633c2ecf503b99ad2b7608dab90e9dbe2d7e3e44b00ce9b42d57225359dd7422c091
 DIST chef-10.16.4.gem 811008 SHA256 42424ddbcbed716ffc1863d033a1e4f5446b3922f5cd31280423f9779f54bd7f SHA512 250899a274d2324cc713c2dab416a6926188434b9115650c1f64e23fbec410aedc16391f3b3b8198830c3f71430d261dfb5c2beb2627bb04411145d47232ee87 WHIRLPOOL 0b35decc41cad676ab826d8078f1e774df672455999032ccf46a77fd1ec55b98fd8d6c56d528941da68e5d32bc8e379e08d18b3f5b41ac753297bc738ba13237
+DIST chef-10.20.0.gem 820736 SHA256 c195f936760ac2e2f20b5833bc76f19eb1b6f8e0839033bf7cdc41031d51a1ab SHA512 0fe80a9210ad63bc9c4e14b5d638dc427517179971230f9a86b693575b7cc57ca50995832019327ecf9fac7ac9b4bd747f176b93ecee87480580a2a9775f1633 WHIRLPOOL 89c9d8574bec15c4982fd574d81e1f4fd6bc4b2b91d21dbc02619574a87f121f7b12eab9eaf2cb11b7275305405b17d7f2c43f96783edfad3c26cbf7640c43dc
 EBUILD chef-10.12.0.ebuild 1905 SHA256 9e378562c9945e5ac986a7b5d31efe1aaf5988a69949e22e71ac83fd5e83f5b0 SHA512 a31c7215c43c631c06aea85ad5b04ff68d4f92cd4b7c1000be54aa8fcfd4c307c4bb9bb3f36ccfd3b4dc3ac955eb638ab5bbc6006c7b5e4774ff0fb08e3ff3a2 WHIRLPOOL eab825a96a9c3de4dd9de5e5879b6494206ded0186c2620a6bf77a7370d7418fdf2a9a9726b6ad60926817a07dcf56baef82dff3e80bb8d4793ee49cd1e65e3b
 EBUILD chef-10.16.4.ebuild 2238 SHA256 bd0fde9c7d68bc7f2b76b891230ca47694db3d8ee1937dbf2c9cc96971ec4148 SHA512 f9cb9dd8d6d4d0c72d4280eaf6acf04617f38868629f91137386669df74f57b3edaf11c495004c0fb8149fac47a42a26f50b55352171f024540d002c8d3d63dd WHIRLPOOL be85e038d02f2b61eddc78a6a27a34c61a0039ae82ac780782e9e4d0dc6ff008d532fc48e4fcfd12b544c8afb3686d07f456c2e926f8566bb231a0286d353be7
-MISC ChangeLog 1952 SHA256 577db23b7cb09c661b1f6ea1cbd2775f509034ecc8229086e7f72676d420e28f SHA512 e9709134e8660d32d0a798a8ab8ae4f83b90042099c49eb3fd647aea36364cb8990e4e588877a65bbae2e8c53b69703abb1aa6f185bbc53cfc537387430a6e75 WHIRLPOOL 0c49a5029dbc371d0f6879f6c698786e5b2c0ddfe0c7897e06cb5cc11c554d0fa2843b2fc9c1edbcee2ee99001ee0d100d7ff5cf2691b23ec0511240db315246
+EBUILD chef-10.20.0.ebuild 2279 SHA256 495150f1d37fdd20d983aaf3f5c0ce0e0543cb514a4a429ca669f8728926a534 SHA512 b6c77696a817c92eb39b880f842543d3c21f95d5c4c8242f61348bc57aa3c2425aed007e840b5eaf4702d73951c275c6c25b7bb509b4e0d5161e0646eec7c9b5 WHIRLPOOL c6779b1e1a9a6096f2d8f6eb895cbed0d03c82b5402552dfe5f5202139d4f443a230a52399d4f45b242680a396e06e1dea4309d9b140809e6785c1181c184b02
+MISC ChangeLog 2096 SHA256 67f018ab76ffcb6a0d38898d3231d56ec9e09019862bb973cd75b5d4753e1312 SHA512 7de02127172815b3994ac1ce1b24f8168733cab8ee985f108f174aabc71cdc158651209b3e2a262e74a46eb38b84fcb5932a24a32e7d826eb6e93ccc83f237f7 WHIRLPOOL 15c832a7ef29d36d677aba115e46a71e534bc3fef8c390e16c69d32538f5d32d0778d1738a580460d5cbb8ae3bc66e3dd90044e478435db243a2643bce20ea00
 MISC metadata.xml 233 SHA256 beb476ec6e21df29167e9daf82fb8dfbfc63be8daa1f841288694882bbc27a98 SHA512 ca635918109682b650c0fea6ef239a15f53ef61a4b5c9c13be2395c09d7f53676d8e85b99db0368936527ba0e2eec1b97cfce3b1fb11cb7be1d465cbb9a50e6b WHIRLPOOL 06f397f0cddc6ab2cad0a780ae53f0c1e7f2893eaa80459f122384ce31a9ebcfb2e130f4f725edc6e56a9780681d0d18d0c8553f063eb661769478a5c7a72ab2
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
 }