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

10 files changed, 37 insertions, 537 deletions

diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index fa8742e8f7cd..de8f90518965 100644
--- a/dev-haskell/Manifest.gz
+++ b/dev-haskell/Manifest.gz
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` ()
diff --git a/dev-haskell/ipynb/Manifest b/dev-haskell/ipynb/Manifest
index a6190198aaf1..c87acfcc30fe 100644
--- a/dev-haskell/ipynb/Manifest
+++ b/dev-haskell/ipynb/Manifest
@@ -1,5 +1,7 @@
+DIST ipynb-0.1.0.2.tar.gz 20158 BLAKE2B 0bdae84979f855e619be8bd61ff7f6c2f47a5fb7b69dd5e4d22b629a5684efd8ad0085dbb3fda50b726cb84fc72c1fee956cfa53e280e7f63e57c404ac5d9c3b SHA512 81f1322d8e6c79eee117b60aa6b2c15b89345d14e52066127e7ecbbf68ed2ac307917913f1f51fd310055043e92457e2f3610912c5f647fdf096d8bfe8874ebf
 DIST ipynb-0.1.tar.gz 632774 BLAKE2B 9c1c7523c230730f56fd7c0fb729f67a904b34c48e573aa7e19f1b34d47791f4a3cace8d0e6d4ba6faec531b476fa012c742b8b33232f2c09e23da91541f71c0 SHA512 8717dac6496905afc5e8735abc3b3a4a90b171253b035efa0751a6311b901caad563fdfeaa455987c1307d0532273ab80be37256562143db575f13c326843bf4
 DIST ipynb-0.2.tar.gz 632962 BLAKE2B bdd85dd21e9e34e9e60157bb3d7447afa96a5ff83aa00fcf9662ce388617e974e81058d6588d5b41d55a38c32fe2e05458987e5ea37c53bf0852bd6c7b60b2b3 SHA512 885ffa2f2269b2bc6c2381fe7a7c91de93e8539ca3493d5a8207e75e986fc42a4b8ead0b4d05184da5bbb931466431ca1b810f03db8cd2c1624a67e1bbb782ea
+EBUILD ipynb-0.1.0.2.ebuild 966 BLAKE2B e7bb8cddba04fbf59de0a95a342b3ca209c2be9b27fee554be2a9c1e5d956a88ce3e469a35636f4369a879fee74a4df7b8f2db6f9c9aa142d33e151b3f9722f9 SHA512 4d1e53ce108fc854ac42b5f9385d7dd0bc1f0bd510263d624aefb8ed6f26f4b48916037fda08c5974c4d9cbd1908e74be53617cd3fc0f6070f4ce9b6fc238fc6
 EBUILD ipynb-0.1.ebuild 966 BLAKE2B 9cf3b710d92ae690e260276ba731bb032a0526cca5f932b289da7afb11319d93a49dbe4f4abd44b56051e033e5bc8d5a0fcd2633f16f156c88cff797523825e9 SHA512 2f59310131d782b98a72cbd865d6fb77fd74c8e2a9f5500e2865632572cc0ae69e0e12ebdb0fd0a30494470afe19e98cc142ffb1e4f462919ae82fd0c048082a
 EBUILD ipynb-0.2.ebuild 847 BLAKE2B 7d100fa8e11dcdb7f740fe153665930991e7199a7fce6055687a29cecc8ff41c913d149c5b9b0d1d0a02e511df521932185a8cdcbc4bc88d0b82294363a61744 SHA512 7d4c7a388f4f3ebc625a3f390ff03bf4c16239afb7f9c54eab46b15d0e116ce730ae86cf073858e904fd6b317ff5645d30513a3966f1053c2d9cdcd745be9a7d
 MISC metadata.xml 449 BLAKE2B fab284b4735e33304e32c70e04a68f86383f357920d6c38d0d746381a9c44653213c424a7fd8048ccd1332018e9673d837b32665a9acc5d5b20ef8c7d196673e SHA512 6b8f9a40aa74e508fc8d36a0551759864015e751fa08064a077f48ac7dcea8f49b49362cabcbccba727e449d9c5e6b534b0d3e7c1483f79851a1353bc1503e94
diff --git a/dev-haskell/ipynb/ipynb-0.1.0.2.ebuild b/dev-haskell/ipynb/ipynb-0.1.0.2.ebuild
new file mode 100644
index 000000000000..e8f0c458f446
--- /dev/null
+++ b/dev-haskell/ipynb/ipynb-0.1.0.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Data structure for working with Jupyter notebooks (ipynb)"
+HOMEPAGE="https://hackage.haskell.org/package/ipynb"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/aeson:=[profile?]
+	dev-haskell/base64-bytestring:=[profile?]
+	>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
+	dev-haskell/text:=[profile?]
+	dev-haskell/unordered-containers:=[profile?]
+	>=dev-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.22.2.0
+	test? ( dev-haskell/aeson-diff
+		dev-haskell/microlens
+		dev-haskell/microlens-aeson
+		dev-haskell/tasty
+		dev-haskell/tasty-hunit
+		dev-haskell/vector )
+"
diff --git a/dev-haskell/persistent-test/Manifest b/dev-haskell/persistent-test/Manifest
index 9918470ac576..a7f41262a9dd 100644
--- a/dev-haskell/persistent-test/Manifest
+++ b/dev-haskell/persistent-test/Manifest
@@ -1,4 +1,3 @@
-AUX persistent-test-2.0.3.0-new-exts.patch 8051 BLAKE2B 6acfdcea9195fc1e79be992ce93c0a5e061722b70a9af9e231a4645436c077bd5c466c7d8ddc091795a3a44726edabfa97eeddbdb61fdc92f1afae29caac7f6b SHA512 cd4eb775a223396ee602cb3a220b0323bf491f9d7f1daebee146a0f573971900bd00ec2de5640119fd2e27fe6be5de3151eb08d4a94f08bb3bc10006aa932ea8
 DIST persistent-test-2.13.1.3.tar.gz 32262 BLAKE2B 77bfae47292edd08cec0504d4006f44f349ba6fef2d670833d5f2c339bbe75f5d5e5afe924793d2f4ae9afb57f018d1e32a11b2cdecfe5c451f5aaa94897dbcf SHA512 906df4039bbd6e054cbcc18b300ea293814b7365c6267348a88abc9902cd30d60bd314b42331a1341befe787f566bca311ca7fb398594ae56cbc2e764d5a8ba2
 EBUILD persistent-test-2.13.1.3.ebuild 1281 BLAKE2B 9157086572ca9ae8c360334c99722477f0e510a09972506fe87c074d38a96ffd62b61fff34c3fe575622a516bc9cb57829eaab1acc05a72b1c4584d439af7214 SHA512 408a706774846292170f7e89adcaf3aec3a4941c9df639818269adf52825a3169f27399f68e6d8554b580f9c783097296fab38127b89f1fd5e24c95e4ceb80ba
 MISC metadata.xml 468 BLAKE2B e29b0252566a2d9f69a25176760331dba848c675da846b9edea632b5f25763fafa76b879fd2eb5f8b07c11789670296a6c4cb0ee089091cd3fe5bd192f0e5ffb SHA512 f6a98cd3fc90ef4683a73932607143ce0e303031b2d29a3527b720ecf5f9610cdaf2a77302903efa5ec69a1fa3691f978fe007c3797540efe4c660a6d3466cbc
diff --git a/dev-haskell/persistent-test/files/persistent-test-2.0.3.0-new-exts.patch b/dev-haskell/persistent-test/files/persistent-test-2.0.3.0-new-exts.patch
deleted file mode 100644
index e27746b85731..000000000000
--- a/dev-haskell/persistent-test/files/persistent-test-2.0.3.0-new-exts.patch
+++ /dev/null
@@ -1,252 +0,0 @@
---- a/src/CompositeTest.hs
-+++ b/src/CompositeTest.hs
-@@ -1,6 +1,8 @@
- {-# LANGUAGE DeriveGeneric #-}
- {-# LANGUAGE GeneralizedNewtypeDeriving #-}
- {-# LANGUAGE UndecidableInstances #-} -- FIXME
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- {-# OPTIONS_GHC -Wno-incomplete-uni-patterns #-}
- module CompositeTest where
- 
---- a/src/CustomPersistFieldTest.hs
-+++ b/src/CustomPersistFieldTest.hs
-@@ -1,4 +1,7 @@
- {-# LANGUAGE UndecidableInstances #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- {-# OPTIONS_GHC -Wno-unused-top-binds #-}
- module CustomPersistFieldTest (specsWith, customFieldMigrate) where
- 
---- a/src/CustomPrimaryKeyReferenceTest.hs
-+++ b/src/CustomPrimaryKeyReferenceTest.hs
-@@ -1,4 +1,6 @@
- {-# LANGUAGE GeneralizedNewtypeDeriving #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- {-# LANGUAGE UndecidableInstances #-}
- -- This test is based on this issue: https://github.com/yesodweb/persistent/issues/421
- -- The primary thing this is testing is the migration, thus the test code itself being mostly negligible.
---- a/src/DataTypeTest.hs
-+++ b/src/DataTypeTest.hs
-@@ -1,5 +1,8 @@
- {-# LANGUAGE ScopedTypeVariables #-}
- {-# LANGUAGE UndecidableInstances #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- {-# OPTIONS_GHC -Wno-unused-top-binds #-}
- module DataTypeTest
-     ( specsWith
---- a/src/EmbedOrderTest.hs
-+++ b/src/EmbedOrderTest.hs
-@@ -1,4 +1,7 @@
- {-# LANGUAGE UndecidableInstances #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- {-# OPTIONS_GHC -Wno-unused-top-binds #-}
- module EmbedOrderTest (specsWith, embedOrderMigrate, cleanDB) where
- 
---- a/src/EmbedTest.hs
-+++ b/src/EmbedTest.hs
-@@ -1,4 +1,7 @@
- {-# LANGUAGE UndecidableInstances #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- {-# OPTIONS_GHC -Wno-orphans -O0 #-}
- {-# OPTIONS_GHC -Wno-unused-top-binds #-}
- module EmbedTest (specsWith, cleanDB, embedMigrate) where
---- a/src/EmptyEntityTest.hs
-+++ b/src/EmptyEntityTest.hs
-@@ -1,4 +1,7 @@
- {-# LANGUAGE UndecidableInstances #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- {-# OPTIONS_GHC -Wno-unused-top-binds #-}
- module EmptyEntityTest (specsWith, migration, cleanDB) where
- 
---- a/src/EntityEmbedTest.hs
-+++ b/src/EntityEmbedTest.hs
-@@ -1,4 +1,7 @@
- {-# LANGUAGE UndecidableInstances #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- module EntityEmbedTest where
- 
- -- because we are using a type alias we need to declare in a separate module
---- a/src/EquivalentTypeTest.hs
-+++ b/src/EquivalentTypeTest.hs
-@@ -1,4 +1,6 @@
- {-# LANGUAGE GeneralizedNewtypeDeriving #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- {-# LANGUAGE UndecidableInstances #-}
- {-# OPTIONS_GHC -Wno-unused-top-binds #-}
- 
---- a/src/HtmlTest.hs
-+++ b/src/HtmlTest.hs
-@@ -1,4 +1,8 @@
- {-# LANGUAGE UndecidableInstances #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-+{-# LANGUAGE StandaloneDeriving #-}
-+
- {-# OPTIONS_GHC -Wno-unused-top-binds #-}
- module HtmlTest (specsWith, cleanDB, htmlMigrate) where
- 
---- a/src/LargeNumberTest.hs
-+++ b/src/LargeNumberTest.hs
-@@ -1,4 +1,7 @@
- {-# LANGUAGE UndecidableInstances #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- module LargeNumberTest where
- 
- import Data.Word
---- a/src/MaxLenTest.hs
-+++ b/src/MaxLenTest.hs
-@@ -1,4 +1,7 @@
- {-# LANGUAGE UndecidableInstances #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- {-# OPTIONS_GHC -Wno-unused-top-binds #-}
- 
- module MaxLenTest (specsWith, maxlenMigrate) where
---- a/src/MigrationColumnLengthTest.hs
-+++ b/src/MigrationColumnLengthTest.hs
-@@ -1,5 +1,7 @@
- {-# LANGUAGE GeneralizedNewtypeDeriving #-}
- {-# LANGUAGE UndecidableInstances #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- module MigrationColumnLengthTest where
- 
- import qualified Data.Text as T
---- a/src/MigrationIdempotencyTest.hs
-+++ b/src/MigrationIdempotencyTest.hs
-@@ -1,5 +1,7 @@
- {-# LANGUAGE GeneralizedNewtypeDeriving #-}
- {-# LANGUAGE UndecidableInstances #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- module MigrationIdempotencyTest where
- 
- import qualified Data.Text as T
---- a/src/MigrationOnlyTest.hs
-+++ b/src/MigrationOnlyTest.hs
-@@ -1,5 +1,8 @@
- {-# LANGUAGE UndecidableInstances #-}
- {-# OPTIONS_GHC -Wno-unused-top-binds #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- module MigrationOnlyTest (specsWith, migrateAll1, migrateAll2) where
- 
- import qualified Data.Text as T
---- a/src/MigrationTest.hs
-+++ b/src/MigrationTest.hs
-@@ -1,5 +1,7 @@
- {-# LANGUAGE GeneralizedNewtypeDeriving #-}
- {-# LANGUAGE UndecidableInstances #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- module MigrationTest where
- 
- import Database.Persist.TH
---- a/src/PersistUniqueTest.hs
-+++ b/src/PersistUniqueTest.hs
-@@ -1,5 +1,7 @@
- {-# LANGUAGE GeneralizedNewtypeDeriving #-}
- {-# LANGUAGE UndecidableInstances #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- module PersistUniqueTest where
- 
- import Init
---- a/src/PersistentTestModels.hs
-+++ b/src/PersistentTestModels.hs
-@@ -1,6 +1,7 @@
- {-# LANGUAGE GeneralizedNewtypeDeriving #-}
- {-# LANGUAGE StandaloneDeriving #-}
- {-# LANGUAGE UndecidableInstances #-} -- FIXME
-+{-# LANGUAGE DerivingStrategies #-}
- module PersistentTestModels where
- 
- import Data.Aeson
---- a/src/PrimaryTest.hs
-+++ b/src/PrimaryTest.hs
-@@ -1,5 +1,7 @@
- {-# LANGUAGE GeneralizedNewtypeDeriving #-}
- {-# LANGUAGE UndecidableInstances #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- module PrimaryTest where
- 
- import Init
---- a/src/Recursive.hs
-+++ b/src/Recursive.hs
-@@ -1,4 +1,7 @@
- {-# LANGUAGE UndecidableInstances #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- {-# OPTIONS_GHC -Wno-unused-top-binds #-}
- module Recursive (specsWith, recursiveMigrate, cleanup) where
- 
---- a/src/RenameTest.hs
-+++ b/src/RenameTest.hs
-@@ -1,4 +1,7 @@
- {-# LANGUAGE UndecidableInstances #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- module RenameTest where
- 
- import qualified Data.Map as Map
---- a/src/SumTypeTest.hs
-+++ b/src/SumTypeTest.hs
-@@ -1,5 +1,7 @@
- {-# LANGUAGE StandaloneDeriving #-}
- {-# LANGUAGE UndecidableInstances #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
- {-# OPTIONS_GHC -Wno-unused-top-binds #-}
- module SumTypeTest (specsWith, sumTypeMigrate) where
- 
---- a/src/TransactionLevelTest.hs
-+++ b/src/TransactionLevelTest.hs
-@@ -1,5 +1,7 @@
- {-# LANGUAGE GeneralizedNewtypeDeriving #-}
- {-# LANGUAGE UndecidableInstances #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- 
- module TransactionLevelTest where
- 
---- a/src/TreeTest.hs
-+++ b/src/TreeTest.hs
-@@ -1,5 +1,7 @@
- {-# LANGUAGE GeneralizedNewtypeDeriving #-}
- {-# LANGUAGE UndecidableInstances #-} -- FIXME
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- module TreeTest where
- 
- import Database.Persist.TH (mkDeleteCascade)
---- a/src/UniqueTest.hs
-+++ b/src/UniqueTest.hs
-@@ -1,5 +1,7 @@
- {-# LANGUAGE GeneralizedNewtypeDeriving #-}
- {-# LANGUAGE UndecidableInstances #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- module UniqueTest where
- 
- import Init
diff --git a/dev-haskell/x11/Manifest b/dev-haskell/x11/Manifest
index 615e501827b4..07e925b60faa 100644
--- a/dev-haskell/x11/Manifest
+++ b/dev-haskell/x11/Manifest
@@ -1,4 +1,3 @@
-AUX x11-1.9-no-LDFLAGS.patch 296 BLAKE2B 8ab586c978cbf6a224bd4edb65be6e19f7135ad5572c28fc732ab0e12b975840a08178cc8edead2589b6ea3b027c02967fbb013f6b95bc4a7d6fae85f7f508f5 SHA512 0937dda56fe2590c75bd3c1be5bfaaf87b9dfd4c960978143cc689f8e762c9a2f7ad056029c850e8fd52e367d75816866c8136635e1056da2101bed68a88bbc1
 DIST x11-1.10.2.tar.gz 192634 BLAKE2B a42e24aea6287a0af7f1b96fd9603d494fc010c9659a69ffcc46bb8670993271fb67061f5026f201bf730dbe0670d485f2a4197cdba5fc6bbd4f36fca4d6dd8e SHA512 5013dc359e081900193efd201c38c41ca73bc8dae3610e8e3b46e42aad7ae4a5917ecd3219d77e40141be7179963aaa2454032c820945e93ff4310ef359b2df4
 EBUILD x11-1.10.2.ebuild 964 BLAKE2B 7e81a2cb1b5909ea0c1b4822d717381237851397f901cc38b362c1c9263593cfef5d908c825c3899d87a561fa4b5ca0cc287111298da3fcfa8d8f43afe7fa963 SHA512 3e80a4053048a73cb360178b6c1f5f3e28c91b4e30dd110b7664f1880404875ff555ed3f44cf3ac7dcc2498ff35172baf10e1c8fe3a3154b1aa32be6061b011a
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/x11/files/x11-1.9-no-LDFLAGS.patch b/dev-haskell/x11/files/x11-1.9-no-LDFLAGS.patch
deleted file mode 100644
index 69bc33c0d21e..000000000000
--- a/dev-haskell/x11/files/x11-1.9-no-LDFLAGS.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Don't persist LDFLAGS into package database.
-
-https://bugs.gentoo.org/609624
---- a/X11.buildinfo.in
-+++ b/X11.buildinfo.in
-@@ -5,3 +5,3 @@ buildable: @BUILD_PACKAGE_BOOL@
- cc-options: @X_CFLAGS@ @CPPFLAGS@
--ld-options: @X_LIBS@ @LDFLAGS@
-+ld-options: @X_LIBS@
- extra-libraries: @EXTRA_LIBRARIES@