gentoo resync : 25.08.2020

5 files changed, 85 insertions, 6 deletions

diff --git a/dev-haskell/test-framework-th-prime/Manifest b/dev-haskell/test-framework-th-prime/Manifest
index d4c2023c66f4..b07199a46284 100644
--- a/dev-haskell/test-framework-th-prime/Manifest
+++ b/dev-haskell/test-framework-th-prime/Manifest
@@ -1,8 +1,9 @@
 AUX test-framework-th-prime-0.0.7-cpphs-1.19.patch 543 BLAKE2B 020b81b3ec3a7aefb0bb090883fbe9f704d194266fdf7a82ace1af4d2374a89f48e45dceac33e38baddd3028e361934b5ad2d5e652c2d7294c4cb5bd4eaee664 SHA512 111948aee97ba397d402b472f557b960cf68c077e049f4c2b87a58cb9e812e85eeeb0d672ac6a2b045a60b0cbbe9f6107a65ed11e17e80004792e621aad3d1a7
+AUX test-framework-th-prime-0.0.9-hse-1.18.patch 2666 BLAKE2B 7aa73a96cb24688bc42812c5fbb86faed1ca4fdc672f65a4fed13cfb3cdec4830017d50cb154b7e02731527898bcd52a1ad77a70f78eef33dbe74de5e0a1da7c SHA512 a87717808f6ea5fa47de0ecb3ae3789d59707957458c9569f10ee01bcd30bf52662dd8a63255e2975f7de4b2465b7e9e8d41849975442c0c46c349d481cc8fa7
 DIST test-framework-th-prime-0.0.7.tar.gz 3832 BLAKE2B 47a4f4cc6884e71e4029290577c4c989fc881b506626ea41ce5598ccef84886b5af755a74f8a92ba68063cf2eaa94de71e098c308edd4c8df4f7a718e27bd8d1 SHA512 724b4de8cfdf10341bc95a6f437359fe0210ab0b7bef63761912d85d71ae552cef230f20bd50a723cf7aafcd45c30def6dc80b37c876986418db6072193f0daa
 DIST test-framework-th-prime-0.0.8.tar.gz 3836 BLAKE2B 7ffa24ed45109319ab111d9b29dfb3beda6624c126eb2c308a5c7b7e0fa36cc5b67564c30220df14ec0db46bf82484446916cb78e0201e1cf995636a53d32b69 SHA512 f988c4c4a1329d9b6f1dc98a840b51787ecc3d2648e8093871970d9a79931cb56cbbef718f052773cb62867c7f0b084e15fa3dfc75c7443d1a94c4df65b8b71e
 DIST test-framework-th-prime-0.0.9.tar.gz 3908 BLAKE2B 4c8794bf66081ffd6eee2b6f0e9d8fd5f2218a90c2522398b13f440aade1244a62e91c3c1e11367f109babd2e78722d94beaac95555be356ce55f25d118adfa3 SHA512 52f64b1705d51f45512da4270d8a80c93602d62a2c33eb3a0146f10a3f737395c9d0294af62cc3ff859dc8292338df892c0262216349109bb4f7b0beb09d3601
-EBUILD test-framework-th-prime-0.0.7.ebuild 750 BLAKE2B c879a60c116c9c7e0c727bbcc09129ffba6e72e07a81f8695b77d6a1628d1da68b194afed514b4a9cf47587222f7e28d63c93eec59aa7fc0e127fc18f699e1e3 SHA512 960bda448d2385d00f7a3c0270fe18eca0d2ce34ef55e20870c9036cfec8ee200ea35f896e496214217d1750491bd0ffc598088bd53852492d1677cb815dd1b8
-EBUILD test-framework-th-prime-0.0.8.ebuild 691 BLAKE2B eb043d498c6419d3b6137541eb45aad0b8034d3a8270c6bd86550b82814dbb3439c3547a80b757d22017cd30b729034c38d183708781b10d95fc4756cf23a6b5 SHA512 575cf6d78a2277e71ee3a95d7561a7ff44ac16adb26084a21bbe818567bc2b7c4d023546001ae1ae0db335228015a3e75364ad56b58e9384abdc1772d5b3d71c
-EBUILD test-framework-th-prime-0.0.9.ebuild 689 BLAKE2B f70baa186ec60179b09e47f364c704e6f46677e7d463da4d782f0a4fa4438bfe8dbb6745066b5035caf3a7cb6dd42ff7461fdea87915021bc01196bb0bba8eca SHA512 b74d0414717933e6183d65d577edc3eed18d2f943328598f46f9696f2f17d3e2cdf703a1a63412d1437fadafc78af19c5b1663e448496436db2f1c93c4f44edf
+EBUILD test-framework-th-prime-0.0.7.ebuild 738 BLAKE2B ba8a519a3398fa0d01c0cf391bd5b4615d05956c275cfc2fe6932c7afaa70c5c8a2fda580e46e895865063250bc128de8b2714fe6613b0802102da00932c4c33 SHA512 9045ddaf4769fb33a123c48091f12f7bd2a52cc0b68847ab6672e9c5f3f6d69de12dabde64044f99fb733a5ae744610a72be17635cecbd1521e473c722781a1e
+EBUILD test-framework-th-prime-0.0.8.ebuild 679 BLAKE2B 8085153bf4bbf730df230bedbdb9595de65d64764830e89aef4bd0e09957b7685b7e6873443d45d1c52b32e176351c8ebc8aa0e11d10721a628c1a21f7a65e24 SHA512 52a0f26481a5286a39e4d8d85c076f58a5a27fdec604e0af87386079a226fce9602bea45e091252c87f65712564801234facc12d74d8e40dc80b76313274de44
+EBUILD test-framework-th-prime-0.0.9.ebuild 722 BLAKE2B 3e8320932bb7298b019d028a075ecbecd09ddc3db97c47de4168236505827ea4cf55182c2c905ac421768987666f06d332b51d2b739bb91aaf35d03f17cc0e5e SHA512 ef4642e5dc56962a99ea8105d083a09a63f83bf76ee864f176e41d98de190043d8db457a0f66648e1a05daa4e6ca8e0f3d7672da1ccd23a5eeb7002fc5248496
 MISC metadata.xml 364 BLAKE2B 75e7b23afcf72d32809e7b955b6427fbda3355bb3204ce7e6231d95916ddc4e44da0e5bf7038f5dec0cdf466ce08eb385333b679ead64b3beb68b17e9b9fd9b9 SHA512 b858a5901747207b40d99002ff60eefa7c4d7ccc94739a2c3b71f1e2a742c2345ffadcc3ff3ae97d339937887ae4ae233a5bb795165e667ac13c7e559f24003d
diff --git a/dev-haskell/test-framework-th-prime/files/test-framework-th-prime-0.0.9-hse-1.18.patch b/dev-haskell/test-framework-th-prime/files/test-framework-th-prime-0.0.9-hse-1.18.patch
new file mode 100644
index 000000000000..359d5ea4f6a9
--- /dev/null
+++ b/dev-haskell/test-framework-th-prime/files/test-framework-th-prime-0.0.9-hse-1.18.patch
@@ -0,0 +1,76 @@
+diff --git a/Test/Framework/TH/Prime/Parser.hs b/Test/Framework/TH/Prime/Parser.hs
+index 87553a6..f188390 100644
+--- a/Test/Framework/TH/Prime/Parser.hs
++++ b/Test/Framework/TH/Prime/Parser.hs
+@@ -10,2 +10,5 @@ import Language.Haskell.Exts.Extension
+ import Language.Haskell.Exts.Parser
++#if MIN_VERSION_haskell_src_exts(1, 18, 0)
++import Language.Haskell.Exts.SrcLoc
++#endif
+ import Language.Haskell.Exts.Syntax hiding (VarName, Exp)
+@@ -14,2 +17,11 @@ import Language.Preprocessor.Cpphs hiding (Ident)
+ 
++#if MIN_VERSION_haskell_src_exts(1, 18, 0)
++-- location field for haskell-src-exts-1.18
++#define L SrcSpanInfo
++#define loc _
++#else
++#define L
++#define loc
++#endif
++
+ ----------------------------------------------------------------
+@@ -45,3 +57,7 @@ getTests :: FilePath -> IO ([String], [String])
+ getTests file = do
++#if MIN_VERSION_haskell_src_exts(1, 18, 0)
++    ParseOk (Module _ _ _ _ decls) <- parseTest file
++#else
+     ParseOk (Module _ _ _ _ _ _ decls) <- parseTest file
++#endif
+     let funs = map fromFunBind $ filter isFunBind decls
+@@ -54,3 +70,3 @@ getTests file = do
+ 
+-parseTest :: FilePath -> IO (ParseResult Module)
++parseTest :: FilePath -> IO (ParseResult (Module L))
+ parseTest file = do
+@@ -74,4 +90,4 @@ parseTest file = do
+ #endif
+-        toStr (Ident str) = str
+-        toStr (Symbol str) = str
++        toStr (Ident loc str) = str
++        toStr (Symbol loc str) = str
+     opt raw = defaultParseMode {
+@@ -88,7 +104,7 @@ parseTest file = do
+ 
+-isFunBind :: Decl -> Bool
+-isFunBind (FunBind _) = True
+-isFunBind _           = False
++isFunBind :: Decl L -> Bool
++isFunBind (FunBind loc _) = True
++isFunBind _               = False
+ 
+-isPatBind :: Decl -> Bool
++isPatBind :: Decl L -> Bool
+ isPatBind PatBind{} = True
+@@ -96,6 +112,6 @@ isPatBind _                   = False
+ 
+-fromPatBind :: Decl -> String
++fromPatBind :: Decl L -> String
+ #if MIN_VERSION_haskell_src_exts(1, 16, 0)
+-fromPatBind (PatBind _ (PVar (Ident  name)) _ _) = name
+-fromPatBind (PatBind _ (PVar (Symbol name)) _ _) = name
++fromPatBind (PatBind _ (PVar loc (Ident  loc name)) _ _) = name
++fromPatBind (PatBind _ (PVar loc (Symbol loc name)) _ _) = name
+ #else
+@@ -106,5 +122,10 @@ fromPatBind _ = error "fromPatBind"
+ 
+-fromFunBind :: Decl -> String
++fromFunBind :: Decl L -> String
++#if MIN_VERSION_haskell_src_exts(1, 18, 0)
++fromFunBind (FunBind _floc (Match _ (Ident  _iloc name) _ _ _:_)) = name
++fromFunBind (FunBind _floc (Match _ (Symbol _sloc name) _ _ _:_)) = name
++#else
+ fromFunBind (FunBind (Match _ (Ident  name) _ _ _ _:_)) = name
+ fromFunBind (FunBind (Match _ (Symbol name) _ _ _ _:_)) = name
++#endif
+ fromFunBind _ = error "fromFunBind"
diff --git a/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.7.ebuild b/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.7.ebuild
index cbb0254bc126..8450659e5091 100644
--- a/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.7.ebuild
+++ b/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/cpphs-0.2.1:=[profile?]
diff --git a/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.8.ebuild b/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.8.ebuild
index 4de5587210de..179b247b23d0 100644
--- a/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.8.ebuild
+++ b/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/cpphs-0.2.1:=[profile?]
diff --git a/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.9.ebuild b/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.9.ebuild
index fd0bfb0801c0..4a84d5c176be 100644
--- a/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.9.ebuild
+++ b/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/cpphs-0.2.1:=[profile?]
@@ -25,3 +25,5 @@ RDEPEND=">=dev-haskell/cpphs-0.2.1:=[profile?]
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.6
 "
+
+PATCHES=("${FILESDIR}"/${P}-hse-1.18.patch)