Fixed USE=source. Other cleanups.

Package-Manager: portage-2.1.2_pre1-r1

4 files changed, 26 insertions, 39 deletions

diff --git a/dev-java/jgoodies-forms/ChangeLog b/dev-java/jgoodies-forms/ChangeLog
index 844ddee21215..873babeb4693 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jgoodies-forms/ChangeLog,v 1.7 2006/08/02 21:12:50 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jgoodies-forms/ChangeLog,v 1.8 2006/09/28 03:10:52 nichoj Exp $
+
+  28 Sep 2006; Joshua Nichols <nichoj@gentoo.org>
+  jgoodies-forms-1.0.7.ebuild:
+  Fixed USE=source. Other cleanups.
 
 *jgoodies-forms-1.0.7 (02 Aug 2006)
 
diff --git a/dev-java/jgoodies-forms/Manifest b/dev-java/jgoodies-forms/Manifest
index 00d00e080834..ae1c97c843ab 100644
--- a/dev-java/jgoodies-forms/Manifest
+++ b/dev-java/jgoodies-forms/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX build.xml 2228 RMD160 3298a0d1b653c018e0749c2afea4c1ba87c74404 SHA1 468d1c536b7014720c81457d4f99cabf3b981762 SHA256 5c70427dcb19c19625bd537ed213827c451f9586d594f502dba3753e33064eb9
 MD5 70ea49a2adf28cc8e1f6bcab10f3ec6a files/build.xml 2228
 RMD160 3298a0d1b653c018e0749c2afea4c1ba87c74404 files/build.xml 2228
@@ -15,28 +12,21 @@ EBUILD jgoodies-forms-1.0.5-r1.ebuild 1359 RMD160 f7b8187a656666a3d9e7c0eb0c6a99
 MD5 e6d6db746099ed2891dfdfc15e9c64d8 jgoodies-forms-1.0.5-r1.ebuild 1359
 RMD160 f7b8187a656666a3d9e7c0eb0c6a99c0bf487b83 jgoodies-forms-1.0.5-r1.ebuild 1359
 SHA256 a92049bd40695025673e4a3ba71abc4af2bbcdff7bc4a4ee9a901a5e6ecc3148 jgoodies-forms-1.0.5-r1.ebuild 1359
-EBUILD jgoodies-forms-1.0.7.ebuild 1208 RMD160 4e47b2c20386ba579a0f6cede5f27b4111a4c70d SHA1 3dee95cf13e89c7572a833e0229767ac3ddbd26a SHA256 d9e605bbde931afa21d76a78c59aa4ecea6da9895edf06671cd2b8941b301fac
-MD5 e9f84bf2b7e2a326ed4cfdb8e66c40a4 jgoodies-forms-1.0.7.ebuild 1208
-RMD160 4e47b2c20386ba579a0f6cede5f27b4111a4c70d jgoodies-forms-1.0.7.ebuild 1208
-SHA256 d9e605bbde931afa21d76a78c59aa4ecea6da9895edf06671cd2b8941b301fac jgoodies-forms-1.0.7.ebuild 1208
-MISC ChangeLog 1380 RMD160 cf814a4c59a5e8b38ee70a9af937bac97e8930b3 SHA1 5e4bd945ee53dda41977927c7436da7bb5ad1001 SHA256 ce396d063741b719e637a7e0f0eab57d774a72416a5a1c5f3a33884b57ccf7c8
-MD5 922b08e0f7e9cc7513a2f34b0cd5e326 ChangeLog 1380
-RMD160 cf814a4c59a5e8b38ee70a9af937bac97e8930b3 ChangeLog 1380
-SHA256 ce396d063741b719e637a7e0f0eab57d774a72416a5a1c5f3a33884b57ccf7c8 ChangeLog 1380
-MISC metadata.xml 308 RMD160 33de7a81ce13144e13716bd21f65918c0cc938b2 SHA1 5b67a7f1699038956898191aca4928696f640d6c SHA256 18737730ab8684f7b08ac54cb9d9500e6a5cac76fb710502dc411d3a2efe72ae
-MD5 0a7e021f886fb1b2e57c3ceb9eb8f9e7 metadata.xml 308
-RMD160 33de7a81ce13144e13716bd21f65918c0cc938b2 metadata.xml 308
-SHA256 18737730ab8684f7b08ac54cb9d9500e6a5cac76fb710502dc411d3a2efe72ae metadata.xml 308
+EBUILD jgoodies-forms-1.0.7.ebuild 1162 RMD160 5ed6325762c3e703848f1a6cd0e061a60f8ff231 SHA1 61cbfe36d65920fa7750073fc0b5d597436eb8fd SHA256 bc4d6f20c429a25249b03240e5807a1f1cc6ac9af958a4c21a06c250793abd87
+MD5 1acf21ea8d008afa2d838063e2f5b3a3 jgoodies-forms-1.0.7.ebuild 1162
+RMD160 5ed6325762c3e703848f1a6cd0e061a60f8ff231 jgoodies-forms-1.0.7.ebuild 1162
+SHA256 bc4d6f20c429a25249b03240e5807a1f1cc6ac9af958a4c21a06c250793abd87 jgoodies-forms-1.0.7.ebuild 1162
+MISC ChangeLog 1496 RMD160 056fddcb1e83f704c5a734a61e8725b7dd0f3bcf SHA1 95971c4567293a6cc2f6cc1924c71c2e06c4a7af SHA256 5dc1c07049e746fb074e616da4f65b1aae9351547f0ede732431792d919d5aea
+MD5 7292319c48cb38dd36977f47258a80e6 ChangeLog 1496
+RMD160 056fddcb1e83f704c5a734a61e8725b7dd0f3bcf ChangeLog 1496
+SHA256 5dc1c07049e746fb074e616da4f65b1aae9351547f0ede732431792d919d5aea ChangeLog 1496
+MISC metadata.xml 159 RMD160 5259d4be0ca7b74c28e711d45a289def9aeadbd9 SHA1 c4ec40cd8f19e0d780a5133941bc50043be198cf SHA256 1c070a909e96d9d193f84ad9304d196febbe33b60a724cc4b0d20634bb82255b
+MD5 e0dae696516c90f5df2d9b63d2fde252 metadata.xml 159
+RMD160 5259d4be0ca7b74c28e711d45a289def9aeadbd9 metadata.xml 159
+SHA256 1c070a909e96d9d193f84ad9304d196febbe33b60a724cc4b0d20634bb82255b metadata.xml 159
 MD5 c16aedc8761321cd512f9d3b7497195a files/digest-jgoodies-forms-1.0.5-r1 61
 RMD160 ac8ac7a99d9cc9bc472ddb98fa7dc9dbf07aa6b4 files/digest-jgoodies-forms-1.0.5-r1 61
 SHA256 d4e6e10809c62c6e0d66e8b6f47b3cf9aa1e26c76457c4771320a89031b22118 files/digest-jgoodies-forms-1.0.5-r1 61
 MD5 9a1fbdb68719dbdfedff8aadbf029686 files/digest-jgoodies-forms-1.0.7 229
 RMD160 d0ac0454c8a66d6d3f67044282ee62369c0f847f files/digest-jgoodies-forms-1.0.7 229
 SHA256 7ab01edc6d7e66975ea084c49255ae4f77571b9d980580185360179737e5edd3 files/digest-jgoodies-forms-1.0.7 229
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFE0RV2go/w9rxVVVERArx5AJ9cYTWK0yUKHA36bbrFLP+LrawXhgCgiJpU
-Pats8HKhbGTq7GDpanUJOZ8=
-=pRqv
------END PGP SIGNATURE-----
diff --git a/dev-java/jgoodies-forms/jgoodies-forms-1.0.7.ebuild b/dev-java/jgoodies-forms/jgoodies-forms-1.0.7.ebuild
index 9a3eb4e042bf..64d0a425e633 100644
--- a/dev-java/jgoodies-forms/jgoodies-forms-1.0.7.ebuild
+++ b/dev-java/jgoodies-forms/jgoodies-forms-1.0.7.ebuild
@@ -1,13 +1,15 @@
 # Copyright 1999-2006 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.7.ebuild,v 1.1 2006/08/02 21:12:50 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jgoodies-forms/jgoodies-forms-1.0.7.ebuild,v 1.2 2006/09/28 03:10:52 nichoj Exp $
 
 inherit java-pkg-2 java-ant-2 eutils
 
-MY_V=${PV//./_}
+MY_PN="forms"
+MY_PV=${PV//./_}
+MY_P="${MY_PN}-${MY_PV}"
 DESCRIPTION="JGoodies Forms Library"
 HOMEPAGE="http://www.jgoodies.com/"
-SRC_URI="http://www.jgoodies.com/download/libraries/forms-${MY_V}.zip"
+SRC_URI="http://www.jgoodies.com/download/libraries/${MY_P}.zip"
 
 LICENSE="BSD"
 SLOT="0"
@@ -20,7 +22,7 @@ DEPEND=">=virtual/jdk-1.4
 	source? ( app-arch/zip )"
 RDEPEND=">=virtual/jre-1.4"
 
-S="${WORKDIR}/forms-${PV}"
+S="${WORKDIR}/${MY_PN}-${PV}"
 
 src_unpack() {
 	unpack ${A} || die "Unpack failed"
@@ -37,17 +39,14 @@ src_unpack() {
 }
 
 src_compile() {
-	local antflags="jar"
-	use doc && antflags="${antflags} javadoc"
-	eant ${antflags} || die "Compile failed"
+	eant jar $(use_doc)
 }
 
 src_install() {
-	cd "${S}"
-	java-pkg_dojar build/forms.jar
+	java-pkg_dojar build/${MY_PN}.jar
 
 	dodoc RELEASE-NOTES.txt README.html
 
 	use doc && java-pkg_dohtml -r build/doc
-	use source && java-pkg_dosrc ${S}/com
+	use source && java-pkg_dosrc src/{core,extras}/com
 }
diff --git a/dev-java/jgoodies-forms/metadata.xml b/dev-java/jgoodies-forms/metadata.xml
index c74025e07608..604e0a4238bb 100644
--- a/dev-java/jgoodies-forms/metadata.xml
+++ b/dev-java/jgoodies-forms/metadata.xml
@@ -2,11 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>
-	<maintainer>
-		<email>compnerd@gentoo.org</email>
-		<name>Saleem Abdulrasool</name>
-	</maintainer>
-	<longdescription lang="en">
-	</longdescription>
 </pkgmetadata>