version bump (bug 176396): added tools USE flag to make proper inclusion of gnuplot dependency (bug 127128); reorder contents of KEYWORDS, inherit and IUSE alphabetically; make proper installation of test_applet.html file (wrong path, depending on python/java USE flag); clean up of old versions

Package-Manager: portage-2.1.3.9

7 files changed, 50 insertions, 104 deletions

diff --git a/sci-libs/libsvm/ChangeLog b/sci-libs/libsvm/ChangeLog
index 6fb53eca4574..60d195b0dd39 100644
--- a/sci-libs/libsvm/ChangeLog
+++ b/sci-libs/libsvm/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sci-libs/libsvm
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libsvm/ChangeLog,v 1.3 2007/05/12 00:44:00 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libsvm/ChangeLog,v 1.4 2007/10/01 22:14:22 opfer Exp $
+
+*libsvm-2.84 (01 Oct 2007)
+
+  01 Oct 2007; Christian Faulhammer <opfer@gentoo.org> -libsvm-2.81.ebuild,
+  -libsvm-2.81-r1.ebuild, +libsvm-2.84.ebuild:
+  version bump (bug 176396): added tools USE flag to make proper inclusion of
+  gnuplot dependency (bug 127128); reorder contents of KEYWORDS, inherit and
+  IUSE alphabetically; make proper installation of test_applet.html file
+  (wrong path, depending on python/java USE flag); clean up of old versions
 
 *libsvm-2.81-r1 (12 May 2007)
 
diff --git a/sci-libs/libsvm/Manifest b/sci-libs/libsvm/Manifest
index 3086bc2e79e3..8861b2176830 100644
--- a/sci-libs/libsvm/Manifest
+++ b/sci-libs/libsvm/Manifest
@@ -1,23 +1,26 @@
-DIST libsvm-2.81.tar.gz 447834 RMD160 4a08a476d58695d154accf36a9ebef8ffbbc98ed SHA1 67a12dd136b03521187621201b2f520f984cf04f SHA256 a94d2716a9cec08e11b12dd05a4de66df0993b1d5506e445304457c65c374247
-EBUILD libsvm-2.81-r1.ebuild 1509 RMD160 5221d5c09def0ebe7a136211840c063e42a88851 SHA1 5f9332cd851eb3f9c9d35a08d80e06ce236809bb SHA256 a5c6918da26f1b133f36aa7837da679f3c9b9c1eff6a11f4dcea4637b81bbe08
-MD5 ad2d7ba77ac9b0b5ce8e91cb54a49ff1 libsvm-2.81-r1.ebuild 1509
-RMD160 5221d5c09def0ebe7a136211840c063e42a88851 libsvm-2.81-r1.ebuild 1509
-SHA256 a5c6918da26f1b133f36aa7837da679f3c9b9c1eff6a11f4dcea4637b81bbe08 libsvm-2.81-r1.ebuild 1509
-EBUILD libsvm-2.81.ebuild 1372 RMD160 56fb26abc5eb13e0d6335eb351596a07b4edd1cf SHA1 aeec8799a4a44f3a980691b224d640f1b4b8b182 SHA256 e7f68730531ac0bd5eaddfbe693f6b50ffa43b0aea181b6901c825aa2bd273eb
-MD5 84cac3c17cb140e8bd3bbf468ea5d239 libsvm-2.81.ebuild 1372
-RMD160 56fb26abc5eb13e0d6335eb351596a07b4edd1cf libsvm-2.81.ebuild 1372
-SHA256 e7f68730531ac0bd5eaddfbe693f6b50ffa43b0aea181b6901c825aa2bd273eb libsvm-2.81.ebuild 1372
-MISC ChangeLog 647 RMD160 00596f4e7a4521010cebddb66b6f38b99cdac058 SHA1 b5481b424b76860ba713a7164cfa6b18f5f3de3b SHA256 512dab4a7bfdb89a64e9b6a78316bb4d70f38610902a7ddde09402f91cb61c67
-MD5 5fc5e5073edcd3620e5c832394e032a9 ChangeLog 647
-RMD160 00596f4e7a4521010cebddb66b6f38b99cdac058 ChangeLog 647
-SHA256 512dab4a7bfdb89a64e9b6a78316bb4d70f38610902a7ddde09402f91cb61c67 ChangeLog 647
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST libsvm-2.84.tar.gz 420750 RMD160 0b79b5a537bd9e2d6b131394e166f17356d7c348 SHA1 ba2e1dc3caec6a68541656e6556cd2bcb7a3bf00 SHA256 7a953a2b47ddd0713051b08c15867f758c06991591e6aaa223b78bfaa6dda3b1
+EBUILD libsvm-2.84.ebuild 1600 RMD160 403a92ad6c23a35ac209de39eac61b9726b96265 SHA1 f5d55f7f54fbe810559928e9fe18c9df67e805c1 SHA256 6a2a9a2a55b8217dbec52e9bb5324c4986b561a8edf18405ca27a3bb0e727927
+MD5 170ba2c0d8f8ef172650dca529b18343 libsvm-2.84.ebuild 1600
+RMD160 403a92ad6c23a35ac209de39eac61b9726b96265 libsvm-2.84.ebuild 1600
+SHA256 6a2a9a2a55b8217dbec52e9bb5324c4986b561a8edf18405ca27a3bb0e727927 libsvm-2.84.ebuild 1600
+MISC ChangeLog 1100 RMD160 1a80a65c7a8fb46bcc75d688b34126e529a81e11 SHA1 f642eedd4c186865ecaa1974c90d9938625dcd50 SHA256 e13fa4b4cf2df56e26f17517474e01594bd2db95160c7b91ff8d6d2d7171fec2
+MD5 53f129b5d1a79013988a5f342f6144ed ChangeLog 1100
+RMD160 1a80a65c7a8fb46bcc75d688b34126e529a81e11 ChangeLog 1100
+SHA256 e13fa4b4cf2df56e26f17517474e01594bd2db95160c7b91ff8d6d2d7171fec2 ChangeLog 1100
 MISC metadata.xml 221 RMD160 b72d8e0df2b2daece5fcb2c5f684e90e10370f2f SHA1 58771ce3377eeee2ebf1bb8acdeaa0ba169e9342 SHA256 d253ce582fe350599cd2fa44bea0a00410ab63bf68129dafdb4cdfdf7a180ecf
 MD5 3ff31b5479b2a0244f5711fff3155aed metadata.xml 221
 RMD160 b72d8e0df2b2daece5fcb2c5f684e90e10370f2f metadata.xml 221
 SHA256 d253ce582fe350599cd2fa44bea0a00410ab63bf68129dafdb4cdfdf7a180ecf metadata.xml 221
-MD5 f0fd69b03c81bf2af3da9b618e47c320 files/digest-libsvm-2.81 235
-RMD160 4f8441306287534bffe294728b71cbbd54467980 files/digest-libsvm-2.81 235
-SHA256 db069969cc1caf27b8fe385272f085de4fcc9ef553cfd9d31caaa2896ca6881e files/digest-libsvm-2.81 235
-MD5 f0fd69b03c81bf2af3da9b618e47c320 files/digest-libsvm-2.81-r1 235
-RMD160 4f8441306287534bffe294728b71cbbd54467980 files/digest-libsvm-2.81-r1 235
-SHA256 db069969cc1caf27b8fe385272f085de4fcc9ef553cfd9d31caaa2896ca6881e files/digest-libsvm-2.81-r1 235
+MD5 9e6ec67473ac2cbc646b0482e9988f20 files/digest-libsvm-2.84 235
+RMD160 e613da153e80e901c2fe7bd9754668439d059b37 files/digest-libsvm-2.84 235
+SHA256 798d4949f8a292866a601f1cdca435c0ebb92a0b69ecb5723738aeee20b84f81 files/digest-libsvm-2.84 235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFHAXFRNQqtfCuFneMRAm9WAJ4uRyRO0hIrAfCjxegfcfcmnoIQSgCgmheX
+XzSvZDD+QJ+XDKm953Nx+Zg=
+=iGZM
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/libsvm/files/digest-libsvm-2.81 b/sci-libs/libsvm/files/digest-libsvm-2.81
deleted file mode 100644
index a097ce7ebbbb..000000000000
--- a/sci-libs/libsvm/files/digest-libsvm-2.81
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2346a02e2e2c8db29696f6695b35a547 libsvm-2.81.tar.gz 447834
-RMD160 4a08a476d58695d154accf36a9ebef8ffbbc98ed libsvm-2.81.tar.gz 447834
-SHA256 a94d2716a9cec08e11b12dd05a4de66df0993b1d5506e445304457c65c374247 libsvm-2.81.tar.gz 447834
diff --git a/sci-libs/libsvm/files/digest-libsvm-2.81-r1 b/sci-libs/libsvm/files/digest-libsvm-2.81-r1
deleted file mode 100644
index a097ce7ebbbb..000000000000
--- a/sci-libs/libsvm/files/digest-libsvm-2.81-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2346a02e2e2c8db29696f6695b35a547 libsvm-2.81.tar.gz 447834
-RMD160 4a08a476d58695d154accf36a9ebef8ffbbc98ed libsvm-2.81.tar.gz 447834
-SHA256 a94d2716a9cec08e11b12dd05a4de66df0993b1d5506e445304457c65c374247 libsvm-2.81.tar.gz 447834
diff --git a/sci-libs/libsvm/files/digest-libsvm-2.84 b/sci-libs/libsvm/files/digest-libsvm-2.84
new file mode 100644
index 000000000000..0e56c8d7978f
--- /dev/null
+++ b/sci-libs/libsvm/files/digest-libsvm-2.84
@@ -0,0 +1,3 @@
+MD5 a7bd21b21510e9634950715c2b4a4ce9 libsvm-2.84.tar.gz 420750
+RMD160 0b79b5a537bd9e2d6b131394e166f17356d7c348 libsvm-2.84.tar.gz 420750
+SHA256 7a953a2b47ddd0713051b08c15867f758c06991591e6aaa223b78bfaa6dda3b1 libsvm-2.84.tar.gz 420750
diff --git a/sci-libs/libsvm/libsvm-2.81.ebuild b/sci-libs/libsvm/libsvm-2.81.ebuild
deleted file mode 100644
index fa6daa8fc0e3..000000000000
--- a/sci-libs/libsvm/libsvm-2.81.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libsvm/libsvm-2.81.ebuild,v 1.2 2006/08/01 03:41:25 nichoj Exp $
-
-inherit toolchain-funcs python java-pkg
-
-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="~x86 ~amd64"
-IUSE="python java"
-
-DEPEND="java? ( virtual/jdk )"
-#RDEPEND=""
-
-src_compile() {
-	emake CXXC="$(tc-getCXX)" CFLAGS="${CXXFLAGS}" || die
-
-	sed -i -e 's@\.\./@/usr/bin/@g' tools/*.py || die
-
-	if use python ; then
-		cd python
-		python_version || die
-		emake CC="$(tc-getCXX)" \
-			CFLAGS="${CXXFLAGS} -I/usr/include/python${PYVER} -I.." all || die
-		cd -
-	fi
-
-	if use java ; then
-		cd java
-		emake || die
-		cd -
-	fi
-}
-
-src_install() {
-	dobin svm-train svm-predict svm-scale || die
-	dohtml FAQ.html
-	dodoc README
-
-	cd tools
-	insinto /usr/share/doc/${PF}/tools
-	doins easy.py grid.py subset.py
-	docinto tools
-	dodoc README
-	cd -
-
-	if use python ; then
-		cd python
-		python_version || die
-		insinto /usr/lib/python${PYVER}/site-packages
-		doins svmc.so svm.py || die
-		docinto python
-		dodoc README
-		cd -
-	fi
-
-	if use java ; then
-		cd java
-		java-pkg_dojar libsvm.jar
-		dohtml test_applet.html
-		cd -
-	fi
-}
diff --git a/sci-libs/libsvm/libsvm-2.81-r1.ebuild b/sci-libs/libsvm/libsvm-2.84.ebuild
index cdcdf198fcb3..2b98ae5d4375 100644
--- a/sci-libs/libsvm/libsvm-2.81-r1.ebuild
+++ b/sci-libs/libsvm/libsvm-2.84.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libsvm/libsvm-2.81-r1.ebuild,v 1.1 2007/05/12 00:44:00 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libsvm/libsvm-2.84.ebuild,v 1.1 2007/10/01 22:14:22 opfer Exp $
 
-inherit toolchain-funcs python java-pkg-opt-2
+inherit java-pkg-opt-2 python toolchain-funcs
 
 DESCRIPTION="Library for Support Vector Machines"
 HOMEPAGE="http://www.csie.ntu.edu.tw/~cjlin/libsvm/"
@@ -10,11 +10,12 @@ SRC_URI="http://www.csie.ntu.edu.tw/~cjlin/libsvm/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="python java"
+KEYWORDS="~amd64 ~x86"
+IUSE="java python tools"
 
 DEPEND="java? ( >=virtual/jdk-1.4 )"
-#RDEPEND=""
+RDEPEND="${DEPEND}
+	tools? ( sci-visualization/gnuplot )"
 
 src_compile() {
 	emake CXXC="$(tc-getCXX)" CFLAGS="${CXXFLAGS}" || die
@@ -43,12 +44,14 @@ src_install() {
 	dohtml FAQ.html
 	dodoc README
 
-	cd tools
-	insinto /usr/share/doc/${PF}/tools
-	doins easy.py grid.py subset.py
-	docinto tools
-	dodoc README
-	cd -
+	if use tools; then
+		cd tools
+		insinto /usr/share/doc/${PF}/tools
+		doins easy.py grid.py subset.py
+		docinto tools
+		dodoc README
+		cd -
+	fi
 
 	if use python ; then
 		cd python
@@ -63,6 +66,7 @@ src_install() {
 	if use java ; then
 		cd java
 		java-pkg_dojar libsvm.jar
+		docinto html
 		dohtml test_applet.html
 		cd -
 	fi