diff --git a/dev-libs/libuna/Manifest b/dev-libs/libuna/Manifest
index fa0eb8159..efc4264ae 100644
--- a/dev-libs/libuna/Manifest
+++ b/dev-libs/libuna/Manifest
@@ -1,4 +1,2 @@
-DIST libuna-alpha-20190102.tar.gz 1872888 BLAKE2B 6404a4aede127cafb603fb84c1d4ea2c79269a56eb32f383f32f859cede82f122dbb20279a147db1ca7539ccc29c2a4674a2058ec2dff54b2cc620a1d1899760 SHA512 a1b47193cefba7a7e572fe5358e59599b8afef3a0f56c3a22eeb77be6b2ebf8f2e7d69ddb068763518ef32decb94896aa624bff64888ba07387529c9fb702156
-DIST libuna-alpha-20200711.tar.gz 1897799 BLAKE2B 4cd56a336ddc547db4730f48d553ad76714037ad92af83b0c22f785198abf2b250e66b895a6b92ea09266ff58c2a676cdcc14fcaed0bc32b5b4d92e4b4681a53 SHA512 a131490e0965b6675840e6180a204e084be817b3258845da12a0c2ea8c2b3af9fb771a4ff97d101785507bf73fdbfedc6a31ed924f606e5065d1ec255330a9cd
-DIST libuna-alpha-20201204.tar.gz 1898257 BLAKE2B d412a2fe9247bf83ec4ed6f7092ce01988e21d10508c4bbde2552a747d81a513e86322f171cf3ed2cfa64f4e94f4599eb4ea35b2c21612da1f34fc7282aa58ca SHA512 1371921e1c5869a8416b20817c5a1ab09582f4570c195254728d9150a53e01735249187e901a659cfb7c585ef1380427bd91ebd9d43d43840bee202c3aac1bc1
+DIST libuna-alpha-20220102.tar.gz 1985446 BLAKE2B 59ccdbd1b19ceaef8f90120bd58fb7a04196a06d791d4b6ba2ba52e1b2181096ee5915ce8bc3f09d0a1b1584ddfdf8151717874a708035a5a70bb772645a92ef SHA512 a86e255f77061425a0b7ff699021f9a5e0f081867970d809f37627400460083072ffec9ef353632031eebc07a29ff7f55d6c33a3552af7acacc1835db37f46d6
 DIST libuna-alpha-20220611.tar.gz 1991540 BLAKE2B b53f5834096a4d467dd7dae86aab56fae4b4ff8f402b37e5495cd1e09f22a3c88eb70454a095add08a1a0b1310290926e63e739698863f97972fb9e91eda88d6 SHA512 14a9a703c2c4166f229eb8c92ea0143f3a1ef947c23fe4cc8adc9e81f7dad6e7d82d8dc091fb987dfdd34144d611051e955be12b8d15fe0d031e1e4a7b87af6f
diff --git a/dev-libs/libuna/libuna-20190102.ebuild b/dev-libs/libuna/libuna-20190102.ebuild
deleted file mode 100644
index ad1fd94aa..000000000
--- a/dev-libs/libuna/libuna-20190102.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Library to support Unicode and ASCII (byte string) conversions"
-HOMEPAGE="https://github.com/libyal/libuna"
-SRC_URI="https://github.com/libyal/${PN}/releases/download/${PV}/${PN}-alpha-${PV}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="nls unicode"
-
-#circle dependence on libcfile
-#https://github.com/libyal/libuna/issues/7
-#dev-libs/libcfile
-DEPEND="dev-libs/libcdatetime
-	dev-libs/libcerror
-	dev-libs/libclocale
-	dev-libs/libcnotify
-	nls? ( virtual/libiconv
-		virtual/libintl )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf $(use_enable nls) \
-		$(use_with nls libiconv-prefix) \
-		$(use_with nls libintl-prefix) \
-		$(use_enable unicode wide-character-type)
-}
diff --git a/dev-libs/libuna/libuna-20200711.ebuild b/dev-libs/libuna/libuna-20200711.ebuild
deleted file mode 100644
index 07e689fb0..000000000
--- a/dev-libs/libuna/libuna-20200711.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Library to support Unicode and ASCII (byte string) conversions"
-HOMEPAGE="https://github.com/libyal/libuna"
-SRC_URI="https://github.com/libyal/${PN}/releases/download/${PV}/${PN}-alpha-${PV}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="nls unicode"
-
-#circle dependence on libcfile
-#https://github.com/libyal/libuna/issues/7
-#dev-libs/libcfile
-DEPEND="dev-libs/libcdatetime
-	dev-libs/libcerror
-	dev-libs/libclocale
-	dev-libs/libcnotify
-	nls? ( virtual/libiconv
-		virtual/libintl )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf $(use_enable nls) \
-		$(use_with nls libiconv-prefix) \
-		$(use_with nls libintl-prefix) \
-		$(use_enable unicode wide-character-type)
-}
diff --git a/dev-libs/libuna/libuna-20201204.ebuild b/dev-libs/libuna/libuna-20201204.ebuild
deleted file mode 100644
index 07e689fb0..000000000
--- a/dev-libs/libuna/libuna-20201204.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Library to support Unicode and ASCII (byte string) conversions"
-HOMEPAGE="https://github.com/libyal/libuna"
-SRC_URI="https://github.com/libyal/${PN}/releases/download/${PV}/${PN}-alpha-${PV}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="nls unicode"
-
-#circle dependence on libcfile
-#https://github.com/libyal/libuna/issues/7
-#dev-libs/libcfile
-DEPEND="dev-libs/libcdatetime
-	dev-libs/libcerror
-	dev-libs/libclocale
-	dev-libs/libcnotify
-	nls? ( virtual/libiconv
-		virtual/libintl )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf $(use_enable nls) \
-		$(use_with nls libiconv-prefix) \
-		$(use_with nls libintl-prefix) \
-		$(use_enable unicode wide-character-type)
-}
diff --git a/dev-libs/libuna/libuna-20220102.ebuild b/dev-libs/libuna/libuna-20220102.ebuild
new file mode 100644
index 000000000..6849b6823
--- /dev/null
+++ b/dev-libs/libuna/libuna-20220102.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Library to support Unicode and ASCII (byte string) conversions"
+HOMEPAGE="https://github.com/libyal/libuna"
+SRC_URI="https://github.com/libyal/libuna/releases/download/${PV}/${PN}-alpha-${PV}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="nls unicode"
+
+# This library has a circular build-time dependency on libcfile. According to upstream, this is
+# a non-issue as long as we use the pre-assembled download tarballs because they contain all
+# required sources (see https://github.com/libyal/libuna/issues/7).
+# dev-libs/libcfile
+DEPEND="
+	dev-libs/libcdatetime[nls=]
+	dev-libs/libcerror[nls=]
+	dev-libs/libclocale[nls=,unicode=]
+	dev-libs/libcnotify[nls=]
+	nls? (
+		virtual/libiconv
+		virtual/libintl
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_with nls libiconv-prefix) \
+		$(use_with nls libintl-prefix) \
+		$(use_enable unicode wide-character-type)
+
+#  --disable-shared-libs   disable shared library support
+# not supported in the ebuild at the moment - kind of defeats the entire process
+
+#  --enable-winapi         enable WINAPI support for cross-compilation
+#                          [default=auto-detect]
+# not supported in the ebuild at the moment - requires windows.h, does not make much sense for us
+}
+
+src_install() {
+	default
+	# see https://projects.gentoo.org/qa/policy-guide/installed-files.html#pg0303
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libuna/libuna-20220611.ebuild b/dev-libs/libuna/libuna-20220611.ebuild
index 07e689fb0..6849b6823 100644
--- a/dev-libs/libuna/libuna-20220611.ebuild
+++ b/dev-libs/libuna/libuna-20220611.ebuild
@@ -1,31 +1,50 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="Library to support Unicode and ASCII (byte string) conversions"
 HOMEPAGE="https://github.com/libyal/libuna"
-SRC_URI="https://github.com/libyal/${PN}/releases/download/${PV}/${PN}-alpha-${PV}.tar.gz"
+SRC_URI="https://github.com/libyal/libuna/releases/download/${PV}/${PN}-alpha-${PV}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="nls unicode"
 
-#circle dependence on libcfile
-#https://github.com/libyal/libuna/issues/7
-#dev-libs/libcfile
-DEPEND="dev-libs/libcdatetime
-	dev-libs/libcerror
-	dev-libs/libclocale
-	dev-libs/libcnotify
-	nls? ( virtual/libiconv
-		virtual/libintl )"
+# This library has a circular build-time dependency on libcfile. According to upstream, this is
+# a non-issue as long as we use the pre-assembled download tarballs because they contain all
+# required sources (see https://github.com/libyal/libuna/issues/7).
+# dev-libs/libcfile
+DEPEND="
+	dev-libs/libcdatetime[nls=]
+	dev-libs/libcerror[nls=]
+	dev-libs/libclocale[nls=,unicode=]
+	dev-libs/libcnotify[nls=]
+	nls? (
+		virtual/libiconv
+		virtual/libintl
+	)
+"
 RDEPEND="${DEPEND}"
 
 src_configure() {
-	econf $(use_enable nls) \
+	econf \
+		$(use_enable nls) \
 		$(use_with nls libiconv-prefix) \
 		$(use_with nls libintl-prefix) \
 		$(use_enable unicode wide-character-type)
+
+#  --disable-shared-libs   disable shared library support
+# not supported in the ebuild at the moment - kind of defeats the entire process
+
+#  --enable-winapi         enable WINAPI support for cross-compilation
+#                          [default=auto-detect]
+# not supported in the ebuild at the moment - requires windows.h, does not make much sense for us
+}
+
+src_install() {
+	default
+	# see https://projects.gentoo.org/qa/policy-guide/installed-files.html#pg0303
+	find "${ED}" -name '*.la' -delete || die
 }