gentoo auto-resync : 12:12:2023 - 23:32:21

3 files changed, 21 insertions, 12 deletions

diff --git a/dev-qt/qtbase/Manifest b/dev-qt/qtbase/Manifest
index d417b858f2f1..6739f28f3cc0 100644
--- a/dev-qt/qtbase/Manifest
+++ b/dev-qt/qtbase/Manifest
@@ -5,11 +5,10 @@ AUX qtbase-6.5.3-forkfd-childstack-size.patch 1121 BLAKE2B a0fdab83b7bbf78335207
 AUX qtbase-6.5.3-xkbcommon160.patch 1038 BLAKE2B c6e499343728b78d33f52cefae44c1ef7fc67df0b5e9184920d8a4268c0fd73456ad9fedccf2380c2e22a9347f1da7c1279d3a22125e6f2b389b0cabe73f85c4 SHA512 09f795ad8342e2f7dd13f63ab98b9945e3e1b80e2917b1ef21845cc488bf823598693d53257e7b15ca3b3ee95dce2bfc60dced2e1b8f765337e4db86be73ac8e
 AUX qtbase-6.6.1-forkfd-childstack-size.patch 861 BLAKE2B c5b1f471cf91150b6d6a643994284e95721f0739284680ba3e2d5d2332b3e0544c85f6dfb7129fccc3ed3beae24d7d3c919357d160bc9d5004426c68e8fa6321 SHA512 8c619b24cd9b7dd72ee975a66d6919718a0594eaeb0907454a9a9fd68a259db345f685aa9c87cf0c0c27b4194f621306a6f00f20dce95482bce7efe55fae00d6
 DIST qtbase-everywhere-src-6.5.3.tar.xz 47142456 BLAKE2B 5b4c774b7199563dc7f2aebf9b2b531d851ee49bc038212f4970eeb43a17c364710432708f82a518eee6692ab123d78b642c234d9548d5b553f689a43aa05ee6 SHA512 31c6c01d466f1e01f18d6dcee593360c08ee83ad0a6be495a8eba023faad628cf07ce7285426fabfd247db306319e9a64da329682c99a712a282e32f7493cdb9
-DIST qtbase-everywhere-src-6.6.0.tar.xz 48350308 BLAKE2B 719e265dfafb4fd95f972a317acb95e2d83f8d62175c28ab97837c635435bdcd79bdca113362dea2f04dab799d4749e23056ddb9583908ee20ab23cedeca19b7 SHA512 4e85acefeddc0a3cd6ba615b4768f435c4e237a605172153a1777a10285dab83d9cf220c18ce6d723d051b8b432f3e92be94925b54c2eb972c2c1d9ace849e17
 DIST qtbase-everywhere-src-6.6.1.tar.xz 48370760 BLAKE2B 2dd551d15eef30c7d9a5f4c406143d6f8908d7ebade9daf9fbd3d82a25765425956f2cb8689c50f87f6477de2150eee7b820ef25bb4355c51e7e7fad3ef73005 SHA512 93e77b9b077a3acd5607b643db282fdd7ed0bdfa07df74c3f0d2285afeb1672a6fa229a7e7a6c8a462701305fc22ffef20c212d906484e50fb5cdb706a7b72e1
 EBUILD qtbase-6.5.3-r1.ebuild 9687 BLAKE2B 815eccc4d634fb6216d3d2579bb9a7b06250a7428f2c8ed35e1dd244b512dd2d74f4b2afc552fa4d1bf0d6c936e3137827bc9c414e045c2f533a8d58d904d7d6 SHA512 ede59eb681b14fa4700f5dc719310f66bd8606e14f0d653be8ee7fe21b96332bfbe1597900c885f4a036a45b5677e8352b951fca57efc6f3d4a5c49cb226fb55
-EBUILD qtbase-6.6.0-r1.ebuild 9708 BLAKE2B 31b7311dfec4d656cf21e49868474228a563d2de80f014482ab5ad9b3f3ceedd1a1f0792cb0edbf78b365a3c0c4558c6f0f415649eec29efda04a8e077f69ac3 SHA512 3bd956295813a67a5327c594bdea9e384653d4ba31d42c957aead14782f4c59c503de4fe8d228c1a20b5081dec74528593d75f19fad34878683522f5e9f3f742
 EBUILD qtbase-6.6.1-r1.ebuild 9798 BLAKE2B 5163c1dfa920fa75816c6984eaade992a296060b103ed9e86bb1e5a8c129ea017fefc840d9b4bb55a0bfedebf0a31cbeaca63fbd88c943e1490a36573a1214b4 SHA512 3f06d6f311b3e2bd4c6fed2f73484dc75b7367845d5fccc0bae92bac95216b74d2a76d4f9fbebaad197c9133e004e26ae6cc84bdc8b492c2255e18ced2954eae
 EBUILD qtbase-6.6.9999.ebuild 9772 BLAKE2B da69eac9e2f60941eacc3a81a4eed22c3f42539af9dc60329525cbf9ded3835c501622780754ba95cdf85188d504ef8fea7d56cc81cf2041a37c3178cfacac19 SHA512 a942638a3d7a108f9bd3a5798ef77824e0a96c9b95319bea460a2af0902ed7bb07f7aaff24016d47046b626cf29a04b7c10182ac1ab732b51c6cb43a39f26cc1
-EBUILD qtbase-6.9999.ebuild 9846 BLAKE2B 0d2e3f29512b7fd5f4bb98e32f34369a60ac45025052527aaa8b1d6dd647be8d6700a05c4680e6d159bc131e3b93ba260588f658680b446cdd18f0c576f9019a SHA512 6fe6ff3392c07622dae320607cb460fb56b9ae7ad49818ec922a0dd1eee7aa87c9f4337f21712066a08bef13f17ac90cd3293af2ecbc3170729a28fc6c8c0641
+EBUILD qtbase-6.7.9999.ebuild 9863 BLAKE2B e4c595b16f7429aabe7dc7de609ad102ee5cfe23c865a60b0f31ac9f73b6e4638c32280f7dba30657f34f5228d592cb4790eb4dc800d86bb2347a4b7713814bb SHA512 a9b9f790c4ca4e8635ad0df0a24a539c1dabe785c88788b27a6ff3887731c457e3570026c825b97f9a77ac3fc34378eb3dfb65fba1054cdcf3f446c6203e2491
+EBUILD qtbase-6.9999.ebuild 9863 BLAKE2B e4c595b16f7429aabe7dc7de609ad102ee5cfe23c865a60b0f31ac9f73b6e4638c32280f7dba30657f34f5228d592cb4790eb4dc800d86bb2347a4b7713814bb SHA512 a9b9f790c4ca4e8635ad0df0a24a539c1dabe785c88788b27a6ff3887731c457e3570026c825b97f9a77ac3fc34378eb3dfb65fba1054cdcf3f446c6203e2491
 MISC metadata.xml 1655 BLAKE2B 1f3bdbe5f14716d1825ff0ce6d3a9439a87c0c18abd0bb6a2286c9709e815205f2f6911ef5d053b57598aa54471d4316f87c9a4d36004be15f499447785f14bd SHA512 d1479bae177f75991241eacaa1300f43d644730fa3d6d7e6e039b8a212f1289b920b6e1aad7c56576857049f133492f5cf648c7931228c6c4ee272d93437e351
diff --git a/dev-qt/qtbase/qtbase-6.6.0-r1.ebuild b/dev-qt/qtbase/qtbase-6.7.9999.ebuild
index 2451f3f8fbda..4f56473ee60f 100644
--- a/dev-qt/qtbase/qtbase-6.6.0-r1.ebuild
+++ b/dev-qt/qtbase/qtbase-6.7.9999.ebuild
@@ -18,13 +18,13 @@ declare -A QT6_IUSE=(
 
 	[gui]="
 		+X accessibility eglfs evdev gles2-only +libinput
-		opengl tslib vulkan +widgets
+		opengl renderdoc tslib vulkan wayland +widgets
 	"
 	[network]="brotli gssapi libproxy sctp"
 	[sql]="mysql oci8 odbc postgres +sqlite"
 	[widgets]="cups gtk"
 
-	[optfeature]="nls wayland" #810802,864509
+	[optfeature]="nls" #810802
 )
 IUSE="${QT6_IUSE[*]}"
 REQUIRED_USE="
@@ -34,7 +34,7 @@ REQUIRED_USE="
 		printf '%s? ( sql ) ' ${QT6_IUSE[sql]//+/}
 		printf '%s? ( gui widgets ) ' ${QT6_IUSE[widgets]//+/}
 	)
-	accessibility? ( X dbus )
+	accessibility? ( dbus )
 	eglfs? ( opengl )
 	gles2-only? ( opengl )
 	gui? ( || ( X eglfs wayland ) )
@@ -50,6 +50,7 @@ REQUIRED_USE="
 # - qtnetwork (src/network/configure.cmake)
 # - qtprintsupport (src/printsupport/configure.cmake) [gui+widgets]
 # - qtsql (src/plugins/sqldrivers/configure.cmake)
+# dlopen: renderdoc
 RDEPEND="
 	sys-libs/zlib:=
 	ssl? ( dev-libs/openssl:= )
@@ -90,6 +91,7 @@ RDEPEND="
 			gles2-only? ( media-libs/libglvnd )
 			!gles2-only? ( media-libs/libglvnd[X?] )
 		)
+		renderdoc? ( media-gfx/renderdoc )
 		tslib? ( x11-libs/tslib )
 		widgets? (
 			cups? ( net-print/cups )
@@ -134,10 +136,8 @@ PDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-6.5.2-hppa-forkfd-grow-stack.patch
-	"${FILESDIR}"/${PN}-6.5.2-no-glx.patch
 	"${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
-	"${FILESDIR}"/${PN}-6.5.3-xkbcommon160.patch
-	"${FILESDIR}"/${PN}-6.5.3-forkfd-childstack-size.patch
+	"${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch
 )
 
 src_prepare() {
@@ -199,8 +199,10 @@ src_configure() {
 		$(qt_feature evdev)
 		$(qt_feature evdev mtdev)
 		$(qt_feature libinput)
+		$(qt_feature renderdoc graphicsframecapture)
 		$(qt_feature tslib)
 		$(qt_feature vulkan)
+		$(qt_feature wayland)
 		$(qt_feature widgets)
 		-DINPUT_opengl=$(usex opengl $(usex gles2-only es2 desktop) no)
 		-DQT_FEATURE_system_textmarkdownreader=OFF # TODO?: package md4c
@@ -310,10 +312,11 @@ src_test() {
 		# similarly, but on armv7 and potentially others (bug #914028)
 		tst_qlineedit
 		tst_qpainter
-		# likewise, known failing at least on BE arches (bug #914033,914371)
+		# likewise, known failing on BE arches (bug #914033,914371,918878)
 		tst_qimagereader
 		tst_qimagewriter
 		tst_qpluginloader
+		tst_quuid
 		# partially broken on llvm-musl, needs looking into but skip to have
 		# a baseline for regressions (rest of dev-qt still passes with musl)
 		$(usev elibc_musl '
@@ -326,6 +329,12 @@ src_test() {
 			tst_qcborvalue
 			tst_qnumeric
 		')
+		# bug #914033
+		$(usev sparc '
+			tst_qbuffer
+			tst_qprocess
+			tst_qtconcurrentiteratekernel
+		')
 		# note: for linux, upstream only really runs+maintains tests for amd64
 		# https://doc.qt.io/qt-6/supported-platforms.html
 	)
diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index d52508982db3..4f56473ee60f 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -18,13 +18,13 @@ declare -A QT6_IUSE=(
 
 	[gui]="
 		+X accessibility eglfs evdev gles2-only +libinput
-		opengl renderdoc tslib vulkan +widgets
+		opengl renderdoc tslib vulkan wayland +widgets
 	"
 	[network]="brotli gssapi libproxy sctp"
 	[sql]="mysql oci8 odbc postgres +sqlite"
 	[widgets]="cups gtk"
 
-	[optfeature]="nls wayland" #810802,864509
+	[optfeature]="nls" #810802
 )
 IUSE="${QT6_IUSE[*]}"
 REQUIRED_USE="
@@ -202,6 +202,7 @@ src_configure() {
 		$(qt_feature renderdoc graphicsframecapture)
 		$(qt_feature tslib)
 		$(qt_feature vulkan)
+		$(qt_feature wayland)
 		$(qt_feature widgets)
 		-DINPUT_opengl=$(usex opengl $(usex gles2-only es2 desktop) no)
 		-DQT_FEATURE_system_textmarkdownreader=OFF # TODO?: package md4c