gentoo resync : 25.08.2020

5 files changed, 13 insertions, 119 deletions

diff --git a/x11-misc/shutter/Manifest b/x11-misc/shutter/Manifest
index 2d61dadac04d..4e230bbf2b46 100644
--- a/x11-misc/shutter/Manifest
+++ b/x11-misc/shutter/Manifest
@@ -1,5 +1,3 @@
-AUX shutter-0.90-goocanvas.patch 581 BLAKE2B a944b2d15b16fc429f73456f1aa266e1687a3d765f018b1f206358e140589d12733fff2bd37b8484207abd8849548b2987fad09b7c789481ec167ea1da0cee6d SHA512 2f3e0fbfbc86740efc4aa9ed7a31caf66560948003e3afc5b9dfba9f0935fffe4de5a217fb322ef9135b981030ef79ce964b1de0a28ad28bc36e58e2261f83e5
-DIST shutter-0.94.3.tar.gz 3375447 BLAKE2B e996966722999ee11ed3c185fd17a77e8982688ec17253f3558f89ccfd2e3afefec34d9214acffb10009fc1a28f587a5b994e32d7bb3538cde5e4f398b8e7b95 SHA512 7f67ed6fbc94aee4b6caa73662ab20684e2d8bdfd7208dcd407bdce4e1b93f2aa1fa256ad6bce66b92c741500726b90e5701e7f31bc831709568e5c4c27bff3b
-EBUILD shutter-0.94.3-r1.ebuild 2083 BLAKE2B 3314d2c7a31903e529434c3e3a4f72ea13768ee6fb09e8b121b054648fc44ba51797c14f524731e2fe85396467f8cfc41c5b02c7e084d085e86e3fea9612100b SHA512 c40be1fa15b4b7bf3297a29b769e2b317cbc71c8594f988ee4e531168856a9cf15fe08e9c18c701344ebe5ab8425e8c012e4115135cd831fb2e9ca1bf514f2d0
-EBUILD shutter-0.94.3.ebuild 2601 BLAKE2B 950db9d14ef692b89d48e73f8264d49b776565ba692a7a5a6b712c809a8a4c30ff7c08f2b01b400631eb2da739af479632adadd99e4281a2297a759e132ac21c SHA512 e8155275463b8456a74a7b18180b0705e328f2597359bb87141bb488c0a45c4278bdfd1db3a7d713e4e64bf9e54dcd7d39925f3ac11e2a4915ce71e4636f8923
-MISC metadata.xml 439 BLAKE2B 688e0946d2c791929e7b351a877ca58d45eaeda73d13fa8eba1e97f3644e8f1d7eadbee432f9f028dc8bda21f72397156386875f7ae3db200fc1ce7108e265a0 SHA512 b4fb3c9f38b71cd3c31af6d819f69709b36ec68035ed695092c54794ca226be58190e7c35019c82e057046630dd5b338dead49b2d09e91ebb40fd979e11c7107
+DIST shutter-0.94.3_p20200621.tar.gz 2571420 BLAKE2B 0567d03d1b511f3bbe889ad6dda3bfa347dc69d96c7ab89368e6e97925d8d4cccb378ee0da179a65a482e6d22117aaff390088e7cac5d695edd3b8fee7c6a396 SHA512 3426b1cc475356cbcbcaba89e59e904907d61ceafb96b7d7994ff3d9a1fcb1f8151099a2361cd8de63b16fe02c1246f0cb50fb7166d666bc502f18e6fdda6d5f
+EBUILD shutter-0.94.3_p20200621.ebuild 2342 BLAKE2B 0676ea8c19807cae8ddc3b3a66621ff7abfc884ed7ee0a69771e5b4f201e6ead0854a8ff1d977b7fb3539c66c23c1d5e28c257cf07517ccc4a9edbff28686141 SHA512 9999f8f578e5fee77105b424488fe9d7b85ef1a4c3a83d809f86225a9b1e6950ab8bd461d870a1a714bc67782ee685405c2607f43ea2ca7da67c17b5b090901a
+MISC metadata.xml 373 BLAKE2B 1b254f3b91e248b37f243d85ca48527e68be76849f668d1918e57a454e1e9da0f899ea36805138e4c18164d91c44b6aaf6a75a46deb5b42af2aa2e1b17a679bf SHA512 9c42f1f7eea609dbd75eba9e5adf78b9f4f69a5966ad54de04cf355672357fe83f1a4f5d140d1701523d96279ca9c8c095dd796bf135a57339ef4d6939be615e
diff --git a/x11-misc/shutter/files/shutter-0.90-goocanvas.patch b/x11-misc/shutter/files/shutter-0.90-goocanvas.patch
deleted file mode 100644
index 3a811635a988..000000000000
--- a/x11-misc/shutter/files/shutter-0.90-goocanvas.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: shutter-0.90/bin/shutter
-===================================================================
---- shutter-0.90.orig/bin/shutter
-+++ shutter-0.90/bin/shutter
-@@ -9407,12 +9407,7 @@ else {
-             $nautilus_sendto = FALSE;
-         }
- 
--        #goocanvas
--        eval { require Goo::Canvas };
--        if ($@) {
--            warn "WARNING: Goo::Canvas/libgoo-canvas-perl is missing --> drawing tool will be disabled!\n\n";
--            $goocanvas = FALSE;
--        }
-+        $goocanvas = FALSE;
- 
-         #net-dbus-glib-perl
-         eval { require Net::DBus::GLib };
diff --git a/x11-misc/shutter/metadata.xml b/x11-misc/shutter/metadata.xml
index f341b92a1e2e..e863a6fabb22 100644
--- a/x11-misc/shutter/metadata.xml
+++ b/x11-misc/shutter/metadata.xml
@@ -9,7 +9,4 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<use>
-		<flag name="drawing">Enables drawing tool</flag>
-	</use>
 </pkgmetadata>
diff --git a/x11-misc/shutter/shutter-0.94.3.ebuild b/x11-misc/shutter/shutter-0.94.3.ebuild
deleted file mode 100644
index 4a8e44ee526f..000000000000
--- a/x11-misc/shutter/shutter-0.94.3.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit xdg-utils desktop
-
-DESCRIPTION="Feature-rich screenshot program"
-HOMEPAGE="https://shutter-project.org/"
-#SRC_URI="https://shutter-project.org/wp-content/uploads/releases/tars/${P}.tar.gz"
-SRC_URI="https://launchpad.net/shutter/0.9x/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="drawing"
-
-RDEPEND="dev-lang/perl
-	drawing? ( dev-perl/Goo-Canvas )
-	dev-perl/libxml-perl
-	dev-perl/gnome2-canvas
-	dev-perl/gnome2-perl
-	dev-perl/gnome2-wnck
-	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/Proc-Simple
-	dev-perl/Proc-ProcessTable
-	dev-perl/Sort-Naturally
-	dev-perl/WWW-Mechanize
-	dev-perl/X11-Protocol
-	dev-perl/XML-Simple
-	dev-perl/libwww-perl
-	virtual/imagemagick-tools[perl]"
-
-src_prepare() {
-	default
-
-	use drawing || eapply "${FILESDIR}"/${PN}-0.90-goocanvas.patch
-
-	#Fix tray icon because it doesn't pick the right icon using various themes
-	sed -i -e "/\$tray->set_from_icon_name/s:set_from_icon_name:set_from_file:" \
-	-e "s:shutter-panel:/usr/share/icons/hicolor/scalable/apps/&.svg:" \
-	bin/shutter || die "failed to fix trayicon"
-}
-
-src_install() {
-	dobin bin/${PN}
-	insinto /usr/share/${PN}
-	doins -r share/${PN}/*
-	dodoc README
-	domenu share/applications/${PN}.desktop
-	# Man page is broken. Reconstruct it.
-	gunzip share/man/man1/${PN}.1.gz || die "gunzip failed"
-	doman share/man/man1/${PN}.1
-	doicon share/pixmaps/${PN}.png
-	doins -r share/locale
-	insinto /usr/share/icons/hicolor
-	doins -r share/icons/hicolor/*
-	find "${D}"/usr/share/shutter/resources/system/plugins/ -type f ! -name '*.*' -exec chmod 755 {} \; \
-		|| die "failed to make plugins executables"
-	find "${D}"/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
-
-	elog ""
-	elog "These optional dependencies provide additional functions:"
-	elog ""
-	elog "- media-libs/exiftool            : Writing Exif information"
-	elog "- dev-libs/libappindicator       : Status icon support for Unity"
-	elog "- dev-perl/{Net-OAuth,Path-Class}: Dropbox support"
-	elog "- dev-perl/JSON-XS               : vgy.me image hosting support"
-	elog""
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/x11-misc/shutter/shutter-0.94.3-r1.ebuild b/x11-misc/shutter/shutter-0.94.3_p20200621.ebuild
index d2df1d6487bc..b29843d0ea8a 100644
--- a/x11-misc/shutter/shutter-0.94.3-r1.ebuild
+++ b/x11-misc/shutter/shutter-0.94.3_p20200621.ebuild
@@ -7,7 +7,9 @@ inherit desktop eutils xdg-utils
 
 DESCRIPTION="Feature-rich screenshot program"
 HOMEPAGE="https://shutter-project.org/"
-SRC_URI="https://launchpad.net/shutter/0.9x/${PV}/+download/${P}.tar.gz"
+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"
@@ -15,10 +17,11 @@ KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	dev-lang/perl
-	dev-perl/libxml-perl
 	dev-perl/gnome2-canvas
-	dev-perl/gnome2-perl
 	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
@@ -29,13 +32,13 @@ RDEPEND="
 	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
-	dev-perl/libwww-perl
 	virtual/imagemagick-tools[perl]
 "
 
@@ -57,6 +60,9 @@ src_install() {
 	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.