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

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

[Sergei Trofimovich]

commit:     1a15cea15c08b516a1a53d2aaf601100b7599098
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 30 07:39:19 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Aug 30 07:39:27 2020 +0000
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 <slyfox <AT> 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 00000000000..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)