Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-mail/mess822/
Date: Wed, 16 Sep 2020 22:20:34
Message-Id: 1600294822.9276734f40a7a7cc209301d3dec96cd254f2ede8.sam@gentoo
1 commit: 9276734f40a7a7cc209301d3dec96cd254f2ede8
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 16 22:20:14 2020 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 16 22:20:22 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9276734f
7
8 net-mail/mess822: port to EAPI 7
9
10 Closes: https://bugs.gentoo.org/725036
11 Closes: https://bugs.gentoo.org/725104
12 Closes: https://bugs.gentoo.org/742224
13 Package-Manager: Portage-3.0.4, Repoman-3.0.1
14 Signed-off-by: Sam James <sam <AT> gentoo.org>
15
16 net-mail/mess822/mess822-0.58-r2.ebuild | 27 +++++++++++++++++----------
17 1 file changed, 17 insertions(+), 10 deletions(-)
18
19 diff --git a/net-mail/mess822/mess822-0.58-r2.ebuild b/net-mail/mess822/mess822-0.58-r2.ebuild
20 index 95c6b44751e..eb062590f36 100644
21 --- a/net-mail/mess822/mess822-0.58-r2.ebuild
22 +++ b/net-mail/mess822/mess822-0.58-r2.ebuild
23 @@ -1,9 +1,9 @@
24 -# Copyright 1999-2014 Gentoo Foundation
25 +# Copyright 1999-2020 Gentoo Authors
26 # Distributed under the terms of the GNU General Public License v2
27
28 -EAPI=4
29 +EAPI=7
30
31 -inherit multilib toolchain-funcs eutils
32 +inherit toolchain-funcs
33
34 DESCRIPTION="Collection of utilities for parsing Internet mail messages"
35 SRC_URI="http://cr.yp.to/software/${P}.tar.gz"
36 @@ -18,15 +18,22 @@ RDEPEND=">=sys-apps/sed-4"
37 DEPEND="${RDEPEND}"
38 RESTRICT="test"
39
40 +PATCHES=(
41 + "${FILESDIR}"/${P}-implicit.patch
42 +)
43 +
44 src_prepare() {
45 + default
46 +
47 echo "$(tc-getCC) ${CFLAGS}" > conf-cc
48 echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
49 echo "/usr" > conf-home
50
51 # fix errno.h problem; bug #26165
52 - sed -i 's/^extern int errno;/#include <errno.h>/' error.h
53 + sed -i 's/^extern int errno;/#include <errno.h>/' error.h || die
54
55 - epatch "${FILESDIR}"/${P}-implicit.patch
56 + sed -i -e "s/ar/$(tc-getAR)/" make-makelib.sh || die
57 + sed -i -e "s/ranlib/$(tc-getRANLIB)/" make-makelib.sh || die
58 }
59
60 src_install() {
61 @@ -35,16 +42,16 @@ src_install() {
62
63 # Now that the commands are compiled, update the conf-home file to point
64 # to the installation image directory.
65 - echo "${D}/usr/" > conf-home
66 - sed -i -e "s:\"/etc\":\"${D}/etc\":" hier.c || die "sed hier.c failed"
67 + echo "${ED}/usr/" > conf-home
68 + sed -i -e "s:\"/etc\":\"${ED}/etc\":" hier.c || die "sed hier.c failed"
69
70 emake setup
71
72 # Move the man pages into /usr/share/man
73 - mv "${D}/usr/man" "${D}/usr/share/"
74 + mv "${ED}/usr/man" "${ED}/usr/share/" || die
75
76 dodir /usr/$(get_libdir)
77 - mv "${D}/usr/lib/${PN}.a" "${D}/usr/$(get_libdir)/${PN}.a"
78 - rmdir "${D}/usr/lib"
79 + mv "${ED}/usr/lib/${PN}.a" "${ED}/usr/$(get_libdir)/${PN}.a" || die
80 + rmdir "${ED}/usr/lib" || die
81 dodoc BLURB CHANGES INSTALL README THANKS TODO VERSION
82 }