Version bump, update patch

Package-Manager: portage-2.2.01.21313-prefix/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360

5 files changed, 173 insertions, 22 deletions

diff --git a/sci-libs/libsvm/ChangeLog b/sci-libs/libsvm/ChangeLog
index db39dc74142b..90773565ef06 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.28 2012/06/26 23:49:24 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libsvm/ChangeLog,v 1.29 2012/11/29 19:04:49 bicatali Exp $
+
+*libsvm-3.14 (29 Nov 2012)
+
+  29 Nov 2012; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/3.14-makefile.patch, +libsvm-3.14.ebuild, metadata.xml:
+  Version bump, update patch
 
   26 Jun 2012; Sebastien Fabbro <fabbros@gentoo.org> -files/2.91-makefile.patch,
   -files/3.0-makefile.patch, -files/3.1-openmp.patch,
@@ -135,4 +141,3 @@
   02 Jan 2006; Mamoru KOMACHI <usata@gentoo.org> +metadata.xml,
   +libsvm-2.81.ebuild:
   Initial import. This closes bug #111898.
-
diff --git a/sci-libs/libsvm/Manifest b/sci-libs/libsvm/Manifest
index 6d379945a2b5..9c9af726a7fb 100644
--- a/sci-libs/libsvm/Manifest
+++ b/sci-libs/libsvm/Manifest
@@ -1,21 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX 2.90-fpic.patch 713 RMD160 d2be5724cbde2aa5c7254c5be37d62cf48de0efb SHA1 231825014841bdf58b19e9f69864210b6d96416b SHA256 7b40aba4cf560488c464ede3374c455bb194b2ef6f15e7c447e823c81964fffc
-AUX 2.90-ldflags.patch 662 RMD160 ed4b98dc092dad67b32dbf513341dd6dbdc2f27d SHA1 55e97a9ef2bec6ba5bb7bff84892c98d6861d639 SHA256 0fb14dfeb3dc508210d2353bc9a1ab5081c7af11223f297b01c651d7a98c450b
-AUX 2.90-python3.patch 408 RMD160 fa1a5cf9b03fe8a0c6a2aaeb3a5de4ffd81888fa SHA1 fcfbf9b8b5525cd4f408e4e3c88f7189eb4f20e2 SHA256 6c319490e6856fe5636de80a2fb89da3765511d9a1854d459a2376e7b36833c4
-AUX 3.11-openmp.patch 939 RMD160 1e8cca6b9ecfad28daa48a6ba1073b21d4ed78cd SHA1 2ec5bd5a86a44e0be9e3aa7b1b3d4c54ce06d0de SHA256 642c56ffaf5cd1415b0707b25dd1c3cf1009715938d298ddb7a612bc2f3854f0
-AUX 3.12-makefile.patch 1616 RMD160 a1613ebae1b1111fd8cae589d754fca67884560b SHA1 731c0caf2f8b23d631754ab446b7d17430a765b5 SHA256 a60c310fc0ecab6e33d45a1ab6d8cd2403e4a4d20d935f7ac91d1bc085959c42
-DIST libsvm-2.9.tar.gz 563829 RMD160 ff6207d399f59eea3329fd629fcdf4c399583a2b SHA1 506725e3328b7fd78b00b99b93e5fb4c90506528 SHA256 0cfb4b88c37e431490b65c97a2043f9aa9d2f1ee140344944dfea88b1136c757
-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.12.ebuild 2108 RMD160 e0b0510ae8afa44463cacefbeb9b759cf1d5c1f9 SHA1 192d7c5d66d7a76f9dfa0f80305fbfdbf062ec8b SHA256 096d4495946734e64ef599775de75fe99b75bada2dadcf08d46d96bd762f2976
-MISC ChangeLog 4714 RMD160 1c05b15e5a4de9204f3f66d3ce4f41a7d554b94d SHA1 4b29f72196d0564eac7243c333e8cc0bdd85406d SHA256 dcc2cf21197f3f6bb17ee16aaba1f3efc284e428a5879dfda50c478f73612fce
-MISC metadata.xml 612 RMD160 aa8a12cb83ea820ab64c431ccabc8093f6da0e19 SHA1 1359ee9f43a7a2c65b6c5e861609a113b9c11a73 SHA256 9b5cf6cdd90cf907fbb016ccdd6a0794e304b53551a4b8a411f61a06111acca0
+AUX 2.90-fpic.patch 713 SHA256 7b40aba4cf560488c464ede3374c455bb194b2ef6f15e7c447e823c81964fffc SHA512 c26dcbf22cde0ae16a75ef34085e589fe70cffaa412cc9e9b034cf246fb3073ac6197605076c01e250cd52f2f71711e82e6971850daabae3bb8160d59fe50697 WHIRLPOOL a0a539c336856cfadbfef396bdeccd041b845df0b5a57047a38ed90dda68402daa21eed293007ecc5793f4710811cc071b8944e17a9a41635a8ce6151ed1f2cf
+AUX 2.90-ldflags.patch 662 SHA256 0fb14dfeb3dc508210d2353bc9a1ab5081c7af11223f297b01c651d7a98c450b SHA512 f77944d2c41bc110ef69a556916a9acd5d602aa2b468edf9f75bb306ea23ad4fb306f5bcf855b3b95b9003c22990096f7b280b5d02e1c8eaf7eb2ce1768cb419 WHIRLPOOL 947bd3f0789a4c4c58154d253a252891b81b649bde9b53cdedf331eb4e73813d5973a1068bf453b36a4ce60698488506c20651662b9d537d66c1d746140b1827
+AUX 2.90-python3.patch 408 SHA256 6c319490e6856fe5636de80a2fb89da3765511d9a1854d459a2376e7b36833c4 SHA512 cb9873d63b7ceff143dc11ea28634fe7808d1cdac5fbf06961004a23ea0eba4809807ecdec4f2398c9317bc9513fb4a38299227cd36d820455c0a075e8a36da3 WHIRLPOOL b3c8ef9b3c1678dd1f1d761d35038e53e3de084cae1d2909fd907ccde9e4929970ea860531ba173777470edf5d7831cdda63d17428dce1c272dacb14e39b6c42
+AUX 3.11-openmp.patch 939 SHA256 642c56ffaf5cd1415b0707b25dd1c3cf1009715938d298ddb7a612bc2f3854f0 SHA512 69428a119162f056f8cf94083a8bd257ef365ab2ae204b14d991eb5a4204a0ec49f5deb4b240e971a3c360474d4876cbc5c1b49c6bef9dc2939c1ffd7a2772c8 WHIRLPOOL 5e925d6b62d061700ac59755d90ab270623bb3172e00973869692184de9c01565d1407594e39528c3a231b21e10cc93a18e6d5e713ac4597f8e07da08ea45f87
+AUX 3.12-makefile.patch 1616 SHA256 a60c310fc0ecab6e33d45a1ab6d8cd2403e4a4d20d935f7ac91d1bc085959c42 SHA512 f10a8489628055e1e03f3e73c4f7ce22169024abcda8bc18f191fc21068a2494cb7f936c4f4187e8a464ca5cdfce71a6087cece90ed917a3dc5e1fd63cc97f87 WHIRLPOOL e3cbe0e75859dc0a2c851f7101bef74d4d9fcdfe2458f7f7e1f43dddfb2408f236132bb8f8face9eba2309aa7f9c8878f0b063623a0cede5edd43389a600f994
+AUX 3.14-makefile.patch 1630 SHA256 7691a5b5d0e1c342da8f82612d7c7d61eadea3a21ff8a918fb03588ce58096d5 SHA512 e7cf13ab3c1c14345fd2d41d2103e3097c4c49052fdfe08515149257d419e4f448f4baa1aa7ef6d51ae58d11fbe3cfe3b5a263f5b65c25e54333390069a7221e WHIRLPOOL f283626bd121fab47baa88b4eca76e233dbc33c6d9afad540125171c85034584a7ead77847a2d084b3ac28548e191a0f3141f3a0a1ccb0bae06634145982933e
+DIST libsvm-2.9.tar.gz 563829 SHA256 0cfb4b88c37e431490b65c97a2043f9aa9d2f1ee140344944dfea88b1136c757
+DIST libsvm-3.12.tar.gz 645287 SHA256 9dcd7a301665d2cbd8c109bba0e8cc2d47b5cc2a9c46aeb359f2dab67be69f74
+DIST libsvm-3.14.tar.gz 603819 SHA256 c968528b6360a8d420f259ce531f76c3c30070cf20f2d334652f828d04cd4aa3 SHA512 7d8681ba65ea754998fcfa702db4297cb2259e59f53a494e3d4e7aa06a9d2c67bc68bfc7a57d64d4008649523cae0ad7315c338036e9aa59416bb7a3486f33f6 WHIRLPOOL ede159ab92c2b60afe0092dee12386f28e8a9a4162e8300076b5e0917c6371c26dae4a4eb8575fa4200399789d3cd461c4e9212168f6da95d9c0d6e1c9a2f4d2
+EBUILD libsvm-2.90-r1.ebuild 2358 SHA256 0d0481f369bc12e3d91ada2ae9cf44dc6d53895a0b5d42c9767c8d39d97754e3 SHA512 44e83a8e3524ca1f783efc455aefb44c1f218d2d3663222a08bd342a95e5da38d10d695c66579fd55e188b3f7cc8128dde1c4df7a0fe3f5ed82bb5be2168e8f3 WHIRLPOOL af8883c731fa51b74fc12791deebf03a6598872949b57c79040ed1bd90ec64f3f5994401abae0c7e754a783b3224df46d4f41290efd6081e1c84c441f1f9ccbc
+EBUILD libsvm-3.12.ebuild 2108 SHA256 096d4495946734e64ef599775de75fe99b75bada2dadcf08d46d96bd762f2976 SHA512 2de618d773fe02a3dd8b4d818fdbdd7a1c3a0287eb79e45930d2236b070072f9a50d5a19915f7dcf2c69e08efbb025887650dbecece47cf747fbc28f01475060 WHIRLPOOL 1a9b060bbc4ecd6e78e9085ae25a7f3ec311f4e102f19939870df898f8ed360c81ef450dae0c23e80dd28cf59c0e3c9c614e4eb0df7a31ce2fb4df68316d32d8
+EBUILD libsvm-3.14.ebuild 2128 SHA256 e212dd35d97339d26cd97d5c5abaaa7356a748050fd17e26eed5a65b52b7431e SHA512 412967e2894431f2c262e6da6906282915daef6f334b498916ec19950a13403a0ce6661a741eddbe141af1758782750bd4cc19110415d992085e9c9ec1c49313 WHIRLPOOL 625c8e3288651857734a02f090b2863adf7af954e75a22afc8a898ecd840ea7e035a0e85aea56f2c6a0cfd6b34337bfacedd4e857a5eca6a00d56557646eb0bb
+MISC ChangeLog 4891 SHA256 d13a41ce19cb7c6aa69713677c76f239ef08ff0f64df3ac6ec9269066ce8c53b SHA512 b46585463622487be3e2825ff86589de1b96a292a5d9e5171095a3417d5daeb7ec5e37c5b3280c67b5e3117d92b225bb567f1bfd12818610249ef8c11188ed95 WHIRLPOOL b26ec5e08f988cddb38bbc42f7e7347f23a641b9f2e04ab12ded18847bb99f175ca0b560e8147631b390a0d914005cfda9985eeb96632ad41d6c0be048ff69ad
+MISC metadata.xml 608 SHA256 3ea9632635376991d0e7d46a2346dd9c9338df6d5619f3db9bf57c6f9c7c8545 SHA512 649f87f606cc2aed21d734df13207a43442985da0470e987c539660efd9e563aa7b5abcb8fc48b586d05aee218e591fe3bdff89590e951e0eba4a6e3caf13421 WHIRLPOOL df7635b2f164ad3fc672b73e1951a8d26a2992f888a9da1c44b3daa4af5c53dafbb4709ffa204979bfa4fcb9ec8eec736a1fcf7c9295d396d91f1c49e094df33
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/qSooACgkQ1ycZbhPLE2CVOACfSMYc6plMKsBz220qz1tw2/ox
-3XwAn0rc7qgG2+o3R5302IJArpjGWFdz
-=7Qa0
+iEYEAREIAAYFAlC3soMACgkQ1ycZbhPLE2AakgCeMUxhQpC3az5kLKoEUg/Wz/Ym
+N0oAn0evuvLj6PfklwnDbn24mYcPZf2F
+=5o04
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/libsvm/files/3.14-makefile.patch b/sci-libs/libsvm/files/3.14-makefile.patch
new file mode 100644
index 000000000000..b8bdd9f82ba8
--- /dev/null
+++ b/sci-libs/libsvm/files/3.14-makefile.patch
@@ -0,0 +1,51 @@
+* 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
+nov 2012 - bicatali@gentoo.org
+
+--- Makefile.orig	2012-11-29 10:39:07.149421728 -0800
++++ Makefile	2012-11-29 10:57:19.727766521 -0800
+@@ -1,9 +1,12 @@
+ CXX ?= g++
+-CFLAGS = -Wall -Wconversion -O3 -fPIC
++CC ?= gcc
++CFLAGS ?= -Wall -Wconversion -O3
++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 +14,20 @@
+ 	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) ; \
++	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
++	$(CC) $(CFLAGS) -c $@.c -o $@.o
++	$(CXX) $(LDFLAGS) $@.o svm.o -lm -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
+-	$(CXX) $(CFLAGS) svm-scale.c -o svm-scale
++	$(CC) $(CFLAGS) -c $@.c -o $@.o
++	$(CXX) $(LDFLAGS) $@.o svm.o -o $@
++
+ 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.14.ebuild b/sci-libs/libsvm/libsvm-3.14.ebuild
new file mode 100644
index 000000000000..7e9bb55317a5
--- /dev/null
+++ b/sci-libs/libsvm/libsvm-3.14.ebuild
@@ -0,0 +1,92 @@
+# 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.14.ebuild,v 1.1 2012/11/29 19:04:49 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 ~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 )"
+
+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.14-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
+	tc-export CXX
+}
+
+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
+	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
+}
diff --git a/sci-libs/libsvm/metadata.xml b/sci-libs/libsvm/metadata.xml
index a30bae157f5b..d3a52c3c71cc 100644
--- a/sci-libs/libsvm/metadata.xml
+++ b/sci-libs/libsvm/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
-	<longdescription lang="en">
+<herd>sci</herd>
+<longdescription lang="en">
  The LIBSVM library is used to calculate Support Vector Machine
  optimizations  with a great variety of options. It includes
  one-class, two-class, multiclass, regression-mode, and probablistic
  output functionality. It is primarily of interest to machine-learning
  researchers and artificial intelligence application developers.
 </longdescription>
-	<use>
-		<flag name="tools">Install python based tool scripts</flag>
-	</use>
+<use>
+  <flag name="tools">Install python based tool scripts</flag>
+</use>
 </pkgmetadata>