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/
Date: Wed, 26 Oct 2016 20:58:54
Message-Id: 1477515512.8737d559bd87e85911747765436dab8224123228.aidecoe@gentoo
1 commit: 8737d559bd87e85911747765436dab8224123228
2 Author: Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
3 AuthorDate: Wed Oct 26 20:58:32 2016 +0000
4 Commit: Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
5 CommitDate: Wed Oct 26 20:58:32 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8737d559
7
8 net-mail/notmuch: Remove 0.23* ebuilds superseded by 0.23.1
9
10 Package-Manager: portage-2.3.2
11
12 net-mail/notmuch/Manifest | 1 -
13 net-mail/notmuch/notmuch-0.23-r1.ebuild | 204 --------------------------------
14 net-mail/notmuch/notmuch-0.23.ebuild | 200 -------------------------------
15 3 files changed, 405 deletions(-)
16
17 diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
18 index 4ff668c..c0f1452 100644
19 --- a/net-mail/notmuch/Manifest
20 +++ b/net-mail/notmuch/Manifest
21 @@ -5,4 +5,3 @@ DIST notmuch-0.20.2.tar.gz 652945 SHA256 f741a26345bff389fd8a4a119c4174c6585730f
22 DIST notmuch-0.21.tar.gz 663600 SHA256 d06f8ffed168c7d53ffc449dd611038b5fa90f7ee22d58f3bec3b379571e25b3 SHA512 2485c422433be21f6bf89aaf997e1468c31a52029ddc8336e78a632b292c659569448c29813ea550ed27fb6815558522a451a7fa10e8fb3f87d9538b4dd7b01a WHIRLPOOL 303c6427822272834e3d95ac94760f0fbaf3f2947a984a6770a9b2918fe0fbad289ef95fb9a8300cb6db08ab3ef0ff56810b3a60879c6a2a3eac524689f0a2f0
23 DIST notmuch-0.22.2.tar.gz 683796 SHA256 6cd19c61634079981b2d8f4b7cb4eb953cba2a36272520603682d813d2bd7ed1 SHA512 cc11feb8d1c2c7959a42e032c1e36e828290a8e8477af8936a27654117fbc2e080c71fe69ec92bd80763d9d3b163d45b7c0fa9fe9c4ec649600fa928110da4ee WHIRLPOOL 6aa41fa26a92a11393193b6f7e147b69de00f57fe712486805b2b7019d9bf9887d6d10962ef4144ca9ef07d6f63bbb1ddb2f7104c6eb89841285620d439743be
24 DIST notmuch-0.23.1.tar.gz 690069 SHA256 e8012a1aa9afa47dfeb78f826610577e6bf9714e0933f28139c8611aad96d180 SHA512 e19bdc525090abcd4d476e4fd77d22e43001dee9b9202c45877b40d8c76bb9f522df61c19448ca42f6812e23e590e9241bda354c28205f479da50fb3ebd7bbb1 WHIRLPOOL b6f34bfa23aa2ed4d970696d5eedbc9d96f754bc88370bd777a9bafac835caf795df7e7f81e28892a014861bcb1512fd5bbb5ce225058f0cdec1858a167e6668
25 -DIST notmuch-0.23.tar.gz 689540 SHA256 c5e75b658ee2b58c5ac7a79e34d2449d37ddfa5c9e67a736454ec296c9a0a1b8 SHA512 87e3bb97035cc2d48b5b1cfdebf49576de96498d54192f7a58976e495b8b77672037a9702af194d882e9eb1e0252daeb01f49df90709434ff04d2b3db236a039 WHIRLPOOL 256d43ccf43d7c83a83ceb1fb55b223e47b1b339a938dfeeb77feae2a3bff60e0449b7bfdf155a2afbd9d10c3416e7fe6e1ed7b7f22d305aef727473d63b77fb
26
27 diff --git a/net-mail/notmuch/notmuch-0.23-r1.ebuild b/net-mail/notmuch/notmuch-0.23-r1.ebuild
28 deleted file mode 100644
29 index 2f4c8d4..00000000
30 --- a/net-mail/notmuch/notmuch-0.23-r1.ebuild
31 +++ /dev/null
32 @@ -1,204 +0,0 @@
33 -# Copyright 1999-2016 Gentoo Foundation
34 -# Distributed under the terms of the GNU General Public License v2
35 -# $Id$
36 -
37 -EAPI=6
38 -
39 -DISTUTILS_OPTIONAL=1
40 -PYTHON_COMPAT=( python{2_7,3_3,3_4} )
41 -
42 -inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
43 - distutils-r1 toolchain-funcs
44 -
45 -DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
46 -HOMEPAGE="http://notmuchmail.org/"
47 -SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.gz
48 - test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
49 -
50 -LICENSE="GPL-3"
51 -# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
52 -# meant to be binary backward compatible.
53 -SLOT="0/4"
54 -KEYWORDS="~alpha ~amd64 ~x86"
55 -REQUIRED_USE="
56 - nmbug? ( python )
57 - python? ( ${PYTHON_REQUIRED_USE} )
58 - test? ( crypt emacs python valgrind )
59 - "
60 -IUSE="crypt doc emacs mutt nmbug python test valgrind"
61 -
62 -CDEPEND="
63 - >=app-shells/bash-completion-1.9
64 - >=dev-libs/glib-2.22:2
65 - >=dev-libs/gmime-2.6.20-r2:2.6
66 - >=dev-libs/xapian-1.2.7-r2:=
67 - dev-python/sphinx[${PYTHON_USEDEP}]
68 - >=sys-libs/zlib-1.2.5.2
69 - sys-libs/talloc
70 - crypt? ( >=dev-libs/gmime-2.6.20-r2:2.6[smime] )
71 - emacs? ( >=virtual/emacs-23 )
72 - python? ( ${PYTHON_DEPS} )
73 - "
74 -DEPEND="${CDEPEND}
75 - virtual/pkgconfig
76 - doc? ( app-doc/doxygen )
77 - test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
78 - >=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb
79 - crypt? ( app-crypt/gnupg dev-libs/openssl ) )
80 - valgrind? ( dev-util/valgrind )
81 - "
82 -RDEPEND="${CDEPEND}
83 - crypt? ( app-crypt/gnupg )
84 - nmbug? ( dev-vcs/git )
85 - mutt? ( dev-perl/File-Which dev-perl/Mail-Box dev-perl/MailTools
86 - dev-perl/String-ShellQuote dev-perl/Term-ReadLine-Gnu
87 - virtual/perl-Digest-SHA virtual/perl-File-Path virtual/perl-Getopt-Long
88 - virtual/perl-Pod-Parser )
89 - "
90 -
91 -DOCS=( AUTHORS NEWS README )
92 -PATCHES=(
93 - "${FILESDIR}/${PV}-0001-emacs-id-buttonization.patch"
94 - "${FILESDIR}/${PV}-0002-emacs-search-face-bugfix.patch"
95 - )
96 -SITEFILE="50${PN}-gentoo.el"
97 -MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib"
98 -
99 -bindings() {
100 - local ret=0
101 -
102 - if use $1; then
103 - pushd bindings/$1 || die
104 - shift
105 - "$@"
106 - ret=$?
107 - popd || die
108 - fi
109 -
110 - return $ret
111 -}
112 -
113 -pkg_pretend() {
114 - if has_version '<net-mail/notmuch-0.18'; then
115 - ewarn
116 - ewarn "There are few not backward compatible changes between"
117 - ewarn "<notmuch-0.18 and >=notmuch-0.18. See NEWS file"
118 - ewarn "(0.18 section) for details before first use!"
119 - ewarn
120 - fi
121 -}
122 -
123 -pkg_setup() {
124 - if use emacs; then
125 - elisp-need-emacs 23 || die "Emacs version too low"
126 - fi
127 -}
128 -
129 -src_unpack() {
130 - unpack "${P}".tar.gz
131 - if use test; then
132 - mkdir -p "${S}"/test/test-databases || die
133 - cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
134 - fi
135 -}
136 -
137 -src_prepare() {
138 - default
139 -
140 - bindings python distutils-r1_src_prepare
141 - bindings python mv README README-python || die
142 - mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
143 -
144 - rm -f Makefile.config # assure that new Makefile.config will be generated
145 -
146 - if use test; then
147 - append-cflags -g
148 - append-cxxflags -g
149 - fi
150 -}
151 -
152 -src_configure() {
153 - local myeconfargs=(
154 - --bashcompletiondir="$(get_bashcompdir)"
155 - --emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
156 - --emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
157 - --without-ruby
158 - --zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
159 - $(use_with emacs)
160 - $(use_with doc api-docs)
161 - )
162 - tc-export CC CXX
163 - econf "${myeconfargs[@]}"
164 -}
165 -
166 -src_compile() {
167 - V=1 default
168 - bindings python distutils-r1_src_compile
169 -
170 - if use mutt; then
171 - pushd contrib/notmuch-mutt || die
172 - emake notmuch-mutt.1
173 - popd || die
174 - fi
175 -
176 - if use doc; then
177 - pydocs() {
178 - pushd docs || die
179 - emake html
180 - rm -r html/_sources || die
181 - rm html/{objects.inv,.buildinfo} || die
182 - mkdir -p ../html && mv html ../html/python || die
183 - popd || die
184 - }
185 - LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" bindings python pydocs
186 - fi
187 -}
188 -
189 -src_test() {
190 - pax-mark -m notmuch
191 - LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" V=1 default
192 - pax-mark -ze notmuch
193 -}
194 -
195 -src_install() {
196 - default
197 -
198 - if use emacs; then
199 - elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
200 - fi
201 -
202 - if use nmbug; then
203 - dobin devel/nmbug/nmbug
204 - dobin devel/nmbug/notmuch-report
205 - fi
206 -
207 - if use mutt; then
208 - pushd contrib/notmuch-mutt || die
209 - dobin notmuch-mutt
210 - doman notmuch-mutt.1
211 - insinto /etc/mutt
212 - doins notmuch-mutt.rc
213 - dodoc README-mutt
214 - popd || die
215 - fi
216 -
217 - DOCS="" bindings python distutils-r1_src_install
218 - use doc && bindings python dodoc -r html
219 -}
220 -
221 -pkg_preinst() {
222 - if use mutt && ! [[ -e ${ROOT}/etc/mutt/notmuch-mutt.rc ]]; then
223 - elog "To enable notmuch support in mutt, add the following line into"
224 - elog "your mutt config file, please:"
225 - elog ""
226 - elog " source /etc/mutt/notmuch-mutt.rc"
227 - fi
228 -}
229 -
230 -pkg_postinst() {
231 - use emacs && elisp-site-regen
232 -}
233 -
234 -pkg_postrm() {
235 - use emacs && elisp-site-regen
236 -}
237
238 diff --git a/net-mail/notmuch/notmuch-0.23.ebuild b/net-mail/notmuch/notmuch-0.23.ebuild
239 deleted file mode 100644
240 index 66c7df9..00000000
241 --- a/net-mail/notmuch/notmuch-0.23.ebuild
242 +++ /dev/null
243 @@ -1,200 +0,0 @@
244 -# Copyright 1999-2016 Gentoo Foundation
245 -# Distributed under the terms of the GNU General Public License v2
246 -# $Id$
247 -
248 -EAPI=6
249 -
250 -DISTUTILS_OPTIONAL=1
251 -PYTHON_COMPAT=( python{2_7,3_3,3_4} )
252 -
253 -inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
254 - distutils-r1 toolchain-funcs
255 -
256 -DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
257 -HOMEPAGE="http://notmuchmail.org/"
258 -SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.gz
259 - test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
260 -
261 -LICENSE="GPL-3"
262 -# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
263 -# meant to be binary backward compatible.
264 -SLOT="0/4"
265 -KEYWORDS="~alpha ~amd64 ~x86"
266 -REQUIRED_USE="
267 - nmbug? ( python )
268 - python? ( ${PYTHON_REQUIRED_USE} )
269 - test? ( crypt emacs python valgrind )
270 - "
271 -IUSE="crypt doc emacs mutt nmbug python test valgrind"
272 -
273 -CDEPEND="
274 - >=app-shells/bash-completion-1.9
275 - >=dev-libs/glib-2.22:2
276 - >=dev-libs/gmime-2.6.20-r2:2.6
277 - >=dev-libs/xapian-1.2.7-r2:=
278 - dev-python/sphinx[${PYTHON_USEDEP}]
279 - >=sys-libs/zlib-1.2.5.2
280 - sys-libs/talloc
281 - crypt? ( >=dev-libs/gmime-2.6.20-r2:2.6[smime] )
282 - emacs? ( >=virtual/emacs-23 )
283 - python? ( ${PYTHON_DEPS} )
284 - "
285 -DEPEND="${CDEPEND}
286 - virtual/pkgconfig
287 - doc? ( app-doc/doxygen )
288 - test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
289 - >=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb
290 - crypt? ( app-crypt/gnupg dev-libs/openssl ) )
291 - valgrind? ( dev-util/valgrind )
292 - "
293 -RDEPEND="${CDEPEND}
294 - crypt? ( app-crypt/gnupg )
295 - nmbug? ( dev-vcs/git )
296 - mutt? ( dev-perl/File-Which dev-perl/Mail-Box dev-perl/MailTools
297 - dev-perl/String-ShellQuote dev-perl/Term-ReadLine-Gnu
298 - virtual/perl-Digest-SHA virtual/perl-File-Path virtual/perl-Getopt-Long
299 - virtual/perl-Pod-Parser )
300 - "
301 -
302 -DOCS=( AUTHORS NEWS README )
303 -SITEFILE="50${PN}-gentoo.el"
304 -MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib"
305 -
306 -bindings() {
307 - local ret=0
308 -
309 - if use $1; then
310 - pushd bindings/$1 || die
311 - shift
312 - "$@"
313 - ret=$?
314 - popd || die
315 - fi
316 -
317 - return $ret
318 -}
319 -
320 -pkg_pretend() {
321 - if has_version '<net-mail/notmuch-0.18'; then
322 - ewarn
323 - ewarn "There are few not backward compatible changes between"
324 - ewarn "<notmuch-0.18 and >=notmuch-0.18. See NEWS file"
325 - ewarn "(0.18 section) for details before first use!"
326 - ewarn
327 - fi
328 -}
329 -
330 -pkg_setup() {
331 - if use emacs; then
332 - elisp-need-emacs 23 || die "Emacs version too low"
333 - fi
334 -}
335 -
336 -src_unpack() {
337 - unpack "${P}".tar.gz
338 - if use test; then
339 - mkdir -p "${S}"/test/test-databases || die
340 - cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
341 - fi
342 -}
343 -
344 -src_prepare() {
345 - default
346 -
347 - bindings python distutils-r1_src_prepare
348 - bindings python mv README README-python || die
349 - mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
350 -
351 - rm -f Makefile.config # assure that new Makefile.config will be generated
352 -
353 - if use test; then
354 - append-cflags -g
355 - append-cxxflags -g
356 - fi
357 -}
358 -
359 -src_configure() {
360 - local myeconfargs=(
361 - --bashcompletiondir="$(get_bashcompdir)"
362 - --emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
363 - --emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
364 - --without-ruby
365 - --zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
366 - $(use_with emacs)
367 - $(use_with doc api-docs)
368 - )
369 - tc-export CC CXX
370 - econf "${myeconfargs[@]}"
371 -}
372 -
373 -src_compile() {
374 - V=1 default
375 - bindings python distutils-r1_src_compile
376 -
377 - if use mutt; then
378 - pushd contrib/notmuch-mutt || die
379 - emake notmuch-mutt.1
380 - popd || die
381 - fi
382 -
383 - if use doc; then
384 - pydocs() {
385 - pushd docs || die
386 - emake html
387 - rm -r html/_sources || die
388 - rm html/{objects.inv,.buildinfo} || die
389 - mkdir -p ../html && mv html ../html/python || die
390 - popd || die
391 - }
392 - LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" bindings python pydocs
393 - fi
394 -}
395 -
396 -src_test() {
397 - pax-mark -m notmuch
398 - LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" V=1 default
399 - pax-mark -ze notmuch
400 -}
401 -
402 -src_install() {
403 - default
404 -
405 - if use emacs; then
406 - elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
407 - fi
408 -
409 - if use nmbug; then
410 - dobin devel/nmbug/nmbug
411 - dobin devel/nmbug/notmuch-report
412 - fi
413 -
414 - if use mutt; then
415 - pushd contrib/notmuch-mutt || die
416 - dobin notmuch-mutt
417 - doman notmuch-mutt.1
418 - insinto /etc/mutt
419 - doins notmuch-mutt.rc
420 - dodoc README-mutt
421 - popd || die
422 - fi
423 -
424 - DOCS="" bindings python distutils-r1_src_install
425 - use doc && bindings python dodoc -r html
426 -}
427 -
428 -pkg_preinst() {
429 - if use mutt && ! [[ -e ${ROOT}/etc/mutt/notmuch-mutt.rc ]]; then
430 - elog "To enable notmuch support in mutt, add the following line into"
431 - elog "your mutt config file, please:"
432 - elog ""
433 - elog " source /etc/mutt/notmuch-mutt.rc"
434 - fi
435 -}
436 -
437 -pkg_postinst() {
438 - use emacs && elisp-site-regen
439 -}
440 -
441 -pkg_postrm() {
442 - use emacs && elisp-site-regen
443 -}