Add new version, drop old #500688

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xEAD50D64D8D3571A!

6 files changed, 57 insertions, 171 deletions

diff --git a/dev-vcs/git-annex/ChangeLog b/dev-vcs/git-annex/ChangeLog
index 3426dd988c29..05265a2505c8 100644
--- a/dev-vcs/git-annex/ChangeLog
+++ b/dev-vcs/git-annex/ChangeLog
@@ -1,6 +1,13 @@
 # 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.20 2014/02/10 09:01:13 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-annex/ChangeLog,v 1.21 2014/03/12 21:33:28 qnikst Exp $
+
+*git-annex-5.20140306 (12 Mar 2014)
+
+  12 Mar 2014; Alexander Vershilov <qnikst@gentoo.org>
+  +git-annex-5.20140306.ebuild, -git-annex-3.20111203-r1.ebuild,
+  -git-annex-3.20120605.ebuild, -git-annex-5.20131130.ebuild, metadata.xml:
+  Add new version, drop old #500688
 
   10 Feb 2014; Alexander Vershilov <qnikst@gentoo.org>
   git-annex-5.20131130.ebuild:
diff --git a/dev-vcs/git-annex/Manifest b/dev-vcs/git-annex/Manifest
index 7dbf1b1edefc..682554b63293 100644
--- a/dev-vcs/git-annex/Manifest
+++ b/dev-vcs/git-annex/Manifest
@@ -2,28 +2,24 @@
 Hash: SHA256
 
 AUX git-annex.xpm 1961 SHA256 e9576b4d026cb8e61ee602d52639d65a2e8f2aadaaa3cfd9d8bfd8f55cf03803 SHA512 4a22ac448852160d66838c272f41b8c7599aa1b904e35ac03ea294d9ed15b855bde24b7e5407a2578937bfd51d482837ed6680af680166d030f71666316ae4d3 WHIRLPOOL a582bb82d01de4750e3bcb2e419cf0a334e11428972f68bbb70aa06ea5a357de89d48327d4576adf0f4101cd577f13c6f50b41d85d7c2fc6a0efb87124b88b60
-DIST git-annex-3.20111203.tar.gz 442974 SHA256 3b7361c9d27302f23136266ff1223b2a82c280988b3c706d518539eb577af244 SHA512 ec728449a76b966ce010e7a9a2892c837414504dd00db3eb77e312eed499c2c0163de12fe5278a3fd055e6fe85c89ca7c70f379f7627c29180a40d0690f840a4 WHIRLPOOL a74c3c1c07cfb61bfbbfa478bedf4e092430e52ffda5bf058a4f62e83810aad5b8c720da04147bef5d7236fc4d02f7bff790e22e34f36ab4377c5d7c9e793cd9
-DIST git-annex-3.20120605.tar.gz 654840 SHA256 1442548463bc56d702b38f1bee45be40da2aaa884127fe461f9bd12e51d5a38c SHA512 1eea2260efe558d1490ad89320ff3b3aafeaeaa8174d736b49f62814dd895250b5e01854696b87c43b7c1fb98a556118702e66dcab6bf25c40b2202b52b3f8ca WHIRLPOOL 10c4719bc9048d3d4ab074461bf32786e486ab89f07d1c94ce06e571e1a5de83bd8d9d21d306280174d9603eef7eb6af6c54973621b8e64b5bf24ae9ce1a5bea
 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.20131130.tar.gz 3945674 SHA256 414adf282d7edc2d758436fa74f864ebc78cbc123d1bc6cfeff8a7fd390aa95f SHA512 07fc54fc5a8383530757e08a93f08818104710a275d19f26678599e80046c48d5629be761ad5252d974eb6a2f8a9ee066dd41de418ccd2c5d8b15b94990c9688 WHIRLPOOL ac102ceb33bffe99048cf7cbed6e2b571d50cfd44de04eb719e8333240fc97f0a5b7f404c2cb6d00a1036cad3f7537f1c639e4cf1fb2ec06e427fe628f0397df
-EBUILD git-annex-3.20111203-r1.ebuild 1450 SHA256 554cea476b133269c141993da1145175539decf0b37247927e2fabb68a14e142 SHA512 aa522d55cf70982fc5693496d6b1853e6917aa089ecb2f9926a37ffb750ec89b56fa47c3d68cdadd7a5cf7807214d5b78718ce9a340dc863e3e3e402b823027e WHIRLPOOL 5213d9f259a6613f7a958df88c882daa86aaa249ceb07f370b768a1354443930cc3c27a2220d8df2d4256406e69c8a652f7a735765e16336575e1e86626fd5a0
-EBUILD git-annex-3.20120605.ebuild 1933 SHA256 5186162cae1ce3dfda0da0939fad64ef521e08b17dfd231b4a89f79100544650 SHA512 a9269ad72e99df9537261edacf63bdfc32664bd354bc25307ad51ab77073de34bf95fc148d3bce9a28a2b7897fee2eebc6a471d71c9e26069545691128714a31 WHIRLPOOL b90b32fd692dcb77890d20af517a115b184de367425c5de7ec43bdaa3698ad1662af5b3ba5989caf3b02943acbeae12ecc0d1b27b1352e4cfe46e3d65aae4231
+DIST git-annex-5.20140306.tar.gz 4340927 SHA256 89cacd6b17a0db65c09c5bc0e21298629fd7ac0f92c7b632f58c590e7ec64fce SHA512 8f2980604f8172537a6e67241b7ddedfc7dbafc5dca64398f5ded381a6326b6cb7b5324b515e324f53ea6e2a7ff12b8a30c56a894ec0b18d9ca5c4b3bd31385a WHIRLPOOL 414591c91f17a6ee1afbe59d8f5115a85cc2932803aa7618d4f0a7b25574d87ea538ce7cce0f1def97b60c4c243e041019e09324e2a1ee475cfacfad78f313ca
 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.20131130.ebuild 4075 SHA256 bf2b134d59e58be7073f8d3ffe66fb1f3bd706bf74254a2ba674f2fb80ee9981 SHA512 ce43c2bc16df88615bce36a208bb397adca96991147043968081fd54a92dbfe07b9195662297af40b1844b45b1d37312c3db9a0e5a93a19b45b5f0bccefe264a WHIRLPOOL 8cc59e6093e358768842809662515c441285650fe0febefbefdb63ffe5f1cef4d11613062088860f7cb39d59a1a11219c6ad291265c8b9147289c4518165d3bd
-MISC ChangeLog 4014 SHA256 a177f6dbe5606c548a219193d702f10b7ce0b8567e04663cf57a2ea8311fd77d SHA512 fbee65192fa5bc6c510a6299fc3741fa0ebca6caa782372186eda6719529f4d4ae42b25eda3e5a8f1518602fc6d99a3d45f2d7e56266b31b0fa17926e711ef90 WHIRLPOOL fec7153dc6cc5773fb92ab2f5e7cf09309bfb114f751d4e53b32b401e8d92cb299fe73acf5bb6751d990daaa6fc2cd4b97ddd7c662a33826164b271d0c4a1cf5
-MISC metadata.xml 1864 SHA256 0a55c7dbcaf114edea817f967a3f420c589074fc3a7e4175140131dfb67aa38f SHA512 11811f625b42e35132e699f1db79eaa1d0ac945b141ce7d558101035f9d5b61126528a219b051b98e7a27031cef18b402903f92a7e26de431ed2ddc91ff37bbd WHIRLPOOL 142df0d8d220eb81a5348707481f418de427780120f5cf7d0717d98cf5e102e07e0728ff41eb4384495bda5fd5c2df8b0aaa23ebad081e81f6cfcc238de525e5
+EBUILD git-annex-5.20140306.ebuild 4531 SHA256 86b86f7fef5075ac0e5ed7dc5b7ee426d44adbb5fd547a1552d213a9cb499829 SHA512 3838a5b902c7552a3f4669f048d30494e80e88aa52d2ad6b1c80cb5ce8f028adafb5333870d23ea05ed431428e098587de135a20a73bfff0f4fc3d16699de8a3 WHIRLPOOL 8a544d59a438ea33426772f145f106ee105a13c0c8b970ebd3323b1333e1a6f9d02687b082ecf1e11c682efcf4d3bdfe4622c3b456a1a884dd7f7fdd4471c639
+MISC ChangeLog 4284 SHA256 1773fcdaaa76915f0c9844ccca9e358b57785a18fb16ca796989d09515f9bc2f SHA512 09774bb5cd340f1ae53c7b5956c24ac49b4abd0a977edd90dec7b42e8d0e573be72733e407de844f3b3b9f7fe9d165ae446ab627341cb3e49dc3b4ca1c77dfdc WHIRLPOOL 25be015382a4a607c8bd8d58be3f68749f1e5d683b9b1e49c61636cafdd16f5fc92696856d9174582c7e26ebfb588ec675f5073ff9e6e80415840b635220bd50
+MISC metadata.xml 2065 SHA256 e4e5ef593e5b7c3b2fdb9078186481782b387a9616528b4e762f56619bd2ef93 SHA512 eacaf2913548b16f69cafe7ea0f54945d5ff7713ccf412aa99a12863a719225ab420bcfd50c237d19e1694f246364ed43c3a5c69d7ae1ea899d1d5f48e725b7b WHIRLPOOL c1963e71659026fb6a43dabc34a5366b31e03416d10c0e0583f1a1e60bfafc87c5878100cf1e7f4c5eb6037ea6e42759c2d793ccd64182aebda7541a615b6569
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQF8BAEBCABmBQJS+JVnXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQF8BAEBCABmBQJTINKpXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwMTlGQTEwRTVCMUJCNjdFRDM5Qzg3RjdF
-QUQ1MEQ2NEQ4RDM1NzFBAAoJEOrVDWTY01caL0oH/0LBRKqVIW3ziF5OcHBtfbDF
-KQei+Vqk7PCCsjfoM4S8ljYj2lFHCTrfYmg6b0CAlk2bUWiqmK+a4tiQSnexw/bW
-NM71NQ4liCO6FNpP8jBW7d2ktzIqKh2MpeNOUBfI2wZ2ta8zBgl2/ml5lfPKw8mI
-4piYnAhSh8JSx/WC7Ou3x+5TMXkeXED7MYsl+bNGfONAkLA36L0vqyR3QDYBeEYZ
-tfZ5DwkJi3Gt9b0EruM1xzHRm8DfBWJMv1u0RU7x0K5Fzf0f5HmHA3wF+XoNwl0b
-bkuJoWp1D0n75SpAGl9qRfKQldixmYOgCStsz4uZ2DwQiVogxEhlAAMJFvyz8O4=
-=PRTr
+QUQ1MEQ2NEQ4RDM1NzFBAAoJEOrVDWTY01caPgAH/0lyOXr3VHWIKtOWFacjfzVo
+T6u2GTahcNGtNPlrzeMnRSXFy96YcM9P4wSmtqIgUQbMCSWZFYckHMh5pecOV0PX
+wtesds/KqzqZLK52+WPhpHD8+a6A30uB7gw8qJRwpqbpXEy9n7RaVwNnRaZ/7AEs
+U4mGfgNVASY+QafEWEIWixT5CHRsR3k2H+iO65Qtt3ohrHdhFC/JxF3E4eFDKt4n
+woynaX+X3GPw66w5rBopUwNKr09fVdnBf8UI+7Dp2gRnaFGJQRyfdAbO1QUTasFj
+SP1wOxR8xhFNffBpIJwMmXObr054zDYuo7UmIlaQMlUwF3D3uBLaA3W3Yg7qhVI=
+=01r9
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/git-annex/git-annex-3.20111203-r1.ebuild b/dev-vcs/git-annex/git-annex-3.20111203-r1.ebuild
deleted file mode 100644
index 395fa9904f73..000000000000
--- a/dev-vcs/git-annex/git-annex-3.20111203-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2012 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.20111203-r1.ebuild,v 1.5 2012/12/07 10:39:18 slyfox Exp $
-
-# ebuild generated by hackport 0.2.13
-
-EAPI="3"
-
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND=">=dev-vcs/git-1.7.7" # TODO: add more deps?
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6
-		dev-haskell/dataenc
-		dev-haskell/hs3
-		dev-haskell/hslogger
-		dev-haskell/http
-		dev-haskell/json[generic]
-		dev-haskell/missingh
-		dev-haskell/monad-control
-		>=dev-haskell/mtl-2
-		dev-haskell/network
-		dev-haskell/pcre-light
-		dev-haskell/sha
-		dev-haskell/utf8-string
-		>=dev-lang/ghc-6.10.1
-		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() {
-	echo 'mans: $(mans)' >>"${S}"/Makefile
-}
-
-src_compile() {
-	haskell-cabal_src_compile
-	use doc && emake docs
-	emake mans
-}
-
-src_install() {
-	#haskell-cabal_src_install
-	emake install DESTDIR="${D}" PREFIX="${EPREFIX}/usr"
-	mv "${ED}"/usr/share/doc/{${PN},${PF}}
-	dodoc CHANGELOG README
-}
diff --git a/dev-vcs/git-annex/git-annex-3.20120605.ebuild b/dev-vcs/git-annex/git-annex-3.20120605.ebuild
deleted file mode 100644
index a4678a560257..000000000000
--- a/dev-vcs/git-annex/git-annex-3.20120605.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2012 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.20120605.ebuild,v 1.5 2012/12/07 10:39:18 slyfox Exp $
-
-EAPI=4
-
-# ebuild generated by hackport 0.2.18.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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT=test # don't seem to like our git environment much
-
-RDEPEND=">=dev-vcs/git-1.7.7" # TODO: add more deps?
-DEPEND="${RDEPEND}
-		test? ( dev-haskell/extensible-exceptions
-			dev-haskell/hunit
-			dev-haskell/testpack
-		)
-		dev-haskell/bloomfilter
-		>=dev-haskell/cabal-1.8
-		dev-haskell/dataenc
-		dev-haskell/edit-distance
-		dev-haskell/hs3
-		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
-		dev-haskell/network
-		dev-haskell/pcre-light
-		>=dev-haskell/quickcheck-2.1
-		dev-haskell/sha
-		dev-haskell/text
-		dev-haskell/transformers-base
-		dev-haskell/utf8-string
-		>=dev-lang/ghc-7.4
-		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() {
-	echo 'mans: $(mans)' >>"${S}"/Makefile
-}
-
-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
-	emake install 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.20131130.ebuild b/dev-vcs/git-annex/git-annex-5.20140306.ebuild
index 5ab13257f327..dbf5778d8aa7 100644
--- a/dev-vcs/git-annex/git-annex-5.20131130.ebuild
+++ b/dev-vcs/git-annex/git-annex-5.20140306.ebuild
@@ -1,10 +1,10 @@
 # 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.20131130.ebuild,v 1.3 2014/02/10 09:01:13 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-annex/git-annex-5.20140306.ebuild,v 1.1 2014/03/12 21:33:28 qnikst Exp $
 
 EAPI=5
 
-# ebuild generated by hackport 0.3.4.9999
+# ebuild generated by hackport 0.3.5
 
 CABAL_FEATURES="bin"
 inherit haskell-cabal
@@ -17,9 +17,7 @@ RESTRICT="test"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="android +assistant +cryptohash +dbus +dns doc +feed +inotify +pairing +production +quvi +s3 +tdfa +testsuite +webapp +webdav +xmpp"
-
-# hackport-args: --extra-dep='doc? ( www-apps/ikiwiki )'
+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
 "
@@ -27,7 +25,9 @@ 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
@@ -44,48 +44,52 @@ DEPEND="${RDEPEND}
 	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 )
-	quvi? ( dev-haskell/aeson )
-	assistant? ( >=dev-haskell/stm-2.3
-			inotify? ( dev-haskell/hinotify ) )
+	assistant? ( inotify? ( dev-haskell/hinotify ) )
 	cryptohash? ( >=dev-haskell/cryptohash-0.10.0 )
 	dbus? ( >=dev-haskell/dbus-0.10.3 )
 	dns? ( dev-haskell/dns )
-	doc? ( www-apps/ikiwiki )
+	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/aeson
-		dev-haskell/hs3
-		webapp? ( !webdav? ( dev-haskell/http-types ) ) )
+	s3? ( dev-haskell/hs3 )
+	tahoe? ( dev-haskell/aeson )
 	tdfa? ( dev-haskell/regex-tdfa )
-	testsuite? ( >=dev-haskell/tasty-0.5.1
-			>=dev-haskell/tasty-hunit-0.4.1
-			>=dev-haskell/tasty-quickcheck-0.3.1 )
-	webapp? ( dev-haskell/blaze-builder
-		    dev-haskell/aeson
-			dev-haskell/case-insensitive
+	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/data-default
 			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/xml-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 )
@@ -93,19 +97,29 @@ DEPEND="${RDEPEND}
 		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) \
diff --git a/dev-vcs/git-annex/metadata.xml b/dev-vcs/git-annex/metadata.xml
index b69c7d8ed6e1..a60b8e4989c3 100644
--- a/dev-vcs/git-annex/metadata.xml
+++ b/dev-vcs/git-annex/metadata.xml
@@ -22,13 +22,16 @@
 	<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="cryptohash">Enable use of cryptohash for checksumming</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="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="webapp">Enable git-annex webapp</flag>