From 4f934dfe4b0ef919d083fa7ed82d7dcf31db0cc1 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 22 Dec 2012 21:47:24 +0000 Subject: Version bump. (Portage version: 2.2.0_alpha149_p1/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA) --- dev-util/bnfc/ChangeLog | 8 +++- dev-util/bnfc/bnfc-2.4.2.1.ebuild | 32 ++++++++++++++ dev-util/bnfc/files/bnfc-2.4.2.1-ghc-7.6.patch | 61 ++++++++++++++++++++++++++ 3 files changed, 100 insertions(+), 1 deletion(-) create mode 100644 dev-util/bnfc/bnfc-2.4.2.1.ebuild create mode 100644 dev-util/bnfc/files/bnfc-2.4.2.1-ghc-7.6.patch (limited to 'dev-util') diff --git a/dev-util/bnfc/ChangeLog b/dev-util/bnfc/ChangeLog index 4048d565c83b..e4f8b7275811 100644 --- a/dev-util/bnfc/ChangeLog +++ b/dev-util/bnfc/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-util/bnfc # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/bnfc/ChangeLog,v 1.17 2012/09/12 16:08:04 qnikst Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/bnfc/ChangeLog,v 1.18 2012/12/22 21:47:24 slyfox Exp $ + +*bnfc-2.4.2.1 (22 Dec 2012) + + 22 Dec 2012; Sergei Trofimovich +bnfc-2.4.2.1.ebuild, + +files/bnfc-2.4.2.1-ghc-7.6.patch: + Version bump. 12 Sep 2012; Alexander Vershilov bnfc-2.4.2.0.ebuild: move dev-util/bnfc/bnfc-2.4.2.0.ebuild ebuild to mirror://hackage diff --git a/dev-util/bnfc/bnfc-2.4.2.1.ebuild b/dev-util/bnfc/bnfc-2.4.2.1.ebuild new file mode 100644 index 000000000000..08f4a8d07b3e --- /dev/null +++ b/dev-util/bnfc/bnfc-2.4.2.1.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/bnfc/bnfc-2.4.2.1.ebuild,v 1.1 2012/12/22 21:47:24 slyfox Exp $ + +EAPI=5 + +# ebuild generated by hackport 0.3.9999 + +CABAL_FEATURES="bin" +inherit base haskell-cabal + +MY_PN="BNFC" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="A compiler front-end generator." +HOMEPAGE="http://www.cse.chalmers.se/research/group/Language-technology/BNFC/" +SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="" + +RDEPEND="" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-1.2 + dev-haskell/mtl + >=dev-lang/ghc-6.10.4" + +S="${WORKDIR}/${MY_P}" + +PATCHES=("${FILESDIR}"/${P}-ghc-7.6.patch) diff --git a/dev-util/bnfc/files/bnfc-2.4.2.1-ghc-7.6.patch b/dev-util/bnfc/files/bnfc-2.4.2.1-ghc-7.6.patch new file mode 100644 index 000000000000..6956c9dfd8bd --- /dev/null +++ b/dev-util/bnfc/files/bnfc-2.4.2.1-ghc-7.6.patch @@ -0,0 +1,61 @@ +diff --git a/formats/c-sharp/CSharpTop.hs b/formats/c-sharp/CSharpTop.hs +index b2ad6f0..62d94bd 100644 +--- a/formats/c-sharp/CSharpTop.hs ++++ b/formats/c-sharp/CSharpTop.hs +@@ -49,6 +49,7 @@ import CFtoCSharpPrinter + import CFtoLatex + import CSharpUtils + import GetCF ++import qualified Control.Exception as E + import Data.Char + import System.IO + import System.Directory +@@ -359,7 +360,9 @@ projectguid = do + -- This works with Visual Studio 2005. + -- We will probably have to be modify this to include another environment variable name for Orcas. + -- I doubt there is any need to support VS2003? (I doubt they have patched it up to have 2.0 support?) +- toolpath <- catch (getEnv "VS80COMNTOOLS") (\_ -> return "C:\\Program Files\\Microsoft Visual Studio 8\\Common7\\Tools") ++ toolpath <- (E.catch :: IO a -> (E.IOException -> IO a) -> IO a) ++ (getEnv "VS80COMNTOOLS") ++ (\_ -> return "C:\\Program Files\\Microsoft Visual Studio 8\\Common7\\Tools") + exists <- doesDirectoryExist toolpath + if exists + then return (Just (toolpath ++ "\\uuidgen.exe")) +diff --git a/formats/java/JavaTop.hs b/formats/java/JavaTop.hs +index e1f877a..80f6af1 100644 +--- a/formats/java/JavaTop.hs ++++ b/formats/java/JavaTop.hs +@@ -38,7 +38,8 @@ module JavaTop ( makeJava ) where + -- Dependencies. + ------------------------------------------------------------------- + import System.Directory ( createDirectory ) +-import System.IO.Error ( try, isAlreadyExistsError ) ++import qualified Control.Exception as E ++import qualified System.IO.Error as E + + import Utils + import CF +@@ -113,9 +114,9 @@ mkFiles make name cf = + + chkExists :: FilePath -> IO () + chkExists dir = +- do eErr <- try $ createDirectory dir ++ do eErr <- E.try $ createDirectory dir + case eErr of +- Left ioerr -> if isAlreadyExistsError ioerr ++ Left ioerr -> if E.isAlreadyExistsError ioerr + then return () + else fail $ show ioerr + Right () -> putStrLn $ "Created directory: " ++ dir +diff --git a/formats/java1.5/JavaTop15.hs b/formats/java1.5/JavaTop15.hs +index 25bf123..ff06739 100644 +--- a/formats/java1.5/JavaTop15.hs ++++ b/formats/java1.5/JavaTop15.hs +@@ -39,7 +39,6 @@ module JavaTop15 ( makeJava15 ) where + -- Dependencies. + ------------------------------------------------------------------- + import System.Directory ( createDirectory ) +-import System.IO.Error ( try, isAlreadyExistsError ) + + import Utils + import CF -- cgit v1.2.3-65-gdbad