version bump wrt #369391

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

3 files changed, 11 insertions, 72 deletions

diff --git a/app-admin/chef-server-webui/ChangeLog b/app-admin/chef-server-webui/ChangeLog
index b2fcf3b459fc..4b4ae08d5e1a 100644
--- a/app-admin/chef-server-webui/ChangeLog
+++ b/app-admin/chef-server-webui/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/chef-server-webui
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-server-webui/ChangeLog,v 1.6 2011/01/07 14:15:08 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-server-webui/ChangeLog,v 1.7 2011/07/25 09:13:38 hollow Exp $
+
+*chef-server-webui-0.10.2 (25 Jul 2011)
+
+  25 Jul 2011; Benedikt Böhm <hollow@gentoo.org>
+  -chef-server-webui-0.9.6.ebuild, -chef-server-webui-0.9.8.ebuild,
+  +chef-server-webui-0.10.2.ebuild:
+  version bump wrt #369391
 
 *chef-server-webui-0.9.12 (07 Jan 2011)
 
diff --git a/app-admin/chef-server-webui/chef-server-webui-0.9.8.ebuild b/app-admin/chef-server-webui/chef-server-webui-0.10.2.ebuild
index 98661e598c75..8e75f14723c3 100644
--- a/app-admin/chef-server-webui/chef-server-webui-0.9.8.ebuild
+++ b/app-admin/chef-server-webui/chef-server-webui-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-server-webui/chef-server-webui-0.9.8.ebuild,v 1.2 2010/09/20 09:26:49 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-server-webui/chef-server-webui-0.10.2.ebuild,v 1.1 2011/07/25 09:13:38 hollow Exp $
 
 EAPI="2"
 USE_RUBY="ruby18"
@@ -24,6 +24,7 @@ RDEPEND=">=dev-db/couchdb-0.10.0
 ruby_add_rdepend "dev-ruby/coderay
 	dev-ruby/haml
 	>=dev-ruby/json-1.4.4
+	<=dev-ruby/json-1.4.6
 	>=dev-ruby/merb-assets-1.1.0
 	>=dev-ruby/merb-core-1.1.0
 	>=dev-ruby/merb-haml-1.1.0
diff --git a/app-admin/chef-server-webui/chef-server-webui-0.9.6.ebuild b/app-admin/chef-server-webui/chef-server-webui-0.9.6.ebuild
deleted file mode 100644
index 058d00541a21..000000000000
--- a/app-admin/chef-server-webui/chef-server-webui-0.9.6.ebuild
+++ /dev/null
@@ -1,69 +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-server-webui/chef-server-webui-0.9.6.ebuild,v 1.2 2010/08/30 17:43:17 graaff Exp $
-
-EAPI="2"
-USE_RUBY="ruby18"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Configuration management tool"
-HOMEPAGE="http://wiki.opscode.com/display/chef"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-db/couchdb-0.10.0
-	>=net-misc/rabbitmq-server-1.7.0"
-
-ruby_add_rdepend "dev-ruby/coderay
-	dev-ruby/haml
-	>=dev-ruby/json-1.4.4
-	>=dev-ruby/merb-assets-1.1.0
-	>=dev-ruby/merb-core-1.1.0
-	>=dev-ruby/merb-haml-1.1.0
-	>=dev-ruby/merb-helpers-1.1.0
-	>=dev-ruby/merb-param-protection-1.1.0
-	>=dev-ruby/merb-slices-1.1.0
-	dev-ruby/ruby-openid
-	www-servers/thin"
-
-pkg_setup() {
-	enewgroup chef
-	enewuser chef -1 -1 /var/lib/chef chef
-}
-
-each_ruby_install() {
-	each_fakegem_install
-	ruby_fakegem_doins -r app
-	ruby_fakegem_doins -r config
-	ruby_fakegem_doins config.ru
-	ruby_fakegem_doins -r public
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	doinitd "${FILESDIR}/initd/chef-server-webui"
-	doconfd "${FILESDIR}/confd/chef-server-webui"
-
-	keepdir /etc/chef /var/lib/chef /var/log/chef /var/run/chef
-
-	insinto /etc/chef
-	doins "${FILESDIR}/webui.rb"
-
-	fowners chef:chef /etc/chef/{,webui.rb}
-	fowners chef:chef /var/{lib,log,run}/chef
-}
-
-pkg_postinst() {
-	elog
-	elog "You should edit or create /etc/chef/webui.rb before starting the service"
-	elog "with /etc/init.d/chef-server-webui start"
-	elog
-}