new upstream version. marked 1.0.3 stable on amd64 and x86. done some cosmetic changes and introduced support for the source useflag.

Package-Manager: portage-2.0.51.19

5 files changed, 32 insertions, 21 deletions

diff --git a/dev-java/jscience/ChangeLog b/dev-java/jscience/ChangeLog
index f3365f33c225..66151275d219 100644
--- a/dev-java/jscience/ChangeLog
+++ b/dev-java/jscience/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/jscience
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jscience/ChangeLog,v 1.2 2005/01/09 18:03:24 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jscience/ChangeLog,v 1.3 2005/04/16 21:42:28 luckyduck Exp $
+
+*jscience-1.0.4 (16 Apr 2005)
+
+  16 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> -jscience-1.0.1.ebuild,
+  jscience-1.0.3.ebuild, +jscience-1.0.4.ebuild:
+  new upstream version. marked 1.0.3 stable on amd64 and x86. done some cosmetic
+  changes and introduced support for the source useflag.
 
 *jscience-1.0.3 (09 Jan 2005)
 
diff --git a/dev-java/jscience/files/digest-jscience-1.0.1 b/dev-java/jscience/files/digest-jscience-1.0.1
deleted file mode 100644
index ab7d0c803097..000000000000
--- a/dev-java/jscience/files/digest-jscience-1.0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 59ccb0df52d1a338591444ee8a517295 jscience-1.0.1-src.zip 418659
diff --git a/dev-java/jscience/files/digest-jscience-1.0.4 b/dev-java/jscience/files/digest-jscience-1.0.4
new file mode 100644
index 000000000000..0cd84f6f08da
--- /dev/null
+++ b/dev-java/jscience/files/digest-jscience-1.0.4
@@ -0,0 +1 @@
+MD5 64f5c5f26e37407ae976005f3cda0ebb jscience-1.0.4-src.zip 414755
diff --git a/dev-java/jscience/jscience-1.0.3.ebuild b/dev-java/jscience/jscience-1.0.3.ebuild
index 4bad199fcab1..7c3b0ee1111b 100644
--- a/dev-java/jscience/jscience-1.0.3.ebuild
+++ b/dev-java/jscience/jscience-1.0.3.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-java/jscience/jscience-1.0.3.ebuild,v 1.1 2005/01/09 18:03:24 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jscience/jscience-1.0.3.ebuild,v 1.2 2005/04/16 21:42:28 luckyduck Exp $
 
 inherit java-pkg
 
@@ -9,27 +9,28 @@ SRC_URI="http://jscience.org/${P}-src.zip"
 HOMEPAGE="http://jscience.org/"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="doc jikes"
+KEYWORDS="x86 amd64"
+IUSE="doc jikes source"
 DEPEND=">=virtual/jdk-1.3
 	>=dev-java/ant-core-1.4
-	>=dev-java/javolution-2.2.0
-	>=app-arch/unzip-5.50-r1
-	jikes?( >=dev-java/jikes-1.21 )"
+	=dev-java/javolution-2.2*
+	app-arch/unzip
+	jikes?( >=dev-java/jikes-1.21 )
+	source? ( app-arch/zip )"
 RDEPEND=">=virtual/jdk-1.3"
 
 S=${WORKDIR}/jscience-${PV%.*}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}/lib
 
+	cd ${S}/lib
 	rm -f *.jar
 	java-pkg_jar-from javolution-2.2
 }
 
 src_compile() {
-	antflags="compile jarfile"
+	local antflags="jarfile"
 	use doc && antflags="${antflags} javadoc"
 	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
 	ant ${antflags} || die "ant build failed"
@@ -37,6 +38,7 @@ src_compile() {
 
 src_install() {
 	java-pkg_dojar jscience.jar
-	dodoc doc/coding_standard.txt doc/license.txt
+	dodoc doc/coding_standard.txt
 	use doc && java-pkg_dohtml -r index.html api/*
+	use source && java-pkg_dohtml ${S}/src/*
 }
diff --git a/dev-java/jscience/jscience-1.0.1.ebuild b/dev-java/jscience/jscience-1.0.4.ebuild
index 39c5c80772fa..dc5dfd7e94d7 100644
--- a/dev-java/jscience/jscience-1.0.1.ebuild
+++ b/dev-java/jscience/jscience-1.0.4.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-java/jscience/jscience-1.0.1.ebuild,v 1.2 2005/01/09 18:03:24 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jscience/jscience-1.0.4.ebuild,v 1.1 2005/04/16 21:42:28 luckyduck Exp $
 
 inherit java-pkg
 
@@ -10,26 +10,27 @@ HOMEPAGE="http://jscience.org/"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
-IUSE="doc jikes"
+IUSE="doc jikes source"
 DEPEND=">=virtual/jdk-1.3
 	>=dev-java/ant-core-1.4
-	>=dev-java/javolution-1.1.0
-	>=app-arch/unzip-5.50-r1
-	jikes?( >=dev-java/jikes-1.21 )"
-RDEPEND=">=virtual/jdk-1.3"
+	app-arch/unzip
+	jikes?( >=dev-java/jikes-1.21 )
+	source? ( app-arch/zip )"
+RDEPEND=">=virtual/jdk-1.3
+	~dev-java/javolution-2.2.4"
 
 S=${WORKDIR}/jscience-${PV%.*}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}/lib
 
+	cd ${S}/lib
 	rm -f *.jar
-	java-pkg_jar-from javolution
+	java-pkg_jar-from javolution-2.2.4
 }
 
 src_compile() {
-	antflags="compile jarfile"
+	local antflags="jarfile"
 	use doc && antflags="${antflags} javadoc"
 	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
 	ant ${antflags} || die "ant build failed"
@@ -37,6 +38,7 @@ src_compile() {
 
 src_install() {
 	java-pkg_dojar jscience.jar
-	dodoc doc/coding_standard.txt doc/license.txt
+	dodoc doc/coding_standard.txt
 	use doc && java-pkg_dohtml -r index.html api/*
+	use source && java-pkg_dohtml ${S}/src/*
 }