gentoo resync : 20.05.2018

22 files changed, 189 insertions, 37 deletions

diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index de30ce0b358b..85241180f596 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/certificate_authority/Manifest b/dev-ruby/certificate_authority/Manifest
index 140353b3d4b7..a2be0d4eceff 100644
--- a/dev-ruby/certificate_authority/Manifest
+++ b/dev-ruby/certificate_authority/Manifest
@@ -1,3 +1,3 @@
 DIST certificate_authority-0.1.6.gem 22528 BLAKE2B 85b229c7506b787b85b734883967dd8e6fc4ceece57dec2b2b8c29fffbaec2d95931af5412d61ef9935e547b68b14213e5cc6971f94ad6294476cc653684742b SHA512 d1471171aa01956ca216bdb8515e9f6fafc9720827e7351b14c7c38907e87b66a3299d9ee0322fb51b8edd1cbc4f4a73a2aa4b54ff5ca4c8bc602ced5e035a59
-EBUILD certificate_authority-0.1.6-r2.ebuild 765 BLAKE2B 01cc05f86f53c4995de22bbf7bbb899eeab2e8a825b8530809de39d1d237f811f5c8ca1506b4e6b6b0224301165f17c2ff8422a9602653ae37d0d0059698a69c SHA512 a9a4d3168cc8519afca4401ff435c87874ab47c5b503b999e28d28bd674472d509c00b6b47bf7cede153098bdb80915e53a81b60490a613863d7dfd1fa0ed8aa
+EBUILD certificate_authority-0.1.6-r2.ebuild 758 BLAKE2B 164f2c285b5909fe412a7ca8c1dfe3530fdcee68c7b6b478c7fd8a565a9065eab5759d6e7a233d63f2f3eddb5c80175ff988a4092b49035c2ddc0e8d8202060a SHA512 3a1c4db3a641255693d638bf0358435d9241c4d5b87008572eadaaaba865da8730107bffd99dac6fedd768ed24c6ea3da721ed9c62a87a02410159e2283a1501
 MISC metadata.xml 357 BLAKE2B 5e69b9b9001e7dcc322333c2cc3f451afded531e07b9942eac2dc59a6c61ceba864f2799487345cee4b5b0540b5952c7c312dfaa9e20f9b1373c4bbeac57c33c SHA512 e0e2a1493426c800a142ccf475ab1d0ab60511b30c28fd6bc927d9672281f6377eaa607596acb6b9b1fd2b949231b4a1b01ce8137725f5f4632ffaf7b62eb932
diff --git a/dev-ruby/certificate_authority/certificate_authority-0.1.6-r2.ebuild b/dev-ruby/certificate_authority/certificate_authority-0.1.6-r2.ebuild
index 0e63ad3ac9a0..b7f8c502f859 100644
--- a/dev-ruby/certificate_authority/certificate_authority-0.1.6-r2.ebuild
+++ b/dev-ruby/certificate_authority/certificate_authority-0.1.6-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
diff --git a/dev-ruby/hashicorp-checkpoint/Manifest b/dev-ruby/hashicorp-checkpoint/Manifest
index 5803267f5f0b..794ff0e78b06 100644
--- a/dev-ruby/hashicorp-checkpoint/Manifest
+++ b/dev-ruby/hashicorp-checkpoint/Manifest
@@ -1,3 +1,3 @@
 DIST hashicorp-checkpoint-0.1.5.gem 13312 BLAKE2B 4318cc7748797732ea3719965debd9621136a097bdc6a9bc6577d563eb69c4bbabe8451396bd9281874c1b4adca690fe443f0a98eb10857b1f6b561aa732b508 SHA512 77effab526b798da1739c19021f3832bea7aab9503a159909a712f18da7a0cc6d750dd0783c2bc5a31f650f00f0a65dad706e2159882bae70dcf7425fdb35a40
-EBUILD hashicorp-checkpoint-0.1.5.ebuild 480 BLAKE2B 2a146e52eb998381c5c37efae667c91e4883d00d2ad06a90878906b4e203447d23bb3950c761c5781a2795e41759dde42bef06f167ad6261e8f475900a892c3e SHA512 ee1176efc826a1d42eff9cd4f9f8b9dbeb14e469d9391032b56a4aeaeb436cd79e528b9122a782a916c9658d9ab2b27783b2fa85ec2857a09d41f56f06d9a8c9
+EBUILD hashicorp-checkpoint-0.1.5.ebuild 481 BLAKE2B 94c6d8c65ea56233db89f45e608ac4d9f694d04d10b2cd63070e17168fc01765e3d38b3444e47331d8570cbe63895e325aaebca2c0c51d4ce40e1881b831d616 SHA512 a56fdde91180ea4dd2449838ec83505731c2d010f6c390984b5f1711ee8f6bd5b562990ec52337804ce4a4c972bd5fb4ac73c9a49e595848dabff081cf712cd6
 MISC metadata.xml 363 BLAKE2B 4218c803e7143862890d6ef8a50c1eb205ed5c343748bd398541b0f6bab6494338fdcccf90bc66789fac9a07c31e9f3dd626a7188b39666ce0117578490d294e SHA512 561d8c47138e489f884db31530c33a4faa9257efbdbddb47e6553e23b386de9b3f5e2eed4e088e9be83439bd6f0fba751c0a37ad1c9ba2716b297eeef9ee9a3e
diff --git a/dev-ruby/hashicorp-checkpoint/hashicorp-checkpoint-0.1.5.ebuild b/dev-ruby/hashicorp-checkpoint/hashicorp-checkpoint-0.1.5.ebuild
index 3d67d7d1ada7..32cff8003279 100644
--- a/dev-ruby/hashicorp-checkpoint/hashicorp-checkpoint-0.1.5.ebuild
+++ b/dev-ruby/hashicorp-checkpoint/hashicorp-checkpoint-0.1.5.ebuild
@@ -12,7 +12,7 @@ RUBY_FAKEGEM_EXTRADOC="README.md"
 inherit ruby-fakegem
 
 DESCRIPTION="Internal HashiCorp service to check version information"
-HOMEPAGE="http://www.hashicorp.com"
+HOMEPAGE="https://www.hashicorp.com"
 
 LICENSE="MPL-2.0"
 SLOT="0"
diff --git a/dev-ruby/hashie/Manifest b/dev-ruby/hashie/Manifest
index 8ba3cc4437b7..a262c1d44f25 100644
--- a/dev-ruby/hashie/Manifest
+++ b/dev-ruby/hashie/Manifest
@@ -3,5 +3,5 @@ DIST hashie-3.5.6.gem 71680 BLAKE2B 51029f134abbc2b1894ca06e74d355f11cd507d72027
 DIST hashie-3.5.7.gem 71680 BLAKE2B 8f03e190cf299f3597e0fe1b991fd07e00af0ecff757ef56648f97e8a3091a1445441d4e00f59c9b93d5db0d21636d9e5352175e49692f7b28a5612c87da9163 SHA512 c7ae610de5fe9b19a724068c26c184b44f951b29b56e3c5240074a372ad24d0ea70e39541812cbd82d5516d9e00e86a33d935b90e086b7db305b9b34b8f44f23
 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 d5e87e69ff66c2de91340a272a22d4041fee08dae3e4ee82d39b66b9d4a581e06b4ac375d71a47a0741a2519f7dab92937634477ec01f51070d6f3647d17070d SHA512 c6a0b64422786bc7f26510eb3ca01633bc702b761538a2c886c8e44d0a58896f45e28f69b7722963edb542ed2ba1d381fb693374e2fdb3e0ec44c182e2b03d0a
+EBUILD hashie-3.5.7.ebuild 1261 BLAKE2B 19a0a2aa6fefe3d0ffc48563a13689ac73c53630d7d5066c0a8fcd6a011259b6bbf8ecacc499d1a8a035f04a8876868ecd867fa2796ada428d2092330f0add22 SHA512 ad85c51d5d97e2d46e87958763e8c50bf4c3f032447e790725d41f73dd67106ca09f0781bc1a72c54d9ef3824b9f62f03a2a3487f419d843318c97ea0b674339
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/hashie/hashie-3.5.7.ebuild b/dev-ruby/hashie/hashie-3.5.7.ebuild
index e3a63a153ecd..813f325a39b2 100644
--- a/dev-ruby/hashie/hashie-3.5.7.ebuild
+++ b/dev-ruby/hashie/hashie-3.5.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/kpeg/Manifest b/dev-ruby/kpeg/Manifest
index dd8f8365decb..e4293b246d07 100644
--- a/dev-ruby/kpeg/Manifest
+++ b/dev-ruby/kpeg/Manifest
@@ -1,3 +1,5 @@
+AUX kpeg-1.1.0-utf8.patch 450 BLAKE2B 00472188e53b34f8395c33c9510232ad826ce71235b3110807d1a3fc9068684cf367f6a312e6adccbf93fbdbc783d69eb8e14a536365f8c72e1ac6841a364171 SHA512 eb0c3b6d3ba32e3496f7f115804dfbef949dfb34e842886cbcc3c8b49a0bfbb21d1ef3510590e335a2836eca09cd031d9e75a8d601176465c84e5424fceba663
 DIST kpeg-1.1.0.gem 57856 BLAKE2B 6aab84aec59c4962ef39f31a7de89a7bb84f0ae2b64327206fefa8bc243e0dd405db121bfe2f50c72b18933c2f4ce7a47a842c741cbd53db1ad73415d41b95dc SHA512 4ca7007bea74485ceb7c3f53eef1cd2e162fed45872f8f078d5b5d2ffd1ecaa0e8fc65ed6f1b220bf6f4642d455a582cb754cdc6350edf856b33d9908510cb66
+EBUILD kpeg-1.1.0-r1.ebuild 743 BLAKE2B f20e8901b0adec15f0d20082ce28a93f608259e577eccb51fdb500d3abf2971c674453fedf3abce0935adc37b7f8943e8d10c2e5e46ee3e6839162fdb77fc1e3 SHA512 233ef339a3656990604cb00a3532cf8be64879c22c8bf71b6418220b704dc2cd18fec220f75e3f900c31fcd056ffa902d160a37ceedffca01d98671594b2176d
 EBUILD kpeg-1.1.0.ebuild 707 BLAKE2B e2915e2ad85769781822446fc38c7ed34285c2df5351e816578736b1a34056c6f8c4a6f0ee18b165db3e4cb06f5801d9979a0fc6acc4f9045d37a3f3df471069 SHA512 d0f00be5b95c4ab944af3432f2a9a280b77d142fe6940801b1d320c091c1272010ef4904f5a0a33fad6d938ade14dcc768b6527cf8cba25e81e0884cdcdcd8cf
 MISC metadata.xml 338 BLAKE2B fc0c3e4cbb7613cd0fb29651974822b31bbc14da28427772026ac068c6d8ca698c4c38073df6a5d06a864ffdca14477d71ca32dd7b4ca4244cfe02e9e052d4c2 SHA512 981524b3599f2a7a812c468763137a4e38b445c87224f91dc12d128025bd42657b62ff1b5fa9797bf437f46b9f9195bb0469431e77646ad5f0cfbe2c6b5e1f21
diff --git a/dev-ruby/kpeg/files/kpeg-1.1.0-utf8.patch b/dev-ruby/kpeg/files/kpeg-1.1.0-utf8.patch
new file mode 100644
index 000000000000..1b565c466c2d
--- /dev/null
+++ b/dev-ruby/kpeg/files/kpeg-1.1.0-utf8.patch
@@ -0,0 +1,17 @@
+Ensure proper encoding in non-UTF-8 locales.
+
+https://bugs.gentoo.org/640150
+
+--- a/lib/kpeg/grammar.rb.orig	2018-05-20 09:26:13.597648830 +0200
++++ b/lib/kpeg/grammar.rb	2018-05-20 09:28:19.606460712 +0200
+@@ -130,6 +130,10 @@
+           end
+         end
+ 
++	if reg =~ /\{[LMNPSZC][c-u]?\}/ && reg.encoding != Encoding::UTF_8
++	  reg.force_encoding('UTF-8')
++	end
++
+         @regexp = Regexp.new(reg, flags, lang)
+       else
+         @regexp = reg
diff --git a/dev-ruby/kpeg/kpeg-1.1.0-r1.ebuild b/dev-ruby/kpeg/kpeg-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..52d864e2684f
--- /dev/null
+++ b/dev-ruby/kpeg/kpeg-1.1.0-r1.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_DOC="rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A simple PEG library for Ruby"
+HOMEPAGE="https://github.com/evanphx/kpeg"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+PATCHES=( "${FILESDIR}/${P}-utf8.patch" )
+
+ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e 'gem "minitest", "~>5.0"; Dir["test/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/logue/Manifest b/dev-ruby/logue/Manifest
index d1377dbe9fbe..72d0c30ea580 100644
--- a/dev-ruby/logue/Manifest
+++ b/dev-ruby/logue/Manifest
@@ -1,7 +1,7 @@
 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.4.tgz 17797 BLAKE2B be99a6c9ecc8bbde25d9a485d83b1d485e7afbe3e5fb8954dd6140881bff496c48185e15ad4596bcf7abba3a19e556da9ac6d44623be33887e32590cb35abd0f SHA512 e3d6ec6a8b302fbdf7a2b7842b31f88af4f0576166b632dd356a40902dc816bbfdaf18a170d5c8066fbfa97643d38d6c8137d4f435f478f04badae4a0120184b
-EBUILD logue-1.0.11.ebuild 572 BLAKE2B 1449b5566d3c1d8aff61f2a39e4fb82d315b7a04d66c7e6daa3799e3739922db98c3c832a789bb6ff5915fb4661717cdddf375d08906d661728f895854d2f794 SHA512 011eda51afb2309e642f4cc1ecd60208a22654187e83728c6eb806ce61adf790dbe23815d3a92170e3265ba96928562af0f42482d89037c7e4c1a9060565c528
-EBUILD logue-1.0.13.ebuild 697 BLAKE2B 6a68148170451e1fdf815c64efb7b8a86081b922b4975e33f33d55049251b1ad9ac725284c80358ee043912c7a045c3c768d28544484ba54b7b69a4f820b0afb SHA512 6cd8082df74d258648e35a847bbbaa5ecb8ec2292aeeb107ad578d5e2a6df469fa733382b9f3a975a64b1e672b214762db4b232dd4da548d410d4a87666ff45b
+EBUILD logue-1.0.11.ebuild 642 BLAKE2B f70c610772e261497ef83ad0d4c58ef401a37bf28a89f8ec5c6d0657e1fb14ce4465b45e59d9a651f82b3c97ed82719dd9555f642f15e2cef6d2f98b79508cfc SHA512 7876127df6fa1327008985202da4452cd1753aad82d4f5d457f9745038c35bfa25b509493e1e558de3e571d5c22e92839b2f451881596c4ffec41485a26771fa
+EBUILD logue-1.0.13.ebuild 744 BLAKE2B e7df279983c71b4d2b61f58cf33bd488263545eccd10ec4e715816b684366db24c5530901db6ba52d3d950adb4d4627f619cc331f49b29be19ca830dfb9946ae SHA512 721482f9aa82592cb7624e38f459e455cca7f075d02ff5c29eb5ef62838cc9e28f4dd46713db40546b78e59d946628427c26a2dd034fd9c0cfd0264275375dfc
 EBUILD logue-1.0.4.ebuild 601 BLAKE2B ce2b1f04851d4e26bff1a1bcc2385786c7ed3cf6bf3afad51bd4b6f7a451f322a7c89e37de17fd404ae14eaee066b99d959185dea984831c6483b663b1c4ffd5 SHA512 f3800e592f379b269bb25a2c6ab8ecf64fdbeedc91e7712989a2021181c3081231445c906f3303f0add37cc230e97227f44c8349e6afefa0d3ebf171e03d9770
 MISC metadata.xml 337 BLAKE2B 045c92dadbdfb3a0c0506734134b5c62b6fc842e12cfbae746a6d9cf07dc65dd5d240575639ef8563baf4d201a43d1b3aed0f3ebf54f88a85e7cf8305926d29d SHA512 2d11804bc1d4e53888e62609677d7bc0c20882ed3cc779dfdf5733adf9cc94ba671af7e901724fe30159ebea1cdcb1039e5c83ead45ebff75b9ce64018bbc1f6
diff --git a/dev-ruby/logue/logue-1.0.11.ebuild b/dev-ruby/logue/logue-1.0.11.ebuild
index 8666fae6d8b5..df7c5ab66489 100644
--- a/dev-ruby/logue/logue-1.0.11.ebuild
+++ b/dev-ruby/logue/logue-1.0.11.ebuild
@@ -23,3 +23,7 @@ KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/rainbow-2.0.0:*"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' Rakefile || die
+}
diff --git a/dev-ruby/logue/logue-1.0.13.ebuild b/dev-ruby/logue/logue-1.0.13.ebuild
index 0fd1d7449f23..6cfc640eddd1 100644
--- a/dev-ruby/logue/logue-1.0.13.ebuild
+++ b/dev-ruby/logue/logue-1.0.13.ebuild
@@ -25,6 +25,8 @@ IUSE=""
 ruby_add_rdepend "dev-ruby/rainbow:3"
 
 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/Manifest b/dev-ruby/mime-types/Manifest
index 9ff11227b84a..77d5b76561c8 100644
--- a/dev-ruby/mime-types/Manifest
+++ b/dev-ruby/mime-types/Manifest
@@ -4,6 +4,6 @@ DIST mime-types-2.99.2.gem 149504 BLAKE2B d2088d606b0210a8607d351ce7b7e3b7f25c3d
 DIST mime-types-3.1.gem 42496 BLAKE2B a586c6264e46fd45c5fa7bf79b8ca79e086d4ed23c0bfafb0c38f508b638df886b8b4e43d975955579fa24f19de6c90b16d1f0395a80f676b4c153e4431accd9 SHA512 1923ff7032aabbf83569497e0016ea0ff183a13751b0ba0a5b09a132e7c18154bbb19e7d3877adc2e1d21cdff612713201a465f954309794fa1d9b330975a112
 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 984 BLAKE2B 7c2e425aef1fa4aa0c664fafbf8337db9c335eff652bea011cb45a606f8df127276b1f672b40756d2651bacb05c9702723e9278aa520c6892c9ce2b55958bb25 SHA512 d04b92658c3b47d612d765a635eb251b99c489712d1a344e086e638aa5a48390645fa76bebb6f08b5ecba527e2a916b0263d1d833c8b72e777d101b7c1ad3dc9
+EBUILD mime-types-2.99.2.ebuild 977 BLAKE2B 76ebba51e40e03c4c4cacdbe8382f6c5822414e61058a1c90f99e8760b086641d89c51b421b1357db18ed20ba2658e9e0ff09a62c648acfed073a70d28c4347f SHA512 cc5dcbf37afd01301052d694d7e42f3c38646d9e9d0dc2cb9e869d71b4ddcc2b648d0d36e01ed66f5130f1cee5e051dff2724d105ad1d0f66614a6bfcda98599
 EBUILD mime-types-3.1.ebuild 906 BLAKE2B 0b08720bb71b60417b134c7713640a591c35d2da9654a2c977dc9773da9a30f785917e1910fe1d3547fa560c22e1251c5afb5a1fc231954663f235ee38d28fd8 SHA512 05b42ce6521fb4f7c031e9b19d379d1ecade2f513efa4e7a404d3475b69656f602bb432be2226c97a51fc36f501922bfcd0eb7ffc741cbd218d5869f9825496a
 MISC metadata.xml 352 BLAKE2B 6edd7bc99a1f3c2522e87695e078800275b4e9301597961b8e9ba3b920f7b75c92c8133860be4642995d2501e9bcc6f8f7cdbf611d85aa8ea23dfeda9353011c SHA512 01ae71ee2d991c0669ce4f9ac252f8edcdbe1df3f2510e5497f9a0fd0bcc1dc10a10259dc1b3dd14b73edd58895911d363b6a60105b619033a2bf09f987f4b5b
diff --git a/dev-ruby/mime-types/mime-types-2.99.2.ebuild b/dev-ruby/mime-types/mime-types-2.99.2.ebuild
index 36a3c3ff0c90..1164a6ad5e81 100644
--- a/dev-ruby/mime-types/mime-types-2.99.2.ebuild
+++ b/dev-ruby/mime-types/mime-types-2.99.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="History.rdoc History-Types.rdoc README.rdoc"
diff --git a/dev-ruby/rdoc/Manifest b/dev-ruby/rdoc/Manifest
index 9f015b8207dc..688b24c59088 100644
--- a/dev-ruby/rdoc/Manifest
+++ b/dev-ruby/rdoc/Manifest
@@ -2,7 +2,9 @@ AUX rdoc-3.0.1-bin-require.patch 632 BLAKE2B 9835233574b78ddf5c9e1d60aa4a7559288
 DIST rdoc-4.3.0.gem 738816 BLAKE2B f705b4fed5a9a7e3a850cacc17b7df3f8fdeb163938ed7d2d29979337cb24bca4a66695643ecc62f811d8e49a931296e1972d5d13366685315649e0ec44ebef7 SHA512 7ec5c8055262300c159ff2dbca3bcd09e169002acad8602db89086d2b9409a096209a1152dca68c79dcd1b5e3c1fdf55e7f89d82b33fa2ce65c816695350b029
 DIST rdoc-5.1.0.tar.gz 702376 BLAKE2B 733d77a341ddad10f5b648b6bb492e0f79daa392e2ca371d38236e4c85a1c409699e35dd3f5bc8bc48551b399603bb0a747cb3c5f7f1fbf4765aabffaad575aa SHA512 cd2ed37e8502a3e9093c88c258ac5e39542a23c3dcaedb9b5eb48ce391a694e5b35fbcfd62f01ec6353ac9c40a4b7043b2ff11bbc403d2e03de9a84c52bcefe7
 DIST rdoc-6.0.1.tar.gz 697323 BLAKE2B 7af4a3189c6680ae3d92b7a0b7764e73a104017b49442d89ffa0e2da2d504e7493b6842a3b5b60326e8f633a10447e2e6efb17ff61da7b6e4e55b52d973fa523 SHA512 43812f068b430d4462821098bca1a1f0fc2adc63c6f358a48b4af94aafb76d33eb494ef06f91aa72065f128fb0d34f53a05cb246f0c4fcc31ce9c1b31658d108
+DIST rdoc-6.0.4.tar.gz 699314 BLAKE2B 37b9c65a55357b9edbf85889c086948a6e80094846434d46e6ffbf17e16eba9e964dc09721f921d5042d6e0c72619fc59d87c8d969490e6af50fddaf49d36556 SHA512 8bf61bda88ea1a85178f5fdd62e87c79c5efd6d6f64d9d8651bbbc37e02da02b7189c7e60e4853a962507cc2ee4c703b6532f28db763202fa24c4b364cee8e28
 EBUILD rdoc-4.3.0.ebuild 2695 BLAKE2B 49ec379de4d303a230b37e7194d07f44c2036d1ffd612f0eee8c5e9877d1023eead430aea666f193509b87d675c89447948d9334c587c8169274ecc164ac56f3 SHA512 24aeb3c3ed906dab7d3c570cc825d1152a769f24c775e529c3ed66160f6a36f211e581dd86aa3efcad5c209e50263a536c0d84067e23e65057f38f975ee5c907
 EBUILD rdoc-5.1.0.ebuild 2568 BLAKE2B 2c2bc3d067b2a5eb6c3f0a176620297ec2409811258ab44dcd8912b9fc9d9dbb104bc7f2608bb33cfeb367a55a0b6aff5c0707fc85e8342bc276a89abcf5ce09 SHA512 445fffe0e53abed82e729ff5cdd322cbed1b485ddf419ced48c1b18035fa42dbb76cb5cceb8d1e604a4737fdab08866a6ffdb691c631c83b2fd58a4265534df3
-EBUILD rdoc-6.0.1.ebuild 2545 BLAKE2B abb535b4fe3a9436ab32a57e7a899301a04d53f6e10ad192f572960c76b9d9069d11e2150482ff18abca4561a4cc11cc4aad9ba4cd104aa486bb3d9d59e77884 SHA512 a12b4a21212b6da59473ccac8175e0e4b8063164b73d54fab60967ac916288d20c90d412dbcec936ab496834d654fc187171df02a0e7015cccb3d1467929f0ee
+EBUILD rdoc-6.0.1.ebuild 2556 BLAKE2B 1007587db7b44f6fbe077215f4a53329f787e0ff2e150f4351e2efb31974101dde55c2e00e4d7bec68eac190ba5987689ef28980f9ca1bbb8eed05ad2525c660 SHA512 5db8d8cd9387c2731b618664cd166950cad142df5994e0f6995574a922dc0ac25746afb3b8108dd40c9f7c514b593e0c22993fd097b9c2d8d4abcd9d805f411b
+EBUILD rdoc-6.0.4.ebuild 2561 BLAKE2B ebffcb449dc097f3c2d0d46d56e4d95565f2a088124c858b30881e2b01b02762e628a7345918a5c9f6ed5b869c70ef546270e73ecf2ffca1a714fb9c34b1d30f SHA512 27ca6b208c38c08027b7083cf4db6eca4fe814734fb7c3167d13a06a9bea44c4e9477c870b7b6785c9c165730e5c4d50a45b21e8c728c1fbf37c0406e7a7d870
 MISC metadata.xml 335 BLAKE2B 835d498407155ac5295c70af8a671114c777e5f9371b3d47f9f92a6b102b8e1d58755df0737c34820630464772dc001163e83b5d319707a1c630f4cf2f9ef8de SHA512 3421081016cb99570f9ce9f775097669cd40a709efbbb3c76a20947717bc40d886195a5fda889407d1c436a387c126e07def1eeae01edff53c490ea9c630e992
diff --git a/dev-ruby/rdoc/rdoc-6.0.1.ebuild b/dev-ruby/rdoc/rdoc-6.0.1.ebuild
index ddbea7785806..a9d943d4e523 100644
--- a/dev-ruby/rdoc/rdoc-6.0.1.ebuild
+++ b/dev-ruby/rdoc/rdoc-6.0.1.ebuild
@@ -25,7 +25,7 @@ IUSE=""
 RDEPEND+=">=app-eselect/eselect-ruby-20161226"
 
 ruby_add_bdepend "
-	dev-ruby/kpeg
+	>=dev-ruby/kpeg-1.1.0-r1
 	>dev-ruby/racc-1.4.10
 	test? (
 		dev-ruby/bundler
diff --git a/dev-ruby/rdoc/rdoc-6.0.4.ebuild b/dev-ruby/rdoc/rdoc-6.0.4.ebuild
new file mode 100644
index 000000000000..66756c013b52
--- /dev/null
+++ b/dev-ruby/rdoc/rdoc-6.0.4.ebuild
@@ -0,0 +1,91 @@
+# 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=""
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc RI.rdoc TODO.rdoc"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_BINDIR="exe"
+
+inherit ruby-fakegem eutils
+
+DESCRIPTION="An extended version of the RDoc library from Ruby 1.8"
+HOMEPAGE="https://github.com/ruby/rdoc/"
+SRC_URI="https://github.com/ruby/rdoc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Ruby MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE=""
+
+RDEPEND+=">=app-eselect/eselect-ruby-20161226"
+
+ruby_add_bdepend "
+	>=dev-ruby/kpeg-1.1.0-r1
+	>dev-ruby/racc-1.4.10
+	test? (
+		dev-ruby/bundler
+		>=dev-ruby/minitest-5.8:5
+	)"
+
+all_ruby_prepare() {
+	# Other packages also have use for a nonexistent directory, bug 321059
+	sed -i -e 's#/nonexistent#/nonexistent_rdoc_tests#g' test/test_rdoc*.rb || die
+
+	# Avoid unneeded dependency on bundler, bug 603696
+	sed -i -e '/bundler/ s:^:#:' \
+		-e 's/Bundler::GemHelper.gemspec.full_name/"rdoc"/' Rakefile || die
+
+	# Remove test that is depending on the locale, which we can't garantuee.
+	sed -i -e '/def test_encode_with/,/^  end/ s:^:#:' test/test_rdoc_options.rb || die
+
+	# Remove test depending on FEATURES=userpriv, bug 361959
+	sed -i -e '/def test_check_files/,/^  end/ s:^:#:' test/test_rdoc_options.rb || die
+
+	# Remove tests for code that is not included and not listed in Manifest.txt
+	rm -f test/test_rdoc_i18n_{locale,text}.rb \
+	   test/test_rdoc_generator_pot* || die
+}
+
+all_ruby_compile() {
+	all_fakegem_compile
+
+	if use doc ; then
+		ruby -Ilib -S exe/rdoc || die
+	fi
+}
+
+each_ruby_compile() {
+	${RUBY} -S rake generate || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	for bin in rdoc ri; do
+		ruby_fakegem_binwrapper $bin /usr/bin/$bin-2
+
+		for version in ${USE_RUBY}; do
+			version=`echo ${version} | cut -c 5-`
+			if use ruby_targets_ruby${version}; then
+				ruby_fakegem_binwrapper $bin /usr/bin/${bin}${version}
+				sed -i -e "1s/env ruby/ruby${version}/" \
+					"${ED}/usr/bin/${bin}${version}" || die
+			fi
+		done
+	done
+}
+
+pkg_postinst() {
+	if [[ ! -n $(readlink "${ROOT}"usr/bin/rdoc) ]] ; then
+		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
+	fi
+}
diff --git a/dev-ruby/sanitize/Manifest b/dev-ruby/sanitize/Manifest
index 11058a3b65ee..68f58f3d6489 100644
--- a/dev-ruby/sanitize/Manifest
+++ b/dev-ruby/sanitize/Manifest
@@ -1,5 +1,7 @@
 DIST sanitize-2.1.0.gem 20992 BLAKE2B 726cca43e1c9bebb4e750acec43dd6f6a3a17659e1390718dafcce3f1813a8756d9f34320b8c27c52a054009f40639e2e933718577ab4c5620bd4b754742d188 SHA512 29a26e37342a75af2bc7795578edf2c5064263c58d38dfc36e18f1e111271616c026f7d808a05d63185c12f0e52384db84d62bdb796bf1b21d7e902ef0c1d096
 DIST sanitize-4.6.4.tar.gz 1349418 BLAKE2B 2d1a56340e562d057c85edc0d5157508267a4089b0aeb59156d0c249c8a39adcc15a10c8c67d84be77a2b388aa779e9330b9b4b52f28f11d7666eb97fb41bd24 SHA512 d870d8cc5ce6043e3825cfbb50f31c00d348c9ca05823c0eda245b9c175ae0bb9d0941845112bb3721ded9013bc554c09bfc55a1bfad70fcccd1660142e4ca82
+DIST sanitize-4.6.5.tar.gz 1349481 BLAKE2B bc0b3317952c1b5a903ca403300fdc788df129669761ab7f16d1cb76a75bed7306bd47065cb58449525c0ab0986015da93cc91d74f12fe407e273a84a79876f4 SHA512 3bd37faf5e99073fd87cf7e3f12628233117dcf38c298a806680da20c00050237d83d286936c898f03583d64b4bac5ae2be373fb89b259e4ca6dea283ca713b7
 EBUILD sanitize-2.1.0.ebuild 582 BLAKE2B cbbe2c5119c77254dea7f9dd1fc259ddca5fc77fa049addead296fea67dd0547259766a930f2d758363be2fb4da6c374d94416dc63ea0da54b9d35ae3d7c3ca0 SHA512 2296a21edb640074975c5f43a5505d4698b41c20e38975622d5c04f20e4cabc9880d5b81ba7e3928b2566d18d36e0ec01a3d178958f12636a97169b418f5cb97
 EBUILD sanitize-4.6.4.ebuild 857 BLAKE2B 9677015725246a86749b166be3de6ddc2e1b04775496a0b00bacaf5afefe038facee8f293d8d0819c68d66575c1ef24beca953dd1428bd082bb374a517e88b9c SHA512 6c8a5e5bd962d64e6e1c3a694c7e5d6b6b3ec6cfa02a4fa52cb02e846fdc4f3d6a9a9532d7ed86efb059a5220df6ca26e6201ce3e65ea22977e2b70a65e149e3
+EBUILD sanitize-4.6.5.ebuild 857 BLAKE2B 9677015725246a86749b166be3de6ddc2e1b04775496a0b00bacaf5afefe038facee8f293d8d0819c68d66575c1ef24beca953dd1428bd082bb374a517e88b9c SHA512 6c8a5e5bd962d64e6e1c3a694c7e5d6b6b3ec6cfa02a4fa52cb02e846fdc4f3d6a9a9532d7ed86efb059a5220df6ca26e6201ce3e65ea22977e2b70a65e149e3
 MISC metadata.xml 341 BLAKE2B 8081029c35d5a56ed5a3399ecb63510e737a664e97a4eb363108b85fe75860cb8b171e8da497d669cb0491199bdbe94408570cb811a8c86d6d38541a0f65cbe4 SHA512 870423593eeb0219f2fa0b6bbb55a4a19063f5cf3d19d9c0bb352aec5632b3e5f5e717e7c6004413497a981091042d54bc092e2c029a511aa0c37e95d435996a
diff --git a/dev-ruby/sanitize/sanitize-4.6.5.ebuild b/dev-ruby/sanitize/sanitize-4.6.5.ebuild
new file mode 100644
index 000000000000..03582866e28e
--- /dev/null
+++ b/dev-ruby/sanitize/sanitize-4.6.5.ebuild
@@ -0,0 +1,32 @@
+# 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="none"
+RUBY_FAKEGEM_EXTRADOC="HISTORY.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Sanitize is a whitelist-based HTML sanitizer"
+HOMEPAGE="https://github.com/rgrove/sanitize"
+SRC_URI="https://github.com/rgrove/sanitize/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="4"
+KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+ruby_add_rdepend "
+	>=dev-ruby/crass-1.0.2 =dev-ruby/crass-1.0*
+	>=dev-ruby/nokogiri-1.4.4
+	>=dev-ruby/nokogumbo-1.4:0"
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+each_ruby_test() {
+	${RUBY} -Ilib test/test_sanitize.rb || die
+}
diff --git a/dev-ruby/turbolinks/Manifest b/dev-ruby/turbolinks/Manifest
index e88349fa1505..d5b10cdcc85d 100644
--- a/dev-ruby/turbolinks/Manifest
+++ b/dev-ruby/turbolinks/Manifest
@@ -1,5 +1,3 @@
-DIST turbolinks-2.5.3.gem 20992 BLAKE2B 55883b4ef728d6499d01357e404cd5bdbc7ce7914c78dc1abbaf7e18737bf9120988662bdd8acdfa61129f2099c8c27cf34e3b88a046d24cdd94f574488d5879 SHA512 3ac0bd52793ae60d57ab8936646157eccd3e83b112ff4456286caea61c195a855f6b3d0b474aa3f298515bda537545fb8c328254144a958ff9a7271183011d2e
 DIST turbolinks-2.5.4.gem 21504 BLAKE2B fdf34659e1db5d4ed8e7ed2894c46b4cba8aa30b5f9492797507e7e2c7a212dcc55b673874162fabf017594cbd1e36eac58d03f9d6951e7701293fabe135fb91 SHA512 052cff2ecfbad7a98371572c09c8c66f6c8babb3e997dfd12fcebc1dda6f9c0d8065be83c0f6b04ca1b1f2e0548abb73ada3fb32bc71f1eceb90b5f0ef61a195
-EBUILD turbolinks-2.5.3.ebuild 516 BLAKE2B 837f5e4a45639fabbd9f02c22e7a8200d4304c8dc0a5c836de02bde34e0d786a96d30152e4f39fd97eb094c214afe35881d1d92e743df6116fc0970d083ae1e8 SHA512 3fa11bbc49e1bf4ac95dce5c09a12fb9a9e721fbd930e491b6c5162a5b30f9cb5b7d042ef01770dfb8b3d5a03a413e07bb1eb27d00119dc4f7bd5e76e703630a
 EBUILD turbolinks-2.5.4.ebuild 518 BLAKE2B 1ad5a20e047f15829587260e92418e552d558e558e32c9ca1396e1831f5bf01af160fcf210e3b5b935133e91a20e932204d448a9b6cf0570c5f0a540c1928729 SHA512 ce6a955df53d54da3a4a884f39c037fb62e58d91bca121ddec2a9dbccabd426e61c8aaeb729e0521e9a0c7489e25c33febce6baf370b93fde8a14c3001a596a8
 MISC metadata.xml 342 BLAKE2B 6a78075d284b979777608d6701b92ffd1b4e72af314ce5c49a1f975615379fd976031455feaa2e6efb14289398d434642b6b2b6e8e037c4ff69226649247a9a0 SHA512 3ea14f0b2b2e0ac563e97ef9eb9ea84e6389dbd456655f344a9cfd4a7a9d24eeb3eaa4fbbe30683cb7f7adeae9c51d136a5a2174cca6ddc1e0d7b31d380a66ce
diff --git a/dev-ruby/turbolinks/turbolinks-2.5.3.ebuild b/dev-ruby/turbolinks/turbolinks-2.5.3.ebuild
deleted file mode 100644
index 4d9fc16cec66..000000000000
--- a/dev-ruby/turbolinks/turbolinks-2.5.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby22 ruby23 ruby24"
-
-# The gem does not contain runnable tests.
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Makes following links in your web application faster"
-HOMEPAGE="https://github.com/rails/turbolinks"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-ruby_add_rdepend "dev-ruby/coffee-rails"