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) }