Fixes for jgoodies-forms

(Portage version: 2.0.51.19)

5 files changed, 34 insertions, 30 deletions

diff --git a/dev-java/jgoodies-forms/ChangeLog b/dev-java/jgoodies-forms/ChangeLog
index 863d33f0821c..ecc7f566048d 100644
--- a/dev-java/jgoodies-forms/ChangeLog
+++ b/dev-java/jgoodies-forms/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jgoodies-forms
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jgoodies-forms/ChangeLog,v 1.2 2005/03/28 20:44:27 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jgoodies-forms/ChangeLog,v 1.3 2005/03/30 23:49:14 compnerd Exp $
+
+  30 Mar 2005; Saleem Abdulrasool <compnerd@gentoo.org> files/build.xml,
+  metadata.xml, jgoodies-forms-1.0.5.ebuild:
+  QA cleanups; compile fixes
 
   28 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org>
   jgoodies-forms-1.0.5.ebuild:
diff --git a/dev-java/jgoodies-forms/Manifest b/dev-java/jgoodies-forms/Manifest
index 72362724e710..c92715ab19a0 100644
--- a/dev-java/jgoodies-forms/Manifest
+++ b/dev-java/jgoodies-forms/Manifest
@@ -1,15 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 0c898ed51b00d7dee52c1c8b12539b6e jgoodies-forms-1.0.5.ebuild 1157
-MD5 2929f43e7365f8bff5fa13934b305143 ChangeLog 612
-MD5 92f4e130f91b25d81c919269bf56d918 metadata.xml 271
-MD5 98eda3538834ab5d2d03b852344b6daa files/build.xml 2213
+MD5 f14b5630b23c660fb83ae229c447f27d jgoodies-forms-1.0.5.ebuild 1350
+MD5 82f72bd817360cef4d542c0bb05da3cb ChangeLog 760
+MD5 0a7e021f886fb1b2e57c3ceb9eb8f9e7 metadata.xml 308
+MD5 70ea49a2adf28cc8e1f6bcab10f3ec6a files/build.xml 2228
 MD5 c16aedc8761321cd512f9d3b7497195a files/digest-jgoodies-forms-1.0.5 61
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCSGzC06ebR+OMO78RAoYXAJ4ugZ0FVyI8s+SW6ABTpcDtKvqUjQCfTRh3
-IgbACFyTKWF/zeUM/jaHEqA=
-=RQE1
------END PGP SIGNATURE-----
diff --git a/dev-java/jgoodies-forms/files/build.xml b/dev-java/jgoodies-forms/files/build.xml
index 82444c20799c..0b190959a3c7 100644
--- a/dev-java/jgoodies-forms/files/build.xml
+++ b/dev-java/jgoodies-forms/files/build.xml
@@ -57,7 +57,7 @@
    </target>
 
    <target name="jar" depends="compile,manifest">
-      <jar jarfile="forms.jar" manifest="MANIFEST.MF">
+      <jar jarfile="forms-${imp.version}.jar" manifest="MANIFEST.MF">
          <fileset dir="${build}"/>
       </jar>
    </target>
diff --git a/dev-java/jgoodies-forms/jgoodies-forms-1.0.5.ebuild b/dev-java/jgoodies-forms/jgoodies-forms-1.0.5.ebuild
index aa3599d31937..3e7fa2ce6f92 100644
--- a/dev-java/jgoodies-forms/jgoodies-forms-1.0.5.ebuild
+++ b/dev-java/jgoodies-forms/jgoodies-forms-1.0.5.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jgoodies-forms/jgoodies-forms-1.0.5.ebuild,v 1.2 2005/03/28 20:44:27 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jgoodies-forms/jgoodies-forms-1.0.5.ebuild,v 1.3 2005/03/30 23:49:14 compnerd Exp $
 
 inherit java-pkg
 
+MY_V=${PV//./_}
 DESCRIPTION="JGoodies Forms Library"
 HOMEPAGE="http://www.jgoodies.com/"
-SRC_URI="http://www.jgoodies.com/download/libraries/forms-1_0_5.zip"
+SRC_URI="http://www.jgoodies.com/download/libraries/forms-${MY_V}.zip"
 
 LICENSE="BSD"
 SLOT="0"
@@ -20,14 +21,22 @@ DEPEND=">=virtual/jdk-1.4
 	source? ( app-arch/zip )"
 RDEPEND=">=virtual/jre-1.4"
 
-S="${WORKDIR}/forms-1.0.5"
+S="${WORKDIR}/forms-${PV}"
 
 src_unpack() {
-	unpack ${A}
+	unpack ${A} || die "Unpack failed"
 	cd ${S}
 
+	# Remove the packaged jars
 	rm *.jar
-	unzip forms-1.0.5-src.zip &> /dev/null || die "Unpack Failed"
+
+	# Extract the sources
+	unzip forms-${PV}-src.zip &> /dev/null || die "Unpack Failed"
+
+	# No support for junit tests yet
+	rm -rf ${S}/src/test
+
+	# Copy the Gentoo'ized build.xml
 	cp ${FILESDIR}/build.xml ${S}/build.xml
 }
 
@@ -35,11 +44,12 @@ src_compile() {
 	local antflags="jar"
 	use doc && antflags="${antflags} javadoc"
 	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
+
 	ant ${antflags} || die "Compile failed"
 }
 
 src_install() {
-	java-pkg_dojar forms.jar
+	java-pkg_dojar forms-${PV}.jar
 
 	dodoc LICENSE.txt RELEASE-NOTES.txt
 
diff --git a/dev-java/jgoodies-forms/metadata.xml b/dev-java/jgoodies-forms/metadata.xml
index 80a4bf99c580..c74025e07608 100644
--- a/dev-java/jgoodies-forms/metadata.xml
+++ b/dev-java/jgoodies-forms/metadata.xml
@@ -1,12 +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 Forms is a library for Swing based panels in Java applications.
-
-</longdescription>
+	<herd>java</herd>
+	<maintainer>
+		<email>compnerd@gentoo.org</email>
+		<name>Saleem Abdulrasool</name>
+	</maintainer>
+	<longdescription lang="en">
+	</longdescription>
 </pkgmetadata>
+