gentoo auto-resync : 17:09:2022 - 11:17:07

9 files changed, 45 insertions, 237 deletions

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 73427c5401ce..c37bdb17a30b 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/vkd3d/Manifest b/app-emulation/vkd3d/Manifest
index 74a044290bd8..ada2ed6a64ec 100644
--- a/app-emulation/vkd3d/Manifest
+++ b/app-emulation/vkd3d/Manifest
@@ -1,12 +1,5 @@
-AUX vkd3d-1.1-Fix-build.patch 707 BLAKE2B 6d9ae111c19c61bbb63115bbd960d32a1c28c37aec8bb49fb631d1931b8f2987ccc6dbe2ff5d293480bda96da406e8045e05c7fc502e865da31beed28d70b54c SHA512 1d5316b4efb48fa8e8af99db675f02a4225a82b5095a6799c060a648977da83f8c3fd54ac3d6a86bfcdb6e05c1f455db68aaea7b7fc636b92f1274ba0fefd63b
-DIST vkd3d-1.0.tar.xz 461884 BLAKE2B 4dbd729f9e795d3d81178abc1a8774c0bbe6a5257c96c97acf1e4b4cdb5b7e30c77235e8b8fa57f7db3196caf30c55c3b0c07e2981629dd6177436a3cd117d33 SHA512 55712528688cdedc63049e168b371b470dbb8e31ddc36d8b23b0655f4a061726eb8556b9abf3cb887f6bd21379959aed9fab93ba0fd53813aec413ebec71d615
-DIST vkd3d-1.1.tar.xz 487452 BLAKE2B 834ca06d2159a5857dde457f27e541f06624e87633af6aca7445867abc38c56a1da1fe34b6795ffbd6aa73e983ac0e4301402ae35ef8358fa8cc79c12972b11d SHA512 e107612bdca95e998f9d819bdf74e4ffe1b4d400d250ab855c4ebf94b7d3f088b3221591fef03b1c6b8ecb030feb1673f74831bd8bd8edda2989d09a8846b0f7
 DIST vkd3d-1.2.tar.xz 611240 BLAKE2B e7ea3f7120ad1092be0239bdc2e6d0dfdfecc3b1c2e7c359c4bfbd8c259f092e041a75a0e896da9a1c6370d5716590711128d31c9e552897b177b300b9a15107 SHA512 ca9d5b11e7770747b78b61f43196b45b7bda8d2dd4f1d76da915f895a04dc28c20499e1e433f5ce17416964fe0f37cdc907e7aa540ec9105afbc8a100094f3e7
 DIST vkd3d-1.4.tar.xz 774920 BLAKE2B c46a71b495fc41658ea493f65ad15aec18202889a9c7925962301cce91f32e197c5850f374331595e4bd267fcbf9836531e733fb5880ddb4936476ddedd19bbc SHA512 58535b57b0b506542f2867e9b1229682f012216b9f8913d2692d4ed64a8113248d66ea710127ec2064baf9511b7f2be7b757dffcaf95a43168d781010d007ddb
-EBUILD vkd3d-1.0.ebuild 926 BLAKE2B 414506ab4d6f240d57ca56e6e3ac080722d2bd375db9c790089ca310ff6340af1d5cd33185af795cdd581405d93f19610b1026087eedd358a3769159b29d4eb1 SHA512 29625db76407d29252f534b11296f0d3df7dcdbc567c9a0e0201765ee75370b28bf9098e96752e128ec4533209eef8dd0bf1f3000f818b5c97bdf12a32404466
-EBUILD vkd3d-1.1-r1.ebuild 980 BLAKE2B daaff20825a376043e4fceb986c67f317967a6b59c1d005060e4e5ced5f1b8ffc9e6f8d0d6ed3c03088c7345be584c5815d978668ef9be936e94aff7db396c7a SHA512 485bc1411a2f71639a107b3f75081a315e4fd8a948116b77f99400ce9b67a21c2e8d0c6de5e26c80cd7d9507306c85ff36f792070691fd65f081cc31a7b27cc2
-EBUILD vkd3d-1.1.ebuild 929 BLAKE2B 3b1a8b289d47ab301fec2a45d5bde71759a0c23a36c6f9009ea7626860436a77f3bb3ff45184ed94f1b26cb859b5a6ae874cb66258edb0a52b8bf78b0ae9dfaf SHA512 db1e44ca23bcc636a61f9019a02558efc948bf7347e6ba11034ac0bae7cd0562555788b69dc98f0ccf67f4760b4c02338e81c54d5ccd8ee8d3ccd004bbbf66a4
 EBUILD vkd3d-1.2.ebuild 1014 BLAKE2B f4305c940dde99c678485c66800e9a5713ea293c8e4b7d523e8004a3e69a45e297a4fb15ebaf04be435fbb5990e9c293fc54b42653e05cc3bf797e9222dd2358 SHA512 237c2b4c0964be401ad514529e2753e88489f02557eef60816d18c494a6fd20b18f11b5dd2cbbdc234897333cc3dcf6690ec1bcac8826a7bcd8fc8b0c68206e9
-EBUILD vkd3d-1.4.ebuild 1016 BLAKE2B 6c1a5f13d7a3f4eeab2548ed0860034b1d397bca2669ea56db9a4619431aa2ca8ecabea788f1b7ec3e340f0a18c013dfc4a06f70178cea0d582a53a79b9555fd SHA512 e56dc910a014e4c93621073aed8a6f9f20af0f719dcfcdc278502f1134a257e787629007abf84c1872ece3b6a9a5b9fe272e70619b4d16dd75810cfe68bb70d7
-EBUILD vkd3d-9999.ebuild 1016 BLAKE2B 6c1a5f13d7a3f4eeab2548ed0860034b1d397bca2669ea56db9a4619431aa2ca8ecabea788f1b7ec3e340f0a18c013dfc4a06f70178cea0d582a53a79b9555fd SHA512 e56dc910a014e4c93621073aed8a6f9f20af0f719dcfcdc278502f1134a257e787629007abf84c1872ece3b6a9a5b9fe272e70619b4d16dd75810cfe68bb70d7
+EBUILD vkd3d-1.4-r1.ebuild 958 BLAKE2B 111994318d8146fb7d172465fe0d44aed8a4a5539f13047a0cf60deb3c0431d0187a688cf159f20d48d141f91af3b5f26d96b6404d03408ca8dc33f31f671839 SHA512 c667400fb34e1c439bc9519d8e63d28dae2b0b8ce678b2998a6548d1e8b92a47bd7984fed0bb7bf42dd565846f9df4332795b06145245c68d6a9f337ec5a008c
 MISC metadata.xml 563 BLAKE2B c976a16a495bdb5863811acda56b2cc628683a63fc2a22c18d2a09775d3a38c845e00f83b97b318d9a0e5267bb470dd56d334dc9f43e3716784254802b8db60b SHA512 3d5afb7890b3b10ad424fcfe3fa2b42a9227ba0b82be8ab85308126966f476798818ee0ecc88c53105b218f465a72b213efe00968112431169884a4a6f48c6a8
diff --git a/app-emulation/vkd3d/files/vkd3d-1.1-Fix-build.patch b/app-emulation/vkd3d/files/vkd3d-1.1-Fix-build.patch
deleted file mode 100644
index 048c6c843f55..000000000000
--- a/app-emulation/vkd3d/files/vkd3d-1.1-Fix-build.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h
-index df44447..53a081a 100644
---- a/libs/vkd3d/vkd3d_private.h
-+++ b/libs/vkd3d/vkd3d_private.h
-@@ -47,6 +47,8 @@
- 
- #define VKD3D_MAX_SHADER_STAGES     5u
- 
-+#define VKD3D_PIPELINE_BIND_POINT_COUNT 2u
-+
- struct d3d12_command_list;
- struct d3d12_device;
- 
-@@ -625,7 +627,7 @@ struct d3d12_command_list
-     VkFramebuffer current_framebuffer;
-     VkPipeline current_pipeline;
-     VkRenderPass current_render_pass;
--    struct vkd3d_pipeline_bindings pipeline_bindings[VK_PIPELINE_BIND_POINT_RANGE_SIZE];
-+    struct vkd3d_pipeline_bindings pipeline_bindings[VKD3D_PIPELINE_BIND_POINT_COUNT];
- 
-     struct d3d12_pipeline_state *state;
- 
diff --git a/app-emulation/vkd3d/vkd3d-1.0.ebuild b/app-emulation/vkd3d/vkd3d-1.0.ebuild
deleted file mode 100644
index adf1fb7481d8..000000000000
--- a/app-emulation/vkd3d/vkd3d-1.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 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"
-	SRC_URI="https://dl.winehq.org/vkd3d/source/${P}.tar.xz"
-fi
-
-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)
-	)
-
-	ECONF_SOURCE=${S} econf "${myconf[@]}"
-}
diff --git a/app-emulation/vkd3d/vkd3d-1.1-r1.ebuild b/app-emulation/vkd3d/vkd3d-1.1-r1.ebuild
deleted file mode 100644
index 2fc70a042f61..000000000000
--- a/app-emulation/vkd3d/vkd3d-1.1-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 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
-
-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"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-Fix-build.patch
-)
-
-multilib_src_configure() {
-	local myconf=(
-		$(use_with spirv-tools)
-	)
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
diff --git a/app-emulation/vkd3d/vkd3d-1.1.ebuild b/app-emulation/vkd3d/vkd3d-1.1.ebuild
deleted file mode 100644
index d3f9d96bc43b..000000000000
--- a/app-emulation/vkd3d/vkd3d-1.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 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
-
-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)
-	)
-
-	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
new file mode 100644
index 000000000000..5fc7999f8241
--- /dev/null
+++ b/app-emulation/vkd3d/vkd3d-1.4-r1.ebuild
@@ -0,0 +1,44 @@
+# 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
+}
diff --git a/app-emulation/vkd3d/vkd3d-1.4.ebuild b/app-emulation/vkd3d/vkd3d-1.4.ebuild
deleted file mode 100644
index e64cc1a24558..000000000000
--- a/app-emulation/vkd3d/vkd3d-1.4.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-9999.ebuild b/app-emulation/vkd3d/vkd3d-9999.ebuild
deleted file mode 100644
index e64cc1a24558..000000000000
--- a/app-emulation/vkd3d/vkd3d-9999.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[@]}"
-}