| 1 |
commit: 3f014ed5b492cbc954b6df383f7d594d1cf24b13 |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 8 12:44:46 2016 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 8 12:44:53 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f014ed5 |
| 7 |
|
| 8 |
dev-lang/epic: rename binary from 'epic' to 'epic-epivm', bug #432436 |
| 9 |
|
| 10 |
Avoid collision with net-irc/epic4. |
| 11 |
|
| 12 |
Reported-by: Diego Elio Pettenò |
| 13 |
|
| 14 |
Package-Manager: portage-2.2.28 |
| 15 |
|
| 16 |
...{epic-0.9.3.3.ebuild => epic-0.9.3.3-r1.ebuild} | 17 ++++--- |
| 17 |
dev-lang/epic/files/epic-0.9.3-ghc-7.6.patch | 53 ---------------------- |
| 18 |
...atch => epic-0.9.3.3-respect-user-cflags.patch} | 0 |
| 19 |
3 files changed, 11 insertions(+), 59 deletions(-) |
| 20 |
|
| 21 |
diff --git a/dev-lang/epic/epic-0.9.3.3.ebuild b/dev-lang/epic/epic-0.9.3.3-r1.ebuild |
| 22 |
similarity index 64% |
| 23 |
rename from dev-lang/epic/epic-0.9.3.3.ebuild |
| 24 |
rename to dev-lang/epic/epic-0.9.3.3-r1.ebuild |
| 25 |
index be57e0a..a7b7b26 100644 |
| 26 |
--- a/dev-lang/epic/epic-0.9.3.3.ebuild |
| 27 |
+++ b/dev-lang/epic/epic-0.9.3.3-r1.ebuild |
| 28 |
@@ -2,12 +2,12 @@ |
| 29 |
# Distributed under the terms of the GNU General Public License v2 |
| 30 |
# $Id$ |
| 31 |
|
| 32 |
-EAPI=5 |
| 33 |
+EAPI=6 |
| 34 |
|
| 35 |
# ebuild generated by hackport 0.4.5.9999 |
| 36 |
|
| 37 |
CABAL_FEATURES="bin lib profile haddock hoogle hscolour" |
| 38 |
-inherit eutils haskell-cabal |
| 39 |
+inherit haskell-cabal |
| 40 |
|
| 41 |
DESCRIPTION="Compiler for a simple functional language" |
| 42 |
HOMEPAGE="http://www.dcs.st-and.ac.uk/~eb/epic.php" |
| 43 |
@@ -20,16 +20,21 @@ IUSE="" |
| 44 |
|
| 45 |
RDEPEND="dev-haskell/cabal:=[profile?] |
| 46 |
dev-haskell/mtl:=[profile?] |
| 47 |
- >=dev-libs/boehm-gc-7.0[threads] |
| 48 |
- dev-libs/gmp:0 |
| 49 |
+ >=dev-libs/boehm-gc-7.0:0=[threads] |
| 50 |
+ dev-libs/gmp:0= |
| 51 |
>=dev-lang/ghc-7.4.1:= |
| 52 |
" |
| 53 |
DEPEND="${RDEPEND} |
| 54 |
>=dev-haskell/cabal-1.8.0.4 |
| 55 |
dev-haskell/happy |
| 56 |
" |
| 57 |
+# Bug #438422, upstream at https://github.com/edwinb/EpiVM/issues/5. |
| 58 |
+PATCHES=("${FILESDIR}"/${PN}-0.9.3.3-respect-user-cflags.patch) |
| 59 |
|
| 60 |
src_prepare() { |
| 61 |
- # Bug #438422, upstream at https://github.com/edwinb/EpiVM/issues/5. |
| 62 |
- epatch "${FILESDIR}"/respect-user-cflags.patch |
| 63 |
+ default |
| 64 |
+ |
| 65 |
+ # to disambiguare with net-irc/epic4, bug #432436 |
| 66 |
+ cabal_chdeps \ |
| 67 |
+ 'Executable epic' 'Executable epic-epivm' |
| 68 |
} |
| 69 |
|
| 70 |
diff --git a/dev-lang/epic/files/epic-0.9.3-ghc-7.6.patch b/dev-lang/epic/files/epic-0.9.3-ghc-7.6.patch |
| 71 |
deleted file mode 100644 |
| 72 |
index d168f03..0000000 |
| 73 |
--- a/dev-lang/epic/files/epic-0.9.3-ghc-7.6.patch |
| 74 |
+++ /dev/null |
| 75 |
@@ -1,53 +0,0 @@ |
| 76 |
---- epic-0.9.3-orig/Epic/Language.lhs 2012-02-28 10:44:29.000000000 +1100 |
| 77 |
-+++ epic-0.9.3/Epic/Language.lhs 2012-09-14 16:20:29.841939337 +1000 |
| 78 |
-@@ -1,9 +1,14 @@ |
| 79 |
--> {-# LANGUAGE FlexibleInstances, MultiParamTypeClasses, |
| 80 |
-+> {-# LANGUAGE FlexibleInstances, MultiParamTypeClasses, CPP, |
| 81 |
- > FunctionalDependencies #-} |
| 82 |
- |
| 83 |
- > module Epic.Language where |
| 84 |
- |
| 85 |
- > import Control.Monad |
| 86 |
-+#if MIN_VERSION_base(4,6,0) |
| 87 |
-+> import Control.Exception.Base |
| 88 |
-+#endif |
| 89 |
-+ |
| 90 |
-+ |
| 91 |
- > import System.IO |
| 92 |
- > import System.Directory |
| 93 |
- > import System.Environment |
| 94 |
-@@ -379,7 +384,13 @@ |
| 95 |
- > environment :: String -> IO (Maybe String) |
| 96 |
- > environment x = catch (do e <- getEnv x |
| 97 |
- > return (Just e)) |
| 98 |
--> (\_ -> return Nothing) |
| 99 |
-+#if MIN_VERSION_base(4,6,0) |
| 100 |
-+> (\y-> do return (y::SomeException); return Nothing) |
| 101 |
-+#endif |
| 102 |
-+> |
| 103 |
-+#if !MIN_VERSION_base(4,6,0) |
| 104 |
-+> (\_-> return Nothing) |
| 105 |
-+#endif |
| 106 |
- |
| 107 |
- Some tests |
| 108 |
- |
| 109 |
---- epic-0.9.3-orig/Epic/CodegenC.lhs 2012-02-28 10:44:29.000000000 +1100 |
| 110 |
-+++ epic-0.9.3/Epic/CodegenC.lhs 2012-09-14 16:13:48.061329048 +1000 |
| 111 |
-@@ -1,3 +1,4 @@ |
| 112 |
-+> {-#LANGUAGE FlexibleContexts#-} |
| 113 |
- > module Epic.CodegenC where |
| 114 |
- |
| 115 |
- > import Control.Monad.State |
| 116 |
-@@ -98,10 +99,11 @@ |
| 117 |
- > if (x>max) then put x else return () |
| 118 |
- |
| 119 |
- > cgs [] = return "" |
| 120 |
-+ |
| 121 |
- > cgs (x:xs) = do xc <- cg x |
| 122 |
- > xsc <- cgs xs |
| 123 |
- > return $ xc ++ "\n" ++ xsc |
| 124 |
-- |
| 125 |
-+> cg:: (MonadState Int m) => ByteOp -> m [Char] |
| 126 |
- > cg (CALL t fn args) = return $ tmp t ++ " = " ++ quickcall fn ++ |
| 127 |
- > targs "(" args ++ ");" |
| 128 |
- > cg (TAILCALL t fn args) |
| 129 |
|
| 130 |
diff --git a/dev-lang/epic/files/respect-user-cflags.patch b/dev-lang/epic/files/epic-0.9.3.3-respect-user-cflags.patch |
| 131 |
similarity index 100% |
| 132 |
rename from dev-lang/epic/files/respect-user-cflags.patch |
| 133 |
rename to dev-lang/epic/files/epic-0.9.3.3-respect-user-cflags.patch |
Archives