public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/libsvm/files/, sci-libs/libsvm/
@ 2016-08-06 22:53 David Seifert
  0 siblings, 0 replies; 4+ messages in thread
From: David Seifert @ 2016-08-06 22:53 UTC (permalink / raw
  To: gentoo-commits

commit:     5ca7432c5d5272d0d9227474dc89011c2c723282
Author:     Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  6 20:54:42 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Aug  6 22:51:18 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ca7432c

sci-libs/libsvm: fix the hardcoded path for grid.py

Add 2 sed statements to src_prepare() to replace the hardcoded path
'./grid.py' with the correct one and subsequently rename 'grid.py' to
'svm-grid'.

Revbumped, since this is a runtime failure.

Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/2032

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sci-libs/libsvm/files/3.11-openmp.patch   |   4 +-
 sci-libs/libsvm/files/3.14-makefile.patch |   4 +-
 sci-libs/libsvm/libsvm-3.17-r2.ebuild     | 114 ++++++++++++++++++++++++++++++
 3 files changed, 118 insertions(+), 4 deletions(-)

diff --git a/sci-libs/libsvm/files/3.11-openmp.patch b/sci-libs/libsvm/files/3.11-openmp.patch
index 6ddb6f0..e07b03e 100644
--- a/sci-libs/libsvm/files/3.11-openmp.patch
+++ b/sci-libs/libsvm/files/3.11-openmp.patch
@@ -1,5 +1,5 @@
---- svm.cpp.orig	2011-05-27 04:32:19.000000000 +0100
-+++ svm.cpp	2011-12-29 19:17:07.000000000 +0000
+--- a/svm.cpp.orig	2011-05-27 04:32:19.000000000 +0100
++++ b/svm.cpp	2011-12-29 19:17:07.000000000 +0000
 @@ -1281,6 +1281,9 @@
  		int start, j;
  		if((start = cache->get_data(i,&data,len)) < len)

diff --git a/sci-libs/libsvm/files/3.14-makefile.patch b/sci-libs/libsvm/files/3.14-makefile.patch
index 56e8bd2..e38dafc 100644
--- a/sci-libs/libsvm/files/3.14-makefile.patch
+++ b/sci-libs/libsvm/files/3.14-makefile.patch
@@ -5,8 +5,8 @@
 * link the shared version library
 nov 2012 - bicatali@gentoo.org
 
---- Makefile.orig	2012-11-29 10:39:07.149421728 -0800
-+++ Makefile	2012-11-29 10:57:19.727766521 -0800
+--- a/Makefile.orig	2012-11-29 10:39:07.149421728 -0800
++++ b/Makefile	2012-11-29 10:57:19.727766521 -0800
 @@ -1,9 +1,12 @@
  CXX ?= g++
 -CFLAGS = -Wall -Wconversion -O3 -fPIC

diff --git a/sci-libs/libsvm/libsvm-3.17-r2.ebuild b/sci-libs/libsvm/libsvm-3.17-r2.ebuild
new file mode 100644
index 0000000..36ce9ba
--- /dev/null
+++ b/sci-libs/libsvm/libsvm-3.17-r2.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+
+inherit flag-o-matic java-pkg-opt-2 python-r1 toolchain-funcs
+
+DESCRIPTION="Library for Support Vector Machines"
+HOMEPAGE="http://www.csie.ntu.edu.tw/~cjlin/libsvm/"
+SRC_URI="http://www.csie.ntu.edu.tw/~cjlin/libsvm/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="java openmp python tools"
+
+DEPEND="java? ( >=virtual/jdk-1.4 )"
+RDEPEND="
+	java? ( >=virtual/jre-1.4 )
+	tools? ( sci-visualization/gnuplot )"
+
+PATCHES=(
+	"${FILESDIR}/3.11-openmp.patch"
+	"${FILESDIR}/3.14-makefile.patch"
+)
+
+pkg_setup() {
+	if use openmp; then
+		if ! tc-has-openmp; then
+			ewarn "OpenMP is not supported by your currently selected compiler"
+
+			if tc-is-clang; then
+				ewarn "OpenMP support in sys-devel/clang is provided by sys-libs/libomp,"
+				ewarn "which you will need to build ${CATEGORY}/${PN} for USE=\"openmp\""
+			fi
+
+			die "need openmp capable compiler"
+		fi
+
+		append-cflags -fopenmp
+		append-cxxflags -fopenmp
+		append-cppflags -DOPENMP
+	fi
+}
+
+src_prepare() {
+	default
+
+	sed -i -e "s@\.\./@${EPREFIX}/usr/bin/@g" tools/*.py \
+		|| die "Failed to fix paths in python files"
+	sed -i -e "s|./grid.py|${EPREFIX}/usr/bin/svm-grid|g" tools/*.py \
+		|| die "Failed to fix paths for svm-grid"
+	sed -i -e 's/grid.py/svm-grid/g' tools/grid.py \
+		|| die "Failed to rename grid.py to svm-grid"
+
+	if use java; then
+		local JAVAC_FLAGS="$(java-pkg_javac-args)"
+		sed -i \
+			-e "s/JAVAC_FLAGS =/JAVAC_FLAGS=${JAVAC_FLAGS}/g" \
+			java/Makefile || die "Failed to fix java makefile"
+	fi
+	tc-export CXX CC
+}
+
+src_compile() {
+	default
+	use java && emake -C java
+}
+
+src_install() {
+	dobin svm-train svm-predict svm-scale
+	dolib.so *.so*
+	insinto /usr/include
+	doins svm.h
+
+	dodoc README
+
+	if use tools; then
+		python_setup
+
+		local t
+		for t in tools/*.py; do
+			mv ${t} svm-$(basename ${t} .py) || die
+			python_doscript svm-$(basename ${t} .py)
+		done
+
+		newdoc tools/README README.tools
+
+		insinto /usr/share/doc/${PF}/examples
+		doins heart_scale
+		doins -r svm-toy
+	fi
+
+	if use python ; then
+		installation() {
+			touch python/__init__.py || die
+			python_moduleinto libsvm
+			python_domodule python/*.py
+		}
+		python_foreach_impl installation
+		newdoc python/README README.python
+	fi
+
+	docinto html
+	if use java; then
+		java-pkg_dojar java/libsvm.jar
+		dodoc java/test_applet.html
+	fi
+
+	dodoc FAQ.html
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/libsvm/files/, sci-libs/libsvm/
@ 2022-05-14 21:30 David Seifert
  0 siblings, 0 replies; 4+ messages in thread
From: David Seifert @ 2022-05-14 21:30 UTC (permalink / raw
  To: gentoo-commits

commit:     3413ca5341ea5ea6e4a39c228f684ee351534a56
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat May 14 21:30:24 2022 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat May 14 21:30:24 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3413ca53

sci-libs/libsvm: [QA] tc-has-openmp → tc-check-openmp

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 ...4-makefile.patch => libsvm-3.25-makefile.patch} | 38 ++++++++++------------
 ...{3.11-openmp.patch => libsvm-3.25-openmp.patch} | 12 +++----
 .../{libsvm-3.25.ebuild => libsvm-3.25-r1.ebuild}  | 33 +++++++++----------
 3 files changed, 39 insertions(+), 44 deletions(-)

diff --git a/sci-libs/libsvm/files/3.14-makefile.patch b/sci-libs/libsvm/files/libsvm-3.25-makefile.patch
similarity index 63%
rename from sci-libs/libsvm/files/3.14-makefile.patch
rename to sci-libs/libsvm/files/libsvm-3.25-makefile.patch
index e38dafc10b20..ea48368b27a5 100644
--- a/sci-libs/libsvm/files/3.14-makefile.patch
+++ b/sci-libs/libsvm/files/libsvm-3.25-makefile.patch
@@ -3,15 +3,13 @@
 * propagate and respect user's LDFLAGS
 * PIC only used for the library
 * link the shared version library
-nov 2012 - bicatali@gentoo.org
 
---- a/Makefile.orig	2012-11-29 10:39:07.149421728 -0800
-+++ b/Makefile	2012-11-29 10:57:19.727766521 -0800
-@@ -1,9 +1,12 @@
- CXX ?= g++
+--- a/Makefile
++++ b/Makefile
+@@ -1,9 +1,10 @@
+-CXX ?= g++
 -CFLAGS = -Wall -Wconversion -O3 -fPIC
-+CC ?= gcc
-+CFLAGS ?= -Wall -Wconversion -O3
++CFLAGS ?= -Wall -Wconversion
 +CXXFLAGS ?= $(CFLAGS)
  SHVER = 2
  OS = $(shell uname)
@@ -22,30 +20,30 @@ nov 2012 - bicatali@gentoo.org
  
  lib: svm.o
  	if [ "$(OS)" = "Darwin" ]; then \
-@@ -11,15 +14,20 @@
+@@ -11,15 +12,17 @@
  	else \
  		SHARED_LIB_FLAG="-shared -Wl,-soname,libsvm.so.$(SHVER)"; \
  	fi; \
 -	$(CXX) $${SHARED_LIB_FLAG} svm.o -o libsvm.so.$(SHVER)
-+	$(CXX) $(LDFLAGS) $${SHARED_LIB_FLAG} svm.o -o libsvm.so.$(SHVER) ; \
++	$(CXX) $(LDFLAGS) $${SHARED_LIB_FLAG} svm.o -o libsvm.so.$(SHVER) $(OPENMP_LIBS) ; \
 +	ln -s libsvm.so.$(SHVER) libsvm.so
++
++svm-predict: svm-predict.o lib
++	$(CXX) $(LDFLAGS) $< -o $@ $(LIBS) -L. -lsvm -lm
++svm-train: svm-train.o lib
++	$(CXX) $(LDFLAGS) $< -o $@ $(LIBS) -L. -lsvm -lm
++svm-scale: svm-scale.o
++	$(CXX) $(LDFLAGS) $< -o $@ $(LIBS)
  
- svm-predict: svm-predict.c svm.o
+-svm-predict: svm-predict.c svm.o
 -	$(CXX) $(CFLAGS) svm-predict.c svm.o -o svm-predict -lm
-+	$(CC) $(CFLAGS) -c $@.c -o $@.o
-+	$(CXX) $(LDFLAGS) $@.o svm.o -lm -o $@
- svm-train: svm-train.c svm.o
+-svm-train: svm-train.c svm.o
 -	$(CXX) $(CFLAGS) svm-train.c svm.o -o svm-train -lm
-+	$(CC) $(CFLAGS) -c $@.c -o $@.o
-+	$(CXX) $(LDFLAGS) $@.o svm.o -lm -o $@
- svm-scale: svm-scale.c
+-svm-scale: svm-scale.c
 -	$(CXX) $(CFLAGS) svm-scale.c -o svm-scale
-+	$(CC) $(CFLAGS) -c $@.c -o $@.o
-+	$(CXX) $(LDFLAGS) $@.o -o $@
-+
  svm.o: svm.cpp svm.h
 -	$(CXX) $(CFLAGS) -c svm.cpp
-+	$(CXX) $(CXXFLAGS) $(PICFLAGS) -c svm.cpp -o $@
++	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(PICFLAGS) $(OPENMP_CFLAGS) -c svm.cpp -o $@
  clean:
 -	rm -f *~ svm.o svm-train svm-predict svm-scale libsvm.so.$(SHVER)
 +	rm -f *~ svm.o svm-train svm-predict svm-scale libsvm.so.$(SHVER) libsvm.so

diff --git a/sci-libs/libsvm/files/3.11-openmp.patch b/sci-libs/libsvm/files/libsvm-3.25-openmp.patch
similarity index 81%
rename from sci-libs/libsvm/files/3.11-openmp.patch
rename to sci-libs/libsvm/files/libsvm-3.25-openmp.patch
index e07b03e57380..1d12e198648e 100644
--- a/sci-libs/libsvm/files/3.11-openmp.patch
+++ b/sci-libs/libsvm/files/libsvm-3.25-openmp.patch
@@ -1,6 +1,6 @@
---- a/svm.cpp.orig	2011-05-27 04:32:19.000000000 +0100
-+++ b/svm.cpp	2011-12-29 19:17:07.000000000 +0000
-@@ -1281,6 +1281,9 @@
+--- a/svm.cpp
++++ b/svm.cpp
+@@ -1282,6 +1282,9 @@
  		int start, j;
  		if((start = cache->get_data(i,&data,len)) < len)
  		{
@@ -10,7 +10,7 @@
  			for(j=start;j<len;j++)
  				data[j] = (Qfloat)(y[i]*y[j]*(this->*kernel_function)(i,j));
  		}
-@@ -2463,7 +2466,10 @@
+@@ -2506,7 +2509,10 @@
  	   model->param.svm_type == NU_SVR)
  	{
  		double *sv_coef = model->sv_coef[0];
@@ -22,9 +22,9 @@
  		for(i=0;i<model->l;i++)
  			sum += sv_coef[i] * Kernel::k_function(x,model->SV[i],model->param);
  		sum -= model->rho[0];
-@@ -2480,6 +2486,9 @@
+@@ -2523,6 +2529,9 @@
  		int l = model->l;
- 		
+ 
  		double *kvalue = Malloc(double,l);
 +#ifdef OPENMP
 +#pragma omp parallel for private(i)

diff --git a/sci-libs/libsvm/libsvm-3.25.ebuild b/sci-libs/libsvm/libsvm-3.25-r1.ebuild
similarity index 82%
rename from sci-libs/libsvm/libsvm-3.25.ebuild
rename to sci-libs/libsvm/libsvm-3.25-r1.ebuild
index fb3107631476..78e21cefa8d4 100644
--- a/sci-libs/libsvm/libsvm-3.25.ebuild
+++ b/sci-libs/libsvm/libsvm-3.25-r1.ebuild
@@ -27,27 +27,16 @@ RDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/3.11-openmp.patch"
-	"${FILESDIR}/3.14-makefile.patch"
+	"${FILESDIR}"/${PN}-3.25-openmp.patch
+	"${FILESDIR}"/${PN}-3.25-makefile.patch
 )
 
-pkg_setup() {
-	if use openmp; then
-		if ! tc-has-openmp; then
-			ewarn "OpenMP is not supported by your currently selected compiler"
-
-			if tc-is-clang; then
-				ewarn "OpenMP support in sys-devel/clang is provided by sys-libs/libomp,"
-				ewarn "which you will need to build ${CATEGORY}/${PN} for USE=\"openmp\""
-			fi
-
-			die "need openmp capable compiler"
-		fi
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
 
-		append-cflags -fopenmp
-		append-cxxflags -fopenmp
-		append-cppflags -DOPENMP
-	fi
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 
 src_prepare() {
@@ -66,6 +55,14 @@ src_prepare() {
 			-e "s/JAVAC_FLAGS =/JAVAC_FLAGS=${JAVAC_FLAGS}/g" \
 			java/Makefile || die "Failed to fix java makefile"
 	fi
+}
+
+src_configure() {
+	if use openmp; then
+		export OPENMP_CFLAGS="-fopenmp -DOPENMP"
+		export OPENMP_LIBS="-fopenmp"
+	fi
+
 	tc-export CXX CC
 }
 


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/libsvm/files/, sci-libs/libsvm/
@ 2023-02-24  8:53 Andrew Ammerlaan
  0 siblings, 0 replies; 4+ messages in thread
From: Andrew Ammerlaan @ 2023-02-24  8:53 UTC (permalink / raw
  To: gentoo-commits

commit:     49d3c67aaeabe28c66ae80ffb0df1dec2ec73dc3
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 24 08:53:19 2023 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Feb 24 08:53:50 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49d3c67a

sci-libs/libsvm: add 3.30

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sci-libs/libsvm/Manifest                         |   1 +
 sci-libs/libsvm/files/libsvm-3.30-makefile.patch |  44 +++++++++
 sci-libs/libsvm/libsvm-3.30.ebuild               | 117 +++++++++++++++++++++++
 3 files changed, 162 insertions(+)

diff --git a/sci-libs/libsvm/Manifest b/sci-libs/libsvm/Manifest
index 0dbb0b08cf6f..6c6be2ee9892 100644
--- a/sci-libs/libsvm/Manifest
+++ b/sci-libs/libsvm/Manifest
@@ -1 +1,2 @@
 DIST libsvm-3.25.tar.gz 892471 BLAKE2B a80b7192981811f57446a966c911a07a2de17042e67faa26451c23129dafeac642596a619731b57a27d9845f904e2e4c5c11ae8aa3006fa49e2f62d7cec4cca2 SHA512 91afbcfd204f5fc9c367df446550cecaf01d5e34770fa10fc6bb02277d79b756393f7d057290df0f72fc941faaf0f4c84a863a3bf9d8628eeff1f99b6bc57a98
+DIST libsvm-3.3.tar.gz 910001 BLAKE2B 69364210998e496e333c6a87a66ad3f1515f2b3e98fe7bc579e8aee6d4df0473a4282f979d4f7d1729ce7080fd8b009ce830caab0ac37b57fafff0d2686e86e0 SHA512 705cdebffce0d9ea053cf51b2bfd46303d306b7a2c34ee46065f19e1227459fbdbe6fde6e4769935a0c225da831ec137fb9c0c28fbc2efa06724a94bdd76500d

diff --git a/sci-libs/libsvm/files/libsvm-3.30-makefile.patch b/sci-libs/libsvm/files/libsvm-3.30-makefile.patch
new file mode 100644
index 000000000000..6f8266d5cb02
--- /dev/null
+++ b/sci-libs/libsvm/files/libsvm-3.30-makefile.patch
@@ -0,0 +1,44 @@
+diff --git a/Makefile b/Makefile
+index 76fd929..a454f56 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,9 +1,10 @@
+-CXX ?= g++
+-CFLAGS = -Wall -Wconversion -O3 -fPIC
++CFLAGS ?= -Wall -Wconversion
++CXXFLAGS ?= $(CFLAGS)
+ SHVER = 3
+ OS = $(shell uname)
++PICFLAGS ?= -fPIC
+ 
+-all: svm-train svm-predict svm-scale
++all: svm-train svm-predict svm-scale lib
+ 
+ lib: svm.o
+ 	if [ "$(OS)" = "Darwin" ]; then \
+@@ -11,15 +12,16 @@ lib: svm.o
+ 	else \
+ 		SHARED_LIB_FLAG="-shared -Wl,-soname,libsvm.so.$(SHVER)"; \
+ 	fi; \
+-	$(CXX) $${SHARED_LIB_FLAG} svm.o -o libsvm.so.$(SHVER)
++	$(CXX) $(LDFLAGS) $${SHARED_LIB_FLAG} svm.o -o libsvm.so.$(SHVER) $(OPENMP_LIBS) ; \
++	ln -s libsvm.so.$(SHVER) libsvm.so
+ 
+-svm-predict: svm-predict.c svm.o
+-	$(CXX) $(CFLAGS) svm-predict.c svm.o -o svm-predict -lm
+-svm-train: svm-train.c svm.o
+-	$(CXX) $(CFLAGS) svm-train.c svm.o -o svm-train -lm
+-svm-scale: svm-scale.c
+-	$(CXX) $(CFLAGS) svm-scale.c -o svm-scale
++svm-predict: svm-predict.o lib
++	$(CXX) $(LDFLAGS) $< -o $@ $(LIBS) -L. -lsvm -lm
++svm-train: svm-train.o lib
++	$(CXX) $(LDFLAGS) $< -o $@ $(LIBS) -L. -lsvm -lm
++svm-scale: svm-scale.o
++	$(CXX) $(LDFLAGS) $< -o $@ $(LIBS)
+ svm.o: svm.cpp svm.h
+-	$(CXX) $(CFLAGS) -c svm.cpp
++	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(PICFLAGS) $(OPENMP_CFLAGS) -c svm.cpp -o $@
+ clean:
+-	rm -f *~ svm.o svm-train svm-predict svm-scale libsvm.so.$(SHVER)
++	rm -f *~ svm.o svm-train svm-predict svm-scale libsvm.so.$(SHVER) libsvm.so

diff --git a/sci-libs/libsvm/libsvm-3.30.ebuild b/sci-libs/libsvm/libsvm-3.30.ebuild
new file mode 100644
index 000000000000..0b94b44306ae
--- /dev/null
+++ b/sci-libs/libsvm/libsvm-3.30.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit java-pkg-opt-2 python-r1 toolchain-funcs
+
+DESCRIPTION="Library for Support Vector Machines"
+HOMEPAGE="https://www.csie.ntu.edu.tw/~cjlin/libsvm/"
+SRC_URI="https://www.csie.ntu.edu.tw/~cjlin/libsvm/${PN}-${PV/0}.tar.gz"
+S="${WORKDIR}/${PN}-${PV/0}"
+
+LICENSE="BSD"
+SLOT="0/2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="java openmp python tools"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
+	java? ( >=virtual/jdk-1.8:* )
+	python? ( ${PYTHON_DEPS} )
+"
+RDEPEND="
+	java? ( >=virtual/jre-1.8:* )
+	python? ( ${PYTHON_DEPS} )
+	tools? ( sci-visualization/gnuplot )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.25-openmp.patch
+	"${FILESDIR}"/${PN}-3.30-makefile.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	default
+
+	sed -i -e "s@\.\./@${EPREFIX}/usr/bin/@g" tools/*.py \
+		|| die "Failed to fix paths in python files"
+	sed -i -e "s|./grid.py|${EPREFIX}/usr/bin/svm-grid|g" tools/*.py \
+		|| die "Failed to fix paths for svm-grid"
+	sed -i -e 's/grid.py/svm-grid/g' tools/grid.py \
+		|| die "Failed to rename grid.py to svm-grid"
+
+	if use java; then
+		local JAVAC_FLAGS="$(java-pkg_javac-args)"
+		sed -i \
+			-e "s/JAVAC_FLAGS =/JAVAC_FLAGS=${JAVAC_FLAGS}/g" \
+			java/Makefile || die "Failed to fix java makefile"
+	fi
+}
+
+src_configure() {
+	if use openmp; then
+		export OPENMP_CFLAGS="-fopenmp -DOPENMP"
+		export OPENMP_LIBS="-fopenmp"
+	fi
+
+	tc-export CXX CC
+}
+
+src_compile() {
+	default
+	use java && emake -C java
+}
+
+src_install() {
+	dobin svm-train svm-predict svm-scale
+	dolib.so *.so*
+	doheader svm.h
+
+	DOCS=( README )
+
+	if use tools; then
+		local t
+		for t in tools/*.py; do
+			python_foreach_impl python_newscript ${t} svm-$(basename ${t} .py)
+		done
+
+		mv tools/README{,.tools} || die
+		DOCS+=( tools/README.tools )
+
+		docinto examples
+		dodoc heart_scale
+		dodoc -r svm-toy
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	if use python ; then
+		installation() {
+			touch python/__init__.py || die
+			python_moduleinto libsvm
+			python_domodule python/*.py
+		}
+		python_foreach_impl installation
+
+		mv python/README{,.python} || die
+		DOCS+=( python/README.python )
+	fi
+
+	HTML_DOCS=( FAQ.html )
+	if use java; then
+		java-pkg_dojar java/libsvm.jar
+		HTML_DOCS+=( java/test_applet.html )
+	fi
+
+	einstalldocs
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/libsvm/files/, sci-libs/libsvm/
@ 2024-07-29  8:55 Arthur Zamarin
  0 siblings, 0 replies; 4+ messages in thread
From: Arthur Zamarin @ 2024-07-29  8:55 UTC (permalink / raw
  To: gentoo-commits

commit:     4ca22663f0a6b650b0e4a2faa7dfc5de7db493d0
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sun Jul 28 06:16:10 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 29 08:55:25 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ca22663

sci-libs/libsvm: drop 3.25-r1

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 sci-libs/libsvm/Manifest                         |   1 -
 sci-libs/libsvm/files/libsvm-3.25-makefile.patch |  49 ----------
 sci-libs/libsvm/libsvm-3.25-r1.ebuild            | 115 -----------------------
 3 files changed, 165 deletions(-)

diff --git a/sci-libs/libsvm/Manifest b/sci-libs/libsvm/Manifest
index 6c6be2ee9892..e972b57ae7a5 100644
--- a/sci-libs/libsvm/Manifest
+++ b/sci-libs/libsvm/Manifest
@@ -1,2 +1 @@
-DIST libsvm-3.25.tar.gz 892471 BLAKE2B a80b7192981811f57446a966c911a07a2de17042e67faa26451c23129dafeac642596a619731b57a27d9845f904e2e4c5c11ae8aa3006fa49e2f62d7cec4cca2 SHA512 91afbcfd204f5fc9c367df446550cecaf01d5e34770fa10fc6bb02277d79b756393f7d057290df0f72fc941faaf0f4c84a863a3bf9d8628eeff1f99b6bc57a98
 DIST libsvm-3.3.tar.gz 910001 BLAKE2B 69364210998e496e333c6a87a66ad3f1515f2b3e98fe7bc579e8aee6d4df0473a4282f979d4f7d1729ce7080fd8b009ce830caab0ac37b57fafff0d2686e86e0 SHA512 705cdebffce0d9ea053cf51b2bfd46303d306b7a2c34ee46065f19e1227459fbdbe6fde6e4769935a0c225da831ec137fb9c0c28fbc2efa06724a94bdd76500d

diff --git a/sci-libs/libsvm/files/libsvm-3.25-makefile.patch b/sci-libs/libsvm/files/libsvm-3.25-makefile.patch
deleted file mode 100644
index ea48368b27a5..000000000000
--- a/sci-libs/libsvm/files/libsvm-3.25-makefile.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-* respect CFLAGS and CXXFLAGS from user
-* compile with CC for C and CXX for C++ files
-* propagate and respect user's LDFLAGS
-* PIC only used for the library
-* link the shared version library
-
---- a/Makefile
-+++ b/Makefile
-@@ -1,9 +1,10 @@
--CXX ?= g++
--CFLAGS = -Wall -Wconversion -O3 -fPIC
-+CFLAGS ?= -Wall -Wconversion
-+CXXFLAGS ?= $(CFLAGS)
- SHVER = 2
- OS = $(shell uname)
-+PICFLAGS ?= -fPIC
- 
--all: svm-train svm-predict svm-scale
-+all: svm-train svm-predict svm-scale lib
- 
- lib: svm.o
- 	if [ "$(OS)" = "Darwin" ]; then \
-@@ -11,15 +12,17 @@
- 	else \
- 		SHARED_LIB_FLAG="-shared -Wl,-soname,libsvm.so.$(SHVER)"; \
- 	fi; \
--	$(CXX) $${SHARED_LIB_FLAG} svm.o -o libsvm.so.$(SHVER)
-+	$(CXX) $(LDFLAGS) $${SHARED_LIB_FLAG} svm.o -o libsvm.so.$(SHVER) $(OPENMP_LIBS) ; \
-+	ln -s libsvm.so.$(SHVER) libsvm.so
-+
-+svm-predict: svm-predict.o lib
-+	$(CXX) $(LDFLAGS) $< -o $@ $(LIBS) -L. -lsvm -lm
-+svm-train: svm-train.o lib
-+	$(CXX) $(LDFLAGS) $< -o $@ $(LIBS) -L. -lsvm -lm
-+svm-scale: svm-scale.o
-+	$(CXX) $(LDFLAGS) $< -o $@ $(LIBS)
- 
--svm-predict: svm-predict.c svm.o
--	$(CXX) $(CFLAGS) svm-predict.c svm.o -o svm-predict -lm
--svm-train: svm-train.c svm.o
--	$(CXX) $(CFLAGS) svm-train.c svm.o -o svm-train -lm
--svm-scale: svm-scale.c
--	$(CXX) $(CFLAGS) svm-scale.c -o svm-scale
- svm.o: svm.cpp svm.h
--	$(CXX) $(CFLAGS) -c svm.cpp
-+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(PICFLAGS) $(OPENMP_CFLAGS) -c svm.cpp -o $@
- clean:
--	rm -f *~ svm.o svm-train svm-predict svm-scale libsvm.so.$(SHVER)
-+	rm -f *~ svm.o svm-train svm-predict svm-scale libsvm.so.$(SHVER) libsvm.so

diff --git a/sci-libs/libsvm/libsvm-3.25-r1.ebuild b/sci-libs/libsvm/libsvm-3.25-r1.ebuild
deleted file mode 100644
index 43c67613dec8..000000000000
--- a/sci-libs/libsvm/libsvm-3.25-r1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit flag-o-matic java-pkg-opt-2 python-r1 toolchain-funcs
-
-DESCRIPTION="Library for Support Vector Machines"
-HOMEPAGE="https://www.csie.ntu.edu.tw/~cjlin/libsvm/"
-SRC_URI="https://www.csie.ntu.edu.tw/~cjlin/libsvm/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/2"
-KEYWORDS="amd64 ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="java openmp python tools"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
-	java? ( >=virtual/jdk-1.8:* )
-	python? ( ${PYTHON_DEPS} )
-"
-RDEPEND="
-	java? ( >=virtual/jre-1.8:* )
-	python? ( ${PYTHON_DEPS} )
-	tools? ( sci-visualization/gnuplot )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.25-openmp.patch
-	"${FILESDIR}"/${PN}-3.25-makefile.patch
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
-	default
-
-	sed -i -e "s@\.\./@${EPREFIX}/usr/bin/@g" tools/*.py \
-		|| die "Failed to fix paths in python files"
-	sed -i -e "s|./grid.py|${EPREFIX}/usr/bin/svm-grid|g" tools/*.py \
-		|| die "Failed to fix paths for svm-grid"
-	sed -i -e 's/grid.py/svm-grid/g' tools/grid.py \
-		|| die "Failed to rename grid.py to svm-grid"
-
-	if use java; then
-		local JAVAC_FLAGS="$(java-pkg_javac-args)"
-		sed -i \
-			-e "s/JAVAC_FLAGS =/JAVAC_FLAGS=${JAVAC_FLAGS}/g" \
-			java/Makefile || die "Failed to fix java makefile"
-	fi
-}
-
-src_configure() {
-	if use openmp; then
-		export OPENMP_CFLAGS="-fopenmp -DOPENMP"
-		export OPENMP_LIBS="-fopenmp"
-	fi
-
-	tc-export CXX CC
-}
-
-src_compile() {
-	default
-	use java && emake -C java
-}
-
-src_install() {
-	dobin svm-train svm-predict svm-scale
-	dolib.so *.so*
-	doheader svm.h
-
-	DOCS=( README )
-
-	if use tools; then
-		local t
-		for t in tools/*.py; do
-			python_foreach_impl python_newscript ${t} svm-$(basename ${t} .py)
-		done
-
-		mv tools/README{,.tools} || die
-		DOCS+=( tools/README.tools )
-
-		docinto examples
-		dodoc heart_scale
-		dodoc -r svm-toy
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	if use python ; then
-		installation() {
-			touch python/__init__.py || die
-			python_moduleinto libsvm
-			python_domodule python/*.py
-		}
-		python_foreach_impl installation
-
-		mv python/README{,.python} || die
-		DOCS+=( python/README.python )
-	fi
-
-	HTML_DOCS=( FAQ.html )
-	if use java; then
-		java-pkg_dojar java/libsvm.jar
-		HTML_DOCS+=( java/test_applet.html )
-	fi
-
-	einstalldocs
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2024-07-29  8:55 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-02-24  8:53 [gentoo-commits] repo/gentoo:master commit in: sci-libs/libsvm/files/, sci-libs/libsvm/ Andrew Ammerlaan
  -- strict thread matches above, loose matches on Subject: below --
2024-07-29  8:55 Arthur Zamarin
2022-05-14 21:30 David Seifert
2016-08-06 22:53 David Seifert

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox