Version bump; minor patch; resolving bug #99107

(Portage version: 2.0.53)

5 files changed, 95 insertions, 13 deletions

diff --git a/dev-java/colt/ChangeLog b/dev-java/colt/ChangeLog
index 1cc60326683c..f2f86ef6920c 100644
--- a/dev-java/colt/ChangeLog
+++ b/dev-java/colt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/colt
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/colt/ChangeLog,v 1.9 2005/02/04 23:31:53 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/colt/ChangeLog,v 1.10 2005/12/13 07:58:44 compnerd Exp $
+
+*colt-1.2.0 (13 Dec 2005)
+
+  13 Dec 2005; Saleem Abdulrasool <compnerd@gentoo.org>
+  +files/colt-1.2.0-benchmark-no-deprecation.patch, +colt-1.2.0.ebuild:
+  Version bump with a minor patch and clean up on dependencies.  Resolves bug
+  #99107.
 
   05 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> colt-1.1.0.ebuild:
   stable on amd64
diff --git a/dev-java/colt/Manifest b/dev-java/colt/Manifest
index 91bb0cf07dee..f483f3118565 100644
--- a/dev-java/colt/Manifest
+++ b/dev-java/colt/Manifest
@@ -1,14 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 8adb34020db61313c4bb9b10bbd07f0e ChangeLog 1242
 MD5 0f7a67be659555a2a84b5242337e2fc4 colt-1.1.0.ebuild 965
-MD5 e03de75ed9ec6b4cf624dd834fc8b867 ChangeLog 998
-MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
+MD5 0cf2cca240d171b5a15ad95c4b8df7a5 colt-1.2.0.ebuild 1168
+MD5 ba3affe18fc44894284ce7fe751b2418 files/colt-1.2.0-benchmark-no-deprecation.patch 1180
 MD5 a6ff6e660f79708d23716172e2228031 files/digest-colt-1.1.0 60
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC174Q/rLF9B432nYRAtCeAKCkgIbFrZOyTjIndPF++1glnt36DQCfW0ZE
-puBosX9R221xIYM5rlxiZK0=
-=N/Ef
------END PGP SIGNATURE-----
+MD5 cedefa25fdfa3efc2c82b4e1afddde73 files/digest-colt-1.2.0 60
+MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
diff --git a/dev-java/colt/colt-1.2.0.ebuild b/dev-java/colt/colt-1.2.0.ebuild
new file mode 100644
index 000000000000..e7197f76f391
--- /dev/null
+++ b/dev-java/colt/colt-1.2.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/colt/colt-1.2.0.ebuild,v 1.1 2005/12/13 07:58:44 compnerd Exp $
+
+inherit java-pkg eutils
+
+DESCRIPTION="Colt provides a set of Open Source Libraries for High Performance Scientific and Technical Computing in Java."
+SRC_URI="http://dsd.lbl.gov/~hoschek/colt-download/releases/${P}.zip"
+HOMEPAGE="http://www-itg.lbl.gov/~hoschek/colt/"
+LICENSE="colt"
+IUSE="doc jikes"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+DEPEND=">=virtual/jdk-1.4
+		>=dev-java/concurrent-util-1.3.4
+		dev-java/ant-core
+		app-arch/unzip
+		jikes? ( dev-java/jikes )"
+RDEPEND=">=virtual/jre-1.4
+		 >=dev-java/concurrent-util-1.3.4"
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${PF}-benchmark-no-deprecation.patch
+
+	find ${S} -iname '*.jar' -exec rm \{\} \;
+
+	cd ${S}/lib
+	java-pkg_jar-from concurrent-util
+}
+
+src_compile() {
+	local antflags="javac jar"
+	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
+	use doc && antflags="${antflags} javadoc"
+
+	ant ${antflags} || die "compile problem"
+}
+
+src_install() {
+	java-pkg_dojar lib/${PN}.jar
+
+	dohtml README.html
+	use doc && java-pkg_dohtml -r doc/*
+}
diff --git a/dev-java/colt/files/colt-1.2.0-benchmark-no-deprecation.patch b/dev-java/colt/files/colt-1.2.0-benchmark-no-deprecation.patch
new file mode 100644
index 000000000000..2617dc49ad57
--- /dev/null
+++ b/dev-java/colt/files/colt-1.2.0-benchmark-no-deprecation.patch
@@ -0,0 +1,31 @@
+--- src/cern/colt/matrix/impl/BenchmarkMatrix2D.java	2005-12-13 00:57:28.000000000 -0600
++++ src/cern/colt/matrix/impl/BenchmarkMatrix2D.java	2005-12-13 01:20:09.000000000 -0600
+@@ -331,6 +331,8 @@
+ 	cern.colt.Timer timer1 = new cern.colt.Timer();

+ 	cern.colt.Timer timer2 = new cern.colt.Timer();

+ 

++   cern.jet.math.Functions F = cern.jet.math.Functions.functions;

++

+ 	long size = (((long)rows)*columns)*runs;

+ 

+ 	DoubleMatrix2D  matrix = null;

+@@ -344,7 +346,8 @@
+ 	//if (kind.equals("sparse")) ((SparseDoubleMatrix2D)matrix).elements.hashCollisions = 0;

+ 	for (int i=0; i<runs; i++) {

+ 		timer1.start();

+-		cern.colt.matrix.doublealgo.Transform.mult(matrix, 3);

++		//cern.colt.matrix.doublealgo.Transform.mult(matrix, 3);

++      matrix.assign(F.mult(3));

+ 		timer1.stop();

+ 	}

+ 	timer1.display();

+@@ -366,7 +369,8 @@
+ 	//if (kind.equals("sparse")) ((SparseDoubleMatrix2D)matrix).elements.hashCollisions = 0;

+ 	for (int i=0; i<runs; i++) {

+ 		timer2.start();

+-		cern.colt.matrix.doublealgo.Transform.mult(matrix,3);

++		// cern.colt.matrix.doublealgo.Transform.mult(matrix,3);

++      matrix.assign(F.mult(3));

+ 		timer2.stop();

+ 	}

+ 	timer2.display();

diff --git a/dev-java/colt/files/digest-colt-1.2.0 b/dev-java/colt/files/digest-colt-1.2.0
new file mode 100644
index 000000000000..1829d229a62d
--- /dev/null
+++ b/dev-java/colt/files/digest-colt-1.2.0
@@ -0,0 +1 @@
+MD5 0f9037953549206a96955ea213aab00e colt-1.2.0.zip 3926197