gentoo auto-resync : 23:07:2022 - 14:50:52

4 files changed, 68 insertions, 37 deletions

diff --git a/dev-haskell/http/Manifest b/dev-haskell/http/Manifest
index 50499d94dad5..955368845ec9 100644
--- a/dev-haskell/http/Manifest
+++ b/dev-haskell/http/Manifest
@@ -1,3 +1,5 @@
-DIST HTTP-4000.3.14.tar.gz 72938 BLAKE2B d1e24a693d5a63d6ff493766e959447e29c6371854360645f398e4b17f807de3d1ffc4716136fcaeb60f4157bd7622b3d8c30269a98ad7ebecf5f3521e292c03 SHA512 bcc9107412f3ff5806369675ae6cfd87c4ecc36490eab6d62c697f47e62ff8b0d1d6a25f9bfb9d8ef1f037492820eb732cb9cbec7ea9e7e4b20699573077b064
-EBUILD http-4000.3.14.ebuild 1852 BLAKE2B 3899ac0746efa3f2670a9d23ef6a1a5aee738ca4c88b5dcb358d639deff3150ed7904496f952a3d776bc4945b75a8e57e124777141b1a99c360b9c5a218f4f70 SHA512 b94a4c6605121be20e8aecb08814a5b5cb4931d6f56d2e2461d3f39f2ca113b71e6f8cb26bf1a631821e7ea8de583a41e66956ec447156baef63accbdf8c36e2
-MISC metadata.xml 2130 BLAKE2B da568c5e9816455abe877e1b4868a243d2962bc8ead519a93518907ef13150994cd3193ba2585b728b60b0cca4fa24a0ac0d0415609cddd32f6343df3dd69f6e SHA512 9b11488b2d702fbc090fd4acc038841fa7ccbbfa862c5c7209cd1e94b658091729ed28b5d9b95fdd040ce39f734910b2762f0eac12fe954696b3fe0dfc89b747
+DIST HTTP-4000.3.16.tar.gz 74516 BLAKE2B a02f66ac69f3e039e465744876b53b94791ca556c90dd13486ccc38138167ef66dedbe985615b62a2a66304b3970643fed4dd268ae9ada2619d373021bd2da97 SHA512 b5136b55967d4db7569a0269b429c8e419878acc548d962af94efa5aa0ddbb8a6ab22bc3096ce3d78b61dc708996c408d4bfa55c6c7fb6c0d915389503cbd755
+DIST HTTP-4000.4.1.tar.gz 74330 BLAKE2B a4efc62f565609efb981c32961ad9fec28246fc67bbbc3da2c8430b7f4c2a96ee378b12b4f6f5f268353db870949cc6b04a9d8489c8f2bee70d783651a2bafc5 SHA512 c1edc529032013391263bcc0f8abd9534fc53a617b5033dfdc478318465cd988732b2644c7144979156c62bd1a08b1ace507b4fb4e2806f22ec7696cbdfd0147
+EBUILD http-4000.3.16.ebuild 1434 BLAKE2B 5e57acc86ca30e67d1d386494aadb460ec5bea4af422a2eb0ec2f8293fd871b479877625e3ec7e5d8dbe513fb34bbfd67eab08f4af7f644df129cdf1dc43c4ca SHA512 1a347de2f2df7321b00130239229f838b8b1053bfa86b2ff491ccb8cf4e6b0466bb0be6ce42d332c3121bb33b87e66d0aff5e4d2c313b7b2f0c7b1f368be93d1
+EBUILD http-4000.4.1.ebuild 1436 BLAKE2B 2c1f0fd07b03c7f5b273479d132389419e67f1b0b4db0ae6849a240022baf5d769ac11756f63fea5c586e43b01c29f1f7c1ba87793077727b3d97320b4278d49 SHA512 e03e3d3f8168b9e437d112f61d03fdfc0adf4a03bc257256832d97f7eac009d10d4676de3c7b90176394a310be12e68a39c4018a8487885caec3ab0b29680f3c
+MISC metadata.xml 1921 BLAKE2B 85057698a772ab77a8760ae7f5b9642dc9b6ed4ba2c9a5c334520223a84b4847071c332377b2529f2614f21022cad639d4456acf2ba34f83a50f9508685519ae SHA512 14bab08c037b6405fe99ad2dbbc5ca894f5b6bd2cd509d8c02d6cf61bfd7a29d7b5b63b40952cc662f513b75f7494e88a81e5505ba2249399c49e37602bb0699
diff --git a/dev-haskell/http/http-4000.3.14.ebuild b/dev-haskell/http/http-4000.3.16.ebuild
index c2e843e563e2..858fd331b35f 100644
--- a/dev-haskell/http/http-4000.3.14.ebuild
+++ b/dev-haskell/http/http-4000.3.16.ebuild
@@ -1,16 +1,17 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-# ebuild generated by hackport 0.6.9999
-#hackport: flags: -warp-tests,-mtl1,-warn-as-error,-old-base,-network23
+# ebuild generated by hackport 0.6.7.9999
+#hackport: flags: -warp-tests,-mtl1,-warn-as-error,-old-base,-network23,+network-uri,-conduit10
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
 MY_PN="HTTP"
 MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="A library for client-side HTTP"
 HOMEPAGE="https://github.com/haskell/HTTP"
@@ -19,19 +20,13 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 LICENSE="BSD"
 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:=
-	network-uri? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-3.2:=[profile?]
-			>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
-	!network-uri? ( >=dev-haskell/network-2.4:=[profile?] <dev-haskell/network-2.6:=[profile?] )
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+	>=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-3.2:=[profile?]
+	>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?]
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
+	>=dev-haskell/cabal-2.2.0.1
 	test? ( >=dev-haskell/httpd-shed-0.4 <dev-haskell/httpd-shed-0.5
 		>=dev-haskell/hunit-1.2.0.1 <dev-haskell/hunit-1.7
 		>=dev-haskell/puremd5-0.2.4 <dev-haskell/puremd5-2.2
@@ -40,20 +35,11 @@ DEPEND="${RDEPEND}
 		>=dev-haskell/test-framework-hunit-0.3.0 <dev-haskell/test-framework-hunit-0.4 )
 "
 
-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) \
+		--flag=-conduit10 \
 		--flag=-mtl1 \
-		$(cabal_flag network-uri network-uri) \
+		--flag=network-uri \
 		--flag=-network23 \
 		--flag=-old-base \
 		--flag=-warn-as-error \
diff --git a/dev-haskell/http/http-4000.4.1.ebuild b/dev-haskell/http/http-4000.4.1.ebuild
new file mode 100644
index 000000000000..cf5e8423a02d
--- /dev/null
+++ b/dev-haskell/http/http-4000.4.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.2.9999
+#hackport: flags: -warp-tests,-mtl1,-warn-as-error,-old-base,-network23,+network-uri,-conduit10
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+MY_PN="HTTP"
+MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="A library for client-side HTTP"
+HOMEPAGE="https://github.com/haskell/HTTP"
+SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-3.2:=[profile?]
+	>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( >=dev-haskell/httpd-shed-0.4 <dev-haskell/httpd-shed-0.5
+		>=dev-haskell/hunit-1.2.0.1 <dev-haskell/hunit-1.7
+		>=dev-haskell/puremd5-0.2.4 <dev-haskell/puremd5-2.2
+		>=dev-haskell/split-0.1.3 <dev-haskell/split-0.3
+		>=dev-haskell/test-framework-0.2.0 <dev-haskell/test-framework-0.9
+		>=dev-haskell/test-framework-hunit-0.3.0 <dev-haskell/test-framework-hunit-0.4 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-conduit10 \
+		--flag=-mtl1 \
+		--flag=network-uri \
+		--flag=-network23 \
+		--flag=-old-base \
+		--flag=-warn-as-error \
+		--flag=-warp-tests
+}
diff --git a/dev-haskell/http/metadata.xml b/dev-haskell/http/metadata.xml
index b45d3251d695..35fde4e13547 100644
--- a/dev-haskell/http/metadata.xml
+++ b/dev-haskell/http/metadata.xml
@@ -10,19 +10,19 @@
 		HTTP connections, transmitting requests and processing the responses coming back, all
 		from within the comforts of Haskell. It's dependent on the network package to operate,
 		but other than that, the implementation is all written in Haskell.
-		
+
 		A basic API for issuing single HTTP requests + receiving responses is provided. On top
 		of that, a session-level abstraction is also on offer  (the @BrowserAction@ monad);
 		it taking care of handling the management of persistent connections, proxies,
 		state (cookies) and authentication credentials required to handle multi-step
 		interactions with a web server.
-		
+
 		The representation of the bytes flowing across is extensible via the use of a type class,
 		letting you pick the representation of requests and responses that best fits your use.
 		Some pre-packaged, common instances are provided for you (@ByteString@, @String@.)
-		
+
 		Here's an example use:
-		
+
 		&gt;
 		&gt;    do
 		&gt;      rsp &lt;- Network.HTTP.simpleHTTP (getRequest "http://www.haskell.org/")
@@ -35,13 +35,9 @@
 		&gt;               request $ getRequest "https://google.com/"
 		&gt;      fmap (take 100) (getResponseBody rsp)
 		&gt;
-		
+
 		Git repository available at &lt;https://github.com/haskell/HTTP.git&gt;
 	</longdescription>
-	<use>
-		<flag name="conduit10">Use version 1.0.x or below of the conduit package (for the test suite).</flag>
-		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">haskell/HTTP</remote-id>
 	</upstream>