13 files changed, 10 insertions, 182 deletions
diff --git a/dev-lang/dmd/dmd-2.095.1.ebuild b/dev-lang/dmd/dmd-2.095.1.ebuild
index 1701d93..58f7f8c 100644
--- a/dev-lang/dmd/dmd-2.095.1.ebuild
+++ b/dev-lang/dmd/dmd-2.095.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 YEAR=2021
 DLANG_VERSION_RANGE="2.076-"
 
diff --git a/dev-lang/dmd/dmd-2.096.1.ebuild b/dev-lang/dmd/dmd-2.096.1.ebuild
index 1701d93..58f7f8c 100644
--- a/dev-lang/dmd/dmd-2.096.1.ebuild
+++ b/dev-lang/dmd/dmd-2.096.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 YEAR=2021
 DLANG_VERSION_RANGE="2.076-"
 
diff --git a/dev-libs/gtkd/Manifest b/dev-libs/gtkd/Manifest
index 5161ad5..0834ad3 100644
--- a/dev-libs/gtkd/Manifest
+++ b/dev-libs/gtkd/Manifest
@@ -1,3 +1,2 @@
 DIST GtkD-2.4.2.zip 4190939 BLAKE2B 90a47d0882cb57f94b75a155cb949e4272669764abefcc65b4c0cdece05409e669d87076d094bf8f5f7c342c9be506006f78314341a8291b858d787599a29efa SHA512 2d936c9ab69f8ea6fbd91696c91f04820f579e3cdb85914cda6611ac675dadd0d6e8d792ffced640097797f6851016474fadf964e2fc5032262c0945b875cd46
-DIST GtkD-3.8.5.zip 4513387 BLAKE2B eb2bf2a5103e14300dee6c3f9abb567b35af272a479c7a4b8dadd4bb480b5aec996a9e54c7fc3a319cbff30bf9dcec71167a05e1440b501b0f91e5ebae79f191 SHA512 efd43a72a514b0b8de9f1db982f2304c264e3a68915da849fe1d6a5c24b8abe2a072526bba3f1c1e3bea81c162de33cd8c570092438c016087d94e875c9a32a5
 DIST GtkD-3.9.0.zip 4576099 BLAKE2B 50d0bda16f3026f1c068f7b65049005b86367ee1ced581bb2f941c202e0038f1bc6be350bd4bcb30f69ec0696ae0e7bbf4336546153bda389683d44c87d58eac SHA512 f8b8a7b83a23af990abb77f16e4bddf2f72bb65ad210ff8f138b0d4ff66fb5fb2a73a3cbe868a8d2ecf3abf98ece5af771af63068dc2fbf8668e46039320cf0f
diff --git a/dev-libs/gtkd/gtkd-3.8.5-r1.ebuild b/dev-libs/gtkd/gtkd-3.8.5-r1.ebuild
deleted file mode 100644
index 841f0a9..0000000
--- a/dev-libs/gtkd/gtkd-3.8.5-r1.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="GtkD is a D binding and OO wrapper of GTK+"
-HOMEPAGE="http://gtkd.org/"
-LICENSE="LGPL-3"
-
-SLOT="3"
-KEYWORDS="amd64 x86"
-SRC_URI="https://gtkd.org/Downloads/sources/GtkD-${PV}.zip"
-
-DLANG_VERSION_RANGE="2.074-"
-DLANG_PACKAGE_TYPE="multi"
-
-inherit eutils dlang
-
-DEPEND="app-arch/unzip"
-RDEPEND="
-	>=x11-libs/gtk+-3.22:3[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.56:2[${MULTILIB_USEDEP}]
-	>=x11-libs/pango-1.42[${MULTILIB_USEDEP}]
-	>=dev-libs/atk-2.28[${MULTILIB_USEDEP}]
-	>=x11-libs/gdk-pixbuf-2.36:2[${MULTILIB_USEDEP}]
-	>=x11-libs/cairo-1.12.2[${MULTILIB_USEDEP}]
-	sourceview? ( >=x11-libs/gtksourceview-3.24:3.0 )
-	gstreamer? ( >=media-libs/gstreamer-1.14:1.0[${MULTILIB_USEDEP}] )
-	vte? ( >=x11-libs/vte-0.52:2.91 )
-	peas? ( >=dev-libs/libpeas-1.20 )
-"
-
-GTKD_USE_FLAGS=(gtk  opengl sourceview gstreamer  vte  peas)
-GTKD_LIB_NAMES=(gtkd gtkdgl gtkdsv     gstreamerd vted peasd)
-GTKD_SRC_DIRS=( gtkd gtkdgl sourceview gstreamer  vte  peas)
-IUSE="${GTKD_USE_FLAGS[@]:1} static-libs"
-
-MAJOR=$(ver_cut 1)
-MINOR=$(ver_cut 2-)
-
-src_unpack() {
-	unzip -q "${DISTDIR}/${A}" -d "${S}"
-}
-
-d_src_compile() {
-	compile_libs() {
-		# Build the shared library version of the component
-		# The test phase expects no version extension on the .so
-		local sources=generated/${SRC_DIR}/*/*.d
-		if [ ${LIB_NAME} != gtkdgl ]; then
-			sources+=" "generated/${SRC_DIR}/*/c/*.d
-		fi
-		if [ ${LIB_NAME} == gstreamerd ]; then
-			sources+=" "generated/gstreamer/gst/*/*.d" "generated/gstreamer/gst/*/c/*.d
-		fi
-		echo $sources
-		dlang_compile_lib_so lib${LIB_NAME}-${MAJOR}.so \
-			lib${LIB_NAME}-${MAJOR}.so.0 -Isrc -Igenerated/gtkd ${sources}
-
-		# Build the static library version
-		if use static-libs; then
-			local libname=lib${LIB_NAME}-${MAJOR}
-			if [[ "${DLANG_VENDOR}" == "DigitalMars" ]]; then
-				dlang_exec ${DC} ${DCFLAGS} -m${MODEL} -Isrc -Igenerated/gtkd ${sources} -lib ${LDFLAGS} ${DLANG_OUTPUT_FLAG}${libname}.a
-			elif [[ "${DLANG_VENDOR}" == "GNU" ]]; then
-				dlang_exec ${DC} ${DCFLAGS} -m${MODEL} -Isrc -Igenerated/gtkd ${sources} -c ${LDFLAGS} ${DLANG_OUTPUT_FLAG}${libname}.o
-				dlang_exec ar rcs ${libname}.a ${libname}.o
-			elif [[ "${DLANG_VENDOR}" == "LDC" ]]; then
-				dlang_exec ${DC} ${DCFLAGS} -m${MODEL} -Isrc -Igenerated/gtkd ${sources} -lib -od=${SRC_DIR} -oq ${LDFLAGS} ${DLANG_OUTPUT_FLAG}${libname}.a
-			fi
-		fi
-	}
-
-	foreach_used_component compile_libs
-}
-
-d_src_test() {
-	dlang_exec ${DC} ${DCFLAGS} -m${MODEL} -Igenerated/gtkd demos/gtkD/TestWindow/*.d ${DLANG_LINKER_FLAG}./libgtkd-3.so ${DLANG_LINKER_FLAG}-ldl ${DLANG_LINKER_FLAG}-rpath=./ ${LDFLAGS} ${DLANG_OUTPUT_FLAG}TestWindow
-}
-
-d_src_install() {
-	install_libs() {
-		# Install the shared library version of the component
-		local libfile="lib${LIB_NAME}-${MAJOR}.so"
-		ln -sf "${libfile}" "${libfile}.0"
-		ln -sf "${libfile}" "${libfile}.0.${MINOR}"
-		dolib.so "${libfile}.0.${MINOR}" "${libfile}.0" "${libfile}"
-
-		# Install the static library version
-		if use static-libs; then
-			dolib.a "lib${LIB_NAME}-${MAJOR}.a"
-		fi
-	}
-
-	foreach_used_component install_libs
-}
-
-d_src_install_all() {
-	# Obligatory docs
-	dodoc AUTHORS README.md
-
-	# Include files
-	insinto "${DLANG_IMPORT_DIR}/${PN}-${MAJOR}"
-
-	install_headers() {
-		files="generated/${SRC_DIR}/*"
-		doins -r ${files}
-	}
-
-	foreach_used_component install_headers
-}
-
-foreach_used_component() {
-	for (( i = 0 ; i < ${#GTKD_LIB_NAMES[@]} ; i++ )); do
-		if [[ "${GTKD_LIB_NAMES[$i]}" == "gtkd" ]] || use ${GTKD_USE_FLAGS[$i]}; then
-			LIB_NAME=${GTKD_LIB_NAMES[$i]} SRC_DIR=${GTKD_SRC_DIRS[$i]} ${@}
-		fi
-	done
-}
diff --git a/dev-libs/gtkd/gtkd-3.9.0.ebuild b/dev-libs/gtkd/gtkd-3.9.0.ebuild
index 90a9580..425a1de 100644
--- a/dev-libs/gtkd/gtkd-3.9.0.ebuild
+++ b/dev-libs/gtkd/gtkd-3.9.0.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="http://gtkd.org/"
 LICENSE="LGPL-3"
 
 SLOT="3"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 SRC_URI="https://gtkd.org/Downloads/sources/GtkD-${PV}.zip"
 
 DLANG_VERSION_RANGE="2.074-"
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 73cdfeb..0fd4d6a 100644
--- a/dev-util/dlang-tools/dlang-tools-2.095.1.ebuild
+++ b/dev-util/dlang-tools/dlang-tools-2.095.1.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="http://dlang.org/"
 LICENSE="Boost-1.0"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 TOOLS="ddemangle detab dustmite rdmd"
 IUSE="+ddemangle detab dustmite +rdmd"
 REQUIRED_USE="|| ( ${TOOLS} )"
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 73cdfeb..0fd4d6a 100644
--- a/dev-util/dlang-tools/dlang-tools-2.096.1.ebuild
+++ b/dev-util/dlang-tools/dlang-tools-2.096.1.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="http://dlang.org/"
 LICENSE="Boost-1.0"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 TOOLS="ddemangle detab dustmite rdmd"
 IUSE="+ddemangle detab dustmite +rdmd"
 REQUIRED_USE="|| ( ${TOOLS} )"
diff --git a/dev-util/dub/Manifest b/dev-util/dub/Manifest
index 0665e6d..b53e909 100644
--- a/dev-util/dub/Manifest
+++ b/dev-util/dub/Manifest
@@ -1,2 +1 @@
-DIST dub-1.24.0.tar.gz 1302631 BLAKE2B eb3ed97ff643b8bafdd2448c3f5630d32417611528cec7a3f77242be35210e1b7a52b82f0058c0e894daccac35d94dcb3a4db2d1833be25cbe7acc3915f3f458 SHA512 39fdc8c1e1e8d57da4a1aeb832d2e661aa2acc2297a75e0900f9920be2dcfb84862d8893fdb9356e0c829f13dbea21ccd132e5abc2ef9c63968cc4a466edf00f
 DIST dub-1.25.0.tar.gz 1303972 BLAKE2B 64579b3150904b3e2ce76aa0dd5930f8d861afa7bb4ab0a2cf7b5796161adb61c0f510f07bea2b82bc23f64fd1f614c9222cec12c3254e0d18b510f4fa39aff1 SHA512 9694d79933283c79ef9e272a52f141f49097d65d2e203b78443da2b6e10ed249fe4ce4614f8357d11fb1de0bddfd56ea8cd2dd2b243ec25231ee1f7db5538d8c
diff --git a/dev-util/dub/dub-1.24.0.ebuild b/dev-util/dub/dub-1.24.0.ebuild
deleted file mode 100644
index e60575b..0000000
--- a/dev-util/dub/dub-1.24.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Package and build management system for D"
-HOMEPAGE="https://code.dlang.org/"
-LICENSE="MIT"
-
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="debug"
-
-GITHUB_URI="https://codeload.github.com/dlang"
-SRC_URI="${GITHUB_URI}/${PN}/tar.gz/v${PV} -> ${PN}-${PV}.tar.gz"
-PATCHES="${FILESDIR}/${P}-gdc-dmd-pathfix.patch"
-
-DLANG_VERSION_RANGE="2.081-"
-DLANG_PACKAGE_TYPE="single"
-
-inherit dlang
-
-DEPEND="net-misc/curl"
-RDEPEND="${DEPEND}"
-
-d_src_compile() {
-	local imports=source versions="DubApplication DubUseCurl" libs="curl z"
-	dlang_compile_bin bin/dub $(<build-files.txt)
-}
-
-d_src_test() {
-	echo "Test phase disabled due to multiple problems."
-	#DUB="${S}/bin/dub" test/run-unittest.sh || die "Test phase failed"
-}
-
-d_src_install() {
-	dobin bin/dub
-	dodoc README.md
-}
diff --git a/dev-util/dub/dub-1.25.0.ebuild b/dev-util/dub/dub-1.25.0.ebuild
index 6c03a22..e60575b 100644
--- a/dev-util/dub/dub-1.25.0.ebuild
+++ b/dev-util/dub/dub-1.25.0.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://code.dlang.org/"
 LICENSE="MIT"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
 
 GITHUB_URI="https://codeload.github.com/dlang"
diff --git a/dev-util/dub/files/dub-1.24.0-gdc-dmd-pathfix.patch b/dev-util/dub/files/dub-1.24.0-gdc-dmd-pathfix.patch
deleted file mode 100644
index 497ef50..0000000
--- a/dev-util/dub/files/dub-1.24.0-gdc-dmd-pathfix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/source/dub/generators/build.d b/source/dub/generators/build.d
---- a/source/dub/generators/build.d
-+++ b/source/dub/generators/build.d
-@@ -119,10 +119,10 @@ class BuildGenerator : ProjectGenerator {
- 		auto build_id = computeBuildID(config, buildsettings, settings);
- 
- 		// make all paths relative to shrink the command line
--		string makeRelative(string path) { return shrinkPath(NativePath(path), cwd); }
-+		/+string makeRelative(string path) { return shrinkPath(NativePath(path), cwd); }
- 		foreach (ref f; buildsettings.sourceFiles) f = makeRelative(f);
- 		foreach (ref p; buildsettings.importPaths) p = makeRelative(p);
--		foreach (ref p; buildsettings.stringImportPaths) p = makeRelative(p);
-+		foreach (ref p; buildsettings.stringImportPaths) p = makeRelative(p);+/
- 
- 		// perform the actual build
- 		bool cached = false;
diff --git a/eclass/dlang-compilers.eclass b/eclass/dlang-compilers.eclass
index 133f2ac..22b3d66 100644
--- a/eclass/dlang-compilers.eclass
+++ b/eclass/dlang-compilers.eclass
@@ -46,6 +46,8 @@ dlang-compilers_declare_versions() {
 		["2.092"]="2.092 x86 amd64"
 		["2.093"]="2.093 x86 amd64"
 		["2.094"]="2.094 x86 amd64"
+		["2.095"]="2.095 x86 amd64"
+		["2.096"]="2.096 x86 amd64"
 	)
 
 	# GDC (hppa, sparc: masked "d" USE-flag)
diff --git a/profiles/use.desc b/profiles/use.desc
index 803e97b..7aa58d7 100644
--- a/profiles/use.desc
+++ b/profiles/use.desc
@@ -30,6 +30,8 @@ dmd-2_091 - Build for DMD 2.091
 dmd-2_092 - Build for DMD 2.092
 dmd-2_093 - Build for DMD 2.093
 dmd-2_094 - Build for DMD 2.094
+dmd-2_095 - Build for DMD 2.295
+dmd-2_096 - Build for DMD 2.096
 gdc-9_3_0 - Build for GCC 9.3.0
 ldc2-1_18 - Build for ldc2 1.18
 ldc2-1_19 - Build for ldc2 1.19