bump up to 5.20140405

Package-Manager: portage-2.2.10/cvs/Linux x86_64 Manifest-Sign-Key: 0xEAD50D64D8D3571A!
author: Alexander Vershilov <qnikst@gentoo.org> 2014-04-09 15:58:49 +0000
committer: Alexander Vershilov <qnikst@gentoo.org> 2014-04-09 15:58:49 +0000
commit: 18ddf0e3f09a40ccafc16560ec0a23a919a38ca6 (patch)
tree: f8e7c248c6636916a9fdba383c77e9311b2a3926 /dev-vcs/git-annex
parent: re-add missing patch (diff)
download: historical-18ddf0e3f09a40ccafc16560ec0a23a919a38ca6.tar.gz
historical-18ddf0e3f09a40ccafc16560ec0a23a919a38ca6.tar.bz2
historical-18ddf0e3f09a40ccafc16560ec0a23a919a38ca6.zip
4 files changed, 195 insertions, 11 deletions
diff --git a/dev-vcs/git-annex/ChangeLog b/dev-vcs/git-annex/ChangeLog
index 2dc6a9d870d4..92e1d401cf26 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.24 2014/03/21 11:30:25 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-annex/ChangeLog,v 1.25 2014/04/09 15:58:40 qnikst Exp $
+
+*git-annex-5.20140405 (09 Apr 2014)
+
+  09 Apr 2014; Alexander Vershilov <qnikst@gentoo.org>
+  +git-annex-5.20140405.ebuild, metadata.xml:
+  bump up to 5.20140405
 
   21 Mar 2014; Alexander Vershilov <qnikst@gentoo.org>
   git-annex-5.20140306-r1.ebuild:
diff --git a/dev-vcs/git-annex/Manifest b/dev-vcs/git-annex/Manifest
index 1eb0656b9a58..cd301a1918b5 100644
--- a/dev-vcs/git-annex/Manifest
+++ b/dev-vcs/git-annex/Manifest
@@ -5,21 +5,23 @@ AUX git-annex.xpm 1961 SHA256 e9576b4d026cb8e61ee602d52639d65a2e8f2aadaaa3cfd9d8
 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
 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
 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
-MISC ChangeLog 4749 SHA256 faeecc0ce183c82c510387c777571da67f41b950691fe75beef926568fb7e1ad SHA512 7575cc31315fff2aa405b5e948737cc5c227194b1df3babb651b0c26610a27d70bc5c56f45a156eaa83ce968e442c5a6606066d593470d4ee0e8efc0fc8d061b WHIRLPOOL a1143d3b1b77e4b0aed43fa8aa051b838c129a66be0c93bd7ecada70c86b45cb44592b7f453e5c4fbf62e56fc68b3bab6e8a2abf24a794115f78efa620a73cb2
-MISC metadata.xml 2065 SHA256 e4e5ef593e5b7c3b2fdb9078186481782b387a9616528b4e762f56619bd2ef93 SHA512 eacaf2913548b16f69cafe7ea0f54945d5ff7713ccf412aa99a12863a719225ab420bcfd50c237d19e1694f246364ed43c3a5c69d7ae1ea899d1d5f48e725b7b WHIRLPOOL c1963e71659026fb6a43dabc34a5366b31e03416d10c0e0583f1a1e60bfafc87c5878100cf1e7f4c5eb6037ea6e42759c2d793ccd64182aebda7541a615b6569
+EBUILD git-annex-5.20140405.ebuild 5005 SHA256 365ef7c7044a3ad16b3c32d33e8f2c8666e180841b4a5201f325b766ccb7668d SHA512 c8f561ba16eb5d5d37a7d692b5a74cf2cfa8d952e124021a31f9da7cd018be68ee6bc3a814bb19582e7a064f0f3ab885425c9f04392e018cd86822b669703c92 WHIRLPOOL c5b3c1ec3dbc812b1e2d24c6b8faa3b9c5c72f6982c2291d2e0b58f3d0f8283b655211f1143d219fbf5c501525df238509014926da8af9d06510dcb15157483a
+MISC ChangeLog 4912 SHA256 5185b2c36bd1afcc89452e92fea90b29f0def24c8804e644265e1bbbcd9d0872 SHA512 0e63695b79f11133ba44238aecae1bc15b48733517c593c8f72f047eac3a32d48ed3ea02c1bdade735e9e92e37eedc80a7d4e3cb139fb5d53d6d6e9cd5f85ac7 WHIRLPOOL 0b8dc75a74cc0cffdf2a8ec859837e3ba850cdf6516e7ccedfa249dfb2071b601e0a605271ee21a18934fb9823ba3e7a85f640d2332a977ad7d1e73cc96049ae
+MISC metadata.xml 2193 SHA256 a698226bc5a4f6d11d5b0351bff6f27b7861a181d74e851426ef4393c2a9266d SHA512 b9dfffc4c03551c3154a0070aa2c6efaf2c8941d8e32b7c4f302f274167d0983bb7f6219c8facc54eea6da9a36a72c200a6f825c8f01e573c0429121f10324c5 WHIRLPOOL 013257588635637aea23ff5d589c33d4d9d756e92df0b41bfd3887ee8b333b38f13c0de79c2ddb6f9032dee5f78a43b007123687aa68ed0d176387386602240b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQF8BAEBCABmBQJTLCLpXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQF8BAEBCABmBQJTRW44XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwMTlGQTEwRTVCMUJCNjdFRDM5Qzg3RjdF
-QUQ1MEQ2NEQ4RDM1NzFBAAoJEOrVDWTY01ca2osH/2BcJxbKSG1WiFFom5382NQN
-6akZIWSeMpcZqJvj7GCIDmYlRjZ5xo5fvJReyzfExhI3/UiV8SO6NOJPFqH4yRQA
-abqQ1QtEfxttpHMYIU5FbV3PDRpLLnTxbBlk4NWyMhJA2g6FeJNvjak21jObLUrh
-EALa9436OkEedkgd8tPglDI4l0ZRXMfaJascel0gwWG8Z+g+mvI27teJeTO8EA7U
-pAq4oFxJP1iudy0jjL4Gy0GuAEf1GimLahZ5wNIlUd3L9Y5O32QaFBGmbySttHbV
-vGu3wR0o2gDd7LwYu9uwv/gmlvjp0v004Pn+WmpgLUasMA5X5/9slQ3a4JIWn68=
-=UR2G
+QUQ1MEQ2NEQ4RDM1NzFBAAoJEOrVDWTY01capxMIAMcLkErEb7yyBy17jZ2mlZuY
+rXjFj5TdGGCw9XtiI69zmaqGwgt3Naa53ODAGjFUXd4zy3ruvHrYYDM9YSUk+m3I
+7qafYkdxZT46YYPo+mGkSPSvUrpRCK2h/lP0st+x41x41+UnR69cxhJbj1kciiMx
+7sASxLqt9cSsvHLSsl5bbPRwzkFk5j3n3JHI3dkW14T+tv9kjo+PYw6Hei2s+4zT
+PKb3nJYNCsYIeLEOv2lVdB+L2nezELUWVyihjmFxYlQ3AUDMs72DW/Qyy1bM9unq
+FO+LvDh2SzFgS5XrPgRCbsjG5NFZxtrrPfslMQ/XJVjGn0sm9AcDx+OBS1rahfM=
+=NsLO
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/git-annex/git-annex-5.20140405.ebuild b/dev-vcs/git-annex/git-annex-5.20140405.ebuild
new file mode 100644
index 000000000000..e9f6e721a41a
--- /dev/null
+++ b/dev-vcs/git-annex/git-annex-5.20140405.ebuild
@@ -0,0 +1,174 @@
+# 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.20140405.ebuild,v 1.1 2014/04/09 15:58:40 qnikst 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
+	assistant? ( sys-process/lsof )
+"
+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/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/stm-2.3
+	dev-haskell/text
+	dev-haskell/unix-compat
+	dev-haskell/utf8-string
+	dev-haskell/uuid
+	>=dev-haskell/stm-2.3
+	>=dev-lang/ghc-7.4.1
+	android? ( dev-haskell/data-endian )
+	assistant? ( 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 )
+	tahoe? ( dev-haskell/aeson )
+	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/aeson
+	        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/transformers
+			dev-haskell/wai
+			dev-haskell/wai-logger
+			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,'
+}
+
+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 "Utility"
+	fi
+}
diff --git a/dev-vcs/git-annex/metadata.xml b/dev-vcs/git-annex/metadata.xml
index a60b8e4989c3..c39fb65dcd4d 100644
--- a/dev-vcs/git-annex/metadata.xml
+++ b/dev-vcs/git-annex/metadata.xml
@@ -25,6 +25,7 @@
 		<flag name="androidsplice">Get TH splices for Android.</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>
 		<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="production">Enable production build (slower build; faster binary)</flag>
@@ -35,6 +36,7 @@
 		<flag name="tdfa">Use regex-tdfa for wildcards</flag>
 		<flag name="testsuite">Embed the test suite into git-annex</flag>
 		<flag name="webapp">Enable git-annex webapp</flag>
+		<flag name="webapp-secure">Secure webapp</flag>
 		<flag name="webdav">Enable webdav remote</flag>
 	</use>
 </pkgmetadata>
author	Alexander Vershilov <qnikst@gentoo.org>	2014-04-09 15:58:49 +0000
committer	Alexander Vershilov <qnikst@gentoo.org>	2014-04-09 15:58:49 +0000
commit	18ddf0e3f09a40ccafc16560ec0a23a919a38ca6 (patch)
tree	f8e7c248c6636916a9fdba383c77e9311b2a3926 /dev-vcs/git-annex
parent	re-add missing patch (diff)
download	historical-18ddf0e3f09a40ccafc16560ec0a23a919a38ca6.tar.gz historical-18ddf0e3f09a40ccafc16560ec0a23a919a38ca6.tar.bz2 historical-18ddf0e3f09a40ccafc16560ec0a23a919a38ca6.zip