Patch hscolour 1.19 for ghc 7.6.1

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0x618E971F

4 files changed, 68 insertions, 5 deletions

diff --git a/dev-haskell/hscolour/ChangeLog b/dev-haskell/hscolour/ChangeLog
index fb4413260951..05b4c26b2f90 100644
--- a/dev-haskell/hscolour/ChangeLog
+++ b/dev-haskell/hscolour/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-haskell/hscolour
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hscolour/ChangeLog,v 1.19 2012/09/12 16:01:51 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hscolour/ChangeLog,v 1.20 2012/11/18 13:40:00 gienah Exp $
+
+  18 Nov 2012; Mark Wright <gienah@gentoo.org>
+  +files/hscolour-1.19-ghc-7.5.patch, +hscolour-1.19-ghc-7.5.patch,
+  hscolour-1.19.ebuild:
+  Patch hscolour 1.19 for ghc 7.6.1
 
   12 Sep 2012; Alexander Vershilov <qnikst@gentoo.org> hscolour-1.17.ebuild,
   hscolour-1.19.ebuild:
diff --git a/dev-haskell/hscolour/Manifest b/dev-haskell/hscolour/Manifest
index ef608320c398..07c4dc484ab7 100644
--- a/dev-haskell/hscolour/Manifest
+++ b/dev-haskell/hscolour/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX hscolour-1.19-ghc-7.5.patch 1701 SHA256 7a21513c83b979b6ec80f4316f2cbca0e66007bdd76ac3d85a93310761ffd2b7 SHA512 302fe056e61d58537c2010c2d286ff6abf1b4eea25beb9b2069492000b1edc257830892369bd16576675d00fb376c04f83f17508b9491140ee92d062b9736c29 WHIRLPOOL e436b30e1cd4abc7f742e58e9e55095fa495ba2e51c231fca4ac0d2330298e4db883365f0afbe8a7a472159f4f89bdf180582fa2b41beb0cb3919db5fccbaa54
 DIST hscolour-1.17.tar.gz 20801 SHA256 b645cdde1b7827dae1519a4423031b4c6bed82a8edb52aa295bea86478ce24b0 SHA512 16cbe462c91fd32b474f0b6346ba24ffc8eaa344498413c1071a65bd8d97488de9f77af7918899efc9145112923a9f2b06722f8584f403dfec21a029c181a2a0 WHIRLPOOL 02be9393125569d4c305deb65bd5ac7438927200f5348e0356f5c2d31f0c7f34c8e96748e6a2be9053d384fcb10eba073794a95ba816e8431779bf8d3f804b08
 DIST hscolour-1.19.tar.gz 25466 SHA256 7f9d2cfafbd300793686fd4e9f4ddb3f6463f300a22129db898db47956689f9f SHA512 8f2a9f16cf82fbe41513600c210a0d3af58f1b06ab1ed14a2493203cfce20a8ac959b3a34966273277ac3ceaf3b4916e82892880dd7685f8de12b2636bf53ae1 WHIRLPOOL 051874e224c5fdac14f122143ddfa9577bab7cbd1142ed97f57801204f2df2de76141dc31241eac53c02920d85895f5c57f02b81c5648725d76b1e34133eebbd
 EBUILD hscolour-1.17.ebuild 624 SHA256 d8a37869acee39b159e2b3af6d1c526d5cebb55eddcb93ff5d668732a002fd5f SHA512 b5b4ffcb012bb86ed2e95b17097235826faf32027096ec213c77ba2726efedd717787bd261dc12245e411f93047bdb3b78ed91b6ca426ed0f7a677e8dc6910c7 WHIRLPOOL e42c9fe122ca3176ac9c2ac011eab2875f594070a48d335545bdba851211d962f1c154a8d43a8b153bc4dba62109e4cb5e7477b013263b94b97a87a5b9ede0e0
-EBUILD hscolour-1.19.ebuild 715 SHA256 a51eeaa6c393ca66589c2e9354cd73635bab31f686b61c7fb83c0ee8b21ed47a SHA512 02b6238a6dd71fd11385e4230d7c6814c5541792d2b8929ffc906b312e11491d5417ddc111ea7f8c2c7415ce4d4d07a7a874fd8d09ac2dc9d27478e18b168c5f WHIRLPOOL cc13745a24096214f554b1155f2b0b4ddeb7b9e9cad8ff777d46baab2e6477383bb3b9230f7d4714b30299643cdd906bb00e088a9ab55b7661bdf02586e8049e
-MISC ChangeLog 2518 SHA256 3c518eb43eba30afbd09f4fbcc37d8f4e8044f3625e6ecf15adede33292e8ebb SHA512 0ff745f87b0347570f7ad32abf78637cd0171bba7d4cd523339dc7bbf7920dea9301e89808eab3dcf77c740f9083975db30b602e6b72b497b268340712235ded WHIRLPOOL fc9fd9c209629b6bf4a392cea71dc9ef71863cf02cfb27811ca7c2c02641161cdd01ee128cdfe55fcfb7c1ee97fed3e0e8edc699f5a5ba9b58669476478ff32b
+EBUILD hscolour-1.19.ebuild 763 SHA256 efbf1e844941ac008e2f8209b64fb9a2e6dc6ddcf5ca6569df9e31fd7f52a451 SHA512 63e43c42929b18951e60ff8c9d5a32d97172d74544fb9e0ce812660d4d0d5be94813b50cb55956b834b0e31a72debe3c25c7462782f562941abf1242b16b61d5 WHIRLPOOL 2e25fe210533a98e50123bb73d999966b55fc7b4c9698db658e9f47afe0f2eb2e1a4bf6901574c0f4c2e23c1d2f5d3d96292058462d0b34ce3b0cb1a208681ae
+MISC ChangeLog 2694 SHA256 5fc2f54581ee7e37e261b5de47fed5c0960a6372c676ecb576e2226c955c7b0b SHA512 c892afc5722311b7c12c2ac101c46af0a6b1a66549f094b8cac2910bc51435d3938bd2ee1f1945d827911394520aadacea80788bff7e539d371a50e88ec519f9 WHIRLPOOL 35d580cf3ff28fbd74a250e8d49ec0fbc07bf564c033f8ab16a5b01136d9b5c02e9df9d53cc9bbaa97466ae973b7203a6c8d7fa2bf7f063627d5faadb319fe5d
 MISC metadata.xml 223 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508 SHA512 24765bbf1cb187cd262aa7fb3824c1cec65e2bf3f2198099de688916d96401a26458265b15408f22b1fbd6d6a2842df814a57ceda80dfa00d130b24423b7544f WHIRLPOOL 8fd6700f6198db6540eb51edf11372faeb6eb8a542a692e515badf236f62444f2c180f7d08e0f98e9fdfa23de14631b31af50543469aaa27084d6b637e2644c7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAlCo5TUACgkQoBEVQmGOlx+i9gEAx5Dzj0DUGh3XvFx9cIKa9IrW
+EdfX8kT6RSIKrduAnrwBAKFhULzY2y6dJcGp+WZxSEgrJ7sheDogXmSCTToXYTaM
+=63IL
+-----END PGP SIGNATURE-----
diff --git a/dev-haskell/hscolour/files/hscolour-1.19-ghc-7.5.patch b/dev-haskell/hscolour/files/hscolour-1.19-ghc-7.5.patch
new file mode 100644
index 000000000000..25e29728ca3a
--- /dev/null
+++ b/dev-haskell/hscolour/files/hscolour-1.19-ghc-7.5.patch
@@ -0,0 +1,45 @@
+--- hscolour-1.19-orig/Language/Haskell/HsColour/Colourise.hs	2011-06-06 03:05:04.000000000 +1000
++++ hscolour-1.19/Language/Haskell/HsColour/Colourise.hs	2012-06-24 10:29:57.990963394 +1000
+@@ -1,3 +1,7 @@
++{-# LANGUAGE CPP #-}
++#if (__GLASGOW_HASKELL__>=705)
++{-# LANGUAGE ScopedTypeVariables #-}
++#endif
+ module Language.Haskell.HsColour.Colourise
+   ( module Language.Haskell.HsColour.ColourHighlight
+   , ColourPrefs(..)
+@@ -9,6 +13,9 @@
+ import Language.Haskell.HsColour.ColourHighlight
+ import Language.Haskell.HsColour.Classify (TokenType(..))
+ 
++#if (__GLASGOW_HASKELL__>=705)
++import Control.Exception (catch, SomeException)
++#endif
+ import System.IO (hPutStrLn,stderr)
+ import System.Environment (getEnv)
+ import Data.List
+@@ -51,6 +58,16 @@
+ -- | Read colour preferences from .hscolour file in the current directory, or failing that,
+ --   from \$HOME\/.hscolour, and failing that, returns a default set of prefs.
+ readColourPrefs :: IO ColourPrefs
++#if (__GLASGOW_HASKELL__>=705)
++readColourPrefs = catch
++  (do val <- readFile ".hscolour"
++      parseColourPrefs ".hscolour" val)
++  (\(_ :: SomeException) -> catch
++    (do home <- getEnv "HOME"
++        val <- readFile (home++"/.hscolour")
++        parseColourPrefs (home++"/.hscolour") val)
++    (\(_ :: SomeException) -> return defaultColourPrefs))
++#else
+ readColourPrefs = catch
+   (do val <- readFile ".hscolour"
+       parseColourPrefs ".hscolour" val)
+@@ -59,6 +76,7 @@
+         val <- readFile (home++"/.hscolour")
+         parseColourPrefs (home++"/.hscolour") val)
+     (\_-> return defaultColourPrefs))
++#endif
+ 
+ -- | Convert token classification to colour highlights.
+ colourise :: ColourPrefs -> TokenType -> [Highlight]
diff --git a/dev-haskell/hscolour/hscolour-1.19.ebuild b/dev-haskell/hscolour/hscolour-1.19.ebuild
index 6c1d84c1fe9c..781d3d2b550c 100644
--- a/dev-haskell/hscolour/hscolour-1.19.ebuild
+++ b/dev-haskell/hscolour/hscolour-1.19.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hscolour/hscolour-1.19.ebuild,v 1.6 2012/09/12 16:01:51 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hscolour/hscolour-1.19.ebuild,v 1.7 2012/11/18 13:40:00 gienah Exp $
 
-EAPI="3"
+EAPI=4
 
 CABAL_FEATURES="bin lib profile haddock"
 inherit base haskell-cabal
@@ -20,6 +20,8 @@ RDEPEND=">=dev-lang/ghc-6.6.1"
 DEPEND="${RDEPEND}
 		>=dev-haskell/cabal-1.6"
 
+PATCHES=("${FILESDIR}/${PN}-1.19-ghc-7.5.patch")
+
 src_install() {
 	cabal_src_install
 	if use doc; then