version bump wrt #369391

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

diff --git a/app-admin/chef/ChangeLog b/app-admin/chef/ChangeLog
index a10d49ee08e90ef673e83e2429d15a46e3f5cb7c..1381f319d585c4b7b176eb4f62efb06c8d83e8d1 100644 (file)
--- a/app-admin/chef/ChangeLog
+++ b/app-admin/chef/ChangeLog
@@ -1,31 +1,10 @@
 # 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.6 2011/01/07 17:16:31 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chef/ChangeLog,v 1.7 2011/07/25 09:06:18 hollow Exp $
 
-  07 Jan 2011; Benedikt Böhm <hollow@gentoo.org> chef-0.9.12.ebuild:
-  fix dependency on dev-ruby/json to include ebuild revisions of 1.4.6
+*chef-0.10.2 (25 Jul 2011)
 
-*chef-0.9.12 (07 Jan 2011)
-
-  07 Jan 2011; Benedikt Böhm <hollow@gentoo.org> +chef-0.9.12.ebuild:
-  version bump
-
-*chef-0.9.8 (19 Sep 2010)
-
-  19 Sep 2010; Benedikt Böhm <hollow@gentoo.org> +chef-0.9.8.ebuild:
-  version bump
-
-  28 Aug 2010; Hans de Graaff <graaff@gentoo.org> chef-0.9.6.ebuild:
-  Depend on >=dev-ruby/json-1.4.4 because json-1.4.3 has bugs that affect
-  dev-ruby/ohai and chef.
-
-  04 Jul 2010; Benedikt Böhm <hollow@gentoo.org> chef-0.9.6.ebuild:
-  Add dependency on ruby-shadow for password support in the user resource
-
-*chef-0.9.6 (03 Jul 2010)
-
-  03 Jul 2010; Benedikt Böhm <hollow@gentoo.org> +chef-0.9.6.ebuild,
-  +files/client.rb, +files/confd/chef-client, +files/initd/chef-client,
-  +files/solo.rb, +metadata.xml:
-  initial ebuild, thanks to Gábor Vészi
+  25 Jul 2011; Benedikt Böhm <hollow@gentoo.org> -chef-0.9.6.ebuild,
+  -chef-0.9.8.ebuild, +chef-0.10.2.ebuild, metadata.xml:
+  version bump wrt #369391
 

diff --git a/app-admin/chef/Manifest b/app-admin/chef/Manifest
index 5f5f4a547c24c50e7f7ebd60ec57ac264d64348e..652f4a8d8203b2c05dac13b3345f73ecdc029a09 100644 (file)
--- a/app-admin/chef/Manifest
+++ b/app-admin/chef/Manifest
@@ -2,11 +2,9 @@ AUX client.rb 2491 RMD160 7f3ab27743edaab3c279a67d1f967634bd823c28 SHA1 edc62d53
 AUX confd/chef-client 477 RMD160 fee00784183c89eba72978a9cd8a7ed0a7229a6b SHA1 1d179065b3bd69cd7fc81a20ee05fb03c097a98b SHA256 87ae3fc931df89fc890d1b976c9596a078780ecf95c1fac4f08cad08f8e89a90
 AUX initd/chef-client 726 RMD160 8a1876428591e93fce814883fb07016b0a78d31f SHA1 6824a6028db843f393032122ae9da57ba72d9ddb SHA256 c5e47f3a9a4528746f9217a17c04e6ab8d7bec2e669bf020025158d19a483d1b
 AUX solo.rb 2023 RMD160 5c60853cf40f3b3565618b8d074814efb0f2e408 SHA1 8cfc5e67e427252c26ebf4c04b504a8a4845d1c7 SHA256 48e1863e4cbcdbf935ea4c9e29514c825c04ff35d68cb6bf8b8f246cd4b6a815
+DIST chef-0.10.2.gem 347648 RMD160 43fc66dd7877aeddd7a1d1066b73c21296b61bf0 SHA1 30832c0a1b6655d0aa5ccc532f9ba443a5b075fd SHA256 350bad2d596d0a3ebe555909480a7e9f50900497413b558c0a74ad2a7da5f2a0
 DIST chef-0.9.12.gem 254464 RMD160 550ba7ee062e61ef20edd60ff5bf596eb3efb8ac SHA1 60c6ce3ccb4fe29eb8b66ebfdff994100b1d24e3 SHA256 a021e015e37c7edc8589b9a17184d675fb5b4784a65bc5532831b8faa3ad4b68
-DIST chef-0.9.6.gem 216064 RMD160 706c55cc043f2be01bcefe643bad5d647c22efb3 SHA1 15fd1245a587cdfb9d2223bfdf2e047a97d34417 SHA256 db676545f35c8b703dc97cee82c05e3604f250d66e0100d6a2a3aaa42a70416c
-DIST chef-0.9.8.gem 244736 RMD160 80e4b875492e22b12e098e1e4bb3754d803f6ed5 SHA1 e0ec9d57c23e011d5663f060f072c32264b62f9e SHA256 5a9241d1fe8eba317b602322bd085a682d0f198fcd91776f8ec30eb2943d0549
+EBUILD chef-0.10.2.ebuild 1469 RMD160 5f1cb3ff2263974a382f07899b72e5e7034cb068 SHA1 a346b3d96fa1d34b24253b9a06cec690bddba08c SHA256 18a0c5c122e22e3bdf536249b6fc06c3b2de3a19b72e5beab087c08514c998d6
 EBUILD chef-0.9.12.ebuild 1311 RMD160 70496c4e5384466078758a1eadd93c27fa0a5b33 SHA1 c0b41d340e8297bb78749eb2e676ffbebe2af33a SHA256 fe93318f6f5631a276b128ac91fc1e6d46e03eac4844fcb8381f8cca38f78ff0
-EBUILD chef-0.9.6.ebuild 1289 RMD160 26e65ca52665f3812e0ad2da267e2a5d6c5597c5 SHA1 32d5acd0d7e6751961c04b03e05349215180f519 SHA256 2bdb6571c791af3e43cb87584611c0a074ae2841791b3c57b511ef9a964ac1c7
-EBUILD chef-0.9.8.ebuild 1289 RMD160 40882d252accf780d82106de99c64b570e3eb5f1 SHA1 86a9ee1d1661fa11aae156c4be5f4c5420b34823 SHA256 489545ac5eeb706281345047036e11cafc66f5c3daddd296158667287d30e434
-MISC ChangeLog 1130 RMD160 16210dbb1e453b3130a5da54d301f5ffe5e0aff0 SHA1 fce1c35c0b61ff3b081f5bca2a29f128d51c034d SHA256 c9a87fe46fa4ec6d82bfb07adaa21f0f2f1b1b75972971540748bbb5061940a0
-MISC metadata.xml 256 RMD160 d9b3d76f0f3b12500bf0a1e012563f2f32f4992f SHA1 2520f467b4a64d131a92dd8101e03ad334d6d7a6 SHA256 74f2c9d6b7ef600697deed6d19bc64604a39ba7a2e8c24fae47ca2544def84c0
+MISC ChangeLog 384 RMD160 b58e6d821b534623ff74fe50ba91c0004c97f0e1 SHA1 2b2c6e4bf538a84df7bb19949a25640cfeda4a8c SHA256 79aaab919357823fc6285aa0314e73f07d8c14e1af5b5d7530ddbaac4e1453c0
+MISC metadata.xml 255 RMD160 07d553bdf9282f61c4e99ad3f7697a310946cf9d SHA1 533ddafc8a18d2110ccdbec4c99c48abbcd6e633 SHA256 e3eef1b3ebe3eea3ba74657f3a332c7427c1bd24a5609d2ff887f63901d9cd35

diff --git a/app-admin/chef/chef-0.9.6.ebuild b/app-admin/chef/chef-0.10.2.ebuild
similarity index 69%
rename from app-admin/chef/chef-0.9.6.ebuild
rename to app-admin/chef/chef-0.10.2.ebuild
index bad3e57602490fa314f08ac37f49d5e513e21028..e5f97a2ea94ee3c6e4695ebd07c9e82a10a141aa 100644 (file)
--- a/app-admin/chef/chef-0.9.6.ebuild
+++ b/app-admin/chef/chef-0.10.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/chef/chef-0.9.6.ebuild,v 1.3 2010/08/28 14:33:52 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chef/chef-0.10.2.ebuild,v 1.1 2011/07/25 09:06:18 hollow Exp $
 
 EAPI="2"
 USE_RUBY="ruby18"
@@ -23,15 +23,19 @@ ruby_add_rdepend ">=dev-ruby/bunny-0.6.0
        dev-ruby/extlib
        dev-ruby/highline
        >=dev-ruby/json-1.4.4
+       <=dev-ruby/json-1.5.2
        >=dev-ruby/mixlib-authentication-1.1.0
        >=dev-ruby/mixlib-cli-1.1.0
-       >=dev-ruby/mixlib-config-1.1.0
-       >=dev-ruby/mixlib-log-1.1.0
+       >=dev-ruby/mixlib-config-1.1.2
+       >=dev-ruby/mixlib-log-1.3.0
        dev-ruby/moneta
-       >=dev-ruby/ohai-0.5.0
+       >=dev-ruby/net-ssh-2.1.3
+       >=dev-ruby/net-ssh-multi-1.0.1
+       >=dev-ruby/ohai-0.6.0
        >=dev-ruby/rest-client-1.0.4
-       <=dev-ruby/rest-client-1.5.1
+       <dev-ruby/rest-client-1.7.0
        dev-ruby/ruby-shadow
+       >=dev-ruby/treetop-1.4.9
        dev-ruby/uuidtools"
 
 all_ruby_install() {
@@ -47,6 +51,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/chef-0.9.8.ebuild b/app-admin/chef/chef-0.9.8.ebuild
deleted file mode 100644 (file)
index aaa5dea..0000000
--- a/app-admin/chef/chef-0.9.8.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/chef/chef-0.9.8.ebuild,v 1.1 2010/09/19 14:23:43 hollow Exp $
-
-EAPI="2"
-USE_RUBY="ruby18"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Chef is a systems integration framework"
-HOMEPAGE="http://wiki.opscode.com/display/chef"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-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/mixlib-authentication-1.1.0
-       >=dev-ruby/mixlib-cli-1.1.0
-       >=dev-ruby/mixlib-config-1.1.0
-       >=dev-ruby/mixlib-log-1.1.0
-       dev-ruby/moneta
-       >=dev-ruby/ohai-0.5.6
-       >=dev-ruby/rest-client-1.0.4
-       <=dev-ruby/rest-client-1.5.1
-       dev-ruby/ruby-shadow
-       dev-ruby/uuidtools"
-
-all_ruby_install() {
-       all_fakegem_install
-
-       keepdir /etc/chef /var/lib/chef /var/log/chef /var/run/chef
-
-       doinitd "${FILESDIR}/initd/chef-client"
-       doconfd "${FILESDIR}/confd/chef-client"
-
-       insinto /etc/chef
-       doins "${FILESDIR}/client.rb"
-       doins "${FILESDIR}/solo.rb"
-}
-
-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/metadata.xml b/app-admin/chef/metadata.xml
index b263a5bc4f28bcea99165b7a3d27af04a04898e9..18c5a8ce65399de1de65b0f0e9dd37b4a3d16fd8 100644 (file)
--- a/app-admin/chef/metadata.xml
+++ b/app-admin/chef/metadata.xml
@@ -7,4 +7,3 @@
                <name>Benedikt Böhm</name>
        </maintainer>
 </pkgmetadata>
-