Version bump.

Package-Manager: portage-2.2.0_alpha149_p1/cvs/Linux x86_64
Manifest-Sign-Key: 0x611FF3AA

4 files changed, 114 insertions, 2 deletions

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 <slyfox@gentoo.org> +bnfc-2.4.2.1.ebuild,
+  +files/bnfc-2.4.2.1-ghc-7.6.patch:
+  Version bump.
 
   12 Sep 2012; Alexander Vershilov <qnikst@gentoo.org> 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/Manifest b/dev-util/bnfc/Manifest
index 2ebd146effd4..713fcbf601d3 100644
--- a/dev-util/bnfc/Manifest
+++ b/dev-util/bnfc/Manifest
@@ -1,5 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX bnfc-2.4.2.0-mangle-errors.patch 1242 SHA256 a520b7796a523bec75725b78577d5af81f7745c59ed42c997a7854ad0aaebf4f SHA512 5cfd3ec643ccbd23021ffceaefeac31c5f83231845db44809dde53b02d16f28f36e3710005924aceb0733dde09d6d9ad13c88c16092716592db3607f0c18c74c WHIRLPOOL 1208e65344c3236260c452da9c39976d25b4512b18fedc06c9bdf0f87933196f4b6a4329656721d8a87f34477d71a4a2be023ed736d20fef4f42f231cf8863e6
+AUX bnfc-2.4.2.1-ghc-7.6.patch 2521 SHA256 dcdc834a04f147d55e3959536f218107698cedfc7efdbe34ec58ca72602e1daa SHA512 ee171342e30ae8fffa138565a3a33d9ea17ebdec4560dce46efd48b2506b4a49f157d934f80c50b8dcb3691f07291835876c1445f61660d6e59cf68efbd6e5f4 WHIRLPOOL 748d53320a7e938c5b63dcb2d9b3769f4bc6cf107792acc78e402217e4b987cf2264b2d5daadef46f453baf092355057e022f8db052afe168e3c61000b19ea38
 DIST BNFC-2.4.2.0.tar.gz 182328 SHA256 c0c69b50f17e13cf5afd9c9d8ce2cabab1273c14bebc91f4f065068af5a7ca5a SHA512 3db8d5eb8196193eb1966fa91015d5518e79199c928e83f8728190592f76ef3834a5be8b63bd781bbf9e5bd4987a211f9d9d95cdafcc928fedb8d2e66c2f0925 WHIRLPOOL 86b609c660fb875d2886e50474d3826158eff72ecf2818f4c18c7d07e81679159bf07a04a046705757ac2261de31f96c9ebb80861676724177d43f8263195ebd
+DIST BNFC-2.4.2.1.tar.gz 3546017 SHA256 24d0964a28c475a722fab4f332407f33c652e11233fe76287e62f6896b62d128 SHA512 631e16e8d12205121c972228adb8282d2c741b669bccbee94e15ea92c5e3ee59c08a15ef8427bf968b6f0f5d83b130fb55cfe0087b8054051656b03c5169306b WHIRLPOOL a3c7f95438e1f33ca73ae20623f845a7b37e24c11fcd5bc31d66f676eb886e88adfbbc1624b69ac8b989905df72211780399543c26c9c2499244bb13f370fb60
 EBUILD bnfc-2.4.2.0.ebuild 1499 SHA256 2481f67e74371d8cf18f8bdaa58362238c989f90354f461f21866cf1662b1428 SHA512 c1d9884cf6e6674aaf87240408d041b29c2e9de33afeced6ca02671389b4bc704751079227f950f8bb2bba22fd230843dc58da60f45cef50aeeef4490f73e229 WHIRLPOOL 8f2c75e7af04da2de5f046b3a5367888faecbd4cf7991678f2085f805f4d49ae9f4160c23bb18507ada7c87fada2d546eb990e2248ba48cc6ac91edbb7453053
-MISC ChangeLog 2793 SHA256 5b33dbb6db43ac8934dbcdb46864bd6e47909f67d6f4d2015e8eddbe571dcd0d SHA512 b962d8a077713ee434ac9270fa540d33555e456b70e2cad93e99c086194e2113c609456ea0102039cf1dd6967572097b2c02ab35b334ef32bccd55d187521404 WHIRLPOOL 832124bf78e69aa838e4d913887a1282663a15066140358789c4c598ca72894c7ac5e24860c45e2fc196ce40d40bb25f21a61ff5b9fc1007f77b4675d93158d1
+EBUILD bnfc-2.4.2.1.ebuild 779 SHA256 e56d90524253093accb0cc36859350468c0c7a9813d21f1f163d6773412ebc4c SHA512 c935ac2bc12a0a16afdbaa33068662601dc29284fd5ed10c2fbdef885d35900e91b66d9c271c81f2bcce7491dd80c1c08d897a90acb2c164dde78499d509fea6 WHIRLPOOL 70a046da31f87614381942908b1610b794c30b5bd6ada61267a4be2bc6c456e25d6d5a7f5cf8f3929c9ab1d483c45b0d36b51c9a9d046a1db7cf57c8bc73cfb6
+MISC ChangeLog 2952 SHA256 2acb40d66217445e7bc96a96206729fc190fb71a3965a0b3c31a9e9621855aa0 SHA512 d110fb64934a783c9b1c076fc86bef17f65de9ee7b0b75f5bc21b64babcce1f9af4949b5f214c1376a1c918f1afb3d24b7ea094d459462ae1eef23fe3aec69df WHIRLPOOL cd5fbfe2bc0fe206552eb3f13bfccde06e2dab6b781590971cd2857e9ed47103233278a172b075c192960cffa06c73d9c6ca4996a21cbc7a1efe647e2dd3df8b
 MISC metadata.xml 161 SHA256 f560c0c2c8a2f2ca3c0c03e1836e16da7085b32ea60e03d9add5e405dac9f004 SHA512 e55e2a33dd7916f4379b273ccd6b1781ddf60411a4ac67abac0e2cf4f547d91f8de3efeaf41da43a323b40b078f5ba1be6cb58dfbf8d0c6c97f4016f1eb38fa2 WHIRLPOOL adc22babb9d923d4533b228c7ad25ffc5b50497c779d2016857eb68f5c23f549066cf56f78dd7465960e723732369cf1943e7c460de81177d636d0c17b3e1944
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlDWKlcACgkQcaHudmEf86rsYgCePS0S7CKUjrPh9ZSCBg0ydiVS
+y4YAnApebgNfAg/jvxqefgNUwB3dwM8K
+=9xAz
+-----END PGP SIGNATURE-----
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