Patch happy 1.18.9 build for ghc 7.6.1

Package-Manager: portage-2.1.11.17/cvs/Linux x86_64

4 files changed, 48 insertions, 5 deletions

diff --git a/dev-haskell/happy/ChangeLog b/dev-haskell/happy/ChangeLog
index 91d35f44aa31..579884bb5361 100644
--- a/dev-haskell/happy/ChangeLog
+++ b/dev-haskell/happy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-haskell/happy
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/happy/ChangeLog,v 1.59 2012/09/14 07:06:28 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/happy/ChangeLog,v 1.60 2012/09/14 13:00:49 gienah Exp $
+
+  14 Sep 2012; Mark Wright <gienah@gentoo.org>
+  +files/happy-1.18.9-ghc-7.5.patch, happy-1.18.9.ebuild:
+  Patch happy 1.18.9 build for ghc 7.6.1
 
   14 Sep 2012; Alexander Vershilov <qnikst@gentoo.org> happy-1.18.2.ebuild,
   happy-1.18.4.ebuild, happy-1.18.6.ebuild, happy-1.18.9.ebuild:
diff --git a/dev-haskell/happy/Manifest b/dev-haskell/happy/Manifest
index 6686e7852f69..b00dfcfeaac5 100644
--- a/dev-haskell/happy/Manifest
+++ b/dev-haskell/happy/Manifest
@@ -1,5 +1,9 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX happy-1.18.6-man.patch 469 SHA256 7892274f9f0a8a0b884c4a80b852a7f41e43597efc3251613bdab36442dfd791 SHA512 1376e16e8c0bb6b9abca763bfbb8572d9640044a82aad951ff9d46dfb2436b6a95bded693696ab84e49fec1d259453444fcb36403db63d0c69f89a64bb3c4800 WHIRLPOOL 100abdf2fd341b7a3861305dc7d1608a9dca8819667579cb134a0f1e485f23501631cb1a7f9cc4c9b14b3b2a56ec22d837f8cdddb8e86f6b01a90ccf1446896c
 AUX happy-1.18.6-missing-tests.patch 4051 SHA256 ba9de7d686e05e070639303862869c70c08b6d1d4d6b89749fa972b86a4ada08 SHA512 f792fb513352ebf1f6634a0019de058ce91a57978b7e6dd6b4c94cc9d42dc09b51c23ea2bd6ad72b807d7dd64aa1b42348df217079216c2d5fc00f6750d381d8 WHIRLPOOL 4b58c08070e00c19f29271efcfd6b9b333b5b53296af89de1781ea6da3a9271553a5f2a75b5eaf762cab5f7010adebbac5cbf550260cb64d093cdd108653b980
+AUX happy-1.18.9-ghc-7.5.patch 792 SHA256 d1d3f5c04e4f7821095b286498f3eb636c920675f2d799a15f2e58641021b9cb SHA512 c0868648d4519d5107360398673e81158edabdfae3e38493bdc3472ad14ca91b4f981e4b92a31f8b43147e9579e487e009211d2eac02160f150b717bf3f08b23 WHIRLPOOL 274dfdad3875a45a99bf9058846a05663e2113a88d10d60c4b5d44fe002b1831b2ec23805a0780f2ee48fb8a3e18e1e81fc98e397b421b17d13eb19f74288b60
 AUX happy-1.18.9-missing-tests.patch 5952 SHA256 165240b4862df981d8f96018d43bb9c3c651369cf4c4824d08b0cbbfb616da2a SHA512 cf8a9d725218eb9a0bfd5ace8701e8a67eef4c75bfce88bcf77ffb22a78fae31e53e27105bdec0c5ef3fce8fab005f8526cd1bb2a9f7f92031c6550816170959 WHIRLPOOL 4e44c9fa68374fa33ed282d37513f578c6f01f2b3bb6f1bf850eb8b2b46fac5b6511678189b37ec103e9d8ac87f0d6e064cfb42850dcc11ed6f00db61c099263
 DIST happy-1.18.2.tar.gz 158782 SHA256 7515922f3cfd32cd844a0abfefe0b4871f403f0d869b8644bf9cbfc0b67996ae SHA512 f088ab9f7fb20a429e10141743fcce777063140c18bea8c2864a4723bcdfdb2fc2921ccb6bdb264de8231cd9e10ad1854b975d5fb72074eaa739603a3292f12e WHIRLPOOL 947c44065e5c7b71c551a3beb5d53285d7c593c8a2cb24a428fb0eaf3d139a08780a7ad8fd9066a085891ffd2f1e0942b00f49bc76b520d0ae90285c1a2bfd3f
 DIST happy-1.18.4.tar.gz 157585 SHA256 909bec4541a92d3765e74756f752514d2d03ec7a5d3e74c18268a57fe7ffa832 SHA512 36c56524445d28010b87ff4c024f2fd4b879f2f77154b03f8f178abfe69559519368fb62f567ee1f6f81b932a8db3f39a1b04476426a6f45bbc8bc00ce0272ef WHIRLPOOL 77bd25c64be831839876ceb90da5876b74947888c73273ab97e820826fe8cf7a3b7b12bd339998b568555e00a0328b146c010f8d5061ecd638a8965562bc2e14
@@ -9,6 +13,13 @@ DIST mtl-1.1.0.2.tar.gz 18901 SHA256 a225aaf2b1e337f40c31e5c42f95eec9a4608322b0e
 EBUILD happy-1.18.2.ebuild 953 SHA256 98ca33ad48280fc3a4f1810ac173aec3305248fb2d0ff9bdce8eff0dccbd1e64 SHA512 b6e7501fe13a3d5d60d2ec244babe389d877fd5319334d4ffb2941568717726f058671ef5a817d07e239620292d71422083e122bc5350d260709a531cc4019dc WHIRLPOOL 5647716a2de7765a4725ba29fa09d4e1315f180998e27d2aa1fb072faba8dd412cf2d94b4f768dda8084e8e166e64027f6a286fa9ee2535d188f7c1869e715ae
 EBUILD happy-1.18.4.ebuild 1707 SHA256 8381cd91311bf2e3458b9ab5ecfbd93529efd65ff6a692d73242bea055e9de1a SHA512 931afd409bf7335fdb811450586cad2b05611d5e56ed8e908745fead221c0b7dd6986d3a63b273f9ad6eb8d6c26ae16465be22967c3a129a916defbcd718a996 WHIRLPOOL 0abd18efb96ad6cefb97276714295696d68858e45cefd7daf19375517d8a9a4d773633dc1842ea53835566c0cb91e68e42e3de75073a6c7043ca0872fe5c597a
 EBUILD happy-1.18.6.ebuild 1362 SHA256 dc11167fbeb81448d0a8b4877e47521745ea0d8f6ef2abe7ba6cb6b18df68aec SHA512 10d4761c630dcb0238f544bf8ac0986ad5cade13cf9b8562f6c7ff036b4acf8278c816969e6330b183eaee9c99049e11946b0921f4a34ecc4f44d51807e68f0c WHIRLPOOL c8936d17c699f5e5e02b042b44d29e56fe74b64d0ca340746d7579ebe873c0cb9c598aca792d06a00a9f39b6065506931157ded06423278d606b707b8f1e27f6
-EBUILD happy-1.18.9.ebuild 1683 SHA256 f0f5f0db3f54887d9ec585836b6a650bc98e02f6d6f13ed6891180c7f37f33b8 SHA512 581c451065c4495c7a487900b26631330b96ab41fa134737c3e1068ba03a68af2c06197163f16fb500ab06f22d7257c73ceadea06fe72cce0f28404180014824 WHIRLPOOL bc0bc7c85955555dd5f78d46fee024736c3778dd93f210e131b4ff96e20a0032b2c89e3d37c852513672fe42933d375d48c8d31200daa870dc2d8bdad18a111e
-MISC ChangeLog 7409 SHA256 cfe8890c95d9fcc490a8f5aa8df356c939e00a886b1594d2ffb8209dedfbc8ef SHA512 efd718da105d9c1c6b6261c743649d72058d64d43eff753304149ae856fcd80a7e216808f39b652c68da0cd0ca93df137d24bb6981a7f36ae374f4d0aca67ca7 WHIRLPOOL 98f5f4aeb799d7dd16d3048729ed208985f122f709094ca82a515fea2f6e34fe3dedff8f3ba28c70006b6155a0842a15f9668f0a47f9f13d76891338d7160f83
+EBUILD happy-1.18.9.ebuild 2015 SHA256 b693f9e8f653a36630cd8436415210077cd992b070bc733832fc10e77a005a4b SHA512 87f76db74c57738eb3b4055a7fd12b7b4ec3f962301825b70937e036f47c3235bed313a1e35ab00d772aa58f14feaa3a70cea5643c1c41bd0aede116905aef97 WHIRLPOOL f355c65e3fa8d8a7fa82332d58252f9dbca9ab27f9cf633e746dcbca409d0883417427a7992c3acc41d87ccb9ccf92e2194c82ef3aa30c05def874df771002fa
+MISC ChangeLog 7556 SHA256 0ec2cba2916abbd0ef71dfa2225d04f8e532e31c6c66a130908c435602acea6f SHA512 7da1cee58af7183170da135d42f44139990ebbaf87650ce1c6af882bfcdc3a8f3e26289e3f0577ee6d7d05731e1aaec8e2752e26dcc0d2e02c8f48d96d0a0501 WHIRLPOOL 80a5423bf74e542664fb30807f75b90bc2017fb61ed40a66cd5140ff5bc3f35ecbc0723c791d9a7ae74d121e034f4b9e933b6fbe943c11fe4001ded45584a534
 MISC metadata.xml 307 SHA256 ce829be1fc42dd20b0fab8cfda883f3999b32dd93e237db97f5e099e5543828b SHA512 7542056774733c0525e655703f0955c80f5e43afdd34ca4b3154cb0dceb09981fe0ae60296bb198aa96b7f8b1d5edbf8ae65da550fd502733a73308d1306a1f5 WHIRLPOOL 746593885e41cd7b39950755c77b2eaba5a2d129cf891b0ab0a9f86f78a3b23d5304dcbd4523e9a9df171635ac59e2466084ec104ac0c2162c8d4e8dcf1a39ef
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAlBTKpIACgkQoBEVQmGOlx8zfAEAg2DEfWup9BTOP6wJt/ujv76c
+gYBT+3oivuxpUeWHeuIBAOEwoQoxddIl8dKRJMReopntF5RibxhAbqAWjOWEdJdE
+=0qUP
+-----END PGP SIGNATURE-----
diff --git a/dev-haskell/happy/files/happy-1.18.9-ghc-7.5.patch b/dev-haskell/happy/files/happy-1.18.9-ghc-7.5.patch
new file mode 100644
index 000000000000..7c71048b3627
--- /dev/null
+++ b/dev-haskell/happy/files/happy-1.18.9-ghc-7.5.patch
@@ -0,0 +1,20 @@
+--- happy-1.18.9-orig/Setup.lhs	2012-02-06 20:49:56.000000000 +1100
++++ happy-1.18.9/Setup.lhs	2012-06-25 08:55:56.283147498 +1000
+@@ -10,7 +10,7 @@
+ import Distribution.Simple.Program
+ 
+ import System.FilePath ((</>))
+-import System.IO.Error ( try )
++import System.IO.Error ( tryIOError )
+ import System.Directory (removeFile)
+ 
+ main :: IO ()
+@@ -50,7 +50,7 @@
+              [ cpp_template "GLR_Base.hs"       dst opts | (dst,opts) <- glr_base_templates ] ++
+              [ cpp_template "GLR_Lib.hs"        dst opts | (dst,opts) <- glr_templates ])
+ 
+-myPostClean _ _ _ _ = mapM_ (try . removeFile) all_template_files
++myPostClean _ _ _ _ = mapM_ (tryIOError . removeFile) all_template_files
+ 
+ myInstall pkg_descr lbi hooks flags =
+   instHook defaultUserHooks pkg_descr' lbi hooks flags
diff --git a/dev-haskell/happy/happy-1.18.9.ebuild b/dev-haskell/happy/happy-1.18.9.ebuild
index 4496ee163c54..289ad7a70502 100644
--- a/dev-haskell/happy/happy-1.18.9.ebuild
+++ b/dev-haskell/happy/happy-1.18.9.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/happy/happy-1.18.9.ebuild,v 1.7 2012/09/14 07:06:28 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/happy/happy-1.18.9.ebuild,v 1.8 2012/09/14 13:00:49 gienah Exp $
 
 # ebuild generated by hackport 0.2.9
 
 EAPI="4"
 
 CABAL_FEATURES="bin"
-inherit base haskell-cabal autotools
+inherit base eutils haskell-cabal autotools
 
 DESCRIPTION="Happy is a parser generator for Haskell"
 HOMEPAGE="http://www.haskell.org/happy/"
@@ -32,6 +32,14 @@ PATCHES=("${FILESDIR}/${PN}-1.18.6-man.patch"
 src_prepare() {
 	base_src_prepare
 
+	# ghc 7.5 removed System.IO.try and Control.OldException.
+	# Conditional patch is required, as it is to the file Setup.lhs, so can not
+	# use LANGUAGE: CPP, and ghc 6.10.4 and 6.12.3 do not have
+	# System.IO.Error.tryIOError.
+	if has_version ">=dev-lang/ghc-7.5"; then
+		epatch "${FILESDIR}/${PN}-1.18.9-ghc-7.5.patch"
+	fi
+
 	use doc && cd doc && eautoconf
 }