Ebuild clean up and fix doc installation.

Package-Manager: portage-2.1.3_rc8

3 files changed, 28 insertions, 25 deletions

diff --git a/dev-java/jgoodies-forms/ChangeLog b/dev-java/jgoodies-forms/ChangeLog
index d622406416dc..570af514a606 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jgoodies-forms/ChangeLog,v 1.11 2007/05/23 17:17:35 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jgoodies-forms/ChangeLog,v 1.12 2007/07/21 10:14:11 betelgeuse Exp $
+
+  21 Jul 2007; Petteri Räty <betelgeuse@gentoo.org>
+  jgoodies-forms-1.0.7.ebuild:
+  Ebuild clean up and fix doc installation.
 
   23 May 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Add ~x86-fbsd keyword. Bug #176906.
diff --git a/dev-java/jgoodies-forms/Manifest b/dev-java/jgoodies-forms/Manifest
index e170124ca5e0..fbe509a36742 100644
--- a/dev-java/jgoodies-forms/Manifest
+++ b/dev-java/jgoodies-forms/Manifest
@@ -15,14 +15,14 @@ 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 1175 RMD160 79addb05145af47b510bad8059b0e7304cd8ea08 SHA1 d50309cc30e36434bda80901954d9fc790339c82 SHA256 01eec37b10324095ac7c247db014ff6983785f5a3164553072d081b30cfd7471
-MD5 fec3513a99f86a3aee3092ba3eb19326 jgoodies-forms-1.0.7.ebuild 1175
-RMD160 79addb05145af47b510bad8059b0e7304cd8ea08 jgoodies-forms-1.0.7.ebuild 1175
-SHA256 01eec37b10324095ac7c247db014ff6983785f5a3164553072d081b30cfd7471 jgoodies-forms-1.0.7.ebuild 1175
-MISC ChangeLog 1805 RMD160 1e69e4ab1f8089bb947ff0f3ac0c44f48b540f31 SHA1 e0adad39b7a3ecbaf6a8cb76677e60f6e8709a8b SHA256 f3182a88fcc07694bf428023d49c45c1b73aeb73593e85c617a26444ba0207af
-MD5 e648e508721746e2e9aef389522dc3eb ChangeLog 1805
-RMD160 1e69e4ab1f8089bb947ff0f3ac0c44f48b540f31 ChangeLog 1805
-SHA256 f3182a88fcc07694bf428023d49c45c1b73aeb73593e85c617a26444ba0207af ChangeLog 1805
+EBUILD jgoodies-forms-1.0.7.ebuild 1157 RMD160 9170eb447d0269872110f86fc695dd74c87d5d4d SHA1 9ea27458d0e5a2e67150e465a5fb7b506bfec7b0 SHA256 bc405991025fbb4e41346071a73a3b2a4e8158f1da24d07e40839c1a7893491b
+MD5 876493a53885dbc6eaa2bf3cee8fd841 jgoodies-forms-1.0.7.ebuild 1157
+RMD160 9170eb447d0269872110f86fc695dd74c87d5d4d jgoodies-forms-1.0.7.ebuild 1157
+SHA256 bc405991025fbb4e41346071a73a3b2a4e8158f1da24d07e40839c1a7893491b jgoodies-forms-1.0.7.ebuild 1157
+MISC ChangeLog 1935 RMD160 0db88f8a2cbd0c9f39ac5ee9f55105fe3ad8fec6 SHA1 4a04fe1c8300e91795d710b958ca1c45f6aa1974 SHA256 e7ec92c11978ae65553ca5f42119e8b9871cf61a294aa096852b5cb57f3f0ef0
+MD5 aef8cb06bd218960efc33315efea0f6b ChangeLog 1935
+RMD160 0db88f8a2cbd0c9f39ac5ee9f55105fe3ad8fec6 ChangeLog 1935
+SHA256 e7ec92c11978ae65553ca5f42119e8b9871cf61a294aa096852b5cb57f3f0ef0 ChangeLog 1935
 MISC metadata.xml 159 RMD160 5259d4be0ca7b74c28e711d45a289def9aeadbd9 SHA1 c4ec40cd8f19e0d780a5133941bc50043be198cf SHA256 1c070a909e96d9d193f84ad9304d196febbe33b60a724cc4b0d20634bb82255b
 MD5 e0dae696516c90f5df2d9b63d2fde252 metadata.xml 159
 RMD160 5259d4be0ca7b74c28e711d45a289def9aeadbd9 metadata.xml 159
@@ -36,7 +36,7 @@ SHA256 7ab01edc6d7e66975ea084c49255ae4f77571b9d980580185360179737e5edd3 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGVHdFAiZjviIA2XgRAj7+AKDbXgMfQZqGgoj3eNil/GAvX2oyawCfb4+j
-EFSrx6SZLcsW+zmEMBdZ+yg=
-=zI9E
+iD8DBQFGodxxcxLzpIGCsLQRAk2GAJ9pDVpLX2oWOA73VOA39WTNid9cAACgiQs8
+aF7K2A8r+vsw7dRyH/8wzS0=
+=pQ8b
 -----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 e527af67dded..ac07dd3965a5 100644
--- a/dev-java/jgoodies-forms/jgoodies-forms-1.0.7.ebuild
+++ b/dev-java/jgoodies-forms/jgoodies-forms-1.0.7.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 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.3 2006/12/09 09:20:56 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jgoodies-forms/jgoodies-forms-1.0.7.ebuild,v 1.4 2007/07/21 10:14:11 betelgeuse Exp $
+
+JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2 eutils
 
@@ -14,39 +16,36 @@ SRC_URI="http://www.jgoodies.com/download/libraries/${MY_P}.zip"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-IUSE="doc source"
+IUSE=""
 
 DEPEND=">=virtual/jdk-1.4
-	>=dev-java/ant-core-1.4
-	app-arch/unzip
-	source? ( app-arch/zip )"
+	app-arch/unzip"
 RDEPEND=">=virtual/jre-1.4"
 
 S="${WORKDIR}/${MY_PN}-${PV}"
 
 src_unpack() {
 	unpack ${A} || die "Unpack failed"
-	cd ${S}
+	cd "${S}"
 
 	# Remove the packaged jars
-	rm *.jar || die "em failed"
+	rm -v *.jar || die "rm failed"
 
 	# No support for junit tests yet
-	rm -rf ${S}/src/test
+	rm -rf "${S}/src/test" || die
 
 	# patch the build.xml:
 	epatch "${FILESDIR}/${P}-build.xml.patch"
 }
 
-src_compile() {
-	eant jar $(use_doc)
-}
+# Comes in the tarball
+EANT_DOC_TARGET=""
 
 src_install() {
 	java-pkg_dojar build/${MY_PN}.jar
 
 	dodoc RELEASE-NOTES.txt README.html
 
-	use doc && java-pkg_dohtml -r build/doc
+	use doc && java-pkg_dohtml -r docs/*
 	use source && java-pkg_dosrc src/{core,extras}/com
 }