gentoo auto-resync : 09:05:2024 - 00:01:03

11 files changed, 197 insertions, 5 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 3b80bf489134..2556885e4824 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index 3a797341d133..88b9c1428a57 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -6,5 +6,5 @@ DIST glib-2.78.3.tar.xz 5321388 BLAKE2B 6ef754b15e1ce4377eafdfc317025ac65c3d8010
 DIST glib-2.78.4.tar.xz 5331892 BLAKE2B ada7134597d7d863e581a2bb1097ac07a63b27b53309aadab5b1d3686327ee718ad8c5c07af3fce5cc12328e728fc2c4df5fd9e69f431fa00dc634062ef7f926 SHA512 6f3a06e10e7373a2dbf0688512de4126472fb73cbec488b7983b5ffecff09c64d7e1ca462f892e8f215d3d277d103ca802bad7ef0bd0f91edf26fc6ce67187b6
 EBUILD gdbus-codegen-2.76.4.ebuild 2205 BLAKE2B f14f73a09f58af0d389f8c152a28cb26d4214415d4283ecd011858b8e392e04225d94ca4d21d38e4737760c65f5163899b8c07f0056e0c95075f47e0ee92ee30 SHA512 54b44a179203fdd817ed7a9479bae47d9b14bee870ce18c398fde23a82defca89ab0f7d34dc15b2859cba0075e2b81e8646a5fb23d00dfefb15de408dc1945f5
 EBUILD gdbus-codegen-2.78.3.ebuild 2206 BLAKE2B d665fe9e6287901e9af29d10eb8d42e39badafa4818432cf7e5beaf516fa25d38ae135b41db2a5143d553b0ea437ecdc24704df2cb41b8da761c9b9a1c3f9571 SHA512 4ec477e17ed78489201c1e26062b5194a19d802cc276c5c7f15382baaf1ba9ba4c180c085203e7e85d5523459563ff56939c0527f8204a21c0ed1dc6e0bfc710
-EBUILD gdbus-codegen-2.78.4-r1.ebuild 2329 BLAKE2B 1e73b0fd20f34de1fff45eab3d7798cc29f7d0a30957b1cc66b6720711b95e4677005c0b6eb6bb1f7dfa8539b792ebc5eba039c780d1a733e97356bbe78ad213 SHA512 1c057d68a36050955d2636631a0b37daaa7e7cb4b085c6a5f4529c9b1df21b068ea951bad4a1f9c9ba669d2afa1064b155c68f804ea2e376075531966ef3b8c2
+EBUILD gdbus-codegen-2.78.4-r1.ebuild 2325 BLAKE2B c31ef3ec93321bbcbb1ce1bb347a305cfbaace34f85b2750ab3ac107aa72529e058472f6d6420ca478596b84be479360fad8e93d47fca8408e608b7782bb7188 SHA512 6d28c9962569269457a6a54e8eb5dfdfe19a57e3719e83dde1c0d554b853b95593238a0cff6d77159316044d8f9a61038c77e5dbdb862df3a260b2b1a0d43f59
 MISC metadata.xml 345 BLAKE2B 91a0526be5ce32d4aa4ea0827c78b2d2d45beae9a8d467916448a0a6b5459fd457e44ac900182654826328b34d37999bedb3ade42e80db92312e50f34d940014 SHA512 b11e427345fab56c77cb1f4f96473645b69054012e86840e2ca7dab221cf55041a1add1dfabce155274acf18488ac79de8149d405213daf39b807f679d4ac752
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.78.4-r1.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.78.4-r1.ebuild
index 7b46a6afbd87..109fb79e6121 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.78.4-r1.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.78.4-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	${PYTHON_DEPS}
diff --git a/dev-util/glib-utils/Manifest b/dev-util/glib-utils/Manifest
index 36303e99f08a..4188aa07b873 100644
--- a/dev-util/glib-utils/Manifest
+++ b/dev-util/glib-utils/Manifest
@@ -3,5 +3,5 @@ DIST glib-2.78.3.tar.xz 5321388 BLAKE2B 6ef754b15e1ce4377eafdfc317025ac65c3d8010
 DIST glib-2.78.4.tar.xz 5331892 BLAKE2B ada7134597d7d863e581a2bb1097ac07a63b27b53309aadab5b1d3686327ee718ad8c5c07af3fce5cc12328e728fc2c4df5fd9e69f431fa00dc634062ef7f926 SHA512 6f3a06e10e7373a2dbf0688512de4126472fb73cbec488b7983b5ffecff09c64d7e1ca462f892e8f215d3d277d103ca802bad7ef0bd0f91edf26fc6ce67187b6
 EBUILD glib-utils-2.76.4.ebuild 2277 BLAKE2B 6ea8ae1bde6cb702d3b9cbc868839f7fd1a4bd917cc34dcfac5d5f17dfdf5fe82e29349da92479a69000a1c65b5a305aab7ae1f8325e9380b4f647f5c6a3fb0f SHA512 376ae52d0362bd3ae698ea96e02bd7046be2fa6052af5a9e156cf266b720896b46f0983e6fb34520ff894a6b6558498cd4819291df0f9494d549f896a8d0e59d
 EBUILD glib-utils-2.78.3.ebuild 2278 BLAKE2B af01964bda4218378cea29c86ddd8019515177cf331156d68d0533bedad3bcf30372c9cef6cc80ae655ed59043befa9f6d3acd00cdd73e0d6cdeaf89292b26fd SHA512 e6d92f0e5d918da1a5c6afacd4b5a5f50b5948db641ce9b4cf9c7b3b8fe02d649454e99feb115dceac49958b70e903e9f0eb6642eda4e92b98468f2148cfa033
-EBUILD glib-utils-2.78.4.ebuild 2283 BLAKE2B f1f849ac4b4d35ed5d7e43d7f464b0361b946d32ba4e8fc97dd1218887f82a7f05fe4ce89e73df06137a1765685ff1e0b5c17b623c8006f92b4b33de38a15cbc SHA512 863acc30bfdaf3d42fd482570af5433342abae520436e7dfb6fe88ddbc76e3c0f067fdda8cba22d4e780c1395c818c31fc49841ae0f45f299e887af09c479c8d
+EBUILD glib-utils-2.78.4.ebuild 2279 BLAKE2B 54910a6d8c36f07fef4325992615b3ea22fd43d1b4d50a836c032f35e468e98d2861fa78431ae53ad873f1d5944ed81392c264d1c94825d9503fd53b27bd68ff SHA512 39a40fdbca38538cfecf09535ab4139e0538ad6de7ea8ea22521c43edb6f3b924a8fe2e72b6594d861608bf76018220c3a885970ef36d8ee4679f603fcf5b62b
 MISC metadata.xml 401 BLAKE2B bdf1884a4dcf8ab8362a86ed6559bb887c026bc315bd8cbfca0b5d8def8102636965da5af0f1871096704309a4a0919028d02f168a91830aa4ed911c6583d103 SHA512 2eaaccd9c6bd6e059b3acf34c964857a9e541f2eedd191c0fa35eca3499242349184ab01becca40791ac1dcdf02ba4a75369ea9c69fa5c21f15d878b1c28c453
diff --git a/dev-util/glib-utils/glib-utils-2.78.4.ebuild b/dev-util/glib-utils/glib-utils-2.78.4.ebuild
index ce9abacdf40e..c4998e8bbf2c 100644
--- a/dev-util/glib-utils/glib-utils-2.78.4.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.78.4.ebuild
@@ -14,7 +14,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
diff --git a/dev-util/intel_clc/Manifest b/dev-util/intel_clc/Manifest
index 4e16c7c5fb44..a55e4bc262c8 100644
--- a/dev-util/intel_clc/Manifest
+++ b/dev-util/intel_clc/Manifest
@@ -1,10 +1,14 @@
 DIST mesa-24.0.4.tar.xz 20057744 BLAKE2B 6de755081f7e9dd9303af791e1a405203388787c294f8163c9d6598aa66eed1c001eeb03203c49ed8a264065458228efd849e6e59091a5963155ce8edc47c63f SHA512 1d05b07026417fbe9cf18f7b18f2db9fe5fe327555c590283d87f69bbdd51f64135928a1dbe155d750187fc268bbdbb070bc1ae9ffc3e013b8707b391969d515
 DIST mesa-24.0.5.tar.xz 20096384 BLAKE2B c4c5f493206f761a7171f19c6549dc791559a1fdbcf49aea98016f98c10f9130081a16df6b780062621495a42dc49ef5f0800bda64058e8ba60106f6a046ccef SHA512 9476af4b9ac8db5dce397084ef169927d10b28adea7e74aa5b3136810b499ac98ddf7ab564e7d1ff81c887208c8ebab3ad2d4e27e7f46136609b5c67527018eb
 DIST mesa-24.0.6.tar.xz 20115628 BLAKE2B 531482c1a01ec4c0bd6b2f0857640c14fcc2ba70e85a14e4edf0f44ba466c12e39ad067690e6a571a0744ae06080943b1328a29263225cb7570f119464e17fbe SHA512 60fcc77132c3cb0c98e650d97d3324bfd18abe7f8f8a3aa5209f71b2fddd94510f939bbf5272b2241749307184d5badde9da4842be57ce13f5760875885ea6fc
+DIST mesa-24.0.7.tar.xz 20144724 BLAKE2B d9438e533b471445b2403e01e1fd593d83c0013b0991585f718122f1cadc6ac6bb1fb913f0fb257354ae21ddd9fe1f970ad9ac46f05d756c223ed56a11b9c9ce SHA512 77b0fae80ab0a07e2e528c113eadef0e3004b8df3e6e98fffe6fc2d8ac39f5ce7fa38ebe5c2ae32bfbac993dd7cbe288ace18ebb03cf2fb445fe7114f74dd45c
 DIST mesa-24.1.0-rc1.tar.xz 28863968 BLAKE2B 6d1b72395c208fcc82838f42b79455ebde3474a5e0362f6ee0ca52031c5ea15e1419bd4c9768649eecdeea51806e3dd7584fc70941b36efc23eb39a1716ac425 SHA512 575252e76e9fd0266ca9cdb0acb8b12f2890dcecca904ff46b81d439d70520d58f719c90806a4a72d553fca4214cfa3333e1271a8831a1e6a68ca257affc84e3
+DIST mesa-24.1.0-rc3.tar.xz 28889928 BLAKE2B bb8fb1ce1559f613e94c33aa20e89061a8e78be23c84776d32ac45eb218bfb8d6e30e5efa4f6c3e0782af1b14c41dab8c98682723f5bf3b21980e01f6ab8e6cf SHA512 d75641a023ba489b5117b369a2d9007bcf6079f31375c9aa70afd968f8acc3695468e9cf2ef1989ed28459cf245fccd60507a0e8b0931401b77a4b2b21f0fe03
 EBUILD intel_clc-24.0.4.ebuild 1741 BLAKE2B b4fc7184409bedcfec1cd559149b7d57b9a5bd708cc4aea847c47573cd194804e3435a15120914fadc4bd5f9172e946d93a9164a875809feae2cc7589a36f74e SHA512 d9825be298668fb6bc933ff6131c5a2d18b76bbcb9b6ca2176512d7a4273cf42f5fe00097478a4cd3e9c678fa53c8a95f83115c4f569ac37eebe940749ba340e
 EBUILD intel_clc-24.0.5.ebuild 1742 BLAKE2B d1e9907d5bf31fad49b648899ef86805c2b6fafe656e934179f9db17cdfa9a9d9a8a94ad57c6556a4f0d02b207ea32a57db8f1dfe6c5f0f1416637dcc5064644 SHA512 f1b41578a6297a7fa7bc48c16dc8fafce59bf9b58a9131168c9d9369092b5332f31e469388b35c98b799f694e43e868eec96b23ea6b9a4f745c4546c8ffc459b
 EBUILD intel_clc-24.0.6.ebuild 1742 BLAKE2B d1e9907d5bf31fad49b648899ef86805c2b6fafe656e934179f9db17cdfa9a9d9a8a94ad57c6556a4f0d02b207ea32a57db8f1dfe6c5f0f1416637dcc5064644 SHA512 f1b41578a6297a7fa7bc48c16dc8fafce59bf9b58a9131168c9d9369092b5332f31e469388b35c98b799f694e43e868eec96b23ea6b9a4f745c4546c8ffc459b
+EBUILD intel_clc-24.0.7.ebuild 1742 BLAKE2B d1e9907d5bf31fad49b648899ef86805c2b6fafe656e934179f9db17cdfa9a9d9a8a94ad57c6556a4f0d02b207ea32a57db8f1dfe6c5f0f1416637dcc5064644 SHA512 f1b41578a6297a7fa7bc48c16dc8fafce59bf9b58a9131168c9d9369092b5332f31e469388b35c98b799f694e43e868eec96b23ea6b9a4f745c4546c8ffc459b
 EBUILD intel_clc-24.1.0_rc1.ebuild 1745 BLAKE2B d4fdcb7b30f9df2f4d248452ea4377bd0615c6fc9e4ac70c7e579500c54e271dcd4754dcee09efbac50ca24b13a17122aee7b5aa65ed2db531ff1def231a0323 SHA512 2800777540b7b3718cbb9c137be4995f017453a5b9814d2225949692b7be9e6d28aa5253324e3b72251acd6fb0731294031d85a035b1257c3f183aeb8110e855
+EBUILD intel_clc-24.1.0_rc3.ebuild 1745 BLAKE2B d4fdcb7b30f9df2f4d248452ea4377bd0615c6fc9e4ac70c7e579500c54e271dcd4754dcee09efbac50ca24b13a17122aee7b5aa65ed2db531ff1def231a0323 SHA512 2800777540b7b3718cbb9c137be4995f017453a5b9814d2225949692b7be9e6d28aa5253324e3b72251acd6fb0731294031d85a035b1257c3f183aeb8110e855
 EBUILD intel_clc-9999.ebuild 1745 BLAKE2B d4fdcb7b30f9df2f4d248452ea4377bd0615c6fc9e4ac70c7e579500c54e271dcd4754dcee09efbac50ca24b13a17122aee7b5aa65ed2db531ff1def231a0323 SHA512 2800777540b7b3718cbb9c137be4995f017453a5b9814d2225949692b7be9e6d28aa5253324e3b72251acd6fb0731294031d85a035b1257c3f183aeb8110e855
 MISC metadata.xml 388 BLAKE2B 0558cfe706987a93605fb383bc2c30ff4f4cf5837ca19afd3e16d9702ea7dcd3d575579d53aacb531e1d421c8b1692eb4607d713793a89240223c031d7781a31 SHA512 e0375912a94fa92b49ed78d9a88c4eacc8b441d8b2fa117a48df2d8a958f1cf91279299aca109e24f76b27ca04f0067f83e5b8e4141f85ac64d379bca0945d2a
diff --git a/dev-util/intel_clc/intel_clc-24.0.7.ebuild b/dev-util/intel_clc/intel_clc-24.0.7.ebuild
new file mode 100644
index 000000000000..8bc3bb53f6ba
--- /dev/null
+++ b/dev-util/intel_clc/intel_clc-24.0.7.ebuild
@@ -0,0 +1,86 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( 16 17 )
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit llvm-r1 meson python-any-r1
+
+MY_PV="${PV/_/-}"
+
+DESCRIPTION="intel_clc tool used for building OpenCL C to SPIR-V"
+HOMEPAGE="https://mesa3d.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	S="${WORKDIR}/intel_clc-${MY_PV}"
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+	inherit git-r3
+else
+	S="${WORKDIR}/mesa-${MY_PV}"
+	SRC_URI="https://archive.mesa3d.org/mesa-${MY_PV}.tar.xz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="MIT SGI-B-2.0"
+SLOT="0"
+IUSE="debug"
+
+RDEPEND="
+	dev-libs/libclc
+	dev-util/spirv-tools
+	>=sys-libs/zlib-1.2.8:=
+	x11-libs/libdrm
+	$(llvm_gen_dep '
+		dev-util/spirv-llvm-translator:${LLVM_SLOT}
+		sys-devel/clang:${LLVM_SLOT}
+		sys-devel/llvm:${LLVM_SLOT}
+	')
+"
+DEPEND="${RDEPEND}
+	dev-libs/expat
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+	virtual/pkgconfig
+"
+
+python_check_deps() {
+	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	llvm-r1_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig"
+
+	local emesonargs=(
+		-Dllvm=enabled
+		-Dshared-llvm=enabled
+		-Dintel-clc=enabled
+
+		-Dgallium-drivers=''
+		-Dvulkan-drivers=''
+
+		# Set platforms empty to avoid the default "auto" setting. If
+		# platforms is empty meson.build will add surfaceless.
+		-Dplatforms=''
+
+		-Dglx=disabled
+		-Dlibunwind=disabled
+		-Dzstd=disabled
+
+		-Dbuildtype=$(usex debug debug plain)
+		-Db_ndebug=$(usex debug false true)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	dobin "${BUILD_DIR}"/src/intel/compiler/intel_clc
+}
diff --git a/dev-util/intel_clc/intel_clc-24.1.0_rc3.ebuild b/dev-util/intel_clc/intel_clc-24.1.0_rc3.ebuild
new file mode 100644
index 000000000000..f47259e8747d
--- /dev/null
+++ b/dev-util/intel_clc/intel_clc-24.1.0_rc3.ebuild
@@ -0,0 +1,87 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( 16 17 )
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit llvm-r1 meson python-any-r1
+
+MY_PV="${PV/_/-}"
+
+DESCRIPTION="intel_clc tool used for building OpenCL C to SPIR-V"
+HOMEPAGE="https://mesa3d.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	S="${WORKDIR}/intel_clc-${MY_PV}"
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+	inherit git-r3
+else
+	S="${WORKDIR}/mesa-${MY_PV}"
+	SRC_URI="https://archive.mesa3d.org/mesa-${MY_PV}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT SGI-B-2.0"
+SLOT="0"
+IUSE="debug"
+
+RDEPEND="
+	dev-libs/libclc
+	dev-util/spirv-tools
+	>=sys-libs/zlib-1.2.8:=
+	x11-libs/libdrm
+	$(llvm_gen_dep '
+		dev-util/spirv-llvm-translator:${LLVM_SLOT}
+		sys-devel/clang:${LLVM_SLOT}
+		sys-devel/llvm:${LLVM_SLOT}
+	')
+"
+DEPEND="${RDEPEND}
+	dev-libs/expat
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+	virtual/pkgconfig
+"
+
+python_check_deps() {
+	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	llvm-r1_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig"
+
+	use debug && EMESON_BUILDTYPE=debug
+
+	local emesonargs=(
+		-Dllvm=enabled
+		-Dshared-llvm=enabled
+		-Dintel-clc=enabled
+
+		-Dgallium-drivers=''
+		-Dvulkan-drivers=''
+
+		# Set platforms empty to avoid the default "auto" setting. If
+		# platforms is empty meson.build will add surfaceless.
+		-Dplatforms=''
+
+		-Dglx=disabled
+		-Dlibunwind=disabled
+		-Dzstd=disabled
+
+		-Db_ndebug=$(usex debug false true)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	dobin "${BUILD_DIR}"/src/intel/compiler/intel_clc
+}
diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index ca1adb6e7a91..543b1c39e4ee 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,7 +1,8 @@
+AUX qbs-2.3.1-qtver.patch 196 BLAKE2B 6cfabd1bbd16b2e342ff9eeb2748ce2215ed25d18203f59e0f181f465e02dfe1e2416b8ab2b5c8eb3b5aa6ec9e7c37e938e389165b1a995ed7f48233f257af79 SHA512 f3f95fc9d1a96767d9a3e74ac428e9b00f4e460959d04298f3f6ecc99f5eb72a57290e6d248f82d1ba8ca7e655fe729b8320a77da585b145c48ac90b9a315181
 DIST qbs-src-1.19.1.tar.gz 4961984 BLAKE2B 2b9333ac8bba12f311ad47b1315d0a61ddf3b3a804888369f3fd868fbebca4ad13bd857451cb3fe3515fd9f9e69b42b84484289e79d3e7911c69720d7d08ab29 SHA512 b53dae9631c9d4ec1f799395948a67ce4b62ae88908cce3b00f42fb0213d80d32127c3429b95d5c32c9f7c1b861fc5a52ac6952046a6d91d035539d7412a5c4d
 DIST qbs-src-2.3.0.tar.gz 5615799 BLAKE2B f7e10d1dffe7d188c4ab5c6ed1b02837b41044f93083e052105638ed3c091a5be2d4f3bffeb39238baf6e8a1ba2cfc316fefea5f80871c851be3d7c873847c74 SHA512 6611ce02b0dc4f4a0cc68a13a7c684c07061d3fff57d2ca16470fffa253ff23f45349d86ad4ba4c0eab681f74f3c92cddd85daedf1f31fd1a7eae5bddb606cb6
 DIST qbs-src-2.3.1.tar.gz 5614581 BLAKE2B 92fa24d75248a3732cbd99b660141e56654574f1388d50d5359afef7b442889fa59c4ab4f029f055ee618c0222f94faba47ae9fff85f0fae26e95f2ba34995f9 SHA512 27ba33805b942cf8180e55bdd6c37ccfd2aeaa2e8c01ca7e7485720030dfad7c5f1a3f92b77bff97a7ebf8878e455758c8729005e8b03959d18106f945d8d42c
 EBUILD qbs-1.19.1.ebuild 2903 BLAKE2B 311441e8a8fdd8c4be254ec784129216120dffe85a7a8172dc0abd8c26c15723eac4c4d18f22901761b10dd0883464f9864d646ff2820fc610665614a32f4116 SHA512 b04c16648754d322fe115858dd99e36ce67355063b44680d6cea3042f5b062efe59716bf3d55c8fb21e96a81f6c7e74998942cdabb8974e2c598c28ad4875bf6
 EBUILD qbs-2.3.0.ebuild 2158 BLAKE2B 847ad66aa051598ac69dac278f9e299328542f3a8ebb553bf29d1e43544ee234219f08effddf15e842fb444f944f8506d80014c87ee0e0260524b4fba2d92e84 SHA512 1523c686e9300db262c3296dc548ebb85d75f840723addf2597af4da751c15bc94b96577e1f86f4d4aea5576d4a2ce5b78dfcf9e1f74f8ee044307efef891048
-EBUILD qbs-2.3.1.ebuild 2158 BLAKE2B 847ad66aa051598ac69dac278f9e299328542f3a8ebb553bf29d1e43544ee234219f08effddf15e842fb444f944f8506d80014c87ee0e0260524b4fba2d92e84 SHA512 1523c686e9300db262c3296dc548ebb85d75f840723addf2597af4da751c15bc94b96577e1f86f4d4aea5576d4a2ce5b78dfcf9e1f74f8ee044307efef891048
+EBUILD qbs-2.3.1.ebuild 2241 BLAKE2B 710f74820cf93424cf79673339fd80d935de0d3cf944d45239518816256233a6ed9220bc8a3c05b314e5f0a3e123c13609a9474bec08a85ef5b8216a69060621 SHA512 15bfa0650a706bc849d68368ec9a3f04fc3877a7ddc139ea9caa8df6ae5400d71c9cc9d9908a3f285d03c533bba4a31b08244244d1da0d331db12236907d61ff
 MISC metadata.xml 1135 BLAKE2B 389cfca2f13552aa0da4e29204014c678d2e710cc96fed8f68616431d5a5d0b9bcd5505b396f843dd065c66c0bd8d955ae6137637eb19226552b6b36509fe296 SHA512 854fb0ce9d21b6ff61c4ed32efeffda84d31ec809faa830b921804dc59e5d6d49d8b7326877705f94346f677d72cc17be5ed4099a6e51dbf381f7456c57567d6
diff --git a/dev-util/qbs/files/qbs-2.3.1-qtver.patch b/dev-util/qbs/files/qbs-2.3.1-qtver.patch
new file mode 100644
index 000000000000..3117c432c544
--- /dev/null
+++ b/dev-util/qbs/files/qbs-2.3.1-qtver.patch
@@ -0,0 +1,9 @@
+https://bugs.gentoo.org/931596
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -29,3 +29,5 @@
+ 
++if (NOT DEFINED QT_VERSION_MAJOR)
+ find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)
++endif()
+ 
diff --git a/dev-util/qbs/qbs-2.3.1.ebuild b/dev-util/qbs/qbs-2.3.1.ebuild
index c00fae7ed834..ed014f09332d 100644
--- a/dev-util/qbs/qbs-2.3.1.ebuild
+++ b/dev-util/qbs/qbs-2.3.1.ebuild
@@ -43,6 +43,10 @@ CMAKE_SKIP_TESTS=(
 	tst_language
 )
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3.1-qtver.patch
+)
+
 python_check_deps() {
 	# _find_python_module in cmake/QbsDocumentation.cmake
 	python_has_version "dev-python/beautifulsoup4[${PYTHON_USEDEP}]" &&
@@ -64,6 +68,7 @@ src_configure() {
 		-DQBS_INSTALL_MAN_PAGE=yes
 		-DQBS_INSTALL_QCH_DOCS=$(usex doc)
 		-DQBS_LIB_INSTALL_DIR="$(get_libdir)"
+		-DQT_VERSION_MAJOR=6 #931596
 		-DWITH_TESTS=$(usex test)
 		-DWITH_UNIT_TESTS=$(usex test)
 	)