[gentoo-commits] repo/gentoo:master commit in: dev-haskell/hdbc-mysql/, dev-haskell/hdbc-mysql/files/, profiles/
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-mysql/files/
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/
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-mysql/
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-mysql/
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/
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-mysql/
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-mysql/, dev-haskell/hdbc-mysql/files/
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