Version bump. makefile patch updated

Package-Manager: portage-2.1.10.49/cvs/Linux x86_64

4 files changed, 141 insertions, 6 deletions

diff --git a/sci-libs/libsvm/ChangeLog b/sci-libs/libsvm/ChangeLog
index aef3d987240c..b339b3f7b95c 100644
--- a/sci-libs/libsvm/ChangeLog
+++ b/sci-libs/libsvm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/libsvm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libsvm/ChangeLog,v 1.25 2012/03/25 11:39:42 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libsvm/ChangeLog,v 1.26 2012/04/17 17:04:23 bicatali Exp $
+
+*libsvm-3.12 (17 Apr 2012)
+
+  17 Apr 2012; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/3.12-makefile.patch, +libsvm-3.12.ebuild:
+  Version bump. makefile patch updated
 
   25 Mar 2012; Justin Lecher <jlec@gentoo.org> -libsvm-3.0.ebuild,
   -libsvm-3.1.ebuild, libsvm-3.11.ebuild, metadata.xml:
diff --git a/sci-libs/libsvm/Manifest b/sci-libs/libsvm/Manifest
index 3891f03b3ae8..2faf4c10cdb9 100644
--- a/sci-libs/libsvm/Manifest
+++ b/sci-libs/libsvm/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX 2.90-fpic.patch 713 RMD160 d2be5724cbde2aa5c7254c5be37d62cf48de0efb SHA1 231825014841bdf58b19e9f69864210b6d96416b SHA256 7b40aba4cf560488c464ede3374c455bb194b2ef6f15e7c447e823c81964fffc
 AUX 2.90-ldflags.patch 662 RMD160 ed4b98dc092dad67b32dbf513341dd6dbdc2f27d SHA1 55e97a9ef2bec6ba5bb7bff84892c98d6861d639 SHA256 0fb14dfeb3dc508210d2353bc9a1ab5081c7af11223f297b01c651d7a98c450b
@@ -9,16 +9,19 @@ AUX 3.0-makefile.patch 1213 RMD160 52c7a34819d6ef6899a5011e5d7e6d3825d821bb SHA1
 AUX 3.1-openmp.patch 1082 RMD160 e2c4ae0be7c255a9f4a5189d74cf5301add91c90 SHA1 418d203a87cb0c794368c8d45acc2a794a4d54b6 SHA256 090054f532bf12e2ab85ea86142eb6a9dd846ea382e31f554fb93f032756f38c
 AUX 3.11-makefile.patch 1258 RMD160 118094113097207ec850502821528da64bd4aaed SHA1 e78fd98710aedff220d381c0d7f84ee5e14bacab SHA256 0f57ae5547a4278a4f28626745528a8ed19b54fe33a3d47fdc2c82d702bda311
 AUX 3.11-openmp.patch 939 RMD160 1e8cca6b9ecfad28daa48a6ba1073b21d4ed78cd SHA1 2ec5bd5a86a44e0be9e3aa7b1b3d4c54ce06d0de SHA256 642c56ffaf5cd1415b0707b25dd1c3cf1009715938d298ddb7a612bc2f3854f0
+AUX 3.12-makefile.patch 1346 RMD160 a8d099c2e22ef7f6b260e91258c3d412c109527c SHA1 4198b87370a2e8bf385298e26c24d8356d5ec5a1 SHA256 a4579793c7a258cfac56a236fc5d457614bd6361010564ab2beee4822c14de3c
 DIST libsvm-2.9.tar.gz 563829 RMD160 ff6207d399f59eea3329fd629fcdf4c399583a2b SHA1 506725e3328b7fd78b00b99b93e5fb4c90506528 SHA256 0cfb4b88c37e431490b65c97a2043f9aa9d2f1ee140344944dfea88b1136c757
 DIST libsvm-3.11.tar.gz 611835 RMD160 75ad8a4380da20f0c72928bdb1b21025227f53aa SHA1 044638cb2335fa020da115dca54c0c685d15dc08 SHA256 8ff59bf7b487b339cac7ed94593f6ba5136c01c985f9a0601c145ce472a621d5
+DIST libsvm-3.12.tar.gz 645287 RMD160 1058df24d9ecca928144425099c69ee268d61330 SHA1 6ee77eb3d89af07fe48058dba0dcc24c85020b85 SHA256 9dcd7a301665d2cbd8c109bba0e8cc2d47b5cc2a9c46aeb359f2dab67be69f74
 EBUILD libsvm-2.90-r1.ebuild 2358 RMD160 df8c1f2d6f169df0cfd49175b8427675cd13bb2d SHA1 0077921f5e0a931b7447067b4d38ab0d125ae92f SHA256 0d0481f369bc12e3d91ada2ae9cf44dc6d53895a0b5d42c9767c8d39d97754e3
 EBUILD libsvm-3.11.ebuild 2048 RMD160 cf6e25de7e7579a70e073fd8a8b6bd9ea1feb3ff SHA1 b06e7f385827b62ab947c0355edf2fc9c32e9bac SHA256 a795a79c7b8c26befa655f3b34b266149a7930c4d87041112783a049c851570d
-MISC ChangeLog 4098 RMD160 0ad13907aaa5213e080eee4179510d1e3c41904c SHA1 7b4f2660c7e86d7da88107b5ec574f83541f4fdd SHA256 06430bce4b059630d29edd28322d650bf57da4e15790eba241d5630c1b42c6b2
+EBUILD libsvm-3.12.ebuild 2067 RMD160 3a58d81a5be85bb5da44944b48c39b1533c8dd71 SHA1 326de178b48626199d5f2a9471e99e6e0a6350d1 SHA256 2d5bd0fbbe559dd532651fcbe8a58b5f1e903a0b4f12f78ff6d6f813a57164f6
+MISC ChangeLog 4276 RMD160 9dfc9944e8a73fe9dc827664897fa1b2b29245ab SHA1 dce770fe80f1b8855f5965b4d8d7e9051f287d54 SHA256 62cd4ceb08cfcd1b6b0e09327661faedc153d0b462c58b098297113315fbf963
 MISC metadata.xml 612 RMD160 aa8a12cb83ea820ab64c431ccabc8093f6da0e19 SHA1 1359ee9f43a7a2c65b6c5e861609a113b9c11a73 SHA256 9b5cf6cdd90cf907fbb016ccdd6a0794e304b53551a4b8a411f61a06111acca0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk9vBAQACgkQgAnW8HDreRa0rgCghFOBoXvhPgENBEBE6OVyPN1n
-piUAniAlcFUYuqUu/EfYLhij7s3l6Eu3
-=ydWP
+iEYEARECAAYFAk+NoqAACgkQ1ycZbhPLE2Ay3QCfTL8tSWqEMjJaIZJPY4meYd8w
+EXYAoKLrwNPGhlqEw0E5R4yZAgktcLnU
+=qTED
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/libsvm/files/3.12-makefile.patch b/sci-libs/libsvm/files/3.12-makefile.patch
new file mode 100644
index 000000000000..5dbce864b475
--- /dev/null
+++ b/sci-libs/libsvm/files/3.12-makefile.patch
@@ -0,0 +1,38 @@
+--- Makefile.orig	2012-01-01 15:10:52.000000000 +0000
++++ Makefile	2012-04-16 17:52:32.000000000 +0100
+@@ -1,9 +1,10 @@
+ CXX ?= g++
+-CFLAGS = -Wall -Wconversion -O3 -fPIC
++CXXFLAGS ?= -Wall -Wconversion -O3
+ 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,15 @@
+ 	else \
+ 		SHARED_LIB_FLAG="-shared -W1,-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); \
++	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
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) 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
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) svm-train.c svm.o -o svm-train -lm
+ svm-scale: svm-scale.c
+-	$(CXX) $(CFLAGS) svm-scale.c -o svm-scale
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) svm-scale.c -o svm-scale
+ svm.o: svm.cpp svm.h
+-	$(CXX) $(CFLAGS) -c svm.cpp
++	$(CXX) $(CXXFLAGS) $(PICFLAGS) -c svm.cpp
+ 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.12.ebuild b/sci-libs/libsvm/libsvm-3.12.ebuild
new file mode 100644
index 000000000000..30450f62f252
--- /dev/null
+++ b/sci-libs/libsvm/libsvm-3.12.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libsvm/libsvm-3.12.ebuild,v 1.1 2012/04/17 17:04:23 bicatali Exp $
+
+EAPI="4"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit eutils java-pkg-opt-2 python flag-o-matic 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"
+IUSE="java openmp python tools"
+
+DEPEND="java? ( >=virtual/jdk-1.4 )"
+RDEPEND="${DEPEND}
+	tools? ( sci-visualization/gnuplot )"
+
+pkg_setup() {
+	if use openmp; then
+		if [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp; then
+			ewarn "You are using gcc but without OpenMP capabilities"
+			die "Need an OpenMP capable compiler"
+		else
+			append-ldflags -fopenmp
+			append-cxxflags -fopenmp
+		fi
+		append-cxxflags -DOPENMP
+	fi
+	use python && python_pkg_setup
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/3.11-openmp.patch \
+		"${FILESDIR}"/3.12-makefile.patch
+	sed -i -e "s@\.\./@${EPREFIX}/usr/bin/@g" tools/*.py \
+		|| die "Failed to fix paths in python files"
+	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_compile() {
+	emake
+	use java && emake -C java
+}
+
+src_install() {
+	dobin svm-train svm-predict svm-scale
+	dolib.so *.so*
+	insinto /usr/include
+	doins svm.h
+	dohtml FAQ.html
+	dodoc README
+
+	if use tools; then
+		local t
+		for t in tools/*.py; do
+			newbin ${t} svm-$(basename ${t} .py)
+		done
+		newdoc tools/README README.tools
+		insinto /usr/share/doc/${PF}
+		doins heart_scale
+		doins -r svm-toy
+	fi
+
+	if use python ; then
+		installation() {
+			insinto $(python_get_sitedir)
+			doins python/*.py
+		}
+		python_execute_function installation
+		newdoc python/README README.python
+	fi
+
+	if use java; then
+		java-pkg_dojar java/libsvm.jar
+		dohtml java/test_applet.html
+	fi
+}