[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-annex/, dev-vcs/git-annex/files/
commit: 11b9b74c2d579cce16fdba2ced8276f4b8ebf8ae
Author: matoro users noreply github com>
AuthorDate: Sat Jul 30 01:57:05 2022 +
Commit: Sam James gentoo org>
CommitDate: Sat Jul 30 05:58:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11b9b74c
dev-vcs/git-annex: add 10.20220624, drop 8.20200810
Signed-off-by: Sam James gentoo.org>
dev-vcs/git-annex/Manifest | 2 +-
.../git-annex-8.20210330-persistent-2.12.patch | 28 +
...0200810.ebuild => git-annex-10.20220624.ebuild} | 68 --
dev-vcs/git-annex/metadata.xml | 26 +
4 files changed, 54 insertions(+), 70 deletions(-)
diff --git a/dev-vcs/git-annex/Manifest b/dev-vcs/git-annex/Manifest
index 7306f3571bc6..c503006cabac 100644
--- a/dev-vcs/git-annex/Manifest
+++ b/dev-vcs/git-annex/Manifest
@@ -1 +1 @@
-DIST git-annex-8.20200810.tar.gz 1312890 BLAKE2B
63226ee6b2150dd48dae3e52e70502e64e89d73185500c1cea201f2be98760ed9b3cd173b75b5603b49ca63f316163273a7c6d7eaddd68e548d903c845925713
SHA512
e6a4ad3169582f65284218c75f2679105a52d2f22310b10436796c439e031c5ad6f4d2dff1772f4cfc670d8956ae4a68d4d98e1dabd48bf06bcafda97676321f
+DIST git-annex-10.20220624.tar.gz 1426982 BLAKE2B
fa3a105f9677c51dfb1a44984ac80a377380ff5e2c69486f6f213fcb709c2280c66b8d856f004016f97751abea3faeca8756663c0af19616ed237d8e4d9d25f9
SHA512
4269c3408c9368283ab280c7231953ad95687b5ff84c1e9cb725d5ed6eb4da9384c48de33e4265d2fd8b1352eea47bffaac7d335d2c998149555b050f80a75af
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
new file mode 100644
index ..977e5931f5f4
--- /dev/null
+++ b/dev-vcs/git-annex/files/git-annex-8.20210330-persistent-2.12.patch
@@ -0,0 +1,28 @@
+--- a/Database/Handle.hs
b/Database/Handle.hs
+@@ -26,7 +26,7 @@ import qualified Database.Sqlite as Sqlite
+ import Control.Monad
+ import Control.Monad.IO.Class (liftIO)
+ import Control.Monad.IO.Unlift (MonadUnliftIO, withRunInIO)
+-import Control.Monad.Logger (MonadLogger)
++import Control.Monad.Logger (MonadLogger, askLoggerIO, MonadLoggerIO)
+ import Control.Concurrent
+ import Control.Concurrent.Async
+ import Control.Exception (throwIO, BlockedIndefinitelyOnMVar(..))
+@@ -246,6 +246,7 @@ runSqliteRobustly tablename db a = do
+ withSqlConnRobustly
+ :: (MonadUnliftIO m
+ , MonadLogger m
++ , MonadLoggerIO m
+ , IsPersistBackend backend
+ , BaseBackend backend ~ SqlBackend
+ , BackendCompatible SqlBackend backend
+@@ -254,7 +255,7 @@ withSqlConnRobustly
+ -> (backend -> m a)
+ -> m a
+ withSqlConnRobustly open f = do
+- logFunc <- askLogFunc
++ logFunc <- askLoggerIO
+ withRunInIO $ \run -> bracket
+ (open logFunc)
+ closeRobustly
diff --git a/dev-vcs/git-annex/git-annex-8.20200810.ebuild
b/dev-vcs/git-annex/git-annex-10.20220624.ebuild
similarity index 70%
rename from dev-vcs/git-annex/git-annex-8.20200810.ebuild
rename to dev-vcs/git-annex/git-annex-10.20220624.ebuild
index c80e75b51846..23fbd1f88474 100644
--- a/dev-vcs/git-annex/git-annex-8.20200810.ebuild
+++ b/dev-vcs/git-annex/git-annex-10.20220624.ebuild
@@ -1,28 +1,27 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-# ebuild generated by hackport 0.6.6.
-#hackport: flags: -production,-android,-androidsplice,-testsuite
+# ebuild generated by hackport 0.7.1.2.
+#hackport: flags: -production,-android,-androidsplice,-testsuite,+networkbsd
CABAL_FEATURES=""
inherit haskell-cabal bash-completion-r1 desktop
DESCRIPTION="manage files with git, without checking their contents into git"
-HOMEPAGE="http://git-annex.branchable.com/;
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz;
+HOMEPAGE="https://git-annex.branchable.com/;
LICENSE="AGPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="+assistant benchmark +dbus debuglocks doc +gitlfs +httpclientrestricted
+magicmime +networkbsd +pairing +s3 +torrentparser +webapp +webdav" # NOTE: add
local USE flag 'doc' when bumping
-
-RESTRICT=test
+IUSE="+assistant +benchmark +dbus debug doc +gitlfs +magicmime +pairing
+torrentparser +webapp"
RDEPEND="dev-haskell/aeson:=
+ >=dev-haskell/ansi-terminal-0.9:=
dev-haskell/async:=
- dev-haskell/attoparsec:=
+ >=dev-haskell/attoparsec-0.13.2.2:=
+ >=dev-haskell/aws-0.20:=
>=dev-haskell/bloomfilter-2.0.0:=
dev-haskell/byteable:=
dev-haskell/case-insensitive:=
@@ -32,15 +31,15 @@ RDEPEND="dev-haskell/aeson:=
dev-haskell/crypto-api:=
>=dev-haskell/cryptonite-0.23:=
dev-haskell/data-default:=
+ >=dev-haskell/dav-1.0:=
dev-haskell/disk-free-space:=
[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-annex/, dev-vcs/git-annex/files/
commit: a7af25e0ef157fc58c8d99541013f8bae68a
Author: Jack Todaro posteo org>
AuthorDate: Mon Aug 3 20:28:49 2020 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Mon Aug 3 22:58:17 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7af25e0
dev-vcs/git-annex: remove old
Bug: https://bugs.gentoo.org/659288
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Jack Todaro posteo.org>
Closes: https://github.com/gentoo/gentoo/pull/16987
Signed-off-by: Sergei Trofimovich gentoo.org>
dev-vcs/git-annex/Manifest | 1 -
.../files/git-annex-6.20160114-QC-2.8.2.patch | 16 --
.../files/git-annex-6.20161210-directory-1.3.patch | 9 --
.../files/git-annex-6.20170101-crypto-api.patch| 8 -
dev-vcs/git-annex/git-annex-6.20170818-r1.ebuild | 161 -
dev-vcs/git-annex/metadata.xml | 2 -
6 files changed, 197 deletions(-)
diff --git a/dev-vcs/git-annex/Manifest b/dev-vcs/git-annex/Manifest
index 8f97fa423e2..9e78d63c3c1 100644
--- a/dev-vcs/git-annex/Manifest
+++ b/dev-vcs/git-annex/Manifest
@@ -1,2 +1 @@
-DIST git-annex-6.20170818.tar.gz 837 BLAKE2B
ff18ffd101b3f9dc2b74caaed57c8f8f568fc51beeedddccf7f76ef5a27a99801cb994a52f09e5467be2f030842f4fa3b38bfd0a19a207057ffe269dfc8f240c
SHA512
06587bf0d3056e4b94d4c40aaae820efda133dcbc876a2ac3db3183fb511ec20aae4c495323b4886868a3e66b5b1f53a04c5f3abb0362c718bbadc8e2f6e15d0
DIST git-annex-8.20200617.tar.gz 1296190 BLAKE2B
3731641ff6623d7f0b2ac5402fe6acb41e4c8210e958c5c4383f401486d4307a921cc9072023ec62fdf2da78ec432cf0707a06265345681d7646af2974917cbf
SHA512
736d10c1442bb6d8eaf67337da6b606e8b79970f1bbd10cfc15c0376780c14dee9ece066dbc6b378f0a750d11d5b7b87687252899e473748828939dc03ae
diff --git a/dev-vcs/git-annex/files/git-annex-6.20160114-QC-2.8.2.patch
b/dev-vcs/git-annex/files/git-annex-6.20160114-QC-2.8.2.patch
deleted file mode 100644
index 2f232782de0..000
--- a/dev-vcs/git-annex/files/git-annex-6.20160114-QC-2.8.2.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/Utility/QuickCheck.hs b/Utility/QuickCheck.hs
-index cd408dd..9f60f23 100644
a/Utility/QuickCheck.hs
-+++ b/Utility/QuickCheck.hs
-@@ -9,2 +9,3 @@
- {-# LANGUAGE TypeSynonymInstances #-}
-+{-# LANGUAGE CPP #-}
-
-@@ -23,2 +24,3 @@ import Prelude
-
-+#if ! MIN_VERSION_QuickCheck(2,8,2)
- instance (Arbitrary k, Arbitrary v, Eq k, Ord k) => Arbitrary (M.Map k v)
where
-@@ -28,2 +30,3 @@ instance (Arbitrary v, Eq v, Ord v) => Arbitrary (S.Set v)
where
- arbitrary = S.fromList <$> arbitrary
-+#endif
-
diff --git a/dev-vcs/git-annex/files/git-annex-6.20161210-directory-1.3.patch
b/dev-vcs/git-annex/files/git-annex-6.20161210-directory-1.3.patch
deleted file mode 100644
index 1e9bb57f9ee..000
--- a/dev-vcs/git-annex/files/git-annex-6.20161210-directory-1.3.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/Common.hs b/Common.hs
-index 5213863..74b054e 100644
a/Common.hs
-+++ b/Common.hs
-@@ -27,3 +27,3 @@ import Utility.Process as X
- import Utility.Path as X
--import Utility.Directory as X
-+import Utility.Directory as X hiding (getFileSize)
- import Utility.Monad as X
diff --git a/dev-vcs/git-annex/files/git-annex-6.20170101-crypto-api.patch
b/dev-vcs/git-annex/files/git-annex-6.20170101-crypto-api.patch
deleted file mode 100644
index c517c651ce4..000
--- a/dev-vcs/git-annex/files/git-annex-6.20170101-crypto-api.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-diff --git a/git-annex.cabal b/git-annex.cabal
-index 5b95a16..f03024d 100644
a/git-annex.cabal
-+++ b/git-annex.cabal
-@@ -326,2 +326,3 @@ Executable git-annex
-case-insensitive,
-+ crypto-api,
-random,
diff --git a/dev-vcs/git-annex/git-annex-6.20170818-r1.ebuild
b/dev-vcs/git-annex/git-annex-6.20170818-r1.ebuild
deleted file mode 100644
index 91abe516311..000
--- a/dev-vcs/git-annex/git-annex-6.20170818-r1.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.3.
-#hackport: flags: -production,-android,-androidsplice,-testsuite
-
-CABAL_FEATURES=""
-inherit haskell-cabal bash-completion-r1
-
-DESCRIPTION="manage files with git, without checking their contents into git"
-HOMEPAGE="http://git-annex.branchable.com/;
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz;
-RESTRICT="test"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="+assistant benchmark +concurrentoutput +dbus doc +magic +network-uri
+pairing s3 +torrentparser +webapp +webdav"
-
-RDEPEND="dev-haskell/aeson:=
- dev-haskell/async:=
- dev-haskell/bloomfilter:=
- dev-haskell/byteable:=
- dev-haskell/case-insensitive:=
- dev-haskell/crypto-api:=
- dev-haskell/cryptonite:=
- dev-haskell/data-default:=
- dev-haskell/disk-free-space:=
- dev-haskell/dlist:=
-
[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-annex/, dev-vcs/git-annex/files/
commit: 594a7f1af4056780eced62f3d316e8a70eac593a
Author: Sergei Trofimovich slyfox AT gentoo DOT org
AuthorDate: Sun Aug 9 18:24:29 2015 +
Commit: Sergei Trofimovich slyfox AT gentoo DOT org
CommitDate: Sun Aug 9 18:25:18 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=594a7f1a
dev-vcs/git-annex: bump up to 5.20150731
Package-Manager: portage-2.2.20
dev-vcs/git-annex/Manifest | 1 +
.../git-annex-5.20150731-no-strange-installs.patch | 9 ++
dev-vcs/git-annex/git-annex-5.20150731.ebuild | 171 +
dev-vcs/git-annex/metadata.xml | 5 +-
4 files changed, 185 insertions(+), 1 deletion(-)
diff --git a/dev-vcs/git-annex/Manifest b/dev-vcs/git-annex/Manifest
index b2a8cb7..94a45b1 100644
--- a/dev-vcs/git-annex/Manifest
+++ b/dev-vcs/git-annex/Manifest
@@ -6,3 +6,4 @@ DIST git-annex-5.20150219.tar.gz 4688334 SHA256
46c1d2a338a4f54774060b39fe5e8645
DIST git-annex-5.20150327.tar.gz 4764485 SHA256
1e309466627eb634816805004391c5407dd9eee280e2f21a48de9617a35918fa SHA512
638ed0c97d0f67cd26699826c9ff5192fd2d089932e06fe8305c536fcbad06239f8d745c350938089827ae4b7058f1e2c3156ab7f5f133e7b4a38a2e6cd69544
WHIRLPOOL
a03f2d28b36eff595ba2780ed70fee8204dceb8aef087871f650dd3482865e30d2644e29b9c7d5763cc79ffe8357e81b5b1b7fb1091fa3cb1d171634af37ac77
DIST git-annex-5.20150617.tar.gz 5047577 SHA256
2d37c49866880803886fe77be17ac154c84acc0c344e4fefea577a59e55f8d54 SHA512
25f42ab403d3fd39a689af74cd8a26dc5de761d5a8a79c8d7050194c2094f65de9681b4189076c484fb5c644408918140cf1fcb0109a6a2195f1d547e307abfc
WHIRLPOOL
89410f048f5773256cac6525f1a42e3845a5106a1d0b82e031d1f70136375479efc180b21907036e191243f55aee7d94b041cc1d994dea403a1640e7310f6f4d
DIST git-annex-5.20150710.tar.gz 5080419 SHA256
970f953a278401863fb1006679d216891ae556f80434b587deb08dfd6644f860 SHA512
35240f1d78561dab02ae014e4d00b8645c33c526b0d36a28253b9129198ea53b784949c7b47fd3b97f056842430a5e8b0d312b8ba6985bbb3228c73a4dfa21ea
WHIRLPOOL
06b824031aeef38468e17ef239aa1501a2236a084a9c54e4c81001247c62b8621cdc6bc090f2b1a516df000823951acee784000aa6dc5b4de5dc4bcd5a2bda59
+DIST git-annex-5.20150731.tar.gz 5096183 SHA256
a2eefd4c273f5510e8ee384cc4fb512bf10c76cc4b84f6fff5c255223bd853a1 SHA512
edad8fb6aa98ad08cfe8406e2c7b794b0cc3a437f28ed43b5863bbba59a1633e2d6b3a94b6f942494ef7bd912650f7c89ad2a3d54920ff405f4d8d173e1027e9
WHIRLPOOL
945600b49b9f240da37d4642849395fc9ef9a615701a8088b6fb573e098e9b4de5a4bde8714974105a36a963e19a78137abdc513f9a0335ff5fe36981d12be25
diff --git
a/dev-vcs/git-annex/files/git-annex-5.20150731-no-strange-installs.patch
b/dev-vcs/git-annex/files/git-annex-5.20150731-no-strange-installs.patch
new file mode 100644
index 000..a2ca5b8
--- /dev/null
+++ b/dev-vcs/git-annex/files/git-annex-5.20150731-no-strange-installs.patch
@@ -0,0 +1,9 @@
+diff --git a/Setup.hs b/Setup.hs
+index f90a9b2..97afb7f 100644
+--- a/Setup.hs
b/Setup.hs
+@@ -25,3 +25,3 @@ main = defaultMainWithHooks simpleUserHooks
+ return (Nothing, [])
+- , postCopy = myPostCopy
++ -- , postCopy = myPostCopy
+ }
diff --git a/dev-vcs/git-annex/git-annex-5.20150731.ebuild
b/dev-vcs/git-annex/git-annex-5.20150731.ebuild
new file mode 100644
index 000..3f4f031
--- /dev/null
+++ b/dev-vcs/git-annex/git-annex-5.20150731.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.5.
+
+CABAL_FEATURES=bin
+inherit haskell-cabal
+
+DESCRIPTION=manage files with git, without checking their contents into git
+HOMEPAGE=http://git-annex.branchable.com/;
+SRC_URI=mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz
+RESTRICT=test
+
+LICENSE=GPL-3
+SLOT=0
+KEYWORDS=~amd64 ~x86 ~amd64-linux
+IUSE=asciiprogress +assistant +database +dbus +desktopnotify +dns doc ekg
+feed +inotify +network-uri +pairing +quvi +s3 +tahoe +tdfa +torrentparser
+webapp +webapp-secure +webdav +xmpp
+
+RDEPEND=dev-haskell/async:=
+ dev-haskell/bloomfilter:=
+ dev-haskell/case-insensitive:=
+ =dev-haskell/cryptohash-0.11.0:=
+ dev-haskell/data-default:=
+ dev-haskell/dlist:=
+ dev-haskell/edit-distance:=
+ =dev-haskell/exceptions-0.6:=
+ dev-haskell/hslogger:=
+ dev-haskell/http-conduit:=
+ dev-haskell/http-types:=
+ dev-haskell/ifelse:=
+ dev-haskell/json:=
+ dev-haskell/missingh:=
+ dev-haskell/monad-control:=
+ dev-haskell/monad-logger:=
+ =dev-haskell/mtl-2:=
+ dev-haskell/old-locale:=
+ =dev-haskell/optparse-applicative-0.10:=
+ =dev-haskell/quickcheck-2.1:2=
+ dev-haskell/random:=
+ dev-haskell/resourcet:=
+ dev-haskell/safesemaphore:=
+ dev-haskell/sandi:=
+ =dev-haskell/stm-2.3:=
+ dev-haskell/text:=
+ dev-haskell/transformers:=
+ dev-haskell/unix-compat:=
+
