Version bump, drop old versions due to CVE-2014-6274 aka #523640: S3 and Glacier remotes creds embedded in the git repo were not encrypted

Package-Manager: portage-2.2.13/cvs/Linux x86_64
Manifest-Sign-Key: 0x611FF3AA

11 files changed, 20 insertions, 1139 deletions

diff --git a/dev-vcs/git-annex/ChangeLog b/dev-vcs/git-annex/ChangeLog
index e2b33e89975e..8cc96b4a8a78 100644
--- a/dev-vcs/git-annex/ChangeLog
+++ b/dev-vcs/git-annex/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-vcs/git-annex
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-annex/ChangeLog,v 1.30 2014/09/06 18:57:38 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-annex/ChangeLog,v 1.31 2014/10/04 17:14:25 slyfox Exp $
+
+*git-annex-5.20140927 (04 Oct 2014)
+
+  04 Oct 2014; Sergei Trofimovich <slyfox@gentoo.org>
+  +git-annex-5.20140927.ebuild, -files/git-annex-5.20140717-old-feed.patch,
+  -git-annex-3.20121211-r2.ebuild, -git-annex-4.20130815-r1.ebuild,
+  -git-annex-5.20140306-r1.ebuild, -git-annex-5.20140405.ebuild,
+  -git-annex-5.20140613.ebuild, -git-annex-5.20140709.ebuild,
+  -git-annex-5.20140717.ebuild, -git-annex-5.20140831.ebuild:
+  Version bump, drop old versions due to CVE-2014-6274 aka #523640: S3 and
+  Glacier remotes creds embedded in the git repo were not encrypted
 
 *git-annex-5.20140831 (06 Sep 2014)
 
diff --git a/dev-vcs/git-annex/Manifest b/dev-vcs/git-annex/Manifest
index 8ddef7131f4e..a24bf5188c9e 100644
--- a/dev-vcs/git-annex/Manifest
+++ b/dev-vcs/git-annex/Manifest
@@ -1,30 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX git-annex-5.20140717-old-feed.patch 797 SHA256 7d41f36dd96fef9975e9b84c151de469ac580dd9de2b229a8940fd46db567521 SHA512 7815086a403adf85c8da8e3adf8f203b9881528ccfa22c5e1b7014a1112841a6b9e0c48d1d918ea31bfa78e2dd9b711650cf8f48f11d45b95cbd7d1cfe09cb50 WHIRLPOOL 9f649149644f1700a1c840ffcd4214e54ad41bb29e280b30848e44fc9dab74317b76707788e89f815298919efc6381426361e2de32e2c74256f6177f7392e1de
 AUX git-annex.xpm 1961 SHA256 e9576b4d026cb8e61ee602d52639d65a2e8f2aadaaa3cfd9d8bfd8f55cf03803 SHA512 4a22ac448852160d66838c272f41b8c7599aa1b904e35ac03ea294d9ed15b855bde24b7e5407a2578937bfd51d482837ed6680af680166d030f71666316ae4d3 WHIRLPOOL a582bb82d01de4750e3bcb2e419cf0a334e11428972f68bbb70aa06ea5a357de89d48327d4576adf0f4101cd577f13c6f50b41d85d7c2fc6a0efb87124b88b60
-DIST git-annex-3.20121211.tar.gz 2068316 SHA256 3b6d9d7d8d44c7939813a4798a78b76a02efef655030d742149eda3779daa13e SHA512 26095f275e9226827d36c8c9b48c71ce3c23091594b911e06cba1c4f5b65d5f60372ec300e2084fdda2f68ea8d53ba7d17f160e805d1830b1910a3d70f8bc4ba WHIRLPOOL c952877bdfac18c2216780333e930d142898e517efdd8bbaee1c42b1a95a3ddcfa4558f1b4653dac30e03a0d57dc5493d5471f70871f72ce9a432e6c7699bc94
-DIST git-annex-4.20130815.tar.gz 6408230 SHA256 e144cf60ccdfc588e71798141f38ce9e2c9b4557bc37f0636536fb6d2bde8e30 SHA512 150765669b4d2660dca73833fa2998323a06f788d478f719b23f67206850c742b1c186d229a21a27741b0bc8ec980a198b5d38e659f437c4fa09f2160af2b397 WHIRLPOOL 00e414b2156845cc23600448e6ba00982fec4542a98873ab7d58d92b73a36254e532863b5ad982816df3bd65abd2b98687c8c007473d6ea9458d31df384b3e55
-DIST git-annex-5.20140306.tar.gz 4340927 SHA256 89cacd6b17a0db65c09c5bc0e21298629fd7ac0f92c7b632f58c590e7ec64fce SHA512 8f2980604f8172537a6e67241b7ddedfc7dbafc5dca64398f5ded381a6326b6cb7b5324b515e324f53ea6e2a7ff12b8a30c56a894ec0b18d9ca5c4b3bd31385a WHIRLPOOL 414591c91f17a6ee1afbe59d8f5115a85cc2932803aa7618d4f0a7b25574d87ea538ce7cce0f1def97b60c4c243e041019e09324e2a1ee475cfacfad78f313ca
-DIST git-annex-5.20140405.tar.gz 4453804 SHA256 73dc81e3d2ddc823263734b7b073024aad6d7ff040552bb2141d4af1d3b66e59 SHA512 6723bb3a0eaca521559492606db6ba27256f16d45c6cc129991daddf442996b08b9eb9aeb9245d32c241435c66cf6581aaa0c1c4cde7dfaf196f0d2b5dd66e7a WHIRLPOOL 3c7d1eddbba082f4cac8a9fcf886d78e40e644b0d71047aa9f72fa1bb24d0a8c821b8dc26b3aa990cd2e8090302e2583ccfd5178964cfa0d7ef8e0f67f3e57be
-DIST git-annex-5.20140613.tar.gz 4322696 SHA256 d129872505e7a5d435ddf5afdd4168096d26403a54619a58ec38078e8cc77006 SHA512 58e8a9c05d7d7ffa3a703163389f2ba75ea4587119eb98615ac5d125c6104a324efa38fb133efd08017727631208ac05c02ea08d0e5d1d90005a15de82d51ded WHIRLPOOL bea07f3848034a82c1eb947df16e9d0fdabdbb2b109fb9a900cda923b5fcb5858574798d40a202be151c041d8272853998d7efb5c1cf0637e77ae72ed4997e12
-DIST git-annex-5.20140709.tar.gz 4369194 SHA256 5a7c73c6cb1d5c8d72826ebd31c29ae630f396cadb7135389233a520ca32c358 SHA512 21cf9cadd39a9450305dc5ac1305ac76a656fdad9be46c8815d4ab7d643fb1dcc450de77a15d356ef095c537e7797d0b91046833d2568049ed73b245f8177180 WHIRLPOOL 4b7195d6a9955298c5901fb952147bed6df9aa9090483f917bff65c30f419ecd253b8fa45e22419467d90bcc62e6c6ea635359249769fd6f081bd836f95a1c44
-DIST git-annex-5.20140717.tar.gz 4390361 SHA256 746570ffafc92b3acd19bef84ffea6ee126cf2b043e8adc7f3b61b57d0c52fa5 SHA512 2ea950cb025885df6d2abc3618c6e4775abef826291108a0c745f8dac8fa664eb42a15a036179c972aede36f1bc049f9abc01b0c72b9fa6ba1dc3736520c9a1f WHIRLPOOL 2f5f486ed93a421e3e09b2df413edc5d7f0be8bea1b6cbba303debd2559c23baab1b035c25a5511498383c51921dba38d71afceb5624947db2df519936fb0725
-DIST git-annex-5.20140831.tar.gz 4478625 SHA256 98e7cc8fd8b167835d055227fddb36f0c3e70bbbe272a7966ee9b05117625768 SHA512 234ccd7bec7cba242fc842d546cdb9e21115bb121ab0cd6cb954e57c36d2df46f51ae0165206116818498f07813278bf497d041a8eb851b9c0eddc8349524ff3 WHIRLPOOL e529e6b35422e6eea032adf2132be0fd318382661db5d691edb1543893178fdaeb675f8944fa3a409a357098d5b4619ab76935071dda6dd1b0e29f5f15b69d5b
-EBUILD git-annex-3.20121211-r2.ebuild 2796 SHA256 ec1ee68bf3ea711322acf89194f4eb2ad0f2702ab38fb696e7061745baa2481d SHA512 1a09fb926a8ac966e6b0d9010a5bb6db9c5d0197dd04fbce0e83f74d2fbbfa35737f438c1e3b956c6905b44cc50f302b7688d0d062078c42e097491c6c53ef94 WHIRLPOOL 14624b94558bffa5a1ed27ffa3b859b1254a20bd07e99b02cbc65a9b6c29948b5a57b147971cae50c0cd1ad6da39569b57dce4d0461db7028d4f4255e537bca0
-EBUILD git-annex-4.20130815-r1.ebuild 3475 SHA256 13a5211cc722e89f6c65e215d249f4637c7fca1e683ac033593743024a1d44fd SHA512 63a3460cb789b81c81252e9a3a5e7d04ac839fd178c6d39d49cfc3ea5ed68cf729fe8cdd6b36e5c5fd73fa1c7f33fa0de377d72a81695e402a328a35aad6cbba WHIRLPOOL 3c056a9399bee0f19b8cef2db8cac74803d540d05c6cdef06e7d19a3307cc9bcb7cc5c71a2378ab7749734957944dab6637d47588e41dd4fd1b153c1a2d9c172
-EBUILD git-annex-5.20140306-r1.ebuild 4568 SHA256 76987365e669a9bb330bafca8df8503ef38135213f3600ed89405ce85c2760f6 SHA512 a4f87964eafd5396b5e17189701d3d29d8502461494f09cbea31736c52e276eaf56da24fd46c6af972b8b7c5620ccf9e83f50768216167d7a9d2f9da37238b16 WHIRLPOOL bb9b5e5dc5a031f891ad3b0cab277a4982b519e36e72a732c204ac9980877f6f3895bc04dbc3f1b399c81ee1dba7982d7fb69a381b1ff3bd1fd0cc98e85d8063
-EBUILD git-annex-5.20140405.ebuild 5005 SHA256 365ef7c7044a3ad16b3c32d33e8f2c8666e180841b4a5201f325b766ccb7668d SHA512 c8f561ba16eb5d5d37a7d692b5a74cf2cfa8d952e124021a31f9da7cd018be68ee6bc3a814bb19582e7a064f0f3ab885425c9f04392e018cd86822b669703c92 WHIRLPOOL c5b3c1ec3dbc812b1e2d24c6b8faa3b9c5c72f6982c2291d2e0b58f3d0f8283b655211f1143d219fbf5c501525df238509014926da8af9d06510dcb15157483a
-EBUILD git-annex-5.20140613.ebuild 4915 SHA256 87a57f76dce89e87dcd7492edf713f5806895dadbae0c78a3a5041a2f38de715 SHA512 852b2f383c126ec6007f0637690e8aec285e2c1fb3dafb037f2435afb8c68779e1f08f2b3662d0e518c98c217e88574ac2d73ab140c79c64428ef58937f20b9c WHIRLPOOL f5c1c29c71a236cf2479eddfc8eac7d8c61e24896bd13ac9ad5d8720b99b64cd4c880eb252fc98d02918d6c0eaf972a10cdc639c736cc11dbabbc7b45425add9
-EBUILD git-annex-5.20140709.ebuild 4941 SHA256 181fdfcc7733b0723f3600fca73ce845412c1dbdbf370c31a1514c889ef8ec0a SHA512 4206607f71ead1eb200772d550d121d899a4314df61f1147fad2247c5aa91c566f65e20ac94d0c04e0aa587c4dc66e2b9f0feec04e9d39741e1027657e59c5c7 WHIRLPOOL ec9b99c25fd3a0681c58cc7f4e80b5ce8f8032d1486c4876e6494f49cd2a896f2b5e5df9954adaac993c4005b512f0797585aa7ea540736b19dfcdc7b94790e5
-EBUILD git-annex-5.20140717.ebuild 4983 SHA256 ae1c533ac0ed070c1eea4da33ab3181e21461c18508bd9f07122db211cd37fa2 SHA512 2d09642784a5561d7b274acef2b314c34790cc670bca9a509fa03a2a7e7fe982eb9a860edf0e4f390c0a54a6859df7315c168726b321ee7547a2b1048b3cea09 WHIRLPOOL 31b970d350e1cffdb3d56f93ea65e6575dc891df1171b837cca64132a0b2f73116dcf0392fa3bdd855cce019c325b2e10eee6e18a7b9a71eaf7606ac5f1fae58
-EBUILD git-annex-5.20140831.ebuild 4574 SHA256 b5413dab16fc7d31e8c2d643b5775a76b8586368de678206f0e9f531d4b41cc4 SHA512 69ab36a81362c045912f3374923130c2c6bb325c4aaeb25ca86f1aaa9690f99c9af7cc3feb456ca18d0a351ca8d5979cfa657e22d69b92c56a8aa871293d9b63 WHIRLPOOL d062fcd4bc1dfd50d6cbce2568e9dd2465a15bd7db0d61a781dc872af3d847a2e2279c74109e34f17117034c55a7336810ca752642c1602a51734287227482c7
-MISC ChangeLog 5772 SHA256 a8e811b619a69e68a6d59ab9b60d90b49c8aa66166400a407469dd33ffab2eec SHA512 0936e67d8a24ae741e0cf5241f3e99f2aad3748c8b1a333cf14990750bcbdb2e9c6e08e812e4f0e8938c9c61310a632326e0f6075a6cf6b5eef07dc8bb912873 WHIRLPOOL ec12c012863441162a1ced1bf023eade2b58ba37824d447dbeee60b3d04091020f7033ecbb8dd4efe6b9bc20afc91d9cbac13bb76c4c65da05ebc04e94d1b2b5
+DIST git-annex-5.20140927.tar.gz 4547006 SHA256 532b36a4a33909b9835a19888b1678251a0b99b1a1f82e94755bb5cc2e7af50b SHA512 7851b773a296efc3c4d3ae36ce240ca466b42d87d32f8635ae1dc8457064c20b2521c0fe3c123554e0d2e2e35346f03a3c25ae94f47f2a2d902a73629f0c6535 WHIRLPOOL bc30b2b7833f46a5633012f072a901142c2a6bc5fbca198c3d391fe336c2c88d3ae2491a439692fe32eb1b217d8a9c6b8baad931f462660b0c4a3cccb1ba44b0
+EBUILD git-annex-5.20140927.ebuild 4582 SHA256 c7cf1e3fca817baaf9823d431a66435fa759829dfe09957c95f66f9872581aef SHA512 81c420f4873fce061ad41a792155622d27cd076c150b26cd4b49c2a6b3d6bacca983815a2f1ea3fd85ed96d2fb5da35d1f65c426b2cd1f0bbe5ba8d04cd03dc6 WHIRLPOOL fa6257fe10038398f01ed026983d393003f26540e452e21b876ffe974a02fda5c729766abd994cbc3993bcd729eee676023f339b77b37b1b2b870e1bdbd1c903
+MISC ChangeLog 6340 SHA256 a555ee97d107710dd4b28d28d730c2f9bde8b1c7ad4df9d07e4cb38889de471e SHA512 b789de242f0f81d8a74b74e2383a70d572621f68b2438b7b4804622be21e1d8e614d5ec0a901d3ae170e0eae39c79a5b24c0d93b59ca8a084ced827c03cf5dd5 WHIRLPOOL be8ca065ad0fa6d67c7a8eb7b963928340017a0ea5f02046bb57af209c70fbfd55d0457d124e9e2df70eafa1d4538051c2027987a7c64c47aee9f562b5c838d3
 MISC metadata.xml 2128 SHA256 0eb7a205b68ef6665df385d7e3edbb3fc3d249f8d3e31a8755895e413346f432 SHA512 5b511ffbe6845d663c742a5a2596c83c45a8bd5919cc8e90413f11ea9aa10aab42a9293c86d7a2ce68dccfe2e23f45e56e13e7c3ebf1533315db578174fa61f4 WHIRLPOOL 7d7a9a718537ef0b5bfdc810a31d4d934f2028b48b0d0f32eb3fd7e9e21b74686b1053c70a84606b57b49d92b501a122d98418ee49a53d3cce6d1b1b81cfc190
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlQLWSMACgkQcaHudmEf86oNYwCdGgs8HFBpBlyRGqFPZp/tkVTA
-ZvsAoISsvo7EW2BWq3i/sBY5QBuq6uFH
-=8XKf
+iEYEAREIAAYFAlQwKvIACgkQcaHudmEf86oT6QCfZZKuZx0i/1uDYTXtb1nhG0H7
+7ZIAnihD8RhS23yuGhE4Mrc1v9VN0kLF
+=9o3J
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/git-annex/files/git-annex-5.20140717-old-feed.patch b/dev-vcs/git-annex/files/git-annex-5.20140717-old-feed.patch
deleted file mode 100644
index c67024c6e910..000000000000
--- a/dev-vcs/git-annex/files/git-annex-5.20140717-old-feed.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-commit d15bfc9061d370b22ba4de8146fab92d3fa3ff02
-Author: Joey Hess <joey@kitenet.net>
-Date:   Sat Jul 19 18:30:08 2014 -0400
-
-    fix build with old feed
-
-diff --git a/Command/ImportFeed.hs b/Command/ImportFeed.hs
-index e785885..1fdba46 100644
---- a/Command/ImportFeed.hs
-+++ b/Command/ImportFeed.hs
-@@ -227,9 +227,13 @@ feedFile tmpl i extension = Utility.Format.format tmpl $
- #endif
- 
- extractMetaData :: ToDownload -> MetaData
-+#if MIN_VERSION_feed(0,3,9)
- extractMetaData i = case getItemPublishDate (item i) :: Maybe (Maybe UTCTime) of
- 	Just (Just d) -> unionMetaData meta (dateMetaData d meta)
- 	_ -> meta
-+#else
-+extractMetaData i = meta
-+#endif
-   where
- 	tometa (k, v) = (mkMetaFieldUnchecked k, S.singleton (toMetaValue v))
- 	meta = MetaData $ M.fromList $ map tometa $ extractFields i
diff --git a/dev-vcs/git-annex/git-annex-3.20121211-r2.ebuild b/dev-vcs/git-annex/git-annex-3.20121211-r2.ebuild
deleted file mode 100644
index 50ed7b212cbc..000000000000
--- a/dev-vcs/git-annex/git-annex-3.20121211-r2.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-annex/git-annex-3.20121211-r2.ebuild,v 1.2 2013/07/21 17:52:00 ottxor Exp $
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.1.9999
-
-CABAL_FEATURES="bin" # test-suite" broken
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="dbus doc inotify s3 test"
-RESTRICT=test # don't seem to like our git environment much, does not ship all files
-
-RDEPEND=">=dev-vcs/git-1.7.7" # TODO: add more deps?
-DEPEND="${RDEPEND}
-		test? ( dev-haskell/hunit
-			dev-haskell/testpack
-		)
-		dev-haskell/bloomfilter
-		>=dev-haskell/cabal-1.8
-		dev-haskell/dataenc
-		dev-haskell/edit-distance
-		dev-haskell/extensible-exceptions
-		dev-haskell/hslogger
-		dev-haskell/http
-		dev-haskell/ifelse
-		dev-haskell/json[generic]
-		dev-haskell/lifted-base
-		dev-haskell/missingh
-		dev-haskell/monad-control
-		>=dev-haskell/mtl-2.1.1
-		>=dev-haskell/network-2.0
-		dev-haskell/pcre-light
-		>=dev-haskell/quickcheck-2.1
-		dev-haskell/safesemaphore
-		dev-haskell/sha
-		dev-haskell/text
-		dev-haskell/transformers-base
-		dev-haskell/utf8-string
-		>=dev-lang/ghc-7.4.1
-
-		dbus? ( >=dev-haskell/dbus-0.10.3 )
-		inotify? ( dev-haskell/hinotify )
-		s3? ( dev-haskell/hs3 )
-
-		dev-lang/perl
-		doc? ( www-apps/ikiwiki net-misc/rsync )"
-# dev-lang/perl is to build the manpages
-# www-apps/ikiwiki and net-misc/rsync used to build the rest of the docs
-
-src_prepare() {
-	#epatch "${FILESDIR}"/${P}-no-tf.patch
-	echo 'mans: $(mans)' >>"${S}"/Makefile
-
-	# there is no kqueue on linux, but should be on freebsd and solaris(?)
-	cabal_chdeps \
-		'testpack' 'testpack, SafeSemaphore' \
-		'if (! os(windows) && ! os(solaris))' 'if (! os(windows) && ! os(linux))'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-Assistant \
-		$(cabal_flag dbus Dbus) \
-		--flag=-DNS \
-		$(cabal_flag inotify Inotify) \
-		--flag=-Pairing \
-		$(cabal_flag s3 S3) \
-		--flag=-Webapp \
-		--flag=-WebDAV \
-		--flag=-XMPP
-}
-
-src_compile() {
-	haskell-cabal_src_compile
-	use doc && emake docs
-	emake mans
-}
-
-src_test() {
-	export GIT_CONFIG=${T}/temp-git-config
-	git config user.email "git@src_test"
-	git config user.name "Mr. ${P} The Test"
-
-	emake test
-}
-
-src_install() {
-	haskell-cabal_src_install
-	dosym git-annex /usr/bin/git-annex-shell # standard make install does more, than needed
-
-	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
-}
diff --git a/dev-vcs/git-annex/git-annex-4.20130815-r1.ebuild b/dev-vcs/git-annex/git-annex-4.20130815-r1.ebuild
deleted file mode 100644
index 09e5969e1b44..000000000000
--- a/dev-vcs/git-annex/git-annex-4.20130815-r1.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-annex/git-annex-4.20130815-r1.ebuild,v 1.2 2013/12/11 13:26:21 gienah Exp $
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-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 +dbus +dns doc +feed +inotify +pairing +production +s3 +tdfa +testsuite +webapp +webdav +xmpp"
-
-RDEPEND=">=dev-vcs/git-1.7.7
-		assistant? ( sys-process/lsof )
-		"
-DEPEND="${RDEPEND}
-		dev-haskell/bloomfilter
-		>=dev-haskell/cabal-1.8
-		dev-haskell/dataenc
-		dev-haskell/dlist
-		dev-haskell/edit-distance
-		dev-haskell/extensible-exceptions
-		dev-haskell/hslogger
-		dev-haskell/http
-		dev-haskell/ifelse
-		dev-haskell/json[generic]
-		dev-haskell/missingh
-		dev-haskell/monad-control
-		dev-haskell/monadcatchio-transformers
-		>=dev-haskell/mtl-2
-		>=dev-haskell/network-2.0
-		>=dev-haskell/quickcheck-2.1
-		dev-haskell/random
-		dev-haskell/safesemaphore
-		dev-haskell/sha
-		dev-haskell/text
-		dev-haskell/unix-compat
-		dev-haskell/utf8-string
-		dev-haskell/uuid
-		>=dev-lang/ghc-7.4.1
-		assistant? ( dev-haskell/async
-			>=dev-haskell/stm-2.3
-			inotify? ( dev-haskell/hinotify )
-		)
-		dbus? ( >=dev-haskell/dbus-0.10.3
-		)
-		dns? ( dev-haskell/dns
-		)
-		feed? ( dev-haskell/feed )
-		pairing? ( dev-haskell/network-info
-			dev-haskell/network-multicast
-		)
-		s3? ( dev-haskell/hs3
-		)
-		tdfa? ( dev-haskell/regex-tdfa
-		)
-		testsuite? ( dev-haskell/hunit
-		)
-		webapp? ( dev-haskell/aeson
-			dev-haskell/blaze-builder
-			dev-haskell/case-insensitive
-			dev-haskell/clientsession
-			dev-haskell/crypto-api
-			dev-haskell/data-default
-			dev-haskell/hamlet
-			dev-haskell/transformers
-			dev-haskell/wai
-			dev-haskell/wai-logger
-			dev-haskell/warp
-			dev-haskell/yesod
-			dev-haskell/yesod-core
-			dev-haskell/yesod-default
-			dev-haskell/yesod-form
-			dev-haskell/yesod-static
-			s3? ( !webdav? ( dev-haskell/http-types
-		)
-		)
-		)
-		webdav? ( >=dev-haskell/dav-0.3
-			dev-haskell/http-conduit
-			dev-haskell/xml-conduit
-		)
-		xmpp? ( >=dev-haskell/gnutls-0.1.4
-			dev-haskell/network-protocol-xmpp
-			dev-haskell/xml-types
-		)"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag assistant assistant) \
-		$(cabal_flag dbus dbus) \
-		$(cabal_flag dns dns) \
-		$(cabal_flag feed feed) \
-		$(cabal_flag inotify inotify) \
-		$(cabal_flag pairing pairing) \
-		$(cabal_flag production production) \
-		$(cabal_flag s3 s3) \
-		$(cabal_flag tdfa tdfa) \
-		$(cabal_flag testsuite testsuite) \
-		$(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
-
-	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
-}
diff --git a/dev-vcs/git-annex/git-annex-5.20140306-r1.ebuild b/dev-vcs/git-annex/git-annex-5.20140306-r1.ebuild
deleted file mode 100644
index 4040b36640cf..000000000000
--- a/dev-vcs/git-annex/git-annex-5.20140306-r1.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-annex/git-annex-5.20140306-r1.ebuild,v 1.3 2014/03/21 11:30:25 qnikst Exp $
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5
-
-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="android androidsplice +assistant +cryptohash +dbus +dns doc ekg +feed +inotify +pairing tahoe +production +quvi +s3 +tdfa +testsuite +webapp +webdav +xmpp"
-
-RDEPEND="dev-vcs/git
-	assistant? ( sys-process/lsof )
-"
-DEPEND="${RDEPEND}
-	dev-haskell/async
-	dev-haskell/bloomfilter
-	>=dev-haskell/cabal-1.8
-	dev-haskell/case-insensitive
-	dev-haskell/dataenc
-	dev-haskell/data-default
-	dev-haskell/dlist
-	dev-haskell/edit-distance
-	dev-haskell/extensible-exceptions
-	dev-haskell/hslogger
-	dev-haskell/http
-	dev-haskell/ifelse
-	dev-haskell/json[generic]
-	dev-haskell/missingh
-	dev-haskell/monad-control
-	dev-haskell/monadcatchio-transformers
-	>=dev-haskell/mtl-2
-	>=dev-haskell/network-2.0
-	>=dev-haskell/quickcheck-2.1
-	dev-haskell/random
-	dev-haskell/safesemaphore
-	dev-haskell/sha
-	>=dev-haskell/stm-2.3
-	dev-haskell/text
-	dev-haskell/unix-compat
-	dev-haskell/utf8-string
-	dev-haskell/uuid
-	>=dev-lang/ghc-7.4.1
-	android? ( dev-haskell/data-endian )
-	assistant? ( inotify? ( dev-haskell/hinotify ) )
-	cryptohash? ( >=dev-haskell/cryptohash-0.10.0 )
-	dbus? ( >=dev-haskell/dbus-0.10.3 )
-	dns? ( dev-haskell/dns )
-	ekg? ( dev-haskell/aeson
-		dev-haskell/ekg
-		dev-haskell/http-types )
-	feed? ( dev-haskell/feed )
-	pairing? ( dev-haskell/network-info
-			dev-haskell/network-multicast )
-	s3? ( dev-haskell/hs3 )
-	tahoe? ( dev-haskell/aeson )
-	tdfa? ( dev-haskell/regex-tdfa )
-	testsuite? ( dev-haskell/tasty
-			dev-haskell/tasty-hunit
-			dev-haskell/tasty-quickcheck
-			dev-haskell/tasty-rerun )
-	webapp? ( dev-haskell/aeson
-			dev-haskell/blaze-builder
-			dev-haskell/clientsession
-			dev-haskell/crypto-api
-			dev-haskell/hamlet
-			dev-haskell/http-types
-			dev-haskell/network-conduit
-			dev-haskell/transformers
-			dev-haskell/wai
-			dev-haskell/wai-logger
-			dev-haskell/warp
-			dev-haskell/warp-tls
-			dev-haskell/yesod
-			dev-haskell/yesod-core
-			dev-haskell/yesod-default
-			dev-haskell/yesod-form
-			dev-haskell/yesod-static )
-	webdav? ( >=dev-haskell/dav-0.3
-		    dev-haskell/http-client
-			dev-haskell/http-conduit
-			dev-haskell/http-types
-			dev-haskell/lifted-base )
-	xmpp? ( >=dev-haskell/gnutls-0.1.4
-		dev-haskell/network-protocol-xmpp
-		dev-haskell/xml-types )
-		dev-lang/perl
-		doc? ( www-apps/ikiwiki net-misc/rsync )
-"
-
-src_prepare() {
-	# at least USE="cryptohash dbus dns inotify pairing production quvi s3 tdfa testsuite -xmpp -webdav -webapp -feed -assistant"
-	# need STM via Remote.External
-	cabal_chdeps \
-		'MissingH, hslogger, directory, filepath,' 'MissingH, hslogger, directory, filepath, stm,'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag android android) \
-		$(cabal_flag androidsplice androidsplice) \
-		$(cabal_flag assistant assistant) \
-		$(cabal_flag cryptohash cryptohash) \
-		$(cabal_flag dbus dbus) \
-		$(cabal_flag dns dns) \
-		$(cabal_flag ekg ekg) \
-		$(cabal_flag feed feed) \
-		$(cabal_flag inotify inotify) \
-		$(cabal_flag pairing pairing) \
-		$(cabal_flag production production) \
-		$(cabal_flag quvi quvi) \
-		$(cabal_flag s3 s3) \
-		$(cabal_flag tahoe tahoe) \
-		$(cabal_flag tdfa tdfa) \
-		$(cabal_flag testsuite testsuite) \
-		$(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 "Utility"
-	fi
-}
diff --git a/dev-vcs/git-annex/git-annex-5.20140405.ebuild b/dev-vcs/git-annex/git-annex-5.20140405.ebuild
deleted file mode 100644
index e9f6e721a41a..000000000000
--- a/dev-vcs/git-annex/git-annex-5.20140405.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-annex/git-annex-5.20140405.ebuild,v 1.1 2014/04/09 15:58:40 qnikst Exp $
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5
-
-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="android androidsplice +assistant +cryptohash +dbus +dns doc +desktop-notify ekg +feed +inotify +pairing +production +quvi +s3 +tahoe +tdfa +testsuite +webapp +webapp-secure +webdav +xmpp"
-
-RDEPEND="dev-vcs/git
-	assistant? ( sys-process/lsof )
-"
-DEPEND="${RDEPEND}
-	dev-haskell/async
-	dev-haskell/bloomfilter
-	>=dev-haskell/cabal-1.8
-	dev-haskell/case-insensitive
-	dev-haskell/dataenc
-	dev-haskell/data-default
-	dev-haskell/dlist
-	dev-haskell/edit-distance
-	dev-haskell/extensible-exceptions
-	dev-haskell/hslogger
-	dev-haskell/http
-	dev-haskell/ifelse
-	dev-haskell/json[generic]
-	dev-haskell/missingh
-	dev-haskell/monad-control
-	dev-haskell/monadcatchio-transformers
-	>=dev-haskell/mtl-2
-	>=dev-haskell/network-2.0
-	>=dev-haskell/quickcheck-2.1
-	dev-haskell/random
-	dev-haskell/safesemaphore
-	dev-haskell/sha
-	>=dev-haskell/stm-2.3
-	dev-haskell/text
-	dev-haskell/unix-compat
-	dev-haskell/utf8-string
-	dev-haskell/uuid
-	>=dev-haskell/stm-2.3
-	>=dev-lang/ghc-7.4.1
-	android? ( dev-haskell/data-endian )
-	assistant? ( inotify? ( dev-haskell/hinotify ) )
-	cryptohash? ( >=dev-haskell/cryptohash-0.10.0 )
-	dbus? ( >=dev-haskell/dbus-0.10.3 )
-	dns? ( dev-haskell/dns )
-	ekg? ( dev-haskell/aeson
-		dev-haskell/ekg
-		dev-haskell/http-types )
-	feed? ( dev-haskell/feed )
-	pairing? ( dev-haskell/network-info
-			dev-haskell/network-multicast )
-	s3? ( dev-haskell/hs3 )
-	tahoe? ( dev-haskell/aeson )
-	tdfa? ( dev-haskell/regex-tdfa )
-	testsuite? ( >=dev-haskell/tasty-0.7
-			dev-haskell/tasty-hunit
-			dev-haskell/tasty-quickcheck
-			dev-haskell/tasty-rerun
-			dev-haskell/optparse-applicative
-			)
-	webapp? ( dev-haskell/aeson
-	        dev-haskell/blaze-builder
-		    dev-haskell/aeson
-			dev-haskell/case-insensitive
-			dev-haskell/clientsession
-			dev-haskell/crypto-api
-			dev-haskell/data-default
-			dev-haskell/hamlet
-			dev-haskell/http-types
-			dev-haskell/transformers
-			dev-haskell/network-conduit
-			dev-haskell/transformers
-			dev-haskell/wai
-			dev-haskell/wai-logger
-			dev-haskell/warp
-			dev-haskell/warp-tls
-			dev-haskell/yesod
-			dev-haskell/yesod-core
-			dev-haskell/yesod-default
-			dev-haskell/yesod-form
-			dev-haskell/yesod-static
-			webapp-secure? (
-			  dev-haskell/warp-tls
-			  dev-haskell/securemem
-			  dev-haskell/byteable
-			) )
-	webdav? ( >=dev-haskell/dav-0.3
-			dev-haskell/http-conduit
-			dev-haskell/http-client
-			dev-haskell/http-types
-			dev-haskell/lifted-base
-			dev-haskell/xml-conduit )
-	xmpp? ( >=dev-haskell/gnutls-0.1.4
-		dev-haskell/network-protocol-xmpp
-		dev-haskell/xml-types )
-		dev-lang/perl
-		doc? ( www-apps/ikiwiki net-misc/rsync )
-"
-
-src_prepare() {
-	# at least USE="cryptohash dbus dns inotify pairing production quvi s3 tdfa testsuite -xmpp -webdav -webapp -feed -assistant"
-	# need STM via Remote.External
-	cabal_chdeps \
-		'MissingH, hslogger, directory, filepath,' 'MissingH, hslogger, directory, filepath, stm,'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag android android) \
-		$(cabal_flag androidsplice androidsplice) \
-		$(cabal_flag assistant assistant) \
-		$(cabal_flag cryptohash cryptohash) \
-		$(cabal_flag dbus dbus) \
-		$(cabal_flag desktop-notify desktop-notify) \
-		$(cabal_flag dns dns) \
-		$(cabal_flag ekg ekg) \
-		$(cabal_flag feed feed) \
-		$(cabal_flag inotify inotify) \
-		$(cabal_flag pairing pairing) \
-		$(cabal_flag production production) \
-		$(cabal_flag quvi quvi) \
-		$(cabal_flag s3 s3) \
-		$(cabal_flag tahoe tahoe) \
-		$(cabal_flag tdfa tdfa) \
-		$(cabal_flag testsuite testsuite) \
-		$(cabal_flag webapp webapp) \
-		$(cabal_flag webapp-secure webapp-secure) \
-		$(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 "Utility"
-	fi
-}
diff --git a/dev-vcs/git-annex/git-annex-5.20140613.ebuild b/dev-vcs/git-annex/git-annex-5.20140613.ebuild
deleted file mode 100644
index e5dc5afbecd6..000000000000
--- a/dev-vcs/git-annex/git-annex-5.20140613.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-annex/git-annex-5.20140613.ebuild,v 1.1 2014/06/18 19:08:24 slyfox Exp $
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5
-
-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="android androidsplice +assistant +cryptohash +dbus +dns doc +desktop-notify ekg +feed +inotify +pairing +production +quvi +s3 +tahoe +tdfa +testsuite +webapp +webapp-secure +webdav +xmpp"
-
-RDEPEND="dev-vcs/git
-"
-DEPEND="${RDEPEND}
-	dev-haskell/async
-	dev-haskell/bloomfilter
-	>=dev-haskell/cabal-1.8
-	dev-haskell/dataenc
-	dev-haskell/dlist
-	dev-haskell/edit-distance
-	>=dev-haskell/exceptions-0.5
-	dev-haskell/extensible-exceptions
-	dev-haskell/hslogger
-	dev-haskell/http
-	dev-haskell/ifelse
-	dev-haskell/json[generic]
-	dev-haskell/missingh
-	dev-haskell/monad-control
-	>=dev-haskell/mtl-2
-	>=dev-haskell/network-2.0
-	>=dev-haskell/quickcheck-2.1
-	dev-haskell/random
-	dev-haskell/safesemaphore
-	dev-haskell/sha
-	>=dev-haskell/stm-2.3
-	dev-haskell/text
-	dev-haskell/unix-compat
-	dev-haskell/utf8-string
-	dev-haskell/uuid
-	>=dev-lang/ghc-7.4.1
-	android? ( dev-haskell/data-endian )
-	assistant? ( >=dev-haskell/stm-2.3
-			inotify? ( dev-haskell/hinotify ) )
-	cryptohash? ( >=dev-haskell/cryptohash-0.10.0 )
-	dbus? ( >=dev-haskell/dbus-0.10.3 )
-	dns? ( dev-haskell/dns )
-	ekg? ( dev-haskell/aeson
-		dev-haskell/ekg
-		dev-haskell/http-types )
-	feed? ( dev-haskell/feed )
-	pairing? ( dev-haskell/network-info
-			dev-haskell/network-multicast )
-	s3? ( dev-haskell/hs3 )
-	tdfa? ( dev-haskell/regex-tdfa )
-	testsuite? ( >=dev-haskell/tasty-0.7
-			dev-haskell/tasty-hunit
-			dev-haskell/tasty-quickcheck
-			dev-haskell/tasty-rerun
-			dev-haskell/optparse-applicative
-			)
-	webapp? ( dev-haskell/blaze-builder
-			dev-haskell/aeson
-			dev-haskell/case-insensitive
-			dev-haskell/clientsession
-			dev-haskell/crypto-api
-			dev-haskell/data-default
-			dev-haskell/hamlet
-			dev-haskell/http-types
-			dev-haskell/transformers
-			dev-haskell/network-conduit
-			dev-haskell/shakespeare
-			dev-haskell/transformers
-			dev-haskell/wai
-			dev-haskell/wai-extra
-			dev-haskell/warp
-			dev-haskell/warp-tls
-			dev-haskell/yesod
-			dev-haskell/yesod-core
-			dev-haskell/yesod-default
-			dev-haskell/yesod-form
-			dev-haskell/yesod-static
-			webapp-secure? ( dev-haskell/warp-tls
-					dev-haskell/securemem
-					dev-haskell/byteable ) )
-	webdav? ( >=dev-haskell/dav-0.3
-			dev-haskell/http-conduit
-			dev-haskell/http-client
-			dev-haskell/http-types
-			dev-haskell/lifted-base
-			dev-haskell/xml-conduit )
-	xmpp? ( >=dev-haskell/gnutls-0.1.4
-		dev-haskell/network-protocol-xmpp
-		dev-haskell/xml-types )
-		dev-lang/perl
-	doc? ( www-apps/ikiwiki net-misc/rsync )
-"
-
-src_prepare() {
-	# at least USE="cryptohash dbus dns inotify pairing production quvi s3 tdfa testsuite -xmpp -webdav -webapp -feed -assistant"
-	# need STM via Remote.External
-	cabal_chdeps \
-		'MissingH, hslogger, directory, filepath,' 'MissingH, hslogger, directory, filepath, stm,'
-
-	cabal_chdeps \
-		'hamlet' 'hamlet, shakespeare'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag android android) \
-		$(cabal_flag androidsplice androidsplice) \
-		$(cabal_flag assistant assistant) \
-		$(cabal_flag cryptohash cryptohash) \
-		$(cabal_flag dbus dbus) \
-		$(cabal_flag desktop-notify desktop-notify) \
-		$(cabal_flag dns dns) \
-		$(cabal_flag ekg ekg) \
-		$(cabal_flag feed feed) \
-		$(cabal_flag inotify inotify) \
-		$(cabal_flag pairing pairing) \
-		$(cabal_flag production production) \
-		$(cabal_flag quvi quvi) \
-		$(cabal_flag s3 s3) \
-		$(cabal_flag tahoe tahoe) \
-		$(cabal_flag tdfa tdfa) \
-		$(cabal_flag testsuite testsuite) \
-		$(cabal_flag webapp webapp) \
-		$(cabal_flag webapp-secure webapp-secure) \
-		$(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-5.20140709.ebuild b/dev-vcs/git-annex/git-annex-5.20140709.ebuild
deleted file mode 100644
index c58bd0c23be7..000000000000
--- a/dev-vcs/git-annex/git-annex-5.20140709.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-annex/git-annex-5.20140709.ebuild,v 1.1 2014/07/10 13:55:40 gienah Exp $
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5
-
-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="android androidsplice +assistant +cryptohash +dbus +dns doc +desktop-notify ekg +feed +inotify +pairing +production +quvi +s3 +tahoe +tdfa +testsuite +webapp +webapp-secure +webdav +xmpp"
-
-RDEPEND="dev-vcs/git
-"
-DEPEND="${RDEPEND}
-	dev-haskell/async
-	dev-haskell/bloomfilter
-	>=dev-haskell/cabal-1.8
-	dev-haskell/case-insensitive
-	dev-haskell/dataenc
-	dev-haskell/data-default
-	dev-haskell/dlist
-	dev-haskell/edit-distance
-	>=dev-haskell/exceptions-0.5
-	dev-haskell/extensible-exceptions
-	dev-haskell/hslogger
-	dev-haskell/http
-	dev-haskell/ifelse
-	dev-haskell/json[generic]
-	dev-haskell/missingh
-	dev-haskell/monad-control
-	>=dev-haskell/mtl-2
-	>=dev-haskell/network-2.0
-	>=dev-haskell/quickcheck-2.1:2
-	dev-haskell/random
-	dev-haskell/safesemaphore
-	dev-haskell/sha
-	>=dev-haskell/stm-2.3
-	dev-haskell/text
-	dev-haskell/unix-compat
-	dev-haskell/utf8-string
-	dev-haskell/uuid
-	>=dev-lang/ghc-7.4.1
-	android? ( dev-haskell/data-endian )
-	assistant? ( >=dev-haskell/stm-2.3
-			inotify? ( dev-haskell/hinotify ) )
-	cryptohash? ( >=dev-haskell/cryptohash-0.10.0 )
-	dbus? ( >=dev-haskell/dbus-0.10.3 )
-	dns? ( dev-haskell/dns )
-	ekg? ( dev-haskell/aeson
-		dev-haskell/ekg
-		dev-haskell/http-types )
-	feed? ( dev-haskell/feed )
-	pairing? ( dev-haskell/network-info
-			dev-haskell/network-multicast )
-	quvi? ( dev-haskell/aeson )
-	s3? ( dev-haskell/hs3 )
-	tdfa? ( dev-haskell/regex-tdfa )
-	tahoe? ( dev-haskell/aeson )
-	testsuite? ( >=dev-haskell/tasty-0.7
-			dev-haskell/tasty-hunit
-			dev-haskell/tasty-quickcheck
-			dev-haskell/tasty-rerun
-			dev-haskell/optparse-applicative
-			)
-	webapp? ( dev-haskell/blaze-builder
-			dev-haskell/aeson
-			dev-haskell/clientsession
-			dev-haskell/crypto-api
-			dev-haskell/hamlet
-			dev-haskell/http-types
-			dev-haskell/transformers
-			dev-haskell/shakespeare
-			dev-haskell/transformers
-			dev-haskell/wai
-			dev-haskell/wai-extra
-			dev-haskell/warp
-			dev-haskell/warp-tls
-			dev-haskell/yesod
-			dev-haskell/yesod-core
-			dev-haskell/yesod-default
-			dev-haskell/yesod-form
-			dev-haskell/yesod-static
-			webapp-secure? ( dev-haskell/warp-tls
-					dev-haskell/securemem
-					dev-haskell/byteable ) )
-	webdav? ( >=dev-haskell/dav-0.3
-			dev-haskell/http-conduit
-			dev-haskell/http-client
-			dev-haskell/http-types
-			dev-haskell/lifted-base
-			dev-haskell/xml-conduit )
-	xmpp? ( >=dev-haskell/gnutls-0.1.4
-		dev-haskell/network-protocol-xmpp
-		dev-haskell/xml-types )
-		dev-lang/perl
-	doc? ( www-apps/ikiwiki net-misc/rsync )
-"
-
-src_prepare() {
-	# at least USE="cryptohash dbus dns inotify pairing production quvi s3 tdfa testsuite -xmpp -webdav -webapp -feed -assistant"
-	# need STM via Remote.External
-	cabal_chdeps \
-		'MissingH, hslogger, directory, filepath,' 'MissingH, hslogger, directory, filepath, stm,'
-
-	cabal_chdeps \
-		'hamlet' 'hamlet, shakespeare'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag android android) \
-		$(cabal_flag androidsplice androidsplice) \
-		$(cabal_flag assistant assistant) \
-		$(cabal_flag cryptohash cryptohash) \
-		$(cabal_flag dbus dbus) \
-		$(cabal_flag desktop-notify desktop-notify) \
-		$(cabal_flag dns dns) \
-		$(cabal_flag ekg ekg) \
-		$(cabal_flag feed feed) \
-		$(cabal_flag inotify inotify) \
-		$(cabal_flag pairing pairing) \
-		$(cabal_flag production production) \
-		$(cabal_flag quvi quvi) \
-		$(cabal_flag s3 s3) \
-		$(cabal_flag tahoe tahoe) \
-		$(cabal_flag tdfa tdfa) \
-		$(cabal_flag testsuite testsuite) \
-		$(cabal_flag webapp webapp) \
-		$(cabal_flag webapp-secure webapp-secure) \
-		$(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-5.20140717.ebuild b/dev-vcs/git-annex/git-annex-5.20140717.ebuild
deleted file mode 100644
index 4c24aa25ea5c..000000000000
--- a/dev-vcs/git-annex/git-annex-5.20140717.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-annex/git-annex-5.20140717.ebuild,v 1.2 2014/07/20 07:35:01 slyfox Exp $
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5
-
-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="android androidsplice +assistant +cryptohash +dbus +dns doc +desktop-notify ekg +feed +inotify +pairing +production +quvi +s3 +tahoe +tdfa +testsuite +webapp +webapp-secure +webdav +xmpp"
-
-RDEPEND="dev-vcs/git
-"
-DEPEND="${RDEPEND}
-	dev-haskell/async
-	dev-haskell/bloomfilter
-	>=dev-haskell/cabal-1.8
-	dev-haskell/case-insensitive
-	dev-haskell/dataenc
-	dev-haskell/data-default
-	dev-haskell/dlist
-	dev-haskell/edit-distance
-	>=dev-haskell/exceptions-0.5
-	dev-haskell/extensible-exceptions
-	dev-haskell/hslogger
-	dev-haskell/http
-	dev-haskell/ifelse
-	dev-haskell/json[generic]
-	dev-haskell/missingh
-	dev-haskell/monad-control
-	>=dev-haskell/mtl-2
-	>=dev-haskell/network-2.0
-	>=dev-haskell/quickcheck-2.1:2
-	dev-haskell/random
-	dev-haskell/safesemaphore
-	dev-haskell/sha
-	>=dev-haskell/stm-2.3
-	dev-haskell/text
-	dev-haskell/unix-compat
-	dev-haskell/utf8-string
-	dev-haskell/uuid
-	>=dev-lang/ghc-7.4.1
-	android? ( dev-haskell/data-endian )
-	assistant? ( >=dev-haskell/stm-2.3
-			inotify? ( dev-haskell/hinotify ) )
-	cryptohash? ( >=dev-haskell/cryptohash-0.10.0 )
-	dbus? ( >=dev-haskell/dbus-0.10.3 )
-	dns? ( dev-haskell/dns )
-	ekg? ( dev-haskell/aeson
-		dev-haskell/ekg
-		dev-haskell/http-types )
-	feed? ( dev-haskell/feed )
-	pairing? ( dev-haskell/network-info
-			dev-haskell/network-multicast )
-	quvi? ( dev-haskell/aeson )
-	s3? ( dev-haskell/hs3 )
-	tdfa? ( dev-haskell/regex-tdfa )
-	tahoe? ( dev-haskell/aeson )
-	testsuite? ( >=dev-haskell/tasty-0.7
-			dev-haskell/tasty-hunit
-			dev-haskell/tasty-quickcheck
-			dev-haskell/tasty-rerun
-			dev-haskell/optparse-applicative
-			)
-	webapp? ( dev-haskell/blaze-builder
-			dev-haskell/aeson
-			dev-haskell/clientsession
-			dev-haskell/crypto-api
-			dev-haskell/hamlet
-			dev-haskell/http-types
-			dev-haskell/path-pieces
-			dev-haskell/transformers
-			dev-haskell/shakespeare
-			dev-haskell/wai
-			dev-haskell/wai-extra
-			dev-haskell/warp
-			dev-haskell/warp-tls
-			dev-haskell/yesod
-			dev-haskell/yesod-core
-			dev-haskell/yesod-default
-			dev-haskell/yesod-form
-			dev-haskell/yesod-static
-			webapp-secure? ( dev-haskell/warp-tls
-					dev-haskell/securemem
-					dev-haskell/byteable ) )
-	webdav? ( >=dev-haskell/dav-0.3
-			dev-haskell/http-conduit
-			dev-haskell/http-client
-			dev-haskell/http-types
-			dev-haskell/lifted-base
-			dev-haskell/xml-conduit )
-	xmpp? ( >=dev-haskell/gnutls-0.1.4
-		dev-haskell/network-protocol-xmpp
-		dev-haskell/xml-types )
-		dev-lang/perl
-	doc? ( www-apps/ikiwiki net-misc/rsync )
-"
-
-src_prepare() {
-	# at least USE="cryptohash dbus dns inotify pairing production quvi s3 tdfa testsuite -xmpp -webdav -webapp -feed -assistant"
-	# need STM via Remote.External
-	cabal_chdeps \
-		'MissingH, hslogger, directory, filepath,' 'MissingH, hslogger, directory, filepath, stm,'
-
-	cabal_chdeps \
-		'hamlet' 'hamlet, shakespeare'
-
-	epatch "${FILESDIR}"/${P}-old-feed.patch
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag android android) \
-		$(cabal_flag androidsplice androidsplice) \
-		$(cabal_flag assistant assistant) \
-		$(cabal_flag cryptohash cryptohash) \
-		$(cabal_flag dbus dbus) \
-		$(cabal_flag desktop-notify desktop-notify) \
-		$(cabal_flag dns dns) \
-		$(cabal_flag ekg ekg) \
-		$(cabal_flag feed feed) \
-		$(cabal_flag inotify inotify) \
-		$(cabal_flag pairing pairing) \
-		$(cabal_flag production production) \
-		$(cabal_flag quvi quvi) \
-		$(cabal_flag s3 s3) \
-		$(cabal_flag tahoe tahoe) \
-		$(cabal_flag tdfa tdfa) \
-		$(cabal_flag testsuite testsuite) \
-		$(cabal_flag webapp webapp) \
-		$(cabal_flag webapp-secure webapp-secure) \
-		$(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-5.20140831.ebuild b/dev-vcs/git-annex/git-annex-5.20140927.ebuild
index 5f68510778eb..40a01f2ab0ff 100644
--- a/dev-vcs/git-annex/git-annex-5.20140831.ebuild
+++ b/dev-vcs/git-annex/git-annex-5.20140927.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-annex/git-annex-5.20140831.ebuild,v 1.1 2014/09/06 18:57:38 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-annex/git-annex-5.20140927.ebuild,v 1.1 2014/10/04 17:14:25 slyfox Exp $
 
 EAPI=5
 
@@ -73,7 +73,7 @@ DEPEND="${RDEPEND}
 			dev-haskell/tasty-hunit
 			dev-haskell/tasty-quickcheck
 			dev-haskell/tasty-rerun
-			dev-haskell/optparse-applicative
+			>=dev-haskell/optparse-applicative-0.9.1
 			)
 	webapp? ( dev-haskell/blaze-builder
 			dev-haskell/aeson