From 16c7c9125ffd540ae67e82058502cc49af315768 Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Fri, 15 Oct 2010 10:56:01 +0000 Subject: Do not pick trayicon from icon theme but use hardcoded path to filename. Bug #340813 (Portage version: 2.2_rc96/cvs/Linux x86_64) --- x11-misc/shutter/ChangeLog | 9 ++++- x11-misc/shutter/shutter-0.86.4-r1.ebuild | 65 +++++++++++++++++++++++++++++++ x11-misc/shutter/shutter-0.86.4.ebuild | 59 ---------------------------- 3 files changed, 73 insertions(+), 60 deletions(-) create mode 100644 x11-misc/shutter/shutter-0.86.4-r1.ebuild delete mode 100644 x11-misc/shutter/shutter-0.86.4.ebuild (limited to 'x11-misc/shutter') diff --git a/x11-misc/shutter/ChangeLog b/x11-misc/shutter/ChangeLog index 16a9c97bf8d0..1f7c2b14c8ca 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.14 2010/10/10 10:36:26 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/shutter/ChangeLog,v 1.15 2010/10/15 10:56:01 hwoarang Exp $ + +*shutter-0.86.4-r1 (15 Oct 2010) + + 15 Oct 2010; Markos Chandras -shutter-0.86.4.ebuild, + +shutter-0.86.4-r1.ebuild: + Do not pick trayicon from icon theme but use hardcoded path to filename. + Bug #340813 *shutter-0.86.4 (10 Oct 2010) diff --git a/x11-misc/shutter/shutter-0.86.4-r1.ebuild b/x11-misc/shutter/shutter-0.86.4-r1.ebuild new file mode 100644 index 000000000000..19902df5bf81 --- /dev/null +++ b/x11-misc/shutter/shutter-0.86.4-r1.ebuild @@ -0,0 +1,65 @@ +# 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.86.4-r1.ebuild,v 1.1 2010/10/15 10:56:01 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 + dev-perl/gnome2-gconf + drawing? ( dev-perl/Goo-Canvas ) + webphoto? ( gnome-extra/gnome-web-photo ) + || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) + dev-perl/libxml-perl + dev-perl/gnome2-wnck + dev-perl/gnome2-canvas + dev-perl/gnome2-perl + dev-perl/Gtk2-ImageView + dev-perl/File-DesktopEntry + dev-perl/File-HomeDir + dev-perl/File-Which + 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}"/disable_webphoto.patch + use drawing || epatch "${FILESDIR}"/${PV}-disable-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 + 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" +} diff --git a/x11-misc/shutter/shutter-0.86.4.ebuild b/x11-misc/shutter/shutter-0.86.4.ebuild deleted file mode 100644 index a4e4786c9f58..000000000000 --- a/x11-misc/shutter/shutter-0.86.4.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# 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.86.4.ebuild,v 1.1 2010/10/10 10:36:26 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 - dev-perl/gnome2-gconf - drawing? ( dev-perl/Goo-Canvas ) - webphoto? ( gnome-extra/gnome-web-photo ) - || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) - dev-perl/libxml-perl - dev-perl/gnome2-wnck - dev-perl/gnome2-canvas - dev-perl/gnome2-perl - dev-perl/Gtk2-ImageView - dev-perl/File-DesktopEntry - dev-perl/File-HomeDir - dev-perl/File-Which - 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}"/disable_webphoto.patch - use drawing || epatch "${FILESDIR}"/${PV}-disable-goocanvas.patch -} - -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 - doman share/man/man1/${PN}.1.gz || die "doman failed" - 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" -} -- cgit v1.2.3-65-gdbad