From 76a55953593fc3f30d74a466f2c2adf7960fc896 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 19 Oct 2022 10:22:16 +0200 Subject: [PATCH] net-misc/whois: Sync with Gentoo It's from Gentoo commit 7ef76bbf5cdac2c3da2bd8e3ba295ad1e8855870. --- .../portage-stable/net-misc/whois/Manifest | 4 +- ....5.10-r1.ebuild => whois-5.5.13-r1.ebuild} | 38 +++++++++---------- ...hois-5.5.11.ebuild => whois-5.5.14.ebuild} | 27 +++++++------ .../net-misc/whois/whois-9999.ebuild | 29 +++++++------- 4 files changed, 52 insertions(+), 46 deletions(-) rename sdk_container/src/third_party/portage-stable/net-misc/whois/{whois-5.5.10-r1.ebuild => whois-5.5.13-r1.ebuild} (70%) rename sdk_container/src/third_party/portage-stable/net-misc/whois/{whois-5.5.11.ebuild => whois-5.5.14.ebuild} (74%) diff --git a/sdk_container/src/third_party/portage-stable/net-misc/whois/Manifest b/sdk_container/src/third_party/portage-stable/net-misc/whois/Manifest index 2ba008a3ee..71c9ea9aae 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/whois/Manifest +++ b/sdk_container/src/third_party/portage-stable/net-misc/whois/Manifest @@ -1,2 +1,2 @@ -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.13.tar.xz 87384 BLAKE2B 6ce90ad907c4ea79301adbcda5a402344df9f283ac258a3186f5c405e0abfb97f603f3f163652f1cf03a1fc60290b8f9f54b509bf7d9fd3cec12189eeeaaffe5 SHA512 b4a70cc6d58133287d70775ecd8173c255f800362639a3e2dea0d3d56c35405b7fc93c4c220cc50cbd15ae5ae402a59bd15f99e98a7cccb314f82a205aa7ee61 +DIST whois_5.5.14.tar.xz 87480 BLAKE2B 868c9dc968581535ee2b56a6293f634e2c8dc6c00703a45d4ca4f0ce6769786ee4921bd66f3a470b2a7f31808db2971b284c23b76b608bff1edbb7bbe37f892a SHA512 f190d488d7bd68717c0a83ca85709fad09c33b619c46d7e0dd12e79621fdba56b9d43480c25ef3c9df2f6ade0ee72d692bfc5d0bd96839ef92194004313d1cc6 diff --git a/sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.5.10-r1.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.5.13-r1.ebuild similarity index 70% rename from sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.5.10-r1.ebuild rename to sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.5.13-r1.ebuild index 633807559d..1c3e8e21b3 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.5.10-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.5.13-r1.ebuild @@ -1,36 +1,36 @@ -# Copyright 1999-2021 Gentoo Authors +# 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" +MY_P=${P/-/_} +DESCRIPTION="Improved Whois Client" HOMEPAGE="https://github.com/rfc1036/whois" -if [[ "${PV}" == *9999 ]] ; then + +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" + 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" + S="${WORKDIR}"/${PN} + + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" fi + LICENSE="GPL-2" SLOT="0" IUSE="iconv idn nls xcrypt" -RESTRICT="test" #59327 -RDEPEND=" - iconv? ( virtual/libiconv ) +RDEPEND="iconv? ( virtual/libiconv ) idn? ( net-dns/libidn2:= ) nls? ( virtual/libintl ) xcrypt? ( >=sys-libs/libxcrypt-4.1:= ) - !xcrypt? ( virtual/libcrypt:= ) -" + !xcrypt? ( virtual/libcrypt:= )" DEPEND="${RDEPEND}" -BDEPEND=" - app-arch/xz-utils +BDEPEND="app-arch/xz-utils >=dev-lang/perl-5 virtual/pkgconfig nls? ( sys-devel/gettext )" @@ -43,6 +43,7 @@ PATCHES=( src_prepare() { default + if use nls ; then sed -i -e 's:#\(.*pos\):\1:' Makefile || die else @@ -58,21 +59,20 @@ 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 [[ ${USERLAND} != "GNU" ]]; then - mv "${ED}"/usr/share/man/man1/{whois,mdwhois}.1 || die - mv "${ED}"/usr/bin/{whois,mdwhois} || die - fi } diff --git a/sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.5.11.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.5.14.ebuild similarity index 74% rename from sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.5.11.ebuild rename to sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.5.14.ebuild index 290ecaeceb..4c1dfcda83 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.5.11.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.5.14.ebuild @@ -5,21 +5,24 @@ EAPI=7 inherit toolchain-funcs -MY_P="${P/-/_}" -DESCRIPTION="improved Whois Client" +MY_P=${P/-/_} +DESCRIPTION="Improved Whois Client" HOMEPAGE="https://github.com/rfc1036/whois" -if [[ "${PV}" == *9999 ]] ; then + +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" + 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" + S="${WORKDIR}"/${PN} + + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" fi + LICENSE="GPL-2" SLOT="0" IUSE="iconv idn nls xcrypt" -RESTRICT="test" #59327 RDEPEND=" iconv? ( virtual/libiconv ) @@ -43,6 +46,7 @@ PATCHES=( src_prepare() { default + if use nls ; then sed -i -e 's:#\(.*pos\):\1:' Makefile || die else @@ -58,21 +62,20 @@ 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 [[ ${USERLAND} != "GNU" ]]; then - mv "${ED}"/usr/share/man/man1/{whois,mdwhois}.1 || die - mv "${ED}"/usr/bin/{whois,mdwhois} || die - fi } diff --git a/sdk_container/src/third_party/portage-stable/net-misc/whois/whois-9999.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/whois/whois-9999.ebuild index 350b7b60b3..4c1dfcda83 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/whois/whois-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-misc/whois/whois-9999.ebuild @@ -1,25 +1,28 @@ -# Copyright 1999-2021 Gentoo Authors +# 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" +MY_P=${P/-/_} +DESCRIPTION="Improved Whois Client" HOMEPAGE="https://github.com/rfc1036/whois" -if [[ "${PV}" == *9999 ]] ; then + +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" + 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" + S="${WORKDIR}"/${PN} + + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" fi + LICENSE="GPL-2" SLOT="0" IUSE="iconv idn nls xcrypt" -RESTRICT="test" #59327 RDEPEND=" iconv? ( virtual/libiconv ) @@ -43,6 +46,7 @@ PATCHES=( src_prepare() { default + if use nls ; then sed -i -e 's:#\(.*pos\):\1:' Makefile || die else @@ -58,21 +62,20 @@ 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 [[ ${USERLAND} != "GNU" ]]; then - mv "${ED}"/usr/share/man/man1/{whois,mdwhois}.1 || die - mv "${ED}"/usr/bin/{whois,mdwhois} || die - fi }