* [gentoo-commits] proj/sci:master commit in: sci-libs/starparse/, sci-libs/starparse/files/
@ 2013-12-28 19:54 Justin Lecher
0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher @ 2013-12-28 19:54 UTC (permalink / raw
To: gentoo-commits
commit: bbe8747e08b63ab3b1344af3b1eaeeb901a7f359
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 28 19:10:53 2013 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Dec 28 19:10:53 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=bbe8747e
sci-libs/starparse: Add patch for guile-1.8
Package-Manager: portage-2.2.7
---
sci-libs/starparse/ChangeLog | 4 ++
.../starparse/files/starparse-9999-guile1.8.patch | 60 ++++++++++++++++++++++
sci-libs/starparse/starparse-9999.ebuild | 10 ++--
3 files changed, 71 insertions(+), 3 deletions(-)
diff --git a/sci-libs/starparse/ChangeLog b/sci-libs/starparse/ChangeLog
index 56f12b5..f3f0f28 100644
--- a/sci-libs/starparse/ChangeLog
+++ b/sci-libs/starparse/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 28 Dec 2013; Justin Lecher <jlec@gentoo.org> starparse-9999.ebuild,
+ +files/starparse-9999-guile1.8.patch:
+ Add patch for guile-1.8
+
28 Dec 2013; Justin Lecher <jlec@gentoo.org> starparse-9999.ebuild:
Add missing dep on pkgconfig
diff --git a/sci-libs/starparse/files/starparse-9999-guile1.8.patch b/sci-libs/starparse/files/starparse-9999-guile1.8.patch
new file mode 100644
index 0000000..1d6e176
--- /dev/null
+++ b/sci-libs/starparse/files/starparse-9999-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-9999.ebuild b/sci-libs/starparse/starparse-9999.ebuild
index 09265fc..1c54b56 100644
--- a/sci-libs/starparse/starparse-9999.ebuild
+++ b/sci-libs/starparse/starparse-9999.ebuild
@@ -4,7 +4,7 @@
EAPI=5
-AUTOTOOLS_AUTORECONF="true"
+AUTOTOOLS_AUTORECONF=yes
inherit autotools-utils git-r3
@@ -15,11 +15,15 @@ EGIT_REPO_URI="git://burrow-owl.git.sourceforge.net/gitroot/burrow-owl/starparse
LICENSE="GPL-2"
SLOT="0"
KEYWORDS=""
-IUSE="guile static-libs"
+IUSE="guile static-libs test"
+
+REQUIRED_USE="test? ( guile )"
RDEPEND="guile? ( dev-scheme/guile:12 )"
DEPEND="${RDEPEND}
- virtual/pkconfig"
+ virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${P}-guile1.8.patch )
src_configure() {
local myeconfargs=( $(use_enable guile) )
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/starparse/, sci-libs/starparse/files/
@ 2021-01-30 11:44 Andrew Ammerlaan
0 siblings, 0 replies; 2+ messages in thread
From: Andrew Ammerlaan @ 2021-01-30 11:44 UTC (permalink / raw
To: gentoo-commits
commit: 79041b6b3a7157ef0b55a484e739ddedcc6d95de
Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Sat Jan 30 11:44:35 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sat Jan 30 11:44:35 2021 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=79041b6b
sci-libs/starparse: EAPI bump, add version 0.9, add keywords
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>
.../starparse/files/starparse-9999-guile1.8.patch | 60 ----------------------
...{starparse-9999.ebuild => starparse-0.9.ebuild} | 21 +++-----
2 files changed, 7 insertions(+), 74 deletions(-)
diff --git a/sci-libs/starparse/files/starparse-9999-guile1.8.patch b/sci-libs/starparse/files/starparse-9999-guile1.8.patch
deleted file mode 100644
index 1d6e176b0..000000000
--- a/sci-libs/starparse/files/starparse-9999-guile1.8.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- 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-9999.ebuild b/sci-libs/starparse/starparse-0.9.ebuild
similarity index 52%
rename from sci-libs/starparse/starparse-9999.ebuild
rename to sci-libs/starparse/starparse-0.9.ebuild
index 1e3deec02..a18173e1b 100644
--- a/sci-libs/starparse/starparse-9999.ebuild
+++ b/sci-libs/starparse/starparse-0.9.ebuild
@@ -1,32 +1,25 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils git-r3
+EAPI=7
DESCRIPTION="Library for parsing NMR star files (peak-list format) and CIF files"
HOMEPAGE="http://burrow-owl.sourceforge.net/"
-EGIT_REPO_URI="git://burrow-owl.git.sourceforge.net/gitroot/burrow-owl/starparse"
+SRC_URI="https://downloads.sourceforge.net/project/burrow-owl/starparse/${PV}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64"
-IUSE="guile static-libs test"
+IUSE="guile test"
RESTRICT="!test? ( test )"
REQUIRED_USE="test? ( guile )"
RDEPEND="guile? ( dev-scheme/guile:12 )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${P}-guile1.8.patch )
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
src_configure() {
- local myeconfargs=( $(use_enable guile) )
- autotools-utils_src_configure
+ econf $(use_enable guile)
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-01-30 11:44 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-28 19:54 [gentoo-commits] proj/sci:master commit in: sci-libs/starparse/, sci-libs/starparse/files/ Justin Lecher
-- strict thread matches above, loose matches on Subject: below --
2021-01-30 11:44 Andrew Ammerlaan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox