gentoo auto-resync : 05:05:2023 - 23:32:28

4 files changed, 42 insertions, 40 deletions

diff --git a/media-libs/vkroots/Manifest b/media-libs/vkroots/Manifest
index 4f9faba7ca85..569287a1320b 100644
--- a/media-libs/vkroots/Manifest
+++ b/media-libs/vkroots/Manifest
@@ -1,5 +1,5 @@
 DIST vkroots-0_p20221205.tar.gz 272641 BLAKE2B ee61988cf1a110d39e96f027160cbefb2e3815e9ef60e367b54be94348d2cd75037a7eb115620460ed1c1c36256e919e568551258217e1b12aea760d2c90dd61 SHA512 a1a21f53d38385a5f300d9dd5650145074baad66b081beaab59179995afcc5a8df8adf19d52c5da15a7ee10fa530aa9d24c3ff1e04df3f7e1d3af526abc1e55e
 DIST vkroots-0_p20230103.tar.gz 306308 BLAKE2B 6252faae2e826a84510b3112aab427efcc80cfd23974165652eff930d064c26ea0595d7b9ea7b0f8fb4b92730b56ba56e1013f0c2aedae1ddc2ec392fcf89aa3 SHA512 606395000264647f0e74aeb4699b63e29de367b5c97b8d26c01b9373cc130ae0cf872ffaa56b826ed6e0b4170654df1af8f4272f8ed6f83fcc6f75750e8d3c2a
-EBUILD vkroots-0_p20221205.ebuild 758 BLAKE2B 67171cd731e7308e303db7ce316eccb709ca938e65cfaaaf865eacd582a4c70b9cc9607ec64b6dbd395b3f3b18f8bd09e4e405fe359653513e9d05a35bf9cc80 SHA512 e9ade5e3531380e1c01d51fdeab9706a12d089287c08dc8ecd951bcde2ff44299b52d51cd3f9cb24836ea69c1ee0826c4feec59f72f875611d03da39f96abb34
-EBUILD vkroots-0_p20230103.ebuild 681 BLAKE2B 5e7844ea53daf588b56e5a87c797912d6674f316c1ef99370df72d21e654f898ae44e29663ecc693edf858184fa53f3318baaffa9db41e7dec91730d53317dc8 SHA512 a39c16f83f37581393ca765f78ea2913de49ab5c6772949b50a3d951629f6cd7d1eefc0456c5232cb2dbbd27dd7fa0505edba804693bf932de9d6746d2bd0f3c
+EBUILD vkroots-0_p20221205-r1.ebuild 575 BLAKE2B 9de82e4b529f9a853761208cea29d33ae3bccd99e79c2345beb72527a6cb5ed755d21798c98189717a81457eca4fb5ee47eabe0a5a4b8f795c68cce40035e66b SHA512 0104a26b38f026c0570169b2c05b2d1767e711d0ed2970cf9aa1b818eed39c8085b3864140feefd81d0b614fdc48e22e25e996696986d80565a69c3623a2c758
+EBUILD vkroots-0_p20230103-r1.ebuild 1064 BLAKE2B f292cad824b5f5237d7d32f8293bd1c308f4088b66d82f5432ffbdb70f8fbe987f89af855931e6918d0a5008f766569096f44ac57085964c77426420444c9a97 SHA512 958bf59387c51a1fec710fbff81421acd96283d134dd4dfbc5a4636fecf093f4b4d76aec7795a43924c0136baa4c5eb60e93a14e91bc12eaff5040aaf1d10fe3
 MISC metadata.xml 334 BLAKE2B b5c4bac2b5e4d1727a382788694763badfb49459ea3874d4d058cc0c141aab14c4111b888e877f095190aabdfac350826b359e0f8a2aed23b44cec9b957f75cf SHA512 c37b1589b9a73654d19a8cbf8fe77035fb8a513f1924fde74613e9cb6ad502ff282e6e915ea366cc847190616285a5753eb2e2e5b8f069bbd5ee2c60beb7913c
diff --git a/media-libs/vkroots/vkroots-0_p20221205.ebuild b/media-libs/vkroots/vkroots-0_p20221205-r1.ebuild
index 639396330c56..d41f02b5ac64 100644
--- a/media-libs/vkroots/vkroots-0_p20221205.ebuild
+++ b/media-libs/vkroots/vkroots-0_p20221205-r1.ebuild
@@ -1,12 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit python-any-r1
-
 COMMIT="e6b89494142eec0ac6061f82a947d2f1246d3d7a"
 DESCRIPTION="Simple framework for writing Vulkan layers"
 HOMEPAGE="https://github.com/Joshua-Ashton/vkroots"
@@ -15,17 +11,12 @@ KEYWORDS="~amd64"
 LICENSE="Apache-2.0 MIT LGPL-2.1"
 SLOT="0"
 
-BDEPEND="
-	${PYTHON_DEPS}
+RDEPEND="
 	dev-util/vulkan-headers
 "
 
 S="${WORKDIR}/${PN}-${COMMIT}"
 
-src_compile() {
-	"${PYTHON}" ./gen/make_vkroots --xml "${BROOT}"/usr/share/vulkan/registry/vk.xml || die
-}
-
 src_install() {
 	default
 	insinto /usr/include/${PN}
diff --git a/media-libs/vkroots/vkroots-0_p20230103-r1.ebuild b/media-libs/vkroots/vkroots-0_p20230103-r1.ebuild
new file mode 100644
index 000000000000..2e58b57ee174
--- /dev/null
+++ b/media-libs/vkroots/vkroots-0_p20230103-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Regenerating vkroots.h from the system vk.xml may seem like a good idea,
+# especially given that vkroots.h includes some Vulkan headers, but this has led
+# to issues such as https://github.com/ValveSoftware/gamescope/issues/858.
+# Leaving the code commented in case we need to revert to the earlier approach.
+
+# PYTHON_COMPAT=( python3_{10..11} )
+
+# inherit meson python-any-r1
+
+inherit meson
+
+COMMIT="26757103dde8133bab432d172b8841df6bb48155"
+DESCRIPTION="Simple framework for writing Vulkan layers"
+HOMEPAGE="https://github.com/Joshua-Ashton/vkroots"
+SRC_URI="https://github.com/Joshua-Ashton/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+LICENSE="Apache-2.0 MIT LGPL-2.1"
+SLOT="0"
+
+# BDEPEND="
+# 	${PYTHON_DEPS}
+# 	dev-util/vulkan-headers
+# "
+
+RDEPEND="
+	dev-util/vulkan-headers
+"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+# src_compile() {
+# 	"${PYTHON}" ./gen/make_vkroots --xml "${BROOT}"/usr/share/vulkan/registry/vk.xml || die
+# }
diff --git a/media-libs/vkroots/vkroots-0_p20230103.ebuild b/media-libs/vkroots/vkroots-0_p20230103.ebuild
deleted file mode 100644
index 335b8e66be27..000000000000
--- a/media-libs/vkroots/vkroots-0_p20230103.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit meson python-any-r1
-
-COMMIT="26757103dde8133bab432d172b8841df6bb48155"
-DESCRIPTION="Simple framework for writing Vulkan layers"
-HOMEPAGE="https://github.com/Joshua-Ashton/vkroots"
-SRC_URI="https://github.com/Joshua-Ashton/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-LICENSE="Apache-2.0 MIT LGPL-2.1"
-SLOT="0"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-util/vulkan-headers
-"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-src_compile() {
-	"${PYTHON}" ./gen/make_vkroots --xml "${BROOT}"/usr/share/vulkan/registry/vk.xml || die
-}