gentoo resync : 29.06.2021

5 files changed, 52 insertions, 3 deletions

diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index 6e1286198d81..7f703f3fb84d 100644
--- a/dev-haskell/Manifest.gz
+++ b/dev-haskell/Manifest.gz
diff --git a/dev-haskell/cairo/Manifest b/dev-haskell/cairo/Manifest
index 6cd89b687fcd..0cc7b80c24c3 100644
--- a/dev-haskell/cairo/Manifest
+++ b/dev-haskell/cairo/Manifest
@@ -1,3 +1,4 @@
 DIST cairo-0.13.8.1.tar.gz 53026 BLAKE2B a05302d41bda35d3864b675e08b9bc296a218d528d3f2ecda34325650cde67a127cb1d21f2bd8d92dfa9a5e768ff6e622a585b81ac5897d86b9d89227af8dda4 SHA512 9c4ec738fe6e335f635c3fa47a26edb9264ec5a9713ff8c0109f2cf321e21331009402d3715321b63f5423e32ad90a0dd3ca9ca83544d554be5463c9784ab727
+EBUILD cairo-0.13.8.1-r1.ebuild 1156 BLAKE2B 6d898d46d86206e1a0b42e7c5d83c6a5094ace5bbbf2f71325337134a4f8fad47de33c9977ba0383018415ba08c0a8c43eb946491ba374a309901c7b9ac2a378 SHA512 d0c7a1a084d13d2fce3b2eaa126f10b04a4475cdb2a241a0ffd1ddedb6361395d778c40c00900892ec76a0c98d91a966eb471a11c27b40b11bffb14c3f470b21
 EBUILD cairo-0.13.8.1.ebuild 1091 BLAKE2B 8b3bd6dab36ae0a3e7a2a9c9cf2df9b9e4fcbb9f9d81911489dab7eaaa57d609b927827b076f6f4f355a53da5dc6f9c338d1c68178b7a8d85cb1bf6e458e7cf9 SHA512 365cd5f56a429ae2e909b0d2414a3a311f992d75234c012c720fb044cb35ed56d43d383c025b9b4e2a38db811d3a73309fe4ef27043014fa13171211862ecd9c
 MISC metadata.xml 468 BLAKE2B 04053766d0971041ea0c68c8945622845833dee8fac5b144799ea1c21874fc739f9c60ee5f418a9a4e94e12f9bd8d621a8419fa6b916bf8fc518aa0cebab90cf SHA512 30c5d32612972f08d6d51603a6972b6a084b2f68e644c72ceb4472bbac83122916070ffc597b8199874c62fc80dcee775ca6632a45e82619d9927669559c79a9
diff --git a/dev-haskell/cairo/cairo-0.13.8.1-r1.ebuild b/dev-haskell/cairo/cairo-0.13.8.1-r1.ebuild
new file mode 100644
index 000000000000..5dc6456d0ed5
--- /dev/null
+++ b/dev-haskell/cairo/cairo-0.13.8.1-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+#hackport: flags: cairo_ps:postscript,cairo_pdf:pdf,cairo_svg:svg
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Binding to the Cairo library"
+HOMEPAGE="http://projects.haskell.org/gtk2hs/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+pdf +postscript +svg"
+
+RDEPEND="dev-haskell/mtl:=[profile?]
+	>=dev-haskell/text-1.0.0.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-haskell/utf8-string-0.2:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
+	>=dev-lang/ghc-7.10.1:=
+	x11-libs/cairo
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24
+	>=dev-haskell/gtk2hs-buildtools-0.13.2.0 <dev-haskell/gtk2hs-buildtools-0.14
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'Cabal >= 1.24 && < 3.3' 'Cabal >= 1.24'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag pdf cairo_pdf) \
+		$(cabal_flag postscript cairo_ps) \
+		$(cabal_flag svg cairo_svg)
+}
diff --git a/dev-haskell/snap-core/Manifest b/dev-haskell/snap-core/Manifest
index 263a22158f3f..11ecd30b976e 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 3099 BLAKE2B c431c6bf4612b7b4289b5e88c39dc810262f5bde7897b3f6cdf0af64c57959b1eb4db5a20af4e3530185407ac4c719c5690609d1aa9aa254b210c7575a59b7a9 SHA512 f23a16589c48af3d27920e94dafa57ad9a6ea55748a5bb1a936b6697892d38ff4338e418b3e92191739d7385d618f364f267abc2968386a8133485b6d1abb97e
+EBUILD snap-core-1.0.4.2.ebuild 3274 BLAKE2B 3c8defd45c17501f4c7a8f411d665b2b276496652f9b2bf17c8dbe9975664fbbe114941f592520231eb8d52a760ba867feb87f18622b64e082f1f6dd30e51ce8 SHA512 1e5a3b6eef5c22a8503563ec0cecbcf047c2adae26d9acd3dec4fe60f4abaf7a384817e816f03a3b67405e354090582aaed7bbe8711a14a64b63266224701d26
 MISC metadata.xml 1855 BLAKE2B 061e56d781f921b5ad34683a6c5c2192a282567e5efa39c315c50cdf915032d70c66d8f270c76647b47ad5c9bee1b666305dc3d9fa790c941bb9ecd416fdf792 SHA512 f497be0430344459a95055207a06f9b9b2b33c6a0edc2cff99ad89051a5d8f615258aaf94234689d4443a6d30e0c4a6df1dadeba2fe142b1f0c324932691e66f
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
index 0a9b8c777f02..0d7046af4b4e 100644
--- a/dev-haskell/snap-core/snap-core-1.0.4.2.ebuild
+++ b/dev-haskell/snap-core/snap-core-1.0.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,13 +18,16 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug portable"
 
+# 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?]
 	>=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/io-streams-1.3:=[zlib,profile?] <dev-haskell/io-streams-1.6:=[zlib,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?]