version bump + ruby 19 support + remove old versions

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

16 files changed, 57 insertions, 440 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"
 
diff --git a/app-admin/chef-server-webui/ChangeLog b/app-admin/chef-server-webui/ChangeLog
index 9f4c9fba50de..2d09c8d260f6 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-server-webui/ChangeLog,v 1.11 2012/06/17 15:45:19 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-server-webui/ChangeLog,v 1.12 2012/08/11 12:46:54 hollow Exp $
+
+*chef-server-webui-10.12.0 (11 Aug 2012)
+
+  11 Aug 2012; Benedikt Böhm <hollow@gentoo.org>
+  -chef-server-webui-0.10.2.ebuild, -chef-server-webui-0.10.8.ebuild,
+  -chef-server-webui-0.10.10_beta1.ebuild, +chef-server-webui-10.12.0.ebuild:
+  version bump + ruby 19 support + remove old versions
 
 *chef-server-webui-0.10.10 (17 Jun 2012)
 
diff --git a/app-admin/chef-server-webui/chef-server-webui-0.10.10_beta1.ebuild b/app-admin/chef-server-webui/chef-server-webui-0.10.10_beta1.ebuild
deleted file mode 100644
index fd153edc5fb6..000000000000
--- a/app-admin/chef-server-webui/chef-server-webui-0.10.10_beta1.ebuild
+++ /dev/null
@@ -1,77 +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-webui/chef-server-webui-0.10.10_beta1.ebuild,v 1.2 2012/05/31 02:24:30 zmedico Exp $
-
-EAPI="4"
-USE_RUBY="ruby18"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_VERSION=${PV/_beta/.beta.}
-
-inherit ruby-fakegem user
-
-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/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-haml-1.1.0
-	<dev-ruby/merb-haml-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/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/chef-server-webui-0.10.2.ebuild b/app-admin/chef-server-webui/chef-server-webui-0.10.2.ebuild
deleted file mode 100644
index f1fc53840c50..000000000000
--- a/app-admin/chef-server-webui/chef-server-webui-0.10.2.ebuild
+++ /dev/null
@@ -1,73 +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-webui/chef-server-webui-0.10.2.ebuild,v 1.2 2012/05/31 02:24:30 zmedico Exp $
-
-EAPI="2"
-USE_RUBY="ruby18"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit ruby-fakegem user
-
-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/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
-	>=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/chef-server-webui-0.10.8.ebuild b/app-admin/chef-server-webui/chef-server-webui-10.12.0.ebuild
index 1eac728ee283..58cf2ccdba68 100644
--- a/app-admin/chef-server-webui/chef-server-webui-0.10.8.ebuild
+++ b/app-admin/chef-server-webui/chef-server-webui-10.12.0.ebuild
@@ -1,9 +1,9 @@
 # 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-webui/chef-server-webui-0.10.8.ebuild,v 1.2 2012/05/31 02:24:30 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-server-webui/chef-server-webui-10.12.0.ebuild,v 1.1 2012/08/11 12:46:54 hollow Exp $
 
-EAPI="4"
-USE_RUBY="ruby18"
+EAPI=4
+USE_RUBY="ruby18 ruby19"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST=""
diff --git a/app-admin/chef-server/ChangeLog b/app-admin/chef-server/ChangeLog
index cd6b14712ff0..0d2fb36dd58a 100644
--- a/app-admin/chef-server/ChangeLog
+++ b/app-admin/chef-server/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/chef-server
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-server/ChangeLog,v 1.7 2012/06/17 15:46:44 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-server/ChangeLog,v 1.8 2012/08/11 12:49:44 hollow Exp $
+
+*chef-server-10.12.0 (11 Aug 2012)
+
+  11 Aug 2012; Benedikt Böhm <hollow@gentoo.org> -chef-server-0.10.2.ebuild,
+  -chef-server-0.10.8.ebuild, -chef-server-0.10.10_beta1.ebuild,
+  +chef-server-10.12.0.ebuild:
+  version bump + ruby 19 support + remove old versions
 
 *chef-server-0.10.10 (17 Jun 2012)
 
diff --git a/app-admin/chef-server/chef-server-0.10.10_beta1.ebuild b/app-admin/chef-server/chef-server-0.10.10_beta1.ebuild
deleted file mode 100644
index 4fe3319c28aa..000000000000
--- a/app-admin/chef-server/chef-server-0.10.10_beta1.ebuild
+++ /dev/null
@@ -1,24 +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/chef-server-0.10.10_beta1.ebuild,v 1.1 2012/04/29 13:26:30 hollow Exp $
-
-EAPI="4"
-USE_RUBY="ruby18"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_VERSION=${PV/_beta/.beta.}
-
-inherit ruby-fakegem
-
-DESCRIPTION="Configuration management tool (meta package)"
-HOMEPAGE="http://wiki.opscode.com/display/chef"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend "~app-admin/chef-server-api-${PV}
-	~app-admin/chef-solr-${PV}
-	~app-admin/chef-expander-${PV}"
diff --git a/app-admin/chef-server/chef-server-0.10.2.ebuild b/app-admin/chef-server/chef-server-0.10.2.ebuild
deleted file mode 100644
index fde8837be704..000000000000
--- a/app-admin/chef-server/chef-server-0.10.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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/chef-server-0.10.2.ebuild,v 1.1 2011/07/25 09:18:19 hollow Exp $
-
-EAPI="2"
-USE_RUBY="ruby18"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Configuration management tool (meta package)"
-HOMEPAGE="http://wiki.opscode.com/display/chef"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend "~app-admin/chef-server-api-${PV}
-	~app-admin/chef-solr-${PV}
-	~app-admin/chef-expander-${PV}"
diff --git a/app-admin/chef-server/chef-server-0.10.8.ebuild b/app-admin/chef-server/chef-server-10.12.0.ebuild
index 1c2db33c438b..432305d4452c 100644
--- a/app-admin/chef-server/chef-server-0.10.8.ebuild
+++ b/app-admin/chef-server/chef-server-10.12.0.ebuild
@@ -1,13 +1,15 @@
 # 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/chef-server-0.10.8.ebuild,v 1.1 2012/01/29 12:36:59 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-server/chef-server-10.12.0.ebuild,v 1.1 2012/08/11 12:49:45 hollow Exp $
 
-EAPI="4"
-USE_RUBY="ruby18"
+EAPI=4
+USE_RUBY="ruby18 ruby19"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST=""
 
+RUBY_FAKEGEM_EXTRADOC="README.rdoc"
+
 inherit ruby-fakegem
 
 DESCRIPTION="Configuration management tool (meta package)"
diff --git a/app-admin/chef-solr/ChangeLog b/app-admin/chef-solr/ChangeLog
index d1434165f11c..b24c3b3a05bf 100644
--- a/app-admin/chef-solr/ChangeLog
+++ b/app-admin/chef-solr/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/chef-solr
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-solr/ChangeLog,v 1.10 2012/06/17 15:41:38 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-solr/ChangeLog,v 1.11 2012/08/11 12:45:49 hollow Exp $
+
+*chef-solr-10.12.0 (11 Aug 2012)
+
+  11 Aug 2012; Benedikt Böhm <hollow@gentoo.org> -chef-solr-0.10.2-r1.ebuild,
+  -chef-solr-0.10.8.ebuild, -chef-solr-0.10.10_beta1.ebuild,
+  +chef-solr-10.12.0.ebuild:
+  version bump + ruby 19 support + remove old versions
 
 *chef-solr-0.10.10 (17 Jun 2012)
 
diff --git a/app-admin/chef-solr/chef-solr-0.10.2-r1.ebuild b/app-admin/chef-solr/chef-solr-0.10.2-r1.ebuild
deleted file mode 100644
index efbc6f28cbe3..000000000000
--- a/app-admin/chef-solr/chef-solr-0.10.2-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-solr/chef-solr-0.10.2-r1.ebuild,v 1.1 2011/12/31 20:07:50 idl0r 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=">=net-misc/rabbitmq-server-1.7.2
-	virtual/jre:1.6"
-
-ruby_add_rdepend "~app-admin/chef-${PV}
-	>=dev-ruby/libxml-1.1.3
-	>=dev-ruby/uuidtools-2.0.0"
-
-each_ruby_install() {
-	each_fakegem_install
-	ruby_fakegem_doins -r solr
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	doinitd "${FILESDIR}/initd/chef-solr"
-	doconfd "${FILESDIR}/confd/chef-solr"
-
-	keepdir /etc/chef /var/lib/chef /var/log/chef /var/run/chef
-
-	insinto /etc/chef
-	doins "${FILESDIR}/solr.rb"
-
-	fowners chef:chef /etc/chef/{,solr.rb}
-	fowners chef:chef /var/{lib,log,run}/chef
-}
diff --git a/app-admin/chef-solr/chef-solr-0.10.8.ebuild b/app-admin/chef-solr/chef-solr-0.10.8.ebuild
deleted file mode 100644
index 17e31c70cb72..000000000000
--- a/app-admin/chef-solr/chef-solr-0.10.8.ebuild
+++ /dev/null
@@ -1,44 +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-solr/chef-solr-0.10.8.ebuild,v 1.1 2012/01/29 12:11:53 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=">=net-misc/rabbitmq-server-1.7.2
-	virtual/jre:1.6"
-
-ruby_add_rdepend "~app-admin/chef-${PV}"
-
-each_ruby_install() {
-	each_fakegem_install
-	ruby_fakegem_doins -r solr
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	doinitd "${FILESDIR}/initd/chef-solr"
-	doconfd "${FILESDIR}/confd/chef-solr"
-
-	keepdir /etc/chef /var/lib/chef /var/log/chef /var/run/chef
-
-	insinto /etc/chef
-	doins "${FILESDIR}/solr.rb"
-
-	fowners chef:chef /etc/chef/{,solr.rb}
-	fowners chef:chef /var/{lib,log,run}/chef
-}
diff --git a/app-admin/chef-solr/chef-solr-0.10.10_beta1.ebuild b/app-admin/chef-solr/chef-solr-10.12.0.ebuild
index 6d675fb573a2..c869f6ffb70b 100644
--- a/app-admin/chef-solr/chef-solr-0.10.10_beta1.ebuild
+++ b/app-admin/chef-solr/chef-solr-10.12.0.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-solr/chef-solr-0.10.10_beta1.ebuild,v 1.1 2012/04/29 13:19:34 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-solr/chef-solr-10.12.0.ebuild,v 1.1 2012/08/11 12:45:49 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"
 
 inherit ruby-fakegem
 
@@ -24,6 +23,10 @@ RDEPEND=">=net-misc/rabbitmq-server-1.7.2
 
 ruby_add_rdepend "~app-admin/chef-${PV}"
 
+each_ruby_test() {
+	${RUBY} -S rspec spec || die
+}
+
 each_ruby_install() {
 	each_fakegem_install
 	ruby_fakegem_doins -r solr