Dep/Style fixes

Package-Manager: portage-2.0.51.22-r1

5 files changed, 18 insertions, 48 deletions

diff --git a/dev-java/fastutil/Manifest b/dev-java/fastutil/Manifest
index 0910c5c51b99..6c5b0ca9b939 100644
--- a/dev-java/fastutil/Manifest
+++ b/dev-java/fastutil/Manifest
@@ -1,8 +1,16 @@
-MD5 9c02085271d7cb2f1ccc54438806098e fastutil-4.4.1.ebuild 1107
-MD5 83264ac4f3bf7511e2e4a1238cefe3cc fastutil-4.1.ebuild 985
-MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 727d5eafb47755c661b63ff0318bbb47 fastutil-4.3.1.ebuild 1012
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e7ac65745e16a7e068f4d710bfc1c478 fastutil-4.3.1.ebuild 994
+MD5 fd06c745c69215187c15570e3263a4ad fastutil-4.4.1.ebuild 1089
 MD5 641bf8e635a05ca9c89cab94ed593e7b ChangeLog 1882
-MD5 125f47ea2a7250ce2b5764d84b279e70 files/digest-fastutil-4.1 68
+MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 0893c05cde010685acf479a9745864f2 files/digest-fastutil-4.3.1 70
 MD5 b9320721c39029bfe87e9042f7e16804 files/digest-fastutil-4.4.1 70
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC17zP/rLF9B432nYRAqjMAJwJXUPHnkqNKCwbIDIC0ilXPOgtggCgjkkU
+FUfWyDXCyVqVCXlqikwUIUg=
+=HUId
+-----END PGP SIGNATURE-----
diff --git a/dev-java/fastutil/fastutil-4.1.ebuild b/dev-java/fastutil/fastutil-4.1.ebuild
deleted file mode 100644
index 7778c55d3918..000000000000
--- a/dev-java/fastutil/fastutil-4.1.ebuild
+++ /dev/null
@@ -1,35 +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/fastutil/fastutil-4.1.ebuild,v 1.11 2005/01/20 18:18:54 luckyduck Exp $
-
-inherit java-pkg
-
-DESCRIPTION="Provides type-specific maps, sets and lists with a small memory footprint for much faster access and insertion."
-SRC_URI="http://fastutil.dsi.unimi.it/${P}-src.tar.gz"
-HOMEPAGE="http://fastutil.dsi.unimi.it"
-LICENSE="LGPL-2.1"
-SLOT="4.1"
-IUSE="doc jikes"
-KEYWORDS="x86 ~sparc ppc ~amd64"
-
-DEPEND=">=virtual/jdk-1.4
-		 >=dev-java/ant-1.5.4
-		 jikes? ( dev-java/jikes )"
-RDEPEND=">=virtual/jre-1.4"
-
-src_compile() {
-	make sources
-
-	local antflags="jar"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	use doc && antflags="${antflags} javadoc"
-	ant ${antflags} || die "compilation failed"
-}
-
-src_install() {
-	mv ${P}.jar ${PN}.jar
-	java-pkg_dojar ${PN}.jar
-	use doc && java-pkg_dohtml -r docs/*
-	dodoc CHANGES README
-}
-
diff --git a/dev-java/fastutil/fastutil-4.3.1.ebuild b/dev-java/fastutil/fastutil-4.3.1.ebuild
index 931d12db4226..743694e69062 100644
--- a/dev-java/fastutil/fastutil-4.3.1.ebuild
+++ b/dev-java/fastutil/fastutil-4.3.1.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/fastutil/fastutil-4.3.1.ebuild,v 1.6 2005/04/21 18:48:59 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fastutil/fastutil-4.3.1.ebuild,v 1.7 2005/07/15 13:40:08 axxo Exp $
 
 inherit java-pkg
 
@@ -13,7 +13,7 @@ IUSE="doc jikes"
 KEYWORDS="x86 ~sparc ppc amd64"
 
 DEPEND=">=virtual/jdk-1.4
-	 >=dev-java/ant-1.5.4
+	 dev-java/ant-core
 	 jikes? ( dev-java/jikes )"
 RDEPEND=">=virtual/jre-1.4"
 
@@ -27,8 +27,7 @@ src_compile() {
 }
 
 src_install() {
-	mv ${P}.jar ${PN}.jar
-	java-pkg_dojar ${PN}.jar
+	java-pkg_newjar ${P}.jar ${PN}.jar
 	use doc && java-pkg_dohtml -r docs/*
 	dodoc CHANGES README
 }
diff --git a/dev-java/fastutil/fastutil-4.4.1.ebuild b/dev-java/fastutil/fastutil-4.4.1.ebuild
index ad3a8a72f6e5..256b10712133 100644
--- a/dev-java/fastutil/fastutil-4.4.1.ebuild
+++ b/dev-java/fastutil/fastutil-4.4.1.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/fastutil/fastutil-4.4.1.ebuild,v 1.1 2005/04/15 13:07:50 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fastutil/fastutil-4.4.1.ebuild,v 1.2 2005/07/15 13:40:08 axxo Exp $
 
 inherit java-pkg
 
@@ -28,8 +28,7 @@ src_compile() {
 }
 
 src_install() {
-	mv ${P}.jar ${PN}.jar
-	java-pkg_dojar ${PN}.jar
+	java-pkg_newjar ${P}.jar ${PN}.jar
 
 	if use doc; then
 		java-pkg_dohtml -r docs/*
diff --git a/dev-java/fastutil/files/digest-fastutil-4.1 b/dev-java/fastutil/files/digest-fastutil-4.1
deleted file mode 100644
index a9f3468731b4..000000000000
--- a/dev-java/fastutil/files/digest-fastutil-4.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 693275cd25d812d67e96571061d0c87b fastutil-4.1-src.tar.gz 198931