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-misc/bsdwhois/files/, net-misc/bsdwhois/
Date: Sun, 13 Sep 2020 04:41:44
Message-Id: 1599972091.ae9855f9d9a1fae1fa77a0fbe1af10881480f90a.sam@gentoo
1 commit: ae9855f9d9a1fae1fa77a0fbe1af10881480f90a
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Sun Sep 13 04:41:31 2020 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sun Sep 13 04:41:31 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae9855f9
7
8 net-misc/bsdwhois: bump to EAPI 7
9
10 Closes: https://bugs.gentoo.org/742128
11 Closes: https://bugs.gentoo.org/712872
12 Package-Manager: Portage-3.0.4, Repoman-3.0.1
13 Signed-off-by: Sam James <sam <AT> gentoo.org>
14
15 net-misc/bsdwhois/bsdwhois-1.43.2.1.ebuild | 10 +++++++---
16 net-misc/bsdwhois/files/bsdwhois-1.43.2.1-musl-cdefs.patch | 12 ++++++++++++
17 2 files changed, 19 insertions(+), 3 deletions(-)
18
19 diff --git a/net-misc/bsdwhois/bsdwhois-1.43.2.1.ebuild b/net-misc/bsdwhois/bsdwhois-1.43.2.1.ebuild
20 index d528d6c4095..2e825ce486c 100644
21 --- a/net-misc/bsdwhois/bsdwhois-1.43.2.1.ebuild
22 +++ b/net-misc/bsdwhois/bsdwhois-1.43.2.1.ebuild
23 @@ -1,7 +1,7 @@
24 # Copyright 1999-2020 Gentoo Authors
25 # Distributed under the terms of the GNU General Public License v2
26
27 -EAPI=4
28 +EAPI=7
29
30 DESCRIPTION="FreeBSD Whois Client"
31 HOMEPAGE="https://www.freebsd.org/"
32 @@ -12,11 +12,15 @@ SLOT="0"
33 KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
34 IUSE="userland_BSD"
35
36 +PATCHES=(
37 + "${FILESDIR}/${PN}-1.43.2.1-musl-cdefs.patch"
38 +)
39 +
40 src_install() {
41 default
42
43 if ! use userland_BSD; then
44 - mv "${ED}"/usr/share/man/man1/{whois,bsdwhois}.1
45 - mv "${ED}"/usr/bin/{whois,bsdwhois}
46 + mv "${ED}"/usr/share/man/man1/{whois,bsdwhois}.1 || die
47 + mv "${ED}"/usr/bin/{whois,bsdwhois} || die
48 fi
49 }
50
51 diff --git a/net-misc/bsdwhois/files/bsdwhois-1.43.2.1-musl-cdefs.patch b/net-misc/bsdwhois/files/bsdwhois-1.43.2.1-musl-cdefs.patch
52 new file mode 100644
53 index 00000000000..2eec53c2645
54 --- /dev/null
55 +++ b/net-misc/bsdwhois/files/bsdwhois-1.43.2.1-musl-cdefs.patch
56 @@ -0,0 +1,12 @@
57 +diff --git a/whois.c b/whois.c
58 +index 329559a..d2f6561 100644
59 +--- a/whois.c
60 ++++ b/whois.c
61 +@@ -43,7 +43,6 @@ static char sccsid[] = "@(#)whois.c 8.1 (Berkeley) 6/6/93";
62 + #endif /* not lint */
63 + #endif
64 +
65 +-#include <sys/cdefs.h>
66 + #ifdef __FBSDID
67 + __FBSDID("$FreeBSD: /repoman/r/ncvs/src/usr.bin/whois/whois.c,v 1.43.2.1 2006/01/31 18:11:21 jhay Exp $");
68 + #endif