Fix building with guile-1.8 and tests wrt bug 325731. Thanks to Diego for reporting.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 111 insertions, 1 deletions

diff --git a/sci-libs/starparse/ChangeLog b/sci-libs/starparse/ChangeLog
index bcfc2895b0cd..4ea5428a859a 100644
--- a/sci-libs/starparse/ChangeLog
+++ b/sci-libs/starparse/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-libs/starparse
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/starparse/ChangeLog,v 1.3 2010/06/24 11:02:54 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/starparse/ChangeLog,v 1.4 2010/06/27 12:33:35 xarthisius Exp $
+
+*starparse-1.0-r1 (27 Jun 2010)
+
+  27 Jun 2010; Kacper Kowalik <xarthisius@gentoo.org>
+  +starparse-1.0-r1.ebuild, +files/starparse-1.0-guile1.8.patch:
+  Fix building with guile-1.8 and tests wrt bug 325731. Thanks to Diego for
+  reporting.
 
 *starparse-1.0 (24 Jun 2010)
 
diff --git a/sci-libs/starparse/files/starparse-1.0-guile1.8.patch b/sci-libs/starparse/files/starparse-1.0-guile1.8.patch
new file mode 100644
index 000000000000..1d6e176b079e
--- /dev/null
+++ b/sci-libs/starparse/files/starparse-1.0-guile1.8.patch
@@ -0,0 +1,60 @@
+--- src/guile-binding.c
++++ src/guile-binding.c
+@@ -61,10 +61,10 @@
+   char* filter_string = NULL;
+   char* fname = "-";
+ 
+-  if (SCM_NFALSEP(filter_string_scm))
++  if (scm_is_true(filter_string_scm))
+     filter_string = scm_to_locale_string(filter_string_scm);
+ 
+-  if (SCM_NFALSEP(fname_scm))
++  if (scm_is_true(fname_scm))
+     fname = scm_to_locale_string(fname_scm);
+   
+   ship_item_cb = ship_item_scm;
+--- src/Makefile.am
++++ src/Makefile.am
+@@ -6,13 +6,10 @@
+ libstarparse_la_SOURCES =\
+ 	parser.y lexer.l starparse.h
+ 
+-libstarparse_la_CFLAGS =
+-libstarparse_la_LDFLAGS = 
+-
+ if ENABLE_GUILE
+ libstarparse_la_SOURCES += guile-binding.c guile-compat.h
+-libstarparse_la_CFLAGS += @GUILE_CFLAGS@
+-libstarparse_la_LDFLAGS += @GUILE_LDFLAGS@ -lpthread
++libstarparse_la_CFLAGS = @GUILE_CFLAGS@
++libstarparse_la_LIBADD = @GUILE_LIBS@ -lpthread
+ endif
+ 
+ 
+--- configure.ac
++++ configure.ac
+@@ -10,18 +10,13 @@
+ 
+ AM_INIT_AUTOMAKE
+ 
+-AC_ARG_ENABLE(guile,
++AC_ARG_ENABLE([guile],
+ 	      AS_HELP_STRING([--enable-guile],
+-                             [build bindings for guile scheme interpreter]),
+-              USE_GUILE=$enable_guile,
+-              USE_GUILE=yes)  # default value
+-
+-if test "x$USE_GUILE" = "xyes";
+-then
+-  GUILE_FLAGS
+-fi
+-
+-AM_CONDITIONAL(ENABLE_GUILE, test "x$USE_GUILE" = "xyes")
++                             [build bindings for guile scheme interpreter]))
++AS_IF([test "x$enable_guile" = "xyes"], [
++  PKG_CHECK_MODULES([GUILE], [guile-1.8])
++])
++AM_CONDITIONAL(ENABLE_GUILE, test "x$enable_guile" = "xyes")
+ 
+ AC_CONFIG_FILES([Makefile
+                  starparse-env
diff --git a/sci-libs/starparse/starparse-1.0-r1.ebuild b/sci-libs/starparse/starparse-1.0-r1.ebuild
new file mode 100644
index 000000000000..926ecd2c3533
--- /dev/null
+++ b/sci-libs/starparse/starparse-1.0-r1.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-libs/starparse/starparse-1.0-r1.ebuild,v 1.1 2010/06/27 12:33:35 xarthisius Exp $
+
+EAPI="2"
+
+inherit autotools eutils
+
+DESCRIPTION="Library for parsing NMR star files (peak-list format) and CIF files"
+HOMEPAGE="http://burrow-owl.sourceforge.net/"
+#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+# Created from rev 19 @ http://oregonstate.edu/~benisong/software/projects/starparse/releases/1.0
+SRC_URI="http://dev.gentooexperimental.org/~jlec/distfiles/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="guile"
+
+RDEPEND="guile? ( dev-scheme/guile )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-guile1.8.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable guile)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+}
+
+src_test() {
+	if use guile; then
+		emake check || die
+	else
+		ewarn "Skipping tests because USE guile is disabled"
+	fi
+}