version bump + ruby 19 support + remove old versions

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

4 files changed, 18 insertions, 99 deletions

diff --git a/app-admin/chef-expander/ChangeLog b/app-admin/chef-expander/ChangeLog
index 9810e9f37166..e5c7a1d0461b 100644
--- a/app-admin/chef-expander/ChangeLog
+++ b/app-admin/chef-expander/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/chef-expander
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-expander/ChangeLog,v 1.5 2012/06/17 15:39:58 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-expander/ChangeLog,v 1.6 2012/08/11 12:25:35 hollow Exp $
+
+*chef-expander-10.12.0 (11 Aug 2012)
+
+  11 Aug 2012; Benedikt Böhm <hollow@gentoo.org> -chef-expander-0.10.2.ebuild,
+  -chef-expander-0.10.8.ebuild, -chef-expander-0.10.10_beta1.ebuild,
+  +chef-expander-10.12.0.ebuild:
+  version bump + ruby 19 support + remove old versions
 
 *chef-expander-0.10.10 (17 Jun 2012)
 
diff --git a/app-admin/chef-expander/chef-expander-0.10.2.ebuild b/app-admin/chef-expander/chef-expander-0.10.2.ebuild
deleted file mode 100644
index 208a8dea33b7..000000000000
--- a/app-admin/chef-expander/chef-expander-0.10.2.ebuild
+++ /dev/null
@@ -1,42 +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-expander/chef-expander-0.10.2.ebuild,v 1.2 2011/08/06 14:23:51 graaff 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=""
-
-ruby_add_rdepend "~app-admin/chef-${PV}
-	>=dev-ruby/amqp-0.6.7:0
-	>=dev-ruby/bunny-0.6.0
-	>=dev-ruby/em-http-request-0.2.11
-	>=dev-ruby/eventmachine-0.12.10
-	>=dev-ruby/fast_xs-0.7.3
-	>=dev-ruby/highline-1.6.1
-	>=dev-ruby/mixlib-log-1.2.0
-	>=dev-ruby/uuidtools-2.1.1
-	>=dev-ruby/yajl-ruby-0.7.7"
-
-all_ruby_install() {
-	all_fakegem_install
-
-	doinitd "${FILESDIR}/initd/chef-expander"
-	doconfd "${FILESDIR}/confd/chef-expander"
-
-	keepdir /etc/chef /var/{lib,log,run}/chef
-	fowners chef:chef /var/{lib,log,run}/chef
-}
diff --git a/app-admin/chef-expander/chef-expander-0.10.8.ebuild b/app-admin/chef-expander/chef-expander-0.10.8.ebuild
deleted file mode 100644
index c28a317cd83d..000000000000
--- a/app-admin/chef-expander/chef-expander-0.10.8.ebuild
+++ /dev/null
@@ -1,49 +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-expander/chef-expander-0.10.8.ebuild,v 1.1 2012/01/29 12:17:25 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=""
-
-ruby_add_rdepend "~app-admin/chef-${PV}
-	>=dev-ruby/amqp-0.6.7
-	<dev-ruby/amqp-0.7
-	>=dev-ruby/bunny-0.6.0
-	<dev-ruby/bunny-0.7
-	>=dev-ruby/em-http-request-0.2.11
-	<dev-ruby/em-http-request-0.3
-	>=dev-ruby/eventmachine-0.12.10
-	<dev-ruby/eventmachine-0.13
-	>=dev-ruby/fast_xs-0.7.3
-	<dev-ruby/fast_xs-0.8
-	>=dev-ruby/highline-1.6.1
-	<dev-ruby/highline-1.7
-	>=dev-ruby/mixlib-log-1.2.0
-	>=dev-ruby/uuidtools-2.1.1
-	<dev-ruby/uuidtools-2.2
-	>=dev-ruby/yajl-ruby-0.7.7"
-
-all_ruby_install() {
-	all_fakegem_install
-
-	doinitd "${FILESDIR}/initd/chef-expander"
-	doconfd "${FILESDIR}/confd/chef-expander"
-
-	keepdir /etc/chef /var/{lib,log,run}/chef
-	fowners chef:chef /var/{lib,log,run}/chef
-}
diff --git a/app-admin/chef-expander/chef-expander-0.10.10_beta1.ebuild b/app-admin/chef-expander/chef-expander-10.12.0.ebuild
index ff67c72da26c..7d1006f7994b 100644
--- a/app-admin/chef-expander/chef-expander-0.10.10_beta1.ebuild
+++ b/app-admin/chef-expander/chef-expander-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-expander/chef-expander-0.10.10_beta1.ebuild,v 1.1 2012/04/29 13:21:15 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-expander/chef-expander-10.12.0.ebuild,v 1.1 2012/08/11 12:25:35 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,7 +20,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=""
+# specs require a live rabbitmq server
+RESTRICT="test"
 
 ruby_add_rdepend "~app-admin/chef-${PV}
 	>=dev-ruby/amqp-0.6.7
@@ -37,7 +39,8 @@ ruby_add_rdepend "~app-admin/chef-${PV}
 	>=dev-ruby/mixlib-log-1.2.0
 	>=dev-ruby/uuidtools-2.1.1
 	<dev-ruby/uuidtools-2.2
-	>=dev-ruby/yajl-ruby-0.7.7"
+	>=dev-ruby/yajl-ruby-1.0
+	<dev-ruby/yajl-ruby-2"
 
 all_ruby_install() {
 	all_fakegem_install