[gentoo-commits] repo/gentoo:master commit in: sci-libs/spr/
commit: 3861af0e507f2ee6d87c57ea5b44db7a329da776
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Sun Apr 14 20:59:32 2024 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Mon Apr 15 04:55:22 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3861af0e
sci-libs/spr: fix bug #930029
Signed-off-by: Michael Mair-Keimberger levelnine.at>
Closes: https://bugs.gentoo.org/930029
Closes: https://github.com/gentoo/gentoo/pull/36261
Signed-off-by: Arthur Zamarin gentoo.org>
sci-libs/spr/{spr-3.3.2-r1.ebuild => spr-3.3.2-r2.ebuild} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/spr/spr-3.3.2-r1.ebuild b/sci-libs/spr/spr-3.3.2-r2.ebuild
similarity index 96%
rename from sci-libs/spr/spr-3.3.2-r1.ebuild
rename to sci-libs/spr/spr-3.3.2-r2.ebuild
index 54935e6924fd..230353e35cc6 100644
--- a/sci-libs/spr/spr-3.3.2-r1.ebuild
+++ b/sci-libs/spr/spr-3.3.2-r2.ebuild
@@ -40,7 +40,7 @@ src_configure() {
src_install() {
default
- if use static-libs; then
+ if ! use static-libs; then
find "${ED}" -name '*.la' -delete || die
fi
}
[gentoo-commits] repo/gentoo:master commit in: sci-libs/spr/
commit: 25c40796cfe176eac68cf17a1310b58ce8e2ce1d
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Sat Mar 30 19:32:59 2024 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sun Apr 14 16:01:20 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25c40796
sci-libs/spr: EAPI8 bump, fix bug #851021
Signed-off-by: Michael Mair-Keimberger levelnine.at>
Closes: https://bugs.gentoo.org/851021
Closes: https://github.com/gentoo/gentoo/pull/36002
Signed-off-by: Arthur Zamarin gentoo.org>
sci-libs/spr/{spr-3.3.2.ebuild => spr-3.3.2-r1.ebuild} | 13 ++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/sci-libs/spr/spr-3.3.2.ebuild b/sci-libs/spr/spr-3.3.2-r1.ebuild
similarity index 80%
rename from sci-libs/spr/spr-3.3.2.ebuild
rename to sci-libs/spr/spr-3.3.2-r1.ebuild
index 3b639a0e109b..54935e6924fd 100644
--- a/sci-libs/spr/spr-3.3.2.ebuild
+++ b/sci-libs/spr/spr-3.3.2-r1.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
inherit autotools
DESCRIPTION="Statistical analysis and machine learning library"
HOMEPAGE="https://statpatrec.sourceforge.net/";
SRC_URI="mirror://sourceforge/statpatrec/${P^^}.tar.gz"
+S="${WORKDIR}/${P^^}"
LICENSE="GPL-2"
SLOT="0"
@@ -18,7 +19,6 @@ IUSE="root static-libs"
DEPEND="root? ( sci-physics/root )"
RDEPEND="${DEPEND}"
-S=${WORKDIR}/${P^^}
PATCHES=(
"${FILESDIR}"/${P}-autotools.patch
"${FILESDIR}"/${P}-gcc46.patch
@@ -37,3 +37,10 @@ src_configure() {
$(use_enable static-libs static) \
$(use_with root)
}
+
+src_install() {
+ default
+ if use static-libs; then
+ find "${ED}" -name '*.la' -delete || die
+ fi
+}
[gentoo-commits] repo/gentoo:master commit in: sci-libs/spr/
commit: 31f584392c3a737c434597271dccf385e9e9959b
Author: luzpaz users noreply github com>
AuthorDate: Fri Aug 11 11:37:59 2023 +
Commit: Andrew Ammerlaan gentoo org>
CommitDate: Tue Sep 5 11:10:17 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31f58439
sci-libs/spr: fix https:// schema in HOMEPAGE url
As reported in https://repology.org/repository/gentoo/problems
Signed-off-by: luzpaz users.noreply.github.com>
Closes: https://github.com/gentoo/gentoo/pull/32254
Signed-off-by: Andrew Ammerlaan gentoo.org>
sci-libs/spr/spr-3.3.2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-libs/spr/spr-3.3.2.ebuild b/sci-libs/spr/spr-3.3.2.ebuild
index 5c35b6b55302..3b639a0e109b 100644
--- a/sci-libs/spr/spr-3.3.2.ebuild
+++ b/sci-libs/spr/spr-3.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
inherit autotools
DESCRIPTION="Statistical analysis and machine learning library"
-HOMEPAGE="http://statpatrec.sourceforge.net/";
+HOMEPAGE="https://statpatrec.sourceforge.net/";
SRC_URI="mirror://sourceforge/statpatrec/${P^^}.tar.gz"
LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: sci-libs/spr/files/, sci-libs/spr/
commit: c1e4efd807e9cce5c6d5a9809360c83881a5f053
Author: David Seifert gentoo org>
AuthorDate: Tue Sep 20 21:02:22 2016 +
Commit: David Seifert gentoo org>
CommitDate: Tue Sep 20 21:06:21 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1e4efd8
sci-libs/spr: Allow for compiling with GCC 6
Gentoo-bug: 594376
* EAPI=6
Package-Manager: portage-2.3.1
sci-libs/spr/files/spr-3.3.2-fix-c++14.patch | 68
sci-libs/spr/spr-3.3.2.ebuild| 22 +
2 files changed, 80 insertions(+), 10 deletions(-)
diff --git a/sci-libs/spr/files/spr-3.3.2-fix-c++14.patch
b/sci-libs/spr/files/spr-3.3.2-fix-c++14.patch
new file mode 100644
index ..fc29392
--- /dev/null
+++ b/sci-libs/spr/files/spr-3.3.2-fix-c++14.patch
@@ -0,0 +1,68 @@
+Fix building with C++14, which errors out due to bool -> T* conversions
+See also: https://bugs.gentoo.org/show_bug.cgi?id=594376
+
+--- a/src/SprBinaryEncoder.cc
b/src/SprBinaryEncoder.cc
+@@ -165,7 +165,7 @@
+ if( found != vars.end() ) {
+ cerr << "Variable " << sclass.c_str() << " is already included "
+<< "in the input list for SprBinaryEncoder." << endl;
+-return false;
++return NULL;
+ }
+ vars.push_back(sclass);
+
+--- a/src/SprDecisionTree.cc
b/src/SprDecisionTree.cc
+@@ -362,7 +362,7 @@
+ {
+ // header
+ char s [200];
+- sprintf(s,"Trained DecisionTree %-6i signal nodes.Overall FOM=%-10g
W0=%-10g W1=%-10g N0=%-10i N1=%-10i
Version=%s",nodes1_.size(),fom_,w0_,w1_,n0_,n1_,SprVersion.c_str());
++ sprintf(s,"Trained DecisionTree %-6lu signal nodes.Overall FOM=%-10g
W0=%-10g W1=%-10g N0=%-10i N1=%-10i
Version=%s",nodes1_.size(),fom_,w0_,w1_,n0_,n1_,SprVersion.c_str());
+ os << s << endl;
+ os << "---" << endl;
+
+--- a/src/SprVarTransformerReader.cc
b/src/SprVarTransformerReader.cc
+@@ -50,7 +50,7 @@
+ nLine++;
+ if( !getline(is,line) ) {
+ cerr << "Unable to read VarTransformer from line " << nLine << endl;
+-return 0;
++return NULL;
+ }
+ istringstream ist(line);
+ string dummy, transformerName, version;
+@@ -59,9 +59,9 @@
+ // decode name
+ if( transformerName.empty() ) {
+ cerr << "Unable to read VarTransformer name on line " << nLine << endl;
+-return false;
++return NULL;
+ }
+- SprAbsVarTransformer* t = 0;
++ SprAbsVarTransformer* t = NULL;
+ if( transformerName == "PCA" )
+ t = SprVarTransformerReader::readPCATransformer(is,nLine);
+ else if( transformerName == "InputNormalizer" )
+@@ -72,16 +72,16 @@
+ t = SprVarTransformerReader::readTransformerSequence(is,nLine);
+ else {
+ cerr << "Unknown VarTransformer name specified on line " << nLine << endl;
+-return 0;
++return NULL;
+ }
+- if( t == 0 ) return 0;
++ if( t == NULL ) return NULL;
+
+ // read vars
+ vector oldVars, newVars;
+ if( !SprVarTransformerReader::readVars(is,nLine,oldVars,newVars) ||
+ oldVars.empty() || newVars.empty() ) {
+ cerr << "Unable to read VarTransformer variables." << endl;
+-return 0;
++return NULL;
+ }
+ t->setOldVars(oldVars);
+ t->setNewVars(newVars);
diff --git a/sci-libs/spr/spr-3.3.2.ebuild b/sci-libs/spr/spr-3.3.2.ebuild
index dad4d53..d63e597 100644
--- a/sci-libs/spr/spr-3.3.2.ebuild
+++ b/sci-libs/spr/spr-3.3.2.ebuild
@@ -1,15 +1,14 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=4
-inherit eutils autotools
+EAPI=6
-MYP=SPR-${PV}
+inherit autotools
DESCRIPTION="Statistical analysis and machine learning library"
HOMEPAGE="http://statpatrec.sourceforge.net/";
-SRC_URI="mirror://sourceforge/statpatrec/${MYP}.tar.gz"
+SRC_URI="mirror://sourceforge/statpatrec/${P^^}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
@@ -20,15 +19,18 @@ IUSE="root static-libs"
DEPEND="root? ( sci-physics/root )"
RDEPEND="${DEPEND}"
-S=${WORKDIR}/${MYP}
+S=${WORKDIR}/${P^^}
+PATCHES=(
+ "${FILESDIR}"/${P}-autotools.patch
+ "${FILESDIR}"/${P}-gcc46.patch
+ "${FILESDIR}"/${P}-fix-c++14.patch
+)
src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-autotools.patch \
- "${FILESDIR}"/${P}-gcc46.patch
+ default
rm aclocal.m4 || die
eautoreconf
- cp data/gauss* src/
+ cp data/gauss* src/ || die
}
src_configure() {
