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

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

6 files changed, 65 insertions, 20 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/Manifest b/dev-haskell/fgl/Manifest
index 546ee0e16c84..c99b524b3a70 100644
--- a/dev-haskell/fgl/Manifest
+++ b/dev-haskell/fgl/Manifest
@@ -1,20 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
+AUX fgl-5.4.2.3-ghc-7.2.patch 420 RMD160 95a3cdbcc11083c11d79d23afff9b74c436564e5 SHA1 788fe0b5041b590cc1008a8f472f65252efd9438 SHA256 71eb3aaae9d71b5d0bb9bfb8b9db98e640804575e071aca484835c29204f9bd7
 DIST fgl-5.4.1.1.tar.gz 32815 RMD160 696139d5bb54b2e8c48d4fb6cea262e0faf83923 SHA1 d5ed4c881fe2d094a5e2942fa37c338c24c79e1c SHA256 19a903b821950d6213e5442622fabc416c5fbc7414af1e7227faeb819a03ac95
 DIST fgl-5.4.2.3.tar.gz 36357 RMD160 54b12f3d770c4a7594fa58fb5924d0d865228472 SHA1 d99530a6c550ed007f046bae3daeb9f3063b96aa SHA256 e72142b555a5ab6c5cdced317b42e8cafdbb54b7e2e46ed14e6ca18d71d486b8
+DIST fgl-5.4.2.4.tar.gz 36574 RMD160 e2b9e0d1d43e69b250719a34c6de9344b38264bf SHA1 1d9c318a23fa062bd9a7914c230bccc0785966dc SHA256 ce98ccb83e2d271a7b3266426a0762a0e902252f07ec09b7bef50c67d0110266
 EBUILD fgl-5.4.1.1.ebuild 722 RMD160 937d4d0a1a188435bfd313caf5a8d210e60238d4 SHA1 cf85d0b2f53a7e57a326e39d7d9e1071afc48d36 SHA256 dc153b5905a83a2b83cff9c5432c126140508fa231351be8a038604924482a8a
-EBUILD fgl-5.4.2.3.ebuild 711 RMD160 35014165bc95dc40005c6cfa1c96e5d8544c1cd2 SHA1 0ca26b955b69b168fa1fba575c3369fddcdead69 SHA256 fd96c89e232a2e04a90620fe29116f24e03e49159322e336a41414c22d3e93c0
-MISC ChangeLog 3946 RMD160 787ff9404c0ad1590bab5fa27331203229b54373 SHA1 b727f75fa7b86644a17bf424645ae0a68535bf28 SHA256 9e74eac10884baee1a742cd7f343d834c0c7af1ac78fcd88f3b71a2b6e724620
-MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508
+EBUILD fgl-5.4.2.3.ebuild 772 RMD160 b48e2233bf122fa4d43ac593362ba64eccd1b2d5 SHA1 07927a6a39aa64444a86fb25c9b24ea0ae2a86fb SHA256 3e4f17005301d2e024cd86ef1a43b9e1545000fc3f4b76205812cff6f5e502d1
+EBUILD fgl-5.4.2.4.ebuild 742 RMD160 a17b57ca2e0c3691a236882f2c72910cc7ca22bb SHA1 3d2a7c052995e535fab3c6d74d3af8570d5c0ada SHA256 f7abdd709b27c025d16928b5434eca8fbbb0e0e58a3d3a05c742781326e06e11
+MISC ChangeLog 4219 RMD160 4b55fbf4740e4f73a3e456c0094c78402e66b055 SHA1 bb7bc4633b96635237d779d7ba06e15cd072df6f SHA256 fbcb98ced5f39c729650efa17e85715f090c52905c13ed8d4f19be1b6b07c6d7
+MISC metadata.xml 311 RMD160 f7bb5084bc47cbaa2c000223ec7068eb93fff945 SHA1 38fa5946cc7e9c8c470651f34d3d7aadc2989cde SHA256 f3689f042c9eca8a81bbb44ee0bae22f55f97f8d5da8f3883f6f6435a40a067b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCgAGBQJO72ieAAoJEOTDgjZ80txdUyIH/jlRy68Xq8yX/3Y/FxjMt/D7
-je1lJyBw1lEi2cyLr67okeVw38cX3zSNyMmUZ+zlV50Z4jBkoQJaWT664Dj5XTyb
-5nlSyAlGQz9VI1ow69GfUJU0jlKGOgV8wBIpoea496bYGYkdwe+tVSwwrYGNzojJ
-Rbr2X2FpDAQMNtb3wZuD9OQLWOysq3FOYgJ+7kvvfaazMZT+5vUaYhrmXoWTu4CF
-tfJhGecmikB+ZeGiqUv0ho/t2CHekjIvsgQFeSnQBYwGT8m3nGnjwh/mFLdXkuwm
-oBKbDUJOfyKxa7BBbhPXFVWegpCOAJD+ryAFcSCB0zD9Ibf67HHAurFvC3zGXB4=
-=++ch
+iEYEARECAAYFAk+IdskACgkQcaHudmEf86q3GgCdE/0csi7WoZIfyrw+q1EA0YKH
+VKcAniv9HAEfzaiJBxvc8pPepiC+iQ85
+=UVcS
 -----END PGP SIGNATURE-----
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>