version bump wrt #369391

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

3 files changed, 10 insertions, 66 deletions

diff --git a/app-admin/chef-solr/ChangeLog b/app-admin/chef-solr/ChangeLog
index 1352ed840d02..d7e2f7353c5b 100644
--- a/app-admin/chef-solr/ChangeLog
+++ b/app-admin/chef-solr/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/chef-solr
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-solr/ChangeLog,v 1.5 2011/01/07 14:19:52 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-solr/ChangeLog,v 1.6 2011/07/25 09:19:37 hollow Exp $
+
+*chef-solr-0.10.2 (25 Jul 2011)
+
+  25 Jul 2011; Benedikt Böhm <hollow@gentoo.org> -chef-solr-0.9.6.ebuild,
+  -chef-solr-0.9.8.ebuild, +chef-solr-0.10.2.ebuild:
+  version bump wrt #369391
 
 *chef-solr-0.9.12 (07 Jan 2011)
 
diff --git a/app-admin/chef-solr/chef-solr-0.9.8.ebuild b/app-admin/chef-solr/chef-solr-0.10.2.ebuild
index 45604e8c4b84..79482860df7e 100644
--- a/app-admin/chef-solr/chef-solr-0.9.8.ebuild
+++ b/app-admin/chef-solr/chef-solr-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-solr/chef-solr-0.9.8.ebuild,v 1.1 2010/09/19 14:24:55 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-solr/chef-solr-0.10.2.ebuild,v 1.1 2011/07/25 09:19:37 hollow Exp $
 
 EAPI="2"
 USE_RUBY="ruby18"
@@ -18,18 +18,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=net-misc/rabbitmq-server-1.7.0
+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"
 
-pkg_setup() {
-	enewgroup chef
-	enewuser chef -1 -1 /var/lib/chef chef
-}
-
 each_ruby_install() {
 	each_fakegem_install
 	ruby_fakegem_doins -r solr
@@ -41,9 +36,6 @@ all_ruby_install() {
 	doinitd "${FILESDIR}/initd/chef-solr"
 	doconfd "${FILESDIR}/confd/chef-solr"
 
-	doinitd "${FILESDIR}/initd/chef-solr-indexer"
-	doconfd "${FILESDIR}/confd/chef-solr-indexer"
-
 	keepdir /etc/chef /var/lib/chef /var/log/chef /var/run/chef
 
 	insinto /etc/chef
diff --git a/app-admin/chef-solr/chef-solr-0.9.6.ebuild b/app-admin/chef-solr/chef-solr-0.9.6.ebuild
deleted file mode 100644
index 019ba1636689..000000000000
--- a/app-admin/chef-solr/chef-solr-0.9.6.ebuild
+++ /dev/null
@@ -1,54 +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-solr/chef-solr-0.9.6.ebuild,v 1.2 2010/07/03 12:59:55 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=">=net-misc/rabbitmq-server-1.7.0
-	=virtual/jre-1.6.0"
-
-ruby_add_rdepend "~app-admin/chef-${PV}
-	>=dev-ruby/libxml-1.1.3
-	>=dev-ruby/uuidtools-2.0.0"
-
-pkg_setup() {
-	enewgroup chef
-	enewuser chef -1 -1 /var/lib/chef chef
-}
-
-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"
-
-	doinitd "${FILESDIR}/initd/chef-solr-indexer"
-	doconfd "${FILESDIR}/confd/chef-solr-indexer"
-
-	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
-}