gentoo auto-resync : 07:08:2024 - 12:37:20

5 files changed, 20 insertions, 177 deletions

diff --git a/sci-libs/libsvm/Manifest b/sci-libs/libsvm/Manifest
index fe535a9505ea..86861b23c126 100644
--- a/sci-libs/libsvm/Manifest
+++ b/sci-libs/libsvm/Manifest
@@ -1,8 +1,6 @@
-AUX libsvm-3.25-makefile.patch 1563 BLAKE2B ed88feaf7f2b6ce51b39f7ed875c6ab880a6e323a610d4f3a01b5830bc79e4bdb98a322fe1d150c3d4abd5f80761241ea81e4ac398dce0cfe307f8729793b999 SHA512 5d37a6298586273e772d0f249f876a31b39895a3394ea470626ea845ac28bad4c0a552b88bc1c3103331c72590e7c485b042c329d58384c3a7337e0d6da6d07d
 AUX libsvm-3.25-openmp.patch 864 BLAKE2B ef67a094c7cd3cafa3c998caa78bd226d83e462e358caa4cf15382087962b1eb9214553ae560d7c13812178d5f9a528764589c9f805b479a4931f7f94f9b4fdc SHA512 60250a325b6d22a1d8404f1b1d8ecd1b47e28003982c8f851107598b0553125afefb9b0a2b2e940761646152c05d6fdcd438994cdc991c2bffe10a9d87923b04
+AUX libsvm-3.30-javaMakefile.patch 390 BLAKE2B e51552651a9efb66b1f1b5d2533f5829e721bb61f334a0723ef74da0b185c1551d5b29a6808b99045df0863d5cc8c7ddc12c17ad8356aa7217490ff33bcc4285 SHA512 be2fa7de2a111ac3c5f7ee8cac51c4d5db1a5e251baadb27a3f37869b5597c02eef10717a53a0d404fc3c3cf50ee95ff8e06d1f748af97321d604649142333b3
 AUX libsvm-3.30-makefile.patch 1443 BLAKE2B 3b8009da6985170045b0d5d319869d89126c9577fa92aaf97bba76b94f4210bb6a40c1629354f30bbc93984a408e121341f9c00a37f824ea367475b2a86849b2 SHA512 a28ac993ea9746a5eb569161d8974108b5b758b4f181f5ce9891a15dd3e1b67dc8f57f934852d8c6660f4ca5be875e70e7064bf0e449e78c6a79cc0e72a75485
-DIST libsvm-3.25.tar.gz 892471 BLAKE2B a80b7192981811f57446a966c911a07a2de17042e67faa26451c23129dafeac642596a619731b57a27d9845f904e2e4c5c11ae8aa3006fa49e2f62d7cec4cca2 SHA512 91afbcfd204f5fc9c367df446550cecaf01d5e34770fa10fc6bb02277d79b756393f7d057290df0f72fc941faaf0f4c84a863a3bf9d8628eeff1f99b6bc57a98
 DIST libsvm-3.3.tar.gz 910001 BLAKE2B 69364210998e496e333c6a87a66ad3f1515f2b3e98fe7bc579e8aee6d4df0473a4282f979d4f7d1729ce7080fd8b009ce830caab0ac37b57fafff0d2686e86e0 SHA512 705cdebffce0d9ea053cf51b2bfd46303d306b7a2c34ee46065f19e1227459fbdbe6fde6e4769935a0c225da831ec137fb9c0c28fbc2efa06724a94bdd76500d
-EBUILD libsvm-3.25-r1.ebuild 2507 BLAKE2B 71108ec61dee425d3b6cd863cf908567f2946283e2437dcfb921e9a451bccacc409e93a028505fbec0aec4a623a6d5ffd05eef281d7ce7e9cb08c0c47ef8045c SHA512 83f3ca9e203a31bcaa73dc11483197e121e9b1974e7c3f4f37e5ce917c1535547605c91917b3a413d56d6ade0ba07a02e1c495c1b55464273c59a1c5a4c24f8a
-EBUILD libsvm-3.30.ebuild 2533 BLAKE2B da60a97837ffa44a59cb0ba428afedb4885e3d48a46631e123ecfd2ea5b2cd177701e42480ff851f1685e7c36368ada948546480c8194c0684267cf20bb3633a SHA512 3bbc1d7dc94cec88f7853200a055947d900eeb6bfbeb65d197d0bf93be471ea9684d629d3779e5daf9e788786d9028e1d6411025475794ec35ff0bdfbcca5c18
+EBUILD libsvm-3.30.ebuild 2463 BLAKE2B 8610bbac395bef87efe21371b2ec2914436ff1d898964e3952e98089a4c68a29e0fc6d7092b21cbeb6bfcc7a8fad061f53d1043507c631b0c865b896b2768e48 SHA512 6cc4f3d959945cc42512aa6b6a76fde2a8a9b2a312786b874a6d8d22c791c8d9f53333ca7c407c9b2a3632d897f669a66b915391f54ce7d63f9e82e14cb2a4b1
 MISC metadata.xml 816 BLAKE2B 59108eaf569019b5adde56aa0197503346d53d3ab07285c65768e4663f8aec41d441c1c8b894ddd4cf86f16d40784800918345a15cd48b8bc6f3fcf1da8dc08b SHA512 8a6fe72c2ad1f017e36bef14eed3d61909395bd2aaa13c561d7818942099f3b20fe020b5548053758c30ec7ba09c0e4f7238c6906452ad6c3f049a857cf8eac6
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/files/libsvm-3.30-javaMakefile.patch b/sci-libs/libsvm/files/libsvm-3.30-javaMakefile.patch
new file mode 100644
index 000000000000..a134ca1a44b1
--- /dev/null
+++ b/sci-libs/libsvm/files/libsvm-3.30-javaMakefile.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/936550
+
+--- a/java/Makefile
++++ b/java/Makefile
+@@ -4,8 +4,6 @@ FILES = libsvm/svm.class libsvm/svm_model.class libsvm/svm_node.class \
+ 		libsvm/svm_print_interface.class \
+ 		svm_train.class svm_predict.class svm_toy.class svm_scale.class
+ 
+-#JAVAC = jikes
+-JAVAC_FLAGS = -target 1.7 -source 1.7
+ JAVAC = javac
+ # JAVAC_FLAGS =
+ export CLASSPATH := .:$(CLASSPATH)
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
-}
diff --git a/sci-libs/libsvm/libsvm-3.30.ebuild b/sci-libs/libsvm/libsvm-3.30.ebuild
index e94e47acd243..d1fdc3096fce 100644
--- a/sci-libs/libsvm/libsvm-3.30.ebuild
+++ b/sci-libs/libsvm/libsvm-3.30.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit java-pkg-opt-2 python-r1 toolchain-funcs
 
@@ -31,6 +31,7 @@ RDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.25-openmp.patch
 	"${FILESDIR}"/${PN}-3.30-makefile.patch
+	"${FILESDIR}"/${PN}-3.30-javaMakefile.patch
 )
 
 pkg_pretend() {
@@ -43,6 +44,7 @@ pkg_setup() {
 
 src_prepare() {
 	default
+	java-pkg_clean
 
 	sed -i -e "s@\.\./@${EPREFIX}/usr/bin/@g" tools/*.py \
 		|| die "Failed to fix paths in python files"
@@ -50,16 +52,10 @@ src_prepare() {
 		|| 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() {
+	use java && export JAVAC_FLAGS="$(java-pkg_javac-args)"
 	if use openmp; then
 		export OPENMP_CFLAGS="-fopenmp -DOPENMP"
 		export OPENMP_LIBS="-fopenmp"