gentoo resync : 20.03.2021

6 files changed, 189 insertions, 83 deletions

diff --git a/dev-haskell/haddock-api/Manifest b/dev-haskell/haddock-api/Manifest
index 1c2e6dd453b3..0f8f0f4d9ec7 100644
--- a/dev-haskell/haddock-api/Manifest
+++ b/dev-haskell/haddock-api/Manifest
@@ -1,8 +1,6 @@
-AUX haddock-api-2.17.3-ghc-8.0.2_rc1.patch 747 BLAKE2B 743b22c933a793ed5006664ff78b7b1691e8ea745f8dedf080a426c2daaadc69d4e7dced80e9872c7e6a65c56cf2946cf24f75219b2e9b8dc361598c8f27fed8 SHA512 813823790fceb96c8b314835896dac165bd4e91f888090c65cbe91dc2ac026e2d0bd79acb40974154252ea106a7dcf56d80da6af4dd67db59f8004166f29bf08
-DIST haddock-api-2.16.1.tar.gz 125372 BLAKE2B dbc0678cd38bad8549375468ddda27061e17cb74927e1a1c3c286cb25e8cd098a8f17333d199897bcd7ee56553b4d68b206a6935c44b0a5056810921fc6a3b45 SHA512 01450602d238651a8711141d51f5246536a96b69efee29942296fdfc249929f5f33df24ee676b56d0ba82269cb6557dd3a4e8fabbd1b809e506867b5f285bb17
-DIST haddock-api-2.17.3.tar.gz 145142 BLAKE2B 1ca87c180baed23ec5df5d5cbfedc7e3823c344655b2d13f2bcbce0c774874223269b06a88f45365511f6789f8068086c04460faaf4eec7354a20bc18680ce26 SHA512 00057618d970fc7786913eec0b408baabbf1aff4b705c105f6d6347ae9c46af1b2ea7bed420edfaec38c835dee08593c9ae53ab9a30153239e687de6f5301840
+AUX haddock-api-2.24.0-ghc-8.10.2.patch 6161 BLAKE2B d13f756bb8736d320f00c06bc654b684ab5dff03df0f58a5a895ba61f038e8566a08a1174a62c984e94f2ce145ecf7a443a9b453f7260e09dee1d7caac4de551 SHA512 351c34536d3faccececd4ccbc3f6b8aa9bf03438d65ef46788496be9455ba9d7c1db4bb6fdc1b185ad014ec06ed7e1ab94dddf72be56a1205ae95a6e6167d448
 DIST haddock-api-2.23.1.tar.gz 200096 BLAKE2B 0635881e198c1df3690f07185da7cc49f8eb92283d99c581756c86fb9f293b28608ac3eea9090abcc3afa12c646e584939df9b8c38b4844e9c462824426019f5 SHA512 fb7826102476a3f292da336f8f16c7a647df7c4432bed905815509fff0df164255c0856cc17663bb42479114ed9a418e6bcd214fb8594b245d401c9e091ac4ef
-EBUILD haddock-api-2.16.1.ebuild 837 BLAKE2B 5714c573a889ea1ab25d4348abac1c0ad4c090c4d0993d50ee7b43e09ea0e8a90fee5e20cf1b5ea36473f963d3933d41931eca20afa2d2b46f78e06347de022e SHA512 c72fb8c9e0e3d0ea5d021931ef7f50acf255b680218313f7c812b4ea812c8dd3d86cb7cb0a9e092f79a33aff5996f2484982267dcaf6f4c7d2b8b223b96e64cb
-EBUILD haddock-api-2.17.3.ebuild 1050 BLAKE2B fa65189aeb89200c0d55a4e30b29cda630d346ba3d6a6430a331f83515f73a626913080e02b6af7b9bfcd60ee9204cd548ed4da943128e4547e8e2fd760dc37a SHA512 1cdc9ddeda2cad2193975ebd504d2ebb1d319f6aaf0f0b3d10cd677b14880e7495eeeddf701820b34cc6d7f8b419ff63887b0dee099d15f687166ab3970f500a
+DIST haddock-api-2.24.0.tar.gz 200478 BLAKE2B 5c4f7be45066583e3d3afa0b1866070f2c05d71685526b0d915461f75208f13cf6bbf2b91cc820e1f229df9dbf240cfef150fb3a9929878cfdc02db9dc124c99 SHA512 dfbe5bcfd722dc92ec70aca2dd681da9e122f60ec3da5c9583c188f65b11bade314c64d4af1a3a51cf8f618d8bea943bd4052aa9860ece38ab10717b484ed057
 EBUILD haddock-api-2.23.1.ebuild 1087 BLAKE2B 937fb9b076c2081f74228d85f11366b937ebfcf450a04f8eccf0ce43b03a8c8c13657a4571a873db543b346c853658bee39c6706857e69342eea953b7e27cae5 SHA512 d795bc7254f46790f615b6a6d507ed8693c1cc84bab3fb143f5e9201d486d77459579705f22cb1e335a6dca6532621e10eeafddb0e5ca0721b5771f346834918
+EBUILD haddock-api-2.24.0.ebuild 1146 BLAKE2B bbc12c4eda94191c71bed7a5cb42b550a75d7c1310cf1851452cf67e235df15e771470a41eb5fa42670abca079cb03fd3f8fedeedde56360e7c741279a130c01 SHA512 1bde64fd2ff4ef0337ac2050e08b71dd3b7d323b35a9ac5a1efe3392552b205d52ac1fb9d5e460efcef512c17ecafa0ee34e853867946377a30042c2efb40805
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/haddock-api/files/haddock-api-2.17.3-ghc-8.0.2_rc1.patch b/dev-haskell/haddock-api/files/haddock-api-2.17.3-ghc-8.0.2_rc1.patch
deleted file mode 100644
index 6aafc8f37522..000000000000
--- a/dev-haskell/haddock-api/files/haddock-api-2.17.3-ghc-8.0.2_rc1.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/src/Haddock/Types.hs b/src/Haddock/Types.hs
-index eacf447..458d15f 100644
---- a/src/Haddock/Types.hs
-+++ b/src/Haddock/Types.hs
-@@ -1,2 +1,2 @@
--{-# LANGUAGE DeriveDataTypeable, DeriveFunctor, DeriveFoldable, DeriveTraversable, StandaloneDeriving, TypeFamilies, RecordWildCards #-}
-+{-# LANGUAGE DeriveDataTypeable, DeriveFunctor, DeriveFoldable, DeriveTraversable, StandaloneDeriving, TypeFamilies, RecordWildCards, CPP #-}
- {-# OPTIONS_GHC -fno-warn-orphans #-}
-@@ -450,2 +450,3 @@ instance (NFData a, NFData mod)
- 
-+#if !MIN_VERSION_GLASGOW_HASKELL(8,0,1,1)
- instance NFData Name where rnf x = seq x ()
-@@ -453,2 +454,3 @@ instance NFData OccName where rnf x = seq x ()
- instance NFData ModuleName where rnf x = seq x ()
-+#endif
- 
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
new file mode 100644
index 000000000000..84c275fbb348
--- /dev/null
+++ b/dev-haskell/haddock-api/files/haddock-api-2.24.0-ghc-8.10.2.patch
@@ -0,0 +1,147 @@
+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/haddock-api-2.16.1.ebuild b/dev-haskell/haddock-api/haddock-api-2.16.1.ebuild
deleted file mode 100644
index eb3209d4acbb..000000000000
--- a/dev-haskell/haddock-api/haddock-api-2.16.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A documentation-generation tool for Haskell libraries"
-HOMEPAGE="https://www.haskell.org/haddock/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cabal-1.10:=[profile?]
-	dev-haskell/ghc-paths:=[profile?]
-	>=dev-haskell/haddock-library-1.2:=[profile?] <dev-haskell/haddock-library-1.3:=[profile?]
-	>=dev-haskell/xhtml-3000.2:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?]
-	>=dev-lang/ghc-7.10:= <dev-lang/ghc-7.12:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/haddock-api/haddock-api-2.17.3.ebuild b/dev-haskell/haddock-api/haddock-api-2.17.3.ebuild
deleted file mode 100644
index f2203d2510d2..000000000000
--- a/dev-haskell/haddock-api/haddock-api-2.17.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A documentation-generation tool for Haskell libraries"
-HOMEPAGE="https://www.haskell.org/haddock/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-# keep in sync with ghc-8.0.1
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cabal-1.10:=[profile?]
-	dev-haskell/ghc-paths:=[profile?]
-	>=dev-haskell/haddock-library-1.4:=[profile?] <dev-haskell/haddock-library-1.5:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-haskell/xhtml-3000.2:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?]
-	>=dev-lang/ghc-8.0:= <dev-lang/ghc-8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.0.0
-	test? ( dev-haskell/hspec
-		>=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3 )
-"
-
-PATCHES=("${FILESDIR}"/${P}-ghc-8.0.2_rc1.patch)
diff --git a/dev-haskell/haddock-api/haddock-api-2.24.0.ebuild b/dev-haskell/haddock-api/haddock-api-2.24.0.ebuild
new file mode 100644
index 000000000000..d17fc17abb38
--- /dev/null
+++ b/dev-haskell/haddock-api/haddock-api-2.24.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CABAL_FEATURES="lib hoogle hscolour profile test-suite" # haddock
+inherit haskell-cabal
+
+DESCRIPTION="A documentation-generation tool for Haskell libraries"
+HOMEPAGE="https://www.haskell.org/haddock/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+# keep in sync with ghc-8.10
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=dev-haskell/ghc-paths-0.1.0.9:=[profile?] <dev-haskell/ghc-paths-0.2:=[profile?]
+	>=dev-haskell/haddock-library-1.9.0:=[profile?] <dev-haskell/haddock-library-1.10:=[profile?]
+	>=dev-haskell/xhtml-3000.2.2:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?]
+	>=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? ( >=dev-haskell/ghc-paths-0.1.0.12 <dev-haskell/ghc-paths-0.2
+		>=dev-haskell/hspec-2.4.4 <dev-haskell/hspec-2.8
+		>=dev-haskell/quickcheck-2.11
+		)
+"
+
+PATCHES=("${FILESDIR}"/${P}-ghc-8.10.2.patch )
+
+src_prepare () {
+	default
+
+	cabal_chdeps \
+		'QuickCheck      >= 2.11  && < 2.14' 'QuickCheck >= 2.11'
+}