gentoo resync : 02.05.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-05-02 14:13:35 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-05-02 14:13:35 +0100
commit: 7c7c2c9727d6b2ff30945b5aea0d575e1c406d8b (patch)
tree: bac2a67fb24ac0836147fe370d30e1610ae1845d /dev-ruby
parent: 2f8db31405fac68eea6f7257d58529243815033b (diff)
69 files changed, 383 insertions, 654 deletions
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 4167aac993bd..a51a95d3c73d 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/bones/Manifest b/dev-ruby/bones/Manifest
index d2f9728e254f..c78afe2f26e0 100644
--- a/dev-ruby/bones/Manifest
+++ b/dev-ruby/bones/Manifest
@@ -1,4 +1,5 @@
 AUX bones-3.8.1-builder.patch 409 BLAKE2B 0e911869f825608db6eee05fc16969db537fdfd8bdbdc4b92fcaf270b402948fae97852c2830cfba5fafa2e53fdc1cf3e35d0968d0bab6a5848d9a827bb38ed3 SHA512 e27aff9a7ef66986abd10aa999f225a58b9272b9fbd7444f84ccc6de5440282a2a25cf2fb8c85be00ebe317fcff78afd84f7fcf2f3523801e09f533419d8bc91
 DIST bones-3.8.4.gem 39936 BLAKE2B 2d666baa5e3df38e74f2ff45f3edf8f13fcc974e71df850a604c6d93d0015d7d9b05121c2e09b6f2f9af8adb8ccd08b4540784b27bfd466d977e565e8dd3031b SHA512 884eb6d84e121daf576eac427a97d69f3d6dfe1bd9c55fc7d821a0658193cbc3864e71b07af00cb6c629c180fce1faa6b314a6607878b665b62208fc1af7fbc4
 EBUILD bones-3.8.4-r1.ebuild 707 BLAKE2B 0fff24c104ce5dee1e96e442f980a2875649328e82ad75b1b27d3a96cbf9113222db5013216fc0bbaaf090683de9b557e78033fba8b74087d1cde92dcffd5b78 SHA512 ce407784725d6718b028bed7ea148326b6a020994a6296ef3f27362e99b0420ca4ec5783059a84e89bb8f27ab967726087e07e226dae16f4362d5e3cde82a2f6
+EBUILD bones-3.8.4-r2.ebuild 760 BLAKE2B af1fc01a73d548909f3fb373169f9835686e31757d363a9060287a41d12058165946fe5adebb706e8890d0a49d02394ddf86f14523c132b16251f2252a777de2 SHA512 116567abd60d086e389eb4203707b6bce0c9af474fce9ac6f5a277b919d0314c0c262538ad482a8156f989b660e1391d72fc4630557e6393f9e8c5ab7b48d572
 MISC metadata.xml 335 BLAKE2B ccd4963b83ddeb40acfe1d276cc506a2509ca02c471a9fbda6da01e62b3c9029fb464ae6c37c26feb0d6138b00b8d644a75dca428734f597d3b8b73e69865835 SHA512 a6d0af1ee39b0005ed71dd26063ab49cba872fe4a3a4d4ecc03a423837ec70bdf6804571ac87e41d2c049d3b2dadb03f5fb0ef740ca7daa317fb2f6438b2c212
diff --git a/dev-ruby/bones/bones-3.8.4-r2.ebuild b/dev-ruby/bones/bones-3.8.4-r2.ebuild
new file mode 100644
index 000000000000..444e1d22f300
--- /dev/null
+++ b/dev-ruby/bones/bones-3.8.4-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+RUBY_FAKEGEM_EXTRADOC="History.txt README.rdoc"
+
+RUBY_FAKEGEM_EXTRAINSTALL="default version.txt"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Tool that creates new Ruby projects from a code skeleton"
+HOMEPAGE="https://github.com/TwP/bones"
+
+IUSE="test"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+ruby_add_rdepend "
+	dev-ruby/builder:*
+	>=dev-ruby/loquacious-1.9.1
+	>=dev-ruby/little-plugger-1.1.3
+	=dev-ruby/rake-12*"
+
+all_ruby_prepare() {
+	eapply "${FILESDIR}"/${PN}-3.8.1-builder.patch
+
+	sed -i -e '/rdoc/,/Gem::Dependency/ s:~>:>=:' ../metadata || die
+}
diff --git a/dev-ruby/childprocess/Manifest b/dev-ruby/childprocess/Manifest
index de6ec48f3358..8ffa2b703ace 100644
--- a/dev-ruby/childprocess/Manifest
+++ b/dev-ruby/childprocess/Manifest
@@ -1,11 +1,7 @@
 DIST childprocess-0.6.3.gem 31744 BLAKE2B 18fedbe7fbfa1a3954e74206b1f6207351d430a2092dda1f230f54c790c5531cf2a4f302bb86a9adf044e16cfafb132ece45152defd0c4c18445f49d5466f2b1 SHA512 93d2dbd23dfbaa6eb7eaf1c5791802180aece373aa912e78b1c3652e4e96f0e73ef948e484715863eef95e6af6daa1292944ebe987c331ce0d59ba086c803db5
-DIST childprocess-0.7.0.gem 32256 BLAKE2B 58654d088b2b45917ce279de5178b21694ddb32c2771eb04b2b9de2db5e1f4cfcd6250947a38f51332dbdde730118cd63cd5432f0d54138b795416bbc6589365 SHA512 f06203ffecc09f5ab2dd2fe003de0e1f96906b1c5966c2dd630cccae046fd4b4efc6f8c96d4c825af2b4ab2e0e8dd63f6dee97701627d0ad311f0d8395c89c8a
-DIST childprocess-0.7.1.gem 32256 BLAKE2B 428eef33c465e8805c855a9389fb0f393e04c48f0f30de4cd2f407cbf403fcfd621283cc9aafcc8336c19415245b180d46036c0e50910fcd8543ad346e0faec3 SHA512 c8e22a3244b5f6315ea003b20feb3f5a576c73938d8eb730f3aea99dc63662497a954531139983ffce74ebc089609e9ecc665144cfa6f05c699804615ca68902
 DIST childprocess-0.8.0.gem 32768 BLAKE2B c473da69bd38bda1e28e6adbac7b11597b05eafa58315996435052683f2e3ed500f3c83b27b17859115e1113e0da726007d0ccac3fee171b5338a9026482ac6f SHA512 7e10c15930012bf99ea28afa677a6f745d4e6ebfc21f21f7101111c5a2d35df4fb146bbddb4d1e7a6711324ee7604af50995960570e85ed3f8fe087c59fc02cf
 DIST childprocess-0.9.0.gem 32768 BLAKE2B cb836c2cc3f9d6bda1db88aec8692499dae2a325611dcdfae482fd6a7bbf065612f0efbe140c08447566b8759ce125968a153d6df38889403d98bc94fe397d7b SHA512 5a788556e14491b0801b8a533d8d8eebba726af6417c8c6c7146738fcae2f92e9faa090312e77d974852003f5a4d155d5307b0c9d1ff1d18173ad653d21f63d8
 EBUILD childprocess-0.6.3.ebuild 859 BLAKE2B 035d58cbcaccde7a7031adf1cce7874aff5de2e7c5ed3cd9eee1299bd9adefdc656cc5bcb711ed80931492906bf6a45606e3fea77b7eb1d616b3d56ced534156 SHA512 6477a2f5c1def70a61bdb6217a66e7c01d539c87432e4e201fd3676b609724307dfdd95ecdfc255b79bce53d93737e0397669da5909f00b73c26f89028a9a52e
-EBUILD childprocess-0.7.0.ebuild 827 BLAKE2B 459b53e470695788f860f6b6c4b3c51569cf65ef6ad6e5d9926af68296b9b52dd2a1805e1612046b7ff7de04e3e4e2fd12b19c590677ca77f9225a7249af3f18 SHA512 a701f8fdbb09fee21b6657873c6afaf8b6128c7183484eafe03477faa0751ad0d46fb338f2378782a4feb16d82c1104d8f6301ed8ecb54d11484845e897d2f41
-EBUILD childprocess-0.7.1.ebuild 982 BLAKE2B e308b59240cb57815e2138d9fb6e91a4c0a7d2212029cb5bc597e4041022b41124417f0a990485f56193fb937fe9655ea65976f049fe621ee85d4b889bcf28d4 SHA512 262d468770afc3288c6923090e8b0620c9d51e569e3eb823cc7d145dfd956756b678489f9976c4492f49f0ace0fe9137b5957440ce14fe52d184e398c64af37b
 EBUILD childprocess-0.8.0.ebuild 975 BLAKE2B ea1902170503fa521ec6fb176c56d8a1054076eba8cb5378d47b3d917ac7022e6889c22337606985f19212b15e6bc0dc0e8f2414a6dd00fcaea206838bec119f SHA512 e3200509ca42c07c6869ba859cf66aecb77433e37ea1631f2a87d9d5ec5fe4dd4b8d28d4629fce0d1b924fc790d08df32e3a80823b789263e972fede3e9e8505
 EBUILD childprocess-0.9.0.ebuild 980 BLAKE2B 2ff0634d17f123d672a1c5b78d79e41f955cd616bf1c2514093cb1767174ae1616389fd884ada0bd446442ce1b5bbb4bad9d2fea11b2c566f7e8aebe0c021172 SHA512 a003735773a12085409882169c976a124ec8cce2f9fc5e0210930f819f11d40cc7891cbdd61d517f6b56cebeaf35ca6033e31292649fd4951b70514df560128a
 MISC metadata.xml 344 BLAKE2B 3cbaf9e4992ca3e9fa2283451433e35247418e190a6447453848988e305a4f04583a3ee563149774c347dbd6bac2ebb0451c19fba1d5447162707783c02ff6b9 SHA512 2995953d3ac4c6cc924859dcc2910bd303262f86d5771368956cb0a3d26db031302547154bd98cdcf189aad39e132020c0c22510c65c7830f528cbf2265d871a
diff --git a/dev-ruby/childprocess/childprocess-0.7.0.ebuild b/dev-ruby/childprocess/childprocess-0.7.0.ebuild
deleted file mode 100644
index e8c89651a6e1..000000000000
--- a/dev-ruby/childprocess/childprocess-0.7.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ruby24 -> fails tests
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Solution for controlling external programs running in the background"
-HOMEPAGE="https://github.com/jarib/childprocess"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/ffi-1.0.11"
-
-all_ruby_prepare() {
-	# Remove bundler support
-	rm Gemfile || die
-	sed -i -e "/[Bb]undler/d" Rakefile || die
-	sed -i -e "/[Cc]overalls/d" spec/spec_helper.rb || die
-	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/childprocess/childprocess-0.7.1.ebuild b/dev-ruby/childprocess/childprocess-0.7.1.ebuild
deleted file mode 100644
index 8401e8954299..000000000000
--- a/dev-ruby/childprocess/childprocess-0.7.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Solution for controlling external programs running in the background"
-HOMEPAGE="https://github.com/jarib/childprocess"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/ffi-1.0.11"
-
-all_ruby_prepare() {
-	# Remove bundler support
-	rm Gemfile || die
-	sed -i -e "/[Bb]undler/d" Rakefile || die
-	sed -i -e "/[Cc]overalls/d" spec/spec_helper.rb || die
-	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_prepare() {
-	sed -i -e "s:'ruby':'"${RUBY}"':" spec/childprocess_spec.rb || die
-}
-
-each_ruby_test() {
-	RUBYLIB=lib RSPEC_VERSION=3 ruby-ng_rspec
-}
diff --git a/dev-ruby/css_parser/Manifest b/dev-ruby/css_parser/Manifest
index ea20d340bd95..c5929ca6104f 100644
--- a/dev-ruby/css_parser/Manifest
+++ b/dev-ruby/css_parser/Manifest
@@ -1,5 +1,3 @@
-DIST css_parser-1.4.10.tar.gz 26718 BLAKE2B fe83cba6f013548e924823f93a727e09d99063e3bc118b62e96e8cbccdc9347ba004ca19627a6c6f5963f24ce8bed0a7af6c3b5bfe3b0c3f73f9f8dbb55398a7 SHA512 ad48200cd9f6fd36d1b13e8699098380c7d74e5349ed1a6aa294615800689a2959f7a91acff9679a630f525d0141f40aaade498570de4f296333c9525b0f1c22
 DIST css_parser-1.6.0.tar.gz 33251 BLAKE2B 1e28e6999675fadc1bc6a98417cc698fb2e5f16e8d8b27e186037112ac9c3cee82161c7530b962209d76d91359d68016210a371c9e8a7f7d631c7aec73bc5c81 SHA512 838baf3cc4249e890f7cf006370f148261b392549e6cc25b11246e15c8347a8877b4cc3bfe70dee18a822a9a8fc496705787262d79e177d62587f41ba6f4c4d6
-EBUILD css_parser-1.4.10.ebuild 1172 BLAKE2B 8cc8093da278956490ea473d5f96afd0f07835cef7b14761c9f958e373c2f655c00df818f8a9c04cec8dd41f0df62a2c188d28b29e3e49cf186a152971c5a3ec SHA512 fbde6d6f1b2450a4ddf27c8c9ad87c89d0013afa9a146de99a8a5133d364ff247e50d975cef629f58f3b4b959729b871456e43b1eef74a95721168a5ba3ad6d3
 EBUILD css_parser-1.6.0.ebuild 1172 BLAKE2B 892864f7ac9dc227e579e4219d9a5c3fc9df13689d8acd6017478b8c8a3e81ecfcda44bbc43b58007530e57f3e8f1c8e4cd25745ae566f3dc9882594f99ea6fe SHA512 ac97e2ae5c314938f31977d60f589be72cd6ee7c46e3c3858a6a07cba74c8471c192ab8425ad39438694e5b42af6a82d2296d314d857b728fb95fdf9d161d4aa
 MISC metadata.xml 346 BLAKE2B 982f54d9e88f4c45c010fa2ba5ed692af66ecb29b8384cf99075c8d919188a1635c9c50c5fd732ff20f204c0277ec85f2a000c4367d9ebd868c6f0e2ff48a694 SHA512 117b856fc53e92ff3c62ba01bc1e54f33e5f02c688aae98cb2754485094bb9f01dc3255ef05864bb944b01c9e8d37b7b622de42a38e4b9d8de893c16fec78d45
diff --git a/dev-ruby/css_parser/css_parser-1.4.10.ebuild b/dev-ruby/css_parser/css_parser-1.4.10.ebuild
deleted file mode 100644
index 441acc968782..000000000000
--- a/dev-ruby/css_parser/css_parser-1.4.10.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOC_DIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md "
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-GITHUB_USER="premailer"
-GITHUB_PROJECT="${PN}"
-inherit ruby-fakegem
-
-DESCRIPTION="Sass-based Stylesheet Framework"
-HOMEPAGE="http://compass-style.org/ https://github.com/premailer/css_parser/"
-LICENSE="MIT"
-
-SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${GITHUB_PROJECT}-${PV}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc test"
-
-ruby_add_rdepend "dev-ruby/addressable
-	virtual/ruby-ssl"
-
-ruby_add_bdepend "test? ( dev-ruby/maxitest )"
-
-all_ruby_prepare() {
-	# get rid of bundler usage
-	rm Gemfile || die
-	sed -i -e '/bundler/d' -e '/bump/d' Rakefile || die
-	sed -i -e '/bundler/d' test/test_helper.rb || die
-	# Avoid tests using the network.
-	sed -i -e '/test_loading_a_remote_file_over_ssl/,/end/ s:^:#:' test/test_css_parser_loading.rb || die
-
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib test/*.rb || die
-}
diff --git a/dev-ruby/docile/Manifest b/dev-ruby/docile/Manifest
index 0930f3a304f9..c6c236f69ab7 100644
--- a/dev-ruby/docile/Manifest
+++ b/dev-ruby/docile/Manifest
@@ -3,5 +3,5 @@ DIST docile-1.2.0.gem 16896 BLAKE2B eadbf625fe1f26bb63cafdf2c30e53d0f7362e19baea
 DIST docile-1.3.0.tar.gz 14120 BLAKE2B 4567905283779e76a2f29fbf40968119bab10959e87c7a4ce9cd35cc77c138704867c032116e7cb682325eb61690afa002b80018241aa330d5e84df20810c2ad SHA512 bfbacb5197ed384dac82111799ecd23f074dd6c70e978e12c0bf9a017cc815429005153c155c62e2c6b04016a8b19cd5e2c4f4af68c899d8273423a4e0992502
 EBUILD docile-1.1.5.ebuild 513 BLAKE2B 3e77257ee9bf68757011077a39cd31c05b3e15d1161bffbbf23ce73b7a17ba0ad8db0ad9ff14ad2a9ffaee9bd35b5d9c1c4a6c338d82dd34416cd98f349f70ac SHA512 8ca56622d9d5d496161b7fbe11790ad8ade778e565c090b6c399b37677b2a9dde04710f62d3eb60b8c9cae3d685188e143ac3c52bbfe737450c4b13d5c055ad6
 EBUILD docile-1.2.0.ebuild 574 BLAKE2B 9e0423a18009f60c536f01524551566cbafb65ba0988a516ba79457d2e8e6cb78c5f1a81f7a7ea2114c27581e76ab6c39c877e31c6afb986742f1c1a33b11524 SHA512 53dfca3c0c52a69e3d973513d411e364a5c1ff3e011e5f8c4e2ce7c2ed3056c53241a22726ce5c839a0381935b5d12ab99505af39d70b531ba4d70b78aae9848
-EBUILD docile-1.3.0.ebuild 772 BLAKE2B e229d08756b11ad08d9d359e0d45a622b78e2a3697ad0741026f63adb793182c9379653a08da1683a2e8513d64aee759a4b2815191b041fc3cbd7de8279b3a86 SHA512 0e6dfe342b46570f5b8097bef712bdf2d29415daf9450af382bd2af6efca4dffef53880c0047deec5104b27951bcc4e257b71dd08599b861d8fbedb23d773d42
+EBUILD docile-1.3.0.ebuild 772 BLAKE2B c9363f7e38fbdfa4bea273c31375054281eb4e78eedca0e7299a0090dfe372075b0449cb542d53ff0bff80bb624d383e579917daa60523bd3a805f7ae82585e3 SHA512 36d80a97c1b55a3f79544376a48b2311e73bbc3f3521308ee86ece45642300efc277ea92f0279dc30db2bb262e1c5efc414bb1249ca33100a228cdcfd575c8cd
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/docile/docile-1.3.0.ebuild b/dev-ruby/docile/docile-1.3.0.ebuild
index 7a3ac945ae16..a33094904d34 100644
--- a/dev-ruby/docile/docile-1.3.0.ebuild
+++ b/dev-ruby/docile/docile-1.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/domain_name/Manifest b/dev-ruby/domain_name/Manifest
index dd694a1c2fcd..a81883f7c3a6 100644
--- a/dev-ruby/domain_name/Manifest
+++ b/dev-ruby/domain_name/Manifest
@@ -1,5 +1,5 @@
 DIST domain_name-0.5.20170404.gem 120320 BLAKE2B c2dbb97c67e1303c272ff67f2c32314827513a5953ca3b9d49667828f6972904249ab98ee0541a380fddb7c6e3fcc3959f8e5f8746ae6b38a3915169ef6c0dc2 SHA512 3314d87ac3b04337dff047c423ded2f4b99a4b9300528c34388cbc30fbcc7e84ae884969624e046e0dcc1d856e0bb8246b1556ac2dc755a1b4917ccf975fece3
 DIST domain_name-0.5.20180417.gem 124928 BLAKE2B 56c8852c09dfabc2291a08d89b4dbb6c9c9c3aecce40fab2a176e2183ebd7b793a6677256f417b0c9cb6cd61680a738038ee2d14e4d15d9ab5a952d666014d27 SHA512 e960aa4445e19ff3e71825d94f85519ec9b1600dab64d139bf21208aec6fe1dc279e9fda6c64fd518ab22783464ba9a4d43f20ceb7699daede981cbf7d5e1876
 EBUILD domain_name-0.5.20170404.ebuild 1106 BLAKE2B c9ff23343d3282ab62658462e19306888817f2b0283bcddd4623d6b552c5880397c210d4f04361df26367b59172608fd2745c36c53326b8542ccf86fca71e3e9 SHA512 0f2990cb1364af59417c5b7b9889d2cf106bc03ae343f6f470956cdb0cdde35f54bbd62ac12895095da04a505292929adf12d8652c690e41d115b3901a148291
-EBUILD domain_name-0.5.20180417.ebuild 1111 BLAKE2B 16aa3afbb3f2f0ca04e55bb78afbe7127cb5ebb3a8cc1fed8f53a8efbacd5c7f4d27f565e1b112b1d5c9ba48e80befc343ba200410b65bdb002b2ab3cc487070 SHA512 63a9c1292cbf39f0407048e0e34afcfa2179f8d7bc74dc4efa8395954b04e502abf05fb6caad9fbba218e38a82ea01ce5123010aa8db2bdb71d6b1ccd7ae5304
+EBUILD domain_name-0.5.20180417.ebuild 1104 BLAKE2B 35e798dab7bdbbba58069bf63d0b3bbcbece4ae3c73dac6b70bb016797ba8a66ccd149d2b21279c4d82f9468e3a98539523cd7e2f66aefac3d1f435ac39c34dc SHA512 e557e5f869e8749a9b93cba3fb3a7fcdab33980b5afa2a33947670d893c6887b55c9085440f8626ccbb37a5094ce37e332bcd6a24dc45dd88f5ef0e1c85ae846
 MISC metadata.xml 346 BLAKE2B e97527fee7fa9d73d77ef7a9e9325c9017fff3a9912fc76c74b76f5c4cf53aac583157ff02ccd5a969882829c1ffc4f35d44cb739497050a59402f88b06de2e5 SHA512 f9b3df47565a7827242a16355e01c450977cc12b7c0cf091590b1f642f5c941e2e3f4f14af66fe2975ffa6f7d53c3385ae2a87ffa666c1c1b7f7356f07c94830
diff --git a/dev-ruby/domain_name/domain_name-0.5.20180417.ebuild b/dev-ruby/domain_name/domain_name-0.5.20180417.ebuild
index 1f96ef6e4efe..e9da54dd9dd3 100644
--- a/dev-ruby/domain_name/domain_name-0.5.20180417.ebuild
+++ b/dev-ruby/domain_name/domain_name-0.5.20180417.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_TEST="none"
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/dotenv/Manifest b/dev-ruby/dotenv/Manifest
index 6581d263564b..f8dc3eeacc1d 100644
--- a/dev-ruby/dotenv/Manifest
+++ b/dev-ruby/dotenv/Manifest
@@ -1,7 +1,5 @@
-DIST dotenv-2.2.1.tar.gz 15855 BLAKE2B c970fbd30e3c616b9426f4f758e47c81cf54887de0a11560f4ed3aabda6b1b83f49849775d129658d3a2eb6ecdfe4fbea670d0a63443954ac1d53177125a895b SHA512 67e9cc5323d505f0b5a5a1278d0ce6c72a577fc096508b5a6de7b73f3c0fa2ca8144475783ab2b9ef04cf44d6e57ddb8e09f849c44729f7bb7c4bb7156baa443
 DIST dotenv-2.2.2.tar.gz 15856 BLAKE2B e27a2650c79aadb31545c3a02d698f5cc3c9e27ddf07aa853a1f776b467f3cb707dda4ee3a0c107fbeb4a5609ded993ab74c81721cab088239858c28bd8e3ded SHA512 6af4039cec9c4c85240dc01eee5e24cac6b762e2fcb0d371bbde4cf03743e1917436664d2ea2e59fa619fddce96c9d3848354d42c3a621556cb120ed1cd0cf2b
 DIST dotenv-2.4.0.tar.gz 16613 BLAKE2B e9f6a3bd08f610f829c09a250916d2b3194f699aa3b19c05e13ac77a4fdcf8a830ff43ddd6203d08fc96b70fc6b5d35b518ee2a640dd5a2b49886fac8a67fdb9 SHA512 59ae851ef6444dafa673549e84e9476c9ffb78ac6aa078be0fbdc0a1011e4df1dbbc664c612759c0932051bbe954a62679b4d9304dea0191469bf3d792943955
-EBUILD dotenv-2.2.1.ebuild 1015 BLAKE2B ef50cc86fde38714d1857ac8456c5e0ca6dc484363017d6b130c4bf55cfba5deff4b0cf94146c2d4e63c878e57d2107731ac218032756db455a18be463241919 SHA512 131dab1ecc531d581a5d8ab4a881200a7cb6444d8aa48e27acc6e615b1605fbc1ceced18de885be3d002966edab7181c1a4e4a59c5ba7470523c27826ab962e4
 EBUILD dotenv-2.2.2.ebuild 1015 BLAKE2B 51f9da2c9e17caae8864d7cc7f0b88ef8e16276db7ea73fdf83a11fa7ca88ccf4b9c0ceb50b9c6f2f5e2d885ea39391ec1c56e99c4d8af539d518425556d74d0 SHA512 bc5c272ec0931b0c75cc6d0c786a95562c3d6298e5b73353c2f9df98e72c1c566d4bfd2e3ef828d95080c67a89fedbab4c2f331ce166550ea796830b150d8947
 EBUILD dotenv-2.4.0.ebuild 1015 BLAKE2B 51f9da2c9e17caae8864d7cc7f0b88ef8e16276db7ea73fdf83a11fa7ca88ccf4b9c0ceb50b9c6f2f5e2d885ea39391ec1c56e99c4d8af539d518425556d74d0 SHA512 bc5c272ec0931b0c75cc6d0c786a95562c3d6298e5b73353c2f9df98e72c1c566d4bfd2e3ef828d95080c67a89fedbab4c2f331ce166550ea796830b150d8947
 MISC metadata.xml 341 BLAKE2B 4cc2ed329e48853a5939f5f7e41d2b6544d3d7d967563da065633826c3fb9d999815e8604fe4a897606f4ffe7be53f3e87c925120961050ce77f1fa573847f5a SHA512 72e21e93099953f1946b486fa8acdbd0b85ed139ef34d4ad9c7e3e89e2924ec598a662f72210d52efdb4cc2ed676962fc6d50c560b4b9c8a4ec849d75d5be2dc
diff --git a/dev-ruby/dotenv/dotenv-2.2.1.ebuild b/dev-ruby/dotenv/dotenv-2.2.1.ebuild
deleted file mode 100644
index 1f940776cc6f..000000000000
--- a/dev-ruby/dotenv/dotenv-2.2.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_EXTRADOC="README.md Changelog.md"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Loads environment variables from .env into ENV"
-HOMEPAGE="https://github.com/bkeepers/dotenv"
-SRC_URI="https://github.com/bkeepers/dotenv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="2"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/spring dev-ruby/rails )"
-
-all_ruby_prepare() {
-	sed -i -e '/:guard/,/end/ s:^:#:' \
-		-e '5igem "rspec", "~> 3.0"' Gemfile || die
-
-	sed -i -e '/rubocop/ s:^:#:' -e 's/git ls-files/find/' dotenv.gemspec || die
-}
-
-each_ruby_prepare() {
-	sed -i -e "s:ruby -v:${RUBY} -v:g" spec/dotenv/parser_spec.rb || die
-}
diff --git a/dev-ruby/faraday/Manifest b/dev-ruby/faraday/Manifest
index 169a8d6ee8a6..2b3c6f4d0994 100644
--- a/dev-ruby/faraday/Manifest
+++ b/dev-ruby/faraday/Manifest
@@ -1,8 +1,6 @@
-DIST faraday-0.11.0.tar.gz 59736 BLAKE2B a4224ec6bf415bd535695561714f247ea9005db622145d7f6f9e5fee19ffb9c5b5f14d6dfe62bc6ed8396d1171506a40cf38ad5c4d1a1d344aaf16bcad412fc7 SHA512 d7e66f7d634b5c517dd688e874557839dbd7f720283dbeb27fd118c8cbcc596898545d62548d3c7c94d7cf49bdcda0d2fa705a1d20fa4d7ce238b38688d5cc62
 DIST faraday-0.12.2.tar.gz 62809 BLAKE2B 4dcd60192df36e1b9766eab3bcbacd729239b0e09d9e82a73d825c750fdbcfae8161cf803f078b841236a5e18b1849b4cdc34e6adebb9eaea0f0442cd65b2e74 SHA512 966fc419d529a8bba5caa6d3932ee94f7b248110edc880b532860c24abd70cb50182e40b94b4143e26575c6db7ce046fa71ac0d25010385d7f0c3dda87f39439
 DIST faraday-0.14.0.tar.gz 65105 BLAKE2B bf5101083bd828e2ea98dcd487c7c082f8b2d2eb4d03ac7ad04e1873666db9e2cec1e6eb9887364874ea5f32d0313019d1eada5e05e25e0415bdd5aa2bcfca97 SHA512 25bba07e76a2a8bf02b0c81c045329e72d5911a2aacae56611db33dc25c89bd48bb1b4de9b20c6edc1514d3ceae8b06fca6076c85580533047c222cb30ef8dc7
 DIST faraday-0.15.0.tar.gz 66086 BLAKE2B 5018d8e92b2988b08f4e7a5b0876ca6cd4049c74199ee0356adc48867611fd6d30d884bd3cf3e7703a02c7a6e967f9c47cdc44deb75045b8cee46992977fb834 SHA512 46602d89b1bbf5a41143a9a71fab193642e7c41db39dc1edc0efb99f4a7a924c5a698460a0a4f921f7ce1f73ee8eb12e6d79a08dea02c7142856d0aa1b95b521
-EBUILD faraday-0.11.0.ebuild 1894 BLAKE2B 42b66ab1eff06f53738c22f7bf0fa8fe4e0e1a170354fd5c9f4a9d7cfdcaf7a155b956e716bd3d5a5cb81c5170a5c67002410dc1061335d23a4c5af870b3a3ee SHA512 7effae5fbd3d5d896e246584cd405bad0e24a934c48955ca49e2dee5db7006560d2655cb74583f98493b2fbf0b7acd322bdfc7286a7c2f3fd12cdd28e74fd3d6
 EBUILD faraday-0.12.2.ebuild 1901 BLAKE2B f686b6d0f5faa8b778b2e80e802c3126dacfea7b06849a7d95b9de0157db54846eac853b31b3ab18efb4e6f09749dbf0676eaca5b952725ae7e5d3417cdead5a SHA512 5a811d93fd62ee14ccf0425a2e59aed6ec676e81b85d994ad437e7f11a29848c4c978a3f235d5a0a76b2435d0aa1952cde1e2eefe9724f8a55c04493376bcefb
 EBUILD faraday-0.14.0.ebuild 1913 BLAKE2B 90c822920672463392a693df515f858879274a4478696dfe44c9065654e2da8fe30fb54f9c65d35f749a88a9f35216995f9f17d295b61c40bcf5384051ef42b7 SHA512 d4b2cf609bfac846889ac1c07ca816ddfa38236c90ab1e5a024cb06eacaf56ac074679e6b83d98f0a949a15c09f997294737cb4aa24f6e4b432562eae154c5de
 EBUILD faraday-0.15.0.ebuild 1913 BLAKE2B 90c822920672463392a693df515f858879274a4478696dfe44c9065654e2da8fe30fb54f9c65d35f749a88a9f35216995f9f17d295b61c40bcf5384051ef42b7 SHA512 d4b2cf609bfac846889ac1c07ca816ddfa38236c90ab1e5a024cb06eacaf56ac074679e6b83d98f0a949a15c09f997294737cb4aa24f6e4b432562eae154c5de
diff --git a/dev-ruby/faraday/faraday-0.11.0.ebuild b/dev-ruby/faraday/faraday-0.11.0.ebuild
deleted file mode 100644
index 8f6ce93b341d..000000000000
--- a/dev-ruby/faraday/faraday-0.11.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_TEST="test"
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem eutils
-
-DESCRIPTION="HTTP/REST API client library with pluggable components"
-HOMEPAGE="https://github.com/lostisland/faraday"
-SRC_URI="https://github.com/lostisland/faraday/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND+=" test? ( sys-process/lsof )"
-
-ruby_add_rdepend ">=dev-ruby/multipart-post-1.2.0 <dev-ruby/multipart-post-3"
-ruby_add_bdepend "test? (
-		>=dev-ruby/test-unit-2.4
-		dev-ruby/httpclient
-		dev-ruby/rack-test
-		dev-ruby/sinatra
-		dev-ruby/net-http-persistent
-		dev-ruby/patron
-	)"
-
-all_ruby_prepare() {
-	# Remove bundler support.
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile test/helper.rb || die
-	sed -i -e '/bundler/,/^fi/ s:^:#:' script/test || die
-
-	# Remove simplecov and coveralls support, not needed to run tests.
-	sed -i -e '/simplecov/,/^end/ s:^:#:' \
-		-e '1igem "rack", "~>1.0"; require "yaml"' \
-		test/helper.rb || die
-
-	# Remove tests for adapters that are not packaged for Gentoo.
-	rm test/adapters/em_http_test.rb test/adapters/em_synchrony_test.rb test/adapters/excon_test.rb test/adapters/typhoeus_test.rb || die
-
-	# The proxy server is already killed, may be OS X vs Linux issue.
-	sed -i -e '138 s/^/#/' script/test || die
-
-	sed -i -e '/git ls-files/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_prepare() {
-	# Make sure the test scripts use the right ruby interpreter
-	sed -i -e 's:ruby:'${RUBY}':' script/* || die
-}
-
-each_ruby_test() {
-	each_fakegem_test
-
-	# Sleep some time to allow the sinatra test server to die
-	einfo "Waiting for test server to stop"
-	sleep 10
-}
diff --git a/dev-ruby/faraday_middleware-multi_json/Manifest b/dev-ruby/faraday_middleware-multi_json/Manifest
index 350414e59617..815a6cf3931e 100644
--- a/dev-ruby/faraday_middleware-multi_json/Manifest
+++ b/dev-ruby/faraday_middleware-multi_json/Manifest
@@ -1,3 +1,3 @@
 DIST faraday_middleware-multi_json-0.0.6.tar.gz 3455 BLAKE2B 3fcdf69d90fe2da5cfe16851b5a5050429593c39c3d56eeab3e687ee89d036822197273fda44370878fb4087c29d6e2357b3220526c9adb8566a83f8d50bbac4 SHA512 4abc794a06725d4a584af08a58874162f1bea6424569f0fa6683ac0df7882708d3872e6a42024d7fa764d08688ceccbdf61d9870f23b71ea3c842440b495cc61
-EBUILD faraday_middleware-multi_json-0.0.6-r1.ebuild 983 BLAKE2B 52a0a44cd1d48b32fa9099c008444e8fc5ca75c30b6fdf7984b31272b83c241ff941b2c75a95e43971f53cdf48afb2e04ba4d87d062b084621f8bfdc40aaa9fe SHA512 c06f079f4f84ea266ba8f0693e4c12fcb4c4338b457907f164211a82543e07524946d13d44b5108c884327b492aada7b14bd95e98e6b65eb8faffec57e7ebb5c
+EBUILD faraday_middleware-multi_json-0.0.6-r1.ebuild 976 BLAKE2B 2c0f12e1c9365b4d8bf74f4b0f13212f2103da19a4f43a71553512b74af81fff0b476ea700c61e679da29e1c5b4e6710557daa21dacc7bcc71850ca8835253e9 SHA512 43fa72c7eb1031433527fbe5cb083503fbd8dc00cf2362cbaa2edb5f068f866c3360dfbbc7724d41a07b3f3326a2bd3031704ac658563bd6bea892d528998031
 MISC metadata.xml 623 BLAKE2B 7be969984baa0dbd08ae9c667ab8a6dc7144de07d5a54721a0f8630ee458b02f8e21f2a693d43224d860daae2464e5e88e43b437c62dc695cf2d2c61cea13e9d SHA512 df56fd21e8b99a769ea2e9c214a2720f90e32d410b78bf884c13fca5a4f79d84f3c3f02163e7b3f39d86f15aa54e6bf1fbabc15e0bbbd4bac8c516f241b0d2e7
diff --git a/dev-ruby/faraday_middleware-multi_json/faraday_middleware-multi_json-0.0.6-r1.ebuild b/dev-ruby/faraday_middleware-multi_json/faraday_middleware-multi_json-0.0.6-r1.ebuild
index 21b72b842fc7..ca8addbae7d6 100644
--- a/dev-ruby/faraday_middleware-multi_json/faraday_middleware-multi_json-0.0.6-r1.ebuild
+++ b/dev-ruby/faraday_middleware-multi_json/faraday_middleware-multi_json-0.0.6-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23"
+USE_RUBY="ruby23 ruby24"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
diff --git a/dev-ruby/faraday_middleware/Manifest b/dev-ruby/faraday_middleware/Manifest
index fa947ba83586..8841506713da 100644
--- a/dev-ruby/faraday_middleware/Manifest
+++ b/dev-ruby/faraday_middleware/Manifest
@@ -1,9 +1,3 @@
-DIST faraday_middleware-0.11.0.1.tar.gz 24349 BLAKE2B f2ce9ece102baa86c9ee763c51da2d7a7318a72d8e6b6f102baaef51ad7b13da32c525b7a67992fcab83d0a145e8cb40d3c4bf31ea1bcb18bd73ee54e327e6d9 SHA512 0bda75432ffa406485e60e9f71dc850a13dc1dd89a8262c9a4101d982fec44b63c72452458d29c49b529ca3483b577ea760400b465bf4b30ae1623a42cb96051
-DIST faraday_middleware-0.11.0.tar.gz 24345 BLAKE2B 43325e27d428a74b1b20eafbe99562442ed7d0f98d19cec3f96fea0ae63f810fab92eabb9a3deb586e4d5933db8d2e9bc1f8270bc99c76a4afd7035fa251f192 SHA512 555407c2daa220fe050a33a6572626bdd47b800f75a87cc0b4da7a311aa3a89c24873434fdb8c14ae92e34c253179697471c25a42d18034b8a1e1e8c332f0e13
-DIST faraday_middleware-0.12.0.tar.gz 24896 BLAKE2B 2a371a55baeafb86196cda66b4d36d1aee3d96c50c1e2550edfe70fe0512c2462739b19c3001bb4569d70d98fda2b27fb59fb466051f331a0839420494f564fe SHA512 e4867c122d69e3b8e8a405a85bc8be4c1489861f4acf42369f34ecda67ca0e821509ef522e742bc8b7a20fb0650a45866a04f4b4469829fbc50cd040cef374af
 DIST faraday_middleware-0.12.2.tar.gz 25041 BLAKE2B 0ce9750f9ce8394d1d926345c50c6b565bc2f5bbc3991d8543424dacb243f2176a066cdb4c7dd4fa66f7f90beb477aa66513538d7a6c2f84de56075c304d3caa SHA512 a93c6ad6a97da1c84e539ff5976f464e6126ea444b269be2f3bb3dab71ef6f46fd12cc0b4de7aa34842d4dcc274cca584ef879a8c1b80ca4557af4d4dafcd755
-EBUILD faraday_middleware-0.11.0.1.ebuild 1623 BLAKE2B 46208c7e0f5096d71369491e6f2d8209e403a86d8f1030f602451753b5cf685834a9609fc76389177910bdc400452b9aeaf8c344e66e96f3077bd2521fef7abe SHA512 ebd707f39403687f73ae25857649c2206a803ac2266ae9ed6d833327288a472fba7dbdfce78fa67f9c3da5e7fab2e7f5fd8f2372ce1e686e0fdc4ce4cb6233ca
-EBUILD faraday_middleware-0.11.0.ebuild 1510 BLAKE2B 926dcb593631fa724d4bdf5ed00b3fe91f345c522f12558e24c06f93366c5c530bdb100fe954ecc2fd7529401c7d93ad8abfad3cce6f71731f8fe3f6ee2c9e5a SHA512 a749d71974bb80c4f4fdae02303d17dd4665abf27d9b430e54585546d22024377a3876cf471fb07ea109f8a4d62f45a10e7cbc87f87707e6bc8678c92fc71377
-EBUILD faraday_middleware-0.12.0.ebuild 1636 BLAKE2B 5af39ee600118af5981388488d9bb56a85ec5a6816ccc982e013f8ec8e47b411423c72372320323501b91d5f8f4ce70eaea0aac838843e5f27d6f92cd149cf20 SHA512 133c50770b3ca3c1a0845f18f47022af28b51ddbbd27f953ff4be7c97c3d83bb378da57750356487df7e28177a8d8251dc882adcc1ed42a84bd2ddbebfa2be81
 EBUILD faraday_middleware-0.12.2.ebuild 1669 BLAKE2B af68d72464cb45f92211f17de914e92f9582f83c7b6718b2b96b6b0033f71c933c417b887a66f4168ce74e651480f18fe65d91af46329ecbc2e9eb01e8ac2dbd SHA512 381911e5d37bccf5c2766b3fdc59cb9ac34be1b4de1dce01a0e55b042722063708da48647746389a010e3aa57305f730ee4b562831890827ddf11f1768ac952f
 MISC metadata.xml 823 BLAKE2B 3329517a3334e1d682430843b838b09e5deab6f87a485ce05245beccfdfb32c66ccc23cec648074f060162ff107a276007a343950b246140dfc9b1675d63f8ee SHA512 68204a852a7a6eb422d389fdbd15abf5aa2424707329b42d48c0c9aec407a30b9ed0567ae87deffdf1cdccc582c31f9b1fb83bf45569915ff72e351940ffe92f
diff --git a/dev-ruby/faraday_middleware/faraday_middleware-0.11.0.1.ebuild b/dev-ruby/faraday_middleware/faraday_middleware-0.11.0.1.ebuild
deleted file mode 100644
index 635339e4da2a..000000000000
--- a/dev-ruby/faraday_middleware/faraday_middleware-0.11.0.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem eutils
-
-DESCRIPTION="Various middleware for Faraday"
-HOMEPAGE="https://github.com/lostisland/faraday_middleware"
-SRC_URI="https://github.com/lostisland/faraday_middleware/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+parsexml +oauth +mashify +rashify"
-
-ruby_add_rdepend "
-	>=dev-ruby/faraday-0.7.4 <dev-ruby/faraday-1
-	parsexml? ( >=dev-ruby/multi_xml-0.5.3 )
-	oauth? ( >=dev-ruby/simple_oauth-0.1 )
-	mashify? ( >=dev-ruby/hashie-1.2:* )
-	rashify? ( >=dev-ruby/rash-0.3 )"
-
-# Bundler must be used because the optional dependencies have different
-# version requirements that must be resolved.
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	dev-ruby/addressable
-	dev-ruby/rake
-	dev-ruby/webmock:0
-	dev-ruby/json:0
-	>=dev-ruby/multi_xml-0.5.3
-	>=dev-ruby/rack-cache-1.1
-	>=dev-ruby/simple_oauth-0.1
-	>=dev-ruby/hashie-1.2
-	>=dev-ruby/rash-0.3 )"
-
-all_ruby_prepare() {
-	sed -i -e '/\(cane\|parallel\|simplecov\)/ s:^:#:' \
-		-e '/rspec/ s/>=/~>/' \
-		-e "/addressable/ s/, '< 2.4'//" \
-		-e "/rake/ s/, '< 11'//" \
-		-e "/rack-cache/ s/, '< 1.3'//" \
-		-e "/simple_oauth/ s/, '< 0.3'//" Gemfile || die
-
-	# Avoid unneeded dependency on git
-	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	${RUBY} -S bundle exec rspec-3 spec || die
-}
diff --git a/dev-ruby/faraday_middleware/faraday_middleware-0.11.0.ebuild b/dev-ruby/faraday_middleware/faraday_middleware-0.11.0.ebuild
deleted file mode 100644
index b5796f7721b5..000000000000
--- a/dev-ruby/faraday_middleware/faraday_middleware-0.11.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem eutils
-
-DESCRIPTION="Various middleware for Faraday"
-HOMEPAGE="https://github.com/lostisland/faraday_middleware"
-SRC_URI="https://github.com/lostisland/faraday_middleware/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+parsexml +oauth +mashify +rashify"
-
-ruby_add_rdepend "
-	>=dev-ruby/faraday-0.7.4 <dev-ruby/faraday-1
-	parsexml? ( >=dev-ruby/multi_xml-0.5.3 )
-	oauth? ( >=dev-ruby/simple_oauth-0.1 )
-	mashify? ( >=dev-ruby/hashie-1.2:* )
-	rashify? ( >=dev-ruby/rash-0.3 )"
-
-# Bundler must be used because the optional dependencies have different
-# version requirements that must be resolved.
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	dev-ruby/addressable
-	dev-ruby/rake
-	dev-ruby/webmock:0
-	>=dev-ruby/multi_xml-0.5.3
-	>=dev-ruby/rack-cache-1.1
-	>=dev-ruby/simple_oauth-0.1
-	>=dev-ruby/hashie-1.2
-	>=dev-ruby/rash-0.3 )"
-
-all_ruby_prepare() {
-	sed -i -e '/\(cane\|parallel\|simplecov\)/ s:^:#:' \
-		-e '/rspec/ s/>=/~>/' \
-		-e "/addressable/ s/, '< 2.4'//" \
-		-e "/rake/ s/, '< 11'//" \
-		-e "/rack-cache/ s/, '< 1.3'//" \
-		-e "/simple_oauth/ s/, '< 0.3'//" Gemfile || die
-}
-
-each_ruby_test() {
-	${RUBY} -S bundle exec rspec-3 spec || die
-}
diff --git a/dev-ruby/faraday_middleware/faraday_middleware-0.12.0.ebuild b/dev-ruby/faraday_middleware/faraday_middleware-0.12.0.ebuild
deleted file mode 100644
index 3f3eefd7c5d3..000000000000
--- a/dev-ruby/faraday_middleware/faraday_middleware-0.12.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem eutils
-
-DESCRIPTION="Various middleware for Faraday"
-HOMEPAGE="https://github.com/lostisland/faraday_middleware"
-SRC_URI="https://github.com/lostisland/faraday_middleware/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+parsexml +oauth +mashify +rashify"
-
-ruby_add_rdepend "
-	>=dev-ruby/faraday-0.7.4 <dev-ruby/faraday-1
-	parsexml? ( >=dev-ruby/multi_xml-0.5.3 )
-	oauth? ( >=dev-ruby/simple_oauth-0.1 )
-	mashify? ( >=dev-ruby/hashie-1.2:* )
-	rashify? ( >=dev-ruby/rash_alt-0.4.3 )"
-
-# Bundler must be used because the optional dependencies have different
-# version requirements that must be resolved.
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	dev-ruby/addressable
-	dev-ruby/rake
-	dev-ruby/webmock:0
-	dev-ruby/json:0
-	>=dev-ruby/multi_xml-0.5.3
-	>=dev-ruby/rack-cache-1.1
-	>=dev-ruby/simple_oauth-0.1
-	>=dev-ruby/hashie-1.2
-	>=dev-ruby/rash_alt-0.4.3 )"
-
-all_ruby_prepare() {
-	sed -i -e '/\(cane\|parallel\|simplecov\)/ s:^:#:' \
-		-e '/rspec/ s/>=/~>/' \
-		-e "/addressable/ s/, '< 2.4'//" \
-		-e "/rake/ s/, '< 11'//" \
-		-e "/rack-cache/ s/, '< 1.3'//" \
-		-e "/simple_oauth/ s/, '< 0.3'//" Gemfile || die
-
-	# Avoid unneeded dependency on git
-	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	${RUBY} -S bundle exec rspec-3 spec || die
-}
diff --git a/dev-ruby/gh/Manifest b/dev-ruby/gh/Manifest
index 83be1e16431e..0da4c2dde4bf 100644
--- a/dev-ruby/gh/Manifest
+++ b/dev-ruby/gh/Manifest
@@ -1,3 +1,4 @@
 DIST gh-0.15.1.tar.gz 64076 BLAKE2B 3611d83d9414349284bbaa7618aee2c9b5cb4c6db98e506891f70cf0f21dd7f25ae87e9f8094a90ec4ed4f62ba1e05bd598722a743e32abe54e7eb2a002d9d72 SHA512 6b8a43360253275408ff3d0f6e8cabe3afe399b4ed362f9b4ded72a9d650d18483cf5e3d10877a97c9112b7ccd5add5f2c9999ab1cd5f8102af3a9e49ef39037
+EBUILD gh-0.15.1-r1.ebuild 845 BLAKE2B 7828fecec0770ef3926b125b7557038c894e9c3ef6c7d424ad23ffdaac51b25619b1bd67db9b5eef7fb884091e8e3e484a37ae5b61197fbe8092d3d3289322b0 SHA512 3634b5ba852cf5df67f116ddb7a264443da28ea9208b51ecb627dbe7b73c68315fb5b137fee881fbaa8153e780f3a1d2840baba2385e02d96f8890d7b45a13a5
 EBUILD gh-0.15.1.ebuild 716 BLAKE2B 6a1fbae1ee603d398e4c68cc16a1c8c46a1ecaf0e8f699c4d97e47d6a8ed8078d362695c858511650a9b24037fe83844769bd30171ea89d1b81decdb6b41b52b SHA512 1519363935e399fc267ab05911c439119fa7651845f69fa23d8748e17eec5d033e862e4f33c897a2535f6bd7cbeafd1b9116552020cc5b4d88e2d7c0d00c4acd
 MISC metadata.xml 328 BLAKE2B ffcac2532a59009124144d5a974ab68f58c35954d76523766184eadaa5ba9602d891c433f40e830cac3d5acc8ea80fe516b5ce69df6e2240454e5ec1d9f198a2 SHA512 827f41487bb4442546ace9b648b2153e910f4e38a9d3edb1d2c231add2ea537c6318da7c5f0b4ee48f016c7c0bc62fba36cf4745fb96f9ad90890b97049d9d29
diff --git a/dev-ruby/gh/gh-0.15.1-r1.ebuild b/dev-ruby/gh/gh-0.15.1-r1.ebuild
new file mode 100644
index 000000000000..eb0b4e6120c0
--- /dev/null
+++ b/dev-ruby/gh/gh-0.15.1-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_GEMSPEC="gh.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="multi-layer client for the github api v3"
+HOMEPAGE="https://github.com/travis-ci/gh"
+SRC_URI="https://github.com/travis-ci/gh/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_bdepend "
+	dev-ruby/webmock
+"
+
+ruby_add_rdepend "
+	>=dev-ruby/addressable-2.4.0:0
+	dev-ruby/backports
+	>dev-ruby/faraday-0.8
+	>dev-ruby/multi_json-1.0
+	>=dev-ruby/net-http-persistent-2.9:0
+	dev-ruby/net-http-pipeline
+"
+
+all_ruby_prepare() {
+	sed -i -e '/addressable/ s/2.4.0/2.4/' \
+		-e 's/git ls-files/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/globalid/Manifest b/dev-ruby/globalid/Manifest
index 554205c3e1a7..e87828190b48 100644
--- a/dev-ruby/globalid/Manifest
+++ b/dev-ruby/globalid/Manifest
@@ -1,6 +1,3 @@
-DIST globalid-0.4.0.tar.gz 18087 BLAKE2B f720a5b760d5a82726155b67ea82977ffcacc109bc431f92afa33bf95b79420a006e9d87650f40ebe5d1b365b3364f645426486b697974072bfbd1e1c4660b88 SHA512 181ee39c12bffe16048b6ae77064f9a9f7babbc8fab43893c8eb89f98571ecd6cbe0032174a9ed6db04398e5f848d718a9ec2d587ac6cfdac4478c7e80284a61
 DIST globalid-0.4.1.tar.gz 17924 BLAKE2B 6657c916049f841f472f6320868287451d061f96501f5a2b4df8fd71512f5752d5568185c8166344494fa3f6829ec0047f54235c8ea4e01b040653b8699d0484 SHA512 da484c6c7e8155416d008d650929c6b72981d2ae2d1654eb02e414838a065dad9b4ba3c6e275abb008a0d9cad1e2d4d5295d90807c7d7fc73e55b7071c0fd657
-EBUILD globalid-0.4.0-r1.ebuild 705 BLAKE2B b2d0a9eece761b2c09af255625e25706bdcd8245cbb2961b27f2aa11f1b19e264a3a3373153a66b92db4e770820a509adfca0311de4fe3fd285d5536441eefba SHA512 ad8d7fdf4fbcd64a6aa343703a063d65df3e519654c6eb974995f2cd29458cc8d4db2c664bacadfcbf512a7d09e82062a90dde1313954795ac83b6aaade32fba
-EBUILD globalid-0.4.0.ebuild 703 BLAKE2B 5667cd38122c0a647a90ae43ae4f497daa5fa95240f943ca348d8a605d6c8158d810410390f581e5fa290286bcaca5f6fbd16df850cd5049d8f77b209c74f218 SHA512 df8b066f1e9f51daf813523fd8217f401ccbe7e13e9351f05cf438c636717fd3e2723893696bcdf75bd7085633b7bea87782f1b3e699d1179aae7df1c6052316
 EBUILD globalid-0.4.1.ebuild 703 BLAKE2B fd21fe8350e7444a11b9032a92cb6701b0026bc82f087713f83b1520fd4da7d97f2e3bb550b143514c5cd067e3735c6314b13ed185e56a86c1e3647359e3c771 SHA512 a79bf27852fd144611169cb8435bbb009a520651d7d9d0f1b30079809207819002a8cbf1d0b28598b48228be6e0cd3b888850a2b25bade03054441f9f52dc9b2
 MISC metadata.xml 340 BLAKE2B c8aa9febd2a1238630c8d42d1670d1333a9c9b8ad8a1195bc49518b4b90e0c5238e8d3859a71a304629c8931b7fa286f805b4eabd1b0782263c689888d168546 SHA512 31207f04b56e2be06ebe5367d496e8f7e9c73732cd0fa852d19bb49cfdb7b53ff30d23131a53ec9a9ca8c7aee8f8d0b4d74cd896c7e407a8b6aead17f06e106e
diff --git a/dev-ruby/globalid/globalid-0.4.0-r1.ebuild b/dev-ruby/globalid/globalid-0.4.0-r1.ebuild
deleted file mode 100644
index f1e1afc71284..000000000000
--- a/dev-ruby/globalid/globalid-0.4.0-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Reference models by URI"
-HOMEPAGE="https://github.com/rails/globalid"
-SRC_URI="https://github.com/rails/globalid/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 ~amd64-linux"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/bundler >=dev-ruby/activemodel-4.2.0 >=dev-ruby/railties-4.2.0 )"
-ruby_add_rdepend ">=dev-ruby/activesupport-4.2.0:*"
-
-all_ruby_prepare() {
-	rm -f Gemfile.lock || die
-}
diff --git a/dev-ruby/globalid/globalid-0.4.0.ebuild b/dev-ruby/globalid/globalid-0.4.0.ebuild
deleted file mode 100644
index 1942f432f108..000000000000
--- a/dev-ruby/globalid/globalid-0.4.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Reference models by URI"
-HOMEPAGE="https://github.com/rails/globalid"
-SRC_URI="https://github.com/rails/globalid/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/bundler >=dev-ruby/activemodel-4.2.0 >=dev-ruby/railties-4.2.0 )"
-ruby_add_rdepend ">=dev-ruby/activesupport-4.2.0:*"
-
-all_ruby_prepare() {
-	rm -f Gemfile.lock || die
-}
diff --git a/dev-ruby/haml-rails/Manifest b/dev-ruby/haml-rails/Manifest
index 1365d1e786e2..ff5559118af0 100644
--- a/dev-ruby/haml-rails/Manifest
+++ b/dev-ruby/haml-rails/Manifest
@@ -1,3 +1,3 @@
 DIST haml-rails-1.0.0.gem 13312 BLAKE2B 9bd863d693121f2bb42bc0dc292f647220a4ba0b152c2fe6b04fabc0a0b537e1d31c12b040841ea2ac51cbfa771bdf21a94c8e482978dd2294a709916ee3aa06 SHA512 92aca4aa20591e47830779ec9d7a04f67cbcfbdcea3cbf2cbe50862ee61d1e373db96dcdb9b187fce2a167132b8394dc738db09416492689fb138d60f537b593
-EBUILD haml-rails-1.0.0.ebuild 692 BLAKE2B ecf38c8f19b5f414b62e8c5fcad48b917970943619d202f5cfbad88cbbcd6d7ccacfd9e918c01638a451aa12aab050e73746b9440fb8886650de16b266cdc171 SHA512 67596e6726bf14380b0524947cdf15a6373b6b8a461f735aa70368ff7492f83a5fc8b8cf2abe48ac6b7d37ed46428c0f298b20ee168b7f05127919c5dd973a4e
+EBUILD haml-rails-1.0.0.ebuild 685 BLAKE2B cd35f4fda88b6041708ffe885511768ed31324d7043ace24f99712b392f84ea4d709f69cbc4e74963cf742de32dd6177683b8edaaeccb5f9e5b9aaa8fec46314 SHA512 900224c0b24110bcaf5736ca6750473e5e507725e99d963d57e999cbf299fef7e930ab5299e150c2b12bfff1971cf39d97a057258794f419f5fcb2881b5df1c4
 MISC metadata.xml 335 BLAKE2B a5cfc94870073cefe663542cff943ea70824dcddbcbc07d34ba6f1067caf922fbfba2a75cb7215c20271bdb7f3b7c16bdeb7ab3ca0d2adbc46a1756a2d079849 SHA512 25a5b3c96a272c61b756d168146ca0f3492d14b8672192afdcedcb3690de723ac0915a7120fb03db06fab6b701ebba205cbc57c49f681720fbbbe5a612d01e0b
diff --git a/dev-ruby/haml-rails/haml-rails-1.0.0.ebuild b/dev-ruby/haml-rails/haml-rails-1.0.0.ebuild
index dd47f90c37c5..d99497999a32 100644
--- a/dev-ruby/haml-rails/haml-rails-1.0.0.ebuild
+++ b/dev-ruby/haml-rails/haml-rails-1.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_RUBY="ruby21 ruby22 ruby23"
+USE_RUBY="ruby23 ruby24"
 RUBY_FAKEGEM_EXTRADOC="README.md"
 RUBY_FAKEGEM_RECIPE_DOC="yard"
 
diff --git a/dev-ruby/hiera/Manifest b/dev-ruby/hiera/Manifest
index f766ead7f32d..ff0ae8c11e10 100644
--- a/dev-ruby/hiera/Manifest
+++ b/dev-ruby/hiera/Manifest
@@ -1,11 +1,9 @@
 DIST hiera-1.3.4.gem 30208 BLAKE2B c0f65db3807e645ec08d60447b3aa0ecd9e826afc730296743faf6cded31ac203fdbe369df0055dc68fbb90f453dad26e8f3679d0c707b14cdcb6ff67328229b SHA512 be3b702f0e3c2e61d8d6a8c1ff1280f9a1be3dc4adc2a605b4ee3b5db82d513bd58fb6b22ef546a625cf4eefa43d597365187b776ee92c2dd9946eaa4b147128
 DIST hiera-3.2.2.gem 40448 BLAKE2B a94bebb0e3549a3bde83ef80db8c13af8bfb6dbf0f9f3efc244ddf211fed47c7f763e033c348d3a0fd20ad04c3de009b4d37fee0da080a77c4eac2a1439b8751 SHA512 5a341c47305592421945fee3ab3fbc2c39f3f847d1c45d9b6dc8cc90da8057c25b32abf127b667fc00071c1fa7809034a5dd1e640c49f4ba6c2ab3e5718753b1
-DIST hiera-3.3.1.gem 40960 BLAKE2B 6bf380cd9a46c4b035578e576fc01af3e026a26c421c5d7745d5f1a62c143999faa466d8b15ed30621bba0ce13a5cf42a38e1f572993560019a73c717050cab7 SHA512 c9032fa0d01f43b22b5d59fa9e8f3b6353b2a91b4ddba9aa6f7c8debfbd2b1089f0b471be5cd0f864025aabeb3f117dabab0a342ae9f659d6dfc13480f27a7a5
 DIST hiera-3.4.2.gem 41472 BLAKE2B d4b1fd0432a4b8fffbf9e55118e93578226fd270ec11da4b999d1e1b7edc32fda70d7a7b84c016034d8028ae51d55d5076dc51780b10ff59af52077ddda6224d SHA512 33045e395fa06467ae61f42eeab5b48b76a03274243db52dff7dbf8a08052b8cd2e0dd609d6a13317efab485408c7351cc2553ba2e5a767afa09a8a21735852f
 DIST hiera-3.4.3.gem 40960 BLAKE2B a4747c6096065c1272bd3099893d27c53b5e869be16643fbd59fa0eead692e3bd082fcbf82463614336d00c3068244bd632fd6c3a87ba520566a8643f674bfc4 SHA512 126e626b9c9020f2b8565aaff35f30b35c73785120425d186c97186c5bdfafc4831216250f78fd33ffd5e1dde49646b262887747c0d73442a252c391329959e2
 EBUILD hiera-1.3.4-r1.ebuild 686 BLAKE2B 039904c7c8491bd47a2e628ddb710d94f50507f95abbbc697ccba743923ca68556c989e431b7a5bd8d62d78a12a285c05900117b21e3d8ab09ba9e339e3eb5d9 SHA512 f23c9077ab3542cabb12b797b971799dd0db0d18dff968467df28e8cbc7189b49ee6d90e2728a7d05957b4575fa7dbd5137c7db1bfefcfc834765255b51e0f16
 EBUILD hiera-3.2.2.ebuild 525 BLAKE2B 3c0b660c66ec6ad6129184715a91a98b6bb7bf3df7a9c3af8dfb338eef813c4fc9153f423ced5cb301dc567ec654d69b21b1724482e105de864fbb09e4e4651c SHA512 6b46a094ad8057bb99455ebf3368628b6e3c6deec83a7053b177ff996887cddfe0160dfa9ef118700397f2bbc4279e0625a9d6628cd02794b4f7007e1d3a6ac0
-EBUILD hiera-3.3.1.ebuild 528 BLAKE2B 87e9a0828cfebd75ef3bc4f7e6681002d6efd91f03b2bcf25e7daac0e88ddc6032623cebd576ed899f1351616ea917ccc7c2e9a5b8e66cb395565f5ea6ea310e SHA512 e0062c4b39a2d2b702754fa7643756c46dd89110cdfad2df2abf3ebef673f1ddafc4bfacd8cf2572546a51a8a4cb36d4af51cd4da648a6b1bcd4c1643a237fc2
 EBUILD hiera-3.4.2.ebuild 540 BLAKE2B 69d22cb0744e1307ebee3daf2f525326063a088a1a635211b01f144ae32b35e66842d914160001d844bb005204e198fb2a837cb31c8eb12c276590bb73f9cc11 SHA512 9eadcea91a5f9cd2eb3d5841b53acda17af87e39fc57bb6d7aec2191c6afcf0c86582abe64d72aafba41910d4090d270ebc5abd83b2614ac19b37eb012828e60
 EBUILD hiera-3.4.3.ebuild 554 BLAKE2B c2707f5e1febb30009fcd3d06793e0f5169423124c53f0a2e1c1729f5a6830cdafe2f1f2817f97f6cbba03d885ace70f8d925a397cbcd10362fceecd462b82d7 SHA512 3312ffe19717edf678f384e6c6057431f3b9639705302f5463d41511ec99fdaffadea10dec3a717c54e03753d8f30811a9e02c9d67283955f7f7026bef697215
 MISC metadata.xml 441 BLAKE2B 45d0b18035001279a7fc0b362aa00ab9bea5282f35a2237bb72e84893d8a9ff4b575e43928d48aa9906def18e3fe1bdfb121e5411c46af7117b529f136224796 SHA512 795fc49e90529600ad3a950440f33c9dc60aee0f6ad134b682d8c8e80452f015fd2de5af77ed6ad58830e61b1ab7944dcb81629d75d4b09927e218f33aa948ae
diff --git a/dev-ruby/hiera/hiera-3.3.1.ebuild b/dev-ruby/hiera/hiera-3.3.1.ebuild
deleted file mode 100644
index 1d8ee8a87cd9..000000000000
--- a/dev-ruby/hiera/hiera-3.3.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A simple pluggable Hierarchical Database"
-HOMEPAGE="https://docs.puppet.com/hiera/latest/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
-
-ruby_add_bdepend "test? ( dev-ruby/mocha )"
-
-ruby_add_rdepend "dev-ruby/deep_merge"
diff --git a/dev-ruby/hipchat/Manifest b/dev-ruby/hipchat/Manifest
index 98b08296a260..79ed041e4d8e 100644
--- a/dev-ruby/hipchat/Manifest
+++ b/dev-ruby/hipchat/Manifest
@@ -1,3 +1,3 @@
 DIST hipchat-1.6.0.tar.gz 23328 BLAKE2B b9328e339f40ff1d865af5bbd660d479e94e18be98a74171125ff9d55e96353bf0ad9420e9eacc8b1a650f873d16a197418f7cc8728042fd403a7d1bceaa0b9a SHA512 43afbc2aca234d7d3778189874013df7847f9045ecc1d5ebd6b3772dce2a9cc5000fa6075867a9b0968d49410d775f3f56ed0a4ae637d6ad3893aa668895f2a3
-EBUILD hipchat-1.6.0.ebuild 899 BLAKE2B 8844d8de105d6779ee8d60444b1c0cb1e8d2c0063dd7fc4a3eeedb4fa6b7e3eecceabbf78cae097b93652507ad827b457733a9fda853195a5ca5fea91b39413f SHA512 83dc3e456eb02b4f01528b1187d678c42abfd0ee53100c30051848d2f4c20cf3f14ae68442ebb4011296c323ea46698cc3049e2bed2935e552a9502f7daaf149
+EBUILD hipchat-1.6.0.ebuild 882 BLAKE2B 2ab76f5204b70b676897d10e6213c68b8ecb9955d893950ca5b3bc369c04c12ab30076e2bbfa5026326cf849f5e025d34e9b3f46d34d2a9135aaad35bf8b963a SHA512 1128d79248e341df44212b35601cad1e59f1fe97fdd244e74e7739b7c7be674aa93e95a94ed0ab9d8f1c4d3968303144ea33e769eb79a592484332b8c414551e
 MISC metadata.xml 344 BLAKE2B 6e939739b4e25c1e6f3d7a01404d63c56d68744c089158d093211394410cbb2d13a0f7802f5378659888ceb0cc0b466accbf28f75f3fe54e9c1d759eadf21dff SHA512 3d3dba56d79d454c346c2616045e6d134d668b94bdbc1c056ccba1b13a2ab715d781904074d42bbb0506d9d1af2cd61d7df08613c077204c558c83b3f31ae3b9
diff --git a/dev-ruby/hipchat/hipchat-1.6.0.ebuild b/dev-ruby/hipchat/hipchat-1.6.0.ebuild
index 9cc20c1f227b..e0c8e1822bb5 100644
--- a/dev-ruby/hipchat/hipchat-1.6.0.ebuild
+++ b/dev-ruby/hipchat/hipchat-1.6.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23"
+USE_RUBY="ruby23 ruby24"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
@@ -25,7 +25,7 @@ ruby_add_rdepend "dev-ruby/httparty dev-ruby/mimemagic"
 ruby_add_bdepend "test? (
 		dev-ruby/rr
 		dev-ruby/rake
-		>dev-ruby/webmock-1.22.6:0
+		dev-ruby/webmock
 	)"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/httparty/Manifest b/dev-ruby/httparty/Manifest
index 1c2419233e8a..f7ae02eb1310 100644
--- a/dev-ruby/httparty/Manifest
+++ b/dev-ruby/httparty/Manifest
@@ -1,9 +1,7 @@
 DIST httparty-0.14.0.gem 84992 BLAKE2B 5fdb305a01c6c16bd8c9ea7bd11f0dddcb39a4bc3113b1e7ca83965f44b3462a41acaf1020e12e91b323d16ce27b65f2ea6f7d9e62722fbcecadc4d61dfd433c SHA512 db04caaeff3277c071a2d3914f782f9151597d601a2f8817e704c977b95b149144c47df73284f83396ce1099f75f7fdc3caaa17385a515878366e2b3fcb84b04
-DIST httparty-0.15.7.gem 87552 BLAKE2B d7a0907d1c24113c129493a57ca900f45026e1ed7cc4407ac367d8ba5afa615af31496a2003755951d52672bdecd0646aaaf407b3c47d4856c9c492e7ec5cac7 SHA512 6bdf5946bc0f22afed346091078dd43dd62cb6190b3d01bc0de5c9732c611474e207c38b4c6eca5f3cc1e2139880c2eac19554d359dac861de33c5c5ceb28c5e
 DIST httparty-0.16.0.gem 89088 BLAKE2B 27715c6760a9adeec289a005f89de219b32e6ad5c3f937478ad4187df895096f9375b0d20a4b33c1c62b96de6313017a713a036247756a96fe9366e7c1e77247 SHA512 c523ab3555d0a86e2df53e800be57b88f40bb680e7df31e754ddc3e76728eb2228e6ddbe9a3e580c4c604a126ebcd33be79dfde3758faf99aadbba4d30d9508d
 DIST httparty-0.16.2.gem 89600 BLAKE2B 581b5fcadf59bb50864b2fa6d1aae220ff9881bba53363601c6e70c3291dc2cee351a8f42b1946ad516cdcab5a85b832e4260f04394e54255e0cd76bc6860d5e SHA512 13efbacb9ee0325fbb185279ca9f7ffcc0131189ccf98d9889c6a1b6bcfa04fd7cbc6d1393bffe69a5a813a2f54f70b5926e176305fa70480dd0902968c894d0
 EBUILD httparty-0.14.0-r1.ebuild 1046 BLAKE2B 114af3a01a68b18490e38a3aa08b154ba3fe4ca5789a515967b89ccb1cd9f4c89c7c353620069e00058f06badba819f0cb5dbf4fdaebfe1d8769431491474272 SHA512 1b3759dc601a16703f7c29afaa90b64562a4bf860738307429d359ed248ca64c02ec27ae36fea632092941170ea693b2dfd73b70d7c17d55d6b8bbaee27d856e
-EBUILD httparty-0.15.7.ebuild 1247 BLAKE2B cf763560c391a029b6dfec085797f97f46d154ae163277e954a914c7a65e172543c9cb4699e15380abc41dd86f4eb2b31b978fdd87ce533ee2061ba23a85d762 SHA512 9d6b5d95df757aea5b389a2102ff106877396e1f82f04adb05ed86af018a9a55672558acac258c5c5d2c2500a522aa6fa480f1da075134860d0bc4efa683056d
-EBUILD httparty-0.16.0.ebuild 1247 BLAKE2B cf763560c391a029b6dfec085797f97f46d154ae163277e954a914c7a65e172543c9cb4699e15380abc41dd86f4eb2b31b978fdd87ce533ee2061ba23a85d762 SHA512 9d6b5d95df757aea5b389a2102ff106877396e1f82f04adb05ed86af018a9a55672558acac258c5c5d2c2500a522aa6fa480f1da075134860d0bc4efa683056d
+EBUILD httparty-0.16.0.ebuild 1246 BLAKE2B d3305c8cd1703486ab374b67d5a8a197e6c9ce0b700e570ba1407148aa692ab1c402f5977e263aa4303a6b3e6bf356297f7572d3a582ae306c9937909c65d137 SHA512 ff0d3fce64021e7ae05c74bd58576bdafd00c52d0ac9241e2faa899f8f12baccbb141f23778f35d0a2878bb468bd8c4cd440fb78d963851053136e6584c0d806
 EBUILD httparty-0.16.2.ebuild 1247 BLAKE2B cf763560c391a029b6dfec085797f97f46d154ae163277e954a914c7a65e172543c9cb4699e15380abc41dd86f4eb2b31b978fdd87ce533ee2061ba23a85d762 SHA512 9d6b5d95df757aea5b389a2102ff106877396e1f82f04adb05ed86af018a9a55672558acac258c5c5d2c2500a522aa6fa480f1da075134860d0bc4efa683056d
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/httparty/httparty-0.15.7.ebuild b/dev-ruby/httparty/httparty-0.15.7.ebuild
deleted file mode 100644
index b65c830b1ec3..000000000000
--- a/dev-ruby/httparty/httparty-0.15.7.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Makes http fun! Also, makes consuming restful web services dead easy"
-HOMEPAGE="https://jnunemaker.github.com/httparty"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend '>=dev-ruby/multi_xml-0.5.2'
-
-ruby_add_bdepend 'test? ( dev-ruby/webmock )'
-
-all_ruby_prepare() {
-	# Remove bundler
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/ s:^:#:' Rakefile || die
-
-	# Avoid test dependency on cucumber. We can't run the features since
-	# they depend on mongrel which is no longer packaged.
-	sed -i -e '/cucumber/I s:^:#:' Rakefile || die
-
-	# Avoid test dependency on simplecov
-	sed -i -e '/simplecov/I s:^:#:' \
-		-e '1i require "cgi"; require "delegate"' spec/spec_helper.rb || die
-
-	# Avoid test that works standalone but fails in the suite
-	sed -i -e '/calls block given to perform with each redirect/,/^        end/ s:^:#:' spec/httparty/request_spec.rb
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc examples/*
-}
diff --git a/dev-ruby/httparty/httparty-0.16.0.ebuild b/dev-ruby/httparty/httparty-0.16.0.ebuild
index b65c830b1ec3..472d30ad10ff 100644
--- a/dev-ruby/httparty/httparty-0.16.0.ebuild
+++ b/dev-ruby/httparty/httparty-0.16.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://jnunemaker.github.com/httparty"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 ruby_add_rdepend '>=dev-ruby/multi_xml-0.5.2'
diff --git a/dev-ruby/jeweler/Manifest b/dev-ruby/jeweler/Manifest
index c7fcb996b478..c8adb18c0290 100644
--- a/dev-ruby/jeweler/Manifest
+++ b/dev-ruby/jeweler/Manifest
@@ -1,3 +1,5 @@
 DIST jeweler-2.3.7.gem 61952 BLAKE2B fff72e299131b3080c36002e90d36e89db8fcef85cb5e8cbb0976e4b06f0555117d2b6e6375d298f03683565a8d2826471a2f847f481f215d1ccdc231346e1e9 SHA512 4ca397c75059a28d623afbb22fc5b2b5627e7c3f078b2b77eb623d0b70f518fa58fce54526e12b417ffbf40e1b635dfbd57ff1d91264ed3ca7bb6917bb4ca784
+DIST jeweler-2.3.9.gem 61952 BLAKE2B 2c802f27db9a5018473792c184c56b1d2262ec4e30ba24da964bd8dfebecc7551ea50f4a4c0f823907a14afc5358036ff2efb0d9e8404befb2c451688f578b1e SHA512 d8e91702cf046cd16b5b0f718966adecaa7777f2ce526e3fac3be97f8e91ffa32362a9a96d1c8b390b400f38d0d7a59860437487459cb0490366ef2d38fec6f2
 EBUILD jeweler-2.3.7.ebuild 1810 BLAKE2B 5eac599ee75477850d05a0f8a9cfa7b73b9a641fa6ae9b9fa341666ae906ddaf02682876d94ce17953ecaf72c28a36010db4b3f7b91683552e225b918e49121a SHA512 d861f57caf2d4f824d43ed56371494387211868024fa93f2f24e1fdd64be9ebea1bb92908a2e707d48beb1931eee9737f5dc1232016dc57ed86af1ed6ed9806e
+EBUILD jeweler-2.3.9.ebuild 1794 BLAKE2B 97acccc69294783beb56ea36911ee696bc661530fc8dc607b54b513f7ef624421d5bdc0004c91c9f394c113c8b404b68438fa6e1d5ef1fdf02ddd0a7152ab222 SHA512 d84abe728c83b52a0365e09433bdb5bc5d657619456e6ece14bd4e639bf8fc4307969e75d33580360fbc7864f548b1106ed06736ac3c7b01c595c73a58bcecb1
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/jeweler/jeweler-2.3.9.ebuild b/dev-ruby/jeweler/jeweler-2.3.9.ebuild
new file mode 100644
index 000000000000..e953d1d6e966
--- /dev/null
+++ b/dev-ruby/jeweler/jeweler-2.3.9.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24"
+
+RUBY_FAKEGEM_TASK_DOC="-Ilib yard"
+RUBY_FAKEGEM_DOCDIR="doc"
+
+# Tests and features also need the same set of dependencies present.
+RUBY_FAKEGEM_TASK_TEST="-Ilib test"
+
+RUBY_FAKEGEM_EXTRADOC="ChangeLog.markdown README.markdown"
+
+RUBY_FAKEGEM_GEMSPEC="jeweler.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Rake tasks to manage gems, versioning and generate new projects"
+HOMEPAGE="https://wiki.github.com/technicalpickles/jeweler"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend "
+	dev-ruby/yard
+	test? (
+		  dev-ruby/shoulda
+		  dev-ruby/rr
+		  dev-ruby/test-unit-rr
+		  dev-ruby/test_construct
+		  dev-ruby/test-unit:2
+	)
+"
+
+ruby_add_rdepend "
+	dev-ruby/builder:*
+	>=dev-ruby/bundler-1.0
+	>=dev-ruby/git-1.2.5
+	>=dev-ruby/github_api-0.16.0
+	>=dev-ruby/highline-1.6.15
+	>=dev-ruby/nokogiri-1.5.10
+	dev-ruby/psych:0
+	dev-ruby/rake
+	dev-ruby/rdoc
+	dev-ruby/semver2
+"
+
+all_ruby_prepare() {
+	# Remove bundler support.
+	rm Gemfile || die
+	sed -i -e '/bundler/d' -e '/Bundler.setup/d' Rakefile test/test_helper.rb features/support/env.rb || die
+
+	sed -i -e '/coverall/I s:^:#:' \
+		-e '1i gem "test-unit"' test/test_helper.rb || die
+
+	# Avoid a test that only passes in the git repository.
+	sed -i -e '/find the base repo/,/^  end/ s:^:#:' test/test_jeweler.rb || die
+
+	# Avoid dependency on cucumber, make sure semver2 gem is used (puppet also provides "semver")
+	sed -i -e '/cucumber/,$ s:^:#:' \
+		-e '1igem "semver2"' Rakefile || die
+
+	# Loosen github_api requirement
+	sed -i -e '/github_api/ s/0.16.0/0.16/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/kramdown/Manifest b/dev-ruby/kramdown/Manifest
index 15d97b2e87ef..70b4eabb7903 100644
--- a/dev-ruby/kramdown/Manifest
+++ b/dev-ruby/kramdown/Manifest
@@ -1,5 +1,3 @@
-DIST kramdown-1.13.2.gem 249856 BLAKE2B 33aacadc09a1f720cf9876690647d2005272c571e861f9f69852e7bbfaa2cbd36802def1f732e9762e9c5c417f85a4eaa63d72a70e37cd9a6b6dd6bed5a099e0 SHA512 dd2194184a7761bc490535a9d5631b78441b83f040e37dafc25b956dd680fe398d19ae75aff06dc2ec6a7573ac198169e175ef78a95743f0f7b4874bf28cebf8
 DIST kramdown-1.14.0.gem 250368 BLAKE2B 78d3638ec58a5c237a9350cad1edabf2d4fa0307013a0ced18f6835c4a8cdd623e4825b06670d5c588147013b191912f93e51e74ab1fe007761c117334f378aa SHA512 bd6295db2fe0d3a7dca936d47f0aaf7f939a86361dfdd3203a52683a9eb11a68075cad7d068cc56a315db3c14e73cf5aebb87531ba3086301a7521c5a86f9905
-EBUILD kramdown-1.13.2-r1.ebuild 1434 BLAKE2B 95bdfa76f8e66a4414eda91214a7a50e9d0d38f49b56640b09965647cc4e8a2c9ed321c66b611a33b60f8ab5d7638c2a69c9a19a6d7f515c72ac7024f16f5268 SHA512 55efedb7a822e146d7917a7abe29c55c1790d9abf90634ecfc0db968768dc3f505d73e736df2b44397e613832036e11e56b7055269207f54aee4471aefebddbe
 EBUILD kramdown-1.14.0.ebuild 1441 BLAKE2B a39516ad8947cfa1235e9c9125cb99c74328ba6bcd420862deb6731c2e2905273ecd3a5b7c23a6690a338933a65d0cb43558ffaf91e7cf404833f79262d5f76a SHA512 6d7d9ba85208b89e113b6b6f10983447ff8c08bdc707f8621619b7abdf4b210bd9f7ad45e98516724565120cf3fd9b978f558a42b270a1907ee9fcdf7b61ec84
 MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/kramdown/kramdown-1.13.2-r1.ebuild b/dev-ruby/kramdown/kramdown-1.13.2-r1.ebuild
deleted file mode 100644
index fbc6f81f1a4e..000000000000
--- a/dev-ruby/kramdown/kramdown-1.13.2-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_EXTRADOC="README.md AUTHORS CONTRIBUTERS"
-
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Yet-another-markdown-parser but fast, pure Ruby, using strict syntax definition"
-HOMEPAGE="https://kramdown.gettalong.org/"
-
-LICENSE="MIT"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-IUSE="latex"
-
-LATEX_DEPS="latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra )"
-RDEPEND+=" ${LATEX_DEPS}"
-DEPEND+=" test? ( ${LATEX_DEPS} app-text/htmltidy )"
-
-ruby_add_rdepend "dev-ruby/prawn:2
-	>=dev-ruby/prawn-table-0.2.2 =dev-ruby/prawn-table-0.2*
-	>=dev-ruby/rouge-1.8:0
-	>=dev-ruby/itextomml-1.5
-	>=dev-ruby/coderay-1.0.0
-	>=dev-ruby/ritex-1.0
-	>=dev-ruby/stringex-1.5.1"
-
-ruby_add_bdepend "doc? ( dev-ruby/rdoc )
-	test? ( >=dev-ruby/minitest-5.0 )"
-
-all_ruby_prepare() {
-	if ! use latex; then
-		# Remove latex tests. They will fail gracefully when latex isn't
-		# present at all, but not when components are missing (most
-		# notable ucs.sty).
-		sed -i -e '/latex -v/,/^  end/ s:^:#:' test/test_files.rb || die
-	fi
-
-	# Avoid tests requiring node to be installed with mathjaxnode.
-	rm -f test/testcases/span/math/mathjaxnode* \
-	   test/testcases/block/15_math/mathjaxnode* || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	doman man/man1/kramdown.1
-}
diff --git a/dev-ruby/little-plugger/Manifest b/dev-ruby/little-plugger/Manifest
index dc6c90bb61b9..ffe944cb46d7 100644
--- a/dev-ruby/little-plugger/Manifest
+++ b/dev-ruby/little-plugger/Manifest
@@ -1,3 +1,3 @@
 DIST little-plugger-1.1.4.gem 10240 BLAKE2B 389abe95f8eaf815e4cbffe184416a2846c917cc3cd90dff6f6f7d6fc9e162c0304652f3173c84fa61b5d25135cb295131733aed4911d19719b2b032ec3c4ad7 SHA512 79b26509c56084a93997e011870de085f9e5222d631bf410c9bb2a361949e80f3d8be279b26b6c405dd47aedbea72089de212990ae0906f7493a3e8edfa8cb87
-EBUILD little-plugger-1.1.4.ebuild 472 BLAKE2B 96b6756c79e2a1d8a3a6ba6918b49c8ee81182e003f880fae5a2c767ede301b4f4af897c3108db80ae97eecc2741d11c0cd62170743041cbf13b932d24775439 SHA512 c6bec799694c35eb08110b44aab20020082c60a8c8bc66c26e5d651e43eff2273e0f95426cdbae5afe54cd3df09a3f15f162585d7b81b24222ced89e23fd637c
+EBUILD little-plugger-1.1.4.ebuild 465 BLAKE2B d261dc89707b8a585fa7ce3fd4a612255908f5032e982241bd828c4107d7233276072cb79d7cd8c8cb0ba739d6dd08ff0e9ef8447bd20aaaa6ec58f85d500ee0 SHA512 c08022c0e7d7f5c63ad9c044f904a277ef8362b703011da38d011dedc6352798889f6a9394cf2c484d9de886e481d644b14e3c7ce00347bd7e6dfba53fdfae15
 MISC metadata.xml 344 BLAKE2B 8b4a2b9470f732ed56013b54505ab7d67051e04cd9439c4de62e6808320f58d95eaaa8e7d1120f4ebd2bd40a6c903ed0f622490bc2c8460c17e7d8d926fe6123 SHA512 350e945d08c8bbee3772d17be76466eff5e11928a96478c9844001a9fb3b1b16d69f6726de3f3c567b2933b315883601901db7564cea72621e746db273777e71
diff --git a/dev-ruby/little-plugger/little-plugger-1.1.4.ebuild b/dev-ruby/little-plugger/little-plugger-1.1.4.ebuild
index e0ca649c1046..b0e5d7f961a6 100644
--- a/dev-ruby/little-plugger/little-plugger-1.1.4.ebuild
+++ b/dev-ruby/little-plugger/little-plugger-1.1.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/log4r/Manifest b/dev-ruby/log4r/Manifest
index 09ad36d387ea..fc953e7a6b7d 100644
--- a/dev-ruby/log4r/Manifest
+++ b/dev-ruby/log4r/Manifest
@@ -1,3 +1,3 @@
 DIST log4r-1.1.10.gem 118272 BLAKE2B 32b47cd7896b4b1769c51542a4b7f98b22874d40abe59fea4859079f8af10c07810d51cad275d3962f9948b6237a3e507d6d010cf7ebca232ea282ddb108b70a SHA512 a3a9e6c9ef5b388106afc4d402455ec480729cb58054794e6ff6c963b4d819776bf5b57ef5ab7499ddc9a6b3c10f299a133f3f5986d94ee0a438b64ede5bc143
-EBUILD log4r-1.1.10-r2.ebuild 626 BLAKE2B bc0844d6deb322b7863d66008dcb8d9f93efe334c705a8068f59345f1cca927c1fc7aa0c29599f7feea428eee2e84bc01199fdce2781b2dfba99236fcad5115d SHA512 538b0fa9f463b0839657f67d58a061d21039331f5f31a8cabce564d3f9c185d6a134cb8ec808ed740a3731a9b4402e84684c6caa46c8bfddbd1b02806629a31c
+EBUILD log4r-1.1.10-r2.ebuild 632 BLAKE2B 4195c86f1a34ce381e47456e13917fa3a6a571967757b81e1e80a8f15402b8ce261482fd3982972542aa92e5e90d1d7b21e22eab881b0ee771d71c1b288bff20 SHA512 e03beb28b7c2f1810889a5d7cacdf3a030a6e6a96c84185890bdc077debe31623da8d19bc7682d9a4d61579151ca1abb17cc605d625a1a69fb5370f6e32bb6f4
 MISC metadata.xml 326 BLAKE2B 316f078eee221f3bf42447216c98134044df080287b3b63a8a382f25732a366e835a277f4a67ba10f8a25fd6e6b08a0d55ba14b6038a650c0fa27939a430612d SHA512 1f5c68f4e045bdf6fa1291a94fa26f63179375b2419cca1cf8ad487c4f311e2907a08d1460b02c9e60e39ecc9793f04eebb9731e13724fc25df48fd24206a133
diff --git a/dev-ruby/log4r/log4r-1.1.10-r2.ebuild b/dev-ruby/log4r/log4r-1.1.10-r2.ebuild
index 93d490ea9959..f12c1f85f82f 100644
--- a/dev-ruby/log4r/log4r-1.1.10-r2.ebuild
+++ b/dev-ruby/log4r/log4r-1.1.10-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,7 +19,7 @@ IUSE=""
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~sparc x86"
 
 all_ruby_install() {
 	all_fakegem_install
diff --git a/dev-ruby/loquacious/Manifest b/dev-ruby/loquacious/Manifest
index a53c74cb6a96..787545b85d44 100644
--- a/dev-ruby/loquacious/Manifest
+++ b/dev-ruby/loquacious/Manifest
@@ -1,3 +1,3 @@
 DIST loquacious-1.9.1.gem 22528 BLAKE2B 5ab28283e40f63a1bacdf6e7ca0c3c9e64527c21bbc7992720b7e2581c156fd449e18e56e10d6cdbe6c4238e129a0b99f5bf1b0487afbd3fc988ba6e9835d37b SHA512 49d176d0229e80a5af69a7cdd24fb2947332faeb70846f28c21249e5297d81246f55eb7f033cc444999267ae727b26f7540f1ec4a542a65af11c3d3ddf7bb129
-EBUILD loquacious-1.9.1-r2.ebuild 761 BLAKE2B 884b35c9ab88c8ada48cdb69bcd2fd363dad312f0e50f3f1ad0a44dbcd3f516760d8ab3e1fbcd629c3099695c10af1f7235eb870a19fd00cf750dc4334edef19 SHA512 d3663744e4d4bb0e1a7cd423110e31de87ae11610e7899d2acf9a9892609cb86d0f4b981e81abf63e62ef0224ab4dd2a1803bdebdf96b3d2f59953c11b53b9b1
+EBUILD loquacious-1.9.1-r2.ebuild 658 BLAKE2B dd27e1cf5a77cf7d50d33ff5133cf226727ba2e2e47817c21ba647b5b11dd167e0a8eaa01b37930be8a1a7552163400dd15c17970d64fe51aeffa12acea9b8e7 SHA512 5cea077a84c831cf12a0eb6640ad8eb0ed9aa1c8c0cda20a7fbfa3c17985345c82d155a98a95cd1445034b5b0ecc10dfc275d0698e69d832c2c53ae36595a9ba
 MISC metadata.xml 340 BLAKE2B 7d541010db79dff55ebd4b1a4a42501ab93b654f0e732830ff7bdefb8b675b45fcda73a8b07699bc9d73e67937f5d168d29d2f9289902b1cf5b5aee72e09f275 SHA512 b68c4a29f683a2a736ebfae1c9e0ba646e80a4384946dc69879494c495b29f4ee0cbbbcfc42f0cc6ec6b8460c773d2ce410748ffb9f1ac81ce8394dd3b61621c
diff --git a/dev-ruby/loquacious/loquacious-1.9.1-r2.ebuild b/dev-ruby/loquacious/loquacious-1.9.1-r2.ebuild
index 445d1b99a150..958838aaa2e7 100644
--- a/dev-ruby/loquacious/loquacious-1.9.1-r2.ebuild
+++ b/dev-ruby/loquacious/loquacious-1.9.1-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
@@ -22,11 +22,6 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-all_ruby_prepare() {
-	# Remove metadata because it confuses jruby.
-	rm -f ../metadata || die
-}
-
 all_ruby_compile() {
 	if use doc; then
 		rdoc lib || die "Documentation generation failed."
diff --git a/dev-ruby/multipart-post/Manifest b/dev-ruby/multipart-post/Manifest
index ffd500048855..0d7ab5d566e9 100644
--- a/dev-ruby/multipart-post/Manifest
+++ b/dev-ruby/multipart-post/Manifest
@@ -1,3 +1,3 @@
 DIST multipart-post-2.0.0.gem 11264 BLAKE2B a842e810dd5ccc4a03509003ec1fe87ff7faed80501e776b7d10bf01d64405a4ff01812e9c6ca600207d268f0abe37dd164b54307cdb446719602bc81787b885 SHA512 4f48c815d82c139986f419cdb12efd2f3792f2ef0b2277b75533c8ddad17cc6a8c187deddadc82d29c9f7f8337fcc9ad23c40eb72053ac933911ec1457b01c18
-EBUILD multipart-post-2.0.0-r1.ebuild 582 BLAKE2B 6da034dee08c267256bc582cc0c267b548b85c96b30242aedae9a00471552d6c084663c0d5ea0b6aa9a231af3291b71f76eaf77e6529209b76f01165409e57eb SHA512 7d9a48328c6cd2a9f6a556baf798130130528174e09c55bbb7bcc3b19021e27a154812d80c582dc1017dd1d6938cd6bb1e9ef66ffaddb76b6dc857d23fca6ff6
+EBUILD multipart-post-2.0.0-r1.ebuild 575 BLAKE2B 7a9a1706024dc183c47b3d573eee8423f33ab6dd6dd3d0bb4d8a688460c87d2d08f62d1bdf1e955c6d2c9c09dba22a8768e021c78047b417aab493500321128c SHA512 5c5efd26310aa63b68467e107862018d8cb368972960bab0a8255f043d3f3faa985dcd79f399fa1a059169c0af9f0fae24689bec17a345a04d656b59eb540d31
 MISC metadata.xml 351 BLAKE2B 1b91932f0fac0566cc3a283f50d5162f09b9ae0f06ee2419f5be35cb6fb9b6b7234c4c8974c89d38eae80ad2a642b1ba5a927506442ab2906a4d43832a2207b5 SHA512 d25464b95046a3df4a9989cdc012fa2220f9d0008f48bc16bc54e87fe6cb99ce0e4548e042ed96675d917a68a2c2e7fcbc3054c66fe5879eb6761cacddb7c51c
diff --git a/dev-ruby/multipart-post/multipart-post-2.0.0-r1.ebuild b/dev-ruby/multipart-post/multipart-post-2.0.0-r1.ebuild
index ff429b4380eb..e2c7ae596b20 100644
--- a/dev-ruby/multipart-post/multipart-post-2.0.0-r1.ebuild
+++ b/dev-ruby/multipart-post/multipart-post-2.0.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/nenv/Manifest b/dev-ruby/nenv/Manifest
index fe0c4e23e14f..5d89e958525f 100644
--- a/dev-ruby/nenv/Manifest
+++ b/dev-ruby/nenv/Manifest
@@ -1,3 +1,3 @@
 DIST nenv-0.3.0.tar.gz 9773 BLAKE2B e3b53fd60ec89e8c068f47321880189750311192b33658ef61120390f4254a3194a8afc3c67acc0e9a2601f64e93cbe02f004c1c345f378f0f80fca3b3a9e778 SHA512 f0a50d7c78573802849b383351f3d099e55c67b935933bc00d55b752c1af944a4b7a8054b2cd41b238b192587f5bcca5de9d5c577764502300d571446de24228
-EBUILD nenv-0.3.0.ebuild 675 BLAKE2B 3178802f4f9b7e1b7e8aaf1f09802e966ffde45f03e195db9eba6599193744b697f28a635878467f3084563a4fd137bdacc2958709c0170d18c7b746c59b62c9 SHA512 4b3ca1fed9364e44adc100cfde03998843bb2a7672c78f02cf324ca2532e6ddaca40dbb8f4037e9569724e581c2252ef3a9be077b7c5305e819a7d5d03ba0a13
+EBUILD nenv-0.3.0.ebuild 668 BLAKE2B f0dcdc27039f8399dcc416777620fdbd1cf9bcf4bede1b2ab5a3598097f2762bf55527f6b13b5aad9757bae0501d43f380000a58c843762bd93d98ea76a1497a SHA512 5f62082008b0dedd20dae231e694834927afeb412b03e766cb36032eb4fc4d095921964f393a59343add0138345624b5cc614bf22ef17dc2992995a8e0c10023
 MISC metadata.xml 333 BLAKE2B 0351956feec9471995daa30673bc189441a7b89449915909aabc270089117ed9149a390f05262d09465d602fb7dbd31dd40ba3b30f4340c68cb9340ca7f9ec1d SHA512 84633eb2251bd7e09096d8adbced6c2d351e1d47ec1ce0c57fb953565b33c515896e4c0fe4828d3ea530e6f8ce44d5d5b8d54c5cb0d0d4777c29ac480309bf72
diff --git a/dev-ruby/nenv/nenv-0.3.0.ebuild b/dev-ruby/nenv/nenv-0.3.0.ebuild
index 160e4630c457..cd33a9945bb1 100644
--- a/dev-ruby/nenv/nenv-0.3.0.ebuild
+++ b/dev-ruby/nenv/nenv-0.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/net-http-persistent/Manifest b/dev-ruby/net-http-persistent/Manifest
index 9ea5c07a7e9d..fe0141cca924 100644
--- a/dev-ruby/net-http-persistent/Manifest
+++ b/dev-ruby/net-http-persistent/Manifest
@@ -1,5 +1,5 @@
 DIST net-http-persistent-2.9.4.gem 31232 BLAKE2B 54388d26971c3ea3353e0c39acd00fe77befd66e408c54be13f7ecea194517a2e71b8d9bebb1238f4d36d7be96584c0be9e6a7bbc44f81f88004dd118fa56311 SHA512 9251e8422c2f43e7ecd8bc287fa9fff682fac84ed95d143425b0e7e7678a06c9be01db56e6a956588d6c33ddccbd1eff45a6f399f43d452de8e3134e6c50b74e
 DIST net-http-persistent-3.0.0.gem 30208 BLAKE2B 2bbd87d66e65081c76bc9cddaeb38f3ffd8a92b5b64f7717f77c7a927e2032fa732c2e82e220a75a63ddc10dfaa6a0f24e4fa7e0964e2ebd3d0729127f1fb452 SHA512 a601d3abde43b196406e3cdd6b704796ed70db67dfb67c9b510e0164ce7355cc925cac37fbf4c5889f41b069890ba2e2c15440fb40294ed21891fd08d9f87894
 EBUILD net-http-persistent-2.9.4-r2.ebuild 846 BLAKE2B 81858ae68e68062c68c80af17008d98cd8a628e28cd6e8cce47b253661f196046684c041542a9be75a8ea5782b689c2de34244189ef24f6f76ebefccc9b3f268 SHA512 4b707d418ebde88b2b7d7782a9795a1e1b0ede9dd88acd7ca0fe9ffaaf4566d72e3029b11ed294c02413389a1355ed7d4e3dc5647513258eabe7e0d667ca13cb
-EBUILD net-http-persistent-3.0.0.ebuild 890 BLAKE2B 7ff7230525abc338114d6c148feff584def231b91f249fc94b53d4f855d6ca462cd8f0923fb33a29ffc26327572bad5e014bd4e9d064d78e156dee715635097e SHA512 1b43430496c0548c8346d4bb8c066f7387a008db0f1fa16a69965b3156ca4cb865f5e293e870e45d7bbae95d070b73757cd2545d03d989779e1c245d64bc5e76
+EBUILD net-http-persistent-3.0.0.ebuild 883 BLAKE2B 128668d57e186a7550476b2c0bc9f4435e0e978ba07da210a9d37d038672cdd3275fabc2c8d591438b7490aa45577246472460343bcfb622c167f91eca0ff6f3 SHA512 268f2ea1493871e0ed9c4381f62bf155dc8bf46071cd9fff5ec56a791b3db6bba56eb515558e31635c0af45d6f8618b64e13313da537dc8220274c5503069bbf
 MISC metadata.xml 353 BLAKE2B 9c2503aa880a368eb25787d0020bba032b96ad047823434e630864c5569985cddc59fb8cfe458ce2ec7a278759f98c677d0413c70d65f20bf2b11df7c1114c0b SHA512 acff0618bb97cf903d61bf4149537876ba57037cf93c033f7a7c2165682d52216229f5d52166e648e313c7066c25bf3cd70925b5791ac8f77f4c43180555d420
diff --git a/dev-ruby/net-http-persistent/net-http-persistent-3.0.0.ebuild b/dev-ruby/net-http-persistent/net-http-persistent-3.0.0.ebuild
index d4e49a903b02..e7b05c4ea0d1 100644
--- a/dev-ruby/net-http-persistent/net-http-persistent-3.0.0.ebuild
+++ b/dev-ruby/net-http-persistent/net-http-persistent-3.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 
diff --git a/dev-ruby/patron/Manifest b/dev-ruby/patron/Manifest
index 56de0119f69d..1b7961bf6cac 100644
--- a/dev-ruby/patron/Manifest
+++ b/dev-ruby/patron/Manifest
@@ -2,8 +2,10 @@ DIST patron-0.10.0.gem 59904 BLAKE2B f4ec8c81e4c0c13f3d3b5e0696955c01c8ff962980a
 DIST patron-0.11.1.gem 62976 BLAKE2B fc41865146876129eb824ccdd2351af8f0bb3bf099459becb87d0034291f864d576dda0c0ff017f0147eba88d7592dd5ce8ad3bb926db0d612e522a375a2c31a SHA512 75a5705493f5496928279c751d396f9815bc47b4126ea8f9bcf9cabf7a40219b6f9cc2b12179d79848f616357552edcfe6b2b4312276bece432ed66a94ee8d63
 DIST patron-0.12.0.gem 64000 BLAKE2B 1cdf258f4c49d5da6724a4ccb53ca81dd61f824727b5835a945799722db8aa9dd6878b903ea0cdebb2035a9f20f280539f624b9bf44e9a9da708687b163f8af0 SHA512 1826da20fe4aab21792d189466d4c6385d21388538c46e831f1852e0ea8f4007ddd0221e9c5a04eda67de9212d276bd494a98456f5befef42368925367d58798
 DIST patron-0.12.1.gem 64000 BLAKE2B d30990f79213929494d88e812e9c396474c326e87010a50416400ff5267acd9236fb5aedea8a110338356c3b0debc463752b23a595a04f44d9319a54d1c14cda SHA512 ee551e221ea7c965055ddb72cdd063e5ed476ccaf032bc4b2a7f8344af38a4dbd5942d8eb5710bb2d23ca854b1676ff512eba4bfae7a33deef5238664bc7d00b
+DIST patron-0.13.1.gem 64512 BLAKE2B 14f691cb0fd1c863a1ef634ba8aee94751095138e940f13bf09860e9e0061872fe14fa33416f59f82d4adc53963721d653936a3f058b27654ea7593d6068d0b7 SHA512 7b082ff7442c2635c38b37132cd61f6cd18d4792d41cbf3bed1201fb7371b75bb628a295f4e3dd173c23e086d3c1f54f0217df3f7d1a30c1031fcca86269e1e7
 EBUILD patron-0.10.0.ebuild 1199 BLAKE2B d060693d0feb9aa61c105f2206e1edea71140ee9244e680904b083e74d321584f0f2428b4eca1c8ddcf3a367026a46ed663a4d1297c91216b242a5bddbab72fd SHA512 a2f448c80c6d3f58e36cf86eeba39faa9237de3e0ffadaa750e008cca39f1f8de63cfef5bfdf06173205b587b479e14a7c0c7670a563e1fe41a023b37c178d7a
 EBUILD patron-0.11.1.ebuild 1201 BLAKE2B 5c00a76390749e36d9d4392d393d1326a37a437f224d4536cc492044faea5c020f625182ef43552860631a0df26da6ae2c1979077364426403aa97232c92d803 SHA512 14dcacaf8fdc982822ffc4c6d2bdf7a3321be8aa31ecbe03394a1b353d7a6f370b184964071291af7fdd28a83b472377c1d5278162eea46dbbd32f72e9a62f7e
 EBUILD patron-0.12.0.ebuild 1201 BLAKE2B 5c00a76390749e36d9d4392d393d1326a37a437f224d4536cc492044faea5c020f625182ef43552860631a0df26da6ae2c1979077364426403aa97232c92d803 SHA512 14dcacaf8fdc982822ffc4c6d2bdf7a3321be8aa31ecbe03394a1b353d7a6f370b184964071291af7fdd28a83b472377c1d5278162eea46dbbd32f72e9a62f7e
-EBUILD patron-0.12.1.ebuild 1201 BLAKE2B 5c00a76390749e36d9d4392d393d1326a37a437f224d4536cc492044faea5c020f625182ef43552860631a0df26da6ae2c1979077364426403aa97232c92d803 SHA512 14dcacaf8fdc982822ffc4c6d2bdf7a3321be8aa31ecbe03394a1b353d7a6f370b184964071291af7fdd28a83b472377c1d5278162eea46dbbd32f72e9a62f7e
+EBUILD patron-0.12.1.ebuild 1201 BLAKE2B 3da3cfb1771f6c53c1d9636e9d4954c17c09f37171ea930e66ab8120ba84f14f4ad6f0522e14e401b89c53017b3c94bc8d5f2acd77635dc14b2f8272f0794b38 SHA512 be9a13f687b35727b2be44b4a99b05e925908a7c39ab3c3b25e5b9ec36bd65038933cedf1cc2d9cf19e8b3a79fa3ecf59d286c76e5c380115adee6e7d1ee3f5a
+EBUILD patron-0.13.1.ebuild 1201 BLAKE2B 3da3cfb1771f6c53c1d9636e9d4954c17c09f37171ea930e66ab8120ba84f14f4ad6f0522e14e401b89c53017b3c94bc8d5f2acd77635dc14b2f8272f0794b38 SHA512 be9a13f687b35727b2be44b4a99b05e925908a7c39ab3c3b25e5b9ec36bd65038933cedf1cc2d9cf19e8b3a79fa3ecf59d286c76e5c380115adee6e7d1ee3f5a
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/patron/patron-0.12.1.ebuild b/dev-ruby/patron/patron-0.12.1.ebuild
index 843a380dbda2..9e7b6892856e 100644
--- a/dev-ruby/patron/patron-0.12.1.ebuild
+++ b/dev-ruby/patron/patron-0.12.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
diff --git a/dev-ruby/patron/patron-0.13.1.ebuild b/dev-ruby/patron/patron-0.13.1.ebuild
new file mode 100644
index 000000000000..9e7b6892856e
--- /dev/null
+++ b/dev-ruby/patron/patron-0.13.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="Patron is a Ruby HTTP client library based on libcurl"
+HOMEPAGE="https://toland.github.com/patron/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND+=" net-misc/curl"
+RDEPEND+=" net-misc/curl"
+
+all_ruby_prepare() {
+	# Fix Rakefile
+	sed -i -e 's:rake/rdoctask:rdoc/task:' \
+		-e 's/README.txt/README.md/' \
+		-e '/bundler/I s:^:#:' \
+		-e '/extensiontask/ s:^:#:' \
+		-e '/ExtensionTask/,/^end/ s:^:#:' \
+		Rakefile || die
+
+	# Avoid specs with failures. We were not running any specs before.
+	rm spec/session_ssl_spec.rb spec/session_spec.rb spec/response_spec.rb || die
+}
+
+each_ruby_configure() {
+	${RUBY} -Cext/patron extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake -Cext/patron V=1
+	cp ext/patron/session_ext$(get_modname) lib/patron/ || die "Unable to cp shared object file"
+}
diff --git a/dev-ruby/pdf-core/Manifest b/dev-ruby/pdf-core/Manifest
index d0868318403c..54cba1430e33 100644
--- a/dev-ruby/pdf-core/Manifest
+++ b/dev-ruby/pdf-core/Manifest
@@ -1,3 +1,5 @@
 DIST pdf-core-0.7.0.tar.gz 43382 BLAKE2B 55116d0d997d5e76d94fab0be9bbea273bcd677fee951a71e3209bd764560c4f14fcd55ccb11748041582a12d4a06819a6203453f0e440718533a92287dfcad7 SHA512 c99409284e9f7f929902d88ff7943b3dc6b37c32d67ceaa15ad79e1f9a02b561af59889dae4344a1a7749edbb6705e06f6ca356f08ca38742a2623168d53d29d
+DIST pdf-core-0.8.1.tar.gz 44159 BLAKE2B 9f199a76434ba1813a9d23f1d489a7aa9eea2bb76dcaccbf35323b1d36beb88ee2a2d642eeab872c3ae4911ff461cb3335d8a5d7a90b880c3b5bf52fa40a15ed SHA512 83d5adfb77938caa1458c262ea466377bc5185ff35e18eb365ce8e20f4f317fe17cc50043c2eb76d863bbadcf13f91cd792b2bbb4828d5383fa0e8b8c20cc8d0
 EBUILD pdf-core-0.7.0.ebuild 781 BLAKE2B 0e94b10271edb99ed4b6c95f9ffcbca844ae77b1ac4a5b98ec10cea87c904f1f82118a036e0f03f48e2255f09cc7ae72986df787ee7284166c48731a84f8d587 SHA512 f9fa99e138f8c42d5d09df217cace04c04997857afff02ebf38b786da4e2804875ab91544b31c50b9eacecdd6a848d9f977a3a2a67fa7eaf5d8dceba0edbf61a
+EBUILD pdf-core-0.8.1.ebuild 774 BLAKE2B 22f175c47b20f0e238ed736405b0eee9194ccbd730c3e6d0417a9bb96243c1df70edcbd2960b848f89afa13ea29d7dbd83549b494cdfcca24a4025d9b0af0696 SHA512 9d967ffe1a13ed158e9bf842ac6a91b5a5999c3c288545097fd4f481b94757175dda10e011b4d4dcc40217514d495f1d138ba7d1bb0df01e303bc6fbdb15c51b
 MISC metadata.xml 343 BLAKE2B 1c70f6275d3aec7f1414e408ec97c954da1bc047b76c39efb2a4d984dd0af20a0410235c74615be73f33bb8018d244f3a267ec3897763632672216ed13a39ae8 SHA512 def6cce805afe3c3ebaa7db7003f7f4c62f9a7bdae71dbfb9f4ec7ee39947b85952a5a49b8dc473fddf03b26aeace6a0e711ae4d0bd94d2d9d49881ffc9086c9
diff --git a/dev-ruby/pdf-core/pdf-core-0.8.1.ebuild b/dev-ruby/pdf-core/pdf-core-0.8.1.ebuild
new file mode 100644
index 000000000000..50cf1a76a97d
--- /dev/null
+++ b/dev-ruby/pdf-core/pdf-core-0.8.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Implements low level PDF features for Prawn"
+HOMEPAGE="https://github.com/prawnpdf/pdf-core/"
+SRC_URI="https://github.com/prawnpdf/pdf-core/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( Ruby GPL-2 GPL-3 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+ruby_add_bdepend "test? ( =dev-ruby/pdf-inspector-1*
+	>=dev-ruby/pdf-reader-1.2 =dev-ruby/pdf-reader-1* )"
+
+all_ruby_prepare() {
+	sed -i -e "/[Bb]undler/d" spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/pdf-reader/Manifest b/dev-ruby/pdf-reader/Manifest
index f5715e41f694..09962eab360c 100644
--- a/dev-ruby/pdf-reader/Manifest
+++ b/dev-ruby/pdf-reader/Manifest
@@ -1,5 +1,5 @@
 DIST pdf-reader-1.4.1.tar.gz 10236680 BLAKE2B 86fb137c65b47717e758473b94ddbbf52def3ae0edaecd7b5eb3f0d880f664c9ff6097221f43d64247b006ed18220f4f9a469d6b8574592750a1d8a468ce7ddb SHA512 aaa53dafc2d58dc591f708941907ecf14b1ee73362a7bd6d34659103d51effa90888560733747ca1bfe3d217cb6834109e06b024f40a95214880ca42f54054e5
 DIST pdf-reader-2.1.0.tar.gz 10977233 BLAKE2B 5922b218108bf87c1b670e8392246a3884df66b9cdeec7e982c6bc2bb39e28bcbd64a0778693731309d51cb92ad6651bd5d894d84de3acb60cf3eaeaa2b77727 SHA512 edf41a75f89af70ee75cc1a3aa44adbc7200ea36bc671479cc652b5263dffb23a62ec8eab70eb0e137f1c7154766bb803260dcfa8973578a684b10cf09fe94c8
-EBUILD pdf-reader-1.4.1-r1.ebuild 1070 BLAKE2B dc3ac7622e5b0ec494a002768dde2e8338cbc27deb3c604963d26a43db7935819f0f30449c69f7bce4890533d06f92fe887be860effccb4e6d33862f21b538eb SHA512 d5930856d8870badfe14a29eb64de5ff4210fa7f4e09fe1a6f426acf321187e5b737bdddc9cec036b391f34af0e053c887da564c2133e0c32c3de064e3ff6c26
+EBUILD pdf-reader-1.4.1-r1.ebuild 1070 BLAKE2B 9f15a43900f836d3e016adeae2b4d2d365afc1ff0d1de9836dce15e6f957475b0e9f4bce45c97fb7f40bc8cc1e0943b75c4979119723da6613e2f82295fe981c SHA512 5ec9f8660232543d03f6a6971eb0dd9735e54c0a7bee429d4f2c654b2c90217cc9fbc060a2522a90e010fbcfbab9cb8f86ebc59dab70e3a0c83619c3ddcb7e39
 EBUILD pdf-reader-2.1.0.ebuild 1094 BLAKE2B 1cb724433ac5d1a8e71b64d8bdb2dcf51f1308493c7695f09460e6354f627acf73e334bf3399b715e52d3765928daca2d14fc327eefa26559bc7087741c885df SHA512 78e861388ae37560d8cb52ac40aa5ed51b57c9d7c09a91c95a02d90871b68376f1f65842180c16aa2b871adf969a5d61bdf89c27ec035daa8275da225a3b70fb
 MISC metadata.xml 340 BLAKE2B 870883ff3971c347d1b9a28f228629d1c972c8a7e1695d77755316a864b74a8b65190d6b1cb07e55e8138321b91a6d9afca61872434ad9c13d081ce47e75d3b6 SHA512 8746d7bf7de89f49d161945c3dd434efa275799aac66d981edabec64ee789ca5864d69f3bae738b3c5ff26cc54b1d824f7aa35b2b9c9624e07339794b56d029b
diff --git a/dev-ruby/pdf-reader/pdf-reader-1.4.1-r1.ebuild b/dev-ruby/pdf-reader/pdf-reader-1.4.1-r1.ebuild
index efb81a2149d9..8e48b16387a3 100644
--- a/dev-ruby/pdf-reader/pdf-reader-1.4.1-r1.ebuild
+++ b/dev-ruby/pdf-reader/pdf-reader-1.4.1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 GITHUB_USER=yob
 
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/pkg-config/Manifest b/dev-ruby/pkg-config/Manifest
index d2640ed714da..fff5ef52c83f 100644
--- a/dev-ruby/pkg-config/Manifest
+++ b/dev-ruby/pkg-config/Manifest
@@ -1,7 +1,9 @@
 DIST pkg-config-1.1.7.gem 19456 BLAKE2B ae6f3641181a60aa46a2da63a5343f23c4a41a9499ff5e00b1115ddfb328a4db33db2890d234f5cbc9a45af28aa537e886c776f0a8f24e54e307f637e5a2c8ae SHA512 9f515874d3edabdfff5f4c8d624bbc91e9c5032e79c241412cd073f0a049e35a2e2a660d5503eaae9640286d74cb98510bbbb34f757c702e220f728fba1c2337
 DIST pkg-config-1.2.8.gem 20480 BLAKE2B cc11b5eff30f0f5e1a91e64902931ed540da108fd326fe731b71527c9c4310f55e9002617e1baae4f71a4b705b20cf10f6fa112f8ef56971e82868145d372a47 SHA512 d83a599a48c7d404946054c6846b6cfd9fce2a264c288519a6eccd9787f05d45397dd46300bf97c80700921456318154ea6d44ba32cd159803471073c2a2b065
 DIST pkg-config-1.2.9.gem 20480 BLAKE2B 8a77d1b00082635ff622940cf313e18e9639e22d7cc0cc170ef62b65c69a3f2d98409339de3d8de2c765699734c6177dfa77ca8357090c4f8d805b9cff453f40 SHA512 6b16b741f8efce51623a98a1979b3bc8af18ce6d74bd35f46baafa9eb19bdab50372921f8548a958bc4428f5e9ff0015ca9ec1700065d70bb9fb9d2a98c311c7
+DIST pkg-config-1.3.1.gem 20480 BLAKE2B 016290cf7eecabc5923333b2fc1e124a369f9a267e7157fcbc842e19b8fe0f3ceccfef77bb4c3b9b0300b72bf503d1ea823b8c2743c3d56da06d75e5a81768c0 SHA512 801dbe70ad1ef075d74f260a124d4b3a78a237abc133bd3da8ac93f0ae51b8d6e94efc1064ffea64138bae26efce52ef5bb23553625d808cafa477af50ca55ec
 EBUILD pkg-config-1.1.7.ebuild 814 BLAKE2B b6739a0cc7285df5a6db56eca3473742fac6b816e7bae226e1673b473743a9b6cbf655016bc9b5c90aaa9605b73b35f5479604f4bb6b60cae2944345fb25e324 SHA512 5e6e06a783a032ea54412a27780c7837133e295cf3d0becfeb22d0ef7d2fac4b5188d3fe415abb092c827c81efa5ce382c42eced83833b79bef7464d5324e232
 EBUILD pkg-config-1.2.8.ebuild 816 BLAKE2B 561c41db7656efd9b93b1aa1a2af811962e99eb02f7c02559e5c540ebb62b71275ecf9dd36e60338f957e9fc37f87813730387dfe8a088209861dda6118ccb39 SHA512 7372277bd736fdf91aff18a3b129b98bdd049ee8084355ecab161fc49757d6081e24758b49dd3244aafcb890a08312a83bc9e7fea9dca2e55bf9faab716c3ba5
 EBUILD pkg-config-1.2.9.ebuild 824 BLAKE2B 9c03eaa53bfaabea7177f1f02b2e2673f99be970f2c896c695bc8de38eadd84e5f47c1c9d7fbba2f2cb8feb7601451e416bfa0dd7c2148755fe75bf6e4b0077c SHA512 a4997b9fef72f9a616e68ec66b05366cac3cc8ca2aaed521f3f64ecf00d28c675a1bc2cf5750a9aadb42dded8f92489414de9ec646661a0e8ae7dc61de28b5ea
+EBUILD pkg-config-1.3.1.ebuild 817 BLAKE2B 95317b9d4f7845810fe5b50899b97f4cd6e0bd189e8d0eb78ff731997eb8b0281afc5244c26cd061675d6223a4977e6aed3342ca89aa29df8ba48a5098f1a3f8 SHA512 6d36b5b7a17c0ec5131d1661fb7e6d0752470ee5ca73aaabf47099fb5b2baf5a5501f280a4af32d599a879450a94b22c01199bf9b8c5419a5bbffc157d960cbe
 MISC metadata.xml 424 BLAKE2B f3283c73952daca20d85a5421afb67150aae553faa03d653686718ca5216c1a65ab5983fb669cc34003902b0a969275bd22e4d1765f3896c7e25bee301323f42 SHA512 40e700a309e3678157d9da4ef18e8f0178e23aa192949ac06acd6f8026d0d53d4f79c199aaf59e0e27dba17925f44a97ad901e0774c6b70583b24b09254eb8d5
diff --git a/dev-ruby/pkg-config/pkg-config-1.3.1.ebuild b/dev-ruby/pkg-config/pkg-config-1.3.1.ebuild
new file mode 100644
index 000000000000..709732866322
--- /dev/null
+++ b/dev-ruby/pkg-config/pkg-config-1.3.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_EXTRADOC="README.rdoc NEWS"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A pkg-config implementation by Ruby"
+HOMEPAGE="https://github.com/rcairo/pkg-config"
+LICENSE="|| ( LGPL-2 LGPL-2.1 LGPL-3 )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0"
+IUSE="test"
+
+ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
+# this is used for testing
+DEPEND+=" test? ( x11-libs/cairo )"
+
+all_ruby_prepare() {
+	# drop failing tests
+	sed -i -e "/test_cflags/,/end/d"\
+		-e "/test_cflags_only_I/,/end/d" test/test_pkg_config.rb || die
+}
+
+each_ruby_test() {
+	ruby-ng_testrb-2 -Ilib test/test_${PN/-/_}.rb || die
+}
diff --git a/dev-ruby/simple-rss/Manifest b/dev-ruby/simple-rss/Manifest
index 9e6b0376cb07..6d3d534276af 100644
--- a/dev-ruby/simple-rss/Manifest
+++ b/dev-ruby/simple-rss/Manifest
@@ -1,3 +1,5 @@
 DIST simple-rss-1.3.1.gem 35840 BLAKE2B 0eeae28a610ccfc82ffe2cb7dc6e00a419fcb6db658e1d5a0d1e8769b04002c084f4606991d5d61eab314a198c98eca2354d2d89624f22695a51423db15c3210 SHA512 a24eca178f0777ba1747e420a883fae7650767cb212fd3dbb89ea35d81d1d0766ab6ac891d19abcc88ed7a2209890a4fbf3827eab6ffb0c11ffe69e4abaa6f4a
+DIST simple-rss-1.3.3.gem 33280 BLAKE2B 7de333c13cb928627ed9962ceb55cb23415218d3214591a3ac2dd29e3782cfcb07bb7e99efec067ed3042eed317f38f815dc43bb11ad5246cc9212e8b03f3664 SHA512 7ce7c121889ede58344cf686ac17ab97d75eea6ba5346aedf06294e969f239999a4e19ae416db93f3933f6dae24d7dce22c408d71efb3bbea91cc8091bf43920
 EBUILD simple-rss-1.3.1-r1.ebuild 715 BLAKE2B f48de5cacfeddafea2f5343bb0badcf10a8bc941f8e09f881a2c225a2918a238010d93f161255b4cbc000706fb443365ef01798646c613b1c2cd5bcaf38b3f85 SHA512 81c7b3f87068a6e9c9d6fb7f6921e4db34f8568df8cf789865b0d071b26a44a14eaba0e7effd70af0da6bf48162f0bcec4dbab496ec64f8a89653668bb02eeec
+EBUILD simple-rss-1.3.3.ebuild 751 BLAKE2B c8bc88ccf15a5cd57c02b250a928e083ba1a7ccaa06ab75bda6ebbd41c91b0188b8992fda82bddf869855affa87891810b216a37043853a1b358e16f45fa7160 SHA512 c87961d7c6f46f33e5cbd152df5df470b913ded8d46e6dbf4f966f9692a040f64563bde398a21d95ad050197274de5c5ad5e2246e4134dedda11a5b43a9a3176
 MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/simple-rss/simple-rss-1.3.3.ebuild b/dev-ruby/simple-rss/simple-rss-1.3.3.ebuild
new file mode 100644
index 000000000000..ab3a044e6021
--- /dev/null
+++ b/dev-ruby/simple-rss/simple-rss-1.3.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_TASK_DOC="doc"
+RUBY_FAKEGEM_EXTRADOC="README.markdown"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A simple, flexible, extensible, and liberal RSS and Atom reader for Ruby"
+HOMEPAGE="https://github.com/cardmagic/simple-rss"
+LICENSE="LGPL-2"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+all_ruby_prepare() {
+	# Avoid dependency on bundler
+	sed -i -e '/bundler/d' \
+		-e '/rubyforgepublisher/I s:^:#:' \
+		Rakefile || die
+
+	# Avoid tests that require unpackaged test data
+	sed -i -e '/@\(media_rss\|rss20_utf8\)/ s:^:#:' \
+		-e '/test_rss_utf8/aomit "missing data"' \
+		test/base/base_test.rb || die
+}
diff --git a/dev-ruby/simplecov/Manifest b/dev-ruby/simplecov/Manifest
index 71399ce93253..3b8ffe149ebb 100644
--- a/dev-ruby/simplecov/Manifest
+++ b/dev-ruby/simplecov/Manifest
@@ -1,3 +1,5 @@
 DIST simplecov-0.14.1.gem 58880 BLAKE2B 61882c34341555ce47df82f8931a8c457d0c6d69a143fa4c9999ff0b3aafb8510d2957627e1dfa9e3819c1509670fdc0a062021eb6655914cc935f9abbd584a1 SHA512 7b62fef6df1d3b395b03a5444d65430ae645aca7c13e6694f4377b35a82c0b4503e5d53a94512ff06e634a6d81331a8bce31787dba793517ecd3e502220afbaf
+DIST simplecov-0.16.1.tar.gz 62296 BLAKE2B f9ebe2c7ec3d8b5bb80f642be3e9803210f9af334a2e7eacc2d1339567750027bf0505106e9fd641c42b3ad41e5e74ebbe730d8ff80947b1ec2ff23f6ee8fef1 SHA512 5b3c16bcdcbfcbd5282bd91375d1593292ad421a73b88cbdf18fc8f57364e20e1eec44bb084be3619684f9871612ca81f790eea8eec98b61cf523bf38b4a997f
 EBUILD simplecov-0.14.1.ebuild 999 BLAKE2B dfaad6b5f99b81d6f084baced7a1e663fbd355218ce2c5a73865ae8a43c227c8da1911520ce19c57f155ab5bb5a7fe11ebd5838a9212d82837b2bb9ba701e0bf SHA512 dcc3b1db6df4cec60c4fa9d1f61e57e95c19a5ae7361905577a84e50ce393b36a5616814b10bf164a228e72d8b2cf4b899fb34694b03d6f29ee33cb84205587d
+EBUILD simplecov-0.16.1.ebuild 1234 BLAKE2B c9922cfbf0b51e5a83fd7b2b02984f089183d6a9818938adc1e0ef073f7089dd58ac5b5866671122db195d6f5eb55353b157706cebf757066f92362d77b74cd4 SHA512 5f53febb2f84fc92b21ea80ab8051624350b9b2d875fed4755d348b2ffd0e5d6a70045f3d691813f7347524808b7a32246df90c17ab70a6a8cd7392fd2710e22
 MISC metadata.xml 345 BLAKE2B b1b086ff87954b47674d7c4ea2e3179d43c10fab22383c937600b0b83675a9dba5434dc9425a1dd1bfff27c8bb81d36fc558523a0b80ed818a37ff9585dc094f SHA512 ca0ae8784caca2cc0091622a5bfa3796600239a0d81bc5338eb36f743db99f36ba7b50866b1de1cd2ae541f2c2dff96c648f5cdb0661ab766501f4c757d2ddd5
diff --git a/dev-ruby/simplecov/simplecov-0.16.1.ebuild b/dev-ruby/simplecov/simplecov-0.16.1.ebuild
new file mode 100644
index 000000000000..c52ad77e32f3
--- /dev/null
+++ b/dev-ruby/simplecov/simplecov-0.16.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_TASK_DOC=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Code coverage with a configuration library and merging across test suites"
+HOMEPAGE="https://www.ruby-toolbox.com/projects/simplecov https://github.com/colszowka/simplecov"
+SRC_URI="https://github.com/colszowka/simplecov/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="0.8"
+IUSE="doc"
+
+ruby_add_rdepend ">=dev-ruby/json-1.8:0 <dev-ruby/json-3:0
+	dev-ruby/simplecov-html:0.10
+	>=dev-ruby/docile-1.1:0"
+
+ruby_add_bdepend "test? (
+	dev-ruby/rspec:3
+	dev-ruby/test-unit:2
+)"
+
+# There are also cucumber tests that require poltergeist and unpackaged phantomjs gem.
+
+all_ruby_prepare() {
+	sed -i -e '/[Bb]undler/ s:^:#:' spec/helper.rb features/support/env.rb || die
+
+	# Avoid test depending on spawning ruby and having timing issues
+	sed -i -e '/blocks other processes/askip "gentoo"' spec/result_merger_spec.rb || die
+}
+
+each_ruby_test() {
+	RSPEC_VERSION=3 ruby-ng_rspec spec/*spec.rb || die
+
+	#${RUBY} -S cucumber features || die
+}
diff --git a/dev-ruby/thor/Manifest b/dev-ruby/thor/Manifest
index f50f56e3db17..1c9db7d2eb7a 100644
--- a/dev-ruby/thor/Manifest
+++ b/dev-ruby/thor/Manifest
@@ -1,5 +1,5 @@
 DIST thor-git-0.19.4.tgz 88733 BLAKE2B 8be54310cc4bf4a0308e6b103832831b89285003bb22a679986cd02636aaee57a25aa606f3e99bf532961a4e1d3625c46bfdb874a09f66cab85a21e5f7ed22d6 SHA512 a5cc52b23806e6104b12f924324960f2567bcd6c73b72ad47c33da222201b0377e7677b996698774de8adf3eff551926393785323ecf46cb59d72eb0e5b05aa0
 DIST thor-git-0.20.0.tgz 91758 BLAKE2B 86e4079a86a9c65852e710e40e49e915afe5522512f061ecc62aed48acc08a5397cc82d45cff7c4b1dd549ec57d8699b9afe7c391ac9ab838d1ba9100f1f058a SHA512 aa5344c94cad7c33dd0582409dbcf9bd109bf97b37131357a4cc8a66317acf8781460e8fe5532b301a74521010be59bb34ac1c68bc01ad3140bfe73fedc2a451
 EBUILD thor-0.19.4.ebuild 1155 BLAKE2B db1b5e8f9f73f8638aea3ead1a1cc7e754a829c8be39d8179aa5a7b9af1ce50349191bff14e2a8c52d0f3e54e64cd60d7eb486c55b6316f951e4660c3f7826e9 SHA512 74b73fbce42e3fc78572b5d9723fdeb6d00fea7544583540bce034265ce27744c4cfa86b346331d1db051c6858a420afcac5ca027ed9d4fc987d7e9a424c47b6
-EBUILD thor-0.20.0.ebuild 1437 BLAKE2B 2402abd3eb5b17bbd577f0a77df7d95b51a38e023555b0f39136cc9e3d3a0e53b80ba375a3851c4ffd037d5341f1d6606583c7339429a436df2c140ca9b6d990 SHA512 90e2e05922022ed356d7c81812cfadef0ec1fff1f0f9680edf9c039d33cdebc44128f31408df83e1eee7cd1696cfa267ec239bfd9dd0941dd16d7daeb299fda6
+EBUILD thor-0.20.0.ebuild 1430 BLAKE2B 6a851cd0b09dcb7cd511c27d2c3d06abb311edf1997adf7b40ccb97ff3a190fe3a9cf53944d6073ae2782024699230198c082f2a9f3ab4e460f474ea1956bff1 SHA512 571a82d151895953f0d69a14de17cb65205d77f2b989580012d510bcafbb08aebc98d0b61b96fffc274d83f48a98963dbdc735bea8f0da3d8fcd7cdfb4b64dba
 MISC metadata.xml 680 BLAKE2B d4b03ac058de229b055e01ee99da7745a8fc67200979f626b55d6156d573269bb260c42ef44d6dd3b391a3e06d46844ef3fcd7cdd1f0d4053957c00bcfb1fd27 SHA512 d4938ad6ec003fe17d09274f39a2526c84d69d447b1e8063e9301000b776496fb3f8fd6d7e596791d9f8d05714e856d6a6d8df2c5c4747420e3221edf48ab264
diff --git a/dev-ruby/thor/thor-0.20.0.ebuild b/dev-ruby/thor/thor-0.20.0.ebuild
index 60e9b5f02184..add426d47668 100644
--- a/dev-ruby/thor/thor-0.20.0.ebuild
+++ b/dev-ruby/thor/thor-0.20.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/erikhuda/${PN}/archive/v${PV}.tar.gz -> ${PN}-git-${
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE="doc"
 
 USE_RUBY="ruby22 ruby23 ruby24" ruby_add_bdepend "
diff --git a/dev-ruby/timers/Manifest b/dev-ruby/timers/Manifest
index a580d020f891..be4da91697a3 100644
--- a/dev-ruby/timers/Manifest
+++ b/dev-ruby/timers/Manifest
@@ -1,3 +1,3 @@
 DIST timers-4.1.2.gem 15360 BLAKE2B 2480b6051825e26c9c30418e4acd7f9d8d0173d21038349ff16c086a2712eff7e9349720d270ed6505d8f90b14fc4dc99cf06d948922a222196d338b7933b5a8 SHA512 8c43f6ab09b918fc047056de20e85371929cd6841d7e26dedf54d565585eba040e23cef83c8747eb0ec43df8c9d9cf5915b5ea0ac6f6d551a0b086de3a9f3499
-EBUILD timers-4.1.2.ebuild 806 BLAKE2B 8210d5421fa8301fd28683da6fbb356e31a83afa8bc318d70f20f60d71db9afed8af80ec1459a96a5ffcf472567e942a015bb845f139b0d6ba58707af9a65137 SHA512 897265282b8375342d63efc1d529fde772f0aef73f61efdb332322fb4d6598361062e9a93e8b27182ff26f48cb97cc82c376e6b159d5bf152c7963f1530532b6
+EBUILD timers-4.1.2.ebuild 799 BLAKE2B 7987723613746413a08b27ab26bf1905df37aeac417cfc6fd138759adfffc8cd2f0826153bc982c17613e5b4cda947d8527ea8f7b19dfea7a3732cdefcfc07fc SHA512 9ad952a071e71579a131d97af99e2b3b55db6a640eb412d079aceb5695fecf324701e7dfed7776c5d7e29a8283f3cb74f1ec05fa2137c97ad5cb06fa92abcfad
 MISC metadata.xml 341 BLAKE2B dfe2c9228e7b666d6b7acb9d9f0cdaa70263a6d5960ecbb144699e62c94ded1b613a8d22f82e5125f6a2e954901a65da57bd432823d922d17164e273b809d8a9 SHA512 b863e101e06e7a8827cd6166688dbfdf77c5bc84203294d0ab63315fe5b5b03fe1898d02b9f219bbbb3f3cddd3d5185c34d9e4079bd993631cc849eae9ac9be1
diff --git a/dev-ruby/timers/timers-4.1.2.ebuild b/dev-ruby/timers/timers-4.1.2.ebuild
index 9b9725e955a0..1b548c4cbbe8 100644
--- a/dev-ruby/timers/timers-4.1.2.ebuild
+++ b/dev-ruby/timers/timers-4.1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
author	V3n3RiX <venerix@redcorelinux.org>	2018-05-02 14:13:35 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-05-02 14:13:35 +0100
commit	7c7c2c9727d6b2ff30945b5aea0d575e1c406d8b (patch)
tree	bac2a67fb24ac0836147fe370d30e1610ae1845d /dev-ruby
parent	2f8db31405fac68eea6f7257d58529243815033b (diff)