gentoo auto-resync : 27:07:2022 - 09:01:23

3 files changed, 0 insertions, 273 deletions

diff --git a/dev-haskell/haddock-api/Manifest b/dev-haskell/haddock-api/Manifest
index f6008f48ff72..ae421a763934 100644
--- a/dev-haskell/haddock-api/Manifest
+++ b/dev-haskell/haddock-api/Manifest
@@ -1,5 +1,3 @@
-AUX haddock-api-2.24.0-ghc-8.10.2.patch 6161 BLAKE2B d13f756bb8736d320f00c06bc654b684ab5dff03df0f58a5a895ba61f038e8566a08a1174a62c984e94f2ce145ecf7a443a9b453f7260e09dee1d7caac4de551 SHA512 351c34536d3faccececd4ccbc3f6b8aa9bf03438d65ef46788496be9455ba9d7c1db4bb6fdc1b185ad014ec06ed7e1ab94dddf72be56a1205ae95a6e6167d448
-AUX haddock-api-2.24.0-haddock-library-1.10.patch 5234 BLAKE2B ee476b851cb1dc6aed4a3be259402b19fc8d3720cb130927c7fbedaaf24743ad6077f0d5fe9b4cf5e9016139aac639f4dd3e36fa133896892455576d2097bc4e SHA512 a52288df217a9bd532f5f070d383e6f60a58fe67748cf84f4731f2decda50a795c5ba29de51a374274ac694d9ecefeb4d0cde7af09c25a8cac2d102faed5c144
 DIST haddock-api-2.25.1.tar.gz 208616 BLAKE2B 4ee682e797f6d8790ba83f53111263b07ce4080809d2aa8306123e04dd0d5472822b45ad8f09bcd4d4a4cf01e4462cfe8f6ed683b6468e2870d43f02bc761717 SHA512 ce34eb986733f3cc8338781054ff4d88f7fcdefed476a8a9861657306ffd8d89e7768b2640f354257fd2db336c5d66bd0acdd1676ad401422d785847277d914f
 EBUILD haddock-api-2.25.1.ebuild 1408 BLAKE2B 8ef32ded53ca22cab66972713332a353ddb483484a1a6231b29531e675b3d4ee636face2b4c79919e069c3c72fd49c3f4b367344f2a0c1987fef903ee65eb2f4 SHA512 252eee304b6d6d52863dc55d2c0207a373b271159f50756e87d4a784cef7ad1ec4c3192eb0c2f15f9f6db575f5870625c80250723ced5f585d684b5365e926d2
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/haddock-api/files/haddock-api-2.24.0-ghc-8.10.2.patch b/dev-haskell/haddock-api/files/haddock-api-2.24.0-ghc-8.10.2.patch
deleted file mode 100644
index 84c275fbb348..000000000000
--- a/dev-haskell/haddock-api/files/haddock-api-2.24.0-ghc-8.10.2.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-From e455bc18e15adf05a1f32bc7c4512eedb7ab889f Mon Sep 17 00:00:00 2001
-From: Alex Biehl <alexbiehl@gmail.com>
-Date: Tue, 8 Dec 2020 19:42:52 +0100
-Subject: [PATCH 1/2] Changes for GHC#17566
-
-See https://gitlab.haskell.org/ghc/ghc/merge_requests/2469
----
- haddock-api/src/Haddock/Backends/LaTeX.hs     |  2 +-
- haddock-api/src/Haddock/Backends/Xhtml.hs     |  2 +-
- .../src/Haddock/Backends/Xhtml/Decl.hs        |  4 ++-
- haddock-api/src/Haddock/GhcUtils.hs           | 29 +++++++++++++++++--
- haddock-api/src/Haddock/Types.hs              |  1 +
- 5 files changed, 32 insertions(+), 6 deletions(-)
-
-diff --git a/haddock-api/src/Haddock/Backends/LaTeX.hs b/haddock-api/src/Haddock/Backends/LaTeX.hs
-index 647812f93..024a6c513 100644
---- a/src/Haddock/Backends/LaTeX.hs
-+++ b/src/Haddock/Backends/LaTeX.hs
-@@ -255,7 +255,7 @@ declNames :: LHsDecl DocNameI
-              , [DocName]       --   names being declared
-              )
- declNames (L _ decl) = case decl of
--  TyClD _ d  -> (empty, [tcdName d])
-+  TyClD _ d  -> (empty, [tcdNameI d])
-   SigD _ (TypeSig _ lnames _ ) -> (empty, map unLoc lnames)
-   SigD _ (PatSynSig _ lnames _) -> (text "pattern", map unLoc lnames)
-   ForD _ (ForeignImport _ (L _ n) _ _) -> (empty, [n])
-diff --git a/haddock-api/src/Haddock/Backends/Xhtml.hs b/haddock-api/src/Haddock/Backends/Xhtml.hs
-index f80a9c05f..541f40c4f 100644
---- a/src/Haddock/Backends/Xhtml.hs
-+++ b/src/Haddock/Backends/Xhtml.hs
-@@ -407,7 +407,7 @@ ppJsonIndex odir maybe_source_url maybe_wiki_url unicode pkg qual_opt ifaces = d
-     exportSubs _ = []
- 
-     exportName :: ExportItem DocNameI -> [IdP DocNameI]
--    exportName ExportDecl { expItemDecl } = getMainDeclBinder (unLoc expItemDecl)
-+    exportName ExportDecl { expItemDecl } = getMainDeclBinderI (unLoc expItemDecl)
-     exportName ExportNoDecl { expItemName } = [expItemName]
-     exportName _ = []
- 
-diff --git a/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs b/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs
-index ef0ba1b67..30b8d43eb 100644
---- a/src/Haddock/Backends/Xhtml/Decl.hs
-+++ b/src/Haddock/Backends/Xhtml/Decl.hs
-@@ -536,6 +536,8 @@ ppClassDecl summary links instances fixities loc d subdocs
-     -- Only the fixity relevant to the class header
-     fixs = ppFixities [ f | f@(n,_) <- fixities, n == unLoc lname ] qual
- 
-+    nm   = tcdNameI decl
-+
-     hdr = ppClassHdr summary lctxt (unLoc lname) ltyvars lfds
- 
-     -- Associated types
-@@ -794,7 +796,7 @@ ppDataDecl summary links instances fixities subdocs loc doc dataDecl pats
-   | otherwise = header_ +++ docSection curname pkg qual doc +++ constrBit +++ patternBit +++ instancesBit
- 
-   where
--    docname   = tcdName dataDecl
-+    docname   = tcdNameI dataDecl
-     curname   = Just $ getName docname
-     cons      = dd_cons (tcdDataDefn dataDecl)
-     isH98     = case unLoc (head cons) of
-diff --git a/haddock-api/src/Haddock/GhcUtils.hs b/haddock-api/src/Haddock/GhcUtils.hs
-index 0874e7b4d..43fe3e774 100644
---- a/src/Haddock/GhcUtils.hs
-+++ b/src/Haddock/GhcUtils.hs
-@@ -58,8 +58,7 @@ moduleString = moduleNameString . moduleName
- isNameSym :: Name -> Bool
- isNameSym = isSymOcc . nameOccName
- 
--getMainDeclBinder :: (SrcSpanLess (LPat p) ~ Pat p , HasSrcSpan (LPat p)) =>
--                     HsDecl p -> [IdP p]
-+getMainDeclBinder :: HsDecl (GhcPass p) -> [IdP (GhcPass p)]
- getMainDeclBinder (TyClD _ d) = [tcdName d]
- getMainDeclBinder (ValD _ d) =
-   case collectHsBindBinders d of
-@@ -221,6 +220,31 @@ getGADTConType (ConDeclH98 {}) = panic "getGADTConType"
-   -- Should only be called on ConDeclGADT
- getGADTConType (XConDecl nec) = noExtCon nec
- 
-+getMainDeclBinderI :: HsDecl DocNameI -> [IdP DocNameI]
-+getMainDeclBinderI (TyClD _ d) = [tcdNameI d]
-+getMainDeclBinderI (ValD _ d) =
-+  case collectHsBindBinders d of
-+    []       -> []
-+    (name:_) -> [name]
-+getMainDeclBinderI (SigD _ d) = sigNameNoLoc d
-+getMainDeclBinderI (ForD _ (ForeignImport _ name _ _)) = [unLoc name]
-+getMainDeclBinderI (ForD _ (ForeignExport _ _ _ _)) = []
-+getMainDeclBinderI _ = []
-+
-+familyDeclLNameI :: FamilyDecl DocNameI -> Located DocName
-+familyDeclLNameI (FamilyDecl { fdLName = n }) = n
-+familyDeclLNameI (XFamilyDecl nec) = noExtCon nec
-+
-+tyClDeclLNameI :: TyClDecl DocNameI -> Located DocName
-+tyClDeclLNameI (FamDecl { tcdFam = fd })     = familyDeclLNameI fd
-+tyClDeclLNameI (SynDecl { tcdLName = ln })   = ln
-+tyClDeclLNameI (DataDecl { tcdLName = ln })  = ln
-+tyClDeclLNameI (ClassDecl { tcdLName = ln }) = ln
-+tyClDeclLNameI (XTyClDecl nec) = noExtCon nec
-+
-+tcdNameI :: TyClDecl DocNameI -> DocName
-+tcdNameI = unLoc . tyClDeclLNameI
-+
- -- -------------------------------------
- 
- getGADTConTypeG :: ConDecl (GhcPass p) -> LHsType (GhcPass p)
-@@ -761,4 +785,3 @@ defaultRuntimeRepVars = go emptyVarEnv
- 
-     go _ ty@(LitTy {}) = ty
-     go _ ty@(CoercionTy {}) = ty
--
-diff --git a/haddock-api/src/Haddock/Types.hs b/haddock-api/src/Haddock/Types.hs
-index c2cf08bb2..853f4b1b2 100644
---- a/src/Haddock/Types.hs
-+++ b/src/Haddock/Types.hs
-@@ -789,6 +789,7 @@ type instance XDataDecl     DocNameI = NoExtField
- type instance XSynDecl      DocNameI = NoExtField
- type instance XFamDecl      DocNameI = NoExtField
- type instance XXFamilyDecl  DocNameI = NoExtCon
-+type instance XXTyClDecl    DocNameI = NoExtCon
- 
- type instance XHsIB             DocNameI _ = NoExtField
- type instance XHsWC             DocNameI _ = NoExtField
-
-From e1fe49e9458a5d5161adc8b5b8bfea6437a9eedf Mon Sep 17 00:00:00 2001
-From: alexbiehl <alexbiehl@gmail.com>
-Date: Tue, 8 Dec 2020 20:03:49 +0100
-Subject: [PATCH 2/2] Import intercalate
-
----
- haddock-api/src/Haddock/Interface/Rename.hs | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/haddock-api/src/Haddock/Interface/Rename.hs b/haddock-api/src/Haddock/Interface/Rename.hs
-index 78c585814..4d9eadac5 100644
---- a/src/Haddock/Interface/Rename.hs
-+++ b/src/Haddock/Interface/Rename.hs
-@@ -29,6 +29,7 @@ import TysWiredIn (eqTyCon_RDR)
- import Control.Applicative
- import Control.Arrow ( first )
- import Control.Monad hiding (mapM)
-+import Data.List (intercalate)
- import qualified Data.Map as Map hiding ( Map )
- import qualified Data.Set as Set
- import Prelude hiding (mapM)
diff --git a/dev-haskell/haddock-api/files/haddock-api-2.24.0-haddock-library-1.10.patch b/dev-haskell/haddock-api/files/haddock-api-2.24.0-haddock-library-1.10.patch
deleted file mode 100644
index 1627b73eba9d..000000000000
--- a/dev-haskell/haddock-api/files/haddock-api-2.24.0-haddock-library-1.10.patch
+++ /dev/null
@@ -1,124 +0,0 @@
---- a/src/Haddock/Backends/Hoogle.hs
-+++ b/src/Haddock/Backends/Hoogle.hs
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE CPP #-}
- {-# LANGUAGE FlexibleContexts #-}
- {-# LANGUAGE TypeFamilies #-}
- -----------------------------------------------------------------------------
-@@ -326,7 +327,11 @@ markupTag dflags = Markup {
-   markupAppend               = (++),
-   markupIdentifier           = box (TagInline "a") . str . out dflags,
-   markupIdentifierUnchecked  = box (TagInline "a") . str . showWrapped (out dflags . snd),
-+#if MIN_VERSION_haddock_library(1,10,0)
-+  markupModule               = box (TagInline "a") . str . modLinkName,
-+#else
-   markupModule               = box (TagInline "a") . str,
-+#endif
-   markupWarning              = box (TagInline "i"),
-   markupEmphasis             = box (TagInline "i"),
-   markupBold                 = box (TagInline "b"),
---- a/src/Haddock/Backends/LaTeX.hs
-+++ b/src/Haddock/Backends/LaTeX.hs
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE CPP #-}
- {-# OPTIONS_GHC -fno-warn-name-shadowing #-}
- {-# LANGUAGE RecordWildCards #-}
- {-# LANGUAGE TypeFamilies #-}
-@@ -1206,7 +1207,11 @@ latexMarkup = Markup
-   , markupAppend               = \l r v -> l v . r v
-   , markupIdentifier           = \i v -> inlineElem (markupId v (fmap occName i))
-   , markupIdentifierUnchecked  = \i v -> inlineElem (markupId v (fmap snd i))
-+#if MIN_VERSION_haddock_library(1,10,0)
-+  , markupModule               = \m _ -> inlineElem (let (mdl,_ref) = break (=='#') (modLinkName m) in (tt (text mdl)))
-+#else
-   , markupModule               = \m _ -> inlineElem (let (mdl,_ref) = break (=='#') m in (tt (text mdl)))
-+#endif
-   , markupWarning              = \p v -> p v
-   , markupEmphasis             = \p v -> inlineElem (emph (p v empty))
-   , markupBold                 = \p v -> inlineElem (bold (p v empty))
---- a/src/Haddock/Backends/Xhtml/DocMarkup.hs
-+++ b/src/Haddock/Backends/Xhtml/DocMarkup.hs
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE CPP #-}
- -----------------------------------------------------------------------------
- -- |
- -- Module      :  Haddock.Backends.Html.DocMarkup
-@@ -44,7 +45,11 @@ parHtmlMarkup qual insertAnchors ppId = Markup {
-   markupAppend               = (+++),
-   markupIdentifier           = thecode . ppId insertAnchors,
-   markupIdentifierUnchecked  = thecode . ppUncheckedLink qual,
-+#if MIN_VERSION_haddock_library(1,10,0)
-+  markupModule               = \m -> let (mdl,ref) = break (=='#') (modLinkName m)
-+#else
-   markupModule               = \m -> let (mdl,ref) = break (=='#') m
-+#endif
-                                          -- Accomodate for old style
-                                          -- foo\#bar anchors
-                                          mdl' = case reverse mdl of
---- a/src/Haddock/Interface/LexParseRn.hs
-+++ b/src/Haddock/Interface/LexParseRn.hs
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE CPP #-}
- {-# OPTIONS_GHC -Wwarn #-}
- {-# LANGUAGE BangPatterns #-}
- {-# LANGUAGE ViewPatterns #-}
-@@ -148,7 +149,11 @@ rename dflags gre = rn
-       DocDefList list -> DocDefList <$> traverse (\(a, b) -> (,) <$> rn a <*> rn b) list
-       DocCodeBlock doc -> DocCodeBlock <$> rn doc
-       DocIdentifierUnchecked x -> pure (DocIdentifierUnchecked x)
-+#if MIN_VERSION_haddock_library(1,10,0)
-+      DocModule (ModLink m l) -> DocModule . ModLink m <$> traverse rn l
-+#else
-       DocModule str -> pure (DocModule str)
-+#endif
-       DocHyperlink (Hyperlink u l) -> DocHyperlink . Hyperlink u <$> traverse rn l
-       DocPic str -> pure (DocPic str)
-       DocMathInline str -> pure (DocMathInline str)
---- a/src/Haddock/InterfaceFile.hs
-+++ b/src/Haddock/InterfaceFile.hs
-@@ -521,9 +521,16 @@ instance (Binary mod, Binary id) => Binary (DocH mod id) where
-     put_ bh (DocIdentifier ae) = do
-             putByte bh 4
-             put_ bh ae
-+#if MIN_VERSION_haddock_library(1,10,0)
-+    put_ bh (DocModule (ModLink af bf)) = do
-+            putByte bh 5
-+            put_ bh af
-+            put_ bh bf
-+#else
-     put_ bh (DocModule af) = do
-             putByte bh 5
-             put_ bh af
-+#endif
-     put_ bh (DocEmphasis ag) = do
-             putByte bh 6
-             put_ bh ag
-@@ -598,8 +605,14 @@ instance (Binary mod, Binary id) => Binary (DocH mod id) where
-                     ae <- get bh
-                     return (DocIdentifier ae)
-               5 -> do
-+#if MIN_VERSION_haddock_library(1,10,0)
-+                    af <- get bh
-+                    bf <- get bh
-+                    return (DocModule (ModLink af bf))
-+#else
-                     af <- get bh
-                     return (DocModule af)
-+#endif
-               6 -> do
-                     ag <- get bh
-                     return (DocEmphasis ag)
---- a/src/Haddock/Types.hs
-+++ b/src/Haddock/Types.hs
-@@ -466,7 +466,11 @@ instance (NFData a, NFData mod)
-     DocParagraph a            -> a `deepseq` ()
-     DocIdentifier a           -> a `deepseq` ()
-     DocIdentifierUnchecked a  -> a `deepseq` ()
-+#if MIN_VERSION_haddock_library(1,10,0)
-+    DocModule (ModLink a b)   -> a `deepseq` b `deepseq` ()
-+#else
-     DocModule a               -> a `deepseq` ()
-+#endif
-     DocWarning a              -> a `deepseq` ()
-     DocEmphasis a             -> a `deepseq` ()
-     DocBold a                 -> a `deepseq` ()