gentoo auto-resync : 05:06:2024 - 00:07:52

5 files changed, 72 insertions, 5 deletions

diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index 5d9275a61a8d..c4ace908ee7a 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -5,9 +5,10 @@ DIST qtwayland-everywhere-opensource-src-5.15.14.tar.xz 560916 BLAKE2B a5edb2144
 DIST qtwayland-everywhere-src-6.7.0.tar.xz 1121748 BLAKE2B d42003056236b542a95484157bee3bf74a602882ac79dde02c74f762e3c07eec28405534df46cf5d4b8381d0f99cccfeeca10f614622bbb7b09ec81dbb6a06aa SHA512 cda0e0736f85656d05b2399970413ffc5082af4256c8b3087c3f1d06cad5ef5ad7cb8838513723569193df02cd3c3df3d5478d99464606c62c42629ef75c225f
 DIST qtwayland-everywhere-src-6.7.1.tar.xz 1122036 BLAKE2B 93acec00864f7f112b442ed60dbd1c297d08695ebccd6755bdc46b40af0e5f69288c9b404fc1d43fc0217bdeb1e770c4ec3950a33c67b577da4f0c308e6867b1 SHA512 9128ecd32319fd2ca154cb3d52726c80f96e2c906f9cf80cd67a3f91a4db49a853948489ec712061c6ef2c5abe70cd850c37f947659199678ac1482c77485a76
 EBUILD qtwayland-5.15.13.ebuild 1214 BLAKE2B 4d974a96e807dfbad6bf480bb6faf022828c9cab0fd5bc82b6c6455344fafd7a349f1f232fa62a00e32cc073cda39aead004657e7b4072f49890442baeda3252 SHA512 75966f4a890e77a29937d63ed50a8095d579fab4871f2d091bb410443a0101fabc592a6cfbe033b12d6f0663c196930a32c85a062a10de4f8dc13eee4103b86b
-EBUILD qtwayland-5.15.14.ebuild 1216 BLAKE2B 78471060c4f0d09d60ce02920edc99ef0f9b55b6987a30051cbb85aaf95d70f1f8c61797398781c693843456574cbe940a09be013f11b34de518f388cc442371 SHA512 1521846d9639ed456169b4f47956e8ce67ecc79055e0cb21285ff53575818d632ef86c30a0f1400b86247a29c80ac75ba2d1190559d3251ea7191fa1c076664b
+EBUILD qtwayland-5.15.14.ebuild 1214 BLAKE2B 4d974a96e807dfbad6bf480bb6faf022828c9cab0fd5bc82b6c6455344fafd7a349f1f232fa62a00e32cc073cda39aead004657e7b4072f49890442baeda3252 SHA512 75966f4a890e77a29937d63ed50a8095d579fab4871f2d091bb410443a0101fabc592a6cfbe033b12d6f0663c196930a32c85a062a10de4f8dc13eee4103b86b
 EBUILD qtwayland-6.7.0.ebuild 1227 BLAKE2B 489fa85da398d927396d5251e4c0af8ae9011ce010a54a74bc2af8542defb8eba4e4871640f78451ebc93ff6b83d24925fa1f69d6bf5e84f400ec59bb35ab098 SHA512 357fd84cf197e687cdfbb56919cf6b88576797cbb01011593c2b3d0403ac4f9ace5cd49c3bc07c8c1444e8e9bebeb428a1f9ebcc304735605f023be8a30a63f1
 EBUILD qtwayland-6.7.1.ebuild 1225 BLAKE2B 24416fe23ce70e9d9ddfebab577d73528fabf6fbfad662b9be2d3e7e8ab2d8eff5a2286ddcd760e05514d56c123eae8468d1d41301b91a60cd80de6fd7557803 SHA512 87c3fe20ef7150c87a4662663156693976ace77dd3bff0a3deb83c8b0aad9ad538c0be4923a6e691847794bae6d6b8a74257f803e6f49ab5a203af7e4fface0c
 EBUILD qtwayland-6.7.9999.ebuild 1229 BLAKE2B a2ef0eece20a69fae358c8c0e22dd05c7d5a04cdd508e1ecb90883c87a6bc365db6443413e7a2150282d26ba8666361b281bd261f5f7a34b0bff24abf96bb723 SHA512 9465226c56e239182b87812bf532ba63e2632830d24e5b7aff53160ba587834bdb7faf9dde05da61084e0a44551cbbbd5599f0988ed92c0e0bc77a016a0ce289
-EBUILD qtwayland-6.9999.ebuild 1229 BLAKE2B a2ef0eece20a69fae358c8c0e22dd05c7d5a04cdd508e1ecb90883c87a6bc365db6443413e7a2150282d26ba8666361b281bd261f5f7a34b0bff24abf96bb723 SHA512 9465226c56e239182b87812bf532ba63e2632830d24e5b7aff53160ba587834bdb7faf9dde05da61084e0a44551cbbbd5599f0988ed92c0e0bc77a016a0ce289
-MISC metadata.xml 790 BLAKE2B 61ed17b888bc084b787b06d504b86aaf7a55c87f332115d007340cc5e158d6b02f08b247140d4311f37cfe92c474a07faeef5470bbd109dbbe7f600faccb9724 SHA512 61e0b8812f02c9d51a31c0e1e05cfdf512c5dd0336c95f00db237f5e3419555cea90be0aaa02894c5a9e50ded43ccbcd1fd3a38d2fd93651a27dc0d85fccccc9
+EBUILD qtwayland-6.8.9999.ebuild 1352 BLAKE2B bb2c0b2ac9c8ac78b4707976fd83382d164b2fad57ce9b0c22e411c95d2ad29650c756db1f2bbc97aa962dc4308ebca6c15c6fdd563ebee35ff15be383df17af SHA512 f1b78a67dfad5e6f820d6bdbdab89e0b99aa7fd8f36c414bfb6f8b82ee442355d68388b2f8aac09151b5ed9b2b7592c0c094310d6ae1a5272a858e9ca769c298
+EBUILD qtwayland-6.9999.ebuild 1352 BLAKE2B bb2c0b2ac9c8ac78b4707976fd83382d164b2fad57ce9b0c22e411c95d2ad29650c756db1f2bbc97aa962dc4308ebca6c15c6fdd563ebee35ff15be383df17af SHA512 f1b78a67dfad5e6f820d6bdbdab89e0b99aa7fd8f36c414bfb6f8b82ee442355d68388b2f8aac09151b5ed9b2b7592c0c094310d6ae1a5272a858e9ca769c298
+MISC metadata.xml 888 BLAKE2B b893520d74518b0ea0d104d72545925ac37c818ef52d29a5551a2e3406ded90bc4f6c3d53b64868f2b39919cab783ed124af13f63704e7ee66c534c21dfdfb23 SHA512 9861bb9cf35100d7464d88f86614511522fc4cf7e2ef5d09b9ea95cdb168d61f645614104aacad24fcebc8ecfc2c98601b26f434059bffe169513fd097b12aec
diff --git a/dev-qt/qtwayland/metadata.xml b/dev-qt/qtwayland/metadata.xml
index 1509a2e738a9..69ca9f641c1c 100644
--- a/dev-qt/qtwayland/metadata.xml
+++ b/dev-qt/qtwayland/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="compositor">Enable support for the wayland compositor / server APIs</flag>
+		<flag name="gnome">Build the GNOME-like decoration plugin (loaded by default with GNOME)</flag>
 		<flag name="qml">Build QML/QtQuick bindings and imports</flag>
 		<flag name="vulkan">Enable support for Vulkan-based server buffer integration</flag>
 	</use>
diff --git a/dev-qt/qtwayland/qtwayland-5.15.14.ebuild b/dev-qt/qtwayland/qtwayland-5.15.14.ebuild
index afb4c3994c69..6a87c8a1a4e7 100644
--- a/dev-qt/qtwayland/qtwayland-5.15.14.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.15.14.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 inherit qt5-build
diff --git a/dev-qt/qtwayland/qtwayland-6.8.9999.ebuild b/dev-qt/qtwayland/qtwayland-6.8.9999.ebuild
new file mode 100644
index 000000000000..93ba392322f1
--- /dev/null
+++ b/dev-qt/qtwayland/qtwayland-6.8.9999.ebuild
@@ -0,0 +1,60 @@
+# Copyright 2021-2024 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 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+IUSE="accessibility compositor gnome qml vulkan"
+
+RDEPEND="
+	dev-libs/wayland
+	~dev-qt/qtbase-${PV}:6[accessibility=,gui,opengl,vulkan=,wayland]
+	media-libs/libglvnd
+	x11-libs/libxkbcommon
+	compositor? (
+		qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
+	)
+	gnome? (
+		~dev-qt/qtbase-${PV}:6[dbus]
+		~dev-qt/qtsvg-${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 Qt6Quick)
+		$(qt_feature compositor wayland_server)
+		$(qt_feature gnome wayland_decoration_adwaita)
+	)
+
+	qt6-build_src_configure
+}
+
+src_test() {
+	# users' session setting may break tst_clientextension (bug #927030)
+	unset DESKTOP_SESSION XDG_CURRENT_DESKTOP
+	unset GNOME_DESKTOP_SESSION_ID KDE_FULL_SESSION
+
+	qt6-build_src_test
+}
diff --git a/dev-qt/qtwayland/qtwayland-6.9999.ebuild b/dev-qt/qtwayland/qtwayland-6.9999.ebuild
index dc3ce8575fd3..93ba392322f1 100644
--- a/dev-qt/qtwayland/qtwayland-6.9999.ebuild
+++ b/dev-qt/qtwayland/qtwayland-6.9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
-IUSE="accessibility compositor qml vulkan"
+IUSE="accessibility compositor gnome qml vulkan"
 
 RDEPEND="
 	dev-libs/wayland
@@ -21,6 +21,10 @@ RDEPEND="
 	compositor? (
 		qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
 	)
+	gnome? (
+		~dev-qt/qtbase-${PV}:6[dbus]
+		~dev-qt/qtsvg-${PV}:6
+	)
 "
 DEPEND="
 	${RDEPEND}
@@ -41,6 +45,7 @@ src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package qml Qt6Quick)
 		$(qt_feature compositor wayland_server)
+		$(qt_feature gnome wayland_decoration_adwaita)
 	)
 
 	qt6-build_src_configure