From b046d9524a2cf48dff2819c985c803b38ed610f3 Mon Sep 17 00:00:00 2001 From: Mark Wright Date: Mon, 22 Jun 2026 19:24:41 +1000 Subject: [PATCH] dev-vcs/git-annex: Bump to 10.20260601 Signed-off-by: Mark Wright --- dev-vcs/git-annex/Manifest | 2 +- ...24.ebuild => git-annex-10.20260601.ebuild} | 102 +++++++++--------- dev-vcs/git-annex/metadata.xml | 2 +- 3 files changed, 53 insertions(+), 53 deletions(-) rename dev-vcs/git-annex/{git-annex-10.20220624.ebuild => git-annex-10.20260601.ebuild} (62%) diff --git a/dev-vcs/git-annex/Manifest b/dev-vcs/git-annex/Manifest index 6467c7376d434..02734898efbe8 100644 --- a/dev-vcs/git-annex/Manifest +++ b/dev-vcs/git-annex/Manifest @@ -1,2 +1,2 @@ -DIST git-annex-10.20220624.tar.gz 1426982 BLAKE2B fa3a105f9677c51dfb1a44984ac80a377380ff5e2c69486f6f213fcb709c2280c66b8d856f004016f97751abea3faeca8756663c0af19616ed237d8e4d9d25f9 SHA512 4269c3408c9368283ab280c7231953ad95687b5ff84c1e9cb725d5ed6eb4da9384c48de33e4265d2fd8b1352eea47bffaac7d335d2c998149555b050f80a75af DIST git-annex-10.20230802.tar.gz 1481981 BLAKE2B 5c7bf5695fb62f9d1aecf4e1a65d1bee726a55396efc5ccd9881bd0086dee4b679814ccaaf9ac5bf191b46b629b6dc86f43aed4cdc32423af35ede745ddf7219 SHA512 6d8235cfcc9993c3db415b606ebb818183df313531c14be85a7ae353e1822dc22250aa25ed60153e75732e846319e5f20f714354f45029776060b4a838a26471 +DIST git-annex-10.20260601.tar.gz 1574707 BLAKE2B 9e6d21bfb7ee2678bf48885aa82ce49cab5b21ead174bfced5a0cc749b22853059332a81f5addedba63050d10a5b8a5bad76dc37c3bd018a602f20526e8279bb SHA512 b45f461de664457750aadddca3ef3f21eb8297a06b7c5e3baf4aa5305e022314926c0596417292c749fd9ede7929ec608ab23e80599256f28d8c96b31dc5238a diff --git a/dev-vcs/git-annex/git-annex-10.20220624.ebuild b/dev-vcs/git-annex/git-annex-10.20260601.ebuild similarity index 62% rename from dev-vcs/git-annex/git-annex-10.20220624.ebuild rename to dev-vcs/git-annex/git-annex-10.20260601.ebuild index f052e90c67b4d..93c946dad60f2 100644 --- a/dev-vcs/git-annex/git-annex-10.20220624.ebuild +++ b/dev-vcs/git-annex/git-annex-10.20260601.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -# ebuild generated by hackport 0.7.1.2.9999 +# ebuild generated by hackport 0.9.1.0 #hackport: flags: -production,-android,-androidsplice,-testsuite,+networkbsd CABAL_FEATURES="" @@ -14,10 +14,8 @@ HOMEPAGE="https://git-annex.branchable.com/" LICENSE="AGPL-3" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" -IUSE="+assistant +benchmark +dbus debug doc +gitlfs +magicmime +pairing +torrentparser +webapp" - -REQUIRED_USE="webapp? ( assistant )" +KEYWORDS="~amd64 ~arm64" +IUSE="+assistant +benchmark +dbus debug +magicmime parallelbuild +torrentparser" GHC_BOOTSTRAP_PACKAGES=( async @@ -26,30 +24,33 @@ GHC_BOOTSTRAP_PACKAGES=( unix-compat ) -RDEPEND="dev-haskell/aeson:= +RDEPEND=">=dev-haskell/aeson-2.0.0:= >=dev-haskell/ansi-terminal-0.9:= dev-haskell/async:= >=dev-haskell/attoparsec-0.13.2.2:= - >=dev-haskell/aws-0.20:= + >=dev-haskell/aws-0.24.1:= >=dev-haskell/bloomfilter-2.0.0:= dev-haskell/byteable:= dev-haskell/case-insensitive:= + >=dev-haskell/clock-0.3.0:= >=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/crypton:= + >=dev-haskell/crypton-connection-0.4.3:= + dev-haskell/crypton-x509-store:= dev-haskell/data-default:= >=dev-haskell/dav-1.0:= dev-haskell/disk-free-space:= - dev-haskell/dlist:= + >=dev-haskell/dlist-1.0:= dev-haskell/edit-distance:= - >=dev-haskell/feed-1.0.0:= + >=dev-haskell/feed-1.1.0:= >=dev-haskell/filepath-bytestring-1.4.2.1.1:= dev-haskell/free:= + >=dev-haskell/git-lfs-1.2.0:= >=dev-haskell/http-client-0.5.3:= >=dev-haskell/http-client-restricted-0.0.2:= - dev-haskell/http-client-tls:= + >=dev-haskell/http-client-tls-0.3.2:= >=dev-haskell/http-conduit-2.3.0:= >=dev-haskell/http-types-0.7:= dev-haskell/ifelse:= @@ -61,10 +62,10 @@ RDEPEND="dev-haskell/aeson:= 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/optparse-applicative-0.14.2:= + >=dev-haskell/persistent-2.13.3:= + >=dev-haskell/persistent-sqlite-2.13.3:= + >=dev-haskell/persistent-template-2.8.0:= >=dev-haskell/quickcheck-2.10.0:= dev-haskell/random:= dev-haskell/regex-tdfa:= @@ -72,55 +73,52 @@ RDEPEND="dev-haskell/aeson:= dev-haskell/safesemaphore:= dev-haskell/sandi:= dev-haskell/securemem:= - dev-haskell/socks:= + dev-haskell/servant:= + dev-haskell/servant-client:= + dev-haskell/servant-client-core:= + dev-haskell/servant-server:= + >=dev-haskell/socks-0.6.0:= dev-haskell/split:= - >=dev-haskell/stm-2.3:= dev-haskell/stm-chans:= dev-haskell/tagsoup:= - >=dev-haskell/tasty-1.2:= + >=dev-haskell/tasty-1.3.0:= dev-haskell/tasty-hunit:= dev-haskell/tasty-quickcheck:= dev-haskell/tasty-rerun:= - >=dev-haskell/unix-compat-0.5:= + >=dev-haskell/text-2.0.2:= + dev-haskell/tls:= + dev-haskell/unbounded-delays:= + >=dev-haskell/unix-compat-0.5:= =dev-haskell/utf8-string-1.0.0:= >=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/warp-3.2.8:= + >=dev-haskell/warp-tls-3.2.2:= + >=dev-lang/ghc-9.6.5:= + assistant? ( dev-haskell/blaze-builder:= dev-haskell/clientsession:= + >=dev-haskell/hinotify-0.3.10:= + dev-haskell/mountpoints:= >=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:= ) + benchmark? ( dev-haskell/criterion:= ) + dbus? ( >=dev-haskell/dbus-0.10.7:= + >=dev-haskell/fdo-notify-0.3:= ) + magicmime? ( dev-haskell/magic:= ) + torrentparser? ( >=dev-haskell/torrent-10000.0.0:= ) " DEPEND="${RDEPEND} - >=dev-haskell/cabal-3.2.0.0 + >=dev-haskell/cabal-3.10.3.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 \ @@ -130,14 +128,12 @@ src_configure() { $(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) \ + $(cabal_flag parallelbuild parallelbuild) \ --flag=-production \ --flag=-testsuite \ - $(cabal_flag torrentparser torrentparser) \ - $(cabal_flag webapp webapp) + $(cabal_flag torrentparser torrentparser) } src_install() { @@ -146,8 +142,12 @@ 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 + + doicon "${FILESDIR}"/${PN}.xpm + make_desktop_entry "${PN} webapp" "git-annex" ${PN}.xpm "Office" + + # Create symlinks that used to be installed by Setup.hs + # See: + dosym git-annex /usr/bin/git-annex-shell + dosym git-annex /usr/bin/git-remote-tor-annex } diff --git a/dev-vcs/git-annex/metadata.xml b/dev-vcs/git-annex/metadata.xml index b731b802a1c09..c6a6530fdf8ab 100644 --- a/dev-vcs/git-annex/metadata.xml +++ b/dev-vcs/git-annex/metadata.xml @@ -11,8 +11,8 @@ Build with git-lfs library (rather than vendored copy) Use libmagic to determine file MIME types Enable pairing + Enable production build (slower build; faster binary) Use haskell torrent library to parse torrent files - Enable git-annex webapp https://git-annex.branchable.com