Cleanup old. Add ruby20 to amqp:0. Remove ree18.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key )

3 files changed, 9 insertions, 46 deletions

diff --git a/dev-ruby/amqp/ChangeLog b/dev-ruby/amqp/ChangeLog
index 108f7e6b82df..b2054c73b65c 100644
--- a/dev-ruby/amqp/ChangeLog
+++ b/dev-ruby/amqp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/amqp
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/amqp/ChangeLog,v 1.11 2013/12/22 07:44:26 graaff Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/amqp/ChangeLog,v 1.12 2014/03/10 15:51:04 mrueg Exp $
+
+  10 Mar 2014; Manuel Rüger <mrueg@gentoo.org> -amqp-1.1.6.ebuild,
+  amqp-0.6.7-r1.ebuild:
+  Cleanup old. Add ruby20 to amqp:0. Remove ree18.
 
 *amqp-1.1.8 (22 Dec 2013)
 
diff --git a/dev-ruby/amqp/amqp-0.6.7-r1.ebuild b/dev-ruby/amqp/amqp-0.6.7-r1.ebuild
index 78ffb5357d02..e9300cb81684 100644
--- a/dev-ruby/amqp/amqp-0.6.7-r1.ebuild
+++ b/dev-ruby/amqp/amqp-0.6.7-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/amqp/amqp-0.6.7-r1.ebuild,v 1.2 2012/06/17 16:36:11 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/amqp/amqp-0.6.7-r1.ebuild,v 1.3 2014/03/10 15:51:04 mrueg Exp $
 
 EAPI=4
-USE_RUBY="ruby18 ree18 ruby19"
+USE_RUBY="ruby18 ruby19 ruby20"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST="none"
diff --git a/dev-ruby/amqp/amqp-1.1.6.ebuild b/dev-ruby/amqp/amqp-1.1.6.ebuild
deleted file mode 100644
index d7b1f0c5dac1..000000000000
--- a/dev-ruby/amqp/amqp-1.1.6.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/amqp/amqp-1.1.6.ebuild,v 1.1 2013/12/10 07:31:51 graaff Exp $
-
-EAPI=5
-USE_RUBY="ruby18 ruby19 ruby20"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit versionator ruby-fakegem
-
-DESCRIPTION="AMQP client implementation in Ruby/EventMachine"
-HOMEPAGE="http://amqp.rubyforge.org/"
-
-LICENSE="Ruby"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/multi_json dev-ruby/evented-spec )"
-ruby_add_rdepend ">=dev-ruby/eventmachine-0.12.4
-	>=dev-ruby/amq-client-1.0.2
-	>=dev-ruby/amq-protocol-1.3.0"
-
-all_ruby_prepare() {
-	#rm Gemfile || die
-	sed -i -e '/[Bb]undler/ s:^:#:' -e '/effin_utf8/ s:^:#:' spec/spec_helper.rb || die
-
-	# Many specs require a live rabbit server, but only root can start
-	# an instance. Skip these specs for now.
-	rm -rf spec/integration spec/unit/amqp/connection_spec.rb || die
-}
-
-all_ruby_install() {
-	dodoc -r docs examples
-}