dev-vcs/git-annex: bump up to 6.20160126, bug #572996

While at it restored dependencies on non-haskell packages:
    git, ikiwiki, perl, rsync

Reported-by: Toralf Förster
Bug: https://bugs.gentoo.org/572996

Package-Manager: portage-2.2.27

3 files changed, 170 insertions, 6 deletions

diff --git a/dev-vcs/git-annex/Manifest b/dev-vcs/git-annex/Manifest
index 89e19fcb61f5..14b9723c2db8 100644
--- a/dev-vcs/git-annex/Manifest
+++ b/dev-vcs/git-annex/Manifest
@@ -8,3 +8,4 @@ DIST git-annex-5.20150617.tar.gz 5047577 SHA256 2d37c49866880803886fe77be17ac154
 DIST git-annex-5.20150710.tar.gz 5080419 SHA256 970f953a278401863fb1006679d216891ae556f80434b587deb08dfd6644f860 SHA512 35240f1d78561dab02ae014e4d00b8645c33c526b0d36a28253b9129198ea53b784949c7b47fd3b97f056842430a5e8b0d312b8ba6985bbb3228c73a4dfa21ea WHIRLPOOL 06b824031aeef38468e17ef239aa1501a2236a084a9c54e4c81001247c62b8621cdc6bc090f2b1a516df000823951acee784000aa6dc5b4de5dc4bcd5a2bda59
 DIST git-annex-5.20150731.tar.gz 5096183 SHA256 a2eefd4c273f5510e8ee384cc4fb512bf10c76cc4b84f6fff5c255223bd853a1 SHA512 edad8fb6aa98ad08cfe8406e2c7b794b0cc3a437f28ed43b5863bbba59a1633e2d6b3a94b6f942494ef7bd912650f7c89ad2a3d54920ff405f4d8d173e1027e9 WHIRLPOOL 945600b49b9f240da37d4642849395fc9ef9a615701a8088b6fb573e098e9b4de5a4bde8714974105a36a963e19a78137abdc513f9a0335ff5fe36981d12be25
 DIST git-annex-5.20151218.tar.gz 5233343 SHA256 d8aed73cbc1d1eefcbe6de7790c83f1d6458b4ac1e910d9a34b22782d16142ca SHA512 6c572b40f53dc4e8b72a14daf16a94bdf8c53618bbe85d797f2f440ceab42066376e681b228699a76da3a93965cd166aa68c020a48e2fdb1de964ca27aed55a0 WHIRLPOOL 62e24e29e5e2dfc8b6b9c7815fea57d720bd7183ec513b23dd0d8ac9f8182eaa1178b4017ea9e4d221baac3684c67ede1d3809956aabe5ce77ed3600b175bbbf
+DIST git-annex-6.20160126.tar.gz 5146331 SHA256 dc59f670a3d0bdb90db8fc6cadba8003708219bb0dc3d56867a9246d825c0d11 SHA512 45828b5e9968ce037e48366deb537353368dbac9145fc93d56921444210c9f0d4af1460c047bcae3e85244ecdf7e272fb65860656a19c449add09bf697c0a37d WHIRLPOOL f9b350968e8e82f7e4523648d5aefd03689123165424e15fee71eaa67345d38a0efe71ea4fc1388b5b683925bc8f638dba130371c4f324ac5910d7a051ae5548
diff --git a/dev-vcs/git-annex/git-annex-6.20160126.ebuild b/dev-vcs/git-annex/git-annex-6.20160126.ebuild
new file mode 100644
index 000000000000..cabccbdf61f6
--- /dev/null
+++ b/dev-vcs/git-annex/git-annex-6.20160126.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+#hackport: flags: -production,-android,-androidsplice,-testsuite
+
+CABAL_FEATURES="bin"
+inherit haskell-cabal
+
+DESCRIPTION="manage files with git, without checking their contents into git"
+HOMEPAGE="http://git-annex.branchable.com/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+RESTRICT="test"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="+assistant benchmark +concurrentoutput +cryptonite doc ekg +network-uri +pairing +s3 +torrentparser +webapp +webdav"
+
+RDEPEND="dev-haskell/aeson:=
+	dev-haskell/async:=
+	dev-haskell/bloomfilter:=
+	dev-haskell/case-insensitive:=
+	dev-haskell/data-default:=
+	>=dev-haskell/dbus-0.10.7:=
+	dev-haskell/dlist:=
+	dev-haskell/edit-distance:=
+	dev-haskell/esqueleto:=
+	>=dev-haskell/exceptions-0.6:=
+	>=dev-haskell/fdo-notify-0.3:=
+	dev-haskell/feed:=
+	>=dev-haskell/gnutls-0.1.4:=
+	dev-haskell/hslogger:=
+	dev-haskell/http-client:=
+	dev-haskell/http-conduit:=
+	dev-haskell/http-types:=
+	dev-haskell/ifelse:=
+	dev-haskell/json:=
+	dev-haskell/missingh:=
+	dev-haskell/monad-control:=
+	dev-haskell/monad-logger:=
+	>=dev-haskell/mtl-2:=
+	dev-haskell/network-protocol-xmpp:=
+	dev-haskell/old-locale:=
+	>=dev-haskell/optparse-applicative-0.11.0:=
+	dev-haskell/persistent:=
+	dev-haskell/persistent-sqlite:=
+	dev-haskell/persistent-template:=
+	>=dev-haskell/quickcheck-2.1:2=
+	dev-haskell/random:=
+	dev-haskell/regex-tdfa:=
+	dev-haskell/resourcet:=
+	dev-haskell/safesemaphore:=
+	dev-haskell/sandi:=
+	>=dev-haskell/stm-2.3:=
+	dev-haskell/text:=
+	dev-haskell/transformers:=
+	dev-haskell/unix-compat:=
+	dev-haskell/utf8-string:=
+	dev-haskell/uuid:=
+	dev-haskell/xml-types:=
+	>=dev-lang/ghc-7.6.1:=
+	assistant? ( dev-haskell/dns:=
+			dev-haskell/hinotify:= )
+	benchmark? ( dev-haskell/criterion:= )
+	concurrentoutput? ( >=dev-haskell/concurrent-output-1.6:= )
+	cryptonite? ( dev-haskell/cryptonite:= )
+	!cryptonite? ( >=dev-haskell/cryptohash-0.11.0:= )
+	ekg? ( dev-haskell/ekg:= )
+	network-uri? ( >=dev-haskell/network-2.6:=
+			>=dev-haskell/network-uri-2.6:= )
+	!network-uri? ( >=dev-haskell/network-2.0:= <dev-haskell/network-2.6:= )
+	pairing? ( dev-haskell/network-info:=
+			dev-haskell/network-multicast:= )
+	s3? ( >=dev-haskell/aws-0.9.2:=
+		dev-haskell/conduit:=
+		dev-haskell/conduit-extra:= )
+	torrentparser? ( >=dev-haskell/torrent-10000.0.0:= )
+	webapp? ( dev-haskell/blaze-builder:=
+			dev-haskell/byteable:=
+			dev-haskell/clientsession:=
+			dev-haskell/crypto-api:=
+			>=dev-haskell/path-pieces-0.1.4:=
+			dev-haskell/securemem:=
+			>=dev-haskell/shakespeare-2.0.0:=
+			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:= )
+	webdav? ( >=dev-haskell/dav-1.0:= )
+"
+# not generated by hackport:
+RDEPEND="${RDEPEND}
+	dev-vcs/git
+"
+
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.16.0
+"
+
+# not generated by hackport:
+DEPEND="${DEPEND}
+	dev-lang/perl
+	doc? ( www-apps/ikiwiki net-misc/rsync )
+"
+
+src_prepare() {
+	# does not respect staging dir
+	epatch "${FILESDIR}"/${PN}-5.20150731-no-strange-installs.patch
+	epatch "${FILESDIR}"/${PN}-6.20160114-QC-2.8.2.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 cryptonite cryptonite) \
+		$(cabal_flag ekg ekg) \
+		$(cabal_flag network-uri network-uri) \
+		$(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_compile() {
+	haskell-cabal_src_compile
+	use doc && emake docs
+}
+
+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
+	dosym git-annex /usr/bin/git-annex-shell # standard make install does more, than needed
+
+	# install-mans wants ikiwiki. It returns 0 and builds the man pages without ikiwiki.
+	emake install-mans DESTDIR="${D}" PREFIX="${EPREFIX}/usr"
+	use doc && emake install-docs DESTDIR="${D}" PREFIX="${EPREFIX}/usr"
+	mv "${ED}"/usr/share/doc/{${PN},${PF}}
+	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 cd2b660679de..d98d30d380c2 100644
--- a/dev-vcs/git-annex/metadata.xml
+++ b/dev-vcs/git-annex/metadata.xml
@@ -21,26 +21,21 @@
 	</longdescription>
 	<use>
 		<flag name="assistant">Enable git-annex assistant and watch command</flag>
-		<flag name="android">Building for Android</flag>
-		<flag name="androidsplice">Get TH splices for Android.</flag>
+		<flag name="benchmark">Enable benchmarking</flag>
 		<flag name="asciiprogress">Use ascii-progress library (experimental)</flag>
-		<flag name="cryptohash">Enable use of cryptohash for checksumming</flag>
 		<flag name="concurrentoutput">Use concurrent-output library (experimental)</flag>
 		<flag name="cryptonite">Use the cryptonite library, instead of the older cryptohash</flag>
 		<flag name="database">Enable building with <pkg>dev-haskell/persistent</pkg> for database use</flag>
 		<flag name="desktopnotify">Enable desktop environment notifications</flag>
-		<flag name="desktop-notify">Enable desktop environment notifications</flag>
 		<flag name="dns">Enable the haskell DNS library for DNS lookup</flag>
 		<flag name="ekg">Enable use of EKG to monitor git-annex as it runs.</flag>
 		<flag name="feed">Enable podcast feed support</flag>
 		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
-		<flag name="production">Enable production build (slower build; faster binary)</flag>
 		<flag name="pairing">Enable pairing of git annex repositories</flag>
 		<flag name="quvi">Enable use of quvi to download videos</flag>
 		<flag name="s3">Enable Amazon S3 remote</flag>
 		<flag name="tahoe">Enable the tahoe special remote</flag>
 		<flag name="tdfa">Use regex-tdfa for wildcards</flag>
-		<flag name="testsuite">Embed the test suite into git-annex</flag>
 		<flag name="torrentparser">Use haskell torrent library to parse torrent files</flag>
 		<flag name="webapp">Enable git-annex webapp</flag>
 		<flag name="webapp-secure">Secure webapp</flag>