version bump wrt #369391

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

4 files changed, 57 insertions, 79 deletions

diff --git a/app-admin/chef-server-api/ChangeLog b/app-admin/chef-server-api/ChangeLog
index 6aea328bd0de..f430eb39aa65 100644
--- a/app-admin/chef-server-api/ChangeLog
+++ b/app-admin/chef-server-api/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/chef-server-api
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-server-api/ChangeLog,v 1.8 2011/02/03 13:12:50 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-server-api/ChangeLog,v 1.9 2011/07/25 09:16:54 hollow Exp $
+
+*chef-server-api-0.10.2 (25 Jul 2011)
+
+  25 Jul 2011; Benedikt Böhm <hollow@gentoo.org>
+  -chef-server-api-0.9.6.ebuild, -chef-server-api-0.9.8.ebuild,
+  +chef-server-api-0.10.2.ebuild, +files/initd/chef-server-api-r1:
+  version bump wrt #369391
 
   03 Feb 2011; Benedikt Böhm <hollow@gentoo.org>
   chef-server-api-0.9.12.ebuild:
diff --git a/app-admin/chef-server-api/chef-server-api-0.9.6.ebuild b/app-admin/chef-server-api/chef-server-api-0.10.2.ebuild
index 44367c9bf3d7..2b602e10992c 100644
--- a/app-admin/chef-server-api/chef-server-api-0.9.6.ebuild
+++ b/app-admin/chef-server-api/chef-server-api-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-api/chef-server-api-0.9.6.ebuild,v 1.3 2010/08/30 17:44:25 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-server-api/chef-server-api-0.10.2.ebuild,v 1.1 2011/07/25 09:16:54 hollow Exp $
 
 EAPI="2"
 USE_RUBY="ruby18"
@@ -18,21 +18,21 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
+RDEPEND=">=dev-db/couchdb-0.10.0
+	>=net-misc/rabbitmq-server-1.7.0"
+
 ruby_add_rdepend "~app-admin/chef-${PV}
+	>=dev-ruby/dep_selector-0.0.3
 	>=dev-ruby/json-1.4.4
+	<=dev-ruby/json-1.4.6
+	>=dev-ruby/mixlib-authentication-1.1.3
 	>=dev-ruby/merb-assets-1.1.0
 	>=dev-ruby/merb-core-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/uuidtools-2.1.1
 	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
@@ -43,7 +43,7 @@ each_ruby_install() {
 all_ruby_install() {
 	all_fakegem_install
 
-	doinitd "${FILESDIR}/initd/chef-server-api"
+	newinitd "${FILESDIR}/initd/chef-server-api-r1" ${PN}
 	doconfd "${FILESDIR}/confd/chef-server-api"
 
 	keepdir /etc/chef /var/lib/chef /var/log/chef /var/run/chef \
diff --git a/app-admin/chef-server-api/chef-server-api-0.9.8.ebuild b/app-admin/chef-server-api/chef-server-api-0.9.8.ebuild
deleted file mode 100644
index 6a405ae5dac7..000000000000
--- a/app-admin/chef-server-api/chef-server-api-0.9.8.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-api/chef-server-api-0.9.8.ebuild,v 1.2 2010/09/20 09:30:31 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=""
-
-ruby_add_rdepend "~app-admin/chef-${PV}
-	>=dev-ruby/json-1.4.4
-	>=dev-ruby/mixlib-authentication-1.1.3
-	>=dev-ruby/merb-assets-1.1.0
-	>=dev-ruby/merb-core-1.1.0
-	>=dev-ruby/merb-helpers-1.1.0
-	>=dev-ruby/merb-param-protection-1.1.0
-	>=dev-ruby/uuidtools-2.1.1
-	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 -r public
-
-	# create unversioned path for passenger/rack integration
-	dodir /var/lib/chef/rack
-	dosym $(ruby_fakegem_gemsdir)/gems/${P} /var/lib/chef/rack/api
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	doinitd "${FILESDIR}/initd/chef-server-api"
-	doconfd "${FILESDIR}/confd/chef-server-api"
-
-	keepdir /etc/chef /var/lib/chef /var/log/chef /var/run/chef \
-		/etc/chef/certificates
-
-	insinto /etc/chef
-	doins "${FILESDIR}/server.rb"
-
-	fperms 0700 /etc/chef/certificates
-	fowners chef:chef /etc/chef/{,server.rb,certificates}
-	fowners chef:chef /var/{lib,log,run}/chef
-}
-
-pkg_postinst() {
-	elog
-	elog "You should edit /etc/chef/server.rb before starting the service with"
-	elog "/etc/init.d/chef-server-api start"
-	elog
-}
diff --git a/app-admin/chef-server-api/files/initd/chef-server-api-r1 b/app-admin/chef-server-api/files/initd/chef-server-api-r1
new file mode 100644
index 000000000000..4847f577a6b6
--- /dev/null
+++ b/app-admin/chef-server-api/files/initd/chef-server-api-r1
@@ -0,0 +1,40 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net couchdb rabbitmq chef-expander
+	before chef-client
+}
+
+CHEF_SERVER_BINARY=${CHEF_SERVER_BINARY:-/usr/bin/chef-server}
+CHEF_SERVER_PIDFILE=${CHEF_SERVER_PIDFILE:-/var/run/chef/server.%s.pid}
+CHEF_SERVER_LOGFILE=${CHEF_SERVER_LOGFILE:-/var/log/chef/server.log}
+CONFIGFILE=${CONFIGFILE:-/etc/chef/server.rb}
+CLUSTER_NODES=${CLUSTER_NODES:-1}
+CHEF_USER=${CHEF_USER:-chef}
+CHEF_GROUP=${CHEF_GROUP:-chef}
+
+CHEF_DIRS=( /etc/chef /var/lib/chef /var/log/chef /var/run/chef )
+
+fix_owners() {
+	for i in ${CHEF_DIRS[@]} ${CONFIGFILE}; do
+		chown ${CHEF_USER}:${CHEF_GROUP} ${i}
+	done
+	chmod 0600 ${CONFIGFILE}
+}
+
+start() {
+	ebegin "Starting Chef server"
+	fix_owners
+	${CHEF_SERVER_BINARY} -d -P ${CHEF_SERVER_PIDFILE} -C ${CONFIGFILE} \
+		-u ${CHEF_USER} -G ${CHEF_GROUP} --name chef-server \
+		-c ${CLUSTER_NODES} -L ${CHEF_SERVER_LOGFILE} ${CHEF_SERVER_OPTS} > /dev/null
+	eend $?
+}
+
+stop() {
+	ebegin "Shutting down Chef server"
+	${CHEF_SERVER_BINARY} -K all -P ${CHEF_SERVER_PIDFILE} > /dev/null
+	eend $?
+}