gentoo auto-resync : 08:09:2023 - 04:29:45

8 files changed, 18 insertions, 21 deletions

diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 0996eda2caf9..ea0efc7722c2 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index 855b4caf14db..f3e7bda291ec 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -3,6 +3,6 @@ DIST qtmultimedia-everywhere-opensource-src-5.15.10.tar.xz 3832156 BLAKE2B 88c01
 DIST qtmultimedia-everywhere-src-6.5.2.tar.xz 6415576 BLAKE2B c0032c405315e6884de6bb851de3aed0b60827a932c15b1022dca70ebfaa5dffb258b2b22f9ab40f57586490db6ec50ea862152fca8429e600f9c6bffe2f42a2 SHA512 e12a2406e78eda8f3f4674b8fe01b06bc2c7b8fcbe5342e25e28340e13c0ab0db44a78c91a8a1f268664e5bb11c3bc7116248700f0c67faa618e058af0dfb1e0
 EBUILD qtmultimedia-5.15.10.ebuild 1511 BLAKE2B f773c6effa7a370b2e48a3af434486ab29251e2f50d71a56862ffa35e2eeaf13f63314980464bd59489ae862122435ffa453e8c29b0010b51c970dfd97ad3d8a SHA512 f9a8ba144b8ec74364cb9b5dc0dad015c01c9e24f2217d01a331c7456bf8cc4128d91f4c3e5c81ff07003760126499c2edfafc127ca2ec1f0ce590934f240a21
 EBUILD qtmultimedia-6.5.2-r1.ebuild 1949 BLAKE2B b9dd4a9d8bf7916e2a31e658ca5d1231342df6d2ac70925a0511f528eef3aad030000ae3eb09c3e440c06aa9cc39ed71ad18655a6ea078431171049bb6fc3cc7 SHA512 dd805568e002ebb3d46222e255a4fa22b09658e6121e09b2b95f48db62ad0b3eedfe9eb2ec9a7af4058595a51909750d46acbcf54e05011e491278bc5545cecb
-EBUILD qtmultimedia-6.5.9999.ebuild 1949 BLAKE2B b9dd4a9d8bf7916e2a31e658ca5d1231342df6d2ac70925a0511f528eef3aad030000ae3eb09c3e440c06aa9cc39ed71ad18655a6ea078431171049bb6fc3cc7 SHA512 dd805568e002ebb3d46222e255a4fa22b09658e6121e09b2b95f48db62ad0b3eedfe9eb2ec9a7af4058595a51909750d46acbcf54e05011e491278bc5545cecb
-EBUILD qtmultimedia-6.9999.ebuild 1949 BLAKE2B b9dd4a9d8bf7916e2a31e658ca5d1231342df6d2ac70925a0511f528eef3aad030000ae3eb09c3e440c06aa9cc39ed71ad18655a6ea078431171049bb6fc3cc7 SHA512 dd805568e002ebb3d46222e255a4fa22b09658e6121e09b2b95f48db62ad0b3eedfe9eb2ec9a7af4058595a51909750d46acbcf54e05011e491278bc5545cecb
+EBUILD qtmultimedia-6.5.9999.ebuild 1922 BLAKE2B 5251ca3cac32001e6e1b3f9763c99bcdebf905fa464f37afbd8d761d4baa8144a0eab1301bfe48e57c3c06b07b61fed83804f5ec97e2dde6fdfa5d9f7db7dc13 SHA512 f23d513fe31efd997b0bb7cf1f251bbbc2cb733c43e5d5f788f2fdd91e65097564cac694a25adb73947df17c56009405cb842347e8926221516f181ac466e071
+EBUILD qtmultimedia-6.9999.ebuild 1922 BLAKE2B 5251ca3cac32001e6e1b3f9763c99bcdebf905fa464f37afbd8d761d4baa8144a0eab1301bfe48e57c3c06b07b61fed83804f5ec97e2dde6fdfa5d9f7db7dc13 SHA512 f23d513fe31efd997b0bb7cf1f251bbbc2cb733c43e5d5f788f2fdd91e65097564cac694a25adb73947df17c56009405cb842347e8926221516f181ac466e071
 MISC metadata.xml 773 BLAKE2B e4b291f7b0f103011af120ad0cb9766cc03341c44f751127997958d704803cbc278094050693f4cc7ba17fb3c2f311252c2304e5a93cf17363ebbbc4e6c2cce0 SHA512 d5c729736723cf7296234acc39d55cd28924449b4bca425c37b8fa7582dbab9c649b501ac88ffcd3c5a5cc696390d18cf9912a4fb6e2520768ff704533d7f909
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.5.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.5.9999.ebuild
index 8e203f8eaec1..ae102c2a70ef 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.5.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.5.9999.ebuild
@@ -30,10 +30,7 @@ RDEPEND="
 			x11-libs/libXext
 			x11-libs/libXrandr
 		)
-		vaapi? (
-			media-libs/libglvnd
-			media-libs/libva:=
-		)
+		vaapi? ( media-libs/libglvnd )
 	)
 	gstreamer? (
 		dev-libs/glib:2
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
index 8e203f8eaec1..ae102c2a70ef 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
@@ -30,10 +30,7 @@ RDEPEND="
 			x11-libs/libXext
 			x11-libs/libXrandr
 		)
-		vaapi? (
-			media-libs/libglvnd
-			media-libs/libva:=
-		)
+		vaapi? ( media-libs/libglvnd )
 	)
 	gstreamer? (
 		dev-libs/glib:2
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index bcf9efa1daa3..e35e37a66a01 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -14,6 +14,6 @@ EBUILD qtwebengine-5.15.10_p20230623.ebuild 8524 BLAKE2B cce6249550a5574ab7763c0
 EBUILD qtwebengine-5.15.10_p20230815.ebuild 8258 BLAKE2B 766d6ad760f73e66d9a7f0ee52c3916e14b7f640e26784abf0866b039aecbf809c9e21a00b13d030311fa1ab91360aacd837e1257474800732a5598c3910c646 SHA512 c2d9534d452db6f53238faa05f6b454c4daeb6fcf683997d5095f4a9b777248e8d7f67ba4203a4b26457782817b887ca0cce36fb8d14f887e1b9772e78173140
 EBUILD qtwebengine-6.5.2-r1.ebuild 8083 BLAKE2B 3c16c2ee3141c8fe6be62f1bd25923dc851430d30b4ce0760e1b4fd0a857cd498f1aab4c1e04293af6d6eea48f5c7fa88e18ef8d9e7fb153de6cfff16f5c013a SHA512 c9e2ca65cf4961ae4e9cb9cba649705a28b5d705fbce46cfa2aa07232e1a5948857db03964be85f0fe3c2cccb85980c5642a22d222dd9b69f5cb614e9c12dd3d
 EBUILD qtwebengine-6.5.2.ebuild 8559 BLAKE2B afcca72bb25aab65e617a033bc7b4eb47241c86307184417151522da586fe38e9485151f139fed68b365061dbfd6d19a99ae8296507109e8ab71b8879da2d9de SHA512 4e53155411b17bd1ba2800b2a265a2d117d64d62b20a7c5f275cb08d1a6a3da3aa5646933a386020bfd09b6ef82763e4cae48644db0e6b5123a0314fa904a0ba
-EBUILD qtwebengine-6.5.9999.ebuild 8083 BLAKE2B 3c16c2ee3141c8fe6be62f1bd25923dc851430d30b4ce0760e1b4fd0a857cd498f1aab4c1e04293af6d6eea48f5c7fa88e18ef8d9e7fb153de6cfff16f5c013a SHA512 c9e2ca65cf4961ae4e9cb9cba649705a28b5d705fbce46cfa2aa07232e1a5948857db03964be85f0fe3c2cccb85980c5642a22d222dd9b69f5cb614e9c12dd3d
-EBUILD qtwebengine-6.9999.ebuild 8041 BLAKE2B f348d951ffef684bd9e052324807b36838cbb7cc1bf9e2f25ce4bc886b7e85a046c053552a2f607609428e2b5cdc3a6da173f3f55eb2e3d0acfafda430517e88 SHA512 8827bd1ed39e63db6be134766c71e9b5befc6559dd1df5d0979895ecea5c9375dcf9368a1956d119133db901bac5adc7e7391d364d83468a94f7ecedffb0bae6
-MISC metadata.xml 1225 BLAKE2B e98ba2a05a516ebdb11d2b669532ba64d2ec3e517a347a77fc9d15f2e9c0671ff521ce13d3e296149c0cfee6b484fa3cbd6013ef20fdbccdce18d38c96b7aa7c SHA512 3aad326e75587e160340740cf9feadbeffac22b7bb064112e67f9750251587d60fc2fdb8256a98ac0b4156cfaf0cac0e01334628ed76dee31de0c5fd65d9a66f
+EBUILD qtwebengine-6.5.9999.ebuild 8111 BLAKE2B 695f5be0da107ac6319f5fad0a2d013e8e9a68f0de7beb7e272299d0aa059d77414d24598f8a8d9ff08bde9f180e43e5629d9b1ed280a8ed116dc2ef8c387244 SHA512 1b11fcf80a323f41603e7729f01bada0ca808c9b7a06e1603094179d9b5f796e5d845095a7b1754a86d6217bf7c1276098a663780363414b029bd20aff6a74e5
+EBUILD qtwebengine-6.9999.ebuild 8069 BLAKE2B 9597280a749df3dec5b58b41019869d147e671efd4a75f670ae957f07ad66e0312a9b9be735e8f007a0651e67dc70109a4cb8c59fdf4fd3d6d46b70f01cecdbe SHA512 bb066af71484bb769bdaab8c321bc32068d2c45904598a4b21e46d8b9d87cce7cc97022d444d7163ca0eee1c6490089714ef91220b95262f4f74fa31434b0870
+MISC metadata.xml 1274 BLAKE2B 34cdf96f228f4495510c069b7c3c536bad535acab91e9ce4ea6cadf01b2c2ada307392ca30ef07bbc47b102941d5601a0eb087e9f7b2e04fe31981efbfacde27 SHA512 76638ce2a1a79c9174e13eb7919ac3bafdd37c8bdda9990ca25db576b2ffb1a0c808411b3238fbeb5917dac354fc7b0fc378878a5a3cb2523bf190e468de9cfb
diff --git a/dev-qt/qtwebengine/metadata.xml b/dev-qt/qtwebengine/metadata.xml
index ca6040fdb1aa..7bf30c9e28a5 100644
--- a/dev-qt/qtwebengine/metadata.xml
+++ b/dev-qt/qtwebengine/metadata.xml
@@ -13,6 +13,7 @@
 	<use>
 		<flag name="designer">Install the QWebEngineView plugin used to add widgets in <pkg>dev-qt/designer</pkg> forms that display web pages.</flag>
 		<flag name="jumbo-build">Combine source files to speed up build process.</flag>
+		<flag name="pdf">Build the QtPdf module</flag>
 		<flag name="qml">Build QML/QtQuick bindings and imports</flag>
 		<flag name="system-icu">Use the system-wide <pkg>dev-libs/icu</pkg> instead of bundled.</flag>
 		<flag name="widgets">Enable QtWidgets support</flag>
diff --git a/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild
index 4f2f7fbf799d..de90fe927c8f 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild
@@ -21,7 +21,7 @@ fi
 
 IUSE="
 	+alsa bindist custom-cflags designer geolocation +jumbo-build kerberos
-	opengl pulseaudio qml screencast +system-icu vulkan +widgets
+	opengl pdf pulseaudio qml screencast +system-icu vulkan +widgets
 "
 REQUIRED_USE="
 	designer? ( qml widgets )
@@ -83,6 +83,7 @@ DEPEND="
 	x11-base/xorg-proto
 	x11-libs/libxshmfence
 	screencast? ( media-libs/libepoxy[egl(+)] )
+	pdf? ( net-print/cups )
 	test? (
 		widgets? ( app-text/poppler[cxx(+)] )
 	)
@@ -158,9 +159,9 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DQT_FEATURE_qtpdf_build=OFF # TODO?
-		-DQT_FEATURE_qtpdf_quick_build=OFF
-		-DQT_FEATURE_qtpdf_widgets_build=OFF
+		$(qt_feature pdf qtpdf_build)
+		$(qt_feature qml qtpdf_quick_build)
+		$(qt_feature widgets qtpdf_widgets_build)
 
 		-DQT_FEATURE_qtwebengine_build=ON
 		$(qt_feature qml qtwebengine_quick_build)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index 45ffa95a789a..2ecd3fe98f7b 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -21,7 +21,7 @@ fi
 
 IUSE="
 	+alsa bindist custom-cflags designer geolocation +jumbo-build kerberos
-	opengl pulseaudio qml screencast +system-icu vulkan +widgets
+	opengl pdf pulseaudio qml screencast +system-icu vulkan +widgets
 "
 REQUIRED_USE="
 	designer? ( qml widgets )
@@ -83,6 +83,7 @@ DEPEND="
 	x11-base/xorg-proto
 	x11-libs/libxshmfence
 	screencast? ( media-libs/libepoxy[egl(+)] )
+	pdf? ( net-print/cups )
 	test? (
 		widgets? ( app-text/poppler[cxx(+)] )
 	)
@@ -157,9 +158,9 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DQT_FEATURE_qtpdf_build=OFF # TODO?
-		-DQT_FEATURE_qtpdf_quick_build=OFF
-		-DQT_FEATURE_qtpdf_widgets_build=OFF
+		$(qt_feature pdf qtpdf_build)
+		$(qt_feature qml qtpdf_quick_build)
+		$(qt_feature widgets qtpdf_widgets_build)
 
 		-DQT_FEATURE_qtwebengine_build=ON
 		$(qt_feature qml qtwebengine_quick_build)