[gentoo-commits] repo/gentoo:master commit in: dev-haskell/hdbc/

2023-11-19 Thread Sam James
commit: 699415c7e8149e1029a50182dd026e5c7cd46928
Author: hololeap  protonmail  com>
AuthorDate: Fri Nov 17 05:44:58 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Nov 19 18:32:41 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=699415c7

dev-haskell/hdbc: Fix dependencies

Add missing src_configure to pass needed flags.

Loosen constraint on 'time'. This allows hdbc-2.4.0.3 to be built on
newer GHC.

Signed-off-by: hololeap  protonmail.com>
Signed-off-by: Sam James  gentoo.org>

 dev-haskell/hdbc/hdbc-2.4.0.3.ebuild | 14 ++
 1 file changed, 14 insertions(+)

diff --git a/dev-haskell/hdbc/hdbc-2.4.0.3.ebuild 
b/dev-haskell/hdbc/hdbc-2.4.0.3.ebuild
index 16d3945d0c86..858dae90cb35 100644
--- a/dev-haskell/hdbc/hdbc-2.4.0.3.ebuild
+++ b/dev-haskell/hdbc/hdbc-2.4.0.3.ebuild
@@ -23,6 +23,10 @@ IUSE=""
 
 RESTRICT="test" # Requires unmaintaned dev-haskell/testpack
 
+CABAL_CHDEPS=(
+   'time >= 1.5 && < 1.10' 'time >= 1.5'
+)
+
 RDEPEND=">=dev-haskell/convertible-1.1.0.0:=[profile?]
dev-haskell/mtl:=[profile?]
dev-haskell/old-locale:=[profile?]
@@ -36,3 +40,13 @@ DEPEND="${RDEPEND}
 "
 
 S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+   config_flags=(
+   --flag=-buildtests
+   --flag=splitBase
+   --flag=minTime15
+   )
+
+   haskell-cabal_src_configure ${config_flags[@]}
+}



[gentoo-commits] repo/gentoo:master commit in: dev-haskell/hdbc-postgresql/, profiles/updates/, dev-haskell/hdbc-sqlite3/, ...

2023-11-19 Thread Sam James
commit: b74dadf2d7c0b11f38d75d062db5d188c7061817
Author: hololeap  protonmail  com>
AuthorDate: Sat Nov 18 02:11:04 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Nov 19 18:32:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b74dadf2

dev-haskell/hdbc: slotmove 2 -> 0

Signed-off-by: hololeap  protonmail.com>
Signed-off-by: Sam James  gentoo.org>

 dev-haskell/hdbc-postgresql/hdbc-postgresql-2.5.0.0.ebuild | 2 +-
 dev-haskell/hdbc-postgresql/hdbc-postgresql-2.5.0.1.ebuild | 2 +-
 dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1-r1.ebuild| 2 +-
 dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1.ebuild   | 2 +-
 dev-haskell/hdbc/hdbc-2.4.0.3.ebuild   | 2 +-
 dev-haskell/hdbc/hdbc-2.4.0.4.ebuild   | 2 +-
 profiles/updates/4Q-2023   | 1 +
 7 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.5.0.0.ebuild 
b/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.5.0.0.ebuild
index 8004d0b918dc..1d9f67c6efaa 100644
--- a/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.5.0.0.ebuild
+++ b/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.5.0.0.ebuild
@@ -23,7 +23,7 @@ IUSE=""
 
 RDEPEND=">=dev-db/postgresql-7:*
dev-haskell/convertible:=[profile?]
-   >=dev-haskell/hdbc-2.2.0:2=[profile?]
+   >=dev-haskell/hdbc-2.2.0:=[profile?]
dev-haskell/mtl:=[profile?]
dev-haskell/old-locale:=[profile?]
dev-haskell/old-time:=[profile?]

diff --git a/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.5.0.1.ebuild 
b/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.5.0.1.ebuild
index 53a270aa6ab8..0072be8a8d5a 100644
--- a/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.5.0.1.ebuild
+++ b/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.5.0.1.ebuild
@@ -25,7 +25,7 @@ KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 RDEPEND="
>=dev-db/postgresql-7:*
dev-haskell/convertible:=[profile?]
-   >=dev-haskell/hdbc-2.2.0:2=[profile?]
+   >=dev-haskell/hdbc-2.2.0:=[profile?]
dev-haskell/old-time:=[profile?]
dev-haskell/parsec:=[profile?]
dev-haskell/utf8-string:=[profile?]

diff --git a/dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1-r1.ebuild 
b/dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1-r1.ebuild
index 40e59e8935ef..8d237bf11d1c 100644
--- a/dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1-r1.ebuild
+++ b/dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1-r1.ebuild
@@ -22,7 +22,7 @@ KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="+splitbase"
 
 RDEPEND=">=dev-db/sqlite-3.0
-   >=dev-haskell/hdbc-2.3.0.0:2=[profile?]
+   >=dev-haskell/hdbc-2.3.0.0:=[profile?]
dev-haskell/mtl:=[profile?]
dev-haskell/utf8-string:=[profile?]
>=dev-lang/ghc-7.4.1:=

diff --git a/dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1.ebuild 
b/dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1.ebuild
index 89738bb48fb2..f4c9fab13d7b 100644
--- a/dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1.ebuild
+++ b/dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1.ebuild
@@ -22,7 +22,7 @@ KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="+splitbase"
 
 RDEPEND=">=dev-db/sqlite-3.0
-   >=dev-haskell/hdbc-2.3.0.0:2=[profile?]
+   >=dev-haskell/hdbc-2.3.0.0:=[profile?]
dev-haskell/mtl:=[profile?]
dev-haskell/utf8-string:=[profile?]
>=dev-lang/ghc-7.4.1:=

diff --git a/dev-haskell/hdbc/hdbc-2.4.0.3.ebuild 
b/dev-haskell/hdbc/hdbc-2.4.0.3.ebuild
index 858dae90cb35..f2d24771a8d8 100644
--- a/dev-haskell/hdbc/hdbc-2.4.0.3.ebuild
+++ b/dev-haskell/hdbc/hdbc-2.4.0.3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/hdbc/hdbc;
 SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz;
 
 LICENSE="BSD"
-SLOT="2/${PV}"
+SLOT="0/${PV}"
 KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 

diff --git a/dev-haskell/hdbc/hdbc-2.4.0.4.ebuild 
b/dev-haskell/hdbc/hdbc-2.4.0.4.ebuild
index 159e1a2ddf5a..3ef978f673de 100644
--- a/dev-haskell/hdbc/hdbc-2.4.0.4.ebuild
+++ b/dev-haskell/hdbc/hdbc-2.4.0.4.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Haskell Database Connectivity"
 HOMEPAGE="https://github.com/hdbc/hdbc;
 
 LICENSE="BSD"
-SLOT="2/${PV}"
+SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 
 PATCHES=(

diff --git a/profiles/updates/4Q-2023 b/profiles/updates/4Q-2023
index a4fe88bb542e..62eba90e6c54 100644
--- a/profiles/updates/4Q-2023
+++ b/profiles/updates/4Q-2023
@@ -25,3 +25,4 @@ move dev-libs/kuserfeedback kde-frameworks/kuserfeedback
 move dev-python/pure_eval dev-python/pure-eval
 slotmove dev-haskell/extra 2 0
 slotmove dev-haskell/hdbc-postgresql 2 0
+slotmove dev-haskell/hdbc 2 0



[gentoo-commits] repo/gentoo:master commit in: dev-haskell/hdbc-postgresql/

2023-11-19 Thread Sam James
commit: 0941d693b666d852901e908fe37db250ddfae2ca
Author: hololeap  protonmail  com>
AuthorDate: Fri Nov 17 23:49:59 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Nov 19 18:32:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0941d693

dev-haskell/hdbc-postgresql: Loosen constraint on 'time'

This allows hdbc-2.4.0.3 to be built on newer GHC.

Add missing flags to src_configure.

Signed-off-by: hololeap  protonmail.com>
Signed-off-by: Sam James  gentoo.org>

 dev-haskell/hdbc-postgresql/hdbc-postgresql-2.5.0.0.ebuild | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.5.0.0.ebuild 
b/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.5.0.0.ebuild
index d04a9048548b..ad99cae6ccbd 100644
--- a/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.5.0.0.ebuild
+++ b/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.5.0.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 # ebuild generated by hackport 0.6.7.
-#hackport: flags: +splitbase -buildtests
+#hackport: flags: +splitbase,-buildtests,+minTime15
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -39,10 +39,12 @@ S="${WORKDIR}/${MY_P}"
 
 CABAL_CHDEPS=(
'Cabal >= 1.8 && < 3.3' 'Cabal >= 1.8'
+   'time >= 1.5 && < 1.10' 'time >= 1.5'
 )
 
 src_configure() {
haskell-cabal_src_configure \
--flag=-buildtests \
-   --flag=splitbase
+   --flag=splitbase \
+   --flag=minTime15
 }



[gentoo-commits] repo/gentoo:master commit in: dev-haskell/hdbc-sqlite3/

2022-10-06 Thread Jakov Smolić
commit: 75046438e397acf5723bf3f79ce82d8d4c9690f2
Author: matoro  users  noreply  github  com>
AuthorDate: Thu Sep 22 03:29:49 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Oct  6 06:11:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75046438

dev-haskell/hdbc-sqlite3: keyword 2.3.3.1-r1 for ~riscv

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1-r1.ebuild 
b/dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1-r1.ebuild
index a7a7dd75f277..69e57d8eba3b 100644
--- a/dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1-r1.ebuild
+++ b/dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1-r1.ebuild
@@ -18,7 +18,7 @@ 
SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz;
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="+splitbase"
 
 RDEPEND=">=dev-db/sqlite-3.0



[gentoo-commits] repo/gentoo:master commit in: dev-haskell/hdbc-postgresql/

2022-10-06 Thread Jakov Smolić
commit: 982178a7210f16604aa211532632971461d4
Author: matoro  users  noreply  github  com>
AuthorDate: Thu Sep 22 03:20:48 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Oct  6 06:11:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=982178a5

dev-haskell/hdbc-postgresql: keyword 2.5.0.0 for ~riscv

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-haskell/hdbc-postgresql/hdbc-postgresql-2.5.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.5.0.0.ebuild 
b/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.5.0.0.ebuild
index 7d75dfea2d51..45320035e796 100644
--- a/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.5.0.0.ebuild
+++ b/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.5.0.0.ebuild
@@ -18,7 +18,7 @@ 
SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz;
 
 LICENSE="BSD"
 SLOT="2/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-db/postgresql-7:*



[gentoo-commits] repo/gentoo:master commit in: dev-haskell/hdbc/

2022-10-06 Thread Jakov Smolić
commit: e3b2ce2e5cdbfa44fcf128db814030efc6418e96
Author: matoro  users  noreply  github  com>
AuthorDate: Thu Sep 22 02:58:48 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Oct  6 06:11:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3b2ce2e

dev-haskell/hdbc: keyword 2.4.0.3 for ~riscv

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-haskell/hdbc/hdbc-2.4.0.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-haskell/hdbc/hdbc-2.4.0.3.ebuild 
b/dev-haskell/hdbc/hdbc-2.4.0.3.ebuild
index 4032e5a2a5b9..34fab413d957 100644
--- a/dev-haskell/hdbc/hdbc-2.4.0.3.ebuild
+++ b/dev-haskell/hdbc/hdbc-2.4.0.3.ebuild
@@ -18,7 +18,7 @@ 
SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz;
 
 LICENSE="BSD"
 SLOT="2/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RESTRICT="test" # Requires unmaintaned dev-haskell/testpack



[gentoo-commits] repo/gentoo:master commit in: dev-haskell/hdbc-odbc/, profiles/

2022-09-29 Thread Jakov Smolić
commit: 20343f97a28dcf420d8b017011d792476303307b
Author: Jakov Smolić  gentoo  org>
AuthorDate: Thu Sep 29 07:53:56 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Sep 29 07:53:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20343f97

dev-haskell/hdbc-odbc: Remove last-rited pkg

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-haskell/hdbc-odbc/Manifest |  1 -
 dev-haskell/hdbc-odbc/hdbc-odbc-2.6.0.0.ebuild | 42 --
 dev-haskell/hdbc-odbc/metadata.xml |  8 -
 profiles/package.mask  |  1 -
 4 files changed, 52 deletions(-)

diff --git a/dev-haskell/hdbc-odbc/Manifest b/dev-haskell/hdbc-odbc/Manifest
deleted file mode 100644
index b83c15e30100..
--- a/dev-haskell/hdbc-odbc/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST HDBC-odbc-2.6.0.0.tar.gz 28537 BLAKE2B 
a3055d837406cd97586448c921738ae1bf05360fe4dc11d28f931c8020899c53ba83924f377945865c17b787eb32658a881136e19be1bd2a45a51b4766e4faa1
 SHA512 
300ee4b14a9cf1392d32549d17f3bb46e4dff22c0c5c8fc6a235dd76cb8dae2d722c3094bcd191ca146381c23259678b0735a7fb3a2d6527122d2a7a7e4db0d4

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
deleted file mode 100644
index d0afebe0c643..
--- a/dev-haskell/hdbc-odbc/hdbc-odbc-2.6.0.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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.
-#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
deleted file mode 100644
index 937381521944..
--- a/dev-haskell/hdbc-odbc/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-https://www.gentoo.org/dtd/metadata.dtd;>
-
-   
-   hask...@gentoo.org
-   Gentoo Haskell
-   
-

diff --git a/profiles/package.mask b/profiles/package.mask
index d07acb4e8847..86497a974b64 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -293,7 +293,6 @@ dev-haskell/haddock-api
 dev-haskell/hashable-time
 dev-haskell/hashtables
 dev-haskell/haskell-src-meta
-dev-haskell/hdbc-odbc
 
 # hololeap  (2022-08-21)
 # doctest-parallel does not currently work with Setup.hs (used internally by



[gentoo-commits] repo/gentoo:master commit in: dev-haskell/hdbc-postgresql/

2022-08-31 Thread Sam James
commit: c871507b1439b775a63aa90ad2c991d54ca3b97f
Author: matoro  users  noreply  github  com>
AuthorDate: Sun Aug 28 22:52:17 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Aug 31 21:31:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c871507b

dev-haskell/hdbc-postgresql: keyword 2.5.0.0 for ~arm64

Signed-off-by: Sam James  gentoo.org>

 dev-haskell/hdbc-postgresql/hdbc-postgresql-2.5.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.5.0.0.ebuild 
b/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.5.0.0.ebuild
index fe3a0775516b..7d75dfea2d51 100644
--- a/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.5.0.0.ebuild
+++ b/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.5.0.0.ebuild
@@ -18,7 +18,7 @@ 
SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz;
 
 LICENSE="BSD"
 SLOT="2/${PV}"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-db/postgresql-7:*



[gentoo-commits] repo/gentoo:master commit in: dev-haskell/hdbc-sqlite3/

2022-08-31 Thread Sam James
commit: 173d4e14bde44c0043da4d67fff887edbe9aea8c
Author: matoro  users  noreply  github  com>
AuthorDate: Sun Aug 28 22:55:22 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Aug 31 21:31:31 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=173d4e14

dev-haskell/hdbc-sqlite3: keyword 2.3.3.1-r1 for ~arm64

Signed-off-by: Sam James  gentoo.org>

 dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1-r1.ebuild 
b/dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1-r1.ebuild
index a1f6e8fb6a5c..a7a7dd75f277 100644
--- a/dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1-r1.ebuild
+++ b/dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1-r1.ebuild
@@ -18,7 +18,7 @@ 
SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz;
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="+splitbase"
 
 RDEPEND=">=dev-db/sqlite-3.0



[gentoo-commits] repo/gentoo:master commit in: dev-haskell/hdbc/

2022-08-31 Thread Sam James
commit: 06176ee4617349d78edddc76beb663c83c3ba1c4
Author: matoro  users  noreply  github  com>
AuthorDate: Sun Aug 28 22:49:13 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Aug 31 21:31:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06176ee4

dev-haskell/hdbc: keyword 2.4.0.3 for ~arm64

Signed-off-by: Sam James  gentoo.org>

 dev-haskell/hdbc/hdbc-2.4.0.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-haskell/hdbc/hdbc-2.4.0.3.ebuild 
b/dev-haskell/hdbc/hdbc-2.4.0.3.ebuild
index 0211d08448d8..4032e5a2a5b9 100644
--- a/dev-haskell/hdbc/hdbc-2.4.0.3.ebuild
+++ b/dev-haskell/hdbc/hdbc-2.4.0.3.ebuild
@@ -18,7 +18,7 @@ 
SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz;
 
 LICENSE="BSD"
 SLOT="2/${PV}"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 RESTRICT="test" # Requires unmaintaned dev-haskell/testpack



[gentoo-commits] repo/gentoo:master commit in: dev-haskell/hdbc-sqlite3/

2022-08-28 Thread Michael Orlitzky
commit: 75a44d7c2c9a9d305e25548da90a960be833627e
Author: matoro  users  noreply  github  com>
AuthorDate: Tue Aug 23 15:28:15 2022 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Sun Aug 28 22:01:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75a44d7c

dev-haskell/hdbc-sqlite3: keyword 2.3.3.1-r1 for ~ppc64

Signed-off-by: Michael Orlitzky  gentoo.org>

 dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1-r1.ebuild 
b/dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1-r1.ebuild
index 5cb19571040f..a1f6e8fb6a5c 100644
--- a/dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1-r1.ebuild
+++ b/dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ 
SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz;
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="+splitbase"
 
 RDEPEND=">=dev-db/sqlite-3.0



[gentoo-commits] repo/gentoo:master commit in: dev-haskell/hdbc/

2022-08-28 Thread Michael Orlitzky
commit: 18a627259560f0dfb38044debc13b30e1e5cff96
Author: matoro  users  noreply  github  com>
AuthorDate: Tue Aug 23 15:24:59 2022 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Sun Aug 28 22:01:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18a62725

dev-haskell/hdbc: keyword 2.4.0.3 for ~ppc64

Signed-off-by: Michael Orlitzky  gentoo.org>

 dev-haskell/hdbc/hdbc-2.4.0.3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-haskell/hdbc/hdbc-2.4.0.3.ebuild 
b/dev-haskell/hdbc/hdbc-2.4.0.3.ebuild
index 90831462697a..0211d08448d8 100644
--- a/dev-haskell/hdbc/hdbc-2.4.0.3.ebuild
+++ b/dev-haskell/hdbc/hdbc-2.4.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ 
SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz;
 
 LICENSE="BSD"
 SLOT="2/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RESTRICT="test" # Requires unmaintaned dev-haskell/testpack



[gentoo-commits] repo/gentoo:master commit in: dev-haskell/hdbc-postgresql/

2022-08-28 Thread Michael Orlitzky
commit: a4956772314c0055c27ad12309d19daba8c7f284
Author: matoro  users  noreply  github  com>
AuthorDate: Tue Aug 23 15:27:06 2022 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Sun Aug 28 22:01:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4956772

dev-haskell/hdbc-postgresql: keyword 2.5.0.0 for ~ppc64

Signed-off-by: Michael Orlitzky  gentoo.org>

 dev-haskell/hdbc-postgresql/hdbc-postgresql-2.5.0.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.5.0.0.ebuild 
b/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.5.0.0.ebuild
index 829c73553edb..fe3a0775516b 100644
--- a/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.5.0.0.ebuild
+++ b/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.5.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ 
SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz;
 
 LICENSE="BSD"
 SLOT="2/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-db/postgresql-7:*



[gentoo-commits] repo/gentoo:master commit in: dev-haskell/hdbc-mysql/, dev-haskell/hdbc-mysql/files/, profiles/

2022-08-22 Thread Jakov Smolić
commit: 85638283f1240e37e1cfebe6966b519d9a545a52
Author: Jakov Smolić  gentoo  org>
AuthorDate: Mon Aug 22 07:18:51 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Mon Aug 22 07:18:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85638283

dev-haskell/hdbc-mysql: treeclean

Closes: https://bugs.gentoo.org/635448
Signed-off-by: Jakov Smolić  gentoo.org>

 dev-haskell/hdbc-mysql/Manifest|  1 -
 .../files/hdbc-mysql-0.7.1.0-cabal-3.patch | 11 --
 .../hdbc-mysql/hdbc-mysql-0.7.1.0-r1.ebuild| 41 --
 dev-haskell/hdbc-mysql/metadata.xml| 15 
 profiles/package.mask  |  1 -
 5 files changed, 69 deletions(-)

diff --git a/dev-haskell/hdbc-mysql/Manifest b/dev-haskell/hdbc-mysql/Manifest
deleted file mode 100644
index 60d7241b1f35..
--- a/dev-haskell/hdbc-mysql/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST HDBC-mysql-0.7.1.0.tar.gz 24086 BLAKE2B 
fd480ef5a3374aa8c6d36bd4f34fb1cb558769a134f60ce1b94cba7143b93adecc2cff6253cb1afbefe52c9ed8081fc7f812f7bc6539c043f783e9ced10ff4d7
 SHA512 
aec9387f08c16c8ccb6df1ca82e69005105a2781e253b6b8788665fa88e54a697601f99d10931ea6d3854dd9c0b43f062bccad1362a1512f5a2135cede0b0cc1

diff --git a/dev-haskell/hdbc-mysql/files/hdbc-mysql-0.7.1.0-cabal-3.patch 
b/dev-haskell/hdbc-mysql/files/hdbc-mysql-0.7.1.0-cabal-3.patch
deleted file mode 100644
index 11fe2231d73e..
--- a/dev-haskell/hdbc-mysql/files/hdbc-mysql-0.7.1.0-cabal-3.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 a/Setup.lhs
-+++ b/Setup.lhs
-@@ -35,7 +35,7 @@ mysqlConfigProgram = (simpleProgram "mysql_config") {
- 
- mysqlBuildInfo :: LocalBuildInfo -> IO BuildInfo
- mysqlBuildInfo lbi = do
--  let mysqlConfig = rawSystemProgramStdoutConf verbosity mysqlConfigProgram 
(withPrograms lbi)
-+  let mysqlConfig = getDbProgramOutput verbosity mysqlConfigProgram 
(withPrograms lbi)
-   ws = " \n\r\t"
- 
-   includeDirs <- return . map (drop 2) . split ws =<< mysqlConfig 
["--include"]

diff --git a/dev-haskell/hdbc-mysql/hdbc-mysql-0.7.1.0-r1.ebuild 
b/dev-haskell/hdbc-mysql/hdbc-mysql-0.7.1.0-r1.ebuild
deleted file mode 100644
index c0ce27b1585e..
--- a/dev-haskell/hdbc-mysql/hdbc-mysql-0.7.1.0-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.1.
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="HDBC-mysql"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="MySQL driver for HDBC"
-HOMEPAGE="https://github.com/ryantm/hdbc-mysql;
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz;
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND=">=dev-haskell/hdbc-2.1.0:2=[profile?]
-   dev-haskell/utf8-string:=[profile?]
-   >=dev-lang/ghc-8.0.1:=
-   dev-libs/openssl:0=
-   sys-libs/zlib
-   dev-db/mysql-connector-c:0=
-"
-DEPEND="${RDEPEND}
-   >=dev-haskell/cabal-1.24.0.0
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=("${FILESDIR}"/${P}-cabal-3.patch)
-
-src_configure() {
-   haskell-cabal_src_configure \
-   $(cabal_flag debug debug)
-}

diff --git a/dev-haskell/hdbc-mysql/metadata.xml 
b/dev-haskell/hdbc-mysql/metadata.xml
deleted file mode 100644
index 18b3e18f1302..
--- a/dev-haskell/hdbc-mysql/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-https://www.gentoo.org/dtd/metadata.dtd;>
-
-   
-   hask...@gentoo.org
-   Gentoo Haskell
-   
-   
-   This package provides a MySQL driver for HDBC, implemented via
-   bindings to the C @mysqlclient@ library.
-   
-   
-   bos/hdbc-mysql
-   
-

diff --git a/profiles/package.mask b/profiles/package.mask
index a21fd2976c97..15ede9453aa0 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -439,7 +439,6 @@ dev-haskell/haskell-src-exts-util
 dev-haskell/haxml
 dev-haskell/hcg-minus
 dev-haskell/hcodecs
-dev-haskell/hdbc-mysql
 
 # Hans de Graaff  (2022-07-16)
 # No longer supported upstream. Use a newer ruby version instead.



[gentoo-commits] repo/gentoo:master commit in: dev-haskell/hdbc-postgresql/

2021-07-25 Thread Sergei Trofimovich
commit: af1b89ed4afd1fe3df9f675361d45232242509f3
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Jul 25 08:33:07 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Jul 25 08:33:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af1b89ed

dev-haskell/hdbc-postgresql: drop old

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Sergei Trofimovich  gentoo.org>

 dev-haskell/hdbc-postgresql/Manifest   |  1 -
 .../hdbc-postgresql/hdbc-postgresql-2.3.2.7.ebuild | 43 --
 2 files changed, 44 deletions(-)

diff --git a/dev-haskell/hdbc-postgresql/Manifest 
b/dev-haskell/hdbc-postgresql/Manifest
index 4f949e04a54..94d3c2bb0ab 100644
--- a/dev-haskell/hdbc-postgresql/Manifest
+++ b/dev-haskell/hdbc-postgresql/Manifest
@@ -1,2 +1 @@
-DIST HDBC-postgresql-2.3.2.7.tar.gz 25606 BLAKE2B 
0991686424f5912258fd1a9bdd40ef84d04a069a2ba14ce93678cce8f8fc1a73a10ed4c9fdf31a372e52a9833007e6469bcb9632d3f80022f240a3bac8aaca28
 SHA512 
0e4b27d5c18335e47b9782adcb09702654d9f8d04053110576a8a7ce68dc90810e35977886e2cbde0d4ef337aad5b36a4217dbfe07e1f64753f0cc34892d006e
 DIST HDBC-postgresql-2.5.0.0.tar.gz 24404 BLAKE2B 
8fc7ca3b2fa6d379af4f9dd4b801921274a6c352b05e95b836f0208304e2e2a6cc18df765b432767cb6ef9fa3f99ee0488e095b82091c12838f6b3220f114453
 SHA512 
3a81708b119e156e08265b02f3b27ac764a854b8d79f7ed1bd1c191b897ead10d231854f0edaf1f27d76af18e4330c67b7ced0328830e013bab88ec47f668a4d

diff --git a/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.3.2.7.ebuild 
b/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.3.2.7.ebuild
deleted file mode 100644
index 2942d5b0348..000
--- a/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.3.2.7.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.
-#hackport: flags: +splitbase
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="HDBC-postgresql"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="PostgreSQL driver for HDBC"
-HOMEPAGE="https://github.com/hdbc/hdbc-postgresql;
-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/postgresql-7:*
-   dev-haskell/convertible:=[profile?]
-   >=dev-haskell/hdbc-2.2.0:2=[profile?]
-   dev-haskell/mtl:=[profile?]
-   dev-haskell/old-locale:=[profile?]
-   dev-haskell/old-time:=[profile?]
-   dev-haskell/parsec:=[profile?]
-   dev-haskell/utf8-string:=[profile?]
-   >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-   >=dev-haskell/cabal-1.8 

[gentoo-commits] repo/gentoo:master commit in: dev-haskell/hdbc-postgresql/

2021-07-25 Thread Sergei Trofimovich
commit: f568c992ec0db6b55df2256a1875986c51d266a3
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Jul 25 08:33:01 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Jul 25 08:33:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f568c992

dev-haskell/hdbc-postgresql: bump up to 2.5.0.0

Reported-by: Toralf Förster
Closes: https://bugs.gentoo.org/799077
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Sergei Trofimovich  gentoo.org>

 dev-haskell/hdbc-postgresql/Manifest   |  1 +
 .../hdbc-postgresql/hdbc-postgresql-2.5.0.0.ebuild | 51 ++
 2 files changed, 52 insertions(+)

diff --git a/dev-haskell/hdbc-postgresql/Manifest 
b/dev-haskell/hdbc-postgresql/Manifest
index 3fa7e42be53..4f949e04a54 100644
--- a/dev-haskell/hdbc-postgresql/Manifest
+++ b/dev-haskell/hdbc-postgresql/Manifest
@@ -1 +1,2 @@
 DIST HDBC-postgresql-2.3.2.7.tar.gz 25606 BLAKE2B 
0991686424f5912258fd1a9bdd40ef84d04a069a2ba14ce93678cce8f8fc1a73a10ed4c9fdf31a372e52a9833007e6469bcb9632d3f80022f240a3bac8aaca28
 SHA512 
0e4b27d5c18335e47b9782adcb09702654d9f8d04053110576a8a7ce68dc90810e35977886e2cbde0d4ef337aad5b36a4217dbfe07e1f64753f0cc34892d006e
+DIST HDBC-postgresql-2.5.0.0.tar.gz 24404 BLAKE2B 
8fc7ca3b2fa6d379af4f9dd4b801921274a6c352b05e95b836f0208304e2e2a6cc18df765b432767cb6ef9fa3f99ee0488e095b82091c12838f6b3220f114453
 SHA512 
3a81708b119e156e08265b02f3b27ac764a854b8d79f7ed1bd1c191b897ead10d231854f0edaf1f27d76af18e4330c67b7ced0328830e013bab88ec47f668a4d

diff --git a/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.5.0.0.ebuild 
b/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.5.0.0.ebuild
new file mode 100644
index 000..829c73553ed
--- /dev/null
+++ b/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.5.0.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.7.
+#hackport: flags: +splitbase -buildtests
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+MY_PN="HDBC-postgresql"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="PostgreSQL driver for HDBC"
+HOMEPAGE="https://github.com/hdbc/hdbc-postgresql;
+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/postgresql-7:*
+   dev-haskell/convertible:=[profile?]
+   >=dev-haskell/hdbc-2.2.0:2=[profile?]
+   dev-haskell/mtl:=[profile?]
+   dev-haskell/old-locale:=[profile?]
+   dev-haskell/old-time:=[profile?]
+   dev-haskell/parsec:=[profile?]
+   dev-haskell/utf8-string:=[profile?]
+   >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+   >=dev-haskell/cabal-2.2.0.1
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+   default
+
+   cabal_chdeps \
+   'Cabal >= 1.8 && < 3.3' 'Cabal >= 1.8'
+}
+
+src_configure() {
+   haskell-cabal_src_configure \
+   --flag=-buildtests \
+   --flag=splitbase
+}



[gentoo-commits] repo/gentoo:master commit in: dev-haskell/hdbc-mysql/files/

2020-08-30 Thread Sergei Trofimovich
commit: 848082f3ba866fdae1b9c2e2c1af6cfed948f16f
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Sat Aug 29 18:43:54 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Aug 30 07:59:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=848082f3

dev-haskell/hdbc-mysql: remove unused patch(es)

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Michael Mair-Keimberger  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/17319
Signed-off-by: Sergei Trofimovich  gentoo.org>

 .../files/hdbc-mysql-0.6.6.1-cabal-1.18.patch  | 33 --
 .../files/hdbc-mysql-0.6.6.1-extralib.patch| 18 
 2 files changed, 51 deletions(-)

diff --git a/dev-haskell/hdbc-mysql/files/hdbc-mysql-0.6.6.1-cabal-1.18.patch 
b/dev-haskell/hdbc-mysql/files/hdbc-mysql-0.6.6.1-cabal-1.18.patch
deleted file mode 100644
index 83ddd4a4c8c..000
--- a/dev-haskell/hdbc-mysql/files/hdbc-mysql-0.6.6.1-cabal-1.18.patch
+++ /dev/null
@@ -1,33 +0,0 @@
 HDBC-mysql-0.6.6.1-orig/Setup.lhs  2012-08-30 13:40:03.0 +1000
-+++ HDBC-mysql-0.6.6.1/Setup.lhs   2014-07-03 22:31:21.162259637 +1000
-@@ -1,6 +1,7 @@
- #!/usr/bin/env runhaskell
- 
- \begin{code}
-+{-# LANGUAGE MultiParamTypeClasses, FlexibleInstances #-}
- import Distribution.Simple
- import Distribution.PackageDescription
- import Distribution.Version
-@@ -26,8 +27,21 @@
- }
- }
- 
-+-- 'ConstOrId' is a @Cabal-1.16@ vs @Cabal-1.18@ compatibility hack,
-+-- 'programFindLocation' has a new (unused in this case)
-+-- parameter. 'ConstOrId' adds this parameter when types say it is
-+-- mandatory.
-+class ConstOrId a b where
-+constOrId :: a -> b
-+
-+instance ConstOrId a a where
-+constOrId = id
-+
-+instance ConstOrId a (b -> a) where
-+constOrId = const
-+
- mysqlConfigProgram = (simpleProgram "mysql_config") {
--programFindLocation = \verbosity -> do
-+programFindLocation = \verbosity -> constOrId $ do
-   mysql_config  <- findProgramOnPath "mysql_config"  verbosity
-   mysql_config5 <- findProgramOnPath "mysql_config5" verbosity
-   return (mysql_config `mplus` mysql_config5)

diff --git a/dev-haskell/hdbc-mysql/files/hdbc-mysql-0.6.6.1-extralib.patch 
b/dev-haskell/hdbc-mysql/files/hdbc-mysql-0.6.6.1-extralib.patch
deleted file mode 100644
index 8b9993969cb..000
--- a/dev-haskell/hdbc-mysql/files/hdbc-mysql-0.6.6.1-extralib.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-commit d53860f7edb75873e26329c159802b2ac5a6
-Author: Satoshi Nakamura 
-Date:   Tue May 27 15:44:57 2014 +0900
-
-Add mysqlclient to Extra-Libraries
-
-diff --git a/HDBC-mysql.cabal b/HDBC-mysql.cabal
-index 2d56d8b..6a8967a 100644
 a/HDBC-mysql.cabal
-+++ b/HDBC-mysql.cabal
-@@ -32,6 +32,7 @@ library
- time,
- utf8-string
-   ghc-options:  -Wall
-+  Extra-Libraries: mysqlclient
- 
- source-repository head
-   type: git



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

2020-08-30 Thread Sergei Trofimovich
commit: 1a15cea15c08b516a1a53d2aaf601100b7599098
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Aug 30 07:39:19 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Aug 30 07:39:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a15cea1

dev-haskell/hdbc-mysql: tweak for cabal-3

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

 dev-haskell/hdbc-mysql/files/hdbc-mysql-0.7.1.0-cabal-3.patch | 11 +++
 dev-haskell/hdbc-mysql/hdbc-mysql-0.7.1.0-r1.ebuild   |  4 +++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/dev-haskell/hdbc-mysql/files/hdbc-mysql-0.7.1.0-cabal-3.patch 
b/dev-haskell/hdbc-mysql/files/hdbc-mysql-0.7.1.0-cabal-3.patch
new file mode 100644
index 000..11fe2231d73
--- /dev/null
+++ b/dev-haskell/hdbc-mysql/files/hdbc-mysql-0.7.1.0-cabal-3.patch
@@ -0,0 +1,11 @@
+--- a/Setup.lhs
 b/Setup.lhs
+@@ -35,7 +35,7 @@ mysqlConfigProgram = (simpleProgram "mysql_config") {
+ 
+ mysqlBuildInfo :: LocalBuildInfo -> IO BuildInfo
+ mysqlBuildInfo lbi = do
+-  let mysqlConfig = rawSystemProgramStdoutConf verbosity mysqlConfigProgram 
(withPrograms lbi)
++  let mysqlConfig = getDbProgramOutput verbosity mysqlConfigProgram 
(withPrograms lbi)
+   ws = " \n\r\t"
+ 
+   includeDirs <- return . map (drop 2) . split ws =<< mysqlConfig 
["--include"]

diff --git a/dev-haskell/hdbc-mysql/hdbc-mysql-0.7.1.0-r1.ebuild 
b/dev-haskell/hdbc-mysql/hdbc-mysql-0.7.1.0-r1.ebuild
index 5a09fbb7663..b1a0712a1a1 100644
--- a/dev-haskell/hdbc-mysql/hdbc-mysql-0.7.1.0-r1.ebuild
+++ b/dev-haskell/hdbc-mysql/hdbc-mysql-0.7.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,6 +33,8 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=("${FILESDIR}"/${P}-cabal-3.patch)
+
 src_configure() {
haskell-cabal_src_configure \
$(cabal_flag debug debug)



[gentoo-commits] repo/gentoo:master commit in: dev-haskell/hdbc-sqlite3/

2020-08-20 Thread Sergei Trofimovich
commit: 79696f08869f47edb98725e1f58738ecf9f1
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Thu Aug 20 09:17:32 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Aug 20 09:17:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79696f08

dev-haskell/hdbc-sqlite3: drop USE=test support, requres testpack

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sergei Trofimovich  gentoo.org>

 .../hdbc-sqlite3/hdbc-sqlite3-2.3.3.1-r1.ebuild| 18 +++---
 dev-haskell/hdbc-sqlite3/metadata.xml  |  5 -
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1-r1.ebuild 
b/dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1-r1.ebuild
index 6f71fc5a2a9..5cb19571040 100644
--- a/dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1-r1.ebuild
+++ b/dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1-r1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-# ebuild generated by hackport 0.5.1
+# ebuild generated by hackport 0.6.6.
+#hackport: flags: -buildtests
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -18,27 +19,22 @@ 
SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz;
 LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE="buildtests +splitbase"
+IUSE="+splitbase"
 
 RDEPEND=">=dev-db/sqlite-3.0
>=dev-haskell/hdbc-2.3.0.0:2=[profile?]
dev-haskell/mtl:=[profile?]
dev-haskell/utf8-string:=[profile?]
>=dev-lang/ghc-7.4.1:=
-   buildtests? ( dev-haskell/convertible:=[profile?]
-   dev-haskell/hunit:=[profile?]
-   dev-haskell/old-locale:=[profile?]
-   dev-haskell/old-time:=[profile?]
-   dev-haskell/testpack:=[profile?] )
 "
 DEPEND="${RDEPEND}
-   >=dev-haskell/cabal-1.2.3
+   >=dev-haskell/cabal-1.2
 "
 
 S="${WORKDIR}/${MY_P}"
 
 src_configure() {
haskell-cabal_src_configure \
-   $(cabal_flag buildtests buildtests) \
+   --flag=-buildtests \
$(cabal_flag splitbase splitbase)
 }

diff --git a/dev-haskell/hdbc-sqlite3/metadata.xml 
b/dev-haskell/hdbc-sqlite3/metadata.xml
index a6dc7b001d9..b9f67a8436a 100644
--- a/dev-haskell/hdbc-sqlite3/metadata.xml
+++ b/dev-haskell/hdbc-sqlite3/metadata.xml
@@ -6,13 +6,8 @@
Gentoo Haskell


-   Build the executable to run unit 
tests
Choose the new smaller, split-up 
package.

-   
-   This is the Sqlite v3 driver for HDBC, the generic
-   database access system for Haskell
-   

hdbc/hdbc-sqlite3




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

2020-08-20 Thread Sergei Trofimovich
commit: 63c8177e036f3a8327b47e2ab0696f2d20c9b98a
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Thu Aug 20 08:38:07 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Aug 20 08:38:13 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63c8177e

dev-haskell/hdbc-odbc: drop old

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sergei Trofimovich  gentoo.org>

 dev-haskell/hdbc-odbc/Manifest |  1 -
 .../files/hdbc-odbc-2.3.1.0-ghc-7.6.patch  | 52 --
 dev-haskell/hdbc-odbc/hdbc-odbc-2.4.0.1.ebuild | 64 --
 dev-haskell/hdbc-odbc/metadata.xml | 12 
 4 files changed, 129 deletions(-)

diff --git a/dev-haskell/hdbc-odbc/Manifest b/dev-haskell/hdbc-odbc/Manifest
index e9e419aff9e..b83c15e3010 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 8092cf16da6..000
--- 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.0 +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.0 +1000
-+++ HDBC-odbc-2.3.1.0/testsrc/Testbasics.hs2012-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 9b527d532bd..000
--- 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.
-
-# 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?]
-   

[gentoo-commits] repo/gentoo:master commit in: dev-haskell/hdbc-odbc/

2020-08-20 Thread Sergei Trofimovich
commit: 346697420ffcb442cf97c41687c31a9b4bbf6e0d
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Thu Aug 20 08:37:36 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Aug 20 08:38:13 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34669742

dev-haskell/hdbc-odbc: bump up to 2.6.0.0

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sergei Trofimovich  gentoo.org>

 dev-haskell/hdbc-odbc/Manifest |  1 +
 dev-haskell/hdbc-odbc/hdbc-odbc-2.6.0.0.ebuild | 42 ++
 2 files changed, 43 insertions(+)

diff --git a/dev-haskell/hdbc-odbc/Manifest b/dev-haskell/hdbc-odbc/Manifest
index d6df0a9cd61..e9e419aff9e 100644
--- a/dev-haskell/hdbc-odbc/Manifest
+++ b/dev-haskell/hdbc-odbc/Manifest
@@ -1 +1,2 @@
 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/hdbc-odbc-2.6.0.0.ebuild 
b/dev-haskell/hdbc-odbc/hdbc-odbc-2.6.0.0.ebuild
new file mode 100644
index 000..d0afebe0c64
--- /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.
+#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
+}



[gentoo-commits] repo/gentoo:master commit in: dev-haskell/hdbc/

2020-08-20 Thread Sergei Trofimovich
commit: 4e11438af326a6689764481c700797127c8ab0c9
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Thu Aug 20 08:33:13 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Aug 20 08:33:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e11438a

dev-haskell/hdbc: drop USE=test support, requres testpack

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sergei Trofimovich  gentoo.org>

 dev-haskell/hdbc/hdbc-2.4.0.3.ebuild | 29 +++--
 1 file changed, 3 insertions(+), 26 deletions(-)

diff --git a/dev-haskell/hdbc/hdbc-2.4.0.3.ebuild 
b/dev-haskell/hdbc/hdbc-2.4.0.3.ebuild
index fb05e030b9d..90831462697 100644
--- a/dev-haskell/hdbc/hdbc-2.4.0.3.ebuild
+++ b/dev-haskell/hdbc/hdbc-2.4.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,9 +19,9 @@ 
SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz;
 LICENSE="BSD"
 SLOT="2/${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
+IUSE=""
 
-RESTRICT="test" # Requires dev-haskell/testpack (deprecated), and this is a 
problem.
+RESTRICT="test" # Requires unmaintaned dev-haskell/testpack
 
 RDEPEND=">=dev-haskell/convertible-1.1.0.0:=[profile?]
dev-haskell/mtl:=[profile?]
@@ -30,32 +30,9 @@ RDEPEND=">=dev-haskell/convertible-1.1.0.0:=[profile?]
dev-haskell/text:=[profile?]
dev-haskell/utf8-string:=[profile?]
>=dev-lang/ghc-7.4.1:=
-   test? ( dev-haskell/hunit:=[profile?]
-   >=dev-haskell/quickcheck-2.0:2=[profile?]
-   >=dev-haskell/testpack-2.0:=[profile?] )
 "
 DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.8
 "
 
 S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-   haskell-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"
-}



[gentoo-commits] repo/gentoo:master commit in: dev-haskell/hdbc-mysql/

2020-08-20 Thread Sergei Trofimovich
commit: 86d059aa2f2ef1bdcddfe634c1db7e7a8a4abd1c
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Thu Aug 20 08:26:30 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Aug 20 08:27:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86d059aa

dev-haskell/hdbc-mysql: drop old

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sergei Trofimovich  gentoo.org>

 dev-haskell/hdbc-mysql/Manifest|  1 -
 .../hdbc-mysql/hdbc-mysql-0.6.6.1-r4.ebuild| 37 --
 2 files changed, 38 deletions(-)

diff --git a/dev-haskell/hdbc-mysql/Manifest b/dev-haskell/hdbc-mysql/Manifest
index e976934e7bb..60d7241b1f3 100644
--- a/dev-haskell/hdbc-mysql/Manifest
+++ b/dev-haskell/hdbc-mysql/Manifest
@@ -1,2 +1 @@
-DIST HDBC-mysql-0.6.6.1.tar.gz 23120 BLAKE2B 
117c7a8c8c366dd3a4c128f97105812330d85eabf4f6ade8acd1e13c31cd2a57b3b904d0d76887ab5e45fe1f3c4a527c8ca1778e5ae736ae7dbae2e36a9a7c9d
 SHA512 
be74be365021df54c9660af699cfec05271444da0042152c944d43927efcf7cf78712d3bfe25796f944af409b9eb24ab903c0b92bb6b3c6dbcf0a3ee057366bf
 DIST HDBC-mysql-0.7.1.0.tar.gz 24086 BLAKE2B 
fd480ef5a3374aa8c6d36bd4f34fb1cb558769a134f60ce1b94cba7143b93adecc2cff6253cb1afbefe52c9ed8081fc7f812f7bc6539c043f783e9ced10ff4d7
 SHA512 
aec9387f08c16c8ccb6df1ca82e69005105a2781e253b6b8788665fa88e54a697601f99d10931ea6d3854dd9c0b43f062bccad1362a1512f5a2135cede0b0cc1

diff --git a/dev-haskell/hdbc-mysql/hdbc-mysql-0.6.6.1-r4.ebuild 
b/dev-haskell/hdbc-mysql/hdbc-mysql-0.6.6.1-r4.ebuild
deleted file mode 100644
index c77da18069b..000
--- a/dev-haskell/hdbc-mysql/hdbc-mysql-0.6.6.1-r4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.3.1.
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-CABAL_FEATURES+=" nocabaldep" # workaround depend on old cabal-1.16
-inherit haskell-cabal
-
-MY_PN="HDBC-mysql"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="MySQL driver for HDBC"
-HOMEPAGE="https://github.com/bos/hdbc-mysql;
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz;
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hdbc-2.1.0:=[profile?]
-   dev-haskell/utf8-string:=[profile?]
-   >=dev-lang/ghc-6.12.1:=
-   dev-db/mysql-connector-c:0=
-"
-DEPEND="${RDEPEND}
-   >=dev-haskell/cabal-1.6"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-   "${FILESDIR}/${P}"-cabal-1.18.patch
-   "${FILESDIR}/${P}"-extralib.patch
-)



[gentoo-commits] repo/gentoo:master commit in: dev-haskell/hdbc-postgresql/

2020-08-20 Thread Sergei Trofimovich
commit: 884d70d2404839e281233bc8ccbb85c8284a6f96
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Thu Aug 20 08:26:05 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Aug 20 08:27:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=884d70d2

dev-haskell/hdbc-postgresql: drop old

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sergei Trofimovich  gentoo.org>

 dev-haskell/hdbc-postgresql/Manifest   |  2 -
 .../hdbc-postgresql/hdbc-postgresql-2.3.2.3.ebuild | 63 --
 .../hdbc-postgresql-2.3.2.4-r1.ebuild  | 43 ---
 3 files changed, 108 deletions(-)

diff --git a/dev-haskell/hdbc-postgresql/Manifest 
b/dev-haskell/hdbc-postgresql/Manifest
index 0c97a020713..3fa7e42be53 100644
--- a/dev-haskell/hdbc-postgresql/Manifest
+++ b/dev-haskell/hdbc-postgresql/Manifest
@@ -1,3 +1 @@
-DIST HDBC-postgresql-2.3.2.3.tar.gz 25193 BLAKE2B 
1f93d2d50e87213415d102fd65bfa2a7d8a0fa5a6cb03223ffa42c6830837cc1ba61421a526756f22b497c7c7486551bac6421d9ddd704ec974d5428b0df656c
 SHA512 
407b18758e75e99230dbad56000839d8499c075e77b63809e079c7968e52177cc599dff30517f8cd08c3e4e263a71a4c65b3040c318b4b3358ff329824f4766f
-DIST HDBC-postgresql-2.3.2.4.tar.gz 25288 BLAKE2B 
9ecd290932ed83cd16159d8ea17379327040eb474ccae2819b95891475395e4ccd1d9724393c15f38053137afc8185bb8c1b6c90a11b76412a199a45104af394
 SHA512 
44f04536d04cf5b9778a03c5cce12d538b121a578e91b338753d64d69939852aacda57fca1e6dd22b5c2160bb29c71b2f8d8f63a9a7b62401db6f89e1d272364
 DIST HDBC-postgresql-2.3.2.7.tar.gz 25606 BLAKE2B 
0991686424f5912258fd1a9bdd40ef84d04a069a2ba14ce93678cce8f8fc1a73a10ed4c9fdf31a372e52a9833007e6469bcb9632d3f80022f240a3bac8aaca28
 SHA512 
0e4b27d5c18335e47b9782adcb09702654d9f8d04053110576a8a7ce68dc90810e35977886e2cbde0d4ef337aad5b36a4217dbfe07e1f64753f0cc34892d006e

diff --git a/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.3.2.3.ebuild 
b/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.3.2.3.ebuild
deleted file mode 100644
index 6efb2a04017..000
--- a/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.3.2.3.ebuild
+++ /dev/null
@@ -1,63 +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.5.
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-CABAL_FEATURES+=" nocabaldep" # workaround depend on old cabal-1.16
-inherit haskell-cabal
-
-MY_PN="HDBC-postgresql"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="PostgreSQL driver for HDBC"
-HOMEPAGE="https://github.com/hdbc/hdbc-postgresql;
-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 postgresql
-
-RDEPEND=">=dev-db/postgresql-7:*
-   dev-haskell/convertible:=[profile?]
-   >=dev-haskell/hdbc-2.2.0:2=[profile?]
-   dev-haskell/mtl:=[profile?]
-   dev-haskell/old-locale:=[profile?]
-   dev-haskell/old-time:=[profile?]
-   dev-haskell/parsec:=[profile?]
-   dev-haskell/utf8-string:=[profile?]
-   >=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-   >=dev-haskell/cabal-1.8.0.2
-   test? ( >=dev-haskell/hdbc-2.2.6:=[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 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-postgresql/hdbc-postgresql-2.3.2.4-r1.ebuild 
b/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.3.2.4-r1.ebuild
deleted file mode 100644
index 1a2faf34130..000
--- a/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.3.2.4-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.
-#hackport: flags: +splitbase
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="HDBC-postgresql"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="PostgreSQL driver for HDBC"
-HOMEPAGE="https://github.com/hdbc/hdbc-postgresql;
-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/postgresql-7:*
-   dev-haskell/convertible:=[profile?]
-   >=dev-haskell/hdbc-2.2.0:2=[profile?]
-   dev-haskell/mtl:=[profile?]
-   

[gentoo-commits] repo/gentoo:master commit in: dev-haskell/hdbc-odbc/

2020-08-20 Thread Sergei Trofimovich
commit: 540c959510d295f7ec383c0a7c46f3d99707434d
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Thu Aug 20 08:26:19 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Aug 20 08:27:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=540c9595

dev-haskell/hdbc-odbc: drop old

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sergei Trofimovich  gentoo.org>

 dev-haskell/hdbc-odbc/Manifest |  1 -
 dev-haskell/hdbc-odbc/hdbc-odbc-2.3.1.1.ebuild | 65 --
 2 files changed, 66 deletions(-)

diff --git a/dev-haskell/hdbc-odbc/Manifest b/dev-haskell/hdbc-odbc/Manifest
index 43cba7cfe12..d6df0a9cd61 100644
--- a/dev-haskell/hdbc-odbc/Manifest
+++ b/dev-haskell/hdbc-odbc/Manifest
@@ -1,2 +1 @@
-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

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 62ce679b5c5..000
--- 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.
-
-# 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"
-}



[gentoo-commits] repo/gentoo:master commit in: dev-haskell/hdbc/

2020-08-20 Thread Sergei Trofimovich
commit: eb30ac21ac9ef64ca9459fec37426ff43715b427
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Thu Aug 20 08:26:42 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Aug 20 08:27:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb30ac21

dev-haskell/hdbc: drop old

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sergei Trofimovich  gentoo.org>

 dev-haskell/hdbc/Manifest|  2 --
 dev-haskell/hdbc/hdbc-2.3.1.2.ebuild | 62 ---
 dev-haskell/hdbc/hdbc-2.4.0.1.ebuild | 63 
 3 files changed, 127 deletions(-)

diff --git a/dev-haskell/hdbc/Manifest b/dev-haskell/hdbc/Manifest
index c27f2313eae..b22461360e6 100644
--- a/dev-haskell/hdbc/Manifest
+++ b/dev-haskell/hdbc/Manifest
@@ -1,3 +1 @@
-DIST HDBC-2.3.1.2.tar.gz 23314 BLAKE2B 
cc6eca2703be4768ea55b7264f960419378e415d165d63b64ac903a5228534cedec7b7e2d9f5c3284781b5a3f253a020deadd3e335bcfa46a77df746e8e99291
 SHA512 
e98ca4043c311eb8e5adb02d1a59bc0d1be84ba66c224b848649a596de214a2a38b8bedfe71fa8f17ae0843cf073e814c76e7e868aca1e20619e3d5fa573109c
-DIST HDBC-2.4.0.1.tar.gz 23415 BLAKE2B 
a63037329bd68e09c343497dd0d95a36675872122ff30bbf40ca108f8bd56454df354628b2317c11745ba58c60b5a9023128253e07a24622c1b34ef7356d07f2
 SHA512 
1a20a533ffe7700cfb48c9875e9c6b09f940c1b808fd1a371327eed9c358abfe0167d206bb5b2dbb904b49f2081f91f81091d4164aad2aa08555f6de01a55d5a
 DIST HDBC-2.4.0.3.tar.gz 23489 BLAKE2B 
23de627666bc4a03c5f3ec93607641c539c1652a4fa9b798dbfd1f9c09ebcffc562bda88e45a522e38753177d69ee0585c9536ab6b6c353747373b751ead7f2a
 SHA512 
394a74e69ff854e657f66f1fe25ff4d2de33bf4410d560454ec7a2cd3e383586acc34eb694a7d1d70005871240417ee32d4163af9e33978921bfbcfcfe23fe43

diff --git a/dev-haskell/hdbc/hdbc-2.3.1.2.ebuild 
b/dev-haskell/hdbc/hdbc-2.3.1.2.ebuild
deleted file mode 100644
index c346de331f6..000
--- a/dev-haskell/hdbc/hdbc-2.3.1.2.ebuild
+++ /dev/null
@@ -1,62 +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.
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal versionator
-
-MY_PN="HDBC"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Haskell Database Connectivity"
-HOMEPAGE="https://github.com/hdbc/hdbc;
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz;
-
-LICENSE="BSD"
-SLOT="2/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="mysql odbc postgres sqlite test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-haskell/convertible-1.0.10.0:=[profile?] 
=dev-lang/ghc-6.12.1:="
-DEPEND="${RDEPEND}
-   >=dev-haskell/cabal-1.8
-   test? ( dev-haskell/hunit
-   dev-haskell/quickcheck
-   dev-haskell/testpack
-   )
-   "
-
-DEPENDV="$(get_version_component_range 1-2)"
-PDEPEND="mysql? ( dev-haskell/hdbc-mysql )
-   odbc? ( =dev-haskell/hdbc-odbc-${DEPENDV}* )
-   postgres? ( =dev-haskell/hdbc-postgresql-${DEPENDV}* )
-   sqlite? ( >=dev-haskell/hdbc-sqlite3-${DEPENDV} )"
-
-S="${WORKDIR}/${MY_P}"
-
-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/hdbc-2.4.0.1.ebuild 
b/dev-haskell/hdbc/hdbc-2.4.0.1.ebuild
deleted file mode 100644
index b23df73dfef..000
--- a/dev-haskell/hdbc/hdbc-2.4.0.1.ebuild
+++ /dev/null
@@ -1,63 +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.
-#hackport: flags: buildtests:test
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="HDBC"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Haskell Database Connectivity"
-HOMEPAGE="https://github.com/hdbc/hdbc;
-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" # Tests do not compile with time 1.5
-
-RDEPEND=">=dev-haskell/convertible-1.1.0.0:=[profile?]
-   dev-haskell/mtl:=[profile?]
-   dev-haskell/text:=[profile?]
-   dev-haskell/utf8-string:=[profile?]
-   >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-   >=dev-haskell/cabal-1.8
-   test? ( dev-haskell/hunit:=[profile?]
-   >=dev-haskell/quickcheck-2.0:2=[profile?]
-   >=dev-haskell/testpack-2.0:=[profile?] )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-   cabal_chdeps \
-   'time >= 1.5 && < 1.6' 

[gentoo-commits] repo/gentoo:master commit in: dev-haskell/hdbc-postgresql/

2019-12-14 Thread Sergei Trofimovich
commit: 4f3cf536adcbbad9679859746581740a4c96a41e
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Dec 14 20:59:27 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Dec 14 21:27:04 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f3cf536

dev-haskell/hdbc-postgresql: bump up to 2.3.2.7

Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Sergei Trofimovich  gentoo.org>

 dev-haskell/hdbc-postgresql/Manifest   |  1 +
 .../hdbc-postgresql/hdbc-postgresql-2.3.2.7.ebuild | 43 ++
 2 files changed, 44 insertions(+)

diff --git a/dev-haskell/hdbc-postgresql/Manifest 
b/dev-haskell/hdbc-postgresql/Manifest
index 0975aaeaffb..0c97a020713 100644
--- a/dev-haskell/hdbc-postgresql/Manifest
+++ b/dev-haskell/hdbc-postgresql/Manifest
@@ -1,2 +1,3 @@
 DIST HDBC-postgresql-2.3.2.3.tar.gz 25193 BLAKE2B 
1f93d2d50e87213415d102fd65bfa2a7d8a0fa5a6cb03223ffa42c6830837cc1ba61421a526756f22b497c7c7486551bac6421d9ddd704ec974d5428b0df656c
 SHA512 
407b18758e75e99230dbad56000839d8499c075e77b63809e079c7968e52177cc599dff30517f8cd08c3e4e263a71a4c65b3040c318b4b3358ff329824f4766f
 DIST HDBC-postgresql-2.3.2.4.tar.gz 25288 BLAKE2B 
9ecd290932ed83cd16159d8ea17379327040eb474ccae2819b95891475395e4ccd1d9724393c15f38053137afc8185bb8c1b6c90a11b76412a199a45104af394
 SHA512 
44f04536d04cf5b9778a03c5cce12d538b121a578e91b338753d64d69939852aacda57fca1e6dd22b5c2160bb29c71b2f8d8f63a9a7b62401db6f89e1d272364
+DIST HDBC-postgresql-2.3.2.7.tar.gz 25606 BLAKE2B 
0991686424f5912258fd1a9bdd40ef84d04a069a2ba14ce93678cce8f8fc1a73a10ed4c9fdf31a372e52a9833007e6469bcb9632d3f80022f240a3bac8aaca28
 SHA512 
0e4b27d5c18335e47b9782adcb09702654d9f8d04053110576a8a7ce68dc90810e35977886e2cbde0d4ef337aad5b36a4217dbfe07e1f64753f0cc34892d006e

diff --git a/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.3.2.7.ebuild 
b/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.3.2.7.ebuild
new file mode 100644
index 000..2942d5b0348
--- /dev/null
+++ b/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.3.2.7.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.
+#hackport: flags: +splitbase
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+MY_PN="HDBC-postgresql"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="PostgreSQL driver for HDBC"
+HOMEPAGE="https://github.com/hdbc/hdbc-postgresql;
+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/postgresql-7:*
+   dev-haskell/convertible:=[profile?]
+   >=dev-haskell/hdbc-2.2.0:2=[profile?]
+   dev-haskell/mtl:=[profile?]
+   dev-haskell/old-locale:=[profile?]
+   dev-haskell/old-time:=[profile?]
+   dev-haskell/parsec:=[profile?]
+   dev-haskell/utf8-string:=[profile?]
+   >=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+   >=dev-haskell/cabal-1.8 

[gentoo-commits] repo/gentoo:master commit in: dev-haskell/hdbc/

2019-12-14 Thread Sergei Trofimovich
commit: ccab3605efeb4092b03c4acac50f62804cee8b32
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Dec 14 21:01:15 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Dec 14 21:27:05 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccab3605

dev-haskell/hdbc: bump up to 2.4.0.3

Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Sergei Trofimovich  gentoo.org>

 dev-haskell/hdbc/Manifest|  1 +
 dev-haskell/hdbc/hdbc-2.4.0.3.ebuild | 61 
 2 files changed, 62 insertions(+)

diff --git a/dev-haskell/hdbc/Manifest b/dev-haskell/hdbc/Manifest
index b79794b7da7..c27f2313eae 100644
--- a/dev-haskell/hdbc/Manifest
+++ b/dev-haskell/hdbc/Manifest
@@ -1,2 +1,3 @@
 DIST HDBC-2.3.1.2.tar.gz 23314 BLAKE2B 
cc6eca2703be4768ea55b7264f960419378e415d165d63b64ac903a5228534cedec7b7e2d9f5c3284781b5a3f253a020deadd3e335bcfa46a77df746e8e99291
 SHA512 
e98ca4043c311eb8e5adb02d1a59bc0d1be84ba66c224b848649a596de214a2a38b8bedfe71fa8f17ae0843cf073e814c76e7e868aca1e20619e3d5fa573109c
 DIST HDBC-2.4.0.1.tar.gz 23415 BLAKE2B 
a63037329bd68e09c343497dd0d95a36675872122ff30bbf40ca108f8bd56454df354628b2317c11745ba58c60b5a9023128253e07a24622c1b34ef7356d07f2
 SHA512 
1a20a533ffe7700cfb48c9875e9c6b09f940c1b808fd1a371327eed9c358abfe0167d206bb5b2dbb904b49f2081f91f81091d4164aad2aa08555f6de01a55d5a
+DIST HDBC-2.4.0.3.tar.gz 23489 BLAKE2B 
23de627666bc4a03c5f3ec93607641c539c1652a4fa9b798dbfd1f9c09ebcffc562bda88e45a522e38753177d69ee0585c9536ab6b6c353747373b751ead7f2a
 SHA512 
394a74e69ff854e657f66f1fe25ff4d2de33bf4410d560454ec7a2cd3e383586acc34eb694a7d1d70005871240417ee32d4163af9e33978921bfbcfcfe23fe43

diff --git a/dev-haskell/hdbc/hdbc-2.4.0.3.ebuild 
b/dev-haskell/hdbc/hdbc-2.4.0.3.ebuild
new file mode 100644
index 000..fb05e030b9d
--- /dev/null
+++ b/dev-haskell/hdbc/hdbc-2.4.0.3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.
+#hackport: flags: buildtests:test
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+MY_PN="HDBC"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Haskell Database Connectivity"
+HOMEPAGE="https://github.com/hdbc/hdbc;
+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 dev-haskell/testpack (deprecated), and this is a 
problem.
+
+RDEPEND=">=dev-haskell/convertible-1.1.0.0:=[profile?]
+   dev-haskell/mtl:=[profile?]
+   dev-haskell/old-locale:=[profile?]
+   dev-haskell/old-time:=[profile?]
+   dev-haskell/text:=[profile?]
+   dev-haskell/utf8-string:=[profile?]
+   >=dev-lang/ghc-7.4.1:=
+   test? ( dev-haskell/hunit:=[profile?]
+   >=dev-haskell/quickcheck-2.0:2=[profile?]
+   >=dev-haskell/testpack-2.0:=[profile?] )
+"
+DEPEND="${RDEPEND}
+   >=dev-haskell/cabal-1.8
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+   haskell-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"
+}



[gentoo-commits] repo/gentoo:master commit in: dev-haskell/hdbc-mysql/

2018-09-17 Thread Sergei Trofimovich
commit: 1ac14e8691705d7bedfe58bc78a97ba60c53a655
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Sep 17 21:10:00 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Sep 17 21:10:22 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ac14e86

dev-haskell/hdbc-mysql: move off virtual/mysql, bug #665866

Move off virtual/mysql to dev-db/mysql-connector-c
as a library provider (with proper subslot).

Reported-by: Brian Evans
Closes: https://bugs.gentoo.org/665866
Package-Manager: Portage-2.3.49, Repoman-2.3.10

 ...hdbc-mysql-0.6.6.1-r3.ebuild => hdbc-mysql-0.6.6.1-r4.ebuild} | 9 +
 .../{hdbc-mysql-0.7.1.0.ebuild => hdbc-mysql-0.7.1.0-r1.ebuild}  | 6 +++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/dev-haskell/hdbc-mysql/hdbc-mysql-0.6.6.1-r3.ebuild 
b/dev-haskell/hdbc-mysql/hdbc-mysql-0.6.6.1-r4.ebuild
similarity index 84%
rename from dev-haskell/hdbc-mysql/hdbc-mysql-0.6.6.1-r3.ebuild
rename to dev-haskell/hdbc-mysql/hdbc-mysql-0.6.6.1-r4.ebuild
index 861ba83ab5c..2ec895f2184 100644
--- a/dev-haskell/hdbc-mysql/hdbc-mysql-0.6.6.1-r3.ebuild
+++ b/dev-haskell/hdbc-mysql/hdbc-mysql-0.6.6.1-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,9 +22,10 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/hdbc-2.1.0:=[profile?]
-   dev-haskell/utf8-string:=[profile?]
-   >=dev-lang/ghc-6.12.1:=
-   virtual/mysql"
+   dev-haskell/utf8-string:=[profile?]
+   >=dev-lang/ghc-6.12.1:=
+   dev-db/mysql-connector-c:0=
+"
 DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.6"
 

diff --git a/dev-haskell/hdbc-mysql/hdbc-mysql-0.7.1.0.ebuild 
b/dev-haskell/hdbc-mysql/hdbc-mysql-0.7.1.0-r1.ebuild
similarity index 89%
rename from dev-haskell/hdbc-mysql/hdbc-mysql-0.7.1.0.ebuild
rename to dev-haskell/hdbc-mysql/hdbc-mysql-0.7.1.0-r1.ebuild
index ce4e1c94bf6..23370ec0b51 100644
--- a/dev-haskell/hdbc-mysql/hdbc-mysql-0.7.1.0.ebuild
+++ b/dev-haskell/hdbc-mysql/hdbc-mysql-0.7.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,9 +23,9 @@ IUSE="debug"
 RDEPEND=">=dev-haskell/hdbc-2.1.0:2=[profile?]
dev-haskell/utf8-string:=[profile?]
>=dev-lang/ghc-8.0.1:=
-   dev-libs/openssl
+   dev-libs/openssl:0=
sys-libs/zlib
-   >=virtual/mysql-4.0
+   dev-db/mysql-connector-c:0=
 "
 DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.24.0.0



[gentoo-commits] repo/gentoo:master commit in: dev-haskell/hdbc-mysql/

2017-10-19 Thread Jonas Stein
commit: 1333594f37dde269d540cc98ea24e2035d44045b
Author: Jonas Stein  gentoo  org>
AuthorDate: Thu Oct 19 21:21:32 2017 +
Commit: Jonas Stein  gentoo  org>
CommitDate: Thu Oct 19 21:21:32 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1333594f

dev-haskell/hdbc-mysql: Remove proxy-maint

Remove proxy maintainer project from metadata, because there was no
proxied maintainer left.
Reported-By: Michael Mair-Keimberger
Package-Manager: Portage-2.3.11, Repoman-2.3.3

 dev-haskell/hdbc-mysql/metadata.xml | 4 
 1 file changed, 4 deletions(-)

diff --git a/dev-haskell/hdbc-mysql/metadata.xml 
b/dev-haskell/hdbc-mysql/metadata.xml
index 7fca400db6e..8aa39248b6d 100644
--- a/dev-haskell/hdbc-mysql/metadata.xml
+++ b/dev-haskell/hdbc-mysql/metadata.xml
@@ -5,10 +5,6 @@
hask...@gentoo.org
Gentoo Haskell

-   
-   proxy-ma...@gentoo.org
-   Proxy Maintainers
-   

This package provides a MySQL driver for HDBC, implemented via
bindings to the C @mysqlclient@ library.



[gentoo-commits] repo/gentoo:master commit in: dev-haskell/hdbc-sqlite/files/

2017-03-25 Thread Sergei Trofimovich
commit: 20626169d0f88ed5bc9147a1c01fdd2c2ddf1d49
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Mar 25 18:49:22 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Mar 25 19:07:56 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20626169

dev-haskell/hdbc-sqlite: drop unused files/

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-haskell/hdbc-sqlite/files/TestTime.hs | 100 --
 1 file changed, 100 deletions(-)

diff --git a/dev-haskell/hdbc-sqlite/files/TestTime.hs 
b/dev-haskell/hdbc-sqlite/files/TestTime.hs
deleted file mode 100644
index 5fd77da6105..000
--- a/dev-haskell/hdbc-sqlite/files/TestTime.hs
+++ /dev/null
@@ -1,100 +0,0 @@
-module TestTime(tests) where
-import Test.HUnit
-import Database.HDBC
-import TestUtils
-import Control.Exception
-import Data.Time
-import Data.Time.LocalTime
-import Data.Time.Clock.POSIX
-import Data.Maybe
-import Data.Convertible
-import SpecificDB
-import System.Locale(defaultTimeLocale)
-import Database.HDBC.Locale (iso8601DateFormat)
-import qualified System.Time as ST
-
-instance Eq ZonedTime where
-a == b = zonedTimeToUTC a == zonedTimeToUTC b &&
- zonedTimeZone a == zonedTimeZone b
-
-testZonedTime :: ZonedTime
-testZonedTime = fromJust $ parseTime defaultTimeLocale (iso8601DateFormat 
(Just "%T %z"))
- "1989-08-01 15:33:01 -0500"
-
-testZonedTimeFrac :: ZonedTime
-testZonedTimeFrac = fromJust $ parseTime defaultTimeLocale (iso8601DateFormat 
(Just "%T%Q %z"))
-"1989-08-01 15:33:01.536 -0500"
-
-
-rowdata t = [[SqlInt32 100, toSql t, SqlNull]]
-
-testDTType inputdata convToSqlValue = dbTestCase $ \dbh ->
-do run dbh ("CREATE TABLE hdbctesttime (testid INTEGER PRIMARY KEY NOT 
NULL, \
-\testvalue " ++ dateTimeTypeOfSqlValue value ++ ")") []
-   finally (testIt dbh) (do commit dbh
-run dbh "DROP TABLE hdbctesttime" []
-commit dbh
-)
-where testIt dbh =
-  do run dbh "INSERT INTO hdbctesttime (testid, testvalue) VALUES 
(?, ?)"
- [iToSql 5, value]
- commit dbh
- r <- quickQuery' dbh "SELECT testid, testvalue FROM 
hdbctesttime" []
- case r of
-   [[testidsv, testvaluesv]] -> 
-   do assertEqual "testid" (5::Int) (fromSql testidsv)
-  assertEqual "testvalue" inputdata (fromSql 
testvaluesv)
-  value = convToSqlValue inputdata
-
-mkTest label inputdata convfunc =
-TestLabel label (testDTType inputdata convfunc)
-
-tests = TestList $
-((TestLabel "Non-frac" $ testIt testZonedTime) :
- if supportsFracTime then [TestLabel "Frac" $ testIt testZonedTimeFrac] 
else [])
-
-testIt baseZonedTime = 
-TestList [mkTest "Day" baseDay toSql,
-  mkTest "TimeOfDay" baseTimeOfDay toSql,
-  mkTest "ZonedTimeOfDay" baseZonedTimeOfDay toSql,
-  mkTest "LocalTime" baseLocalTime toSql,
-  mkTest "ZonedTime" baseZonedTime toSql,
-  mkTest "UTCTime" baseUTCTime toSql,
-  mkTest "DiffTime" baseDiffTime toSql,
-  mkTest "POSIXTime" basePOSIXTime posixToSql,
-  mkTest "ClockTime" baseClockTime toSql,
-  mkTest "CalendarTime" baseCalendarTime toSql,
-  mkTest "TimeDiff" baseTimeDiff toSql
- ]
-where 
-  baseDay :: Day
-  baseDay = localDay baseLocalTime
-
-  baseTimeOfDay :: TimeOfDay
-  baseTimeOfDay = localTimeOfDay baseLocalTime
-
-  baseZonedTimeOfDay :: (TimeOfDay, TimeZone)
-  baseZonedTimeOfDay = fromSql (SqlZonedTime baseZonedTime)
-
-  baseLocalTime :: LocalTime
-  baseLocalTime = zonedTimeToLocalTime baseZonedTime
-
-  baseUTCTime :: UTCTime
-  baseUTCTime = convert baseZonedTime
-
-  baseDiffTime :: NominalDiffTime
-  baseDiffTime = basePOSIXTime
-
-  basePOSIXTime :: POSIXTime
-  basePOSIXTime = convert baseZonedTime
-
-  baseTimeDiff :: ST.TimeDiff
-  baseTimeDiff = convert baseDiffTime
-
-  -- No fractional parts for these two
-
-  baseClockTime :: ST.ClockTime
-  baseClockTime = convert testZonedTime
-
-  baseCalendarTime :: ST.CalendarTime
-  baseCalendarTime = convert testZonedTime



[gentoo-commits] repo/gentoo:master commit in: dev-haskell/hdbc-mysql/

2017-02-16 Thread Sergei Trofimovich
commit: 8d87ab803670135dd3d4c4a6a59ca335d185634d
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Thu Feb 16 21:55:35 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Feb 16 21:57:19 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d87ab80

dev-haskell/hdbc-mysql: bump up to 0.7.1.0

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-haskell/hdbc-mysql/Manifest  |  1 +
 dev-haskell/hdbc-mysql/hdbc-mysql-0.7.1.0.ebuild | 40 
 2 files changed, 41 insertions(+)

diff --git a/dev-haskell/hdbc-mysql/Manifest b/dev-haskell/hdbc-mysql/Manifest
index a61bdad692..3de30b8b00 100644
--- a/dev-haskell/hdbc-mysql/Manifest
+++ b/dev-haskell/hdbc-mysql/Manifest
@@ -1 +1,2 @@
 DIST HDBC-mysql-0.6.6.1.tar.gz 23120 SHA256 
35f1f32f20e9122800cde9eaf07d41e17b8786269f79125e31502cadacefa0e0 SHA512 
be74be365021df54c9660af699cfec05271444da0042152c944d43927efcf7cf78712d3bfe25796f944af409b9eb24ab903c0b92bb6b3c6dbcf0a3ee057366bf
 WHIRLPOOL 
274a15ab1f8b4dee2870c95319b6199803050087bd200540fe1f817ef5c0edae982398887f5c66e3da3accce671647e914c36e662ae9ca1122bc975ac92ba6a9
+DIST HDBC-mysql-0.7.1.0.tar.gz 24086 SHA256 
81c985d4a243c965930fb412b3175ca799ba66985f8b6844014fd600df1da7cf SHA512 
aec9387f08c16c8ccb6df1ca82e69005105a2781e253b6b8788665fa88e54a697601f99d10931ea6d3854dd9c0b43f062bccad1362a1512f5a2135cede0b0cc1
 WHIRLPOOL 
84179d2edef809838e8694844c52a6093f0334af936179c3e014aa4bae78d782139a021569adf43e7ab9984c018f9a2abd2968a64302170ffb1722c626436b9a

diff --git a/dev-haskell/hdbc-mysql/hdbc-mysql-0.7.1.0.ebuild 
b/dev-haskell/hdbc-mysql/hdbc-mysql-0.7.1.0.ebuild
new file mode 100644
index 00..9c8778a191
--- /dev/null
+++ b/dev-haskell/hdbc-mysql/hdbc-mysql-0.7.1.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.1.
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+MY_PN="HDBC-mysql"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="MySQL driver for HDBC"
+HOMEPAGE="https://github.com/ryantm/hdbc-mysql;
+SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND=">=dev-haskell/hdbc-2.1.0:2=[profile?]
+   dev-haskell/utf8-string:=[profile?]
+   >=dev-lang/ghc-8.0.1:=
+   dev-libs/openssl
+   sys-libs/zlib
+   >=virtual/mysql-4.0
+"
+DEPEND="${RDEPEND}
+   >=dev-haskell/cabal-1.24.0.0
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+   haskell-cabal_src_configure \
+   $(cabal_flag debug debug)
+}



[gentoo-commits] repo/gentoo:master commit in: dev-haskell/hdbc-odbc/files/

2016-08-03 Thread Patrice Clement
commit: 7c713ca3da4e9d535c1106fdfe3295bea68f
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Wed Jul 27 16:57:25 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Wed Aug  3 07:21:54 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c713ca3

dev-haskell/hdbc-odbc: remove unused patch

Signed-off-by: Patrice Clement  gentoo.org>

 .../files/hdbc-odbc-2.3.1.0-ghc-6.12.patch | 37 --
 1 file changed, 37 deletions(-)

diff --git a/dev-haskell/hdbc-odbc/files/hdbc-odbc-2.3.1.0-ghc-6.12.patch 
b/dev-haskell/hdbc-odbc/files/hdbc-odbc-2.3.1.0-ghc-6.12.patch
deleted file mode 100644
index 791656b..000
--- a/dev-haskell/hdbc-odbc/files/hdbc-odbc-2.3.1.0-ghc-6.12.patch
+++ /dev/null
@@ -1,37 +0,0 @@
 HDBC-odbc-2.3.1.0-orig/HDBC-odbc.cabal 2011-08-10 07:16:38.0 
+1000
-+++ HDBC-odbc-2.3.1.0/HDBC-odbc.cabal  2011-08-12 14:51:43.510895477 +1000
-@@ -37,10 +37,10 @@
- ExistentialQuantification,
- ForeignFunctionInterface,
- ScopedTypeVariables
--  Build-Depends: base >= 4.3.1.0 && < 5
-+  Build-Depends: base >= 4.2.0.2 && < 5
-, mtl
-, HDBC>=2.1.0
--   , time>=1.2.0.3
-+   , time>=1.1.4
-, utf8-string
-, bytestring
-   GHC-Options: -O2
 HDBC-odbc-2.3.1.0-orig/Database/HDBC/ODBC/Statement.hsc2011-08-10 
07:16:38.0 +1000
-+++ HDBC-odbc-2.3.1.0/Database/HDBC/ODBC/Statement.hsc 2011-08-12 
15:16:11.585672600 +1000
-@@ -17,7 +17,7 @@
- import Database.HDBC.ODBC.Utils
- import Database.HDBC.ODBC.TypeConv
- 
--import Foreign.C.String (castCUCharToChar)
-+import GHC.Base (unsafeChr)
- import Foreign.C.Types
- import Foreign.ForeignPtr
- import Foreign.Ptr
-@@ -55,6 +55,10 @@
- #let CALLCONV = "ccall"
- #endif
- 
-+-- | Convert a C @unsigned char@, representing a Latin-1 character, to
-+-- the corresponding Haskell character.
-+castCUCharToChar :: CUChar -> Char
-+castCUCharToChar ch = unsafeChr (fromIntegral (fromIntegral ch :: Word8))
- fGetQueryInfo :: Conn -> ChildList -> String
-   -> IO ([SqlColDesc], [(String, SqlColDesc)])
- fGetQueryInfo iconn children query =



[gentoo-commits] repo/gentoo:master commit in: dev-haskell/hdbc-sqlite/files/

2016-08-03 Thread Patrice Clement
commit: 99cf2cc358a202ac7f8742c3724e1aeaf0bcf0c6
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Wed Jul 27 17:00:50 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Wed Aug  3 07:21:54 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99cf2cc3

dev-haskell/hdbc-sqlite: remove unused patch

Signed-off-by: Patrice Clement  gentoo.org>

 .../files/HDBC-sqlite3-2.3.3.0-ghc-7.6.patch   | 52 --
 1 file changed, 52 deletions(-)

diff --git a/dev-haskell/hdbc-sqlite/files/HDBC-sqlite3-2.3.3.0-ghc-7.6.patch 
b/dev-haskell/hdbc-sqlite/files/HDBC-sqlite3-2.3.3.0-ghc-7.6.patch
deleted file mode 100644
index c0c0242..000
--- a/dev-haskell/hdbc-sqlite/files/HDBC-sqlite3-2.3.3.0-ghc-7.6.patch
+++ /dev/null
@@ -1,52 +0,0 @@
 HDBC-sqlite3-2.3.3.0-orig/testsrc/TestSbasics.hs   2011-08-10 
07:08:57.0 +1000
-+++ HDBC-sqlite3-2.3.3.0/testsrc/TestSbasics.hs2012-10-13 
11:28:21.094200366 +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
-@@ -140,7 +144,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-sqlite3-2.3.3.0-orig/testsrc/Testbasics.hs2011-08-10 
07:08:57.0 +1000
-+++ HDBC-sqlite3-2.3.3.0/testsrc/Testbasics.hs 2012-10-13 11:27:20.025541058 
+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"]])
- 



[gentoo-commits] repo/gentoo:master commit in: dev-haskell/hdbc-postgresql/files/

2016-08-03 Thread Patrice Clement
commit: 4ca2514ffd41f20b7c8a1bdb305f924950fae9de
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Wed Jul 27 16:58:47 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Wed Aug  3 07:21:54 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ca2514f

dev-haskell/hdbc-postgresql: remove unused patch

Signed-off-by: Patrice Clement  gentoo.org>

 .../files/HDBC-postgresql-2.3.2.1-ghc-7.6.patch| 53 --
 1 file changed, 53 deletions(-)

diff --git 
a/dev-haskell/hdbc-postgresql/files/HDBC-postgresql-2.3.2.1-ghc-7.6.patch 
b/dev-haskell/hdbc-postgresql/files/HDBC-postgresql-2.3.2.1-ghc-7.6.patch
deleted file mode 100644
index 2f81f35..000
--- a/dev-haskell/hdbc-postgresql/files/HDBC-postgresql-2.3.2.1-ghc-7.6.patch
+++ /dev/null
@@ -1,53 +0,0 @@
 HDBC-postgresql-2.3.2.1-orig/testsrc/TestSbasics.hs2012-03-04 
04:08:01.0 +1100
-+++ HDBC-postgresql-2.3.2.1/testsrc/TestSbasics.hs 2012-10-13 
11:08:27.482597846 +1100
-@@ -1,10 +1,14 @@
-+{-# LANGUAGE CPP, ScopedTypeVariables #-}
- module TestSbasics(tests) where
- import Test.HUnit
- import Data.List
- 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
-@@ -142,7 +146,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-postgresql-2.3.2.1-orig/testsrc/Testbasics.hs 2012-03-04 
04:08:01.0 +1100
-+++ HDBC-postgresql-2.3.2.1/testsrc/Testbasics.hs  2012-10-13 
11:07:43.622396904 +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"]])
- 



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

2016-08-03 Thread Patrice Clement
commit: a048cf987bceef8bf658534a01a198a9eaa5336a
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Wed Jul 27 16:56:41 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Wed Aug  3 07:21:54 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a048cf98

dev-haskell/hdbc: remove unused patches

Signed-off-by: Patrice Clement  gentoo.org>

 .../hdbc/files/hdbc-2.4.0.0-ghc-7.10-1.patch   | 39 
 .../hdbc/files/hdbc-2.4.0.0-ghc-7.10-2.patch   | 43 --
 2 files changed, 82 deletions(-)

diff --git a/dev-haskell/hdbc/files/hdbc-2.4.0.0-ghc-7.10-1.patch 
b/dev-haskell/hdbc/files/hdbc-2.4.0.0-ghc-7.10-1.patch
deleted file mode 100644
index 6b79476..000
--- a/dev-haskell/hdbc/files/hdbc-2.4.0.0-ghc-7.10-1.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/Database/HDBC/Locale.hs b/Database/HDBC/Locale.hs
-index e62b1c1..976a6a9 100644
 a/Database/HDBC/Locale.hs
-+++ b/Database/HDBC/Locale.hs
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE CPP #-}
- module Database.HDBC.Locale
- (
-  defaultTimeLocale,
-@@ -5,7 +6,12 @@ module Database.HDBC.Locale
- )
- 
- where
-+
-+#if MIN_VERSION_time(1,5,0)
-+import Data.Time.Format (defaultTimeLocale)
-+#else
- import System.Locale (defaultTimeLocale)
-+#endif
- 
- -- | As the semantic of System.Locale.iso8601DateFormat has changed with
- --   old-locale-1.0.0.2 in a non-compatible way, we now define our own
-diff --git a/Database/HDBC/SqlValue.hs b/Database/HDBC/SqlValue.hs
-index 9724f81..0e278cd 100644
 a/Database/HDBC/SqlValue.hs
-+++ b/Database/HDBC/SqlValue.hs
-@@ -17,7 +17,11 @@ import Data.Char(ord,toUpper)
- import Data.Word
- import Data.Int
- import qualified System.Time as ST
--import Data.Time
-+import Data.Time ( Day (ModifiedJulianDay), DiffTime, LocalTime, 
NominalDiffTime, ParseTime
-+ , TimeOfDay, TimeZone, UTCTime, ZonedTime, formatTime, 
localDay, localTimeOfDay
-+ , parseTime, timeOfDayToTime, timeToTimeOfDay, 
toModifiedJulianDay, utc
-+ , utcToZonedTime, zonedTimeToLocalTime, zonedTimeToUTC, 
zonedTimeZone
-+ )
- import Data.Time.Clock.POSIX
- import Database.HDBC.Locale (defaultTimeLocale, iso8601DateFormat)
- import Data.Ratio

diff --git a/dev-haskell/hdbc/files/hdbc-2.4.0.0-ghc-7.10-2.patch 
b/dev-haskell/hdbc/files/hdbc-2.4.0.0-ghc-7.10-2.patch
deleted file mode 100644
index d4e78b6..000
--- a/dev-haskell/hdbc/files/hdbc-2.4.0.0-ghc-7.10-2.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff --git a/Database/HDBC/SqlValue.hs b/Database/HDBC/SqlValue.hs
-index 0e278cd..1ebf114 100644
 a/Database/HDBC/SqlValue.hs
-+++ b/Database/HDBC/SqlValue.hs
-@@ -19,8 +19,13 @@ import Data.Int
- import qualified System.Time as ST
- import Data.Time ( Day (ModifiedJulianDay), DiffTime, LocalTime, 
NominalDiffTime, ParseTime
-  , TimeOfDay, TimeZone, UTCTime, ZonedTime, formatTime, 
localDay, localTimeOfDay
-- , parseTime, timeOfDayToTime, timeToTimeOfDay, 
toModifiedJulianDay, utc
-+ , timeOfDayToTime, timeToTimeOfDay, toModifiedJulianDay, utc
-  , utcToZonedTime, zonedTimeToLocalTime, zonedTimeToUTC, 
zonedTimeZone
-+#if MIN_VERSION_time(1,5,0)
-+ , parseTimeM
-+#else
-+ , parseTime
-+#endif
-  )
- import Data.Time.Clock.POSIX
- import Database.HDBC.Locale (defaultTimeLocale, iso8601DateFormat)
-@@ -665,7 +670,11 @@ instance Convertible (TimeOfDay, TimeZone) SqlValue where
- instance Convertible SqlValue (TimeOfDay, TimeZone) where
- safeConvert (SqlString x) = 
- do tod <- parseTime' "%T%Q %z" x
-+#if MIN_VERSION_time(1,5,0)
-+   tz <- case parseTimeM True defaultTimeLocale "%T%Q %z" x of
-+#else
-tz <- case parseTime defaultTimeLocale "%T%Q %z" x of
-+#endif
-   Nothing -> convError "Couldn't extract timezone in" 
(SqlString x)
-   Just y -> Right y
-return (tod, tz)
-@@ -939,7 +948,11 @@ parseTime' _ inpstr =
- #else
- parseTime' :: (Typeable t, Convertible SqlValue t, ParseTime t) => String -> 
String -> ConvertResult t
- parseTime' fmtstr inpstr = 
-+#if MIN_VERSION_time(1,5,0)
-+case parseTimeM True defaultTimeLocale fmtstr inpstr of
-+#else
- case parseTime defaultTimeLocale fmtstr inpstr of
-+#endif
-   Nothing -> convError ("Cannot parse using default format string " ++ 
show fmtstr)
-  (SqlString inpstr)
-   Just x -> Right x



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

2016-05-08 Thread Sergei Trofimovich
commit: 948d88a9953c34e44262b46a18a3d6c8d6c9e454
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun May  8 10:19:34 2016 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun May  8 10:19:34 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=948d88a9

dev-haskell/hdbc-mysql: add missing mysql extralib

It's a backport of upstream
https://github.com/bos/hdbc-mysql/pull/13/commits/b69d35f7050b1d23f13586886fa73293cf8fb1ac

Reported-by: savior michael

Package-Manager: portage-2.2.28

 .../hdbc-mysql/files/hdbc-mysql-0.6.6.1-extralib.patch | 18 ++
 ...-0.6.6.1-r2.ebuild => hdbc-mysql-0.6.6.1-r3.ebuild} | 11 +++
 dev-haskell/hdbc-mysql/metadata.xml|  1 +
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/dev-haskell/hdbc-mysql/files/hdbc-mysql-0.6.6.1-extralib.patch 
b/dev-haskell/hdbc-mysql/files/hdbc-mysql-0.6.6.1-extralib.patch
new file mode 100644
index 000..8b99939
--- /dev/null
+++ b/dev-haskell/hdbc-mysql/files/hdbc-mysql-0.6.6.1-extralib.patch
@@ -0,0 +1,18 @@
+commit d53860f7edb75873e26329c159802b2ac5a6
+Author: Satoshi Nakamura 
+Date:   Tue May 27 15:44:57 2014 +0900
+
+Add mysqlclient to Extra-Libraries
+
+diff --git a/HDBC-mysql.cabal b/HDBC-mysql.cabal
+index 2d56d8b..6a8967a 100644
+--- a/HDBC-mysql.cabal
 b/HDBC-mysql.cabal
+@@ -32,6 +32,7 @@ library
+ time,
+ utf8-string
+   ghc-options:  -Wall
++  Extra-Libraries: mysqlclient
+ 
+ source-repository head
+   type: git

diff --git a/dev-haskell/hdbc-mysql/hdbc-mysql-0.6.6.1-r2.ebuild 
b/dev-haskell/hdbc-mysql/hdbc-mysql-0.6.6.1-r3.ebuild
similarity index 82%
rename from dev-haskell/hdbc-mysql/hdbc-mysql-0.6.6.1-r2.ebuild
rename to dev-haskell/hdbc-mysql/hdbc-mysql-0.6.6.1-r3.ebuild
index 3d53632..f01d7de 100644
--- a/dev-haskell/hdbc-mysql/hdbc-mysql-0.6.6.1-r2.ebuild
+++ b/dev-haskell/hdbc-mysql/hdbc-mysql-0.6.6.1-r3.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 # ebuild generated by hackport 0.3.1.
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 CABAL_FEATURES+=" nocabaldep" # workaround depend on old cabal-1.16
-inherit base haskell-cabal
+inherit haskell-cabal
 
 MY_PN="HDBC-mysql"
 MY_P="${MY_PN}-${PV}"
@@ -31,4 +31,7 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=("${FILESDIR}/${PN}-0.6.6.1-cabal-1.18.patch")
+PATCHES=(
+   "${FILESDIR}/${P}"-cabal-1.18.patch
+   "${FILESDIR}/${P}"-extralib.patch
+)

diff --git a/dev-haskell/hdbc-mysql/metadata.xml 
b/dev-haskell/hdbc-mysql/metadata.xml
index 7ed71ab..7fca400 100644
--- a/dev-haskell/hdbc-mysql/metadata.xml
+++ b/dev-haskell/hdbc-mysql/metadata.xml
@@ -3,6 +3,7 @@
 

hask...@gentoo.org
+   Gentoo Haskell


proxy-ma...@gentoo.org



[gentoo-commits] repo/gentoo:master commit in: dev-haskell/hdbc-sqlite/

2015-09-21 Thread Sergei Trofimovich
commit: ce461f92865acadfffa8913be72159f3b6b568a9
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Sep 21 19:58:27 2015 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Sep 21 19:58:49 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce461f92

dev-haskell/hdbc-sqlite: version bump, bug #561026

Reported-by: Toralf Förster
Bug: https://bugs.gentoo.org/show_bug.cgi?id=561026

Package-Manager: portage-2.2.20

 dev-haskell/hdbc-sqlite/Manifest   |  1 +
 dev-haskell/hdbc-sqlite/hdbc-sqlite-2.3.3.1.ebuild | 45 ++
 2 files changed, 46 insertions(+)

diff --git a/dev-haskell/hdbc-sqlite/Manifest b/dev-haskell/hdbc-sqlite/Manifest
index 772ab88..c9e98ba 100644
--- a/dev-haskell/hdbc-sqlite/Manifest
+++ b/dev-haskell/hdbc-sqlite/Manifest
@@ -1 +1,2 @@
 DIST HDBC-sqlite3-2.3.3.0.tar.gz 14827 SHA256 
22f972fc44e830d0db62313fb870cd9d020f3d8efff2928d4cdb3f66b52de684 SHA512 
66dfef4fd6dbaaaea4eadd3c5201a29f8f306170ef76dbf2e8a1f4239bcdcdd5b16d6d331c8a480a9e23209b2c86cfe981d7f83d4d3a0ba617dfdfb6663ad244
 WHIRLPOOL 
b39aa543bfb12923dce1666e29d4f327691540d289b4faa0a83f5cf2aba2eaa3bd107947621fd46ca44b02ba9badece79cb8dbdadf597ae05efb52dc0ae6
+DIST HDBC-sqlite3-2.3.3.1.tar.gz 15544 SHA256 
a783d9ab707ebfc68e3e46bd1bbb5d3d5493f50a7ccf31223d9848cff986ebea SHA512 
17b2929aca806d0672ae83e1aa6122a38596504a4f23f868f1a3ff4e68f97c3aef6499f995659fa4ce82b1e8aab9a107172a7265309d4c3f4e9754e4cf756ec0
 WHIRLPOOL 
f7a6102c83939cb9325450f4b3dc542c2f314d478df13c4ada4725c793731d0601829a80588ff2cdfc251286b208c0f2f6f796367f8a86b46c2962cd481163e2

diff --git a/dev-haskell/hdbc-sqlite/hdbc-sqlite-2.3.3.1.ebuild 
b/dev-haskell/hdbc-sqlite/hdbc-sqlite-2.3.3.1.ebuild
new file mode 100644
index 000..8404865
--- /dev/null
+++ b/dev-haskell/hdbc-sqlite/hdbc-sqlite-2.3.3.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+MY_PN="HDBC-sqlite3"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Sqlite v3 driver for HDBC"
+HOMEPAGE="https://github.com/hdbc/hdbc-sqlite3;
+SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-db/sqlite-3.0
+   >=dev-haskell/hdbc-2.3.0.0:2=[profile?]
+   dev-haskell/mtl:=[profile?]
+   dev-haskell/utf8-string:=[profile?]
+   >=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+   >=dev-haskell/cabal-1.2.3
+   test? ( dev-haskell/convertible:=[profile?]
+   dev-haskell/hunit:=[profile?]
+   dev-haskell/old-locale:=[profile?]
+   dev-haskell/old-time:=[profile?]
+   dev-haskell/testpack:=[profile?] )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+# The test suite doesn't work right now. See
+#
+#   https://github.com/hdbc/hdbc-sqlite3/pull/17
+#
+RESTRICT="test"