gentoo auto-resync : 05:09:2023 - 16:23:54

6 files changed, 142 insertions, 26 deletions

diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index 41596f225e7b..d52326ec3d37 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -5,5 +5,7 @@ DIST qtwayland-5.15.10-gentoo-kde-2.tar.xz 43076 BLAKE2B 735ac875c0957de47f90d08
 DIST qtwayland-everywhere-opensource-src-5.15.10.tar.xz 568552 BLAKE2B c5cd4ed5ff78befb5bb49f9eb809562c418b2469aa0fa23728a1de46d57f42788bba3f87a54c8dda2ee0900c76b84213d1111fd86159dc5e6707f7b67ed386de SHA512 214b1fec7dfd815d148a7485f7811e623b06d172e58e4ee3167264a4e4b8f4aeec11474e574f91652a0bd3a48476a6747cad468f1e5035c49a55a96fc1400899
 DIST qtwayland-everywhere-src-6.5.2.tar.xz 1059356 BLAKE2B 4708b78ff5c8e413edaa4d4400317f58dd068273a5eef7caf1500abf8afbe4e9ac405b6854691ef93265a7eeb0cfb7406024826a0b7c7ba3f8149218af67fd48 SHA512 520d109402f1d629481029a3b1eaab740e66135db4069c34651172bb2ad821b22de60e9956a96331d2f32a4522fc52c6a4ba99b474092d755760cad08c776477
 EBUILD qtwayland-5.15.10-r4.ebuild 1353 BLAKE2B 3cab556185c182f4cd8ed280737e1434c51ec1c52719688a2ca5372d81baa5edca8675b22a7c0f9601f7dacec65f54e7e361fd851a2f226dcefaac38180bd9b5 SHA512 0ac3e896cc8c6c717e44dc3119b1c5cf3cc4cc6d22538f837699528c61e29e11a3969538b0518d21c7d7b1362ac81910e9508197076481a51b4bece379f7dca2
-EBUILD qtwayland-6.5.2-r1.ebuild 499 BLAKE2B 566a294312f80222e566020da980389f788854ee4604ab1e7943bbaa38943729745ff805aaa3e65b2bccb426291a684d675cbbde799f9fd5fdc91ec8ad05693d SHA512 b1268ce63b632223bfe524b4b6f34703c5299e7377a80670ab77951bd5c5a1f39a91fe56bacb13e969b28073cd51fe8eea622483a5c54e04fdd1fc8e937ebc6d
-MISC metadata.xml 584 BLAKE2B ad42909b120209835e121a29de558d338bae4348eb55e69a94e8ac8b54f26564df0a750839bef9418ae8056a0d24f234615247a610b8287f5b0fbffbc60193f2 SHA512 86fd81d63b19fc6e95bdcb92e9da9b03861248a4e78e9de36aca6996e61644ab8bce7a60ca22ee7ad86fefc9b407a1fd0136240b8fdfa3c40a149444ab1dcbe2
+EBUILD qtwayland-6.5.2-r2.ebuild 934 BLAKE2B 66a0bfdf290c008fa2dd480b0a25014f65dfa0b0543c9637468b1308c57429ca3b908a2968793c3bf5ae356aea40c9e5ee13aba40203730ab1471826c1916931 SHA512 69511cba09096263c550eebc257e5dff9f919396e035f2b1338b0f7070ff885d09d6ba31169ab66b2275b980633a67ba38d4c8772ba492eb172cd1efeb851d6b
+EBUILD qtwayland-6.5.9999.ebuild 869 BLAKE2B 33abbf122dd0e5f17788af4ade5c9740c2422acd2bec0d64577aa0760e8c7d86df5d2f242d4d85488aa083c6b7d9f37ee71531484e60e55fe878331427795a6c SHA512 f39e084af6c3a9932a2ea056f3f4cb60375291c5909d682840af0fa7d74260ebca5f4ab8525a42b68ec2f35157069761f32435d2112629efec11ab55f321d394
+EBUILD qtwayland-6.9999.ebuild 869 BLAKE2B 33abbf122dd0e5f17788af4ade5c9740c2422acd2bec0d64577aa0760e8c7d86df5d2f242d4d85488aa083c6b7d9f37ee71531484e60e55fe878331427795a6c SHA512 f39e084af6c3a9932a2ea056f3f4cb60375291c5909d682840af0fa7d74260ebca5f4ab8525a42b68ec2f35157069761f32435d2112629efec11ab55f321d394
+MISC metadata.xml 701 BLAKE2B 4fb22f432cbefa04f10c1f988271ec1db696593f37b3f80edd14c7c669192013a6b43869646c710560bcd08e4acd176331b5c41920c7af111dd58a64c6557207 SHA512 fb99bb933700e619db5e7bec1977f0c51bc7bdbcb97a4411f56e8f41a357982ee3de8d8150dcffdf9a494a0a84437de8b7ccafd2e0006796cdd25947d25815d2
diff --git a/dev-qt/qtwayland/metadata.xml b/dev-qt/qtwayland/metadata.xml
index a8ce9005f0bb..fe0b049a950d 100644
--- a/dev-qt/qtwayland/metadata.xml
+++ b/dev-qt/qtwayland/metadata.xml
@@ -6,11 +6,13 @@
 		<name>Gentoo Qt Project</name>
 	</maintainer>
 	<use>
+		<flag name="qml">Build QML/QtQuick bindings and imports</flag>
 		<flag name="vulkan">Enable support for Vulkan-based server buffer integration</flag>
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
 		<doc>https://doc.qt.io/</doc>
+		<remote-id type="github">qt/qtwayland</remote-id>
 	</upstream>
 	<slots>
 		<subslots>
diff --git a/dev-qt/qtwayland/qtwayland-6.5.2-r1.ebuild b/dev-qt/qtwayland/qtwayland-6.5.2-r1.ebuild
deleted file mode 100644
index 4fbc8c272b2c..000000000000
--- a/dev-qt/qtwayland/qtwayland-6.5.2-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Wayland platform plugin for Qt"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
-fi
-
-BDEPEND="dev-util/wayland-scanner"
-DEPEND="
-	dev-libs/wayland
-	=dev-qt/qtbase-${PV}*[egl,gui,opengl]
-	=dev-qt/qtdeclarative-${PV}*
-	media-libs/libglvnd
-	x11-libs/libxkbcommon
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-drag-drop-segfault.patch" )
diff --git a/dev-qt/qtwayland/qtwayland-6.5.2-r2.ebuild b/dev-qt/qtwayland/qtwayland-6.5.2-r2.ebuild
new file mode 100644
index 000000000000..f625230b37ad
--- /dev/null
+++ b/dev-qt/qtwayland/qtwayland-6.5.2-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Wayland platform plugin for Qt"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+IUSE="qml vulkan"
+
+RDEPEND="
+	dev-libs/wayland
+	~dev-qt/qtbase-${PV}:6[egl(+),gui,opengl,vulkan=]
+	media-libs/libglvnd
+	x11-libs/libxkbcommon
+	qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
+"
+DEPEND="
+	${RDEPEND}
+	vulkan? ( dev-util/vulkan-headers )
+"
+BDEPEND="dev-util/wayland-scanner"
+
+CMAKE_SKIP_TESTS=(
+	# segfaults for not-looked-into reasons, but not considered
+	# an issue given >=seatv5 exists since wayland-1.10 (2016)
+	tst_seatv4
+	# needs a compositor/opengl, skip the extra trouble
+	tst_surface
+	tst_xdgdecorationv1
+)
+
+PATCHES=(
+	"${FILESDIR}"/${P}-drag-drop-segfault.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package qml Qt6Qml)
+	)
+
+	qt6-build_src_configure
+}
diff --git a/dev-qt/qtwayland/qtwayland-6.5.9999.ebuild b/dev-qt/qtwayland/qtwayland-6.5.9999.ebuild
new file mode 100644
index 000000000000..ba9eec33aed3
--- /dev/null
+++ b/dev-qt/qtwayland/qtwayland-6.5.9999.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Wayland platform plugin for Qt"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+IUSE="qml vulkan"
+
+RDEPEND="
+	dev-libs/wayland
+	~dev-qt/qtbase-${PV}:6[gui,opengl,vulkan=]
+	media-libs/libglvnd
+	x11-libs/libxkbcommon
+	qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
+"
+DEPEND="
+	${RDEPEND}
+	vulkan? ( dev-util/vulkan-headers )
+"
+BDEPEND="dev-util/wayland-scanner"
+
+CMAKE_SKIP_TESTS=(
+	# segfaults for not-looked-into reasons, but not considered
+	# an issue given >=seatv5 exists since wayland-1.10 (2016)
+	tst_seatv4
+	# needs a compositor/opengl, skip the extra trouble
+	tst_surface
+	tst_xdgdecorationv1
+)
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package qml Qt6Qml)
+	)
+
+	qt6-build_src_configure
+}
diff --git a/dev-qt/qtwayland/qtwayland-6.9999.ebuild b/dev-qt/qtwayland/qtwayland-6.9999.ebuild
new file mode 100644
index 000000000000..ba9eec33aed3
--- /dev/null
+++ b/dev-qt/qtwayland/qtwayland-6.9999.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Wayland platform plugin for Qt"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+IUSE="qml vulkan"
+
+RDEPEND="
+	dev-libs/wayland
+	~dev-qt/qtbase-${PV}:6[gui,opengl,vulkan=]
+	media-libs/libglvnd
+	x11-libs/libxkbcommon
+	qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
+"
+DEPEND="
+	${RDEPEND}
+	vulkan? ( dev-util/vulkan-headers )
+"
+BDEPEND="dev-util/wayland-scanner"
+
+CMAKE_SKIP_TESTS=(
+	# segfaults for not-looked-into reasons, but not considered
+	# an issue given >=seatv5 exists since wayland-1.10 (2016)
+	tst_seatv4
+	# needs a compositor/opengl, skip the extra trouble
+	tst_surface
+	tst_xdgdecorationv1
+)
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package qml Qt6Qml)
+	)
+
+	qt6-build_src_configure
+}