gentoo resync : 06.08.2019

3 files changed, 77 insertions, 2 deletions

diff --git a/net-misc/whois/Manifest b/net-misc/whois/Manifest
index 2342d5dc05d5..924292b8a27a 100644
--- a/net-misc/whois/Manifest
+++ b/net-misc/whois/Manifest
@@ -1,8 +1,10 @@
 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
+DIST whois-5.5.1.tar.gz 103269 BLAKE2B c737c922b7ef5a8619e1778521da66b3507e96ed82b2fdde8fe61df22d7c40bd4494fa26b3de83e51cbeaf4811d912cbeff8de230f7bce9c0dbeb021567c2908 SHA512 bc32208e32f632b515792767c6c72a94cb66e7f42aed3dc5dc6ede3f5f28860cc279c5e6b1579db45b0f7dc6d55ec910b81cf1dfadb91354fb3833b1272b93fc
 DIST whois_5.4.3.tar.xz 83904 BLAKE2B 19b78ca984c86ad711c317ca6090003ae354eee2b39f353081e99f44396e254b3cb75d38c8f6df9fe88283c5036e9e02f38c74401de8245dbd4f5dae3a6e1a0a SHA512 762feec983d29696796bea87fb47c5bd7357ca96d701b2e30cccb186c248225c45b451289ab45936d7e3eed5c0ff4e8fa249255ceb061a4e1ba1f6cd8fcdf084
 DIST whois_5.5.0.tar.xz 85600 BLAKE2B 37c90324e1b7c773793e1eaff70816f90a6429ab91bafcff36dfa02ea09b4eb5e83b8cd36e1ca0bc5eb3a043f1973f4479037de38cf41a7b7ac646845697636f SHA512 a26730613b8019385e48c7432bcc9871984a7035e53e56188a876e70e255a1adf23d546dfeb1706879af5c4a8f2231976fe89d2571b3d2cb6d615a7834a2d876
 EBUILD whois-5.4.3.ebuild 1583 BLAKE2B a143d22a2f6f7e91122449ee15947fad9d28cb57a7995af6068f36b2d06ee82090f501a86b3d5185b3471edad319f064c0b8c485a6cd80f5beb186d3fae38b6b SHA512 b6b2d2d1e38cfc198859c969de3c870e6624b2746cfb197726cc554b8036035a6bdc09f453997c9b49b8d7ba9cc523cb8fe62d4ed3332c6e573566f62be8458e
 EBUILD whois-5.5.0.ebuild 1624 BLAKE2B 5b6225e917c0746a4db7390d3a2871eb5701604d80747a1fab174beecc82bb08c6776f958bb907ffbfc78077b9035214716f6c7ae8babedb7808c4d49a1d5f76 SHA512 81be69cb9c3a681e371aa44080aa1fc8c89d718a5474072d472c99204a0ac2c78362f1e4a5d242912196ebfe7338c148adf1ab27c79cbaf4e401946639be9b2f
-EBUILD whois-9999.ebuild 1708 BLAKE2B cfb0991a873e3afe2f0efbc710f4e8883eb3bc6b01b248c9dec9369b590d7a3270ba568b774d7ac02f12a877027896e4e58cc6c33897484e5638151e3651f9c3 SHA512 e7a58163d0c63db79c05f7628bb867727143a7dc715f65658ead427f5e9ad6e21399769a5df564e9d491bc19c8a6fc74b64e88890a7a24c018e37b2f1528f42c
+EBUILD whois-5.5.1.ebuild 1790 BLAKE2B 35e07b65f4ae1ad45a8210e65956ec75568c638b91527d87e9c9ca49ed96667414eaafa4f91c4a2dffa388e6f75bfa3621286b08fa07dfd8ee3f0fcfb4cfffd8 SHA512 386833c1f4dababde9f75d8885828c84c0fdbe2697bef7418eb8784444b1b9719ce52171e9890b6ad5b95ea2008af766093756232f4774885c61b729ae70ab88
+EBUILD whois-9999.ebuild 1790 BLAKE2B 35e07b65f4ae1ad45a8210e65956ec75568c638b91527d87e9c9ca49ed96667414eaafa4f91c4a2dffa388e6f75bfa3621286b08fa07dfd8ee3f0fcfb4cfffd8 SHA512 386833c1f4dababde9f75d8885828c84c0fdbe2697bef7418eb8784444b1b9719ce52171e9890b6ad5b95ea2008af766093756232f4774885c61b729ae70ab88
 MISC metadata.xml 335 BLAKE2B 105a64d3c2f98d051101083c04232489e806ea86a66e27bbd33ebaf00cd7ce3cde1e4cce051adf86c6b61201973f9aec9c10f5b49f11586208260b7d7b40b292 SHA512 81d7c5fe370408b1cd3470c7e6b46127a8de700db07da3b0c7416263d7f0f7558da56dd2256cb4120a2fd398765d8a295436a517fbd0e9313d6abe9f5358d51d
diff --git a/net-misc/whois/whois-5.5.1.ebuild b/net-misc/whois/whois-5.5.1.ebuild
new file mode 100644
index 000000000000..f4e5388d3fd4
--- /dev/null
+++ b/net-misc/whois/whois-5.5.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 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 ~sh ~sparc ~x86 ~x86-fbsd ~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 )"
+
+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-9999.ebuild b/net-misc/whois/whois-9999.ebuild
index fbab7732283e..f4e5388d3fd4 100644
--- a/net-misc/whois/whois-9999.ebuild
+++ b/net-misc/whois/whois-9999.ebuild
@@ -12,7 +12,8 @@ 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="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 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 LICENSE="GPL-2"