Gentoo Archives: gentoo-commits

From: Sergei Trofimovich <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-haskell/mysql/files/
Date: Fri, 04 Sep 2020 19:42:33
Message-Id: 1599248545.4aec7d041a326a2fc95f0293149ba949b96f9df8.slyfox@gentoo
1 commit: 4aec7d041a326a2fc95f0293149ba949b96f9df8
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Fri Sep 4 18:20:29 2020 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 4 19:42:25 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4aec7d04
7
8 dev-haskell/mysql: remove unused patch(es)
9
10 Package-Manager: Portage-3.0.4, Repoman-3.0.1
11 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
12 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
13
14 .../mysql/files/mysql-0.1.1.8-Cabal-1.24.patch | 29 ----------------------
15 1 file changed, 29 deletions(-)
16
17 diff --git a/dev-haskell/mysql/files/mysql-0.1.1.8-Cabal-1.24.patch b/dev-haskell/mysql/files/mysql-0.1.1.8-Cabal-1.24.patch
18 deleted file mode 100644
19 index 475d3f79722..00000000000
20 --- a/dev-haskell/mysql/files/mysql-0.1.1.8-Cabal-1.24.patch
21 +++ /dev/null
22 @@ -1,29 +0,0 @@
23 -diff --git a/Setup.lhs b/Setup.lhs
24 -index 2bf8d37..8fb2d3f 100644
25 ---- a/Setup.lhs
26 -+++ b/Setup.lhs
27 -@@ -14,15 +14,2 @@ import Distribution.Verbosity
28 -
29 ---- A Cabal 1.16 vs 1.18 compatibility hack, as in 1.18
30 ---- findProgramLocation has a new (unused in this case) parameter.
31 ---- ConstOrId adds this parameter when types say it is mandatory.
32 --class ConstOrId a b where
33 -- constOrId :: a -> b
34 --
35 --instance ConstOrId a a where
36 -- constOrId = id
37 --
38 --instance ConstOrId a (b -> a) where
39 -- constOrId = const
40 --
41 --
42 - main = defaultMainWithHooks simpleUserHooks {
43 -@@ -39,5 +26,5 @@ main = defaultMainWithHooks simpleUserHooks {
44 - mysqlConfigProgram = (simpleProgram "mysql_config") {
45 -- programFindLocation = \verbosity -> constOrId $ liftM2 mplus
46 -- (findProgramLocation verbosity "mysql_config")
47 -- (findProgramLocation verbosity "mysql_config5")
48 -+ programFindLocation = \verbosity path -> liftM2 mplus
49 -+ (findProgramOnSearchPath verbosity path "mysql_config")
50 -+ (findProgramOnSearchPath verbosity path "mysql_config5")
51 - }