QA fixes; Updates

(Portage version: 2.0.51.19)

5 files changed, 38 insertions, 35 deletions

diff --git a/dev-java/jgoodies-animation/ChangeLog b/dev-java/jgoodies-animation/ChangeLog
index f651a37c430b..87d9ff3ecee9 100644
--- a/dev-java/jgoodies-animation/ChangeLog
+++ b/dev-java/jgoodies-animation/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jgoodies-animation
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jgoodies-animation/ChangeLog,v 1.1 2004/12/23 00:24:52 karltk Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jgoodies-animation/ChangeLog,v 1.2 2005/03/31 00:17:00 compnerd Exp $
+
+  31 Mar 2005; Saleem Abdulrasool <compnerd@gentoo.org> files/build.xml,
+  metadata.xml, jgoodies-animation-1.1.3.ebuild:
+  QA fixes; Compilation fixes
 
 *jgoodies-animation-1.1.3 (23 Dec 2004)
 
diff --git a/dev-java/jgoodies-animation/Manifest b/dev-java/jgoodies-animation/Manifest
index 0750371ef7a0..ecf9095e762f 100644
--- a/dev-java/jgoodies-animation/Manifest
+++ b/dev-java/jgoodies-animation/Manifest
@@ -1,5 +1,5 @@
-MD5 7f2f2054ca777c2196cebc6ddc1195b4 jgoodies-animation-1.1.3.ebuild 1132
-MD5 c390469a5ef05ebc41a58b0571bfee0c ChangeLog 465
-MD5 0f1017e14e1f67ecde8f2bc15ed9d574 metadata.xml 289
+MD5 70599bfb214eac75b2ea43ee4ffc07ec jgoodies-animation-1.1.3.ebuild 1255
+MD5 85e87963060bc46f5be214de6844b1f5 ChangeLog 618
+MD5 0a7e021f886fb1b2e57c3ceb9eb8f9e7 metadata.xml 308
 MD5 1927a2ddc87063bc3a874c03869761bf files/digest-jgoodies-animation-1.1.3 64
-MD5 d84eb66d7a317d0a7b48a159998f30b2 files/build.xml 2261
+MD5 10eed29030757ce0187080b12e9923c6 files/build.xml 2276
diff --git a/dev-java/jgoodies-animation/files/build.xml b/dev-java/jgoodies-animation/files/build.xml
index 900189300d79..7af7b03f8cef 100644
--- a/dev-java/jgoodies-animation/files/build.xml
+++ b/dev-java/jgoodies-animation/files/build.xml
@@ -57,7 +57,7 @@
    </target>
 
    <target name="jar" depends="compile,manifest">
-      <jar jarfile="animation.jar" manifest="MANIFEST.MF">
+      <jar jarfile="animation-${imp.version}.jar" manifest="MANIFEST.MF">
          <fileset dir="${build}"/>
       </jar>
    </target>
diff --git a/dev-java/jgoodies-animation/jgoodies-animation-1.1.3.ebuild b/dev-java/jgoodies-animation/jgoodies-animation-1.1.3.ebuild
index aaf9418e2bfd..2dfccd80a96d 100644
--- a/dev-java/jgoodies-animation/jgoodies-animation-1.1.3.ebuild
+++ b/dev-java/jgoodies-animation/jgoodies-animation-1.1.3.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jgoodies-animation/jgoodies-animation-1.1.3.ebuild,v 1.1 2004/12/23 00:24:52 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jgoodies-animation/jgoodies-animation-1.1.3.ebuild,v 1.2 2005/03/31 00:17:00 compnerd Exp $
 
 inherit java-pkg
 
+MY_V=${PV//./_}
 DESCRIPTION="JGoodies Animation Library"
 HOMEPAGE="http://www.jgoodies.com/"
-SRC_URI="http://www.jgoodies.com/download/libraries/animation-1_1_3.zip"
+SRC_URI="http://www.jgoodies.com/download/libraries/animation-${MY_V}.zip"
 
 LICENSE="BSD"
 SLOT="0"
@@ -19,37 +20,36 @@ DEPEND=">=virtual/jdk-1.4
 	jikes? ( >=dev-java/jikes-1.21 )"
 RDEPEND=">=virtual/jre-1.4"
 
-S="${WORKDIR}/animation-1.1.3"
+S="${WORKDIR}/animation-${PV}"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 
+	# Remove the packaged jar
 	rm *.jar
-	unzip animation-1.1.3-src.zip &> /dev/null || die "Unpack Failed"
-	cp ${FILESDIR}/build.xml .
+
+	# Extract the sources
+	unzip animation-${PV}-src.zip &> /dev/null || die "Unpack Failed"
+
+	# No JUNIT support yet :-(
+	rm -rf ${S}/src/test
+
+	# Copy the Gentoo'ized build.xml
+	cp ${FILESDIR}/build.xml ${S}
 }
 
 src_compile() {
 	local antflags="jar"
-
-	if use jikes ; then
-		antflags="${antflags} -Dbuild.compiler=jikes"
-	fi
-
-	if use doc ; then
-		antflags="${antflags} javadoc"
-	fi
+	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
+	use doc && antflags="${antflags} javadoc"
 
 	ant ${antflags} || die "Compile failed"
 }
 
 src_install() {
-	java-pkg_dojar animation.jar
+	java-pkg_dojar animation-${PV}.jar
 
 	dodoc LICENSE.txt RELEASE-NOTES.txt
-
-	if use doc ; then
-		java-pkg_dohtml -r build/doc
-	fi
+	use doc && java-pkg_dohtml -r build/doc
 }
diff --git a/dev-java/jgoodies-animation/metadata.xml b/dev-java/jgoodies-animation/metadata.xml
index 287f0de65f66..c74025e07608 100644
--- a/dev-java/jgoodies-animation/metadata.xml
+++ b/dev-java/jgoodies-animation/metadata.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
-<herd>java</herd>
-
-<longdescription>
-
-JGoodies animation is a library that allows for real time animation in java 
-applications.
-
-</longdescription>
+	<herd>java</herd>
+	<maintainer>
+		<email>compnerd@gentoo.org</email>
+		<name>Saleem Abdulrasool</name>
+	</maintainer>
+	<longdescription lang="en">
+	</longdescription>
 </pkgmetadata>
+