Ebuild cleanup.

Package-Manager: portage-2.1.2.3

3 files changed, 34 insertions, 22 deletions

diff --git a/dev-java/jsr173/ChangeLog b/dev-java/jsr173/ChangeLog
index 1ef0f7b6fdcc..5990b62f2242 100644
--- a/dev-java/jsr173/ChangeLog
+++ b/dev-java/jsr173/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/jsr173
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jsr173/ChangeLog,v 1.12 2007/01/04 05:51:44 tgall Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jsr173/ChangeLog,v 1.13 2007/04/13 09:14:58 betelgeuse Exp $
+
+  13 Apr 2007; Petteri Räty <betelgeuse@gentoo.org> jsr173-1.0-r1.ebuild:
+  Ebuild cleanup.
 
   03 Jan 2007; Tom Gall <tgall@gentoo.org> jsr173-1.0.ebuild:
   stable on ppc64
diff --git a/dev-java/jsr173/Manifest b/dev-java/jsr173/Manifest
index 741de3922319..3affd51f34f6 100644
--- a/dev-java/jsr173/Manifest
+++ b/dev-java/jsr173/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX build-1.0-r1.xml 1771 RMD160 934dffe75d649f81af2742989f26d767b36059a7 SHA1 65d3460c64123666de47fcb610a98b2256c96cf8 SHA256 ee9b9ab4882a41ed45be0db9760d229d20ddcaf185080c26b7a912ad48caa2d3
 MD5 c1514eff44a7a2cca3ab0bee30140efd files/build-1.0-r1.xml 1771
 RMD160 934dffe75d649f81af2742989f26d767b36059a7 files/build-1.0-r1.xml 1771
@@ -7,18 +10,18 @@ MD5 c1514eff44a7a2cca3ab0bee30140efd files/build-1.0.xml 1771
 RMD160 934dffe75d649f81af2742989f26d767b36059a7 files/build-1.0.xml 1771
 SHA256 ee9b9ab4882a41ed45be0db9760d229d20ddcaf185080c26b7a912ad48caa2d3 files/build-1.0.xml 1771
 DIST jsr173.jar 639734 RMD160 4f8a7522a774d34149987703c828b4bfbafc0966 SHA1 ff060a042afba00c2bd760b49cf847a5134cc07d SHA256 3f6976396e31836dfe99fdc7aa72ee195546b6b6503618f60e2dc2651ed990ba
-EBUILD jsr173-1.0-r1.ebuild 1213 RMD160 5a76b53fed58fb44e9d52e067893b924f5df477e SHA1 2d7b8e9ed5657ff4dac85f7dd8fd9bcda04b23e5 SHA256 b49b89d5c97d2c7dc545c024fabae162f572af1f3fa1cb3aa2f0f3c95a1fc15a
-MD5 d2a5015ddaa1738240f2ddd40b045f2a jsr173-1.0-r1.ebuild 1213
-RMD160 5a76b53fed58fb44e9d52e067893b924f5df477e jsr173-1.0-r1.ebuild 1213
-SHA256 b49b89d5c97d2c7dc545c024fabae162f572af1f3fa1cb3aa2f0f3c95a1fc15a jsr173-1.0-r1.ebuild 1213
+EBUILD jsr173-1.0-r1.ebuild 1204 RMD160 01dceff488c29648b044061a6a7c1d7f7c523fc0 SHA1 a3a963c3634863c870d47115b3882f01ea6580b9 SHA256 b07c9331662f6cd75cc0cb9a26fec5551011be3b37ca82f5c57515d1e8fee665
+MD5 a3c1a98566ac7ff663b148a6f59a8141 jsr173-1.0-r1.ebuild 1204
+RMD160 01dceff488c29648b044061a6a7c1d7f7c523fc0 jsr173-1.0-r1.ebuild 1204
+SHA256 b07c9331662f6cd75cc0cb9a26fec5551011be3b37ca82f5c57515d1e8fee665 jsr173-1.0-r1.ebuild 1204
 EBUILD jsr173-1.0.ebuild 1271 RMD160 71348256c35c8ce6e36d0563b9b535986bc07f7d SHA1 ec44706292c62be8a2f4418b37d4b9eec8136313 SHA256 97e1881496cefd2b9e313c7cfdebc559ac49e07c5ef9eb33d4dd93da9444f7ad
 MD5 6e2a7d140b14bf8d538568bc9481b7c7 jsr173-1.0.ebuild 1271
 RMD160 71348256c35c8ce6e36d0563b9b535986bc07f7d jsr173-1.0.ebuild 1271
 SHA256 97e1881496cefd2b9e313c7cfdebc559ac49e07c5ef9eb33d4dd93da9444f7ad jsr173-1.0.ebuild 1271
-MISC ChangeLog 1536 RMD160 abfd1ad5853ec88ab1ceeca9e31f7369ffa899a8 SHA1 3e062b546291f250c297f3c71dd51d8698c6159c SHA256 a2c8c9137473695867b0a9358c5b60df895d2a3522b21cb44851a7092048914e
-MD5 6692573ccc1e9a4397f3d5d287f7d8fc ChangeLog 1536
-RMD160 abfd1ad5853ec88ab1ceeca9e31f7369ffa899a8 ChangeLog 1536
-SHA256 a2c8c9137473695867b0a9358c5b60df895d2a3522b21cb44851a7092048914e ChangeLog 1536
+MISC ChangeLog 1635 RMD160 67bac0d74a900922ffbb9b31cba5e22c3731f6df SHA1 1b557403c12f1528e124ceda5d4eaf43fbd378e8 SHA256 96379cefc46966f479335774d520c075017f52306003774057b24bb46e1e052d
+MD5 6b2000384e8f4e43f7c2cfc5cad36dbd ChangeLog 1635
+RMD160 67bac0d74a900922ffbb9b31cba5e22c3731f6df ChangeLog 1635
+SHA256 96379cefc46966f479335774d520c075017f52306003774057b24bb46e1e052d ChangeLog 1635
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
@@ -29,3 +32,10 @@ SHA256 0ea87280d2c86e8479bf77de54af26420e5109215c396c2cb6a366b78983bbd6 files/di
 MD5 3f721d0c3e79fb0deb28d036e70e52f7 files/digest-jsr173-1.0-r1 211
 RMD160 763d70d559270e21944dfe9d310e63fb937f9a5d files/digest-jsr173-1.0-r1 211
 SHA256 0ea87280d2c86e8479bf77de54af26420e5109215c396c2cb6a366b78983bbd6 files/digest-jsr173-1.0-r1 211
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGH0oXcxLzpIGCsLQRAuQJAJ9r8TIjMXBk9a0WKcUG2h54gJEgDwCeOUnG
+1raBkRvHE66SuLazpls+byc=
+=tuVn
+-----END PGP SIGNATURE-----
diff --git a/dev-java/jsr173/jsr173-1.0-r1.ebuild b/dev-java/jsr173/jsr173-1.0-r1.ebuild
index 90ae3458627e..70039bc21ec4 100644
--- a/dev-java/jsr173/jsr173-1.0-r1.ebuild
+++ b/dev-java/jsr173/jsr173-1.0-r1.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/jsr173/jsr173-1.0-r1.ebuild,v 1.3 2006/12/09 09:21:47 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jsr173/jsr173-1.0-r1.ebuild,v 1.4 2007/04/13 09:14:58 betelgeuse Exp $
+
+JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2
 
@@ -11,39 +13,36 @@ SRC_URI="http://ftpna2.bea.com/pub/downloads/${PN}.jar"
 LICENSE="bea.ri.jsr173"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="doc source"
+IUSE=""
 
 RDEPEND=">=virtual/jre-1.3
 	dev-java/jaxme"
 DEPEND=">=virtual/jdk-1.3
-	dev-java/ant-core
 	${RDEPEND}"
 
 S=${WORKDIR}
 
 src_unpack() {
-	cd ${S}
+	cd "${S}"
 	jar xvf ${DISTDIR}/${A} || die "failed to unpack"
 
-	cp ${FILESDIR}/build-${PVR}.xml build.xml
+	cp "${FILESDIR}/build-${PVR}.xml" build.xml
 
 	jar xvf ${P//-/_}_src.jar || die "failed to unpack"
-	rm *.jar
+	rm -v *.jar || die
 	cd lib
-	rm *.jar
+	rm -v *.jar || die
 	java-pkg_jarfrom jaxme
 }
 
 src_compile() {
 	local antflags="-Dproject.name=${PN} jar"
-	use doc && antflags="${antflags} javadoc"
-
-	eant ${antflags} || die "Compilation failed"
+	eant ${antflags} $(use_doc) || die "Compilation failed"
 }
 
 src_install() {
 	java-pkg_dojar dist/${PN}.jar
 
-	use doc && java-pkg_dohtml -r dist/doc/api
+	use doc && java-pkg_dojavadoc dist/doc/api
 	use source && java-pkg_dosrc src/*
 }