version bump. fixes #338444

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

3 files changed, 82 insertions, 4 deletions

diff --git a/app-admin/chef-server-webui/ChangeLog b/app-admin/chef-server-webui/ChangeLog
index 3136b76b0881..b2fcf3b459fc 100644
--- a/app-admin/chef-server-webui/ChangeLog
+++ b/app-admin/chef-server-webui/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/chef-server-webui
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-server-webui/ChangeLog,v 1.5 2010/09/20 09:26:49 hollow Exp $
+# 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 $
+
+*chef-server-webui-0.9.12 (07 Jan 2011)
+
+  07 Jan 2011; Benedikt Böhm <hollow@gentoo.org>
+  +chef-server-webui-0.9.12.ebuild, files/initd/chef-server-webui:
+  version bump. fixes #338444
 
   20 Sep 2010; Benedikt Böhm <hollow@gentoo.org>
   chef-server-webui-0.9.8.ebuild:
diff --git a/app-admin/chef-server-webui/chef-server-webui-0.9.12.ebuild b/app-admin/chef-server-webui/chef-server-webui-0.9.12.ebuild
new file mode 100644
index 000000000000..e41da4298942
--- /dev/null
+++ b/app-admin/chef-server-webui/chef-server-webui-0.9.12.ebuild
@@ -0,0 +1,72 @@
+# 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.12.ebuild,v 1.1 2011/01/07 14:15:08 hollow 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/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
+
+	# create unversioned path for passenger/rack integration
+	dodir /var/lib/chef/rack
+	dosym $(ruby_fakegem_gemsdir)/gems/${P} /var/lib/chef/rack/webui
+}
+
+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
+}
diff --git a/app-admin/chef-server-webui/files/initd/chef-server-webui b/app-admin/chef-server-webui/files/initd/chef-server-webui
index 57886e3f25e5..719f9098404b 100644
--- a/app-admin/chef-server-webui/files/initd/chef-server-webui
+++ b/app-admin/chef-server-webui/files/initd/chef-server-webui
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {
@@ -29,7 +29,7 @@ start() {
 	fix_owners
 	${CHEF_SERVER_WEBUI_BINARY} -d -P ${CHEF_SERVER_WEBUI_PIDFILE} --name \
 		chef-server-webui -C ${CONFIGFILE} -u ${CHEF_USER} -G ${CHEF_GROUP} \
-		-c ${CLUSTER_NODES} -L ${CHEF_SERVER_WEBUI_LOGFILE} > /dev/null
+		-c ${CLUSTER_NODES} -L ${CHEF_SERVER_WEBUI_LOGFILE} ${CHEF_SERVER_WEBUI_OPTS} > /dev/null
 	eend $?
 }