gentoo auto-resync : 30:07:2022 - 09:09:33

3 files changed, 35 insertions, 45 deletions

diff --git a/dev-haskell/snap-server/Manifest b/dev-haskell/snap-server/Manifest
index 795cb0da3a3c..e67e20fa7528 100644
--- a/dev-haskell/snap-server/Manifest
+++ b/dev-haskell/snap-server/Manifest
@@ -1,3 +1,3 @@
-DIST snap-server-1.1.1.2.tar.gz 73645 BLAKE2B 29215ce7f542c56be40ce40711f04f7f0b2ccb568903483dbf99950b3ec7703505440cabcf70d0c6084991fe09931e6312b59b48da5511b407df02318b551600 SHA512 a11bb92ce8774269704ce8c045bddf4aad15816cfb447453e8010bfce7aff2a08b38d3c99a400ab3882cb9e0b2f0b1f9af69adc56c1b28df53dc3fdd44042e30
-EBUILD snap-server-1.1.1.2.ebuild 3159 BLAKE2B 123e1ff8719f6d9ccb18e73f26702c05b53dfc535fe301209f717b8f7c95001a57d440fe0e4a27b9268a9d3a6ce34e1eeaa2d7fd47dc51fbace8581191a47617 SHA512 8f7e4bc4764de4b8bad79ff93e7d3ef7eead6ad916cc73723ad7d5d71f248a04c1d2d44e0e8dcc0f4c5c6afa248052b0dad50e554aaeb280633d752efded1fea
-MISC metadata.xml 1428 BLAKE2B 5fbb5b85e3cd6bbdbaef2b778337b5a44557202861a9e12842f42e27fb3b3f52f9550d5552b55c1259156f762d9fbc4cf5e58b7584bd6d092facf59aaf923714 SHA512 22a9fedaaeaaf2c51329c6b48f415bb2aedb4858cf72d5b951e8bc9f5bc820c7e02eab6fff080e24c86a679a134b51e3a22bc0ff89eec9799ab823e57cd79a8f
+DIST snap-server-1.1.2.0.tar.gz 73795 BLAKE2B 878a5967e0929cf84a17ba0fa6f5d2da7b3606aeceffc807dfad916724bae35a751d21f5081f151d7c6d335cf1dec2196197bc452d55e3b31df183b917a52ca3 SHA512 da17f988a364e6c04b29020a9e27fa5d8b98fe890577cb6ca4ee4cc3df016ac6a9ea6d8ffcae564f25efa0362f3bd454f72ad3344f7571ccaa620c6c1bf57665
+EBUILD snap-server-1.1.2.0.ebuild 2540 BLAKE2B 3a263e74b717c5ff05efa6770776ed178c9e17478f3a4c7cd77e54da67e327f0e1ab64737bee1422c152a2025567db186b44c2d67af8309ef651ea18445894d2 SHA512 f4431b1eb12066aa8b598582f11d9c899efb02cd33bd8c581ee21e8d87140a057ae0575d400782239dca0b54f714805b075de11dd18bfaf8f2416965e195415e
+MISC metadata.xml 1080 BLAKE2B e3937f4eb4368ea479fa5953f77341222c601f4b4673581953ece99ad8823ac2f17908fec1ad97ec0d22026dcd495e971eb00494d606a8eed940415d241fa1a1 SHA512 aa1037f397cc57afc4f51e9db8d31787d5d6a2414eb3749d25cc10d0e7a5c270d6dfe027b80ef7d18a49b09fc52f91dce24145f4b148f4e072500d13ff546b94
diff --git a/dev-haskell/snap-server/metadata.xml b/dev-haskell/snap-server/metadata.xml
index c02d9d573bff..475be8193364 100644
--- a/dev-haskell/snap-server/metadata.xml
+++ b/dev-haskell/snap-server/metadata.xml
@@ -6,27 +6,19 @@
 		<name>Gentoo Haskell</name>
 	</maintainer>
 	<use>
-		<flag name="build-pong">Build a server that just returns "PONG"</flag>
-		<flag name="openssl">enable https support using <pkg>dev-haskell/hsopenssl</pkg></flag>
-		<flag name="portable">no non-haskell unportable code.</flag>
+		<flag name="debug">Enable support for debugging.</flag>
+		<flag name="openssl">Enable https support using the HsOpenSSL library.</flag>
+		<flag name="pong-server">Build a server that just returns "PONG". Normally useful only for benchmarks.</flag>
+		<flag name="test-server">Build the blackbox testserver</flag>
 	</use>
 	<longdescription>
 		Snap is a simple and fast web development framework and server written in
 		Haskell. For more information or to download the latest version, you can
 		visit the Snap project website at &lt;http://snapframework.com/&gt;.
 		
-		The Snap HTTP server is a high performance, epoll-enabled, iteratee-based web
-		server library written in Haskell. Together with the @snap-core@ library upon
-		which it depends, it provides a clean and efficient Haskell programming
-		interface to the HTTP protocol.
-		
-		Higher-level facilities for building web applications (like user/session
-		management, component interfaces, data modeling, etc.) are planned but not
-		yet implemented, so this release will mostly be of interest for those who:
-		
-		* need a fast and minimal HTTP API at roughly the same level of abstraction
-		as Java servlets, or
-		
-		* are interested in contributing to the Snap Framework project.
+		The Snap HTTP server is a high performance web server library written in
+		Haskell. Together with the @snap-core@ library upon which it depends, it
+		provides a clean and efficient Haskell programming interface to the HTTP
+		protocol.
 	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/snap-server/snap-server-1.1.1.2.ebuild b/dev-haskell/snap-server/snap-server-1.1.2.0.ebuild
index 4cebd1763301..7b95498faafa 100644
--- a/dev-haskell/snap-server/snap-server-1.1.1.2.ebuild
+++ b/dev-haskell/snap-server/snap-server-1.1.2.0.ebuild
@@ -1,23 +1,24 @@
-# 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.5.9999
+# ebuild generated by hackport 0.6.7.9999
+#hackport: flags: -portable,build-pong:pongserver,build-testserver:test-server
 
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # Fail to build: test-suite"
 inherit haskell-cabal
 
-DESCRIPTION="A fast, iteratee-based, epoll-enabled web server for the Snap Framework"
+DESCRIPTION="A web server for the Snap Framework"
 HOMEPAGE="http://snapframework.com/"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="build-pong debug openssl portable"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="debug openssl pong-server test-server"
 
-RDEPEND=">=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
+RDEPEND=">=dev-haskell/attoparsec-0.12:=[profile?]
 	>=dev-haskell/blaze-builder-0.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
 	>=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?]
 	>=dev-haskell/case-insensitive-1.1:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
@@ -28,36 +29,33 @@ RDEPEND=">=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:
 	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
 	>=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-3.2:=[profile?]
 	>=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
-	>=dev-haskell/semigroups-0.16:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
 	>=dev-haskell/snap-core-1.0:=[profile?] <dev-haskell/snap-core-1.1:=[profile?]
 	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
 	>=dev-haskell/unix-compat-0.2:=[profile?] <dev-haskell/unix-compat-0.6:=[profile?]
 	>=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.13:=[profile?]
-	>=dev-lang/ghc-7.6.2:=
+	>=dev-lang/ghc-7.8.2:=
 	openssl? ( >=dev-haskell/hsopenssl-0.10.4:=[profile?] <dev-haskell/hsopenssl-0.12:=[profile?]
 			>=dev-haskell/openssl-streams-1.1:=[profile?] <dev-haskell/openssl-streams-1.3:=[profile?] )
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( >=dev-haskell/base16-bytestring-0.1 <dev-haskell/base16-bytestring-0.2
-		>=dev-haskell/http-common-0.7 <dev-haskell/http-common-0.9
-		>=dev-haskell/http-streams-0.7 <dev-haskell/http-streams-0.9
-		>=dev-haskell/hunit-1.2 <dev-haskell/hunit-2
-		>=dev-haskell/monad-control-1.0 <dev-haskell/monad-control-1.1
-		>=dev-haskell/parallel-3 <dev-haskell/parallel-4
-		>=dev-haskell/quickcheck-2.3.0.2 <dev-haskell/quickcheck-3
-		>=dev-haskell/random-1.0 <dev-haskell/random-1.2
-		>=dev-haskell/test-framework-0.8.0.3 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.2.7 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.2.12.1 <dev-haskell/test-framework-quickcheck2-0.4
-		>=dev-haskell/threads-0.5 <dev-haskell/threads-0.6
-		>=dev-haskell/transformers-0.3 <dev-haskell/transformers-0.6 )
+	>=dev-haskell/cabal-1.18.1.3
 "
 
+RESTRICT=test # tests need old network
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'base                                >= 4.6      && < 4.15' 'base >= 4.6' \
+		'attoparsec                          >= 0.12     && < 0.14' 'attoparsec >=0.12'
+}
+
 src_configure() {
 	haskell-cabal_src_configure \
-		$(cabal_flag build-pong build-pong) \
+		$(cabal_flag pong-server build-pong) \
+		$(cabal_flag test-server build-testserver) \
 		$(cabal_flag debug debug) \
 		$(cabal_flag openssl openssl) \
-		$(cabal_flag portable portable)
+		--flag=portable
 }