version bump + ruby 19 support + remove old versions

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

4 files changed, 17 insertions, 139 deletions

diff --git a/app-admin/chef-server-api/ChangeLog b/app-admin/chef-server-api/ChangeLog
index b57f4798ccdc..5f6f9f28fc9f 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-server-api/ChangeLog,v 1.12 2012/06/17 15:43:10 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-server-api/ChangeLog,v 1.13 2012/08/11 12:47:54 hollow Exp $
+
+*chef-server-api-10.12.0 (11 Aug 2012)
+
+  11 Aug 2012; Benedikt Böhm <hollow@gentoo.org>
+  -chef-server-api-0.10.2.ebuild, -chef-server-api-0.10.8.ebuild,
+  -chef-server-api-0.10.10_beta1.ebuild, +chef-server-api-10.12.0.ebuild:
+  version bump + ruby 19 support + remove old versions
 
 *chef-server-api-0.10.10 (17 Jun 2012)
 
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
deleted file mode 100644
index 2d2f2f48837e..000000000000
--- a/app-admin/chef-server-api/chef-server-api-0.10.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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.2 2012/01/29 12:22:49 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 "~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/uuidtools-2.1.1
-	www-servers/thin"
-
-each_ruby_install() {
-	each_fakegem_install
-	ruby_fakegem_doins -r app
-	ruby_fakegem_doins -r config
-	ruby_fakegem_doins -r public
-}
-
-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/chef-server-api-0.10.8.ebuild b/app-admin/chef-server-api/chef-server-api-0.10.8.ebuild
deleted file mode 100644
index 57d0600e9a8b..000000000000
--- a/app-admin/chef-server-api/chef-server-api-0.10.8.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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.8.ebuild,v 1.1 2012/01/29 12:22:49 hollow Exp $
-
-EAPI="4"
-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 "~app-admin/chef-${PV}
-	>=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"
-
-each_ruby_install() {
-	each_fakegem_install
-	ruby_fakegem_doins -r app
-	ruby_fakegem_doins -r config
-	ruby_fakegem_doins -r public
-}
-
-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/chef-server-api-0.10.10_beta1.ebuild b/app-admin/chef-server-api/chef-server-api-10.12.0.ebuild
index b6bca3392419..0f21108a9bea 100644
--- a/app-admin/chef-server-api/chef-server-api-0.10.10_beta1.ebuild
+++ b/app-admin/chef-server-api/chef-server-api-10.12.0.ebuild
@@ -1,13 +1,14 @@
 # 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.10_beta1.ebuild,v 1.1 2012/04/29 13:23:57 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-server-api/chef-server-api-10.12.0.ebuild,v 1.1 2012/08/11 12:47:54 hollow Exp $
 
-EAPI="4"
-USE_RUBY="ruby18"
+EAPI=4
+USE_RUBY="ruby18 ruby19"
 
 RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_VERSION=${PV/_beta/.beta.}
+RUBY_FAKEGEM_TASK_TEST="spec"
+
+RUBY_FAKEGEM_EXTRADOC="README.rdoc"
 
 inherit ruby-fakegem
 
@@ -19,6 +20,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
+# specs require root access
+RESTRICT="test"
+
 RDEPEND=">=dev-db/couchdb-0.10.0
 	>=net-misc/rabbitmq-server-1.7.0"