Bump missingh to 1.2.0.2, patched for ghc 6.12, ghc 7.7.20130927 development snapshot, and hopefully ghc 7.8.1 when it is released

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

4 files changed, 114 insertions, 5 deletions

diff --git a/dev-haskell/missingh/ChangeLog b/dev-haskell/missingh/ChangeLog
index a97c9b518d7e..008f70f2f603 100644
--- a/dev-haskell/missingh/ChangeLog
+++ b/dev-haskell/missingh/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-haskell/missingh
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/missingh/ChangeLog,v 1.28 2013/07/27 21:16:54 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/missingh/ChangeLog,v 1.29 2013/09/28 02:45:40 gienah Exp $
+
+*missingh-1.2.0.2 (28 Sep 2013)
+
+  28 Sep 2013; Mark Wright <gienah@gentoo.org>
+  +files/missingh-1.2.0.2-ghc-7.7.patch, +missingh-1.2.0.2.ebuild:
+  Bump missingh to 1.2.0.2, patched for ghc 6.12, ghc 7.7.20130927 development
+  snapshot, and hopefully ghc 7.8.1 when it is released
 
   27 Jul 2013; Sergei Trofimovich <slyfox@gentoo.org> missingh-1.2.0.0.ebuild:
   Allow dev-haskell/quickcheck:2 in tests as well.
diff --git a/dev-haskell/missingh/Manifest b/dev-haskell/missingh/Manifest
index edb4a3a7a6ac..021423d209de 100644
--- a/dev-haskell/missingh/Manifest
+++ b/dev-haskell/missingh/Manifest
@@ -1,14 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX missingh-1.2.0.2-ghc-7.7.patch 1713 SHA256 383d248ea2f8e6b81063752a4ac9e6b996fed6ae2300d6d2c7ac972fffaaf606 SHA512 a34f0a449a77b4e08e9198c5b58965bfdd3acf2e72fbea2ff8a6b0370254ce6f61cc5d012a2abcf33cba3d884a01b614ff96a69065ada0599fdd7613c100b613 WHIRLPOOL e74e67881474416224292fd8b586d199213d8b9f4c16501e359ec9c06ad3f55e817364e55015966c627c5d553bc8649d09fe59828d5885bb2bf08ae990e17dec
 DIST MissingH-1.2.0.0.tar.gz 115761 SHA256 a15a7c33ecea71c729de8ac11c430a77c115df2c39776d57ee11d47d850c0f2f SHA512 03b7c1747c69e67f1e9665ecb38cac397f00ac640120602862e2227b8d6c7fa002fcfc9f5a70b355e959a3783925bcad8f1039d061aedb6216d174fa351997bd WHIRLPOOL 27e696cea7e2c53ec2027e2edc784d5d52f25f43201c53172c339865e128530808c68e57a177dbbfab7a79d77f98c3119de11d1bd96efcbd0a68a1246d602873
+DIST MissingH-1.2.0.2.tar.gz 115774 SHA256 d61226c66c697c45392f63436ce2d27c722467e35ffee046610002df907239f3 SHA512 148146468688d855af988874b28ec3e3ebafb99b8168d50734294ecc5400c832826e11c9714727f83381979f8f8a7c6e7bf6479e582e484ec0abcb741d22a0a9 WHIRLPOOL f66e96b25d34a8aafc4cf3982d6fe8cc638f770a52c7436e221adf59cbbd96ef1ce9dae3e1b810e564d2945124ecc4f4c544054229239462aa92785423f8901c
 EBUILD missingh-1.2.0.0.ebuild 2020 SHA256 de77dbf698990dc500a9cb1dab99e55c54c201b7d86deff3d941745fb1a5108e SHA512 b7762171656c34053860506b1c3005ee7c6e274d753dc7865e7be717c04ed8099abb6e15cfa49d11d10ae99f097033b7d3405728dbfbd6aab4a43ea165ffcb6a WHIRLPOOL 4f01cbaa395859b43e4950d8f2f0b57744b6c3014743fbdf0ea143677fb82beef348f4f1078d528b13c25acdf97ee744a9cfdd717541dbd439437513f880c405
-MISC ChangeLog 4020 SHA256 a3a9c2910932574ec0a3a414dde291a0e10f0784d476450a244b7bf3776c8ffb SHA512 76dde0883a482d5e7c48718dc5db3997c54ba06b376a230e6fee91df2d40734905e5959641fd737df7fd3e8f57bab17e6c24b313c03585effd42de83ed00ff1a WHIRLPOOL f964a5261caedaea8c78920f18cc9cd0fafc908358488db4d6ed3793be9ecb5ef291b329819ee9d2e3a5486f8ba0e1a718f064acd80a499ce86a5039a2408eb4
+EBUILD missingh-1.2.0.2.ebuild 1458 SHA256 7b5a351d60428c3bae29664de066c0e0782adeaacee61db46d1b8826b5a3ca7a SHA512 671fb0a3a250c621243fd3cecc5870ee23be572a1268e2486ce238d3502a26c8e1355e1e52e858058d8c2a425860158c753557d4a02ba34e3806d26a8121e97d WHIRLPOOL 2829ae6e2f78dd3a6b4d36e6892dd4020131d51dfa2640690fb25171112796fc11c98526f71b90ff058751f342ba5167c74af97f3ed476342c06a38967899030
+MISC ChangeLog 4303 SHA256 9231c8edccb3f6ada7789e0be1fc92a9a13eda4b6b5ea3e310dea921c4b3c8f0 SHA512 25d27d0e6ec549d23fa35c5f64671696de1efda87ce88403c77d557981badc67a84ba4a8c34b93e58baabbd5055b7a42d34ef4d2d5aee2f18cbaf042eee9284d WHIRLPOOL 98f046c1cde3a2920473517441106e4011807572447fec05031d82b5244903fc2195c33c228fc0329ef3082cc634836a738d4c7a41248ebf941c21f4aeff276e
 MISC metadata.xml 231 SHA256 b1bacb51e08eb7f067d6a30020b5c45e4f4e48b5ec4640402ecaa34b78e2ae34 SHA512 22e25963ad8954ee117efcd37bb2bb9cd0cd8e24a801509b93c320e36ff5feb4b192b61c4a4c8132822651e125a37058cf51efe661229af11159313831a09554 WHIRLPOOL 6ce3a763671d06fe156b4a57eb66b1d888bf33cfd29826884b3d34c724a300dcfd0a527217e0525c3f7806a07e7fdee85289ac3ef202234298f630845803c194
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlH0OB8ACgkQcaHudmEf86pFRQCeJbDeZLQB+LflRmMgA7xGSKcL
-f64An2GCI4pKLUG323pH4znBzrb3ole0
-=6bx8
+iF4EAREIAAYFAlJGQigACgkQoBEVQmGOlx9Z+wD/a6O0DJLig991ocXAaVHFBiwx
+qXJskQk9Rbv0YOj+pQ4BAMhBgbDgc2MpYmt5pnkf+gi0hEd7mIn69o+9/+mBCrzb
+=R6TX
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/missingh/files/missingh-1.2.0.2-ghc-7.7.patch b/dev-haskell/missingh/files/missingh-1.2.0.2-ghc-7.7.patch
new file mode 100644
index 000000000000..0b249462fa51
--- /dev/null
+++ b/dev-haskell/missingh/files/missingh-1.2.0.2-ghc-7.7.patch
@@ -0,0 +1,47 @@
+--- MissingH-1.2.0.2-orig/src/System/Cmd/Utils.hs	2013-08-22 00:35:27.000000000 +1000
++++ MissingH-1.2.0.2/src/System/Cmd/Utils.hs	2013-09-28 01:17:29.697333968 +1000
+@@ -325,7 +325,11 @@
+                 Just (Exited (ExitSuccess)) -> return ()
+                 Just (Exited (ExitFailure fc)) ->
+                     cmdfailed funcname fp args fc
++#if (__GLASGOW_HASKELL__ >= 707)
++                Just (Terminated sig _) ->
++#else
+                 Just (Terminated sig) ->
++#endif
+                     warnfail fp args $ "Terminated by signal " ++ show sig
+                 Just (Stopped sig) ->
+                     warnfail fp args $ "Stopped by signal " ++ show sig
+@@ -351,7 +355,11 @@
+        case ec of
+             Exited ExitSuccess -> return ()
+             Exited (ExitFailure fc) -> cmdfailed "safeSystem" command args fc
++#if (__GLASGOW_HASKELL__ >= 707)
++            Terminated s _ -> cmdsignalled "safeSystem" command args s
++#else
+             Terminated s -> cmdsignalled "safeSystem" command args s
++#endif
+             Stopped s -> cmdsignalled "safeSystem" command args s
+ #endif
+ 
+--- MissingH-1.2.0.2-orig/testsrc/Eithertest.hs	2013-08-22 00:35:27.000000000 +1000
++++ MissingH-1.2.0.2/testsrc/Eithertest.hs	2013-09-28 01:19:32.177332800 +1000
+@@ -6,6 +6,7 @@
+ For license and copyright information, see the file LICENSE
+ 
+ -}
++{-# LANGUAGE CPP #-}
+ 
+ module Eithertest(tests) where
+ import Test.HUnit
+@@ -13,8 +14,10 @@
+ import Test.HUnit.Tools
+ import Control.Exception
+ 
++#if (__GLASGOW_HASKELL__ < 707)
+ instance Eq ErrorCall where
+     (ErrorCall x) == (ErrorCall y) = x == y
++#endif
+ 
+ test_maybeToEither =
+     let f msg inp exp = TestLabel msg $ TestCase $ assertEqual "" exp inp in
diff --git a/dev-haskell/missingh/missingh-1.2.0.2.ebuild b/dev-haskell/missingh/missingh-1.2.0.2.ebuild
new file mode 100644
index 000000000000..1b8e4256e7c3
--- /dev/null
+++ b/dev-haskell/missingh/missingh-1.2.0.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/missingh/missingh-1.2.0.2.ebuild,v 1.1 2013/09/28 02:45:39 gienah Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.3.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit base haskell-cabal
+
+MY_PN="MissingH"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Large utility library"
+HOMEPAGE="http://software.complete.org/missingh"
+SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~sparc ~x86 ~amd64-linux"
+IUSE=""
+
+RDEPEND="dev-haskell/hslogger:=[profile?]
+	dev-haskell/hunit:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	dev-haskell/network:=[profile?]
+	dev-haskell/parsec:=[profile?]
+	dev-haskell/random:=[profile?]
+	dev-haskell/regex-compat:=[profile?]
+	>=dev-lang/ghc-6.12.1:=
+"
+DEPEND="${RDEPEND}
+	virtual/libiconv
+	>=dev-haskell/cabal-1.8.0.2
+	test? ( dev-haskell/quickcheck
+		dev-haskell/testpack )
+"
+
+# libiconv is needed for the trick below to make it compile with ghc-6.12
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=("${FILESDIR}/${PN}-1.2.0.2-ghc-7.7.patch")
+
+src_prepare() {
+	base_src_prepare
+	# (non-ASCII non-UTF-8 source breaks hscolour)
+	cd src/System/Time
+	mv ParseDate.hs ParseDate.hs.ISO-8859-1
+	iconv -f ISO-8859-1 -t UTF-8 -c ParseDate.hs.ISO-8859-1 > ParseDate.hs || die "unable to recode ParseDate.hs to UTF-8"
+}