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

(Portage version: 2.1.3.9)

6 files changed, 28 insertions, 85 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/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