* [gentoo-commits] repo/gentoo:master commit in: dev-util/bnfc/, dev-util/bnfc/files/
@ 2016-01-16 19:43 Sergei Trofimovich
0 siblings, 0 replies; 2+ messages in thread
From: Sergei Trofimovich @ 2016-01-16 19:43 UTC (permalink / raw
To: gentoo-commits
commit: 531f6c680dca3c3248b4e6ef985a270f5f268c45
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 16 19:36:37 2016 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Jan 16 19:42:39 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=531f6c68
dev-util/bnfc: tweak for alex-3.1.6
Package-Manager: portage-2.2.26
dev-util/bnfc/bnfc-2.8.ebuild | 4 ++++
dev-util/bnfc/files/bnfc-2.8-alex-3.1.6.patch | 8 ++++++++
2 files changed, 12 insertions(+)
diff --git a/dev-util/bnfc/bnfc-2.8.ebuild b/dev-util/bnfc/bnfc-2.8.ebuild
index 16e4487..08c4ba5 100644
--- a/dev-util/bnfc/bnfc-2.8.ebuild
+++ b/dev-util/bnfc/bnfc-2.8.ebuild
@@ -38,3 +38,7 @@ DEPEND="${RDEPEND}
"
S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-alex-3.1.6.patch
+}
diff --git a/dev-util/bnfc/files/bnfc-2.8-alex-3.1.6.patch b/dev-util/bnfc/files/bnfc-2.8-alex-3.1.6.patch
new file mode 100644
index 0000000..e983483
--- /dev/null
+++ b/dev-util/bnfc/files/bnfc-2.8-alex-3.1.6.patch
@@ -0,0 +1,8 @@
+diff --git a/src/LexBNF.x b/src/LexBNF.x
+index 927e15d..aea3386 100644
+--- a/src/LexBNF.x
++++ b/src/LexBNF.x
+@@ -11,2 +11,3 @@ import qualified Data.Bits
+ import Data.Word (Word8)
++import Data.Char (ord)
+ }
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/bnfc/, dev-util/bnfc/files/
@ 2020-12-25 12:17 Sergei Trofimovich
0 siblings, 0 replies; 2+ messages in thread
From: Sergei Trofimovich @ 2020-12-25 12:17 UTC (permalink / raw
To: gentoo-commits
commit: 95c79c851decd2e9caad6893ddc6d84cd0e4c6d1
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 25 12:11:36 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Dec 25 12:17:48 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95c79c85
dev-util/bnfc: drop old
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
dev-util/bnfc/Manifest | 1 -
dev-util/bnfc/bnfc-2.8.1.ebuild | 39 --------
dev-util/bnfc/files/bnfc-2.8.1-ghc84-p2.patch | 130 --------------------------
dev-util/bnfc/files/bnfc-2.8.1-ghc84.patch | 31 ------
4 files changed, 201 deletions(-)
diff --git a/dev-util/bnfc/Manifest b/dev-util/bnfc/Manifest
index 6a5c50e3f53..1fc836c2732 100644
--- a/dev-util/bnfc/Manifest
+++ b/dev-util/bnfc/Manifest
@@ -1,2 +1 @@
-DIST BNFC-2.8.1.tar.gz 225015 BLAKE2B 973f7a5ebc5fb995bf0014621ba7bfebe0d6adbb35bd276b3f7ec56e3fe1ab08c3811d27a2d58a73ca52ac4bf9ba35fba3d172a82684b1ef999a2fdd6dc4ece9 SHA512 d5ea9b4129a4f71c2d66cda2f859a2c39be6d4400cddbd5a5303b5b408f4cf03ce7a92825224f4674c6cc48bec07429c447b9b39fc4e6d144c922bf1b0829561
DIST BNFC-2.8.3.tar.gz 286964 BLAKE2B 5c8a5d08b1b705e064ef0a7a685dab455e933d0fa84946b4526aebee8698e94ea2cdfa797eb63320e9632b3503da5c41ea2aa59d0bb1f0fa9bda3588a19552d9 SHA512 742937cb0674f5e890376f51aeeccaf2f4c986f6b27e77faaee1ac8baebec553e70c623844c7c63e1caf441592b53113ba4ba187d88a9e869885d40201c54bef
diff --git a/dev-util/bnfc/bnfc-2.8.1.ebuild b/dev-util/bnfc/bnfc-2.8.1.ebuild
deleted file mode 100644
index fffb7f49416..00000000000
--- a/dev-util/bnfc/bnfc-2.8.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour" # Broken test-suite: missing files
-inherit haskell-cabal
-
-MY_PN="BNFC"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A compiler front-end generator"
-HOMEPAGE="http://bnfc.digitalgrammars.com/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # missing files
-
-RDEPEND="dev-haskell/mtl:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- dev-haskell/alex
- >=dev-haskell/cabal-1.8
- dev-haskell/happy
-"
-
-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
deleted file mode 100644
index a1e944c2d15..00000000000
--- a/dev-util/bnfc/files/bnfc-2.8.1-ghc84-p2.patch
+++ /dev/null
@@ -1,130 +0,0 @@
---- 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)
- import BNFC.PrettyPrint
-+import Prelude hiding ((<>))
-
---- a/src/BNFC/Backend/Java/CFtoVisitSkel15.hs
-+++ b/src/BNFC/Backend/Java/CFtoVisitSkel15.hs
-@@ -48,2 +48,3 @@ import Text.PrettyPrint
- import Data.Either (lefts)
-+import Prelude hiding ((<>))
-
---- a/src/BNFC/Backend/OCaml/CFtoOCamlLex.hs
-+++ b/src/BNFC/Backend/OCaml/CFtoOCamlLex.hs
-@@ -34,2 +34,3 @@ import BNFC.Backend.OCaml.CFtoOCamlYacc (terminal)
- import BNFC.Utils ((+++))
-+import Prelude hiding ((<>))
-
---- a/src/BNFC/Backend/OCaml/CFtoOCamlPrinter.hs
-+++ b/src/BNFC/Backend/OCaml/CFtoOCamlPrinter.hs
-@@ -30,3 +30,3 @@ import BNFC.PrettyPrint
- import BNFC.Backend.Haskell.CFtoPrinter (compareRules)
--
-+import Prelude hiding ((<>))
-
---- a/src/BNFC/Backend/OCaml/CFtoOCamlTest.hs
-+++ b/src/BNFC/Backend/OCaml/CFtoOCamlTest.hs
-@@ -25,2 +25,3 @@ import BNFC.CF
- import BNFC.Backend.OCaml.OCamlUtil
-+import Prelude hiding ((<>))
-
---- a/src/BNFC/Backend/Pygments.hs
-+++ b/src/BNFC/Backend/Pygments.hs
-@@ -17,2 +17,3 @@ import BNFC.Utils
- import BNFC.PrettyPrint
-+import Prelude hiding ((<>))
-
---- a/src/BNFC/Lexing.hs
-+++ b/src/BNFC/Lexing.hs
-@@ -8,3 +8,3 @@ import PrintBNF
- import BNFC.CF
--
-+import Prelude hiding ((<>))
-
diff --git a/dev-util/bnfc/files/bnfc-2.8.1-ghc84.patch b/dev-util/bnfc/files/bnfc-2.8.1-ghc84.patch
deleted file mode 100644
index 884b0a7e57a..00000000000
--- a/dev-util/bnfc/files/bnfc-2.8.1-ghc84.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/src/BNFC/Backend/Haskell/CFtoAbstract.hs
-+++ b/src/BNFC/Backend/Haskell/CFtoAbstract.hs
-@@ -25,2 +25,4 @@ import BNFC.Backend.Haskell.Utils (catToType, catvars)
- import Text.PrettyPrint
-+import Prelude hiding ((<>))
-+
-
---- a/src/BNFC/Backend/Haskell/CFtoPrinter.hs
-+++ b/src/BNFC/Backend/Haskell/CFtoPrinter.hs
-@@ -29,2 +29,3 @@ import Data.Maybe (fromJust)
- import Text.PrettyPrint
-+import Prelude hiding ((<>))
-
---- a/src/BNFC/Backend/Haskell/CFtoTemplate.hs
-+++ b/src/BNFC/Backend/Haskell/CFtoTemplate.hs
-@@ -25,2 +25,3 @@ import BNFC.CF
- import BNFC.PrettyPrint
-+import Prelude hiding ((<>))
-
---- a/src/BNFC/Backend/Haskell/Utils.hs
-+++ b/src/BNFC/Backend/Haskell/Utils.hs
-@@ -10,2 +10,3 @@ import BNFC.CF (Cat(..), identCat, normCat)
- import BNFC.Utils (mkNames, NameStyle(..))
-+import Prelude hiding ((<>))
-
---- a/src/BNFC/PrettyPrint.hs
-+++ b/src/BNFC/PrettyPrint.hs
-@@ -10,2 +10,3 @@ module BNFC.PrettyPrint
- import Text.PrettyPrint
-+import Prelude hiding ((<>))
-
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-12-25 12:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-01-16 19:43 [gentoo-commits] repo/gentoo:master commit in: dev-util/bnfc/, dev-util/bnfc/files/ Sergei Trofimovich
-- strict thread matches above, loose matches on Subject: below --
2020-12-25 12:17 Sergei Trofimovich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox