summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2021-04-04 12:50:23 +0100
committerSergei Trofimovich <slyfox@gentoo.org>2021-04-04 12:53:53 +0100
commit6c0a68f6c5c88f586bb166fe8416152b7454c725 (patch)
tree790698a6fd7b3b32db661fcbab93a0d601a61bc5
parentdev-haskell/encoding: drop masked package (diff)
downloadgentoo-6c0a68f6c5c88f586bb166fe8416152b7454c725.tar.gz
gentoo-6c0a68f6c5c88f586bb166fe8416152b7454c725.tar.bz2
gentoo-6c0a68f6c5c88f586bb166fe8416152b7454c725.zip
dev-haskell/test-framework-th-prime: drop masked package
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
-rw-r--r--dev-haskell/test-framework-th-prime/Manifest2
-rw-r--r--dev-haskell/test-framework-th-prime/files/test-framework-th-prime-0.0.9-hse-1.18.patch76
-rw-r--r--dev-haskell/test-framework-th-prime/metadata.xml8
-rw-r--r--dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.10.ebuild27
-rw-r--r--dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.9.ebuild29
-rw-r--r--profiles/package.mask5
6 files changed, 0 insertions, 147 deletions
diff --git a/dev-haskell/test-framework-th-prime/Manifest b/dev-haskell/test-framework-th-prime/Manifest
deleted file mode 100644
index b25ec4815301..000000000000
--- a/dev-haskell/test-framework-th-prime/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST test-framework-th-prime-0.0.10.tar.gz 4035 BLAKE2B 44c0f454ec4018f8aeccc9e7eec33c25778d05e257ce910dd779ac6bbb2acf1d4b54a897d0625e78308def417f1aa1b77194fba353802f2fce7a6e954dea3fbb SHA512 91298214c134821b298270c2770cab284131787a40293c01dba2e88a58f355d6811dea06bf14f237fea5d4aa80987790405644bc09ad64a4d7b4574e2bca97eb
-DIST test-framework-th-prime-0.0.9.tar.gz 3908 BLAKE2B 4c8794bf66081ffd6eee2b6f0e9d8fd5f2218a90c2522398b13f440aade1244a62e91c3c1e11367f109babd2e78722d94beaac95555be356ce55f25d118adfa3 SHA512 52f64b1705d51f45512da4270d8a80c93602d62a2c33eb3a0146f10a3f737395c9d0294af62cc3ff859dc8292338df892c0262216349109bb4f7b0beb09d3601
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
deleted file mode 100644
index 359d5ea4f6a9..000000000000
--- a/dev-haskell/test-framework-th-prime/files/test-framework-th-prime-0.0.9-hse-1.18.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-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/metadata.xml b/dev-haskell/test-framework-th-prime/metadata.xml
deleted file mode 100644
index b7878815d80d..000000000000
--- a/dev-haskell/test-framework-th-prime/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.10.ebuild b/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.10.ebuild
deleted file mode 100644
index f0c62e9157cd..000000000000
--- a/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.10.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Template Haskell for test framework"
-HOMEPAGE="https://hackage.haskell.org/package/test-framework-th-prime"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cpphs-0.2.1:=[profile?]
- dev-haskell/haskell-src-exts:=[profile?]
- dev-haskell/test-framework:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6
-"
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
deleted file mode 100644
index 4a84d5c176be..000000000000
--- a/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.9.ebuild
+++ /dev/null
@@ -1,29 +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"
-inherit haskell-cabal
-
-DESCRIPTION="Template Haskell for test framework"
-HOMEPAGE="https://hackage.haskell.org/package/test-framework-th-prime"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cpphs-0.2.1:=[profile?]
- dev-haskell/haskell-src-exts:=[profile?]
- dev-haskell/test-framework:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6
-"
-
-PATCHES=("${FILESDIR}"/${P}-hse-1.18.patch)
diff --git a/profiles/package.mask b/profiles/package.mask
index b2ed7890be86..8aa468402b27 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -191,11 +191,6 @@ dev-libs/zookeeper-c
# in a month.
dev-haskell/network-protocol-xmpp
-# Sergei Trofimovich <slyfox@gentoo.org> (2021-03-15)
-# Needs a port to ghc-8.10. No revdeps. Mask for removal
-# in a month.
-dev-haskell/test-framework-th-prime
-
# Andreas Sturmlechner <asturm@gentoo.org> (2021-03-15)
# Unmaintained for >1 year, blocking cleanup of deprecated libraries.
# Succeeded by LXQt many years ago (see also: lxqt-base/lxqt-meta).