--- jacksum-1.5.1.ebuild	2005-09-12 00:00:00.000000000 +0000
+++ jacksum-1.6.0.ebuild	2005-09-12 00:00:00.000000000 +0000
@@ -4,12 +4,12 @@
 
 inherit java-pkg
 
-DESCRIPTION="Java utility for computing and verifying checksums: CRC*, MD*, SHA*, TIGER"
+DESCRIPTION="Java utility for computing and verifying checksums: CRC*, MD*, RIPEMD*, SHA*, TIGER*, WHIRLPOOL"
 HOMEPAGE="http://www.jonelo.de/java/jacksum/"
 SRC_URI="mirror://sourceforge/jacksum/${P}.zip"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="ppc sparc x86"
+KEYWORDS="~ppc ~sparc ~x86"
 IUSE="jikes"
 DEPEND=">=virtual/jdk-1.3.1
 	dev-java/ant-core
@@ -22,8 +22,8 @@
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	unzip -qq ${PN}-src.zip || die "failed to unpack source"
-	rm ${PN} *.jar
+	unzip -qq source/${PN}-src.zip || die "failed to unpack source"
+	rm *.jar
 }
 
 src_compile() {
@@ -38,7 +38,6 @@
 
 	# make exec wrapper
 	echo "#!/bin/sh" > ${PN}
-	echo "cd /usr/share/${PN}" >> ${PN}
-	echo '${JAVA_HOME}'/bin/java -jar lib/${PN}.jar '$*' >> ${PN}
+	echo '${JAVA_HOME}'/bin/java -jar /usr/share/${PN}/lib/${PN}.jar '$*' >> ${PN}
 	dobin ${PN}
 }