Gentoo Archives: gentoo-commits

From: Amy Liffey <amynka@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: mail-client/nmh/
Date: Wed, 02 Aug 2017 21:03:58
Message-Id: 1501707802.84d3599dcc95b6f52238f2ec8d51aa42760e8990.amynka@gentoo
1 commit: 84d3599dcc95b6f52238f2ec8d51aa42760e8990
2 Author: Amy Liffey <amynka <AT> gentoo <DOT> org>
3 AuthorDate: Wed Aug 2 21:00:44 2017 +0000
4 Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 2 21:03:22 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84d3599d
7
8 mail-client/nmh: eapi bump to 6
9
10 Package-Manager: Portage-2.3.6, Repoman-2.3.1
11
12 .../nmh/{nmh-1.3-r3.ebuild => nmh-1.3-r4.ebuild} | 31 +++++++++++-----------
13 1 file changed, 15 insertions(+), 16 deletions(-)
14
15 diff --git a/mail-client/nmh/nmh-1.3-r3.ebuild b/mail-client/nmh/nmh-1.3-r4.ebuild
16 similarity index 77%
17 rename from mail-client/nmh/nmh-1.3-r3.ebuild
18 rename to mail-client/nmh/nmh-1.3-r4.ebuild
19 index 977181d1e3e..c4260f04184 100644
20 --- a/mail-client/nmh/nmh-1.3-r3.ebuild
21 +++ b/mail-client/nmh/nmh-1.3-r4.ebuild
22 @@ -1,9 +1,9 @@
23 -# Copyright 1999-2012 Gentoo Foundation
24 +# Copyright 1999-2017 Gentoo Foundation
25 # Distributed under the terms of the GNU General Public License v2
26
27 -EAPI="2"
28 +EAPI=6
29
30 -inherit eutils base
31 +inherit eutils
32
33 DESCRIPTION="New MH mail reader"
34 HOMEPAGE="http://www.nongnu.org/nmh/"
35 @@ -15,8 +15,8 @@ KEYWORDS="~amd64 ~x86"
36 IUSE="gdbm"
37
38 DEPEND="gdbm? ( sys-libs/gdbm )
39 - !gdbm? ( sys-libs/db )
40 - >=sys-libs/ncurses-5.2
41 + !gdbm? ( sys-libs/db:= )
42 + >=sys-libs/ncurses-5.2:0=
43 net-libs/liblockfile
44 >=app-misc/editor-wrapper-3
45 !!media-gfx/pixie" # Bug #295996 media-gfx/pixie also uses show
46 @@ -24,17 +24,16 @@ RDEPEND="${DEPEND}"
47
48 DOCS=( ChangeLog DATE MACHINES README )
49
50 -src_prepare() {
51 - # Patches from bug #22173.
52 - epatch "${FILESDIR}"/${P}-inc-login.patch
53 - epatch "${FILESDIR}"/${P}-install.patch
54 - # bug #57886
55 - epatch "${FILESDIR}"/${P}-m_getfld.patch
56 - # bug #319937
57 - epatch "${FILESDIR}"/${P}-db5.patch
58 - # Allow parallel compiles/installs
59 - epatch "${FILESDIR}"/${P}-parallelmake.patch
60 -}
61 +# Patches from bug #22173.
62 +# bug #57886
63 +# bug #319937
64 +# Allow parallel compiles/installs
65 +
66 +PATCHES=( "${FILESDIR}"/${P}-inc-login.patch
67 + "${FILESDIR}"/${P}-install.patch
68 + "${FILESDIR}"/${P}-m_getfld.patch
69 + "${FILESDIR}"/${P}-db5.patch
70 + "${FILESDIR}"/${P}-parallelmake.patch )
71
72 src_configure() {
73 # Bug 348816 & Bug 341741: The previous ebuild default of