Gentoo Archives: gentoo-commits

From: Martin Mokrejs <mmokrejs@×××××××××××××××.cz>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: sci-biology/gbrowse/files/, sci-biology/gbrowse/
Date: Sat, 30 Jul 2011 15:43:51
Message-Id: f67b7b7711a847bed69fcec066f3aa4d3b42427d.mmokrejs@gentoo
1 commit: f67b7b7711a847bed69fcec066f3aa4d3b42427d
2 Author: Martin Mokrejs <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
3 AuthorDate: Sat Jul 30 15:43:31 2011 +0000
4 Commit: Martin Mokrejs <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
5 CommitDate: Sat Jul 30 15:43:31 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=f67b7b77
7
8 sci-biology/gbrowse: add missing brackets cause a perl error while exporting a PNG image
9
10 (Portage version: 2.1.10.7/git/Linux i686, unsigned Manifest commit)
11
12 ---
13 sci-biology/gbrowse/ChangeLog | 5 +++++
14 sci-biology/gbrowse/files/fix-PNG-export.patch | 11 +++++++++++
15 sci-biology/gbrowse/gbrowse-2.39.ebuild | 3 ++-
16 3 files changed, 18 insertions(+), 1 deletions(-)
17
18 diff --git a/sci-biology/gbrowse/ChangeLog b/sci-biology/gbrowse/ChangeLog
19 index 5c2bd3e..a55fdce 100644
20 --- a/sci-biology/gbrowse/ChangeLog
21 +++ b/sci-biology/gbrowse/ChangeLog
22 @@ -3,6 +3,11 @@
23 # $Header: /var/cvsroot/gentoo-x86/sci-biology/generic-genome-browser/ChangeLog,v 1.10 2007/07/29 17:07:38 phreak Exp $
24
25 30 Jul 2011; Martin Mokrejs <mmokrejs@×××××××××××××××.cz>
26 + gbrowse-2.39.ebuild, +files/fix-PNG-export.patch:
27 + sci-biology/gbrowse: add missing brackets cause a perl error while exporting
28 + a PNG image gbrowse-2.39.ebuild files/fix-PNG-export.patch
29 +
30 + 30 Jul 2011; Martin Mokrejs <mmokrejs@×××××××××××××××.cz>
31 gbrowse-2.39.ebuild, +files/destdir.patch:
32 added support for --destdir, patch sent to upstream gbrowse-2.39.ebuild
33
34
35 diff --git a/sci-biology/gbrowse/files/fix-PNG-export.patch b/sci-biology/gbrowse/files/fix-PNG-export.patch
36 new file mode 100644
37 index 0000000..469f752
38 --- /dev/null
39 +++ b/sci-biology/gbrowse/files/fix-PNG-export.patch
40 @@ -0,0 +1,11 @@
41 +--- lib/Bio/Graphics/Browser2/AuthorizedFeatureFile.pm.ori 2011-07-30 17:14:28.000000000 +0200
42 ++++ lib/Bio/Graphics/Browser2/AuthorizedFeatureFile.pm 2011-07-30 17:13:13.000000000 +0200
43 +@@ -30,7 +30,7 @@
44 + sub setting {
45 + my $self = shift;
46 + my ($label,$option,@rest) = @_ >= 2 ? @_ : ('general',@_);
47 +- $label = 'general' if lc $label eq 'general'; # buglet
48 ++ $label = 'general' if lc($label) eq 'general'; # buglet
49 + $self->SUPER::setting($label,$option,@rest);
50 + }
51 +
52
53 diff --git a/sci-biology/gbrowse/gbrowse-2.39.ebuild b/sci-biology/gbrowse/gbrowse-2.39.ebuild
54 index 35af68f..c0bcf25 100644
55 --- a/sci-biology/gbrowse/gbrowse-2.39.ebuild
56 +++ b/sci-biology/gbrowse/gbrowse-2.39.ebuild
57 @@ -90,7 +90,8 @@ src_prepare() {
58 sed -i 's/return unless -t STDIN/return/' install_util/GBrowseInstall.pm || die
59 sed -i 's/process_/bp_process_/g' INSTALL || die
60 epatch "${FILESDIR}"/GBrowseInstall.pm-"${PV}".patch || die "Failed to apply GBrowseInstall.pm-"${PV}".patch"
61 - epatch "${FILESDIR}"/destdir.patch || die "Failed to apply destdir.patch "
62 + epatch "${FILESDIR}"/destdir.patch || die "Failed to apply destdir.patch"
63 + epatch "${FILESDIR}"/fix-PNG-export.patch || die "Failed to apply fix-PNG-export.patch"
64 }
65
66 src_configure() {