Version bump (bug #527368 by Manuel Rüger and others).

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

3 files changed, 175 insertions, 5 deletions

diff --git a/dev-vcs/git-annex/ChangeLog b/dev-vcs/git-annex/ChangeLog
index 8cc96b4a8a78..20fd97f0059b 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.31 2014/10/04 17:14:25 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-annex/ChangeLog,v 1.32 2014/11/10 09:57:50 slyfox Exp $
+
+*git-annex-5.20141125 (10 Nov 2014)
+
+  10 Nov 2014; Sergei Trofimovich <slyfox@gentoo.org>
+  +git-annex-5.20141125.ebuild:
+  Version bump (bug #527368 by Manuel Rüger and others).
 
 *git-annex-5.20140927 (04 Oct 2014)
 
diff --git a/dev-vcs/git-annex/Manifest b/dev-vcs/git-annex/Manifest
index a24bf5188c9e..a818013a41ef 100644
--- a/dev-vcs/git-annex/Manifest
+++ b/dev-vcs/git-annex/Manifest
@@ -3,13 +3,15 @@ Hash: SHA256
 
 AUX git-annex.xpm 1961 SHA256 e9576b4d026cb8e61ee602d52639d65a2e8f2aadaaa3cfd9d8bfd8f55cf03803 SHA512 4a22ac448852160d66838c272f41b8c7599aa1b904e35ac03ea294d9ed15b855bde24b7e5407a2578937bfd51d482837ed6680af680166d030f71666316ae4d3 WHIRLPOOL a582bb82d01de4750e3bcb2e419cf0a334e11428972f68bbb70aa06ea5a357de89d48327d4576adf0f4101cd577f13c6f50b41d85d7c2fc6a0efb87124b88b60
 DIST git-annex-5.20140927.tar.gz 4547006 SHA256 532b36a4a33909b9835a19888b1678251a0b99b1a1f82e94755bb5cc2e7af50b SHA512 7851b773a296efc3c4d3ae36ce240ca466b42d87d32f8635ae1dc8457064c20b2521c0fe3c123554e0d2e2e35346f03a3c25ae94f47f2a2d902a73629f0c6535 WHIRLPOOL bc30b2b7833f46a5633012f072a901142c2a6bc5fbca198c3d391fe336c2c88d3ae2491a439692fe32eb1b217d8a9c6b8baad931f462660b0c4a3cccb1ba44b0
+DIST git-annex-5.20141125.tar.gz 4580886 SHA256 ba26d0459d74d818b7ecc8153856ffccfcd7068dbea344334438a698dd689a66 SHA512 44feb1ecfe6c0f08c8c69b11efa9b81b5e420019321f27b825ae831c04e0e8ad307cea73e6c52ab1f73f2bebdd6476012e5eab1e823a9ded7d6c865e7fd24350 WHIRLPOOL 57ed46a1a8bd43fd12c05c2eee9da2bad529cde7ba424e7607858637e9394b280789edba5ae5c9e0547ad6d6a4ee48fd920c29cab87aacfebf4cf3b527aa58ce
 EBUILD git-annex-5.20140927.ebuild 4582 SHA256 c7cf1e3fca817baaf9823d431a66435fa759829dfe09957c95f66f9872581aef SHA512 81c420f4873fce061ad41a792155622d27cd076c150b26cd4b49c2a6b3d6bacca983815a2f1ea3fd85ed96d2fb5da35d1f65c426b2cd1f0bbe5ba8d04cd03dc6 WHIRLPOOL fa6257fe10038398f01ed026983d393003f26540e452e21b876ffe974a02fda5c729766abd994cbc3993bcd729eee676023f339b77b37b1b2b870e1bdbd1c903
-MISC ChangeLog 6340 SHA256 a555ee97d107710dd4b28d28d730c2f9bde8b1c7ad4df9d07e4cb38889de471e SHA512 b789de242f0f81d8a74b74e2383a70d572621f68b2438b7b4804622be21e1d8e614d5ec0a901d3ae170e0eae39c79a5b24c0d93b59ca8a084ced827c03cf5dd5 WHIRLPOOL be8ca065ad0fa6d67c7a8eb7b963928340017a0ea5f02046bb57af209c70fbfd55d0457d124e9e2df70eafa1d4538051c2027987a7c64c47aee9f562b5c838d3
+EBUILD git-annex-5.20141125.ebuild 4582 SHA256 a70b480a30a2c310eb8e86818be1760f1dccae4034b56a8fe83eb5bdc853e371 SHA512 f3708d11291175c5ef3dd11abd4ca45cc9e8d8f01c0cd39dee4183848b422cac607eb18efb404ad4c7c0e8ddc4642fcea7a57769252d876147e49ce3e3c0d432 WHIRLPOOL 9a782d2b35b57fb50d12d1da0638aa1e1069f9a062b31ab2edf83248001be0abee96664e2a2645718401579c0bcbf9b3e1d1e3c918869243ff573772ff47295e
+MISC ChangeLog 6522 SHA256 4e5fbf5117a813eaabdf2907b66ccb2d2edf2a9af0dff1c11896f082fc33cddf SHA512 5005c600b1ee2888bbcd0a2c04c88395b9afb78321eee907c59a6e90f5c5f89d1f5eeb4d4d9055d684f485d8592b6bbcb6c9d7d30a20c615f091be5e70c575fa WHIRLPOOL f396006afc729c561f8d66b09ec740ff27da92b96ac619c95bbff0efcd41308d180433719dea98de09abd16eb780ddf17095395171e005c134ac3b27f1d17b73
 MISC metadata.xml 2128 SHA256 0eb7a205b68ef6665df385d7e3edbb3fc3d249f8d3e31a8755895e413346f432 SHA512 5b511ffbe6845d663c742a5a2596c83c45a8bd5919cc8e90413f11ea9aa10aab42a9293c86d7a2ce68dccfe2e23f45e56e13e7c3ebf1533315db578174fa61f4 WHIRLPOOL 7d7a9a718537ef0b5bfdc810a31d4d934f2028b48b0d0f32eb3fd7e9e21b74686b1053c70a84606b57b49d92b501a122d98418ee49a53d3cce6d1b1b81cfc190
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlQwKvIACgkQcaHudmEf86oT6QCfZZKuZx0i/1uDYTXtb1nhG0H7
-7ZIAnihD8RhS23yuGhE4Mrc1v9VN0kLF
-=9o3J
+iEYEAREIAAYFAlRgjCEACgkQcaHudmEf86pMJwCaA/7Mn3wtHJYe1O1o1yD8flGt
+4u8AnipYxkSlEpBlNdVzRPYXi8E0bpnm
+=SPeG
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/git-annex/git-annex-5.20141125.ebuild b/dev-vcs/git-annex/git-annex-5.20141125.ebuild
new file mode 100644
index 000000000000..a8e4fb5bffb8
--- /dev/null
+++ b/dev-vcs/git-annex/git-annex-5.20141125.ebuild
@@ -0,0 +1,162 @@
+# 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.20141125.ebuild,v 1.1 2014/11/10 09:57:50 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.6
+	dev-haskell/hslogger
+	dev-haskell/http-conduit
+	dev-haskell/http-types
+	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/transformers
+	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/crypto-api
+			>=dev-haskell/tasty-0.7
+			dev-haskell/tasty-hunit
+			dev-haskell/tasty-quickcheck
+			dev-haskell/tasty-rerun
+			>=dev-haskell/optparse-applicative-0.9.1
+			)
+	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-1.0
+			dev-haskell/http-client
+			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_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
+}