gentoo auto-resync : 27:03:2025 - 00:31:42

9 files changed, 79 insertions, 70 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 87868d1ae8b4..cc720f27d39c 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/fig2dev/Manifest b/media-gfx/fig2dev/Manifest
index d36a11840b70..1c1a07851e1b 100644
--- a/media-gfx/fig2dev/Manifest
+++ b/media-gfx/fig2dev/Manifest
@@ -3,6 +3,6 @@ DIST fig2dev-3.2.9.tar.xz 529892 BLAKE2B d6b4f84f89f85b282e2e02a3a4129ab8c9f67b3
 DIST fig2dev-3.2.9a.tar.xz 536560 BLAKE2B 5648972433ed359f64da233748b556925e8efc7a87a5e49c1ce42f91b093c98846e588ea03c4655d393ba91f14714370cdfe7fca62627a2f69edcf3ce453ee5e SHA512 ffc56ef0bb3313d6650819c5a5bbf3c532c01a9649a1c424ade977411765cb413ef032d162695e14207918bbb535cb0a98e69df9060dd706c0c9d19d4f9435cc
 DIST fig2mpdf-1.1.2.tar.bz2 191438 BLAKE2B 411791fecf6e10aac92c004c7da69a10c97a6e12f811452f12d0b51b3a1eeff8fff97d831a5e64c9047855d27e6825a4e65f62be2536651e5876edd00cc822a9 SHA512 36dea40008371386b47a4451e2f311cc2540ab063e3b61e628a535775d62a8840c5cc20c37b80465184bf041c6e583aaf3e5156079e72211d0a87ff3346d2980
 EBUILD fig2dev-3.2.9-r5.ebuild 2414 BLAKE2B b782b79dc1f5f1ca6a769b00959a77dbd12d2263d01231326920be167392227c045411697513fc1cfe6df0158fc68761e4841e9d55e6f1d913dd4db3b553566d SHA512 c0d7560409fb556a5ef2c919b009d7d9a4471473c9fdbe8a0284c6707fc0ed9c4d49bbb3eb81df0a83a61342b9989c6a8db38bbcf924b42689475f949f20e561
-EBUILD fig2dev-3.2.9a.ebuild 2471 BLAKE2B e11e7ffdb23a922959fadcb697d20e921f499f7576d7d96ef2fefad719444ed2d1f63d25a17839e120dba34c99e104bffe98292608207d2da17fa39e8e729e4d SHA512 7013f5b7b47cc06f27d03484659e1d0e696071deb3f7e0e2510a00303680bd80ca4ef045dcbe8a9a4b173c3f64597c3678c1f4465b8b2be050e489a47c0998f6
+EBUILD fig2dev-3.2.9a.ebuild 2469 BLAKE2B 691bb38ad778eec0fe42bb54d839bd568a5a03c6c99391e17207b84541062f561ad7a5f1daddeb2afc6f4144254e3571e25a048815666350c4b5e6aaf01d2e8f SHA512 74d1065b50b7a8a74c0f58aaf00f47399ecd6d55a6b31cfe15c9e9c4f5f14eee6de9bd955dd96c25054849f23a99fbd994f21018ff834e49112def3c2885906a
 EBUILD fig2dev-9999.ebuild 2748 BLAKE2B 0a86c85ff5176adec021d74db7c6ec57bd491fdd3de95b2536178d0c1bb656d1a58882ea095845c4cc4c7d464d7b2994f31c2e1d7e6a861bea39f62cae597447 SHA512 27ce05ae05d481d68ba8270c26a1fd996d9c0ffd2e9047080d02de8637a2de6c86e4151dea3425df654f81b9055a30ecf2ac94ceac275f53a6b85337e37ba7f9
 MISC metadata.xml 609 BLAKE2B f4f19f0cb2281cf5cddbdf11ac59b3c5c4881b04943e3a4c5d0ff0e5c7f66ffe7d066fc7cd9fb07f7db4f1ef727bcbe7d2033415681d619580a3bed3630474e5 SHA512 0bf3ae4eac46bd373650dfd16ba5b4abaf7f17352a1b59255352e2e9dba56cca03a3192ec99b2b0da6586d86349784de0df25628bf4b35f1e1b37bf38e0ccd6b
diff --git a/media-gfx/fig2dev/fig2dev-3.2.9a.ebuild b/media-gfx/fig2dev/fig2dev-3.2.9a.ebuild
index ad7e2fde03f6..5a565eaa2b92 100644
--- a/media-gfx/fig2dev/fig2dev-3.2.9a.ebuild
+++ b/media-gfx/fig2dev/fig2dev-3.2.9a.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://downloads.sourceforge.net/mcj/${P}.tar.xz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="+ghostscript"
 
 RDEPEND="
diff --git a/media-gfx/ristretto/Manifest b/media-gfx/ristretto/Manifest
index 8954bf5097cf..69d2365ddeff 100644
--- a/media-gfx/ristretto/Manifest
+++ b/media-gfx/ristretto/Manifest
@@ -1,3 +1,5 @@
 DIST ristretto-0.13.3.tar.bz2 854176 BLAKE2B 5c10505c40418cb7ff31e29091dfa23ab168d4fb9ce449003357af1b67db84b3c2e469947637aa9c93b453b9ecc4d7d8eae4285aecfde6ef30e3b5cd365604d3 SHA512 92eb0993cbe64a83c80cd78972a64762a03766a055ac66ad16f86c2ee4360a2cc9114723a60d60257f56052ccd579c618df8110a909e45a5cab10ee7c4a3d0f3
+DIST ristretto-0.13.4.tar.xz 277320 BLAKE2B bbe83cca8044ba971bfb00162ef73809eb1ed970389e2c8a2b95f7be4fb411b704b70238eeed781f25471a91e5989ba7972871f2bb4d31858979d4e4a76e9672 SHA512 07eede11a88b5565bf311fb1d0c5702ef8d655d4970558638cee6a9df27c426fb591d0a693d3e3a0954b40106636d2092e5febfd033201d41e579c8f4b785923
 EBUILD ristretto-0.13.3.ebuild 947 BLAKE2B 334a8074d03e5f07454d56e787ba12ca19362cb02325c22eb34de611133bbe7f99d762b859260ba95a75e313fcb4e68350d3e35dc11e06608270ad04014d5ac2 SHA512 c59d67aa86f6a4b9f6132a7aecb294e7c4dafe16603cccd95efd2289fbe23158eae48de8fe58e7a17c408362abc941c6484463598eccb8b565d54e91b20b8f16
+EBUILD ristretto-0.13.4.ebuild 1146 BLAKE2B bc70f8126475c6855b8d1c25668e3fab09809e689739bb9923ba218a8ebcb4a362c583f4c779804c7b8d487c3e6be483c052b6c79c5bef49e932583b04a252fa SHA512 fd52ee2939bfbdf83438123610359a1096e1468f2353648f4d900ad8cf62e2eeb3f006e5bf96834cda05592184324a20cb0e6ba336189becf6181d2629ab592b
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/media-gfx/ristretto/ristretto-0.13.4.ebuild b/media-gfx/ristretto/ristretto-0.13.4.ebuild
new file mode 100644
index 000000000000..1e56ebe07244
--- /dev/null
+++ b/media-gfx/ristretto/ristretto-0.13.4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson 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.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="X"
+
+# TODO: drop exo when we depend on >=libxfce4ui-4.21.0
+DEPEND="
+	>=dev-libs/glib-2.56.0:2
+	>=media-libs/libexif-0.6.0:0=
+	sys-apps/file
+	>=x11-libs/cairo-1.10.0
+	>=x11-libs/gtk+-3.22.0:3
+	>=xfce-base/exo-4.16.0:=
+	>=xfce-base/libxfce4ui-4.16.0:=
+	>=xfce-base/libxfce4util-4.16.0:=
+	>=xfce-base/xfconf-4.16.0:=
+
+	X? (
+		>=x11-libs/libX11-1.6.7:=
+	)
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature X libx11)
+	)
+	meson_src_configure
+}
+
+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/scrot/Manifest b/media-gfx/scrot/Manifest
index 63d4597dae54..4d3630b4137c 100644
--- a/media-gfx/scrot/Manifest
+++ b/media-gfx/scrot/Manifest
@@ -1,7 +1,6 @@
-AUX scrot-1.7.bash-completion 2622 BLAKE2B febdade3f2b5cb094d9162e66d3b0d0b8ad72659e33ca9b6c55c4888ef3122c8f16430cc5f74d32367ea7a74905e3c8c49e9570d996c1324ffd9b72f42e9f534 SHA512 c0a6ac7347164e007eef219b567a554b5aac91c4afdc585d2ed299f46880a46343e3aef83ad8fe50e090ed8521ca241b7e3661a59511064a43164fbe366e1ebb
-DIST scrot-1.10.tar.bz2 156519 BLAKE2B ca1441823521d14559afe49ed36853bb5448cc5c2ee345ddb617324b63e8f599678cbdc94b862938017a62d2f5ceea3cae03f80e473e86cafc76dd34144d41bb SHA512 7a72b6d7ae350b0ec27b949934ff67cb8800f731f3dfc783bfdf66c4316b318118b8b46d98aca05543144b757c659791f4a9aeae43364277501238a405eda57d
 DIST scrot-1.11.1.tar.bz2 158007 BLAKE2B e0c8f166444bfdfbed41a5588036b861973c90d057e302f7bd35cf9630a9f0311735977632ba068c1b3542baed251a3d682da7d8f56c114880a425b3056a0692 SHA512 6a6435c6e0562a367d895f2d1c7a03b050f6588a5843376c5e33a5b8ef1b0b684390530f8c61c340b3f0928caeefb95d9df1f8fe0b145768c336685b1c8d8deb
-EBUILD scrot-1.10.ebuild 1388 BLAKE2B e99af4ac52022803494f6ae62b004b8a3bb0c40c72300905908e759829ec222a3ce4c24213d3707e3e52664736df01ec120b0813363cd93ac7a25bd6db382042 SHA512 bef2cc2eba090e3a3b9549c7bd464784a1dc0c1ca7fd0b1b9b38de2a15407be66e6953859014ee15b292dec8b91ea37ce0e9c21b33c8a14256e5c32c2d23fa7b
+DIST scrot-1.12.tar.bz2 158561 BLAKE2B 264b9a04bdccc1905998d8812c60e0ce25cd6395abf31bd4982601008ef2b6a269652ab8a12e24e1c34294358e7651fec464dd304fc085c5d1a07d06ea65f3d9 SHA512 6edc065048b0d4172b8fe7221583760cd1aa7a9f383f3f29de89a35f093ed66bb6c0847bb8a037ebd65a60cf750424574c8b8abb593ea29e3ae8e50677597686
 EBUILD scrot-1.11.1.ebuild 1399 BLAKE2B 14729e3eacbfdf5d0ad4d3b09562a5f51941a7d272df8b228921e7a8ee88e7e46b1f8194f091894c83847ffbe157fe5f42184937025fd3942424d2fbfc149cb7 SHA512 70ca475e4010592ee65edf0ba608321a588c55df3bb4e5e08552f744b816edca5856e7e5f2eab3bf4564e43cbfbc14f0e157f2b7b6b335346ff44c07ebba927b
-EBUILD scrot-9999.ebuild 1406 BLAKE2B 0e905c915114d19fb62db734ecd30c0e98c442bd2e11535b7ba7f210d18d439cc6b108666ceb3c895cccd24960ec9ad50d2ac17585ce3596a1af2e8ce6a581ce SHA512 cea86dab25f83a013a209be9bb16bbadcfb0b5d50bd67d9eedd13a22ec40d824ef0462a0738464a35d164d684aba8a8d7a2b72edfa091db25632eaaa94df2381
+EBUILD scrot-1.12.ebuild 1347 BLAKE2B 741fd2c4efd9bcbeca95cff7364c56711bb0bd56a0b281357b60f4a3a819894afbae515c6caeb5d6309650de658f3c68eba900398246b3be2034bd22501e1613 SHA512 16f29ac171c1dd4a6c26e77e0d70fa4d6fa8897f498e64e00c06f1605f995892381c3af45862ea5e676ac9a925b4adea4dba82977fc3eab2ca8aa5ca43953869
+EBUILD scrot-9999.ebuild 1347 BLAKE2B 741fd2c4efd9bcbeca95cff7364c56711bb0bd56a0b281357b60f4a3a819894afbae515c6caeb5d6309650de658f3c68eba900398246b3be2034bd22501e1613 SHA512 16f29ac171c1dd4a6c26e77e0d70fa4d6fa8897f498e64e00c06f1605f995892381c3af45862ea5e676ac9a925b4adea4dba82977fc3eab2ca8aa5ca43953869
 MISC metadata.xml 486 BLAKE2B 49d843df52a3129520dc7f99058e4632bd2bef1239ae14f4ff49e315bb5d11536a2f384845c87ad69e9dcd1ccd363009f4d9b4b5d862aca69d59e5f6490573c9 SHA512 56297474babfd15627050a5d5e4ac885dcd6a9f9d861e708877c280b23251680700e006d58edf384d412df56b97ffaa5dc8d55ab1dedd34a9e4d3af1ed63980f
diff --git a/media-gfx/scrot/files/scrot-1.7.bash-completion b/media-gfx/scrot/files/scrot-1.7.bash-completion
deleted file mode 100644
index 06bc7ac7fad3..000000000000
--- a/media-gfx/scrot/files/scrot-1.7.bash-completion
+++ /dev/null
@@ -1,48 +0,0 @@
-# bash-completion script for scrot
-# place this in /etc/bash_completion.d
-
-_scrot() {
-	local cur prev opts
-	COMPREPLY=()
-	cur=${COMP_WORDS[COMP_CWORD]}
-	prev=${COMP_WORDS[COMP_CWORD-1]}
-	opts="
-		-h --help -v --version -a --autoselect -b --border -c --count -d
-		--delay -e --exec -q --quality -m --multidisp -s --select -u --focused
-		-t --thumb -z --silent -p --pointer -f --freeze -o --overwrite -l --line
-		-n --note -C --class -i --ignorekeyboard -F --file -shole --select=hole
-		-shide --select=hide -sblur --select=blur
-	"
-
-	if [[ "${cur}" == -* ]] || [[ ${COMP_CWORD} -eq 1 ]]; then
-		COMPREPLY=($(compgen -W "${opts}" -- "${cur}"))
-	fi
-
-	case "${prev}" in
-		-h|--help) COMPREPLY=($(compgen -W "${opts/-h --help}" -- "${cur}")) ;;
-		-v|--version) COMPREPLY=($(compgen -W "${opts/-v --version}" -- "${cur}")) ;;
-		-a|--autoselect) COMPREPLY=($(compgen -W "${opts/-a --autoselect}" -- "${cur}")) ;;
-		-b|--border) COMPREPLY=($(compgen -W "${opts/-b --border}" -- "${cur}")) ;;
-		-c|--count) COMPREPLY=($(compgen -W "${opts/-c --count}" -- "${cur}")) ;;
-		-d|--delay) COMPREPLY=($(compgen -W "${opts/-d --delay}" -- "${cur}")) ;;
-		-e|--exec) COMPREPLY=($(compgen -A command -- "${cur}")) ;;
-		-q|--quality) COMPREPLY=($(compgen -W "${opts/-q --quality}" -- "${cur}")) ;;
-		-m|--multidisp) COMPREPLY=($(compgen -W "${opts/-m --multidisp}" -- "${cur}")) ;;
-		-s|--select) COMPREPLY=($(compgen -W "${opts/-s --select}" -- "${cur}")) ;;
-		-u|--focused) COMPREPLY=($(compgen -W "${opts/-u --focused}" -- "${cur}")) ;;
-		-t|--thumb) COMPREPLY=($(compgen -W "${opts/-t --thumb}" -- "${cur}")) ;;
-		-z|--silent) COMPREPLY=($(compgen -W "${opts/-z --silent}" -- "${cur}")) ;;
-		-p|--pointer) COMPREPLY=($(compgen -W "${opts/-p --pointer}" -- "${cur}")) ;;
-		-f|--freeze) COMPREPLY=($(compgen -W "${opts/-f --freeze}" -- "${cur}")) ;;
-		-o|--overwrite) COMPREPLY=($(compgen -W "${opts/-o --overwrite}" -- "${cur}")) ;;
-		-l|--line) COMPREPLY=($(compgen -W "${opts/-l --line}" -- "${cur}")) ;;
-		-n|--note) COMPREPLY=($(compgen -W "${opts/-n --note}" -- "${cur}")) ;;
-		-C|--class)COMPREPLY=($(compgen -W "${opts/-C --class}" -- "${cur}")) ;;
-		-i|--ignorekeyboard)COMPREPLY=($(compgen -W "${opts/-i --ignorekeyboard}" -- "${cur}")) ;;
-		-F|--file)COMPREPLY=($(compgen -W "${opts/-F --file}" -- "${cur}")) ;;
-		-shole|--select=hole)COMPREPLY=($(compgen -W "${opts/-shole --select=hole}" -- "${cur}")) ;;
-		-shide|--select=hide)COMPREPLY=($(compgen -W "${opts/-shide --select=hide}" -- "${cur}")) ;;
-		-sblur|--select=blur)COMPREPLY=($(compgen -W "${opts/-sblur --select=blur}" -- "${cur}")) ;;
-	esac
-}
-complete -F _scrot scrot
diff --git a/media-gfx/scrot/scrot-1.10.ebuild b/media-gfx/scrot/scrot-1.12.ebuild
index 81c77df2463a..7e9593120861 100644
--- a/media-gfx/scrot/scrot-1.10.ebuild
+++ b/media-gfx/scrot/scrot-1.12.ebuild
@@ -1,18 +1,19 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit bash-completion-r1
+inherit shell-completion
 
 DESCRIPTION="Screen capture utility using imlib2 library"
 HOMEPAGE="https://github.com/resurrecting-open-source-projects/scrot"
 if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/resurrecting-open-source-projects/${PN}"
 	inherit autotools git-r3
+	LIVE_BDEPEND="dev-build/autoconf-archive"
 else
 	SRC_URI="https://github.com/resurrecting-open-source-projects/${PN}/releases/download/${PV}/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 LICENSE="feh"
@@ -20,29 +21,26 @@ SLOT="0"
 
 # imlib2[X] needed for imlib_create_image_from_drawable, bug #835582
 # imlib2[png] not technically requried, but it's the default format used by
-# scrot, so unconditionally depend on it to avoid breaking basic commands which
-# don't specify an output format.
+# scrot, so unconditionally depend on it to avoid breaking basic commands.
 RDEPEND="
-	media-libs/imlib2[X,filters(+),text(+)]
+	media-libs/imlib2[X,png,filters(+),text(+)]
 	x11-libs/libXext
 	x11-libs/libX11
 	x11-libs/libXcomposite
 	x11-libs/libXfixes
 	x11-libs/libXinerama
-	media-libs/imlib2[png]
 "
 DEPEND="
 	${RDEPEND}
 	x11-base/xorg-proto
-	elibc_musl? ( sys-libs/queue-standalone )
 "
 BDEPEND="
-	dev-build/autoconf-archive
+	${LIVE_BDEPEND}
 	virtual/pkgconfig
 "
 
 DOCS=(
-	AUTHORS ChangeLog README.md
+	AUTHORS ChangeLog README.md FAQ.md
 )
 
 src_prepare() {
@@ -54,5 +52,6 @@ src_prepare() {
 src_install() {
 	default
 
-	newbashcomp "${FILESDIR}"/${PN}-1.7.bash-completion ${PN}
+	dozshcomp  etc/zsh-completion/_scrot
+	dobashcomp etc/bash-completion/scrot
 }
diff --git a/media-gfx/scrot/scrot-9999.ebuild b/media-gfx/scrot/scrot-9999.ebuild
index d383d2bfa6bc..7e9593120861 100644
--- a/media-gfx/scrot/scrot-9999.ebuild
+++ b/media-gfx/scrot/scrot-9999.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
@@ -21,16 +21,14 @@ SLOT="0"
 
 # imlib2[X] needed for imlib_create_image_from_drawable, bug #835582
 # imlib2[png] not technically requried, but it's the default format used by
-# scrot, so unconditionally depend on it to avoid breaking basic commands which
-# don't specify an output format.
+# scrot, so unconditionally depend on it to avoid breaking basic commands.
 RDEPEND="
-	media-libs/imlib2[X,filters(+),text(+)]
+	media-libs/imlib2[X,png,filters(+),text(+)]
 	x11-libs/libXext
 	x11-libs/libX11
 	x11-libs/libXcomposite
 	x11-libs/libXfixes
 	x11-libs/libXinerama
-	media-libs/imlib2[png]
 "
 DEPEND="
 	${RDEPEND}