commit: 1faf6a0705f853a2929c2d7c12d1df5fdbc7de41
Author: Sergei Trofimovich gentoo org>
AuthorDate: Sat Dec 14 11:11:11 2019 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sat Dec 14 11:11:11 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1faf6a07
dev-util/bnfc: tweak for ghc-8.4
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Sergei Trofimovich gentoo.org>
dev-util/bnfc/bnfc-2.8.1.ebuild | 14 +--
dev-util/bnfc/files/bnfc-2.8.1-ghc84-p2.patch | 130 ++
dev-util/bnfc/files/bnfc-2.8.1-ghc84.patch| 31 ++
3 files changed, 168 insertions(+), 7 deletions(-)
diff --git a/dev-util/bnfc/bnfc-2.8.1.ebuild b/dev-util/bnfc/bnfc-2.8.1.ebuild
index 087c5aa0327..0d11aa19de2 100644
--- a/dev-util/bnfc/bnfc-2.8.1.ebuild
+++ b/dev-util/bnfc/bnfc-2.8.1.ebuild
@@ -1,11 +1,11 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
# ebuild generated by hackport 0.4.6.
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour" # Broken test-suite:
missing files
inherit haskell-cabal
MY_PN="BNFC"
@@ -29,11 +29,11 @@ DEPEND="${RDEPEND}
dev-haskell/alex
>=dev-haskell/cabal-1.8
dev-haskell/happy
- test? ( >=dev-haskell/doctest-0.8
- dev-haskell/hspec
- dev-haskell/hunit
- >=dev-haskell/quickcheck-2.5
- dev-haskell/temporary )
"
S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-ghc84.patch
+ "${FILESDIR}"/${P}-ghc84-p2.patch
+)
diff --git a/dev-util/bnfc/files/bnfc-2.8.1-ghc84-p2.patch
b/dev-util/bnfc/files/bnfc-2.8.1-ghc84-p2.patch
new file mode 100644
index 000..a1e944c2d15
--- /dev/null
+++ b/dev-util/bnfc/files/bnfc-2.8.1-ghc84-p2.patch
@@ -0,0 +1,130 @@
+--- a/src/BNFC/Backend/C/CFtoCAbs.hs
b/src/BNFC/Backend/C/CFtoCAbs.hs
+@@ -50,3 +50,3 @@ import Data.List
+ import Data.Char(toLower)
+-
++import Prelude hiding ((<>))
+
+--- a/src/BNFC/Backend/C/CFtoCPrinter.hs
b/src/BNFC/Backend/C/CFtoCPrinter.hs
+@@ -53,2 +53,3 @@ import Data.Either (lefts)
+ import BNFC.PrettyPrint
++import Prelude hiding ((<>))
+
+--- a/src/BNFC/Backend/C/CFtoCSkel.hs
b/src/BNFC/Backend/C/CFtoCSkel.hs
+@@ -49,2 +49,3 @@ import Data.Either (lefts)
+ import Text.PrettyPrint
++import Prelude hiding ((<>))
+
+--- a/src/BNFC/Backend/CPP/NoSTL/CFtoCPPAbs.hs
b/src/BNFC/Backend/CPP/NoSTL/CFtoCPPAbs.hs
+@@ -50,3 +50,3 @@ import Data.Char(toLower)
+ import Text.PrettyPrint
+-
++import Prelude hiding ((<>))
+
+--- a/src/BNFC/Backend/CPP/NoSTL/CFtoCVisitSkel.hs
b/src/BNFC/Backend/CPP/NoSTL/CFtoCVisitSkel.hs
+@@ -49,2 +49,3 @@ import Data.Either (lefts)
+ import BNFC.PrettyPrint
++import Prelude hiding ((<>))
+
+--- a/src/BNFC/Backend/CPP/PrettyPrinter.hs
b/src/BNFC/Backend/CPP/PrettyPrinter.hs
+@@ -32,2 +32,3 @@ import BNFC.Backend.CPP.STL.STLUtils
+ import BNFC.PrettyPrint
++import Prelude hiding ((<>))
+
+--- a/src/BNFC/Backend/CPP/STL/CFtoBisonSTL.hs
b/src/BNFC/Backend/CPP/STL/CFtoBisonSTL.hs
+@@ -56,2 +56,3 @@ import BNFC.Backend.C.CFtoBisonC (startSymbol)
+ import BNFC.PrettyPrint
++import Prelude hiding ((<>))
+
+--- a/src/BNFC/Backend/Common.hs
b/src/BNFC/Backend/Common.hs
+@@ -4,2 +4,3 @@ module BNFC.Backend.Common (renderListSepByPrecedence) where
+ import BNFC.PrettyPrint
++import Prelude hiding ((<>))
+
+--- a/src/BNFC/Backend/Common/NamedVariables.hs
b/src/BNFC/Backend/Common/NamedVariables.hs
+@@ -75,2 +75,3 @@ import Control.Arrow (left, (&&&))
+ import Data.Either (lefts)
++import Prelude hiding ((<>))
+
+--- a/src/BNFC/Backend/Java.hs
b/src/BNFC/Backend/Java.hs
+@@ -56,2 +56,3 @@ import qualified BNFC.Backend.Common.Makefile as Makefile
+ import BNFC.PrettyPrint
++import Prelude hiding ((<>))
+ ---
+--- a/src/BNFC/Backend/Java/CFtoComposVisitor.hs
b/src/BNFC/Backend/Java/CFtoComposVisitor.hs
+@@ -29,2 +29,3 @@ import Data.Either (lefts)
+ import BNFC.PrettyPrint
++import Prelude hiding ((<>))
+
+--- a/src/BNFC/Backend/Java/CFtoFoldVisitor.hs
b/src/BNFC/Backend/Java/CFtoFoldVisitor.hs
+@@ -28,2 +28,3 @@ import Data.Either (lefts)
+ import BNFC.PrettyPrint
++import Prelude hiding ((<>))
+
+--- a/src/BNFC/Backend/Java/CFtoJLex15.hs
b/src/BNFC/Backend/Java/CFtoJLex15.hs
+@@ -46,2 +46,3 @@ import BNFC.Backend.Common.NamedVariables
+ import Text.PrettyPrint
++import Prelude hiding ((<>))
+
+--- a/src/BNFC/Backend/Java/CFtoJavaAbs15.hs
b/src/BNFC/Backend/Java/CFtoJavaAbs15.hs
+@@ -56,2 +56,3 @@ import Data.Maybe (mapMaybe)
+ import Text.PrettyPrint
++import Prelude hiding ((<>))
+
+--- a/src/BNFC/Backend/Java/CFtoJavaPrinter15.hs
b/src/BNFC/Backend/Java/CFtoJavaPrinter15.hs
+@@ -58,2 +58,3 @@ import Data.Either (lefts)
