From 92983108b65f645af5ab815add715492d9929c04 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyfox@gentoo.org>
Date: Mon, 21 Aug 2017 22:32:14 +0100
Subject: dev-vcs/git-annex: drop old

Package-Manager: Portage-2.3.8, Repoman-2.3.3
---
 dev-vcs/git-annex/Manifest                       |   6 -
 dev-vcs/git-annex/git-annex-6.20160126.ebuild    | 168 ----------------------
 dev-vcs/git-annex/git-annex-6.20160318.ebuild    | 174 -----------------------
 dev-vcs/git-annex/git-annex-6.20160419.ebuild    | 174 -----------------------
 dev-vcs/git-annex/git-annex-6.20160923-r1.ebuild | 170 ----------------------
 dev-vcs/git-annex/git-annex-6.20160923.ebuild    | 173 ----------------------
 dev-vcs/git-annex/git-annex-6.20161031.ebuild    | 170 ----------------------
 dev-vcs/git-annex/git-annex-6.20170101.ebuild    | 168 ----------------------
 dev-vcs/git-annex/metadata.xml                   |   2 -
 9 files changed, 1205 deletions(-)
 delete mode 100644 dev-vcs/git-annex/git-annex-6.20160126.ebuild
 delete mode 100644 dev-vcs/git-annex/git-annex-6.20160318.ebuild
 delete mode 100644 dev-vcs/git-annex/git-annex-6.20160419.ebuild
 delete mode 100644 dev-vcs/git-annex/git-annex-6.20160923-r1.ebuild
 delete mode 100644 dev-vcs/git-annex/git-annex-6.20160923.ebuild
 delete mode 100644 dev-vcs/git-annex/git-annex-6.20161031.ebuild
 delete mode 100644 dev-vcs/git-annex/git-annex-6.20170101.ebuild

(limited to 'dev-vcs/git-annex')

diff --git a/dev-vcs/git-annex/Manifest b/dev-vcs/git-annex/Manifest
index 7f7eda5b868c..ebbd26c904df 100644
--- a/dev-vcs/git-annex/Manifest
+++ b/dev-vcs/git-annex/Manifest
@@ -1,7 +1 @@
-DIST git-annex-6.20160126.tar.gz 5146331 SHA256 dc59f670a3d0bdb90db8fc6cadba8003708219bb0dc3d56867a9246d825c0d11 SHA512 45828b5e9968ce037e48366deb537353368dbac9145fc93d56921444210c9f0d4af1460c047bcae3e85244ecdf7e272fb65860656a19c449add09bf697c0a37d WHIRLPOOL f9b350968e8e82f7e4523648d5aefd03689123165424e15fee71eaa67345d38a0efe71ea4fc1388b5b683925bc8f638dba130371c4f324ac5910d7a051ae5548
-DIST git-annex-6.20160318.tar.gz 5399078 SHA256 5c0067d161a3cd6b93822f85eb82e5cb4895d913b2593bc4fe3b74d3ed426e0b SHA512 62d0caef2f09a1d690229b720e81bf477715fd765a98c037b8e22e7e04ad72d91c81fdbe8bb61bdf4e0bf40cd5b81ea349e60a8e61690767db4a4b92541a063f WHIRLPOOL 96c0232790b0b2cf0d97df2984383a0616a56c695daac233da625fd08ccd8044ef26aed613341f47aa8b0ef70e806b5d0569ff733d3e0dee0e92ed7220b503bc
-DIST git-annex-6.20160419.tar.gz 5086638 SHA256 1452a55809ba7367847fc4a77f2d8a5365af92e130d5ca460bf0880a26a6fb8e SHA512 b8b250b700aaaa336ee85af3d053d893b422e2bf427dc0f1f38689b49a2a74fa240a725da09d98f5bdf86d35d68612765c0de878de52ae4ddbb8908fb32ad118 WHIRLPOOL 1a68daef4b271ec8945c0ab22439eba83400d7babac368ae65167bd8dfec29430913c8165046421d4b0a072d7beaaedf832464a04ac625250b401303afff16aa
-DIST git-annex-6.20160923.tar.gz 1084326 SHA256 964235a358814e081cf4a5d8dab798faacb1dabe5fc714ac6687b135e30fd93d SHA512 2204b5a3b76b22718e4cf5329e78035c4ff45a133e738a8ab627067551fd40a778d4be124862f6a08b583c49400844e3b0c61a682909f911e5ac51fdb6319295 WHIRLPOOL ed5f6c732210b0a720de095ce71c8907b5ddc636e28835f85697f81a01824be7b9f154335af1c4c4e1a304f967b6233487699a49da447f8f883519063be35a55
-DIST git-annex-6.20161031.tar.gz 1087730 SHA256 6de3751f361d730e4a69106443b747a45e27aaeabf51ea999c41bd92fd2c71ce SHA512 4a67154b4bbb12f4573bca71617d4c898c8915b242b30b484bc45e661c09893c5ebf2c906e87269307666dcde603d8dbb34f616d46c7a88bffb4baff0bbec81c WHIRLPOOL 0251d406889b9f171dd207a3956ee6adae4b9415fd993f692e8e76240e1f15194b7c125d5118935db1dbc0676513bf213c91df285d9a3311285ed69c24080c4c
-DIST git-annex-6.20170101.tar.gz 1095866 SHA256 5fbf88652a84278275d9d4bec083189f590b045e23a73bfe8d395c3e356e3f53 SHA512 faf97a4619d1fa94efebd6fc592c58822e853505649c230afa8711165a22c1d84e8c24c850fc61d47ce1390868a934400db28f7b370a7aa26b128c0dcdc11475 WHIRLPOOL 95dbe81bf51b654d6d3deb97c180a346701d35ae07ef0774eafc2d5877ba07ed5f9b9f85beee2b3eacd6749b3f505f6d888b3747da0802fab36496ade6ab12c9
 DIST git-annex-6.20170818.tar.gz 1111837 SHA256 7ddf3f8be218d8e8955be49fb0200179e54406cc02e884abe999f88d578f7d79 SHA512 06587bf0d3056e4b94d4c40aaae820efda133dcbc876a2ac3db3183fb511ec20aae4c495323b4886868a3e66b5b1f53a04c5f3abb0362c718bbadc8e2f6e15d0 WHIRLPOOL b4034833a96ab11c8972c1b679c10948455459ef0a82fe98c9912db932ab384e00ad1a13d08030f658cc1f0525888e5e9e34e48f7e09704f642ac57e908d8a35
diff --git a/dev-vcs/git-annex/git-annex-6.20160126.ebuild b/dev-vcs/git-annex/git-annex-6.20160126.ebuild
deleted file mode 100644
index 81a2b85e20b5..000000000000
--- a/dev-vcs/git-annex/git-annex-6.20160126.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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:=
-			sys-process/lsof )
-	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/git-annex-6.20160318.ebuild b/dev-vcs/git-annex/git-annex-6.20160318.ebuild
deleted file mode 100644
index b45da300f071..000000000000
--- a/dev-vcs/git-annex/git-annex-6.20160318.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.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 +dbus ekg +magicmime +network-uri +pairing +s3 +torrentparser +webapp +webdav +xmpp"
-
-RDEPEND="dev-haskell/aeson:=
-	dev-haskell/async:=
-	dev-haskell/bloomfilter:=
-	dev-haskell/case-insensitive:=
-	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:=
-	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/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-lang/ghc-7.6.1:=
-	assistant? ( dev-haskell/dns:=
-			dev-haskell/hinotify:=
-			dev-haskell/mountpoints:=
-			sys-process/lsof )
-	benchmark? ( dev-haskell/criterion:= )
-	concurrentoutput? ( >=dev-haskell/concurrent-output-1.6:= )
-	cryptonite? ( dev-haskell/cryptonite:= )
-	!cryptonite? ( >=dev-haskell/cryptohash-0.11.0:= )
-	dbus? ( >=dev-haskell/dbus-0.10.7:=
-		>=dev-haskell/fdo-notify-0.3:= )
-	ekg? ( dev-haskell/ekg:= )
-	magicmime? ( 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:= )
-	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:= )
-	xmpp? ( >=dev-haskell/gnutls-0.1.4:=
-		dev-haskell/network-protocol-xmpp:=
-		dev-haskell/xml-types:= )
-"
-# 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 dbus dbus) \
-		$(cabal_flag ekg ekg) \
-		$(cabal_flag magicmime magicmime) \
-		$(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) \
-		$(cabal_flag xmpp xmpp)
-}
-
-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/git-annex-6.20160419.ebuild b/dev-vcs/git-annex/git-annex-6.20160419.ebuild
deleted file mode 100644
index b45da300f071..000000000000
--- a/dev-vcs/git-annex/git-annex-6.20160419.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.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 +dbus ekg +magicmime +network-uri +pairing +s3 +torrentparser +webapp +webdav +xmpp"
-
-RDEPEND="dev-haskell/aeson:=
-	dev-haskell/async:=
-	dev-haskell/bloomfilter:=
-	dev-haskell/case-insensitive:=
-	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:=
-	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/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-lang/ghc-7.6.1:=
-	assistant? ( dev-haskell/dns:=
-			dev-haskell/hinotify:=
-			dev-haskell/mountpoints:=
-			sys-process/lsof )
-	benchmark? ( dev-haskell/criterion:= )
-	concurrentoutput? ( >=dev-haskell/concurrent-output-1.6:= )
-	cryptonite? ( dev-haskell/cryptonite:= )
-	!cryptonite? ( >=dev-haskell/cryptohash-0.11.0:= )
-	dbus? ( >=dev-haskell/dbus-0.10.7:=
-		>=dev-haskell/fdo-notify-0.3:= )
-	ekg? ( dev-haskell/ekg:= )
-	magicmime? ( 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:= )
-	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:= )
-	xmpp? ( >=dev-haskell/gnutls-0.1.4:=
-		dev-haskell/network-protocol-xmpp:=
-		dev-haskell/xml-types:= )
-"
-# 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 dbus dbus) \
-		$(cabal_flag ekg ekg) \
-		$(cabal_flag magicmime magicmime) \
-		$(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) \
-		$(cabal_flag xmpp xmpp)
-}
-
-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/git-annex-6.20160923-r1.ebuild b/dev-vcs/git-annex/git-annex-6.20160923-r1.ebuild
deleted file mode 100644
index 7c8a48a51c81..000000000000
--- a/dev-vcs/git-annex/git-annex-6.20160923-r1.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-#hackport: flags: -production,-android,-androidsplice,-testsuite
-
-CABAL_FEATURES="bin"
-inherit haskell-cabal bash-completion-r1
-
-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 +dbus +magicmime +network-uri +pairing +s3 +torrentparser +webapp +webdav +xmpp"
-
-RDEPEND="dev-haskell/aeson:=
-	dev-haskell/async:=
-	dev-haskell/bloomfilter:=
-	dev-haskell/case-insensitive:=
-	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:=
-	dev-haskell/hslogger:=
-	dev-haskell/http-client:=
-	dev-haskell/http-conduit:=
-	dev-haskell/http-types:=
-	dev-haskell/ifelse:=
-	dev-haskell/missingh:=
-	dev-haskell/monad-control:=
-	dev-haskell/monad-logger:=
-	>=dev-haskell/mtl-2:=
-	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/unordered-containers:=
-	dev-haskell/utf8-string:=
-	>=dev-haskell/uuid-1.2.6:=
-	>=dev-lang/ghc-7.6.1:=
-	assistant? ( dev-haskell/dns:=
-			dev-haskell/hinotify:=
-			dev-haskell/mountpoints:=
-			sys-process/lsof )
-	benchmark? ( dev-haskell/criterion:= )
-	concurrentoutput? ( >=dev-haskell/concurrent-output-1.6:= )
-	cryptonite? ( dev-haskell/cryptonite:= )
-	!cryptonite? ( >=dev-haskell/cryptohash-0.11.0:= )
-	dbus? ( >=dev-haskell/dbus-0.10.7:=
-		>=dev-haskell/fdo-notify-0.3:= )
-	magicmime? ( 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:= )
-	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:= )
-	xmpp? ( >=dev-haskell/gnutls-0.1.4:=
-		dev-haskell/network-protocol-xmpp:=
-		dev-haskell/xml-types:= )
-"
-# 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 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.20160114-QC-2.8.2.patch
-)
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'http-conduit (<2.2.0)' 'http-conduit' \
-		'persistent (< 2.5)' 'persistent'
-}
-
-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 dbus dbus) \
-		$(cabal_flag magicmime magicmime) \
-		$(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) \
-		$(cabal_flag xmpp xmpp)
-}
-
-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/git-annex-6.20160923.ebuild b/dev-vcs/git-annex/git-annex-6.20160923.ebuild
deleted file mode 100644
index d3a791110b63..000000000000
--- a/dev-vcs/git-annex/git-annex-6.20160923.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-#hackport: flags: -production,-android,-androidsplice,-testsuite
-
-CABAL_FEATURES="bin"
-inherit haskell-cabal bash-completion-r1
-
-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 +dbus +magicmime +network-uri +pairing +s3 +torrentparser +webapp +webdav +xmpp"
-
-RDEPEND="dev-haskell/aeson:=
-	dev-haskell/async:=
-	dev-haskell/bloomfilter:=
-	dev-haskell/case-insensitive:=
-	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:=
-	dev-haskell/hslogger:=
-	dev-haskell/http-client:=
-	dev-haskell/http-conduit:=
-	dev-haskell/http-types:=
-	dev-haskell/ifelse:=
-	dev-haskell/missingh:=
-	dev-haskell/monad-control:=
-	dev-haskell/monad-logger:=
-	>=dev-haskell/mtl-2:=
-	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/unordered-containers:=
-	dev-haskell/utf8-string:=
-	>=dev-haskell/uuid-1.2.6:=
-	>=dev-lang/ghc-7.6.1:=
-	assistant? ( dev-haskell/dns:=
-			dev-haskell/hinotify:=
-			dev-haskell/mountpoints:=
-			sys-process/lsof )
-	benchmark? ( dev-haskell/criterion:= )
-	concurrentoutput? ( >=dev-haskell/concurrent-output-1.6:= )
-	cryptonite? ( dev-haskell/cryptonite:= )
-	!cryptonite? ( >=dev-haskell/cryptohash-0.11.0:= )
-	dbus? ( >=dev-haskell/dbus-0.10.7:=
-		>=dev-haskell/fdo-notify-0.3:= )
-	magicmime? ( 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:= )
-	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:= )
-	xmpp? ( >=dev-haskell/gnutls-0.1.4:=
-		dev-haskell/network-protocol-xmpp:=
-		dev-haskell/xml-types:= )
-"
-# 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 )
-"
-
-PATCHES=(
-	# does not respect staging dir
-	"${FILESDIR}"/${PN}-5.20150731-no-strange-installs.patch
-	"${FILESDIR}"/${PN}-6.20160114-QC-2.8.2.patch
-)
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'http-conduit (<2.2.0)' 'http-conduit' \
-		'persistent (< 2.5)' 'persistent'
-}
-
-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 dbus dbus) \
-		$(cabal_flag magicmime magicmime) \
-		$(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) \
-		$(cabal_flag xmpp xmpp)
-}
-
-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
-
-	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/git-annex-6.20161031.ebuild b/dev-vcs/git-annex/git-annex-6.20161031.ebuild
deleted file mode 100644
index d320fec3e537..000000000000
--- a/dev-vcs/git-annex/git-annex-6.20161031.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-#hackport: flags: -production,-android,-androidsplice,-testsuite
-
-CABAL_FEATURES="bin"
-inherit haskell-cabal bash-completion-r1
-
-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 +dbus +magicmime +network-uri +pairing s3 +torrentparser +webapp +webdav +xmpp"
-
-RDEPEND="dev-haskell/aeson:=
-	dev-haskell/async:=
-	dev-haskell/bloomfilter:=
-	dev-haskell/case-insensitive:=
-	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:=
-	dev-haskell/hslogger:=
-	dev-haskell/http-client:=
-	dev-haskell/http-conduit:=
-	dev-haskell/http-types:=
-	dev-haskell/ifelse:=
-	dev-haskell/missingh:=
-	dev-haskell/monad-control:=
-	dev-haskell/monad-logger:=
-	>=dev-haskell/mtl-2:=
-	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/unordered-containers:=
-	dev-haskell/utf8-string:=
-	>=dev-haskell/uuid-1.2.6:=
-	>=dev-lang/ghc-7.6.1:=
-	assistant? ( dev-haskell/dns:=
-			dev-haskell/hinotify:=
-			dev-haskell/mountpoints:=
-			sys-process/lsof )
-	benchmark? ( dev-haskell/criterion:= )
-	concurrentoutput? ( >=dev-haskell/concurrent-output-1.6:= )
-	cryptonite? ( dev-haskell/cryptonite:= )
-	!cryptonite? ( >=dev-haskell/cryptohash-0.11.0:= )
-	dbus? ( >=dev-haskell/dbus-0.10.7:=
-		>=dev-haskell/fdo-notify-0.3:= )
-	magicmime? ( 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:= )
-	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:= )
-	xmpp? ( >=dev-haskell/gnutls-0.1.4:=
-		dev-haskell/network-protocol-xmpp:=
-		dev-haskell/xml-types:= )
-"
-# 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 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.20160114-QC-2.8.2.patch
-)
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'http-conduit (<2.2.0)' 'http-conduit' \
-		'persistent (< 2.5)' 'persistent'
-}
-
-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 dbus dbus) \
-		$(cabal_flag magicmime magicmime) \
-		$(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) \
-		$(cabal_flag xmpp xmpp)
-}
-
-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/git-annex-6.20170101.ebuild b/dev-vcs/git-annex/git-annex-6.20170101.ebuild
deleted file mode 100644
index 0127fbd7e6c3..000000000000
--- a/dev-vcs/git-annex/git-annex-6.20170101.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-#hackport: flags: -production,-android,-androidsplice,-testsuite
-
-CABAL_FEATURES=""
-inherit haskell-cabal bash-completion-r1
-
-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 +dbus +magicmime +network-uri +pairing s3 +torrentparser +webapp +webdav"
-
-RDEPEND="dev-haskell/aeson:=
-	dev-haskell/async:=
-	dev-haskell/bloomfilter:=
-	dev-haskell/byteable:=
-	dev-haskell/case-insensitive:=
-	dev-haskell/crypto-api:=
-	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:=
-	dev-haskell/free:=
-	dev-haskell/hslogger:=
-	dev-haskell/http-client:=
-	dev-haskell/http-conduit:=
-	dev-haskell/http-types:=
-	dev-haskell/ifelse:=
-	dev-haskell/missingh:=
-	dev-haskell/monad-control:=
-	dev-haskell/monad-logger:=
-	>=dev-haskell/mtl-2:=
-	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/securemem:=
-	dev-haskell/socks:=
-	>=dev-haskell/stm-2.3:=
-	dev-haskell/stm-chans:=
-	dev-haskell/text:=
-	dev-haskell/unix-compat:=
-	dev-haskell/unordered-containers:=
-	dev-haskell/utf8-string:=
-	>=dev-haskell/uuid-1.2.6:=
-	>=dev-lang/ghc-7.8.2:=
-	assistant? ( dev-haskell/dns:=
-			dev-haskell/hinotify:=
-			dev-haskell/mountpoints:=
-			sys-process/lsof )
-	benchmark? ( dev-haskell/criterion:= )
-	concurrentoutput? ( >=dev-haskell/concurrent-output-1.6:= )
-	cryptonite? ( dev-haskell/cryptonite:= )
-	!cryptonite? ( >=dev-haskell/cryptohash-0.11.0:= )
-	dbus? ( >=dev-haskell/dbus-0.10.7:=
-		>=dev-haskell/fdo-notify-0.3:= )
-	magicmime? ( 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:= )
-	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/clientsession:=
-			>=dev-haskell/path-pieces-0.1.4:=
-			>=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.18.1.3
-	dev-haskell/data-default
-	dev-haskell/exceptions
-	dev-haskell/hslogger
-	dev-haskell/ifelse
-	dev-haskell/missingh
-	dev-haskell/unix-compat
-"
-
-# not generated by hackport:
-DEPEND="${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 cryptonite cryptonite) \
-		$(cabal_flag dbus dbus) \
-		$(cabal_flag magicmime magicmime) \
-		$(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_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 c880c40bd848..e35251395d35 100644
--- a/dev-vcs/git-annex/metadata.xml
+++ b/dev-vcs/git-annex/metadata.xml
@@ -23,8 +23,6 @@
 		<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="cryptonite">Use the cryptonite library, instead of the older cryptohash</flag>
-		<flag name="ekg">Enable use of EKG to monitor git-annex as it runs.</flag>
 		<flag name="magicmime">Use libmagic to determine file MIME types</flag>
 		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
 		<flag name="pairing">Enable pairing of git annex repositories</flag>
-- 
cgit v1.2.3-65-gdbad