Version Bump and removal of old, #252634

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

6 files changed, 78 insertions, 61 deletions

diff --git a/sci-chemistry/burrow-owl/ChangeLog b/sci-chemistry/burrow-owl/ChangeLog
index d25ab1da590b..e779b06fc85f 100644
--- a/sci-chemistry/burrow-owl/ChangeLog
+++ b/sci-chemistry/burrow-owl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-chemistry/burrow-owl
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/burrow-owl/ChangeLog,v 1.1 2007/06/06 23:32:33 dberkholz Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/burrow-owl/ChangeLog,v 1.2 2010/06/24 11:39:36 jlec Exp $
+
+*burrow-owl-1.4 (24 Jun 2010)
+
+  24 Jun 2010; Justin Lecher <jlec@gentoo.org> +files/1.4-include.patch,
+  -burrow-owl-1.2.ebuild, -files/burrow-owl-1.2-make-script-dir.patch,
+  +burrow-owl-1.4.ebuild:
+  Version Bump and removal of old, #252634
 
 *burrow-owl-1.2 (06 Jun 2007)
 
diff --git a/sci-chemistry/burrow-owl/Manifest b/sci-chemistry/burrow-owl/Manifest
index 24b65aa41ae4..77c5c219ea69 100644
--- a/sci-chemistry/burrow-owl/Manifest
+++ b/sci-chemistry/burrow-owl/Manifest
@@ -1,6 +1,16 @@
-AUX burrow-owl-1.2-make-script-dir.patch 379 RMD160 88406bb9900d368da3abb78b4469a1550a4f7f1f SHA1 f7f0603c7eaf88a53f840e49666ff5bff3f347b6 SHA256 731d643051de476a898214fbfb92bea322a3253cb2f91b780a387808f129d7c2
-DIST burrow-1.2.tar.gz 2203420 RMD160 a8142667db803dbd1092c1a1799e9e7305131a73 SHA1 bf3efa6589260f5761f13465dfe925b602532182 SHA256 54443f3fa5b9ccc5e33369c6f93f645640394bdc2a46817123811c6520e0d889
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 1.4-include.patch 407 RMD160 deeea3c56acffb2454b25071b8baf4feb6ff6d7c SHA1 67b832d12168568d5604a601dd3f788da0d934cd SHA256 699674e48d2321e4e9049e8da0229179dda19316b624fd3895571a02cbffeacb
 DIST burrow-demos.tar 80896000 RMD160 7666dfa982b87a9e8701f75259c5c0e4e2a23fb2 SHA1 8c9611907d325b58e79f85f248757d7cf469113c SHA256 f93e957889adab0521c6e3234f117cf984b7bb18ba6641a3edbdd30202db4b96
-EBUILD burrow-owl-1.2.ebuild 1135 RMD160 4e52e48b36d43e734e98dc20d33177fcd8dca970 SHA1 41a2484c8d28edd8800d8b1d9046f2f858d3e362 SHA256 670b90a76f694026a27d107f927b3230f9f0abdabfbe9996ecbb052fe21f4378
-MISC ChangeLog 487 RMD160 d8bbeae5d62c42bfe22447e2dfb1adf83d273d92 SHA1 6d8f4531c2ffb85411c8c6954bd2e7eaba3f5f6d SHA256 d546a65dbb757c244ed71737939ad11c40222882d60d9fc2b4d159fdb886699f
+DIST burrow-owl-1.4.tar.gz 1299459 RMD160 1fa546846392fbd441b486ee3e94b08f83b78d25 SHA1 bd13c2d28e6ffce7a04e331bc7b2353c50e1bbef SHA256 09544842d2092f9a817d5eb8621d407fddc4a6612c1ef350d7a1cd34feb23778
+EBUILD burrow-owl-1.4.ebuild 1019 RMD160 35b1ccb643fb3191bfe2046912cceff3150eb76f SHA1 1c1efdbbb1a6087ad70cba73dabced70a7a759d0 SHA256 ccf4a4e904e81d2db2e1b77dc20bcf7f3b5635171ca3d21a3c4b573d8bfc022c
+MISC ChangeLog 727 RMD160 41f193c9b98a47e03b5b917dfc06761ad18211cd SHA1 5d632a425fb54da7df9fdf5e4becca7ea10f0ebe SHA256 5a91861747338498ac78faddf7af49d68f6521d48c5e2ee9635a37bbd67045df
 MISC metadata.xml 167 RMD160 ea4003a55d6e2079381a540c441fc59cde29025a SHA1 3bc6dc4dd68f7de22828138e62aa117387b1765d SHA256 f313eeec4ebffac500b57a98a225e32c77489fc826a50494749b6cdeec28e3e8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkwjQ/0ACgkQgAnW8HDreRaoIQCfZFF2ICGYQvoREz0kpDzg/d3i
+wZwAoL+FJ3EyegYNNLMIF2bTPCXXG0Go
+=dAlT
+-----END PGP SIGNATURE-----
diff --git a/sci-chemistry/burrow-owl/burrow-owl-1.2.ebuild b/sci-chemistry/burrow-owl/burrow-owl-1.2.ebuild
deleted file mode 100644
index e55a929bf0e8..000000000000
--- a/sci-chemistry/burrow-owl/burrow-owl-1.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/burrow-owl/burrow-owl-1.2.ebuild,v 1.1 2007/06/06 23:32:33 dberkholz Exp $
-
-inherit eutils autotools
-
-SRC_PN="${PN/-owl}"
-SRC_P="${SRC_PN}-${PV}"
-DESCRIPTION="Visualize multidimensional nuclear magnetic resonance (NMR) spectra"
-HOMEPAGE="http://burrow-owl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${SRC_P}.tar.gz
-	examples? ( mirror://sourceforge/${PN}/${SRC_PN}-demos.tar )"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="examples"
-RDEPEND="=x11-libs/gtk+-2*
-	dev-scheme/guile-gnome-platform"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-S="${WORKDIR}/${SRC_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-make-script-dir.patch
-	rm -rf guile-gnome
-	eautoreconf
-}
-
-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/burrow-owl-1.4.ebuild b/sci-chemistry/burrow-owl/burrow-owl-1.4.ebuild
new file mode 100644
index 000000000000..2d8f4c79582e
--- /dev/null
+++ b/sci-chemistry/burrow-owl/burrow-owl-1.4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/burrow-owl/burrow-owl-1.4.ebuild,v 1.1 2010/06/24 11:39:36 jlec Exp $
+
+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/files/1.4-include.patch b/sci-chemistry/burrow-owl/files/1.4-include.patch
new file mode 100644
index 000000000000..3dc4cbdf8000
--- /dev/null
+++ b/sci-chemistry/burrow-owl/files/1.4-include.patch
@@ -0,0 +1,12 @@
+diff --git a/src/gw/spectrum-spec.scm b/src/gw/spectrum-spec.scm
+index 253464c..605796c 100644
+--- a/src/gw/spectrum-spec.scm
++++ b/src/gw/spectrum-spec.scm
+@@ -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/burrow-owl-1.2-make-script-dir.patch b/sci-chemistry/burrow-owl/files/burrow-owl-1.2-make-script-dir.patch
deleted file mode 100644
index 5d76a6f22d3e..000000000000
--- a/sci-chemistry/burrow-owl/files/burrow-owl-1.2-make-script-dir.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile.am.orig	2007-04-19 01:48:53.000000000 -0700
-+++ Makefile.am	2007-04-19 02:03:39.000000000 -0700
-@@ -13,8 +13,8 @@
- ## abilities
- script_DATA =
- install-data-hook:
--	chmod +w $(scriptdir)
--	$(INSTALL) $(srcdir)/scripts/* $(scriptdir)
-+	chmod +w $(DESTDIR)$(scriptdir)
-+	$(INSTALL) $(srcdir)/scripts/* $(DESTDIR)$(scriptdir)
- 
- uninstall-hook:
- 	rm -rf $(scriptdir)/*