From 7bc9c63c9da678a7e6fceb095d56c634afd22c56 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 15 Dec 2019 18:09:03 +0000 Subject: gentoo resync : 15.12.2019 --- dev-util/bnfc/Manifest | 4 +- 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 ++++++ 4 files changed, 171 insertions(+), 8 deletions(-) create mode 100644 dev-util/bnfc/files/bnfc-2.8.1-ghc84-p2.patch create mode 100644 dev-util/bnfc/files/bnfc-2.8.1-ghc84.patch (limited to 'dev-util/bnfc') diff --git a/dev-util/bnfc/Manifest b/dev-util/bnfc/Manifest index 543b2b384b12..0a0b0a261bb5 100644 --- a/dev-util/bnfc/Manifest +++ b/dev-util/bnfc/Manifest @@ -1,6 +1,8 @@ AUX bnfc-2.8-alex-3.1.6.patch 207 BLAKE2B 3e14851866c8ae0dda9245dd1dc920bc4554eb9eae80caec36b9a9b27d62e01727d23e2d716806c18e7e414def483dc192a1c7c8dbca1a5841c7278f40487264 SHA512 6d467ff25b7e8ef70c99b80f4f847b2c22ad39890f72a9a2dee851783af45a91567629f87685e0f8a2d3d64213161713cd7282feed4cd927aff7feab38b97b48 +AUX bnfc-2.8.1-ghc84-p2.patch 4144 BLAKE2B 19ac2a0e8edcbad7d441c248625904aa0021fc64e97d3f7ebcf3e0d1bdf693b442062a5126af1162404de59a022e8f573d7127c223209993755e99e60285eda8 SHA512 4a21d805f24d9f4729a2b95af04333651639324f7ec26996627007ffb5dc8657cb175b228e95e9356c2b47e70ac49576f58b024891c0ce6ddf299b4ee9299548 +AUX bnfc-2.8.1-ghc84.patch 986 BLAKE2B bf7ecd64654f04d701a2b7ec9dfc969cbf4a1bd51db7e6d31512c2cd7bfbaed83ae37a93bec7ce667cae2a98369086accf5d76dab84ae02df4af6d87703531bf SHA512 615ac9cf9b7eff19f675b4cb44e9a3b9d9acc53c827c57c2b556fb76c9c37832f8d137609df64c469eed0b298c0b9dbe01b1ba9cb8d5a1b3088fadadfe27af49 DIST BNFC-2.8.1.tar.gz 225015 BLAKE2B 973f7a5ebc5fb995bf0014621ba7bfebe0d6adbb35bd276b3f7ec56e3fe1ab08c3811d27a2d58a73ca52ac4bf9ba35fba3d172a82684b1ef999a2fdd6dc4ece9 SHA512 d5ea9b4129a4f71c2d66cda2f859a2c39be6d4400cddbd5a5303b5b408f4cf03ce7a92825224f4674c6cc48bec07429c447b9b39fc4e6d144c922bf1b0829561 DIST BNFC-2.8.tar.gz 183591 BLAKE2B cc14079bba767d85ae59a05057cba7db11bc7fcc39e28c29a5151e1ffae1c5b712351085eaa8affe79a36cac66e79df26335d48cfc24fbf41dff018727aa8dd6 SHA512 358700360dbfbeacf3276150856415e08e1498c6af27254302d406e5407b7b4f84ac0dcf9dcf8391128ac9d77a17a928c2427961ec8c3ffdb9af8d169145cafb -EBUILD bnfc-2.8.1.ebuild 843 BLAKE2B 1435d1cc8dd2537dd7cd1183fc875c36bc4b7116c20471c7352ef999e74e9e6211315dd39022d449f2a6563624edf55011da3d506fcd59b8925fc7e0dba916ac SHA512 1bbb98afd62d1c82bcda69625c36bad5a7b238b780960181a7c895df0ff28303f140c3ec3b0b59bcb3dd44f25332050784395c174f8ead3b19f8b5326e2706bb +EBUILD bnfc-2.8.1.ebuild 815 BLAKE2B 543658d36f34aa2d2e28eee8a953c35f53bceb1258d46ab950b0355b46cca9b61f7a7656978c49f91964dff38d5c2521ae14f3f38ebf049a823620f755c636f6 SHA512 c88a93a1294a99f20c8313cd70810a423e9236f46b72253614605ff3b8effdfd445fd759ee36b4451eafb4969dd82e5d53ac938643b75daf5d98f64be787d802 EBUILD bnfc-2.8.ebuild 906 BLAKE2B 8d6c7e91b6f3fb2f10e4f85427f2af5eb414debea79eec8f2e210de9a39f600c9ceeff57a1985a77f00a79e3bf76370227d59329636d0a971d2f7b09c93f5a3b SHA512 12de94e7cf2fee3494d9aa5fccd0e819f746bd8213cc595f387198be769464e3b355efdb7bcd224b4be551bd52479b0ed2abfe4e18c8e3a80ce402a6bcf47d16 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015 diff --git a/dev-util/bnfc/bnfc-2.8.1.ebuild b/dev-util/bnfc/bnfc-2.8.1.ebuild index 087c5aa0327c..0d11aa19de25 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.9999 -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 000000000000..a1e944c2d154 --- /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) + 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 new file mode 100644 index 000000000000..884b0a7e57a6 --- /dev/null +++ b/dev-util/bnfc/files/bnfc-2.8.1-ghc84.patch @@ -0,0 +1,31 @@ +--- 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 ((<>)) + -- cgit v1.2.3