gentoo resync : 25.08.2020

8 files changed, 7 insertions, 232 deletions

diff --git a/x11-wm/xmonad-contrib/Manifest b/x11-wm/xmonad-contrib/Manifest
index 2a5dd46a53c9..b0a7f1c12a1d 100644
--- a/x11-wm/xmonad-contrib/Manifest
+++ b/x11-wm/xmonad-contrib/Manifest
@@ -1,13 +1,3 @@
-AUX xmonad-contrib-0.11.2-ghc-7.8.patch 1094 BLAKE2B f7ae4dd802fcdbe06f699e01153967b36d5b4dd9357968fa2f00da03bf936f00100aabd020d4b9cbd073e84099b24094eb1a5e0de9b9b8a3ad4fde19fd326ddd SHA512 f4eff1596ef91e8b53a8cd9d31a315f83f3b2a0cb3d23bb9e045b7b38c9159583e3ea0a75c22557031bfafe72656cc01263c89bc5b83a41a76b03ae6b380e8f8
-AUX xmonad-contrib-0.11.4-import-Applicative.patch 918 BLAKE2B 2db877ca920a80ae3eb6e07005a19e703ab54c0aa18bdab68865bc911d01307204fe8358f576a8f9a41d7452ae1e7c59d0de1fff7e5746af18ccacb976c0f9b3 SHA512 a1ebc7a6d6fa5f04242e966b2894ea128cbd4ef32f6c6d3339695a11836b09650edc0624ea587e227f71423f9794decfec54bf56d135636a5518640305cb8f4b
-DIST xmonad-contrib-0.11.2.tar.gz 401758 BLAKE2B 06697bac621dabbbc3e066c38efbfc819087569c18cf7064820a826e0a28f48257b84f54659bc64db062b187129df899f694bb2ea8fa375b5dfb49afce1c170c SHA512 373e1ed1744cbdf26902402d74b4efafa043a4ccf1953c26ec55a03ef8de31818b0c4cfced08b43e664e5f052e52923c6dfb08d68be86726e9f0ed1d96ad7910
-DIST xmonad-contrib-0.11.4.tar.gz 401743 BLAKE2B f6962bcb88e88ebf620ef037c08de8c21ebbb10cb863852f60b5f3ba03d72d00dfb737b57ca0bb5f2fa3364a120fe00377d6c27735abbc8f7eb0b1992ec705b7 SHA512 3d747988baa497475255be4cc96f7eba5cf6fc81658f8f877ca92148fb9a154423ee98ebeb23690de00b186d2e34ad13d94cf1fe332d4ca4f1f4a64790e46ed7
-DIST xmonad-contrib-0.12.tar.gz 464978 BLAKE2B 72b08d01a24e1a878bc1d7175755b45d0751236f01c276f3b5baaf332f3baf5c81b2c75c8ab88e221f1cabde0f3ed3f7a613b672b038da95de0ef4d69f249307 SHA512 5bb145fc7d07ebc8e4dde5ba83b5340913fb089581d22e993663402fc6728eab9f6939466b7a262827c0098599073a928700e0acb8245b943b23e6cd01e63056
-DIST xmonad-contrib-0.13.tar.gz 485351 BLAKE2B ef42ad08bf5878046abfbc0c2cbb79853c01e2e0ba0e6ab0723e575531dc106c32dce58fe9e6e35b5e84f18b04456aec03ef838a9cb6fc34396415a311e1b2d5 SHA512 40b8a8fc8a1fa134f2726c273ff75eee26a43c9f18095bad9251e4b37b0cca5ee6c32eec5c42aa00c9e0c5c90ae54e6414739a2cee5b5d2917814358449d55f5
-DIST xmonad-contrib-0.15.tar.gz 524285 BLAKE2B e34b32a4899e98b00ae5ea4539a8566f056f794adb672df035d140532faf0996ef4bcf078998a1a6bd93320c5ebd41d51babf98a5332142c3a8644d3eb0e007d SHA512 c4669a51f6c1fbb50f5d484ae4a24b608d2b03c2e6814fa2ae079fe57a4b599e3072ae23c29b22fe2cf86a04840b4262a646ee4c7ba7c9a859ee78a31f99bc8a
-EBUILD xmonad-contrib-0.11.2.ebuild 1067 BLAKE2B a6fbccac4def0e616180b3a56d77a988d829451c8911d6cb4897a5576fbe05c270f82722b5790754ca55bfe4bb39fb4313d4ab7c5e3bb10c6c20b3a0ed52a520 SHA512 a252e5628979ee18d8e4674e7029a85eed5bef3012344fb6b427eef3dec9813ddd7f0a178aa4bd97b61c184634953330cde0221cdd1df982d0f6bb0efa171e83
-EBUILD xmonad-contrib-0.11.4.ebuild 1467 BLAKE2B 7e5788e4b64d656a63868e68157443e79cc1965fdf16a12fcfb32b3ad2061707582606775efb4fe8a4f9b069a3036af9faa3ab705267e15df95867f9b99d26bf SHA512 f7357f6b08fc9a68a94b8e23f73b7189b2361dc370cc98500e2c9c2101e06b4d27b106b23f656febd4bba00e7e7bbdf5e0aac7f9a73e4eb483098d1dd634d892
-EBUILD xmonad-contrib-0.12.ebuild 1103 BLAKE2B 59f8ffb2844cd05c2b2727101c7e0c4f64fab5bc34046d1a9daffbd8ce26f00c1593abf2840a34528ba370f5303af2d73d097e53163a4b42f55da08842cc31e2 SHA512 791a9f0597e7921d9992a46c961c54adc361fc9dd85ed9a45cb1050e6ba3d0f10935328f0dac8b507508eea01ac0a9cf1b08727c9d7c5bb2e30e2d0483c46bb6
-EBUILD xmonad-contrib-0.13.ebuild 1096 BLAKE2B de5ba1ec0213ec62b053820a35c3d7e632125a02c2441b3105eb99749ab77c336d6296da22980047b992601f90f0878ceaa2bb6887fda98e3429158f9a5edaa1 SHA512 243ef681db68e135cc9afb86bf023191ebcc2d6abfc25df51087482a54308df13bf73231a999bca83052e0fce046ef77738d8b243a415ee6a46601be6efa470e
-EBUILD xmonad-contrib-0.15.ebuild 1133 BLAKE2B 70747051a40bd68bc16f85f34647f45ce2630fa359c131c22fb7f08b22dff28700d7dc8b9f7fb6ea76de79dc10a632621802b16f969ffbee0f94cfd3472e4dbd SHA512 9c32f3ad4f2016d53ae5288fa7a272b7d9e1457c26b958def381c013ccb1565f66921f6ceca994c14a169f83fe57acb92c6bf2ed1227ee182907da17e607a301
+DIST xmonad-contrib-0.16.tar.gz 540237 BLAKE2B 7ddf8730481c39e9b5e40a548f3cbe36f301901656c57cc5ffdd11e05ad516019dc0b82c7dcf77665c152c390f7b7ae49c04ec6ae39347565b11a23aef23cce3 SHA512 22a18b4045cbfca0229cbf6c0bf1dfa595cbffbe6b82fd58b1fcf941cbfd306642160995b55859cead3cf574df696d2a3cea6507cac4d5c7c58cf09b3a86bc25
+EBUILD xmonad-contrib-0.16.ebuild 1129 BLAKE2B 13465d4c72818c72fe290942915da6913e96d9835b755139830e3bb1db039a4bae7f3f8a34cca1118232687d5595a853e7cb9a3a9f65470e0159181aa42a3dbb SHA512 51f21157803d431d9c681eeae7c2e5d27246caabf5464ea03b4a007201f148da6278c477bb9ff1aef3cc34f660b91b605f18ea3faa7d83ec528c3fd19eda398e
 MISC metadata.xml 708 BLAKE2B 0aae3704519ca0ffba4e25ae3236ebd02ecb6a9e7bef7d23a32107ad6e6826f09613dc6206fd1e350a8e3536061136cfdd463f7e2a80b16e7f38b30db14c4fc4 SHA512 570916b2bcf06efaeccb486d3161d0b751c675955abae7efc57d471961e2c1649075bc155e75849cd1b56c0a5917341f7ef2cbb12e81255787cfb282a6ea1fb7
diff --git a/x11-wm/xmonad-contrib/files/xmonad-contrib-0.11.2-ghc-7.8.patch b/x11-wm/xmonad-contrib/files/xmonad-contrib-0.11.2-ghc-7.8.patch
deleted file mode 100644
index 67e1f8cd8def..000000000000
--- a/x11-wm/xmonad-contrib/files/xmonad-contrib-0.11.2-ghc-7.8.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Sun Feb 17 19:33:56 FET 2013  Adam Vogt <vogt.adam@gmail.com>
-  * Remove unnecessary contexts from L.MultiToggle
-diff -rN -u old-XMonadContrib/XMonad/Layout/MultiToggle.hs new-XMonadContrib/XMonad/Layout/MultiToggle.hs
---- old-XMonadContrib/XMonad/Layout/MultiToggle.hs	2014-02-06 00:58:32.422844682 +0300
-+++ new-XMonadContrib/XMonad/Layout/MultiToggle.hs	2014-02-06 00:58:32.462844684 +0300
-@@ -99,7 +99,7 @@
-     transform :: (LayoutClass l a) => t -> l a ->
-         (forall l'. (LayoutClass l' a) => l' a -> (l' a -> l a) -> b) -> b
- 
--data (LayoutClass l a) => EL l a = forall l'. (LayoutClass l' a) => EL (l' a) (l' a -> l a)
-+data  EL l a = forall l'. (LayoutClass l' a) => EL (l' a) (l' a -> l a)
- 
- unEL :: (LayoutClass l a) => EL l a -> (forall l'. (LayoutClass l' a) => l' a -> b) -> b
- unEL (EL x _) k = k x
-@@ -159,7 +159,7 @@
- infixr 0 ??
- -- | Prepend an element to a heterogeneous list. Used to build transformer
- -- tables for 'mkToggle'.
--(??) :: (HList b w) => a -> b -> HCons a b
-+(??) ::  a -> b -> HCons a b
- (??) = HCons
- 
- -- | Construct a singleton transformer table.
diff --git a/x11-wm/xmonad-contrib/files/xmonad-contrib-0.11.4-import-Applicative.patch b/x11-wm/xmonad-contrib/files/xmonad-contrib-0.11.4-import-Applicative.patch
deleted file mode 100644
index d887e857da03..000000000000
--- a/x11-wm/xmonad-contrib/files/xmonad-contrib-0.11.4-import-Applicative.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- xmonad-contrib-0.11.4-orig/XMonad/Util/Invisible.hs	2015-03-28 05:00:21.000000000 +1100
-+++ xmonad-contrib-0.11.4/XMonad/Util/Invisible.hs	2015-04-03 15:12:17.485143018 +1100
-@@ -22,6 +22,8 @@
-                             , fromIMaybe
-                             ) where
- 
-+import Control.Applicative
-+
- -- $usage
- -- A wrapper data type to store layout state that shouldn't be persisted across
- -- restarts. A common wrapped type to use is @Maybe a@.
---- xmonad-contrib-0.11.4-orig/XMonad/Hooks/DebugEvents.hs	2015-03-28 05:00:21.000000000 +1100
-+++ xmonad-contrib-0.11.4/XMonad/Hooks/DebugEvents.hs	2015-04-03 15:17:02.207816322 +1100
-@@ -30,6 +30,7 @@
- 
- -- import           Graphics.X11.Xlib.Extras.GetAtomName        (getAtomName)
- 
-+import           Control.Applicative
- import           Control.Exception.Extensible         as E
- import           Control.Monad.State
- import           Control.Monad.Reader
diff --git a/x11-wm/xmonad-contrib/xmonad-contrib-0.11.2.ebuild b/x11-wm/xmonad-contrib/xmonad-contrib-0.11.2.ebuild
deleted file mode 100644
index c8eea5244c0c..000000000000
--- a/x11-wm/xmonad-contrib/xmonad-contrib-0.11.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit base haskell-cabal
-
-DESCRIPTION="Third party extensions for xmonad"
-HOMEPAGE="https://xmonad.org/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-# hackport-args: --always-disabled='testing'
-IUSE="+xft"
-
-RDEPEND="dev-haskell/extensible-exceptions:=[profile?]
-		>=dev-haskell/mtl-1:=[profile?]
-		<dev-haskell/mtl-3:=[profile?]
-		dev-haskell/random:=[profile?]
-		dev-haskell/utf8-string:=[profile?]
-		>=dev-haskell/x11-1.6.1:=[profile?]
-		<dev-haskell/x11-1.7:=[profile?]
-		>=dev-lang/ghc-6.10.4:=
-		=x11-wm/xmonad-0.11*:=[profile?]
-		xft? ( >=dev-haskell/x11-xft-0.2:=[profile?]
-		)"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-PATCHES=("${FILESDIR}"/${P}-ghc-7.8.patch)
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flags=-testing \
-		$(cabal_flag xft use_xft)
-}
diff --git a/x11-wm/xmonad-contrib/xmonad-contrib-0.11.4.ebuild b/x11-wm/xmonad-contrib/xmonad-contrib-0.11.4.ebuild
deleted file mode 100644
index 041f35dabc3a..000000000000
--- a/x11-wm/xmonad-contrib/xmonad-contrib-0.11.4.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-#hackport: flags: -testing,use_xft:xft
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit eutils haskell-cabal
-
-DESCRIPTION="Third party extensions for xmonad"
-HOMEPAGE="https://xmonad.org/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="+xft"
-
-RDEPEND="dev-haskell/extensible-exceptions:=[profile?]
-	>=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?]
-	dev-haskell/old-locale:=[profile?]
-	dev-haskell/old-time:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	>=dev-haskell/x11-1.6.1:=[profile?] <dev-haskell/x11-1.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	>=x11-wm/xmonad-0.11:=[profile?] <x11-wm/xmonad-0.12:=[profile?]
-	xft? ( >=dev-haskell/x11-xft-0.2:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_prepare() {
-	# Upstream bug 597 xmonad-contrib-0.11.4 does not compile
-	# https://code.google.com/p/xmonad/issues/detail?id=597
-	epatch "${FILESDIR}"/${P}-import-Applicative.patch
-
-	# https://ghc.haskell.org/trac/ghc/ticket/10667
-	[[ $(ghc-version) == 7.10.1.20150630 ]] && replace-hcflags -g ''
-	[[ $(ghc-version) == 7.10.2 ]] && replace-hcflags -g ''
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-testing \
-		$(cabal_flag xft use_xft)
-}
diff --git a/x11-wm/xmonad-contrib/xmonad-contrib-0.12.ebuild b/x11-wm/xmonad-contrib/xmonad-contrib-0.12.ebuild
deleted file mode 100644
index c0f110a39125..000000000000
--- a/x11-wm/xmonad-contrib/xmonad-contrib-0.12.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-#hackport: flags: -testing,use_xft:xft
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Third party extensions for xmonad"
-HOMEPAGE="https://xmonad.org/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="+xft"
-
-RDEPEND="dev-haskell/extensible-exceptions:=[profile?]
-	>=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?]
-	dev-haskell/old-locale:=[profile?]
-	dev-haskell/old-time:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	>=dev-haskell/x11-1.6.1:=[profile?] <dev-haskell/x11-1.7:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-	>=x11-wm/xmonad-0.12:=[profile?] <x11-wm/xmonad-0.13:=[profile?]
-	xft? ( >=dev-haskell/x11-xft-0.2:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-testing \
-		$(cabal_flag xft use_xft)
-}
diff --git a/x11-wm/xmonad-contrib/xmonad-contrib-0.13.ebuild b/x11-wm/xmonad-contrib/xmonad-contrib-0.13.ebuild
deleted file mode 100644
index 7d6c1775bc74..000000000000
--- a/x11-wm/xmonad-contrib/xmonad-contrib-0.13.ebuild
+++ /dev/null
@@ -1,40 +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.1.9999
-#hackport: flags: -testing,use_xft:xft
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Third party extensions for xmonad"
-HOMEPAGE="https://xmonad.org/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+xft"
-
-RDEPEND="dev-haskell/extensible-exceptions:=[profile?]
-	>=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?]
-	dev-haskell/old-locale:=[profile?]
-	dev-haskell/old-time:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	>=dev-haskell/x11-1.6.1:=[profile?] <dev-haskell/x11-1.9:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-	>=x11-wm/xmonad-0.13:=[profile?] <x11-wm/xmonad-0.14:=[profile?]
-	xft? ( >=dev-haskell/x11-xft-0.2:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-testing \
-		$(cabal_flag xft use_xft)
-}
diff --git a/x11-wm/xmonad-contrib/xmonad-contrib-0.15.ebuild b/x11-wm/xmonad-contrib/xmonad-contrib-0.16.ebuild
index a0ba3e779d74..5156c063509c 100644
--- a/x11-wm/xmonad-contrib/xmonad-contrib-0.15.ebuild
+++ b/x11-wm/xmonad-contrib/xmonad-contrib-0.16.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-# ebuild generated by hackport 0.5.6.9999
+# ebuild generated by hackport 0.6.1
 #hackport: flags: -testing,use_xft:xft
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="Third party extensions for xmonad"
-HOMEPAGE="https://xmonad.org/"
+HOMEPAGE="http://xmonad.org/"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
@@ -26,12 +26,12 @@ RDEPEND="dev-haskell/extensible-exceptions:=[profile?]
 	dev-haskell/semigroups:=[profile?]
 	dev-haskell/utf8-string:=[profile?]
 	>=dev-haskell/x11-1.6.1:=[profile?] <dev-haskell/x11-1.10:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
+	>=dev-lang/ghc-8.0.1:=
 	>=x11-wm/xmonad-0.15:=[profile?] <x11-wm/xmonad-0.16:=[profile?]
 	xft? ( >=dev-haskell/x11-xft-0.2:=[profile?] )
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
+	>=dev-haskell/cabal-1.24.0.0
 "
 
 src_configure() {