gentoo resync : 28.04.2018

3 files changed, 20 insertions, 16 deletions

diff --git a/dev-ruby/http/Manifest b/dev-ruby/http/Manifest
index 50e0350a8abc..0ddd9ae2775d 100644
--- a/dev-ruby/http/Manifest
+++ b/dev-ruby/http/Manifest
@@ -1,14 +1,15 @@
 DIST http-0.6.3.gem 67072 BLAKE2B c61febdc1e25c5ad2a5ae61191a80d8c0395917962fecb8c7fca23190a33e5b49eeba2797939e5ae9be078ef645b48d66ac804a2c713a3c7a2308bf3b926ebc0 SHA512 e5fe784e833da30e5ef6bcdc43b45a04fcf03d827b8336853591c5ba67b5ccf45cc18849ec4a78f3a0526b05cc50da2a7aadd5ea211284fe73f8dddbe89c642b
 DIST http-0.9.8.gem 66560 BLAKE2B 15b6cc066d2b04c3c6df604787f69b5079dacd277dc95a74b56832fc26cd84d2b631b60a60baadaf46368e5dfda30152983c335faea636490000bc5153d11736 SHA512 bb89147a3c28ebd75d2453e51c0c422557907e055b9a20a560b803bc64edfcdfe96e997ff225a26c9ca278211b0f70faaccf2d18ce2cdc9fd95bc4048093ef68
 DIST http-1.0.2.gem 62464 BLAKE2B a7801cb8389473f5dee9761fffe510ed2228ecf01d75e61026a110ac8438c9344094a5f50868536f0641740a3663a6aebacdc2f3a8294fa49894549b7a6e3bf0 SHA512 fbfa76f588d46b10dfa0d3b319d0ca1a5a92749575cf27791febaf5d55f2e4458cf34f48d8b9792d4e220c89c702b75b039ca5b66d3c43d31bab982082312113
-DIST http-2.2.1.gem 66560 BLAKE2B f198fe9aa28e8302503de16422d0b129a89efdcd4f36ac1d4e5ea2f067cd682fdbaa45237e7d00f9993ae1348455401c494d7ad2425f6ca1ec2464e92b1a9db6 SHA512 e8edf381548c04d0fb2ea0f28104d85eda92d6de6686013190e84127c4ce118fe8b8a562267aed41ad23481ca54e21a215613d7e3d920d6c5ea9f9a3c4a2032c
 DIST http-2.2.2.gem 67072 BLAKE2B d2aa0f155085b60c3a65af6e5cda58632708f1aae000d9d52dcfa5fe3f6880000a4dff749810c7816bd1920597f456f7c9e7c080a4e524d578983944f0d49194 SHA512 9c22f7f4473e5cb0b605b9c8d25c1a93c34e7e440fb7cf4f3690cb9dd9e65ce3619d0575da3d97da6dfcf8e1560113b638bb447340605bebc160f589fb007bed
 DIST http-3.0.0.gem 69632 BLAKE2B e02ddc7e7f2747c2b20fc90b38c1c16c315eda8b800d93148aa0cb1ac0194c2fd5742fa346b18a8f60d4814db7d9e0200ad55c94fd2f8f2cb2bf29d50a22da8e SHA512 ef8c4148b68838e0669d5012c3548d373ef99d9273eb2ea25e7e0237027c766ffdbcdede766eb890f042b7211c2ed953688a372c46b120bf0bbd045c06b8aec3
+DIST http-3.2.0.gem 70656 BLAKE2B 9be294d425169318635db9236b3460e1a863e9e0ade07f1bfd97f6c12e75ea40c4c39ea5eda7c82017b78eb91c1c5703229022a9db20fed709149476a53e5936 SHA512 2766cb33d753ba641d9fc5de5c7e15790c6ce3d00f2065631b4e5006ca90f12b38257d8842c99f46f4dee527434c7b7cab2d99476b757937bd4fcd6d81b6cfb4
+DIST http-3.3.0.gem 70656 BLAKE2B 5c52864168663640389a0f107e1bf8a202654a8b479c92bf5126354d360adcae45a9b4596da7cff2e412fee88ed3622870c4e2bb18eca97466b4ede28baa2a08 SHA512 fcb2549c22974712e129306b472c1a32466c50add85eee9a558582697c7ece26cb7a1db6da6aaceedb8bfd134d1213090c158db510fe53ddbe201bba6bd22c68
 EBUILD http-0.6.3-r1.ebuild 669 BLAKE2B 3ad469ee00e4385526f74a1bcd4f885e9fe27080eb639e46f10336a9c19e2fd1e8c5d74d04e9e5e77e251f335ae19355d193b54502edcfde0693c1f1b092bec8 SHA512 5bb6b432c6aafcaef4175ea63cc7e7ddf957d841d5504a98f22f82247b5f5ec6e707ca8f0d93544793d7844c9ae40996547dad84b62bd397fff5618b1a2288b9
-EBUILD http-0.9.8-r1.ebuild 1080 BLAKE2B 07d3edeacac51f80a0d0c578069c8efc0d2c296564297a662a04fce5297bc74db8200cb229a3065c30e492cb38fb866a7b0ce900f9f39d9c5aac8cfbcb5174a6 SHA512 5356640951e4d5cc165269cc93f11dc487e41df050ced3381086db094f86685e9549fe3e39e46946e9bff1e6e03a11df35f15270d3e0cbf58b2c5bd30978845e
 EBUILD http-0.9.8-r2.ebuild 1079 BLAKE2B 0a6e4c30901542b3ca659b19a7308eab8b7dc6aa63dddaa111fe922b14c0db408d1c9c4d22c821038376100b329a3ac2c298e5ed6a036481464bbd49e8d6a715 SHA512 bf9e8e66f026a7fe1a82536fd21d3607d070e58c9d657bee9a3f58ce30b0e3f0aca3ad6445eac61128deafa3eae5a1a2452646cd3d66631769dd64f336172267
 EBUILD http-1.0.2.ebuild 1066 BLAKE2B 8254d2606eefeb6f3088fbcd8a3b40bf5c81f19b8e70c45ae246af3c517ae33041ebda64c7838186842f0ab3146e0d60f7e88abe70a4708dc97ea74eab6ed7c7 SHA512 61835402afb957f5e5d0659edbf7fd7457c2801cd2c9f151e87de4bf3ca57bd0a21729e1ba2ebf0490c8586c472311fe299d54f478d03cc6dfb9ee0f72d67a39
-EBUILD http-2.2.1.ebuild 1227 BLAKE2B e0ae3652c9754f7ade9fe1ef6f4b95efd1ef51c741a337eefbd200c264931963f11f0501400936eb11d7790866b67a1776d4b1e3975d2c9ae01c220f966a64ea SHA512 4aba63dd64f40a6e8a6dd2acf6030534941d04caee3e7758efd638cabd7b1fa3f23e98071d08b1ce7c9eb7ce2b90dc99a1708dd8f53e200b531ed82a9d7eafe0
 EBUILD http-2.2.2.ebuild 1232 BLAKE2B c15bb91342baa306872e609cae8546b30ebedaa8c0388859f94c597b3a3fdfb08f50cb60e14cbe8df34cb8c0389a283f60a0beaf303068fc38417e62ef2e7222 SHA512 e24e112a1ab81d744c8046561c1314b57439c67654250542cae7921e7fefbf716610e1bd3775936fdcfe8db0c9c72b56c8b12a4229c5ae342d1a916675c3d3a6
 EBUILD http-3.0.0.ebuild 1228 BLAKE2B 581bea6ff67449d0bacb2eb8038b38405ed97cebae6be2108a8194eec267932ee9f6014743eddfcc9138076bf507a36f0eca4d64577dda7100f83146697d3f52 SHA512 4ab960efe6d5b79b49af267d9a26e233d49d278fb3f839a9c9052ffe74bbfb96976bcdd5c00302b0c7cc4399a78c25867f4c7a548b8ad903c4700387d7ecc97d
+EBUILD http-3.2.0.ebuild 1232 BLAKE2B 09cd0bdc0adc6926e7f82a83886bad44fa04a51b726cf22e9a32a8ec9caae0c7d3e1d3a4007a125e08da6e8cbe6a382a2f391a11e9222d2b16f9de211c5176b7 SHA512 48910a29b81c2c2e3f608076823f3f76cc0eef2b910f36564a5466bf33e69975ac47a0b388fdd9930b2111993bdc1deb0af1e04e98f791990188bd3b8236193e
+EBUILD http-3.3.0.ebuild 1225 BLAKE2B 807e39fb714feb685fdac6920fe232706c915ef6ba5176cc7a46f29fc43950e9a7981bdda11114981e6f042f78106a0144e36ca41c97e200d070c82210d652e4 SHA512 6a8d7ad05c3126aed3d97db2f1c76253f463ac369d78f614f24b13028728ade06ebc01c317a6c0bf24720e4a45993d0e8a2a259acd70d87a581c3a3cb856c0a8
 MISC metadata.xml 339 BLAKE2B 2508769568914caafa01e9e8e6517a7cf9c1733c772b3c605c8dbb056efb8dca3be9525e1ba2ac610bd6d5b5dc02b7625f3569dce0597444240bc2ed8d8449c2 SHA512 9b43a2f61eea32941c251429694bcfe432f284527c332efdaf4187c9ad8c6f53cd924421ca9d56cefce75cbaff104d4f7579790fe09b45a4cced06bedc44d1c1
diff --git a/dev-ruby/http/http-0.9.8-r1.ebuild b/dev-ruby/http/http-3.2.0.ebuild
index 636df10e187a..adc8cb7d3193 100644
--- a/dev-ruby/http/http-0.9.8-r1.ebuild
+++ b/dev-ruby/http/http-3.2.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -15,13 +15,13 @@ DESCRIPTION="An easy-to-use client library for making requests from Ruby"
 HOMEPAGE="https://github.com/tarcieri/http"
 
 LICENSE="MIT"
-SLOT="0.8"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
 IUSE=""
 
 ruby_add_rdepend "
-	>=dev-ruby/addressable-2.3
-	>=dev-ruby/http-cookie-1.0
+	>=dev-ruby/addressable-2.3:0
+	>=dev-ruby/http-cookie-1.0:0
 	>=dev-ruby/http-form_data-1.0.1:1.0
 	>=dev-ruby/http_parser_rb-0.6.0 =dev-ruby/http_parser_rb-0.6*"
 
@@ -37,4 +37,7 @@ all_ruby_prepare() {
 		spec/lib/http_spec.rb || die
 	sed -i -e '/with non-ASCII URLs/,/^    end/ s:^:#:' \
 		spec/lib/http/client_spec.rb || die
+
+	# Avoid spec that may fail with a running web server
+	sed -i -e '/unifies socket errors into HTTP::ConnectionError/,/^  end/ s:^:#:' spec/lib/http_spec.rb || die
 }
diff --git a/dev-ruby/http/http-2.2.1.ebuild b/dev-ruby/http/http-3.3.0.ebuild
index 14eb329cb4c0..99051aa01e39 100644
--- a/dev-ruby/http/http-2.2.1.ebuild
+++ b/dev-ruby/http/http-3.3.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23"
+EAPI=6
+USE_RUBY="ruby23 ruby24"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -15,13 +15,13 @@ DESCRIPTION="An easy-to-use client library for making requests from Ruby"
 HOMEPAGE="https://github.com/tarcieri/http"
 
 LICENSE="MIT"
-SLOT="2.0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
 IUSE=""
 
 ruby_add_rdepend "
-	>=dev-ruby/addressable-2.3
-	>=dev-ruby/http-cookie-1.0
+	>=dev-ruby/addressable-2.3:0
+	>=dev-ruby/http-cookie-1.0:0
 	>=dev-ruby/http-form_data-1.0.1:1.0
 	>=dev-ruby/http_parser_rb-0.6.0 =dev-ruby/http_parser_rb-0.6*"
 
@@ -39,5 +39,5 @@ all_ruby_prepare() {
 		spec/lib/http/client_spec.rb || die
 
 	# Avoid spec that may fail with a running web server
-	sed -i -e '/unifies socket errors into HTTP::ConnectionError/,/^    end/ s:^:#:' spec/lib/http_spec.rb || die
+	sed -i -e '/unifies socket errors into HTTP::ConnectionError/,/^  end/ s:^:#:' spec/lib/http_spec.rb || die
 }