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 815ef1fa07..3c2c97a88d 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,3 +1,2 @@
-DIST whois-5.5.20.tar.gz 109648 BLAKE2B 17b6a795ac517a81cde44530df3e835cccc020a1750ab28d50551a7bd08d132aa10768ff146b0a7943a8348cc7f3f3f7096262caf1d91fbb2d3610ae9f6473e8 SHA512 1d602ec817411a36b3d175e34f166c06186639f4eeea145751decc45372953df40fc76b57c7589d93c49ab0be1276459dffc6424a4344ddbca23f35a9f492fc7
-DIST whois-5.5.21.tar.gz 109621 BLAKE2B b1cf42f1a60e5009e5882f154432d5974f45c1bf89d8b36b73f6e5f55ff2dba02e8ca7900926d2824200f5422d5e9f00abde524d4e2d8a25ba37376cc2e8d04a SHA512 4f3ffbd875df89e910aa9d20616f2d04e773d3e5cd0c5d0262dca481fd6228214033b854ac4eebe078cfde14ab90429d826f24ce6c21ec14cfe8ad56e78ae6e9
 DIST whois-5.5.23.tar.gz 109709 BLAKE2B 4985c26b90d8afa678e8cdca2b25f7b5a55c300555c5ac1595ff0c35fb65e35bf6e5dc5733e0364172fecdc2071565f08d1fb38ff5b9671714792d6b7baa2a63 SHA512 6e2caf1ce28edcd561287ea7a072a069851caee42fd47850b8555e03dd353ad79a338ceae2f9b8fa98c0e06a16dbeef5a7a6d422a76d8a141c92d8e9e82aebc3
+DIST whois-5.6.6.tar.gz 110330 BLAKE2B bf89556c8c77a3b2ac20b8cd01f4bc7007ed642812df6958f6b89a8ea42681f3fc67cfef6a28f6d99a60adcfcd869de308cc99aab830cff755e1394fb1f7859e SHA512 eaf347cf4ed7154f5b431e895f86ce0340fc3893928d8509bf9389461e7721ed51efd89407f457ee92f6283ab9e11fc1db41c463681d57f102199479ce427601
diff --git a/sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.5.20.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.5.20.ebuild
deleted file mode 100644
index 4c9b563042..0000000000
--- a/sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.5.20.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 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"
-	#S="${WORKDIR}"/${PN}
-
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="iconv idn nls xcrypt"
-
-RDEPEND="
-	iconv? ( virtual/libiconv )
-	idn? ( net-dns/libidn2:= )
-	nls? ( virtual/libintl )
-	xcrypt? ( >=sys-libs/libxcrypt-4.1:= )
-	!xcrypt? ( virtual/libcrypt:= )
-"
-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
-	"${FILESDIR}"/${PN}-5.5.6-libxcrypt_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
-	use xcrypt && export HAVE_XCRYPT=1
-
-	tc-export CC
-
-	emake CFLAGS="${CFLAGS} ${CPPFLAGS}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" BASHCOMPDIR="$(get_bashcompdir)" install
-
-	insinto /etc
-	doins whois.conf
-	dodoc README debian/changelog
-}
diff --git a/sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.5.21.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.5.21.ebuild
deleted file mode 100644
index 4c9b563042..0000000000
--- a/sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.5.21.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 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"
-	#S="${WORKDIR}"/${PN}
-
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="iconv idn nls xcrypt"
-
-RDEPEND="
-	iconv? ( virtual/libiconv )
-	idn? ( net-dns/libidn2:= )
-	nls? ( virtual/libintl )
-	xcrypt? ( >=sys-libs/libxcrypt-4.1:= )
-	!xcrypt? ( virtual/libcrypt:= )
-"
-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
-	"${FILESDIR}"/${PN}-5.5.6-libxcrypt_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
-	use xcrypt && export HAVE_XCRYPT=1
-
-	tc-export CC
-
-	emake CFLAGS="${CFLAGS} ${CPPFLAGS}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" BASHCOMPDIR="$(get_bashcompdir)" install
-
-	insinto /etc
-	doins whois.conf
-	dodoc README debian/changelog
-}
diff --git a/sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.6.6.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.6.6.ebuild
new file mode 100644
index 0000000000..cae7e5ec96
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.6.6.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 toolchain-funcs
+
+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="https://github.com/rfc1036/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="iconv idn nls"
+
+RDEPEND="
+	virtual/libcrypt:=
+	iconv? ( virtual/libiconv )
+	idn? ( net-dns/libidn2:= )
+	nls? ( virtual/libintl )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-lang/perl-5
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.3.0-libidn_automagic.patch
+)
+
+src_prepare() {
+	default
+	if ! use nls; then
+		sed -i -e '/ENABLE_NLS/s:define:undef:' config.h || die
+	fi
+}
+
+src_configure() { :; } # expected no-op
+
+src_compile() {
+	tc-export CC PKG_CONFIG
+	local myemakeargs=(
+		prefix="${EPREFIX}/usr"
+		CONFIG_FILE="${EPREFIX}/etc/whois.conf"
+		$(usev iconv HAVE_ICONV=1)
+		$(usev idn HAVE_LIBIDN=1)
+		$(usev nls LOCALEDIR=1)
+
+		# targets
+		whois
+		mkpasswd
+		$(usev nls pos)
+	)
+	emake "${myemakeargs[@]}"
+}
+
+src_install() {
+	local myemakeargs=(
+		prefix="${EPREFIX}/usr"
+		DESTDIR="${D}"
+		BASHCOMPDIR="$(get_bashcompdir)"
+
+		# targets
+		install-whois
+		install-mkpasswd
+		install-bashcomp
+		$(usev nls install-pos)
+	)
+	emake "${myemakeargs[@]}"
+
+	insinto /etc
+	doins whois.conf
+	dodoc README debian/changelog
+}
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 2e8630e931..cae7e5ec96 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,11 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 inherit bash-completion-r1 toolchain-funcs
 
-MY_P=${P/-/_}
 DESCRIPTION="Improved Whois Client"
 HOMEPAGE="https://github.com/rfc1036/whois"
 
@@ -13,67 +12,70 @@ 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"
-	#S="${WORKDIR}"/${PN}
-
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="iconv idn nls xcrypt"
+IUSE="iconv idn nls"
 
 RDEPEND="
+	virtual/libcrypt:=
 	iconv? ( virtual/libiconv )
 	idn? ( net-dns/libidn2:= )
 	nls? ( virtual/libintl )
-	xcrypt? ( >=sys-libs/libxcrypt-4.1:= )
-	!xcrypt? ( virtual/libcrypt:= )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
-	app-arch/xz-utils
 	>=dev-lang/perl-5
 	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
+	nls? ( sys-devel/gettext )
+"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-4.7.2-config-file.patch
 	"${FILESDIR}"/${PN}-5.3.0-libidn_automagic.patch
-	"${FILESDIR}"/${PN}-5.5.6-libxcrypt_automagic.patch
 )
 
 src_prepare() {
 	default
-
-	if use nls ; then
-		sed -i -e 's:#\(.*pos\):\1:' Makefile || die
-	else
+	if ! use nls; then
 		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
+	tc-export CC PKG_CONFIG
+	local myemakeargs=(
+		prefix="${EPREFIX}/usr"
+		CONFIG_FILE="${EPREFIX}/etc/whois.conf"
+		$(usev iconv HAVE_ICONV=1)
+		$(usev idn HAVE_LIBIDN=1)
+		$(usev nls LOCALEDIR=1)
 
-	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}"
+		# targets
+		whois
+		mkpasswd
+		$(usev nls pos)
+	)
+	emake "${myemakeargs[@]}"
 }
 
 src_install() {
-	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" BASHCOMPDIR="$(get_bashcompdir)" install
+	local myemakeargs=(
+		prefix="${EPREFIX}/usr"
+		DESTDIR="${D}"
+		BASHCOMPDIR="$(get_bashcompdir)"
+
+		# targets
+		install-whois
+		install-mkpasswd
+		install-bashcomp
+		$(usev nls install-pos)
+	)
+	emake "${myemakeargs[@]}"
 
 	insinto /etc
 	doins whois.conf