gentoo resync : 24.12.2018

4 files changed, 15 insertions, 54 deletions

diff --git a/dev-ruby/http/Manifest b/dev-ruby/http/Manifest
index e2faa17f8c14..431c9399a2d5 100644
--- a/dev-ruby/http/Manifest
+++ b/dev-ruby/http/Manifest
@@ -1,9 +1,7 @@
 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.2.gem 67072 BLAKE2B d2aa0f155085b60c3a65af6e5cda58632708f1aae000d9d52dcfa5fe3f6880000a4dff749810c7816bd1920597f456f7c9e7c080a4e524d578983944f0d49194 SHA512 9c22f7f4473e5cb0b605b9c8d25c1a93c34e7e440fb7cf4f3690cb9dd9e65ce3619d0575da3d97da6dfcf8e1560113b638bb447340605bebc160f589fb007bed
 DIST http-3.3.0.gem 70656 BLAKE2B 5c52864168663640389a0f107e1bf8a202654a8b479c92bf5126354d360adcae45a9b4596da7cff2e412fee88ed3622870c4e2bb18eca97466b4ede28baa2a08 SHA512 fcb2549c22974712e129306b472c1a32466c50add85eee9a558582697c7ece26cb7a1db6da6aaceedb8bfd134d1213090c158db510fe53ddbe201bba6bd22c68
+DIST http-4.0.0.gem 72704 BLAKE2B 6a7abec739f545e96b013d4bc10b11acd2cd6e336032cab08977476a0c50b73993ba9c8d46b68c7f891ae6129cddc5566bcdc16cc958b16a2241a5fdc1d2bc8c SHA512 78fee306d0d53068b8082bffc766cb12c8d1a030407648af6c4471cab9d63e2c55e75c9546b684bcaabc795c04b76b91c562e4969e597ec70aed0e16052586b1
 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.2.ebuild 1232 BLAKE2B c15bb91342baa306872e609cae8546b30ebedaa8c0388859f94c597b3a3fdfb08f50cb60e14cbe8df34cb8c0389a283f60a0beaf303068fc38417e62ef2e7222 SHA512 e24e112a1ab81d744c8046561c1314b57439c67654250542cae7921e7fefbf716610e1bd3775936fdcfe8db0c9c72b56c8b12a4229c5ae342d1a916675c3d3a6
-EBUILD http-3.3.0.ebuild 1222 BLAKE2B dd511f94e713b5974f0302cc41ab6f430d95e57bb55fd212bd8d8350739f9c4c9448dc0cd7784f01de3ba966a6f7d0c7b2e1a583f46f2456255f5920815fec55 SHA512 edd2b91ce30508a694a4442d603280974c52ef3472cbb013b242568bf6001e7bc31ea61e329dbf386d30bb81693dd8bf64eeee718c4700464ce399a123c9104b
+EBUILD http-3.3.0.ebuild 1218 BLAKE2B a32f6249049741bee06b42d8c9d044b9fef9c9922141a9413dfc115b55eae9f57b4ec23be0471d272ad6e7316198e485238aaa9464bf9e070bef7fcd9be32334 SHA512 52656d11af2569625bffd37e012412d465564662ae0986ceb5b2e8f375050937a0078e617df210dc615b9a7e0de3059ea6b8a1cb7c7883b9f1083145b07ff81c
+EBUILD http-4.0.0.ebuild 1337 BLAKE2B 3e12358f958c8459d7cb5abbe7249777c0f786ab02cdd1c943ef12b67b092e80fec9b61fffea787728325e75483bbb6dab4d7d1eb1010d631a498f6b38618665 SHA512 912fc5223f048e83d0790c1798f568620a77afd2ec812ac28cac7cbae6d396314076a7b5560be664996f26dfbe576e12031df69e6edcc6cfd232400146f93b95
 MISC metadata.xml 339 BLAKE2B 2508769568914caafa01e9e8e6517a7cf9c1733c772b3c605c8dbb056efb8dca3be9525e1ba2ac610bd6d5b5dc02b7625f3569dce0597444240bc2ed8d8449c2 SHA512 9b43a2f61eea32941c251429694bcfe432f284527c332efdaf4187c9ad8c6f53cd924421ca9d56cefce75cbaff104d4f7579790fe09b45a4cced06bedc44d1c1
diff --git a/dev-ruby/http/http-1.0.2.ebuild b/dev-ruby/http/http-1.0.2.ebuild
deleted file mode 100644
index 87918b72d2cf..000000000000
--- a/dev-ruby/http/http-1.0.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An easy-to-use client library for making requests from Ruby"
-HOMEPAGE="https://github.com/tarcieri/http"
-
-LICENSE="MIT"
-SLOT="1.0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/addressable-2.3
-	>=dev-ruby/http-cookie-1.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*"
-
-ruby_add_bdepend "
-	test? ( dev-ruby/certificate_authority dev-ruby/rspec-its )"
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/,/end/ s:^:#:' \
-		-e '1irequire "cgi"' spec/spec_helper.rb || die
-
-	# Avoid specs that require network access
-	sed -i -e '/.persistent/,/^  end/ s:^:#:' \
-		spec/lib/http_spec.rb || die
-	sed -i -e '/with non-ASCII URLs/,/^    end/ s:^:#:' \
-		spec/lib/http/client_spec.rb || die
-}
diff --git a/dev-ruby/http/http-3.3.0.ebuild b/dev-ruby/http/http-3.3.0.ebuild
index 935b12a363df..eae8208b0eb9 100644
--- a/dev-ruby/http/http-3.3.0.ebuild
+++ b/dev-ruby/http/http-3.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/tarcieri/http"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/http/http-2.2.2.ebuild b/dev-ruby/http/http-4.0.0.ebuild
index d7ce2c5a9579..13986498f7d1 100644
--- a/dev-ruby/http/http-2.2.2.ebuild
+++ b/dev-ruby/http/http-4.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -15,14 +15,14 @@ DESCRIPTION="An easy-to-use client library for making requests from Ruby"
 HOMEPAGE="https://github.com/tarcieri/http"
 
 LICENSE="MIT"
-SLOT="2.0"
+SLOT="4"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
 IUSE=""
 
 ruby_add_rdepend "
-	>=dev-ruby/addressable-2.3
-	>=dev-ruby/http-cookie-1.0
-	>=dev-ruby/http-form_data-1.0.1:1.0
+	>=dev-ruby/addressable-2.3:0
+	>=dev-ruby/http-cookie-1.0:0
+	dev-ruby/http-form_data:2
 	>=dev-ruby/http_parser_rb-0.6.0 =dev-ruby/http_parser_rb-0.6*"
 
 ruby_add_bdepend "
@@ -39,5 +39,8 @@ 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
+
+	# Fix spec for production release
+	sed -i -e '/User-Agent:/ s/.dev//' spec/lib/http/features/logging_spec.rb || die
 }