giv-annex-4.20130815 version bump

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

4 files changed, 172 insertions, 13 deletions

diff --git a/dev-vcs/git-annex/ChangeLog b/dev-vcs/git-annex/ChangeLog
index af111429faaf..4a65f930d50c 100644
--- a/dev-vcs/git-annex/ChangeLog
+++ b/dev-vcs/git-annex/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-vcs/git-annex
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-annex/ChangeLog,v 1.13 2013/07/21 17:52:00 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-annex/ChangeLog,v 1.14 2013/08/26 12:54:18 qnikst Exp $
+
+*git-annex-4.20130815 (26 Aug 2013)
+
+  26 Aug 2013; Alexander Vershilov <qnikst@gentoo.org>
+  +git-annex-4.20130815.ebuild, metadata.xml:
+  giv-annex-4.20130815 version bump
 
   21 Jul 2013; Christoph Junghans <ottxor@gentoo.org>
   git-annex-3.20121211-r2.ebuild:
diff --git a/dev-vcs/git-annex/Manifest b/dev-vcs/git-annex/Manifest
index fcba03445914..16dd6e869b7f 100644
--- a/dev-vcs/git-annex/Manifest
+++ b/dev-vcs/git-annex/Manifest
@@ -4,19 +4,23 @@ Hash: SHA256
 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
 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
 EBUILD git-annex-3.20121211-r2.ebuild 2796 SHA256 ec1ee68bf3ea711322acf89194f4eb2ad0f2702ab38fb696e7061745baa2481d SHA512 1a09fb926a8ac966e6b0d9010a5bb6db9c5d0197dd04fbce0e83f74d2fbbfa35737f438c1e3b956c6905b44cc50f302b7688d0d062078c42e097491c6c53ef94 WHIRLPOOL 14624b94558bffa5a1ed27ffa3b859b1254a20bd07e99b02cbc65a9b6c29948b5a57b147971cae50c0cd1ad6da39569b57dce4d0461db7028d4f4255e537bca0
-MISC ChangeLog 2846 SHA256 6c528ab2da65ef85935b8679c39f4b19bcb11a7bbfc8e4de7ee9095f18038fd2 SHA512 b8fa7d816d3906e1ed81bc9810271659dea0c1bb245f88df2d30a4ac7e5a5889141b5b9558d30cbac584afe0a079fe90119b497f865407b4e0516b964d618166 WHIRLPOOL f48f67a28a734e8e300c4d1dbd97cc38a7744d2a24089cb2d2fc7c201ba3829733b632a999451a6fb8eec241a4087f8f847695fb883704bd282c511f2aca9685
-MISC metadata.xml 1194 SHA256 3ebd2f50fc735237f04fa86176523aaf3564d10e151153dd31a56d52a6f4a923 SHA512 5315bcabfefac9c8c524a6a96d21a0acefd6b6c238a2f2b00d1528f757c63bebbbccc3294f2266abc9421861a32a363a125f9b987314f88f975c979893a49105 WHIRLPOOL 0aa18e7faceb763a19e0cb3d14e6dbe5ba2a16160e9fcb1eba071ed944311a913cfc25db98e1f4bbda339faa3e00d458b0f8f542dc67c6ef43d8f9a4821721b1
+EBUILD git-annex-4.20130815.ebuild 3542 SHA256 d874b409c8e172b52f1e4954cb689043350bb916e614317c2fe0020f38424421 SHA512 455bc1e23565d99450a80314979c0408b6851a6a0d254ae32a083d043762547d258c50171d431542b84f63f71be2f4cf760149f5eac916c543d1655373c37ee9 WHIRLPOOL 45cc7eb0198765498f682eb0392b5fa5aa045f9a0048bc6e543e095be07c0dd15bb7bc27614b7ef08eadee45418fed2abbd2a27bcb3721c16c1d94d6c38fd729
+MISC ChangeLog 3021 SHA256 9e67077f004857199416165357fb3dcdab4f06169ee989b92c75004cbffadded SHA512 ae2abf173d29348534308829319ff5c0f9e9d2e221af9a0994fe1032133504804aa4a15089afcbf42eb876bc82c87a7d82777adf1e9c343dbea2967597c1e97f WHIRLPOOL e76cb63c716b69907fa46c32bb840e640a89b98669b0487a668a4b9eb07747ad36beac6cd3d334597b63368b540bd99104df4938a922c9f485753beccca36643
+MISC metadata.xml 1694 SHA256 6d1d40fe4b30c315725347f800513e8efb9055605d5bc4dde2e62b7dda179df7 SHA512 412bc3c4075a21ed3912328627ebe6b7e231ad8fc86f51927bc628b9aab0a91e72696f06dddc81a4ec21369f4fc47c63622f7bb4c7d2f70cb22a7c632ce9ec34 WHIRLPOOL 4cbb2dddae5cb9fa06dcf19d103fcf91cdd9da9327c11d43a4b92966aeea7f435b91395347fd0fa76e932fa5a5be27c63d9679896fcdfb59c48ca52b5a27b53e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQEcBAEBCAAGBQJR7B/CAAoJEOeBhlrCAAWGZWgIAJKUb9xhHYkFlijHP+0m//Sk
-6QcN+FgyGL23kZu+ZHH8oNadY8DySepp1JWCx8YAUHr9AK4H6npkjttmeYgtKhvr
-VYVFY0ci4PHlVwPfYz4GNPTp4Se8KmoTScaWs5yBAhZ//45aM0ZSJBYOT8au3NbN
-hEoOvFlTpHVTWvEu/eL+HbX4AI2nw8i2MEQ434hbnFwIedNVyDLRruUUY0qgPjc8
-ZJdrvR2UfbVUzj9LwYCcfdDfVxBbSCq00H2yRRt1sJuEfGJRK9/HY+x+3NxRBVlV
-lIXzprqapzcSA+L2bAq4qdT6Nm6Yc+aOsSRDQ1M5iGF5s1iNQEQTtOtJgvv7sL4=
-=sXPF
+iQF7BAEBCABmBQJSG0/7XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwMTlGQTEwRTVCMUJCNjdFRDM5Qzg3RjdF
+QUQ1MEQ2NEQ4RDM1NzFBAAoJEOrVDWTY01caBEkH+N83eCgvrSVcuFHuZY0llqY7
+23XZu+0GHasJNt5ILXVQruZMQo9ZN+fv1YxXWV+zbU4FAE7PS/amVMqhO3QbflwS
+1rsQOle/du2JqLRootmvBxnSQfO6HSFDITrToxRxcbuiHnl1l4TAqYfJcafZ8frC
+tWZ8CrvzDZGpnI67Kajrsicave3j5mKu5z9PA8lm0C6rcNDJjDorX7cV5bCsUnV7
+hb1NiSUNvRyIbxQ4rb/oa31QujLarQ8XlYj2E2njLtECfixtlmuEYg4AjEqFSwLP
+wX7V+0/PSSmcX26YrD9clmQWvv+/ZCJcC2en7GIJiMGof2w0AGZ3wYDjr9mfrA==
+=I7vH
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/git-annex/git-annex-4.20130815.ebuild b/dev-vcs/git-annex/git-annex-4.20130815.ebuild
new file mode 100644
index 000000000000..f112622399e3
--- /dev/null
+++ b/dev-vcs/git-annex/git-annex-4.20130815.ebuild
@@ -0,0 +1,140 @@
+# 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.ebuild,v 1.1 2013/08/26 12:54:18 qnikst 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"
+IUSE="android +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
+		android? ( dev-haskell/data-endian
+		)
+		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 android android) \
+		$(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/metadata.xml b/dev-vcs/git-annex/metadata.xml
index 3c6377554ae5..21e9b22e8096 100644
--- a/dev-vcs/git-annex/metadata.xml
+++ b/dev-vcs/git-annex/metadata.xml
@@ -20,7 +20,16 @@
 		revision control.
 	</longdescription>
 	<use>
-		<flag name="inotify">Enable inotify support (<pkg>dev-haskell/hinotify</pkg>)</flag>
-		<flag name="s3">Enable S3 support (<pkg>dev-haskell/hs3</pkg>)</flag>
+		<flag name="s3">Enable S3 support</flag>
+		<flag name="webdav">Enable webdav support</flag>
+		<flag name="dns">Enable the haskell DNS library for DNS lookup</flag>
+		<flag name="assistant">Enable git-annex assistant and watch command</flag>
+		<flag name="android">Building for Android</flag>
+		<flag name="production">Enable production build (slower build; faster binary)</flag>
+		<flag name="testsuite">Embed the test suite into git-annex</flag>
+		<flag name="pairing"> Enable pairing</flag>
+		<flag name="webapp">Enable git-annex webapp</flag>
+		<flag name="tdfa">Use regex-tdfa for wildcards</flag>
+		<flag name="feed">Enable podcast feed support</flag>
 	</use>
 </pkgmetadata>