Version bump. Fix older stable to be buildable by ghc-7.2+ (bug #411877 by Leonid Podolny).

(Portage version: 2.2.0_alpha96_p5/cvs/Linux x86_64)

5 files changed, 55 insertions, 9 deletions

diff --git a/dev-haskell/fgl/ChangeLog b/dev-haskell/fgl/ChangeLog
index ad50d3c21825..5e2c0d19ef5a 100644
--- a/dev-haskell/fgl/ChangeLog
+++ b/dev-haskell/fgl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-haskell/fgl
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/fgl/ChangeLog,v 1.36 2011/12/19 16:38:35 ago Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/fgl/ChangeLog,v 1.37 2012/04/13 18:51:03 slyfox Exp $
+
+*fgl-5.4.2.4 (13 Apr 2012)
+
+  13 Apr 2012; Sergei Trofimovich <slyfox@gentoo.org> +fgl-5.4.2.4.ebuild,
+  +files/fgl-5.4.2.3-ghc-7.2.patch, fgl-5.4.2.3.ebuild, metadata.xml:
+  Version bump. Fix older stable to be buildable by ghc-7.2+ (bug #411877 by
+  Leonid Podolny).
 
   19 Dec 2011; Agostino Sarubbo <ago@gentoo.org> fgl-5.4.2.3.ebuild:
   Stable for AMD64, wrt bug #393837
diff --git a/dev-haskell/fgl/fgl-5.4.2.3.ebuild b/dev-haskell/fgl/fgl-5.4.2.3.ebuild
index 56069291f901..7ec251b12fa8 100644
--- a/dev-haskell/fgl/fgl-5.4.2.3.ebuild
+++ b/dev-haskell/fgl/fgl-5.4.2.3.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/fgl/fgl-5.4.2.3.ebuild,v 1.4 2011/12/19 16:38:35 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/fgl/fgl-5.4.2.3.ebuild,v 1.5 2012/04/13 18:51:03 slyfox Exp $
 
 # ebuild generated by hackport 0.2.13
 
 EAPI="3"
 
 CABAL_FEATURES="lib profile haddock hscolour"
-inherit haskell-cabal
+inherit base haskell-cabal
 
 DESCRIPTION="Martin Erwig's Functional Graph Library"
 HOMEPAGE="http://web.engr.oregonstate.edu/~erwig/fgl/haskell"
@@ -22,3 +22,5 @@ RDEPEND="dev-haskell/mtl
 		>=dev-lang/ghc-6.8.2"
 DEPEND="${RDEPEND}
 		dev-haskell/cabal"
+
+PATCHES=("${FILESDIR}/${PN}-5.4.2.3-ghc-7.2.patch")
diff --git a/dev-haskell/fgl/fgl-5.4.2.4.ebuild b/dev-haskell/fgl/fgl-5.4.2.4.ebuild
new file mode 100644
index 000000000000..f67050a83fd9
--- /dev/null
+++ b/dev-haskell/fgl/fgl-5.4.2.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/fgl/fgl-5.4.2.4.ebuild,v 1.1 2012/04/13 18:51:03 slyfox Exp $
+
+# ebuild generated by hackport 0.2.17.9999
+
+EAPI=4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Martin Erwig's Functional Graph Library"
+HOMEPAGE="http://web.engr.oregonstate.edu/~erwig/fgl/haskell"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="dev-haskell/mtl[profile?]
+		>=dev-lang/ghc-6.8.2"
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/fgl/files/fgl-5.4.2.3-ghc-7.2.patch b/dev-haskell/fgl/files/fgl-5.4.2.3-ghc-7.2.patch
new file mode 100644
index 000000000000..036e749acc16
--- /dev/null
+++ b/dev-haskell/fgl/files/fgl-5.4.2.3-ghc-7.2.patch
@@ -0,0 +1,10 @@
+diff --git a/Data/Graph/Inductive/PatriciaTree.hs b/Data/Graph/Inductive/PatriciaTree.hs
+index 2e68d86..c465259 100644
+--- a/Data/Graph/Inductive/PatriciaTree.hs
++++ b/Data/Graph/Inductive/PatriciaTree.hs
+@@ -1,4 +1,5 @@
+ {-# LANGUAGE ScopedTypeVariables #-}
++{-# LANGUAGE BangPatterns #-}
+ 
+ -- |An efficient implementation of 'Data.Graph.Inductive.Graph.Graph'
+ -- using big-endian patricia tree (i.e. "Data.IntMap").
diff --git a/dev-haskell/fgl/metadata.xml b/dev-haskell/fgl/metadata.xml
index 8c66906af531..d7b73a20c267 100644
--- a/dev-haskell/fgl/metadata.xml
+++ b/dev-haskell/fgl/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>haskell</herd>
-<maintainer>
-  <email>haskell@gentoo.org</email>
-</maintainer>
+	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		Martin Erwig&#39;s Functional Graph Library
+	</longdescription>
 </pkgmetadata>