gentoo resync : 21.06.2021

3 files changed, 2 insertions, 89 deletions

diff --git a/x11-misc/shutter/Manifest b/x11-misc/shutter/Manifest
index 760e89b3dda8..ca627183ab92 100644
--- a/x11-misc/shutter/Manifest
+++ b/x11-misc/shutter/Manifest
@@ -1,7 +1,5 @@
-DIST shutter-0.94.3_p20200621.tar.gz 2571420 BLAKE2B 0567d03d1b511f3bbe889ad6dda3bfa347dc69d96c7ab89368e6e97925d8d4cccb378ee0da179a65a482e6d22117aaff390088e7cac5d695edd3b8fee7c6a396 SHA512 3426b1cc475356cbcbcaba89e59e904907d61ceafb96b7d7994ff3d9a1fcb1f8151099a2361cd8de63b16fe02c1246f0cb50fb7166d666bc502f18e6fdda6d5f
 DIST shutter-0.95.tar.gz 2567849 BLAKE2B ecb29ef21990dfcb29f71c87b690f0e0609890f88edb2ed3ae3d0650456974242ff278e443a13bd3081625491b86c5d53642c5c2c997a37fcd1d7752994a7cab SHA512 77df43b952c10e6280b12170de997c12e0e13d5868f80f1ab22ad9a062b4b67eb93dfc540d4ed0f5db2e950eaae8a258f3d01d9ddf6043d26f8f16f0ce93e75a
-DIST shutter-0.96.tar.gz 2558287 BLAKE2B cce48a08345502b97be67c6299fa1a011c813519620c7c4c1ff09bf25d6fb525e71b7439037fcbed96900b191e18f551dcac8af1ef0bdce756d4489b2b0b9d95 SHA512 0c7d13950bed216571278cec730a4986aae87effbf385d39805c0f0206c9fda30ec0cba4fe7cb36eebd9cd228c4ada35e21fd5170c9c442eee6934dac41c0c0f
-EBUILD shutter-0.94.3_p20200621.ebuild 2344 BLAKE2B 8519e1ca1c0e45e8712ca98795bf24a65ea26482abd896d9c9fba923cee8c3a4363fe184c9ce68a759428dec94add0316c65ffadd14818352cf6302b2c11c7dc SHA512 1bbf7d90fc522878d9c9cb82bb9f83966e51be028adf8c1a7060d6e0619f9362b577314feb024583eed075c4a32b2a8b37476eb3e2f18dde51cd75fe51c2dde9
+DIST shutter-0.97.tar.gz 2558672 BLAKE2B 72d641750b81b0d4ea1942883b15bed20980c1eb2f96cbc3af101387897b686487b7d0a4e46dfd1ae82cc0d889fba6dd48472c340d088a9600ee9a919c262fe8 SHA512 40315ee03a138c71c29e05e82202d4a1adc0d930aef163e643e757ea2674dd8470e7a4d7d8b38ab5d3386ce8b9d774cbbb9a8b4bc2cb4d5b3b13812c77cf4334
 EBUILD shutter-0.95.ebuild 2101 BLAKE2B 9dbc3526fc832f35ecf43b4f6f9e71ba4bf163d77aafc84745abd8dbe5c2c819c5b099e25ff73a397477e2fa9324228429731a4ba970e84d4a6082e0c6780694 SHA512 e5d94e24724be26f6dc6d6a7b78c55f8ef7cbb1cc261369b12671304276d1b37185904c193b527bfba0622be301f46a5e6aab0a9341d550f004be03e78107f68
-EBUILD shutter-0.96-r1.ebuild 2133 BLAKE2B 110e656054c1268a0f3d1033452b905c106c6b9397836cb242a770772a9c814e16d80fd80f228306a9b5fe75f6afb7d9f511db04ae7b2c5f684808fed6ad874b SHA512 d18f9ebbff1bcf5c553d1fa25e6bfa8e06e8f92a0e77583ea02582c7fffe8a7b266a7e6a3a974a66daa718a6c5c5c7d71350d41afc0a956347d515ee61bd091b
+EBUILD shutter-0.97.ebuild 2133 BLAKE2B 110e656054c1268a0f3d1033452b905c106c6b9397836cb242a770772a9c814e16d80fd80f228306a9b5fe75f6afb7d9f511db04ae7b2c5f684808fed6ad874b SHA512 d18f9ebbff1bcf5c553d1fa25e6bfa8e06e8f92a0e77583ea02582c7fffe8a7b266a7e6a3a974a66daa718a6c5c5c7d71350d41afc0a956347d515ee61bd091b
 MISC metadata.xml 403 BLAKE2B c07092357bb7c9820fe97d4c08081d1074576757c53e81ff0836f4c6b9b4ae7bd604d1c8272c40bf40c0cbc76ea09501ed261d6a65798cde887d85acbf93005b SHA512 69fb60834dd62cec6ec79c6d2d4adf2eb0bcec46914f1794ad6ec611e999919a1dbafd9e648341d7cf2bb03dfd35004293a1192b5392682534ca331aed8681b1
diff --git a/x11-misc/shutter/shutter-0.94.3_p20200621.ebuild b/x11-misc/shutter/shutter-0.94.3_p20200621.ebuild
deleted file mode 100644
index 24c6be4534e1..000000000000
--- a/x11-misc/shutter/shutter-0.94.3_p20200621.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop optfeature xdg-utils
-
-DESCRIPTION="Feature-rich screenshot program"
-HOMEPAGE="https://shutter-project.org/"
-MY_COMMIT="af237e7f415a5fa20402703490c6190dc1af9b20"
-SRC_URI="https://github.com/shutter-project/shutter/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_COMMIT}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-lang/perl
-	dev-perl/gnome2-canvas
-	dev-perl/gnome2-wnck
-	dev-perl/libxml-perl
-	dev-perl/libwww-perl
-	dev-perl/Glib-Object-Introspection
-	dev-perl/Gtk2-Unique
-	dev-perl/Gtk2-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/Net-DBus
-	dev-perl/Number-Bytes-Human
-	dev-perl/Proc-Simple
-	dev-perl/Proc-ProcessTable
-	dev-perl/Sort-Naturally
-	dev-perl/WWW-Mechanize
-	dev-perl/X11-Protocol
-	dev-perl/XML-Simple
-	virtual/imagemagick-tools[perl]
-"
-
-src_install() {
-	dobin bin/shutter
-	dodoc README
-	domenu share/applications/shutter.desktop
-	doicon share/pixmaps/shutter.png
-
-	# Man page is broken. Reconstruct it.
-	gunzip share/man/man1/shutter.1.gz || die "gunzip failed"
-	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/appdata/shutter.appdata.xml
-
-	# .po doesn't belong to installed system, only .mo
-	rm -r "${ED}"/usr/share/shutter/resources/po || die
-
-	find "${ED}"/usr/share/shutter/resources/system/plugins/ -type f ! -name '*.*' -exec chmod 755 {} \; \
-		|| die "failed to make plugins executables"
-	# shutter executes perl scripts as standalone scripts, and after that "require"s them.
-	find "${ED}"/usr/share/shutter/resources/system/upload_plugins/upload -type f \
-		-name "*.pm" -exec chmod 755 {} \; || die "failed to make upload plugins executables"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-
-	optfeature "writing Exif information" media-libs/exiftool
-	optfeature "drawing tool" dev-perl/Goo-Canvas
-	optfeature "image hostings uploading" "dev-perl/JSON-MaybeXS dev-perl/Net-OAuth dev-perl/Path-Class"
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/x11-misc/shutter/shutter-0.96-r1.ebuild b/x11-misc/shutter/shutter-0.97.ebuild
index a93ac100854c..a93ac100854c 100644
--- a/x11-misc/shutter/shutter-0.96-r1.ebuild
+++ b/x11-misc/shutter/shutter-0.97.ebuild