[gentoo-commits] repo/gentoo:master commit in: dev-lang/epic/, dev-lang/epic/files/

[gentoo-commits] repo/gentoo:master commit in: dev-lang/epic/, dev-lang/epic/files/

[Sergei Trofimovich]

commit:     1e32346b569e2530f249db147f870eacdb1b6a7d
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 14 11:16:50 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Dec 14 11:16:50 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e32346b

dev-lang/epic: tweak for ghc-8.4

Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 dev-lang/epic/epic-0.9.3.3-r1.ebuild         |  5 ++++-
 dev-lang/epic/files/epic-0.9.3.3-ghc84.patch | 15 +++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/dev-lang/epic/epic-0.9.3.3-r1.ebuild b/dev-lang/epic/epic-0.9.3.3-r1.ebuild
index a1022b072aa..6480a23b545 100644
--- a/dev-lang/epic/epic-0.9.3.3-r1.ebuild
+++ b/dev-lang/epic/epic-0.9.3.3-r1.ebuild
@@ -28,7 +28,10 @@ DEPEND="${RDEPEND}
 	dev-haskell/happy
 "
 # Bug #438422, upstream at https://github.com/edwinb/EpiVM/issues/5.
-PATCHES=("${FILESDIR}"/${PN}-0.9.3.3-respect-user-cflags.patch)
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.3.3-respect-user-cflags.patch
+	"${FILESDIR}"/${PN}-0.9.3.3-ghc84.patch
+)
 
 src_prepare() {
 	default

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
new file mode 100644
index 00000000000..978cb8b88ce
--- /dev/null
+++ b/dev-lang/epic/files/epic-0.9.3.3-ghc84.patch
@@ -0,0 +1,15 @@
+--- a/Main.lhs
++++ b/Main.lhs
+@@ -10,11 +10,7 @@
+ > import Epic.Compiler
+ > import Paths_epic
+ 
+-> versionString = showV (versionBranch version)
+->   where
+->     showV [] = ""
+->     showV [a] = show a
+->     showV (x:xs) = show x ++ "." ++ showV xs
++> versionString = show version
+ 
+ > main = do args <- getArgs
+ >           (fns, opts) <- getInput args