commit: 848082f3ba866fdae1b9c2e2c1af6cfed948f16f
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Sat Aug 29 18:43:54 2020 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sun Aug 30 07:59:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=848082f3
dev-haskell/hdbc-mysql: remove unused patch(es)
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Michael Mair-Keimberger gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/17319
Signed-off-by: Sergei Trofimovich gentoo.org>
.../files/hdbc-mysql-0.6.6.1-cabal-1.18.patch | 33 --
.../files/hdbc-mysql-0.6.6.1-extralib.patch| 18
2 files changed, 51 deletions(-)
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 83ddd4a4c8c..000
--- 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.0 +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 8b9993969cb..000
--- a/dev-haskell/hdbc-mysql/files/hdbc-mysql-0.6.6.1-extralib.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-commit d53860f7edb75873e26329c159802b2ac5a6
-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
