Gentoo Archives: gentoo-commits

From: "Amadeusz Piotr Żołnowski" <aidecoe@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/files/, net-mail/notmuch/
Date: Thu, 29 Dec 2016 21:39:34
Message-Id: 1483047514.574464e23a823bd88e122017cb2ee5f8121cffdf.aidecoe@gentoo
1 commit: 574464e23a823bd88e122017cb2ee5f8121cffdf
2 Author: Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
3 AuthorDate: Thu Dec 22 20:01:00 2016 +0000
4 Commit: Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
5 CommitDate: Thu Dec 29 21:38:34 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=574464e2
7
8 net-mail/notmuch: Keep only latest patch versions
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11
12 net-mail/notmuch/Manifest | 2 -
13 .../files/0.23-0001-emacs-id-buttonization.patch | 43 -----
14 .../files/0.23-0002-emacs-search-face-bugfix.patch | 36 ----
15 net-mail/notmuch/notmuch-0.22.2.ebuild | 198 --------------------
16 net-mail/notmuch/notmuch-0.23.1.ebuild | 200 ---------------------
17 net-mail/notmuch/notmuch-0.23.2.ebuild | 200 ---------------------
18 6 files changed, 679 deletions(-)
19
20 diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
21 index 56ecce2..e69e076 100644
22 --- a/net-mail/notmuch/Manifest
23 +++ b/net-mail/notmuch/Manifest
24 @@ -4,6 +4,4 @@ DIST notmuch-0.19.tar.gz 659038 SHA256 396fc6548423785ebbbe9a6cce321d957d3b2e856
25 DIST notmuch-0.20.2.tar.gz 652945 SHA256 f741a26345bff389fd8a4a119c4174c6585730f71844809583a54ef2a865adec SHA512 08ab75df324f232edd7c36f73d01d7453c058ffb55c4f548afdf9abe843317c1d7066f21e7600c66c53577f7d31787914bf69743aa5d221e239e182452681c75 WHIRLPOOL 1698cb1b09046f50a57ebf23625a2dd68f86cac7cb1142be81e77b5625e49960cb2311c8acff44de0894238bced48853cdd72b7edf34109ecee0bc53d5b086fc
26 DIST notmuch-0.21.tar.gz 663600 SHA256 d06f8ffed168c7d53ffc449dd611038b5fa90f7ee22d58f3bec3b379571e25b3 SHA512 2485c422433be21f6bf89aaf997e1468c31a52029ddc8336e78a632b292c659569448c29813ea550ed27fb6815558522a451a7fa10e8fb3f87d9538b4dd7b01a WHIRLPOOL 303c6427822272834e3d95ac94760f0fbaf3f2947a984a6770a9b2918fe0fbad289ef95fb9a8300cb6db08ab3ef0ff56810b3a60879c6a2a3eac524689f0a2f0
27 DIST notmuch-0.22.2.tar.gz 683796 SHA256 6cd19c61634079981b2d8f4b7cb4eb953cba2a36272520603682d813d2bd7ed1 SHA512 cc11feb8d1c2c7959a42e032c1e36e828290a8e8477af8936a27654117fbc2e080c71fe69ec92bd80763d9d3b163d45b7c0fa9fe9c4ec649600fa928110da4ee WHIRLPOOL 6aa41fa26a92a11393193b6f7e147b69de00f57fe712486805b2b7019d9bf9887d6d10962ef4144ca9ef07d6f63bbb1ddb2f7104c6eb89841285620d439743be
28 -DIST notmuch-0.23.1.tar.gz 690069 SHA256 e8012a1aa9afa47dfeb78f826610577e6bf9714e0933f28139c8611aad96d180 SHA512 e19bdc525090abcd4d476e4fd77d22e43001dee9b9202c45877b40d8c76bb9f522df61c19448ca42f6812e23e590e9241bda354c28205f479da50fb3ebd7bbb1 WHIRLPOOL b6f34bfa23aa2ed4d970696d5eedbc9d96f754bc88370bd777a9bafac835caf795df7e7f81e28892a014861bcb1512fd5bbb5ce225058f0cdec1858a167e6668
29 -DIST notmuch-0.23.2.tar.gz 690833 SHA256 edfd7528d43bf1e1ab2620607f9fdcf772603455a61c2eb49978619c352c97bc SHA512 487f70ef613962275dc81532cea62f287933bdb7a695466ce5ce0c5913ce06597abb152bac7126457997da710bbd716d30cee408a83b6bad4343407a5a9a202e WHIRLPOOL e5057e4490d949462e7f08530176a0b3c32a31e92402210cd02e11cb18c87f33d3e9705edd84284d0622e25a043d35a2d093bd0a0a9007123e87196ab699a885
30 DIST notmuch-0.23.3.tar.gz 691361 SHA256 0f5da5cf0203b774e345c50d56e975a87c2fc5407ef4ea284b6e2b55a8951882 SHA512 232a4133d70d074e6d38b00471145ecec342a5e138822cce01b6915e2b3de29fc1181e116d1df30e2fea04d519f53297fd8ea0e9d0df91bc8d6fce549feed1e3 WHIRLPOOL 82c30f3137132504ed41c42619c3645b74680d01a835e6074122b6ff3ab8d1a5dfe138a583872d09ea9f70a7312021fafa1bd2c08c3b6b9a319f55e5c81f28ff
31
32 diff --git a/net-mail/notmuch/files/0.23-0001-emacs-id-buttonization.patch b/net-mail/notmuch/files/0.23-0001-emacs-id-buttonization.patch
33 deleted file mode 100644
34 index 0c05373..00000000
35 --- a/net-mail/notmuch/files/0.23-0001-emacs-id-buttonization.patch
36 +++ /dev/null
37 @@ -1,43 +0,0 @@
38 -From b913a28f65e32380a84da735e0524f8d5c127f93 Mon Sep 17 00:00:00 2001
39 -From: David Bremner <david@×××××××.net>
40 -Date: Sun, 9 Oct 2016 19:30:44 -0300
41 -Subject: [PATCH 1/3] emacs/show: force notmuch-show-buttonise-links to act on
42 - lines
43 -
44 -This seems to fix a problem with emacs 25 creating partial buttons by
45 -calling n-s-b-l with a region that does not include the whole button.
46 -I'm not 100% sure it's legit to act outside the region passed by
47 -jit-lock, but goto-address-fontify-region (where I borrowed the code
48 -from) already does this, so this patch to not make things worse.
49 ----
50 - emacs/notmuch-show.el | 12 +++++++-----
51 - 1 file changed, 7 insertions(+), 5 deletions(-)
52 -
53 -diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
54 -index 641398d..e7d16f8 100644
55 ---- a/emacs/notmuch-show.el
56 -+++ b/emacs/notmuch-show.el
57 -@@ -1174,13 +1174,15 @@ This also turns id:\"<message id>\"-parts and mid: links into
58 - buttons for a corresponding notmuch search."
59 - (goto-address-fontify-region start end)
60 - (save-excursion
61 -- (let (links)
62 -- (goto-char start)
63 -- (while (re-search-forward notmuch-id-regexp end t)
64 -+ (let (links
65 -+ (beg-line (progn (goto-char start) (line-beginning-position)))
66 -+ (end-line (progn (goto-char end) (line-end-position))))
67 -+ (goto-char beg-line)
68 -+ (while (re-search-forward notmuch-id-regexp end-line t)
69 - (push (list (match-beginning 0) (match-end 0)
70 - (match-string-no-properties 0)) links))
71 -- (goto-char start)
72 -- (while (re-search-forward notmuch-mid-regexp end t)
73 -+ (goto-char beg-line)
74 -+ (while (re-search-forward notmuch-mid-regexp end-line t)
75 - (let* ((mid-cid (match-string-no-properties 1))
76 - (mid (save-match-data
77 - (string-match "^[^/]*" mid-cid)
78 ---
79 -2.10.1
80 -
81
82 diff --git a/net-mail/notmuch/files/0.23-0002-emacs-search-face-bugfix.patch b/net-mail/notmuch/files/0.23-0002-emacs-search-face-bugfix.patch
83 deleted file mode 100644
84 index 39651cb..00000000
85 --- a/net-mail/notmuch/files/0.23-0002-emacs-search-face-bugfix.patch
86 +++ /dev/null
87 @@ -1,36 +0,0 @@
88 -From e64f1ec1db49406d4834b09d8c4b2aec83ba66cb Mon Sep 17 00:00:00 2001
89 -From: Mark Walters <markwalters1009@×××××.com>
90 -Date: Wed, 12 Oct 2016 08:39:21 +0100
91 -Subject: [PATCH 2/3] emacs: search face bugfix
92 -
93 -In commit 2a7b11b064233afc4feead876fa396e3c18a6b91 the default faces
94 -for unread and flagged were accidentally swapped. This swaps them back.
95 ----
96 - emacs/notmuch.el | 4 ++--
97 - 1 file changed, 2 insertions(+), 2 deletions(-)
98 -
99 -diff --git a/emacs/notmuch.el b/emacs/notmuch.el
100 -index 8e14692..48c33fd 100644
101 ---- a/emacs/notmuch.el
102 -+++ b/emacs/notmuch.el
103 -@@ -313,7 +313,7 @@ there will be called at other points of notmuch execution."
104 -
105 - (defface notmuch-search-flagged-face
106 - '((t
107 -- (:weight bold)))
108 -+ (:foreground "blue")))
109 - "Face used in search mode face for flagged threads.
110 -
111 - This face is the default value for the \"flagged\" tag in
112 -@@ -323,7 +323,7 @@ This face is the default value for the \"flagged\" tag in
113 -
114 - (defface notmuch-search-unread-face
115 - '((t
116 -- (:foreground "blue")))
117 -+ (:weight bold)))
118 - "Face used in search mode for unread threads.
119 -
120 - This face is the default value for the \"unread\" tag in
121 ---
122 -2.10.1
123 -
124
125 diff --git a/net-mail/notmuch/notmuch-0.22.2.ebuild b/net-mail/notmuch/notmuch-0.22.2.ebuild
126 deleted file mode 100644
127 index f65afe4..00000000
128 --- a/net-mail/notmuch/notmuch-0.22.2.ebuild
129 +++ /dev/null
130 @@ -1,198 +0,0 @@
131 -# Copyright 1999-2016 Gentoo Foundation
132 -# Distributed under the terms of the GNU General Public License v2
133 -# $Id$
134 -
135 -EAPI=5
136 -
137 -DISTUTILS_OPTIONAL=1
138 -PYTHON_COMPAT=( python{2_7,3_4} )
139 -
140 -inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
141 - distutils-r1 toolchain-funcs
142 -
143 -DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
144 -HOMEPAGE="http://notmuchmail.org/"
145 -SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.gz
146 - test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
147 -
148 -LICENSE="GPL-3"
149 -# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
150 -# meant to be binary backward compatible.
151 -SLOT="0/4"
152 -KEYWORDS="~alpha ~amd64 ~x86"
153 -REQUIRED_USE="
154 - nmbug? ( python )
155 - python? ( ${PYTHON_REQUIRED_USE} )
156 - test? ( crypt emacs python valgrind )
157 - "
158 -IUSE="crypt doc emacs mutt nmbug python test valgrind"
159 -
160 -CDEPEND="
161 - >=app-shells/bash-completion-1.9
162 - >=dev-libs/glib-2.22:2
163 - >=dev-libs/gmime-2.6.20-r2:2.6
164 - >=dev-libs/xapian-1.2.7-r2:=
165 - dev-python/sphinx[${PYTHON_USEDEP}]
166 - >=sys-libs/zlib-1.2.5.2
167 - sys-libs/talloc
168 - crypt? ( >=dev-libs/gmime-2.6.20-r2:2.6[smime] )
169 - emacs? ( >=virtual/emacs-23 )
170 - python? ( ${PYTHON_DEPS} )
171 - "
172 -DEPEND="${CDEPEND}
173 - virtual/pkgconfig
174 - doc? ( app-doc/doxygen )
175 - test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
176 - >=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb
177 - crypt? ( app-crypt/gnupg dev-libs/openssl ) )
178 - valgrind? ( dev-util/valgrind )
179 - "
180 -RDEPEND="${CDEPEND}
181 - crypt? ( app-crypt/gnupg )
182 - nmbug? ( dev-vcs/git )
183 - mutt? ( dev-perl/File-Which dev-perl/Mail-Box dev-perl/MailTools
184 - dev-perl/String-ShellQuote dev-perl/Term-ReadLine-Gnu
185 - virtual/perl-Digest-SHA virtual/perl-File-Path virtual/perl-Getopt-Long
186 - virtual/perl-Pod-Parser )
187 - "
188 -
189 -DOCS=( AUTHORS NEWS README )
190 -SITEFILE="50${PN}-gentoo.el"
191 -MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib"
192 -MY_PATCHES=( )
193 -
194 -bindings() {
195 - local ret=0
196 -
197 - if use $1; then
198 - pushd bindings/$1 || die
199 - shift
200 - "$@"
201 - ret=$?
202 - popd || die
203 - fi
204 -
205 - return $ret
206 -}
207 -
208 -pkg_pretend() {
209 - if has_version '<net-mail/notmuch-0.18'; then
210 - ewarn
211 - ewarn "There are few not backward compatible changes between"
212 - ewarn "<notmuch-0.18 and >=notmuch-0.18. See NEWS file"
213 - ewarn "(0.18 section) for details before first use!"
214 - ewarn
215 - fi
216 -}
217 -
218 -pkg_setup() {
219 - if use emacs; then
220 - elisp-need-emacs 23 || die "Emacs version too low"
221 - fi
222 -}
223 -
224 -src_unpack() {
225 - unpack "${P}".tar.gz
226 - if use test; then
227 - mkdir -p "${S}"/test/test-databases || die
228 - cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
229 - fi
230 -}
231 -
232 -src_prepare() {
233 - [[ "${MY_PATCHES[@]}" ]] && epatch "${MY_PATCHES[@]}"
234 -
235 - bindings python distutils-r1_src_prepare
236 - bindings python mv README README-python || die
237 - mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
238 -
239 - rm -f Makefile.config # assure that new Makefile.config will be generated
240 -
241 - if use test; then
242 - append-cflags -g
243 - append-cxxflags -g
244 - fi
245 -}
246 -
247 -src_configure() {
248 - local myeconfargs=(
249 - --bashcompletiondir="$(get_bashcompdir)"
250 - --emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
251 - --emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
252 - --without-ruby
253 - --zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
254 - $(use_with emacs)
255 - )
256 - tc-export CC CXX
257 - econf "${myeconfargs[@]}"
258 -}
259 -
260 -src_compile() {
261 - V=1 default
262 - bindings python distutils-r1_src_compile
263 -
264 - if use mutt; then
265 - pushd contrib/notmuch-mutt || die
266 - emake notmuch-mutt.1
267 - popd || die
268 - fi
269 -
270 - if use doc; then
271 - pydocs() {
272 - pushd docs || die
273 - emake html
274 - mv html ../python || die
275 - popd || die
276 - }
277 - LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" bindings python pydocs
278 - fi
279 -}
280 -
281 -src_test() {
282 - pax-mark -m notmuch
283 - LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" V=1 default
284 - pax-mark -ze notmuch
285 -}
286 -
287 -src_install() {
288 - default
289 -
290 - if use emacs; then
291 - elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
292 - fi
293 -
294 - if use nmbug; then
295 - dobin devel/nmbug/nmbug
296 - dobin devel/nmbug/notmuch-report
297 - fi
298 -
299 - if use mutt; then
300 - pushd contrib/notmuch-mutt || die
301 - dobin notmuch-mutt
302 - doman notmuch-mutt.1
303 - insinto /etc/mutt
304 - doins notmuch-mutt.rc
305 - dodoc README-mutt
306 - popd || die
307 - fi
308 -
309 - DOCS="" bindings python distutils-r1_src_install
310 - use doc && bindings python dohtml -r python
311 -}
312 -
313 -pkg_preinst() {
314 - if use mutt && ! [[ -e ${ROOT}/etc/mutt/notmuch-mutt.rc ]]; then
315 - elog "To enable notmuch support in mutt, add the following line into"
316 - elog "your mutt config file, please:"
317 - elog ""
318 - elog " source /etc/mutt/notmuch-mutt.rc"
319 - fi
320 -}
321 -
322 -pkg_postinst() {
323 - use emacs && elisp-site-regen
324 -}
325 -
326 -pkg_postrm() {
327 - use emacs && elisp-site-regen
328 -}
329
330 diff --git a/net-mail/notmuch/notmuch-0.23.1.ebuild b/net-mail/notmuch/notmuch-0.23.1.ebuild
331 deleted file mode 100644
332 index 6f18afc..00000000
333 --- a/net-mail/notmuch/notmuch-0.23.1.ebuild
334 +++ /dev/null
335 @@ -1,200 +0,0 @@
336 -# Copyright 1999-2016 Gentoo Foundation
337 -# Distributed under the terms of the GNU General Public License v2
338 -# $Id$
339 -
340 -EAPI=6
341 -
342 -DISTUTILS_OPTIONAL=1
343 -PYTHON_COMPAT=( python{2_7,3_4} )
344 -
345 -inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
346 - distutils-r1 toolchain-funcs
347 -
348 -DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
349 -HOMEPAGE="http://notmuchmail.org/"
350 -SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.gz
351 - test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
352 -
353 -LICENSE="GPL-3"
354 -# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
355 -# meant to be binary backward compatible.
356 -SLOT="0/4"
357 -KEYWORDS="~alpha amd64 ~x86"
358 -REQUIRED_USE="
359 - nmbug? ( python )
360 - python? ( ${PYTHON_REQUIRED_USE} )
361 - test? ( crypt emacs python valgrind )
362 - "
363 -IUSE="crypt doc emacs mutt nmbug python test valgrind"
364 -
365 -CDEPEND="
366 - >=app-shells/bash-completion-1.9
367 - >=dev-libs/glib-2.22:2
368 - >=dev-libs/gmime-2.6.20-r2:2.6
369 - >=dev-libs/xapian-1.2.7-r2:=
370 - dev-python/sphinx[${PYTHON_USEDEP}]
371 - >=sys-libs/zlib-1.2.5.2
372 - sys-libs/talloc
373 - crypt? ( >=dev-libs/gmime-2.6.20-r2:2.6[smime] )
374 - emacs? ( >=virtual/emacs-23 )
375 - python? ( ${PYTHON_DEPS} )
376 - "
377 -DEPEND="${CDEPEND}
378 - virtual/pkgconfig
379 - doc? ( app-doc/doxygen )
380 - test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
381 - >=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb
382 - crypt? ( app-crypt/gnupg dev-libs/openssl ) )
383 - valgrind? ( dev-util/valgrind )
384 - "
385 -RDEPEND="${CDEPEND}
386 - crypt? ( app-crypt/gnupg )
387 - nmbug? ( dev-vcs/git )
388 - mutt? ( dev-perl/File-Which dev-perl/Mail-Box dev-perl/MailTools
389 - dev-perl/String-ShellQuote dev-perl/Term-ReadLine-Gnu
390 - virtual/perl-Digest-SHA virtual/perl-File-Path virtual/perl-Getopt-Long
391 - virtual/perl-Pod-Parser )
392 - "
393 -
394 -DOCS=( AUTHORS NEWS README )
395 -SITEFILE="50${PN}-gentoo.el"
396 -MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib"
397 -
398 -bindings() {
399 - local ret=0
400 -
401 - if use $1; then
402 - pushd bindings/$1 || die
403 - shift
404 - "$@"
405 - ret=$?
406 - popd || die
407 - fi
408 -
409 - return $ret
410 -}
411 -
412 -pkg_pretend() {
413 - if has_version '<net-mail/notmuch-0.18'; then
414 - ewarn
415 - ewarn "There are few not backward compatible changes between"
416 - ewarn "<notmuch-0.18 and >=notmuch-0.18. See NEWS file"
417 - ewarn "(0.18 section) for details before first use!"
418 - ewarn
419 - fi
420 -}
421 -
422 -pkg_setup() {
423 - if use emacs; then
424 - elisp-need-emacs 23 || die "Emacs version too low"
425 - fi
426 -}
427 -
428 -src_unpack() {
429 - unpack "${P}".tar.gz
430 - if use test; then
431 - mkdir -p "${S}"/test/test-databases || die
432 - cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
433 - fi
434 -}
435 -
436 -src_prepare() {
437 - default
438 -
439 - bindings python distutils-r1_src_prepare
440 - bindings python mv README README-python || die
441 - mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
442 -
443 - rm -f Makefile.config # assure that new Makefile.config will be generated
444 -
445 - if use test; then
446 - append-cflags -g
447 - append-cxxflags -g
448 - fi
449 -}
450 -
451 -src_configure() {
452 - local myeconfargs=(
453 - --bashcompletiondir="$(get_bashcompdir)"
454 - --emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
455 - --emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
456 - --without-ruby
457 - --zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
458 - $(use_with emacs)
459 - $(use_with doc api-docs)
460 - )
461 - tc-export CC CXX
462 - econf "${myeconfargs[@]}"
463 -}
464 -
465 -src_compile() {
466 - V=1 default
467 - bindings python distutils-r1_src_compile
468 -
469 - if use mutt; then
470 - pushd contrib/notmuch-mutt || die
471 - emake notmuch-mutt.1
472 - popd || die
473 - fi
474 -
475 - if use doc; then
476 - pydocs() {
477 - pushd docs || die
478 - emake html
479 - rm -r html/_sources || die
480 - rm html/{objects.inv,.buildinfo} || die
481 - mkdir -p ../html && mv html ../html/python || die
482 - popd || die
483 - }
484 - LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" bindings python pydocs
485 - fi
486 -}
487 -
488 -src_test() {
489 - pax-mark -m notmuch
490 - LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" V=1 default
491 - pax-mark -ze notmuch
492 -}
493 -
494 -src_install() {
495 - default
496 -
497 - if use emacs; then
498 - elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
499 - fi
500 -
501 - if use nmbug; then
502 - dobin devel/nmbug/nmbug
503 - dobin devel/nmbug/notmuch-report
504 - fi
505 -
506 - if use mutt; then
507 - pushd contrib/notmuch-mutt || die
508 - dobin notmuch-mutt
509 - doman notmuch-mutt.1
510 - insinto /etc/mutt
511 - doins notmuch-mutt.rc
512 - dodoc README-mutt
513 - popd || die
514 - fi
515 -
516 - DOCS="" bindings python distutils-r1_src_install
517 - use doc && bindings python dodoc -r html
518 -}
519 -
520 -pkg_preinst() {
521 - if use mutt && ! [[ -e ${ROOT}/etc/mutt/notmuch-mutt.rc ]]; then
522 - elog "To enable notmuch support in mutt, add the following line into"
523 - elog "your mutt config file, please:"
524 - elog ""
525 - elog " source /etc/mutt/notmuch-mutt.rc"
526 - fi
527 -}
528 -
529 -pkg_postinst() {
530 - use emacs && elisp-site-regen
531 -}
532 -
533 -pkg_postrm() {
534 - use emacs && elisp-site-regen
535 -}
536
537 diff --git a/net-mail/notmuch/notmuch-0.23.2.ebuild b/net-mail/notmuch/notmuch-0.23.2.ebuild
538 deleted file mode 100644
539 index 49aefbf..00000000
540 --- a/net-mail/notmuch/notmuch-0.23.2.ebuild
541 +++ /dev/null
542 @@ -1,200 +0,0 @@
543 -# Copyright 1999-2016 Gentoo Foundation
544 -# Distributed under the terms of the GNU General Public License v2
545 -# $Id$
546 -
547 -EAPI=6
548 -
549 -DISTUTILS_OPTIONAL=1
550 -PYTHON_COMPAT=( python{2_7,3_4} )
551 -
552 -inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
553 - distutils-r1 toolchain-funcs
554 -
555 -DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
556 -HOMEPAGE="http://notmuchmail.org/"
557 -SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.gz
558 - test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
559 -
560 -LICENSE="GPL-3"
561 -# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
562 -# meant to be binary backward compatible.
563 -SLOT="0/4"
564 -KEYWORDS="~alpha ~amd64 ~x86"
565 -REQUIRED_USE="
566 - nmbug? ( python )
567 - python? ( ${PYTHON_REQUIRED_USE} )
568 - test? ( crypt emacs python valgrind )
569 - "
570 -IUSE="crypt doc emacs mutt nmbug python test valgrind"
571 -
572 -CDEPEND="
573 - >=app-shells/bash-completion-1.9
574 - >=dev-libs/glib-2.22:2
575 - >=dev-libs/gmime-2.6.20-r2:2.6
576 - >=dev-libs/xapian-1.2.7-r2:=
577 - dev-python/sphinx[${PYTHON_USEDEP}]
578 - >=sys-libs/zlib-1.2.5.2
579 - sys-libs/talloc
580 - crypt? ( >=dev-libs/gmime-2.6.20-r2:2.6[smime] )
581 - emacs? ( >=virtual/emacs-23 )
582 - python? ( ${PYTHON_DEPS} )
583 - "
584 -DEPEND="${CDEPEND}
585 - virtual/pkgconfig
586 - doc? ( app-doc/doxygen )
587 - test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
588 - >=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb
589 - crypt? ( app-crypt/gnupg dev-libs/openssl ) )
590 - valgrind? ( dev-util/valgrind )
591 - "
592 -RDEPEND="${CDEPEND}
593 - crypt? ( app-crypt/gnupg )
594 - nmbug? ( dev-vcs/git )
595 - mutt? ( dev-perl/File-Which dev-perl/Mail-Box dev-perl/MailTools
596 - dev-perl/String-ShellQuote dev-perl/Term-ReadLine-Gnu
597 - virtual/perl-Digest-SHA virtual/perl-File-Path virtual/perl-Getopt-Long
598 - virtual/perl-Pod-Parser )
599 - "
600 -
601 -DOCS=( AUTHORS NEWS README )
602 -SITEFILE="50${PN}-gentoo.el"
603 -MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib"
604 -
605 -bindings() {
606 - local ret=0
607 -
608 - if use $1; then
609 - pushd bindings/$1 || die
610 - shift
611 - "$@"
612 - ret=$?
613 - popd || die
614 - fi
615 -
616 - return $ret
617 -}
618 -
619 -pkg_pretend() {
620 - if has_version '<net-mail/notmuch-0.18'; then
621 - ewarn
622 - ewarn "There are few not backward compatible changes between"
623 - ewarn "<notmuch-0.18 and >=notmuch-0.18. See NEWS file"
624 - ewarn "(0.18 section) for details before first use!"
625 - ewarn
626 - fi
627 -}
628 -
629 -pkg_setup() {
630 - if use emacs; then
631 - elisp-need-emacs 23 || die "Emacs version too low"
632 - fi
633 -}
634 -
635 -src_unpack() {
636 - unpack "${P}".tar.gz
637 - if use test; then
638 - mkdir -p "${S}"/test/test-databases || die
639 - cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
640 - fi
641 -}
642 -
643 -src_prepare() {
644 - default
645 -
646 - bindings python distutils-r1_src_prepare
647 - bindings python mv README README-python || die
648 - mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
649 -
650 - rm -f Makefile.config # assure that new Makefile.config will be generated
651 -
652 - if use test; then
653 - append-cflags -g
654 - append-cxxflags -g
655 - fi
656 -}
657 -
658 -src_configure() {
659 - local myeconfargs=(
660 - --bashcompletiondir="$(get_bashcompdir)"
661 - --emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
662 - --emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
663 - --without-ruby
664 - --zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
665 - $(use_with emacs)
666 - $(use_with doc api-docs)
667 - )
668 - tc-export CC CXX
669 - econf "${myeconfargs[@]}"
670 -}
671 -
672 -src_compile() {
673 - V=1 default
674 - bindings python distutils-r1_src_compile
675 -
676 - if use mutt; then
677 - pushd contrib/notmuch-mutt || die
678 - emake notmuch-mutt.1
679 - popd || die
680 - fi
681 -
682 - if use doc; then
683 - pydocs() {
684 - pushd docs || die
685 - emake html
686 - rm -r html/_sources || die
687 - rm html/{objects.inv,.buildinfo} || die
688 - mkdir -p ../html && mv html ../html/python || die
689 - popd || die
690 - }
691 - LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" bindings python pydocs
692 - fi
693 -}
694 -
695 -src_test() {
696 - pax-mark -m notmuch
697 - LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" V=1 default
698 - pax-mark -ze notmuch
699 -}
700 -
701 -src_install() {
702 - default
703 -
704 - if use emacs; then
705 - elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
706 - fi
707 -
708 - if use nmbug; then
709 - dobin devel/nmbug/nmbug
710 - dobin devel/nmbug/notmuch-report
711 - fi
712 -
713 - if use mutt; then
714 - pushd contrib/notmuch-mutt || die
715 - dobin notmuch-mutt
716 - doman notmuch-mutt.1
717 - insinto /etc/mutt
718 - doins notmuch-mutt.rc
719 - dodoc README-mutt
720 - popd || die
721 - fi
722 -
723 - DOCS="" bindings python distutils-r1_src_install
724 - use doc && bindings python dodoc -r html
725 -}
726 -
727 -pkg_preinst() {
728 - if use mutt && ! [[ -e ${ROOT}/etc/mutt/notmuch-mutt.rc ]]; then
729 - elog "To enable notmuch support in mutt, add the following line into"
730 - elog "your mutt config file, please:"
731 - elog ""
732 - elog " source /etc/mutt/notmuch-mutt.rc"
733 - fi
734 -}
735 -
736 -pkg_postinst() {
737 - use emacs && elisp-site-regen
738 -}
739 -
740 -pkg_postrm() {
741 - use emacs && elisp-site-regen
742 -}