From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- dev-haskell/hdbc-odbc/Manifest | 9 +-- .../files/hdbc-odbc-2.3.1.0-ghc-7.6.patch | 52 ----------------- dev-haskell/hdbc-odbc/hdbc-odbc-2.3.1.1.ebuild | 65 ---------------------- dev-haskell/hdbc-odbc/hdbc-odbc-2.4.0.1.ebuild | 64 --------------------- dev-haskell/hdbc-odbc/hdbc-odbc-2.6.0.0.ebuild | 42 ++++++++++++++ dev-haskell/hdbc-odbc/metadata.xml | 12 ---- 6 files changed, 45 insertions(+), 199 deletions(-) delete mode 100644 dev-haskell/hdbc-odbc/files/hdbc-odbc-2.3.1.0-ghc-7.6.patch delete mode 100644 dev-haskell/hdbc-odbc/hdbc-odbc-2.3.1.1.ebuild delete mode 100644 dev-haskell/hdbc-odbc/hdbc-odbc-2.4.0.1.ebuild create mode 100644 dev-haskell/hdbc-odbc/hdbc-odbc-2.6.0.0.ebuild (limited to 'dev-haskell/hdbc-odbc') diff --git a/dev-haskell/hdbc-odbc/Manifest b/dev-haskell/hdbc-odbc/Manifest index cd759543722d..bcd84cd0736b 100644 --- a/dev-haskell/hdbc-odbc/Manifest +++ b/dev-haskell/hdbc-odbc/Manifest @@ -1,6 +1,3 @@ -AUX hdbc-odbc-2.3.1.0-ghc-7.6.patch 1773 BLAKE2B df997ccc0b3bf454df09377c7a53fa407aa816a46da27a1766af89659333377b420fa26aa7a0cf666c1b617cda7d3a8642e58a541043f50811955589e251e643 SHA512 1978f79956a73b8615331698839583a242bf15987875a43df496b3bc68a814e516cd3d6868cad47b2b3f30226295a8affeab9995c056f58b649eb6a673ffb034 -DIST HDBC-odbc-2.3.1.1.tar.gz 24518 BLAKE2B 306c9af823e55c56ad61f46ac44c4b055e725f0f9400998938a1c00d7d0a330bb06f581c15990bab4c60293e323464cd140b6ff14ebd80d35fe6b92d10890ff5 SHA512 dbf95afca7906c4814f79e00d1fef0d26ed71c8da45a0fd51c4e3e4e0427d56d1937be0b0c4088841d5f12d93da0c4c29ec6f359c2e58fdf4c693f34bdae250a -DIST HDBC-odbc-2.4.0.1.tar.gz 27185 BLAKE2B 5ccd40f9dcc3ee7045f8719b16f0d65f049cd52c323b86aebdc11fba7c9003747f29850aec059d4d092826c579e0f9dc2f9d12dbbf7b1e261ca052a3e5ba122a SHA512 ae9f5ac2aa6adfc155999fb78b35a12e381d1589bf2539306a4e346af4eee401db8af8ef74348cc0707620f9586367701505d0d61bd96f00f0ebeb9240ed9a06 -EBUILD hdbc-odbc-2.3.1.1.ebuild 1459 BLAKE2B 0bbe2a247353f43eaa5e97cc1f127ea4fc220f634fd2eb8c924dc252511525169dba29c5ba6fbc5ed25edb43b0eb8f2186bb6a1440a6068771c5529228cfe815 SHA512 8c776e8f62ae883add435be8270f2aeb40cf1dbc8ce5d3eabc3617af765717cc4cf1ef28f08787225d7d8d80d546279fd720eb3f21fed618736d69b9c8214c07 -EBUILD hdbc-odbc-2.4.0.1.ebuild 1603 BLAKE2B f54f8ddd793eac8dd114a45951faaf0368acd4fb8663172e877ffc4d32f990d20b357117f17c91a17ede51262210d069a9473f8641038460b19b41af12d276c6 SHA512 302b36d959f981d9d44d498b484cf58daaea1b0e3c7a563c9acb33eac8f07f4d801b5415e830f80cfb4fa2ddb90f9fc43a38d5702042fe7b75dba77bb3ddd707 -MISC metadata.xml 677 BLAKE2B 4bba37b7b13610bbf5d540b8a9d972d3338309aeaa3606f69d3dbf1411015a1d9907c0958a053ca13449002001e53de2669bc90e2331d389e20002ab324e3251 SHA512 bf7a8f735c7cbfd829bbca02e919e17ffe388d8b18289ea8126645588f856594e55f5891f924f19072e6a270d711b2397eab40c32d05d98eec27d69f20467170 +DIST HDBC-odbc-2.6.0.0.tar.gz 28537 BLAKE2B a3055d837406cd97586448c921738ae1bf05360fe4dc11d28f931c8020899c53ba83924f377945865c17b787eb32658a881136e19be1bd2a45a51b4766e4faa1 SHA512 300ee4b14a9cf1392d32549d17f3bb46e4dff22c0c5c8fc6a235dd76cb8dae2d722c3094bcd191ca146381c23259678b0735a7fb3a2d6527122d2a7a7e4db0d4 +EBUILD hdbc-odbc-2.6.0.0.ebuild 924 BLAKE2B 5771988680a5b807222bc6def2d001d99b86cd8e8a3aaea464363b5b42c4c84ecd5fa38f9b02cebb67ee07b3797baae1a2f1d5bcdc83d2bda10b6d9ad87a3340 SHA512 05febb7e24d389b650fe66b84f7e4d7d927abebcc0b0cae45c344d3384893f43720caf5c5f5bf8a83de05ed36a57b0452fdbae4156275b9adfe9b895d5fd9a53 +MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015 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.3.1.1.ebuild b/dev-haskell/hdbc-odbc/hdbc-odbc-2.3.1.1.ebuild deleted file mode 100644 index 62ce679b5c5b..000000000000 --- a/dev-haskell/hdbc-odbc/hdbc-odbc-2.3.1.1.ebuild +++ /dev/null @@ -1,65 +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.3.1.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="test" -RESTRICT="test" # requires configured ODBC - -RDEPEND=">=dev-haskell/hdbc-2.1.0:=[profile?] - dev-haskell/mtl:=[profile?] - dev-haskell/utf8-string:=[profile?] - >=dev-lang/ghc-7.0.1:= - >=dev-db/unixODBC-2.2 - " -DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.6 - test? ( dev-haskell/convertible - dev-haskell/hunit - dev-haskell/quickcheck - dev-haskell/testpack - ) - " - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - epatch "${FILESDIR}/${PN}-2.3.1.0-ghc-7.6.patch" -} - -src_configure() { - cabal_src_configure $(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/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/hdbc-odbc-2.6.0.0.ebuild b/dev-haskell/hdbc-odbc/hdbc-odbc-2.6.0.0.ebuild new file mode 100644 index 000000000000..d0afebe0c643 --- /dev/null +++ b/dev-haskell/hdbc-odbc/hdbc-odbc-2.6.0.0.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# ebuild generated by hackport 0.6.6.9999 +#hackport: flags: -buildtests,-buildstresstest + +CABAL_FEATURES="lib profile haddock 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="" + +RDEPEND="dev-db/unixODBC + >=dev-haskell/concurrent-extra-0.7.0.8:=[profile?] + >=dev-haskell/hdbc-2.1.0:2=[profile?] + dev-haskell/mtl:=[profile?] + dev-haskell/utf8-string:=[profile?] + >=dev-lang/ghc-7.4.1:= + virtual/libc +" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-1.8 +" + +S="${WORKDIR}/${MY_P}" + +src_configure() { + haskell-cabal_src_configure \ + --flag=-buildstresstest \ + --flag=-buildtests +} 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 @@ haskell@gentoo.org Gentoo Haskell - - 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. - - - Build stress test - - - hdbc/hdbc-odbc - -- cgit v1.2.3