Fix build failure against ghc-7.4.

Package-Manager: portage-2.2.0_alpha101_p6/cvs/Linux x86_64

4 files changed, 35 insertions, 14 deletions

diff --git a/dev-haskell/drift/ChangeLog b/dev-haskell/drift/ChangeLog
index b1876f72192e..7aba2a8bdcba 100644
--- a/dev-haskell/drift/ChangeLog
+++ b/dev-haskell/drift/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-haskell/drift
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/drift/ChangeLog,v 1.26 2012/03/17 21:50:13 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/drift/ChangeLog,v 1.27 2012/05/13 09:37:20 slyfox Exp $
+
+  13 May 2012; Sergei Trofimovich <slyfox@gentoo.org>
+  +files/drift-2.2.3-ghc-7.4.patch, drift-2.2.3.ebuild:
+  Fix build failure against ghc-7.4.
 
   17 Mar 2012; Sergei Trofimovich <slyfox@gentoo.org> drift-2.2.3.ebuild:
   alpha/ia64/sparc stable (bug #399981).
diff --git a/dev-haskell/drift/Manifest b/dev-haskell/drift/Manifest
index 7d4253f993d2..9f5e6aca9477 100644
--- a/dev-haskell/drift/Manifest
+++ b/dev-haskell/drift/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX drift-2.2.3-ghc-7.4.patch 558 RMD160 57827750e4240b0d6134272971368dfa8373e0d6 SHA1 fa83f9b120d4ed12f4977b4540d884fe04f7561f SHA256 bc8e456184bf0024a13543d90ad258e3903e0b500473813ce7fd464d9865e3e0
 DIST DrIFT-2.2.0.tar.gz 252043 RMD160 74daea78e4d5c4371c3acfb41966e06c732476a6 SHA1 30f458933bda8322d3ce247323c476eb9852e4d5 SHA256 ae24a61a4ca2f81e9f033ce6cc08b2f5f5239de11c53aa677b3de62da4f97406
 DIST DrIFT-2.2.3.tar.gz 219321 RMD160 8cef34851f0dd9233b65f7a660a8fdec1d098630 SHA1 32da34ce9bd801ceb24f041824be6b61f1262baf SHA256 c5edb6e89e3a04aa7918acd2db37413ff80f945fdd1370f3614dc0d93e8913a9
 EBUILD drift-2.2.0.ebuild 844 RMD160 8fe81fd5d1252f5dae5b5f60b02225be8ca87447 SHA1 7ac6f48acc29e3eca36254ca01662c094a9a95ec SHA256 7bef40deccdfe806b600469cec890eb95c399cd05973aaebab923fa44d9d163d
-EBUILD drift-2.2.3.ebuild 854 RMD160 bf4b9c6ec0b207a8051e115b8ca9108908152612 SHA1 7622f5b62b16a20e1db0f85c6492ebe0c4ab0c30 SHA256 09051f2e4e34d2658295dd6f9481df38e28aa28d041f525a8a43400b0fba0741
-MISC ChangeLog 3032 RMD160 979fee8c463e9ab53c3ca1e610b92c4df3cc2a0d SHA1 bae0959e6a4168b57192f84e8df3f3913b84ff31 SHA256 62e153589f210d13cc7edd6a03ca78c558e94920bd6dcf10bf71e3a5b3b66630
+EBUILD drift-2.2.3.ebuild 880 RMD160 9827844f277981a5cc7ed14e7099dbb67c6c82e2 SHA1 05a0488f8ff18c67d5ecef305cb07c6689be83f2 SHA256 e50439b3c88e8c2b84675a9b68936535951cbfb5c686e8d083496622c7ec7d04
+MISC ChangeLog 3180 RMD160 f873f300b9fb19ec630b0bd5d30d6b5cfc5a96a1 SHA1 dcf0b6d4905db03dbea2a61f42110db8749c1759 SHA256 68a264444441fcc94f26fdb63afecedbd8d8b6d967b30ad9f16bbee98f14bdae
 MISC metadata.xml 285 RMD160 15988fa26c91d66e822368f192c0ab541dbf1853 SHA1 e2ab5e4901e7d4fd8ad32143b781d8942b4c3dd4 SHA256 7a662b130d6c54436af26de89f516ebb376b381a03cccd2b4e339b86f0d16f7c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk9lCDQACgkQcaHudmEf86r2IACdHhCBIgwkV7SKYQUoH2JC/rMw
-eegAniRi0vSrjupcOmauc+m6JQrj+yxt
-=nPb8
+iEUEARECAAYFAk+vggYACgkQcaHudmEf86pynwCYzbjkvnyy2QBud57ukk3D50Nq
+WQCdFY464fblcj6hSigNw8R55y0LhoU=
+=ainU
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/drift/drift-2.2.3.ebuild b/dev-haskell/drift/drift-2.2.3.ebuild
index 88a9bc860e14..bcd66c054dd3 100644
--- a/dev-haskell/drift/drift-2.2.3.ebuild
+++ b/dev-haskell/drift/drift-2.2.3.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/drift/drift-2.2.3.ebuild,v 1.6 2012/03/17 21:50:13 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/drift/drift-2.2.3.ebuild,v 1.7 2012/05/13 09:37:20 slyfox Exp $
 
-inherit ghc-package
+EAPI=4
+
+inherit base ghc-package
 
 MY_PN="DrIFT"
 MY_P="${MY_PN}-${PV}"
@@ -22,12 +24,13 @@ RDEPEND=""
 
 S="${WORKDIR}/${MY_P}"
 
-src_compile() {
-	econf --with-hc="$(ghc-getghc)" || die "configure failed"
-	# Makefile has no parallelism
-	emake -j1 || die "emake failed"
+PATCHES=("${FILESDIR}"/${PN}-2.2.3-ghc-7.4.patch)
+
+src_configure() {
+	econf --with-hc="$(ghc-getghc)" --with-hcflags="${HCFLAGS} -package haskell98 -hide-package base"
 }
 
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+src_compile() {
+	# Makefile has no parallelism
+	emake -j1
 }
diff --git a/dev-haskell/drift/files/drift-2.2.3-ghc-7.4.patch b/dev-haskell/drift/files/drift-2.2.3-ghc-7.4.patch
new file mode 100644
index 000000000000..a7c1f3b5f7ae
--- /dev/null
+++ b/dev-haskell/drift/files/drift-2.2.3-ghc-7.4.patch
@@ -0,0 +1,13 @@
+diff --git a/src/GenUtil.hs b/src/GenUtil.hs
+index 4855618..db416ed 100644
+--- a/src/GenUtil.hs
++++ b/src/GenUtil.hs
+@@ -482,7 +482,7 @@ overlaps :: Ord a => (a,a) -> (a,a) -> Bool
+ _ `overlaps` _ = True
+ 
+ -- | translate a number of seconds to a string representing the duration expressed.
+-showDuration :: Integral a => a -> String
++showDuration :: (Integral a, Show a) => a -> String
+ showDuration x = st "d" dayI ++ st "h" hourI ++ st "m" minI ++ show secI ++ "s" where
+         (dayI, hourI) = divMod hourI' 24
+         (hourI', minI) = divMod minI' 60