From 4d009207c28a2ab86d82b4763bb05c4375b0f04a Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 24 Sep 2016 10:54:11 +0100 Subject: [PATCH] dev-vcs/git-annex: bump up to 6.20160923, bug #591831 Reported-by: Jonas Stein Package-Manager: portage-2.3.1 --- dev-vcs/git-annex/Manifest | 1 + dev-vcs/git-annex/files/git-annex.bash | 19 ++ dev-vcs/git-annex/git-annex-6.20160923.ebuild | 174 ++++++++++++++++++ 3 files changed, 194 insertions(+) create mode 100644 dev-vcs/git-annex/files/git-annex.bash create mode 100644 dev-vcs/git-annex/git-annex-6.20160923.ebuild diff --git a/dev-vcs/git-annex/Manifest b/dev-vcs/git-annex/Manifest index c92bd033a4f5..8ecaa25fcc8d 100644 --- a/dev-vcs/git-annex/Manifest +++ b/dev-vcs/git-annex/Manifest @@ -1,3 +1,4 @@ DIST git-annex-6.20160126.tar.gz 5146331 SHA256 dc59f670a3d0bdb90db8fc6cadba8003708219bb0dc3d56867a9246d825c0d11 SHA512 45828b5e9968ce037e48366deb537353368dbac9145fc93d56921444210c9f0d4af1460c047bcae3e85244ecdf7e272fb65860656a19c449add09bf697c0a37d WHIRLPOOL f9b350968e8e82f7e4523648d5aefd03689123165424e15fee71eaa67345d38a0efe71ea4fc1388b5b683925bc8f638dba130371c4f324ac5910d7a051ae5548 DIST git-annex-6.20160318.tar.gz 5399078 SHA256 5c0067d161a3cd6b93822f85eb82e5cb4895d913b2593bc4fe3b74d3ed426e0b SHA512 62d0caef2f09a1d690229b720e81bf477715fd765a98c037b8e22e7e04ad72d91c81fdbe8bb61bdf4e0bf40cd5b81ea349e60a8e61690767db4a4b92541a063f WHIRLPOOL 96c0232790b0b2cf0d97df2984383a0616a56c695daac233da625fd08ccd8044ef26aed613341f47aa8b0ef70e806b5d0569ff733d3e0dee0e92ed7220b503bc DIST git-annex-6.20160419.tar.gz 5086638 SHA256 1452a55809ba7367847fc4a77f2d8a5365af92e130d5ca460bf0880a26a6fb8e SHA512 b8b250b700aaaa336ee85af3d053d893b422e2bf427dc0f1f38689b49a2a74fa240a725da09d98f5bdf86d35d68612765c0de878de52ae4ddbb8908fb32ad118 WHIRLPOOL 1a68daef4b271ec8945c0ab22439eba83400d7babac368ae65167bd8dfec29430913c8165046421d4b0a072d7beaaedf832464a04ac625250b401303afff16aa +DIST git-annex-6.20160923.tar.gz 1084326 SHA256 964235a358814e081cf4a5d8dab798faacb1dabe5fc714ac6687b135e30fd93d SHA512 2204b5a3b76b22718e4cf5329e78035c4ff45a133e738a8ab627067551fd40a778d4be124862f6a08b583c49400844e3b0c61a682909f911e5ac51fdb6319295 WHIRLPOOL ed5f6c732210b0a720de095ce71c8907b5ddc636e28835f85697f81a01824be7b9f154335af1c4c4e1a304f967b6233487699a49da447f8f883519063be35a55 diff --git a/dev-vcs/git-annex/files/git-annex.bash b/dev-vcs/git-annex/files/git-annex.bash new file mode 100644 index 000000000000..309b221f0157 --- /dev/null +++ b/dev-vcs/git-annex/files/git-annex.bash @@ -0,0 +1,19 @@ +_git_annex() +{ + local cmdline + local IFS=$' +' + CMDLINE=(--bash-completion-index $COMP_CWORD) + + if [[ "${COMP_WORDS[@]:0:2}" == "git annex" ]]; then + unset COMP_WORDS[0] + COMP_WORDS[1]="git-annex" + fi + for arg in ${COMP_WORDS[@]}; do + CMDLINE=(${CMDLINE[@]} --bash-completion-word $arg) + done + + COMPREPLY=( $(/usr/bin/git-annex "${CMDLINE[@]}") ) +} + +complete -o filenames -F _git_annex git-annex diff --git a/dev-vcs/git-annex/git-annex-6.20160923.ebuild b/dev-vcs/git-annex/git-annex-6.20160923.ebuild new file mode 100644 index 000000000000..c4e7cd1ca822 --- /dev/null +++ b/dev-vcs/git-annex/git-annex-6.20160923.ebuild @@ -0,0 +1,174 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +# ebuild generated by hackport 0.4.7.9999 +#hackport: flags: -production,-android,-androidsplice,-testsuite + +CABAL_FEATURES="bin" +inherit haskell-cabal bash-completion-r1 + +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="+assistant benchmark +concurrentoutput +cryptonite doc +dbus +magicmime +network-uri +pairing +s3 +torrentparser +webapp +webdav +xmpp" + +RDEPEND="dev-haskell/aeson:= + dev-haskell/async:= + dev-haskell/bloomfilter:= + dev-haskell/case-insensitive:= + dev-haskell/data-default:= + dev-haskell/disk-free-space:= + dev-haskell/dlist:= + dev-haskell/edit-distance:= + dev-haskell/esqueleto:= + >=dev-haskell/exceptions-0.6:= + dev-haskell/feed:= + dev-haskell/hslogger:= + dev-haskell/http-client:= + dev-haskell/http-conduit:= + dev-haskell/http-types:= + dev-haskell/ifelse:= + dev-haskell/missingh:= + dev-haskell/monad-control:= + dev-haskell/monad-logger:= + >=dev-haskell/mtl-2:= + dev-haskell/old-locale:= + >=dev-haskell/optparse-applicative-0.11.0:= + dev-haskell/persistent:= + dev-haskell/persistent-sqlite:= + dev-haskell/persistent-template:= + >=dev-haskell/quickcheck-2.1:2= + dev-haskell/random:= + dev-haskell/regex-tdfa:= + 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/unordered-containers:= + dev-haskell/utf8-string:= + >=dev-haskell/uuid-1.2.6:= + >=dev-lang/ghc-7.6.1:= + assistant? ( dev-haskell/dns:= + dev-haskell/hinotify:= + dev-haskell/mountpoints:= + sys-process/lsof ) + benchmark? ( dev-haskell/criterion:= ) + concurrentoutput? ( >=dev-haskell/concurrent-output-1.6:= ) + cryptonite? ( dev-haskell/cryptonite:= ) + !cryptonite? ( >=dev-haskell/cryptohash-0.11.0:= ) + dbus? ( >=dev-haskell/dbus-0.10.7:= + >=dev-haskell/fdo-notify-0.3:= ) + magicmime? ( dev-haskell/magic:= ) + network-uri? ( >=dev-haskell/network-2.6:= + >=dev-haskell/network-uri-2.6:= ) + !network-uri? ( >=dev-haskell/network-2.4:= =dev-haskell/aws-0.9.2:= + dev-haskell/conduit:= + dev-haskell/conduit-extra:= ) + torrentparser? ( >=dev-haskell/torrent-10000.0.0:= ) + webapp? ( dev-haskell/blaze-builder:= + dev-haskell/byteable:= + dev-haskell/clientsession:= + dev-haskell/crypto-api:= + >=dev-haskell/path-pieces-0.1.4:= + dev-haskell/securemem:= + >=dev-haskell/shakespeare-2.0.0:= + dev-haskell/wai:= + dev-haskell/wai-extra:= + >=dev-haskell/warp-3.0.0.5:= + >=dev-haskell/warp-tls-1.4:= + >=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:= ) + webdav? ( >=dev-haskell/dav-1.0:= ) + xmpp? ( >=dev-haskell/gnutls-0.1.4:= + dev-haskell/network-protocol-xmpp:= + dev-haskell/xml-types:= ) +" +# not generated by hackport: +RDEPEND="${RDEPEND} + dev-vcs/git +" + +DEPEND="${RDEPEND} + >=dev-haskell/cabal-1.16.0 +" + +# not generated by hackport: +DEPEND="${DEPEND} + dev-lang/perl + doc? ( www-apps/ikiwiki net-misc/rsync ) +" + +PATCHES=( + # does not respect staging dir + "${FILESDIR}"/${PN}-5.20150731-no-strange-installs.patch + "${FILESDIR}"/${PN}-6.20160114-QC-2.8.2.patch +) + +src_prepare() { + default + + cabal_chdeps \ + 'http-conduit (<2.2.0)' 'http-conduit' \ + 'persistent (< 2.5)' 'persistent' +} + +src_configure() { + haskell-cabal_src_configure \ + --flag=-android \ + --flag=-androidsplice \ + $(cabal_flag assistant assistant) \ + $(cabal_flag benchmark benchmark) \ + $(cabal_flag concurrentoutput concurrentoutput) \ + $(cabal_flag cryptonite cryptonite) \ + $(cabal_flag dbus dbus) \ + $(cabal_flag magicmime magicmime) \ + $(cabal_flag network-uri network-uri) \ + $(cabal_flag pairing pairing) \ + --flag=-production \ + $(cabal_flag s3 s3) \ + --flag=-testsuite \ + $(cabal_flag torrentparser torrentparser) \ + $(cabal_flag webapp webapp) \ + $(cabal_flag webdav webdav) \ + $(cabal_flag xmpp xmpp) +} + +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 + + newbashcomp "${FILESDIR}"/${PN}.bash ${PN} + + dodoc CHANGELOG README + if use webapp ; then + doicon "${FILESDIR}"/${PN}.xpm + make_desktop_entry "${PN} webapp" "git-annex" ${PN}.xpm "Office" + fi +} -- 2.26.2