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, 01 Jun 2016 06:25:42
Message-Id: 1464762328.3247f5002cd9eaebaf830bbbac6ec386a2b27305.aidecoe@gentoo
1 commit: 3247f5002cd9eaebaf830bbbac6ec386a2b27305
2 Author: Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jun 1 06:18:42 2016 +0000
4 Commit: Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
5 CommitDate: Wed Jun 1 06:25:28 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3247f500
7
8 net-mail/notmuch: Apply changes in dependencies only in new rev
9
10 Revert changes in notmuch-0.22.ebuild in commit
11 9cdfbeb940dabdd1d2088752b761e12c605e6efa and reapply changes to
12 newly bumped notmuch-0.22-r1.ebuild only. Changes in dependencies are
13 not so trivial, so better have a backup option for users.
14
15 Package-Manager: portage-2.3.0_rc1
16
17 net-mail/notmuch/{notmuch-0.22.ebuild => notmuch-0.22-r1.ebuild} | 0
18 net-mail/notmuch/notmuch-0.22.ebuild | 8 ++------
19 2 files changed, 2 insertions(+), 6 deletions(-)
20
21 diff --git a/net-mail/notmuch/notmuch-0.22.ebuild b/net-mail/notmuch/notmuch-0.22-r1.ebuild
22 similarity index 100%
23 copy from net-mail/notmuch/notmuch-0.22.ebuild
24 copy to net-mail/notmuch/notmuch-0.22-r1.ebuild
25
26 diff --git a/net-mail/notmuch/notmuch-0.22.ebuild b/net-mail/notmuch/notmuch-0.22.ebuild
27 index 9357a32..1cf92ce 100644
28 --- a/net-mail/notmuch/notmuch-0.22.ebuild
29 +++ b/net-mail/notmuch/notmuch-0.22.ebuild
30 @@ -29,13 +29,11 @@ IUSE="crypt debug doc emacs mutt nmbug python test"
31 CDEPEND="
32 >=app-shells/bash-completion-1.9
33 >=dev-libs/glib-2.22:2
34 - >=dev-libs/gmime-2.6.20-r2:2.6
35 + >=dev-libs/gmime-2.6.20:2.6
36 >=dev-libs/xapian-1.2.7-r2:=
37 dev-python/sphinx[${PYTHON_USEDEP}]
38 >=sys-libs/zlib-1.2.5.2
39 sys-libs/talloc
40 - crypt? ( >=dev-libs/gmime-2.6.20-r2:2.6[smime] )
41 - !crypt? ( >=dev-libs/gmime-2.6.20-r2:2.6[-smime] )
42 debug? ( dev-util/valgrind )
43 emacs? ( >=virtual/emacs-23 )
44 python? ( ${PYTHON_DEPS} )
45 @@ -44,12 +42,10 @@ DEPEND="${CDEPEND}
46 virtual/pkgconfig
47 doc? ( app-doc/doxygen )
48 test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
49 - >=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb
50 - crypt? ( dev-libs/openssl ) )
51 + >=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb )
52 "
53 RDEPEND="${CDEPEND}
54 crypt? ( app-crypt/gnupg )
55 - !crypt? ( !app-crypt/gnupg )
56 nmbug? ( dev-vcs/git )
57 mutt? ( dev-perl/File-Which dev-perl/Mail-Box dev-perl/MailTools
58 dev-perl/String-ShellQuote dev-perl/Term-ReadLine-Gnu