Version bump, switch to python-r1 for python-bindings

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

3 files changed, 27 insertions, 20 deletions

diff --git a/sci-libs/libsvm/ChangeLog b/sci-libs/libsvm/ChangeLog
index 32093925631c..b4edf0e72e99 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.30 2012/12/04 18:40:13 bicatali Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libsvm/ChangeLog,v 1.31 2013/07/09 23:34:04 bicatali Exp $
+
+*libsvm-3.17 (09 Jul 2013)
+
+  09 Jul 2013; Sébastien Fabbro <bicatali@gentoo.org> +libsvm-3.17.ebuild,
+  -libsvm-3.12.ebuild:
+  Version bump, switch to python-r1 for python-bindings
 
   04 Dec 2012; Sébastien Fabbro <bicatali@gentoo.org> files/3.14-makefile.patch:
   Fixed parallel build, bug #445312
diff --git a/sci-libs/libsvm/Manifest b/sci-libs/libsvm/Manifest
index be83ef1dd595..37cd8f3aafe4 100644
--- a/sci-libs/libsvm/Manifest
+++ b/sci-libs/libsvm/Manifest
@@ -8,17 +8,17 @@ AUX 3.11-openmp.patch 939 SHA256 642c56ffaf5cd1415b0707b25dd1c3cf1009715938d298d
 AUX 3.12-makefile.patch 1616 SHA256 a60c310fc0ecab6e33d45a1ab6d8cd2403e4a4d20d935f7ac91d1bc085959c42 SHA512 f10a8489628055e1e03f3e73c4f7ce22169024abcda8bc18f191fc21068a2494cb7f936c4f4187e8a464ca5cdfce71a6087cece90ed917a3dc5e1fd63cc97f87 WHIRLPOOL e3cbe0e75859dc0a2c851f7101bef74d4d9fcdfe2458f7f7e1f43dddfb2408f236132bb8f8face9eba2309aa7f9c8878f0b063623a0cede5edd43389a600f994
 AUX 3.14-makefile.patch 1630 SHA256 e8dbacc074d91cbfc4e0f523de1c27557848853580ed71582d5cbd600b8a809d SHA512 787b9f34f1bad7da78381a2ee68201e8340090d7c692d04e5e1e440471b8c5ac4fe05bb9385f5ddc5c74550258423cd81bad571a7499186ca8ccb57a7e1fe971 WHIRLPOOL c4e994847f37c5017451f02dabe0d3bd9e233d15ba5ac09973e1f8fa70ffd374f6c7bb3e1f83a5fa0ed3bfd33b894cd74c3ae82524d81c3153588217c97d1d2b
 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
+DIST libsvm-3.17.tar.gz 607892 SHA256 46a4750d3506e6ccd8adf7e3e1f482d86ce9c5368f9c78e19c7923edf0067a12 SHA512 43f3e7cbee37b583cd65041465ef620ab7b3a24ad3f0e70cc2f41efea847e8c1c7319a92b53262bc5f721a46c0cfb4d51102d2e29c93b6ccae03ecf006e53d2d WHIRLPOOL 9518e2aeb5d2f0ac0945fa193edfaf7ba022729cc9ea91e5a773fed638fdcaef4d4bea0f284f1698571b570f5543afc8987ec81a54637d537c709b09474f6fbc
 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 5010 SHA256 a63c977ef9ffe4d3268a724e137ca806e86a5059ad685549e89e272ae6a59ce7 SHA512 dd0a598face8dde078bc7a115d191ab19227e43887b3b0bd3a1db938f06383b34bb796788336694993d0810305fc7cdf393cb0c5720df0038b0b06771f519079 WHIRLPOOL 1bd79e250bb2a672cdb559ca423267ec7ba1212244999aa6d691162478a9c6da883276b84f296c6239afe1786c968027e979ae0d9be31b65714ecdefae6634bf
+EBUILD libsvm-3.17.ebuild 2153 SHA256 6659f0b9640473455daf005e6188876491cfcbfac2ad9ee1705f9428f6508a5d SHA512 44c8c56cd18d7fdc6714ffde923cb237020d80e4aa1d51a6d1a2121201764f4783e5ebf3c2dd9d9c5f1a99a21ee4a7b6c7ee6e0683ad1fd79d79de4e0e27a209 WHIRLPOOL 347cf95c790dc23e9e2bc105768dadeb504525d5012fe567a607411eed10f63865ab402be7ed5fdd3b0204fc48efa69572b914b1b1eda8a5472e0186527479ee
+MISC ChangeLog 5194 SHA256 a9cad5ac068661fd8db3f7a4701cc807fc3962bcd763c7472050ef6b821a33b7 SHA512 503d81cb072920678d1cc1dbb1e6c2f4fac81743a15b8e0ac1781c978209426212c98e1fa475401d992ceb15ba2367a0b6225eed9c1ce8d4cccc42721f5ae707 WHIRLPOOL 7caa4bc1b1a8193af187d35f22525a6424abe83185cfd923ea32d307d43848773759fa9deeac55b19981469c7a5a6ea2b98e0b92d004ccdc59e15f8bc701556d
 MISC metadata.xml 608 SHA256 3ea9632635376991d0e7d46a2346dd9c9338df6d5619f3db9bf57c6f9c7c8545 SHA512 649f87f606cc2aed21d734df13207a43442985da0470e987c539660efd9e563aa7b5abcb8fc48b586d05aee218e591fe3bdff89590e951e0eba4a6e3caf13421 WHIRLPOOL df7635b2f164ad3fc672b73e1951a8d26a2992f888a9da1c44b3daa4af5c53dafbb4709ffa204979bfa4fcb9ec8eec736a1fcf7c9295d396d91f1c49e094df33
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlC+Q5QACgkQ1ycZbhPLE2AaKgCeJHY6iz7uNDQKFxf/n+5BwwT2
-hioAnim+ZFJhtuxrfGqDI82ys4hVfokM
-=wcee
+iEYEAREIAAYFAlHcne0ACgkQ1ycZbhPLE2Ah8wCeL4EVGKUJXIK4RrzinmGC630a
+v7YAnRHb//gj9tqkh4Bj96hKyfiZbaSj
+=a/Yc
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/libsvm/libsvm-3.12.ebuild b/sci-libs/libsvm/libsvm-3.17.ebuild
index fc76d86178e3..902a34910684 100644
--- a/sci-libs/libsvm/libsvm-3.12.ebuild
+++ b/sci-libs/libsvm/libsvm-3.17.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.3 2012/06/26 23:49:24 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libsvm/libsvm-3.17.ebuild,v 1.1 2013/07/09 23:34:04 bicatali Exp $
 
-EAPI=4
+EAPI=5
 
-SUPPORT_PYTHON_ABIS="1"
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
-inherit eutils java-pkg-opt-2 python flag-o-matic toolchain-funcs
+inherit eutils java-pkg-opt-2 python-r1 flag-o-matic toolchain-funcs
 
 DESCRIPTION="Library for Support Vector Machines"
 HOMEPAGE="http://www.csie.ntu.edu.tw/~cjlin/libsvm/"
@@ -18,7 +18,8 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="java openmp python tools"
 
 DEPEND="java? ( >=virtual/jdk-1.4 )"
-RDEPEND="${DEPEND}
+RDEPEND="
+	java? ( >=virtual/jre-1.4 )
 	tools? ( sci-visualization/gnuplot )"
 
 pkg_setup() {
@@ -32,13 +33,12 @@ pkg_setup() {
 		fi
 		append-cxxflags -DOPENMP
 	fi
-	use python && python_pkg_setup
 }
 
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/3.11-openmp.patch \
-		"${FILESDIR}"/3.12-makefile.patch
+		"${FILESDIR}"/3.14-makefile.patch
 	sed -i -e "s@\.\./@${EPREFIX}/usr/bin/@g" tools/*.py \
 		|| die "Failed to fix paths in python files"
 
@@ -77,10 +77,11 @@ src_install() {
 
 	if use python ; then
 		installation() {
-			insinto $(python_get_sitedir)
-			doins python/*.py
+			touch python/__init__.py || die
+			python_moduleinto libsvm
+			python_domodule python/*.py
 		}
-		python_execute_function installation
+		python_foreach_impl installation
 		newdoc python/README README.python
 	fi