From ad0412d0cafb8c04ce98024155cf99a4cc27db44 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 30 Jul 2022 09:09:34 +0100 Subject: gentoo auto-resync : 30:07:2022 - 09:09:33 --- dev-vcs/git-annex/Manifest | 7 +- .../git-annex-8.20210330-persistent-2.12.patch | 28 ++++ dev-vcs/git-annex/git-annex-10.20220624.ebuild | 144 ++++++++++++++++++ dev-vcs/git-annex/git-annex-8.20200810.ebuild | 164 --------------------- dev-vcs/git-annex/metadata.xml | 26 +--- 5 files changed, 177 insertions(+), 192 deletions(-) create mode 100644 dev-vcs/git-annex/files/git-annex-8.20210330-persistent-2.12.patch create mode 100644 dev-vcs/git-annex/git-annex-10.20220624.ebuild delete mode 100644 dev-vcs/git-annex/git-annex-8.20200810.ebuild (limited to 'dev-vcs/git-annex') diff --git a/dev-vcs/git-annex/Manifest b/dev-vcs/git-annex/Manifest index a5aa937c65dd..1eda2778a5a1 100644 --- a/dev-vcs/git-annex/Manifest +++ b/dev-vcs/git-annex/Manifest @@ -1,5 +1,6 @@ +AUX git-annex-8.20210330-persistent-2.12.patch 946 BLAKE2B c5fc158db402d67e411d88ec0ea3dc4b07194c382bd2245d078f59b04d80c780f4bae32eae52f5720c8e6f70fed46d2c2e33f7fa1dfad75b84db10604932d94f SHA512 f29fcd2964338b77e1c5fde4a8bccf85e0973c394916bfe083c0dccfa46040e4d0a9a47f70c95fefdcf216fda8ee23c770042eeb126e097f9cf7fe8613aaf323 AUX git-annex.bash 440 BLAKE2B af7b2b47e98386cef417051a11ae4baff07ea8cd96177c95b6b49095f5b7724ecbc1c4f13a6f351afe66f0d015c7355b6a56b77c06cb1e9e5cf155268312c619 SHA512 89b6520e4be14af9032638c1153df936a7e5707d6453b4251fe762712b8956ba1d39a4623b06910e5ac5724e33e157e654b724e070b6893f6f26578df730d326 AUX git-annex.xpm 1961 BLAKE2B 0fe6e0cf9c43b1b16db1e8394ccda5eef2fdc41727aa3aa97fef8f955e8fdd71336c29f439ed2ad46553f8d67ef8be9d3dbcc6a93c81686f5e746a08b1113c6d SHA512 4a22ac448852160d66838c272f41b8c7599aa1b904e35ac03ea294d9ed15b855bde24b7e5407a2578937bfd51d482837ed6680af680166d030f71666316ae4d3 -DIST git-annex-8.20200810.tar.gz 1312890 BLAKE2B 63226ee6b2150dd48dae3e52e70502e64e89d73185500c1cea201f2be98760ed9b3cd173b75b5603b49ca63f316163273a7c6d7eaddd68e548d903c845925713 SHA512 e6a4ad3169582f65284218c75f2679105a52d2f22310b10436796c439e031c5ad6f4d2dff1772f4cfc670d8956ae4a68d4d98e1dabd48bf06bcafda97676321f -EBUILD git-annex-8.20200810.ebuild 4802 BLAKE2B 04e6958e4dab5428427e0ae4990b962500103ef6b856b0e68f7657115a93e4bcd05d64d8ba34eb156c662263f4750adfcd845956fd9df835bc66e1724702685e SHA512 20200d3f9c9b4ebbf5e375c75d1e001b45d4adf1b310d5cfc51f4d26867aca044558cafcfda4a5381505553480ea20f576f8cda3cb07e745716970698b037439 -MISC metadata.xml 2191 BLAKE2B 7c63cee55780cb57abac8f4cd5e2b9067fc51c8bc79cb12d0a432430f3a200b9859486ba6808ae0543db3e14b3361d6449e908f3311aebaa452c159389197236 SHA512 58294e15c74aea0c88ad7df113a6272ffbd4bf3aa0c0dd9843a9d0bc1b3b7423a18d45d7d25a02cf683567ee95d20c4ae79c20d845227875e01780656335f52b +DIST git-annex-10.20220624.tar.gz 1426982 BLAKE2B fa3a105f9677c51dfb1a44984ac80a377380ff5e2c69486f6f213fcb709c2280c66b8d856f004016f97751abea3faeca8756663c0af19616ed237d8e4d9d25f9 SHA512 4269c3408c9368283ab280c7231953ad95687b5ff84c1e9cb725d5ed6eb4da9384c48de33e4265d2fd8b1352eea47bffaac7d335d2c998149555b050f80a75af +EBUILD git-annex-10.20220624.ebuild 4161 BLAKE2B ca5a395a01f89af8dfdb5fff0d632c35238b53be147bc0bca082a124c66c94b9dd1ec667a6ad2b000477ddb6d4d1ee5b890251270199eb2f2973489a5ca9ab0c SHA512 5c7ec0328b757b1a43c7c06335a97bfd3d363234a94fc6b7619b96cf73d82692525f5577d79a0f50f4f08e9157fb57bf8f45be6c2ed93ddf29da2f97d369acec +MISC metadata.xml 783 BLAKE2B e432870d3b0798fd24f3f138c1213f8497c0bc4c1b5e7f234834919b54494ae476178a2fab1df4a8908e2d555958429b757277b7d58f970de2d2fe56d8d824ed SHA512 0d40eaea4a8c3ba321f6fa27270ec542b2c05c03d2ee7e56476de0a15410f5cf1775db1bf99c0c1c46bcd3874014879c1d15ff16a9ada547737a960cdebd946d 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 000000000000..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-10.20220624.ebuild b/dev-vcs/git-annex/git-annex-10.20220624.ebuild new file mode 100644 index 000000000000..3104cec95ee0 --- /dev/null +++ b/dev-vcs/git-annex/git-annex-10.20220624.ebuild @@ -0,0 +1,144 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# ebuild generated by hackport 0.7.1.2.9999 +#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="https://git-annex.branchable.com/" + +LICENSE="AGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux" +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-0.13.2.2:= + >=dev-haskell/aws-0.20:= + >=dev-haskell/bloomfilter-2.0.0:= + dev-haskell/byteable:= + dev-haskell/case-insensitive:= + >=dev-haskell/concurrent-output-1.10:= + dev-haskell/conduit:= + >=dev-haskell/connection-0.2.6:= + dev-haskell/crypto-api:= + >=dev-haskell/cryptonite-0.23:= + dev-haskell/data-default:= + >=dev-haskell/dav-1.0:= + dev-haskell/disk-free-space:= + dev-haskell/dlist:= + dev-haskell/edit-distance:= + >=dev-haskell/feed-1.0.0:= + >=dev-haskell/filepath-bytestring-1.4.2.1.1:= + dev-haskell/free:= + >=dev-haskell/http-client-0.5.3:= + >=dev-haskell/http-client-restricted-0.0.2:= + dev-haskell/http-client-tls:= + >=dev-haskell/http-conduit-2.3.0:= + >=dev-haskell/http-types-0.7:= + dev-haskell/ifelse:= + dev-haskell/memory:= + dev-haskell/microlens:= + dev-haskell/monad-control:= + >=dev-haskell/monad-logger-0.3.10:= + >=dev-haskell/network-3.0.0.0:= + dev-haskell/network-bsd:= + >=dev-haskell/network-uri-2.6:= + dev-haskell/old-locale:= + >=dev-haskell/optparse-applicative-0.14.1:= + >=dev-haskell/persistent-2.8.1:= + >=dev-haskell/persistent-sqlite-2.8.1:= + dev-haskell/persistent-template:= + >=dev-haskell/quickcheck-2.10.0:2= + dev-haskell/random:= + dev-haskell/regex-tdfa:= + dev-haskell/resourcet:= + dev-haskell/safesemaphore:= + dev-haskell/sandi:= + dev-haskell/securemem:= + dev-haskell/socks:= + dev-haskell/split:= + >=dev-haskell/stm-2.3:= + dev-haskell/stm-chans:= + dev-haskell/tagsoup:= + >=dev-haskell/tasty-1.2:= + dev-haskell/tasty-hunit:= + dev-haskell/tasty-quickcheck:= + dev-haskell/tasty-rerun:= + >=dev-haskell/unix-compat-0.5:= + dev-haskell/unliftio-core:= + dev-haskell/unordered-containers:= + dev-haskell/utf8-string:= + >=dev-haskell/uuid-1.2.6:= + dev-haskell/vector:= + >=dev-lang/ghc-8.10.1:= + assistant? ( >=dev-haskell/hinotify-0.3.10:= + dev-haskell/mountpoints:= ) + benchmark? ( dev-haskell/criterion:= ) + dbus? ( >=dev-haskell/dbus-0.10.7:= + >=dev-haskell/fdo-notify-0.3:= ) + gitlfs? ( >=dev-haskell/git-lfs-1.2.0:= ) + magicmime? ( dev-haskell/magic:= ) + pairing? ( dev-haskell/network-info:= + dev-haskell/network-multicast:= ) + torrentparser? ( >=dev-haskell/torrent-10000.0.0:= ) + webapp? ( dev-haskell/blaze-builder:= + dev-haskell/clientsession:= + >=dev-haskell/path-pieces-0.2.1:= + >=dev-haskell/shakespeare-2.0.11:= + dev-haskell/wai:= + dev-haskell/wai-extra:= + >=dev-haskell/warp-3.2.8:= + >=dev-haskell/warp-tls-3.2.2:= + >=dev-haskell/yesod-1.4.3:= + >=dev-haskell/yesod-core-1.6.0:= + >=dev-haskell/yesod-form-1.4.8:= + >=dev-haskell/yesod-static-1.5.1:= ) +" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-3.2.0.0 + >=dev-haskell/filepath-bytestring-1.4.2.1.4 +" +# not generated by hackport: +RDEPEND+=" dev-vcs/git +" +DEPEND+=" dev-lang/perl + doc? ( www-apps/ikiwiki net-misc/rsync ) +" + +src_configure() { + haskell-cabal_src_configure \ + --flag=-android \ + --flag=-androidsplice \ + $(cabal_flag assistant assistant) \ + $(cabal_flag benchmark benchmark) \ + $(cabal_flag dbus dbus) \ + $(cabal_flag debug debuglocks) \ + $(cabal_flag gitlfs gitlfs) \ + $(cabal_flag magicmime magicmime) \ + --flag=networkbsd \ + $(cabal_flag pairing pairing) \ + --flag=-production \ + --flag=-testsuite \ + $(cabal_flag torrentparser torrentparser) \ + $(cabal_flag webapp webapp) +} + +src_install() { + haskell-cabal_src_install + + newbashcomp "${FILESDIR}"/${PN}.bash ${PN} + + dodoc CHANGELOG README + if use webapp ; then + doicon "${FILESDIR}"/${PN}.xpm + make_desktop_entry "${PN} webapp" "git-annex" ${PN}.xpm "Office" + fi +} diff --git a/dev-vcs/git-annex/git-annex-8.20200810.ebuild b/dev-vcs/git-annex/git-annex-8.20200810.ebuild deleted file mode 100644 index c80e75b51846..000000000000 --- a/dev-vcs/git-annex/git-annex-8.20200810.ebuild +++ /dev/null @@ -1,164 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# ebuild generated by hackport 0.6.6.9999 -#hackport: flags: -production,-android,-androidsplice,-testsuite - -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" - -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 - -RDEPEND="dev-haskell/aeson:= - dev-haskell/async:= - dev-haskell/attoparsec:= - >=dev-haskell/bloomfilter-2.0.0:= - dev-haskell/byteable:= - dev-haskell/case-insensitive:= - >=dev-haskell/concurrent-output-1.10:= - dev-haskell/conduit:= - >=dev-haskell/connection-0.2.6:= - dev-haskell/crypto-api:= - >=dev-haskell/cryptonite-0.23:= - dev-haskell/data-default:= - dev-haskell/disk-free-space:= - dev-haskell/dlist:= - dev-haskell/edit-distance:= - >=dev-haskell/exceptions-0.6:= - >=dev-haskell/feed-1.0.0:= - >=dev-haskell/filepath-bytestring-1.4.2.1.1:= - dev-haskell/free:= - dev-haskell/hslogger:= - >=dev-haskell/http-client-0.5.3:= - dev-haskell/http-client-tls:= - >=dev-haskell/http-conduit-2.3.0:= - >=dev-haskell/http-types-0.7:= - dev-haskell/ifelse:= - dev-haskell/memory:= - dev-haskell/microlens:= - dev-haskell/monad-control:= - dev-haskell/monad-logger:= - >=dev-haskell/mtl-2:= - >=dev-haskell/network-uri-2.6:= - dev-haskell/old-locale:= - >=dev-haskell/optparse-applicative-0.14.1:= - >=dev-haskell/persistent-2.8.1:= - >=dev-haskell/persistent-sqlite-2.8.1:= - dev-haskell/persistent-template:= - >=dev-haskell/quickcheck-2.10.0:2= - dev-haskell/random:= - dev-haskell/regex-tdfa:= - dev-haskell/resourcet:= - dev-haskell/safesemaphore:= - dev-haskell/sandi:= - dev-haskell/securemem:= - dev-haskell/socks:= - dev-haskell/split:= - >=dev-haskell/stm-2.3:= - dev-haskell/stm-chans:= - dev-haskell/tagsoup:= - >=dev-haskell/tasty-0.7:= - dev-haskell/tasty-hunit:= - dev-haskell/tasty-quickcheck:= - dev-haskell/tasty-rerun:= - dev-haskell/text:= - >=dev-haskell/unix-compat-0.5:= - dev-haskell/unliftio-core:= - dev-haskell/unordered-containers:= - dev-haskell/utf8-string:= - >=dev-haskell/uuid-1.2.6:= - dev-haskell/vector:= - >=dev-lang/ghc-8.4.3:= - assistant? ( >=dev-haskell/hinotify-0.3.10:= - dev-haskell/mountpoints:= ) - benchmark? ( dev-haskell/criterion:= ) - dbus? ( >=dev-haskell/dbus-0.10.7:= - >=dev-haskell/fdo-notify-0.3:= ) - gitlfs? ( >=dev-haskell/git-lfs-1.1.0:= ) - httpclientrestricted? ( >=dev-haskell/http-client-restricted-0.0.2:= ) - magicmime? ( dev-haskell/magic:= ) - networkbsd? ( >=dev-haskell/network-3.0.0.0:= - dev-haskell/network-bsd:= ) - !networkbsd? ( >=dev-haskell/network-2.6.3.0:= =dev-haskell/aws-0.20:= ) - torrentparser? ( >=dev-haskell/torrent-10000.0.0:= ) - webapp? ( dev-haskell/blaze-builder:= - dev-haskell/clientsession:= - >=dev-haskell/path-pieces-0.2.1:= - >=dev-haskell/shakespeare-2.0.11:= - dev-haskell/wai:= - dev-haskell/wai-extra:= - >=dev-haskell/warp-3.2.8:= - >=dev-haskell/warp-tls-3.2.2:= - >=dev-haskell/yesod-1.4.3:= - >=dev-haskell/yesod-core-1.6.0:= - >=dev-haskell/yesod-form-1.4.8:= - >=dev-haskell/yesod-static-1.5.1:= ) - webdav? ( >=dev-haskell/dav-1.0:= ) -" -# not generated by hackport: -RDEPEND+=" dev-vcs/git -" -DEPEND="${RDEPEND} - >=dev-haskell/cabal-2.2.0.1 -" -# not generated by hackport: -DEPEND+=" dev-lang/perl - doc? ( www-apps/ikiwiki net-misc/rsync ) -" - -src_configure() { - haskell-cabal_src_configure \ - --flag=-android \ - --flag=-androidsplice \ - $(cabal_flag assistant assistant) \ - $(cabal_flag benchmark benchmark) \ - $(cabal_flag dbus dbus) \ - $(cabal_flag debuglocks debuglocks) \ - $(cabal_flag gitlfs gitlfs) \ - $(cabal_flag httpclientrestricted httpclientrestricted) \ - $(cabal_flag magicmime magicmime) \ - $(cabal_flag networkbsd networkbsd) \ - $(cabal_flag pairing pairing) \ - --flag=-production \ - $(cabal_flag s3 s3) \ - --flag=-testsuite \ - $(cabal_flag torrentparser torrentparser) \ - $(cabal_flag webapp webapp) \ - $(cabal_flag webdav webdav) -} - -src_test() { - if use webapp; then - export GIT_CONFIG=${T}/temp-git-config - git config user.email "git@src_test" - git config user.name "Mr. ${P} The Test" - - emake test - fi -} - -src_install() { - haskell-cabal_src_install - - newbashcomp "${FILESDIR}"/${PN}.bash ${PN} - - dodoc CHANGELOG README - if use webapp ; then - doicon "${FILESDIR}"/${PN}.xpm - make_desktop_entry "${PN} webapp" "git-annex" ${PN}.xpm "Office" - fi -} diff --git a/dev-vcs/git-annex/metadata.xml b/dev-vcs/git-annex/metadata.xml index 0f121b9748a2..82dde5fc9a30 100644 --- a/dev-vcs/git-annex/metadata.xml +++ b/dev-vcs/git-annex/metadata.xml @@ -1,5 +1,5 @@ - + haskell@gentoo.org @@ -9,34 +9,10 @@ Enable git-annex assistant and watch command Enable benchmarking Enable dbus support - Debug location of MVar/STM deadlocks Build with git-lfs library (rather than vendored copy) - Build with http-client-restricted library (rather than vendored copy) Use libmagic to determine file MIME types - Build with network-3.0 which split out network-bsd Enable pairing - Enable S3 support Use haskell torrent library to parse torrent files Enable git-annex webapp - Enable WebDAV support - - git-annex allows managing files with git, without checking the file - contents into git. While that may seem paradoxical, it is useful when - dealing with files larger than git can currently easily handle, whether due - to limitations in memory, time, or disk space. - - It can store large files in many places, from local hard drives, to a - large number of cloud storage services, including S3, WebDAV, - and rsync, with a dozen cloud storage providers usable via plugins. - Files can be stored encrypted with gpg, so that the cloud storage - provider cannot see your data. git-annex keeps track of where each file - is stored, so it knows how many copies are available, and has many - facilities to ensure your data is preserved. - - git-annex can also be used to keep a folder in sync between computers, - noticing when files are changed, and automatically committing them - to git and transferring them to other computers. The git-annex webapp - makes it easy to set up and use git-annex this way. - -- cgit v1.2.3