Version bump

Package-Manager: portage-2.1.9.42/cvs/Linux x86_64

6 files changed, 76 insertions, 34 deletions

diff --git a/x11-misc/shutter/ChangeLog b/x11-misc/shutter/ChangeLog
index e5d516edbcb3..f9ab43f61f37 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.17 2010/11/21 17:43:00 maekke Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/shutter/ChangeLog,v 1.18 2011/03/14 00:10:01 hwoarang Exp $
+
+*shutter-0.87.1 (14 Mar 2011)
+
+  14 Mar 2011; Markos Chandras <hwoarang@gentoo.org> -shutter-0.86.2.ebuild,
+  +shutter-0.87.1.ebuild, +files/disable-goocanvas-0.87.1.patch,
+  +files/disable_webphoto-0.87.1.patch, -files/disable_goocanvas.patch:
+  Version bump
 
   21 Nov 2010; Markus Meier <maekke@gentoo.org> shutter-0.86.4-r1.ebuild:
   x86 stable, bug #345675
diff --git a/x11-misc/shutter/Manifest b/x11-misc/shutter/Manifest
index ca0749d29275..638f29f22940 100644
--- a/x11-misc/shutter/Manifest
+++ b/x11-misc/shutter/Manifest
@@ -1,19 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX 0.86.4-disable-goocanvas.patch 653 RMD160 e1467809942e066c15b1ee29473f79e8c5a0b95f SHA1 735bc4e7963fd192432b6bd28aa90022bb42443d SHA256 5bcc378d9a9b2b0b4a570115f509e2122f5f1b86cfc6f5c1d921278f4ac9f67b
-AUX disable_goocanvas.patch 420 RMD160 907d215bbbed08607068d1aebeb95bd8f567120d SHA1 05c31697fdcffc82cdc932d97a4cf3e4bc1b7295 SHA256 273cf19362843e512ded4e654b82c0587bd8b2f00aad8963e5a5b333e1ee6f49
+AUX disable-goocanvas-0.87.1.patch 531 RMD160 1296fd3013fb22583465bb737aa85ef77775d877 SHA1 34dd16d892be67796b637366c3176a0417ce34e8 SHA256 b5d78cb2eb3707834f14fc2a83052b38d1c235431672f3f6398c942792513d3c
+AUX disable_webphoto-0.87.1.patch 594 RMD160 b430852958f6a7c082f5ddea22655b53a67ab7fd SHA1 e940f83b8e04b81da0f50dd25895fadd80d07d4d SHA256 197bcb2a64d74a599b2df140f649738c921255c2186a2966cbf4658943b7634b
 AUX disable_webphoto.patch 505 RMD160 6dc5ae131e99d07f80c88eeb8410216aa177ac40 SHA1 bae60d84f3d45429c54374f5efed691fcaf3d927 SHA256 f4146a852d1b6508eeb88368ce13275d1d5a168f1587a260848e90900d874fb7
-DIST shutter-0.86.2.tar.gz 2600055 RMD160 3b953f7aa8630b1173a49cbddb1d5d54996f57f7 SHA1 0dfd3771582f97f55bd5a8dbba78a5900a7c132b SHA256 3dadec6bca407cfc4c7976d78398b064dad428346a78e838cf4c677e4d22a67c
 DIST shutter-0.86.4.tar.gz 2813078 RMD160 25163015f81a8ded4c895eef2e2acdc65bbdf443 SHA1 b27264161aaa272d52871bc3d4ea3959c9829412 SHA256 44c4787117ef7f1a1251cc394f93947a8b3399a9ea7887dd3bb1ec1dbc89b557
-EBUILD shutter-0.86.2.ebuild 1757 RMD160 fe6c3b556354412839758ac0b8d935726dda54a1 SHA1 a5d08b565d1f8074a4fa636db20a407a325edb1d SHA256 d3592ba78483a09ea608a612bab4b15ee6006a73b6593d1f7c7cb3a915e3bc79
+DIST shutter-0.87.1.tar.gz 3092862 RMD160 d25a35b0c66076d0900cb47cd27777ac4a912812 SHA1 f06f48da789bfca8c8c76048b3584750e524968f SHA256 e4fe5fc5d6a9c9535d2f58a9d03adcda0497aa5b287613d958ebae00525f8dcf
 EBUILD shutter-0.86.4-r1.ebuild 2125 RMD160 3eb1cd9dd4cffad8f6e5f8721f934309eb550aa0 SHA1 3f4267249d0e19970f609166bc3ca7fd0a3b683a SHA256 33752b0ec9fb9c43b59cdefec1e6b66c657598b169ff72016074e7330c4715ff
-MISC ChangeLog 2790 RMD160 b0e59f5dcca0cedbc91b2b5e1fd74daaa491598f SHA1 324353ac0499c1e7779b7f25741c6e7111359a17 SHA256 7e0a7da9bbbdbd7d9c9fcd9c170a021c2a19ff781209b656fd96ff7e54a90b01
+EBUILD shutter-0.87.1.ebuild 2154 RMD160 2ba2995d7875516e433b4ce530c577c5d108fdd5 SHA1 1983eba0455e35f70b28c9a2eaa10486ab9224ad SHA256 69b8fdc42dff0c94e37ff0b761f14197a8e819cf40197ea7b0245cccc2cfe235
+MISC ChangeLog 3053 RMD160 03959b57fb112db43a173bfaef0303ce463842a8 SHA1 16a6273871669ef3a8c809f32e45f05115613cea SHA256 5382ff235180711907536931486de079f6ab8ac6949d2ad25ecbfddf12488446
 MISC metadata.xml 425 RMD160 c1adebdaded3f7258c266b8175c8b7c4b54f06da SHA1 7042350e8d4f930a10d8f2944f781e13771dd3f0 SHA256 731c700f782bc244fa366f95b38011977ee075dc53540d47c655c65730ce8716
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAkzpWegACgkQkKaRLQcq0GKgqACgrhgFbvStBNaRIGKo4tqv3l2y
-MqwAn3FET1doK/1UD4qBJS9HuLV+54Ha
-=YkMQ
+iQIcBAEBCgAGBQJNfVyXAAoJEPqDWhW0r/LC51gQAIqdAp3ALrQwNuN/JIYOA38x
+VGoQj/c4aaTaSOV1F7z7t8ziJZRCzwEN/u/3k0Y5VgTwj0YoA6EerEPK41q7NS6t
+9pmjMhUCZWnf+0YOJuMf6jd8i9T7NbiH8DcfLSAol9esI1jGYoWGvVu7nnqYm6ix
+taQkPTwB5ZQq4zy9GB+6G+CVHllESwcR/YxIhDs5aX9AaRe4Sg2djoeCz74kloUo
+nC6Ki0x/mwFoi2cVpRdRtfhmDNyY+Zm0u0g0jyUkdfW4mYgbEJJdUEvRp0Lz0gJQ
+QUwfrQn9Iep7KkHHS63NcN+Ik45i+bC1to5/502Zx8P5Zc4ciCiccsPj6Lh/uXsc
+km3lgB5juwKQZ2kSrrfthMoGpw/IvPzFteWr/yeH/I2y2DtsJFk+kiIwMZuvIANS
+/XlklTJ65m4YK4ScgzTPkwjLUD+QrsD7Ioq4XlUZwCzaHsgUuA6FipBzEOz87m49
+braw3ilZMLECU9mF3omTi1G0DkorpcLc3u8b89J2ul8l5SMdQARMr7z91Rb5p52c
+Fo44nnNdgimcOR1nXPCJfT9xYjxPvohAVO7o0F+FJD3MGSyfgqzN59oB0mawMtLn
+xZyD98CYUJJcFzjhsieQUxmqYz91Oa9be9Wo5d5scGXdEEEkgetp+ALOn+edNg5z
+Z1dEKa338bCNrFB3cotW
+=l22J
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/shutter/files/disable-goocanvas-0.87.1.patch b/x11-misc/shutter/files/disable-goocanvas-0.87.1.patch
new file mode 100644
index 000000000000..7819e602a1b5
--- /dev/null
+++ b/x11-misc/shutter/files/disable-goocanvas-0.87.1.patch
@@ -0,0 +1,18 @@
+Index: shutter-0.87.1/bin/shutter
+===================================================================
+--- shutter-0.87.1.orig/bin/shutter
++++ shutter-0.87.1/bin/shutter
+@@ -9188,12 +9188,7 @@ if ($app->is_running) {
+ 			$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/disable_goocanvas.patch b/x11-misc/shutter/files/disable_goocanvas.patch
deleted file mode 100644
index 092ec8b9655d..000000000000
--- a/x11-misc/shutter/files/disable_goocanvas.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: bin/shutter
-===================================================================
---- bin/shutter
-+++ bin/shutter
-@@ -6040,12 +6040,7 @@ sub fct_init_depend {
- 		$gnome_web_photo = FALSE;
- 	}
- 
--	#goocanvas
--	eval { require Goo::Canvas };
--	if ($@) {
--		warn "WARNING: Goo::Canvas/libgoocanvas is missing --> drawing tool will be disabled!\n\n";
--		$goocanvas = FALSE;
--	}
-+	$goocanvas = FALSE;
- 
- 	return TRUE;
- }
diff --git a/x11-misc/shutter/files/disable_webphoto-0.87.1.patch b/x11-misc/shutter/files/disable_webphoto-0.87.1.patch
new file mode 100644
index 000000000000..7db728c4b53a
--- /dev/null
+++ b/x11-misc/shutter/files/disable_webphoto-0.87.1.patch
@@ -0,0 +1,17 @@
+Index: shutter-0.87.1/bin/shutter
+===================================================================
+--- shutter-0.87.1.orig/bin/shutter
++++ shutter-0.87.1/bin/shutter
+@@ -9181,11 +9181,7 @@ if ($app->is_running) {
+ 			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.86.2.ebuild b/x11-misc/shutter/shutter-0.87.1.ebuild
index 63566f4d4376..734d41e5ba08 100644
--- a/x11-misc/shutter/shutter-0.86.2.ebuild
+++ b/x11-misc/shutter/shutter-0.87.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/shutter/shutter-0.86.2.ebuild,v 1.3 2010/07/14 12:51:28 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/shutter/shutter-0.87.1.ebuild,v 1.1 2011/03/14 00:10:01 hwoarang Exp $
 
 EAPI="2"
 
@@ -12,7 +12,7 @@ SRC_URI="http://shutter-project.org/wp-content/uploads/releases/tars/${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="drawing webphoto"
 
 RDEPEND="dev-lang/perl
@@ -24,6 +24,7 @@ RDEPEND="dev-lang/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
@@ -41,8 +42,12 @@ RDEPEND="dev-lang/perl
 	dev-perl/libwww-perl"
 
 src_prepare() {
-	use webphoto || epatch "${FILESDIR}"/disable_webphoto.patch
-	use drawing || epatch "${FILESDIR}"/disable_goocanvas.patch
+	use webphoto || epatch "${FILESDIR}"/disable_webphoto-${PV}.patch
+	use drawing || epatch "${FILESDIR}"/disable-goocanvas-${PV}.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() {
@@ -54,6 +59,8 @@ src_install() {
 	doman share/man/man1/${PN}.1.gz || 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"
 }