gentoo resync : 20.03.2022

3 files changed, 85 insertions, 2 deletions

diff --git a/net-misc/whois/Manifest b/net-misc/whois/Manifest
index 067c6d48b210..607eaba5835b 100644
--- a/net-misc/whois/Manifest
+++ b/net-misc/whois/Manifest
@@ -3,7 +3,9 @@ AUX whois-5.3.0-libidn_automagic.patch 778 BLAKE2B b9214f6f0c081abf6141057ee9f82
 AUX whois-5.5.6-libxcrypt_automagic.patch 677 BLAKE2B e832e829f97c9b23ca4d62e037f74fdf87225390a399fa240f0789123144f07f3e2d66ec009662c9936d1a0f112998532350a2144d95dc96cac7b22250090fac SHA512 14b2787fc7933eaf21584dc93b84a605a3f593b77767f2b622b906f03c75edd3faee3d39281dc4332bb5b64b24bee07c7ccd1115f2e80ae394637bf093f70305
 DIST whois-5.5.10.tar.gz 102555 BLAKE2B 9f1236ceeaea839e5f2a33aa63b39fa7e0566eeb4d2131b88b47dd62f037639a5860719a645d9cc2d0707faa1e86c9822634dda37e1a7a8d3b31a78cf34ecce2 SHA512 5ee92c15146353e77dddcbeddb6e704e0c42d29b8c0ff899ecce80f8e39903e8c796daec7f3de3f197d382f88e7cd4abd470463ea6c13a01347d0cd15d99af28
 DIST whois-5.5.11.tar.gz 102806 BLAKE2B be1a5f04ee5af4987224151116d1d7e37ad580b8cc00c3fd4752e10b2cbc1dc46a528591cf75e95a83a99884c961f20865802246e00508c90e338590e7e0be37 SHA512 a7e400a727dd88b4c8f1df2e850879ece882b9af1d5daaff22bb3e1c88be01b4e5430f74f9d4afd4c73538d87022536e40d5f3f63a501a95845396fe0be595b4
+DIST whois-5.5.12.tar.gz 103268 BLAKE2B f9e132a0de189ede87342383f4b869529efe4d99ffdb12450ab909f4df135dbab40319b16d889533803783ed7de4a518ff81d267d0939b3040bf2e25bff8b711 SHA512 f46065d6df0dc6f7d33996e33f456cef9b313e025515916e0476c36255df2919e49f2dcb7666b179393a4429572ac7e099c2783d72cff73222953ac093484786
 EBUILD whois-5.5.10-r1.ebuild 1941 BLAKE2B e187093a1335885c467d0bed56fa1c0f15d37ef25a9047e6fd6a0ca0550dd7bbe7b792b9d1c7bd3c23b572ae83c7df7749a1b7c02465f845530cb150c800165f SHA512 3ea777e829c31260d1951dd9e3efeff28e33df092600e3f7f5d96a1f4f9cb7154671e6dd9283cc97a7efb7fc2d9174ae7e7f0dfc75afe66a142fabf5de803bd2
-EBUILD whois-5.5.11.ebuild 1948 BLAKE2B 271a234070194fbb397d282dec4d40debb66326f7ea3a3c9fcfbac9b7b01ec651dbc11b7466a7149e3e4d6f50a24b21b6aaf3a4497109fd0d4e5a737f486c063 SHA512 ec926cd93a26c3aeb5db411513922dab3e1ad12013f953c39b126928648c8684385bfd776c04366eeb1204080748c4a598a6fa89b5880a906740d484292ca3c5
+EBUILD whois-5.5.11.ebuild 1941 BLAKE2B 22a19b0e416e2629a0970df690d373d6e0dc5892cdb672d159480c038c50b8b3ed5044e90a1620235feb39d5d20f697388803136c13182627848167d9054f143 SHA512 4f4bc41ac5754e630b3192f3550530e2656000c5d25e9665a8dc1e2dd3adfb3674139339ee2ca3586cdd3e2f70910c795b2aab0d7f63623d0337b40e90dc0b68
+EBUILD whois-5.5.12.ebuild 1916 BLAKE2B 5e5ef953551243c44c07f4b65c962813f7270f55c7e13fb00acecef0b0d933a492f84ba42ee8ef56f8460a9bd0b83432686c2afc548871ee64122482bf327574 SHA512 9009d5360b070d4959c6d3d09b997b0da87a4628e81f85347331571bde1a2a4c03ad88efc3a84f65d29ee59e6c439489381f680f1a2d535cea3790a3a01fa571
 EBUILD whois-9999.ebuild 1948 BLAKE2B 7efd9c6f3134692756555b99baab4842abcb92b0ff2b4a67ee049497f1fa4cd987d5f851d399c8a66b4c33398e6992383e6b674435f596b1a285520dbe96923c SHA512 083090b9dd254fd4e8c2bfb082c416e3b122697548071462a701be60d32220fa2e5850109bbc6d9cf45facf7cc2a2bd7351d0768146781ea095a15bc82c0cc84
 MISC metadata.xml 439 BLAKE2B 609f61e31ef22ab28f06d9f0b6542a0efbcb8a006b05f14ff6339a332bb3f04996d13c9a62b55765ce4611df0e9efe021b6f5b5060b13d00d72eae71eb9f9e3e SHA512 05bf067e25586b2032b137dae008a4c59aed9e633f37b545d6ccdca6dc3d69d8614d8ad26c34e87d956b93d24b7962c3fe908070dcfd6826c8fe916b51f29d2f
diff --git a/net-misc/whois/whois-5.5.11.ebuild b/net-misc/whois/whois-5.5.11.ebuild
index c6838bbf6f8a..290ecaecebdc 100644
--- a/net-misc/whois/whois-5.5.11.ebuild
+++ b/net-misc/whois/whois-5.5.11.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == *9999 ]] ; then
 else
 	#SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
 	SRC_URI="https://github.com/rfc1036/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-misc/whois/whois-5.5.12.ebuild b/net-misc/whois/whois-5.5.12.ebuild
new file mode 100644
index 000000000000..7ddebc10e44a
--- /dev/null
+++ b/net-misc/whois/whois-5.5.12.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_P=${P/-/_}
+DESCRIPTION="Improved Whois Client"
+HOMEPAGE="https://github.com/rfc1036/whois"
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/rfc1036/whois.git"
+else
+	#SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
+	SRC_URI="https://github.com/rfc1036/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="iconv idn nls xcrypt"
+
+RDEPEND="iconv? ( virtual/libiconv )
+	idn? ( net-dns/libidn2:= )
+	nls? ( virtual/libintl )
+	xcrypt? ( >=sys-libs/libxcrypt-4.1:= )
+	!xcrypt? ( virtual/libcrypt:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/xz-utils
+	>=dev-lang/perl-5
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.7.2-config-file.patch
+	"${FILESDIR}"/${PN}-5.3.0-libidn_automagic.patch
+	"${FILESDIR}"/${PN}-5.5.6-libxcrypt_automagic.patch
+)
+
+src_prepare() {
+	default
+
+	if use nls ; then
+		sed -i -e 's:#\(.*pos\):\1:' Makefile || die
+	else
+		sed -i -e '/ENABLE_NLS/s:define:undef:' config.h || die
+
+		# don't generate po files when nls is disabled (bug #419889)
+		sed -i -e '/^all:/s/ pos//' \
+			-e '/^install:/s/ install-pos//' Makefile || die
+	fi
+}
+
+src_configure() { :; } # expected no-op
+
+src_compile() {
+	unset HAVE_ICONV HAVE_LIBIDN
+
+	use iconv && export HAVE_ICONV=1
+	use idn && export HAVE_LIBIDN=1
+	use xcrypt && export HAVE_XCRYPT=1
+
+	tc-export CC
+
+	emake CFLAGS="${CFLAGS} ${CPPFLAGS}"
+}
+
+src_install() {
+	emake BASEDIR="${ED}" prefix=/usr install
+
+	insinto /etc
+	doins whois.conf
+	dodoc README debian/changelog
+
+	if ! use userland_GNU ; then
+		mv "${ED}"/usr/share/man/man1/{whois,mdwhois}.1 || die
+		mv "${ED}"/usr/bin/{whois,mdwhois} || die
+	fi
+}