1 |
commit: 5a0278f19b1212b2f801d984b1df0ae95eea7899 |
2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Dec 14 10:49:39 2019 +0000 |
4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Dec 14 10:49:39 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a0278f1 |
7 |
|
8 |
net-mail/mailbox-count: fix for ghc-8.4 |
9 |
|
10 |
Package-Manager: Portage-2.3.81, Repoman-2.3.20 |
11 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
12 |
|
13 |
.../files/mailbox-count-0.0.2-ghc84.patch | 24 +++++++++++++ |
14 |
.../mailbox-count/mailbox-count-0.0.2-r2.ebuild | 40 ++++++++++++++++++++++ |
15 |
2 files changed, 64 insertions(+) |
16 |
|
17 |
diff --git a/net-mail/mailbox-count/files/mailbox-count-0.0.2-ghc84.patch b/net-mail/mailbox-count/files/mailbox-count-0.0.2-ghc84.patch |
18 |
new file mode 100644 |
19 |
index 00000000000..5257a10a3ac |
20 |
--- /dev/null |
21 |
+++ b/net-mail/mailbox-count/files/mailbox-count-0.0.2-ghc84.patch |
22 |
@@ -0,0 +1,24 @@ |
23 |
+--- a/src/OptionalConfiguration.hs |
24 |
++++ b/src/OptionalConfiguration.hs |
25 |
+@@ -27,3 +27,3 @@ import System.FilePath ( (</>) ) |
26 |
+ import System.IO.Error ( catchIOError ) |
27 |
+- |
28 |
++import qualified Data.Semigroup as S |
29 |
+ |
30 |
+@@ -65,2 +65,16 @@ merge_maybes (Just _) (Just y) = Just y |
31 |
+ -- |
32 |
++ |
33 |
++instance S.Semigroup OptionalConfiguration where |
34 |
++ -- | Combine @cfg1@ and @cfg2@, giving precedence to @cfg2@. |
35 |
++ cfg1 <> cfg2 = |
36 |
++ OptionalConfiguration |
37 |
++ (merge_maybes (database cfg1) (database cfg2)) |
38 |
++ (merge_maybes (detail cfg1) (detail cfg2)) |
39 |
++ (merge_maybes (detail_query cfg1) (detail_query cfg2)) |
40 |
++ (merge_maybes (host cfg1) (host cfg2)) |
41 |
++ (merge_maybes (password cfg1) (password cfg2)) |
42 |
++ (merge_maybes (port cfg1) (port cfg2)) |
43 |
++ (merge_maybes (summary_query cfg1) (summary_query cfg2)) |
44 |
++ (merge_maybes (username cfg1) (username cfg2)) |
45 |
++ |
46 |
+ instance Monoid OptionalConfiguration where |
47 |
|
48 |
diff --git a/net-mail/mailbox-count/mailbox-count-0.0.2-r2.ebuild b/net-mail/mailbox-count/mailbox-count-0.0.2-r2.ebuild |
49 |
new file mode 100644 |
50 |
index 00000000000..275709ed0d9 |
51 |
--- /dev/null |
52 |
+++ b/net-mail/mailbox-count/mailbox-count-0.0.2-r2.ebuild |
53 |
@@ -0,0 +1,40 @@ |
54 |
+# Copyright 1999-2019 Gentoo Authors |
55 |
+# Distributed under the terms of the GNU General Public License v2 |
56 |
+ |
57 |
+EAPI=6 |
58 |
+ |
59 |
+# ebuild generated by hackport 0.4.2 |
60 |
+ |
61 |
+CABAL_FEATURES="bin test-suite" |
62 |
+inherit haskell-cabal |
63 |
+ |
64 |
+DESCRIPTION="Count mailboxes in a SQL database" |
65 |
+HOMEPAGE="http://hackage.haskell.org/package/mailbox-count" |
66 |
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" |
67 |
+ |
68 |
+LICENSE="GPL-3" |
69 |
+SLOT="0" |
70 |
+KEYWORDS="~amd64 ~x86" |
71 |
+IUSE="" |
72 |
+ |
73 |
+RESTRICT=test # Could not find module ‘Paths_mailbox_count’ |
74 |
+ |
75 |
+RDEPEND="" |
76 |
+DEPEND="${RDEPEND} |
77 |
+ >=dev-haskell/cabal-1.16.0 |
78 |
+ >=dev-haskell/cmdargs-0.10 |
79 |
+ >=dev-haskell/configurator-0.2 |
80 |
+ >=dev-haskell/hdbc-2.4 |
81 |
+ >=dev-haskell/hdbc-postgresql-2.3 |
82 |
+ >=dev-haskell/hdbc-sqlite3-2.3 |
83 |
+ >=dev-haskell/missingh-1.2 |
84 |
+ >=dev-haskell/tasty-0.8 |
85 |
+ >=dev-haskell/tasty-hunit-0.8 |
86 |
+ >=dev-lang/ghc-7.6.1 |
87 |
+ test? ( >=dev-haskell/doctest-0.9 |
88 |
+ >=dev-haskell/filemanip-0.3.6 ) |
89 |
+" |
90 |
+ |
91 |
+PATCHES=( |
92 |
+ "${FILESDIR}"/${P}-ghc84.patch |
93 |
+) |