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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/burrow-owl/, sci-chemistry/burrow-owl/files/
@ 2012-01-08 15:22 Justin Lecher
  0 siblings, 0 replies; 5+ messages in thread
From: Justin Lecher @ 2012-01-08 15:22 UTC (permalink / raw
  To: gentoo-commits

commit:     558a538717732e829c9862fedd6e804fee101e08
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  8 10:35:44 2012 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Jan  8 10:35:44 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=558a5387

Bumped to new upstream repo uri

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

---
 sci-chemistry/burrow-owl/ChangeLog                 |    8 ++-
 sci-chemistry/burrow-owl/burrow-owl-9999.ebuild    |   71 ++++++++++++++++++++
 sci-chemistry/burrow-owl/files/9999-impl-dec.patch |   23 ++++++
 sci-chemistry/burrow-owl/files/9999-no-doc.patch   |    9 +++
 sci-chemistry/burrow-owl/metadata.xml              |    8 +-
 5 files changed, 114 insertions(+), 5 deletions(-)

diff --git a/sci-chemistry/burrow-owl/ChangeLog b/sci-chemistry/burrow-owl/ChangeLog
index 4293a90..05bbaf3 100644
--- a/sci-chemistry/burrow-owl/ChangeLog
+++ b/sci-chemistry/burrow-owl/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for sci-chemistry/burrow-owl
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*burrow-owl-9999 (08 Jan 2012)
+
+  08 Jan 2012; Justin Lecher <jlec@gentoo.org> +files/9999-impl-dec.patch,
+  +files/9999-no-doc.patch, +burrow-owl-9999.ebuild, metadata.xml:
+  Bumped to new upstream repo uri
+
   07 Mar 2011; Justin Lecher <jlec@gentoo.org> burrow-owl-9999_pre15.ebuild:
   Correct Slots for gtk 3 introduction to tree
 

diff --git a/sci-chemistry/burrow-owl/burrow-owl-9999.ebuild b/sci-chemistry/burrow-owl/burrow-owl-9999.ebuild
new file mode 100644
index 0000000..5baa35f
--- /dev/null
+++ b/sci-chemistry/burrow-owl/burrow-owl-9999.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="git://burrow-owl.git.sourceforge.net/gitroot/burrow-owl/burrow-owl"
+	GIT="git-2"
+fi
+
+AUTOTOOLS_AUTORECONF="true"
+
+inherit autotools-utils ${GIT}
+
+SRC_PN="${PN/-owl}"
+SRC_P="${SRC_PN}-${PV}"
+
+DESCRIPTION="Visualize multidimensional nuclear magnetic resonance (NMR) spectra"
+HOMEPAGE="http://burrow-owl.sourceforge.net/"
+if [[ ${PV} = 9999* ]]; then
+	SRC_URI="examples? ( mirror://sourceforge/${PN}/${SRC_PN}-demos.tar )"
+else
+	SRC_URI="
+		mirror://sourceforge/${PN}/${SRC_P}.tar.gz
+		examples? ( mirror://sourceforge/${PN}/${SRC_PN}-demos.tar )"
+	S="${WORKDIR}/${SRC_P}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+RDEPEND="
+	dev-scheme/guile-gnome-platform
+	>=dev-scheme/guile-cairo-1.4
+	>=sci-libs/starparse-1.0
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	dev-util/indent
+	dev-util/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-no-doc.patch
+	"${FILESDIR}"/${PV}-impl-dec.patch
+	)
+
+MAKEOPTS+=" -j1"
+
+src_unpack() {
+	if [[ ${PV} = 9999* ]]; then
+		git-2_src_unpack
+		use examples && unpack ${A}
+	else
+		unpack ${A}
+	fi
+}
+
+src_install() {
+	autotools-utils_src_install
+	if use examples; then
+		pushd "${WORKDIR}"/burrow-demos
+		docinto demonstration
+		dodoc *
+		cd data
+		docinto demonstration/data
+		dodoc *
+		popd
+	fi
+}

diff --git a/sci-chemistry/burrow-owl/files/9999-impl-dec.patch b/sci-chemistry/burrow-owl/files/9999-impl-dec.patch
new file mode 100644
index 0000000..9bb6e12
--- /dev/null
+++ b/sci-chemistry/burrow-owl/files/9999-impl-dec.patch
@@ -0,0 +1,23 @@
+ burrow/spectrum/spectrum.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/burrow/spectrum/spectrum.c b/burrow/spectrum/spectrum.c
+index 5e099d8..38040bb 100644
+--- a/burrow/spectrum/spectrum.c
++++ b/burrow/spectrum/spectrum.c
+@@ -35,6 +35,7 @@
+ #include "spectrum_priv.h"
+ #include "skiplist.h"
+ #include "debug.h"
++#include <stdlib.h>
+ 
+ /* 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);

diff --git a/sci-chemistry/burrow-owl/files/9999-no-doc.patch b/sci-chemistry/burrow-owl/files/9999-no-doc.patch
new file mode 100644
index 0000000..d7773d7
--- /dev/null
+++ b/sci-chemistry/burrow-owl/files/9999-no-doc.patch
@@ -0,0 +1,9 @@
+--- Makefile.am	2009-08-09 12:52:21.000000000 +0200
++++ Makefile.am.new	2009-08-09 12:56:37.000000000 +0200
+@@ -1,5 +1,5 @@
+ 
+-SUBDIRS = burrow test-suite doc benchmarks
++SUBDIRS = burrow test-suite benchmarks
+ bin_SCRIPTS=wrapper/burrow
+ 
+ scriptdir=$(pkgdatadir)/scripts

diff --git a/sci-chemistry/burrow-owl/metadata.xml b/sci-chemistry/burrow-owl/metadata.xml
index efb490d..d747d72 100644
--- a/sci-chemistry/burrow-owl/metadata.xml
+++ b/sci-chemistry/burrow-owl/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<maintainer>
-  <email>sci@gentoo.org</email>
-</maintainer>
+	<herd>sci</herd>
+	<maintainer>
+		<email>sci@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>



^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/burrow-owl/, sci-chemistry/burrow-owl/files/
@ 2012-01-09  7:37 Justin Lecher
  0 siblings, 0 replies; 5+ messages in thread
From: Justin Lecher @ 2012-01-09  7:37 UTC (permalink / raw
  To: gentoo-commits

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@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/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);



^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/burrow-owl/, sci-chemistry/burrow-owl/files/
@ 2012-01-10  9:30 Justin Lecher
  0 siblings, 0 replies; 5+ messages in thread
From: Justin Lecher @ 2012-01-10  9:30 UTC (permalink / raw
  To: gentoo-commits

commit:     ec32b3f04bd5336220f500f14fd805be8bb6ea55
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 10 07:32:41 2012 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Jan 10 07:32:41 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=ec32b3f0

Remove patch, fixed upstream

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

---
 sci-chemistry/burrow-owl/ChangeLog               |    8 ++++++++
 sci-chemistry/burrow-owl/burrow-owl-9999.ebuild  |    1 -
 sci-chemistry/burrow-owl/files/9999-header.patch |   15 ---------------
 3 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/sci-chemistry/burrow-owl/ChangeLog b/sci-chemistry/burrow-owl/ChangeLog
index 553d67f..7002ae4 100644
--- a/sci-chemistry/burrow-owl/ChangeLog
+++ b/sci-chemistry/burrow-owl/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  10 Jan 2012; Justin Lecher <jlec@gentoo.org> -files/9999-header.patch,
+  burrow-owl-9999.ebuild:
+  Remove patch, fixed upstream
+
+  10 Jan 2012; Justin Lecher <jlec@gentoo.org> -files/9999-header.patch,
+  burrow-owl-9999.ebuild:
+  Remove patch, fixed upstream
+
   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

diff --git a/sci-chemistry/burrow-owl/burrow-owl-9999.ebuild b/sci-chemistry/burrow-owl/burrow-owl-9999.ebuild
index 495d4db..cbf05b2 100644
--- a/sci-chemistry/burrow-owl/burrow-owl-9999.ebuild
+++ b/sci-chemistry/burrow-owl/burrow-owl-9999.ebuild
@@ -44,7 +44,6 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	"${FILESDIR}"/${PV}-no-doc.patch
 	"${FILESDIR}"/${PV}-impl-dec.patch
-	"${FILESDIR}"/${PV}-header.patch
 	)
 
 MAKEOPTS+=" -j1"

diff --git a/sci-chemistry/burrow-owl/files/9999-header.patch b/sci-chemistry/burrow-owl/files/9999-header.patch
deleted file mode 100644
index 6a42d40..0000000
--- a/sci-chemistry/burrow-owl/files/9999-header.patch
+++ /dev/null
@@ -1,15 +0,0 @@
- 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    \



^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/burrow-owl/, sci-chemistry/burrow-owl/files/
@ 2012-02-19 12:44 Justin Lecher
  0 siblings, 0 replies; 5+ messages in thread
From: Justin Lecher @ 2012-02-19 12:44 UTC (permalink / raw
  To: gentoo-commits

commit:     30c765bc612ff5a436e42c2b534c553433abdee1
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 14 20:19:57 2012 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Feb 14 20:19:57 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=30c765bc

Fix for HEAD

(Portage version: 2.2.0_alpha86/git/Linux x86_64, unsigned Manifest commit)

---
 sci-chemistry/burrow-owl/ChangeLog                 |    7 ++
 sci-chemistry/burrow-owl/burrow-owl-1.4.ebuild     |   43 -------------
 sci-chemistry/burrow-owl/burrow-owl-9999.ebuild    |   65 ++++++++------------
 .../burrow-owl/burrow-owl-9999_pre15.ebuild        |   66 --------------------
 sci-chemistry/burrow-owl/files/1.4-include.patch   |   10 ---
 sci-chemistry/burrow-owl/files/9999-no-doc.patch   |    9 ---
 .../burrow-owl/files/9999_pre15-no-doc.patch       |    9 ---
 ...pl-dec.patch => burrow-owl-9999-impl-dec.patch} |    0
 .../burrow-owl/files/burrow-owl-9999-prll.patch    |   20 ++++++
 9 files changed, 52 insertions(+), 177 deletions(-)

diff --git a/sci-chemistry/burrow-owl/ChangeLog b/sci-chemistry/burrow-owl/ChangeLog
index 7002ae4..dc721a3 100644
--- a/sci-chemistry/burrow-owl/ChangeLog
+++ b/sci-chemistry/burrow-owl/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Feb 2012; Justin Lecher <jlec@gentoo.org> -files/1.4-include.patch,
+  -burrow-owl-1.4.ebuild, -burrow-owl-9999_pre15.ebuild,
+  burrow-owl-9999.ebuild, +files/burrow-owl-9999-impl-dec.patch,
+  +files/burrow-owl-9999-prll.patch, -files/9999-impl-dec.patch,
+  -files/9999-no-doc.patch, -files/9999_pre15-no-doc.patch:
+  Fix for HEAD
+
   10 Jan 2012; Justin Lecher <jlec@gentoo.org> -files/9999-header.patch,
   burrow-owl-9999.ebuild:
   Remove patch, fixed upstream

diff --git a/sci-chemistry/burrow-owl/burrow-owl-1.4.ebuild b/sci-chemistry/burrow-owl/burrow-owl-1.4.ebuild
deleted file mode 100644
index 6e1230e..0000000
--- a/sci-chemistry/burrow-owl/burrow-owl-1.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit base
-
-DESCRIPTION="Visualize multidimensional nuclear magnetic resonance (NMR) spectra"
-HOMEPAGE="http://burrow-owl.sourceforge.net/"
-SRC_URI="examples? ( mirror://sourceforge/${PN}/burrow-demos.tar )
-		mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-RDEPEND="
-	dev-scheme/guile-gnome-platform
-	>=dev-scheme/guile-cairo-1.4
-	>=sci-libs/starparse-1.0
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	dev-util/indent
-	dev-util/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-include.patch
-	)
-
-src_install() {
-	base_src_install
-	if use examples; then
-		pushd "${WORKDIR}"/burrow-demos
-		docinto demonstration
-		dodoc * || die "dodoc demo failed"
-		cd data
-		docinto demonstration/data
-		dodoc * || die "dodoc data failed"
-		popd
-	fi
-}

diff --git a/sci-chemistry/burrow-owl/burrow-owl-9999.ebuild b/sci-chemistry/burrow-owl/burrow-owl-9999.ebuild
index cbf05b2..de9b5b9 100644
--- a/sci-chemistry/burrow-owl/burrow-owl-9999.ebuild
+++ b/sci-chemistry/burrow-owl/burrow-owl-9999.ebuild
@@ -4,28 +4,14 @@
 
 EAPI=4
 
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="git://burrow-owl.git.sourceforge.net/gitroot/burrow-owl/burrow-owl"
-	GIT="git-2"
-fi
-
 AUTOTOOLS_AUTORECONF="true"
 
-inherit autotools-utils ${GIT}
-
-SRC_PN="${PN/-owl}"
-SRC_P="${SRC_PN}-${PV}"
+inherit autotools-utils git-2
 
 DESCRIPTION="Visualize multidimensional nuclear magnetic resonance (NMR) spectra"
 HOMEPAGE="http://burrow-owl.sourceforge.net/"
-if [[ ${PV} = 9999* ]]; then
-	SRC_URI="examples? ( mirror://sourceforge/${PN}/${SRC_PN}-demos.tar )"
-else
-	SRC_URI="
-		mirror://sourceforge/${PN}/${SRC_P}.tar.gz
-		examples? ( mirror://sourceforge/${PN}/${SRC_PN}-demos.tar )"
-	S="${WORKDIR}/${SRC_P}"
-fi
+SRC_URI="examples? ( mirror://sourceforge/${PN}/burrow-demos.tar )"
+EGIT_REPO_URI="git://burrow-owl.git.sourceforge.net/gitroot/burrow-owl/burrow-owl"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -33,46 +19,45 @@ KEYWORDS="~amd64 ~x86"
 IUSE="doc examples static-libs"
 
 RDEPEND="
+	dev-libs/g-wrap
+	dev-libs/glib:2
+	dev-scheme/guile[networking,regex]
+	dev-scheme/guile-cairo
 	dev-scheme/guile-gnome-platform
-	>=dev-scheme/guile-cairo-1.4
-	>=sci-libs/starparse-1.0
+	sci-libs/starparse
 	x11-libs/gtk+:2"
 DEPEND="${RDEPEND}
 	dev-util/indent
-	dev-util/pkgconfig"
+	dev-util/pkgconfig
+	doc? ( app-doc/doxygen )
+"
 
 PATCHES=(
-	"${FILESDIR}"/${PV}-no-doc.patch
-	"${FILESDIR}"/${PV}-impl-dec.patch
+	"${FILESDIR}"/${P}-prll.patch
+	"${FILESDIR}"/${P}-impl-dec.patch
 	)
 
-MAKEOPTS+=" -j1"
-
 src_unpack() {
-	if [[ ${PV} = 9999* ]]; then
-		git-2_src_unpack
-		use examples && unpack ${A}
-	else
-		unpack ${A}
-	fi
+	git-2_src_unpack
+	use examples && unpack ${A}
 }
 
 src_configure() {
 	local myeconfargs=(
-		$(use_with doc doxygen)
+		$(use_with doc doxygen doxygen)
 	)
 	autotools-utils_src_configure
 }
 
+src_test () {
+	autotools-utils_src_compile -C test-suite check
+}
+
 src_install() {
+	use doc && HTML_DOCS=("${AUTOTOOLS_BUILD_DIR}/doc/api/html/")
 	autotools-utils_src_install
-	if use examples; then
-		pushd "${WORKDIR}"/burrow-demos
-		docinto demonstration
-		dodoc *
-		cd data
-		docinto demonstration/data
-		dodoc *
-		popd
-	fi
+
+	use examples && \
+		insinto /usr/share/${PN} && \
+		doins -r "${WORKDIR}"/burrow-demos/*
 }

diff --git a/sci-chemistry/burrow-owl/burrow-owl-9999_pre15.ebuild b/sci-chemistry/burrow-owl/burrow-owl-9999_pre15.ebuild
deleted file mode 100644
index 0345bfd..0000000
--- a/sci-chemistry/burrow-owl/burrow-owl-9999_pre15.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-if [[ ${PV} = 9999* ]]; then
-	EBZR_REPO_URI="http://oregonstate.edu/~benisong/software/projects/burrow-owl/releases/1.5"
-	EBZR_BOOTSTRAP="eautoreconf"
-	BZR="bzr"
-fi
-
-inherit autotools ${BZR}
-
-SRC_PN="${PN/-owl}"
-SRC_P="${SRC_PN}-${PV}"
-
-DESCRIPTION="Visualize multidimensional nuclear magnetic resonance (NMR) spectra"
-HOMEPAGE="http://burrow-owl.sourceforge.net/"
-if [[ ${PV} = 9999* ]]; then
-	SRC_URI="examples? ( mirror://sourceforge/${PN}/${SRC_PN}-demos.tar )"
-else
-	SRC_URI="mirror://sourceforge/${PN}/${SRC_P}.tar.gz
-		examples? ( mirror://sourceforge/${PN}/${SRC_PN}-demos.tar )"
-	S="${WORKDIR}/${SRC_P}"
-fi
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-RDEPEND="
-	dev-scheme/guile-gnome-platform
-	>=dev-scheme/guile-cairo-1.4
-	>=sci-libs/starparse-1.0
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	dev-util/indent
-	dev-util/pkgconfig"
-
-EBZR_PATCHES="${PV}-no-doc.patch"
-
-src_unpack() {
-	if [[ ${PV} = 9999* ]]; then
-		bzr_src_unpack
-		use examples && unpack ${A}
-	else
-		unpack ${A}
-	fi
-}
-
-src_compile() {
-	emake -j1 || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	if use examples; then
-		pushd "${WORKDIR}"/burrow-demos
-		docinto demonstration
-		dodoc * || die "dodoc demo failed"
-		cd data
-		docinto demonstration/data
-		dodoc * || die "dodoc data failed"
-		popd
-	fi
-}

diff --git a/sci-chemistry/burrow-owl/files/1.4-include.patch b/sci-chemistry/burrow-owl/files/1.4-include.patch
deleted file mode 100644
index 3ca2ac9..0000000
--- a/sci-chemistry/burrow-owl/files/1.4-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/gw/spectrum-spec.scm	2008-04-26 06:59:58.000000000 +0200
-+++ src/gw/spectrum-spec.scm.new	2009-08-09 23:16:39.000000000 +0200
-@@ -30,6 +30,7 @@
-         "#include <painter_gdk.h>\n"
-         "#include <burrow/nih.h>\n"
-         "#include <hosbackingsim.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-no-doc.patch b/sci-chemistry/burrow-owl/files/9999-no-doc.patch
deleted file mode 100644
index d7773d7..0000000
--- a/sci-chemistry/burrow-owl/files/9999-no-doc.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- Makefile.am	2009-08-09 12:52:21.000000000 +0200
-+++ Makefile.am.new	2009-08-09 12:56:37.000000000 +0200
-@@ -1,5 +1,5 @@
- 
--SUBDIRS = burrow test-suite doc benchmarks
-+SUBDIRS = burrow test-suite benchmarks
- bin_SCRIPTS=wrapper/burrow
- 
- scriptdir=$(pkgdatadir)/scripts

diff --git a/sci-chemistry/burrow-owl/files/9999_pre15-no-doc.patch b/sci-chemistry/burrow-owl/files/9999_pre15-no-doc.patch
deleted file mode 100644
index d7773d7..0000000
--- a/sci-chemistry/burrow-owl/files/9999_pre15-no-doc.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- Makefile.am	2009-08-09 12:52:21.000000000 +0200
-+++ Makefile.am.new	2009-08-09 12:56:37.000000000 +0200
-@@ -1,5 +1,5 @@
- 
--SUBDIRS = burrow test-suite doc benchmarks
-+SUBDIRS = burrow test-suite benchmarks
- bin_SCRIPTS=wrapper/burrow
- 
- scriptdir=$(pkgdatadir)/scripts

diff --git a/sci-chemistry/burrow-owl/files/9999-impl-dec.patch b/sci-chemistry/burrow-owl/files/burrow-owl-9999-impl-dec.patch
similarity index 100%
rename from sci-chemistry/burrow-owl/files/9999-impl-dec.patch
rename to sci-chemistry/burrow-owl/files/burrow-owl-9999-impl-dec.patch

diff --git a/sci-chemistry/burrow-owl/files/burrow-owl-9999-prll.patch b/sci-chemistry/burrow-owl/files/burrow-owl-9999-prll.patch
new file mode 100644
index 0000000..340ccd2
--- /dev/null
+++ b/sci-chemistry/burrow-owl/files/burrow-owl-9999-prll.patch
@@ -0,0 +1,20 @@
+ burrow/canvas/gw/Makefile.am |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/burrow/canvas/gw/Makefile.am b/burrow/canvas/gw/Makefile.am
+index da50ee3..2ed89bc 100644
+--- a/burrow/canvas/gw/Makefile.am
++++ b/burrow/canvas/gw/Makefile.am
+@@ -31,9 +31,11 @@ H2DEF=@top_srcdir@/utils/h2def.py
+ canvas.defs: $(HEADERS_1)
+ 	$(H2DEF) --all $(HEADERS_1) > $@
+ 
+-canvas-gw.c canvas-gw.h canvas-gw.scm: canvas.defs
++canvas-gw.c canvas-gw.h: canvas.defs
+ 	GUILE_LOAD_PATH=@srcdir@:@builddir@:@GUILE_GNOME_MODULE_DIR@:@G_WRAP_MODULE_DIR@:$$GUILE_LOAD_PATH $(GUILE) -s @srcdir@/run-g-wrap.scm
+ 
++BUILT_SOURCES=canvas-gw.c canvas-gw.h canvas.defs
++
+ INCLUDES=@GTK_CFLAGS@ @G_WRAP_CFLAGS@ @GUILE_GNOME_CFLAGS@ @GUILE_CAIRO_CFLAGS@ @GUILE_CFLAGS@ -I$(headers_dir) -I@top_srcdir@
+ 
+ moduledir=$(datadir)/guile/burrow



^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/burrow-owl/, sci-chemistry/burrow-owl/files/
@ 2021-01-12 20:28 Andrew Ammerlaan
  0 siblings, 0 replies; 5+ messages in thread
From: Andrew Ammerlaan @ 2021-01-12 20:28 UTC (permalink / raw
  To: gentoo-commits

commit:     0e7aed19ea0a3958b5433edb963b97c8aa0e566b
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Tue Jan 12 20:18:34 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Tue Jan 12 20:28:00 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=0e7aed19

sci-chemistry/burrow-owl: remove old pack, 3 missing deps, also removed in ::gentoo

last update in 2013, is missing three dependencies

Bug: https://bugs.gentoo.org/693290

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>

 sci-chemistry/burrow-owl/burrow-owl-9999.ebuild    | 63 ----------------------
 .../files/burrow-owl-9999-impl-dec.patch           | 15 ------
 .../burrow-owl/files/burrow-owl-9999-prll.patch    | 20 -------
 sci-chemistry/burrow-owl/metadata.xml              | 11 ----
 4 files changed, 109 deletions(-)

diff --git a/sci-chemistry/burrow-owl/burrow-owl-9999.ebuild b/sci-chemistry/burrow-owl/burrow-owl-9999.ebuild
deleted file mode 100644
index 0e62aceee..000000000
--- a/sci-chemistry/burrow-owl/burrow-owl-9999.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF="true"
-
-inherit autotools-utils git-r3 virtualx
-
-DESCRIPTION="Visualize multidimensional nuclear magnetic resonance (NMR) spectra"
-HOMEPAGE="http://burrow-owl.sourceforge.net/"
-SRC_URI="examples? ( mirror://sourceforge/${PN}/burrow-demos.tar )"
-EGIT_REPO_URI="git://burrow-owl.git.sourceforge.net/gitroot/burrow-owl/burrow-owl"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="doc examples static-libs"
-
-RDEPEND="
-	dev-libs/g-wrap
-	dev-libs/glib:2
-	dev-scheme/guile:12=[networking,regex]
-	dev-scheme/guile-cairo
-	dev-scheme/guile-gnome-platform
-	sci-libs/starparse
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	dev-util/indent
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-prll.patch
-	"${FILESDIR}"/${P}-impl-dec.patch
-	)
-
-src_unpack() {
-	git-r3_src_unpack
-	use examples && unpack ${A}
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with doc doxygen doxygen)
-	)
-	autotools-utils_src_configure
-}
-
-src_test () {
-	VIRTUALX_COMMAND="autotools-utils_src_compile -C test-suite check"
-	virtualmake
-}
-
-src_install() {
-	use doc && HTML_DOCS=( "${AUTOTOOLS_BUILD_DIR}/doc/api/html/." )
-	autotools-utils_src_install
-
-	use examples && \
-		insinto /usr/share/${PN} && \
-		doins -r "${WORKDIR}"/burrow-demos/*
-}

diff --git a/sci-chemistry/burrow-owl/files/burrow-owl-9999-impl-dec.patch b/sci-chemistry/burrow-owl/files/burrow-owl-9999-impl-dec.patch
deleted file mode 100644
index 461e3e691..000000000
--- a/sci-chemistry/burrow-owl/files/burrow-owl-9999-impl-dec.patch
+++ /dev/null
@@ -1,15 +0,0 @@
- burrow/spectrum/spectrum.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/burrow/spectrum/spectrum.c b/burrow/spectrum/spectrum.c
-index 5e099d8..38040bb 100644
---- a/burrow/spectrum/spectrum.c
-+++ b/burrow/spectrum/spectrum.c
-@@ -35,6 +35,7 @@
- #include "spectrum_priv.h"
- #include "skiplist.h"
- #include "debug.h"
-+#include <stdlib.h>
- 
- /* for debugging purposes; make value available */
- static const gdouble datum_unknown_value_substitute=DATUM_UNKNOWN_VALUE_SUBSTITUTE;

diff --git a/sci-chemistry/burrow-owl/files/burrow-owl-9999-prll.patch b/sci-chemistry/burrow-owl/files/burrow-owl-9999-prll.patch
deleted file mode 100644
index 340ccd236..000000000
--- a/sci-chemistry/burrow-owl/files/burrow-owl-9999-prll.patch
+++ /dev/null
@@ -1,20 +0,0 @@
- burrow/canvas/gw/Makefile.am |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/burrow/canvas/gw/Makefile.am b/burrow/canvas/gw/Makefile.am
-index da50ee3..2ed89bc 100644
---- a/burrow/canvas/gw/Makefile.am
-+++ b/burrow/canvas/gw/Makefile.am
-@@ -31,9 +31,11 @@ H2DEF=@top_srcdir@/utils/h2def.py
- canvas.defs: $(HEADERS_1)
- 	$(H2DEF) --all $(HEADERS_1) > $@
- 
--canvas-gw.c canvas-gw.h canvas-gw.scm: canvas.defs
-+canvas-gw.c canvas-gw.h: canvas.defs
- 	GUILE_LOAD_PATH=@srcdir@:@builddir@:@GUILE_GNOME_MODULE_DIR@:@G_WRAP_MODULE_DIR@:$$GUILE_LOAD_PATH $(GUILE) -s @srcdir@/run-g-wrap.scm
- 
-+BUILT_SOURCES=canvas-gw.c canvas-gw.h canvas.defs
-+
- INCLUDES=@GTK_CFLAGS@ @G_WRAP_CFLAGS@ @GUILE_GNOME_CFLAGS@ @GUILE_CAIRO_CFLAGS@ @GUILE_CFLAGS@ -I$(headers_dir) -I@top_srcdir@
- 
- moduledir=$(datadir)/guile/burrow

diff --git a/sci-chemistry/burrow-owl/metadata.xml b/sci-chemistry/burrow-owl/metadata.xml
deleted file mode 100644
index d78ba4b82..000000000
--- a/sci-chemistry/burrow-owl/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sci-chemistry@gentoo.org</email>
-		<name>Gentoo Chemistry Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">burrow-owl</remote-id>
-	</upstream>
-</pkgmetadata>


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2021-01-12 20:28 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-01-08 15:22 [gentoo-commits] proj/sci:master commit in: sci-chemistry/burrow-owl/, sci-chemistry/burrow-owl/files/ Justin Lecher
  -- strict thread matches above, loose matches on Subject: below --
2012-01-09  7:37 Justin Lecher
2012-01-10  9:30 Justin Lecher
2012-02-19 12:44 Justin Lecher
2021-01-12 20:28 Andrew Ammerlaan

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox