gentoo auto-resync : 26:01:2025 - 06:49:21

8 files changed, 17 insertions, 66 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index ed30e501193c..aabfcb58f2e4 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index d4df0c1abb23..186af207bb30 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -5,5 +5,5 @@ DIST graphviz-12.2.1.tar.xz 20945996 BLAKE2B f16804eab1a08996934526a1ed03c855e68
 EBUILD graphviz-12.0.0-r100.ebuild 6489 BLAKE2B 54b8609d6e23b269e4c3f76dc5724a5292d7c982e083c3bf8aca2b1129a8b3be76804493b8fca43ff41ac9f36184a5a903e3d01dfcd1a0d84d8e753b4d50d1ac SHA512 19ae245e5581e0e00572321e4f3959ddb11c3125bb91cb0fe38b30169fe194b3d7dc591987e94556a45ce5d0db242d464938dc11b526afb5dde5890c6d979c23
 EBUILD graphviz-12.1.2.ebuild 6497 BLAKE2B 73aac1004d0acebea0a1555260980a227d810bd8f194f2c271dc09f79884c364324e1d79129ecee5ad3a90156f9a41ea32dd3002a429d60e717ca8b52baff898 SHA512 889fc6a842a87092678a8b3c16428754e2bc03a1c8ae995be1e70654295dadb00d2b71d23252146405e44d965c9f4941d294895fc350fdfd2e4857be4b4f0063
 EBUILD graphviz-12.2.0.ebuild 6497 BLAKE2B 73aac1004d0acebea0a1555260980a227d810bd8f194f2c271dc09f79884c364324e1d79129ecee5ad3a90156f9a41ea32dd3002a429d60e717ca8b52baff898 SHA512 889fc6a842a87092678a8b3c16428754e2bc03a1c8ae995be1e70654295dadb00d2b71d23252146405e44d965c9f4941d294895fc350fdfd2e4857be4b4f0063
-EBUILD graphviz-12.2.1.ebuild 6497 BLAKE2B 73aac1004d0acebea0a1555260980a227d810bd8f194f2c271dc09f79884c364324e1d79129ecee5ad3a90156f9a41ea32dd3002a429d60e717ca8b52baff898 SHA512 889fc6a842a87092678a8b3c16428754e2bc03a1c8ae995be1e70654295dadb00d2b71d23252146405e44d965c9f4941d294895fc350fdfd2e4857be4b4f0063
+EBUILD graphviz-12.2.1-r1.ebuild 6443 BLAKE2B 6045e1328ff85ad2ee7c5162f7b6fcd8913140bf6867b117f935247cc9b627bad1f10d68f64ef064e32ac42ee8a16cc6719619481360b5bbf9a01556fad4d239 SHA512 01b4a3e0686887f9f87d627807f7bd9d72d772729dcaf043d95dc6932bc4a686d570a42012df4eb46a4570ce29227b17cd67472717329c1018ae2a15c39e3f48
 MISC metadata.xml 2309 BLAKE2B 261f100c9c78cf3bb50ffd84260594d34fa5af75f0b3789ce5640e0d633494405e64b3e9f7524e35ef87d11164c501e21fcef2cc483f60ad6ad2e350f500e3b2 SHA512 1a29d11154b72af3deeb0202136926f0871797086ce1a5a4d1fc71822e86d0e76ff789c684fabad85fac1abd5f29913a555be0916f42b90f5ce62fa395e1cbba
diff --git a/media-gfx/graphviz/graphviz-12.2.1.ebuild b/media-gfx/graphviz/graphviz-12.2.1-r1.ebuild
index d66128a9fbcf..518102e6ab66 100644
--- a/media-gfx/graphviz/graphviz-12.2.1.ebuild
+++ b/media-gfx/graphviz/graphviz-12.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ SRC_URI="https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-re
 LICENSE="CPL-1.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="+cairo devil doc examples gtk2 gts guile lasi nls pdf perl postscript python qt5 ruby svg tcl webp X"
+IUSE="+cairo devil doc examples gtk2 gts guile lasi nls pdf perl postscript python qt6 ruby svg tcl webp X"
 
 REQUIRED_USE="
 	!cairo? ( !X !gtk2 !postscript !lasi )
@@ -53,12 +53,7 @@ RDEPEND="
 	perl? ( dev-lang/perl:= )
 	postscript? ( app-text/ghostscript-gpl )
 	python? ( ${PYTHON_DEPS} )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwidgets:5
-	)
+	qt6? ( dev-qt/qtbase:6[gui,widgets] )
 	ruby? ( dev-lang/ruby:* )
 	svg? ( gnome-base/librsvg )
 	tcl? ( >=dev-lang/tcl-8.3:= )
@@ -131,7 +126,7 @@ BDEPEND="
 # And the commands (/cmd):
 # - dot, gvedit, gvpr, smyrna, tools/* :)
 #   sci-libs/gts can be used for some of these
-# - gvedit (via 'qt5'):
+# - gvedit (via 'qt6'):
 #   based on ./configure it needs qt-core and qt-gui only
 # - smyrna : experimental opengl front-end (via 'smyrna')
 #   currently disabled -- it segfaults a lot
@@ -166,7 +161,7 @@ src_configure() {
 		$(use_with gtk2 gdk-pixbuf)
 		$(use_with gtk2)
 		$(use_with gts)
-		$(use_with qt5 qt)
+		$(use_with qt6 qt)
 		$(use_with lasi)
 		$(use_with pdf poppler)
 		$(use_with postscript ghostscript)
@@ -199,7 +194,7 @@ src_configure() {
 		# libtool file collision, bug #276609
 		--without-included-ltdl
 		--disable-ltdl-install
-		QMAKE=$(usev qt5 qmake5)
+		QMAKE=$(usev qt6 qmake6)
 	)
 	# XXX: Temporary bash for bug #926600. It's been reverted upstream
 	# on master already:
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index a63a972890a0..f8f592fbd04b 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -3,5 +3,5 @@ AUX krita-5.2.2-fftw.patch 689 BLAKE2B a0b62a65d8de4c661a571f0f671387d0571982bbc
 AUX krita-5.2.3-tests-optional.patch 2807 BLAKE2B 7d0c0d26ce0cb1bf86f7933e8510bb5ea1e98986b811641874b4db6f622e5a31bf9b9c3b7e12267bf54f2d57d56459211df3e004dbc261e0d519f69d190e2149 SHA512 021d6d8fa1b976091088b317f54cf0be66f73b0dd9031497abc3101e4e43b69a0d4b5302e004b3ec81193bfecc0066cc4563a50b15e2c30109d3a57bafe23ca5
 AUX krita-5.2.6-py3.13.patch 4520 BLAKE2B cd190b438952853207f6d5f35fadb28d0044273dc4e6d6bb8aac4c623aadd7111a6c852de302da9c72c4444ef422c64c9b2a46ee74328af8b37d77d56a645fbc SHA512 65b2cff6ddcf2e6b3be9e993be61fbcb60ea89c58ba2aa2119582d5eb80b8c230b6323072dd6fc9b56a60899459cbfe433ec4deea3a3fbdaf796111383dbf206
 DIST krita-5.2.6.tar.xz 186560016 BLAKE2B 788385983b371626214898391b08b1276a74b2ee3c9f01c1b1ae19d8791bfcf1ea1f59f6304643aeb6b16a2559fd2e45464596c721eb5d53546672d0efe17903 SHA512 8502ebef11ae066b298e999aba06df7858605cca14b889cec167b7ee3953b8ed86459b44ed90508d59bd7a9968cc9957309cefaa140a8d20293344f4dcb7fea7
-EBUILD krita-5.2.6.ebuild 3817 BLAKE2B 3d0bb2a382f99f8335efde4f44e3e36e5525b4c02c7504f6864be4a6915c5538401b623877d8bb873649cf5bc0eb4e2fd8a1db9b04292aaf495dcacfc6ec05b3 SHA512 54d5b8eec5865e31cb45083d1a103a40049a8f616e14850f7da768e5672a8514340f7af5540b016a56fd038af7f1b5d00c1934691947ac6b19bf2d84b2d48f47
+EBUILD krita-5.2.6.ebuild 3909 BLAKE2B 9e152f896a1e8104efb7615fb3d147703705498341451afd389c14c1b9e8f680b6591ad71e6932214e9bdf5dbdb7b30ccdfef863a406cedbaf6870db23937daa SHA512 37f571a6f583c0c991c4502527701fe0dc9b8e8898c6196e60205c99e8fa680007ecd084f213dbe2548a6809510d7db7ecfbe97d6b7889369d34a1f1b2d00cbe
 MISC metadata.xml 731 BLAKE2B 0acb0a6a6b5fe482c0fdc0a8d2eef10d41ea5f2d270b9880d87cc8159ccfe27b3d9e9ff75babdd4219ea9af8b76248cc591f621d94cac54bc0312e37493ac746 SHA512 c8627e7739acb6e8b030812fc25907cedc29a62e3a66bc7cd3087c3d7684e089a73f673235af9f5cd77ded4b4a8f438206b156fbd4ddb73fc4a1ce1640e26f70
diff --git a/media-gfx/krita/krita-5.2.6.ebuild b/media-gfx/krita/krita-5.2.6.ebuild
index 057f0f3539d7..00fbf4b56f35 100644
--- a/media-gfx/krita/krita-5.2.6.ebuild
+++ b/media-gfx/krita/krita-5.2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -107,6 +107,11 @@ pkg_setup() {
 	ecm_pkg_setup
 }
 
+src_prepare() {
+	ecm_src_prepare
+	cmake_comment_add_subdirectory benchmarks # bug 939842
+}
+
 src_configure() {
 	# Prevent sandbox violation from FindPyQt5.py module
 	# See Gentoo-bug 655918
diff --git a/media-gfx/ristretto/Manifest b/media-gfx/ristretto/Manifest
index 59eec38ababe..3a10799186b2 100644
--- a/media-gfx/ristretto/Manifest
+++ b/media-gfx/ristretto/Manifest
@@ -1,5 +1,3 @@
-DIST ristretto-0.13.2.tar.bz2 852320 BLAKE2B 48451479e698672cd74dc85f32e8430e83026845ed09bee138e7da458bf0f0222e9aa756accec2a939f164ed59fbda4f18792a1238cd648d96dbe29b386ab9cd SHA512 ae4eb0159707a793cefe88b681f61e8c2ce41d57a64c7ad33853fc863bb1909b2a48ccf5543d3484f5710e7bf86ecbbd8520fb59eff11368f3a7a7028cd85914
 DIST ristretto-0.13.3.tar.bz2 854176 BLAKE2B 5c10505c40418cb7ff31e29091dfa23ab168d4fb9ce449003357af1b67db84b3c2e469947637aa9c93b453b9ecc4d7d8eae4285aecfde6ef30e3b5cd365604d3 SHA512 92eb0993cbe64a83c80cd78972a64762a03766a055ac66ad16f86c2ee4360a2cc9114723a60d60257f56052ccd579c618df8110a909e45a5cab10ee7c4a3d0f3
-EBUILD ristretto-0.13.2.ebuild 964 BLAKE2B d4ab2cac6ef7630db1f283d1b80104d3bec5d03f745cd17806a94c48f6b4cd8403c3e659bb251d9998b2b00eba5cf07e9d34d89ad6bb59a7a12dbeb4a7beeb8a SHA512 df0e6833fcd108733d1f3332342116336004d10254b02e149dfa6674740bc6e8fde033a3fc3c22da8447de9e38f29a341145d647f3721faaa4b8e3a4db668385
-EBUILD ristretto-0.13.3.ebuild 960 BLAKE2B b3d072f9c8b12e83a5ee5fa4aac67bc07c09601cb0e33884da4d70a584bca0e95515233cb0da2898cde2a0de664639d35eec6289183af593eb5986d84009cd3a SHA512 edf46eee8e235a972a35068f7983f7b87e2fb9974a531d6bb6e78994e0888bdd4c47004ba90a2c8003306e0893933a3a96fbee175079d5d2a32c9a62712080b4
+EBUILD ristretto-0.13.3.ebuild 954 BLAKE2B 54bfdf51243564a7fe46872b4b28459a836d69740c7bdd1bb8f8cc8ea0f8891a3c6c06cf5a4c91a02191573977002c8909758c99dd279c8cc1a42f1190286387 SHA512 5db444d6c7d911d3370d2a93828847d72d2e4c03acc0f650a0ab7e404eda16f086afd85e2f184c5d2e9b870eb55eb22a54fdc5e6acd82504ed28b5b79db93646
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/media-gfx/ristretto/ristretto-0.13.2.ebuild b/media-gfx/ristretto/ristretto-0.13.2.ebuild
deleted file mode 100644
index 19eafffb4eb5..000000000000
--- a/media-gfx/ristretto/ristretto-0.13.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xdg-utils
-
-DESCRIPTION="A fast and lightweight picture viewer for Xfce"
-HOMEPAGE="
-	https://docs.xfce.org/apps/ristretto/start
-	https://gitlab.xfce.org/apps/ristretto/
-"
-SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-
-DEPEND="
-	>=dev-libs/glib-2.56.0:2
-	>=media-libs/libexif-0.6.0:0=
-	sys-apps/file
-	>=x11-libs/cairo-1.10.0:0
-	>=x11-libs/gtk+-3.22.0:3
-	>=x11-libs/libX11-1.6.7:0=
-	>=xfce-base/libxfce4ui-4.16.0:0=
-	>=xfce-base/libxfce4util-4.16.0:0=
-	>=xfce-base/xfconf-4.12.1:0=
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/media-gfx/ristretto/ristretto-0.13.3.ebuild b/media-gfx/ristretto/ristretto-0.13.3.ebuild
index 584085600827..71729a6688d0 100644
--- a/media-gfx/ristretto/ristretto-0.13.3.ebuild
+++ b/media-gfx/ristretto/ristretto-0.13.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 
 DEPEND="
 	>=dev-libs/glib-2.56.0:2