Version bump. Fixes bug #315923 and bug #314399

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 23 insertions, 15 deletions

diff --git a/x11-misc/shutter/ChangeLog b/x11-misc/shutter/ChangeLog
index c02b5622ec27..2617b026227a 100644
--- a/x11-misc/shutter/ChangeLog
+++ b/x11-misc/shutter/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/shutter
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/shutter/ChangeLog,v 1.6 2010/01/23 13:38:06 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/shutter/ChangeLog,v 1.7 2010/04/18 14:38:16 hwoarang Exp $
+
+*shutter-0.86.1 (18 Apr 2010)
+
+  18 Apr 2010; Markos Chandras <hwoarang@gentoo.org> -shutter-0.80.1.ebuild,
+  shutter-0.85.ebuild, shutter-0.85.1-r1.ebuild, +shutter-0.86.1.ebuild:
+  Version bump. Fixes bug #315923. Fix imagemagick dependencies wrt bug
+  #314399
 
   23 Jan 2010; <hwoarang@gentoo.org> -shutter-0.85.1.ebuild,
   +shutter-0.85.1-r1.ebuild:
diff --git a/x11-misc/shutter/Manifest b/x11-misc/shutter/Manifest
index 28df07ec54ad..96efd8b92c29 100644
--- a/x11-misc/shutter/Manifest
+++ b/x11-misc/shutter/Manifest
@@ -1,10 +1,10 @@
 AUX disable_goocanvas.patch 420 RMD160 907d215bbbed08607068d1aebeb95bd8f567120d SHA1 05c31697fdcffc82cdc932d97a4cf3e4bc1b7295 SHA256 273cf19362843e512ded4e654b82c0587bd8b2f00aad8963e5a5b333e1ee6f49
 AUX disable_webphoto.patch 505 RMD160 6dc5ae131e99d07f80c88eeb8410216aa177ac40 SHA1 bae60d84f3d45429c54374f5efed691fcaf3d927 SHA256 f4146a852d1b6508eeb88368ce13275d1d5a168f1587a260848e90900d874fb7
-DIST shutter-0.80.1.tar.gz 2007660 RMD160 43ef46911662161e84d5c3e0a667c52e798e07d7 SHA1 09a550aac42ac748631d5af412602b18810b75f6 SHA256 b4984c7b73aa093e9f72df18f69d4e65d13283b07bf4af581824f21b1781b8fe
 DIST shutter-0.85.1.tar.gz 2275740 RMD160 84e51e2c652fef2f1d689ec6510a8b00c79fb3b9 SHA1 2a22536c4e71d910b5685976d51fcc0342ef3cc5 SHA256 2049237b27022c5051683138da9e0113b9ced4e6f00d8a1aa330495ccfabd93a
 DIST shutter-0.85.tar.gz 2143256 RMD160 d4e499ab550fd54289215d05e1e80f236d4bead4 SHA1 d74b33b1621ee28209b7de9817c673b41d54558e SHA256 8992b6b72a2ff1c12a31beae9fa1e9e657192a42a4bae7007b837863ce21da49
-EBUILD shutter-0.80.1.ebuild 1667 RMD160 4893650f83b2cfe5a099ea6ef279d3fab8fdfc41 SHA1 18ce43496075f9b739c97e5403b6cdefe445712d SHA256 461eea1b47a1578c2f4e6347b5a3ad856c41632baf456982d9673e78337b139e
-EBUILD shutter-0.85.1-r1.ebuild 1692 RMD160 59f882d16e508713bb9c56c2b29c932e5c475f3d SHA1 149539479991763ace177d9a3626e171f978ef4a SHA256 0cbf94c81a19ac31badd7c635d8083cd1a306a3dfe390ec9dca18951273d149e
-EBUILD shutter-0.85.ebuild 1687 RMD160 fcc14a6ada23a2c8c7d8a0dd2e737a6b60f1e133 SHA1 f3abbb80b639332a1d52add4120a92f7a73f5a40 SHA256 776982263eea436e1bb710dac292eb4b95e1d3378b2be558d8af1f75570a2af3
-MISC ChangeLog 1216 RMD160 9095a33c9340996e0733d0fec28245663343e855 SHA1 6282e02d340423ed379e4132d5c5f828e313c801 SHA256 d23a64df18cc8d5176f1a31a5be420094ace9500a47871eb48fc0c15dd0dfb2b
+DIST shutter-0.86.1.tar.gz 2586895 RMD160 017336ec9f2b18c6eaabde8f317e918ab35945e7 SHA1 bf386f673de4086fae710b60a8fe3d9dcca61868 SHA256 9173ae3183e88e5254195b4820b2cf921a6d4c886b45b3cab528c351af5b711e
+EBUILD shutter-0.85.1-r1.ebuild 1737 RMD160 6eed54feb4a5a4cd0e7b82b4fe3046f1c51c7715 SHA1 fe42fedf9b931e2d970e568c74991796baa6d46d SHA256 b09b1f9b8b73e3b6aa2a67ed617ea222f76499719ae0eb3a369226025c6a9b27
+EBUILD shutter-0.85.ebuild 1732 RMD160 eed7f73b720311b7d2a05d26c32c1fe8707d005f SHA1 1177be8cac22081d18c862db6f303dfa9c99b904 SHA256 a43a7af16e18fa217ef2d08432fb18c7f3ed73ee57da55b312015aeb0c7de5d1
+EBUILD shutter-0.86.1.ebuild 1734 RMD160 079cd143dbab7213b3013c04077e99acdcd3100c SHA1 35d458feb2339e69afd7b1598fac17fe51556614 SHA256 ac7e0225aedb074e0541f3993917db57a2f5ec4cf3fc517cdbc0ab4106b07da9
+MISC ChangeLog 1480 RMD160 ca6993496923f0f824312b695b281b5ed8a4f32c SHA1 e1e4461e15f7dbbd9da7d782f749f573937a5364 SHA256 7c2a08bac56ed1d493928c1473f4edfbf7dea090f78b644b3143f61e7e99805c
 MISC metadata.xml 425 RMD160 c1adebdaded3f7258c266b8175c8b7c4b54f06da SHA1 7042350e8d4f930a10d8f2944f781e13771dd3f0 SHA256 731c700f782bc244fa366f95b38011977ee075dc53540d47c655c65730ce8716
diff --git a/x11-misc/shutter/shutter-0.85.1-r1.ebuild b/x11-misc/shutter/shutter-0.85.1-r1.ebuild
index 670cfdaa17a1..64395ec1a3ea 100644
--- a/x11-misc/shutter/shutter-0.85.1-r1.ebuild
+++ b/x11-misc/shutter/shutter-0.85.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/shutter/shutter-0.85.1-r1.ebuild,v 1.1 2010/01/23 13:38:06 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/shutter/shutter-0.85.1-r1.ebuild,v 1.2 2010/04/18 14:38:16 hwoarang Exp $
 
 EAPI="2"
 
@@ -19,7 +19,7 @@ RDEPEND="dev-lang/perl
 	dev-perl/gnome2-gconf
 	drawing? ( dev-perl/Goo-Canvas  )
 	webphoto? ( gnome-extra/gnome-web-photo )
-	media-gfx/imagemagick
+	|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
 	dev-perl/libxml-perl
 	dev-perl/gnome2-wnck
 	dev-perl/gnome2-canvas
diff --git a/x11-misc/shutter/shutter-0.85.ebuild b/x11-misc/shutter/shutter-0.85.ebuild
index 8bbc79a8fb0a..3e8a50795396 100644
--- a/x11-misc/shutter/shutter-0.85.ebuild
+++ b/x11-misc/shutter/shutter-0.85.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/shutter/shutter-0.85.ebuild,v 1.2 2009/12/04 17:44:34 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/shutter/shutter-0.85.ebuild,v 1.3 2010/04/18 14:38:16 hwoarang Exp $
 
 EAPI="2"
 
@@ -19,7 +19,7 @@ RDEPEND="dev-lang/perl
 	dev-perl/gnome2-gconf
 	drawing? ( dev-perl/Goo-Canvas  )
 	webphoto? ( gnome-extra/gnome-web-photo )
-	media-gfx/imagemagick
+	|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
 	dev-perl/libxml-perl
 	dev-perl/gnome2-wnck
 	dev-perl/gnome2-canvas
diff --git a/x11-misc/shutter/shutter-0.80.1.ebuild b/x11-misc/shutter/shutter-0.86.1.ebuild
index 708344b687f4..ab26ee63b2f9 100644
--- a/x11-misc/shutter/shutter-0.80.1.ebuild
+++ b/x11-misc/shutter/shutter-0.86.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/shutter/shutter-0.80.1.ebuild,v 1.2 2009/09/03 06:46:38 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/shutter/shutter-0.86.1.ebuild,v 1.1 2010/04/18 14:38:16 hwoarang Exp $
 
 EAPI="2"
 
@@ -19,7 +19,7 @@ RDEPEND="dev-lang/perl
 	dev-perl/gnome2-gconf
 	drawing? ( dev-perl/Goo-Canvas  )
 	webphoto? ( gnome-extra/gnome-web-photo )
-	media-gfx/imagemagick
+	|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
 	dev-perl/libxml-perl
 	dev-perl/gnome2-wnck
 	dev-perl/gnome2-canvas
@@ -31,6 +31,7 @@ RDEPEND="dev-lang/perl
 	dev-perl/File-Copy-Recursive
 	dev-perl/File-MimeInfo
 	dev-perl/Locale-gettext
+	dev-perl/Net-DBus
 	dev-perl/Proc-Simple
 	dev-perl/Sort-Naturally
 	dev-perl/WWW-Mechanize
@@ -50,7 +51,7 @@ src_install() {
 	dodoc README || die "dodoc failed"
 	domenu share/applications/${PN}.desktop
 	doman share/man/man1/${PN}.1.gz || die "doman failed"
-	doicon share/pixmaps/${PN}.svg
+	doicon share/pixmaps/${PN}.png
 	doins -r share/locale || die "doins failed"
 	find "${D}"/usr/share/shutter/resources/system/plugins/ -type f ! -name '*.*' -exec chmod 755 {} \; \
 		|| die "failed to make plugins executables"