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: Sat, 01 Apr 2017 19:46:45
Message-Id: 1491075992.149fc8a4bc36a0e0a0dec4b487b36edfb8700ca4.aidecoe@gentoo
1 commit: 149fc8a4bc36a0e0a0dec4b487b36edfb8700ca4
2 Author: Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
3 AuthorDate: Sat Apr 1 19:27:21 2017 +0000
4 Commit: Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
5 CommitDate: Sat Apr 1 19:46:32 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=149fc8a4
7
8 net-mail/notmuch: Remove older minor version
9
10 0.23.7 has just been stabilized. This can be removed now.
11
12 Package-Manager: Portage-2.3.5, Repoman-2.3.2
13
14 net-mail/notmuch/Manifest | 1 -
15 net-mail/notmuch/files/fix-gpg-tests.patch | 16 ---
16 net-mail/notmuch/notmuch-0.23.3.ebuild | 201 -----------------------------
17 3 files changed, 218 deletions(-)
18
19 diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
20 index becee24f955..89bd5e96083 100644
21 --- a/net-mail/notmuch/Manifest
22 +++ b/net-mail/notmuch/Manifest
23 @@ -1,5 +1,4 @@
24 DIST database-v1.tar.xz 204876 SHA256 4299e051b10e1fa7b33ea2862790a09ebfe96859681804e5251e130f800e69d2 SHA512 e2d87373e00b65756d7fea40c54fb236d7a37ce839145c3afd99ab26efdc17796e540c021e2c24e521df2d0a01ccbf918994f87a0d83235ff9b109a51555b3d0 WHIRLPOOL c3a4d99405ce5143ee2ac0cbdebdabbee0213ecfcb25615612b1577165547dd7c5b6b1d1930302dc3a8afc92b3691a6a4cc48255e91b08a297f9d2510e789233
25 DIST notmuch-0.21.tar.gz 663600 SHA256 d06f8ffed168c7d53ffc449dd611038b5fa90f7ee22d58f3bec3b379571e25b3 SHA512 2485c422433be21f6bf89aaf997e1468c31a52029ddc8336e78a632b292c659569448c29813ea550ed27fb6815558522a451a7fa10e8fb3f87d9538b4dd7b01a WHIRLPOOL 303c6427822272834e3d95ac94760f0fbaf3f2947a984a6770a9b2918fe0fbad289ef95fb9a8300cb6db08ab3ef0ff56810b3a60879c6a2a3eac524689f0a2f0
26 -DIST notmuch-0.23.3.tar.gz 691361 SHA256 0f5da5cf0203b774e345c50d56e975a87c2fc5407ef4ea284b6e2b55a8951882 SHA512 232a4133d70d074e6d38b00471145ecec342a5e138822cce01b6915e2b3de29fc1181e116d1df30e2fea04d519f53297fd8ea0e9d0df91bc8d6fce549feed1e3 WHIRLPOOL 82c30f3137132504ed41c42619c3645b74680d01a835e6074122b6ff3ab8d1a5dfe138a583872d09ea9f70a7312021fafa1bd2c08c3b6b9a319f55e5c81f28ff
27 DIST notmuch-0.23.7.tar.gz 692230 SHA256 f11bb10d71945f6c3f16d23117afc70810aa485878e66bb4bf43cc3f08038913 SHA512 e71da3bd6ce1b344aae79b277b695a4668d4fe1b8838618d6970a0b27df9867bac66a3240473ef31fc30ed8af2b0a558203ed5ffb34da873c991b1ecc6c08522 WHIRLPOOL 0b14cd6fb2b584b27b7893bb9c45724725069a6bc980cfe52f80ec3f6ec95c3a8f631975875f44b46b2799d5a0c31a62ff845b2400b7389cd8aa6f55361a0851
28 DIST notmuch-0.24.tar.gz 708243 SHA256 f7e44cf67630669d3537c4febd7685ca27d62a134e42f9a5db90d5a6ed4c75fc SHA512 f966b4faf96b165cc04be15a90681fabfe7ce66a0a9255183f9e4542556836adb7acfe8c02033db3ad8af6cb8962d1a64da8cdd03a0485b104a7b40b88b598d5 WHIRLPOOL a64643461bb3f4e97459b76c43700cce5f69d4e9df99c9eadd424f9d8e1fe2f3b8d33cfd19cb2945050bc5018d2a2dabe484723d68fb247084e729f0b778908b
29
30 diff --git a/net-mail/notmuch/files/fix-gpg-tests.patch b/net-mail/notmuch/files/fix-gpg-tests.patch
31 deleted file mode 100644
32 index e674f185fde..00000000000
33 --- a/net-mail/notmuch/files/fix-gpg-tests.patch
34 +++ /dev/null
35 @@ -1,16 +0,0 @@
36 -diff --git a/test/test-lib-common.sh b/test/test-lib-common.sh
37 -index 03ef1d2d..178820bd 100644
38 ---- a/test/test-lib-common.sh
39 -+++ b/test/test-lib-common.sh
40 -@@ -139,10 +139,7 @@ export PATH MANPATH
41 - # Test repository
42 - test="tmp.$(basename "$0" .sh)"
43 - test -n "$root" && test="$root/$test"
44 --case "$test" in
45 --/*) TMP_DIRECTORY="$test" ;;
46 -- *) TMP_DIRECTORY="$TEST_DIRECTORY/$test" ;;
47 --esac
48 -+TMP_DIRECTORY="$(mktemp -d)"
49 - test ! -z "$debug" || remove_tmp=$TMP_DIRECTORY
50 - rm -fr "$test" || {
51 - GIT_EXIT_OK=t
52
53 diff --git a/net-mail/notmuch/notmuch-0.23.3.ebuild b/net-mail/notmuch/notmuch-0.23.3.ebuild
54 deleted file mode 100644
55 index f084e405278..00000000000
56 --- a/net-mail/notmuch/notmuch-0.23.3.ebuild
57 +++ /dev/null
58 @@ -1,201 +0,0 @@
59 -# Copyright 1999-2017 Gentoo Foundation
60 -# Distributed under the terms of the GNU General Public License v2
61 -
62 -EAPI=6
63 -
64 -DISTUTILS_OPTIONAL=1
65 -PYTHON_COMPAT=( python{2_7,3_4} )
66 -
67 -inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
68 - distutils-r1 toolchain-funcs
69 -
70 -DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
71 -HOMEPAGE="http://notmuchmail.org/"
72 -SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.gz
73 - test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
74 -
75 -LICENSE="GPL-3"
76 -# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
77 -# meant to be binary backward compatible.
78 -SLOT="0/4"
79 -KEYWORDS="~alpha amd64 x86"
80 -REQUIRED_USE="
81 - nmbug? ( python )
82 - python? ( ${PYTHON_REQUIRED_USE} )
83 - test? ( crypt emacs python valgrind )
84 - "
85 -IUSE="crypt doc emacs mutt nmbug python test valgrind"
86 -
87 -CDEPEND="
88 - !!<app-shells/bash-completion-1.9
89 - >=dev-libs/glib-2.22:2
90 - >=dev-libs/gmime-2.6.20-r2:2.6
91 - >=dev-libs/xapian-1.2.7-r2:=
92 - dev-python/sphinx[${PYTHON_USEDEP}]
93 - >=sys-libs/zlib-1.2.5.2
94 - sys-libs/talloc
95 - crypt? ( >=dev-libs/gmime-2.6.20-r2:2.6[smime] )
96 - emacs? ( >=virtual/emacs-23 )
97 - python? ( ${PYTHON_DEPS} )
98 - "
99 -DEPEND="${CDEPEND}
100 - virtual/pkgconfig
101 - doc? ( app-doc/doxygen )
102 - test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
103 - >=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb
104 - crypt? ( app-crypt/gnupg dev-libs/openssl ) )
105 - valgrind? ( dev-util/valgrind )
106 - "
107 -RDEPEND="${CDEPEND}
108 - crypt? ( app-crypt/gnupg )
109 - nmbug? ( dev-vcs/git )
110 - mutt? ( dev-perl/File-Which dev-perl/Mail-Box dev-perl/MailTools
111 - dev-perl/String-ShellQuote dev-perl/Term-ReadLine-Gnu
112 - virtual/perl-Digest-SHA virtual/perl-File-Path virtual/perl-Getopt-Long
113 - virtual/perl-Pod-Parser )
114 - "
115 -
116 -DOCS=( AUTHORS NEWS README )
117 -PATCHES=( "${FILESDIR}/fix-gpg-tests.patch" )
118 -SITEFILE="50${PN}-gentoo.el"
119 -MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib"
120 -
121 -bindings() {
122 - local ret=0
123 -
124 - if use $1; then
125 - pushd bindings/$1 || die
126 - shift
127 - "$@"
128 - ret=$?
129 - popd || die
130 - fi
131 -
132 - return $ret
133 -}
134 -
135 -pkg_pretend() {
136 - if has_version '<net-mail/notmuch-0.18'; then
137 - ewarn
138 - ewarn "There are few not backward compatible changes between"
139 - ewarn "<notmuch-0.18 and >=notmuch-0.18. See NEWS file"
140 - ewarn "(0.18 section) for details before first use!"
141 - ewarn
142 - fi
143 -}
144 -
145 -pkg_setup() {
146 - if use emacs; then
147 - elisp-need-emacs 23 || die "Emacs version too low"
148 - fi
149 -}
150 -
151 -src_unpack() {
152 - unpack "${P}".tar.gz
153 - if use test; then
154 - mkdir -p "${S}"/test/test-databases || die
155 - cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
156 - fi
157 -}
158 -
159 -src_prepare() {
160 - default
161 -
162 - bindings python distutils-r1_src_prepare
163 - bindings python mv README README-python || die
164 - mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
165 -
166 - # assure that new Makefile.config will be generated
167 - rm -f Makefile.config || die
168 -
169 - if use test; then
170 - append-cflags -g
171 - append-cxxflags -g
172 - fi
173 -}
174 -
175 -src_configure() {
176 - local myeconfargs=(
177 - --bashcompletiondir="$(get_bashcompdir)"
178 - --emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
179 - --emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
180 - --without-ruby
181 - --zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
182 - $(use_with emacs)
183 - $(use_with doc api-docs)
184 - )
185 - tc-export CC CXX
186 - econf "${myeconfargs[@]}"
187 -}
188 -
189 -src_compile() {
190 - V=1 default
191 - bindings python distutils-r1_src_compile
192 -
193 - if use mutt; then
194 - pushd contrib/notmuch-mutt || die
195 - emake notmuch-mutt.1
196 - popd || die
197 - fi
198 -
199 - if use doc; then
200 - pydocs() {
201 - pushd docs || die
202 - emake html
203 - rm -r html/_sources || die
204 - rm html/{objects.inv,.buildinfo} || die
205 - mkdir -p ../html && mv html ../html/python || die
206 - popd || die
207 - }
208 - LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" bindings python pydocs
209 - fi
210 -}
211 -
212 -src_test() {
213 - pax-mark -m notmuch
214 - LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" V=1 default
215 - pax-mark -ze notmuch
216 -}
217 -
218 -src_install() {
219 - default
220 -
221 - if use emacs; then
222 - elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
223 - fi
224 -
225 - if use nmbug; then
226 - dobin devel/nmbug/nmbug
227 - dobin devel/nmbug/notmuch-report
228 - fi
229 -
230 - if use mutt; then
231 - pushd contrib/notmuch-mutt || die
232 - dobin notmuch-mutt
233 - doman notmuch-mutt.1
234 - insinto /etc/mutt
235 - doins notmuch-mutt.rc
236 - dodoc README-mutt
237 - popd || die
238 - fi
239 -
240 - DOCS="" bindings python distutils-r1_src_install
241 - use doc && bindings python dodoc -r html
242 -}
243 -
244 -pkg_preinst() {
245 - if use mutt && ! [[ -e ${ROOT}/etc/mutt/notmuch-mutt.rc ]]; then
246 - elog "To enable notmuch support in mutt, add the following line into"
247 - elog "your mutt config file, please:"
248 - elog ""
249 - elog " source /etc/mutt/notmuch-mutt.rc"
250 - fi
251 -}
252 -
253 -pkg_postinst() {
254 - use emacs && elisp-site-regen
255 -}
256 -
257 -pkg_postrm() {
258 - use emacs && elisp-site-regen
259 -}