From 948d88a9953c34e44262b46a18a3d6c8d6c9e454 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 8 May 2016 11:19:34 +0100 Subject: [PATCH] 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 --- .../files/hdbc-mysql-0.6.6.1-extralib.patch | 18 ++++++++++++++++++ ...-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(-) create mode 100644 dev-haskell/hdbc-mysql/files/hdbc-mysql-0.6.6.1-extralib.patch rename dev-haskell/hdbc-mysql/{hdbc-mysql-0.6.6.1-r2.ebuild => hdbc-mysql-0.6.6.1-r3.ebuild} (82%) 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 000000000000..8b9993969cb3 --- /dev/null +++ b/dev-haskell/hdbc-mysql/files/hdbc-mysql-0.6.6.1-extralib.patch @@ -0,0 +1,18 @@ +commit d53860f7edb75873e263111129c159802b2ac5a6 +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 3d53632859cc..f01d7de39408 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.9999 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 7ed71aba93f4..7fca400db6e5 100644 --- a/dev-haskell/hdbc-mysql/metadata.xml +++ b/dev-haskell/hdbc-mysql/metadata.xml @@ -3,6 +3,7 @@ haskell@gentoo.org + Gentoo Haskell proxy-maint@gentoo.org -- 2.26.2