Gentoo Archives: gentoo-commits

From: Justin Lecher <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: sci-chemistry/burrow-owl/, sci-chemistry/burrow-owl/files/
Date: Tue, 10 Jan 2012 09:30:24
Message-Id: ec32b3f04bd5336220f500f14fd805be8bb6ea55.jlec@gentoo
1 commit: ec32b3f04bd5336220f500f14fd805be8bb6ea55
2 Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jan 10 07:32:41 2012 +0000
4 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 10 07:32:41 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=ec32b3f0
7
8 Remove patch, fixed upstream
9
10 (Portage version: 2.2.0_alpha84/git/Linux x86_64, signed Manifest commit with key 70EB7916)
11
12 ---
13 sci-chemistry/burrow-owl/ChangeLog | 8 ++++++++
14 sci-chemistry/burrow-owl/burrow-owl-9999.ebuild | 1 -
15 sci-chemistry/burrow-owl/files/9999-header.patch | 15 ---------------
16 3 files changed, 8 insertions(+), 16 deletions(-)
17
18 diff --git a/sci-chemistry/burrow-owl/ChangeLog b/sci-chemistry/burrow-owl/ChangeLog
19 index 553d67f..7002ae4 100644
20 --- a/sci-chemistry/burrow-owl/ChangeLog
21 +++ b/sci-chemistry/burrow-owl/ChangeLog
22 @@ -2,6 +2,14 @@
23 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
24 # $Header: $
25
26 + 10 Jan 2012; Justin Lecher <jlec@g.o> -files/9999-header.patch,
27 + burrow-owl-9999.ebuild:
28 + Remove patch, fixed upstream
29 +
30 + 10 Jan 2012; Justin Lecher <jlec@g.o> -files/9999-header.patch,
31 + burrow-owl-9999.ebuild:
32 + Remove patch, fixed upstream
33 +
34 09 Jan 2012; Justin Lecher <jlec@g.o> +files/9999-header.patch,
35 files/9999-impl-dec.patch, burrow-owl-9999.ebuild:
36 Fix double installation of spectrum.h
37
38 diff --git a/sci-chemistry/burrow-owl/burrow-owl-9999.ebuild b/sci-chemistry/burrow-owl/burrow-owl-9999.ebuild
39 index 495d4db..cbf05b2 100644
40 --- a/sci-chemistry/burrow-owl/burrow-owl-9999.ebuild
41 +++ b/sci-chemistry/burrow-owl/burrow-owl-9999.ebuild
42 @@ -44,7 +44,6 @@ DEPEND="${RDEPEND}
43 PATCHES=(
44 "${FILESDIR}"/${PV}-no-doc.patch
45 "${FILESDIR}"/${PV}-impl-dec.patch
46 - "${FILESDIR}"/${PV}-header.patch
47 )
48
49 MAKEOPTS+=" -j1"
50
51 diff --git a/sci-chemistry/burrow-owl/files/9999-header.patch b/sci-chemistry/burrow-owl/files/9999-header.patch
52 deleted file mode 100644
53 index 6a42d40..0000000
54 --- a/sci-chemistry/burrow-owl/files/9999-header.patch
55 +++ /dev/null
56 @@ -1,15 +0,0 @@
57 - burrow/spectrum/Makefile.am | 1 -
58 - 1 files changed, 0 insertions(+), 1 deletions(-)
59 -
60 -diff --git a/burrow/spectrum/Makefile.am b/burrow/spectrum/Makefile.am
61 -index 18409cd..d9bc0ec 100644
62 ---- a/burrow/spectrum/Makefile.am
63 -+++ b/burrow/spectrum/Makefile.am
64 -@@ -50,7 +50,6 @@ contour.h \
65 - nih.h \
66 - painter.h \
67 - painter_bwps.h \
68 --spectrum.h \
69 - spectrum_segmented.h \
70 - spectrum_convoluted.h \
71 - spectrum_diagonal_project.h \