gentoo resync : 13.05.2018

19 files changed, 156 insertions, 67 deletions

diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index df75c178a9fc..7967c775d622 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 6b38e88a2bdd..5fb98edcd171 100644
--- a/dev-ruby/arel-helpers/Manifest
+++ b/dev-ruby/arel-helpers/Manifest
@@ -1,5 +1,7 @@
 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
 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 1c92e3921a7f96abe30fb5cb335f31f58ba6437d148b3123bb81fbffff65cc5805ed51cb9c2fee21e5729cfd0afe90c5176cf320d9af0a31955076020073d3c6 SHA512 7431750404f303b53794e6193112e3040c931867199d5f72164eea7bc26676c8cc48250b7e76e87076a801d345427fbf360a45a05b87a71011ef25b95cbc8c45
 MISC metadata.xml 344 BLAKE2B 3c7611e49af6a5fdfabda583dc91fbe8fc4b7943e774a938e100d91633b3a5c38cefab5973207c25d62a5b8b9e8e7c720b5614c083c8568e532e819bb747855f SHA512 2b4f9f6a7cd7aea5f161da441195d3138810930778d441f0c0d3620fc3de6632088d0d49135e7638553e83db723356184db1abaaf1622999adeec59883087c96
diff --git a/dev-ruby/arel-helpers/arel-helpers-2.7.0.ebuild b/dev-ruby/arel-helpers/arel-helpers-2.7.0.ebuild
new file mode 100644
index 000000000000..589f4b6b5d5c
--- /dev/null
+++ b/dev-ruby/arel-helpers/arel-helpers-2.7.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="ruby22 ruby23 ruby24"
+
+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/atomic/Manifest b/dev-ruby/atomic/Manifest
index a81f5d607832..26d6f38d13c7 100644
--- a/dev-ruby/atomic/Manifest
+++ b/dev-ruby/atomic/Manifest
@@ -1,5 +1,7 @@
 DIST atomic-1.1.100.gem 17920 BLAKE2B 47c96c49a572a6d6705b952e419e1a07f3b06de4e0235a4d9d98e6ff546c96aa9af69c39864107c6bec1ba7b92ca2a9ceef2cb5d5938c1c82f40973376920d6e SHA512 64c374b69b7ea8b7fc6aa3e189cb6ae3d4a9a214d410a83fa0ef464a55624792055c5e3e61adda3eff039aba604a0c1b710ba5304d33f27ae9cc6e421e8e1892
+DIST atomic-1.1.101.gem 17920 BLAKE2B 50f4efc215293e931380b6307231279b3c5ca055aa8082fee8575963a68b3d54262449bf45fb1a514dab18f53a1dd9e0467a0f7ac67dea7a45fcce09155721dd SHA512 59c82fa5ec984b7ecd97964ea075ea327511fd4e71cc5ac72d3fb573b777c9fb289f462d022ea1e0256b38dc369c9f7fa7a61b7af877bd06ec94252237111e8d
 DIST atomic-1.1.99.gem 17920 BLAKE2B 814406dc3e38a3ec882eb47e20e6153da9f68c4dd6ba3bc3d3869c0542754ba38678512872b25379b12d902ad6f740b1da974680867d492d2c4620091c5a32c9 SHA512 9c7762f6c32d11b2c5b45be68954ca12c753d2b4683167158a037ce791d72b13d940beef5bf6dd445c8b12e358c62d2a9f43a609fb3b7c7357fea4f66316063c
 EBUILD atomic-1.1.100.ebuild 772 BLAKE2B 20b30483123fe5e082f7f6e373e40b04693a5d4f232f956e186559c7fde98d9793ef8b6e293b924e324cc7a0c5370f16c767e056249681b1f75d9a7dfb7a79dd SHA512 7bd017d22401a6c9f5b56943bd9cb5fcb2e175d1f7d4bbb6ac997347c9bad88eba9e587a82d3f48b40030d1680fb47aa5ca763dedffe50b7a7c64362422330a7
+EBUILD atomic-1.1.101.ebuild 765 BLAKE2B d76d703aa8b152c0c6c6811fcef6899c1d3485fe75841be3fa5de325ef26b7c8b0c7c33a1bc3bc1ffe9a56e0a4a4270c0e10551e1967e43da83da5138902bd64 SHA512 8f736729201b93996305b5dd98a6ea15cb1f6c092db64878ddffe4fb689934fd6b27829c290a2eb4846008398547c1276ae74fa3f69a59b5af689007a2dd570c
 EBUILD atomic-1.1.99.ebuild 769 BLAKE2B 72539198e33799e07965a974e4e96afe6494e749380fa0fd3b9f34b4eae5bbf440b001087c58fc11c9dc222f3427e639e1bbf4afece065f8521fb3577e7d3b51 SHA512 6e33377ff01b28431bdac42ab33a879ef4bb894ede658e4525439dd32031f1594d4b719cf170a35ac153837fe47f083a116a5eecf911352a8c96ca73043f7e2d
 MISC metadata.xml 345 BLAKE2B 64598e451aa2d3e6225aed11977f43d379ad3d26c0f6366dfee9651544e3c4d565a342d61fd1a2f0d176a5cd0e5f97ad1ae5c1150d97a24ff3472e49eb30d446 SHA512 2fc1039a507f87fab12c537d790d538c6e9abada720edcf9de3748e5d81674f4803221ec940a7f3abc6b12f7c9ec009a2960d88e00b45caf2216a23263e03f8f
diff --git a/dev-ruby/atomic/atomic-1.1.101.ebuild b/dev-ruby/atomic/atomic-1.1.101.ebuild
new file mode 100644
index 000000000000..f4208b05803a
--- /dev/null
+++ b/dev-ruby/atomic/atomic-1.1.101.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="An atomic reference implementation for JRuby, Rubinius, and MRI"
+HOMEPAGE="https://github.com/headius/ruby-atomic"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+	# Avoid compilation dependencies since we compile directly.
+	sed -i -e '/:test => :compile/ s:^:#:' \
+		-e '/extensiontask/,/end/ s:^:#:' Rakefile || die
+}
+
+each_ruby_configure() {
+	${RUBY} -Cext extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake V=1 -Cext
+	cp ext/atomic_reference$(get_modname) lib/ || die
+}
diff --git a/dev-ruby/capybara/Manifest b/dev-ruby/capybara/Manifest
index 91682eafac29..e7eae277df56 100644
--- a/dev-ruby/capybara/Manifest
+++ b/dev-ruby/capybara/Manifest
@@ -1,11 +1,9 @@
-DIST capybara-2.14.4.gem 265728 BLAKE2B 7b61fc7424b5e5aeec50e0695ef7719d23b594d3fe233c04443c37a5f06b0f1e7c440135c50225813d9da954c2efa0563488668202e09a4e3877f28708f9624e SHA512 d3ebbd8d96e4d2026327b1c70ff723225ce052fff510a909111b8cc7e02b12fec9e00acddc0bc2565371cc5eb0b590abef43d42a99c3938a929ea25930fdefd1
 DIST capybara-2.16.1.gem 273408 BLAKE2B 1d1a68427fcfed9a8153e409e17fc043dd8d926c3ebbab3560ae12454f3010c8b4569348c231e807d993263940b703dc5380a235da438eb5ac2f9d0bd3a66309 SHA512 921e05111278b7bff93fe805a29e7b2e0e78b36510db5dff1189e34c3cdeada52504a8e06534238e578c32e8e0efa8d99a0ffc8516d94e60c06e7fd2c4ecb174
 DIST capybara-2.18.0.gem 274432 BLAKE2B 992799362025b81a0d074fb06fdafef4c4385ca18ea85a7095d9e58625df6a59a349b60b462c5c4f403a6af955466bc46d82be6cd91724fc2b12cbe15ed74a4c SHA512 3bb994e022593d485a07296193a16cae7b45e96e87dd10b2bd4807ad2bc990801044c0493360598d1626c3e367e8de87e407f65c2c6f42674d5f1b9c0b5c1933
-DIST capybara-3.0.2.gem 275456 BLAKE2B bcf2049193062b7d16e811807faf629379bc5a94bba771d442e9680e727d765703ad4c6cf8abd9d0bb22d1971f07d897f0fc8a572182302528961fcfe8b186fb SHA512 5f2611238a58184dcd57a5ca2fff786d4ecfdbb51815c3f6afdcabbb85087baf87fc601d1506a6b880d42af32e06a62e7757b1abf455325718258d3072616a49
 DIST capybara-3.0.3.gem 276480 BLAKE2B a1aa8e8ccc3846c87bdc989f456fdd0c09f41b2939cfe322faa6ae478bacdd1d6b4b13dba55fc74edd50fcfe28eb59eb8a2add8e3fc5ba948bcf8365c0ffbb96 SHA512 7af6c04304f3308322ec374d226b6cd874ba2068be5451da482a6bd2861e404b580e4c74604f0873cd91a52f1d95117efdf850cf19eb9c6265715cff5d503c47
-EBUILD capybara-2.14.4-r1.ebuild 1512 BLAKE2B 41759ee7879a50f7b270ad9fdfbb459b51c12b2ac6b5eff8613c9bc73c2f71f02a617056a70cb933fef7f0f4e9dd1f8f7313755a4660256343234e100496ee31 SHA512 4a6543d94133e2b0225e2bd4e031625aa58395b9293d67a6cfd9119e089b0b58c9010ee9442d8fe5afd3b99861745608c05e9f028bc0c0767cb09d44528b74b0
-EBUILD capybara-2.16.1.ebuild 1504 BLAKE2B 22cf066a75150f50d23c3761474076dcb9ca07381148aee813b0b3ff36d102a2bf316f3ecd1872306960eabbee179a4af1e136f2b98ae775eeae6d57b76400cf SHA512 c2fab8431816750ce63411a95333916c90fc50003df9cb2d47ba2a8964eb168edaad8bfb487db65daf0472fa598ea0e07e57f2a6b9cf266dba4d3450833b5799
-EBUILD capybara-2.18.0.ebuild 1521 BLAKE2B b2f2b42361100abf4384fc7dfd84d8588dd1ba261fbf14131eb8e8992c0896c7c3bafccfe3dca94c721a1b3cdfdfcab846e14cc85b893d532034e4962058abda SHA512 5d05806094a5ec44d86e5d4fac07b29e16280f2e0da6fd06436fa08dbd966eb18b5771c82981fdd34332e67f145654fad64532fa8d734dbe6498a3e705d6cc92
-EBUILD capybara-3.0.2.ebuild 1514 BLAKE2B 3a79eaa4545b934de0d9fa8396e0d18c858ffb590b2a531e2d2b93864bebe43ecd0c449919e4ac96f5b754bc8e083a7adf7b805ac7be04f8fba5c0e8902a9d4e SHA512 bde7046cc60a57c245493938e937edb919c203aa13ff026c9d00b5eccac6a27a933f9f25a2c0fb6e956581091f7d958814296c0a415ee4fa9b6c7557e0571bae
-EBUILD capybara-3.0.3.ebuild 1507 BLAKE2B 835ae3c657427950f700cb405d406c17bd1a61e91268d34e0ebc530df5c423421506866a79e5cc54b272c74e36b41dc706dadb1757ccfce1a12abe4475425de3 SHA512 4eed108a9869d34373fff303af1f2cbc077a442d9c356d954bcdc0c1eddf15a88283d7be978f13adf59605c658283261957abe44ff279efd9728b3ce64b90bac
+DIST capybara-3.1.0.gem 282112 BLAKE2B 71b275c548e3327dcbad779d48563b6784cbfcc0e5c3ba5fa478488ef90276bab1aeeaecd229255047cd23e01be6923c68c1f753b9d76d3428cc0ce75ff3ede3 SHA512 64c7a22eb8d566b245084e7b95d79dec2c72162e003418c0367a46e1072ad83569e97702f61f9a87f996160a62df3a653543d33878c6d3a46ebc2c286fcfbfd7
+EBUILD capybara-2.16.1.ebuild 1509 BLAKE2B 8ff52d1240388337ea4eefc688caeddcb53f0c589ffc50d2cddfec130e6702b5ae3bee7ae8ca0dfd8c672867ecfb0347aa37e6961f3dbf185145600e493e0276 SHA512 2b9160aa85c4ac67c1756b385e3bd98951b83e114ea390d0c0243ddae60dfc0a56ad1126a841768c1956641be68c76b935f633509791aa1c07ddc1172cc66987
+EBUILD capybara-2.18.0.ebuild 1526 BLAKE2B 99b7a69cd33a583dec71b53e30483164ef4af7a3ddf30e2c0da933f727a3c43b8afa79f2fcc5d872ef2142e9392197804638d29f1c43f1b81cc6ad9e07c9a503 SHA512 65bb91eb8187990a85c58a4514c181bb5643c6a7219421e800934c80b5ed58951d3adc49e8bce0a9e1d63eb3082e54db1beb0b433b0da80ea009198dd79dc1d5
+EBUILD capybara-3.0.3.ebuild 1512 BLAKE2B d8c1dc1208dd7c7aedeb2f48ccaeb190dac1451e60feba70bd2cce2b3e7425f1179716e02792ecaf27b9301c560821d8bc322d2c56a5a92c3032f94303c5e268 SHA512 9f96398cd632b4b2aa5386d84c19bffc3c22cd416178e516a755412c9ecb75287dc089d88925354a6f6d1bae5d5109b4c0831b3b6edf3615deed6253aeb595bb
+EBUILD capybara-3.1.0.ebuild 1512 BLAKE2B d8c1dc1208dd7c7aedeb2f48ccaeb190dac1451e60feba70bd2cce2b3e7425f1179716e02792ecaf27b9301c560821d8bc322d2c56a5a92c3032f94303c5e268 SHA512 9f96398cd632b4b2aa5386d84c19bffc3c22cd416178e516a755412c9ecb75287dc089d88925354a6f6d1bae5d5109b4c0831b3b6edf3615deed6253aeb595bb
 MISC metadata.xml 343 BLAKE2B 93caed6f938d8f2c10a7106e7377812064351018521cbb63477340af9531c5c67940097580c5f7610cea03b0dde6853c9fcbe9ab8cf5daa2a49018b8888e20fc SHA512 1e526463690f3ff61390ed77cb528352bdd1c089b368c3f6ab587766d81167afe99f752b861233f755e10bf2aa6f09dde98a9dc359d51392f15b55462ba66e77
diff --git a/dev-ruby/capybara/capybara-2.14.4-r1.ebuild b/dev-ruby/capybara/capybara-2.14.4-r1.ebuild
deleted file mode 100644
index 1826bfca2aec..000000000000
--- a/dev-ruby/capybara/capybara-2.14.4-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_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 ~arm ~arm64 ~hppa"
-SLOT="2"
-IUSE="test"
-
-DEPEND="${DEPEND} test? ( www-client/firefox )"
-
-ruby_add_bdepend "test? ( dev-ruby/rspec:3 dev-ruby/launchy >=dev-ruby/selenium-webdriver-2.0 dev-ruby/sinatra )"
-
-ruby_add_rdepend "
-	dev-ruby/addressable
-	>=dev-ruby/mime-types-1.16:*
-	>=dev-ruby/nokogiri-1.3.3
-	>=dev-ruby/rack-1.0.0:*
-	>=dev-ruby/rack-test-0.5.4
-	>=dev-ruby/xpath-2.0.0:2"
-
-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 '/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/capybara/capybara-2.16.1.ebuild b/dev-ruby/capybara/capybara-2.16.1.ebuild
index 4e09c2a00cb4..dbb9a2ddae2c 100644
--- a/dev-ruby/capybara/capybara-2.16.1.ebuild
+++ b/dev-ruby/capybara/capybara-2.16.1.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Capybara aims to simplify the process of integration testing Rack a
 HOMEPAGE="https://github.com/jnicklas/capybara"
 LICENSE="MIT"
 
-KEYWORDS="amd64 ~arm64 ~hppa ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~x86"
 SLOT="2"
 IUSE="test"
 
diff --git a/dev-ruby/capybara/capybara-2.18.0.ebuild b/dev-ruby/capybara/capybara-2.18.0.ebuild
index e1d9d1221659..59f068429047 100644
--- a/dev-ruby/capybara/capybara-2.18.0.ebuild
+++ b/dev-ruby/capybara/capybara-2.18.0.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Capybara aims to simplify the process of integration testing Rack a
 HOMEPAGE="https://github.com/jnicklas/capybara"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm64 ~hppa ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
 SLOT="2"
 IUSE="test"
 
diff --git a/dev-ruby/capybara/capybara-3.0.3.ebuild b/dev-ruby/capybara/capybara-3.0.3.ebuild
index d9c1c90896ed..0ff180fb058e 100644
--- a/dev-ruby/capybara/capybara-3.0.3.ebuild
+++ b/dev-ruby/capybara/capybara-3.0.3.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Capybara aims to simplify the process of integration testing Rack a
 HOMEPAGE="https://github.com/jnicklas/capybara"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm64 ~hppa ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
 SLOT="3"
 IUSE="test"
 
diff --git a/dev-ruby/capybara/capybara-3.0.2.ebuild b/dev-ruby/capybara/capybara-3.1.0.ebuild
index dd698f232a22..0ff180fb058e 100644
--- a/dev-ruby/capybara/capybara-3.0.2.ebuild
+++ b/dev-ruby/capybara/capybara-3.1.0.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_EXTRADOC="History.md README.md"
 
@@ -16,7 +16,7 @@ DESCRIPTION="Capybara aims to simplify the process of integration testing Rack a
 HOMEPAGE="https://github.com/jnicklas/capybara"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm64 ~hppa ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
 SLOT="3"
 IUSE="test"
 
@@ -30,7 +30,7 @@ ruby_add_rdepend "
 	>=dev-ruby/nokogiri-1.8:0
 	>=dev-ruby/rack-1.6.0:*
 	>=dev-ruby/rack-test-0.6.3:*
-	|| ( dev-ruby/xpath:3 )"
+	dev-ruby/xpath:3"
 
 all_ruby_prepare() {
 	sed -i -e '/bundler/d' -e '/pry/d' -e '1igem "sinatra"' spec/spec_helper.rb || die
diff --git a/dev-ruby/net-scp/Manifest b/dev-ruby/net-scp/Manifest
index 159da1ec7d62..4d77b26b056f 100644
--- a/dev-ruby/net-scp/Manifest
+++ b/dev-ruby/net-scp/Manifest
@@ -8,5 +8,5 @@ AUX net-scp-1.2.1-raise-correct-errors.patch 3046 BLAKE2B aa0e36edfdc85c944d3ba3
 DIST net-scp-1.1.2.gem 32256 BLAKE2B f855903ce626b370d9fedd9bf7ec4a39898fd2188b09b7dd7d537c92ec21e5f2ff25cfa06af934fecf9aa99e95924d8c3ba9acc8aacf87fe07a1f37a372f862b SHA512 5ba49a994a816b54aee32b5c3e708bed69fc22d7e688f60e93a1e2d29d086ed17f3685ea819d5db23a27abf8ba64fbd418204e1a1702fb0d2702607016febc09
 DIST net-scp-1.2.1.gem 32768 BLAKE2B 67abf0b66aa6e8f28bdfa314a20f594eedafc5aeaf5d0ae8884cb7e27203699a791623968da98aaebda1630d47bf5859cc3e38875fe17dc8c7ce7926b50848a5 SHA512 64645a4517d6e408e3acfdb24576c8ded3b6ff981035ca10a2e081f9e3ab093f97b4848da4acca03ade364483766677e31296d09a31db4c81eb40123fc966829
 EBUILD net-scp-1.1.2-r1.ebuild 713 BLAKE2B 773b45ca7b3693804b11aba0a7affc3d87af112d9520103dc867994e4cf42c5696ae816caaaef6f7a7fc7d0316d692f64c29ab04d69b1b652db6fe641ae1e811 SHA512 684a857564e9c34ccd91586b5824c3d123b7f259892af320f693eaa72dd7cf09a41cf16547fc0b3d64c7ddfa84315334dfa03dda50f26c0ce8af3f85ac4c3d18
-EBUILD net-scp-1.2.1-r1.ebuild 1067 BLAKE2B d3798e26c7cd8d1b6a2b98da583a5f9ae61cf81350083de593244041a9d5496cf827db29d49f820e689d3b52bfe29933d1f40369e51cbe42ccca1750b9b1a9c6 SHA512 e35c2d81231bf1ce23fc50719ebd72332bc4ea436a20f7b199f4a17e7d1e94e3a373e269b879a9aec497ccac158eb42dcfa4e2e2e09c0da7550ef44f9291cedc
+EBUILD net-scp-1.2.1-r1.ebuild 1067 BLAKE2B 294191a95549126cafb3f1a149042223853f45d24444c93aefd60b0aa0b80fb52bdbbb1bd1d55fb0e70fdfc8b79790c1dda23bb55327e6dbcc8ba1943ba80781 SHA512 5ff115becd5e667c795f1cab5e586dee4c14d450ba5c6edecb4a461d0909d93748d165fba11e0cfc06a8688fc66a88656cb4b2cab552d7cfd3b3fe86832e8fb9
 MISC metadata.xml 341 BLAKE2B aec6f820a216a818e7f6a82ffe48f73a01cc662d9a5e10a5dee98885f564560644e377158ccd5c4cb6e914205fa5aa6753aaf5dcd52e1849437955553f3c268c SHA512 bbb71a6668f329ca9b1f5636aa71720a8234a7683fe374b2fde4113ff56d3a5c2242bcba7e3023090a7955870715e0040d990326942def6d3be7e31d5f07d39c
diff --git a/dev-ruby/net-scp/net-scp-1.2.1-r1.ebuild b/dev-ruby/net-scp/net-scp-1.2.1-r1.ebuild
index 7d87c621ddfd..b0d5247366d6 100644
--- a/dev-ruby/net-scp/net-scp-1.2.1-r1.ebuild
+++ b/dev-ruby/net-scp/net-scp-1.2.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGES.txt README.rdoc"
 
diff --git a/dev-ruby/net-sftp/Manifest b/dev-ruby/net-sftp/Manifest
index 9399793fac67..fa8f5a54f635 100644
--- a/dev-ruby/net-sftp/Manifest
+++ b/dev-ruby/net-sftp/Manifest
@@ -1,4 +1,4 @@
 AUX net-sftp-2.1.2-net-ssh-4.patch 1628 BLAKE2B 1dc8caef775ca06c80f485732acdceeedc10aaa96e33c1c6c59ce5e1596a71a229aecb06092b3a265288ae46469d1c72b4a0de8ec3d50cba5fe0947158c3181e SHA512 dc4e99f13e32698bbcfe1b07e2ec4baa1ed9beec5bc3816c016f26b053f7134bb9646dc538a0d03f2f3bda4d8d51d9742a5be54dfc6f9340cf2861e296492855
 DIST net-sftp-2.1.2.gem 67584 BLAKE2B 6b8e15f42c7a18f8c9aa7118e5822281eda6505c34697282cc9c52375ea0e4042f3045f41c2e9a15b8fd20f02946bfe6f3ad557aa5859a8e54e4c0ae8bd1d53d SHA512 126a9537a4ac45150096db4d46ad19e0d8a1833fef3733a1b66ff01463c0d109415f0ef807706ff88be8c5c1395bbd4620e529f06e3c9f746a4ed6ec2cb7d18d
-EBUILD net-sftp-2.1.2-r2.ebuild 631 BLAKE2B 04775b002345417596c5da23372f04fbe74ee751a85659bec14fbc05178ea094a5b018309141ef92f6d4127353a396ad19d09d52cfde5eaecd3fec75bffef09d SHA512 38fbf6a9c76ee34c4967dd35e98842f7fd9e5756b1754fac19d0e74f2f826cb1417a79812c4a8ebbe34655f7e5ad4b56c937c776b513251c3a619828acaa4cf3
+EBUILD net-sftp-2.1.2-r2.ebuild 631 BLAKE2B 2764604b8f672ba8872562d2bf3d222e178524a3bebe9392756b3120d1e678dbd52f1132906336f4b65759952ade96a618e3489e596610044416c436620100ee SHA512 fefec81401b222a1ac0c2de830f85176c0a86288bf784778024e271f272204c6cc32e256c4642ed9eb34923ae4786e290b3b324eb4003d4005963e9ecc7f6745
 MISC metadata.xml 342 BLAKE2B b52478d886842e044705cc42c177577f111b2c01140b58d322107ecaf20bc1b5db9763ec0f0e67397118515690f452b51c1e14dcf6bada17d7c5f18889571b07 SHA512 3ece29fffeee2912d0bc06514adca69c2bdfa95bd88173d4f42cf0aee00944adc71bfaec6df543f0c1fc1717b7a808459f30894977154f7acce289dfb491f6d9
diff --git a/dev-ruby/net-sftp/net-sftp-2.1.2-r2.ebuild b/dev-ruby/net-sftp/net-sftp-2.1.2-r2.ebuild
index 355c2a819361..1b64cc80e4ea 100644
--- a/dev-ruby/net-sftp/net-sftp-2.1.2-r2.ebuild
+++ b/dev-ruby/net-sftp/net-sftp-2.1.2-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGES.txt README.rdoc"
 
diff --git a/dev-ruby/selenium-webdriver/Manifest b/dev-ruby/selenium-webdriver/Manifest
index 2813134d390c..f1ddeac4c27a 100644
--- a/dev-ruby/selenium-webdriver/Manifest
+++ b/dev-ruby/selenium-webdriver/Manifest
@@ -1,9 +1,11 @@
 DIST selenium-webdriver-2.53.4.gem 897536 BLAKE2B 630b5e8cd5ce53de7a689135ce80e364e33b783bd8493f79af01d79717d3d65541fe04c6c0e5016a85af8a559864ddcb641d06c99430599b21095b54ff40845a SHA512 ad7934a67c4415a81c2d0efae5f510d41784411076ea903724e1fa2be1b209382131aa1b05f3636deb1deca38db6e76805262f5037ab2e621e785e4eb3c2b90e
 DIST selenium-webdriver-3.10.0.gem 841728 BLAKE2B fb36121b835c7750595cd57c3217c234e12d9f78a29131a12148f464955b1bc3f5a9ef96b6bd8f8aaedd0fa9943bcc42c1f83a0d31ec6663664f6c4f0102b5a3 SHA512 ee1ccad5661f06b16c106b2515285f763baf2b66aefe4c20aed0521e602997af8b1b12640b1099ad0a64f18b01bcec7824dcdd20fe36d9176337f177b8417b2b
 DIST selenium-webdriver-3.11.0.gem 841728 BLAKE2B b3f069645fb166258aebb0f04c8d3f828413b2a1e2f818b7501118760ba79e812ce7d314b21076076f1e6c30590e0d38f026b32ede63ff08197c8f8fbaaefded SHA512 85488c257772a4628d19bd71e7993a82c2c5a9f6332d591b19507ca5e2a96c03fa5c351714a492915888510728f2e5eca28862c69e1ced43d8b56db128d7705e
+DIST selenium-webdriver-3.12.0.gem 843264 BLAKE2B f9a2e233658e071144f153f7710ec15cd58d8831793f7212d1d49a76d08d80c7110bcf1afc86e98210c6753d19ab2c63f169754f148db8a994fb777048c10b6d SHA512 1d5a510e3e7775c6b8c960de8a5f0ae2084f490c17084e8ba0894dc32021c9295c9301c6bf0ba07e0e9827a8d99ac9f9c5d29fbf57425a076825fe18e4a8f88f
 DIST selenium-webdriver-3.8.0.gem 840192 BLAKE2B 3f3871afed9734627757e58a211ad894fd45a49b73208b533fd39e0d99172536e7f2abdfbed1e0589c45aac6a26dd0c1ae0cf8f25053d44082957f7d07591d37 SHA512 c00c44786ecee4c02723b88c9ae5921d6a3f2d4c6c3bd043da1f524692c75a69357b752fc183c7881de0d0a6e6d6ddb03ca31e6a983afacdd06978bdd0797957
 EBUILD selenium-webdriver-2.53.4-r1.ebuild 1137 BLAKE2B c1686329733f5253efee815896b641a422b510d00ce379c14d87a68c487556bf64b0771dc73097bc483dd796e3e890c5fe74e6e4fa296e2a20b60ec8eac3ad7b SHA512 fd3f0c87afd1924a40ebf80ef783414cb6fc256db64e710b922e4b2834cefc2974d11e8a6c037b1d426f867459b4cf90a922f2a8c38ce0a1d426ccc990d1d268
 EBUILD selenium-webdriver-3.10.0.ebuild 909 BLAKE2B d2e55036612eec131dc8c2cb72c1c6f0c3a9aff238d1e3a5fe046a4d177ecf5ffbde9515f6a6fec35fa8dc4bb7175e3a095ad876747da479eff1ade787f76d4a SHA512 1b819c22107caeaba16bfd5f6c326dab4e933602ac5f4e5c3546c8a9051d6698594f3af0ed731f3cd163caafc368dda501169a0d95e9d8ba5d2c939d63f130f5
 EBUILD selenium-webdriver-3.11.0.ebuild 910 BLAKE2B 5e54683c36cf1ad30ea7df577abc0dbdb479ba95444e24fce04d82a43798a7ae90d229b7516fe839fab0d7f048e30a95e785f002100921688312324df783dc01 SHA512 f520e1491c92e14b92340e84f09ebd4b017d161e8adb6681ead3922dc82644a41b67ab0134c0616b9c2a475985a1e9d816e5a4b7ba1e3eafa8b9ad053775444e
+EBUILD selenium-webdriver-3.12.0.ebuild 910 BLAKE2B 5e54683c36cf1ad30ea7df577abc0dbdb479ba95444e24fce04d82a43798a7ae90d229b7516fe839fab0d7f048e30a95e785f002100921688312324df783dc01 SHA512 f520e1491c92e14b92340e84f09ebd4b017d161e8adb6681ead3922dc82644a41b67ab0134c0616b9c2a475985a1e9d816e5a4b7ba1e3eafa8b9ad053775444e
 EBUILD selenium-webdriver-3.8.0.ebuild 903 BLAKE2B 6fcc42a6fcc196f662bcc1eba11a627c5e5add3d1f76cd3cdfdec1f451c6ba21b1eb07527a39edbbb386984e502ca749ea4dd9f14afe97902ff7f0e6cd0dabf5 SHA512 753b1db1cd486886846531b97fb0d0fcb08eafcdbe86bf960fe08471feb301d655460e110cf809a204bc3ac3068a1b39f96bf4c180b50408b3c9ab220747510b
 MISC metadata.xml 335 BLAKE2B 374e7e6bdf450e60792ad3960c2c0fe8ab87f70c34ca76332bbbc632598354e2a774e4eba46434e9b7c85c7f5eee7086ac85268ae58bddea7d75713d9d2f014a SHA512 94e17dd297f6904f1b70709dba5f5612fcc42e9e0e57695df6d37344cc9a89c13b423e41d142631444990ff39367eb6132d6b070bcdbf256ae00e932cadc67e2
diff --git a/dev-ruby/selenium-webdriver/selenium-webdriver-3.12.0.ebuild b/dev-ruby/selenium-webdriver/selenium-webdriver-3.12.0.ebuild
new file mode 100644
index 000000000000..eb794075ddf1
--- /dev/null
+++ b/dev-ruby/selenium-webdriver/selenium-webdriver-3.12.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"
+
+# NOTE: this package contains precompiled code. It appears that all
+# source code can be found at https://code.google.com/p/selenium/ but the
+# repository is not organized in a way so that we can easily rebuild the
+# suited shared object. We'll just try our luck with the precompiled
+# objects for now.
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_QA_ALLOWED_LIBS="x_ignore_nofocus.so"
+QA_PREBUILT="*/x_ignore_nofocus.so"
+
+inherit ruby-fakegem
+
+DESCRIPTION="This gem provides Ruby bindings for WebDriver"
+HOMEPAGE="https://github.com/seleniumhq/selenium"
+
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/childprocess-0.5.0
+	>=dev-ruby/rubyzip-1.2:1"
diff --git a/dev-ruby/test-unit/Manifest b/dev-ruby/test-unit/Manifest
index 79100a696242..770f6295a107 100644
--- a/dev-ruby/test-unit/Manifest
+++ b/dev-ruby/test-unit/Manifest
@@ -2,6 +2,8 @@ AUX testrb 177 BLAKE2B 7f0192ddcadda449bc4766d5910c76ef21ff8cadce1372a46db4fc236
 AUX testrb-3 183 BLAKE2B 5bd4712b7a73cc480669facf537b5bbeaf16eeae2782e21d5fe88cf92c9945845803d3f1611d465a3fc16f76838b5aba964e9b96eae35d9cef1b0b269bb94e2d SHA512 cff9584c54bb682f03a0253df953ea930053642e249a3c4573e34cc78f4b77ef943ca5a2c7d1869d926b4a8d9e173ebece69169d845724b03c03f00608bdbdfb
 DIST test-unit-3.1.9.gem 124416 BLAKE2B f1c88d9e7da576babaa979a57eb522a244856711d013f0bc38ffb3f04d2b290eeaa50fde14078cedf1d86e26ebf12061ed03b9b82a2d9365a0c61796ef25eb72 SHA512 ec3068db7faceb5c6a3f3a848512aa76ec2e360a2a1ca7ec45fd6c1b84f45f04fb1b4d77120dfde7b0a41e4a8435fa37ba6550e4242e3817d344b3ca8d7b4428
 DIST test-unit-3.2.7.gem 129024 BLAKE2B 31565510d5a16cf75706810a551dca40129edb0fc1528b9f55c862b23db1986640f42a72432028f47d052bb1aab3600c90c4ed19388ba11f2221a5d1e0619aaf SHA512 a55a5abee0d602b23af34ee8a9a7e26effc95ce9dd8ce98da28c49caf883d47c86bd2d0979176b0d1e239861ea73a4c5a9a280a1ceda7fbfbbd98c888ca6b01e
+DIST test-unit-3.2.8.gem 129536 BLAKE2B ee88fc653b0dc0cad7d88427391cd6a476d2d3c56c3e4bfa7e7cac28d6e9a35663c40e9c4ed29a1d5998255c434ab7884177354fd1e68b07f00fe1e0048506d6 SHA512 b7ed21744118036a997525251af2520158282ca19e99ebccaa7180361a112e0cdafaf570c36126a6b74b8480405c67aaa5394e06465145583964defb68abeb9c
 EBUILD test-unit-3.1.9.ebuild 876 BLAKE2B 7f5334600e70cccd7e83c6c13e42f42b9bb364a9d51d8898270eecc965e178062fbe6498325828b6dc6fc7b081b8e5e1d9428d87c0865f2d317b8c486826a329 SHA512 ec68f762c63e6915340d70423d335c8e26c33d4f7f1a9f859afcaa2af98b8926d364b3baf5a9f3f97f8ec730c3a143d0cb8ae0df5568346494299fb6a5535d3c
 EBUILD test-unit-3.2.7.ebuild 947 BLAKE2B db0960f98ff412d217ff6a3a675038a44fea76366384bdd020e583d6e21c3ab6135fa0cf35a319a68ec8cce4c473278b957188954aab15cb799c7323aed07c5e SHA512 f4db8463e398dd4917f6e54b8c4f2ad170a37a24670974bb96ee3c041ffee9128e4f732d8d3bfec53aa5c29b61f0905a8f86b853238653dea955595914e3ff37
+EBUILD test-unit-3.2.8.ebuild 940 BLAKE2B 3a4b1607379fd7e3b994aa59eabf32685fbe26f8923419c55a9adc96847d41ddaee119157a920a3219e5dcc733af65d9172fc081e90d09190e1dd89010fa9bf3 SHA512 a0477a944bc3d03b9cc7ab8a3e540408e6e8bb828d22a033e51271d13d8ed4a34902f74bbf40ef5b8bca29eb4107301f7315bc1d28a0cb4289b4aa2b42a70438
 MISC metadata.xml 491 BLAKE2B 9bef2b6085dbc82d562f091ae4e136cb7aa0817369b257f77bad4aca6faba4074d4dc70134999f81ea612f70f98c072414e1a92878d349e940df8ad0811304e1 SHA512 ef28e88bb4b269eeaf05f0bb512a6cdd73750247b60c2b4ba6c5b2abdb7b2e946c07bb42e7d6416f30f864378c3fa51b86455be2d3ea4467936602d5742a66b6
diff --git a/dev-ruby/test-unit/test-unit-3.2.8.ebuild b/dev-ruby/test-unit/test-unit-3.2.8.ebuild
new file mode 100644
index 000000000000..7f18be10d542
--- /dev/null
+++ b/dev-ruby/test-unit/test-unit-3.2.8.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 doc-install/text/*.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An xUnit family unit testing framework for Ruby"
+HOMEPAGE="https://rubygems.org/gems/test-unit"
+
+LICENSE="|| ( Ruby GPL-2 ) PSF-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc test"
+
+ruby_add_rdepend "dev-ruby/power_assert"
+
+all_ruby_prepare() {
+	mv doc doc-install || die "moving doc directory out of the way failed"
+}
+
+each_ruby_test() {
+	${RUBY} test/run-test.rb || die "testsuite failed"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	newbin "${FILESDIR}"/testrb-3 testrb-2
+}