17 files changed, 31 insertions, 281 deletions
diff --git a/dev-ruby/mime-types/ChangeLog b/dev-ruby/mime-types/ChangeLog
index c57f12f65059..e661b6ecba93 100644
--- a/dev-ruby/mime-types/ChangeLog
+++ b/dev-ruby/mime-types/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/mime-types
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mime-types/ChangeLog,v 1.58 2014/10/24 14:53:58 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mime-types/ChangeLog,v 1.59 2014/10/30 15:57:09 mrueg Exp $
+
+  30 Oct 2014; Manuel Rüger <mrueg@gentoo.org> -mime-types-2.2.ebuild,
+  -mime-types-2.3.ebuild, -mime-types-2.4.1.ebuild, -mime-types-2.4.ebuild,
+  mime-types-1.23.ebuild, mime-types-1.25.1.ebuild:
+  Drop jruby target. Cleanup old.
 
 *mime-types-2.4.3 (24 Oct 2014)
 
diff --git a/dev-ruby/mime-types/Manifest b/dev-ruby/mime-types/Manifest
index 715b605571b8..b7cc27bbd6eb 100644
--- a/dev-ruby/mime-types/Manifest
+++ b/dev-ruby/mime-types/Manifest
@@ -1,16 +1,8 @@
 DIST mime-types-1.23.gem 55296 SHA256 fa29671c5f80a5dbafe3111814f1bf289af91f422c1d1fa4c10bda63fab305b2 SHA512 d2e3c87c776d0e242c2b97c9ec8d630af05e504f815340137fbaeb19251ba096dc486117adddc9830940a80d3c0a81f0862c5c50838dc54c3d04c0231537d0df WHIRLPOOL 7112ceb83e3c6641c7b6ee114dd1f950036a23d085555e61b735973932c85b2f851a90c259339efd5496a9f3236a2dd3bd3e12998509fa1b98b7d2df2453661b
 DIST mime-types-1.25.1.gem 61440 SHA256 88ef3c596481678710ffd4018fa40f1999b02d97babea39682ba7d5badd21f56 SHA512 50a79bc0378bb9bf694656b15ac69446447fc863a5a6556e68ad736768627c9f43e59c68b0ed141cee5dbd81a8ccca1a33a61aa01af7d0a5949b00d6edb6525e WHIRLPOOL 65da6addc3f1f4b6c730eadbeabf285a0a85452d90ff036820d3cb1940311248cdcf12a21e836c4b3d03af8ea73f33f642d071f2bb8fdf9556b05cdf974b16d4
-DIST mime-types-2.2.gem 100352 SHA256 fb20b5fb6b25c2b8abbf74b21b82c6e14ae1e3ed5146ec23d305333c9c360bc6 SHA512 40413dafb264662e315ffa40cbbbc842d67245a8a820837ab651937558faacbbfd57a0c5172b6dbac6afbbf6b7ca677ba0cea7de84983cba8d2f699f7be27805 WHIRLPOOL b1dfe6ccb150304a8bb7cfbaa6b2a71799ed6ffbe603e088e85fc5f70c79fa2e98abda68c0b6b567fb24cfc4872c99efa73390f0746252d6172c39842371a499
-DIST mime-types-2.3.gem 106496 SHA256 6d13658a740d7ce3cbd285a1a60f7f42db56923c37a33cae8ed5252cf2e71548 SHA512 be331b947017980502585088744139c9cd44325977e34d0e12616b0221679e99a9a4fabc5de98b3a53169f81adacaccc8a7153b1c041cf58514426f1d4337ea8 WHIRLPOOL 5cbcd6fb16a9d837940aca77a4c19bd29f95da34bff37b94ea68bfed455c62dce50861725af3a9ec4e04262f69a7b9df62d057731682a7d9fbad95b8008fd79f
-DIST mime-types-2.4.1.gem 117760 SHA256 8dab4996ba9e5af58f801c0b57c12678bc927c44831d89ee01eaf71eed102a07 SHA512 8dc049a49fea594b93c43c439309f06a272ba5df3912d895967bbb24ece0402eecb4b7d9473079e71d6883eb2ca77c167b531b59bb62fd3b312fe1c985949124 WHIRLPOOL 806cebe625d44a4c2e4bf7cc9859f7eb03a5f17567fade952cdddc09ccc4b93f26a694a2c28c6330a568471ea695630bba5c82c5d6129260eb55bea5e1fa784f
 DIST mime-types-2.4.3.gem 118272 SHA256 38f29a89a273d15bfb99e839c6fe5cf7c463f223dd7ac5ee3c9287b1acd6d19a SHA512 7b04ad54819cb813480d90e2f831f3613f5e8d07581f23c632899c7b511c2579c54f402e7b216ca9baea6eff62ad5ddd7602b21f13e1c51aab5416eb629d1bdd WHIRLPOOL 1c28b4fc52460d03f85b7fb86bbe7840775d5f0d3d50f33b04b660879460f12478a08db29aa3c4cadedf2f2bee2332b65687d491cc2b2928f0198950da1ee28c
-DIST mime-types-2.4.gem 116224 SHA256 d2fd7467e440b3c3e7bf3f805bc4db22365f0a6f0415be1548091f13166d789f SHA512 e9ba0d191e08a464b0aff589c9312780ee636f71ca3f2ad6b8eaec9deac62709eae1f14906fda822a9c579c1e89025a73bfaf8c574fc7da5613ffcfc6aff40d7 WHIRLPOOL d789448f2d4b8e1e28f898e4f476ee67cf4f0da533ec934bf43cbd6e7b38fa69c2b72c87d465b2edaa13e98d0fad3ce1d6f653d1bcb6b541b49572f62e201db6
-EBUILD mime-types-1.23.ebuild 835 SHA256 d9857b397107622cc7164ae24fe6318c9cdcc1ec20a90909ffbb3246443ec265 SHA512 0594e2d2186a8ffbf0c807490ca787378f7cdb679ae5c56bebe1e4e099cb534e6d29a63808c8c1ce52f5d0fa3eda8150244a2a666249bfa21d24a0f57a50e704 WHIRLPOOL 7724ce0fa835945ce0e1ba34c1b221c3a113b39d3a550462ba3ef4a832dd50cca43c8309635a8e534b7c57f5555daf019a44dac22106d3b97e1b01ddd2eb5f6f
-EBUILD mime-types-1.25.1.ebuild 1010 SHA256 3e81956888351cfbeed6da60f2d3ddb6c33189ae1c7763503d2ffa39841ed178 SHA512 f0b1b666b3d3969a174598ada618a11afdbd6bf7daa286d53a523e48c4f96b4d4b1849ff53859bbdea4189ffc094a2b64fe1b8f294bc787cb961f820cfd459f5 WHIRLPOOL 7f8e64ddc10e02d727248a282c215a9c04cac643048f78117e56c7a577062cd6068e13c56013ec2339e0eae530e590e50fb8d9cd1dda2d431bd2fbdeec585934
-EBUILD mime-types-2.2.ebuild 1035 SHA256 3054736283dd2c62f044170c513a0da4e36a17830ce9e7bd4fa0d378adac2898 SHA512 c2c9a008064fb216ad81d54798305f53c6f0070fc00c78471e22dd6875e458b679804f37f87568f221255f10dc41eb901431a4f6c1c2a5b64d37178b7c8433f8 WHIRLPOOL 1ccc5a3c79ebff21cd23f5d0bf4b59a672525e1b3f20e55065f69a94330dbdc31eaa190d0d3e8f61fc02f00277d5018ad5a418e3fabb114b2812114c4af4ee86
-EBUILD mime-types-2.3.ebuild 1054 SHA256 fd4f55980b511098e93349381f916b252d140b4f16a466ef7dad98d2911107b3 SHA512 cdcad8e2a7b32c24726c7213a6a343b7b5006e095e9d6cfe3babd17814ef8bd9158889114a0da26ee165ff270f828a88a9ed00db754f37777df5058d35f49a42 WHIRLPOOL c1226c23a5f9d588967fdd377027257af21f333d21d833e023d5582cf2884df5ecec51d8c6ddcb93bad277b48c4c423fdde3bc7fd67dfd0df6cdfcb372fe1d17
-EBUILD mime-types-2.4.1.ebuild 1057 SHA256 5984909a2d692f9e8f996e40377d4530a7226c3958ef1b39d7b9c70f70e2083a SHA512 7c1bbe6576de646c2da18544aa2b9c9e8e29ff8c67f46b06adba6aa7df379412babb995c41c7b86ebb3daa2f1c01fb358c4174959bef4fec853c53cdfb596e3d WHIRLPOOL b072276c3e974c24706ed2d8b0b68f34ae6aec8376a023f02ebce7044b22d4fa777bcfe0dd6ecaafc4ab73fc8c832ff71543624df4577231fa07ae252788649a
+EBUILD mime-types-1.23.ebuild 829 SHA256 47677678edf05523a593aefef6480cd1cde736672cadebbb86c2fab20a3890f1 SHA512 2f567ac5d43f68b73242b2a0495db390c1c9da4c2d253f94ee2d0dfd64dbaa4af414258f2ad2034d8dd8db0f72b3d0b1ea7d42af7881376bf5e64003d0418df2 WHIRLPOOL 0c6bb4e6ce7ea8c4e2bb9adcd3c7e7ecb6ce5fffa76894f1ad48aa8eb7f74e333b8443a6ac241e5a3d2781005c7fd2e6d79f52bb5370417836e39bc8cdb784e6
+EBUILD mime-types-1.25.1.ebuild 1004 SHA256 c1cce391064a5c337ea14866dabb444a2f91131fcfa863eb7b77381ecec923d5 SHA512 02e25e74ea7c20323065f05f178c9beeebe0652bed77b3d537ebe1a616b88097dbe8bea1aea1ba2959a2a9f2f284cfd3d862fd261e810ffa125e62b8828d3c30 WHIRLPOOL 6063336692d019cf52b07bfb6064d7c3914da98ef9ce8f9f7d0f35d538658e85612fd38fdddd7324d542e44ad110f2474a54a6f764e686f089fd357012170ca1
 EBUILD mime-types-2.4.3.ebuild 1056 SHA256 34ce57ab3ae4180449d19b4dd8c949e4bdcd2f260c9d9a088a0f839042d27ad1 SHA512 5f8e5d9433b7e3d09080902f92c531fa73d25ecbe131c9ec579604769b39cc574f630b983706bb71fac0b625a2bb32706ecf10dbee98aff56f6ff418a0bfcb2f WHIRLPOOL bed9567eea1e4b3d2c8a266f50d05749936dccc0701b73d52588a2cb8324ebb683f27bbf2b70d0e198ce6bae650bfa68e46ecad53e1f1e23e23f6af37ef7ec83
-EBUILD mime-types-2.4.ebuild 1055 SHA256 61024be41e67c1f202de6d138ef095d05685f472dc851bb3249ea8e3ef02f819 SHA512 9a23834c6d8b90a323701c39c7c3ec1575890ff11e0d14211346eea75cd05f8abd0a6d2a690c4f89bffedf43925301f8d4d3bd98339b46ca16016ad3688397f6 WHIRLPOOL 1e977667bc642d685ff4aa0306dcd79829fe115a07b27af0744577d076cbf3d7f6e3e9487a4f59967bf89143758c8f7bf03f50cb99c0dce0312b54b38f5b928e
-MISC ChangeLog 7965 SHA256 f7c323b0e10114e9bf8a955a5ba3aaad91f3dfc2979905a066b418284616a85d SHA512 74c0c3abe00109871768a5d4f95c0341b81e325a0ee4faf226397c168cc1128cd1eeba6ae721e395334662b7b2e0a05097eb46637d4776e5c7482c4d66310468 WHIRLPOOL d52c964c9a094bdfb999897429fcc0916c3c1a90bfcbd0c0dece2eb5a48b83534b293f08b1d3be0c483303c198e83a13b63727ab16179b2b539edd622e07a2db
+MISC ChangeLog 8200 SHA256 2a57f854c1e98f97afea6e9fb3312bd1fc9efb8f82c60f7690cda1a6ee551572 SHA512 c00afefe6f341f5b4011b39aee4c9a6bf383d283f6cc3d7aede6593e60e9ff5437e1e3f1252b26b822dfbcd0fdcf6d5f2b3fff8d44eec69cf9adeaa3537216d2 WHIRLPOOL b8e1c63558f41ee18f8757acd7c2a99ce95e4246dca642c55777d25f012f3713257fba0b06db75f87541424806e0d94c189647e5ffe0be6195227ffc08ce2feb
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
diff --git a/dev-ruby/mime-types/mime-types-1.23.ebuild b/dev-ruby/mime-types/mime-types-1.23.ebuild
index 0ca6d28e2484..d08af675ec13 100644
--- a/dev-ruby/mime-types/mime-types-1.23.ebuild
+++ b/dev-ruby/mime-types/mime-types-1.23.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mime-types/mime-types-1.23.ebuild,v 1.10 2014/08/28 02:50:05 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mime-types/mime-types-1.23.ebuild,v 1.11 2014/10/30 15:57:09 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 jruby"
+USE_RUBY="ruby19 ruby20"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
diff --git a/dev-ruby/mime-types/mime-types-1.25.1.ebuild b/dev-ruby/mime-types/mime-types-1.25.1.ebuild
index 161d7f8a03ce..d8b2881f5532 100644
--- a/dev-ruby/mime-types/mime-types-1.25.1.ebuild
+++ b/dev-ruby/mime-types/mime-types-1.25.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mime-types/mime-types-1.25.1.ebuild,v 1.6 2014/08/28 02:50:05 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mime-types/mime-types-1.25.1.ebuild,v 1.7 2014/10/30 15:57:09 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 ruby21 jruby"
+USE_RUBY="ruby19 ruby20 ruby21"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
diff --git a/dev-ruby/mime-types/mime-types-2.2.ebuild b/dev-ruby/mime-types/mime-types-2.2.ebuild
deleted file mode 100644
index e255a57497ef..000000000000
--- a/dev-ruby/mime-types/mime-types-2.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mime-types/mime-types-2.2.ebuild,v 1.4 2014/08/28 02:50:05 mrueg Exp $
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
-
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Provides a mailcap-like MIME Content-Type lookup for Ruby"
-HOMEPAGE="https://github.com/halostatue/mime-types/"
-
-LICENSE="MIT Artistic GPL-2"
-SLOT="2"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
-
-all_ruby_prepare() {
-	# Handle minitest ourselves to avoid bundler dependency.
-	sed -i -e '2igem "minitest", "~> 5.0"; require "minitest/autorun"' test/test_*.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib -S testrb test/test_*.rb || die
-}
diff --git a/dev-ruby/mime-types/mime-types-2.3.ebuild b/dev-ruby/mime-types/mime-types-2.3.ebuild
deleted file mode 100644
index f48017d55b55..000000000000
--- a/dev-ruby/mime-types/mime-types-2.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mime-types/mime-types-2.3.ebuild,v 1.4 2014/08/28 02:50:05 mrueg Exp $
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="History.rdoc History-Types.rdoc README.rdoc"
-
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Provides a mailcap-like MIME Content-Type lookup for Ruby"
-HOMEPAGE="https://github.com/halostatue/mime-types/"
-
-LICENSE="MIT Artistic GPL-2"
-SLOT="2"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
-
-all_ruby_prepare() {
-	# Handle minitest ourselves to avoid bundler dependency.
-	sed -i -e '2igem "minitest", "~> 5.0"; require "minitest/autorun"' test/test_*.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib -S testrb test/test_*.rb || die
-}
diff --git a/dev-ruby/mime-types/mime-types-2.4.1.ebuild b/dev-ruby/mime-types/mime-types-2.4.1.ebuild
deleted file mode 100644
index 6f87ef9a856e..000000000000
--- a/dev-ruby/mime-types/mime-types-2.4.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mime-types/mime-types-2.4.1.ebuild,v 1.1 2014/10/09 06:12:28 graaff Exp $
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="History.rdoc History-Types.rdoc README.rdoc"
-
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Provides a mailcap-like MIME Content-Type lookup for Ruby"
-HOMEPAGE="https://github.com/halostatue/mime-types/"
-
-LICENSE="MIT Artistic GPL-2"
-SLOT="2"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
-
-all_ruby_prepare() {
-	# Handle minitest ourselves to avoid bundler dependency.
-	sed -i -e '2igem "minitest", "~> 5.0"; require "minitest/autorun"' test/test_*.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib -S testrb test/test_*.rb || die
-}
diff --git a/dev-ruby/mime-types/mime-types-2.4.ebuild b/dev-ruby/mime-types/mime-types-2.4.ebuild
deleted file mode 100644
index f4324b5ee67a..000000000000
--- a/dev-ruby/mime-types/mime-types-2.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mime-types/mime-types-2.4.ebuild,v 1.1 2014/10/07 05:41:42 graaff Exp $
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="History.rdoc History-Types.rdoc README.rdoc"
-
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Provides a mailcap-like MIME Content-Type lookup for Ruby"
-HOMEPAGE="https://github.com/halostatue/mime-types/"
-
-LICENSE="MIT Artistic GPL-2"
-SLOT="2"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
-
-all_ruby_prepare() {
-	# Handle minitest ourselves to avoid bundler dependency.
-	sed -i -e '2igem "minitest", "~> 5.0"; require "minitest/autorun"' test/test_*.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib -S testrb test/test_*.rb || die
-}
diff --git a/dev-ruby/safe_yaml/ChangeLog b/dev-ruby/safe_yaml/ChangeLog
index add28ef7da5f..fe13acddb45b 100644
--- a/dev-ruby/safe_yaml/ChangeLog
+++ b/dev-ruby/safe_yaml/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/safe_yaml
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/safe_yaml/ChangeLog,v 1.15 2014/09/30 04:56:02 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/safe_yaml/ChangeLog,v 1.16 2014/10/30 15:55:15 mrueg Exp $
+
+  30 Oct 2014; Manuel Rüger <mrueg@gentoo.org> -safe_yaml-1.0.2.ebuild,
+  -safe_yaml-1.0.3.ebuild, safe_yaml-1.0.4.ebuild:
+  Drop jruby target. Cleanup old.
 
 *safe_yaml-1.0.4 (30 Sep 2014)
 
diff --git a/dev-ruby/safe_yaml/Manifest b/dev-ruby/safe_yaml/Manifest
index 69b368620d24..d34c85baa135 100644
--- a/dev-ruby/safe_yaml/Manifest
+++ b/dev-ruby/safe_yaml/Manifest
@@ -1,18 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-DIST safe_yaml-1.0.2.gem 28672 SHA256 8f28a8d28d7bd5018865fb5531f419bb7fdd520eb5bbd189fd669bad2ca53072 SHA512 346655756609d9a849016f6a461ccaaec98ec89ba869aa98ec02636969f41bd83b149a0ca18bf49ae9c00ca6faf7c2c1ef11a0bb327a938be80dbb47525172c6 WHIRLPOOL d60e5b6dd88dfeb7cf78d45f5a2b5a38573f3708b72aed2829b227c5554ebad4702c3af8fc39eccf8242ec9b6578a94c390048b70359e3726148bd7b68ce71a9
-DIST safe_yaml-1.0.3.gem 29696 SHA256 94a36065cd702f8939f928106f63b0e9049d0cddcbf5163ccc430332fdf46b18 SHA512 868397b36c7c13e783316c82eb6a40490c9e0ccc4dc4c745b9905198e37be4367e6445693aefc33039d309966386bdd05d7a869d1a0a61a78f7ecdf40031fa86 WHIRLPOOL 40f88132f977b305642bf784bd63862f4e1363c56db5f7803c4a78ccea7862a57b9951466a0da72a9bb4ba77433403079b3efe86df8cee3f7eb9b089866fe09e
 DIST safe_yaml-1.0.4.gem 30208 SHA256 248193992ef1730a0c9ec579999ef2256a2b3a32a9bd9d708a1e12544a489ec2 SHA512 ecc944a6e5f0862acf1413d7ab38bd35b56405893bb8064be2b8a056f0164d3710afaa2f6ef65868770e855ecf54a87bf9ddae2241c3c2957ca001ca04b04c5a WHIRLPOOL ae637634e0c9747fe27ca8519d8f7a4fafbfac416c235e55222f29ee72bf07ec4f8c79f8b1395236fa5c7e1afb7ee78aa9945d3b327c93dc86612b2cbfdca6c6
-EBUILD safe_yaml-1.0.2.ebuild 860 SHA256 530fef12131b2c97f80d51cc58ae1028f2fce3a840e7ceb0b1468eba3ce2b1f8 SHA512 4f7befef69cfc4a710ec7384ab3a6fd1c57881129ade3991694022c79f88b06e6edc0db1e5c82035c50eabd7993ea51afb458a8d012512dd3be71f3d0abecfa7 WHIRLPOOL 536e698515ba98deb87a7a009117382615607b5f98c1ffe05956efb5cb0aa66b9c486f54c153f51bce5181cbebfecaf68a2411e3c67ba031619c7c29cecaf2b4
-EBUILD safe_yaml-1.0.3.ebuild 867 SHA256 583fb9b9883a3851248f1c891012b8395d2c7ca3b6dee7707f55f29ced251a73 SHA512 5092f0f39eea37d4ee77904e12792d40912426dd38e126e5ad2cce935a1e23586f212dbda9f48c6ef43f787c4b2f24be1d32dae4f33a2738e6342d16f5eef566 WHIRLPOOL 49eefb4a8d1d302760da8cfda704d578211505a722da4eb6186aca0ffbe4aeb76221d809d4153ad568b90cd18b0ec1f2ce447b0be90e2fcc027d8f4716d732df
-EBUILD safe_yaml-1.0.4.ebuild 865 SHA256 8ce0e0a8a3684d20469296d6ccaa18cb5ec2555287f1f6d928e36106d9cb721f SHA512 909e9fdad034cb745c9a50bcb128ed2a753205b705bd4643e931c1e70c379a34c8adb3a585d881382a01e6e47b7f359953c0b707d7e65f86837ebb660f7a30a1 WHIRLPOOL 0e83ff5b03b29f78779f49022cf4c4cc02d5112a21f9bc0b593d3ea5b765fa3730749ecc7cc55d32741db2a0da1ecd26389f2894093f901307ff8311958582d1
-MISC ChangeLog 2281 SHA256 6c9e201208fc7a3ea3f336ae8b54e5d67cf4f6aae1a05182d059468b49035ee9 SHA512 8d4c345a40fd9f4704ccb410cfa3ee3fdef59f787627ade571c72614a85468abb2d59e9bc117f5c7585ca5132d46d121a18a09b5d4cf4a28ed8f6165877cbb03 WHIRLPOOL e5f63277f7c0693cdbfc79eac2682d9bfcaf7217fcbacbc02c427be533dea4d8dc5a5499fafca63194436e26c82baf75c9793e15fb6ba68f432c43e1bc3e58ce
+EBUILD safe_yaml-1.0.4.ebuild 858 SHA256 f8bbbf2a63d4eb71642bc06a08f35549b905d6ee39bfce8a62dc9db6852363a2 SHA512 f022eed79f81f8e11e6b626708bc28b780df6e0a2cbd677d9df314391ab908fc855abc49d94402c700b2fc2e10c76334246afc84dad69d8370b23581879ca68a WHIRLPOOL 7d941faf79fa7043008da6c189a66e9764f9183be12f5986d3a3c9d7c87270bf9a9874f991d98ce46ef99bf5db3dbef9ed4971615b5513fba64b99e88507d86c
+MISC ChangeLog 2439 SHA256 32d64aa78a25bb6e23a2d3e9bb67ca33cbf34c2a618ef97b6d8b1b00e0d8c3d7 SHA512 909644e9b9974126cdfa008077857940c404d0e418517d700ef9accb3a49240127456585ded6ddd58c6796891eb9e72de4ac67d4ffe9182a9833a6e35ab4374f WHIRLPOOL 7e06e585a04fdf9dc5b6dbdc86081e394bccbf466aa9293553a42fdfd4e8d1aca7f5ed1e1080d38622e75bdd9a372d2ac61d4f054c6a98744a84f9fde641e851
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iF4EAREIAAYFAlQqN+MACgkQiIP6VqMIqNfvIQD/cT6kFjP2PnW6RJY2yxu1/5C+
-6TLQA0JQZPSIlbR/i8UA/Re9nXc5OS+LazgawiqJPkiNaVbra7eh+Gi4hSccFxCq
-=lTQM
------END PGP SIGNATURE-----
diff --git a/dev-ruby/safe_yaml/safe_yaml-1.0.2.ebuild b/dev-ruby/safe_yaml/safe_yaml-1.0.2.ebuild
deleted file mode 100644
index 8348dfc474ed..000000000000
--- a/dev-ruby/safe_yaml/safe_yaml-1.0.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/safe_yaml/safe_yaml-1.0.2.ebuild,v 1.2 2014/08/15 14:25:13 blueness Exp $
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 jruby"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Parse YAML safely, without that pesky arbitrary object deserialization vulnerability"
-HOMEPAGE="https://dtao.github.com/safe_yaml"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64"
-IUSE="test"
-
-ruby_add_bdepend "test? ( dev-ruby/hashie
-	dev-ruby/heredoc_unindent
-	dev-ruby/rspec:2 )"
-
-each_ruby_test() {
-	# Run specs with monkeypatch
-	${RUBY} -S rspec --tag ~libraries || die
-
-	# Running specs without monkeypatch
-	${RUBY} -S rspec --tag libraries || die
-}
diff --git a/dev-ruby/safe_yaml/safe_yaml-1.0.3.ebuild b/dev-ruby/safe_yaml/safe_yaml-1.0.3.ebuild
deleted file mode 100644
index c54d77fb7832..000000000000
--- a/dev-ruby/safe_yaml/safe_yaml-1.0.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/safe_yaml/safe_yaml-1.0.3.ebuild,v 1.3 2014/08/15 14:25:13 blueness Exp $
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21 jruby"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Parse YAML safely, without that pesky arbitrary object deserialization vulnerability"
-HOMEPAGE="https://dtao.github.com/safe_yaml"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64"
-IUSE="test"
-
-ruby_add_bdepend "test? ( dev-ruby/hashie
-	dev-ruby/heredoc_unindent
-	dev-ruby/rspec:2 )"
-
-each_ruby_test() {
-	# Run specs with monkeypatch
-	${RUBY} -S rspec --tag ~libraries || die
-
-	# Running specs without monkeypatch
-	${RUBY} -S rspec --tag libraries || die
-}
diff --git a/dev-ruby/safe_yaml/safe_yaml-1.0.4.ebuild b/dev-ruby/safe_yaml/safe_yaml-1.0.4.ebuild
index d2f601db83cc..5546b4da1310 100644
--- a/dev-ruby/safe_yaml/safe_yaml-1.0.4.ebuild
+++ b/dev-ruby/safe_yaml/safe_yaml-1.0.4.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/safe_yaml/safe_yaml-1.0.4.ebuild,v 1.1 2014/09/30 04:56:02 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/safe_yaml/safe_yaml-1.0.4.ebuild,v 1.2 2014/10/30 15:55:15 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 ruby21 jruby"
+USE_RUBY="ruby19 ruby20 ruby21"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-ruby/samuel/ChangeLog b/dev-ruby/samuel/ChangeLog
index b991bdc5039c..f942d0224afa 100644
--- a/dev-ruby/samuel/ChangeLog
+++ b/dev-ruby/samuel/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/samuel
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/samuel/ChangeLog,v 1.23 2014/08/05 16:00:32 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/samuel/ChangeLog,v 1.24 2014/10/30 15:57:38 mrueg Exp $
+
+  30 Oct 2014; Manuel Rüger <mrueg@gentoo.org> -samuel-0.3.3.ebuild,
+  samuel-0.3.3-r1.ebuild:
+  Drop jruby target. Cleanup old.
 
   05 Aug 2014; Manuel Rüger <mrueg@gentoo.org> samuel-0.3.3-r1.ebuild,
   samuel-0.3.3.ebuild:
diff --git a/dev-ruby/samuel/Manifest b/dev-ruby/samuel/Manifest
index 6570b4843970..2f246829a27f 100644
--- a/dev-ruby/samuel/Manifest
+++ b/dev-ruby/samuel/Manifest
@@ -1,5 +1,4 @@
 DIST samuel-0.3.3.gem 12800 SHA256 a0a566e27f654aff0af30f34d80153201619ba9fc5c80ac891c9719d2f84a048 SHA512 3c668a45ac6eb58d236722f1d9f23cfa02d54506309427ad4c6ee2909a6d3def109246c7f7f98a9c26cda0ac74b54c610c4cc0fc18110bf9b45d1aa461f37f57 WHIRLPOOL 9d90f09fd34c48b9213ddc15c1432d400c44e950f717da9ad536477d9bb3d6fddca6c5ab728bacfdc4f9cd0af983c4191cd952c0a5ff0bad403ff15366c6b151
-EBUILD samuel-0.3.3-r1.ebuild 1256 SHA256 a3a60bdfe06462d3272a415070d6a3580470bafe382203e34c919e771a89331e SHA512 c1e211b3a778776a8a0b1182a94fe1f1eb648e9424e3f48ab298bbe9393e0bbc79614eb81692b6b9f891120613d4f46aa3559e27fa667074e3f788d7d6fa4267 WHIRLPOOL 6a43a17eb00f2d9a58a2e585b979596965799306e1d293ec23243034c6290d296e5238a5693751dc3ce9167a798893e10bda2475ab9453c63afec8abfb1cc261
-EBUILD samuel-0.3.3.ebuild 1016 SHA256 8a6eaa3074e392ec98952273e00028ace91f23d0d934baf82586f45201c5c99b SHA512 12feac91d0b7fff643f5c1d237943c973fc8f5154ed966218882ece1788d300b3371d4ba6c6eea5651369fee6a3131a31e69f2ca453502afc09bbeb9703e9ab6 WHIRLPOOL 725e5c3577c51393893e71c32ce9006ca9070f01b993c108edfbb0b3e84f4154b9b21d52395ec059715054ad11edd6a70ce149e3af283c79ba8d0102db4ef1af
-MISC ChangeLog 3031 SHA256 29b7c0446ce8f097819ae8d37d404269e4683234897eafb31a9a1e3ce0a153de SHA512 1397de53f5b3f1479d27b6177a20991973726400b521b76f3479d389d8b2bcade31c87bcb5fe8e8e4c6955f3a3971a5653d204dbafe9efd050931210eec23313 WHIRLPOOL 3552557dd6277e6dc9111bf56708664a8a76d59532c66c3f24d47ac6767018b71c75633d1361b429b00a39a364ea4fee21b7b13565c960e624b2d72e41aafde6
+EBUILD samuel-0.3.3-r1.ebuild 1177 SHA256 2336c3b8c4ce99e1c241a879d01fc15da9c889c9434cdfb0f124e29a9d00ebf8 SHA512 b709ce76deb8c88fa72a16f907bf876e6c1a597fba820d96e44559a069e7780ed2975095977958b5fe32d0847e49f4217ab3fb0e9191fd05c64c2a412e0d066c WHIRLPOOL 3fd95213b1ab1be23029e47c5855393e497f56733f639e03e7dd3223714a335bba6b23cc7b6cf5b6ec76fdadf590d2e23d02775ca09f86db6c61ca960eae3ce9
+MISC ChangeLog 3162 SHA256 03720053938da0c03cf3acc36bd77c5fa0603ed7ebdb8dd84a2c7bf1d050ba84 SHA512 f76479c6dffa8ba3b95d5b73640fdd3218897873f4238cce46d39bdd2430dd64c1e55d108152a97f59860b8ebcac1c5935193c734a0374a4cf1b28f2e32984c4 WHIRLPOOL 091beb79c9c741eb0314a945d58115aa3220cf67ac6adc12683af90313bfa071d48dce249eb16e7c55787e21c68ff60b938ee2c89f86039fc3f3e448bb72e0db
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
diff --git a/dev-ruby/samuel/samuel-0.3.3-r1.ebuild b/dev-ruby/samuel/samuel-0.3.3-r1.ebuild
index f590dbfd6840..d82fe7856a58 100644
--- a/dev-ruby/samuel/samuel-0.3.3-r1.ebuild
+++ b/dev-ruby/samuel/samuel-0.3.3-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/samuel/samuel-0.3.3-r1.ebuild,v 1.5 2014/08/05 16:00:32 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/samuel/samuel-0.3.3-r1.ebuild,v 1.6 2014/10/30 15:57:38 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 ruby21 jruby"
+USE_RUBY="ruby19 ruby20 ruby21"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
@@ -27,8 +27,6 @@ ruby_add_bdepend "
 		dev-ruby/test-unit:2
 	)"
 
-USE_RUBY=jruby ruby_add_bdepend "test? ( dev-ruby/bouncy-castle-java )"
-
 all_ruby_prepare() {
 	# Remove references to bundler
 	sed -i -e '/[Bb]undler/d' test/test_helper.rb || die
diff --git a/dev-ruby/samuel/samuel-0.3.3.ebuild b/dev-ruby/samuel/samuel-0.3.3.ebuild
deleted file mode 100644
index 9e2a606dd61e..000000000000
--- a/dev-ruby/samuel/samuel-0.3.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/samuel/samuel-0.3.3.ebuild,v 1.7 2014/08/05 16:00:32 mrueg Exp $
-
-EAPI=5
-
-USE_RUBY="ruby19 jruby"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="An automatic logger for HTTP requests in Ruby"
-HOMEPAGE="http://github.com/chrisk/samuel"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE=""
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/shoulda-2.11.3
-		>=dev-ruby/fakeweb-1.3
-		>=dev-ruby/httpclient-2.2.3
-		dev-ruby/mocha:0.12
-	)"
-
-all_ruby_prepare() {
-	# Remove references to bundler
-	sed -i -e '/[Bb]undler/d' test/test_helper.rb || die
-	rm Gemfile*
-
-	# Change the default port from 8000 to 64888 to sidestep Issue #10.
-	# https://github.com/chrisk/samuel/issues/10
-	sed -i -e 's:8000:64888:g' test/*.rb || die
-
-	# Require an old enough version of mocha.
-	sed -i -e '1igem "mocha", "~> 0.12.0"' test/test_helper.rb || die
-}