gentoo resync : 14.07.2018

6 files changed, 148 insertions, 0 deletions

diff --git a/dev-haskell/hdbc-mysql/Manifest b/dev-haskell/hdbc-mysql/Manifest
new file mode 100644
index 000000000000..2df889d2a25e
--- /dev/null
+++ b/dev-haskell/hdbc-mysql/Manifest
@@ -0,0 +1,7 @@
+AUX hdbc-mysql-0.6.6.1-cabal-1.18.patch 1110 BLAKE2B 49bd9b39d789903063c7c7b0c454f0e9f844c275b8283e632481f183b55bcb8a8656d117ab587004e8f9b6f65b2e7e22d03b20eec7926d1a8eb734e614e98c00 SHA512 fca7c256c0035df6bf3e882a368e1207cee8177a1348e7502982b7085c0d81c667bdd905aa0ad5c04761aa8edd9e62809c690bcd220957769fba221f94c79e28
+AUX hdbc-mysql-0.6.6.1-extralib.patch 460 BLAKE2B 845a5c16767c4b0ed569de5b9a7312eb1a3fe81d798d2d16860be28b297d2c9cf03c4567831fdb40e9be1951e10e9cd5338f74a691936a069beb36dd2dfade56 SHA512 04e374b7803748d34bf8f87505609aa4463e70e49b29054a16f65d693eef2bc5ddcfa56c072a4f95e5576c1ad72b9ee94dd00c16538ce04e34b96c060954b114
+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
+EBUILD hdbc-mysql-0.6.6.1-r3.ebuild 849 BLAKE2B 7b9bbbdad37c4327f5c356f46fe6343ee619c6fdc842f09e75de841bac0ad82f175feb8b02f201984aa91794d6b08542db6a4fc4d30185fe2262425ac7aeeb43 SHA512 c2ffda9e01cddcbd648c5c8905df6056a11e2e3b446ef3896b2382b4da6fe2d107d50c66fe314856373f9376f92b1442eb2af03f4e9cfb294ad1a4aa67623d9b
+EBUILD hdbc-mysql-0.7.1.0.ebuild 826 BLAKE2B a2a9601e55352b585ea48ce3f4db876f84382c0f66ee3ec1bd0bd8d3da685fabf173019fd125de988b40f6f80db4d66a4eb10410606d9f35e1299cae743c29a6 SHA512 ea1f16c467689697be3b263eeaae14cc8b15455c33cfe81e4838d53b90cb8082c4fde82ee0919029d8cdf2fc3b5444a7c83dddacca09e13d0b0d773cade77e1d
+MISC metadata.xml 475 BLAKE2B 3a0c594d8c7acbfad9b7c48660ac89b0e85ec100646e4999dff911866e654520139eb0003d18f53ddf8ea79e70a9d6a76bd9f4fe760468f7254f8c0b2106524e SHA512 da1098ad2d5808af1dce10679f4e0146f9cab003e5a68fff7b7d389fadcb6a28cc0c67abca16571a6b76bef1c9d838882496cac5fb7febddb4da71b5d9baa4a2
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/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 <snakamura@infoteria.com>
+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-r3.ebuild b/dev-haskell/hdbc-mysql/hdbc-mysql-0.6.6.1-r3.ebuild
new file mode 100644
index 000000000000..861ba83ab5ca
--- /dev/null
+++ b/dev-haskell/hdbc-mysql/hdbc-mysql-0.6.6.1-r3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 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="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}/${P}"-cabal-1.18.patch
+	"${FILESDIR}/${P}"-extralib.patch
+)
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 000000000000..ce4e1c94bf63
--- /dev/null
+++ b/dev-haskell/hdbc-mysql/hdbc-mysql-0.7.1.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.1.9999
+
+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)
+}
diff --git a/dev-haskell/hdbc-mysql/metadata.xml b/dev-haskell/hdbc-mysql/metadata.xml
new file mode 100644
index 000000000000..8aa39248b6d6
--- /dev/null
+++ b/dev-haskell/hdbc-mysql/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		This package provides a MySQL driver for HDBC, implemented via
+		bindings to the C @mysqlclient@ library.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">bos/hdbc-mysql</remote-id>
+	</upstream>
+</pkgmetadata>