burrow-owl has some fixes from upstream now

5 files changed, 9 insertions, 26 deletions

diff --git a/sci-chemistry/burrow-owl/ChangeLog b/sci-chemistry/burrow-owl/ChangeLog
index 302aee5d0..fff117d59 100644
--- a/sci-chemistry/burrow-owl/ChangeLog
+++ b/sci-chemistry/burrow-owl/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  10 Aug 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
+  -files/9999-include.patch, burrow-owl-9999_pre15.ebuild,
+  -files/9999_pre15-include.patch:
+  includes are fixed upstream
+
 *burrow-owl-9999_pre15 (09 Aug 2009)
 *burrow-owl-1.4 (09 Aug 2009)
 
diff --git a/sci-chemistry/burrow-owl/Manifest b/sci-chemistry/burrow-owl/Manifest
index 3711cb498..640f93568 100644
--- a/sci-chemistry/burrow-owl/Manifest
+++ b/sci-chemistry/burrow-owl/Manifest
@@ -1,10 +1,8 @@
 AUX 1.4-include.patch 384 RMD160 c2a0b652a10c5fbc5512d9268df6b6648ec78858 SHA1 bcd74e982c312a9d71a106c49bd5092df22efc7b SHA256 2a8c4036b4f259960c3656fe0204b8387554d5741b4f278bb3bbbc880e6d3a38
-AUX 9999-include.patch 394 RMD160 c915f5b0c38f77c216250dfde9a5125e70ffe7a7 SHA1 0678bbce753b44b9ae63809dbbf4be10a99405a6 SHA256 e07d769a0884cb543e43979121bd6da4ad2a0f1f7a03c67a1d6c65c52da966a5
-AUX 9999_pre15-include.patch 394 RMD160 c915f5b0c38f77c216250dfde9a5125e70ffe7a7 SHA1 0678bbce753b44b9ae63809dbbf4be10a99405a6 SHA256 e07d769a0884cb543e43979121bd6da4ad2a0f1f7a03c67a1d6c65c52da966a5
 AUX 9999_pre15-no-doc.patch 273 RMD160 d9373d42541423d583dfd9597db9e86443f44200 SHA1 2611ff91c391a496c98a67e86a24bcf9ed1c85ed SHA256 e67f3e23ef5a81c250a74ade140294086f14313858416b57c17c3a7db152f1af
 DIST burrow-demos.tar 80896000 RMD160 7666dfa982b87a9e8701f75259c5c0e4e2a23fb2 SHA1 8c9611907d325b58e79f85f248757d7cf469113c SHA256 f93e957889adab0521c6e3234f117cf984b7bb18ba6641a3edbdd30202db4b96
 DIST burrow-owl-1.4.tar.gz 1299459 RMD160 1fa546846392fbd441b486ee3e94b08f83b78d25 SHA1 bd13c2d28e6ffce7a04e331bc7b2353c50e1bbef SHA256 09544842d2092f9a817d5eb8621d407fddc4a6612c1ef350d7a1cd34feb23778
 EBUILD burrow-owl-1.4.ebuild 949 RMD160 6e8eb72115d9c0c2aad9e1456ee0cbf1a107ec99 SHA1 98aa24fefedf4f873ff889d7a40262f8a5fddf74 SHA256 f21c1b2a96c2a2925f99e60be7493f324017b7808b8599f0cdad81ec12ce15e4
-EBUILD burrow-owl-9999_pre15.ebuild 1479 RMD160 b42ac166778141e655f79310772f79de3eb18f8a SHA1 923f716f571e4342c7cff3f452760158fc4239e9 SHA256 21749ec377be1b60e429fdb6fdb8bf5c2b763569d7a6f9e52244fd0d1862c5f2
-MISC ChangeLog 521 RMD160 73ab231dcbd9c6eca356a1f8eec2ca2856fc81ce SHA1 af7a4d37afffbf14d0f705466b9db87a3ad1178f SHA256 61d3b036f8bb6f43a5a5e17bca2b535be29af55e409987802ba3ed5303e43f69
+EBUILD burrow-owl-9999_pre15.ebuild 1458 RMD160 da589171d6648d29d1d708aff8ccaf33d35989ca SHA1 e5c3bb92813330bd04f2be8beb71c3050f2943ab SHA256 1d73791193f8edbd75c1befd7dee791f81633ac8073827766355f44568b4ef83
+MISC ChangeLog 703 RMD160 1467ca9658d3bf2977c18de6d6d7852ee6c003a6 SHA1 3a7d163db579661bfa0868bab06e0d09dd7e3371 SHA256 ff4ea07ab2ff779ab1b4855c6bc294698a03b58786c8752f755009822e42f4e8
 MISC metadata.xml 215 RMD160 bc9c07aa91f2f175542244e4e4522a73558210a1 SHA1 facb283386de1c0b6b938cdcd4dde04d1694298b SHA256 13f32353652adbd3d934d41381cfc2cacc9e1127c508cebc73806cc1026ee80c
diff --git a/sci-chemistry/burrow-owl/burrow-owl-9999_pre15.ebuild b/sci-chemistry/burrow-owl/burrow-owl-9999_pre15.ebuild
index 3ec92a8ff..2b1cabfec 100644
--- a/sci-chemistry/burrow-owl/burrow-owl-9999_pre15.ebuild
+++ b/sci-chemistry/burrow-owl/burrow-owl-9999_pre15.ebuild
@@ -34,7 +34,7 @@ DEPEND="${RDEPEND}
 	dev-util/indent
 	dev-util/pkgconfig"
 
-EBZR_PATCHES="${PV}-no-doc.patch ${PV}-include.patch"
+EBZR_PATCHES="${PV}-no-doc.patch"
 
 src_unpack() {
 	if [[ ${PV} = 9999* ]]; then
@@ -48,7 +48,7 @@ src_unpack() {
 src_compile() {
 	econf || die
 	emake -j1 || die
-	}
+}
 
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
diff --git a/sci-chemistry/burrow-owl/files/9999-include.patch b/sci-chemistry/burrow-owl/files/9999-include.patch
deleted file mode 100644
index 3f20f2cd0..000000000
--- a/sci-chemistry/burrow-owl/files/9999-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- burrow/canvas/gw/canvas-spec.scm	2009-08-09 13:10:53.000000000 +0200
-+++ burrow/canvas/gw/canvas-spec.scm.new	2009-08-09 13:33:35.000000000 +0200
-@@ -17,6 +17,7 @@
-   (list (next-method)
-         "#include \"burrow/spectrum.h\"\n"
-         "#include \"burrow/canvas.h\"\n"
-+        "#include <guile-cairo/guile-cairo-smob-types.h>\n"
-         "\n"))
- 
-         ; couple of disabled sources
diff --git a/sci-chemistry/burrow-owl/files/9999_pre15-include.patch b/sci-chemistry/burrow-owl/files/9999_pre15-include.patch
deleted file mode 100644
index 3f20f2cd0..000000000
--- a/sci-chemistry/burrow-owl/files/9999_pre15-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- burrow/canvas/gw/canvas-spec.scm	2009-08-09 13:10:53.000000000 +0200
-+++ burrow/canvas/gw/canvas-spec.scm.new	2009-08-09 13:33:35.000000000 +0200
-@@ -17,6 +17,7 @@
-   (list (next-method)
-         "#include \"burrow/spectrum.h\"\n"
-         "#include \"burrow/canvas.h\"\n"
-+        "#include <guile-cairo/guile-cairo-smob-types.h>\n"
-         "\n"))
- 
-         ; couple of disabled sources