gentoo resync : 13.06.2020

7 files changed, 51 insertions, 274 deletions

diff --git a/dev-haskell/glade/Manifest b/dev-haskell/glade/Manifest
index c808e350235e..6ed57c83aade 100644
--- a/dev-haskell/glade/Manifest
+++ b/dev-haskell/glade/Manifest
@@ -1,6 +1,4 @@
-AUX Setup.hs 259 BLAKE2B e80e1fd9229f91e4b8960640eaf4f6f36e688a4c42fbf7d342301a0f9cf42d8531f177c2fa980b3f9ab6d1e346d39ae83ef7e5016b0045519a4f7b19f90c373d SHA512 62ad31d073a26c0465f82fdf521151aa622fc4eb0539f765536b4bccbbfbd30166b019fa9012412b025ee2ea1d9244614e4ad8d6941bfe63f4354cf333269993
-AUX glade-0.12.5.0-ghc-7.10.patch 8817 BLAKE2B f0daebe94458e9ef3704943b215312791a93c9dd3469fb05ca0e3d48780ba61dbb84770f5a4e4c70ef89289d46d0e6a139802a36fd7af54c05d37ae0e687f811 SHA512 dfc6ab3e97b2ec281c66454bac20ab64ac96c567c9bdeac849471b03b9b1fd18940389023ad19f2bdc0c2e1d78af1de0eecdea0aa006167c94890c407a5f8e1f
-DIST glade-0.12.5.0.tar.gz 152942 BLAKE2B ddcdaf5b74feff1992e754f11367cdccddb19c7e08c89d86af337c90c5cb0b450f04a0a45568b4f0837033d297a7b636fea09097462497b6abcef959a6fd1121 SHA512 5ea6ac03e919b881b53649c340d23eacc4c7e7055d9425b581c38bbc08192ad65e009b9bf03e9f224cee69ee2301354b2e42f4c7c845349b2b34fcdf8994c865
-EBUILD glade-0.12.5.0-r100.ebuild 1021 BLAKE2B d827e5be4041ba013745a1e9b4b961bbb951e46a4bdd23ccdd41748ab1069ada59f888d53c30d8ae8dca98cb15997ebcdbb0bbee21a60339444df3aa25fc2cc5 SHA512 698004c6a61481664013dfee79b14228fecf3f027b93c3e607059e1eed9a8e91c4a7be93c37ecf81998b7d3d70f783e877d1b9312421c0c0fb99dcf114774d9f
-EBUILD glade-0.12.5.0-r2.ebuild 1042 BLAKE2B ffa05505ea4f0089ce0f47ea17d4d112006aaa1fcc8b699337a358bef7bf7fc5fa336d4b94cc5177fe2990baa337acdb9ac5aa4bd9fa6c764a8e509360d00c02 SHA512 8abb40289af63db64f493e835b70dfb03a3390bb1ab41f1b89201d4a4e3b471f1c013006d00f4979e5a30c57e042eca0a12ee7405421a2ac8644068ef2cfdefb
+AUX glade-0.13.1-glib-2.62.patch 304 BLAKE2B 2206296250af1bb835669f5cb9bd68c3775d6d3a70217d7368a7cd01f5bf12012c5dbd680d8074182e0181cec4b26524ffb542cd9ce4408d28709b27eeb3a95d SHA512 2483f381af0e6ad1adf33a77e062c07fe33f3c62dce1f7da8983346f3344d88297dd592db256ef922812efac99fe86900fc98549110e80765d4c8dbe9491ed03
+DIST glade-0.13.1.tar.gz 145648 BLAKE2B 31d650bdbe848b2e14efadc90f074664775cfa040def9328c084871efbd708a1bd03d34047d83f9a76cfe4069f14f787c50bde419abb0539597be2ea4a806032 SHA512 3e4282c4a8170351a6c82bf346685da7dd192d9e0139d8ef3f104f085b10686d1b89a77f01f1edc500f5d9584c1c31a63d1f89dc48a1a9a3f100207ae425ddce
+EBUILD glade-0.13.1.ebuild 966 BLAKE2B 608b7071d1ff9b967c1509628a0c2799e0efbd6853211cd415bacf95cd3ec3f41a26f1eb2d65b84304a29d943f7f47b86104e8c050d1a050497fd915e9d94f55 SHA512 9b0baa2e04de3c794515ff6bec1a00d539eb5be00cc014519b40f9cae576bcaf031a4ca3a4b2c1aa33b859a10b9870d1b613e34d724d3d5d8ff96ad3c6095902
 MISC metadata.xml 597 BLAKE2B 76105e5cba3a760b7b4ed8c904b46798b07d90e0f3f20b5ee8e882f972e9d7fb920f75a99291329f137d336aa63691f056f1c1db7e4a19f552ca00351249e496 SHA512 949a3f88b0af3944a268f389e7cfb202f4bb7ccb725c52c28bd127814b853f34cc201c1a9859d97804cf1eb911a5aaa70f7a0415680476343bf0bcb5fa12e63c
diff --git a/dev-haskell/glade/files/Setup.hs b/dev-haskell/glade/files/Setup.hs
deleted file mode 100644
index 5fbe833309e9..000000000000
--- a/dev-haskell/glade/files/Setup.hs
+++ /dev/null
@@ -1,8 +0,0 @@
--- Adjustments specific to this package,
--- all Gtk2Hs-specific boilerplate is kept in
--- gtk2hs-buildtools:Gtk2HsSetup
---
-import Gtk2HsSetup ( gtk2hsUserHooks )
-import Distribution.Simple ( defaultMainWithHooks )
-
-main = defaultMainWithHooks gtk2hsUserHooks
diff --git a/dev-haskell/glade/files/glade-0.12.5.0-ghc-7.10.patch b/dev-haskell/glade/files/glade-0.12.5.0-ghc-7.10.patch
deleted file mode 100644
index 3e5d673661d3..000000000000
--- a/dev-haskell/glade/files/glade-0.12.5.0-ghc-7.10.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-diff --git a/Gtk2HsSetup.hs b/Gtk2HsSetup.hs
-index 371090a..8c60eec 100644
---- a/Gtk2HsSetup.hs
-+++ b/Gtk2HsSetup.hs
-@@ -8,5 +8,5 @@
- --
--module Gtk2HsSetup ( 
--  gtk2hsUserHooks, 
--  getPkgConfigPackages, 
-+module Gtk2HsSetup (
-+  gtk2hsUserHooks,
-+  getPkgConfigPackages,
-   checkGtk2hsBuildtools,
-@@ -57,4 +57,5 @@ import Distribution.Verbosity
- import Control.Monad (when, unless, filterM, liftM, forM, forM_)
--import Data.Maybe ( isJust, isNothing, fromMaybe, maybeToList )
--import Data.List (isPrefixOf, isSuffixOf, stripPrefix, nub)
-+import Data.Maybe ( isJust, isNothing, fromMaybe, maybeToList, catMaybes )
-+import Data.List (isPrefixOf, isSuffixOf, nub, minimumBy, stripPrefix, tails )
-+import Data.Ord as Ord (comparing)
- import Data.Char (isAlpha, isNumber)
-@@ -115,5 +116,12 @@ fixLibs dlls = concatMap $ \ lib ->
-     case filter (isLib lib) dlls of
--                dll:_ -> [dropExtension dll]
--                _     -> if lib == "z" then [] else [lib]
-+                dlls@(_:_) -> [dropExtension (pickDll dlls)]
-+                _          -> if lib == "z" then [] else [lib]
-   where
-+    -- If there are several .dll files matching the one we're after then we
-+    -- just have to guess. For example for recent Windows cairo builds we get
-+    -- libcairo-2.dll libcairo-gobject-2.dll libcairo-script-interpreter-2.dll
-+    -- Our heuristic is to pick the one with the shortest name.
-+    -- Yes this is a hack but the proper solution is hard: we would need to
-+    -- parse the .a file and see which .dll file(s) it needed to link to.
-+    pickDll = minimumBy (Ord.comparing length)
-     isLib lib dll =
-@@ -123,3 +131,3 @@ fixLibs dlls = concatMap $ \ lib ->
-             _                           -> False
--        
-+
- -- The following code is a big copy-and-paste job from the sources of
-@@ -156,8 +164,12 @@ register :: PackageDescription -> LocalBuildInfo
-          -> IO ()
--register pkg@(library       -> Just lib )
--         lbi@(libraryConfig -> Just clbi) regFlags
-+register pkg@PackageDescription { library       = Just lib  } lbi regFlags
-   = do
-+    let clbi = LBI.getComponentLocalBuildInfo lbi LBI.CLibName
- 
-     installedPkgInfoRaw <- generateRegistrationInfo
-+#if CABAL_VERSION_CHECK(1,22,0)
-+                           verbosity pkg lib lbi clbi inplace False distPref packageDb
-+#else
-                            verbosity pkg lib lbi clbi inplace distPref
-+#endif
- 
-@@ -170,3 +182,3 @@ register pkg@(library       -> Just lib )
-     case () of
--     _ | modeGenerateRegFile   -> die "Generate Reg File not supported"
-+     _ | modeGenerateRegFile   -> writeRegistrationFile installedPkgInfo
-        | modeGenerateRegScript -> die "Generate Reg Script not supported"
-@@ -182,2 +194,4 @@ register pkg@(library       -> Just lib )
-     modeGenerateRegFile = isJust (flagToMaybe (regGenPkgConf regFlags))
-+    regFile             = fromMaybe (display (packageId pkg) <.> "conf")
-+                                    (fromFlag (regGenPkgConf regFlags))
-     modeGenerateRegScript = fromFlag (regGenScript regFlags)
-@@ -190,2 +204,6 @@ register pkg@(library       -> Just lib )
- 
-+    writeRegistrationFile installedPkgInfo = do
-+      notice verbosity ("Creating package registration file: " ++ regFile)
-+      writeUTF8File regFile (showInstalledPackageInfo installedPkgInfo)
-+
- register _ _ regFlags = notice verbosity "No package to register"
-@@ -249,3 +267,3 @@ getCppOptions bi lbi
-    ++ [opt | opt@('-':c:_) <- PD.cppOptions bi ++ PD.ccOptions bi, c `elem` "DIU"]
--   ++ ["-D__GLASGOW_HASKELL__="++show (ghcDefine . versionBranch . compilerVersion $ LBI.compiler lbi)]
-+   ++ ["-D__GLASGOW_HASKELL__="++show (ghcDefine . ghcVersion . compilerId $ LBI.compiler lbi)]
-  where
-@@ -254,2 +272,15 @@ getCppOptions bi lbi
- 
-+  ghcVersion :: CompilerId -> [Int]
-+-- This version is nicer, but we need to know the Cabal version that includes the new CompilerId
-+-- #if CABAL_VERSION_CHECK(1,19,2)
-+--   ghcVersion (CompilerId GHC v _) = versionBranch v
-+--   ghcVersion (CompilerId _ _ (Just c)) = ghcVersion c
-+-- #else
-+--   ghcVersion (CompilerId GHC v) = versionBranch v
-+-- #endif
-+--   ghcVersion _ = []
-+-- This version should work fine for now
-+  ghcVersion = concat . take 1 . map (read . (++"]") . takeWhile (/=']')) . catMaybes
-+               . map (stripPrefix "CompilerId GHC (Version {versionBranch = ") . tails . show
-+
- installCHI :: PackageDescription -- ^information from the .cabal file
-@@ -264,3 +295,3 @@ installCHI pkg@PD.PackageDescription { library = Just lib } lbi verbosity copyde
-                    (PD.libModules lib)
--                 
-+
-   let files = [ f | Just f <- mFiles ]
-@@ -268,3 +299,3 @@ installCHI pkg@PD.PackageDescription { library = Just lib } lbi verbosity copyde
- 
--  
-+
- installCHI _ _ _ _ = return ()
-@@ -294,3 +325,2 @@ genSynthezisedFiles :: Verbosity -> PackageDescription -> LocalBuildInfo -> IO (
- genSynthezisedFiles verb pd lbi = do
--
-   cPkgs <- getPkgConfigPackages verb lbi pd
-@@ -300,3 +330,3 @@ genSynthezisedFiles verb pd lbi = do
-       typeOpts :: String -> [ProgArg]
--      typeOpts tag = concat [ map (\val -> '-':'-':drop (length tag) field++'=':val) (words content)
-+      typeOpts tag = concat [ map (\val -> '-':'-':drop (length tag) field ++ '=':val) (words content)
-                             | (field,content) <- xList,
-@@ -308,4 +338,5 @@ genSynthezisedFiles verb pd lbi = do
-                  , tag <- name'
--                        : [ name' ++ "-" ++ show major ++ "." ++ show digit
--                          | digit <- [0,2..minor] ]
-+                        :[ name' ++ "-" ++ show maj ++ "." ++ show d2
-+                          | (maj, d2) <- [(maj,   d2) | maj <- [0..(major-1)], d2 <- [0,2..20]]
-+                                      ++ [(major, d2) | d2 <- [0,2..minor]] ]
-                  ]
-@@ -400,11 +431,6 @@ fixDeps pd@PD.PackageDescription {
-   modDeps <- mapM extractDeps modDeps
--  let (expMods, othMods) = span mdExposed $ sortTopological modDeps
--      badOther = map (fromMaybe "<no file>" . mdLocation) $
--                 filter (not . mdExposed) expMods
--  unless (null badOther) $
--    die ("internal chs modules "++intercalate "," badOther++
--         " depend on exposed chs modules; cabal needs to build internal modules first")
-+  let (othMods, expMods) = span (not . mdExposed) $ reverse $ sortTopological modDeps
-   return pd { PD.library = Just lib {
--    PD.exposedModules = map mdOriginal expMods,
--    PD.libBuildInfo = bi { PD.otherModules = map mdOriginal othMods }
-+    PD.exposedModules = map mdOriginal (reverse expMods),
-+    PD.libBuildInfo = bi { PD.otherModules = map mdOriginal (reverse othMods) }
-   }}
-@@ -428,3 +454,3 @@ instance Ord ModDep where
- -- ignores CPP conditionals. We just require everything which means that the
---- existance of a .chs module may not depend on some CPP condition.  
-+-- existance of a .chs module may not depend on some CPP condition.
- extractDeps :: ModDep -> IO ModDep
-@@ -435,3 +461,3 @@ extractDeps md@ModDep { mdLocation = Just f } = withUTF8FileContents f $ \con ->
-           case simpleParse (takeWhile ('#' /=) ys) of
--            Just m -> findImports (m:acc) xxs 
-+            Just m -> findImports (m:acc) xxs
-             Nothing -> die ("cannot parse chs import in "++f++":\n"++
-@@ -469,3 +495,3 @@ checkGtk2hsBuildtools programs = do
-   let printError name = do
--        putStrLn $ "Cannot find " ++ name ++ "\n" 
-+        putStrLn $ "Cannot find " ++ name ++ "\n"
-                  ++ "Please install `gtk2hs-buildtools` first and check that the install directory is in your PATH (e.g. HOME/.cabal/bin)."
-@@ -473,2 +499,2 @@ checkGtk2hsBuildtools programs = do
-   forM_ programInfos $ \ (name, location) ->
--    when (isNothing location) (printError name) 
-+    when (isNothing location) (printError name)
-diff --git a/SetupMain.hs b/SetupMain.hs
-index 201ee8f..2d1a782 100644
---- a/SetupMain.hs
-+++ b/SetupMain.hs
-@@ -12,2 +12,2 @@ main = do
-   defaultMainWithHooks gtk2hsUserHooks
--  
-+
-diff --git a/SetupWrapper.hs b/SetupWrapper.hs
-index aa825ec..44a20f8 100644
---- a/SetupWrapper.hs
-+++ b/SetupWrapper.hs
-@@ -11,3 +11,3 @@ import Distribution.Simple.Compiler
- import Distribution.Simple.BuildPaths (exeExtension)
--import Distribution.Simple.Configure (configCompiler)
-+import Distribution.Simple.Configure (configCompilerEx)
- import Distribution.Simple.GHC (getInstalledPackages)
-@@ -20,3 +20,3 @@ import System.Environment
- import System.Process
--import System.Exit
-+import System.Exit (ExitCode(..), exitWith)
- import System.FilePath
-@@ -117,3 +117,3 @@ setupWrapper setupHsFile = do
- 
--        (comp, conf)    <- configCompiler (Just GHC) Nothing Nothing
-+        (comp, _, conf) <- configCompilerEx (Just GHC) Nothing Nothing
-                              defaultProgramConfiguration verbosity
diff --git a/dev-haskell/glade/files/glade-0.13.1-glib-2.62.patch b/dev-haskell/glade/files/glade-0.13.1-glib-2.62.patch
new file mode 100644
index 000000000000..953c9df0ec13
--- /dev/null
+++ b/dev-haskell/glade/files/glade-0.13.1-glib-2.62.patch
@@ -0,0 +1,10 @@
+--- a/glade.cabal
++++ b/glade.cabal
+@@ -82,6 +82,7 @@ Library
+         default-language: Haskell98
+         default-extensions: ForeignFunctionInterface
+ 
++        cpp-options: -D__attribute__(A)=
+         if os(darwin)
+           cpp-options: -U__BLOCKS__ -D__attribute__(A)= -D_Nullable= -D_Nonnull=
+ 
diff --git a/dev-haskell/glade/glade-0.12.5.0-r100.ebuild b/dev-haskell/glade/glade-0.12.5.0-r100.ebuild
deleted file mode 100644
index 786bb0925788..000000000000
--- a/dev-haskell/glade/glade-0.12.5.0-r100.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Binding to the glade library"
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="2/${PV}"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/glib-0.12.5.0:0=[profile?]
-	>=dev-haskell/gtk-0.12.5.0:2=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-	gnome-base/libglade:2.0
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/gtk2hs-buildtools-0.12.5.1-r1:0=
-	>=dev-haskell/cabal-1.24
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ghc-7.10.patch
-
-	# update to latest gtk2hs-buildtools
-	rm Setup.hs || die
-	rm Gtk2HsSetup.hs || die
-	cp "${FILESDIR}"/Setup.hs ./ || die
-
-	cabal_chdeps \
-		'glib >= 0.12.5.0 && < 0.13' 'glib >= 0.12.5.0' \
-		'gtk >= 0.12.5.0 && < 0.13' 'gtk >= 0.12.5.0'
-}
diff --git a/dev-haskell/glade/glade-0.12.5.0-r2.ebuild b/dev-haskell/glade/glade-0.12.5.0-r2.ebuild
deleted file mode 100644
index 48cdb9998cf1..000000000000
--- a/dev-haskell/glade/glade-0.12.5.0-r2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-#nocabaldep is for the fancy cabal-detection feature at build-time
-CABAL_FEATURES="lib profile haddock hoogle hscolour nocabaldep"
-inherit haskell-cabal
-
-DESCRIPTION="Binding to the glade library"
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="2/${PV}"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/glib-0.12.5.0:0=[profile?] <dev-haskell/glib-0.14:0=[profile?]
-	>=dev-haskell/gtk-0.12.5.0:2=[profile?] <dev-haskell/gtk-0.14:2=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-	gnome-base/libglade:2.0
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/gtk2hs-buildtools-0.12.5.1-r1:0=
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ghc-7.10.patch
-
-	cabal_chdeps \
-		'glib >= 0.12.5.0 && < 0.13' 'glib >= 0.12.5.0 && < 0.14' \
-		'gtk >= 0.12.5.0 && < 0.13' 'gtk >= 0.12.5.0 && < 0.14'
-}
diff --git a/dev-haskell/glade/glade-0.13.1.ebuild b/dev-haskell/glade/glade-0.13.1.ebuild
new file mode 100644
index 000000000000..f00e962571d0
--- /dev/null
+++ b/dev-haskell/glade/glade-0.13.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Binding to the glade library"
+HOMEPAGE="http://projects.haskell.org/gtk2hs/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="2/${PV}"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/glib-0.13.4:0=[profile?] <dev-haskell/glib-0.14:0=[profile?]
+	>=dev-haskell/gtk-0.14.5:2=[profile?] <dev-haskell/gtk-0.15:2=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	gnome-base/libglade:2.0
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24
+	>=dev-haskell/gtk2hs-buildtools-0.13.2.0:0= <dev-haskell/gtk2hs-buildtools-0.14:0=
+	virtual/pkgconfig
+"
+
+PATCHES=("${FILESDIR}"/${PN}-0.13.1-glib-2.62.patch)
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'Cabal >= 1.24 && < 1.25' 'Cabal >= 1.24'
+}