diff options
Diffstat (limited to 'dev-vcs/git-annex')
| -rw-r--r-- | dev-vcs/git-annex/Manifest | 9 | ||||
| -rw-r--r-- | dev-vcs/git-annex/files/git-annex-6.20160114-QC-2.8.2.patch | 16 | ||||
| -rw-r--r-- | dev-vcs/git-annex/files/git-annex-6.20161210-directory-1.3.patch | 9 | ||||
| -rw-r--r-- | dev-vcs/git-annex/files/git-annex-6.20170101-crypto-api.patch | 8 | ||||
| -rw-r--r-- | dev-vcs/git-annex/git-annex-8.20200810.ebuild (renamed from dev-vcs/git-annex/git-annex-6.20170818-r1.ebuild) | 115 | ||||
| -rw-r--r-- | dev-vcs/git-annex/metadata.xml | 47 |
6 files changed, 90 insertions, 114 deletions
diff --git a/dev-vcs/git-annex/Manifest b/dev-vcs/git-annex/Manifest index 590d14674f8e..5b56ec0df693 100644 --- a/dev-vcs/git-annex/Manifest +++ b/dev-vcs/git-annex/Manifest @@ -1,8 +1,5 @@ -AUX git-annex-6.20160114-QC-2.8.2.patch 509 BLAKE2B 2d84231d59a062bbe3e5a2c970f8c01e7da5cea0e42ff40bedffcfea079e3e131a395a033a3c1d012bda31af2c2326dc4d75c929e8e47b2e198a7ebcc2efadc6 SHA512 2df4f294bd8e39a067cdf7adf0f44d08a7910d7954529d053fd35d35b263dc891ecb1390427783c3448d660e918b6076c86e6c01145f272226c20c8d7688cd1c -AUX git-annex-6.20161210-directory-1.3.patch 279 BLAKE2B 7d85392d72f146c4fb7545c19b362c6f1915925570f69697f612defdcf811596e2b339d2d9a6ed4038f5fc73bf887ecea464a768d40d4616a8fc1992836b279a SHA512 6247c9d8221ec3c1090d6cd66fbf525ea429e64ade0820a54d5116d69c36ba69f7f7ce1ec46d26afdacd24ffdad813ad540abbecd50fca318c7439bd347a6533 -AUX git-annex-6.20170101-crypto-api.patch 212 BLAKE2B 0e9e1fdda1a93ffd709955c472052aa507e364c94095b6acf94f94693c23681a145f808b17c98bb5d40ddc111bb2de43f594e4333e2f6322c93ff711268916f0 SHA512 c0b69ef8dffd9df06663513233f7848e3f8abfec5f6f93656cbfc466887ac5d2bbbbe65bb07088a488616593a44456fa9aa459a1404352afa66b2b7cdc937dfe AUX git-annex.bash 440 BLAKE2B af7b2b47e98386cef417051a11ae4baff07ea8cd96177c95b6b49095f5b7724ecbc1c4f13a6f351afe66f0d015c7355b6a56b77c06cb1e9e5cf155268312c619 SHA512 89b6520e4be14af9032638c1153df936a7e5707d6453b4251fe762712b8956ba1d39a4623b06910e5ac5724e33e157e654b724e070b6893f6f26578df730d326 AUX git-annex.xpm 1961 BLAKE2B 0fe6e0cf9c43b1b16db1e8394ccda5eef2fdc41727aa3aa97fef8f955e8fdd71336c29f439ed2ad46553f8d67ef8be9d3dbcc6a93c81686f5e746a08b1113c6d SHA512 4a22ac448852160d66838c272f41b8c7599aa1b904e35ac03ea294d9ed15b855bde24b7e5407a2578937bfd51d482837ed6680af680166d030f71666316ae4d3 -DIST git-annex-6.20170818.tar.gz 1111837 BLAKE2B ff18ffd101b3f9dc2b74caaed57c8f8f568fc51beeedddccf7f76ef5a27a99801cb994a52f09e5467be2f030842f4fa3b38bfd0a19a207057ffe269dfc8f240c SHA512 06587bf0d3056e4b94d4c40aaae820efda133dcbc876a2ac3db3183fb511ec20aae4c495323b4886868a3e66b5b1f53a04c5f3abb0362c718bbadc8e2f6e15d0 -EBUILD git-annex-6.20170818-r1.ebuild 4424 BLAKE2B 3f8bfdcb1c4ff2e328def3aa19df4ecaf37f63af2f13abc6da4d9e5083feecb67d61693a9045fa3b7f5b0a0671140d6cad803cf1880c51e9b41d7ce792c8e7bd SHA512 cd13af30010593bd53b55711478c8941e963f76f71bb52fcef1207c0275118d2ff95d693066fab96384bbba8d7deb808f0e3ec30563d1fa917b55d02cb52e5bc -MISC metadata.xml 1661 BLAKE2B 356d0921a762cfb657a0da795457c4016c2b131d0465e214cd24ca1b61b6b2666d0d4d3888abcaad00c70bae8f45b25400abfcba669aaa0e6f136f7e782424f0 SHA512 711b59db225918c774489ce308f16fd372377ff64c1449030bc75c4ae17212515ddeac741ee11978a6e3212b3edc75fd45d730664bd625a54d7887bc12dab928 +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 2190 BLAKE2B bc99f8444bdf97aa1cf12abaa871454c84c928ae2938c1a9d37121bc8249bbf818ac875a7db7ed737ef80fc2421899f152c1cf6be869dc84fe071bf8626cbe21 SHA512 6b343a22a16b3466676f9a493da11a645e7b593eb9fe99b13198a8845e213526371deb03464256142c2ba3bdea4dd1e71092bc84e4fe45fcc18165d3ef89886f 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 2f232782de02..000000000000 --- 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 1e9bb57f9eec..000000000000 --- 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 c517c651ce47..000000000000 --- 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-8.20200810.ebuild index 91abe516311c..c80e75b51846 100644 --- a/dev-vcs/git-annex/git-annex-6.20170818-r1.ebuild +++ b/dev-vcs/git-annex/git-annex-8.20200810.ebuild @@ -1,54 +1,62 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -# ebuild generated by hackport 0.5.3.9999 +# ebuild generated by hackport 0.6.6.9999 #hackport: flags: -production,-android,-androidsplice,-testsuite CABAL_FEATURES="" -inherit haskell-cabal bash-completion-r1 +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" -RESTRICT="test" -LICENSE="GPL-3" +LICENSE="AGPL-3" SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux" -IUSE="+assistant benchmark +concurrentoutput +dbus doc +magic +network-uri +pairing s3 +torrentparser +webapp +webdav" +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/bloomfilter:= + 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:= + >=dev-haskell/cryptonite-0.23:= dev-haskell/data-default:= dev-haskell/disk-free-space:= dev-haskell/dlist:= dev-haskell/edit-distance:= - dev-haskell/esqueleto:= >=dev-haskell/exceptions-0.6:= - >=dev-haskell/feed-0.3.9:= + >=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:= - >=dev-haskell/http-conduit-2.0:= + >=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.11.0:= - dev-haskell/persistent:= - dev-haskell/persistent-sqlite:= + >=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.1:2= + >=dev-haskell/quickcheck-2.10.0:2= dev-haskell/random:= dev-haskell/regex-tdfa:= dev-haskell/resourcet:= @@ -59,76 +67,71 @@ RDEPEND="dev-haskell/aeson:= 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:= + >=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-lang/ghc-7.8.2:= - assistant? ( >=dev-haskell/dns-1.0.0:= - dev-haskell/hinotify:= - dev-haskell/mountpoints:= - sys-process/lsof ) + dev-haskell/vector:= + >=dev-lang/ghc-8.4.3:= + assistant? ( >=dev-haskell/hinotify-0.3.10:= + dev-haskell/mountpoints:= ) benchmark? ( dev-haskell/criterion:= ) - concurrentoutput? ( >=dev-haskell/concurrent-output-1.6:= ) dbus? ( >=dev-haskell/dbus-0.10.7:= >=dev-haskell/fdo-notify-0.3:= ) - magic? ( dev-haskell/magic:= ) - network-uri? ( >=dev-haskell/network-2.6:= - >=dev-haskell/network-uri-2.6:= ) - !network-uri? ( >=dev-haskell/network-2.4:= <dev-haskell/network-2.6:= ) + 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/network-3.0.0.0:= ) pairing? ( dev-haskell/network-info:= dev-haskell/network-multicast:= ) - s3? ( >=dev-haskell/aws-0.9.2:= - dev-haskell/conduit:= - dev-haskell/conduit-extra:= ) + s3? ( >=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.1.4:= - >=dev-haskell/shakespeare-2.0.0:= + >=dev-haskell/path-pieces-0.2.1:= + >=dev-haskell/shakespeare-2.0.11:= dev-haskell/wai:= dev-haskell/wai-extra:= - >=dev-haskell/warp-3.0.0.5:= - >=dev-haskell/warp-tls-1.4:= - >=dev-haskell/yesod-1.2.6:= - >=dev-haskell/yesod-core-1.2.19:= - >=dev-haskell/yesod-default-1.2.0:= - >=dev-haskell/yesod-form-1.3.15:= - >=dev-haskell/yesod-static-1.2.4:= ) + >=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="${RDEPEND} - dev-vcs/git +RDEPEND+=" dev-vcs/git " - DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.18.1.3 + >=dev-haskell/cabal-2.2.0.1 " - # not generated by hackport: -DEPEND="${DEPEND} - dev-lang/perl +DEPEND+=" dev-lang/perl doc? ( www-apps/ikiwiki net-misc/rsync ) " -PATCHES=( - "${FILESDIR}"/${PN}-6.20160114-QC-2.8.2.patch - "${FILESDIR}"/${PN}-6.20161210-directory-1.3.patch - "${FILESDIR}"/${PN}-6.20170101-crypto-api.patch -) - src_configure() { haskell-cabal_src_configure \ --flag=-android \ --flag=-androidsplice \ $(cabal_flag assistant assistant) \ $(cabal_flag benchmark benchmark) \ - $(cabal_flag concurrentoutput concurrentoutput) \ $(cabal_flag dbus dbus) \ - $(cabal_flag magic magicmime) \ - $(cabal_flag network-uri network-uri) \ + $(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) \ diff --git a/dev-vcs/git-annex/metadata.xml b/dev-vcs/git-annex/metadata.xml index 556f1c584b7f..58517e95d4ad 100644 --- a/dev-vcs/git-annex/metadata.xml +++ b/dev-vcs/git-annex/metadata.xml @@ -5,29 +5,38 @@ <email>haskell@gentoo.org</email> <name>Gentoo Haskell</name> </maintainer> - <longdescription> - 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, checksumming time, or disk space. - - Even without file content tracking, being able to manage files with git, - move files around and delete files with versioned directory trees, and use - branches and distributed clones, are all very handy reasons to use git. And - annexed files can co-exist in the same git repository with regularly - versioned files, which is convenient for maintaining documents, Makefiles, - etc that are associated with annexed files but that benefit from full - revision control. - </longdescription> <use> <flag name="assistant">Enable git-annex assistant and watch command</flag> <flag name="benchmark">Enable benchmarking</flag> - <flag name="concurrentoutput">Use concurrent-output library (experimental)</flag> - <flag name="network-uri">Get Network.URI from the network-uri package.</flag> - <flag name="pairing">Enable pairing of git annex repositories</flag> - <flag name="s3">Enable Amazon S3 remote</flag> + <flag name="dbus">Enable dbus support</flag> + <flag name="debuglocks">Debug location of MVar/STM deadlocks</flag> + <flag name="gitlfs">Build with git-lfs library (rather than vendored copy)</flag> + <flag name="httpclientrestricted">Build with http-client-restricted library (rather than vendored copy)</flag> + <flag name="magicmime">Use libmagic to determine file MIME types</flag> + <flag name="networkbsd">Build with network-3.0 which split out network-bsd</flag> + <flag name="pairing">Enable pairing</flag> + <flag name="s3">Enable S3 support</flag> <flag name="torrentparser">Use haskell torrent library to parse torrent files</flag> <flag name="webapp">Enable git-annex webapp</flag> - <flag name="webdav">Enable webdav remote</flag> + <flag name="webdav">Enable WebDAV support</flag> </use> + <longdescription> + 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. + </longdescription> </pkgmetadata> |