diff --git a/sdk_container/src/third_party/portage-stable/dev-util/checkbashisms/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/checkbashisms/Manifest
index 171f0d7ca6..fdcf0a4005 100644
--- a/sdk_container/src/third_party/portage-stable/dev-util/checkbashisms/Manifest
+++ b/sdk_container/src/third_party/portage-stable/dev-util/checkbashisms/Manifest
@@ -1,2 +1,2 @@
-DIST devscripts_2.17.8.tar.xz 696424 SHA256 7e39e296891d2d158b717c0c834cc0c5ab560e5c7d88910e42bf59cda10fbeea SHA512 1495a754346ec3903cb91d9d937b74a1d6a928a84028d19016b7a2d0df5c0f665aba7c777952ae57f5f8b421b696cf631c7a139ea68a98f31030c83b6e67d349 WHIRLPOOL d146b5e3317278b21c49c34af29877e0bb8f463c6bca9ec037953d0da9b53c8aea863d27691fe95667ebedc2d7b1d209d2593b51083537f9c0d8956a34b45855
-DIST devscripts_2.17.9.tar.xz 696500 SHA256 0ef164a9b8e774e8aef7a532302e7ce60ba10a72e56da485865222e68033b73b SHA512 00bc2fea2aa2f5806f6ecedee96c09c0ff31d99283e7b242f85c04a63310ada692df2bbef0cfde73dbcf3ac455026a5262b298fb2348528f2a9d7ce7916d97dd WHIRLPOOL 867d946c6d598ccb67e2e19a872c033d9c22b7b270cf2eadbc81da0d1d4a42d444cc705bff69b6b2e35006d72f6131ee101e34ced34faa8e89da7f950aca5c81
+DIST devscripts_2.21.2.tar.xz 980516 BLAKE2B 907f2f4e258a8396ad0a28eead1e2058b8e19be205f024ea80c0fbd9621d5ca4299844fe83d66cac7f653a917705d9c36eddb9d51454a7fbb9d7e2b52bc994ff SHA512 a6765d807dc0c2ef7a3d8c59e1262bfe7542c3ca52cda3c1910af253925cb105a9d1bf272c76a86f0b3cdda9c8a4e2d29a660437f73087dd70ee8a444bbedb01
+DIST devscripts_2.21.4.tar.xz 981488 BLAKE2B 29339490586a66c6360f599a90e23452fd1e99fd01757e258e082b9550731b3e443b12fb9ce9b8fe6fb229f228a115f87a9b91b8769000afd741eb77e9e7a4a4 SHA512 99250737cabc24bbd21e20de7c787e182492e15cad4288226ed497349cbf3dd45927e1c501d73341e48dfd14ee2285c8cca8ac3b2145c2f02ce4d04ddb881e50
diff --git a/sdk_container/src/third_party/portage-stable/dev-util/checkbashisms/checkbashisms-2.17.9.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/checkbashisms/checkbashisms-2.21.2.ebuild
similarity index 67%
rename from sdk_container/src/third_party/portage-stable/dev-util/checkbashisms/checkbashisms-2.17.9.ebuild
rename to sdk_container/src/third_party/portage-stable/dev-util/checkbashisms/checkbashisms-2.21.2.ebuild
index 8524418c7c..8078bd1b9a 100644
--- a/sdk_container/src/third_party/portage-stable/dev-util/checkbashisms/checkbashisms-2.17.9.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-util/checkbashisms/checkbashisms-2.21.2.ebuild
@@ -1,34 +1,31 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MY_PN="devscripts"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Perl script to check for commonly used bash features not defined by POSIX"
-HOMEPAGE="https://packages.debian.org/devscripts https://anonscm.debian.org/cgit/collab-maint/devscripts.git"
+HOMEPAGE="https://packages.debian.org/devscripts https://salsa.debian.org/debian/devscripts"
 SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_P/-/_}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE=""
 
 # Requires python packages to check tools we don't need anyway
 RESTRICT="test"
 
 RDEPEND="dev-lang/perl
-	virtual/perl-Getopt-Long
-	!<dev-util/rpmdevtools-8.3-r1"
+	virtual/perl-Getopt-Long"
 
 S="${WORKDIR}/${MY_P}/scripts"
 
 src_prepare() {
 	default
 
-	eapply -p2 "${FILESDIR}"/${PN}-2.15.9-command-vV.patch
-
 	sed "s@###VERSION###@${PV}@" -i checkbashisms.pl || die
 }
 
diff --git a/sdk_container/src/third_party/portage-stable/dev-util/checkbashisms/checkbashisms-2.17.8.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/checkbashisms/checkbashisms-2.21.4.ebuild
similarity index 62%
rename from sdk_container/src/third_party/portage-stable/dev-util/checkbashisms/checkbashisms-2.17.8.ebuild
rename to sdk_container/src/third_party/portage-stable/dev-util/checkbashisms/checkbashisms-2.21.4.ebuild
index ac906202e7..0c7a74637d 100644
--- a/sdk_container/src/third_party/portage-stable/dev-util/checkbashisms/checkbashisms-2.17.8.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-util/checkbashisms/checkbashisms-2.21.4.ebuild
@@ -1,37 +1,28 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 MY_PN="devscripts"
 MY_P="${MY_PN}-${PV}"
 
-inherit eutils
-
 DESCRIPTION="Perl script to check for commonly used bash features not defined by POSIX"
-HOMEPAGE="https://packages.debian.org/devscripts https://anonscm.debian.org/cgit/collab-maint/devscripts.git"
+HOMEPAGE="https://packages.debian.org/devscripts https://salsa.debian.org/debian/devscripts"
 SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_P/-/_}.tar.xz"
+S="${WORKDIR}/${MY_P}/scripts"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 # Requires python packages to check tools we don't need anyway
 RESTRICT="test"
 
 RDEPEND="dev-lang/perl
-	virtual/perl-Getopt-Long
-	!<dev-util/rpmdevtools-8.3-r1"
-
-S="${WORKDIR}/${MY_P}/scripts"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.15.9-command-vV.patch
-)
+	virtual/perl-Getopt-Long"
 
 src_prepare() {
-	epatch "${PATCHES[@]}"
+	default
 
 	sed "s@###VERSION###@${PV}@" -i checkbashisms.pl || die
 }
diff --git a/sdk_container/src/third_party/portage-stable/dev-util/checkbashisms/files/checkbashisms-2.15.9-command-vV.patch b/sdk_container/src/third_party/portage-stable/dev-util/checkbashisms/files/checkbashisms-2.15.9-command-vV.patch
deleted file mode 100644
index 662ccdfd2b..0000000000
--- a/sdk_container/src/third_party/portage-stable/dev-util/checkbashisms/files/checkbashisms-2.15.9-command-vV.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://bugs.debian.org/733511
-
-From 50dac50bdfa7ab482bf2277cc1a620a62629c80c Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Tue, 10 Nov 2015 19:39:19 -0500
-Subject: [PATCH] checkbashisms: allow `command` to use -v/-V
-
-POSIX permits the -v/-V options:
-http://pubs.opengroup.org/onlinepubs/9699919799/utilities/command.html
-command [-p][-v|-V] command_name
----
- scripts/checkbashisms.pl | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/scripts/checkbashisms.pl b/scripts/checkbashisms.pl
-index 045328c..fe64a6b 100755
---- a/scripts/checkbashisms.pl
-+++ b/scripts/checkbashisms.pl
-@@ -644,7 +644,7 @@ sub init_hashes {
- 	qr';;?&' =>  q<;;& and ;& special case operators>,
- 	$LEADIN . qr'jobs\s' =>  q<jobs>,
- #	$LEADIN . qr'jobs\s+-[^lp]\s' =>  q<'jobs' with option other than -l or -p>,
--	$LEADIN . qr'command\s+-[^p]\s' =>  q<'command' with option other than -p>,
-+	$LEADIN . qr'command\s+-[^pvV]\s' =>  q<'command' with option other than -p/-v/-V>,
- 	$LEADIN . qr'setvar\s' =>  q<setvar 'foo' 'bar' should be eval 'foo="'"$bar"'"'>,
- 	$LEADIN . qr'trap\s+["\']?.*["\']?\s+.*(?:ERR|DEBUG|RETURN)' => q<trap with ERR|DEBUG|RETURN>,
- 	$LEADIN . qr'(?:exit|return)\s+-\d' => q<exit|return with negative status code>,
--- 
-2.6.2
-
diff --git a/sdk_container/src/third_party/portage-stable/dev-util/checkbashisms/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-util/checkbashisms/metadata.xml
index 8491585905..28866513f7 100644
--- a/sdk_container/src/third_party/portage-stable/dev-util/checkbashisms/metadata.xml
+++ b/sdk_container/src/third_party/portage-stable/dev-util/checkbashisms/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
     <email>robbat2@gentoo.org</email>