Cleanup.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x8883FA56A308A8D7!

36 files changed, 134 insertions, 685 deletions

diff --git a/dev-ruby/rack-attack/ChangeLog b/dev-ruby/rack-attack/ChangeLog
index 66f5fc08e354..05b97929699f 100644
--- a/dev-ruby/rack-attack/ChangeLog
+++ b/dev-ruby/rack-attack/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/rack-attack
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack-attack/ChangeLog,v 1.4 2014/10/27 07:06:31 graaff Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack-attack/ChangeLog,v 1.5 2015/03/16 20:21:10 graaff Exp $
+
+  16 Mar 2015; Hans de Graaff <graaff@gentoo.org> -rack-attack-2.3.0.ebuild,
+  -rack-attack-4.1.0.ebuild, -rack-attack-4.1.1.ebuild:
+  Cleanup.
 
 *rack-attack-4.2.0 (27 Oct 2014)
 
diff --git a/dev-ruby/rack-attack/Manifest b/dev-ruby/rack-attack/Manifest
index 057437923b73..b4ca5472aa57 100644
--- a/dev-ruby/rack-attack/Manifest
+++ b/dev-ruby/rack-attack/Manifest
@@ -1,20 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST rack-attack-2.3.0.gem 13312 SHA256 f910e5d0a54b7cc7e086bf111481a0e455260caf8184a33bbb9e96f8064ef49c SHA512 4add5fdf4fbc92a88a7448248df72e755fde7e3a5222ee2df788eb5f2e86689ed2ba925b420ee1873997c11c13ce4f6d5bf1e405a9c42f025ecc731b26490d38 WHIRLPOOL 3ded4c62c5f0058e1f8443c2dd574734e28dfe1021efdcca76afa1dcfdd219b50f975261d4987dafc996771990944c5ad63e59303ffaa3b290c967f1fa5eff7b
-DIST rack-attack-4.1.0.gem 14848 SHA256 6c28ec2cb3e234e75ffe9306e7b75a86c22b9861c03c3ecbb12d38b6f630f5ae SHA512 3e23e48b1c39a9e84c9ba4d10ab71d570690bf37901a3cdf6f46a6df54de5005490523df7f33818f723ab25dcfb1e935e7209d061d66f0f5c48cbdfdbd7dc220 WHIRLPOOL ea25c308a42be5c39983d9507d63301e76a7ff77653d61f1bf97ed813ab5fbc74b644e47660db999898ee072ba2f781b07da3748650018faebec9ca9d9635030
-DIST rack-attack-4.1.1.gem 14848 SHA256 b713eaa3d3377c227c2637398a84978c0ab4021b4b5b2c4dbdbc2b68d448814c SHA512 06bf682b5fbbe3996197d14337963abcf6cfb7f8f1edbcf40f65650508655c92f43ba97189d22394b821acc4fe7cd6b27f70859020632ec6c9c5da04ac8cc807 WHIRLPOOL 8d37a9619f21a29459a7bd745ea0a783a01780da4df766e9657007c1459fcf02a05123296d26ed9da0ffdd3371f1245840b6dd9347794b76bf0ae00d9180e416
 DIST rack-attack-4.2.0.gem 15360 SHA256 f915f0811e32455729b58a1f4359a31a169f6a465ac46e163e573eb4cbca918e SHA512 27a46987d864886ba5f2a2724fb36293f3d7bc6721d1663defaa924bc6e3e17dd3f74b260eb74e0f6ca84a331dfeaea6431d0589b2cb410a51385d96c27cfca9 WHIRLPOOL 136fed76ce46865294f1f0952c564a5799728855166b1f1ef5d96fbea6dc1fa0f76bd3e33e6c3a9c3aa1b3197f00deca09ca153aeb4b1c03764c174eb1905677
-EBUILD rack-attack-2.3.0.ebuild 705 SHA256 088a3c0b8c84e2fec569c039260ef32f9c9ff6b344e576cdf78f0d209a9f94f1 SHA512 bf81d578a73c9ca12d43dfd4835b1bfbe2eadfdc5025f9c1207271c885f8656356a1fab5869255c2be741b4cefd23c2ff0418316032eff7950aae8b56812771b WHIRLPOOL 4ae54227a4fad6002efb1e09dbbb8bab0d391684740212513116fcc4c7439e517cc2473013240050c48c50a19127cefdcee82d260558db25cfe72dc6be04e9cf
-EBUILD rack-attack-4.1.0.ebuild 870 SHA256 b42c4aac94582d8e97e392545191f48b2451f6dcdb09deb61187b60c9a81f82a SHA512 84c6153efc16770e41c7630f672e2b39fba34a7e5e61215ea1627f415436d60974476a755782f6ebed3628a036d8c17da2a6e73ea9a1345fe2d13ea91cb8ca96 WHIRLPOOL a358f85b7fb013049b110b9bbb8635bbdabd5a0aa7cba6046e7373879a280430fb8b6baf48f242ca9a2ca1a8b30e895fc7e435a16e494fb88534f288b33edde9
-EBUILD rack-attack-4.1.1.ebuild 869 SHA256 d7fc67c8dbc499ce8b620232a6302e4fa5f62dbe219f512f0a626d0918f8501c SHA512 7703cda6ed0037f0758c8c4a5904ff58e54ed52fb512ac2273d0623f5cc7368d81a5412a144d87786c7afa3841b2f33776b0c5439d2979348af69c79eb6569d6 WHIRLPOOL a2bf76d7d358ab956eda7a46e38346321d9c680064208bba44b076435139d2e6160032588124372526c25e8a1607f07b01736c205312d8eb130d30bef9fec0d8
 EBUILD rack-attack-4.2.0.ebuild 859 SHA256 7bfc1aa57016fec7140f5d4e1544b1c8169f48bb6d64fb3626797e2427b3e689 SHA512 b71b45d5cf281e7c800fe15b3b3bc3d5f7a55be843ea74cd88f78fe11fe4d737d14644fefaec8d8563ce68580e8e14614c2598961e7577520288ba3520eb0fc8 WHIRLPOOL 3dac66e0ce7fd6500f78163b9d171e4cb7e9e42df2628f08891da49484052cccbaf6aa5ee13cdbc4a14dcd680226af21bfa4e9e598c6bc4eafef8749a8b61e68
-MISC ChangeLog 739 SHA256 a675d64293ed825b8371242fff39fc489632e9e3d82bbae4b23f3c199fc9b4d3 SHA512 d872e1961667321bdb62627227020dec4e678e1bb8d26987683af56f46136cba854628f495d15f43323c20ccfeac09b334c0e31bc9533b672ba9dc471efe8661 WHIRLPOOL dbd027c9b0797ebfd2bef70a4ba8236e89553d85bc5fd52ddd2619a49894ccb1b55aa2290bae2ec67e568b7d057dfabff641fb5d108ef0378694e04b39a4a86d
+MISC ChangeLog 884 SHA256 942ab60ce3829a7dcfd7f083f07b1ddfa8414030c2cb178e7ab1d032806c364a SHA512 8c6fae6a3009d2a4739d72387f8474438e8e3a834111f4f7d78bda28aefe11d3ffcaa4b09c673af9b62ed629fb11007a75fe60f5b952197fc33de4504ef0dd14 WHIRLPOOL cd5924206d509659cf10991000a8ab69703340c69a1df0b23853453ffdcc74514d642b5b698c4fb3888e38405dab5995f0da01351aa8ec8a526e72ca4837efad
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlRN7v0ACgkQiIP6VqMIqNfxMwD/f8dTVapQWqMuztYj7xLkD8o4
-ES1pdMgr/rMPnHtfeYsA/jY2aJ54IwRU5akWiPA18I4WPW+Wr7npkXEIHq466eVg
-=0gzz
+iF4EAREIAAYFAlUHOzgACgkQiIP6VqMIqNex6AD7B/E39jXiD1ZsrpJ2e9qkP6HR
+P8K9SH6hEqbcYCNYv+gBAIojrSLMDLRJu2ZGJEZqd+wPaSCgc9Haf0gGHB9bMqS8
+=eYC+
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/rack-attack/rack-attack-2.3.0.ebuild b/dev-ruby/rack-attack/rack-attack-2.3.0.ebuild
deleted file mode 100644
index 7774d295552c..000000000000
--- a/dev-ruby/rack-attack/rack-attack-2.3.0.ebuild
+++ /dev/null
@@ -1,28 +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/rack-attack/rack-attack-2.3.0.ebuild,v 1.1 2013/11/22 02:22:59 mrueg Exp $
-
-EAPI=5
-USE_RUBY="ruby19"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A DSL for blocking & throttling abusive clients"
-HOMEPAGE="https://github.com/kickstarter/rack-attack"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-ruby_add_rdepend "dev-ruby/rack"
-ruby_add_bdepend "test? ( dev-ruby/activesupport
-	dev-ruby/rack-test
-	dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/d' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/rack-attack/rack-attack-4.1.0.ebuild b/dev-ruby/rack-attack/rack-attack-4.1.0.ebuild
deleted file mode 100644
index d1c9be0eaf40..000000000000
--- a/dev-ruby/rack-attack/rack-attack-4.1.0.ebuild
+++ /dev/null
@@ -1,34 +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/rack-attack/rack-attack-4.1.0.ebuild,v 1.1 2014/05/29 05:45:58 graaff Exp $
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
-
-# Skip integration tests since they require additional unpackaged
-# dependencies and running daemons.
-RUBY_FAKEGEM_TASK_TEST="test:units"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A DSL for blocking & throttling abusive clients"
-HOMEPAGE="https://github.com/kickstarter/rack-attack"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-ruby_add_rdepend "dev-ruby/rack"
-ruby_add_bdepend "test? ( dev-ruby/activesupport
-	dev-ruby/rack-test
-	dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/d' spec/spec_helper.rb || die
-
-	# Remove
-}
diff --git a/dev-ruby/rack-attack/rack-attack-4.1.1.ebuild b/dev-ruby/rack-attack/rack-attack-4.1.1.ebuild
deleted file mode 100644
index e9d1a6e807f3..000000000000
--- a/dev-ruby/rack-attack/rack-attack-4.1.1.ebuild
+++ /dev/null
@@ -1,34 +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/rack-attack/rack-attack-4.1.1.ebuild,v 1.1 2014/09/14 01:48:18 mrueg Exp $
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
-
-# Skip integration tests since they require additional unpackaged
-# dependencies and running daemons.
-RUBY_FAKEGEM_TASK_TEST="test:units"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A DSL for blocking & throttling abusive clients"
-HOMEPAGE="https://github.com/kickstarter/rack-attack"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-ruby_add_rdepend "dev-ruby/rack"
-ruby_add_bdepend "test? ( dev-ruby/activesupport
-	dev-ruby/rack-test
-	dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/d' spec/spec_helper.rb || die
-
-	# Remove
-}
diff --git a/dev-ruby/rack-mount/ChangeLog b/dev-ruby/rack-mount/ChangeLog
index 974e4cc38d18..f71e4d475088 100644
--- a/dev-ruby/rack-mount/ChangeLog
+++ b/dev-ruby/rack-mount/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/rack-mount
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack-mount/ChangeLog,v 1.32 2014/11/10 15:55:20 mrueg Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack-mount/ChangeLog,v 1.33 2015/03/16 20:22:16 graaff Exp $
+
+  16 Mar 2015; Hans de Graaff <graaff@gentoo.org> -rack-mount-0.8.3-r1.ebuild:
+  Cleanup.
 
   10 Nov 2014; Manuel Rüger <mrueg@gentoo.org> rack-mount-0.8.3-r1.ebuild,
   rack-mount-0.8.3-r2.ebuild:
diff --git a/dev-ruby/rack-mount/Manifest b/dev-ruby/rack-mount/Manifest
index 42e9aadfe54a..28c15954ed2d 100644
--- a/dev-ruby/rack-mount/Manifest
+++ b/dev-ruby/rack-mount/Manifest
@@ -1,6 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX rack-mount-fix-ruby20.patch 860 SHA256 1e602478f877fa0565d95382f94bb2d1520ca523dcb359ab4634ce3a0cecc91a SHA512 79a8acc75d2a32c82ef088d1d25a3f868205dd7e0a17b443ddded432161685ca56d67ce013ffa9c05a32c5446adbb3563b5a09beb1f5c44311cd3033f794ad2e WHIRLPOOL 3c69a2830bc1f6af1e0d286b97cf57bcb38a74da2a379886f363cc9a1a3b6c1085213ba2bba7d62abba5c24db6d58df6d7ee552870db70451af437f737d5ca63
 DIST rack-mount-0.8.3.tgz 33944 SHA256 a293b89958502c2804942450743ab622d7dfd17d13e4122dab11ae90545ae364 SHA512 5f1d10b951c967bc4c36a81b5c7dae5c5ec8d5253ee804fa1e1b4446c962fa0882d4c59773bca9373d5eb37a18646aff0a2dff2b1636d3d9126cae0f1e10a638 WHIRLPOOL ee40900e241edd116cf1f2a4fb726ff83c18474176fb4ba8b6b18bcfceacd6df05fde0b8d6fc877f207767bf97dc56ca6897fa2cb681aa6383c2df8fc3122ba8
-EBUILD rack-mount-0.8.3-r1.ebuild 943 SHA256 929ac06961590a7fe7222ec9f763a20745b6570a49629d8e21f4c9b9ddff8435 SHA512 aa5114307a02a8d3e5de6dd84a6a7792257d03cd56e408dd0df26dafb25eaeb6769d8a88d31fc6d548ecfa6fff791dd2a08dcce5066a51562805efe3c099a58f WHIRLPOOL b143048215b0233e736e34c94e9a5a646b10865185a683f7cdf571f5b057b2ee25311d0bdf3fa28e82bda156f04a54b07d59d9faedc4fa1f6602300764b759b3
 EBUILD rack-mount-0.8.3-r2.ebuild 998 SHA256 70046e850e2211dbc9486c5c7f2c52a8488d8e236f19c08b7ecac60d0790ccc8 SHA512 1360f60553a1768cdc06b9f4372a369e1841c4928ec32080a0ddd41bd1888be3dd7ae9ae8e86bcf86138da7a7a86c146e3f575d422d4f95f55e240c246c0de49 WHIRLPOOL 1240160898dad93e69a0b5d7e434266088a13072d31ffcba00f25865b024378673b1e758b1f3f307c4098f00d11162c3339093a7643000419094d60f4b44daba
-MISC ChangeLog 4482 SHA256 eada51163f40bc8a67bc53327c578837e19b96f0728e564d6f73f57db6c628e5 SHA512 6ad160bdf3e8848accae122cec82b8c580553bc5cb5273273eb2cdf07a6b31ef59d6a8c1de4490831694d1459fc3992f3b204f25d9543b9974a70fa102bb94c8 WHIRLPOOL dbc888689550fbe3f4a00d744b106b2bb749968ca72af2545d273fbab32d7327db302890b27d2a1a1c3c08fb5f1eef39fb236f783046e3f67864cd30f47d6199
+MISC ChangeLog 4574 SHA256 aa3cfe2b833c2a916f46f95d8bbe4f99fc8e8a3f7e1bb1ec3d3fc7c59a659528 SHA512 f7acd12b1a62be7af3ae4c549e97d841fef3a2db5e0f5e5b52ac2ab672e0a1324db36232d063665f136588203a669feecaf9e1e6dc19c6fbccb90cf795828c23 WHIRLPOOL 1df93107e695f028e2bd135bf7e3b839f08aac9ea03e2ea206c1fe618fe068f05ddd035bb68391f047e4ea3a053526e91afcdc734ca1bc326ba3ea235a1e6ce8
 MISC metadata.xml 298 SHA256 4433420c9bacb25a180e376175271d9fa41ab158ac71638fb8cccc460370899b SHA512 c0de1df7597e126c9f481ab141bd56eb1469ffa204ef830f59e64529b969a5a43dc0717929741e25b225525f3fdeb524154e4d1fcf7748650f43f50043d902ba WHIRLPOOL 499d9b2cea447555c1d9733c4b7c59f075572e5e799d574cf7482515e04269d13a3f6f72e3ea21e5bcdef92651a913c05ffe62c4bbd1af21f104783a9d0fcd37
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iF4EAREIAAYFAlUHO3kACgkQiIP6VqMIqNfQHgD/awC5fd+PnOkr1zQMLdgHScKk
+iLzKKbOAlOIz94dZV7YA/RwiF2dyyfKPFjQBdGwm8/r/xVNJsIdhM1wZZ/TrPicK
+=NE6y
+-----END PGP SIGNATURE-----
diff --git a/dev-ruby/rack-mount/rack-mount-0.8.3-r1.ebuild b/dev-ruby/rack-mount/rack-mount-0.8.3-r1.ebuild
deleted file mode 100644
index 996c79f0896e..000000000000
--- a/dev-ruby/rack-mount/rack-mount-0.8.3-r1.ebuild
+++ /dev/null
@@ -1,28 +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/rack-mount/rack-mount-0.8.3-r1.ebuild,v 1.4 2014/11/10 15:55:20 mrueg Exp $
-
-EAPI=5
-USE_RUBY="ruby19"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-
-inherit versionator ruby-fakegem
-
-DESCRIPTION="A stackable dynamic tree based Rack router"
-HOMEPAGE="https://github.com/josh/rack-mount"
-SRC_URI="https://github.com/josh/rack-mount/tarball/v${PV} -> ${P}.tgz"
-RUBY_S="josh-${PN}-*"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/rack-1.0.0"
-
-all_ruby_prepare() {
-	# Avoid fragile test depending on hash ordering.
-	sed -i -e '/foo=1&bar=2/ s:^:#:' test/test_utils.rb || die
-}
diff --git a/dev-ruby/rails_autolink/ChangeLog b/dev-ruby/rails_autolink/ChangeLog
index fc3ea8cc19f0..36b5070a97ce 100644
--- a/dev-ruby/rails_autolink/ChangeLog
+++ b/dev-ruby/rails_autolink/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/rails_autolink
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails_autolink/ChangeLog,v 1.7 2014/11/18 13:44:11 mrueg Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails_autolink/ChangeLog,v 1.8 2015/03/16 20:22:49 graaff Exp $
+
+  16 Mar 2015; Hans de Graaff <graaff@gentoo.org> -rails_autolink-1.1.5.ebuild:
+  Cleanup.
 
   18 Nov 2014; Manuel Rüger <mrueg@gentoo.org>
   -files/rails_autolink-1.0.9-fixes.patch:
diff --git a/dev-ruby/rails_autolink/Manifest b/dev-ruby/rails_autolink/Manifest
index 2f4e9c6eed80..6c7334fe5697 100644
--- a/dev-ruby/rails_autolink/Manifest
+++ b/dev-ruby/rails_autolink/Manifest
@@ -1,6 +1,14 @@
-DIST rails_autolink-1.1.5.gem 12800 SHA256 240b2a25bcc2b1da360b570c4209022f7878dfea0f6ff68ddd8fb0a4d324ae52 SHA512 691f400d525f7d834f16887013a2dad6b64528eb853a8e2fa243d683d84a6de8c6c5c9f95b688c79b8365653cfcc42144158849d6ce52fa350355048ed4523d2 WHIRLPOOL a9458f7ab998e008f525c4ba0c89a6d674a5de002b12610fc2135611ca3c9712ea7a749690a510ad46e574e0005428acc863f02055720254a5a93f3be47fa954
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST rails_autolink-1.1.6.gem 13312 SHA256 384c17bee71ca5dc44f49401762f91abb6bc356dd564f380713fc974d2c25671 SHA512 5a9b5c2449a0a69488dbf1de3a87b987b450cfd34b420489a38801d5fcca91a2ac1c6b6b43f2f5699534a9f583a3367452d7e99da3f18619ecc23172949a8b4e WHIRLPOOL 82f51c91595f912908c53a5716a49efc7a686e024a926d29d5427182b6386b96f9294157aa0ca9722ba9f7710bc247cc8dbb9fe23794135db5a955ee705725da
-EBUILD rails_autolink-1.1.5.ebuild 923 SHA256 4bb7328a2237ad358f261723bba30d668153fb990b60b4b093d934d28dc1e06f SHA512 bbe3bd7f1b340ac98b7d7245d023ee7973839d388bad91a3c2bcee1906c90357d1c3bcd68b2293d9f3920770b812dd72d4e7d7f78ac225303cfaccdca441682c WHIRLPOOL f16426dd987aed27dabf918ccf3244e8fc57395babf502b45746405d7626753e858ab85e960ad241966e6e76fedb670b8667865f01c0c082d4404c2eb72dad75
 EBUILD rails_autolink-1.1.6.ebuild 656 SHA256 cc1ce7ac1e677b4e703bc3771ba3dd6d1ab073f10068d810abe0fb8fbbeb95c2 SHA512 326002ad157ac25794653a7d1cf680e34c908c866e2ccea33089c1086d96fa6b1804a89739ca52a1433ea01c8f2fe90a4cb4a62b9d10d8cac66bac1510070b58 WHIRLPOOL 3f3fb16ce41723e86b9ce338b8998cbbe52b1dafa6c05ccb66f9a4045bc4c5a569fff5720ea44212bb90d094faa4e172fd60085b7ded1da9edbaec5608dfe00e
-MISC ChangeLog 1411 SHA256 32b9d0c7a3b4e887f5ad2ed894c193064e8b7bda3c45f693bb602a5eb38f45b0 SHA512 945620256d6193920aedc2fb8a04350b97793ab3fa3d9542c6187968714a914d9b9bc432b43432aff00a4716d8a32a36afa6fe19f3fa4a444d77b6c22026937a WHIRLPOOL 02835c655da46eb986141621ebdbe53ee21bd22cc92546fec395a26662695069ec327ddbfa5ad5d6e0fd129bdf26ea46a18aeda095e157603cb106fab95fac85
+MISC ChangeLog 1504 SHA256 c97f1a0cdf0c422d7ab2b280c32ef7208a200545c2e63d014b9cf7b9a0524c83 SHA512 c58944862c6feb232c3df3d782c4c583d5d594a28fa1ca17b6d414e3038bac173c140fe2770491b04e62f7c0e248b5c8c6abb8b542a8e13404921691b1840732 WHIRLPOOL 25b03bfebf7eb32b2dff5d23ba4dfae370115c0c2b92088ed7c1a1a7d1786463a6033989dc60b4bbd61fc12067966a75f714964d1dd5feb0b9e1b0b3ef230134
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iF0EAREIAAYFAlUHO6oACgkQiIP6VqMIqNf6HAD44tF/R5eIq1sMe1FO1sRKKV6m
+8SP79HvU6QQLV1cifwD/QoLdgwdForcbCELnbYkiJpL/ju0Fd7SNe8LN1u8Qqvs=
+=tA58
+-----END PGP SIGNATURE-----
diff --git a/dev-ruby/rails_autolink/rails_autolink-1.1.5.ebuild b/dev-ruby/rails_autolink/rails_autolink-1.1.5.ebuild
deleted file mode 100644
index 25615872c93b..000000000000
--- a/dev-ruby/rails_autolink/rails_autolink-1.1.5.ebuild
+++ /dev/null
@@ -1,32 +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/rails_autolink/rails_autolink-1.1.5.ebuild,v 1.2 2014/08/05 16:00:32 mrueg Exp $
-
-EAPI=5
-USE_RUBY="ruby19"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="This is an extraction of the auto_link method from rails"
-HOMEPAGE="http://github.com/tenderlove/rails_autolink"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-# Restrict tests since they seem to be tied to very specific rails and
-# test framework versions without making this explicit anywhere. Things
-# seem to work for the most part with Rails 3.2 and Minitest 4.2.
-RESTRICT="test"
-
-ruby_add_bdepend "test? ( dev-ruby/minitest )"
-
-ruby_add_rdepend ">=dev-ruby/rails-3.1"
-
-each_ruby_test() {
-	${RUBY} -Ilib test/test_*.rb || die "tests failed"
-}
diff --git a/dev-ruby/rb-inotify/ChangeLog b/dev-ruby/rb-inotify/ChangeLog
index 070495209322..1b356ec57281 100644
--- a/dev-ruby/rb-inotify/ChangeLog
+++ b/dev-ruby/rb-inotify/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/rb-inotify
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rb-inotify/ChangeLog,v 1.36 2014/12/31 11:28:04 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rb-inotify/ChangeLog,v 1.37 2015/03/16 20:24:43 graaff Exp $
+
+  16 Mar 2015; Hans de Graaff <graaff@gentoo.org> -rb-inotify-0.9.0.ebuild:
+  Cleanup.
 
   31 Dec 2014; Agostino Sarubbo <ago@gentoo.org> rb-inotify-0.9.5.ebuild:
   Stable for x86, wrt bug #523188
diff --git a/dev-ruby/rb-inotify/Manifest b/dev-ruby/rb-inotify/Manifest
index 2d028dbe6796..be2b6f9fae79 100644
--- a/dev-ruby/rb-inotify/Manifest
+++ b/dev-ruby/rb-inotify/Manifest
@@ -1,27 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST rb-inotify-0.9.0.gem 13312 SHA256 3fc925989db3e897e5e0aa9ef89ff511e8485f21cd7a90c2b4f390fcfc581623 SHA512 83d10102e9c3e55a5387f92bf1926ca26da99a3321dff0123f33ac38eb0dfa3fc416ec37abc3ed53ee1a201655a447a8c8e066859b344967c1c09370311c1abe WHIRLPOOL 6f09acb5e6a537854b23d5e6c046ba73a21b940a03bc91d5a2ccff860152e20c3ee8287326254895ab96dece2965c28a906eccd9e5a9d09988e3ecb34d1fc3e2
 DIST rb-inotify-0.9.5.gem 14336 SHA256 69559fc3d790c275b90f55f8c76cde94a999e3400f5a51f2e0d463a0a2e8ad4d SHA512 1ecc0142ed44358a2f51403736533e9854b5fc13cb81b552eb866310b60535b14e2ac6bfb6ee53bc1ee65ac14e51fc5a981e52f843607dbb3d8390c1d6c13e60 WHIRLPOOL 19d7d1f7ca8e65a297de94fae3311c1bc8d9942aa47dc2c92202ce0adb8f04d62ac94f0c51c76a6bd263e773df2481b2337b6576f818cff7bf4fd2ccaa30fd27
-EBUILD rb-inotify-0.9.0.ebuild 1028 SHA256 03db46b83cedc10e6f5597e82a13cd2220c000a3a5f8b6181155b4dec2efe1aa SHA512 5ca7569c6117f70c0f119e2a1cb315da93efdf88fb61e51654c6fd6bbc5d1dc15de6a213324c75634a2e9a545ef8b97805af863c3efc7dd3d9624ae24a57392f WHIRLPOOL 21380b02a2a49a37bb472917c458323fa44db191a7fb2330416cd4903977416a165cafdc3963c2241a7245b0cd007eeb387611d4d7526f62af62235e0bd997ad
 EBUILD rb-inotify-0.9.5-r1.ebuild 1047 SHA256 e7b54b82187830127c31d3bb5ab41999987dba03e430dc18e209e90092660e52 SHA512 e0d9e7026ace6558a925c3c460ee2e923c28b842ecd935c5306fa5d47245e7fad08a4814f93230a4be64b3ad0e8c15c5741bf0786d2eb0017fcacfd85c9f6419 WHIRLPOOL dfe58aa7e570ad0ec8d7922d4e67802ff8462002fad3aa91e78e2aa662cd0fef953aff2afbf1e53e108e5f57fba4014dc345063969809992bbf62f9b0c6f8c56
 EBUILD rb-inotify-0.9.5.ebuild 1033 SHA256 5d9418f21c0a06b9822304ca099b2146d4f58bab91db0b6dc0c3e19c8ed83a70 SHA512 8eb76b72e4c08f19ed48ba754c6e9987287e7179d7b031990550f7dab521e8950200af2cc02ee032088c6344b502080c018bc2913a1193ccd090a1035ba8745f WHIRLPOOL 9243e8b14ecf2833427267bdf33e3a2d816b050e7b5e4bc26b564f95bb32c83496ca5f7b9f9e3a590da062ca270cae8dc32da0985ae0db5ecb96c21825a9d451
-MISC ChangeLog 4800 SHA256 357f335045d1a191a7a0b954cdafdec5d20a9c496e291dd463f5fe17b7e54b4d SHA512 4493248be4fc6017ef26ae62f03af1aed63f1ac31129d90eac724a46bde092c7ae7e64765825d7007ead379967d8eeaada30eae14332fc8352166cd6defb46b9 WHIRLPOOL 6a6a1a54e0b3421fbfca08ec7a191315df320c7856d707dd23fe7382fcdab9702c4e1f90fc0ee3307c792c7f582f5dc5fd5a840494082683441c11104abac29f
+MISC ChangeLog 4891 SHA256 83d4c3a0b89cf10c1096a3eb47735f636691faf5db29eab3cd7f8d941d0c6aa6 SHA512 d4d2600c1315125505ea9af84915c09d702bdf201706f0ece719c681c34846c4e7883d683dd6d7db1cffc3d6ea215061cbccc8729e47531b9d7fb2453573fbe7 WHIRLPOOL 0edddf606593b5aadbed0247f640b5793a0af027e6d833ea940b441e7a9eb742317a6efd7598f7de994a0a56c1d0ff7b6a9acaef7c6bc5abdd1a9939d4976c7d
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUo93FAAoJELp701BxlEWf8CMP/3D06V4d6CexSViBTtWEagRv
-kivCaLMWwVmdti/nQ6/qoI0ma84elrky5nhMgo5N4L4jfs9BR+ycFRmlyGiNAG+D
-sbXOvX7xc1dIsb8rQ9gygkF1gnRDOIhJkEbZRQITsR+RNApepxXRCyOjr3EqkGAt
-+fjZdIT4EeXKiTfXr1H9OIkCTsZpLq/klqOijiNfCartASs4IYlInRKSnR7bSJjn
-wBIitbyRBhUZN/nmwoisz3/agfc7nWPiowXtzagpsOA5W61Lk4lxUbp6Iy0lZ98r
-/dNbkLizR4vUcAGjdkQozgQ9OmqXyyq8iG1o4w7R7y6xBJfQeHzY21/OS6dSc/36
-NIZmrs3zIb7coRFJsnzeypVEweHqGcRZ1YcHAZs7DaTCDDgm/5FLhl9D2IvmILoH
-DwYDzcA5jXWAYwCoXfl3JCVfDr2FG9Wr5iKFbwo8xChnEo4DBth3cjsk52C8n/qF
-jOtM2+hCfstKIXT1AU6P8axe38n91umNZZMzDlmoFcnpAZCz990LhmRXZlpZn4ro
-3ErVZ0oCDHwKp0qCZed4lcQ9UdM5uK+ni0i06uvw1/DVxd205FX3h5cHZ4Tf95qV
-+RaYbAEa70PPtHwVwue7Tq66PPTorJL7aDiKEiH/QLjd5AMphqx8jSXyebnoUa31
-Trud/xTZr7nlfGww0PxJ
-=JC+Q
+iF4EAREIAAYFAlUHPAwACgkQiIP6VqMIqNeg9AEAhMLwOsS4WUXn//Cldf4K2GWh
+0o5ovZr9arIoKL0N3/oA/jKg0LrEfA2/tu77zpvAG75yGbYu481HP9N9NqVFiBZf
+=h23t
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/rb-inotify/rb-inotify-0.9.0.ebuild b/dev-ruby/rb-inotify/rb-inotify-0.9.0.ebuild
deleted file mode 100644
index 912ef8b9fe16..000000000000
--- a/dev-ruby/rb-inotify/rb-inotify-0.9.0.ebuild
+++ /dev/null
@@ -1,39 +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/rb-inotify/rb-inotify-0.9.0.ebuild,v 1.6 2014/11/25 11:27:49 mrueg Exp $
-
-EAPI=5
-
-USE_RUBY="ruby19"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_TASK_DOC="yard"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="VERSION"
-
-RUBY_FAKEGEM_GEMSPEC="rb-inotify.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A thorough inotify wrapper for Ruby using FFI"
-HOMEPAGE="https://github.com/nex3/rb-inotify"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x64-macos"
-IUSE=""
-
-ruby_add_rdepend "virtual/ruby-ffi"
-
-ruby_add_bdepend "doc? ( dev-ruby/yard )"
-
-all_ruby_prepare() {
-	# Avoid unneeded dependency on jeweler.
-	sed -i -e '/:build/ s:^:#:' -e '/module Jeweler/,/^end/ s:^:#:' -e '/class Jeweler/,/^end/ s:^:#:' Rakefile || die
-
-	# Remove mandatory markup processor from yard options, bug 436112.
-	sed -i -e '/maruku/d' .yardopts || die
-}
diff --git a/dev-ruby/rdoc/ChangeLog b/dev-ruby/rdoc/ChangeLog
index 7644a3165b70..22b24d5697d6 100644
--- a/dev-ruby/rdoc/ChangeLog
+++ b/dev-ruby/rdoc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/rdoc
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rdoc/ChangeLog,v 1.133 2015/01/14 07:03:35 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rdoc/ChangeLog,v 1.134 2015/03/16 20:26:39 graaff Exp $
+
+  16 Mar 2015; Hans de Graaff <graaff@gentoo.org> -rdoc-3.12.2.ebuild:
+  Cleanup.
 
 *rdoc-4.1.2-r1 (14 Jan 2015)
 
diff --git a/dev-ruby/rdoc/Manifest b/dev-ruby/rdoc/Manifest
index 828f49efe297..abea9cf520ce 100644
--- a/dev-ruby/rdoc/Manifest
+++ b/dev-ruby/rdoc/Manifest
@@ -3,20 +3,18 @@ Hash: SHA256
 
 AUX rdoc-3.0.1-bin-require.patch 632 SHA256 5b8468ba10d6767620ee6ecad9719f213744c6de207ecab078dd48f96147ad50 SHA512 d8840d320582f1b744597a4a48008508dfcfe7537b24570e977f7e10f1bc6e5955cf9319182d2546db23d96fa31a55320bf54f49d127623c9d9cac9d639c572f WHIRLPOOL d716e4c6ea8da7c52ab20cf52146fd7128f5071f390f25fc66012770c59fa283473fdb9214b942cad789be8df2ed66286617d8f9dd4e3c8d82ffd91d757cc8a7
 AUX rdoc-fix-hash-ordering-tests.patch 3124 SHA256 e28b0f19d7c954f5d49a783a1a8db087256be0523fccd5f5887582ae891d5f45 SHA512 7589a32a0ab1e887feeaa4fc88b21a1cd33bb397a2a9eb64105164783ef9371a75e8a828bb97c0eff9c1b612c4eaecddb61144da43f2844cd4511b669041487f WHIRLPOOL d31b2e9fc096a9f377ec2031826e93c4ce40d3b781f5d686e350df1d20721efeab9f51dd003efcdeb7785c94741be37bebb4932b882211890edd47745756c71f
-DIST rdoc-3.12.2.gem 326144 SHA256 a8e2b78f7e5ec4cc4716cd863975645f2f2377dc6db267a15e427e5fae2633ed SHA512 c0cc99d3ee75bf5ec5bf73a3f89b43ed3915a80b12a6128b0e106c50e93b0b33db6bcd9812b9e2a241978c3a46cc2f05c5b1d9346c321823fc333d53c8d1296c WHIRLPOOL 22fefdc2dd6caca0fb843c82cf98ccdc5f6a4da97af5b65476891799b2e3a133284c8890db1fe9637fe6f508db353f69cfe82b59740fbc14d223bc9577c86c6a
 DIST rdoc-4.0.1.gem 467456 SHA256 b712d56c266a8568362bbebcdc385b102b1494ceea099161c71e02f420d716ba SHA512 11cf6e1700598bd7c414f3ed9d7b75f73bf0f053eb2754d2652bb628e6e47c171646fb420d7b7ee4b589da43fb4b638bc9a2b151ec348c0a20ebaf10f58438c9 WHIRLPOOL 471cd451fd4bc947ad4a29802d66182a21079d444963bb3006fb065175285c71351bfb75c1aaf3d5778e5554c9b5562281037ec38df1c0b159e60dfa368016fd
 DIST rdoc-4.1.2.gem 729600 SHA256 8623c640083f0e06085636a6a719cac993dcccceba5f3f7344ed14c35b941033 SHA512 e2a369cf4cba1ef0e1429bc0ea5a288011559c37f8a1a82de00bb4a423f57799d6b05ec2110209528f17cbfb4eb437cf569a13698f509ad5f17bd1f4cc8939f7 WHIRLPOOL 5e4b7f95d3380e0fcc1ba3ce54dcd91cadb0dd8538651332adb19c873dbb12de3e82b2cd0fffdfab3e2223559627e67642b7d242196416af1dbef269e8d96bca
-EBUILD rdoc-3.12.2.ebuild 2463 SHA256 cb1feec6db1e64d3cfb303216dba50bb91025921c5992de24a31ca789eb0ad6e SHA512 c6bfe52976d5066d6a4628a3145df86b7b4722f523b8f6b6720b6002e2cfb78777aca67437b86580ad4535ace462181d2719eb5ba46074061a2e8bb9edd73a1f WHIRLPOOL 219c310d48d77e19cabf33179aadb760907c7264f20eb9aa323bc7a05aeb93fd5ab1b05974dd0c709841a5354bb43fc825202a441fd7209e5ee37980b349d0d2
 EBUILD rdoc-4.0.1-r1.ebuild 2724 SHA256 e24773a98a299ceb57666d3335db215628bb55580beeefbf1b8858987529216e SHA512 bf2bc139188ae24040d4864abfa8e18daa0d4c67a970e605ab3b254b6cb31f9614165dfde2cd6e4f9ef45fd92f60bdb6ea4245b45a6f1a4e8c0091510c9f07e7 WHIRLPOOL cd46782a3ba6f7d67e13158b98e714542b5d656683bb2b9c4703347edf630ffac38b979a0b43ad67ac7fa64b6fc2e28e6a85697246ba460aa5e32febc8605d85
 EBUILD rdoc-4.0.1-r2.ebuild 2692 SHA256 ea46692712d90c891070c7f4c76a262ae0fe937ac3cbcde1836c815d7f6d3ee4 SHA512 cd9359e5eb6fdbd189641afbfb63d7f19690b09d3c5688c5f3d564c603415c39705cd9fa87509041087710c20a3e0611cf047fd15dcf3645e72e7585470db7d9 WHIRLPOOL 5212d28b8d1faaf1ef8a2b5a46b976db656f383d74793e91dc76683b1b5d57255ba6d667ef2a9dded1cb3a9102402dd7ecb76e5a83a9913a36fd77be28f672d4
 EBUILD rdoc-4.1.2-r1.ebuild 2794 SHA256 0a4229b4e1c000eb68fb02d16c413656fd433929007c0c1c43bcd1c63a2a1238 SHA512 8c90d89494c733b16c67e7c7018c8a1b4d9f97cfb9c603c125ea0bc3c5f595be850d7cd43dc4c8b7cc11a25ec813974138b46092d5d9d61ea7cbfc61e720d0ac WHIRLPOOL 6b34369231378cd88c19f0c2cbc11894c86a7bc25d5e7225fa34a31beb478ac4da6888fbe1d6a68618bd912ad3f39425d20c798d839359627800878ef5540130
 EBUILD rdoc-4.1.2.ebuild 2901 SHA256 2b30e0be7c9e60c85fa5ed74d9c819c53ff7f884855ca4c8e4368295e5a93c23 SHA512 dcfc7cedf7715d1ad5d59cbd08c10b2e98f61bd18b2602b19e1790b1bb04c3b9758c1b8a7c129dedd4e36e7d33be45d3bdacc9cfe3d58ac795eb64bd8a92c4bb WHIRLPOOL f9b78ffead97ca32348d09dd9e9051e188b5f9b06763ffcb4327501fd1747a97d31ecff5d7b158c5d386316fc4dd1fcfaa7393ad348532f625a827b675d477b6
-MISC ChangeLog 374 SHA256 f0e3f4ce0e423eba47c96e234b027618447a8de0e12600d7a5defa0d1d0bdbfe SHA512 eaa61f3339f02f6e8ba071d953b352b312e70b62e5b12f0e5e3b5315c4bb1b4f97d294c19a878ecb16e18c534e6e49942451ad137a0c3b826a3c796e5d832573 WHIRLPOOL 443156b46e0f05da04444b7ae3ecffd688af034f8f1f9372a70fb80f1d9780b61a7445f79e4ea82d8177fdb648cbb5431d04a2fcf240f337800f5813451fd7c8
+MISC ChangeLog 457 SHA256 c46a1c399891518d6b91d93565f9d6f3cbd8d943d2fdc6b6da152f5a0fd83498 SHA512 aec303564e01d2010bede04b26f8d70b5d64c5e9a6508d948862b5d01bb68c346497ab135b01fe94314caa3b032f4c325849db56b5b7d94759e3a8f092ac3248 WHIRLPOOL a5ee2eeb82773dcb879defdd639f06744c7cae576a38bb6f01137869b2cce9fffdd896f729a20bea063fa874c84dd8e8913360362c9b7a2e44ca18a79795b7d6
 MISC metadata.xml 230 SHA256 a04255553b410ad36340c3a47e4f30304c388b503b27c07c3e6f9bbdc9dbbd54 SHA512 c1c7fd9d06fc087b6bca6119547401ab5c9a752ce6a3981ab8a3531033332bdf4a176cfe455f130c3157f0a9757ab5250cc99bf600151e83f09c201c1a1b4e46 WHIRLPOOL f1aa7788f09e4d730668da22d38c1ccbfb8f72cd601d66c53ca3ca5af779c01578232332d37ffe74fa6529426e5d7517e2612bcc83d46133aea00b86db2f2ad7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlS2FMgACgkQiIP6VqMIqNcaWQEAkuh9yWgLFIqN4BcZJy6L2XoC
-8XxsJXgEuTte4XJqAYIA/3HG5I4D0/7O8qVFcG6s46rstCv7MvqFXzFgt/u4zFSl
-=3qoU
+iF4EAREIAAYFAlUHPIAACgkQiIP6VqMIqNceBwD/RBabFSl1Wq5pi4tI/oux+SZn
+guwUJvThx1qPn9rVAAEA/33xzvI5z7IoYxkRp15sp6KZwXUDwR/7o8niiY4Rq3jD
+=MmVG
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/rdoc/rdoc-3.12.2.ebuild b/dev-ruby/rdoc/rdoc-3.12.2.ebuild
deleted file mode 100644
index 493865ef5f8b..000000000000
--- a/dev-ruby/rdoc/rdoc-3.12.2.ebuild
+++ /dev/null
@@ -1,82 +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/rdoc/rdoc-3.12.2.ebuild,v 1.15 2014/11/26 02:00:24 mrueg Exp $
-
-EAPI=5
-USE_RUBY="ruby19"
-
-RUBY_FAKEGEM_TASK_DOC="docs"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc RI.rdoc TODO.rdoc"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eutils
-
-DESCRIPTION="An extended version of the RDoc library from Ruby 1.8"
-HOMEPAGE="https://github.com/rdoc/rdoc/"
-
-LICENSE="Ruby MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "
-	dev-ruby/racc
-	doc? ( >=dev-ruby/hoe-2.7.0 )
-	test? (
-		>=dev-ruby/hoe-2.7.0
-		dev-ruby/minitest
-	)"
-
-ruby_add_rdepend "=dev-ruby/json-1* >=dev-ruby/json-1.4"
-
-# This ebuild replaces rdoc in ruby-1.9.2 and later.
-# ruby 1.8.6 is no longer supported.
-RDEPEND="${RDEPEND}
-	ruby_targets_ruby19? (
-		>=dev-lang/ruby-1.9.2:1.9
-	)"
-
-all_ruby_prepare() {
-	# Other packages also have use for a nonexistent directory, bug 321059
-	sed -i -e 's#/nonexistent#/nonexistent_rdoc_tests#g' test/test_rdoc*.rb || die
-
-	# Remove unavailable and unneeded isolate plugin for Hoe
-	sed -i -e '/isolate/d' Rakefile || die
-
-	epatch "${FILESDIR}/${PN}-3.0.1-bin-require.patch"
-	epatch "${FILESDIR}/${PN}-fix-hash-ordering-tests.patch"
-
-	# Remove test that is depending on the locale, which we can't garantuee.
-	sed -i -e '/def test_encode_with/,/^  end/ s:^:#:' test/test_rdoc_options.rb || die
-
-	# Remove test depending on FEATURES=userpriv, bug 361959
-	sed -i -e '/def test_check_files/,/^  end/ s:^:#:' test/test_rdoc_options.rb || die
-
-	# Avoid the generate rule since it doesn't work on jruby, see below.
-	sed -i -e '/:generate/d' Rakefile || die
-}
-
-each_ruby_compile() {
-	# Generate the file inline here since the Rakefile confuses jruby
-	# into a circular dependency.
-	for file in lib/rdoc/rd/block_parser lib/rdoc/rd/inline_parser ; do
-		${RUBY} -S racc -l -o ${file}.rb ${file}.ry || die
-	done
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	for bin in rdoc ri; do
-		ruby_fakegem_binwrapper $bin /usr/bin/$bin-2
-
-		if use ruby_targets_ruby19; then
-			ruby_fakegem_binwrapper $bin /usr/bin/${bin}19
-			sed -i -e "1s/env ruby/ruby19/" \
-				"${ED}/usr/bin/${bin}19" || die
-		fi
-	done
-}
diff --git a/dev-ruby/redcarpet/ChangeLog b/dev-ruby/redcarpet/ChangeLog
index 077a180cfcb6..e81e71e83166 100644
--- a/dev-ruby/redcarpet/ChangeLog
+++ b/dev-ruby/redcarpet/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/redcarpet
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/redcarpet/ChangeLog,v 1.20 2014/12/08 21:54:41 mrueg Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/redcarpet/ChangeLog,v 1.21 2015/03/16 20:28:47 graaff Exp $
+
+  16 Mar 2015; Hans de Graaff <graaff@gentoo.org> -redcarpet-2.3.0.ebuild:
+  Cleanup.
 
 *redcarpet-3.2.2 (07 Dec 2014)
 
diff --git a/dev-ruby/redcarpet/Manifest b/dev-ruby/redcarpet/Manifest
index 0b449384923c..2daf526e8e08 100644
--- a/dev-ruby/redcarpet/Manifest
+++ b/dev-ruby/redcarpet/Manifest
@@ -1,9 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST redcarpet-2.3.0.tar.gz 93355 SHA256 e9f614c28c64bc87f452b0f0d892f43f4f92cceac223bae6b1d378acd3608905 SHA512 41ee359a06238d62cf0bb023f74c68b4c9811edb11e61b2c469742f1462f782a8d265d4191391e43e036924265e29aba3a277d0d1237bcf2733f77fd269c73e6 WHIRLPOOL 18d2ec1696c030dd4fcf413cbdca977e2412d6d7eeb53a266c0c09f9689f707be4e181af6b16101155af9cee613c884e82636cbd894c4a7cc8da73292ea19b70
 DIST redcarpet-3.1.2.tar.gz 98483 SHA256 021e715c34caa6e23281687d3e6c6fdb9deeab3bb34700f2c659c9d5bc501f9d SHA512 99d0c639226e7f36ab32dde466522944921e450d34347751e2c9183cc83487db9530bc4f2533ea7c99ea0766f854893246546e1cb7924cf022a347d1edc71342 WHIRLPOOL a38af917c228696219309db53678d7543caafd4a5326f5eb991eeed7e6dc40204aa35450bc8fdcff31dc30c8cb74eb09715a050e40ec420e6251c202d39cc2de
 DIST redcarpet-3.2.2.tar.gz 100046 SHA256 1b5a1e90376dd4fa2f791fdbb03e84ea97d6f2b1dd224d52aa753f8d45fd3476 SHA512 2658a00d396133a959338a16a3fa4cdcc3195a750bdf03f29154ffddbf2e04b63d103a80ea0f0f63ca4f8e455fc6a3e28d39d1c84fecc18c7ea097e0fb9047d9 WHIRLPOOL e2075ad029f7a187e598391b02746b3c87d3ac94a4c7454209d83ad6277bd75cc1d586a36324ba3837911c51c961b055980e1280e43fe04c06a54f373e01e8e0
 EBUILD redcarpet-2.3.0-r1.ebuild 968 SHA256 22e89bbf492075d3e0dfdc073fa0226985b33a327c3b02acc339fa4e4f5ffe88 SHA512 0668c5a00e9dfcd9a4366ddefac48601a59a29e1623662dea1c1d3e6ebaf0c8d4cd6b40ee0217159559e1a7e7c302f0870af0e0fe47561baa5949252a0079e79 WHIRLPOOL 1960041d49a6b7014ccf049260bac28762888cfcfd92f54e71d0380b150e3b34f69cb6569339ced321fa6019d677e1ecb7174d57f1ef891e670a042bde276dde
-EBUILD redcarpet-2.3.0.ebuild 958 SHA256 389f213df1458463d82b0b25e04a7d786c8c4fd9318e32cd62bb52c3be8b2e29 SHA512 3eb5d9215f9900ae200e2acd7ed51eb0fb62084176d388102811d881ac550775fcc098d7e27757f2a5db8c4c27db1d77764cb6ce4e6fb45322806cb1810bb8ef WHIRLPOOL b2fd9d6838aa8377ee86f5443be6c47299ef38f64cf566e88ab4dbb00dc4124efd637b44b9f4517f6f652c9874715d1015a57b6c9f5dc87bdf95958bb810368f
 EBUILD redcarpet-3.1.2.ebuild 970 SHA256 92c50d17bf57fad0d069e22115da6d7b63953f58c4fd914f448624dfa9900cd0 SHA512 9be60aacc21888050fe238366368bd7cada5e1e27687d8be028d9310a001a372b33a780a1e454277ef452118faea0f5f64f5c31776c00e8e2cb4582178751a4c WHIRLPOOL 108c0d18698d721d688ad153fcc208f9250ce82fee73bf93e96793e237efc2b2fe4e7c6ff3585d2fc0f3f7aff4ebb0f9424c6c3a12ed95db6a4c2af86b6a5a8d
 EBUILD redcarpet-3.2.2.ebuild 970 SHA256 6428fed0ab1e3db35653d622cf75f62c4071628094bafd6c3b4fa8b791163bb4 SHA512 e6cc1b0f24a5656e9aef927a65411f93f22f3f3e5217c03a2d30b0017ea571eec101e0301b2922e3c4d963d089565d71195800bef5859199d7796328a65e94a2 WHIRLPOOL 64a427277e1b3530f5fe838d12fd4f16ad3ec6a21e5b5f0706f321732401baae808df2147b2bf324451e752da8202de2a459153c92b75db0b1805ad721a2115f
-MISC ChangeLog 2851 SHA256 7f67915276a03ae49058616db1dad5c4bf33009b7e7e92d6c574f41d459aa822 SHA512 c9918b34997bb5028f0ccc6800269079cb8e71de1773c0750cc6aa20fafa131a08f9aa69bc0a7fb359a32a918fbd93989c8a8d44bfebc6b9ef0bba1d661ec8a3 WHIRLPOOL 3e2f03d8e4fe548e0a77ac3af5ddec841addde6cd5cd7540f3550aba500cbcdbe7a8d3e5c40d527e777302366ceb79389a0e4c62ad93c69521bf2602d4c40347
+MISC ChangeLog 2939 SHA256 615292a273ae8c08da8be57dd30faad515ebb999fb28f306eeb9730f6fc87a14 SHA512 2a968ebe0e8394235e49cb08c9833a850da68185851dd42ce6f06cc7e358fb8ccbb2a5d38028805de9cbfee57ebf89071cc3cf1a804bcdb5e8934e76e4764891 WHIRLPOOL 2a51605d3b421a55157a092b01e2d49f4fa5ca4265e79a02ac089912967da1a53fb7edff4023e41a70a654363a4bfd397ed35272e92f59b5731feec96883fb55
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iF4EAREIAAYFAlUHPQAACgkQiIP6VqMIqNcoaAD/TH7CcaMhWNWRGDurJaP5QsxN
+E9cGjRVF+nWMl+Led78A/3A6/IJv5DC24vuoPFPPRd81AOHTtD0k4p2bfQpC44PI
+=oeV+
+-----END PGP SIGNATURE-----
diff --git a/dev-ruby/redcarpet/redcarpet-2.3.0.ebuild b/dev-ruby/redcarpet/redcarpet-2.3.0.ebuild
deleted file mode 100644
index 12ba521c6fd0..000000000000
--- a/dev-ruby/redcarpet/redcarpet-2.3.0.ebuild
+++ /dev/null
@@ -1,36 +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/redcarpet/redcarpet-2.3.0.ebuild,v 1.5 2014/08/05 16:00:32 mrueg Exp $
-
-EAPI=5
-USE_RUBY="ruby19"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOCS="README.markdown CONTRIBUTING.md CHANGELOG.md doc"
-RUBY_FAKEGEM_TASK_TEST="test:unit"
-
-inherit multilib ruby-fakegem
-
-SRC_URI="https://github.com/vmg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="A Ruby wrapper for Upskirt"
-HOMEPAGE="https://github.com/vmg/redcarpet"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	# Remove test depending on compile, since we handle compilation
-	# directly.
-	sed -i -e 's/=> :compile//' tasks/testing.rake || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/redcarpet extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/${PN}
-	cp ext/${PN}/*$(get_modname) lib || die
-}
diff --git a/dev-ruby/redcloth/ChangeLog b/dev-ruby/redcloth/ChangeLog
index c23a50beb8eb..677480588ddc 100644
--- a/dev-ruby/redcloth/ChangeLog
+++ b/dev-ruby/redcloth/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/redcloth
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/redcloth/ChangeLog,v 1.98 2015/02/21 09:31:22 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/redcloth/ChangeLog,v 1.99 2015/03/16 20:29:52 graaff Exp $
+
+  16 Mar 2015; Hans de Graaff <graaff@gentoo.org> -redcloth-4.2.9.ebuild:
+  Cleanup.
 
   21 Feb 2015; Hans de Graaff <graaff@gentoo.org> redcloth-4.2.9-r2.ebuild:
   Add ruby22.
diff --git a/dev-ruby/redcloth/Manifest b/dev-ruby/redcloth/Manifest
index 14d3a5d182b3..abc13616ca43 100644
--- a/dev-ruby/redcloth/Manifest
+++ b/dev-ruby/redcloth/Manifest
@@ -4,13 +4,12 @@ Hash: SHA256
 DIST RedCloth-git-4.2.9.tgz 96897 SHA256 e649f46a58b949c6d229714c25b747f331b4a5b887eaa65ac43eab1f39067e6c SHA512 646f7a1a88ab9b3ff078016df706a1c9d991bf21d86ef1dd4c0a0ee6b946f94276b52499218bca222461eb003510e84b81f44b08899c5b36ac115137193e968a WHIRLPOOL 4276714eb34ec2571544ff271698f1e6540ac62d51704c4216d19452be0b59d1da3014b7c290204b9ca42d5edd88094f1de79618d3bbf8d4f8ae5fb214ecca63
 EBUILD redcloth-4.2.9-r1.ebuild 1746 SHA256 4d6527ebb1b625d8526097b6dc663b01e8aab19189d264e16f3ac72e2ab67219 SHA512 44a9065ab5ff392db6546402966a347d2e0c674128447a2228434efceb065cb7d17b82bf4f5404a35a3e0f37d0bac8820aecd80e3dab9f181f739c5789919816 WHIRLPOOL a5e088776fd39795fade0f4b900dab31d7141f2ca19ee9b1ea58025692a196d1e1b5436cf79dc42a67882359709927c6c655a2d9bc345cace57cc93b87974b22
 EBUILD redcloth-4.2.9-r2.ebuild 1612 SHA256 a6b5e108279668acaf30aa5c43fbfdae5742453c1e1f980191351b08018c9add SHA512 0fbfbe8e94d562f48c0545f9229b548ff760408208aee58b5bfa106c2a43481bda295b68ca06deff3df142df64d094b60478c0bbaf0a88d3bbe5b76dfa812b08 WHIRLPOOL 0cb6203339e081b51c740782f9094d39356f8d6268ba92e8e555b8477a758118a0cf517f23c0dba1b8f6029c0fca89c65823a84aae95f15f6771325e748d05a7
-EBUILD redcloth-4.2.9.ebuild 1738 SHA256 3f1da03a8d7bc629903d9addcc68e0ea0509f13bee405086e26e648d224e19f4 SHA512 d9da60cb4b80fb675826f5e116e72f58ed3718bdbc10500db1c0e25ce7637cf167c8ec1dd18430181b470c387c5d3613e0aa4ab29f0578a53e1aeab3886cd307 WHIRLPOOL 6e58b3b383e52820e06a7d5db59da50642ed51061e9bc8e41ec59bcbbc72705980c1537735c409bfa4ca526dc0e881fe2a4fa88ca3f0f173fb3504b09104fcf5
-MISC ChangeLog 12687 SHA256 9f0a93f56509e4474eb5d82a21dee9d5ba2ddc292dcc61cfb68d4e36335d337d SHA512 af2d88c0b1b68b0e3bb18b928b0139ab86d3c6a0d592aa60a8e7dbed7ba7e6868581d946344aa8ad7a2457290541600de65113e8e6a6edf7830a1d57986af909 WHIRLPOOL 9af507021d428edb304427b58270f3b0c6ba195b5ac478232dc5c7016761731596705d0ce93efa627e6693fce54bd04204f07f3c35292b1a9c3644f9c42d98f3
+MISC ChangeLog 12773 SHA256 2a4338f1f1d75873b7e51b8b593ed1acd3399e0a046a6a45568d7e00ff338eaf SHA512 edb8b63288511dfbf380a0f66ee0ff427900687eddc435e33a960c613c77b2a94746e92daa7075d0dcf57e27abba1619ee90d2641865d37bb17aba7367dc9359 WHIRLPOOL 517260e8ce7bbeab3845a399cdb11f684e6dfa5658d974e561be2be321e89565e8117b592d22462cb20c27fded5494948108ff3a430c1a14932503a0c20dd4bf
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlToUG8ACgkQiIP6VqMIqNdk5gD+JOH4FhjWjGm5tlLTY7S6jCJz
-CSlgGwrMYMos+ddIhkUA/jD0JvVR302wiMp8sMdDFoEjPdHMqe006QOzNhPzRCZ/
-=zi8L
+iF4EAREIAAYFAlUHPUEACgkQiIP6VqMIqNcECAD/W1yfwVCQqvO/We2y1u6YhFGL
+2dxRoyy92lekhFqMXsYA/A9K5Lvpz/l5pstg8tRwwtTAoCVqn1b+E5yXdbP8kqqM
+=ZtVI
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/redcloth/redcloth-4.2.9.ebuild b/dev-ruby/redcloth/redcloth-4.2.9.ebuild
deleted file mode 100644
index 50512febeed3..000000000000
--- a/dev-ruby/redcloth/redcloth-4.2.9.ebuild
+++ /dev/null
@@ -1,61 +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/redcloth/redcloth-4.2.9.ebuild,v 1.15 2014/05/07 19:14:15 mrueg Exp $
-
-EAPI=4
-
-# jruby → tests still fail with UTF-8 characters
-# http://jgarber.lighthouseapp.com/projects/13054/tickets/149-redcloth-4-doesnt-support-multi-bytes-content
-USE_RUBY="ruby19"
-
-RUBY_FAKEGEM_NAME="RedCloth"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_EXTRADOC="README.rdoc CHANGELOG"
-
-RUBY_FAKEGEM_REQUIRE_PATHS="lib/case_sensitive_require"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="A module for using Textile in Ruby"
-HOMEPAGE="http://redcloth.org/"
-
-GITHUB_USER=jgarber
-SRC_URI="https://github.com/${GITHUB_USER}/redcloth/tarball/v${PV} -> ${RUBY_FAKEGEM_NAME}-git-${PV}.tgz"
-RUBY_S="${GITHUB_USER}-${PN}-*"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND+=" dev-util/ragel"
-
-ruby_add_bdepend "
-	>=dev-ruby/rake-0.8.7
-	>=dev-ruby/rake-compiler-0.7.1
-	test? ( >=dev-ruby/diff-lcs-1.1.2 )"
-
-pkg_setup() {
-	ruby-ng_pkg_setup
-
-	# Export the VERBOSE variable to avoid remapping of stdout and
-	# stderr, and that breaks because of bad interactions between
-	# echoe, Ruby and Gentoo.
-	export VERBOSE=1
-}
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undler/d' Rakefile ${PN}.gemspec || die
-	rm tasks/{release,gems,rspec}.rake || die
-}
-
-each_ruby_compile() {
-	# We cannot run this manually easily, because Ragel re-generation
-	# is a mess
-	${RUBY} -S rake compile || die "rake compile failed"
-}
diff --git a/dev-ruby/rjb/ChangeLog b/dev-ruby/rjb/ChangeLog
index 9027e4c6d0c2..82404b9b7c9c 100644
--- a/dev-ruby/rjb/ChangeLog
+++ b/dev-ruby/rjb/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/rjb
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rjb/ChangeLog,v 1.4 2014/04/25 05:36:25 graaff Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rjb/ChangeLog,v 1.5 2015/03/16 20:30:41 graaff Exp $
+
+  16 Mar 2015; Hans de Graaff <graaff@gentoo.org> -rjb-1.4.8.ebuild:
+  Cleanup.
 
 *rjb-1.4.9 (25 Apr 2014)
 
diff --git a/dev-ruby/rjb/Manifest b/dev-ruby/rjb/Manifest
index b3b5f8b78866..8db7cc1a9519 100644
--- a/dev-ruby/rjb/Manifest
+++ b/dev-ruby/rjb/Manifest
@@ -1,16 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST rjb-1.4.8.gem 67584 SHA256 3c5295fd2f552b1f5a42caa27552ca4dc330d63cfbc05194e412adaeb426fa1a SHA512 1b06f5aef03e8a7852aa6e09b518521b791f9d0fbdda9971877812adb7cfb91d61d9aee84862368c0697eb42796c252abc0bf67218a7ebaa1df58cf72b9c290d WHIRLPOOL 4744d58573c003920d015e5189fd277bf70d32c2e02a63accf95e053469af39d9cb89626e14514adba0dca8373d5f8711baf1d62ac4020cf5d3c286f31598043
 DIST rjb-1.4.9.gem 68608 SHA256 df835dda3c11b805f1c6550b0531860ad94efa5affdb4454333f9acfe53a4e18 SHA512 718776b599dfd59bbb889caa69ffc32284848a1d7848c7db6e384b7c05e11eff48f8d94f918c9c98f84f94e9c7f6008dcc3ff62a56c30eea83f4efe1602677f7 WHIRLPOOL b3abf6dd4311ea8d6f4b0d0dcf17aadc8f0be14e39e990e2eb998050f7155a4168740a38df784cee6d20f79e18196805694b1c3a656842612abedaa87d3ef1a3
-EBUILD rjb-1.4.8.ebuild 1576 SHA256 3f8f4a82bb3f9c819578a22d40763b4e4af2226ab161ef040a177e9bf482521d SHA512 566ecef7748e3fd74233b4a76241dbccd36d7c46a8c0aff83be0ca2a155ea638ed1585c2acf5562735a6d855641b19dcc57a4eb3046050c9b9e9d099d7d9b4d5 WHIRLPOOL 12cf9f20ae804575a2736c873be5631dcc1b5b5efac7121f9c299c134774955b24e4fefeccb6ecab45cf17b5e5c61b77f2b8814eb1ba5e37d3ceedd0e8b18fb1
 EBUILD rjb-1.4.9.ebuild 1872 SHA256 ccc795874af5656dfb5f16ddd64f0b40e41a86c28c9b642d6510be4a8a84f501 SHA512 8f281b024dcf8881e5ef9d85918f82d649cd5b545056a2e28041e05fd78463f297219cc0e94d370967c8e661398053c5e06ff8cc50cc567da52c90187d6f580b WHIRLPOOL b1acf82aca8943d744504c0d4f380b7558db5412bf8d2d9b8abdb881a3163bb219c06a31004d292c0cff81e05911b7cfb87426d8a47335ddd0dc97eec245933c
-MISC ChangeLog 843 SHA256 c06454cf1eb70c8edb5ceca5f12bc16503d264fe399a0fc7c822541a15c7f899 SHA512 61af7b5fe9ecba05fd6a18b10fb45a79c52f5a6c7ccaf516d5eb039b9d34999d796f52e4ad444f6f3239576a8efa1beee70700b90750349bf72a46086c78c6a3 WHIRLPOOL 87fba47fdb939848ef98ebb77532c3a7d64b7d164d180532a9152bedc30ee579baff9d01c070fad7024aa0a42bda5988e405f42022fb34b9c42aa1c11bd254ad
+MISC ChangeLog 924 SHA256 fc64510882dab8feac3e51c8e8a9b9caaa4bc878922f9c8b74d75f200676a598 SHA512 85e0f3cf3d7415cdbf58100e80b2b24170bd0f916b571f384b017eee3becccabfc6337823516015a3ca79ee226447bb9113b955e5df60678d9a690a7ee28fde0 WHIRLPOOL fa8440c0ba86711d5d8b09c5373aa0f8f33412486b6f481b7de573ffa05195cc5833348e12056232cb408754197522f1f244fbf668a1a828ec00d2830f870ad9
 MISC metadata.xml 292 SHA256 cb7bc08e56161cfd708e9e743a5792b5d7793847c2e8b94506cc372281fd6dc6 SHA512 b1f870f4f237affb1473f6d4bfcb870143365e564d8be3ed8ca39a72cc16896f545ef7b97e606b2a39e0fc4161e5ff4512cc0c27186cc12e017d65aebf3edb3c WHIRLPOOL 2d526ce30fb6f82eff831ae6effcec383371d14c57be74b529577123475864e370e7d4b0541c4e88dfc5a2a4cdac58fee3fe8d947b564da84925d12a265ca318
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iF4EAREIAAYFAlNZ9FoACgkQiIP6VqMIqNfvjQD9EHxWqARIxUyvQ38t2JFdNvGw
-J5xwf/CSDGdC3Pnbzi8A/0FuSjQ/tn0KQkuM1EFbDcPii/S9ohQIzxIveAYplNUb
-=QMPp
+iF4EAREIAAYFAlUHPXIACgkQiIP6VqMIqNeIUAD/bgTVQtdTboThHCIjdy7aFZ4b
+K6DjXp0crNUIBzWx64gA/2bf8/nT9wKdRfLwiR8M6MnWNYOijBxUVChTbfAchMGJ
+=Ihid
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/rjb/rjb-1.4.8.ebuild b/dev-ruby/rjb/rjb-1.4.8.ebuild
deleted file mode 100644
index 16c97696a9a5..000000000000
--- a/dev-ruby/rjb/rjb-1.4.8.ebuild
+++ /dev/null
@@ -1,65 +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/rjb/rjb-1.4.8.ebuild,v 1.1 2013/12/22 15:42:14 mrueg Exp $
-
-EAPI=5
-
-USE_RUBY="ruby19"
-
-RUBY_FAKEGEM_EXTRADOC="readme.txt ChangeLog"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit java-pkg-2 ruby-ng ruby-fakegem
-
-DESCRIPTION="Rjb is a Ruby-Java software bridge"
-HOMEPAGE="http://rjb.rubyforge.org/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples hardened"
-
-DEPEND=">=virtual/jdk-1.5
-	hardened? ( sys-apps/paxctl )"
-RDEPEND="virtual/jre"
-
-pkg_setup() {
-	ruby-ng_pkg_setup
-	java-pkg-2_pkg_setup
-}
-
-each_ruby_prepare() {
-	#dev-lang/ruby might need the "hardened" flag to enforce the following:
-	if use hardened; then
-		paxctl -v /usr/bin/ruby 2>/dev/null | grep MPROTECT | grep disabled || ewarn '!!! rjb may only work if ruby is MPROTECT disabled, but not really sure\n  please disable it if required using paxctl -m /usr/bin/ruby'
-	fi
-	# force compilation of class file for our JVM
-	rm -rf data
-}
-
-each_ruby_configure() {
-	${RUBY} -C ext extconf.rb || die "extconf.rb failed"
-}
-
-each_ruby_compile() {
-	emake V=1 -C ext CFLAGS="${CFLAGS} -fPIC" archflags="${LDFLAGS}"
-}
-
-each_ruby_install() {
-	each_fakegem_install
-
-	# currently no elegant way to do this (bug #352765)
-	ruby_fakegem_newins ext/rjbcore.so lib/rjbcore.so
-
-	ruby_fakegem_doins -r data
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r samples
-	fi
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:ext test/test.rb || die
-}
diff --git a/dev-ruby/rspec-rails/ChangeLog b/dev-ruby/rspec-rails/ChangeLog
index 47b46706565e..b8016044ebab 100644
--- a/dev-ruby/rspec-rails/ChangeLog
+++ b/dev-ruby/rspec-rails/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/rspec-rails
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-rails/ChangeLog,v 1.84 2015/03/13 12:40:01 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-rails/ChangeLog,v 1.85 2015/03/16 20:32:05 graaff Exp $
+
+  16 Mar 2015; Hans de Graaff <graaff@gentoo.org> -rspec-rails-2.14.0.ebuild:
+  Cleanup.
 
   13 Mar 2015; Patrick Lauer <patrick@gentoo.org> rspec-rails-3.2.0.ebuild:
   Keyword for x86, needed as dependency of dev-ruby/ammeter
diff --git a/dev-ruby/rspec-rails/Manifest b/dev-ruby/rspec-rails/Manifest
index 87c22550adaa..abae20836050 100644
--- a/dev-ruby/rspec-rails/Manifest
+++ b/dev-ruby/rspec-rails/Manifest
@@ -1,12 +1,20 @@
-DIST rspec-rails-2.14.0.tar.gz 73130 SHA256 18a5b8f8cad6a8437c51440c115a416e042a3627b7d126be30d9b3f2718173dc SHA512 97766f303cbd8e4b27ae5e7c1770fc3b1e1bde3cdb7083ccac4f56a90a3d9c0189af309d35335f9bc878a977b71c2a258e1b533bb203e86baebced96ff1754e8 WHIRLPOOL f25d11322be024b380a8fc6210f1769ac6aa9000662bfc2f497bd6c2283218c8b984411d5394cb39fa8c9d0979a028281a4aaaae3a1140eb7783081a92902b32
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST rspec-rails-2.14.2.tar.gz 75049 SHA256 c5ec91e3c360033a7ef640d0a08b4f9167032b5d6d5cdee020f4df949f916a24 SHA512 2dcc568c578f3201dbdc6a757c84d0e689c3f221fe7cbd57849524680e40150c972436a2c6fcc1220e99c9d2e6c97c62bb6d4c5c59e9d6890a67caceb94ed5cd WHIRLPOOL d721b1dbec6cf4d35560868981087f5f7950353bb281d277fd17d012d71302986c5645b3d0c28bf61d270a2b90596d324ad072184eb195b642718f33f83ede4e
 DIST rspec-rails-2.99.0.tar.gz 78448 SHA256 81ff54e638432c2b734ebefd5398f646960bcc72b92e381393d2420fc9525882 SHA512 0453450cf5a5435dc4f870ae7a37a299c6b17a4df04de730c14ca3d070808c9a9a70a6f485a1d0c6f4f8ddf3def6e4710ae5842e9e8f0b59c10b2177299670f4 WHIRLPOOL 0a5774bab31786cca0a3146641306cce38d2a809bc94a9728cc2c479be761b66246cb54bdf9185c478519434d95f7808f9d8f7f9ddecac1ffc01251cf9dcd5a6
 DIST rspec-rails-3.1.0.tar.gz 88945 SHA256 4a5c5c7b92bcd8b6e84e756d3619ec48e4ad362bffe2bd883999ec9696c0b157 SHA512 39c7bffab081e7a37e3c89eae623075193055ca10d5dbdd9f9f55acf821dc74ceb82b4771987cc52696057d403411dcd3d821a35ed2384b8f3f38a6ab88a28c5 WHIRLPOOL 5d77ba1f3386333c9e2725c44291dfa8dba68c9156d1a671ef910ee8438665eef45f93ef98777b40f44653ce2cb8794ffa745948a893c4d127e95b22fae293c8
 DIST rspec-rails-3.2.0.tar.gz 94419 SHA256 3e81714744a7dc043b9ee7fe91a1fd37a4769e83c3b56bd26537b701cfffd0dd SHA512 23ff704e34f87f524518216c450dde5e87a6de09593370d8b808251f4fe058028d93528e241eb6901a31e307f0349bf5c0376b181b4808db9281f8b146f5f049 WHIRLPOOL 8fb7c166c647d255ba4c920233292ffabd980655a893f62d9cafb18a2889546967829feefd6350ba8e74d633544687755020038d7c42ce3590b5efe97f78722d
-EBUILD rspec-rails-2.14.0.ebuild 1192 SHA256 a9531e19cd2014f81b1cbf6cdfb7777d2ace8a4b92be726d9a75822a2d9661b3 SHA512 748b1cee886a1a2c8072b75522903b942389d3e4915b0685e0bb4e98309231b222b6c6bad22f5c7cbdbb99c070b112aa4890d4de9ef01d1f41ae72d20331c574 WHIRLPOOL 1509d7905758a8eac971622bd8ae172009ea8ba71ad6de2bbe964955ab43efde629f5080a1a50b7b1ccfad3ce3f317b823a70b784cfa735ad2537254062b715a
 EBUILD rspec-rails-2.14.2.ebuild 1399 SHA256 205295a6449e984f417257548f22af2768d4c285a30e1c8a950179ac940578ab SHA512 99b44ce56230e871ba2c2c476c9b1c5db0a6ace2bc7700445a398982de2b518fea36d98d60a2090f64041e0718096bdb4a521f7ffc0718498ede2ce36e687bec WHIRLPOOL efe4c6a6680bde84f5c27b970a6e09c940066c27da026098871d738bf00b2f63077b21e82283be01ee4a3a316646bfa62e0df6546252d819281c621c271e4ab9
 EBUILD rspec-rails-2.99.0.ebuild 1404 SHA256 238e8e51192060aa6b75e97b83c82b70cc1678b47c7337bcf89e9f6b57b5913c SHA512 ea75b037e5fa29850c3e754063ac75303ecb226f86763d5a38b56cd4edbcb1a9b42ba25b98c0b705e4ba0708b79aa8f986ff0f93456d8f17cb32502a87a05b14 WHIRLPOOL 422053c2aacaf0bab2e59ab64fe7451b1d79a201b322c2b6874eeeafd023ba81f1b7bbc665becfe338c1497c98850f53df56f2775e4de26cba61e2b8f1caa099
 EBUILD rspec-rails-3.1.0.ebuild 1305 SHA256 c9493c763415d1a17e87837c86ded5e4a4d27a397bc7e39c2a6ce3c44dd41d54 SHA512 0c926e0ff0ea6e6d0348a56bb42a55215fb2673d441184e87126cf437de0e5502029c3433bbd515fee71d337eba83b0074f76587f60d3d33f31d0b23e4df20f8 WHIRLPOOL be5201fc89ac1c3601ca6dc68e7363703cfefa602c30f13c1ef7bf1dc99ac21c16ceb18cd7143df1ac4cddf156f74bca1929e82d722385cbb01989bb3aeb1751
 EBUILD rspec-rails-3.2.0.ebuild 1311 SHA256 8947c04fc2adf85344a759728dd72468c00dd44651f35ab563cd45cde5d9fbb9 SHA512 fec894de42653b13147fc9a5b794dcae164a4fef9efd13674b6b0f5ee7d1ea6efb024cc040c7ccae1e840f76d5fcb841c8880c3f440022ffcd7c0b4f1e5e5024 WHIRLPOOL 9e7e36e67b8789f9f71bde3f1c55e9c35e2c4e8eda1fc751ab681ed7214b3ef14fe23712b23a07548768fe0535105bcc9d4f3d78e7315dbf0b25f7ddc5be1034
-MISC ChangeLog 11608 SHA256 5b4e387165d4e4e3012d8e8b6dc0fe08d0c7a77bfc776d94e08ba667c6199b0e SHA512 d3c55be6cf20179ceeac3b70e5a8e7c7d87c7ec3e70b705148d0e6ca5ca787f74bc24bd07661c542015ee2416d19612b66f023cdc0c704380496d41ea428b3a4 WHIRLPOOL fcef989032a3bd51d5a3829fa2baeb4946b31a72beb883f21e22b64518efe53cebac5fd873435fffe540dc9a9ad5109c3144cc7fc8cb7ae5c746b4fc71893848
+MISC ChangeLog 11697 SHA256 cbd3d6b0a9519e6a6723516045e073a63b291bba65a4191852359a3768df6be0 SHA512 5a2a8eda3d01280af3ccd9ae21b60d3a85b74fc94e83b4338a4d57f2d0f475f94baa306d036419b7ea7f53be86bdd3fa081712f356de7ea22ee143a7e5ccf35d WHIRLPOOL b4b0c75279efaf7080bdf5a743f56121ad1ee328e494e060cb46d43802b1ac06806ab9e83c59bc38ea9da9744d0fb6f5e7b916eded9915a35477c6e4a8fb6b48
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iF4EAREIAAYFAlUHPcYACgkQiIP6VqMIqNe17gD9EWOw2g+13cUTBlPpCtn4BlQr
+Jd8wqi71sCQoRUqbFHIA/ijNZNd3G76HC3gsPOrQ9rlLLOYzStm10pJCTNiS9QPk
+=ARYE
+-----END PGP SIGNATURE-----
diff --git a/dev-ruby/rspec-rails/rspec-rails-2.14.0.ebuild b/dev-ruby/rspec-rails/rspec-rails-2.14.0.ebuild
deleted file mode 100644
index 8d9c774e8d8b..000000000000
--- a/dev-ruby/rspec-rails/rspec-rails-2.14.0.ebuild
+++ /dev/null
@@ -1,41 +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/rspec-rails/rspec-rails-2.14.0.ebuild,v 1.4 2014/04/05 12:13:44 mrueg Exp $
-
-EAPI=5
-
-USE_RUBY="ruby19"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="RSpec's official Ruby on Rails plugin"
-HOMEPAGE="http://rspec.info/"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-SUBVERSION="$(get_version_component_range 1-2)"
-
-ruby_add_rdepend "=dev-ruby/activesupport-3*
-	=dev-ruby/actionpack-3*
-	=dev-ruby/railties-3*
-	=dev-ruby/rspec-${SUBVERSION}*"
-
-# Depend on the package being already installed for tests, because
-# requiring ammeter will load it, and we need a consistent set of rspec
-# and rspec-rails for that to work.
-ruby_add_bdepend "test? ( =dev-ruby/mocha-0.10* >=dev-ruby/ammeter-0.2.5 ~dev-ruby/rspec-rails-${PV} )"
-
-all_ruby_prepare() {
-	# Remove .rspec options to avoid dependency on newer rspec when
-	# bootstrapping.
-	rm .rspec || die
-}
diff --git a/dev-ruby/ruby-termios/ChangeLog b/dev-ruby/ruby-termios/ChangeLog
index 88e7503d474f..ef8ee0689ec1 100644
--- a/dev-ruby/ruby-termios/ChangeLog
+++ b/dev-ruby/ruby-termios/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/ruby-termios
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-termios/ChangeLog,v 1.40 2014/08/30 15:18:03 nimiux Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-termios/ChangeLog,v 1.41 2015/03/16 20:36:19 graaff Exp $
+
+  16 Mar 2015; Hans de Graaff <graaff@gentoo.org>
+  -ruby-termios-0.9.6-r2.ebuild:
+  Cleanup.
 
   30 Aug 2014; Chema Alonso <nimiux@gentoo.org> ruby-termios-1.0.0.ebuild:
   Stable for amd64 wrt bug #517012
diff --git a/dev-ruby/ruby-termios/Manifest b/dev-ruby/ruby-termios/Manifest
index d4bd3d6ef91e..05297e3c6fe6 100644
--- a/dev-ruby/ruby-termios/Manifest
+++ b/dev-ruby/ruby-termios/Manifest
@@ -1,20 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST ruby-termios-0.9.6.tar.gz 14077 SHA256 c838419d4265ce78be0efdfda6d525d81c231450805ec61c861394929f90181c SHA512 66033dcb2cbe2e76bd114607234c105595a9ab7fe567834ae052aa69c70fa83f95724273efc2d32db48fa853276e0015bde4b4ebebae323858b3ee6dc553e6d8 WHIRLPOOL 665f630eb07ae3cbcc480d195ec4c5ac531c0e2e5ad993157793e34c6294236e04d25f7ca3fb7c1fbbd9d77ca3f445dcf78db5a571112034724aec7e0abc9cd2
 DIST ruby-termios-1.0.0.tar.gz 14738 SHA256 0b6c41fb554acf17d257db8e8a10b283be6a9b45807ef1562151aadfc008ce5f SHA512 16d71a8cf84391da2dc8b138ff381751f5a72d61ce37d2215960d389285dee14862b50cf770d4648b298df093a85005df460ba951c5d7e6fb38e69d8d686599a WHIRLPOOL 34c9ad7fdfb7f72d8311a04345f5aa94050ea5d0fd66d362cd7c9eca55b19b91dd022bf2b3e60714a78c4e80bfc28952d722e8538372a3ed7faed8443baa85e3
-EBUILD ruby-termios-0.9.6-r2.ebuild 1024 SHA256 4657589042c39cf42c72f72a6356dafe72b4c1ab2a7b5989dfdae3b0d5ac9bcf SHA512 e737ef7bb0688d2c37871390cd4d80477fd8fc24b81289b9743f8963df1082ca152d2a0de8766a90e2830f4deb38437064b295dc3f54f77322695016f2845ed3 WHIRLPOOL 5bb11c917179863d17bd797852026a7cd6034f54d36281e5bfb350e790caaff4bc3344cad2f87ce563f732d706f2bb685e6414d6cbb9d79ea07c7c4b6b1ff93d
 EBUILD ruby-termios-1.0.0.ebuild 1083 SHA256 ef412f4d107638b7a0fec12d43f3e48b63042fd21504956a90ea5d96ecbf1ef1 SHA512 fee40bb3c245ecd7b52610d2dce04bf2f2e75aa86f3bb55cdc7177d4201ba4686c23a27eb5c486f1d8f368d344b20c6f065f7d0388838df302d3c0cf6ef49193 WHIRLPOOL 2894258745c5cbbbdbf81ad1540c74a1cbba0c1f49c592784ed824eed1500f4167283fea4a59f5da1c4a1bc7504c6dde4dbaf04d7e23cc4b5bb799d299fd3aac
-MISC ChangeLog 4849 SHA256 a2f9cef4a6edbf96342240fdd3cadc9f8b33279eddccff9720fe7e9a2b1bcfa9 SHA512 bf07c0e24dbd6df254166508631ed92050c9819b637d8a0c86a1bb9cc8374d6f9dd77ee8a05869998f8a1608747b0f0a0656aa02719d4387f75f355cabd7ad9c WHIRLPOOL ead05f0b03d28684204f52c8ca7e5472c6410f4c970ac342a00d30e9e278ae018112be890a9776e8603233214c8588ca210ea45f530854e07194a7edf804ff98
+MISC ChangeLog 4944 SHA256 587dca8e9b69e845236e4f227dfa5410ee7eaba38d49f6c8efb5671fe1861709 SHA512 d0498330f567ed1e571482344f0c090cdceb853b24d5869fbade11bed83b943c0e5c01b7402062064fa0338f6d152fe3be8e06685659f642187b3e09b2a44ec7 WHIRLPOOL fb023073e6647fb8248d48e1f6ecb89e2258142a701c0afd53e0b827aff5312e2623a9a13a9ff723bd59c0add9606425e1325a55453aa228ec85724f997585bd
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUAet4AAoJEA2sAkrWKOU2+i0H+QGlHAUowiBoI2x5zpRga+C5
-mW2L9nsNE2H6HwahHkM1uJHp5TJtJ5n8ov5Kp7U+XTh4mBpXgPd0FDnocKoBaIFf
-HMVy395Y365hIh7iVGFfkYb1q3kEa3AY6F0M5ZxeDbhQLbK+ndHkWhxvM808dDos
-qyKzkep65vkoZL/gRbaqSTBxSN24qul8VzqsFdqyACHvvorsJGSParVLWSKZPhDb
-fF7c+RX7P3CgXxDYIWaYzQYXAJYkg8RLt1QZdHLsr171S/R6ux0BpdmhB6nSDr7G
-3Ugwe4i1AM/Zc2vPLBZTg2ZJuzQuI7shKORnlI8VKGXCb0wtaFtRsN01ZW33RIA=
-=yNwX
+iF4EAREIAAYFAlUHPsQACgkQiIP6VqMIqNeZrQD+KxuEQJMLpbbdl8SrRGQ9Mfti
+8ZOkwYdoNrN1hp1w7egA/jFtwm7EZVUolKtqdukOp5erMedYQw758KRXIOmsnUOZ
+=fnic
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/ruby-termios/ruby-termios-0.9.6-r2.ebuild b/dev-ruby/ruby-termios/ruby-termios-0.9.6-r2.ebuild
deleted file mode 100644
index 8c6dfe54dfac..000000000000
--- a/dev-ruby/ruby-termios/ruby-termios-0.9.6-r2.ebuild
+++ /dev/null
@@ -1,45 +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/ruby-termios/ruby-termios-0.9.6-r2.ebuild,v 1.4 2014/04/24 17:45:05 mrueg Exp $
-
-EAPI=4
-USE_RUBY="ruby19"
-
-inherit ruby-ng
-
-DESCRIPTION="A Ruby interface to termios"
-HOMEPAGE="http://arika.org/ruby/termios"	# trailing / isn't needed
-SRC_URI="http://github.com/arika/ruby-termios/tarball/version_0_9_6 -> ${P}.tar.gz"
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~mips ~ppc x86 ~x86-macos"
-IUSE=""
-
-RUBY_S="arika-${PN}-94fd9ac"
-
-# Tests require a normal TTY, bug 340575. They should all pass when run
-# manually.
-RESTRICT=test
-
-each_ruby_configure() {
-	${RUBY} extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake || die
-}
-
-each_ruby_test() {
-	${RUBY} test/test0.rb || die "tests failed"
-}
-
-each_ruby_install() {
-	emake DESTDIR="${D}" install || die
-}
-
-all_ruby_install() {
-	dodoc ChangeLog README termios.rd
-
-	insinto /usr/share/doc/${PF}/examples
-	doins examples/* || die
-}
diff --git a/dev-ruby/sass/ChangeLog b/dev-ruby/sass/ChangeLog
index 375d13fc185d..eeab7009a50f 100644
--- a/dev-ruby/sass/ChangeLog
+++ b/dev-ruby/sass/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/sass
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sass/ChangeLog,v 1.75 2015/03/03 18:17:50 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sass/ChangeLog,v 1.76 2015/03/16 20:38:22 graaff Exp $
+
+  16 Mar 2015; Hans de Graaff <graaff@gentoo.org> -sass-3.1.21.ebuild,
+  -sass-3.4.10.ebuild:
+  Cleanup.
 
 *sass-3.4.13 (03 Mar 2015)
 
diff --git a/dev-ruby/sass/Manifest b/dev-ruby/sass/Manifest
index d21f1ee418d1..bd5a1d51561a 100644
--- a/dev-ruby/sass/Manifest
+++ b/dev-ruby/sass/Manifest
@@ -1,16 +1,22 @@
-DIST sass-3.1.21.gem 233472 SHA256 08502fc7889187909d66098629a89a9901d4dce13626339f4976c1e8d16b4a57 SHA512 fed0700147bd8adc90927a16ae2b5a3256392fa6d969c4281ea0189d728e2f0818f5b88b60aea5b59288730e3897bdf58a83ed72b48d4a538d14d16c85234062 WHIRLPOOL 57e59efa57af97c26a80cd83c4d0fe9eda8d30f664e73eab01400fa5c7171a16d0ed6400ebc8680dc78885e961b78a7252d4ea0dbe5d94209f6cca70a6896cb2
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST sass-3.2.19.gem 261632 SHA256 ddcd7d76d98daa8f3ebbaec196972500a6cf6e854f9c328fcfc9aa556f29bfac SHA512 6c288985d53b905aa3cc5ed471359c8a47b82fc30e9c576332fcf20c3d033e1f683c390e2b300295aa3b4be4f7b640ed5578e937793d0bc3537c268ed6986429 WHIRLPOOL 8a3ac79e5c287b1049fe21058704f81b7817fa217a165c0daeaa17ad68cc4189f75b92cd659ec5afc0b4254ee5a368f4657c00a3228a3b27a802fb8c0e60894e
 DIST sass-3.3.14.gem 315392 SHA256 95435ddef3aee817ef727e3576852e9cb12f7020027c9f2da8a3835f16ec46c1 SHA512 816c3aa7869648b51708a6a3bb14598dffdbb6335db7800ddb789c3f325f58822e2f3031f25f036eca2aabdd5ce8da1507ce58a75d0edcda17b7ae7a3484f39a WHIRLPOOL 544f2cfceff59872737dc9c564be5a328212c714bfbe78fb954511e5a70ad43cf80eac556026b13ea3fc48943d331925d8d2e7bc8954614e0a1b63e42648581e
-DIST sass-3.4.10.gem 334848 SHA256 6eb51835b52fe344fe08b077d399d0b6fc96dc16d2d66ac205b1a00601dee12e SHA512 6638007970a7819de934555db785ad560143825ccb6d379035cbbb52393819463ffc2f80d455aa634d06aedaed6be684b106f5233c287527ddfa0aa4e7baca24 WHIRLPOOL 63adc84684b48640476295447acb4b387586b5626e500a4551051c3426bf80e6b08fda69cc0d10ea383c475e76f6064dd78c3a61ec80c9e375d3a925722bd16a
 DIST sass-3.4.12.gem 335360 SHA256 8190764889895ebf8e9a8796c2e78c56c1e028ebe3e659ffb03decd97ff34497 SHA512 30c42cc4da2c8c5fddd783ee7edd5b6d15961cff40d32ddbb9d9c256d3f8d6400ae64ca5a8b096ddb21ea1375e12420278aedf5dddba2480bb7b8d6ce23cd525 WHIRLPOOL 3d3831d1d2dd228df785dc365bab2572c7c8d9f7c71375a90823e287d5951138e5f64b47fb7124a04dda93e8236933ed7a1fdbbcc081f9b3a97675ec6c5f1118
 DIST sass-3.4.13.gem 335872 SHA256 2f1e913f5845e6d3a6beebca01a25dd703bccde68b19109dbde7e41e4895b373 SHA512 a9a214045f7f3afb7b7a15d8f1f82c813700351454e13bdca061025329c780d2b9b6846ebb097ac75728ea560db940a1dc7d211b53d9c8bd356ddd4d818b9357 WHIRLPOOL 0f0dc24efb927c36109a8f0acf677e3736c5be11202eda72283a65a129b9229a87bfba93d9d0b5d8618a518158e4afad96ca56dd2e0e4ed4487da55bd16d96bb
-EBUILD sass-3.1.21.ebuild 861 SHA256 9ec24f839e1a1c9d5f0a8651c0ed03e2f76a8c8899335db8516f344677c3d816 SHA512 8f230527e7f0eae1d8ff333de8c603a224b7a8743e39269a3c1dc71e7f51989ba9038186c290288e500da80e8b618508940c2904a44ed0959818d2d2caed3616 WHIRLPOOL 03fa40860e9e2e4644754da249eab482731df821f42c7bc67e246347bb4575ef3cf72740fc898bbc4471f53f0801d247d5690d0fad10cca16afb9e3e114e91d2
 EBUILD sass-3.2.19-r1.ebuild 1045 SHA256 cf96d9b49a1cbe7e62d040b1f92db8bb1f5fbbf7296c228923a2d9f1360fa851 SHA512 d1eda9021f75dc00f27bbf4efbf6167e718e9903871f58099699172909d861078288c56d0a9117cd5f1490781b72d2e370f279359ac889e25f32714b2e21b007 WHIRLPOOL 8edf534354504f213d45319de2ad3663105284ec6ea06dfcd09b3f9c89bf0254f687639c118af3ed3fb2d82c346df6490e6f3fcdfac9b63e3176a29a83817b11
 EBUILD sass-3.2.19.ebuild 945 SHA256 ada61a4136c9e237875335547bdaffb8a21d72c2f74a38a46920a6c845d66918 SHA512 38ac8122d8734ea9b7639b47c5dd0ca9bdbea1063ad1b7fcaf4e0b90bbbb863571cdc1a7071e14af8bf043c8c89e9d3084f832d1e822e89235bb4a1d7bebfee8 WHIRLPOOL ef5f256096aa33e7ced275d21f75425e77c93535987e0fed3e9707f6cfd8663c434ccc539a62c560f97452324c9791716546bee4e5363ac5ac3ae2ba40281570
 EBUILD sass-3.3.14-r1.ebuild 1180 SHA256 6888c43d4a1a2f50f74ede75e57724007e681aa6e89f7bf2463dabe139660264 SHA512 9337b5aafff623c5b48fb6f76961f9ae1571f72180486b9c86d2499f6321d99e6a52a61bf21d9f400735cce5603bdeaf54febc16d77d523acd24ca68bdc522cb WHIRLPOOL 8b2d7b7e846699586bb7ceb81e4bb762a9131e69c095ea7c27e6a06e0301446476da2758f0ac904e579b971c35760b2e0550ac170c7041fcebdc50c63fb47048
 EBUILD sass-3.3.14.ebuild 1091 SHA256 60d2239cb79319fb1db1c223bf1c592fa6c4b52f1a02b48757186a2afd8d4be7 SHA512 9e7522ff336e4f41f12f6c870e588225cc3259ab13d84a0c924dfafdbc66ca37c7578cbd13e59880794d2d5559a8ec4541963af0430cac9515ec5e0801a31bc6 WHIRLPOOL 3002409d1e4b14ed84bfb5848147327e42bcdea3c010570ac988e738839f1051cffbe5018e722b69284291e121f811bb1d3fac84c8eddefdfde4207cb02a5fbf
-EBUILD sass-3.4.10.ebuild 1124 SHA256 e39bb491ec0cbadfe4e3f53dcb46f5cd8722e9ed074ce39ffc1082c21d3911af SHA512 551815957b9d22a86c85cbd5814e17b65e94a66938a06b9559891a61fbc521e4a5da4ff2583521d5797f639497eb3dd76bcba817052485cd8a8f28be10e18cc3 WHIRLPOOL 3dbf296494237f376e7c7efcf0cde30a6b81ecabb958b348a6fd88e64910dd4834f070e38843a09c74d3d595472e48dc5216a17085719096bc6bf1f3426f1cad
 EBUILD sass-3.4.12.ebuild 1124 SHA256 22f91bdf7fa5bb76b928dbd1682898bc5346d4ed0e7a0f89fbc45818f25c8e61 SHA512 709fb1339fee9474b3bf93058f21d85fdd3c56e600aaef540be0835fb26eb58b0f9f1a4f5fdaa5b9c679b19e9af66eea68f136e7e07a111be37a67d8a0f5a396 WHIRLPOOL f97dd95d2043f8c449f3bd79a5318f1b953b4bd9e2ef1a67d652ab319158d8740049cc5897b8ca5a149ab30a07a540126972fcb5be66248e3d89fe242c9c86a5
 EBUILD sass-3.4.13.ebuild 1124 SHA256 15cf15b3ed2bc248e41ae6601fd109d49bb89f43a7d77fbbfdff0227abffdd13 SHA512 0a7a472efe94dcbf5e01f7a78171d05d7345ec38b02c6b8708559c72a1a84908badc4bdd178b7094beaf6848028c8a06bdc0718e3fdf33f2eaabc70e1332a990 WHIRLPOOL 4537a81f3b15df56e6838a50c41cc159ab691e373395f7a335f549d376d055887f1b9f5dc77b60ff10d7ce874ab09611b78c0c0f49fa5f2cdc7fa6252a530342
-MISC ChangeLog 10110 SHA256 52558aa403f75fdac197ad715e1452d978bac8314c28da081fd02cebcbc1a32f SHA512 4f4d2d8f072e50133f29f0266aa58935a1b0662f1398b543c766028977110bf56cd3e7aff9a811f4c44c762992137f18545a90d498f77b7399da19a4e8258d8c WHIRLPOOL 67b813aa07b821f946f093838381394f66c54186fd71e893713cd9babe9a16be8f666d53be1d19f2d322ec53b6379acabb1ec28f7fb291bd61b3ece87be559af
+MISC ChangeLog 10217 SHA256 f3a9c88b118350d2422280c9fd9971fbb8c9bed4fe0701cb27102d320e7c01b6 SHA512 5ceac0d0d0a4d00e9e80d8bae2e0453e6702b92122e88fd7064058db3f693289c58ca7c29e91035e6a9c900a7e583f57d45ea10897fe67ff5dd0cb3b1df68e75 WHIRLPOOL 6043b38ac29aecde134624fe21e7785ece47bfb5a8587d6b0e318ddf2300fee84b9865735b2150a52a8b2e186fb5b75b88648089818a98da75a78b148fcb30d7
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iF4EAREIAAYFAlUHPz8ACgkQiIP6VqMIqNfQMgD/d3P+L4Mmchbj968nac/Hjxg1
+/vbVy613r5TQRMbqp7QA/RPsaev/7CaOFfRpEVjSxkmamjJp9+xzb3gydCTEL/PU
+=AjOu
+-----END PGP SIGNATURE-----
diff --git a/dev-ruby/sass/sass-3.1.21.ebuild b/dev-ruby/sass/sass-3.1.21.ebuild
deleted file mode 100644
index 29266978c871..000000000000
--- a/dev-ruby/sass/sass-3.1.21.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/sass/sass-3.1.21.ebuild,v 1.8 2014/11/25 13:06:36 mrueg Exp $
-
-EAPI=2
-
-USE_RUBY="ruby19"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="rails init.rb VERSION VERSION_NAME"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An extension of CSS3, adding nested rules, variables, mixins, selector inheritance, and more"
-HOMEPAGE="http://sass-lang.com/"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x64-macos ~x86"
-SLOT="0"
-IUSE=""
-
-ruby_add_bdepend "doc? ( >=dev-ruby/yard-0.5.3 >=dev-ruby/maruku-0.5.9 )"
-
-ruby_add_rdepend ">=dev-ruby/listen-0.4.2 !!<dev-ruby/haml-3.1"
-
-# tests could use `less` if we had it
-
-all_ruby_prepare() {
-	rm -rf vendor/listen
-}
diff --git a/dev-ruby/sass/sass-3.4.10.ebuild b/dev-ruby/sass/sass-3.4.10.ebuild
deleted file mode 100644
index 3483a54f4cb8..000000000000
--- a/dev-ruby/sass/sass-3.4.10.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sass/sass-3.4.10.ebuild,v 1.1 2015/01/18 03:10:07 mrueg Exp $
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="rails init.rb VERSION VERSION_NAME"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="An extension of CSS3, adding nested rules, variables, mixins, selector inheritance, and more"
-HOMEPAGE="http://sass-lang.com/"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-SLOT="$(get_version_component_range 1-2)"
-IUSE=""
-
-ruby_add_bdepend "doc? ( >=dev-ruby/yard-0.5.3 )"
-
-ruby_add_rdepend ">=dev-ruby/listen-1.3.1 !!<dev-ruby/haml-3.1 !!<dev-ruby/sass-3.2.19-r1:0 !!<dev-ruby/sass-3.3.14-r1:3.3"
-
-# tests could use `less` if we had it
-
-all_ruby_prepare() {
-	rm -rf vendor/listen || die
-
-	# Don't require maruku as markdown provider but let yard decide.
-	sed -i -e '/maruku/d' .yardopts || die
-}
-
-each_ruby_test() {
-	RUBOCOP=false ${RUBY} -S rake test || die
-}