8 files changed, 95 insertions, 120 deletions
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 536c66d5e40f..1d3da525a560 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/kaqaz/Manifest b/x11-misc/kaqaz/Manifest
deleted file mode 100644
index ce9419f2e545..000000000000
--- a/x11-misc/kaqaz/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX kaqaz-1.2.0-qt55.patch 239 BLAKE2B 78369f07e9acf49443a8e51cef13c144df605c8ec7087be525e3b41fd2c92dd534b080970066d55e47e5d7b34b6ec2d7fbeb229f7dd520988539ff59359dd698 SHA512 9f97f60532e89c41fd27be1db20471eba9465ed145fdd39f578918525801a385ba58a5a6a649ce47bff754dca7b46515337694e87c55a8198f8a236086867c50
-AUX kaqaz-1.2.0-unbundle-qtsingleapplication.patch 1452 BLAKE2B 7827185411a5531f0eeb320705261bc72b220456a97edc31133e038c64ca5eaa67e54f29ea66a0e44224018fab695def466a215ca9b92aed92f8c78d319ce4df SHA512 c35b4cda2f3895a20b01276b8ab80757182d6f825508a320480fdbb27bd58c9f8d2fa59a6b291f59c2eff0c4d948f3d960c88b144d34f8cba7605698a8b0d2c1
-DIST kaqaz-1.2.0.tar.gz 5824631 BLAKE2B 52e9f8ed5896ddf3415386364fa684927eccda2342d60971a64d4602fa4e83f387bbfd47c7898deb04a798fc0be0a8e905ac9cd2fa58bec12f43b0cd9e3f6f17 SHA512 447d4bb9dd413b07f1f05ab797fe3c277caa1afc7063dccc080ee274f266e07dd04c17b56cacd8baa6e67ba53e0012f2cf5d490493c5fbd24c3e6bfcbf1887c4
-EBUILD kaqaz-1.2.0-r5.ebuild 921 BLAKE2B d39d90a5d2bccf86fafa19b645929f2a9e90a90c0ef6ce68dd237042662ae58f1924eb385fd1498e963d7e9cec2cfad3c973b986916e7fb676c44c5eeef3493a SHA512 ec8a477df3dae74f2f66004dbe256dfe043a8231fd1f58f02fa1dfb9b09324da4d1ba14481ee64ee9780912bbc8cf1cb0b72954e4bee9d7255fb0e1ea73a49c4
-MISC metadata.xml 250 BLAKE2B 224402c367a817445d4dab00f3217f8ccd35b0fd973aece6f2dc480f8e33658ce311a13ff751fe552083f7cc5245958290f78fd2fa0c170d83b0f40f58b65fac SHA512 99b8432dd8337685818690692cd5707f4e7f3d697d692a6e4ea38ab31c097108e37078ead749014f7ff32201d214a9190655595a8eb7a4e6eec3b300300fe0a4
diff --git a/x11-misc/kaqaz/files/kaqaz-1.2.0-qt55.patch b/x11-misc/kaqaz/files/kaqaz-1.2.0-qt55.patch
deleted file mode 100644
index 8d9adc400225..000000000000
--- a/x11-misc/kaqaz/files/kaqaz-1.2.0-qt55.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Fix build with Qt 5.5.
-
-Gentoo-bug: 563678
-
---- a/databasedatatypes.h
-+++ b/databasedatatypes.h
-@@ -23,6 +23,7 @@
- #include <QColor>
- #include <QStringList>
- #include <QGeoCoordinate>
-+#include <QObject>
- 
- class Enums : public QObject
- {
diff --git a/x11-misc/kaqaz/files/kaqaz-1.2.0-unbundle-qtsingleapplication.patch b/x11-misc/kaqaz/files/kaqaz-1.2.0-unbundle-qtsingleapplication.patch
deleted file mode 100644
index 31bcc61e11db..000000000000
--- a/x11-misc/kaqaz/files/kaqaz-1.2.0-unbundle-qtsingleapplication.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Use system copy of qtsingleapplication.
-
---- a/sialantools/sialantools.pri
-+++ b/sialantools/sialantools.pri
-@@ -1,4 +1,5 @@
- QT += qml quick
-+CONFIG += qtsingleapplication
- 
- android {
-     manifest.source = android-build
-@@ -24,20 +25,10 @@
- 
-             HEADERS += \
-                 sialantools/sialanmimeapps.h \
--                sialantools/qtsingleapplication/qtsinglecoreapplication.h \
--                sialantools/qtsingleapplication/qtsingleapplication.h \
--                sialantools/qtsingleapplication/qtlockedfile.h \
--                sialantools/qtsingleapplication/qtlocalpeer.h
- 
-             SOURCES += \
-                 sialantools/sialanmimeapps.cpp \
--                sialantools/qtsingleapplication/qtsinglecoreapplication.cpp \
--                sialantools/qtsingleapplication/qtsingleapplication.cpp \
--                sialantools/qtsingleapplication/qtlockedfile.cpp \
--                sialantools/qtsingleapplication/qtlocalpeer.cpp
- 
--            win32: SOURCES += sialantools/qtsingleapplication/qtlockedfile_win.cpp
--            unix:  SOURCES += sialantools/qtsingleapplication/qtlockedfile_unix.cpp
-         }
-     }
- }
-
---- a/sialantools/sialanapplication.h
-+++ b/sialantools/sialanapplication.h
-@@ -22,7 +22,7 @@
- #include "sialan_macros.h"
- 
- #ifdef DESKTOP_DEVICE
--#include "qtsingleapplication/qtsingleapplication.h"
-+#include "qtsingleapplication.h"
- class INHERIT_QAPP : public QtSingleApplication
- {
- public:
diff --git a/x11-misc/kaqaz/kaqaz-1.2.0-r5.ebuild b/x11-misc/kaqaz/kaqaz-1.2.0-r5.ebuild
deleted file mode 100644
index 3c58668d1b08..000000000000
--- a/x11-misc/kaqaz/kaqaz-1.2.0-r5.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qmake-utils
-
-DESCRIPTION="Note manager"
-HOMEPAGE="https://github.com/sialan-labs/kaqaz/"
-SRC_URI="https://github.com/sialan-labs/kaqaz/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5[qml]
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtpositioning:5
-	dev-qt/qtsingleapplication[X]
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-"
-RDEPEND="${DEPEND}
-	dev-qt/qtgraphicaleffects:5
-	dev-qt/qtquickcontrols:5
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-qt55.patch"
-	"${FILESDIR}/${P}-unbundle-qtsingleapplication.patch"
-)
-
-src_prepare() {
-	default
-	rm -r sialantools/qtsingleapplication || die
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-}
diff --git a/x11-misc/kaqaz/metadata.xml b/x11-misc/kaqaz/metadata.xml
deleted file mode 100644
index 09c91ebffc3d..000000000000
--- a/x11-misc/kaqaz/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">sialan-labs/kaqaz</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/x11-misc/shutter/Manifest b/x11-misc/shutter/Manifest
index ce7a79127deb..7f8b09e5c5b1 100644
--- a/x11-misc/shutter/Manifest
+++ b/x11-misc/shutter/Manifest
@@ -1,3 +1,5 @@
 DIST shutter-0.99.5.tar.gz 1736757 BLAKE2B b861d4c71295ceb1e8a2d268e57babccb8a832245ffb18410c19b20bb5aca56358e00cb4e578f3b8dfcd15e4c318beb7ed873a86094de522deed7f4b2e33b58c SHA512 524e135191a324f7da890922c98646c7cd83a714a3b1dc14f2ba9910f8a90f5c6c527a5c857888c2be93120a7b242e435664c8af45792d36b66d7642fda50371
+DIST shutter-0.99.6.tar.gz 1737401 BLAKE2B 2c6558c95ebd0b8eb2c249ac8aa0da896c8da3573b250346d67e46b1f5f9631407cb9a30c16e1ee227f784bc9392534d478bd092cc0e0a78ea408a260ebfd8af SHA512 3c75d7cd7f472411eccb7d0e1e4f67412842463923f83d979b57d1e3ebe05b36792d5e5bb54f59dbc22ffedb8e18b569f3fbab5006fb6d31490c4805d4856439
 EBUILD shutter-0.99.5.ebuild 2361 BLAKE2B 246d71cf8cb630cb0f25f7bf70849f78ee5e8a1efd321720b9bcaf14bd3f2a2fad7c12f0b5a79d1c6cae384dedeb2fbf0a63093fa4d400cdca4aaa0865d4a064 SHA512 4c32073ed541040a778b51a19e34c1ad4812e1d551f748314caaac67aa2a20331fb37bbb1759dff5b1bb8f6b2b52b03142f04714eddda3055a02ba0e7cb2f2d6
+EBUILD shutter-0.99.6.ebuild 2423 BLAKE2B 9ae4786dc5d5bc5972676520e76dd9ddb6004146948a69ff9207e499089f8a583c59bbbcbd5a1c2ba9ba21beb16c8a3e165823cd3d0e51faa0eabc0b1ba3b864 SHA512 cd75ac887425c6bf1e91da1211a528253a3a92241cacc61c86058416ddcdfa2b266a052608ae440b72326714e5fa8379294099f0faf8b75e55aba8ad359fd408
 MISC metadata.xml 492 BLAKE2B 3e3bf1dc04748435e212469e84d12040db18041c65e432a4ca994fef361bc100bfb7e5f284067ae7ff63cc090ce10b2e05d38a7c4bfbdd0e8fe673f77f3fae4e SHA512 bba85636de4594323daf1be7648c76ad3323b03ce8d093842ff61e95e1f2023094d0d707985d14d99dae6f346d9624eb4e9fb17b72c0e2507f93e61bb26fec7b
diff --git a/x11-misc/shutter/shutter-0.99.6.ebuild b/x11-misc/shutter/shutter-0.99.6.ebuild
new file mode 100644
index 000000000000..262b419644a4
--- /dev/null
+++ b/x11-misc/shutter/shutter-0.99.6.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop optfeature prefix xdg
+
+DESCRIPTION="Feature-rich screenshot program"
+HOMEPAGE="https://shutter-project.org/"
+SRC_URI="https://github.com/shutter-project/shutter/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-lang/perl
+	dev-libs/libayatana-appindicator
+	dev-perl/Carp-Always
+	dev-perl/libxml-perl
+	dev-perl/Glib-Object-Introspection
+	dev-perl/GooCanvas2
+	dev-perl/GooCanvas2-CairoTypes
+	dev-perl/Gtk3
+	dev-perl/Gtk3-ImageView
+	dev-perl/File-DesktopEntry
+	dev-perl/File-HomeDir
+	dev-perl/File-Which
+	dev-perl/JSON
+	dev-perl/File-Copy-Recursive
+	dev-perl/File-MimeInfo
+	dev-perl/Locale-gettext
+	dev-perl/Moo
+	dev-perl/Net-DBus
+	dev-perl/Number-Bytes-Human
+	dev-perl/Pango
+	dev-perl/Proc-Simple
+	dev-perl/Proc-ProcessTable
+	dev-perl/Sort-Naturally
+	dev-perl/X11-Protocol
+	dev-perl/XML-Simple
+	virtual/imagemagick-tools[perl]
+	x11-libs/libwnck:3[introspection]
+"
+BDEPEND="
+	sys-devel/gettext
+	test? ( dev-perl/Test-MockModule )
+"
+
+src_prepare() {
+	hprefixify bin/shutter
+	default
+}
+
+src_test() {
+	prove -I share/shutter/resources/modules/ -I t/lib t -r || die
+}
+
+src_install() {
+	dobin bin/shutter
+	dodoc README
+	domenu share/applications/shutter.desktop
+	doicon share/pixmaps/shutter.png
+	doman share/man/man1/shutter.1
+
+	insinto /usr/share
+	doins -r share/shutter
+	doins -r share/locale
+	doins -r share/icons
+
+	insinto /usr/share/metainfo
+	doins share/metainfo/shutter.metainfo.xml
+
+	# .po doesn't belong to installed system, only .mo
+	rm -r "${ED}"/usr/share/shutter/resources/po || die
+
+	# shutter executes perl scripts as standalone scripts, and after that "require"s them.
+	find "${ED}"/usr/share/shutter/resources/system/plugins/ -type f ! -name '*.*' -exec chmod +x {} + \
+		|| die "failed to make plugins executables"
+	find "${ED}"/usr/share/shutter/resources/system/upload_plugins/upload -type f \
+		-name "*.pm" -exec chmod +x {} + || die "failed to make upload plugins executables"
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "writing Exif information" media-libs/exiftool
+	optfeature "image hostings uploading" "dev-perl/JSON-MaybeXS dev-perl/Path-Class"
+	optfeature "WebP support" gui-libs/gdk-pixbuf-loader-webp
+	optfeature "AVIF support" "media-libs/libavif[gdk-pixbuf]"
+}