diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/whois-5.2.15 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/whois-5.2.15 deleted file mode 100644 index 62d19dad1b..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/whois-5.2.15 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install prepare -DEPEND=iconv? ( virtual/libiconv ) idn? ( net-dns/libidn ) nls? ( virtual/libintl ) app-arch/xz-utils >=dev-lang/perl-5 nls? ( sys-devel/gettext ) -DESCRIPTION=improved Whois Client -EAPI=5 -HOMEPAGE=http://www.linux.it/~md/software/ -IUSE=iconv idn nls -KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux -LICENSE=GPL-2 -RDEPEND=iconv? ( virtual/libiconv ) idn? ( net-dns/libidn ) nls? ( virtual/libintl ) -RESTRICT=test -SLOT=0 -SRC_URI=mirror://debian/pool/main/w/whois/whois_5.2.15.tar.xz -_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 -_md5_=f3c1294e4675565afa0229e8256c9907 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/whois-5.2.14 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/whois-5.2.17 similarity index 59% rename from sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/whois-5.2.14 rename to sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/whois-5.2.17 index 9b9ba09da2..afa40d6f85 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/whois-5.2.14 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/whois-5.2.17 @@ -1,7 +1,7 @@ DEFINED_PHASES=compile configure install prepare DEPEND=iconv? ( virtual/libiconv ) idn? ( net-dns/libidn ) nls? ( virtual/libintl ) app-arch/xz-utils >=dev-lang/perl-5 nls? ( sys-devel/gettext ) DESCRIPTION=improved Whois Client -EAPI=5 +EAPI=6 HOMEPAGE=http://www.linux.it/~md/software/ IUSE=iconv idn nls KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux @@ -9,6 +9,6 @@ LICENSE=GPL-2 RDEPEND=iconv? ( virtual/libiconv ) idn? ( net-dns/libidn ) nls? ( virtual/libintl ) RESTRICT=test SLOT=0 -SRC_URI=mirror://debian/pool/main/w/whois/whois_5.2.14.tar.xz -_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 -_md5_=f3c1294e4675565afa0229e8256c9907 +SRC_URI=mirror://debian/pool/main/w/whois/whois_5.2.17.tar.xz +_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 +_md5_=80451e39f9fdd3596272e1dff7b10915 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 d2fc4e4f3b..61246a0a50 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,10 +1,3 @@ -AUX whois-4.7.2-config-file.patch 198 SHA256 b7ad9cb716a8dbd1bb64dc80c1d4460c4a5661ba9420b771f9323c4337dbbea2 SHA512 1b2363abaae196390acdca8c04e7af9a2de14038e305b08c0780d272855d05b3ab06bee1157288f6a123ce072fd03b5ddb64be60faa091599eff92557ba3f4d3 WHIRLPOOL 02ca8ea0d8d864ad2fb94c2d8d36ddafd7a91195d08c5f30579893181b23f08c4a8821b2981b70dd23edeb630c7cd0869de8ab1cc7e7c85413e499629e2abab7 DIST whois_5.2.12.tar.xz 80428 SHA256 b26d4027b8987d9911466aa06ce2c167a50017cd59a622a429bd506222f6cdf1 SHA512 df40e2e7cbd11d00984f865e122ad4ece882a6a45e2f75ad5ea24ce937b7e9452b01fd886f43bae55fd065a6556cfc4577e7126151b5fd43fa806c4b0c886ced WHIRLPOOL a2c5a3e9f01dd0cbb127269632c60e6c71c981df4d4e53fdf37e2c1932252f3ae2b13961a1c8606b542fd9997bf9fcb62a6cef592a01dbd04ff18c75e3f9b3ec -DIST whois_5.2.15.tar.xz 82048 SHA256 7a5a6b690bfc6360d92d9328adbe5c1f096a41f0d6548ce0df4aa664dcb37188 SHA512 b84aaa19ed12e2c3fd1d90095054b45619158e33d12e818980afb460aa3d6272363c7ad31012a6bf048e56066d31f886587e9cd1de9dc0e31ab4b6266d8b5054 WHIRLPOOL 573863ef06a440ff541e3996f74b034529fa4cf6a12ee523bc01d80ceff2ce6f5c468a4340392fa3b5d143481d9a959dec682eb784f0050f2dd929c8e549f0b3 DIST whois_5.2.16.tar.xz 82108 SHA256 e9d208b61ccea96b611e522d30fb753dbefed0d44cfabe346e1928690453fc3a SHA512 08e75edbdab2c094150b92570e04de0fc10d42a18643e404262bef4366338bd67a4f23cef248660a4c2a435825cf5ebcc396c71d5702905ca97746686a5c8f06 WHIRLPOOL 2a8db3a9ac764ee31712b312a6c3408932fb98d98404a50bb6f1f7ca4a59e850a8e9434f8cc7372d1e8769d1d0711f82161027d6146eef0ae33f64e329f8be5c -EBUILD whois-5.2.12.ebuild 1493 SHA256 752edb04b06d9c626ffec710db50b0ece60884b78743565b2e0fbf20635617c5 SHA512 9b6a1560751cf9463f88ece760ca314cfc20917a2db728183b65ab348e98f489717e17acd17ac4a4154c1c63edac46ced38d69f1e2e6d6c42291ad90e39b27fb WHIRLPOOL fb4bf78f11177334460413250ade6ba666f2c6a0940b0bac381e05641d14b4f047d0d055e48a29bde20152bc6a0930ecd8d531f249f7992657a0a1d819a7570a -EBUILD whois-5.2.15.ebuild 1506 SHA256 a1c773b2d964bb99e5fe21211dc3510956b8a0ea622357c2b715bcf0e03ffe47 SHA512 805ce1c3d2c07ec445426133208545f887aeeb7d9553f3f94291cf9e71e0f7a834ba2efc7fc2f738a713a3d57465e95be283cc2978efba488e8c187ca5cd215a WHIRLPOOL e309b904eaeba852fa7e14c8c7177706236edab53e3983aac8b934b966fb97857726a4a87d8f72721270a71eee644d5fea0bda4ec1e2001d66a7ed73c692bc19 -EBUILD whois-5.2.16.ebuild 1506 SHA256 a1c773b2d964bb99e5fe21211dc3510956b8a0ea622357c2b715bcf0e03ffe47 SHA512 805ce1c3d2c07ec445426133208545f887aeeb7d9553f3f94291cf9e71e0f7a834ba2efc7fc2f738a713a3d57465e95be283cc2978efba488e8c187ca5cd215a WHIRLPOOL e309b904eaeba852fa7e14c8c7177706236edab53e3983aac8b934b966fb97857726a4a87d8f72721270a71eee644d5fea0bda4ec1e2001d66a7ed73c692bc19 -MISC ChangeLog 4684 SHA256 09aa77a369c9a3a38a054b05ee4027da63e30bf22860344b32572cb74ea98ba4 SHA512 8eede489ca3d68856fd91486e256cdb782b33682cfe4c08f4f85ea2c63c2752e47d47c7463844aa4f1f180078734f2128238addcb1236b66359752a09e22c761 WHIRLPOOL 0925454c25dcb48c4f5a8d1f6cbdba024734b4375a3237a576d897334ea68a7344b0badb6448eb7fd6436792d9dd62ad53bd60cb04fc7f7883354961c9e442c1 -MISC ChangeLog-2015 27688 SHA256 9fae1217e514122384e797d575b6c7769d7ebe7b4ec6885be6b921c6f7a6e44e SHA512 a892cbb5db4af5ebd5d03bbcc660ea5159e3edadbbdb552e2ee99f2dd9e907555dcf5e3218ae48d504feba74d9b2c69d4aafb2f453f59a433bd45e0d21f6707f WHIRLPOOL ab11384acce69d4388514f5c34a676717b5549cdceea3372bfc61a3b6169757655a7e16434400d6b47fcd4513ddde028269f1e3cfc9f2fbf0767765163153a11 -MISC metadata.xml 253 SHA256 d82c33ef453113a5c1ebe250dcba373c22934a69b0a86c6ab15a5ca589c25b91 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 WHIRLPOOL e5aee23acff864609953a1e4de768f0e4aef704b44c53c021f28573e1ca5c99f1a46d92935ecec2449f7b4419a36d8373127d0ecfa8d7bae72d835e1839eb3f8 +DIST whois_5.2.17.tar.xz 82360 SHA256 257585678f571e18964667b41dc6543fe9da6123ac95743660c9c3ae1eba9664 SHA512 b65de384ac935518bde0cee42f46f4bf99dc94e94e411b103df8eb73291c317409837adba2a358dfebdae6e1c46d85ccfe8debf86233be64eb91ebfe86a29152 WHIRLPOOL 4ed1eca099fd1c4337e555564b37e604b4115ca520b751531470c5e70ab9013a3e43a3db3318307e04b10d357743bd2495cdf2051c159a3a661c36d29f919af2 diff --git a/sdk_container/src/third_party/portage-stable/net-misc/whois/files/whois-4.7.2-config-file.patch b/sdk_container/src/third_party/portage-stable/net-misc/whois/files/whois-4.7.2-config-file.patch index 24ffb3de9a..da91d5a713 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/whois/files/whois-4.7.2-config-file.patch +++ b/sdk_container/src/third_party/portage-stable/net-misc/whois/files/whois-4.7.2-config-file.patch @@ -2,8 +2,8 @@ Enable /etc/whois.conf support. http://bugs.gentoo.org/show_bug.cgi?id=89417 ---- config.h -+++ config.h +--- a/config.h ++++ b/config.h @@ -13,5 +13,3 @@ /* Configuration file */ -/* diff --git a/sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.2.15.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.2.15.ebuild deleted file mode 100644 index e14820d2ef..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.2.15.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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 ~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/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 -} diff --git a/sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.2.14.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.2.17.ebuild similarity index 93% rename from sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.2.14.ebuild rename to sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.2.17.ebuild index e14820d2ef..68d961e766 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.2.14.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.2.17.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils toolchain-funcs +EAPI=6 +inherit toolchain-funcs MY_P=${P/-/_} DESCRIPTION="improved Whois Client" @@ -23,9 +23,12 @@ DEPEND="${RDEPEND} >=dev-lang/perl-5 nls? ( sys-devel/gettext )" -src_prepare() { - epatch "${FILESDIR}"/${PN}-4.7.2-config-file.patch +PATCHES=( + "${FILESDIR}"/${PN}-4.7.2-config-file.patch +) +src_prepare() { + default if use nls ; then sed -i -e 's:#\(.*pos\):\1:' Makefile || die else