From f61dd266c1c40a68f3ef3b65377f3b074f51ca4e Mon Sep 17 00:00:00 2001
From: David Seifert <soap@gentoo.org>
Date: Sat, 11 Feb 2017 20:21:55 +0100
Subject: x11-misc/shutter: Depend on virtual/imagemagick-tools

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3907
---
 x11-misc/shutter/shutter-0.93.1-r2.ebuild | 86 -------------------------------
 x11-misc/shutter/shutter-0.93.1-r3.ebuild | 86 +++++++++++++++++++++++++++++++
 2 files changed, 86 insertions(+), 86 deletions(-)
 delete mode 100644 x11-misc/shutter/shutter-0.93.1-r2.ebuild
 create mode 100644 x11-misc/shutter/shutter-0.93.1-r3.ebuild

(limited to 'x11-misc/shutter')

diff --git a/x11-misc/shutter/shutter-0.93.1-r2.ebuild b/x11-misc/shutter/shutter-0.93.1-r2.ebuild
deleted file mode 100644
index c43a3fd22fc..00000000000
--- a/x11-misc/shutter/shutter-0.93.1-r2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="Feature-rich screenshot program"
-HOMEPAGE="http://shutter-project.org/"
-SRC_URI="http://shutter-project.org/wp-content/uploads/releases/tars/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="drawing"
-
-RDEPEND="dev-lang/perl
-	drawing? ( dev-perl/Goo-Canvas  )
-	|| ( media-gfx/imagemagick[perl] media-gfx/graphicsmagick[imagemagick,perl] )
-	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"
-
-src_prepare() {
-	default
-
-	eapply "${FILESDIR}"/${PN}-0.90-webphoto.patch
-	use drawing || eapply "${FILESDIR}"/${PN}-0.90-goocanvas.patch
-
-	# 560426
-	eapply "${FILESDIR}"/${P}-insecure_use_of_system.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} || die "dobin failed"
-	insinto /usr/share/${PN}
-	doins -r share/${PN}/* || die "doins failed"
-	dodoc README || die "dodoc failed"
-	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 || die "doman failed"
-	doicon share/pixmaps/${PN}.png
-	doins -r share/locale || die "doins failed"
-	insinto /usr/share/icons/hicolor
-	doins -r share/icons/hicolor/* || die "doins failed"
-	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() {
-	elog ""
-	elog "The following optional dependencies can be used to provide"
-	elog "additional functionality:"
-	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""
-}
diff --git a/x11-misc/shutter/shutter-0.93.1-r3.ebuild b/x11-misc/shutter/shutter-0.93.1-r3.ebuild
new file mode 100644
index 00000000000..bb5435a6694
--- /dev/null
+++ b/x11-misc/shutter/shutter-0.93.1-r3.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit eutils
+
+DESCRIPTION="Feature-rich screenshot program"
+HOMEPAGE="http://shutter-project.org/"
+SRC_URI="http://shutter-project.org/wp-content/uploads/releases/tars/${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
+
+	eapply "${FILESDIR}"/${PN}-0.90-webphoto.patch
+	use drawing || eapply "${FILESDIR}"/${PN}-0.90-goocanvas.patch
+
+	# 560426
+	eapply "${FILESDIR}"/${P}-insecure_use_of_system.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} || die "dobin failed"
+	insinto /usr/share/${PN}
+	doins -r share/${PN}/* || die "doins failed"
+	dodoc README || die "dodoc failed"
+	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 || die "doman failed"
+	doicon share/pixmaps/${PN}.png
+	doins -r share/locale || die "doins failed"
+	insinto /usr/share/icons/hicolor
+	doins -r share/icons/hicolor/* || die "doins failed"
+	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() {
+	elog ""
+	elog "The following optional dependencies can be used to provide"
+	elog "additional functionality:"
+	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""
+}
-- 
cgit v1.2.1