Gentoo Archives: gentoo-commits

From: Sergei Trofimovich <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/epic/, dev-lang/epic/files/
Date: Sat, 14 Dec 2019 11:17:02
Message-Id: 1576322210.1e32346b569e2530f249db147f870eacdb1b6a7d.slyfox@gentoo
1 commit: 1e32346b569e2530f249db147f870eacdb1b6a7d
2 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
3 AuthorDate: Sat Dec 14 11:16:50 2019 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 14 11:16:50 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e32346b
7
8 dev-lang/epic: tweak for ghc-8.4
9
10 Package-Manager: Portage-2.3.81, Repoman-2.3.20
11 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
12
13 dev-lang/epic/epic-0.9.3.3-r1.ebuild | 5 ++++-
14 dev-lang/epic/files/epic-0.9.3.3-ghc84.patch | 15 +++++++++++++++
15 2 files changed, 19 insertions(+), 1 deletion(-)
16
17 diff --git a/dev-lang/epic/epic-0.9.3.3-r1.ebuild b/dev-lang/epic/epic-0.9.3.3-r1.ebuild
18 index a1022b072aa..6480a23b545 100644
19 --- a/dev-lang/epic/epic-0.9.3.3-r1.ebuild
20 +++ b/dev-lang/epic/epic-0.9.3.3-r1.ebuild
21 @@ -28,7 +28,10 @@ DEPEND="${RDEPEND}
22 dev-haskell/happy
23 "
24 # Bug #438422, upstream at https://github.com/edwinb/EpiVM/issues/5.
25 -PATCHES=("${FILESDIR}"/${PN}-0.9.3.3-respect-user-cflags.patch)
26 +PATCHES=(
27 + "${FILESDIR}"/${PN}-0.9.3.3-respect-user-cflags.patch
28 + "${FILESDIR}"/${PN}-0.9.3.3-ghc84.patch
29 +)
30
31 src_prepare() {
32 default
33
34 diff --git a/dev-lang/epic/files/epic-0.9.3.3-ghc84.patch b/dev-lang/epic/files/epic-0.9.3.3-ghc84.patch
35 new file mode 100644
36 index 00000000000..978cb8b88ce
37 --- /dev/null
38 +++ b/dev-lang/epic/files/epic-0.9.3.3-ghc84.patch
39 @@ -0,0 +1,15 @@
40 +--- a/Main.lhs
41 ++++ b/Main.lhs
42 +@@ -10,11 +10,7 @@
43 + > import Epic.Compiler
44 + > import Paths_epic
45 +
46 +-> versionString = showV (versionBranch version)
47 +-> where
48 +-> showV [] = ""
49 +-> showV [a] = show a
50 +-> showV (x:xs) = show x ++ "." ++ showV xs
51 ++> versionString = show version
52 +
53 + > main = do args <- getArgs
54 + > (fns, opts) <- getInput args