dev-vcs/git-annex: bump up to 5.20150731

Package-Manager: portage-2.2.20

4 files changed, 185 insertions, 1 deletions

diff --git a/dev-vcs/git-annex/Manifest b/dev-vcs/git-annex/Manifest
index b2a8cb7edc31..94a45b151ee3 100644
--- a/dev-vcs/git-annex/Manifest
+++ b/dev-vcs/git-annex/Manifest
@@ -6,3 +6,4 @@ DIST git-annex-5.20150219.tar.gz 4688334 SHA256 46c1d2a338a4f54774060b39fe5e8645
 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
 DIST git-annex-5.20150710.tar.gz 5080419 SHA256 970f953a278401863fb1006679d216891ae556f80434b587deb08dfd6644f860 SHA512 35240f1d78561dab02ae014e4d00b8645c33c526b0d36a28253b9129198ea53b784949c7b47fd3b97f056842430a5e8b0d312b8ba6985bbb3228c73a4dfa21ea WHIRLPOOL 06b824031aeef38468e17ef239aa1501a2236a084a9c54e4c81001247c62b8621cdc6bc090f2b1a516df000823951acee784000aa6dc5b4de5dc4bcd5a2bda59
+DIST git-annex-5.20150731.tar.gz 5096183 SHA256 a2eefd4c273f5510e8ee384cc4fb512bf10c76cc4b84f6fff5c255223bd853a1 SHA512 edad8fb6aa98ad08cfe8406e2c7b794b0cc3a437f28ed43b5863bbba59a1633e2d6b3a94b6f942494ef7bd912650f7c89ad2a3d54920ff405f4d8d173e1027e9 WHIRLPOOL 945600b49b9f240da37d4642849395fc9ef9a615701a8088b6fb573e098e9b4de5a4bde8714974105a36a963e19a78137abdc513f9a0335ff5fe36981d12be25
diff --git a/dev-vcs/git-annex/files/git-annex-5.20150731-no-strange-installs.patch b/dev-vcs/git-annex/files/git-annex-5.20150731-no-strange-installs.patch
new file mode 100644
index 000000000000..a2ca5b866282
--- /dev/null
+++ b/dev-vcs/git-annex/files/git-annex-5.20150731-no-strange-installs.patch
@@ -0,0 +1,9 @@
+diff --git a/Setup.hs b/Setup.hs
+index f90a9b2..97afb7f 100644
+--- a/Setup.hs
++++ b/Setup.hs
+@@ -25,3 +25,3 @@ main = defaultMainWithHooks simpleUserHooks
+ 		return (Nothing, [])	
+-	, postCopy = myPostCopy
++	-- , postCopy = myPostCopy
+ 	}
diff --git a/dev-vcs/git-annex/git-annex-5.20150731.ebuild b/dev-vcs/git-annex/git-annex-5.20150731.ebuild
new file mode 100644
index 000000000000..3f4f03180bc0
--- /dev/null
+++ b/dev-vcs/git-annex/git-annex-5.20150731.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.5.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 ~amd64-linux"
+IUSE="asciiprogress +assistant +database +dbus +desktopnotify +dns doc ekg +feed +inotify +network-uri +pairing +quvi +s3 +tahoe +tdfa +torrentparser +webapp +webapp-secure +webdav +xmpp"
+
+RDEPEND="dev-haskell/async:=
+	dev-haskell/bloomfilter:=
+	dev-haskell/case-insensitive:=
+	>=dev-haskell/cryptohash-0.11.0:=
+	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:=
+	dev-haskell/missingh:=
+	dev-haskell/monad-control:=
+	dev-haskell/monad-logger:=
+	>=dev-haskell/mtl-2:=
+	dev-haskell/old-locale:=
+	>=dev-haskell/optparse-applicative-0.10:=
+	>=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.6.1:=
+	asciiprogress? ( dev-haskell/ascii-progress:=
+				dev-haskell/terminal-size:= )
+	assistant? ( inotify? ( dev-haskell/hinotify:= ) )
+	database? ( dev-haskell/esqueleto:=
+			dev-haskell/persistent:=
+			dev-haskell/persistent-sqlite:=
+			dev-haskell/persistent-template:= )
+	dbus? ( >=dev-haskell/dbus-0.10.7:=
+		desktopnotify? ( >=dev-haskell/fdo-notify-0.3:= ) )
+	dns? ( dev-haskell/dns:= )
+	ekg? ( dev-haskell/ekg:= )
+	feed? ( >=dev-haskell/feed-0.3.4:= )
+	network-uri? ( >=dev-haskell/network-2.6:=
+			>=dev-haskell/network-uri-2.6:= )
+	!network-uri? ( >=dev-haskell/network-2.0:= <dev-haskell/network-2.6:= )
+	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:= )
+	tahoe? ( dev-haskell/aeson:= )
+	tdfa? ( dev-haskell/regex-tdfa:= )
+	!tdfa? ( dev-haskell/regex-compat:= )
+	torrentparser? ( >=dev-haskell/torrent-10000.0.0:= )
+	webapp? ( dev-haskell/aeson:=
+			dev-haskell/blaze-builder:=
+			dev-haskell/clientsession:=
+			dev-haskell/crypto-api:=
+			>=dev-haskell/path-pieces-0.1.4:=
+			>=dev-haskell/shakespeare-2.0.0:=
+			dev-haskell/wai:=
+			dev-haskell/wai-extra:=
+			>=dev-haskell/warp-3.0.0.5:=
+			>=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/byteable:=
+					dev-haskell/securemem:=
+					>=dev-haskell/warp-tls-1.4:= )
+			!webapp-secure? ( dev-haskell/warp-tls:= ) )
+	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:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.16.0
+"
+
+src_prepare() {
+	# does not respect staging dir
+	epatch "${FILESDIR}"/${P}-no-strange-installs.patch
+
+	cabal_chdeps \
+		'ascii-progress (<= 0.2.1.2)' 'ascii-progress'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-android \
+		--flag=-androidsplice \
+		$(cabal_flag asciiprogress asciiprogress) \
+		$(cabal_flag assistant assistant) \
+		$(cabal_flag database database) \
+		$(cabal_flag dbus dbus) \
+		$(cabal_flag desktopnotify desktopnotify) \
+		$(cabal_flag dns dns) \
+		$(cabal_flag ekg ekg) \
+		$(cabal_flag feed feed) \
+		$(cabal_flag inotify inotify) \
+		$(cabal_flag network-uri network-uri) \
+		$(cabal_flag pairing pairing) \
+		--flag=-production \
+		$(cabal_flag quvi quvi) \
+		$(cabal_flag s3 s3) \
+		$(cabal_flag tahoe tahoe) \
+		$(cabal_flag tdfa tdfa) \
+		--flag=-testsuite \
+		$(cabal_flag torrentparser torrentparser) \
+		$(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 b36e0eee5dd1..351a729bdbce 100644
--- a/dev-vcs/git-annex/metadata.xml
+++ b/dev-vcs/git-annex/metadata.xml
@@ -22,10 +22,13 @@
 		<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="database">Enable building with <pkg>dev-haskell/persistent</pkg> for database use</flag>
+		<flag name="desktopnotify">Enable desktop environment notifications</flag>
 		<flag name="desktop-notify">Enable desktop environment notifications</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='network-uri'>Get Network.URI from the network-uri package.</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>