summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2020-08-20 09:38:07 +0100
committerSergei Trofimovich <slyfox@gentoo.org>2020-08-20 09:38:13 +0100
commit63c8177e036f3a8327b47e2ab0696f2d20c9b98a (patch)
treec285144a56827a80417f9409cab552406fea2271
parentdev-haskell/hdbc-odbc: bump up to 2.6.0.0 (diff)
downloadgentoo-63c8177e.tar.gz
gentoo-63c8177e.tar.bz2
gentoo-63c8177e.zip
dev-haskell/hdbc-odbc: drop old
Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
-rw-r--r--dev-haskell/hdbc-odbc/Manifest1
-rw-r--r--dev-haskell/hdbc-odbc/files/hdbc-odbc-2.3.1.0-ghc-7.6.patch52
-rw-r--r--dev-haskell/hdbc-odbc/hdbc-odbc-2.4.0.1.ebuild64
-rw-r--r--dev-haskell/hdbc-odbc/metadata.xml12
4 files changed, 0 insertions, 129 deletions
diff --git a/dev-haskell/hdbc-odbc/Manifest b/dev-haskell/hdbc-odbc/Manifest
index e9e419aff9e3..b83c15e30100 100644
--- a/dev-haskell/hdbc-odbc/Manifest
+++ b/dev-haskell/hdbc-odbc/Manifest
@@ -1,2 +1 @@
-DIST HDBC-odbc-2.4.0.1.tar.gz 27185 BLAKE2B 5ccd40f9dcc3ee7045f8719b16f0d65f049cd52c323b86aebdc11fba7c9003747f29850aec059d4d092826c579e0f9dc2f9d12dbbf7b1e261ca052a3e5ba122a SHA512 ae9f5ac2aa6adfc155999fb78b35a12e381d1589bf2539306a4e346af4eee401db8af8ef74348cc0707620f9586367701505d0d61bd96f00f0ebeb9240ed9a06
DIST HDBC-odbc-2.6.0.0.tar.gz 28537 BLAKE2B a3055d837406cd97586448c921738ae1bf05360fe4dc11d28f931c8020899c53ba83924f377945865c17b787eb32658a881136e19be1bd2a45a51b4766e4faa1 SHA512 300ee4b14a9cf1392d32549d17f3bb46e4dff22c0c5c8fc6a235dd76cb8dae2d722c3094bcd191ca146381c23259678b0735a7fb3a2d6527122d2a7a7e4db0d4
diff --git a/dev-haskell/hdbc-odbc/files/hdbc-odbc-2.3.1.0-ghc-7.6.patch b/dev-haskell/hdbc-odbc/files/hdbc-odbc-2.3.1.0-ghc-7.6.patch
deleted file mode 100644
index 8092cf16da6c..000000000000
--- a/dev-haskell/hdbc-odbc/files/hdbc-odbc-2.3.1.0-ghc-7.6.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- HDBC-odbc-2.3.1.0-orig/testsrc/TestSbasics.hs 2011-08-10 07:16:38.000000000 +1000
-+++ HDBC-odbc-2.3.1.0/testsrc/TestSbasics.hs 2012-10-13 12:30:47.216363898 +1100
-@@ -1,9 +1,13 @@
-+{-# LANGUAGE CPP, ScopedTypeVariables #-}
- module TestSbasics(tests) where
- import Test.HUnit
- import Database.HDBC
- import TestUtils
- import System.IO
--import Control.Exception hiding (catch)
-+#if !MIN_VERSION_base(4,6,0)
-+import Prelude hiding (catch)
-+#endif
-+import Control.Exception
-
- openClosedb = sqlTestCase $
- do dbh <- connectDB
-@@ -123,7 +127,7 @@
- -- Let's try a rollback.
- catch (withTransaction dbh (\_ -> do sExecuteMany sth rows
- fail "Foo"))
-- (\_ -> return ())
-+ (\(_::IOException) -> return ())
- sExecute qrysth []
- sFetchAllRows qrysth >>= (assertEqual "rollback" [[Just "0"]])
-
---- HDBC-odbc-2.3.1.0-orig/testsrc/Testbasics.hs 2011-08-10 07:16:38.000000000 +1000
-+++ HDBC-odbc-2.3.1.0/testsrc/Testbasics.hs 2012-10-13 12:30:10.883415738 +1100
-@@ -1,9 +1,13 @@
-+{-# LANGUAGE CPP, ScopedTypeVariables #-}
- module Testbasics(tests) where
- import Test.HUnit
- import Database.HDBC
- import TestUtils
- import System.IO
--import Control.Exception hiding (catch)
-+#if !MIN_VERSION_base(4,6,0)
-+import Prelude hiding (catch)
-+#endif
-+import Control.Exception
-
- openClosedb = sqlTestCase $
- do dbh <- connectDB
-@@ -140,7 +144,7 @@
- -- Let's try a rollback.
- catch (withTransaction dbh (\_ -> do executeMany sth rows
- fail "Foo"))
-- (\_ -> return ())
-+ (\(_::IOException) -> return ())
- execute qrysth []
- fetchAllRows qrysth >>= (assertEqual "rollback" [[SqlString "0"]])
-
diff --git a/dev-haskell/hdbc-odbc/hdbc-odbc-2.4.0.1.ebuild b/dev-haskell/hdbc-odbc/hdbc-odbc-2.4.0.1.ebuild
deleted file mode 100644
index 9b527d532bd8..000000000000
--- a/dev-haskell/hdbc-odbc/hdbc-odbc-2.4.0.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-# haddock is disabled as it chokes in .hsc file:
-# Database/HDBC/ODBC/Statement.hsc:462:3:
-# parse error on input `Word16'
-CABAL_FEATURES="bin lib profile hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="HDBC-odbc"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="ODBC driver for HDBC"
-HOMEPAGE="https://github.com/hdbc/hdbc-odbc"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="2/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="buildstresstest test"
-RESTRICT="test" # requires configured ODBC
-
-RDEPEND=">=dev-haskell/hdbc-2.1.0:2=[profile?]
- dev-haskell/mtl:=[profile?]
- dev-haskell/utf8-string:=[profile?]
- >=dev-lang/ghc-7.4.1:=
- >=dev-db/unixODBC-2.2
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- buildstresstest? ( dev-haskell/random:=[profile?]
- dev-haskell/resource-pool:=[profile?] )
- test? ( dev-haskell/convertible:=[profile?]
- dev-haskell/hunit:=[profile?]
- dev-haskell/quickcheck:2=[profile?]
- dev-haskell/testpack:=[profile?] )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag buildstresstest buildstresstest) \
- $(cabal_flag test buildtests)
-}
-
-src_test() {
- # default tests
- haskell-cabal_src_test || die "cabal test failed"
-
- # built custom tests
- "${S}/dist/build/runtests/runtests" || die "unit tests failed"
-}
-
-src_install() {
- cabal_src_install
-
- # if tests were enabled, make sure the unit test driver is deleted
- rm -f "${ED}/usr/bin/runtests"
-}
diff --git a/dev-haskell/hdbc-odbc/metadata.xml b/dev-haskell/hdbc-odbc/metadata.xml
index 5c72d4a3ad3d..b7878815d80d 100644
--- a/dev-haskell/hdbc-odbc/metadata.xml
+++ b/dev-haskell/hdbc-odbc/metadata.xml
@@ -5,16 +5,4 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- This package provides an ODBC database backend for HDBC.
- It is cross-platform and supports unixODBC on Unix/Linux/POSIX platforms
- and Microsoft ODBC on Windows. It is also the preferred way to access
- MySQL databases from Haskell.
- </longdescription>
- <use>
- <flag name="buildstresstest">Build stress test</flag>
- </use>
- <upstream>
- <remote-id type="github">hdbc/hdbc-odbc</remote-id>
- </upstream>
</pkgmetadata>