1 |
commit: accea94b09cc78b46e73e566ff6fff6cfeae530b |
2 |
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Feb 2 05:58:43 2020 +0000 |
4 |
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 2 05:59:02 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=accea94b |
7 |
|
8 |
net-mail/mailbox-count: new version 0.0.3. |
9 |
|
10 |
This new version attempts to support both the ghc-7.10.1 and ghc-8.x |
11 |
compilers. The newer GHCs require monoid instances to be semigroups, |
12 |
but the semigroups package wasn't bundled with the GHC until then. |
13 |
However, requiring a "redundant" semigroups package seems to not hurt, |
14 |
and should theoretically fix the build with ghc-7.10.1 as well. |
15 |
|
16 |
Bug: https://bugs.gentoo.org/707836 |
17 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
18 |
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org> |
19 |
|
20 |
net-mail/mailbox-count/Manifest | 2 +- |
21 |
.../files/mailbox-count-0.0.2-ghc84.patch | 24 ------------- |
22 |
.../mailbox-count/mailbox-count-0.0.2-r2.ebuild | 40 ---------------------- |
23 |
...-0.0.2-r1.ebuild => mailbox-count-0.0.3.ebuild} | 29 +++++++++------- |
24 |
4 files changed, 18 insertions(+), 77 deletions(-) |
25 |
|
26 |
diff --git a/net-mail/mailbox-count/Manifest b/net-mail/mailbox-count/Manifest |
27 |
index f539e1520f1..6a336c7338f 100644 |
28 |
--- a/net-mail/mailbox-count/Manifest |
29 |
+++ b/net-mail/mailbox-count/Manifest |
30 |
@@ -1 +1 @@ |
31 |
-DIST mailbox-count-0.0.2.tar.gz 20644 BLAKE2B 036d118f9c23d42e21de06405d2703e97017f35d618a90e77561d604441092b543a8ba03b50dee5a7c2a48c2b8c0d6e87c06c2338853d9c508de7b6ea9d86006 SHA512 98e39927382719295260c64bd5888244000dbbb3fbd7f6405dcffe78a4fc5f1dea7f8236542e58eb0118bb421c19225a8be0560b92c7688c0701418c7221d569 |
32 |
+DIST mailbox-count-0.0.3.tar.gz 21358 BLAKE2B f56030876321251637d4d41246ccec767edbc71cbd9547a403a8fab2c4b7fbffbef74205faed5dba6e9f2047a7dd85a82301dae52106b18b19f63daf8d66c478 SHA512 24d79cd122c3c34b61f5f0234f8a6e55c04f9f7ff74d1fb589c3aa7af2e5fb2df7c02960b6cf4fd743edc006214bb788ea9059361f5614c2a47543dbbe8790b4 |
33 |
|
34 |
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 |
35 |
deleted file mode 100644 |
36 |
index 5257a10a3ac..00000000000 |
37 |
--- a/net-mail/mailbox-count/files/mailbox-count-0.0.2-ghc84.patch |
38 |
+++ /dev/null |
39 |
@@ -1,24 +0,0 @@ |
40 |
---- a/src/OptionalConfiguration.hs |
41 |
-+++ b/src/OptionalConfiguration.hs |
42 |
-@@ -27,3 +27,3 @@ import System.FilePath ( (</>) ) |
43 |
- import System.IO.Error ( catchIOError ) |
44 |
-- |
45 |
-+import qualified Data.Semigroup as S |
46 |
- |
47 |
-@@ -65,2 +65,16 @@ merge_maybes (Just _) (Just y) = Just y |
48 |
- -- |
49 |
-+ |
50 |
-+instance S.Semigroup OptionalConfiguration where |
51 |
-+ -- | Combine @cfg1@ and @cfg2@, giving precedence to @cfg2@. |
52 |
-+ cfg1 <> cfg2 = |
53 |
-+ OptionalConfiguration |
54 |
-+ (merge_maybes (database cfg1) (database cfg2)) |
55 |
-+ (merge_maybes (detail cfg1) (detail cfg2)) |
56 |
-+ (merge_maybes (detail_query cfg1) (detail_query cfg2)) |
57 |
-+ (merge_maybes (host cfg1) (host cfg2)) |
58 |
-+ (merge_maybes (password cfg1) (password cfg2)) |
59 |
-+ (merge_maybes (port cfg1) (port cfg2)) |
60 |
-+ (merge_maybes (summary_query cfg1) (summary_query cfg2)) |
61 |
-+ (merge_maybes (username cfg1) (username cfg2)) |
62 |
-+ |
63 |
- instance Monoid OptionalConfiguration where |
64 |
|
65 |
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 |
66 |
deleted file mode 100644 |
67 |
index 275709ed0d9..00000000000 |
68 |
--- a/net-mail/mailbox-count/mailbox-count-0.0.2-r2.ebuild |
69 |
+++ /dev/null |
70 |
@@ -1,40 +0,0 @@ |
71 |
-# Copyright 1999-2019 Gentoo Authors |
72 |
-# Distributed under the terms of the GNU General Public License v2 |
73 |
- |
74 |
-EAPI=6 |
75 |
- |
76 |
-# ebuild generated by hackport 0.4.2 |
77 |
- |
78 |
-CABAL_FEATURES="bin test-suite" |
79 |
-inherit haskell-cabal |
80 |
- |
81 |
-DESCRIPTION="Count mailboxes in a SQL database" |
82 |
-HOMEPAGE="http://hackage.haskell.org/package/mailbox-count" |
83 |
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" |
84 |
- |
85 |
-LICENSE="GPL-3" |
86 |
-SLOT="0" |
87 |
-KEYWORDS="~amd64 ~x86" |
88 |
-IUSE="" |
89 |
- |
90 |
-RESTRICT=test # Could not find module ‘Paths_mailbox_count’ |
91 |
- |
92 |
-RDEPEND="" |
93 |
-DEPEND="${RDEPEND} |
94 |
- >=dev-haskell/cabal-1.16.0 |
95 |
- >=dev-haskell/cmdargs-0.10 |
96 |
- >=dev-haskell/configurator-0.2 |
97 |
- >=dev-haskell/hdbc-2.4 |
98 |
- >=dev-haskell/hdbc-postgresql-2.3 |
99 |
- >=dev-haskell/hdbc-sqlite3-2.3 |
100 |
- >=dev-haskell/missingh-1.2 |
101 |
- >=dev-haskell/tasty-0.8 |
102 |
- >=dev-haskell/tasty-hunit-0.8 |
103 |
- >=dev-lang/ghc-7.6.1 |
104 |
- test? ( >=dev-haskell/doctest-0.9 |
105 |
- >=dev-haskell/filemanip-0.3.6 ) |
106 |
-" |
107 |
- |
108 |
-PATCHES=( |
109 |
- "${FILESDIR}"/${P}-ghc84.patch |
110 |
-) |
111 |
|
112 |
diff --git a/net-mail/mailbox-count/mailbox-count-0.0.2-r1.ebuild b/net-mail/mailbox-count/mailbox-count-0.0.3.ebuild |
113 |
similarity index 67% |
114 |
rename from net-mail/mailbox-count/mailbox-count-0.0.2-r1.ebuild |
115 |
rename to net-mail/mailbox-count/mailbox-count-0.0.3.ebuild |
116 |
index 737684cfbc1..1da9929cd88 100644 |
117 |
--- a/net-mail/mailbox-count/mailbox-count-0.0.2-r1.ebuild |
118 |
+++ b/net-mail/mailbox-count/mailbox-count-0.0.3.ebuild |
119 |
@@ -1,34 +1,39 @@ |
120 |
-# Copyright 1999-2019 Gentoo Authors |
121 |
+# Copyright 1999-2020 Gentoo Authors |
122 |
# Distributed under the terms of the GNU General Public License v2 |
123 |
|
124 |
-EAPI=6 |
125 |
+EAPI=7 |
126 |
|
127 |
-# ebuild generated by hackport 0.4.2 |
128 |
- |
129 |
-CABAL_FEATURES="bin test-suite" |
130 |
+CABAL_FEATURES="test-suite" |
131 |
inherit haskell-cabal |
132 |
|
133 |
DESCRIPTION="Count mailboxes in a SQL database" |
134 |
HOMEPAGE="http://hackage.haskell.org/package/mailbox-count" |
135 |
SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" |
136 |
|
137 |
-LICENSE="GPL-3" |
138 |
+LICENSE="AGPL-3" |
139 |
SLOT="0" |
140 |
KEYWORDS="~amd64 ~x86" |
141 |
IUSE="" |
142 |
|
143 |
-RDEPEND="" |
144 |
-DEPEND="${RDEPEND} |
145 |
- >=dev-haskell/cabal-1.16.0 |
146 |
+RDEPEND=" |
147 |
>=dev-haskell/cmdargs-0.10 |
148 |
>=dev-haskell/configurator-0.2 |
149 |
>=dev-haskell/hdbc-2.4 |
150 |
>=dev-haskell/hdbc-postgresql-2.3 |
151 |
>=dev-haskell/hdbc-sqlite3-2.3 |
152 |
>=dev-haskell/missingh-1.2 |
153 |
+ >=dev-haskell/semigroups-0.18 |
154 |
>=dev-haskell/tasty-0.8 |
155 |
>=dev-haskell/tasty-hunit-0.8 |
156 |
- >=dev-lang/ghc-7.6.1 |
157 |
- test? ( >=dev-haskell/doctest-0.9 |
158 |
- >=dev-haskell/filemanip-0.3.6 ) |
159 |
+ >=dev-lang/ghc-7.10.1 |
160 |
" |
161 |
+DEPEND="${RDEPEND} |
162 |
+ >=dev-haskell/cabal-1.16.0 |
163 |
+ test? ( >=dev-haskell/doctest-0.9 |
164 |
+ >=dev-haskell/filemanip-0.3.6 )" |
165 |
+ |
166 |
+src_install() { |
167 |
+ haskell-cabal_src_install |
168 |
+ dodoc "${S}/doc/${PN}rc.example" |
169 |
+ doman "${S}/doc/man1/${PN}.1" |
170 |
+} |