Fix double installation of spectrum.h

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

5 files changed, 42 insertions, 12 deletions

diff --git a/sci-chemistry/burrow-owl/ChangeLog b/sci-chemistry/burrow-owl/ChangeLog
index 05bbaf3a0..553d67f63 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@gentoo.org> +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@gentoo.org> +files/9999-impl-dec.patch,
diff --git a/sci-chemistry/burrow-owl/Manifest b/sci-chemistry/burrow-owl/Manifest
index 809859011..aba8e66e3 100644
--- a/sci-chemistry/burrow-owl/Manifest
+++ b/sci-chemistry/burrow-owl/Manifest
@@ -1,11 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX 1.4-include.patch 384 RMD160 c2a0b652a10c5fbc5512d9268df6b6648ec78858 SHA1 bcd74e982c312a9d71a106c49bd5092df22efc7b SHA256 2a8c4036b4f259960c3656fe0204b8387554d5741b4f278bb3bbbc880e6d3a38
-AUX 9999-impl-dec.patch 865 RMD160 ec6ea531f88bc9ee45e0ead6e787b43b7563c690 SHA1 097c6d09c8029ff6567cfab4e1c7c128f854ab12 SHA256 190d000bc92b09aefaabf08751f9cd35afb301d461af744e0f30382f9fec80aa
+AUX 9999-header.patch 481 RMD160 8bac48b0490ebcec607a6d17aa306f97127b33dd SHA1 2408929a967375d8259b6a54369c002952369727 SHA256 a1f83bc076b530ce9dc481f1f2064cf21ed5ad4d713a19beadca27a0be76bfa9
+AUX 9999-impl-dec.patch 503 RMD160 81d0ccb45fd51e444fccbfd2976e0c42ac820499 SHA1 498f6cb0cf9ed4d0dd04a33191d6af5ef62e9777 SHA256 abc5dac073d35c5eb30038ee698651e34b3329d0fb2c78c2d5f3131965daafaf
 AUX 9999-no-doc.patch 273 RMD160 d9373d42541423d583dfd9597db9e86443f44200 SHA1 2611ff91c391a496c98a67e86a24bcf9ed1c85ed SHA256 e67f3e23ef5a81c250a74ade140294086f14313858416b57c17c3a7db152f1af
 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 913 RMD160 12299392117f297e98f02fa6b422d0172f39279b SHA1 d6e2cb2a24929ef6cad0f33efd2095416e830ab5 SHA256 a3799eefe33d77ea63dc772fe532f22017aec0bbbd2a8c9e55392f4585e111b2
-EBUILD burrow-owl-9999.ebuild 1409 RMD160 35e132b17301573a874078b56b5a5bc4c957fe8a SHA1 448f2704d2ae67d5c819f36b9acbdc01f6a6bc13 SHA256 ebcea7152bf9bc431d9655f94ed1fa0f5eabbe1a654ee6d79ad40c88c476bd87
+EBUILD burrow-owl-9999.ebuild 1561 RMD160 f430fd98ee5d99a6314b2c66e5fd4eea33333376 SHA1 f24480aa9aacec3bd2fb061f0ff09d4eb080656b SHA256 384e9ec78f1d41b2d4cf952cd209f253630be834c22115e1d695e8b63f7860d3
 EBUILD burrow-owl-9999_pre15.ebuild 1460 RMD160 de74648cea63f560fcecdb90ab535ca191397ee0 SHA1 dc4bda4a71fd5d6c9fac802bebd3be15c97e917f SHA256 db65195fb0730ae139f307c1c1cc82c9b7f722075f2755d1f43029a7eafd7801
-MISC ChangeLog 1158 RMD160 ad62875c7a48c4749cc0023fcf85fe9e81dc35eb SHA1 0b25ea4d41b0e5776808551e2f613eefdec94a24 SHA256 c54543e2bf2672be0645729b3b2dee9ce25e75be2d45ac6b40ab87cdcc0d820a
+MISC ChangeLog 1325 RMD160 b1845591cd30e66aa2ee16ebabe312ba3f18f99a SHA1 04db4cfccb2110aab0caa3c54b8984e52e034ae9 SHA256 e0d4d8bea7c5c1b69c1cf15a107103977120a72846c3418e52b875b855564a51
 MISC metadata.xml 238 RMD160 cd0b39e25cd42f2404497b73bce8d9986a9ac6a5 SHA1 38be74ebc9663ded25eb6b0cb91d766d49664c6d SHA256 4b782643f88737c34dec2720469ee0d472658eadfc37a694e6294c71f8961a30
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iEYEAREKAAYFAk8KmQMACgkQgAnW8HDreRYy7ACgpQwkHWoTfRh74Ebftk8USfUN
+YPYAoJAhkoVdBaTfU7Dki1LK+FlKbXz9
+=ySK2
+-----END PGP SIGNATURE-----
diff --git a/sci-chemistry/burrow-owl/burrow-owl-9999.ebuild b/sci-chemistry/burrow-owl/burrow-owl-9999.ebuild
index 5baa35f33..495d4db2c 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 000000000..6a42d400e
--- /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 9bb6e120c..461e3e691 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);