From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A6B2D138359 for ; Sun, 30 Aug 2020 07:39:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6D0A6E093E; Sun, 30 Aug 2020 07:39:35 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2B720E093E for ; Sun, 30 Aug 2020 07:39:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EA48C340DD2 for ; Sun, 30 Aug 2020 07:39:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 643D1335 for ; Sun, 30 Aug 2020 07:39:32 +0000 (UTC) From: "Sergei Trofimovich" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" Message-ID: <1598773167.1a15cea15c08b516a1a53d2aaf601100b7599098.slyfox@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-haskell/hdbc-mysql/files/, dev-haskell/hdbc-mysql/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-haskell/hdbc-mysql/files/hdbc-mysql-0.7.1.0-cabal-3.patch dev-haskell/hdbc-mysql/hdbc-mysql-0.7.1.0-r1.ebuild X-VCS-Directories: dev-haskell/hdbc-mysql/files/ dev-haskell/hdbc-mysql/ X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: 1a15cea15c08b516a1a53d2aaf601100b7599098 X-VCS-Branch: master Date: Sun, 30 Aug 2020 07:39:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f93f5eee-d2b4-497f-9dda-45e4e257e0e9 X-Archives-Hash: ae16b5557dc1fde69fef648a0aa99ec7 commit: 1a15cea15c08b516a1a53d2aaf601100b7599098 Author: Sergei Trofimovich gentoo org> AuthorDate: Sun Aug 30 07:39:19 2020 +0000 Commit: Sergei Trofimovich gentoo 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 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)