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

3 files changed, 24 insertions, 64 deletions

diff --git a/dev-haskell/snap-core/Manifest b/dev-haskell/snap-core/Manifest
index 8ac043f582d0..dcc6a4b42cb3 100644
--- a/dev-haskell/snap-core/Manifest
+++ b/dev-haskell/snap-core/Manifest
@@ -1,3 +1,3 @@
-DIST snap-core-1.0.4.2.tar.gz 163146 BLAKE2B 2fc037fa239eed3771c84ede4ed247f34169fb45464f5724e7d770baa0992409eeff4b066a9eaea3cdebf46a9846dd8ac94dab42deb36047bb26654df5642f9b SHA512 42e710ac58a7d3cf58f9fdeca6c9c4880a94765ee0dc42fbcdaf68a6c2c337e1715f8b89863c7f911232af493bf5622b647d4c962237f211f97d731572fd94f5
-EBUILD snap-core-1.0.4.2.ebuild 3274 BLAKE2B 3c8defd45c17501f4c7a8f411d665b2b276496652f9b2bf17c8dbe9975664fbbe114941f592520231eb8d52a760ba867feb87f18622b64e082f1f6dd30e51ce8 SHA512 1e5a3b6eef5c22a8503563ec0cecbcf047c2adae26d9acd3dec4fe60f4abaf7a384817e816f03a3b67405e354090582aaed7bbe8711a14a64b63266224701d26
-MISC metadata.xml 1856 BLAKE2B 0de547b6f37428da5cf4b2898ca2dd47f05173548f2f5a90414a27c912de81bc46faedad8c79584282bad7ae82b64cd72cf4ed864163048231835bb35373aa34 SHA512 54d54c595a5f02b608bfc156f36d46f679874d57e5f669f55019185ee0bc52eddaa78246db02cf1ce181ef9f2ce06585e30e5fed8b2906d8395c50a636aafae2
+DIST snap-core-1.0.5.0.tar.gz 163675 BLAKE2B 24cace660bd43093b1f7cd358e79f3df74d5daff62a2e1c754cbb80ea0631560443f69f5d5d892c0609a881b6c943dddcdb6ab3e9e7a8205c37b6c6465df2ce2 SHA512 4873382625715703531c7cbc61343a29cf7606384e64b92fb2026016018258f5c959ac7dccf0b1093eca39f5b750c19416afc691bec93161fa76ef79a1369b7b
+EBUILD snap-core-1.0.5.0.ebuild 2751 BLAKE2B 4ae51ec92d68b66d24dd8db74021c1d379ab21878ef466d4f89d3f3821e7ed4cb25affb7cb2e466231ee22ec62203193de3bcf645b5ce108cebe371faefc8b9a SHA512 57010247bceb230390679e6d8f3168f07a8a699bcb0a4af1fc2f4f86bc2b58c130e7374d185c00834e55e9ffd9aafda3a61cadc11ecc7a7574897ff104b58c83
+MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/snap-core/metadata.xml b/dev-haskell/snap-core/metadata.xml
index a31266da8cde..937381521944 100644
--- a/dev-haskell/snap-core/metadata.xml
+++ b/dev-haskell/snap-core/metadata.xml
@@ -5,43 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<use>
-		<flag name="portable">No non-haskell unportable code.</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;.
-		
-		This library contains the core definitions and types for the Snap framework,
-		including:
-		
-		1. Primitive types and functions for HTTP (requests, responses, cookies,
-		post/query parameters, etc)
-		
-		2. Type aliases and helper functions for Iteratee I/O
-		
-		3. A monad for programming web handlers called \"Snap\", inspired by
-		happstack's (&lt;http://happstack.com/index.html&gt;), which allows:
-		
-		* Stateful access to the HTTP request and response objects
-		
-		* Monadic failure (i.e. MonadPlus/Alternative instances) for declining
-		to handle requests and chaining handlers together
-		
-		* Early termination of the computation if you know early what you want
-		to return and want to prevent further monadic processing
-		
-		/Quick start/: The 'Snap' monad and HTTP definitions are in "Snap.Core",
-		some iteratee utilities are in "Snap.Iteratee".
-		
-		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.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/snap-core/snap-core-1.0.4.2.ebuild b/dev-haskell/snap-core/snap-core-1.0.5.0.ebuild
index 0d7046af4b4e..c9dddcfd624b 100644
--- a/dev-haskell/snap-core/snap-core-1.0.4.2.ebuild
+++ b/dev-haskell/snap-core/snap-core-1.0.5.0.ebuild
@@ -1,53 +1,45 @@
-# Copyright 1999-2021 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
-#hackport: flags: +network-uri
+# ebuild generated by hackport 0.7.1.1.9999
+#hackport: flags: +network-uri,-portable
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="Snap: A Haskell Web Framework (core interfaces and types)"
-HOMEPAGE="http://snapframework.com/"
+HOMEPAGE="https://snapframework.com/"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug portable"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="debug"
 
-# Fixed in next release: https://github.com/snapframework/snap-core/commit/49a8090d7834a0ef9b438048e96be36e55b2fbf5
-RESTRICT=test # test relied on headers ordering
-
-RDEPEND=">=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
+RDEPEND=">=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.15:=[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?]
-	>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
-	>=dev-haskell/hashable-1.2.0.6:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
+	>=dev-haskell/hashable-1.2.0.6:=[profile?]
 	>=dev-haskell/hunit-1.2:=[profile?] <dev-haskell/hunit-2:=[profile?]
-	>=dev-haskell/io-streams-1.3:=[zlib,profile?] <dev-haskell/io-streams-1.6:=[zlib,profile?]
+	>=dev-haskell/io-streams-1.3:=[profile?] <dev-haskell/io-streams-1.6:=[profile?]
 	>=dev-haskell/lifted-base-0.1:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?]
 	>=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
 	>=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-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?]
 	>=dev-haskell/random-1:=[profile?] <dev-haskell/random-2:=[profile?]
 	>=dev-haskell/readable-0.1:=[profile?] <dev-haskell/readable-0.4:=[profile?]
 	>=dev-haskell/regex-posix-0.95:=[profile?] <dev-haskell/regex-posix-1:=[profile?]
-	>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
 	>=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
 	>=dev-haskell/unix-compat-0.3:=[profile?] <dev-haskell/unix-compat-0.6:=[profile?]
 	>=dev-haskell/unordered-containers-0.1.4.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
 	>=dev-haskell/vector-0.6:=[profile?] <dev-haskell/vector-0.13:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	portable? ( >=dev-haskell/time-locale-compat-0.1:=[profile?] <dev-haskell/time-locale-compat-0.2:=[profile?] )
-	!portable? ( >=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?] )
+	>=dev-lang/ghc-8.4.3:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
+	>=dev-haskell/cabal-2.2.0.1
 	test? ( >=dev-haskell/parallel-3 <dev-haskell/parallel-4
 		>=dev-haskell/quickcheck-2.3.0.2 <dev-haskell/quickcheck-3
 		>=dev-haskell/test-framework-0.8.0.3 <dev-haskell/test-framework-0.9
@@ -56,9 +48,16 @@ DEPEND="${RDEPEND}
 		>=dev-haskell/zlib-0.5 <dev-haskell/zlib-0.7 )
 "
 
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'hashable                  >= 1.2.0.6 && < 1.4' 'hashable >=1.2.0.6'
+}
+
 src_configure() {
 	haskell-cabal_src_configure \
 		$(cabal_flag debug debug) \
 		--flag=network-uri \
-		$(cabal_flag portable portable)
+		--flag=-portable
 }