1 |
commit: 4d009207c28a2ab86d82b4763bb05c4375b0f04a |
2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Sep 24 09:54:11 2016 +0000 |
4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Sep 24 09:55:07 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d009207 |
7 |
|
8 |
dev-vcs/git-annex: bump up to 6.20160923, bug #591831 |
9 |
|
10 |
Reported-by: Jonas Stein |
11 |
Package-Manager: portage-2.3.1 |
12 |
|
13 |
dev-vcs/git-annex/Manifest | 1 + |
14 |
dev-vcs/git-annex/files/git-annex.bash | 19 +++ |
15 |
dev-vcs/git-annex/git-annex-6.20160923.ebuild | 174 ++++++++++++++++++++++++++ |
16 |
3 files changed, 194 insertions(+) |
17 |
|
18 |
diff --git a/dev-vcs/git-annex/Manifest b/dev-vcs/git-annex/Manifest |
19 |
index c92bd03..8ecaa25 100644 |
20 |
--- a/dev-vcs/git-annex/Manifest |
21 |
+++ b/dev-vcs/git-annex/Manifest |
22 |
@@ -1,3 +1,4 @@ |
23 |
DIST git-annex-6.20160126.tar.gz 5146331 SHA256 dc59f670a3d0bdb90db8fc6cadba8003708219bb0dc3d56867a9246d825c0d11 SHA512 45828b5e9968ce037e48366deb537353368dbac9145fc93d56921444210c9f0d4af1460c047bcae3e85244ecdf7e272fb65860656a19c449add09bf697c0a37d WHIRLPOOL f9b350968e8e82f7e4523648d5aefd03689123165424e15fee71eaa67345d38a0efe71ea4fc1388b5b683925bc8f638dba130371c4f324ac5910d7a051ae5548 |
24 |
DIST git-annex-6.20160318.tar.gz 5399078 SHA256 5c0067d161a3cd6b93822f85eb82e5cb4895d913b2593bc4fe3b74d3ed426e0b SHA512 62d0caef2f09a1d690229b720e81bf477715fd765a98c037b8e22e7e04ad72d91c81fdbe8bb61bdf4e0bf40cd5b81ea349e60a8e61690767db4a4b92541a063f WHIRLPOOL 96c0232790b0b2cf0d97df2984383a0616a56c695daac233da625fd08ccd8044ef26aed613341f47aa8b0ef70e806b5d0569ff733d3e0dee0e92ed7220b503bc |
25 |
DIST git-annex-6.20160419.tar.gz 5086638 SHA256 1452a55809ba7367847fc4a77f2d8a5365af92e130d5ca460bf0880a26a6fb8e SHA512 b8b250b700aaaa336ee85af3d053d893b422e2bf427dc0f1f38689b49a2a74fa240a725da09d98f5bdf86d35d68612765c0de878de52ae4ddbb8908fb32ad118 WHIRLPOOL 1a68daef4b271ec8945c0ab22439eba83400d7babac368ae65167bd8dfec29430913c8165046421d4b0a072d7beaaedf832464a04ac625250b401303afff16aa |
26 |
+DIST git-annex-6.20160923.tar.gz 1084326 SHA256 964235a358814e081cf4a5d8dab798faacb1dabe5fc714ac6687b135e30fd93d SHA512 2204b5a3b76b22718e4cf5329e78035c4ff45a133e738a8ab627067551fd40a778d4be124862f6a08b583c49400844e3b0c61a682909f911e5ac51fdb6319295 WHIRLPOOL ed5f6c732210b0a720de095ce71c8907b5ddc636e28835f85697f81a01824be7b9f154335af1c4c4e1a304f967b6233487699a49da447f8f883519063be35a55 |
27 |
|
28 |
diff --git a/dev-vcs/git-annex/files/git-annex.bash b/dev-vcs/git-annex/files/git-annex.bash |
29 |
new file mode 100644 |
30 |
index 00000000..309b221 |
31 |
--- /dev/null |
32 |
+++ b/dev-vcs/git-annex/files/git-annex.bash |
33 |
@@ -0,0 +1,19 @@ |
34 |
+_git_annex() |
35 |
+{ |
36 |
+ local cmdline |
37 |
+ local IFS=$' |
38 |
+' |
39 |
+ CMDLINE=(--bash-completion-index $COMP_CWORD) |
40 |
+ |
41 |
+ if [[ "${COMP_WORDS[@]:0:2}" == "git annex" ]]; then |
42 |
+ unset COMP_WORDS[0] |
43 |
+ COMP_WORDS[1]="git-annex" |
44 |
+ fi |
45 |
+ for arg in ${COMP_WORDS[@]}; do |
46 |
+ CMDLINE=(${CMDLINE[@]} --bash-completion-word $arg) |
47 |
+ done |
48 |
+ |
49 |
+ COMPREPLY=( $(/usr/bin/git-annex "${CMDLINE[@]}") ) |
50 |
+} |
51 |
+ |
52 |
+complete -o filenames -F _git_annex git-annex |
53 |
|
54 |
diff --git a/dev-vcs/git-annex/git-annex-6.20160923.ebuild b/dev-vcs/git-annex/git-annex-6.20160923.ebuild |
55 |
new file mode 100644 |
56 |
index 00000000..c4e7cd1 |
57 |
--- /dev/null |
58 |
+++ b/dev-vcs/git-annex/git-annex-6.20160923.ebuild |
59 |
@@ -0,0 +1,174 @@ |
60 |
+# Copyright 1999-2016 Gentoo Foundation |
61 |
+# Distributed under the terms of the GNU General Public License v2 |
62 |
+# $Id$ |
63 |
+ |
64 |
+EAPI=6 |
65 |
+ |
66 |
+# ebuild generated by hackport 0.4.7.9999 |
67 |
+#hackport: flags: -production,-android,-androidsplice,-testsuite |
68 |
+ |
69 |
+CABAL_FEATURES="bin" |
70 |
+inherit haskell-cabal bash-completion-r1 |
71 |
+ |
72 |
+DESCRIPTION="manage files with git, without checking their contents into git" |
73 |
+HOMEPAGE="http://git-annex.branchable.com/" |
74 |
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" |
75 |
+RESTRICT="test" |
76 |
+ |
77 |
+LICENSE="GPL-3" |
78 |
+SLOT="0" |
79 |
+KEYWORDS="~amd64 ~x86 ~amd64-linux" |
80 |
+IUSE="+assistant benchmark +concurrentoutput +cryptonite doc +dbus +magicmime +network-uri +pairing +s3 +torrentparser +webapp +webdav +xmpp" |
81 |
+ |
82 |
+RDEPEND="dev-haskell/aeson:= |
83 |
+ dev-haskell/async:= |
84 |
+ dev-haskell/bloomfilter:= |
85 |
+ dev-haskell/case-insensitive:= |
86 |
+ dev-haskell/data-default:= |
87 |
+ dev-haskell/disk-free-space:= |
88 |
+ dev-haskell/dlist:= |
89 |
+ dev-haskell/edit-distance:= |
90 |
+ dev-haskell/esqueleto:= |
91 |
+ >=dev-haskell/exceptions-0.6:= |
92 |
+ dev-haskell/feed:= |
93 |
+ dev-haskell/hslogger:= |
94 |
+ dev-haskell/http-client:= |
95 |
+ dev-haskell/http-conduit:= |
96 |
+ dev-haskell/http-types:= |
97 |
+ dev-haskell/ifelse:= |
98 |
+ dev-haskell/missingh:= |
99 |
+ dev-haskell/monad-control:= |
100 |
+ dev-haskell/monad-logger:= |
101 |
+ >=dev-haskell/mtl-2:= |
102 |
+ dev-haskell/old-locale:= |
103 |
+ >=dev-haskell/optparse-applicative-0.11.0:= |
104 |
+ dev-haskell/persistent:= |
105 |
+ dev-haskell/persistent-sqlite:= |
106 |
+ dev-haskell/persistent-template:= |
107 |
+ >=dev-haskell/quickcheck-2.1:2= |
108 |
+ dev-haskell/random:= |
109 |
+ dev-haskell/regex-tdfa:= |
110 |
+ dev-haskell/resourcet:= |
111 |
+ dev-haskell/safesemaphore:= |
112 |
+ dev-haskell/sandi:= |
113 |
+ >=dev-haskell/stm-2.3:= |
114 |
+ dev-haskell/text:= |
115 |
+ dev-haskell/transformers:= |
116 |
+ dev-haskell/unix-compat:= |
117 |
+ dev-haskell/unordered-containers:= |
118 |
+ dev-haskell/utf8-string:= |
119 |
+ >=dev-haskell/uuid-1.2.6:= |
120 |
+ >=dev-lang/ghc-7.6.1:= |
121 |
+ assistant? ( dev-haskell/dns:= |
122 |
+ dev-haskell/hinotify:= |
123 |
+ dev-haskell/mountpoints:= |
124 |
+ sys-process/lsof ) |
125 |
+ benchmark? ( dev-haskell/criterion:= ) |
126 |
+ concurrentoutput? ( >=dev-haskell/concurrent-output-1.6:= ) |
127 |
+ cryptonite? ( dev-haskell/cryptonite:= ) |
128 |
+ !cryptonite? ( >=dev-haskell/cryptohash-0.11.0:= ) |
129 |
+ dbus? ( >=dev-haskell/dbus-0.10.7:= |
130 |
+ >=dev-haskell/fdo-notify-0.3:= ) |
131 |
+ magicmime? ( dev-haskell/magic:= ) |
132 |
+ network-uri? ( >=dev-haskell/network-2.6:= |
133 |
+ >=dev-haskell/network-uri-2.6:= ) |
134 |
+ !network-uri? ( >=dev-haskell/network-2.4:= <dev-haskell/network-2.6:= ) |
135 |
+ pairing? ( dev-haskell/network-info:= |
136 |
+ dev-haskell/network-multicast:= ) |
137 |
+ s3? ( >=dev-haskell/aws-0.9.2:= |
138 |
+ dev-haskell/conduit:= |
139 |
+ dev-haskell/conduit-extra:= ) |
140 |
+ torrentparser? ( >=dev-haskell/torrent-10000.0.0:= ) |
141 |
+ webapp? ( dev-haskell/blaze-builder:= |
142 |
+ dev-haskell/byteable:= |
143 |
+ dev-haskell/clientsession:= |
144 |
+ dev-haskell/crypto-api:= |
145 |
+ >=dev-haskell/path-pieces-0.1.4:= |
146 |
+ dev-haskell/securemem:= |
147 |
+ >=dev-haskell/shakespeare-2.0.0:= |
148 |
+ dev-haskell/wai:= |
149 |
+ dev-haskell/wai-extra:= |
150 |
+ >=dev-haskell/warp-3.0.0.5:= |
151 |
+ >=dev-haskell/warp-tls-1.4:= |
152 |
+ >=dev-haskell/yesod-1.2.6:= |
153 |
+ >=dev-haskell/yesod-core-1.2.19:= |
154 |
+ >=dev-haskell/yesod-default-1.2.0:= |
155 |
+ >=dev-haskell/yesod-form-1.3.15:= |
156 |
+ >=dev-haskell/yesod-static-1.2.4:= ) |
157 |
+ webdav? ( >=dev-haskell/dav-1.0:= ) |
158 |
+ xmpp? ( >=dev-haskell/gnutls-0.1.4:= |
159 |
+ dev-haskell/network-protocol-xmpp:= |
160 |
+ dev-haskell/xml-types:= ) |
161 |
+" |
162 |
+# not generated by hackport: |
163 |
+RDEPEND="${RDEPEND} |
164 |
+ dev-vcs/git |
165 |
+" |
166 |
+ |
167 |
+DEPEND="${RDEPEND} |
168 |
+ >=dev-haskell/cabal-1.16.0 |
169 |
+" |
170 |
+ |
171 |
+# not generated by hackport: |
172 |
+DEPEND="${DEPEND} |
173 |
+ dev-lang/perl |
174 |
+ doc? ( www-apps/ikiwiki net-misc/rsync ) |
175 |
+" |
176 |
+ |
177 |
+PATCHES=( |
178 |
+ # does not respect staging dir |
179 |
+ "${FILESDIR}"/${PN}-5.20150731-no-strange-installs.patch |
180 |
+ "${FILESDIR}"/${PN}-6.20160114-QC-2.8.2.patch |
181 |
+) |
182 |
+ |
183 |
+src_prepare() { |
184 |
+ default |
185 |
+ |
186 |
+ cabal_chdeps \ |
187 |
+ 'http-conduit (<2.2.0)' 'http-conduit' \ |
188 |
+ 'persistent (< 2.5)' 'persistent' |
189 |
+} |
190 |
+ |
191 |
+src_configure() { |
192 |
+ haskell-cabal_src_configure \ |
193 |
+ --flag=-android \ |
194 |
+ --flag=-androidsplice \ |
195 |
+ $(cabal_flag assistant assistant) \ |
196 |
+ $(cabal_flag benchmark benchmark) \ |
197 |
+ $(cabal_flag concurrentoutput concurrentoutput) \ |
198 |
+ $(cabal_flag cryptonite cryptonite) \ |
199 |
+ $(cabal_flag dbus dbus) \ |
200 |
+ $(cabal_flag magicmime magicmime) \ |
201 |
+ $(cabal_flag network-uri network-uri) \ |
202 |
+ $(cabal_flag pairing pairing) \ |
203 |
+ --flag=-production \ |
204 |
+ $(cabal_flag s3 s3) \ |
205 |
+ --flag=-testsuite \ |
206 |
+ $(cabal_flag torrentparser torrentparser) \ |
207 |
+ $(cabal_flag webapp webapp) \ |
208 |
+ $(cabal_flag webdav webdav) \ |
209 |
+ $(cabal_flag xmpp xmpp) |
210 |
+} |
211 |
+ |
212 |
+src_test() { |
213 |
+ if use webapp; then |
214 |
+ export GIT_CONFIG=${T}/temp-git-config |
215 |
+ git config user.email "git@src_test" |
216 |
+ git config user.name "Mr. ${P} The Test" |
217 |
+ |
218 |
+ emake test |
219 |
+ fi |
220 |
+} |
221 |
+ |
222 |
+src_install() { |
223 |
+ haskell-cabal_src_install |
224 |
+ dosym git-annex /usr/bin/git-annex-shell # standard make install does more, than needed |
225 |
+ |
226 |
+ newbashcomp "${FILESDIR}"/${PN}.bash ${PN} |
227 |
+ |
228 |
+ dodoc CHANGELOG README |
229 |
+ if use webapp ; then |
230 |
+ doicon "${FILESDIR}"/${PN}.xpm |
231 |
+ make_desktop_entry "${PN} webapp" "git-annex" ${PN}.xpm "Office" |
232 |
+ fi |
233 |
+} |