1 |
commit: 11b9b74c2d579cce16fdba2ced8276f4b8ebf8ae |
2 |
Author: matoro <matoro <AT> users <DOT> noreply <DOT> github <DOT> com> |
3 |
AuthorDate: Sat Jul 30 01:57:05 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jul 30 05:58:54 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11b9b74c |
7 |
|
8 |
dev-vcs/git-annex: add 10.20220624, drop 8.20200810 |
9 |
|
10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
11 |
|
12 |
dev-vcs/git-annex/Manifest | 2 +- |
13 |
.../git-annex-8.20210330-persistent-2.12.patch | 28 +++++++++ |
14 |
...0200810.ebuild => git-annex-10.20220624.ebuild} | 68 ++++++++-------------- |
15 |
dev-vcs/git-annex/metadata.xml | 26 +-------- |
16 |
4 files changed, 54 insertions(+), 70 deletions(-) |
17 |
|
18 |
diff --git a/dev-vcs/git-annex/Manifest b/dev-vcs/git-annex/Manifest |
19 |
index 7306f3571bc6..c503006cabac 100644 |
20 |
--- a/dev-vcs/git-annex/Manifest |
21 |
+++ b/dev-vcs/git-annex/Manifest |
22 |
@@ -1 +1 @@ |
23 |
-DIST git-annex-8.20200810.tar.gz 1312890 BLAKE2B 63226ee6b2150dd48dae3e52e70502e64e89d73185500c1cea201f2be98760ed9b3cd173b75b5603b49ca63f316163273a7c6d7eaddd68e548d903c845925713 SHA512 e6a4ad3169582f65284218c75f2679105a52d2f22310b10436796c439e031c5ad6f4d2dff1772f4cfc670d8956ae4a68d4d98e1dabd48bf06bcafda97676321f |
24 |
+DIST git-annex-10.20220624.tar.gz 1426982 BLAKE2B fa3a105f9677c51dfb1a44984ac80a377380ff5e2c69486f6f213fcb709c2280c66b8d856f004016f97751abea3faeca8756663c0af19616ed237d8e4d9d25f9 SHA512 4269c3408c9368283ab280c7231953ad95687b5ff84c1e9cb725d5ed6eb4da9384c48de33e4265d2fd8b1352eea47bffaac7d335d2c998149555b050f80a75af |
25 |
|
26 |
diff --git a/dev-vcs/git-annex/files/git-annex-8.20210330-persistent-2.12.patch b/dev-vcs/git-annex/files/git-annex-8.20210330-persistent-2.12.patch |
27 |
new file mode 100644 |
28 |
index 000000000000..977e5931f5f4 |
29 |
--- /dev/null |
30 |
+++ b/dev-vcs/git-annex/files/git-annex-8.20210330-persistent-2.12.patch |
31 |
@@ -0,0 +1,28 @@ |
32 |
+--- a/Database/Handle.hs |
33 |
++++ b/Database/Handle.hs |
34 |
+@@ -26,7 +26,7 @@ import qualified Database.Sqlite as Sqlite |
35 |
+ import Control.Monad |
36 |
+ import Control.Monad.IO.Class (liftIO) |
37 |
+ import Control.Monad.IO.Unlift (MonadUnliftIO, withRunInIO) |
38 |
+-import Control.Monad.Logger (MonadLogger) |
39 |
++import Control.Monad.Logger (MonadLogger, askLoggerIO, MonadLoggerIO) |
40 |
+ import Control.Concurrent |
41 |
+ import Control.Concurrent.Async |
42 |
+ import Control.Exception (throwIO, BlockedIndefinitelyOnMVar(..)) |
43 |
+@@ -246,6 +246,7 @@ runSqliteRobustly tablename db a = do |
44 |
+ withSqlConnRobustly |
45 |
+ :: (MonadUnliftIO m |
46 |
+ , MonadLogger m |
47 |
++ , MonadLoggerIO m |
48 |
+ , IsPersistBackend backend |
49 |
+ , BaseBackend backend ~ SqlBackend |
50 |
+ , BackendCompatible SqlBackend backend |
51 |
+@@ -254,7 +255,7 @@ withSqlConnRobustly |
52 |
+ -> (backend -> m a) |
53 |
+ -> m a |
54 |
+ withSqlConnRobustly open f = do |
55 |
+- logFunc <- askLogFunc |
56 |
++ logFunc <- askLoggerIO |
57 |
+ withRunInIO $ \run -> bracket |
58 |
+ (open logFunc) |
59 |
+ closeRobustly |
60 |
|
61 |
diff --git a/dev-vcs/git-annex/git-annex-8.20200810.ebuild b/dev-vcs/git-annex/git-annex-10.20220624.ebuild |
62 |
similarity index 70% |
63 |
rename from dev-vcs/git-annex/git-annex-8.20200810.ebuild |
64 |
rename to dev-vcs/git-annex/git-annex-10.20220624.ebuild |
65 |
index c80e75b51846..23fbd1f88474 100644 |
66 |
--- a/dev-vcs/git-annex/git-annex-8.20200810.ebuild |
67 |
+++ b/dev-vcs/git-annex/git-annex-10.20220624.ebuild |
68 |
@@ -1,28 +1,27 @@ |
69 |
-# Copyright 1999-2020 Gentoo Authors |
70 |
+# Copyright 1999-2022 Gentoo Authors |
71 |
# Distributed under the terms of the GNU General Public License v2 |
72 |
|
73 |
-EAPI=7 |
74 |
+EAPI=8 |
75 |
|
76 |
-# ebuild generated by hackport 0.6.6.9999 |
77 |
-#hackport: flags: -production,-android,-androidsplice,-testsuite |
78 |
+# ebuild generated by hackport 0.7.1.2.9999 |
79 |
+#hackport: flags: -production,-android,-androidsplice,-testsuite,+networkbsd |
80 |
|
81 |
CABAL_FEATURES="" |
82 |
inherit haskell-cabal bash-completion-r1 desktop |
83 |
|
84 |
DESCRIPTION="manage files with git, without checking their contents into git" |
85 |
-HOMEPAGE="http://git-annex.branchable.com/" |
86 |
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" |
87 |
+HOMEPAGE="https://git-annex.branchable.com/" |
88 |
|
89 |
LICENSE="AGPL-3" |
90 |
SLOT="0" |
91 |
KEYWORDS="~amd64 ~x86 ~amd64-linux" |
92 |
-IUSE="+assistant benchmark +dbus debuglocks doc +gitlfs +httpclientrestricted +magicmime +networkbsd +pairing +s3 +torrentparser +webapp +webdav" # NOTE: add local USE flag 'doc' when bumping |
93 |
- |
94 |
-RESTRICT=test |
95 |
+IUSE="+assistant +benchmark +dbus debug doc +gitlfs +magicmime +pairing +torrentparser +webapp" |
96 |
|
97 |
RDEPEND="dev-haskell/aeson:= |
98 |
+ >=dev-haskell/ansi-terminal-0.9:= |
99 |
dev-haskell/async:= |
100 |
- dev-haskell/attoparsec:= |
101 |
+ >=dev-haskell/attoparsec-0.13.2.2:= |
102 |
+ >=dev-haskell/aws-0.20:= |
103 |
>=dev-haskell/bloomfilter-2.0.0:= |
104 |
dev-haskell/byteable:= |
105 |
dev-haskell/case-insensitive:= |
106 |
@@ -32,15 +31,15 @@ RDEPEND="dev-haskell/aeson:= |
107 |
dev-haskell/crypto-api:= |
108 |
>=dev-haskell/cryptonite-0.23:= |
109 |
dev-haskell/data-default:= |
110 |
+ >=dev-haskell/dav-1.0:= |
111 |
dev-haskell/disk-free-space:= |
112 |
dev-haskell/dlist:= |
113 |
dev-haskell/edit-distance:= |
114 |
- >=dev-haskell/exceptions-0.6:= |
115 |
>=dev-haskell/feed-1.0.0:= |
116 |
>=dev-haskell/filepath-bytestring-1.4.2.1.1:= |
117 |
dev-haskell/free:= |
118 |
- dev-haskell/hslogger:= |
119 |
>=dev-haskell/http-client-0.5.3:= |
120 |
+ >=dev-haskell/http-client-restricted-0.0.2:= |
121 |
dev-haskell/http-client-tls:= |
122 |
>=dev-haskell/http-conduit-2.3.0:= |
123 |
>=dev-haskell/http-types-0.7:= |
124 |
@@ -48,8 +47,9 @@ RDEPEND="dev-haskell/aeson:= |
125 |
dev-haskell/memory:= |
126 |
dev-haskell/microlens:= |
127 |
dev-haskell/monad-control:= |
128 |
- dev-haskell/monad-logger:= |
129 |
- >=dev-haskell/mtl-2:= |
130 |
+ >=dev-haskell/monad-logger-0.3.10:= |
131 |
+ >=dev-haskell/network-3.0.0.0:= |
132 |
+ dev-haskell/network-bsd:= |
133 |
>=dev-haskell/network-uri-2.6:= |
134 |
dev-haskell/old-locale:= |
135 |
>=dev-haskell/optparse-applicative-0.14.1:= |
136 |
@@ -68,32 +68,26 @@ RDEPEND="dev-haskell/aeson:= |
137 |
>=dev-haskell/stm-2.3:= |
138 |
dev-haskell/stm-chans:= |
139 |
dev-haskell/tagsoup:= |
140 |
- >=dev-haskell/tasty-0.7:= |
141 |
+ >=dev-haskell/tasty-1.2:= |
142 |
dev-haskell/tasty-hunit:= |
143 |
dev-haskell/tasty-quickcheck:= |
144 |
dev-haskell/tasty-rerun:= |
145 |
- dev-haskell/text:= |
146 |
>=dev-haskell/unix-compat-0.5:= |
147 |
dev-haskell/unliftio-core:= |
148 |
dev-haskell/unordered-containers:= |
149 |
dev-haskell/utf8-string:= |
150 |
>=dev-haskell/uuid-1.2.6:= |
151 |
dev-haskell/vector:= |
152 |
- >=dev-lang/ghc-8.4.3:= |
153 |
+ >=dev-lang/ghc-8.10.1:= |
154 |
assistant? ( >=dev-haskell/hinotify-0.3.10:= |
155 |
dev-haskell/mountpoints:= ) |
156 |
benchmark? ( dev-haskell/criterion:= ) |
157 |
dbus? ( >=dev-haskell/dbus-0.10.7:= |
158 |
>=dev-haskell/fdo-notify-0.3:= ) |
159 |
- gitlfs? ( >=dev-haskell/git-lfs-1.1.0:= ) |
160 |
- httpclientrestricted? ( >=dev-haskell/http-client-restricted-0.0.2:= ) |
161 |
+ gitlfs? ( >=dev-haskell/git-lfs-1.2.0:= ) |
162 |
magicmime? ( dev-haskell/magic:= ) |
163 |
- networkbsd? ( >=dev-haskell/network-3.0.0.0:= |
164 |
- dev-haskell/network-bsd:= ) |
165 |
- !networkbsd? ( >=dev-haskell/network-2.6.3.0:= <dev-haskell/network-3.0.0.0:= ) |
166 |
pairing? ( dev-haskell/network-info:= |
167 |
dev-haskell/network-multicast:= ) |
168 |
- s3? ( >=dev-haskell/aws-0.20:= ) |
169 |
torrentparser? ( >=dev-haskell/torrent-10000.0.0:= ) |
170 |
webapp? ( dev-haskell/blaze-builder:= |
171 |
dev-haskell/clientsession:= |
172 |
@@ -107,15 +101,14 @@ RDEPEND="dev-haskell/aeson:= |
173 |
>=dev-haskell/yesod-core-1.6.0:= |
174 |
>=dev-haskell/yesod-form-1.4.8:= |
175 |
>=dev-haskell/yesod-static-1.5.1:= ) |
176 |
- webdav? ( >=dev-haskell/dav-1.0:= ) |
177 |
-" |
178 |
-# not generated by hackport: |
179 |
-RDEPEND+=" dev-vcs/git |
180 |
" |
181 |
DEPEND="${RDEPEND} |
182 |
- >=dev-haskell/cabal-2.2.0.1 |
183 |
+ >=dev-haskell/cabal-3.2.0.0 |
184 |
+ >=dev-haskell/filepath-bytestring-1.4.2.1.4 |
185 |
" |
186 |
# not generated by hackport: |
187 |
+RDEPEND+=" dev-vcs/git |
188 |
+" |
189 |
DEPEND+=" dev-lang/perl |
190 |
doc? ( www-apps/ikiwiki net-misc/rsync ) |
191 |
" |
192 |
@@ -127,28 +120,15 @@ src_configure() { |
193 |
$(cabal_flag assistant assistant) \ |
194 |
$(cabal_flag benchmark benchmark) \ |
195 |
$(cabal_flag dbus dbus) \ |
196 |
- $(cabal_flag debuglocks debuglocks) \ |
197 |
+ $(cabal_flag debug debuglocks) \ |
198 |
$(cabal_flag gitlfs gitlfs) \ |
199 |
- $(cabal_flag httpclientrestricted httpclientrestricted) \ |
200 |
$(cabal_flag magicmime magicmime) \ |
201 |
- $(cabal_flag networkbsd networkbsd) \ |
202 |
+ --flag=networkbsd \ |
203 |
$(cabal_flag pairing pairing) \ |
204 |
--flag=-production \ |
205 |
- $(cabal_flag s3 s3) \ |
206 |
--flag=-testsuite \ |
207 |
$(cabal_flag torrentparser torrentparser) \ |
208 |
- $(cabal_flag webapp webapp) \ |
209 |
- $(cabal_flag webdav webdav) |
210 |
-} |
211 |
- |
212 |
-src_test() { |
213 |
- if use webapp; then |
214 |
- export GIT_CONFIG=${T}/temp-git-config |
215 |
- git config user.email "git@src_test" |
216 |
- git config user.name "Mr. ${P} The Test" |
217 |
- |
218 |
- emake test |
219 |
- fi |
220 |
+ $(cabal_flag webapp webapp) |
221 |
} |
222 |
|
223 |
src_install() { |
224 |
|
225 |
diff --git a/dev-vcs/git-annex/metadata.xml b/dev-vcs/git-annex/metadata.xml |
226 |
index 0f121b9748a2..82dde5fc9a30 100644 |
227 |
--- a/dev-vcs/git-annex/metadata.xml |
228 |
+++ b/dev-vcs/git-annex/metadata.xml |
229 |
@@ -1,5 +1,5 @@ |
230 |
<?xml version="1.0" encoding="UTF-8"?> |
231 |
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> |
232 |
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
233 |
<pkgmetadata> |
234 |
<maintainer type="project"> |
235 |
<email>haskell@g.o</email> |
236 |
@@ -9,34 +9,10 @@ |
237 |
<flag name="assistant">Enable git-annex assistant and watch command</flag> |
238 |
<flag name="benchmark">Enable benchmarking</flag> |
239 |
<flag name="dbus">Enable dbus support</flag> |
240 |
- <flag name="debuglocks">Debug location of MVar/STM deadlocks</flag> |
241 |
<flag name="gitlfs">Build with git-lfs library (rather than vendored copy)</flag> |
242 |
- <flag name="httpclientrestricted">Build with http-client-restricted library (rather than vendored copy)</flag> |
243 |
<flag name="magicmime">Use libmagic to determine file MIME types</flag> |
244 |
- <flag name="networkbsd">Build with network-3.0 which split out network-bsd</flag> |
245 |
<flag name="pairing">Enable pairing</flag> |
246 |
- <flag name="s3">Enable S3 support</flag> |
247 |
<flag name="torrentparser">Use haskell torrent library to parse torrent files</flag> |
248 |
<flag name="webapp">Enable git-annex webapp</flag> |
249 |
- <flag name="webdav">Enable WebDAV support</flag> |
250 |
</use> |
251 |
- <longdescription> |
252 |
- git-annex allows managing files with git, without checking the file |
253 |
- contents into git. While that may seem paradoxical, it is useful when |
254 |
- dealing with files larger than git can currently easily handle, whether due |
255 |
- to limitations in memory, time, or disk space. |
256 |
- |
257 |
- It can store large files in many places, from local hard drives, to a |
258 |
- large number of cloud storage services, including S3, WebDAV, |
259 |
- and rsync, with a dozen cloud storage providers usable via plugins. |
260 |
- Files can be stored encrypted with gpg, so that the cloud storage |
261 |
- provider cannot see your data. git-annex keeps track of where each file |
262 |
- is stored, so it knows how many copies are available, and has many |
263 |
- facilities to ensure your data is preserved. |
264 |
- |
265 |
- git-annex can also be used to keep a folder in sync between computers, |
266 |
- noticing when files are changed, and automatically committing them |
267 |
- to git and transferring them to other computers. The git-annex webapp |
268 |
- makes it easy to set up and use git-annex this way. |
269 |
- </longdescription> |
270 |
</pkgmetadata> |