commit: ae9855f9d9a1fae1fa77a0fbe1af10881480f90a Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Sep 13 04:41:31 2020 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Sep 13 04:41:31 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae9855f9
net-misc/bsdwhois: bump to EAPI 7 Closes: https://bugs.gentoo.org/742128 Closes: https://bugs.gentoo.org/712872 Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Sam James <sam <AT> gentoo.org> net-misc/bsdwhois/bsdwhois-1.43.2.1.ebuild | 10 +++++++--- net-misc/bsdwhois/files/bsdwhois-1.43.2.1-musl-cdefs.patch | 12 ++++++++++++ 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/net-misc/bsdwhois/bsdwhois-1.43.2.1.ebuild b/net-misc/bsdwhois/bsdwhois-1.43.2.1.ebuild index d528d6c4095..2e825ce486c 100644 --- a/net-misc/bsdwhois/bsdwhois-1.43.2.1.ebuild +++ b/net-misc/bsdwhois/bsdwhois-1.43.2.1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=4 +EAPI=7 DESCRIPTION="FreeBSD Whois Client" HOMEPAGE="https://www.freebsd.org/"; @@ -12,11 +12,15 @@ SLOT="0" KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux" IUSE="userland_BSD" +PATCHES=( + "${FILESDIR}/${PN}-1.43.2.1-musl-cdefs.patch" +) + src_install() { default if ! use userland_BSD; then - mv "${ED}"/usr/share/man/man1/{whois,bsdwhois}.1 - mv "${ED}"/usr/bin/{whois,bsdwhois} + mv "${ED}"/usr/share/man/man1/{whois,bsdwhois}.1 || die + mv "${ED}"/usr/bin/{whois,bsdwhois} || die fi } 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 new file mode 100644 index 00000000000..2eec53c2645 --- /dev/null +++ b/net-misc/bsdwhois/files/bsdwhois-1.43.2.1-musl-cdefs.patch @@ -0,0 +1,12 @@ +diff --git a/whois.c b/whois.c +index 329559a..d2f6561 100644 +--- a/whois.c ++++ b/whois.c +@@ -43,7 +43,6 @@ static char sccsid[] = "@(#)whois.c 8.1 (Berkeley) 6/6/93"; + #endif /* not lint */ + #endif + +-#include <sys/cdefs.h> + #ifdef __FBSDID + __FBSDID("$FreeBSD: /repoman/r/ncvs/src/usr.bin/whois/whois.c,v 1.43.2.1 2006/01/31 18:11:21 jhay Exp $"); + #endif
