commit: 22dff458b1cc86f8d0efbf744616220aaf6e46d9
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 21 10:38:39 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Jan 21 10:39:56 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22dff458
net-misc/whois: Bump to version 5.3.0
Package-Manager: Portage-2.3.20, Repoman-2.3.6
net-misc/whois/Manifest | 1 +
.../whois/files/whois-5.3.0-libidn_automagic.patch | 23 ++++++++
net-misc/whois/whois-5.3.0.ebuild | 65 ++++++++++++++++++++++
3 files changed, 89 insertions(+)
diff --git a/net-misc/whois/Manifest b/net-misc/whois/Manifest
index f72e7913704..854397df646 100644
--- a/net-misc/whois/Manifest
+++ b/net-misc/whois/Manifest
@@ -1,3 +1,4 @@
DIST whois_5.2.12.tar.xz 80428 BLAKE2B
53aa08d4e45ab417585aaaff03beb588a01e88c35d508f96e0738e6934659df6ab78c21d5794d86ce90c775fe5a32242710e8cf93b9f46c52dc32597ad113f40
SHA512
df40e2e7cbd11d00984f865e122ad4ece882a6a45e2f75ad5ea24ce937b7e9452b01fd886f43bae55fd065a6556cfc4577e7126151b5fd43fa806c4b0c886ced
DIST whois_5.2.19.tar.xz 82476 BLAKE2B
20fb18c0d7244293f5ead1bb11431227f5897f8db57ce4347790e4f9e4689c1dd8a43a9be95533df2496f4da515163053e3f9110f5470eb3faa1cf9a6f21bd4c
SHA512
93e6df6bda18fe1dd9b8ca017271a46c6e2b721820260b11c5427258f6c0010cb573cc619def5af44a56b5740423b46ad7b383da7743cc35517f4526a720389f
DIST whois_5.2.20.tar.xz 82336 BLAKE2B
b10d7e22f41bfb68cdd1264016bbfeeb93436a5c46b0ddcfc79834d0446ea8c21cd8ff95bc440bbe4fda0d5b08a16c50fe9504c98c3de3cf4ce18892203518e1
SHA512
3308d9f5562babe007e46b7764718f13c1e7cd8ef7f501161353e4b1b81efacec9742ec25dec3b1cc80940898c785c1920a1aa68af10081f952ebde320075808
+DIST whois_5.3.0.tar.xz 82728 BLAKE2B
ac5e9bdd070c3a79306f79709d6450455ff74fc7c3a8c81380f79b98cdd36d25932032673710a39ec55da2220f1d0a21221e1a2b70c36e8798affe9b7f46f3bb
SHA512
a507f38254d826a9112d1f5a7888fbd4b79eeaa372977c02e4e8235509d133540ba647ddece95376f6ac704f9b1042d276051d4a3a36d10906ad11f69561432f
diff --git a/net-misc/whois/files/whois-5.3.0-libidn_automagic.patch
b/net-misc/whois/files/whois-5.3.0-libidn_automagic.patch
new file mode 100644
index 00000000000..4e01eb5668e
--- /dev/null
+++ b/net-misc/whois/files/whois-5.3.0-libidn_automagic.patch
@@ -0,0 +1,23 @@
+We don't want libidn(2) being detected automagically.
+Partially reverting upstream stupidity.
+
+--- whois-5.3.0/Makefile
++++ whois-5.3.0/Makefile
+@@ -33,17 +33,9 @@
+ DEFS += -DLOCALEDIR=\"$(BASEDIR)$(prefix)/share/locale\"
+ endif
+
+-# libidn support has been autodetected since 5.2.18
+ ifdef HAVE_LIBIDN
+-$(error Please fix your build system to stop defining HAVE_LIBIDN!)
+-endif
+-
+-ifeq ($(shell $(PKG_CONFIG) --exists 'libidn2 >= 2.0.3' || echo NO),)
+ whois_LDADD += $(shell $(PKG_CONFIG) --libs libidn2)
+ DEFS += -DHAVE_LIBIDN2 $(shell $(PKG_CONFIG) --cflags libidn2)
+-else ifeq ($(shell $(PKG_CONFIG) --exists 'libidn' || echo NO),)
+-whois_LDADD += $(shell $(PKG_CONFIG) --libs libidn)
+-DEFS += -DHAVE_LIBIDN $(shell $(PKG_CONFIG) --cflags libidn)
+ endif
+
+ ifdef HAVE_ICONV
diff --git a/net-misc/whois/whois-5.3.0.ebuild
b/net-misc/whois/whois-5.3.0.ebuild
new file mode 100644
index 00000000000..3ea3b08fc43
--- /dev/null
+++ b/net-misc/whois/whois-5.3.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs
+
+MY_P=${P/-/_}
+DESCRIPTION="improved Whois Client"
+HOMEPAGE="https://www.linux.it/~md/software/";
+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
~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="iconv idn nls"
+RESTRICT="test" #59327
+
+RDEPEND="iconv? ( virtual/libiconv )
+ idn? ( net-dns/libidn2 )
+ nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+ 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
+}
