Fixed bug #278897 (build failure on ghc-6.10+)

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

diff --git a/dev-haskell/hsql-mysql/ChangeLog b/dev-haskell/hsql-mysql/ChangeLog
index 406eb1b4a9cade2a6ef6a1db71a1cfa4d06ce277..47f22ddacb3efc294ab7b13d602b7601a6110048 100644 (file)
--- a/dev-haskell/hsql-mysql/ChangeLog
+++ b/dev-haskell/hsql-mysql/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-haskell/hsql-mysql
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-mysql/ChangeLog,v 1.9 2009/08/05 18:10:26 kolmodin Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-mysql/ChangeLog,v 1.10 2010/07/12 15:47:40 slyfox Exp $
+
+  12 Jul 2010; Sergei Trofimovich <slyfox@gentoo.org> hsql-mysql-1.7.ebuild,
+  hsql-mysql-1.7.1.ebuild:
+  Fixed bug #278897 (build failure on ghc-6.10+). Thanks to Nikolay Orlyuk
+  <virkony@gmail.com> for the report and fix.
 
 *hsql-mysql-1.7.1 (05 Aug 2009)
 

diff --git a/dev-haskell/hsql-mysql/hsql-mysql-1.7.1.ebuild b/dev-haskell/hsql-mysql/hsql-mysql-1.7.1.ebuild
index 511ccb20c215e3f33a58bd8635bc6e8bc6b184aa..5805d7dda3c523c72883232457b1576f4587b6de 100644 (file)
--- a/dev-haskell/hsql-mysql/hsql-mysql-1.7.1.ebuild
+++ b/dev-haskell/hsql-mysql/hsql-mysql-1.7.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 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/hsql-mysql/hsql-mysql-1.7.1.ebuild,v 1.1 2009/08/05 18:10:26 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-mysql/hsql-mysql-1.7.1.ebuild,v 1.2 2010/07/12 15:47:40 slyfox Exp $
 
 CABAL_FEATURES="lib profile haddock"
 inherit haskell-cabal
@@ -11,7 +11,7 @@ SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.6.1

diff --git a/dev-haskell/hsql-mysql/hsql-mysql-1.7.ebuild b/dev-haskell/hsql-mysql/hsql-mysql-1.7.ebuild
index f109b222710e896379a0d7739f7db90cb6e894c8..7819660fc3ada027fa2533ae9fae142269e70127 100644 (file)
--- a/dev-haskell/hsql-mysql/hsql-mysql-1.7.ebuild
+++ b/dev-haskell/hsql-mysql/hsql-mysql-1.7.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/hsql-mysql/hsql-mysql-1.7.ebuild,v 1.8 2007/12/13 05:42:21 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-mysql/hsql-mysql-1.7.ebuild,v 1.9 2010/07/12 15:47:40 slyfox Exp $
 
 CABAL_FEATURES="lib haddock"
 inherit haskell-cabal versionator
@@ -18,8 +18,10 @@ DEPEND=">=dev-lang/ghc-6.4.1
        ~dev-haskell/hsql-${PV}
        >=virtual/mysql-4.0"
 
+CABAL_CONFIGURE_FLAGS="--constraint=base<4"
+
 src_unpack() {
-       unpack "${A}"
+       unpack ${A}
 
        cabal-mksetup
        sed -i '/cc-options:/d' "${S}/${PN}.cabal"

diff --git a/dev-haskell/hsql-odbc/ChangeLog b/dev-haskell/hsql-odbc/ChangeLog
index d8f4d68da5f576d5a221d3a9b0ad8d50c9e5f737..fb4b5048c5355b90ea9db0192459b31361357219 100644 (file)
--- a/dev-haskell/hsql-odbc/ChangeLog
+++ b/dev-haskell/hsql-odbc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-haskell/hsql-odbc
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-odbc/ChangeLog,v 1.8 2007/12/13 05:43:36 dcoutts Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-odbc/ChangeLog,v 1.9 2010/07/12 15:48:39 slyfox Exp $
+
+  12 Jul 2010; Sergei Trofimovich <slyfox@gentoo.org> hsql-odbc-1.7.ebuild:
+  Fixed bug #278897 (build failure on ghc-6.10+). Thanks to Nikolay Orlyuk
+  <virkony@gmail.com> for the report and fix.
 
   13 Dec 2007; Duncan Coutts <dcoutts@gentoo.org> hsql-odbc-1.7.ebuild:
   Updates for upward compatability with cabal-1.2 and ghc-6.8

diff --git a/dev-haskell/hsql-odbc/hsql-odbc-1.7.ebuild b/dev-haskell/hsql-odbc/hsql-odbc-1.7.ebuild
index 42c5b69c59c8315b056a9efc0c4e2e41fe465e9c..4919ed2bd2b1eb38561b67b35f0d80eb6fe52ae3 100644 (file)
--- a/dev-haskell/hsql-odbc/hsql-odbc-1.7.ebuild
+++ b/dev-haskell/hsql-odbc/hsql-odbc-1.7.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/hsql-odbc/hsql-odbc-1.7.ebuild,v 1.7 2007/12/13 05:43:36 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-odbc/hsql-odbc-1.7.ebuild,v 1.8 2010/07/12 15:48:39 slyfox Exp $
 
 CABAL_FEATURES="lib haddock"
 inherit haskell-cabal versionator
@@ -18,8 +18,10 @@ DEPEND=">=dev-lang/ghc-6.4.1
        ~dev-haskell/hsql-${PV}
        >=dev-db/unixODBC-2.2"
 
+CABAL_CONFIGURE_FLAGS="--constraint=base<4"
+
 src_unpack() {
-       unpack "${A}"
+       unpack ${A}
 
        cabal-mksetup
        sed -i -e  '/cc-options:/d' "${S}/${PN}.cabal"

diff --git a/dev-haskell/hsql-postgresql/ChangeLog b/dev-haskell/hsql-postgresql/ChangeLog
index eb99c2e7a93e88606f6af4de5ffd77c325aecb2b..12aa583042fcffbfdb21d2291032c1ab7fee985f 100644 (file)
--- a/dev-haskell/hsql-postgresql/ChangeLog
+++ b/dev-haskell/hsql-postgresql/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-haskell/hsql-postgresql
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-postgresql/ChangeLog,v 1.11 2010/06/17 18:22:48 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-postgresql/ChangeLog,v 1.12 2010/07/12 15:49:30 slyfox Exp $
+
+  12 Jul 2010; Sergei Trofimovich <slyfox@gentoo.org>
+  hsql-postgresql-1.7.ebuild:
+  Fixed bug #278897 (build failure on ghc-6.10+). Thanks to Nikolay Orlyuk
+  <virkony@gmail.com> for the report and fix.
 
   17 Jun 2010; Patrick Lauer <patrick@gentoo.org>
   hsql-postgresql-1.7.ebuild, hsql-postgresql-1.7.3.ebuild:

diff --git a/dev-haskell/hsql-postgresql/hsql-postgresql-1.7.3.ebuild b/dev-haskell/hsql-postgresql/hsql-postgresql-1.7.3.ebuild
index e8efbb60b59bb51e820c330c99c3ba46016340cb..d819637904be0e6de7a390cbc92036c7012736a7 100644 (file)
--- a/dev-haskell/hsql-postgresql/hsql-postgresql-1.7.3.ebuild
+++ b/dev-haskell/hsql-postgresql/hsql-postgresql-1.7.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-postgresql/hsql-postgresql-1.7.3.ebuild,v 1.2 2010/06/17 18:22:48 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-postgresql/hsql-postgresql-1.7.3.ebuild,v 1.3 2010/07/12 15:49:30 slyfox Exp $
 
 CABAL_FEATURES="lib profile haddock"
 inherit base haskell-cabal versionator
@@ -11,7 +11,7 @@ SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.6.1

diff --git a/dev-haskell/hsql-postgresql/hsql-postgresql-1.7.ebuild b/dev-haskell/hsql-postgresql/hsql-postgresql-1.7.ebuild
index 89028e81374c3188511efcc2bcfbf5e9c3a3f3f8..f457c1c4bfa8465a45972cc3592457f1b37063d9 100644 (file)
--- a/dev-haskell/hsql-postgresql/hsql-postgresql-1.7.ebuild
+++ b/dev-haskell/hsql-postgresql/hsql-postgresql-1.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-postgresql/hsql-postgresql-1.7.ebuild,v 1.9 2010/06/17 18:22:48 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-postgresql/hsql-postgresql-1.7.ebuild,v 1.10 2010/07/12 15:49:30 slyfox Exp $
 
 CABAL_FEATURES="lib haddock"
 inherit haskell-cabal versionator
@@ -18,8 +18,10 @@ DEPEND=">=dev-lang/ghc-6.4.1
        ~dev-haskell/hsql-${PV}
        dev-db/postgresql-base"
 
+CABAL_CONFIGURE_FLAGS="--constraint=base<4"
+
 src_unpack() {
-       unpack "${A}"
+       unpack ${A}
 
        cabal-mksetup
        echo >> "${S}/${PN}.cabal"

diff --git a/dev-haskell/hsql-sqlite/ChangeLog b/dev-haskell/hsql-sqlite/ChangeLog
index 5b01c3ef04f0011b55de5149c3877786aaa3bfa5..9a4cb49072a7e2352f13e1b7531b28f68f8f3f8a 100644 (file)
--- a/dev-haskell/hsql-sqlite/ChangeLog
+++ b/dev-haskell/hsql-sqlite/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-haskell/hsql-sqlite
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-sqlite/ChangeLog,v 1.9 2007/12/13 05:43:11 dcoutts Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-sqlite/ChangeLog,v 1.10 2010/07/12 15:50:22 slyfox Exp $
+
+  12 Jul 2010; Sergei Trofimovich <slyfox@gentoo.org>
+  hsql-sqlite-1.7.ebuild:
+  Fixed bug #278897 (build failure on ghc-6.10+). Thanks to Nikolay Orlyuk
+  <virkony@gmail.com> for the report and fix.
 
   13 Dec 2007; Duncan Coutts <dcoutts@gentoo.org> hsql-sqlite-1.7.ebuild:
   Updates for upward compatability with cabal-1.2 and ghc-6.8

diff --git a/dev-haskell/hsql-sqlite/hsql-sqlite-1.7.ebuild b/dev-haskell/hsql-sqlite/hsql-sqlite-1.7.ebuild
index bbef73e9280157188f84f28372133e844f3a3f98..092df92beca490251341902b763e1f9e1cfa324b 100644 (file)
--- a/dev-haskell/hsql-sqlite/hsql-sqlite-1.7.ebuild
+++ b/dev-haskell/hsql-sqlite/hsql-sqlite-1.7.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/hsql-sqlite/hsql-sqlite-1.7.ebuild,v 1.7 2007/12/13 05:43:11 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-sqlite/hsql-sqlite-1.7.ebuild,v 1.8 2010/07/12 15:50:22 slyfox Exp $
 
 CABAL_FEATURES="lib haddock"
 inherit haskell-cabal
@@ -23,8 +23,10 @@ DEPEND=">=dev-lang/ghc-6.4.1
 
 S="${WORKDIR}/${MY_P}"
 
+CABAL_CONFIGURE_FLAGS="--constraint=base<4"
+
 src_unpack() {
-       unpack "${A}"
+       unpack ${A}
 
        cabal-mksetup
        echo 'extra-libraries: sqlite3' >> "${S}/hsql-sqlite3.cabal"

diff --git a/dev-haskell/hsql/ChangeLog b/dev-haskell/hsql/ChangeLog
index 2857e82597a79134b3ab982b58697f47342421e5..aa96c585a68a37a55c87b54bc8d190fb3d4cf19b 100644 (file)
--- a/dev-haskell/hsql/ChangeLog
+++ b/dev-haskell/hsql/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-haskell/hsql
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql/ChangeLog,v 1.12 2009/08/05 18:07:58 kolmodin Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql/ChangeLog,v 1.13 2010/07/12 15:46:39 slyfox Exp $
+
+  12 Jul 2010; Sergei Trofimovich <slyfox@gentoo.org> hsql-1.7.ebuild,
+  hsql-1.7.1.ebuild:
+  Fixed bug #278897 (build failure on ghc-6.10+). Thanks to Nikolay Orlyuk
+  <virkony@gmail.com> for the report and fix.
 
 *hsql-1.7.1 (05 Aug 2009)
 

diff --git a/dev-haskell/hsql/hsql-1.7.1.ebuild b/dev-haskell/hsql/hsql-1.7.1.ebuild
index afb98a65584ccf9599f6fda896954bae0ca6ca75..5126374bc3b7c3dee51493bb01330124e064660d 100644 (file)
--- a/dev-haskell/hsql/hsql-1.7.1.ebuild
+++ b/dev-haskell/hsql/hsql-1.7.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 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/hsql/hsql-1.7.1.ebuild,v 1.1 2009/08/05 18:07:58 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql/hsql-1.7.1.ebuild,v 1.2 2010/07/12 15:46:39 slyfox Exp $
 
 CABAL_FEATURES="lib profile haddock"
 inherit haskell-cabal
@@ -11,7 +11,7 @@ SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.6.1"

diff --git a/dev-haskell/hsql/hsql-1.7.ebuild b/dev-haskell/hsql/hsql-1.7.ebuild
index f7bbf185878a6dc6a2b8d0b6b17e163ec4617f01..05560b63a0e3f8f01d779b1c6aedf2fa6e965c7c 100644 (file)
--- a/dev-haskell/hsql/hsql-1.7.ebuild
+++ b/dev-haskell/hsql/hsql-1.7.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/hsql/hsql-1.7.ebuild,v 1.11 2007/12/13 05:41:55 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql/hsql-1.7.ebuild,v 1.12 2010/07/12 15:46:39 slyfox Exp $
 
 CABAL_FEATURES="lib haddock"
 inherit eutils haskell-cabal versionator
@@ -16,8 +16,10 @@ IUSE=""
 
 DEPEND=">=dev-lang/ghc-6.4.1"
 
+CABAL_CONFIGURE_FLAGS="--constraint=base<4"
+
 src_unpack() {
-       unpack "${A}"
+       unpack ${A}
 
        cd "${S}"
        epatch "${FILESDIR}/${P}-sqltext-to-int.patch"