version bump wrt #396693

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

6 files changed, 30 insertions, 80 deletions

diff --git a/app-admin/chef-server-api/ChangeLog b/app-admin/chef-server-api/ChangeLog
index f430eb39aa65..a2556c872859 100644
--- a/app-admin/chef-server-api/ChangeLog
+++ b/app-admin/chef-server-api/ChangeLog
@@ -1,6 +1,14 @@
 # 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.9 2011/07/25 09:16:54 hollow Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-server-api/ChangeLog,v 1.10 2012/01/29 12:22:49 hollow Exp $
+
+*chef-server-api-0.10.8 (29 Jan 2012)
+
+  29 Jan 2012; Benedikt Böhm <hollow@gentoo.org>
+  -chef-server-api-0.9.12.ebuild, chef-server-api-0.10.2.ebuild,
+  +chef-server-api-0.10.8.ebuild, -files/initd/chef-server-api-r1,
+  files/initd/chef-server-api:
+  version bump wrt #396693
 
 *chef-server-api-0.10.2 (25 Jul 2011)
 
diff --git a/app-admin/chef-server-api/Manifest b/app-admin/chef-server-api/Manifest
index 3f3d6c76f97f..286f9d0f5ea8 100644
--- a/app-admin/chef-server-api/Manifest
+++ b/app-admin/chef-server-api/Manifest
@@ -1,22 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX confd/chef-server-api 586 RMD160 23bb8fa3f66b4e7dcc45681d379e8d1572af3d04 SHA1 8d12900828fe60a6ee9212b1d5a8c2131555c61a SHA256 b42493bc295ba493ea42e74eeed918281df0c75dae234650dcc56a94808a4184
-AUX initd/chef-server-api 1147 RMD160 683d2317bac913130f7fc34162cc58131cf7e3d7 SHA1 9f93ef7b1f87a78dd1123b677b2ba7ff21a9389b SHA256 e09614cf308c9f29d79714f19efbefb572e40f76de88577e9c9cf1b43fedfcca
-AUX initd/chef-server-api-r1 1143 RMD160 46d87742b7959ebefab6d6c1fe9e42bef2c9a678 SHA1 40d86155df4ad0776d85a0d5623dab6c913446d8 SHA256 93b21564c63dcb9b1d759b320eedb34232457c766595d38796bdeae4e985e877
+AUX initd/chef-server-api 1143 RMD160 f65d4a541c266bf9e89ce4c33173316d3837c20c SHA1 9b7ad854ea813d0de530b0dd1fdd4cd354061906 SHA256 7947ede94b61042366c798f7c3c2d049c8ebc1f7ce9002994ce0ced9de5def2c
 AUX server.rb 5136 RMD160 e551cc0041839cb2dc5e27c4a1e26c78c6ca0a5e SHA1 045becd28f35db589d7147cd7c9ec898e0cb5a44 SHA256 732b67b08d067cfa63ed102a35ab4769f517e49024c2f4830843bf5a3a515159
 DIST chef-server-api-0.10.2.gem 51200 RMD160 a83cb7b24520c2dce6a0c0cd50499ecbf707b696 SHA1 584d5502ae38be295529600536037bab64546e46 SHA256 13a7dcea383c569d124826dcadcb99058761eb255e5793dbc08362265a4ba3e3
-DIST chef-server-api-0.9.12.gem 45568 RMD160 05a9fbe46770891d0d1f9b87e6fb9403b5eb961a SHA1 f13c4960a8574d11168a760b0bab1d824cf4e423 SHA256 7dfaef034c10a0da09ff1dac851e5d0ce0629a99235ae4b3be4d29cc03ab7116
-EBUILD chef-server-api-0.10.2.ebuild 1603 RMD160 5379a4f85f7992e8ee45e43b8f6468e428058074 SHA1 e8f45019832399a9ee9b4fe9eb5675fa1c31e522 SHA256 a93be3b7be219e62185d91c51e6f35da19313b8432f8c4fbce6037aa094c1541
-EBUILD chef-server-api-0.9.12.ebuild 1784 RMD160 fefc2334e67733a00cbf69e408d214ac0ed80772 SHA1 ca6304de6fbd5d89389b2d60034512c90c168f92 SHA256 ac8469917da3086659bf2c653eccd6b8e73ace06b68602cd25f507f42b26bb35
-MISC ChangeLog 1751 RMD160 aa4b84abcb806b5443f2a84e654afa74454b5f4c SHA1 9534e65864fa7c1c30d9e031b51043a397beae32 SHA256 04aeaa12d00e4794053c315b50af422ec6c9eb3555f6f9293d23826ca96ac2d5
+DIST chef-server-api-0.10.8.gem 52224 RMD160 0879f1ca948e0336e501cc00de4cd8babbde1d52 SHA1 394fc38e2ec307b8650e57ad1bcbcd1ddc8a9466 SHA256 d35ca109959f70210db2d0fc193503889eb331fc3ec1bac5aed85d9cc47741a3
+EBUILD chef-server-api-0.10.2.ebuild 1593 RMD160 b5cc16a0c73878cb6dbc8217ad2cb3b122446ebe SHA1 f4642e6fc8d34638200c27adc80fc9a4b397e836 SHA256 d9917f38b8847f7799a1b1c5b097d5ea959891b7d0845db29bbf40bb11b0c3e8
+EBUILD chef-server-api-0.10.8.ebuild 1689 RMD160 70991f93f76ea98825411935a1bf0a088d8323b1 SHA1 4c573b5aeb2a006708f667d0565bdfc59a20e938 SHA256 448e6b54f978d3d75b3733bd82768e4f6066e81fe844351c9b012f10557ff736
+MISC ChangeLog 2032 RMD160 e89adcc3debfa77da0a740d0b77064e0ccbe6636 SHA1 36f766ff7b0d52d1888bee9d25893f19717981c2 SHA256 4db7180a04869676226f2b1c081ba0efd6c523f550e8e870d47046d1c53b0af0
 MISC metadata.xml 234 RMD160 cb149fcd7945b8906164cad81daf559757035cde SHA1 9bf4056cf71e3eb7153bb319e8bd24ede9a205b6 SHA256 9f3ea84c59dfbd2d2dd7f1e6f0b959540e27cc9caad4f77e6e76774ce98505a6
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iJwEAQEIAAYFAk589RYACgkQfXuS5UK5QB3a7QQAgVRPES35FY52UqK4LVqv6G7p
-6IqkcJDTgNJ3kuDzZeBMnbG4luHbM1XGcgXPwZuPrk2/4WE8tnzGu/aTYFGq9Fvg
-8lkNR2/MXzuUDVfJ6mk+NiNwvCv7KCk4XkjbNMuMEFUbgSVAdugqJG/nBvs4Tlay
-/7U8hGM8LfELD1k+2OI=
-=Cpch
------END PGP SIGNATURE-----
diff --git a/app-admin/chef-server-api/chef-server-api-0.10.2.ebuild b/app-admin/chef-server-api/chef-server-api-0.10.2.ebuild
index 2b602e10992c..2d2f2f48837e 100644
--- a/app-admin/chef-server-api/chef-server-api-0.10.2.ebuild
+++ b/app-admin/chef-server-api/chef-server-api-0.10.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.10.2.ebuild,v 1.1 2011/07/25 09:16:54 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-server-api/chef-server-api-0.10.2.ebuild,v 1.2 2012/01/29 12:22:49 hollow Exp $
 
 EAPI="2"
 USE_RUBY="ruby18"
@@ -43,7 +43,7 @@ each_ruby_install() {
 all_ruby_install() {
 	all_fakegem_install
 
-	newinitd "${FILESDIR}/initd/chef-server-api-r1" ${PN}
+	doinitd "${FILESDIR}/initd/chef-server-api"
 	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.12.ebuild b/app-admin/chef-server-api/chef-server-api-0.10.8.ebuild
index 49d635a394ba..57d0600e9a8b 100644
--- a/app-admin/chef-server-api/chef-server-api-0.9.12.ebuild
+++ b/app-admin/chef-server-api/chef-server-api-0.10.8.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.12.ebuild,v 1.2 2011/02/03 13:12:50 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-server-api/chef-server-api-0.10.8.ebuild,v 1.1 2012/01/29 12:22:49 hollow Exp $
 
-EAPI="2"
+EAPI="4"
 USE_RUBY="ruby18"
 
 RUBY_FAKEGEM_TASK_DOC=""
@@ -22,30 +22,25 @@ RDEPEND=">=dev-db/couchdb-0.10.0
 	>=net-misc/rabbitmq-server-1.7.0"
 
 ruby_add_rdepend "~app-admin/chef-${PV}
-	>=dev-ruby/json-1.4.4
-	<=dev-ruby/json-1.4.6
-	>=dev-ruby/mixlib-authentication-1.1.3
+	>=dev-ruby/dep_selector-0.0.3
 	>=dev-ruby/merb-assets-1.1.0
+	<dev-ruby/merb-assets-1.2
 	>=dev-ruby/merb-core-1.1.0
+	<dev-ruby/merb-core-1.2
 	>=dev-ruby/merb-helpers-1.1.0
+	<dev-ruby/merb-helpers-1.2
 	>=dev-ruby/merb-param-protection-1.1.0
+	<dev-ruby/merb-param-protection-1.2
+	>=dev-ruby/mixlib-authentication-1.1.3
 	>=dev-ruby/uuidtools-2.1.1
+	<dev-ruby/uuidtools-2.2
 	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() {
diff --git a/app-admin/chef-server-api/files/initd/chef-server-api b/app-admin/chef-server-api/files/initd/chef-server-api
index 4a7149a091c1..a297c8c1919e 100644
--- a/app-admin/chef-server-api/files/initd/chef-server-api
+++ b/app-admin/chef-server-api/files/initd/chef-server-api
@@ -1,9 +1,9 @@
 #!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {
-	need net couchdb rabbitmq chef-solr-indexer
+	need net couchdb rabbitmq chef-expander
 	before chef-client
 }
 
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
deleted file mode 100644
index 4847f577a6b6..000000000000
--- a/app-admin/chef-server-api/files/initd/chef-server-api-r1
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/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 $?
-}