[gentoo-commits] proj/sci:master commit in: sci-chemistry/burrow-owl/, sci-chemistry/burrow-owl/files/

[Justin Lecher]

commit:     040e05b406e258170d2e49d508899fa53b93c86b
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  9 07:36:35 2012 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Jan  9 07:36:35 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=040e05b4

Fix double installation of spectrum.h

(Portage version: 2.2.0_alpha84/git/Linux x86_64, signed Manifest commit with key 70EB7916)

---
 sci-chemistry/burrow-owl/ChangeLog                 |    4 ++++
 sci-chemistry/burrow-owl/burrow-owl-9999.ebuild    |   10 +++++++++-
 sci-chemistry/burrow-owl/files/9999-header.patch   |   15 +++++++++++++++
 sci-chemistry/burrow-owl/files/9999-impl-dec.patch |    8 --------
 4 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/sci-chemistry/burrow-owl/ChangeLog b/sci-chemistry/burrow-owl/ChangeLog
index 05bbaf3..553d67f 100644
--- a/sci-chemistry/burrow-owl/ChangeLog
+++ b/sci-chemistry/burrow-owl/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  09 Jan 2012; Justin Lecher <jlec@g.o> +files/9999-header.patch,
+  files/9999-impl-dec.patch, burrow-owl-9999.ebuild:
+  Fix double installation of spectrum.h
+
 *burrow-owl-9999 (08 Jan 2012)
 
   08 Jan 2012; Justin Lecher <jlec@g.o> +files/9999-impl-dec.patch,

diff --git a/sci-chemistry/burrow-owl/burrow-owl-9999.ebuild b/sci-chemistry/burrow-owl/burrow-owl-9999.ebuild
index 5baa35f..495d4db 100644
--- a/sci-chemistry/burrow-owl/burrow-owl-9999.ebuild
+++ b/sci-chemistry/burrow-owl/burrow-owl-9999.ebuild
@@ -30,7 +30,7 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="examples"
+IUSE="doc examples static-libs"
 
 RDEPEND="
 	dev-scheme/guile-gnome-platform
@@ -44,6 +44,7 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	"${FILESDIR}"/${PV}-no-doc.patch
 	"${FILESDIR}"/${PV}-impl-dec.patch
+	"${FILESDIR}"/${PV}-header.patch
 	)
 
 MAKEOPTS+=" -j1"
@@ -57,6 +58,13 @@ src_unpack() {
 	fi
 }
 
+src_configure() {
+	local myeconfargs=(
+		$(use_with doc doxygen)
+	)
+	autotools-utils_src_configure
+}
+
 src_install() {
 	autotools-utils_src_install
 	if use examples; then

diff --git a/sci-chemistry/burrow-owl/files/9999-header.patch b/sci-chemistry/burrow-owl/files/9999-header.patch
new file mode 100644
index 0000000..6a42d40
--- /dev/null
+++ b/sci-chemistry/burrow-owl/files/9999-header.patch
@@ -0,0 +1,15 @@
+ burrow/spectrum/Makefile.am |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/burrow/spectrum/Makefile.am b/burrow/spectrum/Makefile.am
+index 18409cd..d9bc0ec 100644
+--- a/burrow/spectrum/Makefile.am
++++ b/burrow/spectrum/Makefile.am
+@@ -50,7 +50,6 @@ contour.h		       \
+ nih.h			       \
+ painter.h		       \
+ painter_bwps.h		       \
+-spectrum.h		       \
+ spectrum_segmented.h 	       \
+ spectrum_convoluted.h	       \
+ spectrum_diagonal_project.h    \

diff --git a/sci-chemistry/burrow-owl/files/9999-impl-dec.patch b/sci-chemistry/burrow-owl/files/9999-impl-dec.patch
index 9bb6e12..461e3e6 100644
--- a/sci-chemistry/burrow-owl/files/9999-impl-dec.patch
+++ b/sci-chemistry/burrow-owl/files/9999-impl-dec.patch
@@ -13,11 +13,3 @@ index 5e099d8..38040bb 100644
  
  /* for debugging purposes; make value available */
  static const gdouble datum_unknown_value_substitute=DATUM_UNKNOWN_VALUE_SUBSTITUTE;
-@@ -1023,7 +1024,6 @@ point_cache_store(HosSpectrum *spec, gsize idx, gdouble value)
-   if (point_cache_enable)
-     {
-       struct _point_cache_slot *slot = point_cache + point_cache_hash(spec, idx);
--      
-       gint old_version = g_atomic_pointer_get(&(slot->version));
-       slot->spec = NULL;
-       g_atomic_int_set(&(slot->version), old_version + 1);