[gentoo-commits] repo/gentoo:master commit in: dev-haskell/warp/

["Sam James" <sam@gentoo.org>]

commit:     d22bf443c936345e1c1493f9173603f1ab8c488b
Author:     matoro <matoro <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Sun Jul 24 03:27:59 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 24 17:10:46 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d22bf443

dev-haskell/warp: add 3.3.21, drop 3.3.13

Closes: https://github.com/gentoo/gentoo/pull/26561
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-haskell/warp/Manifest                          |  2 +-
 dev-haskell/warp/metadata.xml                      | 12 +++------
 .../{warp-3.3.13.ebuild => warp-3.3.21.ebuild}     | 29 ++++++++++------------
 3 files changed, 17 insertions(+), 26 deletions(-)

diff --git a/dev-haskell/warp/Manifest b/dev-haskell/warp/Manifest
index 1a02783b51c7..a94001ab80a3 100644
--- a/dev-haskell/warp/Manifest
+++ b/dev-haskell/warp/Manifest
@@ -1 +1 @@
-DIST warp-3.3.13.tar.gz 64719 BLAKE2B f9430b22fed524cfa8b90ec3ead31f8c86c74a5b5b967503dcc682a31da8880814856f37c4612d16a873ecdb6faf21dbca1af28c1e1f22942fa258c3b828c326 SHA512 ac37e1f274d26b2c846429960074d27010c0864efd87da6d79f03e3f833aca3269176bb99301ab8cb59c4476ff12bae35b26e0fe602e7b0e2cad2837592e07b1
+DIST warp-3.3.21.tar.gz 66529 BLAKE2B e8de94a4695c42a7620c1afa1a38225f6c26fc454235e941e34b65929a733e160781d895335d0ab48c4d7db25aa650d50e1d84a3ef83daf62b22f409c2045d48 SHA512 7f181669d9f10f88d14f8f1dc3acb6c08f41c8f4565f371f7fe4b89b3fde411a0190e50f003b07a239ba25ea71dbafaa16cb9e77effbe574bec929ea29646f37

diff --git a/dev-haskell/warp/metadata.xml b/dev-haskell/warp/metadata.xml
index e7c2731d2b2e..df109f49ed5d 100644
--- a/dev-haskell/warp/metadata.xml
+++ b/dev-haskell/warp/metadata.xml
@@ -1,18 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		The premier WAI handler. For more information, see &lt;http://steve.vinoski.net/blog/2011/05/01/warp-a-haskell-web-server/&gt;.
-	</longdescription>
 	<use>
-		<flag name="allow-sendfilefd">Allow use of sendfileFd (not available on GNU/kFreeBSD).</flag>
-		<flag name="warp-debug">Add additional debuging information</flag>
+		<flag name="allow-sendfilefd">Allow use of sendfileFd (not available on GNU/kFreeBSD)</flag>
+		<flag name="x509">Adds a dependency on the x509 library to enable getting TLS client certificates.</flag>
 	</use>
-	<upstream>
-		<remote-id type="github">yesodweb/wai</remote-id>
-	</upstream>
 </pkgmetadata>

diff --git a/dev-haskell/warp/warp-3.3.13.ebuild b/dev-haskell/warp/warp-3.3.21.ebuild
similarity index 71%
rename from dev-haskell/warp/warp-3.3.13.ebuild
rename to dev-haskell/warp/warp-3.3.21.ebuild
index 23fad6252f66..71a0e7aea898 100644
--- a/dev-haskell/warp/warp-3.3.13.ebuild
+++ b/dev-haskell/warp/warp-3.3.21.ebuild
@@ -1,9 +1,9 @@
 # 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.4.9999
+# ebuild generated by hackport 0.7.1.1.9999
 #hackport: flags: -network-bytestring
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
@@ -16,39 +16,35 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="+allow-sendfilefd warp-debug"
+IUSE="+allow-sendfilefd debug +x509"
 
-RESTRICT=test # requires network
-
-RDEPEND="dev-haskell/async:=[profile?]
-	>=dev-haskell/auto-update-0.1.3:=[profile?] <dev-haskell/auto-update-0.2:=[profile?]
+RDEPEND=">=dev-haskell/auto-update-0.1.3:=[profile?] <dev-haskell/auto-update-0.2:=[profile?]
 	<dev-haskell/bsb-http-chunked-0.1:=[profile?]
 	>=dev-haskell/case-insensitive-0.2:=[profile?]
 	dev-haskell/hashable:=[profile?]
 	dev-haskell/http-date:=[profile?]
 	>=dev-haskell/http-types-0.12:=[profile?]
-	>=dev-haskell/http2-2.0:=[profile?] <dev-haskell/http2-2.1:=[profile?]
+	>=dev-haskell/http2-3.0:=[profile?] <dev-haskell/http2-3.1:=[profile?]
 	>=dev-haskell/iproute-1.3.1:=[profile?]
 	>=dev-haskell/network-2.3:=[profile?]
-	dev-haskell/semigroups:=[profile?]
 	>=dev-haskell/simple-sendfile-0.2.7:=[profile?] <dev-haskell/simple-sendfile-0.3:=[profile?]
 	>=dev-haskell/stm-2.3:=[profile?]
 	>=dev-haskell/streaming-commons-0.1.10:=[profile?]
-	dev-haskell/text:=[profile?]
 	dev-haskell/time-manager:=[profile?]
 	>=dev-haskell/unix-compat-0.2:=[profile?]
+	dev-haskell/unliftio:=[profile?]
 	>=dev-haskell/vault-0.3:=[profile?]
 	>=dev-haskell/wai-3.2:=[profile?] <dev-haskell/wai-3.3:=[profile?]
 	dev-haskell/word8:=[profile?]
-	dev-haskell/x509:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
+	>=dev-lang/ghc-8.6.3:=
+	x509? ( dev-haskell/x509:=[profile?] )
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-	test? ( >=dev-haskell/hspec-1.3
+	>=dev-haskell/cabal-2.4.0.1
+	test? ( dev-haskell/async
+		>=dev-haskell/hspec-1.3
 		dev-haskell/http-client
 		dev-haskell/hunit
-		>=dev-haskell/lifted-base-0.1
 		dev-haskell/quickcheck )
 "
 
@@ -56,5 +52,6 @@ src_configure() {
 	haskell-cabal_src_configure \
 		$(cabal_flag allow-sendfilefd allow-sendfilefd) \
 		--flag=-network-bytestring \
-		$(cabal_flag warp-debug warp-debug)
+		$(cabal_flag debug warp-debug) \
+		$(cabal_flag x509 x509)
 }