Fixed building against newer ghc (base==3.*). Addresses bug #296529.

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

diff --git a/dev-haskell/hdbc/ChangeLog b/dev-haskell/hdbc/ChangeLog
index a03d43761ef64c37a4061e088a7660282ebceeb6..a38930b80e8b14b1f51b719a5bee5171928fd43d 100644 (file)
--- a/dev-haskell/hdbc/ChangeLog
+++ b/dev-haskell/hdbc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-haskell/hdbc
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc/ChangeLog,v 1.11 2007/12/13 17:17:58 dcoutts Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc/ChangeLog,v 1.12 2010/07/11 21:21:59 slyfox Exp $
+
+  11 Jul 2010; Sergei Trofimovich <slyfox@gentoo.org> hdbc-1.1.3.ebuild:
+  Fixed building against newer ghc (bug #296529). Thanks to Diego E.
+  'Flameeyes' Pettenò <flameeyes@gentoo.org> and Emil Karlson
+  <jekarlson@gmail.com> for report and proposed fix.
 
 *hdbc-1.1.3 (13 Dec 2007)
 

diff --git a/dev-haskell/hdbc/Manifest b/dev-haskell/hdbc/Manifest
index 271d16faa9a655750dd41d30d16104ee675ee2b4..50065faa1501217c48baa26595bb4397bb9b6429 100644 (file)
--- a/dev-haskell/hdbc/Manifest
+++ b/dev-haskell/hdbc/Manifest
@@ -3,6 +3,6 @@ DIST hdbc_1.0.0.tar.gz 52179 RMD160 ae60ca444373f07ca63787c9f980264542a39131 SHA
 DIST hdbc_1.0.1.tar.gz 52565 RMD160 66324cde38d2f60b6ab9e64c87ce3a3597a6afd0 SHA1 78afa6b978131c69e1e310f88105170de0f42312 SHA256 bf4122d7482887f2c42bdab5d1af77b9393947f5d4aa2fdf3fd5078273b3b3fa
 EBUILD hdbc-1.0.0.ebuild 720 RMD160 97e4f435430c1d30deb7c8fd0432d509401b7dc8 SHA1 6ea4588226430715bf7acd5a39abee97dc188d7b SHA256 13fcdf4429074181f76f02da5f6657e6f251f5bdbf5932cff7e1c6861d7d2ff9
 EBUILD hdbc-1.0.1.ebuild 743 RMD160 db017be11edb56d08cc39e8f4da513289fc24eb2 SHA1 ec53bca07d2f58c40dc8863ac1d290ee2e2a716a SHA256 f942c204f94b23a24b5a06069643d7b57e7eb932451e418dd783d791570a64e1
-EBUILD hdbc-1.1.3.ebuild 1113 RMD160 78dd9c0a6280b60391e1b0d2ab647adbd2e09eab SHA1 ec7ecca27650597c0949b1800d5f925a5bf93ad7 SHA256 52f07f6c714de2b5dceb92501f27e4fbe0de210284248fc53a7760c89a14f095
-MISC ChangeLog 1591 RMD160 c21e4847baec6f3cf8afeeaaadba0760b75894d2 SHA1 dd2017aa5d21de3935e23080fcd56116a59728f8 SHA256 cea755137902843eda51b104fe345507499631737fdc0063e8b303aaa0de6553
+EBUILD hdbc-1.1.3.ebuild 1156 RMD160 c0aa9ca9c411a2bd6e412e5cb188977f15816feb SHA1 e819e5dfe78bcd7181534277e72e334d42206418 SHA256 2c573fe893203bcf93f72a6bf5c5ff0b6733b5cf7d8faa2d7d1229d30a434344
+MISC ChangeLog 1849 RMD160 065d7c20eeb729fd3a3cccaaab4e8dbd22dd1bc4 SHA1 1a41255293a11144a72e623ec928851bca787b41 SHA256 7fa50b9e7f2fc3b91e1b5c8e727b812744456d8ab6cef8ece00e0e4d7073110d
 MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508

diff --git a/dev-haskell/hdbc/hdbc-1.1.3.ebuild b/dev-haskell/hdbc/hdbc-1.1.3.ebuild
index 43f531037ef038bb05d9c502985cb4eb13944a38..155340c38f860c312f0fabc758161ff0853d4465 100644 (file)
--- a/dev-haskell/hdbc/hdbc-1.1.3.ebuild
+++ b/dev-haskell/hdbc/hdbc-1.1.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc/hdbc-1.1.3.ebuild,v 1.1 2007/12/13 17:17:58 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc/hdbc-1.1.3.ebuild,v 1.2 2010/07/11 21:21:59 slyfox Exp $
 
 CABAL_FEATURES="lib profile haddock"
 inherit haskell-cabal versionator
@@ -38,3 +38,5 @@ src_unpack() {
                echo "GHC-Options: -fglasgow-exts" >> "${S}/HDBC.cabal"
        fi
 }
+
+CABAL_CONFIGURE_FLAGS="--constraint=base<4"
\ No newline at end of file