Version bump

Package-Manager: portage-2.1.11.37/cvs/Linux x86_64
Manifest-Sign-Key: 0xB4AFF2C2

6 files changed, 132 insertions, 33 deletions

diff --git a/x11-misc/shutter/ChangeLog b/x11-misc/shutter/ChangeLog
index 46ce8db9a88e..bc9d26f0914e 100644
--- a/x11-misc/shutter/ChangeLog
+++ b/x11-misc/shutter/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/shutter
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/shutter/ChangeLog,v 1.34 2012/08/17 17:57:39 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/shutter/ChangeLog,v 1.35 2012/12/22 00:44:00 hwoarang Exp $
+
+*shutter-0.90 (22 Dec 2012)
+
+  22 Dec 2012; Markos Chandras <hwoarang@gentoo.org>
+  +files/shutter-0.90-goocanvas.patch, +files/shutter-0.90-webphoto.patch,
+  +shutter-0.90.ebuild, -files/disable_webphoto.patch:
+  Version bump
 
 *shutter-0.89.1 (17 Aug 2012)
 
diff --git a/x11-misc/shutter/Manifest b/x11-misc/shutter/Manifest
index 16dd1d97ab31..d39fc135d305 100644
--- a/x11-misc/shutter/Manifest
+++ b/x11-misc/shutter/Manifest
@@ -4,27 +4,30 @@ Hash: SHA256
 AUX 0.86.4-disable-goocanvas.patch 653 SHA256 5bcc378d9a9b2b0b4a570115f509e2122f5f1b86cfc6f5c1d921278f4ac9f67b SHA512 e3990bf4197556b76bc272740bce69d79abcbb604ccb2c50c2fda859142a018ad7569cd05dcea11d800d40542edf56f5f0c2b359c871928908185499a7f396a1 WHIRLPOOL c45ab21f225ff642c2de58ab6cad2320683afc0ec1cefbdea51d577a910d42b00c2ba808d8e5b4cbbf76cd7f93334261d299bb89c40dcab046d11abdabfac611
 AUX disable-goocanvas-0.87.1.patch 531 SHA256 b5d78cb2eb3707834f14fc2a83052b38d1c235431672f3f6398c942792513d3c SHA512 1a53ffd996b32f184c15689a820696a49de924865734235b6f74d10ddd8618498878e73eaf62c21ef3299cfe17dd884d9437ff539bbd659a95ed6f0767dadb70 WHIRLPOOL a12be1752726a00c2e06acbb669270671d91dd03f77be5bc45f63bbb59f00c931cb16473cf3078dce8dd5378e71aa0854bb74afd1f8340608db12dd51cfe135e
 AUX disable_webphoto-0.87.1.patch 594 SHA256 197bcb2a64d74a599b2df140f649738c921255c2186a2966cbf4658943b7634b SHA512 02d1a35ef4aaa05caa221ae0b311f05e79b363eae516d2ca0ff3cb1ec1279fc26af3d7ccb43889a0769f17702eff99f688e7aa9543d44a53434eb94af81840e7 WHIRLPOOL 6511f3c18d44919259839a387da17fd580d27a24b7e6d5ea3e38321376e3495858ff47c0ebdd928ec0ee257ad221ad6726ce973d7b24bda68a71a5d1aac7bdc1
-AUX disable_webphoto.patch 505 SHA256 f4146a852d1b6508eeb88368ce13275d1d5a168f1587a260848e90900d874fb7 SHA512 0a51c18a801e87d936505423d8e0a75c7a08821ea775256447cf87802b5785f04816b94ee4f1779fe004a76301c3847b4e56a3e314de3132a234a704b888819d WHIRLPOOL 2e75a33ce4ddfe1f2dabca0d093e07871811b156e48637273130450b874e31b270223d6f0dc1985cda33111b14becdc69d692196e5b62d2d66456f2caa2d3602
+AUX shutter-0.90-goocanvas.patch 581 SHA256 d1696e992427d01202beb23df819050990b4c54b92942cf77bff34635fec963d SHA512 2f3e0fbfbc86740efc4aa9ed7a31caf66560948003e3afc5b9dfba9f0935fffe4de5a217fb322ef9135b981030ef79ce964b1de0a28ad28bc36e58e2261f83e5 WHIRLPOOL 058ddcaa38dd516131885b43d227016eda9e6c4023ced297883224f88d4e1d7261f08280439abbfa472aacd667042514a1369f34f85c79c1b813f88e3f18127a
+AUX shutter-0.90-webphoto.patch 640 SHA256 c5d3fed669f447156214bf9a66f8be1b25449714fb25af5aae005e4572eb08d7 SHA512 710c6009f9f9a0a75c5358538f8f396e1ba796fb1090048295b07ea0855c392691f3b2b2639e295b235180abe0f374af03339d0b6c0be898a1247683ce46b08a WHIRLPOOL 382e6b4a26e3dbfc8167bb1820ee43dc9f5a59ed750195ac9fa31717d8ef9023d967012e2259cbf1eb4430489d2b67f85be87d6f9dc77f6bd9fdf39d12e7aae2
 DIST shutter-0.88.1.tar.gz 3155525 SHA256 8e7946cc188fd28005ea7eb6d65121e5c52f2e2dc9e2b2f6bb1c1bcdb3538098 SHA512 3b9859ee47bdaec260a5fc49495538f2141492af305513415cafd107d1e790774da7af370b57496bf1880545091e8320513ac80f4f6d75649ee04145b04cd769 WHIRLPOOL c78009e57804edced93bc09392e50381c4b892fc7bc45f975f9bca650228fa22b1bf862e575e13f9f49dd6142cec796fa9e44163b9efa53378c479d4fbf8d789
 DIST shutter-0.89.1.tar.gz 3364889 SHA256 9b0e8f61d0dae738890c6b02f41a9b37c72f5e74184a57f1fef40843ea4feca7 SHA512 6e6a1a163929970e28121804927843bacf8671a9cc9a68fe2a43e7f21be8a0e4f751245e51154d93317db88622fafd752897e6d7d3c8cbc6891d9e86a63f26fd WHIRLPOOL 5097ce2ae0f45befcb0b631f2c742e88ecc5fd735919c49888f824620f375a44953ec0db684f6ed8ddcca968f96aba0a0d03f90bf6846b846020978af8cc036d
+DIST shutter-0.90.tar.gz 3281329 SHA256 7001b872f1723f58ec27289ceeb1fe9e3a75d82236250dc466076d30d7137a7d SHA512 f27912f2b1a2d9469e20870c79f8cd11671ce9559510149f3806e2d1d3fd00d25e1f1216f9aac226aef1d7f6d543078d1a03ade912a4797d1342aad739ef6999 WHIRLPOOL 5c57ee654aa01f6bdfe8d7d69903a7fcc5186a88d0e1172326425c945796b3fc1f28929af97c67d065ddb1029f9a42b0fe86b71cef31fcae5aae3d19a3e0a36d
 EBUILD shutter-0.88.1.ebuild 2273 SHA256 5bef48d259e20a9e4453e3353440def88bc278e2f7682ecf6ce89b1fcb6ea2fc SHA512 97bc7826ccb7cbc8f228fee3e35f5d70baf3b6be1e7b6eb9f9f80fc00ee39f5754d6be3c72b5c1769d965d685a8f4591cd6537d2ae2df5d80ec653896d9572cd WHIRLPOOL 35cd167f59423e1411fec506a4eb0975147459d1bb182b0af9040ffe7c99048562b9883ed09edeb90894281d336737aa6e4e9dca9f2f789c30d94d73c6349256
 EBUILD shutter-0.89.1.ebuild 2471 SHA256 7b57615c736022f82de8cb7dda9695419fa5aaec9821bbccbd689b741d096727 SHA512 61a9b8ec8132fe803d3bc475ada07ba62dc61ec4268a7605e1fa55e2a5d587f7e4d05bd9223026d76342a060183c27ec48a34894fd8dfd9df96006107a356f07 WHIRLPOOL 663876edc36bdad1f4df16a35f412f60fa5ee67bad2b7e6e0778b954572149acf9a2251945bdd00139a31e67a06a8583b722cfc842e10131e25d4c874954f70f
-MISC ChangeLog 5160 SHA256 8b709c2ed3f030d6de2eada384bb679ab5fc4343ce3bcea174ba0851004af41d SHA512 67fd88edebe755749e813d4381ac62912d1b5913270c269d6cf558721f1e3556df8e58442976292f7665d99b10ea29381a1d4a800a6380ef565de11da4199a47 WHIRLPOOL f7b32ad761cb1c400df79fe93e547e18c0105459273293b0a7a33966b6b20a2e02a5fda872f762002b0630874443600f1730f118759b227db57514e2ddb65f07
+EBUILD shutter-0.90.ebuild 2426 SHA256 252301004c93d2605407ec774a16fa9a85511a996bbec809873f0fe24dab03b2 SHA512 e7ec0593efd6d8e7d9d88029548a28ed440ac856da2ccfe82ddb9cafb5c58ccda72a0dbfb6d3d75f7eeff6ee7ae2ed0e44bc62f72d0809bd23c5d024f97546e7 WHIRLPOOL be1302b3b554fae2020311fc0a68e787ddee96cf187d4759f3a9af24f75b448c5c624eb56b8acf8a861a13bc85708d331599594a613c0ac9422007edf4858a7e
+MISC ChangeLog 5388 SHA256 4fb131d8817cde4475d0dbc77aaf4c23c4e089e2ddfc1001b17e1b7ca8b8b3a2 SHA512 a79c14416ff820861656121ab6d668d20d3f450bf2d30d35d6e324d7ef73b1f7bbdb5cd5329184b737bbabcb69dd0417c6fa5a47039bbd71420acf971604d238 WHIRLPOOL 949269a49698a2da094e6b39b4d1b7b59adefd53f13bf1f8fad1a1af2c651200487d7d311a4863a119dc003b8dfc6fef114cb3e63d7e03174e2539f0b5e8be31
 MISC metadata.xml 425 SHA256 731c700f782bc244fa366f95b38011977ee075dc53540d47c655c65730ce8716 SHA512 b10ae9ae0ec32fcb90a921277f07894ff250bc7d42d6fcc8c3f742190e5f702b9f8ef3671ab3049628b8e61e56bc7f70b6640468c94bcf49d3450c2d2828a976 WHIRLPOOL e398e1cd6cd9808081e3fedb7566b03739f2d90a516c935ff79eb3ddad97bc86b659974c07dc9622477ca00ed458ac5f51a8d6a23b03cb4404b294df667bb66d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQLoYZAAoJEPqDWhW0r/LCn7wQAKRxvVWG/Mqzza2oqmn0CDVe
-4T3uKMG5DjTKUOTGJSz8vZJ64qaJWb0a9RAfoStQcvaNu4aMyO25cYKQgEuhhuuR
-ZAyAKwZSfGCdf8UT4XGtDlHJGUbd514k2ReTklA2yfj6GXegUA5atzs1oBw9uYb5
-Oq/j7bBCYJ/adBTpW88G6kZ9W8O3fV0+cjU3ewf2Y05hLLIrV0aBwSSR+jrVzzuR
-BJM34xcse+fyrKtPj4kSezL1XDGKHhrlafK+b0e1Qvx2UepdHThaeNh+3mwUPWmA
-16qZIbe4Hzhy7daDp5JJyZmYmP8Uym/1VvrrzfZ5Um3CiuOwZysEP3QTwWHgoxXt
-5fQPr2sBjRHBtzgWcKOy8NAJdwb57QZw3Q3O7Wpl7ZGkPywwdkaHY3zAABHTQ/oX
-i7VfqnOeM6ZFdzRyYdhr5xrI8f0QRC/HbkKFHG4SFjasVij6ChS7j+FcYJnXiJSb
-wFvc/YcuWx6u5ekUfNdCAPPuBVUP8Er/ZowfKMHGOvi+hJG8Co+ax3LAqkG4N3J+
-zGmKSq6PV6v88ktFkrRcTkrsLwWDhzFSNkr/1EU8bisHJkdtOKhGHbWYkBGuTNN2
-YWL6d/uxlt1MB7j0Fgod2n2rAo5KkmbXtHaEOREuL4hdKz+6y8lVEesazPn65DOl
-Xo1N6ZODooonOSojAy8F
-=62yw
+iQIcBAEBCAAGBQJQ1QJJAAoJEPqDWhW0r/LCD3YQAJLPgZeF4LURu0kJs1NjIkS9
+ThfTR4T5NDQZgXcPdAJsuZn/GZE4IA7U9blFRvEPEgDNS0tZ+4JMLDLIWR3wUI8n
+dpTliU2D14yGqdOOewNXgSGhOSU9LIhEb1RMwgII3G/7YH8IgxNhOeYo5s4c/nmK
+W7l66FC/2uNPUc+AnumevnWZwy493TU7+wwqBcv+RNeV+c2Z5enYjnmBN9G4/nlG
+BS+zbjrpOOJu7+s5yzd8u5eOz66amfZMQNM6kCrtI3B6zFcSnSMrKbuTj7kef6/Y
+gdL0vg0T8YCjX8g1YX61vA7LlejOnF58jVXg0AKnznfVU0cQzzXgBGCo7emmytee
+ym/Xp/BiG1vnvUc1MBvt1XYS/OmXdl39XZsaf4bz/f7B9kN8gOyaVGzA4bQxf1oO
+5C4HBrhxMiJJddNIoWTqw1FBjiRZNSVyfK8HTbBtrUA93YIMX7HslGi/xVW1cGdE
+IJS+yaIPIjqvRZuHYT0OS7Kx9srwf9MonKqkrEoXHbbMpnR5G/vGf9ksipvUhpiL
+z1ANUqi8FbooNO6rp4I42DsdGk8Hap6LA27qBuCTRSbtgERbgoV1DbDwOkReTQSz
+kjZmfMyylZ899STyQI+PPq41Lbh3SiyJomabh2WCTfWwFaVCWHjNWcG1QH7DYsP4
+jhhTDXqhSV2BiiVhfFUo
+=dlIH
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/shutter/files/disable_webphoto.patch b/x11-misc/shutter/files/disable_webphoto.patch
deleted file mode 100644
index d09f30395737..000000000000
--- a/x11-misc/shutter/files/disable_webphoto.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: bin/shutter
-===================================================================
---- bin/shutter
-+++ bin/shutter
-@@ -6034,11 +6034,7 @@ sub fct_init_depend {
- 		die "ERROR: imagemagick is missing --> aborting!\n\n";
- 	}
- 
--	#gnome-web-photo
--	unless ( File::Which::which('gnome-web-photo') ) {
--		warn "WARNING: gnome-web-photo is missing --> screenshots of websites will be disabled!\n\n";
--		$gnome_web_photo = FALSE;
--	}
-+	$gnome_web_photo = FALSE;
- 
- 	#goocanvas
- 	eval { require Goo::Canvas };
diff --git a/x11-misc/shutter/files/shutter-0.90-goocanvas.patch b/x11-misc/shutter/files/shutter-0.90-goocanvas.patch
new file mode 100644
index 000000000000..3a811635a988
--- /dev/null
+++ b/x11-misc/shutter/files/shutter-0.90-goocanvas.patch
@@ -0,0 +1,18 @@
+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/files/shutter-0.90-webphoto.patch b/x11-misc/shutter/files/shutter-0.90-webphoto.patch
new file mode 100644
index 000000000000..647e53aa5e04
--- /dev/null
+++ b/x11-misc/shutter/files/shutter-0.90-webphoto.patch
@@ -0,0 +1,17 @@
+Index: shutter-0.90/bin/shutter
+===================================================================
+--- shutter-0.90.orig/bin/shutter
++++ shutter-0.90/bin/shutter
+@@ -9396,11 +9396,7 @@ else {
+             die "ERROR: imagemagick is missing --> aborting!\n\n";
+         }
+ 
+-        #gnome-web-photo
+-        unless ( File::Which::which('gnome-web-photo') ) {
+-            warn "WARNING: gnome-web-photo is missing --> screenshots of websites will be disabled!\n\n";
+-            $gnome_web_photo = FALSE;
+-        }
++        $gnome_web_photo = FALSE;
+ 
+         #nautilus-sendto
+         unless ( File::Which::which('nautilus-sendto') ) {
diff --git a/x11-misc/shutter/shutter-0.90.ebuild b/x11-misc/shutter/shutter-0.90.ebuild
new file mode 100644
index 000000000000..4a5e97016705
--- /dev/null
+++ b/x11-misc/shutter/shutter-0.90.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/shutter/shutter-0.90.ebuild,v 1.1 2012/12/22 00:44:00 hwoarang Exp $
+
+EAPI="2"
+
+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 webphoto"
+
+RDEPEND="dev-lang/perl
+	drawing? ( dev-perl/Goo-Canvas  )
+	webphoto? ( gnome-extra/gnome-web-photo )
+	|| ( media-gfx/imagemagick[perl] media-gfx/graphicsmagick[imagemagick,perl] )
+	dev-perl/libxml-perl
+	dev-perl/gnome2-wnck
+	dev-perl/gnome2-canvas
+	dev-perl/gnome2-perl
+	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() {
+	use webphoto || epatch "${FILESDIR}"/${P}-webphoto.patch
+	use drawing || epatch "${FILESDIR}"/${P}-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} || die "dobin failed"
+	insinto /usr/share/${PN}
+	doins -r share/${PN}/* || die "doins failed"
+	dodoc README || die "dodoc failed"
+	domenu share/applications/${PN}.desktop
+	# mapage is broken. Reconstruct it.
+	mv share/man/man1/${PN}.1.gz share/man/man1/${PN}.1
+	bzip2 share/man/man1/${PN}.1
+	doman share/man/man1/${PN}.1.bz2 || 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"
+}