diff --git a/dev-libs/libcdatetime/Manifest b/dev-libs/libcdatetime/Manifest
index cfb1ded99..eaf9377bf 100644
--- a/dev-libs/libcdatetime/Manifest
+++ b/dev-libs/libcdatetime/Manifest
@@ -1,2 +1,2 @@
-DIST libcdatetime-alpha-20181004.tar.gz 514292 BLAKE2B 2b5422af6b223cf7de779058dcafc3da758ee6423790f7709d5ff98dc3d9d6a4fb7879351777e27b75e4e6ea86f6f2e188658fdf32d2b8e6f3ab41f707d19487 SHA512 bd3bcdcd0945ef20644fcb8eef355dc76b3a5440ea601c00d69a724a65c4cfc547645424bfcdad992878f0dce0a8c1270edfeccc33992ed1c0ed671cf794f44d
 DIST libcdatetime-alpha-20200510.tar.gz 528911 BLAKE2B 2cd1be839fed054bf1dbb0abf6dbf02e5958a96cb9a6800bcd7668b74d557b3a19c3eb7c761e8507ca51ec232b60e743fe6e11b25e7da883c19d3b8a5473a05a SHA512 9daf695ba64783ff96fdaee231cc28661077c80323f26946c5750ce567225033c81729b8ed667304c85dd01c59581ef8f4d5f7205c275a9bc7bc3c4db1a0f1a4
+DIST libcdatetime-alpha-20220104.tar.gz 529696 BLAKE2B 04479f858c885e9e2b0273cd4b3aadaef36d4b72d0945cc2f07a7866bd3cf1f4cf444a0da9b370bc4820880e2572c8a5f9ff44ac543aa123ceea92e93092a292 SHA512 e968586c51ce5f50e2233074677fc56b0a8da9954bf4a3795e68e41cac9e167b98a07d99b2f9a902cd3313ae69166fa189bee5633f7b23b11d2e57e656ec10f7
diff --git a/dev-libs/libcdatetime/libcdatetime-20181004.ebuild b/dev-libs/libcdatetime/libcdatetime-20181004.ebuild
deleted file mode 100644
index 095966cc1..000000000
--- a/dev-libs/libcdatetime/libcdatetime-20181004.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Library for cross-platform C date and time functions"
-HOMEPAGE="https://github.com/libyal/${PN}"
-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"
-
-DEPEND="dev-libs/libcerror"
-
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf $(use_enable nls) \
-		$(use_with nls libiconv-prefix) \
-		$(use_with nls libintl-prefix) \
-		--with-libcerror
-}
diff --git a/dev-libs/libcdatetime/libcdatetime-20200510.ebuild b/dev-libs/libcdatetime/libcdatetime-20200510.ebuild
index 84a838e33..7ae960122 100644
--- a/dev-libs/libcdatetime/libcdatetime-20200510.ebuild
+++ b/dev-libs/libcdatetime/libcdatetime-20200510.ebuild
@@ -1,25 +1,50 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
+inherit autotools
 
 DESCRIPTION="Library for cross-platform C date and time functions"
-HOMEPAGE="https://github.com/libyal/${PN}"
-SRC_URI="https://github.com/libyal/${PN}/releases/download/${PV}/${PN}-alpha-${PV}.tar.gz"
+HOMEPAGE="https://github.com/libyal/libcdatetime"
+SRC_URI="https://github.com/libyal/libcdatetime/releases/download/${PV}/${PN}-alpha-${PV}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="nls"
 
-DEPEND="dev-libs/libcerror"
-
+DEPEND="
+	dev-libs/libcerror[nls=]
+	nls? (
+		virtual/libiconv
+		virtual/libintl
+	)
+"
 RDEPEND="${DEPEND}"
 
+src_prepare() {
+	#makefile was created with 1.16, let's regenerate it
+	eautoreconf
+	eapply_user
+}
+
 src_configure() {
-	econf $(use_enable nls) \
+	econf \
+		$(use_enable nls) \
 		$(use_with nls libiconv-prefix) \
 		$(use_with nls libintl-prefix)
-		# \
-		#--with-libcerror
+
+#  --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/libcdatetime/libcdatetime-20220104.ebuild b/dev-libs/libcdatetime/libcdatetime-20220104.ebuild
new file mode 100644
index 000000000..7ae960122
--- /dev/null
+++ b/dev-libs/libcdatetime/libcdatetime-20220104.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Library for cross-platform C date and time functions"
+HOMEPAGE="https://github.com/libyal/libcdatetime"
+SRC_URI="https://github.com/libyal/libcdatetime/releases/download/${PV}/${PN}-alpha-${PV}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="nls"
+
+DEPEND="
+	dev-libs/libcerror[nls=]
+	nls? (
+		virtual/libiconv
+		virtual/libintl
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	#makefile was created with 1.16, let's regenerate it
+	eautoreconf
+	eapply_user
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_with nls libiconv-prefix) \
+		$(use_with nls libintl-prefix)
+
+#  --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
+}