diff options
Diffstat (limited to 'dev-vcs/git-annex')
| -rw-r--r-- | dev-vcs/git-annex/Manifest | 5 | ||||
| -rw-r--r-- | dev-vcs/git-annex/files/git-annex-8.20210330-persistent-2.12.patch | 28 | ||||
| -rw-r--r-- | dev-vcs/git-annex/git-annex-10.20220624.ebuild | 2 | ||||
| -rw-r--r-- | dev-vcs/git-annex/metadata.xml | 2 |
4 files changed, 5 insertions, 32 deletions
diff --git a/dev-vcs/git-annex/Manifest b/dev-vcs/git-annex/Manifest index 1eda2778a5a1..ed2c01399843 100644 --- a/dev-vcs/git-annex/Manifest +++ b/dev-vcs/git-annex/Manifest @@ -1,6 +1,5 @@ -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-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 +EBUILD git-annex-10.20220624.ebuild 4199 BLAKE2B c200a4e283f89f83a4a16efee76644fa5f95983870a4b17aa8051b3839a03a5d5dd7fee641b2bfc65061cb320d8c3f954f335963ec61f93e88eb76551af5016c SHA512 b4a6dd64dbbf31fc2c4480110d34a6a361c753b1e8c1b708e0e88af553732381468fb1392ebc944e31ffc1d8b650f158b2779551cfe804673c9af17560013f48 +MISC metadata.xml 784 BLAKE2B 36b0c9b201205f4e3b614e7fbfed0f3e1261728cf5a5b74a2a7c9003b1c1f1e9228aa2cd4f32bdb3993cddd55d74db5c19a1d7a808dd8f60677fb251abb33701 SHA512 d0c948899a2199fc5234cdf8106544019d26d0445e5abcb66719cb67ec702c017517ab69dbbb16947ae7604ed235dfe00d7b7987a8eb395ece001d713a07b530 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 deleted file mode 100644 index 977e5931f5f4..000000000000 --- a/dev-vcs/git-annex/files/git-annex-8.20210330-persistent-2.12.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- 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 index 3104cec95ee0..875ff88f915e 100644 --- a/dev-vcs/git-annex/git-annex-10.20220624.ebuild +++ b/dev-vcs/git-annex/git-annex-10.20220624.ebuild @@ -17,6 +17,8 @@ SLOT="0" KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux" IUSE="+assistant +benchmark +dbus debug doc +gitlfs +magicmime +pairing +torrentparser +webapp" +REQUIRED_USE="webapp? ( assistant )" + RDEPEND="dev-haskell/aeson:= >=dev-haskell/ansi-terminal-0.9:= dev-haskell/async:= diff --git a/dev-vcs/git-annex/metadata.xml b/dev-vcs/git-annex/metadata.xml index 82dde5fc9a30..1f73976ae199 100644 --- a/dev-vcs/git-annex/metadata.xml +++ b/dev-vcs/git-annex/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>haskell@gentoo.org</email> |