From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Tue, 25 Aug 2020 10:45:55 +0100
Subject: gentoo resync : 25.08.2020

---
 dev-haskell/top/Manifest                  |  3 ++-
 dev-haskell/top/files/top-1.7-ghc84.patch | 12 ++++++++++++
 dev-haskell/top/top-1.7.ebuild            | 11 ++++++-----
 3 files changed, 20 insertions(+), 6 deletions(-)
 create mode 100644 dev-haskell/top/files/top-1.7-ghc84.patch

(limited to 'dev-haskell/top')

diff --git a/dev-haskell/top/Manifest b/dev-haskell/top/Manifest
index 27b51cc225a4..99cbcbfc97cb 100644
--- a/dev-haskell/top/Manifest
+++ b/dev-haskell/top/Manifest
@@ -1,4 +1,5 @@
 AUX top-1.7-ghc-7.10.patch 2305 BLAKE2B 13dd321a0e6f4a3fd935c650361a2c65f4ac015fefe66cee4c419e9960b98ec17738cbfc679b51bfa0e3eb10eef3809d37e3d4895b91ad22147d7d2cb6c4da9a SHA512 e5b6d8ad618787e70e06ad08e92b53c5d66dd4464a7cc476f55da86b740bf835a9e3c1e35a03dd3a390bb7798459afbdf7aed19c91491bb6d16c53092cd4a0fb
+AUX top-1.7-ghc84.patch 380 BLAKE2B 87297984a0a521eaea8c87ecde9a16dc5be4784f4ea7416d4d2cd497386ce60701984f471a1e2a346fc6b3bea04b9b0916803975a247079277083136e8f9f72e SHA512 9446c5e961272d196e51749376863befab7750a1b91990c40c1655676e9cc0c7f52435197fe8d44cab0dbc3e4deaa6fcede96c890305cb18ce68a5b091728306
 DIST Top-1.7.tar.gz 70721 BLAKE2B 90ddda99ab4dac209712494c28e15e90ffd2996151ab7df0a57fb8162bec09da6b28fd52b36672e081d10fa0b79d25bb2da2fd58d220573cea006d70c61229f0 SHA512 90d5f1042c07101c35bc1722c18667f551fa4d9034e70a4b7466ff25906899053a054f1227fed8d6d534d04fe9a1c2420585143cde44badfe98e08bf9a6225b4
-EBUILD top-1.7.ebuild 777 BLAKE2B 539a9fe489d6bd3619742d6f07730df7c5a83630d7ed720cdf72bd48300b0d24a6586411e276655f872c8a65fddd805ae057e2c74ad02a2ab4e9eadda66aba60 SHA512 6e7a6fe06e5bfa7a480f22cf9825fb446dc45fdeabba893fe1a65c3b51bdb8a77435cb03b1640233cb9afcc9330e1b4be71692b63758ae29499b30f080b5f6d1
+EBUILD top-1.7.ebuild 796 BLAKE2B fef4675b5f797858228b61bf369eab9c32e5efd4de3a58a21a8a245341337026528d4a892ab9b5c461a21118b73595eecf21502797d21a7f597747c883d80366 SHA512 08bf0d162010bb7b14591fee4dc8ef80522d0192ce7b1eac678fd4659a2493e36437643442548dad3cfd00d723a6c4e806a08e6a06ef004cb206d934b7ed23be
 MISC metadata.xml 662 BLAKE2B b039247722ec544417c47f53e9d7f4034e5097cc1d0874f26b735d71fa5b8a341e42f297531b15aa8fced4337dd300cf4e778406c59f58383fe74a1e8a876d9c SHA512 f335204b8139d294a18034055d76797412a4af6b98beb052878478b4246d6b2161c147fad254be262fd7732d96affe9952f231311debbd2a52fa9e338f0267be
diff --git a/dev-haskell/top/files/top-1.7-ghc84.patch b/dev-haskell/top/files/top-1.7-ghc84.patch
new file mode 100644
index 000000000000..58ed02d3ff2a
--- /dev/null
+++ b/dev-haskell/top/files/top-1.7-ghc84.patch
@@ -0,0 +1,12 @@
+--- a/src/Top/Solver.hs
++++ b/src/Top/Solver.hs
+@@ -26,2 +26,3 @@ import Top.Constraint.Information
+ import Control.Monad.Writer
++import qualified Data.Semigroup as S
+ 
+@@ -170,2 +171,5 @@ evalBasicMonad = runWriter . flip evalStateFixT empty
+ 
++instance S.Semigroup LogEntries where
++   (<>) (LogEntries f) (LogEntries g) = LogEntries (f . g)
++
+ instance Monoid LogEntries where
diff --git a/dev-haskell/top/top-1.7.ebuild b/dev-haskell/top/top-1.7.ebuild
index 505c0ee09fb7..f3d825ce4f66 100644
--- a/dev-haskell/top/top-1.7.ebuild
+++ b/dev-haskell/top/top-1.7.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 # ebuild generated by hackport 0.4.4.9999
 
@@ -30,6 +30,7 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ghc-7.10.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-ghc-7.10.patch
+	"${FILESDIR}"/${P}-ghc84.patch
+)
-- 
cgit v1.2.3