diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libmspack/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/libmspack/Manifest
index 698014b976..8bde9da8b8 100644
--- a/sdk_container/src/third_party/portage-stable/dev-libs/libmspack/Manifest
+++ b/sdk_container/src/third_party/portage-stable/dev-libs/libmspack/Manifest
@@ -1 +1,2 @@
 DIST libmspack-0.10.1alpha.tar.gz 963274 BLAKE2B 39bcb3b7ea419d6d00850b70c217c802a2095dd4398038e594ae7c01ca12e71508218c1cfca5ae8b102636ab9517b13d55c1e411b31e87d28aa46331cd0127e6 SHA512 a7b5f7caa49190c5021f3e768b92f2e51cc0ce685c9ab6ed6fb36de885c73231b58d47a8a3b5c5aa5c9ac56c25c500eb683d84dbf11f09f97f6cb4fff5adc245
+DIST libmspack-0.11alpha.tar.gz 509478 BLAKE2B 7e386ab5ae160000bab9e5523f2ebf3907a5cb564fb7cc8945ca15daf5c8ff2563f6680383c52f6de95d1aa992d6616e2f80133740c8329390a8e5c76ba84301 SHA512 40c487e5b4e2f63a6cada26d29db51f605e8c29525a1cb088566d02cf2b1cc9dba263f80e2101d7f8e9d69cf7684a15bcaf791fb4891ad013a56afc7256dfa62
diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libmspack/libmspack-0.10.1_alpha-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libmspack/libmspack-0.10.1_alpha-r1.ebuild
index 35b8d8474a..da8fcd943d 100644
--- a/sdk_container/src/third_party/portage-stable/dev-libs/libmspack/libmspack-0.10.1_alpha-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-libs/libmspack/libmspack-0.10.1_alpha-r1.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit autotools multilib-minimal
+inherit autotools
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/kyz/libmspack.git"
 	inherit git-r3
 	MY_P="${PN}-9999"
 else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	MY_PV="${PV/_alpha/alpha}"
 	MY_P="${PN}-${MY_PV}"
 	SRC_URI="https://www.cabextract.org.uk/libmspack/libmspack-${MY_PV}.tar.gz"
@@ -21,54 +21,47 @@ HOMEPAGE="https://www.cabextract.org.uk/libmspack/"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="debug doc static-libs"
-
-DEPEND=""
-RDEPEND=""
+IUSE="debug doc"
 
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-	if [[ ${PV} == "9999" ]] ; then
+	if [[ ${PV} == *9999 ]] ; then
 		# Re-create file layout from release tarball
-		pushd "${WORKDIR}" &>/dev/null || die
+		pushd "${WORKDIR}" > /dev/null || die
+
 		cp -aL "${S}"/${PN} "${WORKDIR}"/${PN}-source || die
 		rm -r "${S}" || die
 		mv "${WORKDIR}"/${PN}-source "${S}" || die
-		popd &>/dev/null || die
+
+		popd > /dev/null || die
 	fi
 
 	default
 
 	eautoreconf
-
-	multilib_copy_sources
 }
 
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		--prefix=/oem \
-		$(use_enable debug) \
-		$(use_enable static-libs static)
+src_configure() {
+	econf $(use_enable debug)
 }
 
-multilib_src_test() {
-	if multilib_is_native_abi; then
-		default
-		cd "${S}"/test && "${BUILD_DIR}"/test/cabd_test || die
-	fi
+src_test() {
+	default
+
+	cd "${S}"/test || die
+	./cabd_test || die
 }
 
-multilib_src_install_all() {
-	DOCS=(AUTHORS ChangeLog NEWS README TODO)
-	use doc && HTML_DOCS=(doc/*)
-	default_src_install
-	if use doc; then
+src_install() {
+	use doc && HTML_DOCS=( doc/. )
+
+	default
+
+	if use doc ; then
 		rm "${ED}"/usr/share/doc/"${PF}"/html/{Makefile*,Doxyfile*} || die
 	fi
 
 	find "${ED}" -name '*.la' -delete || die
-	if ! use static-libs ; then
-		find "${ED}" -name "*.a" -delete || die
-	fi
+	find "${ED}" -name "*.a" -delete || die
 }
diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libmspack/libmspack-0.11_alpha.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libmspack/libmspack-0.11_alpha.ebuild
new file mode 100644
index 0000000000..2a4ad5dfcc
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/dev-libs/libmspack/libmspack-0.11_alpha.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/kyz/libmspack.git"
+	inherit git-r3
+	MY_P="${PN}-9999"
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+	MY_PV="${PV/_alpha/alpha}"
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI="https://www.cabextract.org.uk/libmspack/libmspack-${MY_PV}.tar.gz"
+fi
+
+DESCRIPTION="A library for Microsoft compression formats"
+HOMEPAGE="https://www.cabextract.org.uk/libmspack/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="debug doc"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	if [[ ${PV} == *9999 ]] ; then
+		# Re-create file layout from release tarball
+		pushd "${WORKDIR}" > /dev/null || die
+
+		cp -aL "${S}"/${PN} "${WORKDIR}"/${PN}-source || die
+		rm -r "${S}" || die
+		mv "${WORKDIR}"/${PN}-source "${S}" || die
+
+		popd > /dev/null || die
+	fi
+
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable debug)
+}
+
+src_test() {
+	default
+
+	cd "${S}"/test || die
+	./cabd_test || die
+}
+
+src_install() {
+	use doc && HTML_DOCS=( doc/. )
+
+	default
+
+	if use doc ; then
+		rm "${ED}"/usr/share/doc/"${PF}"/html/{Makefile*,Doxyfile*} || die
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+	find "${ED}" -name "*.a" -delete || die
+}
diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libmspack/libmspack-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libmspack/libmspack-9999.ebuild
new file mode 100644
index 0000000000..2a4ad5dfcc
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/dev-libs/libmspack/libmspack-9999.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/kyz/libmspack.git"
+	inherit git-r3
+	MY_P="${PN}-9999"
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+	MY_PV="${PV/_alpha/alpha}"
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI="https://www.cabextract.org.uk/libmspack/libmspack-${MY_PV}.tar.gz"
+fi
+
+DESCRIPTION="A library for Microsoft compression formats"
+HOMEPAGE="https://www.cabextract.org.uk/libmspack/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="debug doc"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	if [[ ${PV} == *9999 ]] ; then
+		# Re-create file layout from release tarball
+		pushd "${WORKDIR}" > /dev/null || die
+
+		cp -aL "${S}"/${PN} "${WORKDIR}"/${PN}-source || die
+		rm -r "${S}" || die
+		mv "${WORKDIR}"/${PN}-source "${S}" || die
+
+		popd > /dev/null || die
+	fi
+
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable debug)
+}
+
+src_test() {
+	default
+
+	cd "${S}"/test || die
+	./cabd_test || die
+}
+
+src_install() {
+	use doc && HTML_DOCS=( doc/. )
+
+	default
+
+	if use doc ; then
+		rm "${ED}"/usr/share/doc/"${PF}"/html/{Makefile*,Doxyfile*} || die
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+	find "${ED}" -name "*.a" -delete || die
+}
diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libmspack/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-libs/libmspack/metadata.xml
index ea25c82c21..98cc0646be 100644
--- a/sdk_container/src/third_party/portage-stable/dev-libs/libmspack/metadata.xml
+++ b/sdk_container/src/third_party/portage-stable/dev-libs/libmspack/metadata.xml
@@ -5,4 +5,7 @@
 		<email>reavertm@gentoo.org</email>
 		<name>Maciej Mrozowski</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">kyz/libmspack</remote-id>
+	</upstream>
 </pkgmetadata>