gentoo resync : 10.01.2018

22 files changed, 89 insertions, 79 deletions

diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 673e840a0a49..02790ad93b3f 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/backports/Manifest b/dev-ruby/backports/Manifest
index 54559156041c..fc42799345e4 100644
--- a/dev-ruby/backports/Manifest
+++ b/dev-ruby/backports/Manifest
@@ -1,3 +1,3 @@
 DIST backports-3.8.0.gem 146944 BLAKE2B 20798893f692d69cdf39d64f1f5568bb74780875ca9c6a36e788ea44c46d133aa954f2882b3802a2c483ee486d1ea3ef968db397914191273978e40ac1ae0bda SHA512 898472ee88dd0df46067de12ef38bb033b270573ff09db99982336b9eb264c90003e6e150101f7fc0034998961d81eac7b2f72e1e843e0a7e683b6b98980153f
-EBUILD backports-3.8.0.ebuild 624 BLAKE2B 115028fb7bd1ee5d07c220784461ef5294fbda88fafa2de05e73ea73b2a09e934c2f4395b6e289054df9a96470fbb9480200e81488524eeac96f1899a6cd64b2 SHA512 1e8919ff112ae17c4f6b8848d97bf2e562777d93e1baf97dcfa458029683dc659757af4842891e5a7a33d6210415b9bb2823eb6a7346feba8a01df7692c442c4
+EBUILD backports-3.8.0.ebuild 629 BLAKE2B f8536f670fd6c9dd1799e4b8f3ece0f65a78a629a2c4748e4dc7c418bc22fa949cb786bc5c6f844fd1508774cf1b6babb273215053683821b2fc0ae167a2dd83 SHA512 79e312f7c9f8e23b55d36636302d7eaa06a95c1c33c4307b8f59c12848fdf3a8c87b69892d781701c2040cd471c5efa5cdf586d7800598c6b48fe84a58217d51
 MISC metadata.xml 335 BLAKE2B 23e6e33c417bb055592549fdd07fd02a2d97b613095e42248f501ee6ea71e3d4b2a2e25796060d3448900ba0d2fe66d0c44307be97b89834711ed153751126c3 SHA512 2850da756cf7d97e70667e06587ab9a37869e4a77417c12386edff4ab09d380641a4573a7ecaa6eec5809fe85106ca53844b4b25fbeb6cef8e451fef2803ae19
diff --git a/dev-ruby/backports/backports-3.8.0.ebuild b/dev-ruby/backports/backports-3.8.0.ebuild
index e93f54a76419..68b2f9553c13 100644
--- a/dev-ruby/backports/backports-3.8.0.ebuild
+++ b/dev-ruby/backports/backports-3.8.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/marcandre/backports"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~x86"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/fast_gettext/Manifest b/dev-ruby/fast_gettext/Manifest
index c2e02ee932be..c390d288c71f 100644
--- a/dev-ruby/fast_gettext/Manifest
+++ b/dev-ruby/fast_gettext/Manifest
@@ -1,5 +1,5 @@
 DIST fast_gettext-1.5.1.tar.gz 88259 BLAKE2B 75f9875e7a51d28a16d2acb690dfebe97bb0ac64a715b91348537b15c52643c2f08e5597cc135a95e66a0d4d87445ba40ba98b7c08f70a33cdae873c1e4d1e7f SHA512 44b6531d3a50982f2eee5f6154fd716411d85fcc19750781596253af1e841852f0178f2a735ba3d3d45a037c8204de18c6b1390d1e9e2bdd7b3f895eb740ccff
 DIST fast_gettext-1.6.0.tar.gz 88780 BLAKE2B 237a37bf505fe7520a25c6014f0524201905f8cf112624370477229db2d06f7160bad62e42878688ef954a1b72166e21a7f3a89de66c21aec780749fb26cd8bb SHA512 0f26cf8bd8a2078631d32be14fb6bd194dc9bd8a6727a355f4d2978441c972785747063ec4d8b8b1d4c78f07914a8b6cccf37ed85a37e7833bfe724d1d159ae9
-EBUILD fast_gettext-1.5.1.ebuild 2003 BLAKE2B 14c3ff752a79bcdd02eff9682926c2b394b3897196d24dc99b7f031533eb970d3df70a0812318e62409289302afa67a11d51096d7bd154980a1d0b8a90e46905 SHA512 837101297baf39e349c88d429c84b1a75b6c0a25716343aa6d13f17e5988da09c5794800f3723e97e25cd4665c6806408312a82c141198f4a6565eb30ec8b69a
-EBUILD fast_gettext-1.6.0.ebuild 1996 BLAKE2B 65f896c261ffbc576cd97ef9035b0bcb006f254ea4aa3b38c7fcc0dcf8845edd489742ff6b1214044bfa16aa424a2903da79dfa6f280ab84a0e76712fb54ef6b SHA512 8693641577b36d49ea074b67772d8c47148bc1108294bfddf49e6a6a513c276532f3a42a710a007703dd8e75172accaf4c5a173eec1bde6170f716f740eec964
+EBUILD fast_gettext-1.5.1.ebuild 2008 BLAKE2B e0953a472cd365132247593266e68c518dbb3f641149bb91cd0ebb2318112f3b546f588af9796b360d00a13b70e3e94915be6694aa3a9ae6354d10eee118024a SHA512 976a0488c1d6be4d2f486d84453b1bb065e37c581901742fb50d8a7835aa459751d639efc2d6bf70fe93d1e8620ebdac0de8ce8ed10a0ed809066e29d58d05f2
+EBUILD fast_gettext-1.6.0.ebuild 2001 BLAKE2B 64bf236de1762fa83cec2adbf12b1677111c32287c5f82aebaf6bf417ca87e277b056b2b6bd6632b71100b6622b6691b7887ea7afd12291b43c509b13f769147 SHA512 958310685e6c50961a239452bc8250ec3eab031b2abc792cf87f561b1fa140458d57605a990bc1f0657dc147cd8a47bd4fb1e4c2c996df1de2768b68af2386c6
 MISC metadata.xml 346 BLAKE2B 93a39aacb63cc0db79f126c108547c24dd182711584ef61c481b762a35f96cbee330ee29baea8d063e6f2ea2fc0491e572b860156f14be164ab29131a8f047a2 SHA512 1b57982213ae99ae1dc5ea06240bf81f7719f3cc576926de6a0d308f26895236eaa9b3312157eb5af3e47893787c9260e4386988a6f156c9a8b660aae85007ce
diff --git a/dev-ruby/fast_gettext/fast_gettext-1.5.1.ebuild b/dev-ruby/fast_gettext/fast_gettext-1.5.1.ebuild
index 3d4d021b73e7..543d28b46926 100644
--- a/dev-ruby/fast_gettext/fast_gettext-1.5.1.ebuild
+++ b/dev-ruby/fast_gettext/fast_gettext-1.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/grosser/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/bundler )"
diff --git a/dev-ruby/fast_gettext/fast_gettext-1.6.0.ebuild b/dev-ruby/fast_gettext/fast_gettext-1.6.0.ebuild
index 4b5fa5b3bc0f..34316295306f 100644
--- a/dev-ruby/fast_gettext/fast_gettext-1.6.0.ebuild
+++ b/dev-ruby/fast_gettext/fast_gettext-1.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/grosser/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/bundler )"
diff --git a/dev-ruby/flog/Manifest b/dev-ruby/flog/Manifest
index 079b32606b50..8f25b0f67445 100644
--- a/dev-ruby/flog/Manifest
+++ b/dev-ruby/flog/Manifest
@@ -1,5 +1,3 @@
-DIST flog-4.4.0.gem 25600 BLAKE2B 7d33587f76f0d78bb698ff4df409027541b87994f6c6d1cc2672ace98aa96d898739dbaaee4ff837590566f28c8d185540ef126ee2b2e02a6ab0f30b9ce70e98 SHA512 d34e6b863e545faa4edd9cbb5a5896f37ef59433c455b49c4553cfe2a46deeda242cd82bfb1a1f5e7035ba940dd701c597e8caee946e47ca4a7eb52bd5cd71d0
 DIST flog-4.6.1.gem 26112 BLAKE2B b9b242b9e43bdbf9430bde74c7aa261ad4ce5e60e4522786304e21d55a9531a501eb831073a79230fdc13d8b0e9ec4666fbf72c551e8d82d9c1a6880589bb897 SHA512 43c9bb04ef0c036a523a470ba2741d6845071a376f73f9dd4b983a73112c3fca69221e2444e98c9ecd42ce2a75ae39e4cd21018a934e8583dc622b5e9c384859
-EBUILD flog-4.4.0.ebuild 619 BLAKE2B 97fae894fe9add5eac02fdf0803cee12550f11f9b2f186151742114d3ab2aaa40b357648065f5089bae4dd5c7ce7aa6cfd5bde1ab6cb5ede3a6ab83028960609 SHA512 664a3ccc3b24df4c2309fdfd306d27103bcc0c089a7ec9edea5f9417b154bb1224247fc78cbb740c978eb279b8bcefbc27e3c2ee202b210ca782f264627e1d5d
-EBUILD flog-4.6.1.ebuild 642 BLAKE2B ce612b9157d2659ef44ef989e0b522086b105058d262b081492f2420a22f005077d7ec00078cca7c74f4c5c568f90acb3f21fac62083074944ca7acb9440cd45 SHA512 530a514bd49a5f87d2ee8b2f8ade041fce954e512915585601cf5413a5cf5f65b73be1727b17260b10ca48355a0716a2095370019c9630c3bc31c09437f94fbb
+EBUILD flog-4.6.1.ebuild 647 BLAKE2B 29a6df3212837eb32d81979f291bc68342f82cc08b8b9d158c4a37abe788782b137ed8807f45145945fbb0fda6938fe3aac8e5cb25bba47001ba4e5c422e892e SHA512 bd41c61611b729a413002ec238439cf579328b0079d64d9da3a1ee462d353e030764de50359e6cfaf787e25816e5bfa9de975fd17b2517f5ef18d3eab599ce9b
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/flog/flog-4.4.0.ebuild b/dev-ruby/flog/flog-4.4.0.ebuild
deleted file mode 100644
index c4bbaf4c2b9e..000000000000
--- a/dev-ruby/flog/flog-4.4.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Flog reports the most tortured code in an easy to read pain report"
-HOMEPAGE="http://ruby.sadi.st/"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/minitest )"
-
-ruby_add_rdepend ">dev-ruby/ruby_parser-3.1.0:3
-	>=dev-ruby/sexp_processor-4.4:4"
-
-each_ruby_test() {
-	${RUBY} -Ilib test/test_flog.rb || die
-}
diff --git a/dev-ruby/flog/flog-4.6.1.ebuild b/dev-ruby/flog/flog-4.6.1.ebuild
index 8fcb2a9553eb..3f89e7315236 100644
--- a/dev-ruby/flog/flog-4.6.1.ebuild
+++ b/dev-ruby/flog/flog-4.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ DESCRIPTION="Flog reports the most tortured code in an easy to read pain report"
 HOMEPAGE="http://ruby.sadi.st/"
 LICENSE="MIT"
 
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/gettext-setup/Manifest b/dev-ruby/gettext-setup/Manifest
index 6f9350ec62af..9223ce61a613 100644
--- a/dev-ruby/gettext-setup/Manifest
+++ b/dev-ruby/gettext-setup/Manifest
@@ -3,5 +3,5 @@ DIST gettext-setup-0.28.tar.gz 15594 BLAKE2B 5cda2bd48cba44f38a27020febcbe6e9ee6
 DIST gettext-setup-0.29.tar.gz 15811 BLAKE2B fab356f79e9a84433df583d122a391240ec9c412b062d6aecd13116bba483b3e9f71f8364e82cabc1f695ada416c99fcc8fafb2c8a7b99dc9f21881b4c045069 SHA512 b6bad9c38481880f1086ad9edca86ee46d5afb915213591d7b30526ee3428c91325f59f977ab21395fdc73df702f05666a3e00116ac5765b9bf66ce6bfa90575
 EBUILD gettext-setup-0.26-r1.ebuild 1037 BLAKE2B 54c2d5aea4dafba440dbdf0b6e72cf76b2ed972412047ae3ff053ec16f22acffdad954b9094e1d07ed5de08e21e480053f35f446c431d6d569c247274775133d SHA512 5d9eaccd4a488bb4fbb07247fc0f359919e7c289d21f9de9147dacefd6804074f2ecb7fe4685166caa101fe9b5b65573f91086ff1e575e3cf0fbd2fbce93ddd7
 EBUILD gettext-setup-0.28.ebuild 1044 BLAKE2B 0699a94e54ffc5e3098f5252a65a846c91e8db6b14115c6436b5fb61c884dda2e361ecfd2ac26976687279bf3b7749287d2e81b1d6407b0296d13bf1865fc9a5 SHA512 5e18394ada417abe990503c7320fe01fa5e749bb1cd26c7d6f6c45b4f454054b7ec128e5a1447d44c506ec988fe5a87c4400c5f91108f177a745e6ddd545b032
-EBUILD gettext-setup-0.29.ebuild 1055 BLAKE2B 35d020ec0e019d0aaa8e8edf90fc4389de080a74775803e4d958dc99a14f9123a09d19d95e1d6df2b37eb0366065d398d80fb512607570729c05ef970667d92f SHA512 8be19e214e0198318589d8cf5e8e20a228237e4d4d4e9da723dcc72ffef9dd8a13369fd1f9e5d1e134edbcd906b5442a10a462e9d8f46f653bed827d2198889c
+EBUILD gettext-setup-0.29.ebuild 1060 BLAKE2B 330bf2b6be2c95711be022a987e39566ab9e242535b1726c1490d908af4571c1e526ee328aef0e6853519f2d8a4ca7353218b0e2a679120274406d394efc2f21 SHA512 1b05afca02c2fd5232f0e012dda6484b06c0e17ebd74b3c2edda67c314477542a554bb86a646deae3d7b336a0a3b9623cda2566317d2d9b5e339030990b2aede
 MISC metadata.xml 344 BLAKE2B 14075c722372613eeff2cb810420e1e0ff7cdcf4ee1ba748a0b615222b88b13a0ecc01c9d0ca1aab71c0bb28359c18682b7402444caa01100c3d8381b9b13e08 SHA512 f7f8c8e7f745313b74340ffe738cab426f793f452106e0ae70f5e73a3a745f1b9ae7b1b70b5951f1d5eb81d4e61851845fa53bd2aa3dab8362f330e6f8d79e9c
diff --git a/dev-ruby/gettext-setup/gettext-setup-0.29.ebuild b/dev-ruby/gettext-setup/gettext-setup-0.29.ebuild
index c3c7a14b3223..756bded96c7f 100644
--- a/dev-ruby/gettext-setup/gettext-setup-0.29.ebuild
+++ b/dev-ruby/gettext-setup/gettext-setup-0.29.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ RUBY_S="${PN}-gem-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/multi_json/Manifest b/dev-ruby/multi_json/Manifest
index 199eae746796..d5b35624929e 100644
--- a/dev-ruby/multi_json/Manifest
+++ b/dev-ruby/multi_json/Manifest
@@ -1,5 +1,7 @@
 DIST multi_json-1.12.1.tar.gz 25579 BLAKE2B 50fa37b907289b8247ffff1e22ebde1b07ee32e5ca97984be1243340f14185ebaaeb72cb28a18c5c77b1b48bfd0b400479fe7ef532e40cef3736d782c84c0d09 SHA512 f61e500197c5a1373443b308bd9307238c54d2d23ba9da91843c667c12e491f34fd87575028c3630a81a7355d4903344996f20408bbb7971b12dfba3cc4f76df
 DIST multi_json-1.12.2.tar.gz 25630 BLAKE2B 61209dc4be50b44302cfe40e45b840ae8d81e827d8b9df82ca6b852a72d360fbe09c0f5b0ef8eecfbd08b6bd08343ab7bb307d91d9abf28c9b9adb35f18bea51 SHA512 bbbdd05a6dd12052aa3e09389f47212f15799310d5c265057f7ca801622d32295d1f0844b37e51f8f1fd2d48e4430234f99bc6de4b9ed149e81d9a33a831e6d9
+DIST multi_json-1.13.0.tar.gz 25954 BLAKE2B 22a2f2ff2f1291a45613f456661a1735fc41ad80f28ee7d2c9b97109f0637da4e60439686cfc29b7ced501c32d2fe9236c9acc25acc0f55e57ec0bfe53331f37 SHA512 b168b2a093865f48f1a4d1941e8cfead8b3efba73bcd59660dae581a77ab7149f0f452f1280e69061187f35c84b6eeff70144f815f9f669db03dba49100143aa
 EBUILD multi_json-1.12.1.ebuild 1926 BLAKE2B f392a89f6f23033080a4ec1fa22b638f41a44f00638a0ccf1fbe34dc70150082b0e3eaa5b926df620efd7676bab3f31fd197ea0f99496cddc918d93ef4abada3 SHA512 9cc52c4e92ef2c398bc05ae8dd53ba440dd3713b3713972bb44ae6aa5881e13b7b79a382b16abf64e75da531f35871b0a98ae8470fab1e9b6b4cdc7c6c3442d3
 EBUILD multi_json-1.12.2.ebuild 1922 BLAKE2B 338cbc039830d46a7cebb61b82ee7fcce1b6722a7de17a9cff0ff1372c12c7157d01bf0c8b1fe05cf81d2f5a4b51aaecaf807ee6563b84ce31e843963e78c992 SHA512 429d8f7036473500cc478d690e28ab4baab02cce66a474f0c73e03b2362e3b9124248520bca8ce1c2c89ab46f6ca41dab196b654919f8bd43e66e76c6e04e9cc
+EBUILD multi_json-1.13.0.ebuild 1922 BLAKE2B c909ef211d008b8f12d400319e89674f79cc556d4f3aeea0d5b76c7c43ec671f2a4e6e48fd3f1861f7c157668778a86cbdf151f77bdf64392f0be4a859aa0695 SHA512 170aa5bb583feeef39ca4600bdfba839e7b640a4ac376de56e42641eec72650b536ccc16a1fc8065c843ffaddf2b1655bac68608804abc669f5b67be7146c39c
 MISC metadata.xml 345 BLAKE2B 7d7684a1546dcc97e934f1a7df4484b568c5e8043dcfd0493e03124fa9f96959de5dccb78d22b1ff51ebc39b5fbec8b9a1dfd24531d676b8982b1f1dbd5097d0 SHA512 5fe7f117806d67e0d295bfcbdd07d4bbe8d3c3875e07cc3d276f2aee81b89f2e90174cbf4264d647384817fe0e8c81c2f2c9d9d67e3f78b46c3c194001bcace9
diff --git a/dev-ruby/multi_json/multi_json-1.13.0.ebuild b/dev-ruby/multi_json/multi_json-1.13.0.ebuild
new file mode 100644
index 000000000000..819f95007369
--- /dev/null
+++ b/dev-ruby/multi_json/multi_json-1.13.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC="yard"
+
+RUBY_FAKEGEM_DOCDIR="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="multi_json.gemspec"
+
+inherit ruby-fakegem
+
+SRC_URI="https://github.com/intridea/multi_json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="A gem to provide swappable JSON backends"
+HOMEPAGE="https://github.com/intridea/multi_json"
+LICENSE="MIT"
+
+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"
+SLOT="0"
+IUSE=""
+
+ruby_add_rdepend "|| ( >=dev-ruby/json-1.4:* >=dev-ruby/yajl-ruby-1.0 )"
+
+ruby_add_bdepend "doc? ( dev-ruby/rspec:3 dev-ruby/yard )"
+
+ruby_add_bdepend "test? ( dev-ruby/json
+	dev-ruby/yajl-ruby )"
+
+all_ruby_prepare() {
+	sed -i -e '/[Bb]undler/d' Rakefile spec/spec_helper.rb || die "Unable to remove bundler."
+
+	# Remove unimportant rspec options not supported by rspec 2.6.
+	rm .rspec || die
+
+	# Remove specs specific to oj since we don't package oj yet.
+	sed -i -e '/defaults to the best available gem/,/^  end/ s:^:#:' \
+		-e '/Oj does not create symbols on parse/,/^    end/ s:^:#:' \
+		-e '/with Oj.default_settings/,/^    end/ s:^:#:' \
+		-e '/using one-shot parser/,/^  end/ s:^:#:' \
+		spec/multi_json_spec.rb
+
+	# Avoid simplecov which only works with ruby 1.9
+	sed -i -e '/simplecov/d' -e '/SimpleCov.formatter/,/SimpleCov.start/ d' spec/spec_helper.rb || die
+
+	# Remove unpackaged and for our purposes unneeded coveralls
+	sed -i -e '/coveralls/d' spec/spec_helper.rb || die
+
+	# Avoid testing unpackaged adapters
+	rm spec/{gson,jr_jackson,oj}_adapter_spec.rb || die
+}
+
+each_ruby_test() {
+	for t in spec/*_spec.rb; do
+		${RUBY} -S rspec-3 ${t} || die
+	done
+}
diff --git a/dev-ruby/path_expander/Manifest b/dev-ruby/path_expander/Manifest
index 3fba7e0ccf4d..5d5dcb22d34e 100644
--- a/dev-ruby/path_expander/Manifest
+++ b/dev-ruby/path_expander/Manifest
@@ -1,3 +1,3 @@
 DIST path_expander-1.0.2.gem 12800 BLAKE2B 99bc161e39803b01f2bac48eaca063a00473db1cf2f033837a1ffc187847a32aa5a88077d163b8acb2a75171a5fb134f47ee6d82cc8105d4ce297919ea8fce76 SHA512 550d20be7f3379ccb30e2e0c86c26348103d7d11d7b5d21c684c341cdb7cf1aaa29886c7b1210265af7bbc1853b8c26a0048d6bd40a8a2752938101e64a23468
-EBUILD path_expander-1.0.2.ebuild 754 BLAKE2B 4d7c70e50b0cb138801538951dbd3c89a4bea17912e8ffa58497401055ffdc227bde055bdcbc3fdb3d1313ceb8ff53f9ce543f993f88d00e90ffbdea7ce7f41b SHA512 41e43ad60accf9d62a7ed9bbf69e2364f596f5391f20c67f75604b0b8cb8108c90af6a4f20111462a7bb1366dcfb9a1305c57ab0e4b451d71ce6eb1a69ba08a1
+EBUILD path_expander-1.0.2.ebuild 759 BLAKE2B bd330755d7783774be5dc732a20bab12a862cb68c83163e4cc31d051d519f3054bddeb4a7ca97eb9b2b92d4e9b38b546985aa7c483a321e6287d0a788829f3c1 SHA512 def5cc3a9f94eda59aab6b45b3d22470417ede6f6d113a8b093b28750111527388a99c5fd390db76cad9ccd3d55f9103a6d9356e86d7337c54ba5cfeed4b3723
 MISC metadata.xml 339 BLAKE2B 46f1672ac66227d580c5f13621d10aa58b2a17373eb108a190e64203ca4dfaa92aee5dff0c71551a52af7cb58a77336f34328581fdcb75e68ecf7698071d1100 SHA512 9defdaf2e5b30460816c7e929aabc8421c4afeba6ca56a60001bff5047052a2a7f7928a683707b26582facb2886f05a4ecb56e5036fbfc4f75d4d3353fefb8a5
diff --git a/dev-ruby/path_expander/path_expander-1.0.2.ebuild b/dev-ruby/path_expander/path_expander-1.0.2.ebuild
index 97d13e7f16f4..d63deb968507 100644
--- a/dev-ruby/path_expander/path_expander-1.0.2.ebuild
+++ b/dev-ruby/path_expander/path_expander-1.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ DESCRIPTION="Pre-process CLI arguments expanding directories into their constitu
 HOMEPAGE="https://github.com/seattlerb/path_expander"
 LICENSE="MIT"
 
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 SLOT="1"
 IUSE=""
 
diff --git a/dev-ruby/semantic_puppet/Manifest b/dev-ruby/semantic_puppet/Manifest
index 3bec7c46f858..9b47f92094c9 100644
--- a/dev-ruby/semantic_puppet/Manifest
+++ b/dev-ruby/semantic_puppet/Manifest
@@ -1,7 +1,5 @@
 DIST semantic_puppet-0.1.3.gem 25600 BLAKE2B d227b5fb500af4da47db7dbc197d84a5d06485420e43473d3bd6a43b79cc3744a6b382a51e2cf2172a9f80432540e952344b95edda4b10bd7f04b0a535380fb7 SHA512 ee676033fbbea42f7316d03d13a99a5278385237eba3651e2eb8c2c64abc7c39bf5035d5bc71573be83622ae9f6681bff6f25b643c176679fcba4966361dd061
-DIST semantic_puppet-1.0.0.gem 32256 BLAKE2B 2986def6877cffa9811fd37ba7db5a16229c16292af8ae47db9c925e003f06d4071447f1bdc9c084742702e710e946c2bed3797a51a4f3886eb71c77200db550 SHA512 b44d139221e12b29c46a8114abfede123a305f0cb33c8be21ab410db1b1bad3d7f708800c513566e4a5f0aa3cccc9d0197b9d9b0aa0015b7055dd06a887b334d
 DIST semantic_puppet-1.0.1.gem 32256 BLAKE2B 21125e70a8c7af1bbf476c94cffd3e72f16595b5b4c67b114ba2e7b92a4467975b1d368d2447139088cf0acb7f15c45371ad7bac07ccd095590c420cbaf5a83b SHA512 739641c4cce0c6d47c1ccfdda4c6577dc74a8232909f10ed493e865d0c1d691aa9367c978c23f139fd0bc36236664bda8503129f8162a04f72a51c872105e7d3
 EBUILD semantic_puppet-0.1.3.ebuild 499 BLAKE2B baeece43bdf0937e412d4b12bd04456afdb3cc8644ea11c72cd3c162a43349abbea5fc88d6dfa63900ea380035a093f72d33ef593c5d68d91a520c0189b24c49 SHA512 d742c79b1f3c07c1fe10f2fb7bab1caaa3ab39a5094e6b48d8a29f14f305e21f7dc61b5d28308342b3735ad393a3979fb0924d12a70bdfcaf7806d71a6a834d4
-EBUILD semantic_puppet-1.0.0.ebuild 537 BLAKE2B 7cf5ae17e1f57ee5152637ffd2abf608a198325ae5ac29f8aa1f98644a256b6a6755d790c5facf94a1935dda6d724163b1b1b1de953293e6d639d945a4c8ce21 SHA512 729705155a573dc79b6665cfc0d5689d7707058af7f498102d418e78de7a2e7e7e4fa30a60d3abfb0e1114b64e4db620d0788d9541d5261935d2f3143a23b609
-EBUILD semantic_puppet-1.0.1-r1.ebuild 574 BLAKE2B 36039d2a24f4bdd5480a9ad3c100adbc9bca940b6b765349b2adaffb1776c3126281a718ddead3c8ecd92504046bc860f39a10f1d2a37be37e00c472b21de9ac SHA512 90c1153eacddb4820ba80233543592b06bec516c9e79c6c25b7bd11b9ac15bb3079b1c7de6f4db5af4bf2a716185878424d7632c286f9c04b420604c360f911c
+EBUILD semantic_puppet-1.0.1-r1.ebuild 579 BLAKE2B 6542335558ff66aebcd8f9f1bb766efcbc69a10e51436bd5fd20d5d914fdc9d9180b36fb8c136a815014aabdee66730867e18f8cd70dcb44134a769e14252de1 SHA512 ac6b119a8f26e0f4764282ee100e118d4610f9d1a48371de76be8f9914be1c059a3690e99a4c4b89d9a53c03b6c78d41a18438db49d9e36e4282f464284d26ce
 MISC metadata.xml 588 BLAKE2B 15525acb9d4d8341a6493929fd74e264fc3ca7652b1af154e34ad07e3ba0a3880648bc0ccc6a7cb8d2d17c4e43846c38c3068ecf8fc0a9f677122ca49da141d9 SHA512 5f54d04ed39dba11a8985b3a943bfd325be25851f0710a3a2f96d43b5c0ecfcf6f6f54632f86f5cf4b285e077b2f4307792c6221b64c2c8d4dd58018ae911dce
diff --git a/dev-ruby/semantic_puppet/semantic_puppet-1.0.0.ebuild b/dev-ruby/semantic_puppet/semantic_puppet-1.0.0.ebuild
deleted file mode 100644
index 1cfb244da2d2..000000000000
--- a/dev-ruby/semantic_puppet/semantic_puppet-1.0.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Library of tools for working with Semantic Versions and module dependencies"
-HOMEPAGE="https://github.com/puppetlabs/semantic_puppet"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/gettext-setup-0.3"
diff --git a/dev-ruby/semantic_puppet/semantic_puppet-1.0.1-r1.ebuild b/dev-ruby/semantic_puppet/semantic_puppet-1.0.1-r1.ebuild
index 71bb90658b25..020733218794 100644
--- a/dev-ruby/semantic_puppet/semantic_puppet-1.0.1-r1.ebuild
+++ b/dev-ruby/semantic_puppet/semantic_puppet-1.0.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/puppetlabs/semantic_puppet"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/gettext-setup-0.3"
diff --git a/dev-ruby/sourcemap/Manifest b/dev-ruby/sourcemap/Manifest
index eff665251713..7b750a82f276 100644
--- a/dev-ruby/sourcemap/Manifest
+++ b/dev-ruby/sourcemap/Manifest
@@ -1,3 +1,3 @@
 DIST sourcemap-0.1.1.gem 15872 BLAKE2B fac8ae7604a5d5a56b6aff82742b8c773bebfdeb41be6b6aeb3f2b5aff9c6cb2bf584b29ee7a6cfcb4b3064e6b1666e6c0341383fa4d39037759fcbf51ae57ee SHA512 d197a3aab0fe8c9e620c50d3bd994ed957b37dba071f6abc3b8a149a8a0490ee1b89512036b833ec44e6bdcdca6dacbdda9872036ba51736ac1d1e1f160ded59
-EBUILD sourcemap-0.1.1.ebuild 455 BLAKE2B 7465801c5e3642f37d7e821ef4aac89a20f0117b4891c5ef10b7889f5f0bab7a7e975028db62f333b98fee7edc6d264c2a9b523c337d1cbebdd21b0745b615e6 SHA512 9ce464b7fdaca8e35b02cbf2e2ef4ad1d33b1b8abb8eb1cbc14df741ae82c106405fc36637e40254a9bd532b53e3ab1decc87fcea2dd3592012f63e6ae914cdd
+EBUILD sourcemap-0.1.1.ebuild 460 BLAKE2B cca9b50505245ce9a11cc04a09cc5e60d829ccd6197fd141ddaed1a40317ead225f84ff93d8f08e9aac83d2c0fe131f704a16a6bb6f79654b6190b32e79f2491 SHA512 49e8d01085d8e55b707050deb4d7f59ede9eb414ea74a484b5bac644ec08b803403beebf2b321dd99053a843fb2befc46f1847133e2fce5ba56cd7457f7ac8f7
 MISC metadata.xml 343 BLAKE2B a8f9658e9fea493c4d839537333079971a0b6afc29a46258763c8febf0862925f02bbdeb1696528c2e752a625d9e536282aad3cea7edbb624e3b1ebc2a545e49 SHA512 5347372e3013b627aeb9194714f4a1525a232b1d85eb252d2537606639ab95ce351396a094ffbcacb0caf5c153b77f4381abdcf8670b914b9fb43c26a05c3e4c
diff --git a/dev-ruby/sourcemap/sourcemap-0.1.1.ebuild b/dev-ruby/sourcemap/sourcemap-0.1.1.ebuild
index e4b90947e037..57cc91ee52b3 100644
--- a/dev-ruby/sourcemap/sourcemap-0.1.1.ebuild
+++ b/dev-ruby/sourcemap/sourcemap-0.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/maccman/sourcemap"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 IUSE=""
 
diff --git a/dev-ruby/uglifier/Manifest b/dev-ruby/uglifier/Manifest
index 56b8575a2cc6..ab911c527b11 100644
--- a/dev-ruby/uglifier/Manifest
+++ b/dev-ruby/uglifier/Manifest
@@ -6,7 +6,7 @@ DIST uglifier-4.0.2.tar.gz 184915 BLAKE2B eaac0fae612f357a51332db420e31d568b120d
 DIST uglifier-4.1.0.tar.gz 189074 BLAKE2B b18e2661a1e87eaf2436d9ed89aebb05b164523bf478a3f0b5ec2587100621fa75eac38f0ac2ab724a10add7aff2a96947c32babdd246d0583f757682d704375 SHA512 46191a961471db2f515e28229e6febe3a1e448730eece965307e6993b3b0282e69ba1c6cb8cc232897b4e29eeaea4b2981af4cafa2d1afc384ad39a049c26f60
 DIST uglifier-4.1.2.tar.gz 190343 BLAKE2B 0f3b0052d7065f36dcf9c52c226d6ddd27bcafe5a85b1a1a56a9d1d31ce8e7e8986e68ff471aa33cc2dd46688bd579594bf370203bd2ace26554b5dc71764a33 SHA512 8b11b3f8dc9e6dd6d2fe856decf11a569bea2040f1443fe437759fe4d14c0410158ef40b2660f38cd548358e78f6ac27929712e8fbc5708dc215099e58de1f75
 EBUILD uglifier-2.7.2.ebuild 598 BLAKE2B 866212993ed0781517edb9b12f37ec7c449f42dc7361aae98dd01ef31a40bd2936111446bfd17590a5b96f2a49d969641754b9aa7aff13d93d3e31614fc42fdf SHA512 6f6a691d0f60f9469080b8bf0840277424ea956b2cd509a1b7889c4798e90bd104a33c70c1511ea183391daa88f2a3cbc657614d1c9124d3e333e584d4a9a8de
-EBUILD uglifier-3.2.0.ebuild 795 BLAKE2B a8b1153f7e009847cdc8993be7bca0a42e897cb842c705a399b401dd27f128decd95b84b2e320a8b5489680879dd95769652ee9fccc746a0b7f42e85d989d852 SHA512 05ee6ae5dda25687496fec88c4e073ea3b7a54a833b8658787e8851222157a53c077d09c70aa4fb45262eb966e11021f2a97fac077c6f366e366f002f4b2c112
+EBUILD uglifier-3.2.0.ebuild 800 BLAKE2B a19a8fe518ebeac3dd4854d7a1cfa86f04a03522ae79a4c5d211777dc3098f32e319923544ffd4f2220caf62cf828bd0c57ddada8abd9e8757e04131f4d7e013 SHA512 b0d20ca10593f7072a58a457fe7985f1e374936c96ff322df63688fbdaae167987132e5eb65aca13113c65d4448d39c94bef4b9eac5f342e6ee46245751db45e
 EBUILD uglifier-4.0.0.ebuild 788 BLAKE2B fa880d98f5e28680df44f3b2c92b5cf282037326d002772b4e881ab25a220848fc4b3a030fe70e20ac4a797f882ef71f63228b1ce393a309906be7db99418411 SHA512 e4c2855b456360ede9d3003f4f42fd65f5c3d2672628af5eeb1952fcd558785d48276c7d4cf3dd61679b4173ee3af998f26cd1a2fbef582d7a7b6514b797e4f1
 EBUILD uglifier-4.0.1.ebuild 788 BLAKE2B fa880d98f5e28680df44f3b2c92b5cf282037326d002772b4e881ab25a220848fc4b3a030fe70e20ac4a797f882ef71f63228b1ce393a309906be7db99418411 SHA512 e4c2855b456360ede9d3003f4f42fd65f5c3d2672628af5eeb1952fcd558785d48276c7d4cf3dd61679b4173ee3af998f26cd1a2fbef582d7a7b6514b797e4f1
 EBUILD uglifier-4.0.2.ebuild 788 BLAKE2B fa880d98f5e28680df44f3b2c92b5cf282037326d002772b4e881ab25a220848fc4b3a030fe70e20ac4a797f882ef71f63228b1ce393a309906be7db99418411 SHA512 e4c2855b456360ede9d3003f4f42fd65f5c3d2672628af5eeb1952fcd558785d48276c7d4cf3dd61679b4173ee3af998f26cd1a2fbef582d7a7b6514b797e4f1
diff --git a/dev-ruby/uglifier/uglifier-3.2.0.ebuild b/dev-ruby/uglifier/uglifier-3.2.0.ebuild
index f88e6673904a..41ec812c35da 100644
--- a/dev-ruby/uglifier/uglifier-3.2.0.ebuild
+++ b/dev-ruby/uglifier/uglifier-3.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/lautis/uglifier/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux"
 
 IUSE="test"