4 files changed, 11 insertions, 95 deletions
diff --git a/app-emulation/vkd3d/Manifest b/app-emulation/vkd3d/Manifest
index 5fc50d2062fe..e46132d73bb4 100644
--- a/app-emulation/vkd3d/Manifest
+++ b/app-emulation/vkd3d/Manifest
@@ -1,3 +1 @@
-DIST vkd3d-1.2.tar.xz 611240 BLAKE2B e7ea3f7120ad1092be0239bdc2e6d0dfdfecc3b1c2e7c359c4bfbd8c259f092e041a75a0e896da9a1c6370d5716590711128d31c9e552897b177b300b9a15107 SHA512 ca9d5b11e7770747b78b61f43196b45b7bda8d2dd4f1d76da915f895a04dc28c20499e1e433f5ce17416964fe0f37cdc907e7aa540ec9105afbc8a100094f3e7
-DIST vkd3d-1.4.tar.xz 774920 BLAKE2B c46a71b495fc41658ea493f65ad15aec18202889a9c7925962301cce91f32e197c5850f374331595e4bd267fcbf9836531e733fb5880ddb4936476ddedd19bbc SHA512 58535b57b0b506542f2867e9b1229682f012216b9f8913d2692d4ed64a8113248d66ea710127ec2064baf9511b7f2be7b757dffcaf95a43168d781010d007ddb
-DIST vkd3d-1.5.tar.xz 776260 BLAKE2B c021dd03b120f3ad8da61147a12f9d581a85aaf458f34308f06a648167562adedd670444473cbc5ca66c1ff6242b2add21396bbc5cce308c39482451aa5b45e5 SHA512 69ec33bef28334a9a55da34621c71623843995279fb5267cc56228cd343c8cf292deb848596e6f850dfee6d07cc35206fc034fc4ce2a911652a9c42c032cdc08
+DIST vkd3d-1.11.tar.xz 1016132 BLAKE2B 634f5f99f7605814d36a90270ddb82a6a11e2b6bfc2cdc6a6d4d31b730b9d5739479770fe00704f27a726c39aa115272c0a79dbcff8baf251188a4b3ead8faeb SHA512 2b14f7f8d4d58c2bfc6c30aa0d24b6789c0887b2869cfb6be98d03b7b001a74a1fbe24439229fa4d3a618a69fe8eeb77d7a520a16276ae494fe6ee2357dd31d0
diff --git a/app-emulation/vkd3d/vkd3d-1.5.ebuild b/app-emulation/vkd3d/vkd3d-1.11.ebuild
index f0e863b89b11..c05e18ff7123 100644
--- a/app-emulation/vkd3d/vkd3d-1.5.ebuild
+++ b/app-emulation/vkd3d/vkd3d-1.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,22 +11,25 @@ SRC_URI="https://dl.winehq.org/vkd3d/source/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="ncurses spirv-tools"
 RESTRICT="test" #838655
 
 RDEPEND="
 	media-libs/vulkan-loader[${MULTILIB_USEDEP}]
 	ncurses? ( sys-libs/ncurses:= )
-	spirv-tools? ( dev-util/spirv-tools[${MULTILIB_USEDEP}] )"
+	spirv-tools? ( dev-util/spirv-tools[${MULTILIB_USEDEP}] )
+"
 DEPEND="
 	${RDEPEND}
 	dev-util/spirv-headers
-	dev-util/vulkan-headers"
+	dev-util/vulkan-headers
+"
 BDEPEND="
 	sys-devel/flex
 	sys-devel/bison
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 multilib_src_configure() {
 	local conf=(
@@ -40,5 +43,7 @@ multilib_src_configure() {
 }
 
 multilib_src_install_all() {
+	einstalldocs
+
 	find "${ED}" -type f -name '*.la' -delete || die
 }
diff --git a/app-emulation/vkd3d/vkd3d-1.2.ebuild b/app-emulation/vkd3d/vkd3d-1.2.ebuild
deleted file mode 100644
index f1338881d76e..000000000000
--- a/app-emulation/vkd3d/vkd3d-1.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-minimal
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://source.winehq.org/git/vkd3d.git"
-	inherit git-r3
-else
-	KEYWORDS="amd64 x86"
-	SRC_URI="https://dl.winehq.org/vkd3d/source/${P}.tar.xz"
-fi
-
-#Tests fail: https://bugs.gentoo.org/838655
-RESTRICT="test"
-
-IUSE="spirv-tools"
-RDEPEND="spirv-tools? ( dev-util/spirv-tools:=[${MULTILIB_USEDEP}] )
-		media-libs/vulkan-loader[${MULTILIB_USEDEP},X]
-		x11-libs/xcb-util:=[${MULTILIB_USEDEP}]
-		x11-libs/xcb-util-keysyms:=[${MULTILIB_USEDEP}]
-		x11-libs/xcb-util-wm:=[${MULTILIB_USEDEP}]"
-
-DEPEND="${RDEPEND}
-		dev-util/spirv-headers
-		dev-util/vulkan-headers"
-
-DESCRIPTION="D3D12 to Vulkan translation library"
-HOMEPAGE="https://source.winehq.org/git/vkd3d.git/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-multilib_src_configure() {
-	local myconf=(
-		$(use_with spirv-tools)
-		--disable-doxygen-pdf
-	)
-
-	ECONF_SOURCE=${S} econf "${myconf[@]}"
-}
diff --git a/app-emulation/vkd3d/vkd3d-1.4-r1.ebuild b/app-emulation/vkd3d/vkd3d-1.4-r1.ebuild
deleted file mode 100644
index 5fc7999f8241..000000000000
--- a/app-emulation/vkd3d/vkd3d-1.4-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multilib-minimal
-
-DESCRIPTION="D3D12 to Vulkan translation library"
-HOMEPAGE="https://source.winehq.org/git/vkd3d.git/"
-SRC_URI="https://dl.winehq.org/vkd3d/source/${P}.tar.xz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ncurses spirv-tools"
-RESTRICT="test" #838655
-
-RDEPEND="
-	media-libs/vulkan-loader[${MULTILIB_USEDEP}]
-	ncurses? ( sys-libs/ncurses:= )
-	spirv-tools? ( dev-util/spirv-tools[${MULTILIB_USEDEP}] )"
-DEPEND="
-	${RDEPEND}
-	dev-util/spirv-headers
-	dev-util/vulkan-headers"
-BDEPEND="
-	sys-devel/flex
-	sys-devel/bison
-	virtual/pkgconfig"
-
-multilib_src_configure() {
-	local conf=(
-		$(multilib_native_use_with ncurses)
-		$(use_with spirv-tools)
-		--disable-doxygen-pdf
-		--without-xcb
-	)
-
-	ECONF_SOURCE=${S} econf "${conf[@]}"
-}
-
-multilib_src_install_all() {
-	find "${ED}" -type f -name '*.la' -delete || die
-}