dev-vcs/git-annex: bump up to 8.20200810

Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Jack Todaro <solpeth@posteo.org>
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>

3 files changed, 192 insertions, 18 deletions

diff --git a/dev-vcs/git-annex/Manifest b/dev-vcs/git-annex/Manifest
index 9e78d63c3c13..cac3abdca235 100644
--- a/dev-vcs/git-annex/Manifest
+++ b/dev-vcs/git-annex/Manifest
@@ -1 +1,2 @@
 DIST git-annex-8.20200617.tar.gz 1296190 BLAKE2B 3731641ff6623d7f0b2ac5402fe6acb41e4c8210e958c5c4383f401486d4307a921cc9072023ec62fdf2da78ec432cf0707a06265345681d7646af2974917cbf SHA512 736d10c1442bb6d8eaf67337da6b606e8b79970f1bbd10cfc15caaaa0376780c14dee9ece066dbc6b378f0a750d11d5b7b87687252899e473748828939dc03ae
+DIST git-annex-8.20200810.tar.gz 1312890 BLAKE2B 63226ee6b2150dd48dae3e52e70502e64e89d73185500c1cea201f2be98760ed9b3cd173b75b5603b49ca63f316163273a7c6d7eaddd68e548d903c845925713 SHA512 e6a4ad3169582f65284218c75f2679105a52d2f22310b10436796c439e031c5ad6f4d2dff1772f4cfc670d8956ae4a68d4d98e1dabd48bf06bcafda97676321f
diff --git a/dev-vcs/git-annex/git-annex-8.20200810.ebuild b/dev-vcs/git-annex/git-annex-8.20200810.ebuild
new file mode 100644
index 000000000000..c80e75b51846
--- /dev/null
+++ b/dev-vcs/git-annex/git-annex-8.20200810.ebuild
@@ -0,0 +1,164 @@
+# 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/network-3.0.0.0:= )
+	pairing? ( dev-haskell/network-info:=
+			dev-haskell/network-multicast:= )
+	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.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 8d49ace368ce..acfc1100620e 100644
--- a/dev-vcs/git-annex/metadata.xml
+++ b/dev-vcs/git-annex/metadata.xml
@@ -5,30 +5,39 @@
 		<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="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="network-3">Use network-3</flag>
-		<flag name="pairing">Enable pairing of git annex repositories</flag>
-		<flag name="s3">Enable Amazon S3 remote</flag>
+		<flag name="networkbsd">Build with network-3.0 which split out network-bsd</flag>
+		<flag name="network-3">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>