gentoo resync : 23.09.2020

4 files changed, 2 insertions, 147 deletions

diff --git a/net-misc/whois/Manifest b/net-misc/whois/Manifest
index b899af964cfe..438a8e2a7b97 100644
--- a/net-misc/whois/Manifest
+++ b/net-misc/whois/Manifest
@@ -1,11 +1,7 @@
 AUX whois-4.7.2-config-file.patch 202 BLAKE2B b5c421655f40c22fcb9c9ac3194821e6e4100657bd11013ed220cea3c81c77e3c7e50432361c8e08274b59d96ff04ca22d8f500436fbefef981d587e26ef75a7 SHA512 932ce9dd51b29750a88da3082bdb1f3fd994e1d859fbdef45fadd3c833ee24d12acb6530989db60f4df3df9481d34cc5cabbdad4bf5150389a06ef7c832daf65
 AUX whois-5.3.0-libidn_automagic.patch 778 BLAKE2B b9214f6f0c081abf6141057ee9f82db30dad7306fe611b1cb70d256b235d0ba544887f8b084d7b71a21486ad68d312ad98075aed51765f59ecbf7ced45684772 SHA512 8df8c99320ee4a4327f35a62dbaca0b071a3472d398604304d772f2424d607d109d87056b1a138b041c4c391409828cc7397dc62ed973dee500b2eb9f1735676
 AUX whois-5.5.6-libxcrypt_automagic.patch 677 BLAKE2B e832e829f97c9b23ca4d62e037f74fdf87225390a399fa240f0789123144f07f3e2d66ec009662c9936d1a0f112998532350a2144d95dc96cac7b22250090fac SHA512 14b2787fc7933eaf21584dc93b84a605a3f593b77767f2b622b906f03c75edd3faee3d39281dc4332bb5b64b24bee07c7ccd1115f2e80ae394637bf093f70305
-DIST whois-5.5.5.tar.gz 103424 BLAKE2B ef406985be6ca6fe1d73e5c23817c99aa1c111f9ec74707f96602e53e519b77585fc27feaf11baf0cfc4f1fa94fbd876fd6631ea0a4c2b3d7b4bcd99cfd2e786 SHA512 0fcdd5b7fbdf4123edda2af58a2fcf0a1a87c454dc6cb83c86c1d200f80659967a7d08d54d3b010c40465004aa219de2a8efcc4b41524a8aefc2e6050d868d1b
 DIST whois-5.5.6.tar.gz 103581 BLAKE2B 7e4aebeb440b95a278a0f0d0e51dbec2003599ee9f6e6355f29a5b043ba5cbad19310058964120142d417e6a5df86bd68d03d7ac4358be488538584c2a56740f SHA512 97a139a8e24b9a92c5597bc31e1b8d5d5bcab1ec4cc53f80cbdb7f2e5b7e54f36b3a8a8d90fd7b86452aad36adc0ba2015aaf936643b290c8a777f5f6cb27ef3
-DIST whois_5.4.3.tar.xz 83904 BLAKE2B 19b78ca984c86ad711c317ca6090003ae354eee2b39f353081e99f44396e254b3cb75d38c8f6df9fe88283c5036e9e02f38c74401de8245dbd4f5dae3a6e1a0a SHA512 762feec983d29696796bea87fb47c5bd7357ca96d701b2e30cccb186c248225c45b451289ab45936d7e3eed5c0ff4e8fa249255ceb061a4e1ba1f6cd8fcdf084
-EBUILD whois-5.4.3.ebuild 1573 BLAKE2B fc50ea531b65cef7b4987129c8c5669a417455d50b277a5da11f1c1d418a278e549c2c1a7d958d1c52d4bf6cc33a538f64d53898dca779dc90a6940b44a6cd07 SHA512 e6547e93190db050a60658e057da8a204ab7f441d5a5f9d45145547c60bf21804e63b36b0ec29932873fade1cc048f10c6f0dcb2084574c8bce9c04dbd488a8f
-EBUILD whois-5.5.5.ebuild 1799 BLAKE2B 88352b97b5f99ec654251f4e44fccc301c922ff3bff5ead97a793187728630d8c5d17a25fb008201407c6c2b35cc545772ed60ee73c7cb0676ca195bc8d9e57a SHA512 b5668faf787c2bf8f6786dab4a075e10a186c72e219f43cac4839bed67a88d192137091516495725fc30242e1a240d13f5dc93712e7c40c21846cd9b790dddda
-EBUILD whois-5.5.6-r1.ebuild 1928 BLAKE2B 2742ebe3c819638e982607d377a620215e756b578defaa13130c7f0accc893c99981ee35d9fbb102a20489965e146e42506489b5fc6566b4e225a1e083cf8660 SHA512 643b052e22bc8c9449ec669fa9bb12dd5aafc6e82f019ad0a47a415563771580bc2f16c5eccdadc3aa134b60a5a2ac74c2715b69584b51ffd287d48bc4acc3b9
+EBUILD whois-5.5.6-r1.ebuild 1927 BLAKE2B 9d7b89f81502de253111365405f2297e63896fca0ade76222d8aaae3f05cd91b88cde8129c9d98ecf167ef380601f6197a00cc549597e29e968211d6f86f4103 SHA512 5f539dff3bfdbe7e75184bc04420d70e376118394a9d3f286f04cb36462b7eb0d8eb735b36ba5a08c07cd7cb1caed86ee0719c3cbe8b85bebd7edb3b9c9a6b4b
 EBUILD whois-9999.ebuild 1913 BLAKE2B 1b7be0cc8b1d074cbe507e9dee7c0d1deba0e1b4389980a2c29026d37b51abd21dd1b52213f381eeccca69787580e8a4b72fc572ab2fbdc51ed91fcd185ad217 SHA512 1f365041a0b643011257e9edeb0f036f045fdfbd1018c2eb8ecea6e7839839e55817fad892c213c7d7364776dd8dbe33152fa16587bd7b94300ca8cdb3ce0828
 MISC metadata.xml 438 BLAKE2B 3c2de7b15d6973ef59d174c857597c7f320176305e7f37df85694b87874f9590f37b75402b9ce273c20855a67c54e47f64cc5c0f0cd77a5baeb348bab5c44356 SHA512 cbe1e74802cc8810ebe72d9daf7a3863bec49f70c0ac17c09c5616cb3dd5074ecf1e53172b522f30197f7e994ae7596f830dbf4c791c86083727d8b452db309e
diff --git a/net-misc/whois/whois-5.4.3.ebuild b/net-misc/whois/whois-5.4.3.ebuild
deleted file mode 100644
index 669b2c40b3e2..000000000000
--- a/net-misc/whois/whois-5.4.3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 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"
-SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="iconv idn nls"
-RESTRICT="test" #59327
-
-RDEPEND="iconv? ( virtual/libiconv )
-	idn? ( net-dns/libidn2:= )
-	nls? ( virtual/libintl )"
-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
-)
-
-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
-	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 [[ ${USERLAND} != "GNU" ]]; then
-		mv "${ED}"/usr/share/man/man1/{whois,mdwhois}.1 || die
-		mv "${ED}"/usr/bin/{whois,mdwhois} || die
-	fi
-}
diff --git a/net-misc/whois/whois-5.5.5.ebuild b/net-misc/whois/whois-5.5.5.ebuild
deleted file mode 100644
index d99078f32be7..000000000000
--- a/net-misc/whois/whois-5.5.5.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 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"
-RESTRICT="test" #59327
-
-RDEPEND="iconv? ( virtual/libiconv )
-	idn? ( net-dns/libidn2:= )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-arch/xz-utils
-	>=dev-lang/perl-5
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-#S="${WORKDIR}/${PN}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.7.2-config-file.patch
-	"${FILESDIR}"/${PN}-5.3.0-libidn_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
-	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 [[ ${USERLAND} != "GNU" ]]; then
-		mv "${ED}"/usr/share/man/man1/{whois,mdwhois}.1 || die
-		mv "${ED}"/usr/bin/{whois,mdwhois} || die
-	fi
-}
diff --git a/net-misc/whois/whois-5.5.6-r1.ebuild b/net-misc/whois/whois-5.5.6-r1.ebuild
index b3b6a8ea1b68..740b5fcfc9e2 100644
--- a/net-misc/whois/whois-5.5.6-r1.ebuild
+++ b/net-misc/whois/whois-5.5.6-r1.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"