12 files changed, 123 insertions, 89 deletions
diff --git a/dev-java/javolution/ChangeLog b/dev-java/javolution/ChangeLog
index d1203cac9f21..e85bb44b29fe 100644
--- a/dev-java/javolution/ChangeLog
+++ b/dev-java/javolution/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/javolution
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/javolution/ChangeLog,v 1.3 2005/01/09 18:00:40 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javolution/ChangeLog,v 1.4 2005/04/16 21:41:32 luckyduck Exp $
+
+*javolution-2.2.4 (16 Apr 2005)
+
+  16 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> -javolution-1.1.0.ebuild,
+  -javolution-2.1.0.ebuild, javolution-2.2.0.ebuild, +javolution-2.2.4.ebuild,
+  +javolution-3.2.4.ebuild:
+  new upstream version. marked 2.2.0 stable on amd64 and x86. done some cosmetic
+  changes and introduced support for the source useflag.
 
 *javolution-2.2.0 (09 Jan 2005)
 
diff --git a/dev-java/javolution/Manifest b/dev-java/javolution/Manifest
index 76c777723356..89d4852616d7 100644
--- a/dev-java/javolution/Manifest
+++ b/dev-java/javolution/Manifest
@@ -1,8 +1,18 @@
-MD5 53ff7d449c60ae50d3da273198036559 javolution-1.1.0.ebuild 939
-MD5 4d5a0c2cbabf842ad9e0eb71e76b11fa javolution-2.1.0.ebuild 955
-MD5 1eb8eb120c081d4597472e33982bb979 ChangeLog 700
-MD5 75f1b74de32ad42bc626aa99d194e02a javolution-2.2.0.ebuild 1043
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 576759745ace72c46e2ad3b268e864c3 javolution-2.2.4.ebuild 1105
+MD5 9a42b0dd72a459573481d76fc00f6813 javolution-3.2.4.ebuild 1087
+MD5 954dcffff6870bff71efe763bde60f7a ChangeLog 1057
+MD5 46bf681ff429d8927ec8b3d79c9ba385 javolution-2.2.0.ebuild 1076
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
-MD5 13e3853a9a71a7185517fea0c966988c files/digest-javolution-1.1.0 69
-MD5 298d744cd066a31a14193057d1721667 files/digest-javolution-2.1.0 69
 MD5 006daea0c5cc5edcc45fcccc17f6101b files/digest-javolution-2.2.0 69
+MD5 7e1ab0fb2d84befdc65d1d04a503893a files/digest-javolution-2.2.4 69
+MD5 d9715c64410d14ad1cc01802dff9c108 files/digest-javolution-3.2.4 69
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCYYaW06ebR+OMO78RAip+AJ9tKDFPBz3dQ87o2lee6oBbGfqA4QCdF0S/
+8ySAa3wpCIU6MrnHIu+4Mgo=
+=nWvM
+-----END PGP SIGNATURE-----
diff --git a/dev-java/javolution/files/digest-javolution-1.1.0 b/dev-java/javolution/files/digest-javolution-1.1.0
deleted file mode 100644
index 4853fccf79ce..000000000000
--- a/dev-java/javolution/files/digest-javolution-1.1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 870fcb2648661a0bf91f0b2ebdc009d6 javolution-1.1.0-src.zip 340565
diff --git a/dev-java/javolution/files/digest-javolution-2.1.0 b/dev-java/javolution/files/digest-javolution-2.1.0
deleted file mode 100644
index 562a6b0ea0f5..000000000000
--- a/dev-java/javolution/files/digest-javolution-2.1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 61f8a0efacaa4e318a9c28dedd6609df javolution-2.1.0-src.zip 651111
diff --git a/dev-java/javolution/files/digest-javolution-2.2.4 b/dev-java/javolution/files/digest-javolution-2.2.4
new file mode 100644
index 000000000000..cb7ce51b9e98
--- /dev/null
+++ b/dev-java/javolution/files/digest-javolution-2.2.4
@@ -0,0 +1 @@
+MD5 c46c862d03dea51a19226e5946d80fb5 javolution-2.2.4-src.zip 391698
diff --git a/dev-java/javolution/files/digest-javolution-3.2.4 b/dev-java/javolution/files/digest-javolution-3.2.4
new file mode 100644
index 000000000000..320bd6bad409
--- /dev/null
+++ b/dev-java/javolution/files/digest-javolution-3.2.4
@@ -0,0 +1 @@
+MD5 b082040b93aeb56e91a53dd2ea7b4e66 javolution-3.2.4-src.zip 429666
diff --git a/dev-java/javolution/javolution-1.1.0.ebuild b/dev-java/javolution/javolution-1.1.0.ebuild
deleted file mode 100644
index 1aafbd3c15e5..000000000000
--- a/dev-java/javolution/javolution-1.1.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/javolution/javolution-1.1.0.ebuild,v 1.2 2005/01/05 20:13:00 zx Exp $
-
-inherit java-pkg
-
-DESCRIPTION="Java Solution for Real-Time and Embedded Systems"
-SRC_URI="http://javolution.org/${P}-src.zip"
-HOMEPAGE=""
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="doc jikes"
-DEPEND=">=virtual/jdk-1.3
-	>=dev-java/ant-core-1.4
-	>=app-arch/unzip-5.50-r1
-	jikes?( >=dev-java/jikes-1.21 )"
-RDEPEND=">=virtual/jdk-1.3"
-
-S=${WORKDIR}/javolution-${PV%.*}
-
-src_compile() {
-	antflags="compile jarfile"
-	use doc && antflags="${antflags} javadoc"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	ant ${antflags} || die "ant build failed"
-}
-
-src_install() {
-	java-pkg_dojar javolution.jar
-	dodoc doc/coding_standard.txt doc/license.txt
-	use doc && java-pkg_dohtml -r index.html api/*
-}
diff --git a/dev-java/javolution/javolution-2.1.0.ebuild b/dev-java/javolution/javolution-2.1.0.ebuild
deleted file mode 100644
index 20cd97032250..000000000000
--- a/dev-java/javolution/javolution-2.1.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/javolution/javolution-2.1.0.ebuild,v 1.1 2005/01/05 20:13:00 zx Exp $
-
-inherit java-pkg
-
-DESCRIPTION="Java Solution for Real-Time and Embedded Systems"
-SRC_URI="http://javolution.org/${P}-src.zip"
-HOMEPAGE=""
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="doc jikes"
-DEPEND=">=virtual/jdk-1.3
-	>=dev-java/ant-core-1.4
-	>=app-arch/unzip-5.50-r1
-	jikes?( >=dev-java/jikes-1.21 )"
-RDEPEND=">=virtual/jdk-1.3"
-RESTRICT="nomirror"
-
-S=${WORKDIR}/javolution-${PV%.*}
-
-src_compile() {
-	antflags="compile jar"
-	use doc && antflags="${antflags} javadoc"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	ant ${antflags} || die "ant build failed"
-}
-
-src_install() {
-	java-pkg_dojar javolution.jar
-	dodoc doc/coding_standard.txt doc/license.txt
-	use doc && java-pkg_dohtml -r index.html api/*
-}
diff --git a/dev-java/javolution/javolution-2.2.0.ebuild b/dev-java/javolution/javolution-2.2.0.ebuild
index 620953cad7b8..73fda63a5aec 100644
--- a/dev-java/javolution/javolution-2.2.0.ebuild
+++ b/dev-java/javolution/javolution-2.2.0.ebuild
@@ -1,35 +1,36 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/javolution/javolution-2.2.0.ebuild,v 1.1 2005/01/09 18:00:40 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javolution/javolution-2.2.0.ebuild,v 1.2 2005/04/16 21:41:32 luckyduck Exp $
 
 inherit eutils java-pkg
 
 DESCRIPTION="Java Solution for Real-Time and Embedded Systems"
 SRC_URI="http://javolution.org/${P}-src.zip"
-HOMEPAGE=""
+HOMEPAGE="http://javolution.org"
 LICENSE="LGPL-2.1"
 SLOT="2.2"
-KEYWORDS="~x86 ~amd64"
-IUSE="doc"
+KEYWORDS="x86 amd64"
+IUSE="doc source"
 DEPEND=">=virtual/jdk-1.4
 	>=dev-java/ant-core-1.4
-	>=app-arch/unzip-5.50-r1
-	jikes?( >=dev-java/jikes-1.21 )"
+	app-arch/unzip
+	source? ( app-arch/zip )"
+	#jikes?( >=dev-java/jikes-1.21 )"
 RDEPEND=">=virtual/jdk-1.4"
-RESTRICT="nomirror"
 
 S=${WORKDIR}/javolution-${PV%.*}
 
 src_compile() {
 	antflags="init_1.4 compile jar"
 	use doc && antflags="${antflags} doc"
-	# disabled jikes for now till i've the time to write an patch for this
+	# jikes support, doesnt work without patching
 	#use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
 	ant ${antflags} || die "ant build failed"
 }
 
 src_install() {
 	java-pkg_dojar javolution.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_dosrc ${S}/src/javolution
 }
diff --git a/dev-java/javolution/javolution-2.2.4.ebuild b/dev-java/javolution/javolution-2.2.4.ebuild
new file mode 100644
index 000000000000..3ca311b4722a
--- /dev/null
+++ b/dev-java/javolution/javolution-2.2.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javolution/javolution-2.2.4.ebuild,v 1.1 2005/04/16 21:41:32 luckyduck Exp $
+
+inherit eutils java-pkg
+
+DESCRIPTION="Java Solution for Real-Time and Embedded Systems"
+SRC_URI="http://javolution.org/${P}-src.zip"
+HOMEPAGE="http://javolution.org"
+LICENSE="LGPL-2.1"
+SLOT="2.2.4"
+KEYWORDS="~x86 ~amd64"
+IUSE="doc source"
+DEPEND=">=virtual/jdk-1.4
+	>=dev-java/ant-core-1.4
+	app-arch/unzip
+	source? ( app-arch/zip )"
+	#jikes?( >=dev-java/jikes-1.21 )"
+RDEPEND=">=virtual/jdk-1.4"
+
+S=${WORKDIR}/javolution-${PV%.*}
+
+src_compile() {
+	antflags="init_1.4 compile jar"
+	use doc && antflags="${antflags} doc"
+	# disabled jikes for now till i've the time to write an patch for this
+	#use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
+	ant ${antflags} || die "ant build failed"
+}
+
+src_install() {
+	java-pkg_dojar javolution.jar
+	dodoc doc/coding_standard.txt
+	use doc && java-pkg_dohtml -r index.html api/*
+	use source && java-pkg_dosrc ${S}/src/javolution
+}
diff --git a/dev-java/javolution/javolution-3.2.4.ebuild b/dev-java/javolution/javolution-3.2.4.ebuild
new file mode 100644
index 000000000000..07a773cded3b
--- /dev/null
+++ b/dev-java/javolution/javolution-3.2.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javolution/javolution-3.2.4.ebuild,v 1.1 2005/04/16 21:41:32 luckyduck Exp $
+
+inherit eutils java-pkg
+
+DESCRIPTION="Java Solution for Real-Time and Embedded Systems"
+SRC_URI="http://javolution.org/${P}-src.zip"
+HOMEPAGE="http://javolution.org"
+LICENSE="LGPL-2.1"
+SLOT="3.2"
+KEYWORDS="~x86 ~amd64"
+IUSE="doc source"
+DEPEND=">=virtual/jdk-1.4
+	>=dev-java/ant-core-1.4
+	app-arch/unzip
+	source? ( app-arch/zip )"
+	#jikes?( >=dev-java/jikes-1.21 )"
+RDEPEND=">=virtual/jdk-1.4"
+
+S=${WORKDIR}/javolution-${PV%.*}
+
+src_compile() {
+	antflags="init_1.4 compile jar"
+	use doc && antflags="${antflags} doc"
+	# jikes support disabled, doesnt work without patching
+	#use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
+	ant ${antflags} || die "ant build failed"
+}
+
+src_install() {
+	java-pkg_dojar javolution.jar
+	dodoc doc/coding_standard.txt
+	use doc && java-pkg_dohtml -r index.html api/*
+	use source && java-pkg_dosrc ${S}/src/javolution
+}
diff --git a/dev-java/jscience/Manifest b/dev-java/jscience/Manifest
index 9cdca4892d62..032f9332c3c8 100644
--- a/dev-java/jscience/Manifest
+++ b/dev-java/jscience/Manifest
@@ -1,6 +1,16 @@
-MD5 700bec465dbc67d598b6c20640e35e6d jscience-1.0.1.ebuild 1081
-MD5 b5c4a14e08df1dcc87f95d763bbbc5e2 ChangeLog 569
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0f1f5d362ac4b316d2ffb4c1b5118ec4 jscience-1.0.4.ebuild 1133
+MD5 a346120d0edc8faba99ba5e0248e90f6 ChangeLog 864
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
-MD5 ae478526af5b34d31fde637d2afa7ad5 jscience-1.0.3.ebuild 1085
-MD5 5f6eca5de0f1dc5bf76610f716721554 files/digest-jscience-1.0.1 67
+MD5 407c854fdb368e36ddde82c57be6cc4a jscience-1.0.3.ebuild 1128
 MD5 d0072fb2be1b4b15dce54241d96b3829 files/digest-jscience-1.0.3 67
+MD5 33275f3418d3c3be7c6c67e761db9f0c files/digest-jscience-1.0.4 67
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCYYbK06ebR+OMO78RAl3WAJ4j7YO+gxSlzROF2cRYqBY6Y6fU0gCfeOMz
+e+b8r00m+gebc8n0TNHdrHY=
+=6TH3
+-----END PGP SIGNATURE-----