[gentoo-commits] repo/gentoo:master commit in: dev-haskell/hsql/, dev-haskell/hsql/files/

[gentoo-commits] repo/gentoo:master commit in: dev-haskell/hsql/, dev-haskell/hsql/files/

[Sergei Trofimovich]

commit:     a675fc2715da06ea817bbcc51afb03fb4adb3710
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Nov  9 19:45:50 2015 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Nov  9 19:46:05 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a675fc27

dev-haskell/hsql: drop old

Package-Manager: portage-2.2.24

 dev-haskell/hsql/Manifest                       |  1 -
 dev-haskell/hsql/files/hsql-1.8.1-ghc-7.4.patch | 13 ---------
 dev-haskell/hsql/hsql-1.8.1.ebuild              | 36 -------------------------
 3 files changed, 50 deletions(-)

diff --git a/dev-haskell/hsql/Manifest b/dev-haskell/hsql/Manifest
index 59c3bc6..4163d08 100644
--- a/dev-haskell/hsql/Manifest
+++ b/dev-haskell/hsql/Manifest
@@ -1,2 +1 @@
-DIST hsql-1.8.1.tar.gz 9365 SHA256 bff33ef9109a9e27333f239bb999f224192da5a1a91a78a0bf3ba1b514107dc9 SHA512 3f174a9684bb7ce78a9ba66d15be584fb312bc2fb95b67b1005a3e6fbc48816428e6ab6bbc2ada6ce1094fbd20b9f0553e70463f0e406b252fccff5c3829c475 WHIRLPOOL d33ab8266e3b000cdaf9ac5633e51d01f5d29eb7586771e4b6c91697dbb3a867d1f7ea809032bf690f22bcc040762ad298b8ffa2594c0e5a022c2056409b8416
 DIST hsql-1.8.2.tar.gz 10568 SHA256 7e2d32eb0d3a1e30ec8fe02ff41b8975298249ccf54ef2e9774260eb05b1a344 SHA512 f4a002573bead2de330d526ab4158517e66f92f4d6a87a517dd2e7949abb7566c318d96e4072535b157f3d40a5714702f4127ea106ab976bf5f0ec302e50c6f6 WHIRLPOOL 938cc447a81ad9c2aa0e254d25bf1c3aec1783de33144af53e310cce5a5fe08cb7657e847f383c9dc2f9535ac3db1784becab25115225e0473c9d9243c5cacc3

diff --git a/dev-haskell/hsql/files/hsql-1.8.1-ghc-7.4.patch b/dev-haskell/hsql/files/hsql-1.8.1-ghc-7.4.patch
deleted file mode 100644
index c8af51d..0000000
--- a/dev-haskell/hsql/files/hsql-1.8.1-ghc-7.4.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/hsql.cabal b/hsql.cabal
-index 6595eee..7e198e9 100644
---- a/hsql.cabal
-+++ b/hsql.cabal
-@@ -19,7 +19,7 @@ exposed-modules:
- 	Database.HSQL.Types
- build-depends:	base==4.*, old-time
- extensions: CPP, ForeignFunctionInterface, DeriveDataTypeable, RankNTypes,
--			ScopedTypeVariables
-+			ScopedTypeVariables, FlexibleInstances
- build-type: Simple
- license-file: LICENSE
- cabal-version: >= 1.6

diff --git a/dev-haskell/hsql/hsql-1.8.1.ebuild b/dev-haskell/hsql/hsql-1.8.1.ebuild
deleted file mode 100644
index 39d4a72..0000000
--- a/dev-haskell/hsql/hsql-1.8.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# ebuild generated by hackport 0.2.13
-
-EAPI=4
-
-CABAL_FEATURES="lib profile haddock hscolour hoogle"
-inherit base haskell-cabal
-
-DESCRIPTION="Simple library for database access from Haskell"
-HOMEPAGE="http://hackage.haskell.org/package/hsql"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.1"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-PATCHES=("${FILESDIR}"/${P}-ghc-7.4.patch)
-
-pkg_postinst () {
-	ghc-package_pkg_postinst
-
-	elog "You will probably want to emerge one or more HSQL backend."
-	elog "These backends are available:"
-	elog "		hsql-postgresql"
-	elog "		hsql-mysql"
-	elog "		hsql-sqlite"
-	elog "		hsql-odbc"
-}

[gentoo-commits] repo/gentoo:master commit in: dev-haskell/hsql/, dev-haskell/hsql/files/

[Sergei Trofimovich]

commit:     290fba178f2c4eb5e066ece9f27f0d1aacf83191
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 22 21:47:46 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Aug 22 21:47:46 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=290fba17

dev-haskell/hsql: tweak for ghc-8.4

Reported-by: Toralf Förster
Closes: https://bugs.gentoo.org/735664
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 dev-haskell/hsql/files/hsql-1.8.2-ghc84.patch | 29 +++++++++++++++++++++++++++
 dev-haskell/hsql/hsql-1.8.2-r1.ebuild         |  8 ++++++--
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/dev-haskell/hsql/files/hsql-1.8.2-ghc84.patch b/dev-haskell/hsql/files/hsql-1.8.2-ghc84.patch
new file mode 100644
index 00000000000..8f90d43393e
--- /dev/null
+++ b/dev-haskell/hsql/files/hsql-1.8.2-ghc84.patch
@@ -0,0 +1,29 @@
+--- a/DB/HSQL/Core.hs
++++ b/DB/HSQL/Core.hs
+@@ -7,3 +7,3 @@ import Control.Exception(Exception,throw,catch,handle)
+ import Control.Concurrent.MVar(MVar,withMVar,modifyMVar_)
+-import Data.Dynamic(cast)
++import Data.Typeable(cast)
+ 
+--- a/DB/HSQL/Error.hs
++++ b/DB/HSQL/Error.hs
+@@ -7,3 +7,3 @@ module DB.HSQL.Error(SqlError(..)) where
+ import Control.Exception(Exception(..),SomeException(..))
+-import Data.Dynamic(Typeable,TyCon,mkTyCon3,cast)
++import Data.Typeable(Typeable, cast)
+ import DB.HSQL.Type(SqlType)
+@@ -32,14 +32,3 @@ data SqlError
+     | SqlClosedHandle -- ^ referenced handle is already closed
+-#ifdef __GLASGOW_HASKELL__
+    deriving (Eq,Ord,Typeable)
+-#else
+-   deriving (Eq,Ord)
+-
+-instance Typeable SqlError where
+-	typeOf _ = mkAppTy sqlErrorTc []
+-#endif
+-
+--- | The `TyCon' of `SqlError'.
+-sqlErrorTc :: TyCon
+-sqlErrorTc = mkTyCon3 "DB.HSQL" "Error" "SqlError"
+ 

diff --git a/dev-haskell/hsql/hsql-1.8.2-r1.ebuild b/dev-haskell/hsql/hsql-1.8.2-r1.ebuild
index 5d1559a6e3a..53a5a9d3ae0 100644
--- a/dev-haskell/hsql/hsql-1.8.2-r1.ebuild
+++ b/dev-haskell/hsql/hsql-1.8.2-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 # ebuild generated by hackport 0.4.6.9999
 
@@ -24,8 +24,12 @@ DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.10
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-ghc84.patch
+)
+
 pkg_postinst() {
-	ghc-package_pkg_postinst
+	haskell-cabal_pkg_postinst
 
 	elog "You will probably want to emerge one or more HSQL backend."
 	elog "These backends are available:"