Version bump (bug #510748 by Manuel Rüger).

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

3 files changed, 184 insertions, 11 deletions

diff --git a/dev-vcs/git-annex/ChangeLog b/dev-vcs/git-annex/ChangeLog
index 92e1d401cf26..82178f7cf8fd 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-annex/ChangeLog,v 1.25 2014/04/09 15:58:40 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-annex/ChangeLog,v 1.26 2014/06/18 19:08:24 slyfox Exp $
+
+*git-annex-5.20140613 (18 Jun 2014)
+
+  18 Jun 2014; Sergei Trofimovich <slyfox@gentoo.org>
+  +git-annex-5.20140613.ebuild:
+  Version bump (bug #510748 by Manuel Rüger).
 
 *git-annex-5.20140405 (09 Apr 2014)
 
diff --git a/dev-vcs/git-annex/Manifest b/dev-vcs/git-annex/Manifest
index cd301a1918b5..7ef1eea68d4e 100644
--- a/dev-vcs/git-annex/Manifest
+++ b/dev-vcs/git-annex/Manifest
@@ -6,22 +6,18 @@ DIST git-annex-3.20121211.tar.gz 2068316 SHA256 3b6d9d7d8d44c7939813a4798a78b76a
 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
 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
-MISC ChangeLog 4912 SHA256 5185b2c36bd1afcc89452e92fea90b29f0def24c8804e644265e1bbbcd9d0872 SHA512 0e63695b79f11133ba44238aecae1bc15b48733517c593c8f72f047eac3a32d48ed3ea02c1bdade735e9e92e37eedc80a7d4e3cb139fb5d53d6d6e9cd5f85ac7 WHIRLPOOL 0b8dc75a74cc0cffdf2a8ec859837e3ba850cdf6516e7ccedfa249dfb2071b601e0a605271ee21a18934fb9823ba3e7a85f640d2332a977ad7d1e73cc96049ae
+EBUILD git-annex-5.20140613.ebuild 4915 SHA256 87a57f76dce89e87dcd7492edf713f5806895dadbae0c78a3a5041a2f38de715 SHA512 852b2f383c126ec6007f0637690e8aec285e2c1fb3dafb037f2435afb8c68779e1f08f2b3662d0e518c98c217e88574ac2d73ab140c79c64428ef58937f20b9c WHIRLPOOL f5c1c29c71a236cf2479eddfc8eac7d8c61e24896bd13ac9ad5d8720b99b64cd4c880eb252fc98d02918d6c0eaf972a10cdc639c736cc11dbabbc7b45425add9
+MISC ChangeLog 5083 SHA256 a139abe2ac382a4ff038afd2d1637af2e1f7199f8e31f4c7bc3f14898f015383 SHA512 4a30e8b799f3309d8f39aca68aa5850e40402fa8f90c904f2ae11a188cc4d335b32df799c7c079ebff1145faf9871b337399eb2edc47c14b7eb5628a464f4a25 WHIRLPOOL 02c43663bd88e48369e171fdcd0fa1f1c71bfd9430aa12c35540a56d0b194aad806c1c1eabe6f6776b878a7bfe6ed5e2b2a60ba77627c724d5552e67aac60055
 MISC metadata.xml 2193 SHA256 a698226bc5a4f6d11d5b0351bff6f27b7861a181d74e851426ef4393c2a9266d SHA512 b9dfffc4c03551c3154a0070aa2c6efaf2c8941d8e32b7c4f302f274167d0983bb7f6219c8facc54eea6da9a36a72c200a6f825c8f01e573c0429121f10324c5 WHIRLPOOL 013257588635637aea23ff5d589c33d4d9d756e92df0b41bfd3887ee8b333b38f13c0de79c2ddb6f9032dee5f78a43b007123687aa68ed0d176387386602240b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQF8BAEBCABmBQJTRW44XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwMTlGQTEwRTVCMUJCNjdFRDM5Qzg3RjdF
-QUQ1MEQ2NEQ4RDM1NzFBAAoJEOrVDWTY01capxMIAMcLkErEb7yyBy17jZ2mlZuY
-rXjFj5TdGGCw9XtiI69zmaqGwgt3Naa53ODAGjFUXd4zy3ruvHrYYDM9YSUk+m3I
-7qafYkdxZT46YYPo+mGkSPSvUrpRCK2h/lP0st+x41x41+UnR69cxhJbj1kciiMx
-7sASxLqt9cSsvHLSsl5bbPRwzkFk5j3n3JHI3dkW14T+tv9kjo+PYw6Hei2s+4zT
-PKb3nJYNCsYIeLEOv2lVdB+L2nezELUWVyihjmFxYlQ3AUDMs72DW/Qyy1bM9unq
-FO+LvDh2SzFgS5XrPgRCbsjG5NFZxtrrPfslMQ/XJVjGn0sm9AcDx+OBS1rahfM=
-=NsLO
+iEYEAREIAAYFAlOh43wACgkQcaHudmEf86qmFACdF0e/TN/9TgUQRxYp8TIm8RqF
+NTAAn3j+FZe0MliVULkil7e3waNMyPs6
+=m8IR
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/git-annex/git-annex-5.20140613.ebuild b/dev-vcs/git-annex/git-annex-5.20140613.ebuild
new file mode 100644
index 000000000000..e5dc5afbecd6
--- /dev/null
+++ b/dev-vcs/git-annex/git-annex-5.20140613.ebuild
@@ -0,0 +1,171 @@
+# 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
+}