Version bump. Closes #45708

5 files changed, 28 insertions, 17 deletions

diff --git a/dev-java/jzlib/ChangeLog b/dev-java/jzlib/ChangeLog
index df2844b599a1..3c421bf32e1e 100644
--- a/dev-java/jzlib/ChangeLog
+++ b/dev-java/jzlib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/jzlib
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jzlib/ChangeLog,v 1.5 2004/03/23 20:29:51 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jzlib/ChangeLog,v 1.6 2004/03/27 05:40:09 zx Exp $
+
+*jzlib-1.0.4 (30 Mar 2004)
+
+  30 Mar 2004; Chris Aniszczyk <zx@gentoo.org> jzlib-1.0.3.ebuild,
+  jzlib-1.0.4.ebuild:
+  Clean up. Version bump. Closes #45708
+  Thanks to Pavel <hlobil@sympatico.ca> for the cleaned up ebuild.
 
   23 Mar 2004; David Holm <dholm@gentoo.org> jzlib-1.0.3.ebuild:
   Backed out of ~ppc.
diff --git a/dev-java/jzlib/Manifest b/dev-java/jzlib/Manifest
index ea17d1db487d..8d83f5cbeb5a 100644
--- a/dev-java/jzlib/Manifest
+++ b/dev-java/jzlib/Manifest
@@ -1,5 +1,7 @@
-MD5 6b25b19bb0f7f78afa19bebdab3150d7 ChangeLog 625
-MD5 164ccb8f109a80e868418970f38d784e jzlib-1.0.3.ebuild 1039
+MD5 cda06be976b88ee11cdb6a30517d8cb7 jzlib-1.0.3.ebuild 1038
+MD5 9b0b4dafb0d7657c8816ea467e24227b jzlib-1.0.4.ebuild 1123
+MD5 402d23c163183510d84956849c81b3f6 ChangeLog 624
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 d4a5da6cd5894adce3162aa3a1340a9d files/digest-jzlib-1.0.3 62
+MD5 e6db4d511f49ceae73c89ccbd2db8b37 files/digest-jzlib-1.0.4 62
 MD5 c85943ac8f46d6595a76723f73d57599 files/jzlib_build.xml 1688
diff --git a/dev-java/jzlib/files/digest-jzlib-1.0.3 b/dev-java/jzlib/files/digest-jzlib-1.0.3
deleted file mode 100644
index 06424ce52470..000000000000
--- a/dev-java/jzlib/files/digest-jzlib-1.0.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3fd5d22c18b28d2757b0910f5f87b89b jzlib-1.0.3.tar.gz 47688
diff --git a/dev-java/jzlib/files/digest-jzlib-1.0.4 b/dev-java/jzlib/files/digest-jzlib-1.0.4
new file mode 100644
index 000000000000..da22ce316159
--- /dev/null
+++ b/dev-java/jzlib/files/digest-jzlib-1.0.4
@@ -0,0 +1 @@
+MD5 3e3720031f05a10db4239d01cea3e130 jzlib-1.0.4.tar.gz 48104
diff --git a/dev-java/jzlib/jzlib-1.0.3.ebuild b/dev-java/jzlib/jzlib-1.0.4.ebuild
index 9502d7f81f83..d256c18de6d6 100644
--- a/dev-java/jzlib/jzlib-1.0.3.ebuild
+++ b/dev-java/jzlib/jzlib-1.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jzlib/jzlib-1.0.3.ebuild,v 1.6 2004/03/23 20:29:51 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jzlib/jzlib-1.0.4.ebuild,v 1.1 2004/03/27 05:40:09 zx Exp $
 
 inherit java-pkg
 
@@ -19,22 +19,24 @@ DEPEND=">=virtual/jdk-1.4
 	jikes? ( >=dev-java/jikes-1.17 )"
 RDEPEND=">=virtual/jdk-1.4"
 
-src_compile() {
-	cp ${FILESDIR}/jzlib_build.xml build.xml
-	mkdir src
-	mv com/ src/
-	local myc
 
-	if [ -n "`use jikes`" ] ; then
-		myc="${myc} -Dbuild.compiler=jikes"
-	fi
+src_unpack() {
+	unpack ${A}
+	cp ${FILESDIR}/jzlib_build.xml ${S}/build.xml
+	mkdir ${S}/src
+	mv ${S}/com/ ${S}/src/
+}
 
-	ANT_OPTS=${myc} ant || die "Failed Compiling"
+src_compile() {
+	local antflags="dist"
+	use doc && antflags="${antflags} javadoc"
+	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
+	ant ${antflags} || die "compilation failed"
 }
 
 src_install() {
-	mv dist/lib/jzlib-${PV}.jar dist/lib/jzlib.jar
-	java-pkg_dojar dist/lib/jzlib.jar || die "Failed Installing"
+	mv dist/lib/jzlib{*,}.jar
+	java-pkg_dojar dist/lib/jzlib.jar || die "installation failed"
+	use doc && dohtml -r javadoc/*
 	dodoc LICENSE.txt README ChangeLog
-	cp -r example ${D}/usr/share/doc/${PN}-${PV}
 }