gentoo auto-resync : 24:09:2023 - 23:23:49

6 files changed, 57 insertions, 12 deletions

diff --git a/dev-qt/qtbase/Manifest b/dev-qt/qtbase/Manifest
index c7f57ddc50c9..2336df2484ee 100644
--- a/dev-qt/qtbase/Manifest
+++ b/dev-qt/qtbase/Manifest
@@ -1,10 +1,11 @@
 AUX qtbase-6.5.2-CVE-2023-38197.patch 14691 BLAKE2B 68de2edb047871de9608a0a570773c9987474f9977f1dad9a849b8ed18dad6ef966997c0293adaee92fd2fcdb24a79a6bd05a71874c548722bfca64d960f12e3 SHA512 0ee7d66a0894879816454fdfd4c9feb958d82e87f4287935704216330e74135709b23cba7a5c084a6b2617b16c54a96eb6eff785d85f0d79b15ef6ccd9da51c6
 AUX qtbase-6.5.2-hppa-forkfd-grow-stack.patch 1001 BLAKE2B 21fabd37d44ad496d2e114351c52bb56ed311f4939e243efc8c0e61b9090bc2dacf29590fa7b5ec21244df7d7f37960fdc2446079609fc7f38d450c0b3afd420 SHA512 4619902ea198a3565e9520206f88632e1c06518b42edfc7e0d2656b0593404bdc96fe0673ca56703858dc0697ee77593eac44cac9108fef4a5147ed7ab1470ca
+AUX qtbase-6.5.2-no-glx.patch 1298 BLAKE2B 83b399a1faa1bb976bc00b7d0b9721b2a2bc64f11f345d3ddb6019481c16f503a6faf1789c56fdbbb7a4d0bde5ffd9c1620dc677189d0e40008cef0ab02e732e SHA512 fcdd0ad2f0f6dadfea8ca00fbb93c18426eb4e12a8374f9f6d0c9fb2f4aa3bb9494e1c5eb0408066dbc4f9b5075c56f8b99a6336b9d66ac5558e99f38357f9ca
 AUX qtbase-6.5.2-no-symlink-check.patch 152 BLAKE2B 676ff8577f678fe3ed1e34e3fc8f7a9b16145259b2e23c432d4cb08465cb5d3a6685e557c9da862f3abb0d51459c7dc055155d804c3daef768bf0e9bdcc3b162 SHA512 6a82cb63812c7fa6d04e9ba9d017ce23ff1d620ec6ebcd575719678138d74e1298e3962d48e211ee72c9a533f03cb7a0fa47b428592a1402ec7ad1d1c487a4b4
 AUX qtbase-6.5.2-tests-gcc13.patch 1491 BLAKE2B 72417e910bb35df59c10d18e093bf4d17952d0a39ead552a342020004bbf7c9e0f903140c014509ab806915ff380ad3732e3cd119b9b1ce3bec550b9c247a077 SHA512 10e05e135e4997cc71c0d2f1a0b40131babe88801d87bb11f69aa1ae93cdcdef9e1e510dbfe337b5bd101e4831a401a63a5e49d84f9f865d6db986e3e60277ba
 DIST qtbase-everywhere-src-6.5.2.tar.xz 48410716 BLAKE2B 578c69ede6f45a8b21cba0a24674d5d8801722503d13ab9578b06b2446ce15e6a84bcdbd0c5d2c9aa868ec70862f0845406c959ed79b695f82bb398ecf299c63 SHA512 8d97029aae5b73a3e03624c9a8495dbf2fe54a4f5e992071c06f3d93935e64c80f2121b33eeb60a92d96ceb288cb25d74906a5bf47b45bb018d859d4a2d13f20
-EBUILD qtbase-6.5.2-r2.ebuild 9373 BLAKE2B dad43ad1229e7917b4584745cdb145a55684194ced8dcad6822895ed9c7ad3567cc6813fe97c0e25de218a6fbb7fc07bd433884cc19ffaade01e86fcb78792a6 SHA512 2a4250bb28a009bfe20ac51c73cd6e36e0b95963575f3453fe3332a73356dcfd6afc80dbfed3741858b65e294142f88ded0af97a08a76393341fae65a49d7d06
-EBUILD qtbase-6.5.9999.ebuild 9272 BLAKE2B 94178db742d77b917b0854ddbf356e5ce5e15a301b8910cee3d5fea4891354835cf6f799b4489099d256c09cd77636f5c395f6c1ebae220268b7fe99d9d34e09 SHA512 842253986ab53beac67fa84af646df3b7a63d201e673f0c56099f79f50666f0aa3fa980cae8449fdd5c4bfb840fba7392d52d905d38c03bb7ed185a5db5f50e4
-EBUILD qtbase-6.6.9999.ebuild 9249 BLAKE2B e9a9e9b513e7f86651f1c0a987b99b1846802af4fcf19615cd11922378c2cd01526326d7f0417cc4d9d082c875938d9390f26423fc145ec741935a8778c7658e SHA512 08253ba013f83804fc172a811fec3c8bf5bf814c02e934d8855f41faf5832e0edfbc3e1fb0e8753193b24cc5f4962b0384da2d445cfdf820f71f170d7bf21828
-EBUILD qtbase-6.9999.ebuild 9363 BLAKE2B 7485fe27bc96dbd497ee0723726eb55f3dee180cba09130c829b28e2e675ccb46bee19a12cdf28edff6706d80063a3d0c359416546a8a4a599e13f9e8acd56ae SHA512 1522a0e9e798547ffe400db35c93e7ce3e6041cbeab1a21b2ca52fc6a7576a02834009b4ddf86911cfc825479ddc80348deb210667c054253ce31de65e0f22b7
+EBUILD qtbase-6.5.2-r2.ebuild 9481 BLAKE2B 2ca36d0ed9d09173f74e4762acfbc14b79f7794e632dbd7d7f298be310d29006d5fee746234a5e1108e45f4cbef1d47899d7e057d6f608459a7ab1fecefdddbd SHA512 69a445cf07beaabbc231b7b0f5fef72745559f617081ac9c0397692c49dd2c13eb86363e854e239a82aa68ab4957558ae96f76d6b543715ff577d3a0b45da275
+EBUILD qtbase-6.5.9999.ebuild 9380 BLAKE2B d0e745c82f3422dd5fa37478dc821ea7f7a386eb7a97b0aaabe0c0d6b18901a36a77ae58f5e041d6729c8f7396d627973d1bbe74426861a826510d95d472cbfa SHA512 2b0dd2376ddcb23bf941e76f0d4d1235195334d87d3874b60492b579c84a5c7e7e92f9fdeccb529e1c0b449c282511df209e97de2fa0f27c0cf06e483183b838
+EBUILD qtbase-6.6.9999.ebuild 9357 BLAKE2B 755933284d26416a4037a0dcaa8de099678f1bc363c754702f436108eeaa4cc82f834e7314d1ff249f1b53fc50df248878f840cee08e08807d9581e0652e79cc SHA512 20362e26ba77197f04e13177627b5a98c43b0af9ccbd72798ffa0d6b9b6ff62bc788dde4ebeaca0d51bf6226719a060ba1ba43d8e993928a767a80b8ea0fb026
+EBUILD qtbase-6.9999.ebuild 9431 BLAKE2B 12a376f381a49902652866386c755c86b700d9539f7b7e6c2d3d525ebd796bc2d65dde66ad7eb77881182b01af92d66c27097eee912fa6a0fe5e4702e14b0e35 SHA512 93fc1b3aa4894676982f37e90f4de79b1bb0728829a1d5e890245287af03a04afcef210e52b426afa2fefc18ac13982f72fc242070f89e30dfb7f74221e8643a
 MISC metadata.xml 1724 BLAKE2B 958a60a43b45b9d79102633d818a57e697dc8180d1ffdea15ae064b659d19d099e6edf0c0583614cea1451375fec5163b8140efa530e9295a8a33e2165da1f01 SHA512 a11523095d1d6bb8443c8198315098c2c3b2e3e17cabcfd7260e2322c8542825605cc8e71eb8144c6dfe469abb2ed834d04350e80ccd9d6ee544a15099bde8b8
diff --git a/dev-qt/qtbase/files/qtbase-6.5.2-no-glx.patch b/dev-qt/qtbase/files/qtbase-6.5.2-no-glx.patch
new file mode 100644
index 000000000000..f8263d10c022
--- /dev/null
+++ b/dev-qt/qtbase/files/qtbase-6.5.2-no-glx.patch
@@ -0,0 +1,29 @@
+Fixes build with libglvnd[-X].
+
+https://github.com/qt/qtbase/commit/929d9a4ca5c9eb0a590479182471d0bbc81589aa
+From: Yaroslav Isakov <yaroslav.isakov@gmail.com>
+Date: Sat, 8 Jul 2023 22:09:40 +0200
+Subject: [PATCH] Allow OpenGL to be found on X11-less Linux systems (using
+ libOpenGL)
+
+Cmake supports finding OpenGL, even if there is no GLX (for glvnd) or
+old-style libGL. This change keeps old behavior, but in case, if
+X11-related OpenGL libraries cannot be found on Linux, it adds logic
+to check for (and link with) libOpenGL, if it is present.
+--- a/cmake/FindWrapOpenGL.cmake
++++ b/cmake/FindWrapOpenGL.cmake
+@@ -47,4 +47,14 @@
+         target_link_libraries(WrapOpenGL::WrapOpenGL INTERFACE OpenGL::GL)
+     endif()
++elseif(UNIX AND NOT APPLE AND NOT CMAKE_SYSTEM_NAME STREQUAL "Integrity")
++    # Requesting only the OpenGL component ensures CMake does not mark the package as
++    # not found if neither GLX nor libGL are available. This allows finding OpenGL
++    # on an X11-less Linux system.
++    find_package(OpenGL ${WrapOpenGL_FIND_VERSION} COMPONENTS OpenGL)
++    if (OpenGL_FOUND)
++        set(WrapOpenGL_FOUND ON)
++        add_library(WrapOpenGL::WrapOpenGL INTERFACE IMPORTED)
++        target_link_libraries(WrapOpenGL::WrapOpenGL INTERFACE OpenGL::OpenGL)
++    endif()
+ endif()
+ 
diff --git a/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild b/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
index 2f489c953187..277567f58edf 100644
--- a/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
@@ -8,7 +8,7 @@ inherit flag-o-matic qt6-build toolchain-funcs
 DESCRIPTION="Cross-platform application development framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~x86"
 fi
 
 declare -A QT6_IUSE=(
@@ -86,7 +86,10 @@ RDEPEND="
 		eglfs? ( media-libs/mesa[gbm(+)] )
 		evdev? ( sys-libs/mtdev )
 		libinput? ( dev-libs/libinput:= )
-		opengl? ( media-libs/libglvnd[X?] )
+		opengl? (
+			gles2-only? ( media-libs/libglvnd )
+			!gles2-only? ( media-libs/libglvnd[X?] )
+		)
 		tslib? ( x11-libs/tslib )
 		widgets? (
 			cups? ( net-print/cups )
@@ -131,6 +134,7 @@ 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}"/${P}-CVE-2023-38197.patch
 	"${FILESDIR}"/${P}-tests-gcc13.patch
diff --git a/dev-qt/qtbase/qtbase-6.5.9999.ebuild b/dev-qt/qtbase/qtbase-6.5.9999.ebuild
index fcb8b96417f2..9084a0b6223b 100644
--- a/dev-qt/qtbase/qtbase-6.5.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.9999.ebuild
@@ -8,7 +8,7 @@ inherit flag-o-matic qt6-build toolchain-funcs
 DESCRIPTION="Cross-platform application development framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~loong"
 fi
 
 declare -A QT6_IUSE=(
@@ -86,7 +86,10 @@ RDEPEND="
 		eglfs? ( media-libs/mesa[gbm(+)] )
 		evdev? ( sys-libs/mtdev )
 		libinput? ( dev-libs/libinput:= )
-		opengl? ( media-libs/libglvnd[X?] )
+		opengl? (
+			gles2-only? ( media-libs/libglvnd )
+			!gles2-only? ( media-libs/libglvnd[X?] )
+		)
 		tslib? ( x11-libs/tslib )
 		widgets? (
 			cups? ( net-print/cups )
@@ -131,6 +134,7 @@ 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
 )
 
diff --git a/dev-qt/qtbase/qtbase-6.6.9999.ebuild b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
index a99420fff1b8..2d8d2a18c484 100644
--- a/dev-qt/qtbase/qtbase-6.6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
@@ -8,7 +8,7 @@ inherit flag-o-matic qt6-build toolchain-funcs
 DESCRIPTION="Cross-platform application development framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~loong"
 fi
 
 declare -A QT6_IUSE=(
@@ -86,7 +86,10 @@ RDEPEND="
 		eglfs? ( media-libs/mesa[gbm(+)] )
 		evdev? ( sys-libs/mtdev )
 		libinput? ( dev-libs/libinput:= )
-		opengl? ( media-libs/libglvnd[X?] )
+		opengl? (
+			gles2-only? ( media-libs/libglvnd )
+			!gles2-only? ( media-libs/libglvnd[X?] )
+		)
 		tslib? ( x11-libs/tslib )
 		widgets? (
 			cups? ( net-print/cups )
@@ -131,6 +134,7 @@ 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
 )
 
diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index ffcc8c5bedb8..a968789b80a3 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -8,7 +8,7 @@ inherit flag-o-matic qt6-build toolchain-funcs
 DESCRIPTION="Cross-platform application development framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~loong"
 fi
 
 declare -A QT6_IUSE=(
@@ -87,7 +87,10 @@ RDEPEND="
 		eglfs? ( media-libs/mesa[gbm(+)] )
 		evdev? ( sys-libs/mtdev )
 		libinput? ( dev-libs/libinput:= )
-		opengl? ( media-libs/libglvnd[X?] )
+		opengl? (
+			gles2-only? ( media-libs/libglvnd )
+			!gles2-only? ( media-libs/libglvnd[X?] )
+		)
 		renderdoc? ( media-gfx/renderdoc )
 		tslib? ( x11-libs/tslib )
 		widgets? (