Fix Bug 514342 - dev-haskell/hdbc-mysql-0.6.6.1-r1 fails to build, based on the hdbc-postgresql patch by gracjan. Add virtual/mysql as suggested by grknight.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x618E971F

4 files changed, 84 insertions, 19 deletions

diff --git a/dev-haskell/hdbc-mysql/ChangeLog b/dev-haskell/hdbc-mysql/ChangeLog
index 15ef668ebb54..297fe7aff92c 100644
--- a/dev-haskell/hdbc-mysql/ChangeLog
+++ b/dev-haskell/hdbc-mysql/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-haskell/hdbc-mysql
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc-mysql/ChangeLog,v 1.5 2013/03/17 16:10:53 hwoarang Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc-mysql/ChangeLog,v 1.6 2014/07/03 12:37:30 gienah Exp $
+
+*hdbc-mysql-0.6.6.1-r2 (03 Jul 2014)
+
+  03 Jul 2014; Mark Wright <gienah@gentoo.org>
+  +files/hdbc-mysql-0.6.6.1-cabal-1.18.patch, +hdbc-mysql-0.6.6.1-r2.ebuild:
+  Fix Bug 514342 - dev-haskell/hdbc-mysql-0.6.6.1-r1 fails to build, based on
+  the hdbc-postgresql patch by gracjan. Add virtual/mysql as suggested by
+  grknight.
 
   17 Mar 2013; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
   Add proxy-maintainers to metadata.xml
diff --git a/dev-haskell/hdbc-mysql/Manifest b/dev-haskell/hdbc-mysql/Manifest
index e799df65a617..62b8d84e9600 100644
--- a/dev-haskell/hdbc-mysql/Manifest
+++ b/dev-haskell/hdbc-mysql/Manifest
@@ -1,26 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX hdbc-mysql-0.6.6.1-cabal-1.18.patch 1110 SHA256 35003c4f6f005cbce77fdbfea7bd397f15c0e47b08d0b77fa09a6c6c2b4b8957 SHA512 fca7c256c0035df6bf3e882a368e1207cee8177a1348e7502982b7085c0d81c667bdd905aa0ad5c04761aa8edd9e62809c690bcd220957769fba221f94c79e28 WHIRLPOOL a088d8c1d2d8c34c4903831909f02e96b338ac6692373f2fc610ac90d94bf9d52f917d0c024df83bab683aae90cb2e6e29c0f3e35b7592109a6d49983733aee4
 DIST HDBC-mysql-0.6.6.1.tar.gz 23120 SHA256 35f1f32f20e9122800cde9eaf07d41e17b8786269f79125e31502cadacefa0e0 SHA512 be74be365021df54c9660af699cfec05271444da0042152c944d43927efcf7cf78712d3bfe25796f944af409b9eb24ab903c0b92bb6b3c6dbcf0a3ee057366bf WHIRLPOOL 274a15ab1f8b4dee2870c95319b6199803050087bd200540fe1f817ef5c0edae982398887f5c66e3da3accce671647e914c36e662ae9ca1122bc975ac92ba6a9
 EBUILD hdbc-mysql-0.6.6.1-r1.ebuild 805 SHA256 f5e16e4433b5827c8cfad23c8726a6fe95bffec97b73961f6c8c6a4d94b5a35b SHA512 01a0a6d5a752649d3ed01d991187e82a37a80703259d74b62150dc541b509869ed659157e1bc1b4515d9da83f118711eb75bb22044172f46f4e523ccc6e04b0e WHIRLPOOL 3fb3466b1a5817903194371957e94a70c9ef07575efa9cbd50912e72070ac58a44dd992e9ca11e0df2bdec02a4f271a200b0ddbe8a87362dffc62689ad967562
-MISC ChangeLog 962 SHA256 7b51192a5acd6375affd919d049271e96aa2e35602c09ebf349936d3769cdeb1 SHA512 8e9a4ff860891637dbe104815de5200fed6a2d1fd5c14d33017312dce0fd4db3d23e0126ada324b37bea3a58ab33a5e0cde676b6e6861f587e72dac3e71ecab1 WHIRLPOOL 89f159db293c320c15c15571df7f7827a9a7a0def47c58d4398dd0e482f68b87dfab202f4c8fc3c7210026775bca893fa36e6ac19f2c713bacd2df68a6440c2b
+EBUILD hdbc-mysql-0.6.6.1-r2.ebuild 950 SHA256 efe9364ebec8c098be5ff1d8f82113d51751b01487489587f237f3dc2d396ec4 SHA512 45998bb81bf7ccf53c22a3b6b3973a45b8a11b66758537ded94b1bb3cbbd8e5db6b55fc0aca9662d8a5b68adfd281d30d667dd3302d3cf9bbdbda323ccaa615c WHIRLPOOL 76636f24dc34cc748337685a1beb776973b018eb17b70de0fe0c1460c7da80fc59f22bee3ace2fc2f08eb258fc2024f49323cd93e111c290aef17d8634db7a88
+MISC ChangeLog 1287 SHA256 2aab23a86ca7ca660ad8cafa3fcc887fb5dd3263c8c578253255034e3392673e SHA512 e9162e651129f841ffef7c3a046e14da668449993e45037cd0b46e150b2bcb8b07f6ce91ee2d36757bb668c759ad6213167f334d33db76fa46d22267e15404d9 WHIRLPOOL ddc65e7201cab18639f56b8759ae6e30456f166370ac846d388d1f6b347d0ada89225b77b8a1eb98627877ecce05f3c8d29a7107d632b4427e7b591ce8af0439
 MISC metadata.xml 405 SHA256 50d80c152236d2f34e249fddfa8d452653efd9f5b60d8e8c70d3da6ddbc7c59f SHA512 52e190dbc04cbbb03fa4e12347bc717c3e659b1b08ffe92964ec17b1fa5e0b2582c46d49ed9660e499691ae1c1f681b9b9f971a3cc6001dcfb0e2f527fd3d418 WHIRLPOOL 47a93b8841df05ae4d4c00a81d3b55a0b67b6e78d91260ed54bccf3d96dd04ab8aaf639ea06afbcbcf754e3cae7a6422120b8583808668f7d43918c15931827d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRResOXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88VHAQAM/W3+XaVV1vTH+dQ0eRJD6H
-CopxVG8TY/DiRQi+YObEcYJtIdXY9BKTYqTGPrARWM/+EmBiBixf++3qdNdQjKRy
-jMA+FGSactAxlzadQTQMz7VQoGnhf2wYyHM70mHIKvnhuGPkR8AB3rtZaNNeyMIj
-PTb/OLi4Pp5zWjDo8Z8XXJ+p9vg83JuBaMrkixaEQmGBGAKxr3DLpPGhd4/QD92S
-RMmCmUJE6DfSzk8rJrUUqRfGJ+2VApbmfLHEzT81cC9syjQp8vR0jmFMbv0W2OMN
-4pZSjMpWEEct6LDe2UhYgyKMMoq5oDGJS7JCXvHWNns7JvJlHqCvhGeOhSpgWraJ
-5A+JScA2HEunDiQU4FjqxzSuYk2t+JA9PE7QFPQ51jsKv1rK0ZanrX3SVCTzl+hw
-MDLMWiYkU5CaJDjt8k2XGoxJAN6GwW0uApaDQkWqv/6nyD6BWUkCEiIPM+oFot1+
-slQOoQPBU5f5Phzqo7qWtGtlZWYObWqhSS9XOoxuRB+vhJwN2waDFUNZMA+yvlpL
-LSAVlfw2eZQxKw1BHZHv+O6+Zq8zm9DvRcV0rXFtAlAgfBZyuH/cS6VCkB0/Cm2z
-Cx7/8F6DHWqXmcKRXOZdXTomGJzrm0Yh2Juu62PM1jU9+YMvJYnGG1TjOgHFmLwW
-oJlzbBf7+YDsTiaEpohd
-=VKfG
+iF4EAREIAAYFAlO1TpEACgkQoBEVQmGOlx+boQEAqkNbwClDOsI3yHwHPVCoO6Lf
+eLLFafz8mKCHBrUcJeIBAN2t0MadFfkW0UfjvCcWZVfncArEcKXsW27EstZCdb9H
+=8wId
 -----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..83ddd4a4c8ca
--- /dev/null
+++ b/dev-haskell/hdbc-mysql/files/hdbc-mysql-0.6.6.1-cabal-1.18.patch
@@ -0,0 +1,33 @@
+--- HDBC-mysql-0.6.6.1-orig/Setup.lhs	2012-08-30 13:40:03.000000000 +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/hdbc-mysql-0.6.6.1-r2.ebuild b/dev-haskell/hdbc-mysql/hdbc-mysql-0.6.6.1-r2.ebuild
new file mode 100644
index 000000000000..d739ce23d7a4
--- /dev/null
+++ b/dev-haskell/hdbc-mysql/hdbc-mysql-0.6.6.1-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc-mysql/hdbc-mysql-0.6.6.1-r2.ebuild,v 1.1 2014/07/03 12:37:30 gienah Exp $
+
+EAPI=5
+
+# 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
+
+MY_PN="HDBC-mysql"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="MySQL driver for HDBC"
+HOMEPAGE="http://github.com/bos/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=""
+
+RDEPEND=">=dev-haskell/hdbc-2.1.0:=[profile?]
+		dev-haskell/utf8-string:=[profile?]
+		>=dev-lang/ghc-6.12.1:=
+		virtual/mysql"
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.6"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=("${FILESDIR}/${PN}-0.6.6.1-cabal-1.18.patch")