gentoo resync : 02.09.2020

5 files changed, 16 insertions, 55 deletions

diff --git a/dev-haskell/hdbc-mysql/Manifest b/dev-haskell/hdbc-mysql/Manifest
index 436101f9f165..295b54f9d330 100644
--- a/dev-haskell/hdbc-mysql/Manifest
+++ b/dev-haskell/hdbc-mysql/Manifest
@@ -1,5 +1,4 @@
-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
+AUX hdbc-mysql-0.7.1.0-cabal-3.patch 470 BLAKE2B 2afbc4da32a3b6a47e67910824df9b106d00a98984376b25ec73585e73b5391c8bb96103ae68a51da5a6ca67d6df9989af3c722f0b830579aa722d6ee2465673 SHA512 78c0a76cdd0d0b55a2f6546d74d2eff12c2d2ab02158fd35251a6a5538457e5fa68db2f1bc7d93ddf5e9f54dbf511c47f609c55e72fe453e1a511da2dfbea9c9
 DIST HDBC-mysql-0.7.1.0.tar.gz 24086 BLAKE2B fd480ef5a3374aa8c6d36bd4f34fb1cb558769a134f60ce1b94cba7143b93adecc2cff6253cb1afbefe52c9ed8081fc7f812f7bc6539c043f783e9ced10ff4d7 SHA512 aec9387f08c16c8ccb6df1ca82e69005105a2781e253b6b8788665fa88e54a697601f99d10931ea6d3854dd9c0b43f062bccad1362a1512f5a2135cede0b0cc1
-EBUILD hdbc-mysql-0.7.1.0-r1.ebuild 829 BLAKE2B 9b5498d344f2f66407f8c1f1bf7dcdc12d11ff26fe255b09638afbbd92e5f9c94e3ce6b0497c752c1000a90668dcf5793fdcacc3e1c99e1abe4c6a90a143e5d3 SHA512 5813d6e479c0463ec7ffc7ef3787c80bc56b859d82e071e8ba085fd6019defad8c611827f6129ea57fb4a03294c9574c0852b50a036d1a300c2d613a4106405e
+EBUILD hdbc-mysql-0.7.1.0-r1.ebuild 873 BLAKE2B 439c564bcff81d63a4b6f38817290299fb4924075eda0f813a2a22d5820fd8321d261ce61c7cf197e6a479818275272fccd317f81b4288b52c321943de7acd2b SHA512 a0a46f6e1e35da0be9d1750b4c1439b6ad0c4513b8eecfcb32c29761502658141ae0270a69b60947c0a172f9294a735cba0be9953d108b8426cf5eb20dee96e9
 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
deleted file mode 100644
index 83ddd4a4c8ca..000000000000
--- a/dev-haskell/hdbc-mysql/files/hdbc-mysql-0.6.6.1-cabal-1.18.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- 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
deleted file mode 100644
index 8b9993969cb3..000000000000
--- a/dev-haskell/hdbc-mysql/files/hdbc-mysql-0.6.6.1-extralib.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-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/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 000000000000..11fe2231d73e
--- /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 5a09fbb7663b..b1a0712a1a16 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)