gentoo auto-resync : 23:10:2023 - 08:35:49

5 files changed, 78 insertions, 8 deletions

diff --git a/dev-haskell/fgl/Manifest b/dev-haskell/fgl/Manifest
index 02a22578d5ce..a776bfb618c4 100644
--- a/dev-haskell/fgl/Manifest
+++ b/dev-haskell/fgl/Manifest
@@ -1,3 +1,6 @@
+AUX fgl-5.6.0.0-ghc-8.6.patch 1089 BLAKE2B 749a7b99b9d0fa4dfac76bf0666e741741c6da4c8e7d26e2481d2cca29c2198b41cdb3c4f0f2a60183c7a7ef9024fb723748c7433238a6e678ffc715b2ff12f5 SHA512 4e9ca70d5e0c2f5b61fe3eb81a43f48e28fd8796c8e84aa353b5ee1cdc17a5383ac59e7ea2663033645562ecd23335a63be3bd5c05bf5b47119774457c34b411
 DIST fgl-5.7.0.3.tar.gz 56415 BLAKE2B 6b7f5d3d2fd93494f3c2f9fbf69dd38c0358ced8a4f488f31d4904a375e21b4d12b974fe78868be8184a989b43fa6f345ca84ed74ea8c5970416c2903dd7a024 SHA512 f77ee1a66fe02b0a01e70b6fcb16baaba67be5433e4310bfb0862cec66855fc0413de586ca111e2e1569898b890fe93faf7c9f079dc569ca2d32b6c087762bbd
-EBUILD fgl-5.7.0.3.ebuild 751 BLAKE2B 2abf9fd7fd818b9c6e0e4f5c11caf7aa41f2ba66f37ab2e81277487d43d2ca5fbf29faa91f986a4c22ae934cd02db40740f2127022f7c2317879f5f5de83a4fd SHA512 96b789779b1873a6e7fe56926cee72bc707b113c96a7f64597523a5caafb51f4bb219b087aeb6290efbc7bfcb11d876f99fbb95db5ec00e82913bad28572aa46
-MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
+DIST fgl-5.8.1.1.tar.gz 56829 BLAKE2B ad698d62e0961ebc19800225128053eae5d559a952504025f76c783392e699605abf009eccb7a69b8084009309a9252a29d3efb2b022941de895f7ce2064c610 SHA512 c1d82f2cbce89bb8088dda0e57a6787de0f83834b44f3b7e88393fa79f706dc7b5bff254ee4f2479a90c35a99cedc12c1691770c7c78c48362322b48b02b4873
+EBUILD fgl-5.7.0.3.ebuild 723 BLAKE2B 7751f079689ed0c703fc77269aa52cd1ce6d68ff7997faa982c39d18a1f39c2bf59188fb75a6cb0d207eec396c3629eeda458d88c7f6bbad6e913b8492dcb7a6 SHA512 b13b91d0ee0378dc984d3da8c8b3f462b034525d5a5d734c8aa1c2e71377ddb0c93b901d12f28072c406dc7426741a4614b6924cfd6d0ee9810a46894457241d
+EBUILD fgl-5.8.1.1.ebuild 629 BLAKE2B 0e4fd5076fa82b6cc959836217b15e06d23dc89317a30bc2203a86fa75d0723872d24bc2e991f8392d658ccfe3fe901e4705640449fa897c532c510d66bc18bc SHA512 98a4d52b7ec460b8e0ab0072e59d847e9f97ab76a158e52709711dce957c0544fcff551537ded76ff90d95f779856acf512d3ab4daa380d5940a66b5804131b6
+MISC metadata.xml 370 BLAKE2B 9fb5d053f3184c4ad899aba0d91be60dc9586a25182e37b8250b812db510ff1b1b5a48b09b4aaf6e02d7458810433c7a8bfc8d7411231a0d73c0fb79336c41e3 SHA512 a1dd10db5f540aec148b95a59ca70cf8c31d45d8bba54c95515a0c90d192fcc9a050f7dff86dd79830784c86252c3ce115b6a532fc18843f95cc2ad2330db26e
diff --git a/dev-haskell/fgl/fgl-5.7.0.3.ebuild b/dev-haskell/fgl/fgl-5.7.0.3.ebuild
index b37b8ffcd43b..dbf509ee6bbd 100644
--- a/dev-haskell/fgl/fgl-5.7.0.3.ebuild
+++ b/dev-haskell/fgl/fgl-5.7.0.3.ebuild
@@ -24,9 +24,6 @@ DEPEND="${RDEPEND}
 		>=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-2.15 )
 "
 
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'hspec >= 2.1 && < 2.8' 'hspec >= 2.1'
-}
+CABAL_CHDEPS=(
+	'hspec >= 2.1 && < 2.8' 'hspec >= 2.1'
+)
diff --git a/dev-haskell/fgl/fgl-5.8.1.1.ebuild b/dev-haskell/fgl/fgl-5.8.1.1.ebuild
new file mode 100644
index 000000000000..c65b125d96d3
--- /dev/null
+++ b/dev-haskell/fgl/fgl-5.8.1.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Martin Erwig's Functional Graph Library"
+HOMEPAGE="https://hackage.haskell.org/package/fgl"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.1.0
+	test? ( >=dev-haskell/hspec-2.1 <dev-haskell/hspec-2.11
+		>=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-2.15 )
+"
diff --git a/dev-haskell/fgl/files/fgl-5.6.0.0-ghc-8.6.patch b/dev-haskell/fgl/files/fgl-5.6.0.0-ghc-8.6.patch
new file mode 100644
index 000000000000..0e3f35425ee1
--- /dev/null
+++ b/dev-haskell/fgl/files/fgl-5.6.0.0-ghc-8.6.patch
@@ -0,0 +1,42 @@
+commit 344a7e452630ace0f5c647e525e0299d99de5902
+Author: Alex Washburn <github@recursion.ninja>
+Date:   Mon Aug 20 23:46:32 2018 -0400
+
+    Fixing issue with MonadFailDesugaring.
+
+diff --git a/Data/Graph/Inductive/Monad.hs b/Data/Graph/Inductive/Monad.hs
+index 1d58af0..d63752b 100644
+--- a/Data/Graph/Inductive/Monad.hs
++++ b/Data/Graph/Inductive/Monad.hs
+@@ -1,4 +1,4 @@
+-{-# LANGUAGE MultiParamTypeClasses #-}
++{-# LANGUAGE CPP, MultiParamTypeClasses #-}
+ 
+ -- (c) 2002 by Martin Erwig [see file COPYRIGHT]
+ -- | Monadic Graphs
+@@ -19,6 +19,10 @@ module Data.Graph.Inductive.Monad(
+ 
+ 
+ import Data.Graph.Inductive.Graph
++#if MIN_VERSION_base(4,12,0)
++import Control.Monad.Fail
++import Prelude hiding (fail)
++#endif
+ 
+ {-# ANN module "HLint: ignore Redundant lambda" #-}
+ 
+@@ -39,7 +43,13 @@ import Data.Graph.Inductive.Graph
+ 
+ -- Monadic Graph
+ --
+-class (Monad m) => GraphM m gr where
++class
++#if MIN_VERSION_base(4,12,0)
++ (MonadFail m)
++#else
++ (Monad m)
++#endif
++  => GraphM m gr where
+   {-# MINIMAL emptyM, isEmptyM, matchM, mkGraphM, labNodesM #-}
+ 
+   emptyM     :: m (gr a b)
diff --git a/dev-haskell/fgl/metadata.xml b/dev-haskell/fgl/metadata.xml
index 937381521944..e5868c189376 100644
--- a/dev-haskell/fgl/metadata.xml
+++ b/dev-haskell/fgl/metadata.xml
@@ -5,4 +5,8 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="hackage">fgl</remote-id>
+		<remote-id type="github">haskell/fgl</remote-id>
+	</upstream>
 </pkgmetadata>