dev-util/dlang-tools: upgrade to EAPI 8

Also drop dman utility from older versions.

Signed-off-by: Horodniceanu Andrei <a.horodniceanu@proton.me>

44 files changed, 239 insertions, 369 deletions

diff --git a/dev-util/dlang-tools/Manifest b/dev-util/dlang-tools/Manifest
index 186515b..7408506 100644
--- a/dev-util/dlang-tools/Manifest
+++ b/dev-util/dlang-tools/Manifest
@@ -40,13 +40,3 @@ DIST dlang-tools-2.102.2.tar.gz 129480 BLAKE2B 1eba640a429ab6812bf7f2c5a15ced31f
 DIST dlang-tools-2.103.1.tar.gz 129477 BLAKE2B 4ae83c17fd354265ae8a221f849af9f293a6b81e86aec8713ee9e5eb32be6ebf2faa92c5d760270b76ac26eec05881d841264132cabdd493dc9ecffa00019f00 SHA512 5e4d535804f64b6d0374c12bf1fb9b64859f31e9ddd260ed73aefb66cbb6fd6cc0e892ac0e91d4ecf0771e817743f2c9cc9eb7b7631437083a799f98d6131eed
 DIST dlang-tools-2.104.2.tar.gz 129552 BLAKE2B 656e2ae6b6194906a9ee0b29827e3de9e25ae1b3f099dc91c5f75d63fd366c07c4367067d73c744d0307b3e74a6ef54a527d17916a1b60b47ebbb8a08ebb9442 SHA512 a2dcece4a68e0f8791a04b5fc431e240f5052c66e0fc732bc52bbb0345e46d40dba83451123c8ea07ef517121b1831acb1e4e7e4bf501fc320382632bbb543db
 DIST dlang-tools-2.105.2.tar.gz 129644 BLAKE2B 2ec9ace06e5ffe3ee0dae40f702eb7d0268460f86bdc613912a3931552b71d7a9d451d103946f7a4fba2fa6e07927c6ce4c9a162edeafa9ac719c0d8a2b5501e SHA512 702841fa2c636c8d2fcd525bccb083a3fcaef660ade3bcf199fb4908f164464ba2d33afe5610a213b4b6d82e927d7fa75db7503094144a09054807bb67d77615
-DIST dlang.org-2.064.2.tar.gz 963131 BLAKE2B a7cf0d43a1cd531722bda717882a34e01c0186f0832a12064bf0600aede0a0913190724011f0b13c76cf794434e1c82490f48e9fda66409aa2820adc7c8a40f9 SHA512 a1284955764385539dcd8949cd851100af9be47908e85d8cfd897d6409903763919dc082fc0ca88fbaaf49647168357656aee82717a375ed45407eb15ccd44cf
-DIST dlang.org-2.065.0.tar.gz 1005429 BLAKE2B 01fc8ec0c5148f910e2923be556208c08a18f00453ffa1f1a22d6725db6489b6f9022cd170caa3a05078baddde353ee819984da5efa53547e78006d2f0a97b9c SHA512 0fb185603766b54c3b9dc57824b18ec7ea9f37281610729860543630f4546591f9523bff48eee5414235d2ee656201c444e6d2efc44ba66a052b98a0d9b4729e
-DIST dlang.org-2.066.1.tar.gz 1024075 BLAKE2B cfdb4922c38d9f0ced941eeb4578d71f09d65201d2f89cfc73e46ae73f0939c74fa92d7f003b87a28f814c5b2cc0dda6855b86e64fd86be3920c129f8c20df6a SHA512 d3838cc2ab6236d57c17f92fa5eaef8458176715985aecbea9653cc772725e1b9f813c9ffc8e06490e08c1031826ab84d1fcfbd88008791cac3257db814e3dc8
-DIST dlang.org-2.067.1.tar.gz 852712 BLAKE2B d0aeda080fd67d598cc0423a26d8a9edf7f24e10592e0368c4fd5275bf9fe0bae0946d19896bc617d24363480367abff53564d451f72ce80ba50231430124ea1 SHA512 1aeee0d2dbb18418bf5b3f5d9a1523cd3dc898a4ad7ed1385060200eb2f8585443cac056841f3aafe4d131925ba4bd6042377d644baa1345ac1dc1316d8c33e9
-DIST dmd-2.067.1.tar.gz 2521765 BLAKE2B 4835f9e9aaf7eaadc13a39f93f792965c2a48710dc2fb686c2556b70edfbcada21b9534aea78ec777362c7179ba80893c66790fc587698dd8a89f773be793083 SHA512 1e2275af60b3812419042b490b1c0363b50041f1002e8ca92631540ca0cb87d75f2b81a1edae5d0203edc3ef0a51010dfd589f66699f781f491be57b1397a61c
-DIST druntime-2.067.1.tar.gz 863410 BLAKE2B 8226dbc3cc1381a7f6c2e4018da6c24f82cf5a10c53a9604caa4bbaf83d0a5b4f443b1b0ad9fd5abb75cbe5a987d25f11b7f482e177ee9a2101f4d88627f295a SHA512 c2a74e17224636f5c7ea4f529db4e1b494573a809d6cb50a835dd8c7d9fbec801c5a46c45c57b4064b3013dc3ceec5d1d2b5393c54dad57e503ebef31ba43453
-DIST phobos-2.064.2.tar.gz 1671937 BLAKE2B dafef9997e4840f2bedd3cae0356df1059d0d485f881fa2ddb8f113a1ba71adb6542cac7995ad042f9defed85085f05dd842fb8a99e111641464aba13aa1119d SHA512 e4bd2a508afb86e484c73049b186290269ddd9820592d3113344c6bc50d76723fa21999e3d34372b727193a98105256bd53e29874b2155684027637450ba982f
-DIST phobos-2.065.0.tar.gz 1693942 BLAKE2B e9bbe0b51c74506f09dd19b0ce0bc66673e4fbd9c326c93f20791f96fe39056e88c1ed3fb0e48b092b192d886b0064099144af030855cd707b2d5ee5e9422e7b SHA512 0e9c3d98a1743e1d5f697e1602345cdc0ad1902393935a7928d4afc7904c4e2299f5608b4922a505663b0948aecb7348ebde69e4ac5e9039fe29d650f6979a64
-DIST phobos-2.066.1.tar.gz 1716661 BLAKE2B 0b6fab2b51c16ff3ec39c8c18ca975d9c4d9630f8c87812f127b011be2e3c4285f7223d98691affddb851f8e8a52a7e551a8b8eb103948af3ad2696cc30d99d4 SHA512 9dd703b42cd3ba44ca070629e739a93df00b502cb43d5f21afd9540128a7c371259703a1667f093b87e37cb1b9ae706ade5d8b1e51e4b9dd3d1feed2dcccdd23
-DIST phobos-2.067.1.tar.gz 1834537 BLAKE2B 328507302aae94145a610c34bff86999bd4889f34980ddc93a807dcf14f9adfce8f0d24a849945ecb10b7867e2df24a88ed7dd0f32d55e88c782216b23eca23c SHA512 80fec2707f78ebec505c400c80195d3fc07eb1921d2ac6668f2ce157f24addd73545955d6e1dd4e195b8fc0f09fcd0a865ba1c81f58074208239f153855348f8
diff --git a/dev-util/dlang-tools/dlang-tools-2.064.2.ebuild b/dev-util/dlang-tools/dlang-tools-2.064.2.ebuild
index dd5e9c4..a4ff489 100644
--- a/dev-util/dlang-tools/dlang-tools-2.064.2.ebuild
+++ b/dev-util/dlang-tools/dlang-tools-2.064.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Ancilliary tools for the D programming language compiler"
 HOMEPAGE="http://dlang.org/"
@@ -9,50 +9,33 @@ LICENSE="Boost-1.0"
 
 SLOT="0"
 KEYWORDS="amd64 x86"
-TOOLS="rdmd ddemangle detab dman dustmite"
-IUSE="+rdmd +ddemangle detab +dman dustmite"
+TOOLS="ddemangle detab dustmite rdmd"
+IUSE="+ddemangle detab dustmite +rdmd"
 REQUIRED_USE="|| ( ${TOOLS} )"
 
-inherit eapi7-ver
-
 DLANG_SLOT="$(ver_cut 1-2)"
-GITHUB_URI="https://codeload.github.com/dlang"
-SRC_URI="
-	${GITHUB_URI}/tools/tar.gz/v${PV} -> dlang-tools-${PV}.tar.gz
-	dman? (
-		${GITHUB_URI}/phobos/tar.gz/v${PV} -> phobos-${PV}.tar.gz
-		${GITHUB_URI}/dlang.org/tar.gz/v${PV} -> dlang.org-${PV}.tar.gz
-	)"
-DEPEND="dman? ( =dev-lang/dmd-${PV}*:${DLANG_SLOT} )"
+RESTRICT="mirror"
 
-DLANG_VERSION_RANGE="${DLANG_SLOT}"
-DLANG_PACKAGE_TYPE="single"
+BETA="$(ver_cut 4)"
+VERSION="$(ver_cut 1-3)"
 
-inherit eutils dlang xdg-utils
+if [[ -n "${BETA}" ]]; then
+	# We want to convert a Gentoo version string into an upstream one: 2.097.0_rc1 -> 2.097.0-rc.1
+	VERSION="$(ver_rs 3 "-" 4 ".")"
+fi
+SRC_URI="https://codeload.github.com/dlang/tools/tar.gz/v${VERSION} -> dlang-tools-${VERSION}.tar.gz"
 
-S="${WORKDIR}"
+DLANG_VERSION_RANGE="${DLANG_SLOT}-2.070"
+DLANG_PACKAGE_TYPE="single"
 
-src_prepare() {
-	mv "tools-${PV}" "tools" || die "Could not rename tools-${PV} to tools"
-	if use dman; then
-		mv "phobos-${PV}" "phobos" || die "Could not rename phobos-${PV} to phobos"
-		mv "dlang.org-${PV}" "dlang.org" || die "Could not rename dlang.org-${PV} to dlang.org"
-	fi
-	# Apply patches
-	dlang_src_prepare
-}
+inherit desktop dlang xdg-utils
+
+S="${WORKDIR}/tools-${VERSION}"
 
 d_src_compile() {
-	mkdir -p "tools/generated/linux/default" || die "Could not create output directory"
 	for tool in ${TOOLS}; do
 		if use "${tool}"; then
-			if [[ "${tool}" == dman ]]; then
-				emake -C "dlang.org" -f posix.mak LATEST="${PV}" DMD="${DMD}" html
-				emake -C "phobos" -f posix.mak \
-					DOC_OUTPUT_DIR="../dlang.org/web/phobos" SONAME="" \
-					DMD="${ROOT}opt/dmd-${DLANG_SLOT}/bin/dmd" html
-			fi
-			DFLAGS="${DMDFLAGS}" emake -C "tools" -f posix.mak DMD="${DMD}" "${tool}"
+			emake -f posix.mak DMD="${DMD}" DFLAGS="${DMDFLAGS}" "${tool}"
 		fi
 	done
 }
@@ -60,9 +43,14 @@ d_src_compile() {
 d_src_install() {
 	for tool in ${TOOLS}; do
 		if use "${tool}"; then
-			dobin "tools/generated/linux/default/${tool}"
+			dobin generated/linux/*/"${tool}"
 		fi
 	done
+
+	# file icons
+	for size in 16 22 24 32 48 256; do
+		newicon --size "${size}" --context mimetypes "${FILESDIR}/icons/${size}/dmd-source.png" text-x-dsrc.png
+	done
 }
 
 pkg_postinst() {
diff --git a/dev-util/dlang-tools/dlang-tools-2.065.0.ebuild b/dev-util/dlang-tools/dlang-tools-2.065.0.ebuild
index 62558dd..a4ff489 100644
--- a/dev-util/dlang-tools/dlang-tools-2.065.0.ebuild
+++ b/dev-util/dlang-tools/dlang-tools-2.065.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Ancilliary tools for the D programming language compiler"
 HOMEPAGE="http://dlang.org/"
@@ -9,52 +9,33 @@ LICENSE="Boost-1.0"
 
 SLOT="0"
 KEYWORDS="amd64 x86"
-TOOLS="rdmd ddemangle detab dman dustmite"
-IUSE="+rdmd +ddemangle detab +dman dustmite"
+TOOLS="ddemangle detab dustmite rdmd"
+IUSE="+ddemangle detab dustmite +rdmd"
 REQUIRED_USE="|| ( ${TOOLS} )"
 
-inherit eapi7-ver
-
 DLANG_SLOT="$(ver_cut 1-2)"
-GITHUB_URI="https://codeload.github.com/dlang"
-SRC_URI="
-	${GITHUB_URI}/tools/tar.gz/v${PV} -> dlang-tools-${PV}.tar.gz
-	dman? (
-		${GITHUB_URI}/phobos/tar.gz/v${PV} -> phobos-${PV}.tar.gz
-		${GITHUB_URI}/dlang.org/tar.gz/v${PV} -> dlang.org-${PV}.tar.gz
-	)"
-DEPEND="dman? ( =dev-lang/dmd-${PV}*:${DLANG_SLOT} )"
+RESTRICT="mirror"
 
-DLANG_VERSION_RANGE="${DLANG_SLOT}-2.071"
-DLANG_PACKAGE_TYPE="single"
+BETA="$(ver_cut 4)"
+VERSION="$(ver_cut 1-3)"
 
-inherit eutils dlang xdg-utils
+if [[ -n "${BETA}" ]]; then
+	# We want to convert a Gentoo version string into an upstream one: 2.097.0_rc1 -> 2.097.0-rc.1
+	VERSION="$(ver_rs 3 "-" 4 ".")"
+fi
+SRC_URI="https://codeload.github.com/dlang/tools/tar.gz/v${VERSION} -> dlang-tools-${VERSION}.tar.gz"
 
-S="${WORKDIR}"
+DLANG_VERSION_RANGE="${DLANG_SLOT}-2.070"
+DLANG_PACKAGE_TYPE="single"
 
-src_prepare() {
-	mv "tools-${PV}" "tools" || die "Could not rename tools-${PV} to tools"
-	if use dman; then
-		mv "phobos-${PV}" "phobos" || die "Could not rename phobos-${PV} to phobos"
-		mv "dlang.org-${PV}" "dlang.org" || die "Could not rename dlang.org-${PV} to dlang.org"
-		echo "${PV}" > VERSION || die "Could not write VERSION file"
-	fi
-	# Apply patches
-	dlang_src_prepare
-}
+inherit desktop dlang xdg-utils
+
+S="${WORKDIR}/tools-${VERSION}"
 
 d_src_compile() {
-	mkdir -p "tools/generated/${CHOST}" || die "Could not create output directory"
 	for tool in ${TOOLS}; do
 		if use "${tool}"; then
-			if [[ "${tool}" == dman ]]; then
-				emake -C "dlang.org" -f posix.mak LATEST="${PV}" DMD="${DMD}" html
-				emake -C "phobos" -f posix.mak \
-					DOC_OUTPUT_DIR="../dlang.org/web/phobos" SONAME="" \
-					VERSION="../VERSION" \
-					DMD="${ROOT}opt/dmd-${DLANG_SLOT}/bin/dmd" html
-			fi
-			DFLAGS="${DMDFLAGS}" emake -C "tools" -f posix.mak DMD="${DMD}" ROOT="generated/${CHOST}" "${tool}"
+			emake -f posix.mak DMD="${DMD}" DFLAGS="${DMDFLAGS}" "${tool}"
 		fi
 	done
 }
@@ -62,9 +43,14 @@ d_src_compile() {
 d_src_install() {
 	for tool in ${TOOLS}; do
 		if use "${tool}"; then
-			dobin "tools/generated/${CHOST}/${tool}"
+			dobin generated/linux/*/"${tool}"
 		fi
 	done
+
+	# file icons
+	for size in 16 22 24 32 48 256; do
+		newicon --size "${size}" --context mimetypes "${FILESDIR}/icons/${size}/dmd-source.png" text-x-dsrc.png
+	done
 }
 
 pkg_postinst() {
diff --git a/dev-util/dlang-tools/dlang-tools-2.066.1.ebuild b/dev-util/dlang-tools/dlang-tools-2.066.1.ebuild
index 2f2d6ac..a4ff489 100644
--- a/dev-util/dlang-tools/dlang-tools-2.066.1.ebuild
+++ b/dev-util/dlang-tools/dlang-tools-2.066.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Ancilliary tools for the D programming language compiler"
 HOMEPAGE="http://dlang.org/"
@@ -9,52 +9,33 @@ LICENSE="Boost-1.0"
 
 SLOT="0"
 KEYWORDS="amd64 x86"
-TOOLS="rdmd ddemangle detab dman dustmite"
-IUSE="+rdmd +ddemangle detab +dman dustmite"
+TOOLS="ddemangle detab dustmite rdmd"
+IUSE="+ddemangle detab dustmite +rdmd"
 REQUIRED_USE="|| ( ${TOOLS} )"
 
-inherit eapi7-ver
-
 DLANG_SLOT="$(ver_cut 1-2)"
-GITHUB_URI="https://codeload.github.com/dlang"
-SRC_URI="
-	${GITHUB_URI}/tools/tar.gz/v${PV} -> dlang-tools-${PV}.tar.gz
-	dman? (
-		${GITHUB_URI}/phobos/tar.gz/v${PV} -> phobos-${PV}.tar.gz
-		${GITHUB_URI}/dlang.org/tar.gz/v${PV} -> dlang.org-${PV}.tar.gz
-	)"
-DEPEND="dman? ( =dev-lang/dmd-${PV}*:${DLANG_SLOT} )"
+RESTRICT="mirror"
 
-DLANG_VERSION_RANGE="${DLANG_SLOT}"
-DLANG_PACKAGE_TYPE="single"
+BETA="$(ver_cut 4)"
+VERSION="$(ver_cut 1-3)"
 
-inherit eutils dlang xdg-utils
+if [[ -n "${BETA}" ]]; then
+	# We want to convert a Gentoo version string into an upstream one: 2.097.0_rc1 -> 2.097.0-rc.1
+	VERSION="$(ver_rs 3 "-" 4 ".")"
+fi
+SRC_URI="https://codeload.github.com/dlang/tools/tar.gz/v${VERSION} -> dlang-tools-${VERSION}.tar.gz"
 
-S="${WORKDIR}"
+DLANG_VERSION_RANGE="${DLANG_SLOT}-2.070"
+DLANG_PACKAGE_TYPE="single"
 
-src_prepare() {
-	mv "tools-${PV}" "tools" || die "Could not rename tools-${PV} to tools"
-	if use dman; then
-		mv "phobos-${PV}" "phobos" || die "Could not rename phobos-${PV} to phobos"
-		mv "dlang.org-${PV}" "dlang.org" || die "Could not rename dlang.org-${PV} to dlang.org"
-		echo "${PV}" > VERSION || die "Could not write VERSION file"
-	fi
-	# Apply patches
-	dlang_src_prepare
-}
+inherit desktop dlang xdg-utils
+
+S="${WORKDIR}/tools-${VERSION}"
 
 d_src_compile() {
-	mkdir -p "tools/generated/${CHOST}" || die "Could not create output directory"
 	for tool in ${TOOLS}; do
 		if use "${tool}"; then
-			if [[ "${tool}" == dman ]]; then
-				emake -C "dlang.org" -f posix.mak LATEST="${PV}" DMD="${DMD}" html
-				emake -C "phobos" -f posix.mak \
-					DOC_OUTPUT_DIR="../dlang.org/web/phobos" SONAME="" \
-					VERSION="../VERSION" \
-					DMD="${ROOT}opt/dmd-${DLANG_SLOT}/bin/dmd" html
-			fi
-			DFLAGS="${DMDFLAGS}" emake -C "tools" -f posix.mak DMD="${DMD}" ROOT="generated/${CHOST}" "${tool}"
+			emake -f posix.mak DMD="${DMD}" DFLAGS="${DMDFLAGS}" "${tool}"
 		fi
 	done
 }
@@ -62,9 +43,14 @@ d_src_compile() {
 d_src_install() {
 	for tool in ${TOOLS}; do
 		if use "${tool}"; then
-			dobin "tools/generated/${CHOST}/${tool}"
+			dobin generated/linux/*/"${tool}"
 		fi
 	done
+
+	# file icons
+	for size in 16 22 24 32 48 256; do
+		newicon --size "${size}" --context mimetypes "${FILESDIR}/icons/${size}/dmd-source.png" text-x-dsrc.png
+	done
 }
 
 pkg_postinst() {
diff --git a/dev-util/dlang-tools/dlang-tools-2.067.1.ebuild b/dev-util/dlang-tools/dlang-tools-2.067.1.ebuild
index af5be5f..a4ff489 100644
--- a/dev-util/dlang-tools/dlang-tools-2.067.1.ebuild
+++ b/dev-util/dlang-tools/dlang-tools-2.067.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Ancilliary tools for the D programming language compiler"
 HOMEPAGE="http://dlang.org/"
@@ -9,73 +9,48 @@ LICENSE="Boost-1.0"
 
 SLOT="0"
 KEYWORDS="amd64 x86"
-TOOLS="rdmd ddemangle detab dustmite"
-IUSE="+rdmd +ddemangle detab +dman dustmite"
-REQUIRED_USE="|| ( ${TOOLS} dman )"
-
-inherit eapi7-ver
+TOOLS="ddemangle detab dustmite rdmd"
+IUSE="+ddemangle detab dustmite +rdmd"
+REQUIRED_USE="|| ( ${TOOLS} )"
 
 DLANG_SLOT="$(ver_cut 1-2)"
 RESTRICT="mirror"
-GITHUB_URI="https://codeload.github.com/dlang"
-SRC_URI="
-	${GITHUB_URI}/tools/tar.gz/v${PV} -> dlang-tools-${PV}.tar.gz
-	dman? (
-		${GITHUB_URI}/dmd/tar.gz/v${PV} -> dmd-${PV}.tar.gz
-		${GITHUB_URI}/druntime/tar.gz/v${PV} -> druntime-${PV}.tar.gz
-		${GITHUB_URI}/phobos/tar.gz/v${PV} -> phobos-${PV}.tar.gz
-		${GITHUB_URI}/dlang.org/tar.gz/v${PV} -> dlang.org-${PV}.tar.gz
-	)"
-PATCHES=( "${FILESDIR}/2.067-no-narrowing.patch" "${FILESDIR}/replace-bits-mathdef-h.patch" )
+
+BETA="$(ver_cut 4)"
+VERSION="$(ver_cut 1-3)"
+
+if [[ -n "${BETA}" ]]; then
+	# We want to convert a Gentoo version string into an upstream one: 2.097.0_rc1 -> 2.097.0-rc.1
+	VERSION="$(ver_rs 3 "-" 4 ".")"
+fi
+SRC_URI="https://codeload.github.com/dlang/tools/tar.gz/v${VERSION} -> dlang-tools-${VERSION}.tar.gz"
 
 DLANG_VERSION_RANGE="${DLANG_SLOT}-2.070"
 DLANG_PACKAGE_TYPE="single"
 
-inherit eutils dlang xdg-utils
-
-S="${WORKDIR}"
+inherit desktop dlang xdg-utils
 
-src_prepare() {
-	mv "tools-${PV}" "tools" || die "Could not rename tools-${PV} to tools"
-	if use dman; then
-		mv "dlang.org-${PV}" "dlang.org" || die "Could not rename dlang.org-${PV} to dlang.org"
-		mv "dmd-${PV}" "dmd" || die "Could not rename dmd-${PV} to dmd"
-		touch dmd/.cloned || die "Could not touch 'dmd/.cloned'"
-		mv "druntime-${PV}" "druntime" || die "Could not rename druntime-${PV} to druntime"
-		mv "phobos-${PV}" "phobos" || die "Could not rename phobos-${PV} to phobos"
-	fi
-	# Apply patches
-	dlang_src_prepare
-}
+S="${WORKDIR}/tools-${VERSION}"
 
 d_src_compile() {
 	for tool in ${TOOLS}; do
 		if use "${tool}"; then
-			emake -C "tools" -f posix.mak DMD="${DMD}" DFLAGS="${DMDFLAGS}" "${tool}"
+			emake -f posix.mak DMD="${DMD}" DFLAGS="${DMDFLAGS}" "${tool}"
 		fi
 	done
-	if use dman; then
-		# This builds chmgen with the system D compiler (and also a vanilla DMD
-		# as a dependency from the make file.) A dummy PHOBOS_DIR is set to make
-		# the build process use the system Phobos instead.
-		emake -C "dlang.org" -f posix.mak RELEASE=1 LATEST="${PV}" TARGET_CPU=X86 DMD="${DMD}" PHOBOS_DIR="." chmgen
-		# Next we populate the druntime/import directory as required by the HTML
-		# generation process.
-		emake -C "druntime" -f posix.mak DMD="${DMD}" import copy
-		# Then we generate Phobos HTML documentation that can be parsed by
-		# chmgen when building dman.
-		emake -C "phobos" -f posix.mak DOC_OUTPUT_DIR="../dlang.org/web/phobos" DMD="${DMD}" html
-		# The last step creates the actual executable.
-		emake -C "tools" -f posix.mak RELEASE=1 LATEST="${PV}" DMD="${DMD}" DFLAGS="${DMDFLAGS} -J../dlang.org" dman
-	fi
 }
 
 d_src_install() {
-	for tool in ${TOOLS} dman; do
+	for tool in ${TOOLS}; do
 		if use "${tool}"; then
-			dobin tools/generated/linux/*/"${tool}"
+			dobin generated/linux/*/"${tool}"
 		fi
 	done
+
+	# file icons
+	for size in 16 22 24 32 48 256; do
+		newicon --size "${size}" --context mimetypes "${FILESDIR}/icons/${size}/dmd-source.png" text-x-dsrc.png
+	done
 }
 
 pkg_postinst() {
diff --git a/dev-util/dlang-tools/dlang-tools-2.068.2.ebuild b/dev-util/dlang-tools/dlang-tools-2.068.2.ebuild
index 01045c2..1b61994 100644
--- a/dev-util/dlang-tools/dlang-tools-2.068.2.ebuild
+++ b/dev-util/dlang-tools/dlang-tools-2.068.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Ancilliary tools for the D programming language compiler"
 HOMEPAGE="http://dlang.org/"
@@ -9,28 +9,33 @@ LICENSE="Boost-1.0"
 
 SLOT="0"
 KEYWORDS="amd64 x86"
-TOOLS="rdmd ddemangle detab dustmite"
-IUSE="+rdmd +ddemangle detab dustmite"
+TOOLS="ddemangle detab dustmite rdmd"
+IUSE="+ddemangle detab dustmite +rdmd"
 REQUIRED_USE="|| ( ${TOOLS} )"
 
-inherit eapi7-ver
-
 DLANG_SLOT="$(ver_cut 1-2)"
 RESTRICT="mirror"
-GITHUB_URI="https://codeload.github.com/dlang"
-SRC_URI="${GITHUB_URI}/tools/tar.gz/v${PV} -> dlang-tools-${PV}.tar.gz"
+
+BETA="$(ver_cut 4)"
+VERSION="$(ver_cut 1-3)"
+
+if [[ -n "${BETA}" ]]; then
+	# We want to convert a Gentoo version string into an upstream one: 2.097.0_rc1 -> 2.097.0-rc.1
+	VERSION="$(ver_rs 3 "-" 4 ".")"
+fi
+SRC_URI="https://codeload.github.com/dlang/tools/tar.gz/v${VERSION} -> dlang-tools-${VERSION}.tar.gz"
 
 DLANG_VERSION_RANGE="${DLANG_SLOT}-"
 DLANG_PACKAGE_TYPE="single"
 
-inherit eutils dlang xdg-utils
+inherit desktop dlang xdg-utils
 
-S="${WORKDIR}"
+S="${WORKDIR}/tools-${VERSION}"
 
 d_src_compile() {
 	for tool in ${TOOLS}; do
 		if use "${tool}"; then
-			emake -C "tools-${PV}" -f posix.mak DMD="${DMD}" DFLAGS="${DMDFLAGS}" "${tool}"
+			emake -f posix.mak DMD="${DMD}" DFLAGS="${DMDFLAGS}" "${tool}"
 		fi
 	done
 }
@@ -38,9 +43,14 @@ d_src_compile() {
 d_src_install() {
 	for tool in ${TOOLS}; do
 		if use "${tool}"; then
-			dobin tools-"${PV}"/generated/linux/*/"${tool}"
+			dobin generated/linux/*/"${tool}"
 		fi
 	done
+
+	# file icons
+	for size in 16 22 24 32 48 256; do
+		newicon --size "${size}" --context mimetypes "${FILESDIR}/icons/${size}/dmd-source.png" text-x-dsrc.png
+	done
 }
 
 pkg_postinst() {
diff --git a/dev-util/dlang-tools/dlang-tools-2.069.1.ebuild b/dev-util/dlang-tools/dlang-tools-2.069.1.ebuild
index 78492bc..1b61994 100644
--- a/dev-util/dlang-tools/dlang-tools-2.069.1.ebuild
+++ b/dev-util/dlang-tools/dlang-tools-2.069.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Ancilliary tools for the D programming language compiler"
 HOMEPAGE="http://dlang.org/"
@@ -9,15 +9,13 @@ LICENSE="Boost-1.0"
 
 SLOT="0"
 KEYWORDS="amd64 x86"
-TOOLS="rdmd ddemangle detab dustmite"
-IUSE="+rdmd +ddemangle detab dustmite"
+TOOLS="ddemangle detab dustmite rdmd"
+IUSE="+ddemangle detab dustmite +rdmd"
 REQUIRED_USE="|| ( ${TOOLS} )"
 
-inherit eapi7-ver
-
 DLANG_SLOT="$(ver_cut 1-2)"
 RESTRICT="mirror"
-GITHUB_URI="https://github.com/D-Programming-Language/tools/archive"
+
 BETA="$(ver_cut 4)"
 VERSION="$(ver_cut 1-3)"
 
@@ -25,12 +23,12 @@ if [[ -n "${BETA}" ]]; then
 	# We want to convert a Gentoo version string into an upstream one: 2.097.0_rc1 -> 2.097.0-rc.1
 	VERSION="$(ver_rs 3 "-" 4 ".")"
 fi
-SRC_URI="${GITHUB_URI}/v${VERSION}.tar.gz -> dlang-tools-${VERSION}.tar.gz"
+SRC_URI="https://codeload.github.com/dlang/tools/tar.gz/v${VERSION} -> dlang-tools-${VERSION}.tar.gz"
 
 DLANG_VERSION_RANGE="${DLANG_SLOT}-"
 DLANG_PACKAGE_TYPE="single"
 
-inherit eutils dlang xdg-utils
+inherit desktop dlang xdg-utils
 
 S="${WORKDIR}/tools-${VERSION}"
 
@@ -48,6 +46,11 @@ d_src_install() {
 			dobin generated/linux/*/"${tool}"
 		fi
 	done
+
+	# file icons
+	for size in 16 22 24 32 48 256; do
+		newicon --size "${size}" --context mimetypes "${FILESDIR}/icons/${size}/dmd-source.png" text-x-dsrc.png
+	done
 }
 
 pkg_postinst() {
diff --git a/dev-util/dlang-tools/dlang-tools-2.070.2.ebuild b/dev-util/dlang-tools/dlang-tools-2.070.2.ebuild
index 736a44e..1b61994 100644
--- a/dev-util/dlang-tools/dlang-tools-2.070.2.ebuild
+++ b/dev-util/dlang-tools/dlang-tools-2.070.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Ancilliary tools for the D programming language compiler"
 HOMEPAGE="http://dlang.org/"
@@ -9,12 +9,10 @@ LICENSE="Boost-1.0"
 
 SLOT="0"
 KEYWORDS="amd64 x86"
-TOOLS="rdmd ddemangle detab dustmite"
-IUSE="+rdmd +ddemangle detab dustmite"
+TOOLS="ddemangle detab dustmite rdmd"
+IUSE="+ddemangle detab dustmite +rdmd"
 REQUIRED_USE="|| ( ${TOOLS} )"
 
-inherit eapi7-ver
-
 DLANG_SLOT="$(ver_cut 1-2)"
 RESTRICT="mirror"
 
@@ -30,7 +28,7 @@ SRC_URI="https://codeload.github.com/dlang/tools/tar.gz/v${VERSION} -> dlang-too
 DLANG_VERSION_RANGE="${DLANG_SLOT}-"
 DLANG_PACKAGE_TYPE="single"
 
-inherit eutils dlang xdg-utils
+inherit desktop dlang xdg-utils
 
 S="${WORKDIR}/tools-${VERSION}"
 
@@ -48,6 +46,11 @@ d_src_install() {
 			dobin generated/linux/*/"${tool}"
 		fi
 	done
+
+	# file icons
+	for size in 16 22 24 32 48 256; do
+		newicon --size "${size}" --context mimetypes "${FILESDIR}/icons/${size}/dmd-source.png" text-x-dsrc.png
+	done
 }
 
 pkg_postinst() {
diff --git a/dev-util/dlang-tools/dlang-tools-2.071.2.ebuild b/dev-util/dlang-tools/dlang-tools-2.071.2.ebuild
index a6c8396..1b61994 100644
--- a/dev-util/dlang-tools/dlang-tools-2.071.2.ebuild
+++ b/dev-util/dlang-tools/dlang-tools-2.071.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Ancilliary tools for the D programming language compiler"
 HOMEPAGE="http://dlang.org/"
@@ -13,8 +13,6 @@ TOOLS="ddemangle detab dustmite rdmd"
 IUSE="+ddemangle detab dustmite +rdmd"
 REQUIRED_USE="|| ( ${TOOLS} )"
 
-inherit eapi7-ver
-
 DLANG_SLOT="$(ver_cut 1-2)"
 RESTRICT="mirror"
 
@@ -30,7 +28,7 @@ SRC_URI="https://codeload.github.com/dlang/tools/tar.gz/v${VERSION} -> dlang-too
 DLANG_VERSION_RANGE="${DLANG_SLOT}-"
 DLANG_PACKAGE_TYPE="single"
 
-inherit eutils dlang xdg-utils
+inherit desktop dlang xdg-utils
 
 S="${WORKDIR}/tools-${VERSION}"
 
diff --git a/dev-util/dlang-tools/dlang-tools-2.072.2.ebuild b/dev-util/dlang-tools/dlang-tools-2.072.2.ebuild
index a6c8396..1b61994 100644
--- a/dev-util/dlang-tools/dlang-tools-2.072.2.ebuild
+++ b/dev-util/dlang-tools/dlang-tools-2.072.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Ancilliary tools for the D programming language compiler"
 HOMEPAGE="http://dlang.org/"
@@ -13,8 +13,6 @@ TOOLS="ddemangle detab dustmite rdmd"
 IUSE="+ddemangle detab dustmite +rdmd"
 REQUIRED_USE="|| ( ${TOOLS} )"
 
-inherit eapi7-ver
-
 DLANG_SLOT="$(ver_cut 1-2)"
 RESTRICT="mirror"
 
@@ -30,7 +28,7 @@ SRC_URI="https://codeload.github.com/dlang/tools/tar.gz/v${VERSION} -> dlang-too
 DLANG_VERSION_RANGE="${DLANG_SLOT}-"
 DLANG_PACKAGE_TYPE="single"
 
-inherit eutils dlang xdg-utils
+inherit desktop dlang xdg-utils
 
 S="${WORKDIR}/tools-${VERSION}"
 
diff --git a/dev-util/dlang-tools/dlang-tools-2.073.2.ebuild b/dev-util/dlang-tools/dlang-tools-2.073.2.ebuild
index a6c8396..1b61994 100644
--- a/dev-util/dlang-tools/dlang-tools-2.073.2.ebuild
+++ b/dev-util/dlang-tools/dlang-tools-2.073.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Ancilliary tools for the D programming language compiler"
 HOMEPAGE="http://dlang.org/"
@@ -13,8 +13,6 @@ TOOLS="ddemangle detab dustmite rdmd"
 IUSE="+ddemangle detab dustmite +rdmd"
 REQUIRED_USE="|| ( ${TOOLS} )"
 
-inherit eapi7-ver
-
 DLANG_SLOT="$(ver_cut 1-2)"
 RESTRICT="mirror"
 
@@ -30,7 +28,7 @@ SRC_URI="https://codeload.github.com/dlang/tools/tar.gz/v${VERSION} -> dlang-too
 DLANG_VERSION_RANGE="${DLANG_SLOT}-"
 DLANG_PACKAGE_TYPE="single"
 
-inherit eutils dlang xdg-utils
+inherit desktop dlang xdg-utils
 
 S="${WORKDIR}/tools-${VERSION}"
 
diff --git a/dev-util/dlang-tools/dlang-tools-2.074.1.ebuild b/dev-util/dlang-tools/dlang-tools-2.074.1.ebuild
index a6c8396..1b61994 100644
--- a/dev-util/dlang-tools/dlang-tools-2.074.1.ebuild
+++ b/dev-util/dlang-tools/dlang-tools-2.074.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Ancilliary tools for the D programming language compiler"
 HOMEPAGE="http://dlang.org/"
@@ -13,8 +13,6 @@ TOOLS="ddemangle detab dustmite rdmd"
 IUSE="+ddemangle detab dustmite +rdmd"
 REQUIRED_USE="|| ( ${TOOLS} )"
 
-inherit eapi7-ver
-
 DLANG_SLOT="$(ver_cut 1-2)"
 RESTRICT="mirror"
 
@@ -30,7 +28,7 @@ SRC_URI="https://codeload.github.com/dlang/tools/tar.gz/v${VERSION} -> dlang-too
 DLANG_VERSION_RANGE="${DLANG_SLOT}-"
 DLANG_PACKAGE_TYPE="single"
 
-inherit eutils dlang xdg-utils
+inherit desktop dlang xdg-utils
 
 S="${WORKDIR}/tools-${VERSION}"
 
diff --git a/dev-util/dlang-tools/dlang-tools-2.075.1.ebuild b/dev-util/dlang-tools/dlang-tools-2.075.1.ebuild
index a6c8396..1b61994 100644
--- a/dev-util/dlang-tools/dlang-tools-2.075.1.ebuild
+++ b/dev-util/dlang-tools/dlang-tools-2.075.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Ancilliary tools for the D programming language compiler"
 HOMEPAGE="http://dlang.org/"
@@ -13,8 +13,6 @@ TOOLS="ddemangle detab dustmite rdmd"
 IUSE="+ddemangle detab dustmite +rdmd"
 REQUIRED_USE="|| ( ${TOOLS} )"
 
-inherit eapi7-ver
-
 DLANG_SLOT="$(ver_cut 1-2)"
 RESTRICT="mirror"
 
@@ -30,7 +28,7 @@ SRC_URI="https://codeload.github.com/dlang/tools/tar.gz/v${VERSION} -> dlang-too
 DLANG_VERSION_RANGE="${DLANG_SLOT}-"
 DLANG_PACKAGE_TYPE="single"
 
-inherit eutils dlang xdg-utils
+inherit desktop dlang xdg-utils
 
 S="${WORKDIR}/tools-${VERSION}"
 
diff --git a/dev-util/dlang-tools/dlang-tools-2.076.1.ebuild b/dev-util/dlang-tools/dlang-tools-2.076.1.ebuild
index fb749d6..3336818 100644
--- a/dev-util/dlang-tools/dlang-tools-2.076.1.ebuild
+++ b/dev-util/dlang-tools/dlang-tools-2.076.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Ancilliary tools for the D programming language compiler"
 HOMEPAGE="http://dlang.org/"
@@ -13,8 +13,6 @@ TOOLS="ddemangle detab dustmite rdmd"
 IUSE="+ddemangle detab dustmite +rdmd"
 REQUIRED_USE="|| ( ${TOOLS} )"
 
-inherit eapi7-ver
-
 DLANG_SLOT="$(ver_cut 1-2)"
 RESTRICT="mirror"
 
@@ -30,7 +28,7 @@ SRC_URI="https://codeload.github.com/dlang/tools/tar.gz/v${VERSION} -> dlang-too
 DLANG_VERSION_RANGE="${DLANG_SLOT}-"
 DLANG_PACKAGE_TYPE="single"
 
-inherit eutils dlang xdg-utils
+inherit desktop dlang xdg-utils
 
 S="${WORKDIR}/tools-${VERSION}"
 
diff --git a/dev-util/dlang-tools/dlang-tools-2.077.1.ebuild b/dev-util/dlang-tools/dlang-tools-2.077.1.ebuild
index fb749d6..3336818 100644
--- a/dev-util/dlang-tools/dlang-tools-2.077.1.ebuild
+++ b/dev-util/dlang-tools/dlang-tools-2.077.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Ancilliary tools for the D programming language compiler"
 HOMEPAGE="http://dlang.org/"
@@ -13,8 +13,6 @@ TOOLS="ddemangle detab dustmite rdmd"
 IUSE="+ddemangle detab dustmite +rdmd"
 REQUIRED_USE="|| ( ${TOOLS} )"
 
-inherit eapi7-ver
-
 DLANG_SLOT="$(ver_cut 1-2)"
 RESTRICT="mirror"
 
@@ -30,7 +28,7 @@ SRC_URI="https://codeload.github.com/dlang/tools/tar.gz/v${VERSION} -> dlang-too
 DLANG_VERSION_RANGE="${DLANG_SLOT}-"
 DLANG_PACKAGE_TYPE="single"
 
-inherit eutils dlang xdg-utils
+inherit desktop dlang xdg-utils
 
 S="${WORKDIR}/tools-${VERSION}"
 
diff --git a/dev-util/dlang-tools/dlang-tools-2.078.3.ebuild b/dev-util/dlang-tools/dlang-tools-2.078.3.ebuild
index fb749d6..3336818 100644
--- a/dev-util/dlang-tools/dlang-tools-2.078.3.ebuild
+++ b/dev-util/dlang-tools/dlang-tools-2.078.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Ancilliary tools for the D programming language compiler"
 HOMEPAGE="http://dlang.org/"
@@ -13,8 +13,6 @@ TOOLS="ddemangle detab dustmite rdmd"
 IUSE="+ddemangle detab dustmite +rdmd"
 REQUIRED_USE="|| ( ${TOOLS} )"
 
-inherit eapi7-ver
-
 DLANG_SLOT="$(ver_cut 1-2)"
 RESTRICT="mirror"
 
@@ -30,7 +28,7 @@ SRC_URI="https://codeload.github.com/dlang/tools/tar.gz/v${VERSION} -> dlang-too
 DLANG_VERSION_RANGE="${DLANG_SLOT}-"
 DLANG_PACKAGE_TYPE="single"
 
-inherit eutils dlang xdg-utils
+inherit desktop dlang xdg-utils
 
 S="${WORKDIR}/tools-${VERSION}"
 
diff --git a/dev-util/dlang-tools/dlang-tools-2.079.1.ebuild b/dev-util/dlang-tools/dlang-tools-2.079.1.ebuild
index fb749d6..3336818 100644
--- a/dev-util/dlang-tools/dlang-tools-2.079.1.ebuild
+++ b/dev-util/dlang-tools/dlang-tools-2.079.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Ancilliary tools for the D programming language compiler"
 HOMEPAGE="http://dlang.org/"
@@ -13,8 +13,6 @@ TOOLS="ddemangle detab dustmite rdmd"
 IUSE="+ddemangle detab dustmite +rdmd"
 REQUIRED_USE="|| ( ${TOOLS} )"
 
-inherit eapi7-ver
-
 DLANG_SLOT="$(ver_cut 1-2)"
 RESTRICT="mirror"
 
@@ -30,7 +28,7 @@ SRC_URI="https://codeload.github.com/dlang/tools/tar.gz/v${VERSION} -> dlang-too
 DLANG_VERSION_RANGE="${DLANG_SLOT}-"
 DLANG_PACKAGE_TYPE="single"
 
-inherit eutils dlang xdg-utils
+inherit desktop dlang xdg-utils
 
 S="${WORKDIR}/tools-${VERSION}"
 
diff --git a/dev-util/dlang-tools/dlang-tools-2.080.1.ebuild b/dev-util/dlang-tools/dlang-tools-2.080.1.ebuild
index 4dc215e..003249a 100644
--- a/dev-util/dlang-tools/dlang-tools-2.080.1.ebuild
+++ b/dev-util/dlang-tools/dlang-tools-2.080.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Ancilliary tools for the D programming language compiler"
 HOMEPAGE="http://dlang.org/"
@@ -13,8 +13,6 @@ TOOLS="ddemangle detab dustmite rdmd"
 IUSE="+ddemangle detab dustmite +rdmd"
 REQUIRED_USE="|| ( ${TOOLS} )"
 
-inherit eapi7-ver
-
 DLANG_SLOT="$(ver_cut 1-2)"
 RESTRICT="mirror"
 
@@ -30,7 +28,7 @@ SRC_URI="https://codeload.github.com/dlang/tools/tar.gz/v${VERSION} -> dlang-too
 DLANG_VERSION_RANGE="2.075-"
 DLANG_PACKAGE_TYPE="single"
 
-inherit eutils dlang xdg-utils
+inherit desktop dlang xdg-utils
 
 S="${WORKDIR}/tools-${VERSION}"
 
diff --git a/dev-util/dlang-tools/dlang-tools-2.081.2.ebuild b/dev-util/dlang-tools/dlang-tools-2.081.2.ebuild
index 4dc215e..003249a 100644
--- a/dev-util/dlang-tools/dlang-tools-2.081.2.ebuild
+++ b/dev-util/dlang-tools/dlang-tools-2.081.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Ancilliary tools for the D programming language compiler"
 HOMEPAGE="http://dlang.org/"
@@ -13,8 +13,6 @@ TOOLS="ddemangle detab dustmite rdmd"
 IUSE="+ddemangle detab dustmite +rdmd"
 REQUIRED_USE="|| ( ${TOOLS} )"
 
-inherit eapi7-ver
-
 DLANG_SLOT="$(ver_cut 1-2)"
 RESTRICT="mirror"
 
@@ -30,7 +28,7 @@ SRC_URI="https://codeload.github.com/dlang/tools/tar.gz/v${VERSION} -> dlang-too
 DLANG_VERSION_RANGE="2.075-"
 DLANG_PACKAGE_TYPE="single"
 
-inherit eutils dlang xdg-utils
+inherit desktop dlang xdg-utils
 
 S="${WORKDIR}/tools-${VERSION}"
 
diff --git a/dev-util/dlang-tools/dlang-tools-2.082.1.ebuild b/dev-util/dlang-tools/dlang-tools-2.082.1.ebuild
index 4dc215e..003249a 100644
--- a/dev-util/dlang-tools/dlang-tools-2.082.1.ebuild
+++ b/dev-util/dlang-tools/dlang-tools-2.082.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Ancilliary tools for the D programming language compiler"
 HOMEPAGE="http://dlang.org/"
@@ -13,8 +13,6 @@ TOOLS="ddemangle detab dustmite rdmd"
 IUSE="+ddemangle detab dustmite +rdmd"
 REQUIRED_USE="|| ( ${TOOLS} )"
 
-inherit eapi7-ver
-
 DLANG_SLOT="$(ver_cut 1-2)"
 RESTRICT="mirror"
 
@@ -30,7 +28,7 @@ SRC_URI="https://codeload.github.com/dlang/tools/tar.gz/v${VERSION} -> dlang-too
 DLANG_VERSION_RANGE="2.075-"
 DLANG_PACKAGE_TYPE="single"
 
-inherit eutils dlang xdg-utils
+inherit desktop dlang xdg-utils
 
 S="${WORKDIR}/tools-${VERSION}"
 
diff --git a/dev-util/dlang-tools/dlang-tools-2.083.1.ebuild b/dev-util/dlang-tools/dlang-tools-2.083.1.ebuild
index 4dc215e..003249a 100644
--- a/dev-util/dlang-tools/dlang-tools-2.083.1.ebuild
+++ b/dev-util/dlang-tools/dlang-tools-2.083.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Ancilliary tools for the D programming language compiler"
 HOMEPAGE="http://dlang.org/"
@@ -13,8 +13,6 @@ TOOLS="ddemangle detab dustmite rdmd"
 IUSE="+ddemangle detab dustmite +rdmd"
 REQUIRED_USE="|| ( ${TOOLS} )"
 
-inherit eapi7-ver
-
 DLANG_SLOT="$(ver_cut 1-2)"
 RESTRICT="mirror"
 
@@ -30,7 +28,7 @@ SRC_URI="https://codeload.github.com/dlang/tools/tar.gz/v${VERSION} -> dlang-too
 DLANG_VERSION_RANGE="2.075-"
 DLANG_PACKAGE_TYPE="single"
 
-inherit eutils dlang xdg-utils
+inherit desktop dlang xdg-utils
 
 S="${WORKDIR}/tools-${VERSION}"
 
diff --git a/dev-util/dlang-tools/dlang-tools-2.084.1.ebuild b/dev-util/dlang-tools/dlang-tools-2.084.1.ebuild
index 4dc215e..003249a 100644
--- a/dev-util/dlang-tools/dlang-tools-2.084.1.ebuild
+++ b/dev-util/dlang-tools/dlang-tools-2.084.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Ancilliary tools for the D programming language compiler"
 HOMEPAGE="http://dlang.org/"
@@ -13,8 +13,6 @@ TOOLS="ddemangle detab dustmite rdmd"
 IUSE="+ddemangle detab dustmite +rdmd"
 REQUIRED_USE="|| ( ${TOOLS} )"
 
-inherit eapi7-ver
-
 DLANG_SLOT="$(ver_cut 1-2)"
 RESTRICT="mirror"
 
@@ -30,7 +28,7 @@ SRC_URI="https://codeload.github.com/dlang/tools/tar.gz/v${VERSION} -> dlang-too
 DLANG_VERSION_RANGE="2.075-"
 DLANG_PACKAGE_TYPE="single"
 
-inherit eutils dlang xdg-utils
+inherit desktop dlang xdg-utils
 
 S="${WORKDIR}/tools-${VERSION}"
 
diff --git a/dev-util/dlang-tools/dlang-tools-2.085.1.ebuild b/dev-util/dlang-tools/dlang-tools-2.085.1.ebuild
index 4dc215e..003249a 100644
--- a/dev-util/dlang-tools/dlang-tools-2.085.1.ebuild
+++ b/dev-util/dlang-tools/dlang-tools-2.085.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Ancilliary tools for the D programming language compiler"
 HOMEPAGE="http://dlang.org/"
@@ -13,8 +13,6 @@ TOOLS="ddemangle detab dustmite rdmd"
 IUSE="+ddemangle detab dustmite +rdmd"
 REQUIRED_USE="|| ( ${TOOLS} )"
 
-inherit eapi7-ver
-
 DLANG_SLOT="$(ver_cut 1-2)"
 RESTRICT="mirror"
 
@@ -30,7 +28,7 @@ SRC_URI="https://codeload.github.com/dlang/tools/tar.gz/v${VERSION} -> dlang-too
 DLANG_VERSION_RANGE="2.075-"
 DLANG_PACKAGE_TYPE="single"
 
-inherit eutils dlang xdg-utils
+inherit desktop dlang xdg-utils
 
 S="${WORKDIR}/tools-${VERSION}"
 
diff --git a/dev-util/dlang-tools/dlang-tools-2.086.1.ebuild b/dev-util/dlang-tools/dlang-tools-2.086.1.ebuild
index 4dc215e..003249a 100644
--- a/dev-util/dlang-tools/dlang-tools-2.086.1.ebuild
+++ b/dev-util/dlang-tools/dlang-tools-2.086.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Ancilliary tools for the D programming language compiler"
 HOMEPAGE="http://dlang.org/"
@@ -13,8 +13,6 @@ TOOLS="ddemangle detab dustmite rdmd"
 IUSE="+ddemangle detab dustmite +rdmd"
 REQUIRED_USE="|| ( ${TOOLS} )"
 
-inherit eapi7-ver
-
 DLANG_SLOT="$(ver_cut 1-2)"
 RESTRICT="mirror"
 
@@ -30,7 +28,7 @@ SRC_URI="https://codeload.github.com/dlang/tools/tar.gz/v${VERSION} -> dlang-too
 DLANG_VERSION_RANGE="2.075-"
 DLANG_PACKAGE_TYPE="single"
 
-inherit eutils dlang xdg-utils
+inherit desktop dlang xdg-utils
 
 S="${WORKDIR}/tools-${VERSION}"
 
diff --git a/dev-util/dlang-tools/dlang-tools-2.087.1.ebuild b/dev-util/dlang-tools/dlang-tools-2.087.1.ebuild
index 4dc215e..003249a 100644
--- a/dev-util/dlang-tools/dlang-tools-2.087.1.ebuild
+++ b/dev-util/dlang-tools/dlang-tools-2.087.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Ancilliary tools for the D programming language compiler"
 HOMEPAGE="http://dlang.org/"
@@ -13,8 +13,6 @@ TOOLS="ddemangle detab dustmite rdmd"
 IUSE="+ddemangle detab dustmite +rdmd"
 REQUIRED_USE="|| ( ${TOOLS} )"
 
-inherit eapi7-ver
-
 DLANG_SLOT="$(ver_cut 1-2)"
 RESTRICT="mirror"
 
@@ -30,7 +28,7 @@ SRC_URI="https://codeload.github.com/dlang/tools/tar.gz/v${VERSION} -> dlang-too
 DLANG_VERSION_RANGE="2.075-"
 DLANG_PACKAGE_TYPE="single"
 
-inherit eutils dlang xdg-utils
+inherit desktop dlang xdg-utils
 
 S="${WORKDIR}/tools-${VERSION}"
 
diff --git a/dev-util/dlang-tools/dlang-tools-2.088.1.ebuild b/dev-util/dlang-tools/dlang-tools-2.088.1.ebuild
index 07eadce..5108ce1 100644
--- a/dev-util/dlang-tools/dlang-tools-2.088.1.ebuild
+++ b/dev-util/dlang-tools/dlang-tools-2.088.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Ancilliary tools for the D programming language compiler"
 HOMEPAGE="http://dlang.org/"
@@ -13,8 +13,6 @@ TOOLS="ddemangle detab dustmite rdmd"
 IUSE="+ddemangle detab dustmite +rdmd"
 REQUIRED_USE="|| ( ${TOOLS} )"
 
-inherit eapi7-ver
-
 DLANG_SLOT="$(ver_cut 1-2)"
 RESTRICT="mirror"
 
@@ -30,7 +28,7 @@ SRC_URI="https://codeload.github.com/dlang/tools/tar.gz/v${VERSION} -> dlang-too
 DLANG_VERSION_RANGE="2.076-"
 DLANG_PACKAGE_TYPE="single"
 
-inherit eutils dlang xdg-utils
+inherit desktop dlang xdg-utils
 
 S="${WORKDIR}/tools-${VERSION}"
 
diff --git a/dev-util/dlang-tools/dlang-tools-2.089.1.ebuild b/dev-util/dlang-tools/dlang-tools-2.089.1.ebuild
index 01f9748..5108ce1 100644
--- a/dev-util/dlang-tools/dlang-tools-2.089.1.ebuild
+++ b/dev-util/dlang-tools/dlang-tools-2.089.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Ancilliary tools for the D programming language compiler"
 HOMEPAGE="http://dlang.org/"
@@ -13,8 +13,6 @@ TOOLS="ddemangle detab dustmite rdmd"
 IUSE="+ddemangle detab dustmite +rdmd"
 REQUIRED_USE="|| ( ${TOOLS} )"
 
-inherit eapi7-ver
-
 DLANG_SLOT="$(ver_cut 1-2)"
 RESTRICT="mirror"
 
@@ -30,7 +28,7 @@ SRC_URI="https://codeload.github.com/dlang/tools/tar.gz/v${VERSION} -> dlang-too
 DLANG_VERSION_RANGE="2.076-"
 DLANG_PACKAGE_TYPE="single"
 
-inherit eutils dlang xdg-utils
+inherit desktop dlang xdg-utils
 
 S="${WORKDIR}/tools-${VERSION}"
 
diff --git a/dev-util/dlang-tools/dlang-tools-2.090.1.ebuild b/dev-util/dlang-tools/dlang-tools-2.090.1.ebuild
index 01f9748..5108ce1 100644
--- a/dev-util/dlang-tools/dlang-tools-2.090.1.ebuild
+++ b/dev-util/dlang-tools/dlang-tools-2.090.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Ancilliary tools for the D programming language compiler"
 HOMEPAGE="http://dlang.org/"
@@ -13,8 +13,6 @@ TOOLS="ddemangle detab dustmite rdmd"
 IUSE="+ddemangle detab dustmite +rdmd"
 REQUIRED_USE="|| ( ${TOOLS} )"
 
-inherit eapi7-ver
-
 DLANG_SLOT="$(ver_cut 1-2)"
 RESTRICT="mirror"
 
@@ -30,7 +28,7 @@ SRC_URI="https://codeload.github.com/dlang/tools/tar.gz/v${VERSION} -> dlang-too
 DLANG_VERSION_RANGE="2.076-"
 DLANG_PACKAGE_TYPE="single"
 
-inherit eutils dlang xdg-utils
+inherit desktop dlang xdg-utils
 
 S="${WORKDIR}/tools-${VERSION}"
 
diff --git a/dev-util/dlang-tools/dlang-tools-2.091.1.ebuild b/dev-util/dlang-tools/dlang-tools-2.091.1.ebuild
index 01f9748..5108ce1 100644
--- a/dev-util/dlang-tools/dlang-tools-2.091.1.ebuild
+++ b/dev-util/dlang-tools/dlang-tools-2.091.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Ancilliary tools for the D programming language compiler"
 HOMEPAGE="http://dlang.org/"
@@ -13,8 +13,6 @@ TOOLS="ddemangle detab dustmite rdmd"
 IUSE="+ddemangle detab dustmite +rdmd"
 REQUIRED_USE="|| ( ${TOOLS} )"
 
-inherit eapi7-ver
-
 DLANG_SLOT="$(ver_cut 1-2)"
 RESTRICT="mirror"
 
@@ -30,7 +28,7 @@ SRC_URI="https://codeload.github.com/dlang/tools/tar.gz/v${VERSION} -> dlang-too
 DLANG_VERSION_RANGE="2.076-"
 DLANG_PACKAGE_TYPE="single"
 
-inherit eutils dlang xdg-utils
+inherit desktop dlang xdg-utils
 
 S="${WORKDIR}/tools-${VERSION}"
 
diff --git a/dev-util/dlang-tools/dlang-tools-2.092.1.ebuild b/dev-util/dlang-tools/dlang-tools-2.092.1.ebuild
index 01f9748..5108ce1 100644
--- a/dev-util/dlang-tools/dlang-tools-2.092.1.ebuild
+++ b/dev-util/dlang-tools/dlang-tools-2.092.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Ancilliary tools for the D programming language compiler"
 HOMEPAGE="http://dlang.org/"
@@ -13,8 +13,6 @@ TOOLS="ddemangle detab dustmite rdmd"
 IUSE="+ddemangle detab dustmite +rdmd"
 REQUIRED_USE="|| ( ${TOOLS} )"
 
-inherit eapi7-ver
-
 DLANG_SLOT="$(ver_cut 1-2)"
 RESTRICT="mirror"
 
@@ -30,7 +28,7 @@ SRC_URI="https://codeload.github.com/dlang/tools/tar.gz/v${VERSION} -> dlang-too
 DLANG_VERSION_RANGE="2.076-"
 DLANG_PACKAGE_TYPE="single"
 
-inherit eutils dlang xdg-utils
+inherit desktop dlang xdg-utils
 
 S="${WORKDIR}/tools-${VERSION}"
 
diff --git a/dev-util/dlang-tools/dlang-tools-2.093.1.ebuild b/dev-util/dlang-tools/dlang-tools-2.093.1.ebuild
index 01f9748..5108ce1 100644
--- a/dev-util/dlang-tools/dlang-tools-2.093.1.ebuild
+++ b/dev-util/dlang-tools/dlang-tools-2.093.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Ancilliary tools for the D programming language compiler"
 HOMEPAGE="http://dlang.org/"
@@ -13,8 +13,6 @@ TOOLS="ddemangle detab dustmite rdmd"
 IUSE="+ddemangle detab dustmite +rdmd"
 REQUIRED_USE="|| ( ${TOOLS} )"
 
-inherit eapi7-ver
-
 DLANG_SLOT="$(ver_cut 1-2)"
 RESTRICT="mirror"
 
@@ -30,7 +28,7 @@ SRC_URI="https://codeload.github.com/dlang/tools/tar.gz/v${VERSION} -> dlang-too
 DLANG_VERSION_RANGE="2.076-"
 DLANG_PACKAGE_TYPE="single"
 
-inherit eutils dlang xdg-utils
+inherit desktop dlang xdg-utils
 
 S="${WORKDIR}/tools-${VERSION}"
 
diff --git a/dev-util/dlang-tools/dlang-tools-2.094.2.ebuild b/dev-util/dlang-tools/dlang-tools-2.094.2.ebuild
index 838d0e3..5108ce1 100644
--- a/dev-util/dlang-tools/dlang-tools-2.094.2.ebuild
+++ b/dev-util/dlang-tools/dlang-tools-2.094.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Ancilliary tools for the D programming language compiler"
 HOMEPAGE="http://dlang.org/"
@@ -13,8 +13,6 @@ TOOLS="ddemangle detab dustmite rdmd"
 IUSE="+ddemangle detab dustmite +rdmd"
 REQUIRED_USE="|| ( ${TOOLS} )"
 
-inherit eapi7-ver
-
 DLANG_SLOT="$(ver_cut 1-2)"
 RESTRICT="mirror"
 
@@ -30,7 +28,7 @@ SRC_URI="https://codeload.github.com/dlang/tools/tar.gz/v${VERSION} -> dlang-too
 DLANG_VERSION_RANGE="2.076-"
 DLANG_PACKAGE_TYPE="single"
 
-inherit eutils dlang xdg-utils
+inherit desktop dlang xdg-utils
 
 S="${WORKDIR}/tools-${VERSION}"
 
diff --git a/dev-util/dlang-tools/dlang-tools-2.095.1.ebuild b/dev-util/dlang-tools/dlang-tools-2.095.1.ebuild
index 7e16d25..20bea31 100644
--- a/dev-util/dlang-tools/dlang-tools-2.095.1.ebuild
+++ b/dev-util/dlang-tools/dlang-tools-2.095.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Ancilliary tools for the D programming language compiler"
 HOMEPAGE="http://dlang.org/"
@@ -13,8 +13,6 @@ TOOLS="ddemangle detab dustmite rdmd"
 IUSE="+ddemangle detab dustmite +rdmd"
 REQUIRED_USE="|| ( ${TOOLS} )"
 
-inherit eapi7-ver
-
 DLANG_SLOT="$(ver_cut 1-2)"
 RESTRICT="mirror"
 
@@ -30,7 +28,7 @@ SRC_URI="https://codeload.github.com/dlang/tools/tar.gz/v${VERSION} -> dlang-too
 DLANG_VERSION_RANGE="2.076-"
 DLANG_PACKAGE_TYPE="single"
 
-inherit eutils dlang xdg-utils
+inherit desktop dlang xdg-utils
 
 S="${WORKDIR}/tools-${VERSION}"
 
diff --git a/dev-util/dlang-tools/dlang-tools-2.096.1.ebuild b/dev-util/dlang-tools/dlang-tools-2.096.1.ebuild
index 7e16d25..20bea31 100644
--- a/dev-util/dlang-tools/dlang-tools-2.096.1.ebuild
+++ b/dev-util/dlang-tools/dlang-tools-2.096.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Ancilliary tools for the D programming language compiler"
 HOMEPAGE="http://dlang.org/"
@@ -13,8 +13,6 @@ TOOLS="ddemangle detab dustmite rdmd"
 IUSE="+ddemangle detab dustmite +rdmd"
 REQUIRED_USE="|| ( ${TOOLS} )"
 
-inherit eapi7-ver
-
 DLANG_SLOT="$(ver_cut 1-2)"
 RESTRICT="mirror"
 
@@ -30,7 +28,7 @@ SRC_URI="https://codeload.github.com/dlang/tools/tar.gz/v${VERSION} -> dlang-too
 DLANG_VERSION_RANGE="2.076-"
 DLANG_PACKAGE_TYPE="single"
 
-inherit eutils dlang xdg-utils
+inherit desktop dlang xdg-utils
 
 S="${WORKDIR}/tools-${VERSION}"
 
diff --git a/dev-util/dlang-tools/dlang-tools-2.097.2.ebuild b/dev-util/dlang-tools/dlang-tools-2.097.2.ebuild
index 640ccb4..3d753fc 100644
--- a/dev-util/dlang-tools/dlang-tools-2.097.2.ebuild
+++ b/dev-util/dlang-tools/dlang-tools-2.097.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Ancilliary tools for the D programming language compiler"
 HOMEPAGE="http://dlang.org/"
@@ -13,8 +13,6 @@ TOOLS="ddemangle detab dustmite rdmd"
 IUSE="+ddemangle detab dustmite +rdmd"
 REQUIRED_USE="|| ( ${TOOLS} )"
 
-inherit eapi7-ver
-
 DLANG_SLOT="$(ver_cut 1-2)"
 RESTRICT="mirror"
 
@@ -30,7 +28,7 @@ SRC_URI="https://codeload.github.com/dlang/tools/tar.gz/v${VERSION} -> dlang-too
 DLANG_VERSION_RANGE="2.075-"
 DLANG_PACKAGE_TYPE="single"
 
-inherit eutils dlang xdg-utils
+inherit desktop dlang xdg-utils
 
 S="${WORKDIR}/tools-${VERSION}"
 
diff --git a/dev-util/dlang-tools/dlang-tools-2.098.1.ebuild b/dev-util/dlang-tools/dlang-tools-2.098.1.ebuild
index 640ccb4..3d753fc 100644
--- a/dev-util/dlang-tools/dlang-tools-2.098.1.ebuild
+++ b/dev-util/dlang-tools/dlang-tools-2.098.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Ancilliary tools for the D programming language compiler"
 HOMEPAGE="http://dlang.org/"
@@ -13,8 +13,6 @@ TOOLS="ddemangle detab dustmite rdmd"
 IUSE="+ddemangle detab dustmite +rdmd"
 REQUIRED_USE="|| ( ${TOOLS} )"
 
-inherit eapi7-ver
-
 DLANG_SLOT="$(ver_cut 1-2)"
 RESTRICT="mirror"
 
@@ -30,7 +28,7 @@ SRC_URI="https://codeload.github.com/dlang/tools/tar.gz/v${VERSION} -> dlang-too
 DLANG_VERSION_RANGE="2.075-"
 DLANG_PACKAGE_TYPE="single"
 
-inherit eutils dlang xdg-utils
+inherit desktop dlang xdg-utils
 
 S="${WORKDIR}/tools-${VERSION}"
 
diff --git a/dev-util/dlang-tools/dlang-tools-2.099.1.ebuild b/dev-util/dlang-tools/dlang-tools-2.099.1.ebuild
index aa26d98..20bea31 100644
--- a/dev-util/dlang-tools/dlang-tools-2.099.1.ebuild
+++ b/dev-util/dlang-tools/dlang-tools-2.099.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Ancilliary tools for the D programming language compiler"
 HOMEPAGE="http://dlang.org/"
@@ -13,8 +13,6 @@ TOOLS="ddemangle detab dustmite rdmd"
 IUSE="+ddemangle detab dustmite +rdmd"
 REQUIRED_USE="|| ( ${TOOLS} )"
 
-inherit eapi7-ver
-
 DLANG_SLOT="$(ver_cut 1-2)"
 RESTRICT="mirror"
 
@@ -30,7 +28,7 @@ SRC_URI="https://codeload.github.com/dlang/tools/tar.gz/v${VERSION} -> dlang-too
 DLANG_VERSION_RANGE="2.076-"
 DLANG_PACKAGE_TYPE="single"
 
-inherit eutils dlang xdg-utils
+inherit desktop dlang xdg-utils
 
 S="${WORKDIR}/tools-${VERSION}"
 
diff --git a/dev-util/dlang-tools/dlang-tools-2.100.2.ebuild b/dev-util/dlang-tools/dlang-tools-2.100.2.ebuild
index 77e9b0d..6f1cef4 100644
--- a/dev-util/dlang-tools/dlang-tools-2.100.2.ebuild
+++ b/dev-util/dlang-tools/dlang-tools-2.100.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Ancilliary tools for the D programming language compiler"
 HOMEPAGE="http://dlang.org/"
@@ -13,8 +13,6 @@ TOOLS="ddemangle detab dustmite rdmd"
 IUSE="+ddemangle detab dustmite +rdmd"
 REQUIRED_USE="|| ( ${TOOLS} )"
 
-inherit eapi7-ver
-
 DLANG_SLOT="$(ver_cut 1-2)"
 RESTRICT="mirror"
 
@@ -30,7 +28,7 @@ SRC_URI="https://codeload.github.com/dlang/tools/tar.gz/v${VERSION} -> dlang-too
 DLANG_VERSION_RANGE="2.075-2.102"
 DLANG_PACKAGE_TYPE="single"
 
-inherit eutils dlang xdg-utils
+inherit desktop dlang xdg-utils
 
 S="${WORKDIR}/tools-${VERSION}"
 
diff --git a/dev-util/dlang-tools/dlang-tools-2.101.2.ebuild b/dev-util/dlang-tools/dlang-tools-2.101.2.ebuild
index 77e9b0d..6f1cef4 100644
--- a/dev-util/dlang-tools/dlang-tools-2.101.2.ebuild
+++ b/dev-util/dlang-tools/dlang-tools-2.101.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Ancilliary tools for the D programming language compiler"
 HOMEPAGE="http://dlang.org/"
@@ -13,8 +13,6 @@ TOOLS="ddemangle detab dustmite rdmd"
 IUSE="+ddemangle detab dustmite +rdmd"
 REQUIRED_USE="|| ( ${TOOLS} )"
 
-inherit eapi7-ver
-
 DLANG_SLOT="$(ver_cut 1-2)"
 RESTRICT="mirror"
 
@@ -30,7 +28,7 @@ SRC_URI="https://codeload.github.com/dlang/tools/tar.gz/v${VERSION} -> dlang-too
 DLANG_VERSION_RANGE="2.075-2.102"
 DLANG_PACKAGE_TYPE="single"
 
-inherit eutils dlang xdg-utils
+inherit desktop dlang xdg-utils
 
 S="${WORKDIR}/tools-${VERSION}"
 
diff --git a/dev-util/dlang-tools/dlang-tools-2.102.2.ebuild b/dev-util/dlang-tools/dlang-tools-2.102.2.ebuild
index 77e9b0d..6f1cef4 100644
--- a/dev-util/dlang-tools/dlang-tools-2.102.2.ebuild
+++ b/dev-util/dlang-tools/dlang-tools-2.102.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Ancilliary tools for the D programming language compiler"
 HOMEPAGE="http://dlang.org/"
@@ -13,8 +13,6 @@ TOOLS="ddemangle detab dustmite rdmd"
 IUSE="+ddemangle detab dustmite +rdmd"
 REQUIRED_USE="|| ( ${TOOLS} )"
 
-inherit eapi7-ver
-
 DLANG_SLOT="$(ver_cut 1-2)"
 RESTRICT="mirror"
 
@@ -30,7 +28,7 @@ SRC_URI="https://codeload.github.com/dlang/tools/tar.gz/v${VERSION} -> dlang-too
 DLANG_VERSION_RANGE="2.075-2.102"
 DLANG_PACKAGE_TYPE="single"
 
-inherit eutils dlang xdg-utils
+inherit desktop dlang xdg-utils
 
 S="${WORKDIR}/tools-${VERSION}"
 
diff --git a/dev-util/dlang-tools/dlang-tools-2.103.1.ebuild b/dev-util/dlang-tools/dlang-tools-2.103.1.ebuild
index cfc4c35..3d753fc 100644
--- a/dev-util/dlang-tools/dlang-tools-2.103.1.ebuild
+++ b/dev-util/dlang-tools/dlang-tools-2.103.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Ancilliary tools for the D programming language compiler"
 HOMEPAGE="http://dlang.org/"
@@ -13,8 +13,6 @@ TOOLS="ddemangle detab dustmite rdmd"
 IUSE="+ddemangle detab dustmite +rdmd"
 REQUIRED_USE="|| ( ${TOOLS} )"
 
-inherit eapi7-ver
-
 DLANG_SLOT="$(ver_cut 1-2)"
 RESTRICT="mirror"
 
@@ -30,7 +28,7 @@ SRC_URI="https://codeload.github.com/dlang/tools/tar.gz/v${VERSION} -> dlang-too
 DLANG_VERSION_RANGE="2.075-"
 DLANG_PACKAGE_TYPE="single"
 
-inherit eutils dlang xdg-utils
+inherit desktop dlang xdg-utils
 
 S="${WORKDIR}/tools-${VERSION}"
 
diff --git a/dev-util/dlang-tools/dlang-tools-2.104.2.ebuild b/dev-util/dlang-tools/dlang-tools-2.104.2.ebuild
index cfc4c35..3d753fc 100644
--- a/dev-util/dlang-tools/dlang-tools-2.104.2.ebuild
+++ b/dev-util/dlang-tools/dlang-tools-2.104.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Ancilliary tools for the D programming language compiler"
 HOMEPAGE="http://dlang.org/"
@@ -13,8 +13,6 @@ TOOLS="ddemangle detab dustmite rdmd"
 IUSE="+ddemangle detab dustmite +rdmd"
 REQUIRED_USE="|| ( ${TOOLS} )"
 
-inherit eapi7-ver
-
 DLANG_SLOT="$(ver_cut 1-2)"
 RESTRICT="mirror"
 
@@ -30,7 +28,7 @@ SRC_URI="https://codeload.github.com/dlang/tools/tar.gz/v${VERSION} -> dlang-too
 DLANG_VERSION_RANGE="2.075-"
 DLANG_PACKAGE_TYPE="single"
 
-inherit eutils dlang xdg-utils
+inherit desktop dlang xdg-utils
 
 S="${WORKDIR}/tools-${VERSION}"
 
diff --git a/dev-util/dlang-tools/dlang-tools-2.105.2.ebuild b/dev-util/dlang-tools/dlang-tools-2.105.2.ebuild
index cfc4c35..3d753fc 100644
--- a/dev-util/dlang-tools/dlang-tools-2.105.2.ebuild
+++ b/dev-util/dlang-tools/dlang-tools-2.105.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Ancilliary tools for the D programming language compiler"
 HOMEPAGE="http://dlang.org/"
@@ -13,8 +13,6 @@ TOOLS="ddemangle detab dustmite rdmd"
 IUSE="+ddemangle detab dustmite +rdmd"
 REQUIRED_USE="|| ( ${TOOLS} )"
 
-inherit eapi7-ver
-
 DLANG_SLOT="$(ver_cut 1-2)"
 RESTRICT="mirror"
 
@@ -30,7 +28,7 @@ SRC_URI="https://codeload.github.com/dlang/tools/tar.gz/v${VERSION} -> dlang-too
 DLANG_VERSION_RANGE="2.075-"
 DLANG_PACKAGE_TYPE="single"
 
-inherit eutils dlang xdg-utils
+inherit desktop dlang xdg-utils
 
 S="${WORKDIR}/tools-${VERSION}"
 
diff --git a/dev-util/dlang-tools/metadata.xml b/dev-util/dlang-tools/metadata.xml
index b599856..b23ae29 100644
--- a/dev-util/dlang-tools/metadata.xml
+++ b/dev-util/dlang-tools/metadata.xml
@@ -4,7 +4,6 @@
   <use>
     <flag name="ddemangle">An improved D symbol demangler. Replaces all occurrences of mangled D symbols in the input with their unmangled form, and writes the result to standard output.</flag>
     <flag name="detab">Replace tabs with spaces, and remove trailing whitespace from lines.</flag>
-    <flag name="dman">Look up D topics in the online manual. (Requires dmd as a build dependency to create the index.)</flag>
     <flag name="dustmite">DustMite is a tool which minimizes D source code. It was inspired by Tigris Delta and a thread on digitalmars.D.learn. DustMite will parse the source code into a simple hierarchy, and attempt to shrink it by deleting fragments iteratively, as long as the result satisfies a user-specified condition.</flag>
     <flag name="rdmd">rdmd is a companion to the dmd compiler that simplifies the typical edit-compile-link-run or edit-make-run cycle to a rapid edit-run cycle. Like make and other tools, rdmd uses the relative dates of the files involved to minimize the amount of work necessary. Unlike make, rdmd tracks dependencies and freshness without requiring additional information from the user.</flag>
   </use>