Version bump, bug #550762 by Manuel Rüger.

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

4 files changed, 193 insertions, 6 deletions

diff --git a/dev-vcs/git-annex/ChangeLog b/dev-vcs/git-annex/ChangeLog
index 713dbdee26ba..c573712ede73 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-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-annex/ChangeLog,v 1.37 2015/04/05 05:36:34 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-annex/ChangeLog,v 1.38 2015/06/21 18:57:45 slyfox Exp $
+
+*git-annex-5.20150617 (21 Jun 2015)
+
+  21 Jun 2015; Sergei Trofimovich <slyfox@gentoo.org>
+  +git-annex-5.20150617.ebuild, metadata.xml:
+  Version bump, bug #550762 by Manuel Rüger.
 
 *git-annex-5.20150327 (05 Apr 2015)
 
diff --git a/dev-vcs/git-annex/Manifest b/dev-vcs/git-annex/Manifest
index 7aba6bd27d79..a8156f8c0098 100644
--- a/dev-vcs/git-annex/Manifest
+++ b/dev-vcs/git-annex/Manifest
@@ -8,18 +8,20 @@ DIST git-annex-5.20141203.tar.gz 4611768 SHA256 d36d07fe592b27e7e4e363de3ddccb5c
 DIST git-annex-5.20141231.tar.gz 4635173 SHA256 ce7f8e1a6f9049e9864a125a10672d577605ecbb45bb83401af6d6c128533c67 SHA512 d9b0db8084f08a8a2408ea1af1bc95c20591e573cddef866a9eed84319a7fff774d482d464a390c10468436dabb69fdd2cf177afb4600ef2300ae0f08b284e6e WHIRLPOOL 053b76ee765cc5b01900a7c3c115a736dff67e50b4847e552e6e1adae10344219698f59969509f2248e589ea7a6eb32991d2e4646c02b2b1a703c8269fdc1352
 DIST git-annex-5.20150219.tar.gz 4688334 SHA256 46c1d2a338a4f54774060b39fe5e864551d047b0d04eee158b3c2cb947085d5f SHA512 006ef74ba687bd97f93fb91f3ee675551abecfe019e45696bdc783523e8559ffeb9a8e521b488b695518b2fb001b2db2826ad53c5af2199d487cd664f2a9ee13 WHIRLPOOL 1e2f16af86915ec433c38eedad994538b13f56d7f0e3b35d648bc2872abef78acdac4b19b4983101f697dd138a3deaa60451196ad13a8b083dd0c6dc1c712de1
 DIST git-annex-5.20150327.tar.gz 4764485 SHA256 1e309466627eb634816805004391c5407dd9eee280e2f21a48de9617a35918fa SHA512 638ed0c97d0f67cd26699826c9ff5192fd2d089932e06fe8305c536fcbad06239f8d745c350938089827ae4b7058f1e2c3156ab7f5f133e7b4a38a2e6cd69544 WHIRLPOOL a03f2d28b36eff595ba2780ed70fee8204dceb8aef087871f650dd3482865e30d2644e29b9c7d5763cc79ffe8357e81b5b1b7fb1091fa3cb1d171634af37ac77
+DIST git-annex-5.20150617.tar.gz 5047577 SHA256 2d37c49866880803886fe77be17ac154c84acc0c344e4fefea577a59e55f8d54 SHA512 25f42ab403d3fd39a689af74cd8a26dc5de761d5a8a79c8d7050194c2094f65de9681b4189076c484fb5c644408918140cf1fcb0109a6a2195f1d547e307abfc WHIRLPOOL 89410f048f5773256cac6525f1a42e3845a5106a1d0b82e031d1f70136375479efc180b21907036e191243f55aee7d94b041cc1d994dea403a1640e7310f6f4d
 EBUILD git-annex-5.20140927.ebuild 4582 SHA256 c7cf1e3fca817baaf9823d431a66435fa759829dfe09957c95f66f9872581aef SHA512 81c420f4873fce061ad41a792155622d27cd076c150b26cd4b49c2a6b3d6bacca983815a2f1ea3fd85ed96d2fb5da35d1f65c426b2cd1f0bbe5ba8d04cd03dc6 WHIRLPOOL fa6257fe10038398f01ed026983d393003f26540e452e21b876ffe974a02fda5c729766abd994cbc3993bcd729eee676023f339b77b37b1b2b870e1bdbd1c903
 EBUILD git-annex-5.20141125.ebuild 4582 SHA256 a70b480a30a2c310eb8e86818be1760f1dccae4034b56a8fe83eb5bdc853e371 SHA512 f3708d11291175c5ef3dd11abd4ca45cc9e8d8f01c0cd39dee4183848b422cac607eb18efb404ad4c7c0e8ddc4642fcea7a57769252d876147e49ce3e3c0d432 WHIRLPOOL 9a782d2b35b57fb50d12d1da0638aa1e1069f9a062b31ab2edf83248001be0abee96664e2a2645718401579c0bcbf9b3e1d1e3c918869243ff573772ff47295e
 EBUILD git-annex-5.20141203.ebuild 4664 SHA256 595f71ccdd459c57f606c2115966ad0eaf359ecb8c29e80b3ab220c8b30f12d1 SHA512 ebf0da210685736080b51eaa70230694321235f56069880bca1d52a63fd632fc550a65b68fe7541b210f00c905f1f6449a04bb94cb2f25dce8be5c37b451baa5 WHIRLPOOL 16c37434bc80305ffcf5e72db8bc540d18baa04988893cfe470d600853e751b9a21fe02559919816b1e4796a71f63b9af2b65ee1e1a70d6286db0bb107ace071
 EBUILD git-annex-5.20141231.ebuild 4869 SHA256 872a5f4581e70d0457607a021ee7406845909c87693e1c57eff4a08bd3329edc SHA512 3fb6744caa62ecc51e2498edc898829c0861ea7b0af5ac499543ed639312e03b292ec8ed4642e63656dfdc3684efe6ac600d51b21eece61e628a5705494df985 WHIRLPOOL b0c24f82afb0c01c25d5c7135810661eae40e4a790736f1f142c784b3f9ce1c77c2120f49692a9aa7e2dc3a8c6479f42d7cf24e67bd20fd90dc1cf23ecbbbf7d
 EBUILD git-annex-5.20150219.ebuild 4801 SHA256 256b5db93f2d2a6107d13fa0f51c971ec5e47f67f58949eadc01894b2f3e87ee SHA512 9b4fa9cec3e258d0b159ae128449013c01443b138a7441dad1c135c0dc184b44e50ce6a32096eafcf3f7fe57070da7c33783ea08c43327287fe0bf6deef31b78 WHIRLPOOL 9f3a5ecf61218276b4634999dd8335dd5a2b3b15e6b524117d941a855eb2a6c8726da33689b7c5120ab93238ede87f94578bf0d3fdb168623a060a5376ed9902
 EBUILD git-annex-5.20150327.ebuild 4857 SHA256 bd62b34ee03be2d9968794db0894386d6b10d91b338885ca4e158dfe0ef479c1 SHA512 d3da02e8e4c7909466ca81a395adf10541e7f655997c9f47e5bef48e9b835a98d5653d1b3f1562262f32f95b3441e2b1216d915ba53a8a6fadf4ab5ca2855c7d WHIRLPOOL 396af2818643ca22d4d0ca3ed6a6b63ce647e0d6780d231765edd178eba1da73508bcbaa88e86bf38200ba0a76c99d1f748863921f4d17195c99b6ebf2bc5acc
-MISC ChangeLog 7340 SHA256 95292ef7d32708864c5618da9308b2e2786837202e92755a6c913f694ef248a6 SHA512 7a2af1b60d506e422c3d64bfa5409b2ffa0605b6c82823a4e8f290c90b3ec9c8a83c853dd9e20cd3d8893ab137a89b25a5aad4586da07db78836ad3165a03547 WHIRLPOOL 443a391458b371c9b5397c8f01674844c394c8b05ea5aa0e1ca82a070fa3d5d01a1468a62724d2788de41828e8dfa67cc960c6898b803dd63d55d25e5f3d729b
-MISC metadata.xml 2215 SHA256 c7b37f427c3c92e0be429c57bf32025078283c7c0a7bec17ec4dbf552b44b9ac SHA512 6404397b809efab33dbf7961bfb47764bde9f861a3c4b369945367fd5ea4c63499743183ec81b48810fcb311dab9b6f09f44aeecfb5551436016a26b1d1856bc WHIRLPOOL 49f20c6048442556e472cdff5cfd26e9acea2c7f2424ad5ae563579ae634f6540829ed6bdaa15c2c28716e245506b4bd3419dcfcd2f938885377c54a09666d60
+EBUILD git-annex-5.20150617.ebuild 5096 SHA256 479e91dd3ccef331cb81d7f95c459c4d5f2b4c76f535d4c9c6269a1a0a9ad505 SHA512 7fd65d449dce48a56f697da6e45a44574067903e36c0e8a04dba1e25192c7c72e4b62051b3495d7eeb531c1f4b3d5523192d0fc50dc81b1860f5e5622bfbf32e WHIRLPOOL 307376044874ac74a3161ec734e4e0b448b92c5d64a0d8ae38eca9ac36d4c2fdddcdf9c6548107940b1cc32e3f21d1d6d5ecb038130a1af5dc3db84173de6b4d
+MISC ChangeLog 7524 SHA256 9186fd7ebba1ffa8916b8ad254bcf40eee108e0925a2489859d1fa24a0588529 SHA512 5acd80d315f332fb79d9364b75c3d67c0d42e4eb7719d3aff196d8ca4d368e7ab66677a8cf77e70ed886cff15c6d0a0a94b2de0568297e4717e6baf35545d956 WHIRLPOOL 9fdb221d15990cf2f348bd7ef3eb63a082da8f641ebe07e4eb03afffd1d71915df9a5bd01c43dda66c25034eda9941b464959bee57ea459a13727ee9127b0060
+MISC metadata.xml 2293 SHA256 1684c371084b49216903fe4d8afbf7fb1f2c3cdd82207f3b14985692e3505d78 SHA512 af99663aa1841f2a6989f053a265c6ac9e2c07667a1926e53d59c0f9d2415c53b22a9703d68b279cdccc725122461efd33933c4503ab283bfba6cf7d3e5baac0 WHIRLPOOL e693cb75cbb922978a520509c8ccbfad9efba24a4c7d61e58fca719bcd13e66097ca6eb1104806d784e8817aa7e23311d037464c667333e93d14e23977b34557
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlUgyecACgkQoBEVQmGOlx9GWAD+NKSWOoiI0YSISTj+55m9ovjG
-s/VL8EFZJzOXPIQ3XGYA/2PEI87CpiZcscHh3W6QXgXv7/YWhcAho5fHHwdFHQCZ
-=j2Tq
+iEYEAREIAAYFAlWHCSoACgkQcaHudmEf86rokwCfePsYgUPWsz0vqQAsJ7CqZsAv
+I2oAnijWtfntHMGnMWPHVO9GkOKxYF2A
+=y6t4
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/git-annex/git-annex-5.20150617.ebuild b/dev-vcs/git-annex/git-annex-5.20150617.ebuild
new file mode 100644
index 000000000000..1de7bc9a835b
--- /dev/null
+++ b/dev-vcs/git-annex/git-annex-5.20150617.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2015 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.20150617.ebuild,v 1.1 2015/06/21 18:57:45 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 asciiprogress +assistant +dbus +dns doc +desktop-notify ekg +feed +inotify +pairing +production +quvi +s3 +tahoe +tdfa +testsuite torrentparser +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/cryptohash-0.11.0
+	dev-haskell/data-default
+	dev-haskell/dlist
+	dev-haskell/edit-distance
+	dev-haskell/esqueleto
+	>=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/monad-logger
+	>=dev-haskell/mtl-2
+	>=dev-haskell/network-2.0
+	dev-haskell/network-uri
+	dev-haskell/persistent
+	dev-haskell/persistent-sqlite
+	dev-haskell/persistent-template
+	>=dev-haskell/quickcheck-2.1:2
+	dev-haskell/random
+	dev-haskell/resourcet
+	dev-haskell/safesemaphore
+	dev-haskell/sandi
+	>=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 )
+	asciiprogress? ( dev-haskell/ascii-progress
+		dev-haskell/terminal-size )
+	assistant? ( >=dev-haskell/stm-2.3
+			inotify? ( dev-haskell/hinotify ) )
+	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-0.3.4 )
+	dev-haskell/old-locale
+	pairing? ( dev-haskell/network-info
+			dev-haskell/network-multicast )
+	quvi? ( dev-haskell/aeson )
+	s3? ( >=dev-haskell/aws-0.9.2
+		dev-haskell/conduit
+		dev-haskell/conduit-extra
+		dev-haskell/http-client )
+	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
+			)
+	torrentparser? ( >=dev-haskell/torrent-10000.0.0 )
+	webapp? ( dev-haskell/blaze-builder
+			dev-haskell/aeson
+			dev-haskell/clientsession
+			dev-haskell/crypto-api
+			dev-haskell/http-types
+			>=dev-haskell/path-pieces-0.1.4
+			dev-haskell/transformers
+			>=dev-haskell/shakespeare-2
+			dev-haskell/wai
+			dev-haskell/wai-extra
+			>=dev-haskell/warp-3.0.0.5
+			dev-haskell/warp-tls
+			>=dev-haskell/yesod-1.2.6
+			>=dev-haskell/yesod-core-1.2.19
+			>=dev-haskell/yesod-default-1.2.0
+			>=dev-haskell/yesod-form-1.3.15
+			>=dev-haskell/yesod-static-1.2.4
+			webapp-secure? ( dev-haskell/warp-tls
+					dev-haskell/securemem
+					dev-haskell/byteable ) )
+	webdav? ( >=dev-haskell/dav-1.0
+			dev-haskell/http-client )
+	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() {
+	cabal_chdeps \
+		'ascii-progress (<= 0.2.1.2)' 'ascii-progress'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag android android) \
+		$(cabal_flag androidsplice androidsplice) \
+		$(cabal_flag asciiprogress asciiprogress) \
+		$(cabal_flag assistant assistant) \
+		$(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/metadata.xml b/dev-vcs/git-annex/metadata.xml
index 243858e2cbac..b36e0eee5dd1 100644
--- a/dev-vcs/git-annex/metadata.xml
+++ b/dev-vcs/git-annex/metadata.xml
@@ -20,6 +20,7 @@
 		<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="asciiprogress">Use ascii-progress library (experimental)</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="desktop-notify">Enable desktop environment notifications</flag>