* [gentoo-commits] repo/gentoo:master commit in: net-misc/whois/files/, net-misc/whois/
@ 2017-01-17 16:23 Lars Wendler
0 siblings, 0 replies; 2+ messages in thread
From: Lars Wendler @ 2017-01-17 16:23 UTC (permalink / raw
To: gentoo-commits
commit: ca807e03e7a5023e638e3eaf9308826d79005bd7
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 17 15:45:43 2017 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Jan 17 16:23:25 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca807e03
net-misc/whois: Removed old.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
net-misc/whois/Manifest | 2 -
net-misc/whois/files/whois-5.1.5-po_fixes.patch | 22 ---------
net-misc/whois/whois-5.1.5.ebuild | 62 -------------------------
net-misc/whois/whois-5.2.13.ebuild | 61 ------------------------
4 files changed, 147 deletions(-)
diff --git a/net-misc/whois/Manifest b/net-misc/whois/Manifest
index 913cf7f..04ed37f 100644
--- a/net-misc/whois/Manifest
+++ b/net-misc/whois/Manifest
@@ -1,4 +1,2 @@
-DIST whois_5.1.5.tar.xz 77176 SHA256 d4a192d6208f1ed3856b5089e2de5fc986031c96148b97c9ef43af7a21af1a9d SHA512 99fb43494aa7ff809055e31679eecb1d8a2a1276c54e550a9559cbca84c4ed7044953bf86f9f155e28f4a3c9d78f7c87ec28188f971c8f30e07d4ca5ef03c8eb WHIRLPOOL 62e2a2b4dcbcf4bb2b2cf320f0ea6a4286e512c032e9d22ba355d60c5a4dd5fea5a23b7db8ec40fcebea9b7e2699dea923484b7176f7fe48f63f5239f456ee7b
DIST whois_5.2.12.tar.xz 80428 SHA256 b26d4027b8987d9911466aa06ce2c167a50017cd59a622a429bd506222f6cdf1 SHA512 df40e2e7cbd11d00984f865e122ad4ece882a6a45e2f75ad5ea24ce937b7e9452b01fd886f43bae55fd065a6556cfc4577e7126151b5fd43fa806c4b0c886ced WHIRLPOOL a2c5a3e9f01dd0cbb127269632c60e6c71c981df4d4e53fdf37e2c1932252f3ae2b13961a1c8606b542fd9997bf9fcb62a6cef592a01dbd04ff18c75e3f9b3ec
-DIST whois_5.2.13.tar.xz 82148 SHA256 cc83a9b93c47e0334aa812d7d731972cf09aceb59235d452525a77cd6f5f6b64 SHA512 0c9028021415e69116e891696c86b26cbab17f861829fe5f9a5ed1528f7e6d8406890a8d1afdeb17e41856eaa076fe7417557034b20bb59109b9fc5970ad05c7 WHIRLPOOL d911883b79e76dd988d56a14eafa25a373d92918df45424349e38a1c1650a622c3d8db4302a84b9141cd1f94c1777c763752b401b64f44d2987df4b784630d77
DIST whois_5.2.14.tar.xz 81888 SHA256 a41daf41abed0fbfa8c9c4b0e4a3f5f22d9876dd6feb9091aac12f8f4c38b0d2 SHA512 b276401c9b153c63d69a7f126e4813517fffb9368e899af979f71f338f1747b564b2ddf48a323f179c06f03a8e13c38813017add6bfa2b15fdc3a73b05630b13 WHIRLPOOL 33f830312bec66ca20cc037afd2c42c2f2b1bd669c697953f9d058e48424344bdef437b2a59f8da0512aa09524e0409eb3dd710b40498659430a444b1cf205de
diff --git a/net-misc/whois/files/whois-5.1.5-po_fixes.patch b/net-misc/whois/files/whois-5.1.5-po_fixes.patch
deleted file mode 100644
index 904b97a..00000000
--- a/net-misc/whois/files/whois-5.1.5-po_fixes.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- whois-5.1.5/po/eu.po
-+++ whois-5.1.5/po/eu.po
-@@ -11,7 +11,7 @@
- "PO-Revision-Date: 2002-08-24 16:22+0200\n"
- "Last-Translator: Aitor Ibaez <aitiba@gmail.com>\n"
- "Language-Team: Euskara <Librezale@librezale.org>\n"
--"Language: \n"
-+"Language: eu\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
---- whois-5.1.5/po/pt_BR.po
-+++ whois-5.1.5/po/pt_BR.po
-@@ -11,7 +11,7 @@
- "PO-Revision-Date: 2006-04-26 21:03-0300\n"
- "Last-Translator: Anderson Goulart <globalx@gmail.com>\n"
- "Language-Team: Portuguese/Brazil\n"
--"Language: \n"
-+"Language: pt_BR\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=iso-8859-1\n"
- "Content-Transfer-Encoding: 8bit\n"
diff --git a/net-misc/whois/whois-5.1.5.ebuild b/net-misc/whois/whois-5.1.5.ebuild
deleted file mode 100644
index 37b8093..00000000
--- a/net-misc/whois/whois-5.1.5.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit eutils toolchain-funcs
-
-MY_P=${P/-/_}
-DESCRIPTION="improved Whois Client"
-HOMEPAGE="http://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 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-IUSE="iconv idn nls"
-RESTRICT="test" #59327
-
-RDEPEND="iconv? ( virtual/libiconv )
- idn? ( net-dns/libidn )
- nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
- app-arch/xz-utils
- >=dev-lang/perl-5
- nls? ( sys-devel/gettext )"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-4.7.2-config-file.patch \
- "${FILESDIR}"/${PN}-5.1.5-po_fixes.patch
-
- 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.2.13.ebuild b/net-misc/whois/whois-5.2.13.ebuild
deleted file mode 100644
index 826db9c..00000000
--- a/net-misc/whois/whois-5.2.13.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-MY_P=${P/-/_}
-DESCRIPTION="improved Whois Client"
-HOMEPAGE="http://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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-IUSE="iconv idn nls"
-RESTRICT="test" #59327
-
-RDEPEND="iconv? ( virtual/libiconv )
- idn? ( net-dns/libidn )
- nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
- app-arch/xz-utils
- >=dev-lang/perl-5
- nls? ( sys-devel/gettext )"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-4.7.2-config-file.patch
-
- 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
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/whois/files/, net-misc/whois/
@ 2018-01-21 10:40 Lars Wendler
0 siblings, 0 replies; 2+ messages in thread
From: Lars Wendler @ 2018-01-21 10:40 UTC (permalink / raw
To: gentoo-commits
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
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-01-21 10:40 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-01-21 10:40 [gentoo-commits] repo/gentoo:master commit in: net-misc/whois/files/, net-misc/whois/ Lars Wendler
-- strict thread matches above, loose matches on Subject: below --
2017-01-17 16:23 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox