gentoo resync : 25.08.2020

3 files changed, 65 insertions, 52 deletions

diff --git a/dev-haskell/snap-server/Manifest b/dev-haskell/snap-server/Manifest
index 5685e8b85cde..38eb9d9a2feb 100644
--- a/dev-haskell/snap-server/Manifest
+++ b/dev-haskell/snap-server/Manifest
@@ -1,5 +1,5 @@
-DIST snap-server-0.9.5.1.tar.gz 59062 BLAKE2B 395796da3eb41a16c0c4e0f0118dbba31d75f78f1a31c4bfab70920c83b4d7e807be8fccd7619713aac48446c912ea988881f2c0aff138552a35e737f44ea70d SHA512 6320401c349fd7c376e798959274a9fb3aff49cf11c8b6d9edd513c6311c3daf23eeaf03087cda3c0afb11686203a422b0e36e8391d418b6b47e791505db50e3
 DIST snap-server-1.0.1.1.tar.gz 73893 BLAKE2B 35b907d285c099059ec5d1f288252a5e4086d20cf0c81f6992e4d0977340474e2123e8c48cc416c9483f4dcc919a0acd37a73f286f8db84aec546e36912ac422 SHA512 bf3496123c07432cefedc6b03de5f335bb9b3a1e917bac45c0ee6b8d7529a3013d19d21433ce02d3f3caa2091abf0a4415b974470317804d70dfb8c9d46b33bd
-EBUILD snap-server-0.9.5.1-r1.ebuild 2115 BLAKE2B 76e30bd22b4a39a28292c519f9f2e50c275bc0ef0f60008d2661ecccac2cde5616edd08cd7b580c89a1f1ed5597d1d3c187de011122065690c9ae1cebd80b1da SHA512 6974eac2f4599ef9989f077edefbfcc1706bcc31383f962c421ef0c9d20e19bfd5aa26e6282b53b6b1dc7ef075d3adf68e2499d07c3308802a0735f36bb4112e
+DIST snap-server-1.1.1.2.tar.gz 73645 BLAKE2B 29215ce7f542c56be40ce40711f04f7f0b2ccb568903483dbf99950b3ec7703505440cabcf70d0c6084991fe09931e6312b59b48da5511b407df02318b551600 SHA512 a11bb92ce8774269704ce8c045bddf4aad15816cfb447453e8010bfce7aff2a08b38d3c99a400ab3882cb9e0b2f0b1f9af69adc56c1b28df53dc3fdd44042e30
 EBUILD snap-server-1.0.1.1.ebuild 3294 BLAKE2B 5e9a6469e359ac0c0a0be8a0a5fbb97ac40f50142f90309cb5115f9596e45b5373e67013e5c86ac74a9394f368736ea0c5f054b3fde60181b063ce6c8d7e20ac SHA512 93e4ea44050b7e265575ddac68780d8d3543ef904e2f3476980e3350c4c2c000b7f3802a419cd96aaa02ccdfc9f7d2f4e580a72a069e107c845e288631bb8cbe
+EBUILD snap-server-1.1.1.2.ebuild 3159 BLAKE2B 123e1ff8719f6d9ccb18e73f26702c05b53dfc535fe301209f717b8f7c95001a57d440fe0e4a27b9268a9d3a6ce34e1eeaa2d7fd47dc51fbace8581191a47617 SHA512 8f7e4bc4764de4b8bad79ff93e7d3ef7eead6ad916cc73723ad7d5d71f248a04c1d2d44e0e8dcc0f4c5c6afa248052b0dad50e554aaeb280633d752efded1fea
 MISC metadata.xml 1427 BLAKE2B d190025f7b08e754a96fc40656ea5669e0a15bee559e5d8d8b88ea25ebc4b195e055b7779c42d5aeb8be3ce878031c0e16912e75755eeaa5c37366c6304dd180 SHA512 b94a8124fae8c073c4dfa2e8d629b547077d6d09eb9e7cf17faa038274125b17fe217b065e5c5ec78087abbdfea1219c3d45bbbc30e3fd2ebbe60c3e53cd3d81
diff --git a/dev-haskell/snap-server/snap-server-0.9.5.1-r1.ebuild b/dev-haskell/snap-server/snap-server-0.9.5.1-r1.ebuild
deleted file mode 100644
index 68ee62caac17..000000000000
--- a/dev-haskell/snap-server/snap-server-0.9.5.1-r1.ebuild
+++ /dev/null
@@ -1,50 +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.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A fast, iteratee-based, epoll-enabled 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="openssl 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.0:=[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/monadcatchio-transformers-0.2.1:=[profile?] <dev-haskell/monadcatchio-transformers-0.4:=[profile?]
-	>=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-3:=[profile?]
-	>=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.7:=[profile?]
-	dev-haskell/old-locale:=[profile?]
-	>=dev-haskell/snap-core-0.9.3:=[profile?] <dev-haskell/snap-core-0.10:=[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-lang/ghc-7.4.1:=
-	openssl? ( >=dev-haskell/hsopenssl-0.10:=[profile?] <dev-haskell/hsopenssl-0.12:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'attoparsec                >= 0.10     && < 0.13' 'attoparsec                >= 0.10     && < 0.14' \
-		'time                      >= 1.0      && < 1.6' 'time                      >= 1.0'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag openssl openssl) \
-		$(cabal_flag portable portable)
-}
diff --git a/dev-haskell/snap-server/snap-server-1.1.1.2.ebuild b/dev-haskell/snap-server/snap-server-1.1.1.2.ebuild
new file mode 100644
index 000000000000..4cebd1763301
--- /dev/null
+++ b/dev-haskell/snap-server/snap-server-1.1.1.2.ebuild
@@ -0,0 +1,63 @@
+# 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
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A fast, iteratee-based, epoll-enabled 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"
+
+RDEPEND=">=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=[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?]
+	>=dev-haskell/clock-0.7.1:=[profile?] <dev-haskell/clock-0.9:=[profile?]
+	>=dev-haskell/io-streams-1.3:=[profile?] <dev-haskell/io-streams-1.6:=[profile?]
+	>=dev-haskell/io-streams-haproxy-1.0:=[profile?] <dev-haskell/io-streams-haproxy-1.1:=[profile?]
+	>=dev-haskell/lifted-base-0.1:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?]
+	>=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:=
+	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 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag build-pong build-pong) \
+		$(cabal_flag debug debug) \
+		$(cabal_flag openssl openssl) \
+		$(cabal_flag portable portable)
+}