gentoo resync : 20.10.2021

4 files changed, 11 insertions, 93 deletions

diff --git a/x11-misc/shutter/Manifest b/x11-misc/shutter/Manifest
index 0d84d3bd162c..7050a360e664 100644
--- a/x11-misc/shutter/Manifest
+++ b/x11-misc/shutter/Manifest
@@ -1,7 +1,5 @@
-DIST shutter-0.97.tar.gz 2558672 BLAKE2B 72d641750b81b0d4ea1942883b15bed20980c1eb2f96cbc3af101387897b686487b7d0a4e46dfd1ae82cc0d889fba6dd48472c340d088a9600ee9a919c262fe8 SHA512 40315ee03a138c71c29e05e82202d4a1adc0d930aef163e643e757ea2674dd8470e7a4d7d8b38ab5d3386ce8b9d774cbbb9a8b4bc2cb4d5b3b13812c77cf4334
-DIST shutter-0.98.tar.gz 2560060 BLAKE2B a7b48df221d8640a4705f2ffc856fd0ec50646cb26900aabe4bbafcc8b2595ae86aff158aed9c3522624ec5433e111ff322ba35a7b2cd8623356a3b68e90db7b SHA512 5a3321db635a81f6f67d5789cf374d846f21003a9bd3fd748bb58481d8a5fde450a1c4b5ad4d3edee49804cee6dd8da6ad7b4422eaef96bb333b8b3059cb3e41
+DIST shutter-0.99.1.tar.gz 1733952 BLAKE2B fcf5f9a34ce54f674a4b0f9bba2493917bf27141ea7f7e1d8528ae439eabfb33e4e6805bd3cb96131b297748046c9797747520952ad57cc033cf7f7362c4606c SHA512 4d6ee699d3b31194c6685019a9493968d7a4988ee86f9348cf5aaa15c573b0a5f515ba6e5d786faf8054762ae134fea5ca2add10dbb3e14905247daf1303c751
 DIST shutter-0.99.tar.gz 1734356 BLAKE2B c261d7792a2a7508fb8e73b968e1e07edbea0338b857132674caee5ec1bb7a3d58eb2e35645c581af652027007a27df6120b035218c41d8671bc53293b6548e7 SHA512 335c85730f49978d4b69ee2d5bbaa5d660d652d386a70618fdeb46c639bd209cee99743b44a8ef1019404f52328692de91bfbe47b14bea202efd089f80d36f82
-EBUILD shutter-0.97.ebuild 2131 BLAKE2B 28f354d1e340221e618c61165a560d00dbb29dcdb5aa98e1bb67b86051f1b4c62e23dd67eba07c527791fa3c0d9b23644990b49648e801b6f814dd6977925f2d SHA512 719411c211bcd34bc04920c5aee574743ece2fef9252682b1702a30fd1465cc715d16924d0785fbd4317e07782dde13507b5621cbd2baf4570e12ee6b3f56676
-EBUILD shutter-0.98.ebuild 2131 BLAKE2B 28f354d1e340221e618c61165a560d00dbb29dcdb5aa98e1bb67b86051f1b4c62e23dd67eba07c527791fa3c0d9b23644990b49648e801b6f814dd6977925f2d SHA512 719411c211bcd34bc04920c5aee574743ece2fef9252682b1702a30fd1465cc715d16924d0785fbd4317e07782dde13507b5621cbd2baf4570e12ee6b3f56676
-EBUILD shutter-0.99.ebuild 2158 BLAKE2B ffc42ed37d1158d2d92cb7c357580a6ac7239075ba2c749ca5ade60e017c540d07afc79c2ce711fbbc2647ab2042581be10851b6ce522f7efc68e49c4607327e SHA512 307521146637420a94847d11f5810c4fc5c9906f920045bf02a72f68de108d2ec7d4d2d7ed869b85124dccf0ff713e9c3f67d31c46e2ae6078c9d1037744f485
+EBUILD shutter-0.99.1.ebuild 2159 BLAKE2B 5f827b65e6c014b28579ce94f9405bd14f7a82a578472ef3813c496ac5a5691376bbc8b7bf4a04bc2786a968e28311527f0b5fceceb46417430a46e4881eb6e0 SHA512 0cd07998924c59db93b8bda4695d06409b3e29506d963cabddad46da4dfc4409008317d9ed16d80a2ee296992bca14fadc77dcfd1969f63e135986a55c1559e0
+EBUILD shutter-0.99.ebuild 2156 BLAKE2B d6462cf8be7f1f84bb51c4db29378c52b63fa7a9fcc0238abeaa89f80cfd13a7bdd9961754517c9600e723ed56997a2c9a9f69bdcd5b6eb90ca728baf70f83a8 SHA512 3402387ead7393b75773829b259f37932b8fcf83a5cb536754ba258767cac71bf0b3bef2105b5062a28e3b20a63fc56bc2943aeae4c7b127e0aaecd70e2ef68a
 MISC metadata.xml 404 BLAKE2B 89b0c69e56bace083baf4e82ff7deb14bddc671f418233e32c268056477328c4a22d427147fde4d3ad6093ad51d9b3c5e64bc28297add868281f1fe25382f450 SHA512 4fe92d2d4e6d8a0179df9c2748f6740d7c8f0cabab18650baab8df6ab1008a61f48fac5f82cf65f3f08341679dc3e554a37ddd98bb5cb0912d0cac4e6302f22d
diff --git a/x11-misc/shutter/shutter-0.98.ebuild b/x11-misc/shutter/shutter-0.98.ebuild
deleted file mode 100644
index 9d00eb454695..000000000000
--- a/x11-misc/shutter/shutter-0.98.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 x86"
-
-RDEPEND="
-	dev-lang/perl
-	dev-perl/Carp-Always
-	dev-perl/libxml-perl
-	dev-perl/libwww-perl
-	dev-perl/Glib-Object-Introspection
-	dev-perl/GooCanvas2
-	dev-perl/GooCanvas2-CairoTypes
-	dev-perl/Gtk3
-	>=dev-perl/Gtk3-ImageView-9
-	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/Pango
-	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]
-	x11-libs/libwnck:3[introspection]
-"
-
-src_prepare() {
-	hprefixify bin/shutter
-	default
-}
-
-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/appdata/shutter.appdata.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 755 {} \; \
-		|| die "failed to make plugins executables"
-	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_pkg_postinst
-
-	optfeature "writing Exif information" media-libs/exiftool
-	optfeature "image hostings uploading" "dev-perl/JSON-MaybeXS dev-perl/Net-OAuth dev-perl/Path-Class"
-}
diff --git a/x11-misc/shutter/shutter-0.97.ebuild b/x11-misc/shutter/shutter-0.99.1.ebuild
index 9d00eb454695..8a35f2c4fbd4 100644
--- a/x11-misc/shutter/shutter-0.97.ebuild
+++ b/x11-misc/shutter/shutter-0.99.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit desktop optfeature prefix xdg
 
@@ -9,9 +9,9 @@ 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"
+LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	dev-lang/perl
@@ -22,7 +22,7 @@ RDEPEND="
 	dev-perl/GooCanvas2
 	dev-perl/GooCanvas2-CairoTypes
 	dev-perl/Gtk3
-	>=dev-perl/Gtk3-ImageView-9
+	>=dev-perl/Gtk3-ImageView-10
 	dev-perl/File-DesktopEntry
 	dev-perl/File-HomeDir
 	dev-perl/File-Which
@@ -42,6 +42,7 @@ RDEPEND="
 	virtual/imagemagick-tools[perl]
 	x11-libs/libwnck:3[introspection]
 "
+BDEPEND="sys-devel/gettext"
 
 src_prepare() {
 	hprefixify bin/shutter
@@ -67,10 +68,10 @@ src_install() {
 	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 755 {} \; \
+	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 755 {} \; || die "failed to make upload plugins executables"
+		-name "*.pm" -exec chmod +x {} + || die "failed to make upload plugins executables"
 }
 
 pkg_postinst() {
diff --git a/x11-misc/shutter/shutter-0.99.ebuild b/x11-misc/shutter/shutter-0.99.ebuild
index 144918c4f2d6..b1392c23fefe 100644
--- a/x11-misc/shutter/shutter-0.99.ebuild
+++ b/x11-misc/shutter/shutter-0.99.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/shutter-project/shutter/archive/v${PV}.tar.gz -> ${P
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-lang/perl