diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/nasm/Manifest b/sdk_container/src/third_party/portage-stable/dev-lang/nasm/Manifest
index 6f0a396d5b..43b1e8d6ce 100644
--- a/sdk_container/src/third_party/portage-stable/dev-lang/nasm/Manifest
+++ b/sdk_container/src/third_party/portage-stable/dev-lang/nasm/Manifest
@@ -1 +1 @@
-DIST nasm-2.14.02.tar.xz 827620 BLAKE2B deb1f3c806ffbe48eefe4163271c68f02a782f75f21980331cb03e64de20da61c118621536c1c869c1629e558cab45ce98fed8443d29c1126fb4255cd6a36ce4 SHA512 c7a228095f37321d57f2813d04f58ee66949e8f81fc49ef6c4ecd391301e308217583ce1a265d4fe8c13d54b5b9c72aeb132caa3caee36e31b6555fbfff34c81
+DIST nasm-2.15.05.tar.xz 995732 BLAKE2B a41434965c2125577b762d907a0a3c251c75d9f9beac230fba4099182c7f7beb08c6d2c05c2432b0dc8ba829f24077f44c3096faea9bd0a533250e6dbbfaef35 SHA512 512f90a2584f1c5811429274b97c64a2cedf37b9fdeffb1bcd0ea64afd9ecc19a2d7877ca8f1e05393aa324153fc9f39ea51dacbf8d25a7d5a2d7728c925dba7
diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/nasm/files/nasm-2.13.03-bsd-cp-doc.patch b/sdk_container/src/third_party/portage-stable/dev-lang/nasm/files/nasm-2.15-bsd-cp-doc.patch
similarity index 68%
rename from sdk_container/src/third_party/portage-stable/dev-lang/nasm/files/nasm-2.13.03-bsd-cp-doc.patch
rename to sdk_container/src/third_party/portage-stable/dev-lang/nasm/files/nasm-2.15-bsd-cp-doc.patch
index 76c1790da2..5c7f6cfafe 100644
--- a/sdk_container/src/third_party/portage-stable/dev-lang/nasm/files/nasm-2.13.03-bsd-cp-doc.patch
+++ b/sdk_container/src/third_party/portage-stable/dev-lang/nasm/files/nasm-2.15-bsd-cp-doc.patch
@@ -4,12 +4,10 @@ In this case we can unconditionally copy files.
 
 Reported-by: Michał Górny
 Bug: https://bugs.gentoo.org/655444
-diff --git a/doc/Makefile.in b/doc/Makefile.in
-index 261a791..bc9da1e 100644
 --- a/doc/Makefile.in
 +++ b/doc/Makefile.in
 @@ -28,3 +28,3 @@ RM_RF		= rm -rf
  CP_F		= cp -f
--CP_UF		= cp -ufv
-+CP_UF		= cp -fv
+-CP_UF		= cp -uf
++CP_UF		= cp -f
  
diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/nasm/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-lang/nasm/metadata.xml
index f7462a193d..af856ea306 100644
--- a/sdk_container/src/third_party/portage-stable/dev-lang/nasm/metadata.xml
+++ b/sdk_container/src/third_party/portage-stable/dev-lang/nasm/metadata.xml
@@ -1,9 +1,9 @@
 <?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>slyfox@gentoo.org</email>
-    <name>Sergei Trofimovich</name>
+    <email>matthew@gentoo.org</email>
+    <name>Matthew Smith</name>
   </maintainer>
   <longdescription>
 The Netwide Assembler, NASM, is an 80x86 assembler designed for portability
@@ -14,7 +14,7 @@ and easy to understand, similar to Intel's but less complex. It supports
 Pentium, P6, MMX, 3DNow!, SSE and SSE2 opcodes, and has macro capability.
   </longdescription>
   <upstream>
-    <remote-id type="sourceforge">nasm</remote-id>
+    <remote-id type="github">netwide-assembler/nasm</remote-id>
     <bugs-to>https://bugzilla.nasm.us/</bugs-to>
   </upstream>
 </pkgmetadata>
diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/nasm/nasm-2.14.02.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/nasm/nasm-2.15.05.ebuild
similarity index 73%
rename from sdk_container/src/third_party/portage-stable/dev-lang/nasm/nasm-2.14.02.ebuild
rename to sdk_container/src/third_party/portage-stable/dev-lang/nasm/nasm-2.15.05.ebuild
index ebe185b58e..0e5a4eeeb3 100644
--- a/sdk_container/src/third_party/portage-stable/dev-lang/nasm/nasm-2.14.02.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-lang/nasm/nasm-2.15.05.ebuild
@@ -1,21 +1,18 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit flag-o-matic
-
 DESCRIPTION="groovy little assembler"
 HOMEPAGE="https://www.nasm.us/"
 SRC_URI="https://www.nasm.us/pub/nasm/releasebuilds/${PV/_}/${P/_}.tar.xz"
+S="${WORKDIR}"/${P/_}
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm64 ~ia64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
-RDEPEND=""
-DEPEND=""
 # [fonts note] doc/psfonts.ph defines ordered list of font preference.
 # Currently 'media-fonts/source-pro' is most preferred and is able to
 # satisfy all 6 font flavours: tilt, chapter, head, etc.
@@ -30,17 +27,10 @@ BDEPEND="
 	)
 "
 
-S=${WORKDIR}/${P/_}
-
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.13.03-bsd-cp-doc.patch
+	"${FILESDIR}"/${PN}-2.15-bsd-cp-doc.patch
 )
 
-src_configure() {
-	strip-flags
-	default
-}
-
 src_compile() {
 	default
 	use doc && emake doc