5 files changed, 92 insertions, 86 deletions
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 4540f7345a2d..66e25b892265 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/gammastep/Manifest b/x11-misc/gammastep/Manifest
index 37fd054c4b18..fd05bf8d9375 100644
--- a/x11-misc/gammastep/Manifest
+++ b/x11-misc/gammastep/Manifest
@@ -1,4 +1,3 @@
 DIST gammastep-v2.0.9.tar.bz2 540120 BLAKE2B cfc29b157ad2dbd3d6bb0ac4bdb26c958ba07cad3e817931c2ee4c2e4d15c157b7c0b8b891869ddcc2cdfc39c1d52afb8437991ae60501afee84500e1f28c694 SHA512 d8b23e5890d6135cef79057408e1b7c1dbc36444dfbfaf7c80a3f36c46df19eaded1829c2cd52365413779cc752d0911a44669b5abce16d7e266b92b15c035fb
 EBUILD gammastep-2.0.9-r1.ebuild 1941 BLAKE2B 7d0040d270cb5818b4f5a39a69db3aee9df9a94ad0a102904748c2fced3bca12a2c9252ab907b3261d7555337140358367e1d345a228b0d3b3229c335f2dc2a0 SHA512 cfe0f5d682c3323b242c6246f07c555dfd8a7d274211ba6e8def4353aed891abf2315547b2541595327cc7f1516f17931ffdd17864487f38cc5a8fc6a4d30d2f
-EBUILD gammastep-2.0.9.ebuild 1951 BLAKE2B dc03e43cbca16e98165aa5d8110d34c7a495b4564eecc668578bac3cecb1ff0828b1e0d496d85fbe2cf29b72f8e2b886f584c68f76a141d457139fbe10da3636 SHA512 b049f991c2d3227ab84cadeb0f97daeff47d769dad35ddd9662681cb6524a08261e40d96ea11c040b3a4a372d76d7b553450abfdffa2941f9ee2f59b3aa38cfc
 MISC metadata.xml 408 BLAKE2B 76e880ceff79cafe0ee71c2b2bab4c2977a43eb15bc2ffb26cf1431b6c9303bd3b95801e501d01134e546e20c0c83239864eb32e4b8bcea0c7eb8191bc191d8b SHA512 dfd49b49ec66241adb4e53941455d4e1df8af068f894748973fcafab0f8e87238fa3d358b222366efb897558dd7f05e67274a11799169470b5ea3d2663b10137
diff --git a/x11-misc/gammastep/gammastep-2.0.9.ebuild b/x11-misc/gammastep/gammastep-2.0.9.ebuild
deleted file mode 100644
index 59e51f985f0d..000000000000
--- a/x11-misc/gammastep/gammastep-2.0.9.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit autotools systemd xdg-utils python-r1
-
-DESCRIPTION="A screen color temperature adjusting software"
-HOMEPAGE="https://gitlab.com/chinstrap/gammastep"
-SRC_URI="https://gitlab.com/chinstrap/gammastep/-/archive/v${PV}/gammastep-v${PV}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="appindicator geoclue gtk nls wayland"
-
-COMMON_DEPEND=">=x11-libs/libX11-1.4
-	x11-libs/libXxf86vm
-	x11-libs/libxcb
-	x11-libs/libdrm
-	appindicator? ( dev-libs/libappindicator:3[introspection] )
-	geoclue? ( app-misc/geoclue:2.0 dev-libs/glib:2 )
-	gtk? ( ${PYTHON_DEPS} )"
-RDEPEND="${COMMON_DEPEND}
-	gtk? ( dev-python/pygobject[${PYTHON_USEDEP}]
-		x11-libs/gtk+:3[introspection]
-		dev-python/pyxdg[${PYTHON_USEDEP}] )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.50
-	nls? ( sys-devel/gettext )
-"
-REQUIRED_USE="gtk? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}"/${PN}-v${PV}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	use gtk && python_setup
-
-	econf \
-		$(use_enable nls) \
-		--enable-drm \
-		$(use_enable wayland) \
-		--enable-randr \
-		--enable-vidmode \
-		$(use_enable geoclue geoclue2) \
-		$(use_enable gtk gui) \
-		--enable-apparmor \
-		--with-systemduserunitdir="$(systemd_get_userunitdir)"
-}
-
-_impl_specific_src_install() {
-	emake DESTDIR="${D}" \
-		PYTHON="${PYTHON}" \
-		pythondir="$(python_get_sitedir)" \
-		-C src/gammastep_indicator install
-}
-
-src_install() {
-	emake DESTDIR="${D}" UPDATE_ICON_CACHE=/bin/true install
-
-	if use gtk; then
-		python_foreach_impl _impl_specific_src_install
-		python_replicate_script "${D}"/usr/bin/gammastep-indicator
-
-		python_foreach_impl python_optimize
-	fi
-
-	insinto /etc/gammastep/
-	newins gammastep.conf.sample config.ini.example
-}
-
-pkg_postinst() {
-	use gtk && xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	use gtk && xdg_icon_cache_update
-}
diff --git a/x11-misc/shutter/Manifest b/x11-misc/shutter/Manifest
index e4b0b0d349ca..d9c041d822d6 100644
--- a/x11-misc/shutter/Manifest
+++ b/x11-misc/shutter/Manifest
@@ -1,5 +1,6 @@
 DIST shutter-0.99.2.tar.gz 1733886 BLAKE2B 19596b5385a11f179c9fbbf81a97f2a5d9661d52d14f33be72595c26c096548095aa6cdbbc4932413f0a3103b30a78e2e870d2e7e904fb9cf0fd17ee43ad45fb SHA512 5fcb094f0e6f732da3648e58ef62aa1e5537132ffb0bff80972e1891f58fe5e63ec63bc7bec63e84268c095e3cd43d60d358be61e2d050dfcc49ffb042d34cfb
 DIST shutter-0.99.4.tar.gz 1734992 BLAKE2B 410e73f784f0d83638867132669a00fe89c06af622f3024e52b5b5700c1a431b4ad50f9066c267cd76f9be48ce6ff88eab4348d2d4dff28b4ae7e0267eb7bc41 SHA512 57f7fdc1066375942bd1a9db381a8ba6f24fafbd5e0853a4dd19016438ec2f3cb039ebe90038d282bc07f6e45af9cdbb6f180f55e43357231b41818b8555347b
 EBUILD shutter-0.99.2.ebuild 2164 BLAKE2B 5b07bd985c0187032a4d06d1b397ff2344f7cee5e3ec4bf6da71fc3fc5d23eea2f17f46e52a7007194a2d67066bf3bc04d7a8ec2804dc1a575370f3d0e4c69e2 SHA512 9a00d38a56f3c008e17c176e358a1a06d025525f5a0d07947fe4de938338b0cdd7a6f518ebc6c45d1f174315e912d96957af943d8e8e71465d46be9fd787bc57
+EBUILD shutter-0.99.4-r1.ebuild 2304 BLAKE2B b608665406515316038ba2c67066d65b172624b1a590fb7dd140b16068dc5480794b76aeb282a96ec4d703e15cda49235bca473e0cd40c6534bb397221bd4139 SHA512 41bffdef4ad5eefb76d2f5f131cffec5fbf1f75a89577def8d70913e19b1c3a7cf0e741f56d6740b5b874b0d132842cca582bcf220ce15cebd718a88e96dd35b
 EBUILD shutter-0.99.4.ebuild 2311 BLAKE2B d0ebffc9595ccb120ea421839e484a6404c64a0bb7485be1c1abbbf17b9060e59855e940f1d1e5cfb18f7cc7533f4aac3ff06b850389515cb5b340e888f1a8d8 SHA512 26b79b23fc63d6f04568e81e95992b723bf1cd07150f40b476390848399bf74ff5d1b137afb604410f830aea4e20f1fc2614ea4b8bcd875aa90afc71a647d811
 MISC metadata.xml 492 BLAKE2B 3e3bf1dc04748435e212469e84d12040db18041c65e432a4ca994fef361bc100bfb7e5f284067ae7ff63cc090ce10b2e05d38a7c4bfbdd0e8fe673f77f3fae4e SHA512 bba85636de4594323daf1be7648c76ad3323b03ce8d093842ff61e95e1f2023094d0d707985d14d99dae6f346d9624eb4e9fb17b72c0e2507f93e61bb26fec7b
diff --git a/x11-misc/shutter/shutter-0.99.4-r1.ebuild b/x11-misc/shutter/shutter-0.99.4-r1.ebuild
new file mode 100644
index 000000000000..2151903f4f96
--- /dev/null
+++ b/x11-misc/shutter/shutter-0.99.4-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2023 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"
+}