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

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 119 insertions, 5 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/Manifest b/sci-libs/starparse/Manifest
index dde42e18b7a5..c2aed372b91d 100644
--- a/sci-libs/starparse/Manifest
+++ b/sci-libs/starparse/Manifest
@@ -1,14 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX starparse-1.0-guile1.8.patch 1598 RMD160 48e2b7606eaba490f797b16dffaf760dba6eba54 SHA1 7eecf5d60665e1420e9b684c1002f180c941fec6 SHA256 903ef428f181005fecca241203e96df7fbbbeaa6e5308c851b10674d3fccf1e6
 DIST starparse-1.0.tar.bz2 5466370 RMD160 8d3421d7b6cfaa02e77c6c879577812d18fe378d SHA1 279bfea2024ba62ee35f3ac3eafb4315b8386713 SHA256 0ff25bb00c9481136bd060660340a44095902e17d75cc11d749ace597b5f4c61
+EBUILD starparse-1.0-r1.ebuild 1078 RMD160 e6a0bb0d15c23174b81b387d5b60657168ef780f SHA1 7a335d0db2f0032787a08ecf9b7c1ce8e8757a8e SHA256 faf6edd5ef1ef05ef8065a929d9b56c501648cd35596533a6ec59161797dccdd
 EBUILD starparse-1.0.ebuild 878 RMD160 5ea155fce59c937676edfeb24cd088d854c98138 SHA1 5344dc76609824c75deb1c1f6fc89b048500b445 SHA256 7284b79d851293e5e393ede1b79e014ce16199368b2ead541e7983c848e35467
-MISC ChangeLog 764 RMD160 ef1faf38804f8d354e125b2d0c9a7e17948c2b9e SHA1 47609e629ded8079dbd18c5ddd0602eb1744296f SHA256 6c8f9b28c2c18136ad64cb7d6604d857b8297a019c5e661d917a7dd576f9c2bf
+MISC ChangeLog 1012 RMD160 41ca82962510fca6488c3938b2c5d35cc574b454 SHA1 4bb41f8843a2dad9fcd40aa815f7581ffa6e8bef SHA256 eecf6603e1e27ab0a18e7a7979e86c4de35fb5c36cde1cd8c625c36cbd9b011b
 MISC metadata.xml 167 RMD160 ea4003a55d6e2079381a540c441fc59cde29025a SHA1 3bc6dc4dd68f7de22828138e62aa117387b1765d SHA256 f313eeec4ebffac500b57a98a225e32c77489fc826a50494749b6cdeec28e3e8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwjO2MACgkQgAnW8HDreRYpcACg0gL2m9D4f2Z24TJcEOzRTCRp
-C3IAoKjhRwUqfvXb6H6UpAotfRkHwkOZ
-=hgMY
+iJwEAQECAAYFAkwnRSoACgkQIiMqcbOVdxSnXgP/c0PKuAghPLiF+Nej48WN0T83
+GtaBKF/aVgB/ixdibpk7ZDaSw8nDfiSy1yBKsHd1u71xhu6lvrsIyunxAq1aq4/w
+edgliD/jkZ/mu50g2oRrUb2ZHmRUD5ytHnkavai7f23IVkHqWRZtr+ODgmF7F6Dl
+8x82ypF9iQxWUTpHHqw=
+=9iGg
 -----END PGP SIGNATURE-----
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
+}