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-util/bnfc/, dev-util/bnfc/files/
Date: Fri, 25 Dec 2020 12:17:59
Message-Id: 1608898668.95c79c851decd2e9caad6893ddc6d84cd0e4c6d1.slyfox@gentoo
1 commit: 95c79c851decd2e9caad6893ddc6d84cd0e4c6d1
2 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
3 AuthorDate: Fri Dec 25 12:11:36 2020 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Fri Dec 25 12:17:48 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95c79c85
7
8 dev-util/bnfc: drop old
9
10 Package-Manager: Portage-3.0.12, Repoman-3.0.2
11 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
12
13 dev-util/bnfc/Manifest | 1 -
14 dev-util/bnfc/bnfc-2.8.1.ebuild | 39 --------
15 dev-util/bnfc/files/bnfc-2.8.1-ghc84-p2.patch | 130 --------------------------
16 dev-util/bnfc/files/bnfc-2.8.1-ghc84.patch | 31 ------
17 4 files changed, 201 deletions(-)
18
19 diff --git a/dev-util/bnfc/Manifest b/dev-util/bnfc/Manifest
20 index 6a5c50e3f53..1fc836c2732 100644
21 --- a/dev-util/bnfc/Manifest
22 +++ b/dev-util/bnfc/Manifest
23 @@ -1,2 +1 @@
24 -DIST BNFC-2.8.1.tar.gz 225015 BLAKE2B 973f7a5ebc5fb995bf0014621ba7bfebe0d6adbb35bd276b3f7ec56e3fe1ab08c3811d27a2d58a73ca52ac4bf9ba35fba3d172a82684b1ef999a2fdd6dc4ece9 SHA512 d5ea9b4129a4f71c2d66cda2f859a2c39be6d4400cddbd5a5303b5b408f4cf03ce7a92825224f4674c6cc48bec07429c447b9b39fc4e6d144c922bf1b0829561
25 DIST BNFC-2.8.3.tar.gz 286964 BLAKE2B 5c8a5d08b1b705e064ef0a7a685dab455e933d0fa84946b4526aebee8698e94ea2cdfa797eb63320e9632b3503da5c41ea2aa59d0bb1f0fa9bda3588a19552d9 SHA512 742937cb0674f5e890376f51aeeccaf2f4c986f6b27e77faaee1ac8baebec553e70c623844c7c63e1caf441592b53113ba4ba187d88a9e869885d40201c54bef
26
27 diff --git a/dev-util/bnfc/bnfc-2.8.1.ebuild b/dev-util/bnfc/bnfc-2.8.1.ebuild
28 deleted file mode 100644
29 index fffb7f49416..00000000000
30 --- a/dev-util/bnfc/bnfc-2.8.1.ebuild
31 +++ /dev/null
32 @@ -1,39 +0,0 @@
33 -# Copyright 1999-2019 Gentoo Authors
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=6
37 -
38 -# ebuild generated by hackport 0.4.6.9999
39 -
40 -CABAL_FEATURES="bin lib profile haddock hoogle hscolour" # Broken test-suite: missing files
41 -inherit haskell-cabal
42 -
43 -MY_PN="BNFC"
44 -MY_P="${MY_PN}-${PV}"
45 -
46 -DESCRIPTION="A compiler front-end generator"
47 -HOMEPAGE="http://bnfc.digitalgrammars.com/"
48 -SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
49 -
50 -LICENSE="GPL-2"
51 -SLOT="0/${PV}"
52 -KEYWORDS="~amd64 ~x86"
53 -IUSE=""
54 -
55 -RESTRICT=test # missing files
56 -
57 -RDEPEND="dev-haskell/mtl:=[profile?]
58 - >=dev-lang/ghc-7.4.1:=
59 -"
60 -DEPEND="${RDEPEND}
61 - dev-haskell/alex
62 - >=dev-haskell/cabal-1.8
63 - dev-haskell/happy
64 -"
65 -
66 -S="${WORKDIR}/${MY_P}"
67 -
68 -PATCHES=(
69 - "${FILESDIR}"/${P}-ghc84.patch
70 - "${FILESDIR}"/${P}-ghc84-p2.patch
71 -)
72
73 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
74 deleted file mode 100644
75 index a1e944c2d15..00000000000
76 --- a/dev-util/bnfc/files/bnfc-2.8.1-ghc84-p2.patch
77 +++ /dev/null
78 @@ -1,130 +0,0 @@
79 ---- a/src/BNFC/Backend/C/CFtoCAbs.hs
80 -+++ b/src/BNFC/Backend/C/CFtoCAbs.hs
81 -@@ -50,3 +50,3 @@ import Data.List
82 - import Data.Char(toLower)
83 --
84 -+import Prelude hiding ((<>))
85 -
86 ---- a/src/BNFC/Backend/C/CFtoCPrinter.hs
87 -+++ b/src/BNFC/Backend/C/CFtoCPrinter.hs
88 -@@ -53,2 +53,3 @@ import Data.Either (lefts)
89 - import BNFC.PrettyPrint
90 -+import Prelude hiding ((<>))
91 -
92 ---- a/src/BNFC/Backend/C/CFtoCSkel.hs
93 -+++ b/src/BNFC/Backend/C/CFtoCSkel.hs
94 -@@ -49,2 +49,3 @@ import Data.Either (lefts)
95 - import Text.PrettyPrint
96 -+import Prelude hiding ((<>))
97 -
98 ---- a/src/BNFC/Backend/CPP/NoSTL/CFtoCPPAbs.hs
99 -+++ b/src/BNFC/Backend/CPP/NoSTL/CFtoCPPAbs.hs
100 -@@ -50,3 +50,3 @@ import Data.Char(toLower)
101 - import Text.PrettyPrint
102 --
103 -+import Prelude hiding ((<>))
104 -
105 ---- a/src/BNFC/Backend/CPP/NoSTL/CFtoCVisitSkel.hs
106 -+++ b/src/BNFC/Backend/CPP/NoSTL/CFtoCVisitSkel.hs
107 -@@ -49,2 +49,3 @@ import Data.Either (lefts)
108 - import BNFC.PrettyPrint
109 -+import Prelude hiding ((<>))
110 -
111 ---- a/src/BNFC/Backend/CPP/PrettyPrinter.hs
112 -+++ b/src/BNFC/Backend/CPP/PrettyPrinter.hs
113 -@@ -32,2 +32,3 @@ import BNFC.Backend.CPP.STL.STLUtils
114 - import BNFC.PrettyPrint
115 -+import Prelude hiding ((<>))
116 -
117 ---- a/src/BNFC/Backend/CPP/STL/CFtoBisonSTL.hs
118 -+++ b/src/BNFC/Backend/CPP/STL/CFtoBisonSTL.hs
119 -@@ -56,2 +56,3 @@ import BNFC.Backend.C.CFtoBisonC (startSymbol)
120 - import BNFC.PrettyPrint
121 -+import Prelude hiding ((<>))
122 -
123 ---- a/src/BNFC/Backend/Common.hs
124 -+++ b/src/BNFC/Backend/Common.hs
125 -@@ -4,2 +4,3 @@ module BNFC.Backend.Common (renderListSepByPrecedence) where
126 - import BNFC.PrettyPrint
127 -+import Prelude hiding ((<>))
128 -
129 ---- a/src/BNFC/Backend/Common/NamedVariables.hs
130 -+++ b/src/BNFC/Backend/Common/NamedVariables.hs
131 -@@ -75,2 +75,3 @@ import Control.Arrow (left, (&&&))
132 - import Data.Either (lefts)
133 -+import Prelude hiding ((<>))
134 -
135 ---- a/src/BNFC/Backend/Java.hs
136 -+++ b/src/BNFC/Backend/Java.hs
137 -@@ -56,2 +56,3 @@ import qualified BNFC.Backend.Common.Makefile as Makefile
138 - import BNFC.PrettyPrint
139 -+import Prelude hiding ((<>))
140 - -------------------------------------------------------------------
141 ---- a/src/BNFC/Backend/Java/CFtoComposVisitor.hs
142 -+++ b/src/BNFC/Backend/Java/CFtoComposVisitor.hs
143 -@@ -29,2 +29,3 @@ import Data.Either (lefts)
144 - import BNFC.PrettyPrint
145 -+import Prelude hiding ((<>))
146 -
147 ---- a/src/BNFC/Backend/Java/CFtoFoldVisitor.hs
148 -+++ b/src/BNFC/Backend/Java/CFtoFoldVisitor.hs
149 -@@ -28,2 +28,3 @@ import Data.Either (lefts)
150 - import BNFC.PrettyPrint
151 -+import Prelude hiding ((<>))
152 -
153 ---- a/src/BNFC/Backend/Java/CFtoJLex15.hs
154 -+++ b/src/BNFC/Backend/Java/CFtoJLex15.hs
155 -@@ -46,2 +46,3 @@ import BNFC.Backend.Common.NamedVariables
156 - import Text.PrettyPrint
157 -+import Prelude hiding ((<>))
158 -
159 ---- a/src/BNFC/Backend/Java/CFtoJavaAbs15.hs
160 -+++ b/src/BNFC/Backend/Java/CFtoJavaAbs15.hs
161 -@@ -56,2 +56,3 @@ import Data.Maybe (mapMaybe)
162 - import Text.PrettyPrint
163 -+import Prelude hiding ((<>))
164 -
165 ---- a/src/BNFC/Backend/Java/CFtoJavaPrinter15.hs
166 -+++ b/src/BNFC/Backend/Java/CFtoJavaPrinter15.hs
167 -@@ -58,2 +58,3 @@ import Data.Either (lefts)
168 - import BNFC.PrettyPrint
169 -+import Prelude hiding ((<>))
170 -
171 ---- a/src/BNFC/Backend/Java/CFtoVisitSkel15.hs
172 -+++ b/src/BNFC/Backend/Java/CFtoVisitSkel15.hs
173 -@@ -48,2 +48,3 @@ import Text.PrettyPrint
174 - import Data.Either (lefts)
175 -+import Prelude hiding ((<>))
176 -
177 ---- a/src/BNFC/Backend/OCaml/CFtoOCamlLex.hs
178 -+++ b/src/BNFC/Backend/OCaml/CFtoOCamlLex.hs
179 -@@ -34,2 +34,3 @@ import BNFC.Backend.OCaml.CFtoOCamlYacc (terminal)
180 - import BNFC.Utils ((+++))
181 -+import Prelude hiding ((<>))
182 -
183 ---- a/src/BNFC/Backend/OCaml/CFtoOCamlPrinter.hs
184 -+++ b/src/BNFC/Backend/OCaml/CFtoOCamlPrinter.hs
185 -@@ -30,3 +30,3 @@ import BNFC.PrettyPrint
186 - import BNFC.Backend.Haskell.CFtoPrinter (compareRules)
187 --
188 -+import Prelude hiding ((<>))
189 -
190 ---- a/src/BNFC/Backend/OCaml/CFtoOCamlTest.hs
191 -+++ b/src/BNFC/Backend/OCaml/CFtoOCamlTest.hs
192 -@@ -25,2 +25,3 @@ import BNFC.CF
193 - import BNFC.Backend.OCaml.OCamlUtil
194 -+import Prelude hiding ((<>))
195 -
196 ---- a/src/BNFC/Backend/Pygments.hs
197 -+++ b/src/BNFC/Backend/Pygments.hs
198 -@@ -17,2 +17,3 @@ import BNFC.Utils
199 - import BNFC.PrettyPrint
200 -+import Prelude hiding ((<>))
201 -
202 ---- a/src/BNFC/Lexing.hs
203 -+++ b/src/BNFC/Lexing.hs
204 -@@ -8,3 +8,3 @@ import PrintBNF
205 - import BNFC.CF
206 --
207 -+import Prelude hiding ((<>))
208 -
209
210 diff --git a/dev-util/bnfc/files/bnfc-2.8.1-ghc84.patch b/dev-util/bnfc/files/bnfc-2.8.1-ghc84.patch
211 deleted file mode 100644
212 index 884b0a7e57a..00000000000
213 --- a/dev-util/bnfc/files/bnfc-2.8.1-ghc84.patch
214 +++ /dev/null
215 @@ -1,31 +0,0 @@
216 ---- a/src/BNFC/Backend/Haskell/CFtoAbstract.hs
217 -+++ b/src/BNFC/Backend/Haskell/CFtoAbstract.hs
218 -@@ -25,2 +25,4 @@ import BNFC.Backend.Haskell.Utils (catToType, catvars)
219 - import Text.PrettyPrint
220 -+import Prelude hiding ((<>))
221 -+
222 -
223 ---- a/src/BNFC/Backend/Haskell/CFtoPrinter.hs
224 -+++ b/src/BNFC/Backend/Haskell/CFtoPrinter.hs
225 -@@ -29,2 +29,3 @@ import Data.Maybe (fromJust)
226 - import Text.PrettyPrint
227 -+import Prelude hiding ((<>))
228 -
229 ---- a/src/BNFC/Backend/Haskell/CFtoTemplate.hs
230 -+++ b/src/BNFC/Backend/Haskell/CFtoTemplate.hs
231 -@@ -25,2 +25,3 @@ import BNFC.CF
232 - import BNFC.PrettyPrint
233 -+import Prelude hiding ((<>))
234 -
235 ---- a/src/BNFC/Backend/Haskell/Utils.hs
236 -+++ b/src/BNFC/Backend/Haskell/Utils.hs
237 -@@ -10,2 +10,3 @@ import BNFC.CF (Cat(..), identCat, normCat)
238 - import BNFC.Utils (mkNames, NameStyle(..))
239 -+import Prelude hiding ((<>))
240 -
241 ---- a/src/BNFC/PrettyPrint.hs
242 -+++ b/src/BNFC/PrettyPrint.hs
243 -@@ -10,2 +10,3 @@ module BNFC.PrettyPrint
244 - import Text.PrettyPrint
245 -+import Prelude hiding ((<>))
246 -