version bump wrt #369391

(Portage version: 2.2.0_alpha37/cvs/Linux x86_64)

4 files changed, 20 insertions, 88 deletions

diff --git a/app-admin/chef/ChangeLog b/app-admin/chef/ChangeLog
index a10d49ee08e9..1381f319d585 100644
--- 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/chef-0.9.6.ebuild b/app-admin/chef/chef-0.10.2.ebuild
index bad3e5760249..e5f97a2ea94e 100644
--- 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
index aaa5dea232ba..000000000000
--- 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 b263a5bc4f28..18c5a8ce6539 100644
--- a/app-admin/chef/metadata.xml
+++ b/app-admin/chef/metadata.xml
@@ -7,4 +7,3 @@
 		<name>Benedikt Böhm</name>
 	</maintainer>
 </pkgmetadata>
-