diff --git a/sdk_container/src/third_party/portage-stable/media-libs/libpng/Manifest b/sdk_container/src/third_party/portage-stable/media-libs/libpng/Manifest
index cff7dcacd3..ae09296f49 100644
--- a/sdk_container/src/third_party/portage-stable/media-libs/libpng/Manifest
+++ b/sdk_container/src/third_party/portage-stable/media-libs/libpng/Manifest
@@ -1,2 +1,2 @@
-DIST libpng-1.6.37-apng.patch.gz 10334 BLAKE2B 98660f2c13a78c93f937adf2859447cb0e6fa014b2ef6f0571c910593d94cc0a50137d271dbded0b571a3bc0ce4e9f765be48130ee4ae89884fb7292a1b0cf6e SHA512 a9365257a33d67d7e7284494a37747bb1f3ab89f42a1730f2745c604538f59861828dc91d9bc1d08a5b79ab2f4eef1bb9e438dda1774b3548a1c56be77f8435f
-DIST libpng-1.6.37.tar.xz 1012272 BLAKE2B 48e8f48a88e0db6fcbc0c0f1a4d5bda6e6c8b03255bacdc60e353256ae41ccc01b5b2a7e0e7b0dea236c53a3b9d1dd89d4bb19445afbebc37bf0f92691452424 SHA512 59e8c1059013497ae616a14c3abbe239322d3873c6ded0912403fc62fb260561768230b6ab997e2cccc3b868c09f539fd13635616b9fa0dd6279a3f63ec7e074
+DIST libpng-1.6.38-apng.patch.gz 10766 BLAKE2B 3aa4bf28f5854f3dbafd1b1e92a1b80b23b59279286f730babcb091369c266ab93427223f79c8797139a6624bd41a3485064faedde47680048804ef6d41f892a SHA512 e8cb74d9be6bcbc474b6bbd6200ab5d5111e91d3ab601e5fda04213d2800a4051f04152fa5d47db690612ed06a488ff3b2608a8f0bac0cf207d486107d98da1f
+DIST libpng-1.6.39.tar.xz 1020552 BLAKE2B f0a2e643e921587334349f48758e61e69b4708ebc36575567767087878d262d134eeeb98fea7f0b6ff1493ea954910ca1608b10fea57196aad770eb807a9006e SHA512 ce233bb58d70b391b7dc858a132a8f9f66a9e30f5b387426317fdd5e76e8395e00ec36324e5e2caec8fda49a3f2b13fe27594a3466fdf2020ec7520e79a608c9
diff --git a/sdk_container/src/third_party/portage-stable/media-libs/libpng/libpng-1.6.37-r2.ebuild b/sdk_container/src/third_party/portage-stable/media-libs/libpng/libpng-1.6.39.ebuild
similarity index 56%
rename from sdk_container/src/third_party/portage-stable/media-libs/libpng/libpng-1.6.37-r2.ebuild
rename to sdk_container/src/third_party/portage-stable/media-libs/libpng/libpng-1.6.39.ebuild
index 38d7b6e619..f1c9336b51 100644
--- a/sdk_container/src/third_party/portage-stable/media-libs/libpng/libpng-1.6.37-r2.ebuild
+++ b/sdk_container/src/third_party/portage-stable/media-libs/libpng/libpng-1.6.39.ebuild
@@ -1,18 +1,19 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit libtool multilib-minimal
 
+APNG_VERSION="1.6.38"
 DESCRIPTION="Portable Network Graphics library"
 HOMEPAGE="http://www.libpng.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
-	apng? ( mirror://sourceforge/apng/${P}-apng.patch.gz )"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+SRC_URI+=" apng? ( mirror://sourceforge/libpng-apng/${PN}$(ver_rs 1-2 '' $(ver_cut 1-2 ${APNG_VERSION}))/${PV}/${PN}-${APNG_VERSION}-apng.patch.gz )"
 
 LICENSE="libpng2"
 SLOT="0/16"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="apng cpu_flags_arm_neon cpu_flags_x86_sse static-libs"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]"
@@ -22,20 +23,24 @@ DOCS=( ANNOUNCE CHANGES libpng-manual.txt README TODO )
 
 src_prepare() {
 	default
+
 	if use apng; then
-		eapply -p0 "${WORKDIR}"/${PN}-*-apng.patch
-		# Don't execute symbols check with apng patch wrt #378111
+		eapply "${WORKDIR}"/${PN}-*-apng.patch
+
+		# Don't execute symbols check with apng patch, bug #378111
 		sed -i -e '/^check/s:scripts/symbols.chk::' Makefile.in || die
 	fi
+
 	elibtoolize
 }
 
 multilib_src_configure() {
 	local myeconfargs=(
-		$(use_enable cpu_flags_arm_neon arm-neon check)
+		$(use_enable cpu_flags_arm_neon arm-neon)
 		$(use_enable cpu_flags_x86_sse intel-sse)
 		$(use_enable static-libs static)
 	)
+
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
diff --git a/sdk_container/src/third_party/portage-stable/media-libs/libpng/metadata.xml b/sdk_container/src/third_party/portage-stable/media-libs/libpng/metadata.xml
index 10e62abda6..e98eff7f2f 100644
--- a/sdk_container/src/third_party/portage-stable/media-libs/libpng/metadata.xml
+++ b/sdk_container/src/third_party/portage-stable/media-libs/libpng/metadata.xml
@@ -15,7 +15,11 @@
 	<upstream>
 		<remote-id type="cpe">cpe:/a:libpng:libpng</remote-id>
 		<remote-id type="github">glennrp/libpng</remote-id>
+		<remote-id type="github">pnggroup/libpng-EXPERIMENTAL</remote-id>
+		<remote-id type="github">glennrp/libpng-releases</remote-id>
 		<remote-id type="sourceforge">libpng</remote-id>
+		<remote-id type="sourceforge">apng</remote-id>
+		<remote-id type="sourceforge">libpng-apng</remote-id>
 	</upstream>
 	<slots>
 		<subslots>Reflect ABI compatibility for libpng.so.</subslots>