gentoo resync : 25.08.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-08-25 07:36:27 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-08-25 07:36:27 +0100
commit: 43793fab84041cfc5c60c0151d1591b8a69fb24a (patch)
tree: 6208a7f4fc744684fce0f55acbb47511acace498 /dev-ruby
parent: 28e3d252dc8ac8a5635206dfefe1cfe05058d1db (diff)
65 files changed, 797 insertions, 238 deletions
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 01d84182d857..9defac3caf1c 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/arel-helpers/Manifest b/dev-ruby/arel-helpers/Manifest
index bb5ba66e5168..c8a005085a97 100644
--- a/dev-ruby/arel-helpers/Manifest
+++ b/dev-ruby/arel-helpers/Manifest
@@ -1,7 +1,9 @@
 DIST arel-helpers-2.5.0.gem 11776 BLAKE2B 1c5edb20d5c6029efa8b52ba1eb59b939b7209126a3961a77ebd92524b1da3998cf6497364cedeb0b3976cbe30b6e99e993280618d2ad88f021b8e88930742d8 SHA512 501d2820d69419c732edef1d9dbfa136d27f886a55a8d10f0dd351dfe7f0b06f0b338b665487afc87d6a34769b1ac2d55a70081529262bcc75d7cd73d98cce4e
 DIST arel-helpers-2.6.1.gem 12288 BLAKE2B 75958abc0f3c1ff61482cb576f650d230757d653972fe88496226f0462bb95f29f4b61395ee0b3ed68c13c7d3b4318eb46ac38485615790f8a4f3e8c07edfffc SHA512 99eda2da00a48000e9aa282688a1370e6d7606c399f72ec8edc54a236fa9c7ba4d37315b10b54eee54f59d44e0680cd398f4a1d2331e86138c48d6bd68530441
 DIST arel-helpers-2.7.0.gem 12288 BLAKE2B 623225b35205ff32bada46b1f2cc857f384938726fcec6137cc33cbb16903ec51731835bb1fa1a7b603d35d0f623eb59af7d0e5b163e28d0d6f7802f30e6a6b7 SHA512 48305acd4d40f60ced74c32c334ab6ca2b7f648cd2185f829f36f5c942ff53b1e0aa709ea08fcd2200c2b56dcd9c76fe0328408e6e84934f27fb0bbf6075873c
+DIST arel-helpers-2.8.0.gem 12288 BLAKE2B 9b48fc83ca777c481977a9ee629e4cabdf3b015749032ad1551ae082fabf4b238ab2ea4293560511bc8a598ad47e43cf0adb624376a56a6d8dfc22f35641230f SHA512 455ceab078863afe38ba704e84bf2bca4c2358f05a4cc92dc3213611f408e3e02fa5f7b2aaec34d261914563c434e04a91ae26209abb6a23085dd63baa43c1c1
 EBUILD arel-helpers-2.5.0.ebuild 667 BLAKE2B 2691aafcda53349d43c236dd5aea54f979065c2ce1ec3dd2dcbeb215dea744522e122a6bb98965cde00a06643919dcfa457e1f63e56ff34c60c1264d6b393d94 SHA512 0c2833e6de441cdb905c73c0e02ebe30f19f3aedd97a8910bc3ca36bd0ed4b64f11e66f6157f199685f8b8bd29f0d2c5735942b557222d6fed2f0ae21f332dc4
 EBUILD arel-helpers-2.6.1.ebuild 664 BLAKE2B 62f54c6943fbf6692b9b87c55776a6d50c1da249e5c7c1cdba77f4f06afb7742ae37fe6e7a91bb4a15647516b3b8d9fde3ab40883458a1b6dd64a4a6df7b6934 SHA512 a38e1fcda818b8cee7cb6aa79b65eeefe23dfd5297332f065b9856e760b9a8f5c7498ebc67915faf7a2642126a216f899b45b878823d79df2fa5e76bfe8e9a9f
 EBUILD arel-helpers-2.7.0.ebuild 693 BLAKE2B f16838448db982d8aaa733009882c706f1a491027abb0370cd8460a81fa91d94966e221021cd46e00f55261c96bfb9594132b1ea3129259eb4e2ca37a43ba43d SHA512 02a72633b22c43e6948c4d3045d0156362f7af8d112922ebbbe5b49abba70be5d7be150cb02bc05809e6ed7f44c4db1025adafb1eee3aa6904ad5fc1be6de3d2
+EBUILD arel-helpers-2.8.0.ebuild 693 BLAKE2B f16838448db982d8aaa733009882c706f1a491027abb0370cd8460a81fa91d94966e221021cd46e00f55261c96bfb9594132b1ea3129259eb4e2ca37a43ba43d SHA512 02a72633b22c43e6948c4d3045d0156362f7af8d112922ebbbe5b49abba70be5d7be150cb02bc05809e6ed7f44c4db1025adafb1eee3aa6904ad5fc1be6de3d2
 MISC metadata.xml 344 BLAKE2B 3c7611e49af6a5fdfabda583dc91fbe8fc4b7943e774a938e100d91633b3a5c38cefab5973207c25d62a5b8b9e8e7c720b5614c083c8568e532e819bb747855f SHA512 2b4f9f6a7cd7aea5f161da441195d3138810930778d441f0c0d3620fc3de6632088d0d49135e7638553e83db723356184db1abaaf1622999adeec59883087c96
diff --git a/dev-ruby/arel-helpers/arel-helpers-2.8.0.ebuild b/dev-ruby/arel-helpers/arel-helpers-2.8.0.ebuild
new file mode 100644
index 000000000000..96b2a7e9f4f3
--- /dev/null
+++ b/dev-ruby/arel-helpers/arel-helpers-2.8.0.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_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Tools to help construct database queries"
+HOMEPAGE="https://github.com/camertron/arel-helpers"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm"
+IUSE=""
+
+ruby_add_rdepend "|| (
+			dev-ruby/activerecord:5.2
+			dev-ruby/activerecord:5.1
+			dev-ruby/activerecord:5.0
+			dev-ruby/activerecord:4.2 )"
+
+ruby_add_bdepend "test? (
+	dev-ruby/rr
+	dev-ruby/activerecord[sqlite]
+)"
+
+all_ruby_prepare() {
+	sed -i -e '/pry-/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/autoprefixer-rails/Manifest b/dev-ruby/autoprefixer-rails/Manifest
index 0ad273b6e033..f3a0d4bc54af 100644
--- a/dev-ruby/autoprefixer-rails/Manifest
+++ b/dev-ruby/autoprefixer-rails/Manifest
@@ -1,13 +1,9 @@
 DIST autoprefixer-rails-7.2.6.gem 196608 BLAKE2B 0f9224fbf765877b1b7414c68fc39a6587514d27fb5290e1a623db8dcdcbf6f668b66ddd0133906a97e63e877b8201168a45520a9919dc756021d5a7cffc0d38 SHA512 37b3f245291711f92ab9e264491637e753afb95e52f9fd4e2bda6655cd781b2d031934f3379cabdd5589bdf57b780d0727f2fff1cdf7887ca4cc323d23023396
-DIST autoprefixer-rails-8.6.0.gem 203264 BLAKE2B 23ca172f6c862cb43fa3609ffe1fe02f9d70cd5fdaaa4eece8882aa812327f5a4b8b4b039e898a1800589447463f35832afbceae8c3d59b84c0acf64c897d97d SHA512 7bc5d6991f309aa0f0c6487d5a51fdc30b6ce852f4a3345cc82cdd2b1a6afb19a266cba5c46829cb1defbcc0d88af6b638b8114ab303316bbc844ea75b0181a5
-DIST autoprefixer-rails-8.6.3.gem 208384 BLAKE2B a373a18b43fefafd5e29b9da78b7ec2b276738729b748244d34684429b5081c34516512794234526af7f952218973f20ef6245772436c4cfc4fd511dedd80e92 SHA512 db7bd3737d5356adcd91edfd35623459ba67541ffb615eeb85155de9ec7b2c7bdf69518b9258dbf97a1a8a82a22a27da5eda2e445cbdf305a726f31dbf296f0d
-DIST autoprefixer-rails-8.6.4.gem 208896 BLAKE2B 4a4edba06d55a3de33d625d3827777ad98d7a36b040ec3c2a02274ca50d1e18c68217a81dbf18c61f80310b1f225680971a746e0ac9018eadd4314da1d648da7 SHA512 e71cd9889932e881154737287dca21000b929b8dec56e51fd8a9b97705f0ce83969515aa36e40b78ab4629f404caf78125cd066c7fea19fd63339c2c9b873576
 DIST autoprefixer-rails-8.6.5.gem 208896 BLAKE2B 50e8b8ef3fec9a0bb8d68afa8950989dbf84b58b79b8822e83bf22873c5172c2c514643c31dca88cfec49bd585563eb9b201c621d3ab6707ed0d49c6cd4c8fc8 SHA512 fddabc4d745ad1b4282622a52ab4e36c377eccec85c4e80b3e8d633ffcc2d1613f4fee9e9f2356c85d251e44b0010418029bb278894987119689435ac885e982
 DIST autoprefixer-rails-9.1.0.gem 204800 BLAKE2B 1aa4befa996db5f5e49637327d464816709cf30f816e1107a4916db272a9c7052a96f8cc3ab2b7259d01a0d9eeffab9fc7fd5a3fd7f6b372b6a18bb7fa1126a1 SHA512 aefa976523c6f71a918620803178b11700c8a5d40c32d2e714b085c090b710cf30a9bf9d45b1b6b16f0cf06c1abe219c99f81a7e5e18291e23ba36da50dbc430
+DIST autoprefixer-rails-9.1.1.gem 205824 BLAKE2B 6843495ec1c26ace2268b750d076612f3cdd0c0d7b6b16b0fab1f16cedb27417675e53d7aef126787d50b2ac69c5358a0011f2a5519036c6bc74aee44f63d577 SHA512 7b4a3a6bda8639dc7a3649fb00ba8b074855f9783f8de93c99c027af6494af62701d96b55d212fd34ab0461be8d7fa96b4769d6e1ce03ca4c40d2cd6b320cabe
 EBUILD autoprefixer-rails-7.2.6.ebuild 827 BLAKE2B fd6aef469bd1e07f5100e88ebe523da96383c721dfc2bee9b7babb7d11f3d710bbb6debf4cf9cd57702f81150c8b7c7ef9a0f3de4efc1e6325240fd1bf2e4bf0 SHA512 f17f3e58a7cf0a8d960d683d3cdc6ddae7065ce7d28d3284b45b169210a068a9ec0dafcee100fcbda098aab73c809f455908df069ba72e5536b95aa1ddac7ace
-EBUILD autoprefixer-rails-8.6.0.ebuild 820 BLAKE2B a6ff9ac662691abdade26a4c5af9762924cbc3007aadf3e5fd1a0a4091f33a06a288f1c69cc8c43597f5736b46dcf36a65372d942c1ce64e1cce73a1ee0986d5 SHA512 028872e339c0fc598fc83906e14b562c86f3b8d487bcf7cbca5483525706c3e53a3d91ff04d693a53cfd01c2245a15814671fab91c6bd8fbfc5acba23569ff0e
-EBUILD autoprefixer-rails-8.6.3.ebuild 820 BLAKE2B a6ff9ac662691abdade26a4c5af9762924cbc3007aadf3e5fd1a0a4091f33a06a288f1c69cc8c43597f5736b46dcf36a65372d942c1ce64e1cce73a1ee0986d5 SHA512 028872e339c0fc598fc83906e14b562c86f3b8d487bcf7cbca5483525706c3e53a3d91ff04d693a53cfd01c2245a15814671fab91c6bd8fbfc5acba23569ff0e
-EBUILD autoprefixer-rails-8.6.4.ebuild 820 BLAKE2B a6ff9ac662691abdade26a4c5af9762924cbc3007aadf3e5fd1a0a4091f33a06a288f1c69cc8c43597f5736b46dcf36a65372d942c1ce64e1cce73a1ee0986d5 SHA512 028872e339c0fc598fc83906e14b562c86f3b8d487bcf7cbca5483525706c3e53a3d91ff04d693a53cfd01c2245a15814671fab91c6bd8fbfc5acba23569ff0e
 EBUILD autoprefixer-rails-8.6.5.ebuild 827 BLAKE2B 4bce491c80db4a8eb1d77467167c3c290c0af5311f4395424f5f0c4e2b30e1474fed1746c3dc5127413d48b9e7031f8e782f7b5d1a1987550747c3900d8954cd SHA512 8bd8a32ceb04e688ec4d149a67b98905b2ec975684f3fb2fe3dddcc4ff0d8a04e7556b41a3a804a6b1dd2d4c46d4b5ab45c6ed45f300c7171bf2335f73d42768
 EBUILD autoprefixer-rails-9.1.0.ebuild 848 BLAKE2B 875ab493b7f7673729a6743fe86163786024b30fc3703fbba59f9bc1a7767afaecfe7768d33bda44deaac312547523f0c2a43b5b7e732130fb78201fdd662a71 SHA512 dc78cdf0a7de95cebcd20d3493fbd43a11aa4ae00f2ca51bd374837d8f030465c2048d5d7078680a0260084775613e167aebf808d5fce0bb4adebc4240cfc98c
+EBUILD autoprefixer-rails-9.1.1.ebuild 848 BLAKE2B 875ab493b7f7673729a6743fe86163786024b30fc3703fbba59f9bc1a7767afaecfe7768d33bda44deaac312547523f0c2a43b5b7e732130fb78201fdd662a71 SHA512 dc78cdf0a7de95cebcd20d3493fbd43a11aa4ae00f2ca51bd374837d8f030465c2048d5d7078680a0260084775613e167aebf808d5fce0bb4adebc4240cfc98c
 MISC metadata.xml 347 BLAKE2B 71b067345809944df1e70cdcaa44e44ae416d0c4ff80975aa796b8217170825e6be32a15d2549f464d9a65e8aa9ff1b2e9496989e66bce29d3dad672742495ec SHA512 b0985f41e9463a6c5bdbda0d5a84cc76cb6090614fa07395705b3207e0cd4fadbe9b1bb18fb7382f3c8bd00663db1232fd7107f6757bd20cfca0a0df99928426
diff --git a/dev-ruby/autoprefixer-rails/autoprefixer-rails-8.6.3.ebuild b/dev-ruby/autoprefixer-rails/autoprefixer-rails-8.6.3.ebuild
deleted file mode 100644
index f623a7c290e0..000000000000
--- a/dev-ruby/autoprefixer-rails/autoprefixer-rails-8.6.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="vendor"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Add vendor prefixes to CSS rules using values from the Can I Use website"
-HOMEPAGE="https://github.com/ai/autoprefixer-rails"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="8"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/execjs:*"
-
-ruby_add_bdepend "test? (
-	dev-ruby/rails
-	dev-ruby/rake
-	dev-ruby/rspec-rails
-)"
-
-all_ruby_prepare() {
-	sed -i -e "/bundler/d" -e "/BUNDLE/d" spec/app/config/boot.rb || die
-	sed -i -e "/Bundler/,+3d" spec/app/config/application.rb || die
-	rm spec/rails_spec.rb spec/compass_spec.rb || die
-}
diff --git a/dev-ruby/autoprefixer-rails/autoprefixer-rails-8.6.4.ebuild b/dev-ruby/autoprefixer-rails/autoprefixer-rails-8.6.4.ebuild
deleted file mode 100644
index f623a7c290e0..000000000000
--- a/dev-ruby/autoprefixer-rails/autoprefixer-rails-8.6.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="vendor"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Add vendor prefixes to CSS rules using values from the Can I Use website"
-HOMEPAGE="https://github.com/ai/autoprefixer-rails"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="8"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/execjs:*"
-
-ruby_add_bdepend "test? (
-	dev-ruby/rails
-	dev-ruby/rake
-	dev-ruby/rspec-rails
-)"
-
-all_ruby_prepare() {
-	sed -i -e "/bundler/d" -e "/BUNDLE/d" spec/app/config/boot.rb || die
-	sed -i -e "/Bundler/,+3d" spec/app/config/application.rb || die
-	rm spec/rails_spec.rb spec/compass_spec.rb || die
-}
diff --git a/dev-ruby/autoprefixer-rails/autoprefixer-rails-8.6.0.ebuild b/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.1.1.ebuild
index f623a7c290e0..ea1c27226645 100644
--- a/dev-ruby/autoprefixer-rails/autoprefixer-rails-8.6.0.ebuild
+++ b/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-USE_RUBY="ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
@@ -11,14 +11,14 @@ RUBY_FAKEGEM_EXTRADOC="README.md"
 
 RUBY_FAKEGEM_EXTRAINSTALL="vendor"
 
-inherit ruby-fakegem
+inherit ruby-fakegem eapi7-ver
 
 DESCRIPTION="Add vendor prefixes to CSS rules using values from the Can I Use website"
 HOMEPAGE="https://github.com/ai/autoprefixer-rails"
 LICENSE="MIT"
 
 KEYWORDS="~amd64"
-SLOT="8"
+SLOT="$(ver_cut 1)"
 IUSE=""
 
 ruby_add_rdepend "dev-ruby/execjs:*"
diff --git a/dev-ruby/barby/Manifest b/dev-ruby/barby/Manifest
index 085b9b26c08d..b7d7733a2835 100644
--- a/dev-ruby/barby/Manifest
+++ b/dev-ruby/barby/Manifest
@@ -1,3 +1,5 @@
 DIST barby-0.6.5.tar.gz 93781 BLAKE2B 52589bd473403e6640426eeda6c5f4f9e0b070693e2a146fc077bba33e141fd73bc0ff73908f61d0efb6b8d1c5cd971527f9ae75333ecf029d44ea21135c2133 SHA512 f6101edf7a75986c55577d27dcbb0628fc7a6a4d2b8b4eab7a53e2703fbd0a1ec70a062c7a1e3d2b65db2afeecf8f0375a936c2932125b0d96647b8d24dd0e5c
+DIST barby-0.6.6.tar.gz 95120 BLAKE2B e46f261eb11eb2f5b17061e6cbe04419df81d4248a9bed8a5f8f90cba9329915cacf3fa48cc922f4eac14ca7eada87e5be526d9b0d2e0bd1f443daf09af89088 SHA512 5b0a00861b9cecee153c5e1f4e1564d99021b3f7f6005efc48d666f8b4255e91f18792d19b9ae635d40f72dbb38de8db215a252b553138be737a52a8ba85c728
 EBUILD barby-0.6.5.ebuild 2405 BLAKE2B d3f278e67548cc8cca3d0b27da5ea879e996e1ab1e45b01b77efcbd4e1d449e93c01cedc724f203e5dbbd46a3ef236df199e4da958e4a6f9832182663e51dad0 SHA512 a89867db71a7ffb645952dda91dab8313c8b278911df9e5637770de3f428e68e5d842993191795a5de9d939d48695869916b1e09adeea7ac5097ef496c6cce16
+EBUILD barby-0.6.6.ebuild 2398 BLAKE2B ce05a03eabdccc14e8cde77a884f90b201583ea277ecafa8b9c9837881f5dd4d420f3c73a4daae1d7efac33a930a05500578c051e9c3b6aef1f7db7c307bfc6a SHA512 15a4e3feb233f2d93a5962e0ef5a5b5f8523aab9382d2208807aa981a7a2aa89412aed995eb9ecd95da51d8a35b5dac38e1293b75578b183c574c9b09ab212bf
 MISC metadata.xml 1073 BLAKE2B bf39d76c0240bbdeeb85299879247c695237c4a614c1728ef2c432b8049a9e1bf381acdfeafb0bc3083c2238d3b4489790c845d127fafa14038538fa0ef01b8f SHA512 c3e13b0b201a8a8556b5f725d366b78da9ee82bae9707a8722055d0e5e73571560209657e4c7ef69a777934585cdd2d0e001a979f35773f9f31ac99d6346f4dd
diff --git a/dev-ruby/barby/barby-0.6.6.ebuild b/dev-ruby/barby/barby-0.6.6.ebuild
new file mode 100644
index 000000000000..935d6cd8ee35
--- /dev/null
+++ b/dev-ruby/barby/barby-0.6.6.ebuild
@@ -0,0 +1,99 @@
+# 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_TEST="test"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby barcode generator that doesn't rely on 3rd party libraries"
+HOMEPAGE="http://toreto.re/barby/"
+
+GITHUB_USER="toretore"
+SRC_URI="https://github.com/${GITHUB_USER}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test qrcode rmagick prawn png cairo"
+
+ruby_add_rdepend "
+	rmagick? ( dev-ruby/rmagick )
+	cairo? ( dev-ruby/rcairo )"
+
+ruby_add_rdepend "qrcode? ( dev-ruby/rqrcode )
+	png? ( dev-ruby/chunky_png )
+	prawn? ( dev-ruby/prawn:* )"
+
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+# testing requires imagemagick capable of png output
+DEPEND+=" test? ( media-gfx/imagemagick[png] )"
+
+# prawn breaks tests for some reasons, needs to be investigated; code
+# still works though.
+RESTRICT="prawn? ( test )"
+
+all_ruby_prepare() {
+	sed -i -e 's/README/README.md/' Rakefile || die
+
+	sed -i -e '/[bB]undler/s:^:#:' test/test_helper.rb || die
+
+	if use qrcode; then
+		sed -i -e '/^end/i s.add_dependency "rqrcode"' ${RUBY_FAKEGEM_GEMSPEC}
+	else
+		rm \
+			lib/barby/barcode/qr_code.rb \
+			test/qr_code_test.rb
+	fi
+
+	if use rmagick; then
+		sed -i -e '/^end/i s.add_dependency "rmagick"' ${RUBY_FAKEGEM_GEMSPEC}
+	else
+		rm \
+			lib/barby/outputter/rmagick_outputter.rb \
+			test/outputter/rmagick_outputter_test.rb
+	fi
+
+	if use prawn; then
+		sed -i -e '/^end/i s.add_dependency "prawn"' ${RUBY_FAKEGEM_GEMSPEC}
+	else
+		rm \
+			lib/barby/outputter/prawn_outputter.rb \
+			test/outputter/prawn_outputter_test.rb
+	fi
+
+	if use png; then
+		sed -i -e '/^end/i s.add_dependency "chunky_png"' ${RUBY_FAKEGEM_GEMSPEC}
+	else
+		rm \
+			lib/barby/outputter/png_outputter.rb \
+			test/outputter/png_outputter_test.rb
+	fi
+
+	if use cairo; then
+		sed -i -e '/^end/i s.add_dependency "cairo"' ${RUBY_FAKEGEM_GEMSPEC}
+	else
+		rm \
+			lib/barby/outputter/cairo_outputter.rb \
+			test/outputter/cairo_outputter_test.rb
+	fi
+
+	rm -f \
+		lib/barby/barcode/data_matrix.rb \
+		test/data_matrix_test.rb \
+		lib/barby/outputter/pdfwriter_outputter.rb \
+		test/outputter/pdfwriter_outputter_test.rb || die
+
+	sed -i \
+		-e '/semacode/d' \
+		-e '/pdf-writer/d' \
+		${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/bundler/Manifest b/dev-ruby/bundler/Manifest
index 70049ebeb4a2..2100429637c4 100644
--- a/dev-ruby/bundler/Manifest
+++ b/dev-ruby/bundler/Manifest
@@ -1,7 +1,9 @@
 DIST bundler-1.16.1.gem 349696 BLAKE2B 6057aed2e3bffdfa7f3ea8489c4ae79d9241b7b300fd35c4a2c14899ff306183165d1554be793a1856d9fd1c696161161049519fc8915800c68c60a9a5b116d8 SHA512 2cca87aa17b61df98ef98a648a7d7cfe0529015f1278e8cb2298bb12544157933d723bd666d945bcdbaceacbf97a092a3848e2a587bd01cffa73c662d37d4834
 DIST bundler-1.16.2.gem 352768 BLAKE2B 4ba3729d314aec33a4ce6738a54774d4772714913d132493a8bfd719b53c05e9beb498835c01fb1904336d80fb3bd9466f71cc8e5bd1e34491f7e1f38b7bf9bb SHA512 998708b0eec5cdf7ab89b415a0a5173275b221b46e7151c0f05cb49f64a902a0fb0d77f831c60afe55ac4cafe6f4229d082d3f6c38ec13767add7979853f9221
 DIST bundler-1.16.3.gem 353792 BLAKE2B 5a36cd3e3a7fed39ea1de8d7bcd27a2f7758e4fd67bcfdbcc877a44c491624b45736e9aa122a14d792f2ff11605d226cdfb5a70c2d6cdadb5e0e4e36d597c96c SHA512 bc6b911a5ad2911c35be1ce4e28d42b7762cfc950bc060cca1527b66f78c5f125ed5524d1fc161f68053f00997742c6354549712be0a49c72877ab32ccbbefe6
+DIST bundler-1.16.4.gem 354304 BLAKE2B ce10e5e158341f0a6411f808f2dbf4f29a3384b23380845cce0c34a5c4440de6147da84955f087c373470870651cadaa1c42d0652de4b3d6b6999da8c2449c07 SHA512 fe55b87bb999759da8b4285bb6cb9edbef41b87e418beb4bb9f450f425fd152d45fac2be99d79e26c0cdcfa4785f2b0e35b7f18492ac61d8f780c01ab662e40d
 EBUILD bundler-1.16.1.ebuild 953 BLAKE2B 5244bb0fdc2c0bf5cf5ea33ed4d632b7ad8f831d23506b5572f2344c3babc67e0eafe3f9d3af200e7494a7d98488dbef09c58de45fae5d8ddbe84905d4c7a81f SHA512 86a458781879e76e48d769001e42304dd846a8ea595c92dfeb5d8d984c85294873dc47622de9d4aca27d56e1884f83760150eda18cf52a2684b746f7ab957782
 EBUILD bundler-1.16.2.ebuild 963 BLAKE2B 4ba5577bfb001e257ad44a04e3c7e920f6e809177d2f0f0d6557ea4ed5df1955f009323900e3eb9b7fc03bcb333ad197b80e892a0c58bacfed366c606f0fcc67 SHA512 d08f8706fc972839979d1ecacb8ea2436eda09c9585fb664d150a7251cba665553a7d7641adf545628e7557f5e2b3342287287bbb21106856be078fb12f20021
 EBUILD bundler-1.16.3.ebuild 956 BLAKE2B 16a90a9a7d14d861369b7b0f0f2c3dfaa59bc04e96ee3833aecbcee6070f58ec524758a61bcce3d93690f6ab70579de519bd90d6b816bb0bc93b3773de464cc2 SHA512 aba431908bdaccc5d70c76e0bf1209148c4679ec9eca1073025b89d3c0fb630def82147f7c76f35c0a1a81bdf0017888db7fc3f171adbefe808de8c4091957cf
+EBUILD bundler-1.16.4.ebuild 956 BLAKE2B 16a90a9a7d14d861369b7b0f0f2c3dfaa59bc04e96ee3833aecbcee6070f58ec524758a61bcce3d93690f6ab70579de519bd90d6b816bb0bc93b3773de464cc2 SHA512 aba431908bdaccc5d70c76e0bf1209148c4679ec9eca1073025b89d3c0fb630def82147f7c76f35c0a1a81bdf0017888db7fc3f171adbefe808de8c4091957cf
 MISC metadata.xml 342 BLAKE2B 9247517894a366c8b67564e015ff966b22eb3df924ec8438d9886ee854d922e376a274e1dcb455e23451febbb1bf4d8f60023e6b7763cd42772749de1bab372c SHA512 2eb67c3eb94b1d7dfe3e3c818588e6a8b15b375e2e4497afbed91dd0ac28b261cc53e2c04a7f713db710c90566ffea60a0d27acc56893010f9f1b31a6f34cb3e
diff --git a/dev-ruby/bundler/bundler-1.16.4.ebuild b/dev-ruby/bundler/bundler-1.16.4.ebuild
new file mode 100644
index 000000000000..b8d61098f3b1
--- /dev/null
+++ b/dev-ruby/bundler/bundler-1.16.4.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"
+
+# The specs require a number of gems to be installed in a temporary
+# directory, but this requires network access. They also don't work
+# when run with a path that contains "-".
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+# No documentation task
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+RUBY_FAKEGEM_EXTRAINSTALL="man"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An easy way to vendor gem dependencies"
+HOMEPAGE="https://github.com/carlhuda/bundler"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+doc test"
+
+ruby_add_rdepend virtual/rubygems
+
+RDEPEND+=" dev-vcs/git"
diff --git a/dev-ruby/capybara/Manifest b/dev-ruby/capybara/Manifest
index 68a2bf05fcaf..edbfa8dc949a 100644
--- a/dev-ruby/capybara/Manifest
+++ b/dev-ruby/capybara/Manifest
@@ -5,6 +5,7 @@ DIST capybara-3.2.1.gem 284672 BLAKE2B 9da8f588049fab74c4e734626e42758cdd4baf555
 DIST capybara-3.4.1.gem 292352 BLAKE2B baf07378ec9c932ca4fac4b9ce465b76704c5b17cea73db01d584dbf7076b2c6defe0170a0575691f6af5dcda2d8f97bd16a3901d36c8a9db63c72491fbfc962 SHA512 abd969af564a9b8a827493674d51e2cabbb57c47795ede260498f99600da0da9bf00c97e64ccd07cfdb1b630135714191f232f166e08856a4cb9fdff6c47fe1a
 DIST capybara-3.4.2.gem 292864 BLAKE2B f04bef4540df60eaaeab2cdf59577962493da34adae1abcb4fc23101244a522fa2bc80ad86ba906368a98e68d6918877a073be1e0068b4eb2ba44e0d060b40cd SHA512 e9415ce626a1391d9a0af944d9afaa536d98b6d44bb19d288e3b71399effa2fa8ffeef72a0fb2d786a3267f6809943f499f50f88f95c24552888db24888867e5
 DIST capybara-3.5.1.gem 294400 BLAKE2B 413281f52305c47cad34b6200e534798f05cf8a4257ca0f396dcb5c7f4d689d1c34463a99644ce8861cb12fe921918c6ddc503ffa3c4f00b04b6570ce1096dfb SHA512 c42c4492865f70fad30f9c554dfd4a5e435102d58c3934392d9e692638ace50dd7f3301628e45eee0ceb0e94f91b051341bdc9eb9a3f498aec7a477a866bc76c
+DIST capybara-3.6.0.gem 296448 BLAKE2B 4054aaac6b6e0d5f1f0c1adee1951dcac7fcb3b2061dfe9de261e6c8bb749d6c88eb2c5a635b683e9a02719870435d52546701f4f21f722068836d4acd78f3eb SHA512 d99e9aab306955e01c08f26e7e8e042019b30d97c106ce6e33c96d7277670b81a143312c06e89c2f6c5f959af461d219c213c3660e895bec1e8cfcae030728b4
 EBUILD capybara-2.16.1.ebuild 1509 BLAKE2B 8ff52d1240388337ea4eefc688caeddcb53f0c589ffc50d2cddfec130e6702b5ae3bee7ae8ca0dfd8c672867ecfb0347aa37e6961f3dbf185145600e493e0276 SHA512 2b9160aa85c4ac67c1756b385e3bd98951b83e114ea390d0c0243ddae60dfc0a56ad1126a841768c1956641be68c76b935f633509791aa1c07ddc1172cc66987
 EBUILD capybara-2.18.0.ebuild 1525 BLAKE2B 17327933169f1c330a0f0580b8dfd00be4ae39e0fa94d62e172d6621a8a91189925acfca3730685ed80573e6eb456f731d8072fb1adb2653b6b646714a89bc5b SHA512 a6347a7b9014e3ca1bdeee9eed2a9e22d866dd831041e700086b00c4245d254ea3107c82b019f7550faa273777430898c571c837ac4202cdb2cfdf15068edd47
 EBUILD capybara-3.1.1.ebuild 1512 BLAKE2B d8c1dc1208dd7c7aedeb2f48ccaeb190dac1451e60feba70bd2cce2b3e7425f1179716e02792ecaf27b9301c560821d8bc322d2c56a5a92c3032f94303c5e268 SHA512 9f96398cd632b4b2aa5386d84c19bffc3c22cd416178e516a755412c9ecb75287dc089d88925354a6f6d1bae5d5109b4c0831b3b6edf3615deed6253aeb595bb
@@ -12,4 +13,5 @@ EBUILD capybara-3.2.1.ebuild 1518 BLAKE2B af598a905b37db7eb77511372ace937bff702c
 EBUILD capybara-3.4.1.ebuild 1502 BLAKE2B 8aa63d3d3d39207e1884b05ba051ebabc8a5d65b472bbb57db356a7482efb91e3adb20ed7f7f06db3f609d50b456a0f1bad8b36d53880682742039b04826d9aa SHA512 9b5a5c6d9e8362eaf76aae52065706ea8192e59ead7acefe282023295f46c0d89d8548f955286bd3e240c8d20e39e1e0123c81d1054c91a37bade11f74d7f4c1
 EBUILD capybara-3.4.2.ebuild 1534 BLAKE2B 5c0175bc808c5cf563d7985466a3c2650ba7fbd6e48f9c569015e6b41ee05359b5475e377a6d90ba146acdae95bd864836c4431236da0a0518fbe07ea490009d SHA512 7b0b3182c1145efcd2267f37d0ed5f0b5d1d6be51ca6549980df143d9964abca673581b0fe6b68c2d00d8163a252603006ee0a68b42d7f0d8cd3f1d7db9ceeae
 EBUILD capybara-3.5.1.ebuild 1534 BLAKE2B 5c0175bc808c5cf563d7985466a3c2650ba7fbd6e48f9c569015e6b41ee05359b5475e377a6d90ba146acdae95bd864836c4431236da0a0518fbe07ea490009d SHA512 7b0b3182c1145efcd2267f37d0ed5f0b5d1d6be51ca6549980df143d9964abca673581b0fe6b68c2d00d8163a252603006ee0a68b42d7f0d8cd3f1d7db9ceeae
+EBUILD capybara-3.6.0.ebuild 1534 BLAKE2B 5c0175bc808c5cf563d7985466a3c2650ba7fbd6e48f9c569015e6b41ee05359b5475e377a6d90ba146acdae95bd864836c4431236da0a0518fbe07ea490009d SHA512 7b0b3182c1145efcd2267f37d0ed5f0b5d1d6be51ca6549980df143d9964abca673581b0fe6b68c2d00d8163a252603006ee0a68b42d7f0d8cd3f1d7db9ceeae
 MISC metadata.xml 343 BLAKE2B 93caed6f938d8f2c10a7106e7377812064351018521cbb63477340af9531c5c67940097580c5f7610cea03b0dde6853c9fcbe9ab8cf5daa2a49018b8888e20fc SHA512 1e526463690f3ff61390ed77cb528352bdd1c089b368c3f6ab587766d81167afe99f752b861233f755e10bf2aa6f09dde98a9dc359d51392f15b55462ba66e77
diff --git a/dev-ruby/capybara/capybara-3.6.0.ebuild b/dev-ruby/capybara/capybara-3.6.0.ebuild
new file mode 100644
index 000000000000..da6c2de9e770
--- /dev/null
+++ b/dev-ruby/capybara/capybara-3.6.0.ebuild
@@ -0,0 +1,56 @@
+# 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="History.md README.md"
+
+# Rake tasks are not distributed in the gem.
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST=""
+
+inherit virtualx ruby-fakegem
+
+DESCRIPTION="Capybara aims to simplify the process of integration testing Rack applications"
+HOMEPAGE="https://github.com/jnicklas/capybara"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="3"
+IUSE="test"
+
+DEPEND="${DEPEND} test? ( www-client/firefox )"
+
+ruby_add_bdepend "test? (
+	dev-ruby/rspec:3
+	>=dev-ruby/launchy-2.4.0
+	>=dev-ruby/selenium-webdriver-3.5:3
+	dev-ruby/sinatra:2
+	www-servers/puma
+)"
+
+ruby_add_rdepend "
+	dev-ruby/addressable
+	>=dev-ruby/mini_mime-0.1.3
+	>=dev-ruby/nokogiri-1.8:0
+	>=dev-ruby/rack-1.6.0:*
+	>=dev-ruby/rack-test-0.6.3:*
+	>=dev-ruby/xpath-3.1:3"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/d' -e '/pry/d' -e '1igem "sinatra"' spec/spec_helper.rb || die
+
+	# Avoid window-manager specific tests (sizes are specific for fluxbox)
+	sed -i -e '/#maximize/,/^  end/ s:^:#:' lib/capybara/spec/session/window/window_spec.rb || die
+
+	# Avoid spec that requires unpackaged geckodriver
+	sed -i -e '/describe.*register_server/,/^  end/ s:^:#:' spec/capybara_spec.rb || die
+
+	# Avoid test dependency on puma server for now
+	sed -i -e '/should have :puma registered/,/^    end/ s:^:#:' spec/capybara_spec.rb || die
+}
+
+each_ruby_test() {
+	virtx ${RUBY} -Ilib -S rspec-3 spec || die "Tests failed."
+}
diff --git a/dev-ruby/childprocess/Manifest b/dev-ruby/childprocess/Manifest
index 943b51df0cb2..c91aabe9026e 100644
--- a/dev-ruby/childprocess/Manifest
+++ b/dev-ruby/childprocess/Manifest
@@ -1,7 +1,3 @@
-DIST childprocess-0.6.3.gem 31744 BLAKE2B 18fedbe7fbfa1a3954e74206b1f6207351d430a2092dda1f230f54c790c5531cf2a4f302bb86a9adf044e16cfafb132ece45152defd0c4c18445f49d5466f2b1 SHA512 93d2dbd23dfbaa6eb7eaf1c5791802180aece373aa912e78b1c3652e4e96f0e73ef948e484715863eef95e6af6daa1292944ebe987c331ce0d59ba086c803db5
-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.8.0.ebuild 975 BLAKE2B ea1902170503fa521ec6fb176c56d8a1054076eba8cb5378d47b3d917ac7022e6889c22337606985f19212b15e6bc0dc0e8f2414a6dd00fcaea206838bec119f SHA512 e3200509ca42c07c6869ba859cf66aecb77433e37ea1631f2a87d9d5ec5fe4dd4b8d28d4629fce0d1b924fc790d08df32e3a80823b789263e972fede3e9e8505
 EBUILD childprocess-0.9.0.ebuild 971 BLAKE2B 5ed065ba56bc16668404ba0c313e55cdfbc29dec4bcc105119244770845b172e3b98c8486b067de60d582839fa687bd53a90d8084b6b4e0536606f2cd2c79422 SHA512 ec1eb05d135195cd7248499da33f2dd306ff26b132b3bb3263cfa49211464235d0ba2bac8e16711dd10ee22426caa4c35c4270dd892f9dfd86275173a5ec3290
 MISC metadata.xml 344 BLAKE2B 3cbaf9e4992ca3e9fa2283451433e35247418e190a6447453848988e305a4f04583a3ee563149774c347dbd6bac2ebb0451c19fba1d5447162707783c02ff6b9 SHA512 2995953d3ac4c6cc924859dcc2910bd303262f86d5771368956cb0a3d26db031302547154bd98cdcf189aad39e132020c0c22510c65c7830f528cbf2265d871a
diff --git a/dev-ruby/childprocess/childprocess-0.6.3.ebuild b/dev-ruby/childprocess/childprocess-0.6.3.ebuild
deleted file mode 100644
index 0292a3268eae..000000000000
--- a/dev-ruby/childprocess/childprocess-0.6.3.ebuild
+++ /dev/null
@@ -1,34 +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_TASK_DOC="yard"
-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 sparc x86"
-IUSE=""
-
-ruby_add_bdepend "doc? ( dev-ruby/yard dev-ruby/rspec:3 )"
-
-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.8.0.ebuild b/dev-ruby/childprocess/childprocess-0.8.0.ebuild
deleted file mode 100644
index d497ab979068..000000000000
--- a/dev-ruby/childprocess/childprocess-0.8.0.ebuild
+++ /dev/null
@@ -1,41 +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_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/cri/Manifest b/dev-ruby/cri/Manifest
index ae4f1d5ca837..768bb2af9615 100644
--- a/dev-ruby/cri/Manifest
+++ b/dev-ruby/cri/Manifest
@@ -1,7 +1,11 @@
 DIST cri-2.10.1.gem 28672 BLAKE2B fe6f78ec193298605995e00242a4f615159192b66900c111fa58252aea63c3a5515a0e7a9d7c5a1a0878a2e9c70a77023ee60be4d7b6c780d5f2d1300641e109 SHA512 f71cdd00613b226f916c9f45f9e8ce3a7c0c68bdb547de6df8b9457c018627c18ce978a13c971e0ef2cd24ec985f815df0389d0ddabd463eef93d5e2147e6101
 DIST cri-2.11.0.gem 29184 BLAKE2B cd6df24e9c50be519e8d8cba06c7f747dab98c758a70de1f3ff7c3570a3f62b1b7d7769347d0922cc39d9588dd1d061a71b02c0de47a4182184eec8072720ae8 SHA512 ceb87803fc90a394effd3ba445ccb44a2bfc3700e44910766144074ef82b019cd5ddaffad93ce7e7b3446f94735736a4e53f5916924a33460b96afd7aea427b7
+DIST cri-2.12.0.gem 31232 BLAKE2B 742a86204e16280eb7fcb41dcecfdb4779e1676e4d2dde4d79055dc2f3db6e0dfd58b7e78e29e728e7d31fa59669f327e2c5a328b13ccd758012f1268b891d48 SHA512 a248815e5ecd3235a23ece390179ee8763fd99c47e559139c769442b68b4be61e8fee6a90adf64196722c22ff321db9bad84162c28dc149acddff9edfa5b4ab1
+DIST cri-2.13.0.gem 31744 BLAKE2B fb1ba32f4413b5b0f63d105c0770e26c20252744c0db0405dd7528f1a3a3a588b20d2f34611d06f74c21374228954b9acd5991bd6e5574f84ede55ff8682c17c SHA512 a583129316c58fa90336f867f7a723478f64f0a755d0e6d4a34c829a0867e7b917203dddb5594f6fbed63993fd56e6a0da4bcae33013920b5b5aa85936047a27
 DIST cri-2.7.1.gem 25088 BLAKE2B 20317d886401d6d5f034c27396cad2fdaf322246c319ef3cadc3e38169dbc00c83771fdb2d564efd0ca386b916a0bc2d8cf283742ccd18ca390e491a84f5e31f SHA512 37d641390dc83550c254b3c48018f7f2c53f73161807c299cb78ef84b8625e5f00cd8c877ac464ece5c6623d7118872c45648ed56c2bd5f53ae62cd66b8e24d1
 EBUILD cri-2.10.1.ebuild 772 BLAKE2B ce43c4c23ea400229c826bd18c7baa6a68f0749eb3507e927ccf79d89da6f9e9cc491e45e694c930d1fa78d64cb7560d282edf86424994c5adfbd6f7909e942a SHA512 1974af8955cb30a496a14066fab05a7ee499045e17fa6642d9e97904b6bd2700c5b06e7b81b882039a03cd03bc13bf5da9f61510beb40638f686d65e045254a4
 EBUILD cri-2.11.0.ebuild 770 BLAKE2B a281b6c5524b3dac245dc5a892d4fa278d275ea12af194332800627832484016b5090e3b0cc6da82bc0a27e3fa85211d6704dbba0f9d2a2a055b2bf28745ee25 SHA512 a33ab9b67b71b48e61196ea591909fc9de4ab537dbb05f8e2740db4c7905f7ec5074dce2d8698d0b390fa8374f88a4c9a83ef0e96371d46ad9ac38de202bbf1e
+EBUILD cri-2.12.0.ebuild 770 BLAKE2B a281b6c5524b3dac245dc5a892d4fa278d275ea12af194332800627832484016b5090e3b0cc6da82bc0a27e3fa85211d6704dbba0f9d2a2a055b2bf28745ee25 SHA512 a33ab9b67b71b48e61196ea591909fc9de4ab537dbb05f8e2740db4c7905f7ec5074dce2d8698d0b390fa8374f88a4c9a83ef0e96371d46ad9ac38de202bbf1e
+EBUILD cri-2.13.0.ebuild 770 BLAKE2B a281b6c5524b3dac245dc5a892d4fa278d275ea12af194332800627832484016b5090e3b0cc6da82bc0a27e3fa85211d6704dbba0f9d2a2a055b2bf28745ee25 SHA512 a33ab9b67b71b48e61196ea591909fc9de4ab537dbb05f8e2740db4c7905f7ec5074dce2d8698d0b390fa8374f88a4c9a83ef0e96371d46ad9ac38de202bbf1e
 EBUILD cri-2.7.1.ebuild 772 BLAKE2B 3e09c46b3ec082da544c48c2a4c6a024ec45c83547bb3558a5b26c0399818a1fd9ee602155aeaea5e7a408fe4d3abc1294f03bd1d3d14af437a77ba125651e48 SHA512 29b1e00f40376ec04affde1d366437fb65bddab170bc6f4b66c3a4f42c560bd2970b923a2cfa17e62620170695c1929e6958b1f0da966e87280ada6c08b80ee8
 MISC metadata.xml 321 BLAKE2B 2bbd02b4b0f33bb2e3942b93c9af104fcafe960a59b2f109935f5121c2476635f1a3efb9ac092f4f5e6138df0398ea0ca874ee62390d20f3620d442d3502d42d SHA512 8e90f3ffd2b30ff9557e4c11bb31655cbd65498191288c68191f2e5f6d7bbdab6f1c22935f8d45fa95673582d1d0bf776055c0242cee2da27c9d3e71e2851f72
diff --git a/dev-ruby/cri/cri-2.12.0.ebuild b/dev-ruby/cri/cri-2.12.0.ebuild
new file mode 100644
index 000000000000..30952c0fb573
--- /dev/null
+++ b/dev-ruby/cri/cri-2.12.0.ebuild
@@ -0,0 +1,34 @@
+# 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="NEWS.md README.md"
+
+RUBY_FAKEGEM_TASK_DOC="doc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Cri is a library for building easy-to-use commandline tools"
+HOMEPAGE="https://rubygems.org/gems/cri"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+SLOT="0"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/colored-1.2"
+
+ruby_add_bdepend "doc? ( dev-ruby/yard )
+	test? ( dev-ruby/yard dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	sed -e '/coveralls/I s:^:#:' -i test/helper.rb || die
+	sed -i -e '/rubocop/ s:^:#:' \
+		-e '/RuboCop/,/end/ s:^:#:' Rakefile || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib -S rake test_unit || die
+}
diff --git a/dev-ruby/cri/cri-2.13.0.ebuild b/dev-ruby/cri/cri-2.13.0.ebuild
new file mode 100644
index 000000000000..30952c0fb573
--- /dev/null
+++ b/dev-ruby/cri/cri-2.13.0.ebuild
@@ -0,0 +1,34 @@
+# 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="NEWS.md README.md"
+
+RUBY_FAKEGEM_TASK_DOC="doc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Cri is a library for building easy-to-use commandline tools"
+HOMEPAGE="https://rubygems.org/gems/cri"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+SLOT="0"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/colored-1.2"
+
+ruby_add_bdepend "doc? ( dev-ruby/yard )
+	test? ( dev-ruby/yard dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	sed -e '/coveralls/I s:^:#:' -i test/helper.rb || die
+	sed -i -e '/rubocop/ s:^:#:' \
+		-e '/RuboCop/,/end/ s:^:#:' Rakefile || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib -S rake test_unit || die
+}
diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest
index 16ad30e1aea9..ecc751268102 100644
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@@ -3,11 +3,13 @@ DIST facter-2.4.6.gem 246272 BLAKE2B 105a43b2697cde0a48d4fcf87e221cfcb348695f817
 DIST facter-3.11.1.tar.gz 384201 BLAKE2B 349493f0046239ed900cb22df6cac2f5c1f748503e057a68e9be34c2f24f134a280ab9292d7f4e754a5974818a1fd01bc55634905d84706b47686a9e7a1ccc39 SHA512 295c91817912fb43fe259ede4b51ecf4ae5efd500d64b2682c700583bfdf694a8849a4bd4cb3a16a8046d563f487225957a49b760cc03d8bf86ac8487e37a756
 DIST facter-3.11.2.tar.gz 384784 BLAKE2B f280772231a9105e5924cdb777411861a76a67c15b4d7f3cc73fb9c089752a4e5fa43c4d84b8525917fae71ae34c770925161cc94882e74a704d6609b1c1778a SHA512 aaeee7449813590ac8bc8d3b1b2a654e75bcdaabbb19f91f8b282f747e0f8af05ef71bc872b99c226f0db4d06b67549551f62c365853f5829c6b26c931c0b582
 DIST facter-3.11.3.tar.gz 384882 BLAKE2B ad6103df38efb6abd68d9f831e53dba2767401e129d55bb94adee4dc3f8bc48c7a969050cc52d395a196883d561317ccb72bfaba2775e003171fd6941935feb8 SHA512 6b2dbc5a0bc1c70739a4c0987311ef0891a27f64ed1b45a46cc20a37e6d1d24fda0481976fbf743f83f10d2014f6e0df0e2b5cc9eba19924e831652e1a8417ef
+DIST facter-3.11.4.tar.gz 388074 BLAKE2B c3105376ba8d74df08e7e19ca7b5291d241d57aebb43a77d0dabe96668a07a62bf70fb18aa3bc3d85011e22f935a711daade17cf60ad867a7503e1b731647c88 SHA512 af58d0592a4b220d8f1d9a6d065da71136b58b7a474587c140021fd2915d920d328bad52178566f26292bd932ca1ac1371a631f88a567876265c7494bb01c518
 DIST facter-3.9.2.tar.gz 380883 BLAKE2B d2804664e0499715230e5696c5a9ebae933f5b43dfb37154251d47763c2c7f78cfa8d1413dd836e5a0c76ed67300d066fa5bb390f17f85cd4cb7a444eaf0d133 SHA512 bc040826311bbff40f5a151ade315d9d47ef1e0f3faa570805e48ca55405265e66308230118b9cd59f701ecd76a7b0fd4d9200dd4ace838521223a162b105374
 EBUILD facter-2.4.6.ebuild 1899 BLAKE2B a8e0d7c7a83c42150219a300d4a1a512913deee5d66e3a28a4f285a27d731cfa1937bb4d0d9bd8c80e133f2956ecf17690f5a94d66b385507a4f3740a425872f SHA512 0f4a589cb04567a42181bf366e51f6224d792c63bc2b38d2db3653688844e2cb611223fe148a6ff015d8dd734695214afc33ec0812e1707ac629344a691a396e
 EBUILD facter-3.11.1.ebuild 2851 BLAKE2B f7195a19a256dca9b6c1ca5aede6001421411869b4b4c1e9dd02ca91a9e73a6a4efeacbc2809bda46977f5ba2ea4b8efc6d52ecbd5a09b2fb44addfc2ff369b5 SHA512 fb1d8480fe94d452b49560093151be5ee068ab6b8a7f2fe7d90a1d07aaea0b0becd35d435189a7dbe9b9eff60ab2d82d703d700668951c562774f55dc12d375e
 EBUILD facter-3.11.2.ebuild 2752 BLAKE2B 6759e761e7152705a9fae260d626b78c32119553b63e37d19186b20d2afd8efa3a1b92286117f0c10486ecb818086e01352bdfedddd33b37e576cc9c90f731b2 SHA512 d9558badde687ae24b9150e36ccf7ee557463ba996c9654b87ccca5fa8ce44dbb38925282aa3af41aaa366b126a805d8cad42c2dd7d771ccb03d4b85ead17b63
-EBUILD facter-3.11.3-r1.ebuild 2420 BLAKE2B 08c571937a6069cdbad57b9a70236c6dbb8c58c85f6d820e7c310e005452b468bf5932c65fbb13ed4d3eb957814820bfee13727eb6e8d6fe119da2711463157e SHA512 13865deccd523a37cbc49950da7a9b614841dee503ff099733f4562216617ed1754850635156e05dbc20fd6add9fe37b60167a5315f5c4be2c30211cecdb5257
+EBUILD facter-3.11.3-r1.ebuild 2418 BLAKE2B 9836f2e1a648b64509f8b20d20e8f3a274186440d4187b13b28355dcf57932a418cd18640b3b544d2b2fbe75e82b6fd07a0ff7d35d9b1e791a8b871df169dd3c SHA512 5d22eadc6b126276f08a5a9a3a44d0ed74634a5f5064081290f7daffb5930995ad15e71e6654efdc340febb6f5ae0053d469fa58c68b9bfe203ce5a78d0041ac
+EBUILD facter-3.11.4.ebuild 2420 BLAKE2B 08c571937a6069cdbad57b9a70236c6dbb8c58c85f6d820e7c310e005452b468bf5932c65fbb13ed4d3eb957814820bfee13727eb6e8d6fe119da2711463157e SHA512 13865deccd523a37cbc49950da7a9b614841dee503ff099733f4562216617ed1754850635156e05dbc20fd6add9fe37b60167a5315f5c4be2c30211cecdb5257
 EBUILD facter-3.9.2.ebuild 2106 BLAKE2B efcbbd0cfe6a71b1b1a08bbc1f7abe4b94845c9e13192deae811466211ab2ba533ae10732a4d72635609b9cb419051b7c4a39f248e9b06f7ec751cd893d28852 SHA512 5cfb67a3db8d288302f21bf0092c05ce19b40c8a2f00b4b9b63e3e02cd7d1af3dd20670b744520cb42db2b2ccd52e9153d86c0e1db7a36c4c7854c70d79149dc
 EBUILD facter-9999.ebuild 2372 BLAKE2B e3b4f77d6d012fc24893ad870f3f96b6d297aa9874277230721ba74f996ede3a1cdc38f11164593a253e56ab52a539756e88952cacce7eb04a8229722935d338 SHA512 3bbf988e93de0fa9f338b4b3fb3c586bdbb9052c07eafbe54723de98d9daca8dcc103bbddc766e752b323d88ffec0bbe67fa4d1becdfa6174eb97310edee8193
 MISC metadata.xml 854 BLAKE2B 51b94622bf8ce34658bf34bf266effc445fdbee52fb22e70c9a645c36b7ac28db73793f185b2dfa791d8459a56ea66eccc6a3f4da56db4fe4ee171ee607366ea SHA512 27e7e17a15ad80544fb121b050f0f5c39d3e27a53ade89063a894569472618b29649b5a737011b8d6597594d9bc94a49cf52c9df857d577a098d6c770b4a9639
diff --git a/dev-ruby/facter/facter-3.11.3-r1.ebuild b/dev-ruby/facter/facter-3.11.3-r1.ebuild
index 683775e7668d..5060a204e2a0 100644
--- a/dev-ruby/facter/facter-3.11.3-r1.ebuild
+++ b/dev-ruby/facter/facter-3.11.3-r1.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_BRANCH="master"
 else
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
 	SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/dev-ruby/facter/facter-3.11.4.ebuild b/dev-ruby/facter/facter-3.11.4.ebuild
new file mode 100644
index 000000000000..683775e7668d
--- /dev/null
+++ b/dev-ruby/facter/facter-3.11.4.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+# git-r3 goes after ruby-ng so that it overrides src_unpack properly
+inherit cmake-utils eutils multilib ruby-ng
+
+DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems"
+HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="debug test"
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/puppetlabs/facter.git"
+	EGIT_BRANCH="master"
+else
+	[[ "${PV}" = *_rc* ]] || \
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+BDEPEND="
+	>=sys-devel/gcc-4.8:*
+	dev-cpp/cpp-hocon"
+COMMON_DEPEND="
+	>=dev-libs/leatherman-1.0.0:=
+	dev-libs/openssl:*
+	sys-apps/util-linux
+	app-emulation/virt-what
+	net-misc/curl
+	>=dev-libs/boost-1.54:=[nls]
+	>=dev-cpp/yaml-cpp-0.5.1
+	!<app-admin/puppet-4.0.0"
+
+ruby_add_bdepend "test? ( dev-ruby/rake dev-ruby/rspec:2 dev-ruby/mocha:0.14 )"
+
+RDEPEND="${COMMON_DEPEND}"
+DEPEND="${BDEPEND}
+	${COMMON_DEPEND}"
+
+# restore ${S} and override all phases exported by ruby-ng.eclass
+S="${WORKDIR}/${P}"
+
+pkg_setup() {
+	ruby-ng_pkg_setup
+}
+
+src_unpack() {
+	default
+
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	fi
+}
+
+src_prepare() {
+	# be explicit about the version of rspec we test with
+	sed -i -e '/libfacter.*specs/ s/rspec/rspec-2/' \
+		CMakeLists.txt || die
+	# be more lenient for software versions for tests
+	sed -i -e '/rake/ s/~> 10.1.0/>= 10/' \
+		-e '/rspec/ s/2.11.0/2.11/' \
+		-e '/mocha/ s/0.10.5/0.14.0/' lib/Gemfile || die
+	# patches
+	default
+	cmake-utils_src_prepare
+}
+
+each_ruby_configure() {
+	# hack for correct calculation of relative path from facter.rb to
+	# libfacter.so
+	my_ruby_sitelibdir=$(ruby_rbconfig_value 'sitelibdir')
+}
+
+src_configure() {
+	ruby-ng_src_configure
+
+	local mycmakeargs=(
+		-DCMAKE_VERBOSE_MAKEFILE=ON
+		-DRUBY_LIB_INSTALL=${my_ruby_sitelibdir}
+		-DBLKID_LIBRARYDIR="${EPREFIX}/$(get_libdir)"
+	)
+	if use debug; then
+		mycmakeargs+=(
+		  -DCMAKE_BUILD_TYPE=Debug
+		)
+	fi
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	cmake-utils_src_test
+}
+
+each_ruby_install() {
+	doruby "${BUILD_DIR}"/lib/facter.rb
+}
+
+src_install() {
+	cmake-utils_src_install
+	ruby-ng_src_install
+}
diff --git a/dev-ruby/hashie/Manifest b/dev-ruby/hashie/Manifest
index a262c1d44f25..abd8f902e67d 100644
--- a/dev-ruby/hashie/Manifest
+++ b/dev-ruby/hashie/Manifest
@@ -1,7 +1,7 @@
 DIST hashie-2.1.2.gem 34816 BLAKE2B 7406fece6c731f62ab8b73095b6c61d4d79cc3811ba20db68d2d6c54a780e8b37ce92ffa97ddc6c9ae2b802fbdbb04cc0d9c752761c9032739f3548f05696757 SHA512 6f72998710da58a2584939b4e74a114ae54168902020dc16ec5ea0422a91316b84aa6835fffb36a2985634f24ff5b0d01bcdb50134a414a269a4881ebcd728ac
-DIST hashie-3.5.6.gem 71680 BLAKE2B 51029f134abbc2b1894ca06e74d355f11cd507d720278b8aee7bad0ec49cd883868f48d2f3569bd62b4a5bd9b649a986a6afbd997fb06dfef03b2b8483c83746 SHA512 86d9ff56ced3a9458d48119f928be565d2022ee97424d864166e908e2cca7b2155ffc5d35af14cb33741aedc88435e2c5f7d3cad3e98e0ce4e48469673615572
 DIST hashie-3.5.7.gem 71680 BLAKE2B 8f03e190cf299f3597e0fe1b991fd07e00af0ecff757ef56648f97e8a3091a1445441d4e00f59c9b93d5db0d21636d9e5352175e49692f7b28a5612c87da9163 SHA512 c7ae610de5fe9b19a724068c26c184b44f951b29b56e3c5240074a372ad24d0ea70e39541812cbd82d5516d9e00e86a33d935b90e086b7db305b9b34b8f44f23
+DIST hashie-3.6.0.gem 74752 BLAKE2B b689843d30001dd7eaa09d62ab908d60e76128df66055283ccf0770830e5901b4e792c4bebd2cad8bb6d5e97a23016aee0d0114f2fb0f7ace8ebd722b8941020 SHA512 7b5355a2b93267d6b7c63608aeac4bb7d21f32a982e2c59771d5a791f9a0c921d11e1b4a185067447917315ce98f8cc5f2b48a31efec3068fb1f1ec0e4386e15
 EBUILD hashie-2.1.2-r1.ebuild 713 BLAKE2B 0f27740d0e8be35e6278f7b9abc832bd099e85cb539d7294bddeb9cf7d8d322124ad631000da5dd8caf416f090a56b09ad8cee5fdf79f53a550a133ef6c9f3ad SHA512 1ebad38775161f73e659e122f107f8a30971128d2c7f884b559915cb49e6d6736ca3ac7ff949952de3398579302294cc23e050e96e7d53e870ed52804d41af15
-EBUILD hashie-3.5.6.ebuild 1257 BLAKE2B df39d8e186861da35eda6b600b1c7bc82d5af77c62f324910b4be23cf8a748eca4ed75458cc37272e82350d6a33d5c29e636f9dd219666cafa4b60361a8dcd4f SHA512 136f5be7455079b5e65f1a3320874bf66c1483cd00a0305043d183f76864891a7db1af9a56f028d871f5aed93cc6963b4212410d1db7f4c02bf02f1fef0d5df9
 EBUILD hashie-3.5.7.ebuild 1261 BLAKE2B 19a0a2aa6fefe3d0ffc48563a13689ac73c53630d7d5066c0a8fcd6a011259b6bbf8ecacc499d1a8a035f04a8876868ecd867fa2796ada428d2092330f0add22 SHA512 ad85c51d5d97e2d46e87958763e8c50bf4c3f032447e790725d41f73dd67106ca09f0781bc1a72c54d9ef3824b9f62f03a2a3487f419d843318c97ea0b674339
+EBUILD hashie-3.6.0.ebuild 1275 BLAKE2B bd8dc4c35211abdafdd8c7e25664fd892e5f48e98589c8a86250795b85f60d5d06328023695866fb53ed8ecf1cef932bf413eaa9ca31307b27813b17647b9b79 SHA512 abac62cfe3f15cf6d856586012f87c10f884c99dbdbe0d19f34dc25ec6bd99cbc2088d4ece1efbc838edecfb8f9d4a5c27c615c36371345aabf8095c961a32a4
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/hashie/hashie-3.5.6.ebuild b/dev-ruby/hashie/hashie-3.6.0.ebuild
index c5377507bb30..c5333c7504ba 100644
--- a/dev-ruby/hashie/hashie-3.5.6.ebuild
+++ b/dev-ruby/hashie/hashie-3.6.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_TEST="rspec3"
 
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.mobomo.com/2009/11/hashie-the-hash-toolkit/"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/activesupport )"
@@ -36,5 +36,5 @@ all_ruby_prepare() {
 		spec/hashie/extensions/strict_key_access_spec.rb || die
 
 	# Avoid integration specs to avoid complicated dependencies
-	rm spec/integration/{omniauth*,rails}/integration_spec.rb || die
+	rm spec/integration/{elasticsearch,omniauth*,rails}/integration_spec.rb || die
 }
diff --git a/dev-ruby/hiera/Manifest b/dev-ruby/hiera/Manifest
index f679c291aa0d..b9d9a214722f 100644
--- a/dev-ruby/hiera/Manifest
+++ b/dev-ruby/hiera/Manifest
@@ -1,3 +1,5 @@
 DIST hiera-3.4.3.gem 40960 BLAKE2B a4747c6096065c1272bd3099893d27c53b5e869be16643fbd59fa0eead692e3bd082fcbf82463614336d00c3068244bd632fd6c3a87ba520566a8643f674bfc4 SHA512 126e626b9c9020f2b8565aaff35f30b35c73785120425d186c97186c5bdfafc4831216250f78fd33ffd5e1dde49646b262887747c0d73442a252c391329959e2
+DIST hiera-3.4.4.gem 41472 BLAKE2B 12c098d4cbf3bbf5980a4638d7dd7a67a56b9874c96e5be483335be2e0c9ac2417b7e187737c40c9cfa4f1d822f7d3bd9ac74f96e2df040c7aa029b82f295304 SHA512 bfac2d76cca90708a52f907a31c35f8e3944d50d473e3f17ad13f3673ab2efed0ee9edcbb4c40242f398ab2e3bd08b249b191a6b9d534c185ed540802684beca
 EBUILD hiera-3.4.3.ebuild 543 BLAKE2B 121f9fd758d74c0dfea47e5154778da04e759237fc8574e91429a16212f098a5f56d0798ab385f47d5c1ce96548fc28d5fb59610ff0043ec314700759e49fb3f SHA512 96805f69a7bfcc72e4b05e01d3a3eb835349dbe3fcdef6cdd06e1f9c1b2ae0c08b3c9119c93af8691b736b44e6e13a6d5c064d6099e7b3b5ec6afc886f07351d
+EBUILD hiera-3.4.4.ebuild 540 BLAKE2B 1dd281b299350bac945b5fe274857321f0adc0e0d592c98614659982219df504e16d01a577a482e79adf2426f7d2ccacaeea26cef69ba3557d9c14cb666be224 SHA512 e9f9211dfd1a460d6dc8ca5898c302b960dd2363fb313e28f4819369a1af423c5edfdc58d86091e042a662ea998597219649b8813d3bf532bfb93f383f96b8c3
 MISC metadata.xml 441 BLAKE2B 45d0b18035001279a7fc0b362aa00ab9bea5282f35a2237bb72e84893d8a9ff4b575e43928d48aa9906def18e3fe1bdfb121e5411c46af7117b529f136224796 SHA512 795fc49e90529600ad3a950440f33c9dc60aee0f6ad134b682d8c8e80452f015fd2de5af77ed6ad58830e61b1ab7944dcb81629d75d4b09927e218f33aa948ae
diff --git a/dev-ruby/hiera/hiera-3.4.4.ebuild b/dev-ruby/hiera/hiera-3.4.4.ebuild
new file mode 100644
index 000000000000..f653c3e47f1f
--- /dev/null
+++ b/dev-ruby/hiera/hiera-3.4.4.ebuild
@@ -0,0 +1,25 @@
+# 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_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A simple pluggable Hierarchical Database"
+HOMEPAGE="https://docs.puppet.com/hiera/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+ruby_add_bdepend "test? ( dev-ruby/mocha )"
+
+ruby_add_rdepend "dev-ruby/deep_merge"
diff --git a/dev-ruby/logue/Manifest b/dev-ruby/logue/Manifest
index 13cd214f2876..8808cb69a6f6 100644
--- a/dev-ruby/logue/Manifest
+++ b/dev-ruby/logue/Manifest
@@ -1,6 +1,8 @@
 DIST logue-git-1.0.11.tgz 11535 BLAKE2B 6515efab4cb42fa7a787bded637ea6d21ff9d4f99acbc6f14334a0aa6b49c6b93b48f57c78e38b52761cd9e59e722b94b4992a0c585bad601a70b425d0abb165 SHA512 8a5793967eeed4df21439f55bb1bc33037d7c18e8b5f543bef7d6bb9e54e6c5acfb6302f754c7454ef0d8ddf5717563e136b45ee3c5e0c08d92fad15028220b9
 DIST logue-git-1.0.13.tgz 14389 BLAKE2B a6886989e561124904e6e6016c84b53abd1ea5be2f92958dffdc9b5ce9741728b9760034a9a7517ff35dfe0ebf10d6a6937aee426b85de3e71690098e9eec0ad SHA512 677ef2a8fecc50cb923dcf85ab0bdd984ea5806c31e11df9438af92912b94a4ce227837fac4baee05595f894f6a0fd4167f2984357628eb3e8036479103340c4
+DIST logue-git-1.0.14.tgz 12914 BLAKE2B fad25ab9abeaaa282462a743e0b89d55266d7596de55a61db1d712b0952a000df0988856e302aa93bd56cdf53a0eae96b9f60b245f444f7fefc3b5b64af15f35 SHA512 640c48144e098a012736348de2e40b05b59c20a0520df5da52324c7ae455ed41ae1138500db46fa53f4a9c90da138d7fcd5e62921a112ad35f7884149e56dc96
 EBUILD logue-1.0.11.ebuild 641 BLAKE2B 268a65af2a5250319bdbdf3c72f28a8a213e16a5a020aa3dc656e5420141788fab4226ac99a10871216c80242b1b7d27854ecede4bdc9f3dc5501e06704e5083 SHA512 49763d1cede8d908ef5b86a47e07e200bda2d7be3e62d276a793643e3da26b863a101b5f1ca7046af8c74d460ee6cf673c90c70358936e20afb05ea98b739ab8
 EBUILD logue-1.0.13-r1.ebuild 785 BLAKE2B 293a2d4b2c394437d4c7bd40066b650b2bf17d191d7abf2284af33be4173c2c53afac58c8fd950b4217b0dd4bd5ca0fd17f9ea85c9b801ac323b7d4870fe58f8 SHA512 90cd6bf999c3a2d0dd730a937f8b6ba5d0a7a7a8c3cf6af3389d91a5d8e533623777e92cb39fa14bc2fa9992f47fd1372c6dbd87f337905fcfc75b235571744d
 EBUILD logue-1.0.13.ebuild 744 BLAKE2B e7df279983c71b4d2b61f58cf33bd488263545eccd10ec4e715816b684366db24c5530901db6ba52d3d950adb4d4627f619cc331f49b29be19ca830dfb9946ae SHA512 721482f9aa82592cb7624e38f459e455cca7f075d02ff5c29eb5ef62838cc9e28f4dd46713db40546b78e59d946628427c26a2dd034fd9c0cfd0264275375dfc
+EBUILD logue-1.0.14.ebuild 787 BLAKE2B d346a92af9f80c0b618de0f828e3312ec9d9576a690679b317c1dc51708d79af78c824ff37eb61918701953a4cde2a46f7c7355ee03b72969c5f093c679e3d21 SHA512 b9fa5ac4b3a438bedec57acc84403999a33f5d4c1d3550f6eea47934ed5856d84fe04c434e0e4d1abb294755e7c7bc2c2e46f2d7aecf97f6388e203d7849ae05
 MISC metadata.xml 337 BLAKE2B 045c92dadbdfb3a0c0506734134b5c62b6fc842e12cfbae746a6d9cf07dc65dd5d240575639ef8563baf4d201a43d1b3aed0f3ebf54f88a85e7cf8305926d29d SHA512 2d11804bc1d4e53888e62609677d7bc0c20882ed3cc779dfdf5733adf9cc94ba671af7e901724fe30159ebea1cdcb1039e5c83ead45ebff75b9ce64018bbc1f6
diff --git a/dev-ruby/logue/logue-1.0.14.ebuild b/dev-ruby/logue/logue-1.0.14.ebuild
new file mode 100644
index 000000000000..5750a90c7811
--- /dev/null
+++ b/dev-ruby/logue/logue-1.0.14.ebuild
@@ -0,0 +1,34 @@
+# 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_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A module that adds logging/trace functionality"
+HOMEPAGE="https://github.com/jpace/logue"
+
+SRC_URI="https://github.com/jpace/logue/archive/v${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/rainbow:3"
+
+ruby_add_bdepend "test? ( dev-ruby/paramesan )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' Rakefile || die
+
+	# Fix path to match installed gem path
+	sed -i -e 's:logue/lib/logue:/lib/logue:' lib/logue/stack.rb || die
+}
diff --git a/dev-ruby/mime-types-data/Manifest b/dev-ruby/mime-types-data/Manifest
index c4c0f7d58685..50ef998e8760 100644
--- a/dev-ruby/mime-types-data/Manifest
+++ b/dev-ruby/mime-types-data/Manifest
@@ -1,3 +1,5 @@
 DIST mime-types-data-3.2016.0521.gem 101888 BLAKE2B 7711f4154936c200d678c8a94f2bdff8a2fc2a9abb54918563d4c9018c77330f94d4f6b3eb5a64acf7a85c7a27dcc41ba14f1d9e8cb5dcb238b7a1b6b9e70655 SHA512 3eb23e446f25a1b058408bec4f4867177ce42f579d188e3f8f1f31d8268e6566309e7439cdcafec214e54e3b22b7c29896c859bac26556b5573fc149eefeebc5
+DIST mime-types-data-3.2018.0812.gem 157184 BLAKE2B b43b7bd6200182c402fe74f9a3f8cb1bc39a643b1de098ec6427ec66e62b6f28732032f4d6305f1ff267a61f60a12d759950b1a8f25c396bb2a7a6acc27b88f5 SHA512 8c60151f044a03dbb28da231994e4d5e1961839774791ac9caf3332353000c7ab12671960f791a03417b4236b9b6c9f690a5d228b7c5ec0d2a19b1a8e59eadb1
 EBUILD mime-types-data-3.2016.0521.ebuild 642 BLAKE2B 1a8bd47ba1e3717b7833df7751184ad1447328fe5e70e6fdd433d72353ae8d0c1fb7a24bc1a12de52a0287d44ed87f40f8b0162622754d0157fef20559d48572 SHA512 5d57294dc65788b911c3e0cb15f761770606f3ef6f84f370b4e5333efbbf43483e906af79ed2d051ccc35e4f630b9373c6e77d23de19d480205285f9ae9e6716
+EBUILD mime-types-data-3.2018.0812.ebuild 635 BLAKE2B 907968e7db7ec0c47fdd3567a7e6b7a88a7e15ee47058702ea035b8efce84d5c2fcc0d06a4e1137f936c3ef494185e0e2b60a0f9128d50718262b2938b1c9370 SHA512 77fb664a0b015851dc40e32ac26d8822a2825d558854c764c5dc222a95774d7564725cc46d7fa802b13f4723bd6d9f2fdceca3250f1b0cd51c277977912fd29f
 MISC metadata.xml 352 BLAKE2B 31923bc222e1b0230ff1b03dff06215d199c9f0de7c7def0a0acfa7e6d74088efad1934704aa817ac91a8ed7d8a6287c059ae72d925fb83b2a15226b9a2f7dd8 SHA512 b994c7733a66987a405c5e03c34cc1c5c33a102d6121843147b846b2c6c0eb5eba2e5bfb6b8bdc27c39adfdeaadb1f5a525de3667ee7b22f9362b8539f42ec44
diff --git a/dev-ruby/mime-types-data/mime-types-data-3.2018.0812.ebuild b/dev-ruby/mime-types-data/mime-types-data-3.2018.0812.ebuild
new file mode 100644
index 000000000000..efda391d4421
--- /dev/null
+++ b/dev-ruby/mime-types-data/mime-types-data-3.2018.0812.ebuild
@@ -0,0 +1,21 @@
+# 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_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="History.md README.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Registry for information about MIME media type definitions"
+HOMEPAGE="https://github.com/mime-types/mime-types-data"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
diff --git a/dev-ruby/mime-types/Manifest b/dev-ruby/mime-types/Manifest
index f3d7b527e216..6a8f34cc4da8 100644
--- a/dev-ruby/mime-types/Manifest
+++ b/dev-ruby/mime-types/Manifest
@@ -2,8 +2,10 @@ DIST mime-types-1.25.1.gem 61440 BLAKE2B ba28c605e910c41840645780ff42d2eea032fd9
 DIST mime-types-2.6.2.gem 190976 BLAKE2B 985ed336dd20e1dfe8603ef8e8ae1868c605ff9d241439b7d64bf732012423bb76fe6ea420ff67487d100be25dfc4b467aeb7d1373ee17635a9fe634d7958f02 SHA512 a083d865ba39e1b0e468c26823e82472d6bcb501e7dda047f1206b538e2f018d51d8bb31fd6734ba706a8352ade42bb40c52df1837402c3cb4fa01778772485c
 DIST mime-types-2.99.2.gem 149504 BLAKE2B d2088d606b0210a8607d351ce7b7e3b7f25c3d518eaa3cb32ccfbf56a16eea104c908614f315317cece175003261d240f43bbf203619b54da35702abb94be8ce SHA512 46b3add451c3a6879f0f5df5f1e09c41d78d5a5b3872c2fcae7c8b097008cb04a9f5606360af9cc9880d7d659fe2dad19a118e6dfca1774ec3f5a5b852e31720
 DIST mime-types-3.1.gem 42496 BLAKE2B a586c6264e46fd45c5fa7bf79b8ca79e086d4ed23c0bfafb0c38f508b638df886b8b4e43d975955579fa24f19de6c90b16d1f0395a80f676b4c153e4431accd9 SHA512 1923ff7032aabbf83569497e0016ea0ff183a13751b0ba0a5b09a132e7c18154bbb19e7d3877adc2e1d21cdff612713201a465f954309794fa1d9b330975a112
+DIST mime-types-3.2.2.gem 35840 BLAKE2B dd77473793d68007a3f096971366b5c2120391f3bdd5c758d8e4fac2c1df509a9e367766ac8f1dd292e9b000beb6346d22f2e21c599d2d9117cee84ae7fee864 SHA512 e098df6001ddb53225cf2f48df4e13f2cb9c5e86f64dfaebfba82ed9f1d60149b05069800ea14d1d76554d760169f3c3cb506cc3c789c74da7e1c8df61d67b7c
 EBUILD mime-types-1.25.1.ebuild 930 BLAKE2B 89306f2bc2bdc4acfa22985d105956a9cc446cd49f8ef3efcc8d6df307958e5e6dbd27192fd914799adecef52003c8dda784025a454a0b7c2b8e7ec994bf7aaa SHA512 38aef1f501418bce5c169ddc81c669bae21359c458e1c78d61a669c25d4fdeedb032631733191721b8b93a0b5f887f695d3e8c243f867d95af9a241d9f7c08cc
 EBUILD mime-types-2.6.2.ebuild 946 BLAKE2B 2988ff13f6e1c1e9d65cc6b1bb6d69d4db1bc5028e384445285bdedbbb7c7f035387f9bfa5e0902eb8eddc15d5895e9a64076c565a679b2e465d305b4bd02b15 SHA512 30885a365989359975affc1985f1bb0eca60640e7e7bad9a4ef8192e412ad8fa6894f37604ab42a082accd73ddab740cb8f66bde27eed5ff1622db37d0f6cf7e
 EBUILD mime-types-2.99.2.ebuild 976 BLAKE2B 5882d6adf5ca0ab24aaae566f75382cde94d8dce011e15796ed1b0e1922ea187b7c60a78ccd7b6a24ec28fc54b6fcabae16873afc8dc61c971b673a866f3f3b8 SHA512 293cf6a57db6df47523557235520aeb0dbfa95cb9dc904516a49971a6dd490c5293d108ad135bd5da98c6d05460c2c31e6e8a357d063a733870cf1753c767bd9
 EBUILD mime-types-3.1.ebuild 906 BLAKE2B 0b08720bb71b60417b134c7713640a591c35d2da9654a2c977dc9773da9a30f785917e1910fe1d3547fa560c22e1251c5afb5a1fc231954663f235ee38d28fd8 SHA512 05b42ce6521fb4f7c031e9b19d379d1ecade2f513efa4e7a404d3475b69656f602bb432be2226c97a51fc36f501922bfcd0eb7ffc741cbd218d5869f9825496a
+EBUILD mime-types-3.2.2.ebuild 904 BLAKE2B d8eeae6d5b2f44358a660ab305047d1b43d6ebac72026bac0967648975d6e059e86cc46253ee3b39c1c0db3073e5ab0bd6975430401189a4107c616c9a882dfc SHA512 60155673e561aeeeacf2c5dcf57266943f4c8769a5aa29baf29b87e55df38b19765f9bc4e5fa574b1912ea6ba073eff1772e8e6f32806288e07bfb12180c4f0c
 MISC metadata.xml 352 BLAKE2B 6edd7bc99a1f3c2522e87695e078800275b4e9301597961b8e9ba3b920f7b75c92c8133860be4642995d2501e9bcc6f8f7cdbf611d85aa8ea23dfeda9353011c SHA512 01ae71ee2d991c0669ce4f9ac252f8edcdbe1df3f2510e5497f9a0fd0bcc1dc10a10259dc1b3dd14b73edd58895911d363b6a60105b619033a2bf09f987f4b5b
diff --git a/dev-ruby/mime-types/mime-types-3.2.2.ebuild b/dev-ruby/mime-types/mime-types-3.2.2.ebuild
new file mode 100644
index 000000000000..cb6a7ae60f35
--- /dev/null
+++ b/dev-ruby/mime-types/mime-types-3.2.2.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_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="History.md README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides a mailcap-like MIME Content-Type lookup for Ruby"
+HOMEPAGE="https://github.com/mime-types/ruby-mime-types"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/minitest:5 dev-ruby/minitest-bonus-assertions:2 dev-ruby/minitest-hooks:1 )"
+
+ruby_add_rdepend ">=dev-ruby/mime-types-data-3.2015:3"
+
+all_ruby_prepare() {
+	# Avoid unneeded developer-only dependencies.
+	sed -i -e '/\(focus\|rg\)/ s:^:#:' \
+		-e 's:fivemat/::' test/minitest_helper.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/mustermann/Manifest b/dev-ruby/mustermann/Manifest
index 6eabfefab460..f998cd00d94c 100644
--- a/dev-ruby/mustermann/Manifest
+++ b/dev-ruby/mustermann/Manifest
@@ -1,3 +1,5 @@
 DIST mustermann-1.0.2.gem 51712 BLAKE2B dedfd8c4f5a2819ffbf3a7f5462e656d7e50e28e773abbd391bf01c984eb0a25274ee1c5080da0ec5c2f9ac88294be4975ab4310502dd83ac74010443ac582a6 SHA512 89f27ebdcb6df3eac82159b77d6fb6b87fe3c0409e14975abbbca01675eb84c6b49c52ccf75ffa779ff0b476b904834eb349ecb416324e6c61a360d583aa16dc
+DIST mustermann-1.0.3.gem 51712 BLAKE2B 03672295ec33dd5320a40a2c5e5f78ca83a055f73e1f2f8b127f13cd04e0ce5f7bf34eba68f49e253c209db4e169b2a51dd21541d86debca0797b3dc2b3670d9 SHA512 776ad3f24e1165155def04a6e1ff18ccaf536606dafc3fa19b8b2c2576cd316eaa9b72cac37bc6ede3c48c7ed6c90e99a4388f60cdeaef0bca461e9caa4bb4f5
 EBUILD mustermann-1.0.2.ebuild 527 BLAKE2B a37a927827b74fa9e8b71053c8c9d2ea40066b79f06c9f4da647d7754d394a0cf1b299fce2c826485aae4a42302a6e0e1e095295d4a78839c6725080cab9e750 SHA512 0c10bdc8fc07946d1e2e3df1a5166ce4e409bc258be696c0ddc44ce3d338e17ef3dce58681e1e33cb3914830b005c5f30e877c9a4aca2afeb31c96b0685f32f7
+EBUILD mustermann-1.0.3.ebuild 520 BLAKE2B a2869f8be5032ae547598abbfa4a6c2b594c185b7adcc07ca82d492d19c3e8d1436a93d6d8a9731acabba1615f7448a6c6252441de2f68ab664c50cc5c207b99 SHA512 912d29301cd7e19ddf55570ce4028abbf29fc557d36856081418c4ab32eaf9554a6776ca72f782ab6f98de819087211ecd792998464aad80df8ad29612441be2
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/mustermann/mustermann-1.0.3.ebuild b/dev-ruby/mustermann/mustermann-1.0.3.ebuild
new file mode 100644
index 000000000000..fb55411c2230
--- /dev/null
+++ b/dev-ruby/mustermann/mustermann-1.0.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+# There are specs but they depend heavily on unpackaged code.
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A library implementing patterns that behave like regular expressions"
+HOMEPAGE="https://github.com/sinatra/mustermann"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
diff --git a/dev-ruby/public_suffix/Manifest b/dev-ruby/public_suffix/Manifest
index 3c8d5a682b89..b6f3f4bd261b 100644
--- a/dev-ruby/public_suffix/Manifest
+++ b/dev-ruby/public_suffix/Manifest
@@ -1,5 +1,7 @@
 DIST public_suffix-2.0.5.gem 89600 BLAKE2B c561b32a26c4b605821eff66ae2afef17988c45d954a15b04a7174b202851e6dd0012df32981146a0cbaadfd0358b1f67be359b5526a65de2a3b0f7061ee7beb SHA512 d261dec44c11803631e267f36d82a59278d90dceb2811233ca511e895c5f1a58005b6afea980bd1bbd78bbfc7a3a4e02f9f1fbe351fded38be340ecc235da383
 DIST public_suffix-3.0.2.gem 95744 BLAKE2B 5c06af572214760f7d2a176e1b6603ea9bf0f45c91633cdead841ef8289b7c9ae7ae5b0400d5248d3df4c3bc81d9bb357de622fb85a9c3a67f4973872bdee94a SHA512 eafab08d0114212798390b4b5e9472fab98c91b38ea836c76254673e48bd068afeeb5ec4a2685bdb030ea78e4e5ea0be10dc3b742ed30352e11ec7a7cc1e7bc2
+DIST public_suffix-3.0.3.gem 96768 BLAKE2B 0ef8da7c32a2a1268d45a03a46f9a7de9da312fae2b2461692b1eefca09075029972ef196ae5c531d85140cc5da4107ff47abb16129b19e995357d04cfd852b4 SHA512 8d80d126bb91162d9228dd515c2e5cee466134493e874c136831eda11293477a035ec05436a16dc0bf720b7b38b15664e8c1d9b5f4f140f4054fc387565ea275
 EBUILD public_suffix-2.0.5.ebuild 793 BLAKE2B 63883d1db9db91b8e76c756889813a48eda032776895d67ccfe07eb7077f61a0bb1f3916d6ce0425b246ceb8a04068adc03be92689a4a0b68de9fd5920198746 SHA512 47f42be38e0d4ebb1c84ae66230f70bec51ad872e664d9acfb1ba62f13008513fe438f47ce8be13464e7308c2466bb10eba85e10c0ef300b433e1080106f8b2e
 EBUILD public_suffix-3.0.2.ebuild 834 BLAKE2B 35f65e5abe8032946dbae78be95f3a11f91380f74e8b7736f025c05fb3b68181e7b8712081a3908ae4460ea2a539428acc92b330de1c65573f2956cbbae72402 SHA512 e574ad1b94f28ccf7d19daf05abaf1ad76760499e262c17249d6de12f6f17917ccc9bb7739c33561d48b73de11fd3f253cea1e228c7a22d5c57b8cb197aa961a
+EBUILD public_suffix-3.0.3.ebuild 829 BLAKE2B ceed0f9ca69723da1ec895cb677bc2a0267a1c81615e6eaf0fde12f86d8fabacefd332dd948727fd14effe4ec02b896875fe5e4e5e06e4e37708178e511318b3 SHA512 383d3266b1553e2d03ba478f16f2f764731a6785413fc8eaca932de55af2171fef344f16bc0416098dc1defb2a62cba385876f7b7f22cc8aeafd890166058ff4
 MISC metadata.xml 340 BLAKE2B e5ff0b06a3e6205a270389a1aaec9cb8902fad8e9b815e650b9be53276545b401565d8f7b1167ac415766a809fa2358289811196001e840d9d8641bbe2ff281a SHA512 e5091bcfca152fb1301ce5969cb5ce1e65db3452926c5b75db5afb284e28f44655495663fcce3ba5718b9817d1e3f6db491fe8da96732181926ccd58b36d7f20
diff --git a/dev-ruby/public_suffix/public_suffix-3.0.3.ebuild b/dev-ruby/public_suffix/public_suffix-3.0.3.ebuild
new file mode 100644
index 000000000000..c4206c610353
--- /dev/null
+++ b/dev-ruby/public_suffix/public_suffix-3.0.3.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 ruby25"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Parse and decompose a domain name into top level domain, domain and subdomains"
+HOMEPAGE="https://simonecarletti.com/code/publicsuffix-ruby/"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+LICENSE="MIT"
+SLOT="3"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/mocha )"
+
+all_ruby_prepare() {
+	sed -i -e '/rubocop/I s:^:#:' \
+		-e '/yardoc/,/CLOBBER.include/ s:^:#:' \
+		-e '/bundler/ s:^:#:' Rakefile || die
+	sed -i -e '/reporters/I s:^:#:' test/test_helper.rb || die
+}
diff --git a/dev-ruby/puppetdb-termini/Manifest b/dev-ruby/puppetdb-termini/Manifest
index 3eec2c3ca496..cca498f45798 100644
--- a/dev-ruby/puppetdb-termini/Manifest
+++ b/dev-ruby/puppetdb-termini/Manifest
@@ -1,5 +1,5 @@
 DIST puppetdb-termini_5.2.2-1xenial_all.deb 20540 BLAKE2B 2aa48a9de8e512d81fd2e38fff4664bf3ccc69d4fdc6558edf1838171dbc01f3e87186a84a3308c33955336ba3b7d0d70dee640da0cf145ed1624d2341f7614b SHA512 7ac62306b16af0ebd9423a66ac911d35ac11403f45b03d2efe0a4d7c2aec3572670abd0c8930bd3b141c8d4a3aaf1c0b849535e74361b0b1f273b93a6bd855e8
 DIST puppetdb-termini_5.2.4-1xenial_all.deb 20538 BLAKE2B aad000bc0e13e3c97f4428bca88653cbfd76db2e5499f2acad90afcff58847e1dbaec9bc9ae8ec30e21c9b5c8308061b7d51058f0a17e2936d6dfd05ccc650f4 SHA512 98e871a4867735a8ca677ee3fbb6ab5e8718e78623fe6d497a3c680e090b86a0cefc35ee318f6f5abb45ebfd02d9bf75a04f0f1fc48ba654443c5c4ca99f3180
 EBUILD puppetdb-termini-5.2.2.ebuild 658 BLAKE2B 94ce86150e8228a994207160c454fa5d2adec923000e3056c8c94af52be9e970ae143e1c5f885adbd0aa2a17fbdb5f59eab9465c9beec94d98949a6eb652284d SHA512 44ad07412a536aaeea6bbc9e73c9beecb68df91e12f5b5818c3a2fcc7f472bca9e08853b2b1f7f6412e91a0c65bcd4da11a81da73471f75c7eb79ca3df8e9757
-EBUILD puppetdb-termini-5.2.4.ebuild 660 BLAKE2B c73b33d7739eb07ee79a51fb7cb21c83fbe884ed91a914b8ff2290a543e839f9c310579e3bac9f8114bd3445b1f0e310189114948124d17c9f397234f08ade6a SHA512 69f5d75586eab1fb449863e50151213db8b21dccd931a07cd6c2a2465a2315becd341e064e7a7f5dc709708f434aebb4c0662d4a791499ba91ff39c616a7a5a2
+EBUILD puppetdb-termini-5.2.4.ebuild 658 BLAKE2B 94ce86150e8228a994207160c454fa5d2adec923000e3056c8c94af52be9e970ae143e1c5f885adbd0aa2a17fbdb5f59eab9465c9beec94d98949a6eb652284d SHA512 44ad07412a536aaeea6bbc9e73c9beecb68df91e12f5b5818c3a2fcc7f472bca9e08853b2b1f7f6412e91a0c65bcd4da11a81da73471f75c7eb79ca3df8e9757
 MISC metadata.xml 459 BLAKE2B 90810b08bfad84e8e841bb1bbe1a2340f5f4a5b214642cef60a882dc8acf4f502d8e971dc04ab6a614e0437c8321c98c6a7566f0151475adaf8c0daa275c485f SHA512 122359cc00e8fa171933fb808692db59e25a4350a4efb72ca78dc5451e8b96f17fae32a8cd6e532f4c2fbaffc8b7d7bbb1ce141ce1e48d93c928cfb3ba3cfeb5
diff --git a/dev-ruby/puppetdb-termini/puppetdb-termini-5.2.4.ebuild b/dev-ruby/puppetdb-termini/puppetdb-termini-5.2.4.ebuild
index ecc47a98cfa9..ebd00d8d8025 100644
--- a/dev-ruby/puppetdb-termini/puppetdb-termini-5.2.4.ebuild
+++ b/dev-ruby/puppetdb-termini/puppetdb-termini-5.2.4.ebuild
@@ -15,7 +15,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 # will need the same keywords as puppet
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND+=""
 DEPEND+=""
diff --git a/dev-ruby/rspec-core/Manifest b/dev-ruby/rspec-core/Manifest
index fe7e9e2a137e..cfa76537fdfc 100644
--- a/dev-ruby/rspec-core/Manifest
+++ b/dev-ruby/rspec-core/Manifest
@@ -5,7 +5,7 @@ DIST rspec-core-3.7.1-git.tgz 376819 BLAKE2B 6747ffd8f2d426718376b51356d8838a7db
 DIST rspec-core-3.8.0-git.tgz 386022 BLAKE2B e827f006fe9f05f93b741d021bbb108ae3e98cd23f3388c1fdf2a87d8be349c04e91c810cbb7c47cc99ce99a00f62e13eb01a927b8b89d54dfa437ed46b1d24f SHA512 6d3f431a1f9485009f5029bea967f36cb789be8cf33722b36c40df44e12a2284674c6c8af333bfe8ba8825e032576569fd42c92f798988faad732ac3a720c5e6
 EBUILD rspec-core-2.99.2-r2.ebuild 3518 BLAKE2B 017a60ccb0ac017b08c4d97903a5bd59921fd0c0bc3b4322059d856bfee6eba2c026242bfda1e2083b043c190ad9160c6122ad62350b07aa0a486afbbb3089b6 SHA512 7b22027fa5ae71e80f071c4fc7cf3fa0e291ec42e06e0c07bcd0e94ab2782aa2dd79d4cba709751077b7c19cb0c5bc7a346c2c424cf9ffbbb62ed486776b6888
 EBUILD rspec-core-3.5.4.ebuild 3096 BLAKE2B 0dd38520f3c03ff53f1d4de2ad6add6df77e8f55719eea1e7282fe4411e254afe0b51b06a2b7a7263b7a77c5caa7ec0cfd773444c6edf9846d06c98ba68a959b SHA512 2b5c663071b496f4925624d74ab18a870bb1ac64089164f8fae9216a00999465073de08741db7aec0fed85a2beb3e94808abb423dfcd9e44ff094f402317aacc
-EBUILD rspec-core-3.6.0.ebuild 3407 BLAKE2B 32059f16c92df728f21e65be3606a30cd5333c77923c135ebf3dbb613cddd45e7e7374cfaaf6724ba83924101df5fae4e6d0df1aed135659bd42ba64b1106827 SHA512 cf47c20a4446affbc38cc5d9cb870eabdc37a889a734cbde747b2f37e2b669f30123c2fc037fdd95f64b676afac30abfd9a5b5c586f617bd6a229a37e267a2f9
+EBUILD rspec-core-3.6.0.ebuild 3406 BLAKE2B 1be49178d9a21c5335a60d4a8ce5594f71f87f223a0911864d9adf827a211511054a910c346338377355b846714b4b5930e2ae389974b080657cdf16fb334f47 SHA512 c5f17c9976217f8623dbe00665943ebf524a801010eb3549c7a54acec8c6f266c378e4bf577cf24bcf9b1ab7bdaf39da144852a46ec060b642965cd5ba6db72d
 EBUILD rspec-core-3.7.1.ebuild 3414 BLAKE2B 2fea004e794166c2c7cbca481c0d25c1865018fea73edb99ad3ea4c775e46b12d9d33794e14c651ff3ef96a69265c25f6dc6d281819627b591351f453cf378e0 SHA512 5f1a8d0f5e517c2ccc3e0269e34519e614afdad64d3a2491f9335dd4989c317f95b32f503d8fd0e298308e352845592154e9ae8fd0f4fe9f5c0177fad6b2dc63
 EBUILD rspec-core-3.8.0.ebuild 2965 BLAKE2B cb76ba83dce43eda2f511949f085697c832142a34c611d6ec845d7da73801aba37136d392fceacbb3241a69e63f1148631eb2bd584db2d611eb38e52fe5c4004 SHA512 175a24dd2d96a60a39d185aa855b6a1c771d1cf996e5b3898878e86e65fefcb81b399b24f9339c27815268e083bd5f9ce47e1828178818d0fa7e33134a3be837
 MISC metadata.xml 465 BLAKE2B 7aa4aea8fcc4616588f8842e4d3625219eabe0c17f7a621f9d01ba3ba403ce178ba5960a15c9a163eea32a9956cdc27ce1a607bdae1c32a1a6fa1207c7358388 SHA512 987f6c0ce5814c23f3d76a32f0b59ebd89ddc71bcb23d109106a2ee11a5ab050cafd1ec7f87c84f07b4b4d71244d71885c6d727d2b583484c0e5f6466066a57b
diff --git a/dev-ruby/rspec-core/rspec-core-3.6.0.ebuild b/dev-ruby/rspec-core/rspec-core-3.6.0.ebuild
index 2433909fd3b4..07d9fe149498 100644
--- a/dev-ruby/rspec-core/rspec-core-3.6.0.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-3.6.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="highlight"
 
 SUBVERSION="$(get_version_component_range 1-2)"
diff --git a/dev-ruby/rspec-expectations/Manifest b/dev-ruby/rspec-expectations/Manifest
index 0a401f578ad5..a237c4592494 100644
--- a/dev-ruby/rspec-expectations/Manifest
+++ b/dev-ruby/rspec-expectations/Manifest
@@ -7,7 +7,7 @@ DIST rspec-expectations-3.8.0-git.tgz 198184 BLAKE2B 4bd191885a7944ca4909a127561
 DIST rspec-expectations-3.8.1-git.tgz 198732 BLAKE2B 243dccbf1771bda4a445abdadfbb79e67ad2e3a2a92013bcefdf746bcb6a3c99c1c999c15cf3a0ed324d587463ce57676785670ee5b2fa85ee216359b694bb64 SHA512 91d637210ccc4322073ce3e258b923de0e69f0a6eb0f07dd31bfe41da0a0ff18685c289e02c3ccabdea0f332ad55dbcb197fc16c7d6b144958e11cc90bfc8496
 EBUILD rspec-expectations-2.99.2.ebuild 1696 BLAKE2B c613aa21e9d76decaf26954bf8be2357a12dc92960ab966ac587883a91d023a79d5c9fd4e8e00ffdec9a647cf2483e2aeda03c3a851e2a43dcf5bb340caa7ec2 SHA512 54646cef1a0b856616797a8c11ae5bc684b3c3d9db2999f2a3e6e78b2254ae7efcbc22a924fa069d4b560c407a4cf010d4db3bfeb10851febb90d23d7f032ef4
 EBUILD rspec-expectations-3.5.0.ebuild 1322 BLAKE2B 79d4a73c87e4e93e1c165255ee391915c7b2252fcc7ed308994c170ce4f8e3a163a7df0ca59ef24952b53130dc5d0884dcfab319739d0cb1c026a7d26dfe86f1 SHA512 5a56eadd7f68b0b57eb153e5e14bdb2f2d653bad26d84a266dd3d2d34ffa8a2e9a97df5292fcb35cbadab5cec5e86fb6cbbe18c7810c7f1d976019c0dbcaf1b7
-EBUILD rspec-expectations-3.6.0.ebuild 1331 BLAKE2B 65e77871ce74811da397b1238949a97b25c3c22f41383739238ed20e37ece2814284d1776e620e2f4ed74c188c9306bd0cb8a0634ae00598786fa2751ef1e611 SHA512 b956b73bee9aed050249b161a3bc1d77e338c0a9c3ccebec6f89f341a4d006e7053ae47d46cbfa9ca113b39d6312d04723fabc9f09b6672c3d216f3126c391f7
+EBUILD rspec-expectations-3.6.0.ebuild 1330 BLAKE2B 62ce213c58731f498e9bc46b473e2479d05ea6b159abc3eb396ebde2e143dd8f29661b6ea596fea531964f6a693d0084637296b8848496d11407b707609c2ea1 SHA512 0235ce96e9042a7ce9ad476a023d7fc3ce2ec7aa058cca9c1fbd4279ff54b3ac14902139b93aff26de7fc91c5424d01777afdbc6d60aa665349f7f23ecadeb7f
 EBUILD rspec-expectations-3.7.0.ebuild 1376 BLAKE2B 1c49478e03eb5037247f7e624787302ba6827527f403b7edaa02497e315a367492a6bc3c4a8ac267cd6932c7b8477f7d8ab9d347c685c233df8a6042ed825551 SHA512 3a534370174f697e10bd4bc593564154539ac4e562c4fc9188c3ba032e4b17022d997e27f9b2e4f8258a4eb3f90b6d4df9c1ea31bf8ea5196da9e2757049132d
 EBUILD rspec-expectations-3.8.0.ebuild 1314 BLAKE2B 87b3d58a0bac222a68e6c240f510890b875c31847e21935748ed79f4a8d5618d299023df9c133e868f81ea010e2338e6ff3ce8dbb2721c67c6345bc5ed1a72c4 SHA512 08796e9a1fc9fdf1bc13d3806ac91f9b841158107bcfe4a862e379a0d7da1dd8681d81b99afcaee3034bc97b6843120723a42afc9510a14c7893e73ab8429fdf
 EBUILD rspec-expectations-3.8.1.ebuild 1314 BLAKE2B 87b3d58a0bac222a68e6c240f510890b875c31847e21935748ed79f4a8d5618d299023df9c133e868f81ea010e2338e6ff3ce8dbb2721c67c6345bc5ed1a72c4 SHA512 08796e9a1fc9fdf1bc13d3806ac91f9b841158107bcfe4a862e379a0d7da1dd8681d81b99afcaee3034bc97b6843120723a42afc9510a14c7893e73ab8429fdf
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.6.0.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.6.0.ebuild
index 92b33ed30412..006db3d09cd2 100644
--- a/dev-ruby/rspec-expectations/rspec-expectations-3.6.0.ebuild
+++ b/dev-ruby/rspec-expectations/rspec-expectations-3.6.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SUBVERSION="$(get_version_component_range 1-2)"
diff --git a/dev-ruby/rspec-mocks/Manifest b/dev-ruby/rspec-mocks/Manifest
index 2c3bb5c73f98..7f1329d0984f 100644
--- a/dev-ruby/rspec-mocks/Manifest
+++ b/dev-ruby/rspec-mocks/Manifest
@@ -7,7 +7,7 @@ DIST rspec-mocks-3.7.0-git.tgz 189170 BLAKE2B a0a622ac593660c673cd80b3f3caddd2ac
 DIST rspec-mocks-3.8.0-git.tgz 191102 BLAKE2B a8dc3794245e4508fb57874ba11a753db5622abda2d34a022c6f01b2e95bf43dd2df8612abcb84c32cff632f70083ea9d76171de73720d00dd929d562fa5993d SHA512 0649c3722479013aa1a20f750b3a83a9b426e5f79cb0edff995b09d1e2fa674fb8e91c0c94e7f9513f338c3c2e9c5b824a9473e91955cf928542324b8b1463ba
 EBUILD rspec-mocks-2.99.2.ebuild 1532 BLAKE2B b8cf9d6afcc3f38d304daf6abd0610f4fad1e21f1985a01c906e476a35f50f129175fbe7e457509a7eb65f6a09cbca301deb84c9c70abfec23b48016e52d0356 SHA512 98dadc99f3a3bd894ccca1d2763526acb9754646e5b13fc471672d86a96efc10921742f626ef1090d6285faaf6e7f047abdeaee3217d681e7f4583b19ca774f5
 EBUILD rspec-mocks-3.5.0.ebuild 1346 BLAKE2B 1799d6cba41bcc4cc28e1e1778020c52fafc6a16b7515f72cf31e7bb347007ab3a96c88aa71f121e31e3785fb63518324df72b90e6a0ac464727db2d3338e0b8 SHA512 40cae4ee52db2cfc0274c6961f32f654e9f09291c3a9410756f3dca4a1d42b32e0bf54cd8a83164b7f06cc57ba410aaef478390019e0d1d0b7a0630884cb2a48
-EBUILD rspec-mocks-3.6.0.ebuild 1355 BLAKE2B 72fbb0d03cad8dfb45f963fe85b3a2871e97f958f81cda4b8f03fcfd74e6c2b1dfe1f9862cdcebf1da8d497b59b47ff2a33e42b0466533ec89261b9352ba8081 SHA512 65ba2db30404e4301ed3599e3b8461001641ed2b7ea254b29cd610da65e85fbde30cf5b357e4b15d2920a719be0d6b782a2ba681984fc4d79e5f252f3af0653b
+EBUILD rspec-mocks-3.6.0.ebuild 1354 BLAKE2B c55186c7677e44ae2665552ab3e822dc00a7ce38278b2c492513c5798e37e92ba5d8972a82a012c742d8c7139429734ef52f9623bd46f2c77df5ddba679bd874 SHA512 2af0bf67794e666c365f3c752cbc947f4c63a0b63ef15434891dc15c61a42196536b5653e39d68483ec0c8f518e5af8d8a14f76b35aaea526e5cc087388023ff
 EBUILD rspec-mocks-3.7.0.ebuild 1436 BLAKE2B f25095d08605676528048e7f28c3e5f91872d1f49f3075b147cf01edad4d212c0e09da4eeab6e1554220a015d4e1bd67596d44e93240971372fdff84ac16e639 SHA512 99818678324074efd4a4f2f8132dc4cad1de97dc19fc05d4e967362b47111b98375601835e03deec41bd024b626aaafaf7b42aca7966117c11b9a1ccf3f50ad5
 EBUILD rspec-mocks-3.8.0.ebuild 1338 BLAKE2B 0fce9a9428a6c5b74bca18e7656c1afa984b02b01861e723e56a5731d2d6db10835b9bad5b0421adf4c7945b262f40daee9c49c4531411fcd85d2f10e2254edc SHA512 bb9988586bc908dab6aceef3f930c453d0bdfeff8708165d5cdea81ca4a75cdbaa0ec301963b629df42f457a032102de361898df02370076467d439a1d6acaea
 MISC metadata.xml 343 BLAKE2B 87ebb52b322f698e5242c517ca646e64b3a9a33c6b76d968847b2224b4dd683a9eaae5d03470efe775d350c65e3bfbe16547d4b4b99e2744379fbb7c76cc5680 SHA512 c7956e0175d9fdbfd423140f3c757d4c9e1deb6089577f60d11111a93fde6a7c056dcbac8620c30c8c02693297402aa2f0710e43f60abc0878a51bcb8c624667
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-3.6.0.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.6.0.ebuild
index 14b05f778093..36f36d714e49 100644
--- a/dev-ruby/rspec-mocks/rspec-mocks-3.6.0.ebuild
+++ b/dev-ruby/rspec-mocks/rspec-mocks-3.6.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SUBVERSION="$(get_version_component_range 1-2)"
diff --git a/dev-ruby/rspec-support/Manifest b/dev-ruby/rspec-support/Manifest
index 48d61b048369..aa526a3e0719 100644
--- a/dev-ruby/rspec-support/Manifest
+++ b/dev-ruby/rspec-support/Manifest
@@ -3,7 +3,7 @@ DIST rspec-support-3.6.0-git.tgz 64987 BLAKE2B 9337da63047a1b33e8534a74a6dd40042
 DIST rspec-support-3.7.1-git.tgz 65831 BLAKE2B 8595c496bc8d13e36fdfd4a8be8e055db4ac1e85af63f99158d191c9ef9e0a6ba0a2972ad7661a63eeda959e2969139a99ded71219777fd493544b711b6fea53 SHA512 a5760d696048897d76c665a756474bbb1a1995891e577c989cf68a205644c8608c538bf3d87c558428e2c412e02d3552d47567a0679cd4f8793c06f43eccf459
 DIST rspec-support-3.8.0-git.tgz 68415 BLAKE2B c1b13d639213e03c4e334de5520f19136da0e25e96a93b685776a691a84dc1daa66e4dacf3feb83b01032cb1364ba16cdfccf19e738264bbc3bef20882a89d8a SHA512 e16cc7bcc3de797e78c4f6ed475b0e60d492d0442dc048b4b2769a4819b80d1fb4a12aefaee3cc6a35f08d35f5fea82e00cc0fcf04363e57e74a6f5ed73d0693
 EBUILD rspec-support-3.5.0.ebuild 1327 BLAKE2B 0573e7a4db15827ecb994b4f3cb1597b781e8e5faa9b6cbc1ab65ea6940b943f3cfa495d378e72b939472ec0481e014d69a222464aa8e7cb117877e620acf4ca SHA512 4d9e61775a435d1cd2af88e98257b13f21584368903cf3c941b29adcd265f49e5d840268d378fda884c30d7532e16975c7bdb009870abe96181e02a216978db5
-EBUILD rspec-support-3.6.0.ebuild 1343 BLAKE2B 3f99dce2fdbb195d72fbb34821191a5bbdc488cf51f1c4278214544d79a44dbe6d983b421618f0c0f23df4c0b1375fc3335363504269a90e65dad7af5f427349 SHA512 d24236f73dfe7af1440a216da7d836b395559264642da44e37d4e182681e72989c1ac6879efb60bafa859b71dc7316619000bea0ed637e37cc8d4dbc6553ce67
+EBUILD rspec-support-3.6.0.ebuild 1342 BLAKE2B bfcebd89bdc651f6793dfade908505183145d334059078a9af101016cd925f00ecfa458ef9054b7b03885ba3c6a68d8e84e7c600508c75cbae4f0b8509e80da8 SHA512 4ad5b02016f7418669b164991b6b9e70fff9a3e4d70136f5f79ff98c12ed4abbd59a30177243ca8b4ce66aad9caf14f610c9d0932084f968e566e17f541244c1
 EBUILD rspec-support-3.7.1.ebuild 1343 BLAKE2B 951484a84844e5042cda10591933a2857b756ed93e45fa54adbd11f31bb8aec6c60748050f8a95034de08c83815a01be065b25a28d6c723c0a0b7436a88fa95f SHA512 d1afec7a788a72076737aea3cce0a4ca0ad0ee1f22d28936343c2ada2185db20ddc65f792e0bad5623fee5118c24455a074bae9ed8b35b84a137d7ce11cab48d
 EBUILD rspec-support-3.8.0.ebuild 1344 BLAKE2B ae82168cda3923ceb6413c3732d25ff912d434e199db6282f793963626b4d7924975c8bdb969f95de8b13804cb0078c3f31210febeef4d7287778879e279c7c8 SHA512 9ccf1d142e570c78e9c1d92a867b6c0aa705434bdbb07d8cb244be76a7ef9721a7f2d3c1460371160283f9b2533b8630580b951d2a3192bba906d9020bd33788
 MISC metadata.xml 345 BLAKE2B 832a39e1b38a33b4b5238aaf4a79f08aaff0a7751d466ebe3dd6eeaca493cd10d7ed51766d12c17f589be48d450d3f7a36690ee171a5c650c1cdad334003446f SHA512 71b6ed77045b94efb05b0275574fdcf328678c7d0aef385703a40f5ff3300653638dc32911ff8f91c66881201c735df930c000c0283afa9f189dbba41e97628c
diff --git a/dev-ruby/rspec-support/rspec-support-3.6.0.ebuild b/dev-ruby/rspec-support/rspec-support-3.6.0.ebuild
index 4496a2383a47..001d6f98b97e 100644
--- a/dev-ruby/rspec-support/rspec-support-3.6.0.ebuild
+++ b/dev-ruby/rspec-support/rspec-support-3.6.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? ( >=dev-ruby/rspec-3.6.0:3 dev-ruby/thread_order )"
diff --git a/dev-ruby/rspec/Manifest b/dev-ruby/rspec/Manifest
index 4e47288fafad..8598cd21f659 100644
--- a/dev-ruby/rspec/Manifest
+++ b/dev-ruby/rspec/Manifest
@@ -5,7 +5,7 @@ DIST rspec-3.7.0.gem 10752 BLAKE2B a0e15d557b0d9089a886d04c917feda80c7a8e5eb70a5
 DIST rspec-3.8.0.gem 10752 BLAKE2B 14b1710fb64fb2ab46d59ac692ceb95dbe7f5e2f5c54e4f97170bd99c2b0d32e1977250f69160ab191367c8016663ecf5cd4e0c89941ff12c727ed52e6118551 SHA512 aa3ecee499240a26866797c00461c7e63915bb84a9a29afce75bd4e7864027588bafde05b108aa7b6d988c1a123265587db807567a8e0f3d03527b0f2d8329ba
 EBUILD rspec-2.99.0.ebuild 796 BLAKE2B 1f7e76cf83dabe36056c164d335150f56d9a666b389d02e5878ff15464fb50084053f8a4feb545bb314aecafcdaf54d417d94bece5154854e539768e063889cc SHA512 85040ba6e2d27ef48d167ce1365e8301812dcfd1917d5bc84d2509a5fe51fcb2d44c007834fd0fb6e77843f5263122c6f1f045649a9e18b091e3300b63545163
 EBUILD rspec-3.5.0.ebuild 667 BLAKE2B 3df4ec8bc0263ff263cc1d938f614d62d1a27c45f3e1a8eb3fcc5dd1c3455dc8dfd026d9a3104813157c9f8fc29964962fbdf9a7b46d6c5acfaa6ad288dafdf2 SHA512 e10338a61d1af33eae298f1a663c93199b2d871cc2de1a2fc93299657d813b2137dc34f81027314f68de5f80fda2670cee851978f437ddeba1c9156cbeec9de1
-EBUILD rspec-3.6.0.ebuild 676 BLAKE2B 8e76360218b79025df1ce79c52a049ebf6220bc68214c29c5ad9f74288a30bf68d9bb3b2f99e7590095ff61bf89884bbe92e4b1835d9c214e692b9a3ccfdaa81 SHA512 88bb208eeb11d59a60c3eb389d33f1cd93599ed0dcb7c48b62682e7356600af27c3485714dfe8cabb8c6128be06ff90b41ffad2b87c8bd42892305a845718b93
+EBUILD rspec-3.6.0.ebuild 675 BLAKE2B 143830fca24ed3c031ec44b67ecee1bfa255e4f1eb51dd3b379aecaed04a5eb04a4979e5e65353cf3742697f0924f5467bfd8957e3ae12e61c284f1a0b51fbe0 SHA512 cdc52317d98069674222f1cf36186c490e02003226876b56e1f2d74087611dbbbab5e5da306c7e5c2698926014668ead382cf8658307e9fbf5ee2e6d7f5a6c1f
 EBUILD rspec-3.7.0.ebuild 676 BLAKE2B d7297f23018396e07c9480fb1c70b939a2205a78f4644ee8ad88d272df9307d6efe20d9ba836262cc6c7c2c531af272e4fbffc3e57d2c3de6ea080eb781672ad SHA512 1dfd1ffd741ea3d48104f64e12dd9ff262e98818152cc2a68dec46f8234247e57b2cd7b812553e5c0529d8cd4b8943650e911ef9a7d3685750cbbc615997cdc3
 EBUILD rspec-3.8.0.ebuild 647 BLAKE2B 9f8105a18f3a68e80fbe8a506fc5c29427834cd5efbb38a235bde485d88c9278099ec54e54d989ad8d99535a280095208bd0d28bf77c8498945262c4c477fc8d SHA512 fa6975b9a59f2afdc201c97ca4f811561e3f93d00cb4373fd47f136f11269676247b39f71f32172895316252df976ce486d2aa2d5de25e0001fc23f1bdf68106
 MISC metadata.xml 337 BLAKE2B fd99a128031819f061bb4b2fea336d7b14b26b7a986d782d8a4e2b9b9b7ce4c703242ef724cc9bdd98cf0219973dfcfca2a2eb7979b446f879d2f337b566985f SHA512 0a9165edcea2906fb370afa35ef77b74a4b833539959e8f28194e4d02ab7685f23dd16f04ea7e18873d10bf607236972610c49cf61ed97e5df7b4796ec9a66be
diff --git a/dev-ruby/rspec/rspec-3.6.0.ebuild b/dev-ruby/rspec/rspec-3.6.0.ebuild
index 6c951ce0d09b..13a9b3b58f46 100644
--- a/dev-ruby/rspec/rspec-3.6.0.ebuild
+++ b/dev-ruby/rspec/rspec-3.6.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/rspec/rspec"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc ~x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 SUBVERSION="$(get_version_component_range 1-2)"
diff --git a/dev-ruby/ruby-progressbar/Manifest b/dev-ruby/ruby-progressbar/Manifest
index b574383f84f3..60d1899730ec 100644
--- a/dev-ruby/ruby-progressbar/Manifest
+++ b/dev-ruby/ruby-progressbar/Manifest
@@ -1,5 +1,7 @@
+DIST ruby-progressbar-1.10.0.tar.gz 51483 BLAKE2B 24b92718fe933caa29460939a816b14a492d3144e9a891839ec3b5dbac103849bc0aa3becfb47e507a001ce6b0d0bbf2e0b207fe8d7cb51443924e81c9395b0a SHA512 ec645858d619a95081304905661918eef6d5bd19c0f8d00beac48df3f202d18ac85811d51028d71ab144a5a56649feb2409eca59b3db26733c00a1a54a7ef55d
 DIST ruby-progressbar-1.4.2.gem 24064 BLAKE2B 4c26f5c281129a7333c8a7a1f7738a094ec02d769293252c8fbc6df0bea99971cd0d235b6bbeba7e2e4fac10409028f7cdb15870484878c26d9ea9f709f0135b SHA512 443fc015b2dcabc76c685f1529a39ffba289cb00c3cee3992ef240fb9822729f9049db4d85c58ee1ab6cc17927cb325044ea45a968c755a9b5ad93f7b9999fbd
 DIST ruby-progressbar-1.9.0.tar.gz 47888 BLAKE2B 26707f4f931e378da18a29d20da47963c06bde537155d0e9bd3a623b9b3edd9d653a50ca106dcb29ffb53668a869815818398ae514ef3302465cf5a5504b2cda SHA512 d2b01c205dec3bad6989a1ea466070fdc0c3fc5bc0c8685a21094c52d2f2c6a11849b42d88d3ec70df1475ad47c9f84a4c4b603948344643310e2180122d9b67
+EBUILD ruby-progressbar-1.10.0.ebuild 1032 BLAKE2B 4232d3368457607a33731f9711161b08e7e5e1f846b0f034bd19363cd1d5085cc52f4f9307ce6fe148f8dfb95cc13288064a5e42ff2001b0144d60a0aa42eee9 SHA512 9402021f21d8d8d47cbcfe38228ba5cd75061e5eb22367bfc44440fd2f5983e8aa36e81679cb672b17b0b5aba9f637884f2f07db27633d7b16e4230b9e410aa1
 EBUILD ruby-progressbar-1.4.2-r1.ebuild 586 BLAKE2B d9a86d4032d44252d30e5fcb3774ec26efbfb6d1348cc604fc6008ab31ef836e84e558bdf1610168ac97e06aa48310f7d1b74e908e5e3aee60ef165b946b8535 SHA512 7fe1ac90518b66e1605b96c966e31ac111491d1af807b9f5d45a27832d872452db3a1c3aa981af03247670139a3feaf7d26f3443b32f6aafaf05cfd8407a7c22
 EBUILD ruby-progressbar-1.9.0.ebuild 1032 BLAKE2B 4232d3368457607a33731f9711161b08e7e5e1f846b0f034bd19363cd1d5085cc52f4f9307ce6fe148f8dfb95cc13288064a5e42ff2001b0144d60a0aa42eee9 SHA512 9402021f21d8d8d47cbcfe38228ba5cd75061e5eb22367bfc44440fd2f5983e8aa36e81679cb672b17b0b5aba9f637884f2f07db27633d7b16e4230b9e410aa1
 MISC metadata.xml 352 BLAKE2B a36b436c51b56ed96a170c6edaff16655ff0d3b42f2cc6b13e67c252f89e2d56c47ce0c69fd693acc9ddab9a755a5fbf5d72e360f2e6a16bc0117148eb7a25ef SHA512 a572b7825c4e778c503bfa3bb1b82d4d91c28285578c614a8a0c62bdf1967f307645c92f0101a4898baa0ebeac9a26455e459b2440db6989593c0cc4472df616
diff --git a/dev-ruby/ruby-progressbar/ruby-progressbar-1.10.0.ebuild b/dev-ruby/ruby-progressbar/ruby-progressbar-1.10.0.ebuild
new file mode 100644
index 000000000000..033082b7ba8b
--- /dev/null
+++ b/dev-ruby/ruby-progressbar/ruby-progressbar-1.10.0.ebuild
@@ -0,0 +1,35 @@
+# 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_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Text Progress Bar Library for Ruby"
+HOMEPAGE="https://github.com/jfelchner/ruby-progressbar"
+SRC_URI="https://github.com/jfelchner/ruby-progressbar/archive/releases/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="ruby-progressbar-releases-v${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/rspectacular dev-ruby/timecop )"
+
+all_ruby_prepare() {
+	sed -i -e '/warning_filter/ s:^:#:' \
+		spec/spec_helper.rb || die
+	# Avoid ruby24 syntax for an unneeded check
+	sed -i -e '/^return/ s:^:#:' spec/ruby-progressbar/refinements/enumerator_spec.rb || die
+}
diff --git a/dev-ruby/spreadsheet/Manifest b/dev-ruby/spreadsheet/Manifest
index d522bd4e57f7..b1b46c125cf6 100644
--- a/dev-ruby/spreadsheet/Manifest
+++ b/dev-ruby/spreadsheet/Manifest
@@ -1,5 +1,7 @@
 DIST spreadsheet-1.1.3.tar.gz 4655837 BLAKE2B fdb28822c0d40eaceaeccd7ecb7861fa7ab9cf2f775aeca2f5fa00dc7932d17f1cbf5298aac4458109bada8e1d97a5a537f9054cc947aa4140dde3ae260556e3 SHA512 c1529318384c4e48abe20aad21aa80d652ab91bca505379c310707fa23382654252bfc04d1f8bdb7aa6ec00d0e064790e3ffdcf1c1089bd49010e79729a36690
 DIST spreadsheet-1.1.7.tar.gz 4656117 BLAKE2B 4771d747609da7a552ada5d3c0d5de51e6fafbdd1d3dbc8740e50c7a8d3d6d981316816a0e0ea5f5e817e66ee6966ce501e239409a352bce56d22274816ee8e8 SHA512 f1617e1733bb41e7cdcde626a31248fce43160efbd16736822f2dc4e64db814ee5394c50feaf6986b8af4876488191e40e01d95dc76078666517f5cf14f97fcf
+DIST spreadsheet-1.1.8.tar.gz 4656238 BLAKE2B 583e3b45da505f398fb243387c375f97f13482ed39c8857caf96a865eb1f7babff188e459818e4609316ebdbd18f9050d60492fc27e0557aeebb0846dd3679cd SHA512 be90f9b3b21db98daced4bdaaf57fb1f0dd45e9f8fb330e451b51d68a78ffb0dbb2e7b08c1ee41836935ed263acd9639b074df45b7e429f5781d188bd7170e75
 EBUILD spreadsheet-1.1.3.ebuild 858 BLAKE2B 50d430f040cc966c821bd9580eee072fea15f75ab91de8f33d7b12ee06dd96b44cb06fa206182e01ef93561879a1f769443aed0d53ec7373d45440d35fba4060 SHA512 91c10e423b90c3c8a6e88a79ec5f8a44812fbcaadd6309632fd50023c7838b9ea7efab30fa471f9009c36a6d6bc3eb824b6543f40105175457ed95951a6f083b
 EBUILD spreadsheet-1.1.7.ebuild 858 BLAKE2B c79433d6e6deb044f2ddbb8ad1d9577b76ac14099d9b6997da7d92e71da0cafe3dad31dda02b4cb75a0c7bd6f27eb8a16f13719e2811b3757830b88192c96739 SHA512 9bd59e39c5a35ed78e1d990e8741e20f4c5968b2c5e01b3b3bfef47cd451f69ba5d23215dc327ffb459d85f14c822485ac5a68bc1440a1004258e52c6358fa3b
+EBUILD spreadsheet-1.1.8.ebuild 851 BLAKE2B ebda7a86935bb1c4e6e9b19c26fac74576d799ae420aca75ffe4b947866275cbf64662a50bcff4399fb40f295b87bc05a8ed614fed7755bdd84dc47c86ff5c2f SHA512 253427a8c46cb217cd995a3f62495dd6154c40de536502b3edd69bdc627e1ae3e6eb5125d6815b0a23462e62eda16b28cd073e5a5d53a9112f4a6a4fa161b79a
 MISC metadata.xml 452 BLAKE2B acebaf37b6e910c08eda195fab8eb473c2516d5a22d30b64cbb564d25e9c162d3f2a5918fe5ed208533fd847de10ba374c5647f18d33f2045ced2c0fc6158af8 SHA512 a0677ee7cb739f0108436f4021f487e59ad4d24af2d3e08c463b0042cc3016f02a025cbb558a68c04cb13fac2b099530fa3c17b29b473c9371b2243810664416
diff --git a/dev-ruby/spreadsheet/spreadsheet-1.1.8.ebuild b/dev-ruby/spreadsheet/spreadsheet-1.1.8.ebuild
new file mode 100644
index 000000000000..6b5df7f52291
--- /dev/null
+++ b/dev-ruby/spreadsheet/spreadsheet-1.1.8.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 ruby25"
+
+# Avoid the complexity of the "rake" recipe and run testrb-2 manually.
+RUBY_FAKEGEM_RECIPE_TEST=none
+
+# Same thing for the docs whose rake target just calls rdoc.
+RUBY_FAKEGEM_RECIPE_DOC=rdoc
+RUBY_FAKEGEM_EXTRADOC="GUIDE.md History.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby library to read and write spreadsheet documents"
+HOMEPAGE="https://github.com/zdavatz/spreadsheet"
+SRC_URI="https://github.com/zdavatz/spreadsheet/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/test-unit:2 )"
+ruby_add_rdepend ">=dev-ruby/ruby-ole-1.0"
+
+each_ruby_test() {
+	ruby-ng_testrb-2 --pattern='.+.rb' --exclude='suite\.rb' test/
+}
diff --git a/dev-ruby/stringex/Manifest b/dev-ruby/stringex/Manifest
index 36c39d28477f..aeeb536b5cd9 100644
--- a/dev-ruby/stringex/Manifest
+++ b/dev-ruby/stringex/Manifest
@@ -1,5 +1,5 @@
 DIST stringex-2.8.2.gem 130048 BLAKE2B 3f3e88d69924a26eba830d94d9bc9240eb2b7a32cc9d3e444fb55af5f462d2091f2069c8c0ba39c9bebc7c4a48b54d23ee5b3fb9ba18f93a4c122d5b2f237e51 SHA512 e5750df84eeea6787d85f9289200d1f32fe9feb31c44c583a8e2e153c7d6cbcd940ca1cfd7cfd6f9a958e4a866f0ea3204ddb584ff2a43893da274e9813a4497
 DIST stringex-2.8.4.gem 130048 BLAKE2B 69cf894a0d7a6828197d70c474f6075083c41cf36171808d8f16763283654c7907938411b44bdd6a2af85ae445442bf018788c851f72276f89eeae467c01da59 SHA512 5ab6e096133e49ef426c8faee897bd8fbb6fc61db87a80ced13900f7191639b8f5abe223bdfc5170e5049ef7b340883a436ab53feefb708c47207d6fead9094a
 EBUILD stringex-2.8.2.ebuild 876 BLAKE2B c8152e60e4b83c36dff56683c861783711c69e551e322e62767d5c0c1ca5aef6ae97964303f33b60e381dadf545b8243334eac8c270d3be596e04a94fb0577ef SHA512 35ebc94e81699a8e87b784d3cdd86af8ec6d55047b868c56547f46cf7ea1aa042ce7bb257bf7badf1b6fda0ad399779b91b15c214cf7e47e9ebed109b004c121
-EBUILD stringex-2.8.4.ebuild 881 BLAKE2B 6800035e9b6e983dbb8dd4ff7399f2c7ed952a650b999e861b7352f67292eae789c167cc644ae7f1db33b4386383a3f3d4ca656408bb2b7e3f4d70ccec21ee8d SHA512 086e0ed8de826ba59b17a7c09fbfcce8a8bad5dfe376f5ddc25e0201a4ce37b4e3f331b3621e4fb21e486165b6aa4eae3ef69053f55dba65c37175da9a11e34b
+EBUILD stringex-2.8.4.ebuild 881 BLAKE2B 5f83f6da5131fa56f714425b584148d9f955713e99bc1799e44de700b07bd1872428beb2aea77c13a630513f975637de5f7787dfa43cf7f4ac84b5af7af03b44 SHA512 c321eb7e843a987278b413fa8958187bc7be321e2cc9a7c5a5cd77864a38f88a213ca2171117222ff5ed0960296814dda06c9bf525d80b3d06a305bf78009b28
 MISC metadata.xml 338 BLAKE2B 5cf0c51755ddcf10add2da7ec28ff2f3b9f9cf80a9b834a626851ac0635f02e72b8af33391eb281a45a646cbe3854e69e46bfc9e626dac1ba98de6375e3dcd53 SHA512 76f5dde82c273cc2b573f3e2eb417808b9095ae684a860abad1dac99829e0b70790fc3874a8dd8b06c5e8a3dbc71142fd69abb0c860ff9e997b57dde623a11b7
diff --git a/dev-ruby/stringex/stringex-2.8.4.ebuild b/dev-ruby/stringex/stringex-2.8.4.ebuild
index 158b4c62093b..28fe4e7fa7ed 100644
--- a/dev-ruby/stringex/stringex-2.8.4.ebuild
+++ b/dev-ruby/stringex/stringex-2.8.4.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_DOC_DIR="rdoc"
 RUBY_FAKEGEM_EXTRADOC="README.rdoc"
diff --git a/dev-ruby/syntax/Manifest b/dev-ruby/syntax/Manifest
index 621e1b759463..613c722ba0f8 100644
--- a/dev-ruby/syntax/Manifest
+++ b/dev-ruby/syntax/Manifest
@@ -1,4 +1,3 @@
-AUX syntax-1.2.0-require-set.patch 379 BLAKE2B 2f142dce82c2e802e8d8b665a8f547940663366bb27037fe9da8450eee8a633ca7a64687b96532ce4a428f05506fca3bb3cc612971c264e0c5eb8181e8c65d8d SHA512 18a8465164b52a0b39317b50fd69d08f5187f0bc25e709f3bc5ee5bc16a6d257e9e70763447c735615f3b01135c4e2095e0ae8194edf308edd78f4aae08f8d84
 DIST syntax-1.2.2.tar.gz 41485 BLAKE2B 09a1fc9a4172ec8e6a748981a966c891038fe43303360a3e5f2302aa0fb370b1098c7fd7b8a1fc2f022365ac8491b3e9f9146f940dffc772fb68fa8be5245986 SHA512 a3be7ac736d6c77833aa532f17485c076d34e66c40426c9c6be2dbbde87b2adb7154c9b3bed3439cc12577dffc01c8148e0870a0d02b3a02ffbf9fb1d651433b
 EBUILD syntax-1.2.2.ebuild 902 BLAKE2B 6314b43c8304297c764fdfbbf83c925820a60e35f8006fa29faf80517577bd170b77954e3c8094470d33e7b8756442be103cba8175e44ac6ff65005c2f489266 SHA512 c8bc71984e48ceed09e3c2a59709e2c82d32b475e2cea9ddc9ce3fad7581f60d9909aba14d5718182c186fff8937ba6e0a02bcab2304a0f4342f126ede5047af
 MISC metadata.xml 339 BLAKE2B 007757aafebca384bbe340c653875cdfa7c36a40d0fcc948f28f2a1eae85265100d30442f1bc05af9b4286f88f969d54bcf001ad9156aa0bd3dbbbf999a3f129 SHA512 d3d2406f489b687ceb61d99a66ec5e0a4539491277a5c2b5006e03414d14fbd5a25d7de00d2983ab629a1c8efb3e4999681734d07df9ef67f6a01c6abe3f0608
diff --git a/dev-ruby/syntax/files/syntax-1.2.0-require-set.patch b/dev-ruby/syntax/files/syntax-1.2.0-require-set.patch
deleted file mode 100644
index 34dec6c66506..000000000000
--- a/dev-ruby/syntax/files/syntax-1.2.0-require-set.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-commit 22430510b9662edd64e3792c560629daf8aebc82
-Author: Jan Berkel <jan@soundcloud.com>
-Date:   Tue Apr 1 07:00:17 2014 -0400
-
-    Explicitly require 'set'.
-
-diff --git a/lib/syntax/lang/ruby.rb b/lib/syntax/lang/ruby.rb
-index edccda0..90eca56 100644
---- a/lib/syntax/lang/ruby.rb
-+++ b/lib/syntax/lang/ruby.rb
-@@ -1,4 +1,5 @@
- require 'syntax'
-+require 'set'
- 
- module Syntax
- 
diff --git a/dev-ruby/travis/Manifest b/dev-ruby/travis/Manifest
index 833fb22a38e7..c33fcd005f07 100644
--- a/dev-ruby/travis/Manifest
+++ b/dev-ruby/travis/Manifest
@@ -1,3 +1,5 @@
 DIST travis-1.8.8.gem 192512 BLAKE2B 6671b4c8b2e3ea0b374f523e8089fd8f0bb60b0d03e0ba387138c7df926565dfe4bfa7e04926d3dfe0514a9ad6d660ba4c182c947dd605ef30f73275730cddbc SHA512 f4fca2278de7263a0f4889c64dd6f78927355eece73cc600e704d0bebba2efaf86f78b8d608c0859d83c33f04b7fde47f33a4b6307d7799ff312705b40c7d563
+DIST travis-1.8.9.gem 193536 BLAKE2B b889127e07b2126ef193d64361059d514db4df4e3dc70fd30b55dac3fe67624df20d156aa6d9842d6bb766788626358ab38d7e6a59455c91a80925628e30764b SHA512 fce5dfb8071629de172b8a91fad15b1d6fcc50af1ab1a41eaa1e5eb91042b90fd58e1be24779fb02972077af743ebd65183b2dff42ee47d48818f7ed2755980a
 EBUILD travis-1.8.8.ebuild 1184 BLAKE2B 4d165a322934900fe64012e9cb088a542412ad560d6ff80881f473c8e55166832c66e78e76d772ee3f845b405ebc4bd22b9cdbc9edc2a14ef258fc9f39078d8c SHA512 8f1a024d6a0fa0350844db8bf66ae7a204aca6f53068950fdfd128128ead60194fea3e85329488f487d9a451bdd602ea7ffd1461521884bfe83045db01805bb1
+EBUILD travis-1.8.9.ebuild 1187 BLAKE2B 863bc3f3cad62b908396105eee8b8460169efb642b5265e365a6135c79c90628ce02dff8171b565396fdcde5b546e93509a51893ff728f3aaf4fd8d77bb3349b SHA512 d219abd39d8be23446635f3dc5679f4a0f554189e428ec079ee51f3dbc4fd827664ec69a9a610d9274cadfcc2fa68ba47bc4d160ce6a70c7b6687012427edaac
 MISC metadata.xml 335 BLAKE2B 028a3eb98175d899ca2cb4412a35af5c9d9e1dbe43a1065346c7a529087790e3e3482fe7aa489ee4803f7ddff115bb654c62d865957fe80cce7952d316e7bb30 SHA512 2706c228bc0da2e813ab70918226cf82561b8f3f7c186ce5c97a7d74237e2448029bc0ee74b18295996a0c3d09107e7453cfff8257aff91def14ef30468919fa
diff --git a/dev-ruby/travis/travis-1.8.9.ebuild b/dev-ruby/travis/travis-1.8.9.ebuild
new file mode 100644
index 000000000000..9e8cc0ce88e3
--- /dev/null
+++ b/dev-ruby/travis/travis-1.8.9.ebuild
@@ -0,0 +1,57 @@
+# 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="rspec"
+
+RUBY_FAKEGEM_EXTRAINSTALL="assets"
+
+inherit bash-completion-r1 ruby-fakegem
+
+DESCRIPTION="Travis CI Client (CLI and Ruby library)"
+HOMEPAGE="https://github.com/travis-ci/travis.rb"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+#RESTRICT="test"
+
+DEPEND+="test? ( dev-vcs/git )"
+RDEPEND+="dev-vcs/git"
+
+ruby_add_bdepend "
+	test? ( >dev-ruby/rack-test-0.6 )
+	>dev-ruby/sinatra-1.3
+"
+
+ruby_add_rdepend "
+	dev-ruby/backports
+	>dev-ruby/faraday-0.9
+	>=dev-ruby/faraday_middleware-0.9.1
+	>dev-ruby/gh-0.13
+	>=dev-ruby/highline-1.6:0
+	>dev-ruby/launchy-2.1
+	>dev-ruby/pusher-client-0.4
+	dev-ruby/typhoeus:0
+"
+
+all_ruby_prepare() {
+	if use test ; then
+		git init --quiet . || die
+		git remote add origin "${HOMEPAGE}" || die
+		touch .travis.yml || die
+	fi
+
+	# Remove failing spec where cause is not fully clear.
+	# May be related to highline compatibility issues.
+	rm spec/cli/login_spec.rb || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	newbashcomp "assets/travis.sh" "travis"
+}
diff --git a/dev-ruby/uglifier/Manifest b/dev-ruby/uglifier/Manifest
index e90ac8b57999..50d0d4136bb6 100644
--- a/dev-ruby/uglifier/Manifest
+++ b/dev-ruby/uglifier/Manifest
@@ -1,15 +1,13 @@
 DIST uglifier-2.7.2.gem 84480 BLAKE2B a446f21f9b8682ba7ec020d355ec5b6eb573649116fddfe2d4d74849c59f6697065ca2837fb040a91a3f43264a71280660b947b138fd0fe67806f2c18631f498 SHA512 03c8fffbd385db9ee0fa8f422bf571ba99803f810828d536f1b00bc99a21108ac0ed232015d39f1ab88441fef0a3371df10944873fbadae6c8bd2624e3e1a65d
 DIST uglifier-3.2.0.tar.gz 169273 BLAKE2B b0263853c882859db8cc04c19e7f7f4bcbcef9d0b4080e414c9e1c86b691307c59d694abb33582485ea432b787f36445a49c39ece298d90806838bc56a4b7360 SHA512 5bc577753c175cddd7b3241f7343b75f593141c3bfa9ffa1325f7ade4a9acaf3b47e711007b5708f7cea1a7e9e768cbc3bc845d9eb362f877fe2fc83c047bb57
-DIST uglifier-4.1.12.tar.gz 199867 BLAKE2B 858cd1b04880775815a36515fa34077a59899a58ded15b25aa52f9fd6e232ae7576319ee67e299291f9bbb5b5a03aa883025fd133736328b11cc1e47636bb295 SHA512 cef2dcda1c7195e2af50ed94e808ddbf1ec2b95ca27cedea86180e68451d5354029d2995407150c8ee5c5e702353fcf05e205cb81cdd63e0c89bd8c8e48e5a82
-DIST uglifier-4.1.14.tar.gz 200188 BLAKE2B ef75c4e678987cc7b640cd2efd003352da978d6bc18c688670cbe08101475f3eec26880a764eb30e1c1f1694b2fdaeee3b13c825c79c0d09940824d2e6876674 SHA512 5f9c4f608e2e76e8eebaeec9dc90a100f367db79ca4a559cceb11984fc030360861fd8796cbfc67b2346b0d6b344eda647e14fa9ae29dd246a1a9b76a8d59c42
 DIST uglifier-4.1.15.tar.gz 200245 BLAKE2B 3e709eaa2394f611fdcb1996656e5531014c1cd492615f39d7309fe4089311e3838887981e5c7cc224261d4aae60bf928b8dd866985acae284c1eb5fc81906ea SHA512 673d4db046455bbde93d5542cbc2caab1f3265a8679955250227f631a58bbb303e04f92699da14aeb2f986c84c62b74f61f048e0f8625886c4f11cfe59e5ed23
 DIST uglifier-4.1.16.tar.gz 200320 BLAKE2B 3c23cc25c03a4c335b2866dee7aed34e3b32987960f5a7b8e376e3ba2dd858081286dda164fc39a55bcf0be29910fe90064ac1129e0aa370d118b5a83a2feec0 SHA512 25eccabfcf1fe2fe1dd3f3afd9835d51d692f1f57060b7c281af557f31646d293f4736c162abdba276622b0cc1558820830d073006b00e8ba6213d16c0a56773
 DIST uglifier-4.1.17.tar.gz 200378 BLAKE2B a1eaed99a87366ae157173afb12df32d80db65a2a93bb58661f3e3e52efb74f4857fb2b9fad8cf9c95da7c22ba18cb778f4bf863e4857f82ba20839a266eefdb SHA512 53652323c793604fe1fb7ce96d46343399804c15a68d474d1b6ec88a8d2e58805dd7b703851ef48710b458a23f749816f61d8717ddb05c9219524a1b102cd3f1
+DIST uglifier-4.1.18.tar.gz 200342 BLAKE2B d3c7c25465759a3cca72feb1d0072d3d563e8d06da57f6e8dd46945707e8d82823f49e19b0cc88e9e04cfd73001a1207229bf290c05a7c68f43418613d9dcdc3 SHA512 ab877707e2236e73d669eedeb17d4cba39c9b199f2ec27aa9b7b7a66d3c07754fb29dd3e4523ddf40bd215d9f985edb3e9205ccb326c0d5487cf9d011777fdb6
 EBUILD uglifier-2.7.2.ebuild 598 BLAKE2B 866212993ed0781517edb9b12f37ec7c449f42dc7361aae98dd01ef31a40bd2936111446bfd17590a5b96f2a49d969641754b9aa7aff13d93d3e31614fc42fdf SHA512 6f6a691d0f60f9469080b8bf0840277424ea956b2cd509a1b7889c4798e90bd104a33c70c1511ea183391daa88f2a3cbc657614d1c9124d3e333e584d4a9a8de
 EBUILD uglifier-3.2.0.ebuild 800 BLAKE2B a19a8fe518ebeac3dd4854d7a1cfa86f04a03522ae79a4c5d211777dc3098f32e319923544ffd4f2220caf62cf828bd0c57ddada8abd9e8757e04131f4d7e013 SHA512 b0d20ca10593f7072a58a457fe7985f1e374936c96ff322df63688fbdaae167987132e5eb65aca13113c65d4448d39c94bef4b9eac5f342e6ee46245751db45e
-EBUILD uglifier-4.1.12.ebuild 805 BLAKE2B a114b6d5eb06d899384886a5cc47db85d3acf0156d31e49446126aa596dca1ccf335e32899163ff3bf5670dc9c9e5458d5bfecb69d8c79337930c45834db4ebb SHA512 32ac7dc1bcba18a57bd1c6d1ba84046c4736e8a4560a7850d83869170d759911b5e66caeb9a49ab69d387225680ef44554631abd75890ead6e2af5ddc8c1ceda
-EBUILD uglifier-4.1.14.ebuild 805 BLAKE2B a114b6d5eb06d899384886a5cc47db85d3acf0156d31e49446126aa596dca1ccf335e32899163ff3bf5670dc9c9e5458d5bfecb69d8c79337930c45834db4ebb SHA512 32ac7dc1bcba18a57bd1c6d1ba84046c4736e8a4560a7850d83869170d759911b5e66caeb9a49ab69d387225680ef44554631abd75890ead6e2af5ddc8c1ceda
 EBUILD uglifier-4.1.15.ebuild 805 BLAKE2B a114b6d5eb06d899384886a5cc47db85d3acf0156d31e49446126aa596dca1ccf335e32899163ff3bf5670dc9c9e5458d5bfecb69d8c79337930c45834db4ebb SHA512 32ac7dc1bcba18a57bd1c6d1ba84046c4736e8a4560a7850d83869170d759911b5e66caeb9a49ab69d387225680ef44554631abd75890ead6e2af5ddc8c1ceda
 EBUILD uglifier-4.1.16.ebuild 805 BLAKE2B a114b6d5eb06d899384886a5cc47db85d3acf0156d31e49446126aa596dca1ccf335e32899163ff3bf5670dc9c9e5458d5bfecb69d8c79337930c45834db4ebb SHA512 32ac7dc1bcba18a57bd1c6d1ba84046c4736e8a4560a7850d83869170d759911b5e66caeb9a49ab69d387225680ef44554631abd75890ead6e2af5ddc8c1ceda
 EBUILD uglifier-4.1.17.ebuild 805 BLAKE2B a114b6d5eb06d899384886a5cc47db85d3acf0156d31e49446126aa596dca1ccf335e32899163ff3bf5670dc9c9e5458d5bfecb69d8c79337930c45834db4ebb SHA512 32ac7dc1bcba18a57bd1c6d1ba84046c4736e8a4560a7850d83869170d759911b5e66caeb9a49ab69d387225680ef44554631abd75890ead6e2af5ddc8c1ceda
+EBUILD uglifier-4.1.18.ebuild 805 BLAKE2B a114b6d5eb06d899384886a5cc47db85d3acf0156d31e49446126aa596dca1ccf335e32899163ff3bf5670dc9c9e5458d5bfecb69d8c79337930c45834db4ebb SHA512 32ac7dc1bcba18a57bd1c6d1ba84046c4736e8a4560a7850d83869170d759911b5e66caeb9a49ab69d387225680ef44554631abd75890ead6e2af5ddc8c1ceda
 MISC metadata.xml 341 BLAKE2B 07cb7ce323751f520c38158ef006374652e317e5809b4fbc729c264f3b44e99fc8e1d75916d858ba50361c2d3cff389b33cba7c7f863300ae8da8002de4a8d24 SHA512 0747fa6ff0d695b149915495d5242dec8541231e0e72a2157e3b4412301d8f0767c1eab17ea72a0d9f8c1afc9107c4f55b261018744e43823c8140de38ebb0b4
diff --git a/dev-ruby/uglifier/uglifier-4.1.14.ebuild b/dev-ruby/uglifier/uglifier-4.1.14.ebuild
deleted file mode 100644
index b822aa8c1b9d..000000000000
--- a/dev-ruby/uglifier/uglifier-4.1.14.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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_DOC="rdoc"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby wrapper for UglifyJS JavaScript compressor"
-HOMEPAGE="https://github.com/lautis/uglifier"
-SRC_URI="https://github.com/lautis/uglifier/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-
-IUSE="test"
-
-ruby_add_rdepend ">=dev-ruby/execjs-0.3.0:*"
-
-ruby_add_bdepend "test? ( dev-ruby/sourcemap )"
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/uglifier/uglifier-4.1.12.ebuild b/dev-ruby/uglifier/uglifier-4.1.18.ebuild
index b822aa8c1b9d..b822aa8c1b9d 100644
--- a/dev-ruby/uglifier/uglifier-4.1.12.ebuild
+++ b/dev-ruby/uglifier/uglifier-4.1.18.ebuild
diff --git a/dev-ruby/yard/Manifest b/dev-ruby/yard/Manifest
index 9fb791331bf3..76ee51417bf5 100644
--- a/dev-ruby/yard/Manifest
+++ b/dev-ruby/yard/Manifest
@@ -1,7 +1,9 @@
 DIST yard-0.9.11-git.tgz 916355 BLAKE2B e9f27fe129cf93c51dbf83f4a7d5745d385252ba63c90f85223f2e9436c22a55aaba296f263072069d39e4beaca3e0830775a8be121c64cdc2a15afd3539a73f SHA512 375a4878e61888cf73aaa06e9300195ae48b9898d8cd639fa796a067e5fa0b89d6ef62d327a388ee83953e80177515f4d8c070042188e3a1e597f48b82b3a72e
 DIST yard-0.9.14-git.tgz 917830 BLAKE2B dd0d1d6dbc5aa9b549bd4c110f1abd57edc76b85e7c936bca8f7d35761d705ba86cd169c3c2b2141095dda68a8ab350b46bcbeb978d655addff78b110fbd2b71 SHA512 7974d431b2c1ef4830f225fd2012592405e7fb63546aeb52b74f4ad8b498926be979f3010bd315877bb4f738f6aa6c31f54b71832b461ebd3fa54fe1a1fccf5f
 DIST yard-0.9.15-git.tgz 918280 BLAKE2B f7ae54298cfb8d19e006ad5e18525c3e73e423894e37c3af1fbf555227c4f66bbbcdae781addf7ad30ac900d2af7458550558fe75d876d9fa4c0cd5a2a1a3668 SHA512 45e3a6e170c06c0f7e7ff508d33e87ed9922be3e8fca19d272553b84e678fa209c44460665b86e508145b147dbbc6d4664b95694dbcf91c421988b233e63dd40
+DIST yard-0.9.16-git.tgz 918424 BLAKE2B 41213a87b108bbacf3d700ffbce67806619ff417b8c883b8f7c33bb1eda1e1d97176226a801d8fb8a888a4ed4e2bcb45c46a65b236bc39c9100bcc6200c5778d SHA512 0027fccf87ec86a8ad5d62ec02b10a9c50be82212a7ad0f9f79d41627a2b88cb886fdc832e0df5c28cf737ad9f308670bd98b4dbb8ddc21aeba76b5c6928ecf1
 EBUILD yard-0.9.11.ebuild 1464 BLAKE2B 0e4ee9f923c5a7fdfa905a50fe8a69b2273795c19e4c0665d015807e283b8cfee92ce936dcc1d08ca2d5c3c1001452ccc7d2e4b9fb1b9097e008de723db048d2 SHA512 0eb51531a2c15800b4af27f4174abd3fe161448f7d275e63673ccd4e6787fdbfd18ab50563b454495e7707d68df90281c3e7b97f82be977095c41ac9ec74dbdc
 EBUILD yard-0.9.14.ebuild 1588 BLAKE2B 52adfcc822cfd56271195f6814091ae790477cdfa30574bc1a23862f0c6d8d61725b5e75540057b6da305842fb77a9b26dd82a21c4e75e90c00ce980438c70c3 SHA512 93ca7b3a3771f5c1df77f5ebb2e9d12cefe45ce6fb05f32a8b4035df555e72b03ddce7b29b3a7a0e687ef6e7368518e5a874d8f570f557ba979b16740f4b6d2f
 EBUILD yard-0.9.15.ebuild 1588 BLAKE2B 52adfcc822cfd56271195f6814091ae790477cdfa30574bc1a23862f0c6d8d61725b5e75540057b6da305842fb77a9b26dd82a21c4e75e90c00ce980438c70c3 SHA512 93ca7b3a3771f5c1df77f5ebb2e9d12cefe45ce6fb05f32a8b4035df555e72b03ddce7b29b3a7a0e687ef6e7368518e5a874d8f570f557ba979b16740f4b6d2f
+EBUILD yard-0.9.16.ebuild 1588 BLAKE2B 52adfcc822cfd56271195f6814091ae790477cdfa30574bc1a23862f0c6d8d61725b5e75540057b6da305842fb77a9b26dd82a21c4e75e90c00ce980438c70c3 SHA512 93ca7b3a3771f5c1df77f5ebb2e9d12cefe45ce6fb05f32a8b4035df555e72b03ddce7b29b3a7a0e687ef6e7368518e5a874d8f570f557ba979b16740f4b6d2f
 MISC metadata.xml 337 BLAKE2B 1aedede1271d1f9a566743dd25b1fd9961e429b78bb5f9f36bd6ea66f631f376a273d7a094fba7121d099f3a4a3f0e7738753078e2a1a554cfe6cf32acc6e2b6 SHA512 0de30cc9c4a9d08649f141cb6df0ee9c05703831603c77a0605f0bf8e2f49b8324a782d092aaa690581e23d6d948fda9781b98770a3ba89ed6bfc0de351c11bb
diff --git a/dev-ruby/yard/yard-0.9.16.ebuild b/dev-ruby/yard/yard-0.9.16.ebuild
new file mode 100644
index 000000000000..4270103786c4
--- /dev/null
+++ b/dev-ruby/yard/yard-0.9.16.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 ruby25"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC="yard"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_DOCDIR="doc docs"
+
+RUBY_FAKEGEM_EXTRAINSTALL="templates"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Documentation generation tool for the Ruby programming language"
+HOMEPAGE="https://yardoc.org/"
+
+# The gem lakes the gemspec file needed to pass tests.
+SRC_URI="https://github.com/lsegal/yard/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend "doc? ( || ( dev-ruby/maruku dev-ruby/rdiscount dev-ruby/bluecloth dev-ruby/kramdown ) )"
+
+ruby_add_bdepend "test? ( >=dev-ruby/ruby-gettext-2.3.8 dev-ruby/rack )"
+
+all_ruby_prepare() {
+	sed -i -e '/[Bb]undler/ s:^:#:' spec/spec_helper.rb || die
+
+	# Avoid specs that make assumptions on load ordering that are not
+	# true for us. This may be related to how we install in Gentoo. This
+	# also drops a test requirement on dev-ruby/rack.
+	rm -f spec/cli/server_spec.rb || die
+
+	# Avoid specs that only work with bundler
+	sed -i -e '/#initialize/,/^  end/ s:^:#:' spec/cli/yri_spec.rb || die
+
+	# Avoid redcarpet-specific spec that is not optional
+	sed -i -e '/autolinks URLs/askip "make redcarpet optional"' spec/templates/helpers/html_helper_spec.rb || die
+}
diff --git a/dev-ruby/zentest/Manifest b/dev-ruby/zentest/Manifest
index 2b95fedab850..df756d336786 100644
--- a/dev-ruby/zentest/Manifest
+++ b/dev-ruby/zentest/Manifest
@@ -1,5 +1,5 @@
 DIST ZenTest-4.11.0.gem 71680 BLAKE2B ae2d72ce5ff899dab0905eb7ed1bca0cf2158ec5044254cd7ebb86c59feb746bf18e6a0242f91c49803a062c5d94f5b1b0be4338cadef2a5afd116753259f51b SHA512 cb835ea2e937b7ea56084c138948acb1c2a96500e5b8bd54dd9d195e4005ebdce67b189cdf31a010135f55adb02f3bcf21ff663a26022eb759dd2126558c5c21
 DIST ZenTest-4.11.1.gem 71680 BLAKE2B 27bd94ca98a6739829526c06689ee5a890aa254bef3cb7b7b02d79d82a4fa96faa1853d36069aa801983b4927d44b2af2c852c111ece3b64459c99d63a7a072d SHA512 6f3b5dfb8cc8154856e94f20134e9a6bd2d54e052d05d3e7a250f831ee0a3d3196b497cf118322c51201fb8dd30a05b8a0a0462c58a8852354c4dee2a10d867b
 EBUILD zentest-4.11.0.ebuild 969 BLAKE2B 72c54b3845891c3bd8873fd3bad177c074972b9f8faa37c735cfa62d5a5b29736379e24a686927f3d363724c5df575d2164406b70f067828a4e03b5bb741e4ac SHA512 e0ccf05566fb8329d88e540ed4a6fbf34828d8c7c3108cae3e92dd21ea209349c149585973568e32b038c90247f3cb547e3fad42f38809b702ebc583eab5ec0e
-EBUILD zentest-4.11.1.ebuild 803 BLAKE2B 23499c0b85a733d60d21ecd407c49a24b76168030c9357d57f3981af239ce8380911c3f501b7d2e16a6a76771a3808c1a30525427178f99d35828c6c5c05003e SHA512 8825098e7e587db6ac63c16503c06b7b236704d9c70f48b424e3a3d5ceb8cc9a09b972309ba1e00243c6b6c48255331f0379fe07043c6c6729f2ffedf2c2b470
+EBUILD zentest-4.11.1.ebuild 802 BLAKE2B 1f43da0be5ac4497a647e799de76cf5364bf9c8a557291798dac4ce01eb3776f925983e2ae705a4e2e5b78cbc941105f2f614aa6248efcbd2d3e1528a46efca3 SHA512 776b7d1876e2bbf24e5937fbad393a34b685a28f3b5ad944bddc15552efe08fe28ddb0b1d476eb2efb437c29b367f08b09bd43edaf9aacb2fbd41a9040879f4d
 MISC metadata.xml 333 BLAKE2B cf1ac3fbb6994dc96110bdb974b726f53fdfe34db473f272ba78ede47b65e26350b807bf291c65f8a8bcf9e12fc3366e431ca32a277d9ac38cf9d4ed7ea46e62 SHA512 d02fdcc6c8ef63d22d0df77a6c7c82ac1d629d29685e6fc653c70079d56fb1b28574bfc7c372a5298dd4a3e20061aecc705d6824c569ce0f99e3dea464f04fcb
diff --git a/dev-ruby/zentest/zentest-4.11.1.ebuild b/dev-ruby/zentest/zentest-4.11.1.ebuild
index 9032f1001987..546db06d651c 100644
--- a/dev-ruby/zentest/zentest-4.11.1.ebuild
+++ b/dev-ruby/zentest/zentest-4.11.1.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Testing tools: zentest, unit_diff, autotest, multiruby, and Test::R
 HOMEPAGE="https://github.com/seattlerb/zentest"
 LICENSE="Ruby"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
author	V3n3RiX <venerix@redcorelinux.org>	2018-08-25 07:36:27 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-08-25 07:36:27 +0100
commit	43793fab84041cfc5c60c0151d1591b8a69fb24a (patch)
tree	6208a7f4fc744684fce0f55acbb47511acace498 /dev-ruby
parent	28e3d252dc8ac8a5635206dfefe1cfe05058d1db (diff)