gentoo resync : 25.08.2020

3 files changed, 63 insertions, 59 deletions

diff --git a/dev-haskell/snap-core/Manifest b/dev-haskell/snap-core/Manifest
index eb4c7e1e193e..bfab2a9d7f1c 100644
--- a/dev-haskell/snap-core/Manifest
+++ b/dev-haskell/snap-core/Manifest
@@ -1,5 +1,5 @@
-DIST snap-core-0.9.8.0.tar.gz 91610 BLAKE2B 291dd696482f3406b58081fc3dede958cd255ef725ee84d0e4706b096c9c468832b99e5e3d61771e0c652cc0463e831a9c7119595328f18443deedd901625417 SHA512 8bf98590294b3f8752255612b90378f19cec14067f2eaddab496cee5fddb4b8be954aada5a7831b81611d7ffc04d74156eb8fdb5d3c5f45e30259c7f86605585
 DIST snap-core-1.0.1.0.tar.gz 139670 BLAKE2B 13c0839ef95b2260e1272dbf26c9ee1f8970094e3f9ffea728d760f4bf11a260ad73120495a39305e8d8d05cb39c230db08ae1e4094efcaf7879acf4680f61c3 SHA512 ed862530f235adca6f193c96d45b31705534089c58637bf8d0d9d8cd898db8f25494990e210151adc737c34e3cc59f5e0a47cc6b1e638dae9104e991e27dbe8b
-EBUILD snap-core-0.9.8.0.ebuild 2577 BLAKE2B e93b3463251861004ad339173bb1cd4ace97d1315d065a10d988055a046101ad7d8a7c0e2631c51324d415ec52f7fd8e81475acf364c3e58f512467afaf70c67 SHA512 0a6606cd65e6d1c80654668c53b7607f190438990a2f2edd4e2776fed5543aea007d101ba272e3caec554f6888cbca51a02cd073700eff7b578d69f638305c80
+DIST snap-core-1.0.4.2.tar.gz 163146 BLAKE2B 2fc037fa239eed3771c84ede4ed247f34169fb45464f5724e7d770baa0992409eeff4b066a9eaea3cdebf46a9846dd8ac94dab42deb36047bb26654df5642f9b SHA512 42e710ac58a7d3cf58f9fdeca6c9c4880a94765ee0dc42fbcdaf68a6c2c337e1715f8b89863c7f911232af493bf5622b647d4c962237f211f97d731572fd94f5
 EBUILD snap-core-1.0.1.0.ebuild 2671 BLAKE2B f640e8beceb73f848807f0114bd9f1ac15afb986d7d3e040297ae16253a4c67c6bb143cd515de0c77d57ec9f9a38cfac892b9d995dd25a262baf908ab1e2e04b SHA512 d11fb28227e34fac77e1353e07d1a4c26ec7d5f02e01a5d0c9a6324d8320a2c97dce7d45183020e4892815c06cd0a03f0960e43ce38a2a4e182e75d3c08816fd
+EBUILD snap-core-1.0.4.2.ebuild 3099 BLAKE2B c431c6bf4612b7b4289b5e88c39dc810262f5bde7897b3f6cdf0af64c57959b1eb4db5a20af4e3530185407ac4c719c5690609d1aa9aa254b210c7575a59b7a9 SHA512 f23a16589c48af3d27920e94dafa57ad9a6ea55748a5bb1a936b6697892d38ff4338e418b3e92191739d7385d618f364f267abc2968386a8133485b6d1abb97e
 MISC metadata.xml 1855 BLAKE2B 061e56d781f921b5ad34683a6c5c2192a282567e5efa39c315c50cdf915032d70c66d8f270c76647b47ad5c9bee1b666305dc3d9fa790c941bb9ecd416fdf792 SHA512 f497be0430344459a95055207a06f9b9b2b33c6a0edc2cff99ad89051a5d8f615258aaf94234689d4443a6d30e0c4a6df1dadeba2fe142b1f0c324932691e66f
diff --git a/dev-haskell/snap-core/snap-core-0.9.8.0.ebuild b/dev-haskell/snap-core/snap-core-0.9.8.0.ebuild
deleted file mode 100644
index 7aaa43d11b24..000000000000
--- a/dev-haskell/snap-core/snap-core-0.9.8.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Snap: A Haskell Web Framework (core interfaces and types)"
-HOMEPAGE="http://snapframework.com/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug portable"
-
-RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
-	>=dev-haskell/attoparsec-enumerator-0.3:=[profile?] <dev-haskell/attoparsec-enumerator-0.4:=[profile?]
-	>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	>=dev-haskell/blaze-builder-enumerator-0.2:=[profile?] <dev-haskell/blaze-builder-enumerator-0.3:=[profile?]
-	>=dev-haskell/case-insensitive-0.3:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
-	>=dev-haskell/enumerator-0.4.15:=[profile?] <dev-haskell/enumerator-0.5:=[profile?]
-	>=dev-haskell/hunit-1.2:=[profile?] <dev-haskell/hunit-2:=[profile?]
-	>=dev-haskell/monadcatchio-transformers-0.2.1:=[profile?] <dev-haskell/monadcatchio-transformers-0.4:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/random-1:=[profile?] <dev-haskell/random-2:=[profile?]
-	>=dev-haskell/regex-posix-0.95:=[profile?] <dev-haskell/regex-posix-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.5:=[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.12:=[profile?]
-	>=dev-haskell/zlib-enum-0.2.1:=[profile?] <dev-haskell/zlib-enum-0.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	>=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	portable? ( >=dev-haskell/time-locale-compat-0.1:=[profile?] <dev-haskell/time-locale-compat-0.2:=[profile?] )
-	!portable? ( >=dev-haskell/bytestring-mmap-0.2.2:=[profile?] <dev-haskell/bytestring-mmap-0.3:=[profile?]
-			>=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'time                      >= 1.0     && < 1.6' 'time                      >= 1.0'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag debug debug) \
-		$(cabal_flag portable portable)
-}
diff --git a/dev-haskell/snap-core/snap-core-1.0.4.2.ebuild b/dev-haskell/snap-core/snap-core-1.0.4.2.ebuild
new file mode 100644
index 000000000000..0a9b8c777f02
--- /dev/null
+++ b/dev-haskell/snap-core/snap-core-1.0.4.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.5.9999
+#hackport: flags: +network-uri
+
+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/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug portable"
+
+RDEPEND=">=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=[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/hunit-1.2:=[profile?] <dev-haskell/hunit-2:=[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/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?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	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
+		>=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/zlib-0.5 <dev-haskell/zlib-0.7 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag debug debug) \
+		--flag=network-uri \
+		$(cabal_flag portable portable)
+}