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

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64

4 files changed, 11 insertions, 60 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/Manifest b/dev-ruby/amqp/Manifest
index 3c1bed0e8b3f..49ec3bfdfafa 100644
--- a/dev-ruby/amqp/Manifest
+++ b/dev-ruby/amqp/Manifest
@@ -1,20 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST amqp-0.6.7.gem 83456 SHA256 7d7faf3e394d0a9c5c3574fbd87f9877b85dbd1fa419f5e1dfe84266f56cdfe3 SHA512 8dd993c5da6056b1904549aebe8c4807a014d82d22bb0b3be26f75cf09d9faa8c7bccc67fb06931bcb2b918ff12f12ee306a53329477d8af5a2a54652a9d0390 WHIRLPOOL e4f8372de915a94bdba801be691dcdd9cbe366a0bebf5fd0aab7bf8b7fbc34d1446cb6cb2b0d31aa66424649be558b676673212e9d46f5fe16da7c60434a8e21
 DIST amqp-1.0.2.gem 1159680 SHA256 ed5aa5fd296d3a9296000677f666604428d5e3cb30970500b6eb8ddefc06a171 SHA512 3a2bd4f3b28808262fc898e05645264c2a124b6ce8d6be7e49a53ea5c39f129cf8e1b172a930fb523c5d3d228a63f82359d169438eda5c52e6d8428e432a6388 WHIRLPOOL 8f14b3e66bc91605f63f34b8d6c3900e837fca6b223d7bdf521302f9f363e1613d569c032e8cc1c33a03cbe020b6a2fea0554078a7fca9db46d1d7579412a008
-DIST amqp-1.1.6.gem 1174528 SHA256 577a52282313be5b1b715227b2ef1ded059c10ab4b37353697b9703561f45757 SHA512 8b6c7292c1a0dba64b91957acfc3a05b77c03126dbc82634dff9170ddf5d9909e7d365ed9848ea682fa5e9681825ba0137ad3f39f536f77f94560d5b359b6d52 WHIRLPOOL 79df7ddfc9e66d3bb0403b965a0ac1fd29fd6f1c0309f11542c9d5868c9731c47fec477f2cb70dc4a1ca68e5cd0387969c897fbeedd43ddc84675fda111ada9e
 DIST amqp-1.1.8.gem 1174528 SHA256 3effc0d3f816b214e588a3cb816d02ec537239609cf538e96a175791307386eb SHA512 c00f34242af6a73df11579c80262663769858a49904c1333635c6ec83259b3cbb5bf0ab6bd9fc8dacf4c406c64165f4f0466ec64313f8b715cfc3f732c7a4e1c WHIRLPOOL c21fc55e9597a77fc0fbc05fa238c618bc7c1a9bc8fd3e6e0b69ffe21cbe2b336f7bd04b8985a80cbea6797b807346e394182fa0b3ec65171ed53141dadb1d7b
-EBUILD amqp-0.6.7-r1.ebuild 715 SHA256 c74c277f2aec479e6d8bbe813ba384eb63f71c541045fdbee66b0575b6418c90 SHA512 2e6269c89eb96ecb2b28c4d609e7db7ba70c82845b5bc784ca48056923c33f89d5f8d602f3cc441f33b5d07b13f64dda8e559de408ebfe3d2f57d15a4ffcc54a WHIRLPOOL 315da393a79191b4ca5a3a2ed5334294730e85779d87b664764a97f8a82a0ccd200db5ce2d1ad336282f36d91cebac37ab68dccad4736ec901a638d518e83757
+EBUILD amqp-0.6.7-r1.ebuild 715 SHA256 b88db421cffce8eb8e73fd0ce116b8f3f981ac4cb739d9c5a5eeb54c7cfb5611 SHA512 cbb32fd84bca8d3d0bcd1b7970a140103192da2ce5fdd057f70437b01434c43724059270c200f47d52040758318c2562f8ace325f528fc3d5075849c8f00aecf WHIRLPOOL 3a144210025c353a3cf09dbfcb9fa286865a6a1759f6bdff3ffc414dd44fd592f146b41cdb8fb7046e89bcb3357394026f5a4b185c033c1c7f04cf2abf5ac758
 EBUILD amqp-1.0.2.ebuild 1230 SHA256 0ef83c164d46f3ff6520ef8d69b2ff8ab2a49c6e1e0e5cf551e24e32ee062786 SHA512 8073a847ad5d0ab59e3506161808683f22d03aafc69b510e62bfe9f33900c9bb80c3427e4035f287e066a263330d9c34af2bcc5f3d358433932ae5611ea40d67 WHIRLPOOL 94765488653259dc8d4bf09fb278680e7f43b47643c4f28a923a916b0d3c0d793d6e5d76a1f6294eaa3b77abe2fddf93378d51d04c80a6050652ebb402ded57c
-EBUILD amqp-1.1.6.ebuild 1142 SHA256 23e082db82843ad4ca4e3da1cef4b2075e5156789134f5cf4483be2e418633ac SHA512 f3b871fcc7f2a3dcbac580a5d735487892126940ea80bf7cbdcb2f75a5b0615442638842ba0e3490d9274eaa251496c079ee14ffebb7c9e2ac9612f25aa62f08 WHIRLPOOL 2508359e5438adee07fb044c5006784ee1a925fe991c4f056f6015cda751681168f8d73832deaeb97749a3c439bc5d8c407c832d35a7ca239062250ca99c860a
 EBUILD amqp-1.1.8.ebuild 1113 SHA256 38e0b4956e601c772569c9bca451b6936ffc713eca1ebd7578a9a2159793c990 SHA512 1fea035593112d3642eb80a422847aece82ec6bb1e45399208b0e1e2748bd9723bd2c9df48e4d932fe8c2d06f2bd9a13b337bc19ecc681a208b1ccac9b817763 WHIRLPOOL b73bee467a3d2d0c347c210aef012641ea4a6813d5bf52d4f178bc8e1cf37385231b528de7f4dec43d0bc640570628eecbe579bebfed639567aafa405b8270c9
-MISC ChangeLog 1547 SHA256 b44241963c5a0d18dbd1b5ddacdedbfbdbd116baadf05e9d0e1b84575afe0b37 SHA512 188020ebc875f1a8b1e0950aaf69e9d703e410821167ac299c7a1dc3d09b200d15c546b4f62ca1b3d5ee37dc905b8764c12eb56361e52084a208d9bf6d277f7f WHIRLPOOL d12490a0442e695043a388a923a6f2876176ecc2bd860902304eb589187699a8ac76f188994f324591377867b8fd41780459e9347c38e4957f70afc578ac6ad6
+MISC ChangeLog 1690 SHA256 540cd4cfe7c79e074ba7105c650beb83a0b8fb288b3a3c512a55a6c66a4caa59 SHA512 1337f8a8d00ca1e6554103255efa88ee01edab742f2276c8669da41f02f9aa0c735f8f8991b793c5a37d14a3f576e19eae5bd44a7508b6f6c3e17ec195946346 WHIRLPOOL 8a8665f88718da4872a249bdc27f86a3c5b484710fe562d52fa830fba734326b916588e0b1b29b802a5cb8a7ca505d4373ea8b1173713ffad389ded8ad568119
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iF4EAREIAAYFAlK2mFsACgkQiIP6VqMIqNeBWAD8CihShEe+VBmpfXV76NjrCiRQ
-eKiCu/9276J2Q3geAdsA/jZ/6WgmZ7soj8LSxXsYNlGPPH6LHvzQnrEq9v35BnTy
-=FroY
------END PGP SIGNATURE-----
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
-}