diff --git a/sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.5.17.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.5.17-r1.ebuild
similarity index 93%
rename from sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.5.17.ebuild
rename to sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.5.17-r1.ebuild
index aa2706ce44..6d1a89e730 100644
--- a/sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.5.17.ebuild
+++ b/sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.5.17-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit toolchain-funcs
+inherit bash-completion-r1 toolchain-funcs
 
 MY_P=${P/-/_}
 DESCRIPTION="Improved Whois Client"
@@ -73,7 +73,7 @@ src_compile() {
 }
 
 src_install() {
-	emake BASEDIR="${ED}" prefix=/usr install
+	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" BASHCOMPDIR="$(get_bashcompdir)" install
 
 	insinto /etc
 	doins whois.conf
diff --git a/sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.5.18.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.5.18-r1.ebuild
similarity index 93%
rename from sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.5.18.ebuild
rename to sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.5.18-r1.ebuild
index 7d0d51aff2..73f366159b 100644
--- a/sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.5.18.ebuild
+++ b/sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.5.18-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit toolchain-funcs
+inherit bash-completion-r1 toolchain-funcs
 
 MY_P=${P/-/_}
 DESCRIPTION="Improved Whois Client"
@@ -73,7 +73,7 @@ src_compile() {
 }
 
 src_install() {
-	emake BASEDIR="${ED}" prefix=/usr install
+	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" BASHCOMPDIR="$(get_bashcompdir)" install
 
 	insinto /etc
 	doins whois.conf
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 7d0d51aff2..73f366159b 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
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit toolchain-funcs
+inherit bash-completion-r1 toolchain-funcs
 
 MY_P=${P/-/_}
 DESCRIPTION="Improved Whois Client"
@@ -73,7 +73,7 @@ src_compile() {
 }
 
 src_install() {
-	emake BASEDIR="${ED}" prefix=/usr install
+	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" BASHCOMPDIR="$(get_bashcompdir)" install
 
 	insinto /etc
 	doins whois.conf