style fixes

Package-Manager: portage-2.0.51.22-r1

6 files changed, 16 insertions, 97 deletions

diff --git a/dev-util/weka/Manifest b/dev-util/weka/Manifest
index 89fc00ceb5be..c77732d21277 100644
--- a/dev-util/weka/Manifest
+++ b/dev-util/weka/Manifest
@@ -1,9 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f3c42bc97f73602a7acce5fe05ab5d5e weka-3.4.3_p20041113.ebuild 1458
 MD5 fe0469f782d6b007d89df8b976d11ec1 ChangeLog 1511
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 a33a5cceec65abd49e4751640597c431 weka-3.4.1.ebuild 791
-MD5 a3fce87aa1a7bf3177dff8950768c319 weka-3.4.1-r1.ebuild 1419
-MD5 b6703d348e57bb8058d953cf0fbd935c weka-3.4.3_p20041113.ebuild 1519
-MD5 6fe760afce2d4d198e9453a6171e7913 files/digest-weka-3.4.1 60
-MD5 6fe760afce2d4d198e9453a6171e7913 files/digest-weka-3.4.1-r1 60
 MD5 e6cdfc65e52842dc2d8910061cdbb9e7 files/digest-weka-3.4.3_p20041113 143
 MD5 60179e67fd9dadf4d3fc08c2b89317a6 files/weka-build_xml.patch 2035
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC3ChQ/rLF9B432nYRAsp/AJ4tjy4U+Ku6e6FrU8B2O/pEBR9X3wCgmQik
+oVwwRmpSlzYFnGB9lgrDaK8=
+=QF67
+-----END PGP SIGNATURE-----
diff --git a/dev-util/weka/files/digest-weka-3.4.1 b/dev-util/weka/files/digest-weka-3.4.1
deleted file mode 100644
index 933077cdd243..000000000000
--- a/dev-util/weka/files/digest-weka-3.4.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 525d6a5220d6fe917fdb08efcbb1c97d weka-3-4-1.zip 6886727
diff --git a/dev-util/weka/files/digest-weka-3.4.1-r1 b/dev-util/weka/files/digest-weka-3.4.1-r1
deleted file mode 100644
index 933077cdd243..000000000000
--- a/dev-util/weka/files/digest-weka-3.4.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 525d6a5220d6fe917fdb08efcbb1c97d weka-3-4-1.zip 6886727
diff --git a/dev-util/weka/weka-3.4.1-r1.ebuild b/dev-util/weka/weka-3.4.1-r1.ebuild
deleted file mode 100644
index 701727ca675b..000000000000
--- a/dev-util/weka/weka-3.4.1-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/weka/weka-3.4.1-r1.ebuild,v 1.5 2005/03/04 10:57:09 luckyduck Exp $
-
-inherit java-pkg
-
-DESCRIPTION="A Java data mining package"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-${PV//./-}.zip"
-HOMEPAGE="http://www.cs.waikato.ac.nz/ml/weka/"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-DEPEND=">=virtual/jdk-1.4.1
-	app-arch/unzip
-	dev-java/ant"
-IUSE="doc"
-
-S=${WORKDIR}/${PN}-3-4
-
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	mkdir build
-	jar xf weka.jar || die "failed to unpack"
-
-	find weka/ -type f -name '*.class' -exec rm -f {} \; || die "failed to	remove classes"
-	cp -r weka build || die "failed to copy"
-
-	rm -rf weka
-	jar xf weka-src.jar || die "failed to unpack"
-
-	rm -f *.jar
-}
-
-src_compile() {
-	javac -nowarn -classpath . $(find weka -name '*.java') -d build || die "failed to compile"
-	jar cf ${PN}.jar -C build .
-}
-
-src_install() {
-	java-pkg_dojar ${PN}.jar || die "failed installing"
-
-	mkdir bin
-	echo "#!/bin/sh" > bin/${PN}
-	echo "java -classpath \$(java-config -p weka) weka.gui.GUIChooser" >> bin/${PN}
-	dobin bin/${PN}
-
-	dodir /usr/share/${PN}/data/
-	cp data/* ${D}/usr/share/${PN}/data/ || die "failed to copy data"
-	use doc && java-pkg_dohtml -r doc/*
-	dodoc README* COPYING CHANGELOG-${PV//./-}
-	cp *.pdf ${D}/usr/share/doc/${PF}/ || die "failed to copy docs"
-}
diff --git a/dev-util/weka/weka-3.4.1.ebuild b/dev-util/weka/weka-3.4.1.ebuild
deleted file mode 100644
index 188165cf83de..000000000000
--- a/dev-util/weka/weka-3.4.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/weka/weka-3.4.1.ebuild,v 1.7 2005/03/04 10:57:09 luckyduck Exp $
-
-inherit java-pkg
-
-DESCRIPTION="A Java data mining package"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-${PV//./-}.zip"
-HOMEPAGE="http://www.cs.waikato.ac.nz/ml/weka/"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-DEPEND=">=virtual/jdk-1.4.1
-	app-arch/unzip
-	dev-java/ant"
-IUSE="doc"
-
-S=${WORKDIR}/${PN}-3-4
-
-src_compile() { :; }
-
-src_install() {
-	java-pkg_dojar *.jar || die "failed installing"
-
-	dodir /usr/share/${PN}/data/
-	cp data/* ${D}/usr/share/${PN}/data/
-	use doc && java-pkg_dohtml -r doc/*
-	dodoc README* COPYING CHANGELOG-${PV//./-}
-	cp *.pdf ${D}/usr/share/doc/${P}/
-}
diff --git a/dev-util/weka/weka-3.4.3_p20041113.ebuild b/dev-util/weka/weka-3.4.3_p20041113.ebuild
index 49be435a31e5..2798edae68eb 100644
--- a/dev-util/weka/weka-3.4.3_p20041113.ebuild
+++ b/dev-util/weka/weka-3.4.3_p20041113.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/weka/weka-3.4.3_p20041113.ebuild,v 1.4 2005/05/07 20:51:44 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/weka/weka-3.4.3_p20041113.ebuild,v 1.5 2005/07/18 22:07:54 axxo Exp $
 
 inherit eutils java-pkg
 
@@ -12,7 +12,7 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 amd64 ~ppc"
 DEPEND=">=virtual/jdk-1.4
-	dev-java/ant"
+	dev-java/ant-core"
 #	jikes?( >=dev-java/jikes-1.21 )"
 RDEPEND=">=virtual/jre-1.4"
 IUSE="doc" # jikes"
@@ -31,24 +31,23 @@ src_compile() {
 	cd weka
 
 	# all attempts to build it with jikes failed
-	antflags="exejar srcjar remotejar"
+	local antflags="exejar srcjar remotejar"
 	use doc && antflags="${antflags} docs"
 #	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
 	ant ${antflags} || die "ant build failed"
 }
 
 src_install() {
-	java-pkg_dojar dist/*.jar || die "failed to install"
+	java-pkg_dojar dist/*.jar
 
 	mkdir bin
 	echo "#!/bin/sh" > bin/${PN}
 	echo "java -classpath \$(java-config -p weka) weka.gui.GUIChooser" >> bin/${PN}
-	into /usr
 	dobin bin/${PN}
 
 	use doc && java-pkg_dohtml -r doc/*
 
-	dodir /usr/share/${PN}/data/ || die "couldnt create data-dir"
+	dodir /usr/share/${PN}/data/
 	cp -r numeric UCI regression-datasets ${D}/usr/share/${PN}/data \
 					|| die "failed to copy datasets"
 }