gentoo resync : 25.08.2020

4 files changed, 15 insertions, 6 deletions

diff --git a/dev-haskell/http/Manifest b/dev-haskell/http/Manifest
index aaeed266a5e8..45dcbb86fe67 100644
--- a/dev-haskell/http/Manifest
+++ b/dev-haskell/http/Manifest
@@ -4,10 +4,10 @@ DIST HTTP-4000.2.22.tar.gz 71609 BLAKE2B 06bee2b2d43f1dd088fc0ab528bb0009890b257
 DIST HTTP-4000.2.8.tar.gz 67903 BLAKE2B f94713b1a7e6f5bca23b0c59a86b6c6672d2f49bb527f30da631b3fb8521fcf772244e2277f8389853f62c040d9d3a80cc0824d294afb420eac92a29f530608d SHA512 f7ada9000837a06ce06f9d6aaf83158d48fa5bb4fea812d093eece3b36e9bd4b25df205948c66a4e4b60df3ceb41181f4bdf13415e86ec805239f43421518872
 DIST HTTP-4000.3.14.tar.gz 72938 BLAKE2B d1e24a693d5a63d6ff493766e959447e29c6371854360645f398e4b17f807de3d1ffc4716136fcaeb60f4157bd7622b3d8c30269a98ad7ebecf5f3521e292c03 SHA512 bcc9107412f3ff5806369675ae6cfd87c4ecc36490eab6d62c697f47e62ff8b0d1d6a25f9bfb9d8ef1f037492820eb732cb9cbec7ea9e7e4b20699573077b064
 DIST HTTP-4000.3.5.tar.gz 71718 BLAKE2B 3838c286001bef88fe4b1834bf9e924ab84057fdef1906735e5049123c3694fded687099c7c4e6cd1ad71a1193f301ee0ffec59141ee7a6997abe8efacc9ae35 SHA512 9abfbac7796c21a01828c686500ec0fa81d0ad23b8139e3f64a41dfd62a3ecf345573831f5a304390dab057687d73e5cd49507a4efeb4bc9371558e8c1676653
-EBUILD http-4000.2.17.ebuild 1567 BLAKE2B 6aa842f4ebd5f20ec415e06b6a65298ea462384345bfccf0bf26c0aa20c0c24a3c702a6bfdebdfb445224d4b1c9f6f204d42b39338a6784808fae691452608b5 SHA512 c80f8a53211c35aa5e0548ae2db985353e70e70df46732a810ab10de8514dced395758a286c289d650e8693d1e1aae2ea89787e561738aae9c6e233ef92cc7b0
+EBUILD http-4000.2.17.ebuild 1555 BLAKE2B 1892ff48674855d62cbd0ffc9ba0e35688be09d69c3f4f154921327d3c713f307fe68eaa482a5b3d5d2cbcbfa4aae9dbbf812ac8603e5c5c8d97f3c5cc3e011c SHA512 a36b4dba3978fdb05ffee9ab4c05c1eeaa7667a38505dae87229cdba85e20a6378ef8ab8aa09d139b13d7d161dafef63d941162f8d46faf5a814cab21af2eeb9
 EBUILD http-4000.2.20.ebuild 1823 BLAKE2B 3800ac75f245c58128be89da500fd7291203102678e9c0ee3f3c75b0eb7470be07654841c02a6ba6a8a3c842044bac82375a9ce5f608eec23049d83a872794df SHA512 77ae8040317aabcc5a40d0b40fd544b5f0e321e95c1739f90af4a2faa59994ad8ae368439bb5209dd1cd935d0b96b8f99e736db34f29235bfdb8e6ccccd5dc40
 EBUILD http-4000.2.22.ebuild 1827 BLAKE2B 044313e1a09269974c809292d9591fd0027c1d0368aa22b8b7e106cee6a3e2391e5b5ef780b25e36c4e401b95f299184910f972eafdfe686bb9cdf089a8d06ac SHA512 c2210d20ba75d36eba64bef7b0b33a6ea769b6fe5556648ccfd33e4ea8c8ee09d19e83b559d3e9ee4b94e5ed1d7d6594bd4bba9d05814a6fd7ccc7c07801b482
-EBUILD http-4000.2.8.ebuild 1597 BLAKE2B 40f55f638fe9ee677a57801802538010a334a15c7f8a8b0b1c698840186f4b7e2cb8899282ab1e2b7e6fdbd876cea7b7b90394ad2064c8a4c54f1d7f80d216b0 SHA512 11bde48005ad36921edc12eca3e8e3db1a3023d448cbdaa260fd52855ede20a21d76a2b79c4156f9f281f27bce640da66daa1104c4782b089440083b61111032
-EBUILD http-4000.3.14.ebuild 1725 BLAKE2B c776222548580cd98fccae313fd7f51120ccffc1cbad34d5c96a8e3c04c6b1df80c7ea3292291a5b1f81d029147354063557103ad7e0f44310c32ffdad1b0022 SHA512 0f5a0b5f4261e1f4fe6a8c5ae8229b0fc1cea0e3ab3ddd421b74ad791d98e29e5007ba70bf7081c8d38f8479f91bfc29c4ae3a42f4dc8736efea767bc66cd325
+EBUILD http-4000.2.8.ebuild 1585 BLAKE2B 4082f8b24e9e7501f44f54d236d95baaeccebe6d28c2484c40a92ce1657bd8c671e88fc92071c4a9790ea595e057c48dd5d2facc40faf7afebac7c7d30a896b1 SHA512 09cc49dd8838f4df4ed2975b40e888ed23e97fb068dec417d852575af2dbcb4e4e62b6f7113f2fe3ff1d41c7e7da8108942b5ccb06bcca4f25a8c33147bc93f8
+EBUILD http-4000.3.14.ebuild 1852 BLAKE2B 3899ac0746efa3f2670a9d23ef6a1a5aee738ca4c88b5dcb358d639deff3150ed7904496f952a3d776bc4945b75a8e57e124777141b1a99c360b9c5a218f4f70 SHA512 b94a4c6605121be20e8aecb08814a5b5cb4931d6f56d2e2461d3f39f2ca113b71e6f8cb26bf1a631821e7ea8de583a41e66956ec447156baef63accbdf8c36e2
 EBUILD http-4000.3.5.ebuild 1755 BLAKE2B 9f164bef799a7b2a0c171046034cfc5d4da81669bf951bf51baba4e162925157f776d7990540983123bab11057d7d49bcb391f2e2a785333b608f8af9fe32abd SHA512 6d265117779af058a440c8b8d0d563aa4f55bdc082497c24fbeae897129a7132a161a876acaa6e47505cf6118dd39a72b356f8b8e074f1ae08d5bcc3762312ef
 MISC metadata.xml 2129 BLAKE2B fcca60629e838303b2e2a690253d81709730e1b2db996f983e083079aa7beec30d0885d2b1066c335e5ed1032f9c11bddfd1d0de11014a9f1958a0c6b1d4c714 SHA512 f9571e122a4ba9ca247f51c7900621dae1831fe15f6dd298b8592291c53fbe4dab61caf975b3c4ff7d0e12991904d5eb298c5c5f3e1d2294a80ade4e93455af3
diff --git a/dev-haskell/http/http-4000.2.17.ebuild b/dev-haskell/http/http-4000.2.17.ebuild
index 44434b24e9d8..29ebc488b254 100644
--- a/dev-haskell/http/http-4000.2.17.ebuild
+++ b/dev-haskell/http/http-4000.2.17.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x86-macos"
 IUSE=""
 RESTRICT=test # missing ia64 alpha keywords for dev-haskell/puremd5
 
diff --git a/dev-haskell/http/http-4000.2.8.ebuild b/dev-haskell/http/http-4000.2.8.ebuild
index f48253dfe4e1..8dcc8bd7810a 100644
--- a/dev-haskell/http/http-4000.2.8.ebuild
+++ b/dev-haskell/http/http-4000.2.8.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x86-macos"
 # hackport-args: --always-disabled='mtl1 network23 old-base warn-as-error'
 IUSE=""
 
diff --git a/dev-haskell/http/http-4000.3.14.ebuild b/dev-haskell/http/http-4000.3.14.ebuild
index 3d0ac020959f..c2e843e563e2 100644
--- a/dev-haskell/http/http-4000.3.14.ebuild
+++ b/dev-haskell/http/http-4000.3.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,6 +21,8 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="conduit10 +network-uri"
 
+RESTRICT=test # requires network
+
 RDEPEND=">=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
 	>=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
 	>=dev-lang/ghc-7.4.1:=
@@ -40,6 +42,13 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'base >= 4.3.0.0 && < 4.14' 'base >= 4.3.0.0'
+}
+
 src_configure() {
 	haskell-cabal_src_configure \
 		$(cabal_flag conduit10 conduit10) \