Cleanup.

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

19 files changed, 53 insertions, 422 deletions

diff --git a/dev-ruby/fast_gettext/ChangeLog b/dev-ruby/fast_gettext/ChangeLog
index c3d2bebf6ff2..e5445b2fa8a9 100644
--- a/dev-ruby/fast_gettext/ChangeLog
+++ b/dev-ruby/fast_gettext/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/fast_gettext
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fast_gettext/ChangeLog,v 1.30 2015/03/11 16:54:33 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fast_gettext/ChangeLog,v 1.31 2015/03/12 06:44:49 graaff Exp $
+
+  12 Mar 2015; Hans de Graaff <graaff@gentoo.org> -fast_gettext-0.7.1.ebuild,
+  -fast_gettext-0.8.1.ebuild:
+  Cleanup.
 
   11 Mar 2015; Agostino Sarubbo <ago@gentoo.org> fast_gettext-0.8.1.ebuild,
   fast_gettext-0.9.0.ebuild, fast_gettext-0.9.2.ebuild:
diff --git a/dev-ruby/fast_gettext/Manifest b/dev-ruby/fast_gettext/Manifest
index 4366e09e8cc6..c461d8419f28 100644
--- a/dev-ruby/fast_gettext/Manifest
+++ b/dev-ruby/fast_gettext/Manifest
@@ -1,30 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST fast_gettext-0.7.1.gem 86528 SHA256 82a181827a8dc28af45cc02304644dc6ca7d3141f402baf576411fdb1d7fa42c SHA512 b2b63bb0021844652400e3db36deaf66fb50beefd4908c7f6701431a7f0f1ab1c8298e6759f0eab82a302272f7de875b8454034a0b2adff574b88adecc8ad05a WHIRLPOOL af92ffa5a9854bbd4f09554ffb29a4d88c76eead873e06bd32ab4563635b9f6cffe3b680c03cd74a2aec6879814174393b2978921fc35db78c5b63f789a22723
-DIST fast_gettext-0.8.1.gem 89600 SHA256 85b78738c05af23cdfc75c64e3dcf2a1a6966536723aad5c8619f05cd8ba15e5 SHA512 b918d1c27943cf2aaaf3d12a7708f737859d8268ccadb37807712bc63a9963a0c029750a8c359d2708fd5ce53d1c782518af038b78229eb2bb79678960eb186a WHIRLPOOL 231e3cf256d7e6afe91721bdb66ab6c774c8621d9e8215d4235f808fcd7e630ef06561f88e3e1c333c754c4e1edd6eb53c69ad967a9f4c22d28301600e9c2d86
 DIST fast_gettext-0.9.0.tar.gz 86616 SHA256 773f1112524f1777f4f46ce80c5e1341dd270d232d86808d5ecc27d5b4d83e29 SHA512 901e9725ae537300be078febf4c5c94f466da48b0e4d3611037bfc98b914436a23828708177d6874c7b2ae60245631cd414ee52bd1b9de90c6ff8d1a6dbe37a4 WHIRLPOOL 06f858d501d66cfc609ff2a75010e73b33f706d388286a64ce923a6a87f96ddcc98a6623644b8bac9e57dbe86b7345ddd7aaf601d69ca600e6f8a7c9c8e95114
 DIST fast_gettext-0.9.2.tar.gz 86892 SHA256 7c7de3f9ac19d2e5a81fa15bf0dcd4d54bcb92051e881d83265c6cdadfce239b SHA512 d8bfe755ba6754ff474a6d0e42e9a725aa00f20b381fe5c0a2a2dc3efc5e0bf6096450e0665cd4369717296dc55cd316f836d9cd35b96764eb56e3ca33379c14 WHIRLPOOL 615f5357815d8321d1f099889b352826034af1defbf8a6a4383b9e71b7e37ed06c582e0e957ec4e9a2345b3b84dce9a5432e3d85946f679fa27fcafe04cbce4c
-EBUILD fast_gettext-0.7.1.ebuild 1521 SHA256 ac15557a45ffbab8c7e45f1a19cacc37cbfdbc14da79b3b91cc6b9e050765f4c SHA512 3e1a1f6a8e508c879845b57f24e66df10f8801855365ecc68ca99afef468d71d7f08c74032871a785c3d39badeff5f492fcf871f007f3b3ef4937b0ccf6593d2 WHIRLPOOL ff3c058ccd479e6b6df9b14784f0ca608190057208a02cdef5353affdc6411d839389f476087c82e81cfee5488c0483c84ea383fc273c869cb665495be4e37be
-EBUILD fast_gettext-0.8.1.ebuild 1715 SHA256 3c7f92f4092133ee302864aef66f2270a7fa0f8ff583f9baa2b3b431ca9d0524 SHA512 658834bde9f3f7ba6a1e3ec9fcce5bb3864a69248a23989c07a56d3bb28efc0a2d6007d4e98dbb342d2668bbf250d89144df10d853e70c4c572d35dab1e81505 WHIRLPOOL ab10b21928cb2082647597977772535cd5eac2e6c40f3bcfda68f1be20b5a8e35d8ff994d453997bed76525f06a57aabfb82137577dafbb63fae53a3b9997e6e
 EBUILD fast_gettext-0.9.0.ebuild 1979 SHA256 0bc5888ebded7daa48fad5957ef9875d7c6c3b00e214f9c49df06c1b27c8a573 SHA512 fde2e0410453ad677a402e96a8cdbab5a1c0fce307be01bfa6efc873dcffc0dc4bd7d391fce118ed7549939c76be7abce2f174d0ead1954d42772f0c7d35c3ad WHIRLPOOL 460b31c8ef533783a316e9f2aeab87e289ac1e4d4e8be69a02911671773f1eb6ef6daff78c1928767adf9526402ec0794b062fc53b41abc0c524868abf5328df
 EBUILD fast_gettext-0.9.2.ebuild 1661 SHA256 b649490752eaba73559a65aa7b9f7d166ef54796026b98c9b1609db141d7eff5 SHA512 3ea6e187270294a0700f73d720f94b21720d60ae719bc4fcadce5adcc19fb44ca721db2cfe9d76992d355b388938154a191d1ee300b20e474b9bef0fb4f5c5e6 WHIRLPOOL ae1322e7e833cef2430bbdddb8e3a7150973cb8de04a6ff7d26c8dd3e168ca27e1b0d1d33ddf45a53687f39cc4888c6b3c60ab080ba16a51d9d4ed45b477b439
-MISC ChangeLog 4339 SHA256 8de67e8d0b6ea3c687cca8f47a5d45477f8fe08e8eade51a975af17d33351786 SHA512 54d85843deccfb79324f7e41878c17963d292d04db73dde33aa7b0763d338fb250061d2493314c7b0c1c13085047c03be32c1aa04ab7a4667150294694077363 WHIRLPOOL df42c1a16d2dbecc81d8b6773530cd03491df2d2aeffe0b2409e95687c1e0c58b095ab8706f64c9a6e0ce6078e691587fb6fcb8303ca3c9df4fd2e520d614d41
+MISC ChangeLog 4462 SHA256 8b322ba8f90b0131d67982fb6c3ae95ec93a73b212ee5e5eaf99cf71ad13c8f2 SHA512 d5600fb05fc974e4abed2385a4bfd78a2483ccd36eb7238931c41412007b3b5329747ef888f45ddfa6a96f1d912a3f21366e8313bc82f8d7ee08c2f6fd9d3ab3 WHIRLPOOL 25ad471db9455d3c432b96e7f497faa3ebc9747541321ee48d0271fa5b5878d1d425f081ec5441332659aea680ae15594c80673fc04fbd2d3e8ea96b871d39f6
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVAHNKAAoJELp701BxlEWfF2EQAMdfrPA5ve9dXKlj7CamDTIE
-Nlr6i9M1lxRUT+0TK4unn0dlZrowtAeqNG8qbj3xHK9/hWEIwQ6ztjLwsM9Zu2aZ
-5IoCRv1um9QrbPEIfweGsksq8TNeQU5+uf4AM7wjxd6YzUMjqvb+zfG9tHQYZyiP
-1dbiKsb6l5bheMuAKJHCdBtAbaTo2KSO+ExjfRZ0DCYFtNjoqH7XfcAmhGy7VLyC
-3W7/3+VzDq/DpiNu/9NNlsUJx2ENqZbCJTwP6Ibz609GoH5o6PqYUDvNrzxW8iII
-OV9NqvXP+/fVHLlXe9vDGptEfc8oGkgs2UJuRsvEprruejAdfDn4TUj2VEmcKYS7
-Q/CwRxRjcCf/3Mhw6of2dnGZBTby7udqsbz9CqBc0yUJsJdxdkKplzioiZfKwbH8
-VnZc7EKY6tbP2otJT9sjlV3qxuRRjiA6Euq6ovfRLppFRB+S3UAkVgZ72wp8ncKa
-VM0rX2lS1SBmYyHcgZ467MGqEqwSu6HWHNu77i+EA/68M+X6NIf86DPDzrISNGsg
-cLBMEOfNsGMeldVivySa+9v8dxYlZvQmxsw4ftu7MIYK19YzX8zRByzrMXhMnLLR
-2qLElrgckCGz6yLggyCOXfkIePzaLeSZUuxD3M0+UCM3v1+/7UJedgM9C35Dsl4i
-j6O6pde55WVsxzu6tX/k
-=/kMK
+iF4EAREIAAYFAlUBNeYACgkQiIP6VqMIqNcbNwD/eQUEX2Vkb+1cybPffvcgDlj+
+lx9h5Z4g3a20ubC54b4A/37+dMIXJb7XRWvFWE0faQnhMv0eq8GMLmG0YJUaECVs
+=np9b
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/fast_gettext/fast_gettext-0.7.1.ebuild b/dev-ruby/fast_gettext/fast_gettext-0.7.1.ebuild
deleted file mode 100644
index f6a05a1487ef..000000000000
--- a/dev-ruby/fast_gettext/fast_gettext-0.7.1.ebuild
+++ /dev/null
@@ -1,46 +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/fast_gettext/fast_gettext-0.7.1.ebuild,v 1.2 2014/05/26 05:45:34 mrueg Exp $
-
-EAPI=5
-
-# jruby support requires sqlite3 support for jruby.
-USE_RUBY="ruby19"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG Readme.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="GetText but 3.5 x faster, 560 x less memory, simple, clean namespace (7 vs 34) and threadsave!"
-HOMEPAGE="https://github.com/grosser/fast_gettext"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/activerecord dev-ruby/bundler )"
-
-all_ruby_prepare() {
-	rm Gemfile.lock || die
-
-	# Remove jeweler and bump from Gemfile since they are not needed for tests.
-	sed -i -e '/jeweler/d' -e '/bump/d' -e '/appraisal/d' Gemfile || die
-
-	# Avoid unneeded dependency on git.
-	sed -i -e '/git ls-files/ s:^:#:' fast_gettext.gemspec || die
-
-	# Don't run a test that requires safe mode which we can't provide
-	# due to insecure directory settings for the portage dir. This spec
-	# also calls out to ruby which won't work with different ruby
-	# implementations.
-	sed -i -e '/can work in SAFE mode/,/end/ s:^:#:' spec/fast_gettext/translation_repository/mo_spec.rb || die
-}
-
-each_ruby_prepare() {
-	# Make sure the right ruby interpreter is used
-	sed -i -e "s:bundle exec ruby:bundle exec ${RUBY}:" spec/fast_gettext/vendor/*spec.rb || die
-}
diff --git a/dev-ruby/fast_gettext/fast_gettext-0.8.1.ebuild b/dev-ruby/fast_gettext/fast_gettext-0.8.1.ebuild
deleted file mode 100644
index a2270893d740..000000000000
--- a/dev-ruby/fast_gettext/fast_gettext-0.8.1.ebuild
+++ /dev/null
@@ -1,49 +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/fast_gettext/fast_gettext-0.8.1.ebuild,v 1.4 2015/03/11 16:54:33 ago Exp $
-
-EAPI=5
-
-# jruby support requires sqlite3 support for jruby.
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG Readme.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="GetText but 3.5 x faster, 560 x less memory, simple, clean namespace (7 vs 34) and threadsave!"
-HOMEPAGE="https://github.com/grosser/fast_gettext"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/activerecord dev-ruby/protected_attributes dev-ruby/bundler )"
-
-all_ruby_prepare() {
-	rm Gemfile.lock || die
-
-	# Remove jeweler and bump from Gemfile since they are not needed for tests.
-	sed -i -e '/jeweler/d' -e '/bump/d' -e '/appraisal/d' Gemfile || die
-
-	# Avoid unneeded dependency on git.
-	sed -i -e '/git ls-files/ s:^:#:' fast_gettext.gemspec || die
-
-	# Don't run a test that requires safe mode which we can't provide
-	# due to insecure directory settings for the portage dir. This spec
-	# also calls out to ruby which won't work with different ruby
-	# implementations.
-	sed -i -e '/can work in SAFE mode/,/^  end/ s:^:#:' spec/fast_gettext/translation_repository/mo_spec.rb || die
-
-	# Avoid not failing pending specs related to ree18.
-	sed -i -e '/with i18n loaded/,/^  end/ s:^:#:' spec/fast_gettext/vendor/string_spec.rb || die
-}
-
-each_ruby_prepare() {
-	# Make sure the right ruby interpreter is used
-	sed -i -e "s:bundle exec ruby:bundle exec ${RUBY}:" spec/fast_gettext/vendor/*spec.rb || die
-}
diff --git a/dev-ruby/fxruby/ChangeLog b/dev-ruby/fxruby/ChangeLog
index e34eaa6abf43..d69d210dbf50 100644
--- a/dev-ruby/fxruby/ChangeLog
+++ b/dev-ruby/fxruby/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/fxruby
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fxruby/ChangeLog,v 1.117 2015/02/24 07:08:21 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fxruby/ChangeLog,v 1.118 2015/03/12 06:48:14 graaff Exp $
+
+  12 Mar 2015; Hans de Graaff <graaff@gentoo.org> -fxruby-1.6.28.ebuild:
+  Cleanup.
 
 *fxruby-1.6.29 (24 Feb 2015)
 
diff --git a/dev-ruby/fxruby/Manifest b/dev-ruby/fxruby/Manifest
index 4bb248d9e63b..40aa2e36af8c 100644
--- a/dev-ruby/fxruby/Manifest
+++ b/dev-ruby/fxruby/Manifest
@@ -2,17 +2,15 @@
 Hash: SHA256
 
 DIST fxruby-1.6.25.gem 1422848 SHA256 1a2bd0e74e9138df8004ddec006a7dd99646c08d68892898f0d6238e33e47a12 SHA512 82a2914bf8c770eea5732f26ac10ace39918b82ae30b51b20d9e6d1100ab8853e70e3ad36f7cffdee708cb677314c04cf3324d6727ea8f28d403f7c10c4102a3 WHIRLPOOL 3acb162cdd26a79855d4b2e793f13ca9d5eb8df8aa8bdf3ab6e453268bda250ce6dbb0652cb4bede8690d3edecb23076b9e4719a8d5d39945ddae5eb0bd85cdc
-DIST fxruby-1.6.28.gem 1404928 SHA256 456bcec231af10e522a38e1e89bcaa762f26b6ae382ab95b565aab9965bccf76 SHA512 bd6783f0f0c82aa9d26b18d5c5fda5c21b035cb09b1704c7c5277b6776ad7a78b9434a5eb0c1bd11ed92ed9fb4f94a0119f97b7b4281c7932e19eda1f883ebd4 WHIRLPOOL 709ff8c9171d41de9996b4544c22f6b1d24a8ea1c0fd9c0fb7cb019bbb1a81c7563e9b120ec70d7565b123d4ddbab63de7dcb04255ac3d5c1c939db84b6410a9
 DIST fxruby-1.6.29.gem 1894400 SHA256 d6e81d984a27e9abb9f51097a796b0d082ef08d186d2da8e1b948125a9ddb22e SHA512 5438ae48b1e95ef1247c214d44a8334ce54fd8396a7348de4796ab309a554014bd4f82e4a738d9192fe792d4decb91118f66e11e68e38d4a0620be33258b1823 WHIRLPOOL 5cf110f5a7c70ab14c047fb47a2554706adbf978faa46fec625f74651e3397b724e35c8dd805aae20884c826bc9bb17a82bd1891c21a1c08830135bac0602fe2
 EBUILD fxruby-1.6.25.ebuild 2094 SHA256 9b02fad1cba841cd44c7320939f34042a9f8c8bfaff195d08381f187857ae78a SHA512 c59e6f9d2a8a274501b785e8a2a4d850752dde213cd9085b2b97563b970e290cd4a6a81f7ccee55dc2d96d50b524f8d767788bb869c1e7c15edf7dafa2733724 WHIRLPOOL 8fe6b4a15c9ced70d9fc91c6425430850bd73445955adc58bbd89ed3647a6cb37bd1fe1e555a1c9fa41a70e0b508f283591d957b0bab5ffa7115fa26adc1e234
-EBUILD fxruby-1.6.28.ebuild 2001 SHA256 f351eff83ffec16dd15ada3deb21dd4280592c39260012559cccde84bf55cc4d SHA512 9587eb827add21b36b577cab734a8980d93a89e0452809fee705db50d9c275a66df4dbff7649059a4979b212b45b66b320dd099d5645edce400c6c5da21aa79e WHIRLPOOL b3cfa14903e11d1d849db616fcac7c51c7638e71389ae7b8f406cafd6476c3a398b08f925bc57cea4b38decb114881d4f5a41f0f0754da03a191de4623e666dc
 EBUILD fxruby-1.6.29.ebuild 2014 SHA256 62ef915b012338d95f4d9d545ce2ac2180f324f5aeeb71d55a71d854bf9acb6b SHA512 f7db3e78967dd1630628f4a655314acefa1a2563ceec44cdad0f70550a8b3051e0a14d9cfa0e13123498122de3e8b78302fe65146838a9ad3861b40ae1d79cba WHIRLPOOL 3fc5bda655e55b5dc846427e28188c6b69d12cbb9f2586c185369407c5a879c79f213f99511c51dd143c004a8fba5c84f12c3322b9a735f3f33eda761a6f0cac
-MISC ChangeLog 8311 SHA256 3ac24a6d7940292a21f6489c15b21b92eebb70bf43e718e804ba77a4b46d7f1d SHA512 4c4f0ae24514be54a4b25808a67756a0643c48d24be2676c7bea794d5a77b3794ea5fe80c195c1773821d537ff61a8d0425c8f449e7d4552a3b745eeb41d1d76 WHIRLPOOL be8471628d2d173393ea79e0f9f934bf45fef0431779d410e19822f82909cdc415c221bdc6ce32f52c6eb1ec57f61a5ba87a9903c81d6c629e5aa9139cfc7746
+MISC ChangeLog 8396 SHA256 6f698bf0fa37fdf43747412c64fe1a090e5bf1b96d16285d8be409a606655920 SHA512 7a6cc99712f232e90a8ed4a787ec737789e6fbe96077c2a9c52fc1e14c5698ad5ac96c1698b52ba687110f3868e78a41fb08052e745ca45cb60d070f2a5f8d8c WHIRLPOOL 116f7aa4fead3e962f221b6dff6f0f290302a9ed8c034c51c3309e12c44c38309a8b7ff5a5dabc8848d084a394cbb45f8043ce349db5d1713c30937271a9903f
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlTsI2sACgkQiIP6VqMIqNcRKwD9GTY4oYYYyPcxyYnFUZBTWMbE
-d4E+RA492ha+UjuuZdgA/3ocU0IVznGDQKMZx0xRSUG5/Ip75Z29EeyKnghSlAkA
-=mRkZ
+iF4EAREIAAYFAlUBNq8ACgkQiIP6VqMIqNd5sQD/W5PTk+3TzSMzgwkxCOVG16Im
+jm8iTxx7o2qqKKnC/tQA/1eu1JJiujB7EscQ2SCsgwW1MvZEJHFz+Q4ipIMjNSpl
+=AJ9S
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/fxruby/fxruby-1.6.28.ebuild b/dev-ruby/fxruby/fxruby-1.6.28.ebuild
deleted file mode 100644
index e3d1ebede246..000000000000
--- a/dev-ruby/fxruby/fxruby-1.6.28.ebuild
+++ /dev/null
@@ -1,76 +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/fxruby/fxruby-1.6.28.ebuild,v 1.3 2013/12/25 09:38:03 patrick Exp $
-
-EAPI=5
-USE_RUBY="ruby19"
-
-RUBY_FAKEGEM_NAME="fxruby"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="History.txt index.html README.rdoc TODO"
-
-inherit multilib virtualx ruby-fakegem toolchain-funcs
-
-DESCRIPTION="Ruby language binding to the FOX GUI toolkit"
-HOMEPAGE="http://www.fxruby.org/"
-
-LICENSE="LGPL-2.1"
-SLOT="1.6"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="examples doc"
-
-CDEPEND="x11-libs/fox:1.6 >=x11-libs/fxscintilla-1.62-r1"
-DEPEND="${DEPEND} ${CDEPEND} dev-lang/swig"
-RDEPEND="${RDEPEND} ${CDEPEND}"
-
-ruby_add_bdepend "test? ( dev-ruby/ruby-opengl )"
-
-ruby_add_bdepend "doc? ( dev-ruby/rdoc )"
-
-all_ruby_prepare() {
-	sed -i -e '/\[:compile\]/d' Rakefile || die
-	einfo "Avoid -O0 builds"
-	sed -i -e 's:-O0 -I:-I:' \
-		ext/fox16_c/extconf.rb || die "Can't fix forced -O0"
-
-	# Use a more modern swig.
-	sed -i -e 's/swig-1.3.22/swig/g' Rakefile || die
-
-	# Remove failing tests. We did not run tests before so this is not a
-	# regression for now.
-	rm test/TC_FXFileStream.rb test/TC_FXId.rb test/TC_FXMainWindow.rb test/TC_FXMaterial.rb || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/fox16_c extconf.rb || die
-}
-
-each_ruby_compile() {
-	CXX=$(tc-getCXX) emake V=1 -Cext/fox16_c || die
-	cp ext/fox16_c/fox16_c$(get_modname) lib/ || die
-}
-
-all_ruby_compile() {
-	all_fakegem_compile
-
-	rdoc --main rdoc-sources/README.rdoc --exclude ext/fox16_c --exclude "/aliases|kwargs|missingdep|responder/" || die
-}
-
-each_ruby_test() {
-	VIRTUALX_COMMAND=${RUBY} virtualmake -S testrb -Ilib test/TC_*.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	if use examples; then
-		for dir in sample samples example examples; do
-			if [ -d ${dir} ] ; then
-				dodir /usr/share/doc/${PF}
-				cp -pPR ${dir} "${D}"/usr/share/doc/${PF} || die "cp failed"
-			fi
-		done
-	fi
-}
diff --git a/dev-ruby/gettext_i18n_rails/ChangeLog b/dev-ruby/gettext_i18n_rails/ChangeLog
index 7a3b955af743..51decb2b4642 100644
--- a/dev-ruby/gettext_i18n_rails/ChangeLog
+++ b/dev-ruby/gettext_i18n_rails/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/gettext_i18n_rails
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/gettext_i18n_rails/ChangeLog,v 1.31 2015/03/11 16:54:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/gettext_i18n_rails/ChangeLog,v 1.32 2015/03/12 06:50:20 graaff Exp $
+
+  12 Mar 2015; Hans de Graaff <graaff@gentoo.org>
+  -gettext_i18n_rails-0.10.0.ebuild:
+  Cleanup.
 
   11 Mar 2015; Agostino Sarubbo <ago@gentoo.org>
   gettext_i18n_rails-1.0.5.ebuild, gettext_i18n_rails-1.1.0.ebuild,
diff --git a/dev-ruby/gettext_i18n_rails/Manifest b/dev-ruby/gettext_i18n_rails/Manifest
index a3d2e7a87018..7c4abdff390e 100644
--- a/dev-ruby/gettext_i18n_rails/Manifest
+++ b/dev-ruby/gettext_i18n_rails/Manifest
@@ -1,30 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST gettext_i18n_rails-0.10.0.gem 22528 SHA256 d8f1e2ee37646e050327fe75d79d6a01a139811973ec0bbf87d67d89c0ce5b35 SHA512 f0519a84f51a3efbe6b2ea79d274c3659f71dbcb946ef0bed451c657c6a16b143e633c8ce8c1410f32881cf93a0c7bfc19b26010e3279d7eeb86ea83a5194dde WHIRLPOOL 50067d21fc3ff386834ef986302aeea6aae40a95c9f673f1cb1d6a1bfe52468931b7fb04e9ac87eb8c851f231f59814157281a1bc4e1581ae814b91c4b82043b
 DIST gettext_i18n_rails-1.0.5.tar.gz 20335 SHA256 1179dd6c71356ccfa0a764bb9bb7605bc9b43c000aafd2aaf54972da5e8da386 SHA512 28c53f47473382de08a7bee56432f965b13aa9c5097442ed4f3fad3252b6e65f112d63119ca418f64c03c602b13db0a46277080f24874e027e453ce3ae08e360 WHIRLPOOL e7217c3ba3ec9c94829c38040f9baa840fa7061fc1678975c6689b3441d3752e81cc3cf8a522f795b8b34289684ab11b7313d7569034ab780037e345622edbca
 DIST gettext_i18n_rails-1.1.0.tar.gz 19581 SHA256 ae0910ac2d343a06b1c3ea4346272096834c4f792448e0c0a3f13ca102fd5a33 SHA512 61f628b1fd13ecb85f34d87475ee30a05f5de567ca097763e6d765fefc1a8715e72fba1361bc8717dff66b2baaea143525c5349159e8f02ee9aa010115d0e9a7 WHIRLPOOL 7d3fa603f5ec812d0fcb9daf36b27880d9f114b243ab956ca6da13722ee09370e78811acefab206e5826a4f933a0a19e115376dddcf1a6ab14487a279fd36ea6
 DIST gettext_i18n_rails-1.2.0.tar.gz 19882 SHA256 9d1d67134868bdf7267369f8dcaf79be4270b1c035ee3c9e26035c7161a2965a SHA512 b2b366b2a618bcbc76e8f75476c1f1a54d68bc285178e68aee15bf331fe1e919486738fe443eefac889b789665bd2e9d1c3971c8da7cb81bb5ab8add090e5020 WHIRLPOOL 89d71727ea2d35dd15a3882cc38f7ef9fa9c7c6b958dd86de812a13e8f6a1405d0fb8263b492d904294aa2df2de1e9d274c0386738df2f6311ffca6e908e18a1
-EBUILD gettext_i18n_rails-0.10.0.ebuild 996 SHA256 7c042188247e88d04328c515e2ed869143274f7a4a01f7f152b6fa06d61cff57 SHA512 70cd32f051e272063caabe0bdccb37ebb059dd47eed9bb88a20fd2213cd559ab1e9667dd98557ceddb465b731510166e15ff1e2c62672827213ee584b59c9be5 WHIRLPOOL b6933c315ff58aa9cce2df8d27e98b51b5adecff073e18a6422bdad970acbcbb3a7c447099aa1421e9fdb014c9c0aabae247aad0da82ef0f692eaea875c47a9e
 EBUILD gettext_i18n_rails-1.0.5.ebuild 1243 SHA256 0414c3e67a8a2b7f05e14796876bb30abffba90a5a77cba3790441f15271ed9d SHA512 faccece665e6db1f514645b9a55b0d40d6956d74be9ac5318c9e15bbd81f4034b040d7ff1f708e3db5a4e87ce1356c26e3b78a4cb60b29c47ee936f64dfe3062 WHIRLPOOL 8518a6eb22e8de12a3cd6f8d4078b637b23c718c3a4f4d54cbe837d85f410fd2464ace592f565755db468d2d195aee65049c999b18e8564c18dd5753f7304ed5
 EBUILD gettext_i18n_rails-1.1.0.ebuild 1214 SHA256 5e71068bd20b39930449bc21d2aa6101321979532fc3683e4077b743970417b5 SHA512 3b5eb497255b56b6677500c48f2035a74116a0df8193209003e3180d4d69fcf3628a1381f8636285ec433d67d60aeb6966fab13af21ca169cd93dc5f0bd4e34b WHIRLPOOL b430a07dd2ef1fc26de62d34db1c7a10f40ef0cc4649fcf77d78848428c54fe7139eae2535de5110e4b87c479bd4bfe948357dcd3ea92ddd32f46eb9edca4455
 EBUILD gettext_i18n_rails-1.2.0.ebuild 1163 SHA256 f331b19b0f49c35629b9e2ef0c6cd6fca528dfdd3cdeda8378badcf61e1d9f30 SHA512 cf4d1bb5aa60ddace5f4fc5aa5e91bdce99ce105153353f1a688b1db32cee6a1e1ae72218d0c1a9658849f6ee8b5df69afcca081f748b442be1402541dab096f WHIRLPOOL 00ee14579f81497de155e9fc33fecc658c10bb9c13446b51abca63e5218464dfa79a0846986d7ba913531c042c18973e4d2ed5c024a61025131d1dce78597317
-MISC ChangeLog 4877 SHA256 27a802194784c2b7bed4177d78906671dc7e0e7776eba7608f318b037c2c42ef SHA512 8362db79c449f974b967db521e45c32ef5c53466c9b1da1d5803e3c8cf4ba8ba048b0fd5e559096e7cf512a9915a1fe76fda80301cb6fed6370e4760121af295 WHIRLPOOL c9fab287c42722d5aa376c0269d6a8fa606b9aa0b512d93149c3c16f34f9fb0515241e64b9020cbcdac30a8b13bfb2481ab6eb8e2b2a06502350a39b2738fed1
+MISC ChangeLog 4979 SHA256 de4a1f7b5075bd00cc5e080ff8a3f451e4a61e3304da994d952b93df1b9545b6 SHA512 8eff175711eebb946e895ad0069b46cfd89e606e7777165b2bea199fa15c981569f166eda74075b3c8914a4ddb544fc410b5be393bf64ff45cd1c194b01869f5 WHIRLPOOL 32b872f59ec775a0759da36c330e010671eaede6341442f228a4d5f801202c2853cb34b97c36c8284bea6fc15dcc36164c4a05b81a4195aac366c4bb8dd0b90d
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVAHNOAAoJELp701BxlEWfw6EP/AisRp9O+EPxda8vjNM0QsRK
-1dpS63WT+SnfE1r2g5MoFpGHxY9EE8Pm7uWqi02FABZn+Z26Yy5b/Hm5Wlks0tjh
-ce+h8pCoOOufTBTJSwF8ZxK/xx8/YlSvvcLbUUarqrSYReNcSIUDwyFqZMhFySxR
-3nnZOVs75z294UlJZXCOJDsp2FPYTMFq8AxSFonOqEy8f4z7FxipEiKuklGtXffq
-WNsNyO29p2ycG0w3nf9L+HZQgeMsgIZ1wriOxJBhb0/6xjiXL8ddzA6at2fDtApH
-+zh2UkQc9RT4gGocFI7VOm1Kt+wZBAudHlnlfa+tR5JyS4X7lfqFeJay7GYdDRr+
-1scv8gkYrMV305M22PcFC0AQS0qRc/C6Tx8+v15ZRqMQQJ+xT8kT7vV/N/rqMjwQ
-S7p7EFMaNb7NBKoF1kQE0rnHPB7rf390FCdh9CS5oAnWu4m1hCRdI6yQaFaXqbzB
-/mVAKwEye9Nmd06t3x+EW7WNxpSG8C9udTKA0qPx9eNxg6I9aNS7c7lEesQPG4ps
-Y1w0C1ZpaQG8puwA+mQm4ROW1ixqvj4HGggmJlcnsHNmpB+dk0UK8YC64seBp5yP
-IFXZx2XVNZf1vaIjrEY8rtPr3X7PetbUpi51T7zwT+U3syV+rpbNvHEEf3Y+S1iL
-baVkzA3qn0Pu/q5o0bRR
-=cwVh
+iF4EAREIAAYFAlUBNy0ACgkQiIP6VqMIqNfY2gD9GfHqHLirgN+uLWu0YYDz/15X
+/9p3WelkBini0kp5eS4BAI46NN42rSBkAiT+xjsAsnuaZ6Pa7DocKlk9yW/BkmXt
+=gTBD
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/gettext_i18n_rails/gettext_i18n_rails-0.10.0.ebuild b/dev-ruby/gettext_i18n_rails/gettext_i18n_rails-0.10.0.ebuild
deleted file mode 100644
index 9ba4f9c063ae..000000000000
--- a/dev-ruby/gettext_i18n_rails/gettext_i18n_rails-0.10.0.ebuild
+++ /dev/null
@@ -1,35 +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/gettext_i18n_rails/gettext_i18n_rails-0.10.0.ebuild,v 1.3 2014/08/05 16:00:57 mrueg Exp $
-
-EAPI=5
-
-# jruby support requires sqlite3 support for jruby.
-USE_RUBY="ruby19"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="Readme.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="init.rb"
-
-inherit ruby-fakegem
-
-DESCRIPTION="FastGettext / Rails integration"
-HOMEPAGE="https://github.com/grosser/gettext_i18n_rails"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/activerecord[sqlite3] dev-ruby/temple )"
-ruby_add_rdepend ">=dev-ruby/fast_gettext-0.4.8"
-
-all_ruby_prepare() {
-	rm Gemfile Gemfile.lock || die
-
-	# Remove specs for slim and hamlet, template engines we don't package.
-	rm spec/gettext_i18n_rails/slim_parser_spec.rb spec/gettext_i18n_rails/haml_parser_spec.rb || die
-}
diff --git a/dev-ruby/haml/ChangeLog b/dev-ruby/haml/ChangeLog
index 7fbd7580c3c6..d5692c6152a8 100644
--- a/dev-ruby/haml/ChangeLog
+++ b/dev-ruby/haml/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/haml
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/haml/ChangeLog,v 1.97 2014/08/15 14:01:04 blueness Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/haml/ChangeLog,v 1.98 2015/03/12 06:51:25 graaff Exp $
+
+  12 Mar 2015; Hans de Graaff <graaff@gentoo.org> -haml-3.1.8-r1.ebuild:
+  Cleanup.
 
   15 Aug 2014; Anthony G. Basile <blueness@gentoo.org> haml-3.1.8-r1.ebuild,
   haml-3.1.8-r2.ebuild, haml-4.0.3.ebuild, haml-4.0.5.ebuild:
diff --git a/dev-ruby/haml/Manifest b/dev-ruby/haml/Manifest
index 9e9afbcabfad..9e22805a1227 100644
--- a/dev-ruby/haml/Manifest
+++ b/dev-ruby/haml/Manifest
@@ -5,26 +5,15 @@ AUX haml-3.1.6-sass.patch 568 SHA256 bf1d8387aab6f23fe2a35ab1157c03bf316492090d3
 DIST haml-3.1.8.gem 367616 SHA256 44f69d51810cfc5a0ffbb03fdc646afb2c2f4f841eacfab87caba02b59ae1617 SHA512 cb65e4b6b4eaf31b0d81376e819baf3a8e5216baa18fca744ac3297d207f26120c6571693459e06490dab587e7936624d14852504dd502de39dac3052181d4e7 WHIRLPOOL e6ea1e5f3074ec72d69ee99eeefacdea3dc36ff89ac6f29ae5e4fc0cc826ace375688a6126b1739e5bde0722fe0cf321f87561f68214ee72f5c60e1f8115c5a8
 DIST haml-4.0.3.gem 115712 SHA256 d94e937e5bc92da72e1d101e1ba983a5a84eb84b1981709b93fdfc349b833fd1 SHA512 1ecca4187a53071e17d4536ea7983d273a13630b66789640052da86376146a3f119175cc050c7fa7eeddc996f7bf0ad6728f215284fcb6918c82326c5a516f79 WHIRLPOOL 79aca5570b293617049fdc9981a7c85e7011b092485e2cd4688659e495c22718fbd2339e389efd08024b95f685436b80cbaf497d9f31388ebc59b275c0c3e57f
 DIST haml-4.0.5.gem 116736 SHA256 05b1cde6e0d770e800cb74f6bf1212446bc4573bbbfecc4002e1085c2658bff6 SHA512 2fe8658584ae08504a52a1d7a6b01fbfce5b65547328b90ed89f0276c74ac28ec34757d4a64886e6dfa6749ed2692e27ff24e7cb6b475e69a5628f02fbb779a9 WHIRLPOOL 161a008951eeb5f044ebacba70a48085a3c61fa2c538022a472f23fe22a31c4927cb1145c38996e960775a60a6fc950be7715515419363b0c0ee51ea65448c3a
-EBUILD haml-3.1.8-r1.ebuild 1588 SHA256 402700f78116776c4e7eac56988e6233fedb806658c545baba03a6f9d40a5439 SHA512 79d2606ba618e43e314781114c925b21ac788f2144f15c2aa227e911aedca77348df01b73cfdd19effe2739d2816a4c6b6708897d277744a177356b22baa9eae WHIRLPOOL 0c6629e3c9b341b34e96245f6752b43915f10e6b265e447d94fce82631b0256f845ac0909636e579fe9d088dfb1a5b9884de032e293a52f1f3dcf0364d6576b3
 EBUILD haml-3.1.8-r2.ebuild 1614 SHA256 d891e904631ad8460ded8c21fbb47f522d41bb1d3a36015dfceff3e12632d4eb SHA512 8f8f89b6bfe5a5e7d284f9b7192b6bf12a4a2fbcd8dfb6539cd5ca2f7749c714c763eab2191b9776c32b41e2406939b4425065bb4f7618772deffa21cfc646ac WHIRLPOOL 287cd7d5b60d27632d808917cd6fcf0ec24a3533be4f39338fbdcce66d93ab39f02e5eaf415027fd5a288c4bcfc78f9cd3e5b0f1a58e3384761dfb74ea2c2f09
 EBUILD haml-4.0.3.ebuild 1063 SHA256 cd39c8bc9f722575f8ad04bdea67a02603941f7568f617858c88a3962ee8641a SHA512 558a2fab7a4ce7141ace23089b26d7fe5966ab052f56659a2491056ea14d0d392fc89b3979308aef4dc7ad7d2dd7571220aaf225615323529a77febd1b2fe198 WHIRLPOOL aad001e837f6d7d5f68bd67b89062b2e2665ba985cacdf510fff5ef5a93b9c8a420f602deb211b19cb15232635ab92d0dc676c27b220771eb8df1d4d2835641a
 EBUILD haml-4.0.5.ebuild 1372 SHA256 fcdc98cd8927a39bf8a8d042e631eebdb1d11a05581514ac72050b232e4e621c SHA512 40ce1a664530401fce4265a6d985f9efec870479c17b73d681298bbbd2516ea8e2aadde2df79fe222238a162a9caacbee4018c718cfebb9673f0dfb97b55b05d WHIRLPOOL 9f8513296b360ca5f31225375f7eb91889b02ee290e64dd228bda0a06d04c3c074684a9e201bd74720af20009672ea1a511feae979da477e0608afab648df058
-MISC ChangeLog 13480 SHA256 34a4520d494ad31c499360abcf6bbc2ae667d9df37cacdf8af236c369cfacee4 SHA512 0606cfdc833f6ef536feb2862dbc8c1474c025bb8ced56d2c9d719b24f469d3eb387faac7ad4f17d880c76b7c7829acf2f3faee4cb69fc14886a3d0b718c14ac WHIRLPOOL fe0c7ed24ff60c5df8cd55a64c0df19df726188f2e303243a88c0072cbd45d5c4fb3fe24efff01dfcfe8225c026dd0636b71fbae50229f08bd1b878cd4f8a409
+MISC ChangeLog 13563 SHA256 e935906dc96afe2d299355855142039b4870b129fd28e1c0472650d250995650 SHA512 75faef46912e735f7c2cff073669062e298bffa13008815f19f252c17ed2b879c301d2061d92fd6926e2919ee0c10bff9113416f72931426ccf4a2ec8a57ec6e WHIRLPOOL 282332ab88096c1ea4d1439d55fdb9bddad21a54ce31ff6d5b2ce23892d3c95446b12be45e828d0b5d547fa9e95847d85ce96df71fd310c3da0a5071ba5b4694
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJT7hMoAAoJEJOE+m71LUu6WwsP/R5XkQhbdDId6ANmNQC40qgA
-LzseKaadvsen/ljth/xLocxDkEVYYtWtZmQ1ADPf8c6WnsWTchNsDLBIJTnhsWQz
-NWf/lg0XCp7oLs7eQgbWUULmLZLXs+9EWVzosH/tD6VbJ3C6upR9CUP8bYW3yLv0
-DBhrL86PtoOWQtTcR2rcVivc1IzzCwVuLO0hJlHzg9ME3kzvdwywBAqLPTWKMkOn
-Y9ReMDCg3TboxSVLmEt3K+a7y6CCP2tbjPdORK+RYt2j7g+6V5cfc9/7hueyQlew
-J9nAljL32hUWFcrEj5YJ0At011ineuZV6zZaT0Eizg56QuySXZ7OZoVjUM2y3oEh
-QEs57oHjIjZlWVABElazcIWSxivyLAOVbG7kQkisykFQvPtVj/cZ4DZGN0MNQUMx
-Vj7mzkDVUCaoX+ajPR+HGzTnynPcT/idrgNjG2asoEOJ+QnOTQrYA25Vps+7U9qj
-wIMsyEdrWe5xI0P66uF17wJ17pqKt2Mowt7PRAYfE1pne0LDpc3WTz7bexvogLCV
-HME6sUhxarpHWmKCafFCLOMicgPB/v361lybY97vH4rfY71BHJPeaUuK0pXHQPlV
-AQ0e1SCs9YgIbZePM3NLeVmNX07Y9DZAViHwkZ7m/kueZE0bp1P5MsQab4BXhV+p
-3cxybEFtSJgb2E0jBNxO
-=iqBZ
+iF4EAREIAAYFAlUBN24ACgkQiIP6VqMIqNcVfAEAlAadLkMtrvteWvah7/MJVui5
+yps2dg7LxDNZjtj9Ew8A/0jEBgpQREktjLpYqS21vEov+mVWhE1It3pHUInb1rUH
+=lRPG
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/haml/haml-3.1.8-r1.ebuild b/dev-ruby/haml/haml-3.1.8-r1.ebuild
deleted file mode 100644
index dd87ad65cfa2..000000000000
--- a/dev-ruby/haml/haml-3.1.8-r1.ebuild
+++ /dev/null
@@ -1,63 +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/haml/haml-3.1.8-r1.ebuild,v 1.6 2014/08/15 14:01:04 blueness Exp $
-
-EAPI=5
-
-USE_RUBY="ruby19"
-
-RUBY_FAKEGEM_TASK_TEST="test"
-RUBY_FAKEGEM_TASK_DOC="-Ilib doc"
-
-RUBY_FAKEGEM_EXTRADOC="CONTRIBUTING README.md"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_EXTRAINSTALL="init.rb rails VERSION VERSION_NAME"
-
-inherit ruby-fakegem
-
-DESCRIPTION="HAML - a ruby web page templating engine"
-HOMEPAGE="http://haml-lang.com/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# TODO: haml has some emacs modes that it could be installing, in case
-IUSE=""
-
-RESTRICT="test"
-
-ruby_add_rdepend "dev-ruby/sass"
-
-# It could use merb during testing as well, but it's not mandatory
-# ruby_add_bdepend "
-# 	test? (
-# 		dev-ruby/minitest
-# 		dev-ruby/hpricot
-# 		dev-ruby/erubis
-# 		dev-ruby/rails
-# 		dev-ruby/ruby_parser
-# 		>=dev-ruby/sass-3.2.0
-# 	)"
-ruby_add_bdepend "doc? (
-		dev-ruby/yard
-		dev-ruby/maruku
-		dev-ruby/sass
-	)"
-
-all_ruby_prepare() {
-	# unbundle sass; remove dependency over fssm and add one over sass
-	# itself.
-	rm -r vendor/ || die
-
-	pushd .. &>/dev/null
-	epatch "${FILESDIR}"/${PN}-3.1.6-sass.patch
-	sed -i \
-		-e '/vendor\//d' \
-		metadata || die
-	popd &>/dev/null
-
-	# Use newer sass and update specs to make a consistent combination.
-	sed -i -e 's/fuchsia/magenta/' test/haml/results/filters.xhtml || die
-}
diff --git a/dev-ruby/hiera/ChangeLog b/dev-ruby/hiera/ChangeLog
index 530242e2935c..eadbb60ab94c 100644
--- a/dev-ruby/hiera/ChangeLog
+++ b/dev-ruby/hiera/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/hiera
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hiera/ChangeLog,v 1.31 2014/12/22 13:58:34 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hiera/ChangeLog,v 1.32 2015/03/12 06:52:17 graaff Exp $
+
+  12 Mar 2015; Hans de Graaff <graaff@gentoo.org> -hiera-1.2.1.ebuild:
+  Cleanup.
 
   22 Dec 2014; Agostino Sarubbo <ago@gentoo.org> hiera-1.3.4.ebuild:
   Stable for sparc, wrt bug #513290
diff --git a/dev-ruby/hiera/Manifest b/dev-ruby/hiera/Manifest
index 958b35a3066e..e673807f6f28 100644
--- a/dev-ruby/hiera/Manifest
+++ b/dev-ruby/hiera/Manifest
@@ -1,27 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST hiera-1.2.1.gem 25600 SHA256 4847d2161f32654572e8944aadb273e75d8fb9c562fe390100a0632bb3440e71 SHA512 e7df2b144a80a2d993a12fdf9beb072b3882cc8b503ab74120be8d91586ce6e71eee3d83cafe64d8e81282958ea8baf1c1e660142a6a5f575d43161c229e0150 WHIRLPOOL 0e4f79abceeacecf11f47bbfdb001833235ae5b280390d75b6609f8a292653cfd752feb5b3b922871c6a7f5bc6e8076a6817555c6b0369a6a8a29d2e65ce92fb
 DIST hiera-1.3.4.gem 30208 SHA256 a3c85385ddda64916d453efeeb965151dc2454428d88f04f40d539559af27020 SHA512 be3b702f0e3c2e61d8d6a8c1ff1280f9a1be3dc4adc2a605b4ee3b5db82d513bd58fb6b22ef546a625cf4eefa43d597365187b776ee92c2dd9946eaa4b147128 WHIRLPOOL 27334cb8b3aef8cd40eb74933fac99e30a5eda7770e980093092465f2eaf7e1e714e47428e3b585fc67f490b91eb4c22fd42ac66110b8cf6365650ace00840c8
-EBUILD hiera-1.2.1.ebuild 784 SHA256 a68aebebcbd1f85d83cde0dbffb9941f3130dd3a5465749de909bda036b7eb2b SHA512 036ad5eb229d92362b510bf4976ad491a0f30e65dc725b6ca1ab3616c99425b9b0b8700b757dd133c886c3ed1b2aedc963f45138c2da1050c0c86e08e4099766 WHIRLPOOL c9e0380b04f417f64bcda9e535550bdb4d784518a5f8d72a9eb748a0c1a72bcbbdb98a5249afb628f61faf275ac109fbd47fcb898faeb7594b4973bb9cba1446
 EBUILD hiera-1.3.4-r1.ebuild 808 SHA256 f98bb5c6bf34736e8dcdc826ae55ad8ff3969608a313072b89c508d6520823f3 SHA512 ae94fbe647affcfe977741bdc831cb091a4183ce241333fba3e91b5deb8b7b471b3a894a79f5a4d853eebbc5e426687db1a0134849b47b58f58d8350e9487ee8 WHIRLPOOL 68c487129fb5f0ed785903bc05147b4bead034b9338b3cbb4765a24cc76ea27415dedf49a5f410f05949414fc0e525896141aa2c6ddba30b7d07d44cc2bb666f
 EBUILD hiera-1.3.4.ebuild 789 SHA256 a4623cc496cdb1166ec6557ee78acfbee47077debf0ebc60cc66c2d32a37992a SHA512 f0268133b1692694402e1ab70a7c4e10691814d03a85b3dccf99942bb10ae35ce096a49236248c1876d010184ed138323ae09891dfe1eb91608a1b7b74a06a90 WHIRLPOOL 499f2b08b33ff4117fc8c66b2d6a394e7fdec28044caae2e86a7ff5b17ae8227fcafd5d391dfd41add5b58124c079050e87c7ef5377db27c61955466dc0648f7
-MISC ChangeLog 4140 SHA256 e3427e224820b9075286811df56fe0088e2f3ea1fd1e7947adaec16a7347ac11 SHA512 596c607feb0f734e0ae0b4c9369427f3992512f68051425311f1c246c11c36e40e1dc03ddf3850bd97a24a884600effa3c178ce1e39fb03f3a455b33cc0fefb7 WHIRLPOOL 83041a59329ddf0adbfff7c9058be8e06b695bd43acd6f0855d36363f224da0dae556ad6cb5508af511c83c4ae444301b99ffb9c71171f2439f11fa897a4d50d
+MISC ChangeLog 4226 SHA256 d7551b94d428e3b8618b089fda53b2a581597f066d5aba5f1f8be3753a7c3a01 SHA512 746569cec57df57950aa6ba93de8a1ac73ccfb5ea6c7ff19d0bce8f46ce5ea426cf46c4c27aadcbfd01f32aaf1115e29f0c633896ee921e7adb6c975f22ccadf WHIRLPOOL f406fc001bae14b5220513ac8dc345a99fe42fc6bedcc51b81bc45fb7fa8421ad6582f647f06940676e95266a6acf1b812a02db8666b74241510f40bdf8d5ac8
 MISC metadata.xml 247 SHA256 85b95e8165c6378ff5abccc7a09589eefb34856e73e58334c1480a00aedfb2be SHA512 83c30112436ffe8516a2cb69fabaff17bbbdc5a0b4d48d5235135f122b489ab0f1a9b1f989d3a77ad374d6f90f751a8edf0f6db260bfa2a915e19531e7186df7 WHIRLPOOL beb688220d43265344dcb663f7ba0c44dbdd87fe26bd859ff18b6aa70141e418d38bc71dde9f36e977ad8bfb13fa1080dd468cfc082c0787f974101ed7f8a8c6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUmCOLAAoJELp701BxlEWfO+kP/jIUFMIcQHGU3H4P3FM/qx85
-A87qGACi+s0GCBmf4sBTSX+LWFmbhNwN95HlJw+SQE9/xogIbqO+Ov9S8h9L9FFB
-+rQnD24Te5dIQkqjJx2jQDCmkRz+H4w7VPayhFcAYV3rhSll3HJIovicv6tsptsg
-0/YmVhzcE0aVRMYkzc979KXwsHjOGWPARLGiAnpqSCR0fUz47hbWMyD4eHI89wzF
-U2Mnv4wYai6SX80qhVC8kfid4xJB7AoQAPzu33xULQWKV1pJ/UFqYI0fAJms84Wk
-f70x0MsXFGxrpQISqY9c7re55a2Ti2De90huFKtI/pokExDpfHI/28Uy8iXEvqtz
-iCGa8+p6B+P7aOddBb0IVK9h40Z4DtM/ynHyaZfEVCRP/+UQs1W4LHzz3TrQ6AVX
-xZMwaNsOMI8lTyt5Wsu4vRy3Pvdk4+zb0SeVdkgOX6nlSCcGEKjb+7lKABM4UvJ9
-L0xe6E26KDFOBI4s3XB3y6+RgztZj6QxCTvy8sCHtGw25MwZhWJIWQWKZvl//4oO
-diNlU080gDNDHzAvYJ3Z41qwpxavRuLBygvRdBtAHww3Vgt2Gn1xf0GhsMEVl62l
-l8jVZX9xK6hmcztwUYwl6Bm/G00j1TpOcWxMMKt9VnGWr7R7qVcVIBdjT9BQhVx+
-qPeooVPrW549oPzpK7YE
-=03Zm
+iF4EAREIAAYFAlUBN6IACgkQiIP6VqMIqNd8eAD+LajEHfm9pT2l2FisRSio43hq
+e9MFWx6QeTpHJV+8n2MA/3Jt9gjbAkRYhXw+RHBfddQah5a1PSeIHQJzLKM3pNIC
+=UGcf
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/hiera/hiera-1.2.1.ebuild b/dev-ruby/hiera/hiera-1.2.1.ebuild
deleted file mode 100644
index 59b930b68338..000000000000
--- a/dev-ruby/hiera/hiera-1.2.1.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/hiera/hiera-1.2.1.ebuild,v 1.9 2014/11/11 11:06:51 mrueg Exp $
-
-EAPI=5
-
-USE_RUBY="ruby19"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A simple pluggable Hierarchical Database"
-HOMEPAGE="http://projects.puppetlabs.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-KEYWORDS="amd64 hppa ppc sparc x86"
-
-ruby_add_bdepend "test? ( dev-ruby/mocha )"
-
-ruby_add_rdepend "dev-ruby/json"
-
-all_ruby_prepare() {
-	# Our json package is either the compiled version or the pure
-	# version. Fix gemspec accordingly.
-	sed -i -e 's/json_pure/json/' ../metadata || die
-}
diff --git a/dev-ruby/i18n/ChangeLog b/dev-ruby/i18n/ChangeLog
index f5940d868ab4..778f2473065e 100644
--- a/dev-ruby/i18n/ChangeLog
+++ b/dev-ruby/i18n/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/i18n
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/i18n/ChangeLog,v 1.70 2014/12/31 12:18:07 graaff Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/i18n/ChangeLog,v 1.71 2015/03/12 06:57:13 graaff Exp $
+
+  12 Mar 2015; Hans de Graaff <graaff@gentoo.org> -i18n-0.6.9.ebuild:
+  Cleanup.
 
   31 Dec 2014; Hans de Graaff <graaff@gentoo.org> i18n-0.6.9.ebuild,
   i18n-0.6.9-r1.ebuild, i18n-0.6.11.ebuild:
diff --git a/dev-ruby/i18n/Manifest b/dev-ruby/i18n/Manifest
index 99be432cb038..aa873f58f2b4 100644
--- a/dev-ruby/i18n/Manifest
+++ b/dev-ruby/i18n/Manifest
@@ -6,14 +6,13 @@ DIST i18n-0.6.9.gem 60416 SHA256 1cd368e0b3854e8067955643892b18040e1d17f3c768dae
 DIST i18n-0.7.0.tar.gz 57647 SHA256 8a9ea123661e5da978ecffadc8d1b7ea50ba2d8e9de1455d61e7848cc6c2c855 SHA512 8824feb3fb99bba759963d2ae34555f27b85dbac3d3001168471a27e47fc805e5ffe5c3b4e10d6ca4b2e2524ec16c98260b981ef504f274aab93f912a57d2e14 WHIRLPOOL 0f16ab5f06ae7ec75eefbec985d183dac5a2cd572d6c70fc3de8616bec8834e210a5660a74657ae3397017962253350e6bd926c0d2c9509400ceadc5b365fa9d
 EBUILD i18n-0.6.11.ebuild 1245 SHA256 e07a94f0bf2e1731002c11b50d852d0414baf704ddc5d1c8d5b0b6e14db5d8d1 SHA512 26568f224d8d0b26bf158766b0b2fcbe2c612a5437c6528cced662a43374478ccd42b09706fec0d71a9d59c31c62735f2ae4f1ec1eeeac4cafe9b135be03b21a WHIRLPOOL 3a1a5fe5ddd636a3a010481419ad3736c73a9a1e8072161c8e16b632efda4df2a2527c001c60fbf42953418643d98c3828268108be1309f76fac33207e97ee7e
 EBUILD i18n-0.6.9-r1.ebuild 1224 SHA256 ec13c54439797b37623381fcb020bb18e83b687741386e72a7e5dc289a1da0ec SHA512 aced3de6589e5606a61c0e2db607d019588d3fb4d8734903f668f7c7dc768bb673f94218b2e98c0161c21296e2c677f61bf69848a52ff0c0a1b296328cfe092a WHIRLPOOL 27b38abb0a5f4b7d3bc667eb047d95e3c0450a20273609cb0b149fa1cf6d9fd0e822bf77019deec3f676c20e2ec6289930ea6b32a641fb5060befc3e65f8255f
-EBUILD i18n-0.6.9.ebuild 1092 SHA256 a890f186e1c0970ce8e5df9d0e8927b9c0ce39e918bc4e086b07a6056bacb17b SHA512 b8ec121e09ed0e9cc5b99d42d0bc2e9e79a52d07f5deeb5a653347f2c8365c67607a9f510d53628effe9486ab9dc28ff184f3fbddfd40953339ff8644a460c14 WHIRLPOOL ec5c93d1b651c64468d0f4c47b5b743e92fa9a8f523dffad01a588d3d84f8ff52b2f34fd0c15d50c1949d050676992e49df16ff29920e50f553ec980701b90fc
 EBUILD i18n-0.7.0.ebuild 1448 SHA256 825be89c81ad49177b8134309b75a09bfbb45d52feb1ebb5d67e67659172150e SHA512 95f415ee5514ab04c5ef8e6044e30413db277d1f5eb891bd4358fc45c74b68df26228c84945f1a982374835df43f9a5dc8864bac5c80dc4dadf8d71ed003c94d WHIRLPOOL eec95f76fa8ef7afebe80693555f1b4586696f074eeeac30ab32fd542b10692c7f34b9b8089662f2f206c7d62e3ff1b352c856e2a19cc59aa0a6f2837be5968f
-MISC ChangeLog 9291 SHA256 addef54f3b98aa7ea85f663804df3047b0723bfb6d77683c01ed681843851dcf SHA512 d544f3b6dac641153eac72d61ea906a2974f9de045ed4d237ad9ddb4463031afdc72ce7af4b882a63b573a3961a88b0721e59d10c1a3d0d7488b8f2cdc8193a6 WHIRLPOOL 77884a2cfe89a4d41cd5d5b849a4611464c48eb1ef451a65d2108bf0bf8925e60bc4fd009cab4fc534f3b1ab6c65f485959c0151bb3574f828ec753b290456a3
+MISC ChangeLog 9373 SHA256 970daea2cfe140ff5488d9bcf8c69d26c25a53f3abb9ed69e5ffb1ffea62dca7 SHA512 f9d548dcfc79caf2db88090a11ade09b1433612a33799334915ff4e2fc68a9e0769af3e74633be3a302f0af9081c2746f4f737c99cdf89631d2cb3e4ebc2f9c5 WHIRLPOOL d9c9d8cfa047c92b3cfedf54001c940ba28aec69fc52b82a571c24e3ba1e78ca0e2791b9ac093d32e8796e19037e94b4f28ca0a03db5c21be85a246b116b8cf1
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlSj6YAACgkQiIP6VqMIqNdzyQD5AZT2HgOt83L23cg8iBi7ytV9
-PQpM2lzFpOyMobL6MLEA/1j0vwKCYwqaJf17+NoTA+aUAL81XDkXCY52V6N/Facz
-=JQ3b
+iF4EAREIAAYFAlUBOMoACgkQiIP6VqMIqNeOKQD/UsqF/K6Afs/JuTfwD+TMzp2T
+JwLQZ49f/TyhPCCHfYYA/3WxUVLQQyqG2mU9GaJ2UIT2egJslG8/k0dfqrTtscNT
+=fbjL
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/i18n/i18n-0.6.9.ebuild b/dev-ruby/i18n/i18n-0.6.9.ebuild
deleted file mode 100644
index ed115223cdf7..000000000000
--- a/dev-ruby/i18n/i18n-0.6.9.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/i18n/i18n-0.6.9.ebuild,v 1.4 2014/12/31 12:18:07 graaff Exp $
-
-EAPI=5
-
-USE_RUBY="ruby19"
-
-RUBY_FAKEGEM_RECIPE_TEST="test"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.textile"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Add Internationalization support to your Ruby application"
-HOMEPAGE="http://rails-i18n.org/"
-
-LICENSE="MIT"
-SLOT="0.6"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~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/activesupport
-	dev-ruby/mocha:0.12
-	dev-ruby/test_declarative )"
-
-each_ruby_test() {
-	${RUBY} -w -Ilib -Itest test/all.rb || die
-}
-
-all_ruby_prepare() {
-	#Bundler isn't really necessary here, and it doesn't work with jruby
-	#Tests fail for ruby18 with >=mocha-0.13
-	sed -i -e "15s/require 'bundler\/setup'//"\
-		-e "/require 'mocha'/i gem 'mocha', '~>0.12.0'" test/test_helper.rb || die
-}