From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6D57C159C9B for ; Mon, 29 Jul 2024 08:55:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B7A53E2A24; Mon, 29 Jul 2024 08:55:38 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 98EA4E2A21 for ; Mon, 29 Jul 2024 08:55:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B1CE4335D21 for ; Mon, 29 Jul 2024 08:55:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 551721E7E for ; Mon, 29 Jul 2024 08:55:36 +0000 (UTC) From: "Arthur Zamarin" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Arthur Zamarin" Message-ID: <1722243325.4ca22663f0a6b650b0e4a2faa7dfc5de7db493d0.arthurzam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/libsvm/files/, sci-libs/libsvm/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/libsvm/Manifest sci-libs/libsvm/files/libsvm-3.25-makefile.patch sci-libs/libsvm/libsvm-3.25-r1.ebuild X-VCS-Directories: sci-libs/libsvm/ sci-libs/libsvm/files/ X-VCS-Committer: arthurzam X-VCS-Committer-Name: Arthur Zamarin X-VCS-Revision: 4ca22663f0a6b650b0e4a2faa7dfc5de7db493d0 X-VCS-Branch: master Date: Mon, 29 Jul 2024 08:55:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c6b8e500-5176-4068-b093-c427f0007c0c X-Archives-Hash: a97b2d37a6ec21f3fbf7733e5c798d56 commit: 4ca22663f0a6b650b0e4a2faa7dfc5de7db493d0 Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Sun Jul 28 06:16:10 2024 +0000 Commit: Arthur Zamarin gentoo 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 pogatzki.net> Signed-off-by: Arthur Zamarin 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 -}