From: Petteri Räty <betelgeuse@gentoo.org>
Date: Fri, 27 Apr 2007 21:46:08 +0000 (+0000)
Subject: Remove unneeded dependency on junit, RDEPEND on dev-java/ant-core and stylistic cleanup.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e9eb4173745f8bd9be7112c156117de5e722e60c;p=gentoo.git

Remove unneeded dependency on junit, RDEPEND on dev-java/ant-core and stylistic cleanup.
Package-Manager: portage-2.1.2.4
---

diff --git a/dev-java/commons-grant/ChangeLog b/dev-java/commons-grant/ChangeLog
index df49a8bd138a..7ffe13d6c515 100644
--- a/dev-java/commons-grant/ChangeLog
+++ b/dev-java/commons-grant/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/commons-grant
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-grant/ChangeLog,v 1.2 2006/07/22 22:46:32 nelchael Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-grant/ChangeLog,v 1.3 2007/04/27 21:46:08 betelgeuse Exp $
+
+  27 Apr 2007; Petteri Räty <betelgeuse@gentoo.org>
+  commons-grant-1.0_beta5-r1.ebuild:
+  Remove unneeded dependency on junit, RDEPEND on dev-java/ant-core and
+  stylistic cleanup.
 
 *commons-grant-1.0_beta5-r1 (22 Jul 2006)
 
diff --git a/dev-java/commons-grant/Manifest b/dev-java/commons-grant/Manifest
index 372baa1a8fc7..caabd5e0ea97 100644
--- a/dev-java/commons-grant/Manifest
+++ b/dev-java/commons-grant/Manifest
@@ -6,18 +6,18 @@ MD5 a05c0258c189c350524bb14761e9c3cd files/commons-grant-1.0_beta5-gentoo.diff 1
 RMD160 4cafa3ccd1a1db8971f1bda34483d8160da13ded files/commons-grant-1.0_beta5-gentoo.diff 1254
 SHA256 4c237fd0141bd1d03664e9eb6d533cafdc361529696de4718fe5c1cd44ef1cfa files/commons-grant-1.0_beta5-gentoo.diff 1254
 DIST jakarta-commons-grant-1.0.b5.cvs20040118-4jpp.src.rpm 11651 RMD160 983860d8e513c8b0e8b7d1032d04230902a4f883 SHA1 fa3cb73541db37209ea388e23274634565c50172 SHA256 c6cc1cd6b51668ba18f6fab17863d4f3bc9889a20a0f70261dbf00fd08ec482d
-EBUILD commons-grant-1.0_beta5-r1.ebuild 1547 RMD160 ee3ad634af520976f8bd39c5fe3851c7a780df3e SHA1 df093d51c127cd7b2506ff9616716749e601eab0 SHA256 1a787b5b75c41d49e2f28ead032f4a4093f93ce456214441aa41b596afbb8c0c
-MD5 cc51be8ed2aa82fd3ada72897fb79f34 commons-grant-1.0_beta5-r1.ebuild 1547
-RMD160 ee3ad634af520976f8bd39c5fe3851c7a780df3e commons-grant-1.0_beta5-r1.ebuild 1547
-SHA256 1a787b5b75c41d49e2f28ead032f4a4093f93ce456214441aa41b596afbb8c0c commons-grant-1.0_beta5-r1.ebuild 1547
+EBUILD commons-grant-1.0_beta5-r1.ebuild 1463 RMD160 e577c5efdc317a89923601f5e1aa8ce0704dfdaa SHA1 6c823f324c63fead8b813a3903ac3cf15417eec4 SHA256 3f9e9ea31dcae732c61612b35324d478d7500cf024809a644820d33f96af86f0
+MD5 00d3d91f329c8a629e741e9bbc6a6936 commons-grant-1.0_beta5-r1.ebuild 1463
+RMD160 e577c5efdc317a89923601f5e1aa8ce0704dfdaa commons-grant-1.0_beta5-r1.ebuild 1463
+SHA256 3f9e9ea31dcae732c61612b35324d478d7500cf024809a644820d33f96af86f0 commons-grant-1.0_beta5-r1.ebuild 1463
 EBUILD commons-grant-1.0_beta5.ebuild 1620 RMD160 3541628e0e8ba8b0f03413e4b2392def14e2be10 SHA1 73c9faa705125da82d4f8238dfea105211715b07 SHA256 57718786f73f3a43bd45231da002960d7a14e57cc2bf7adece2996ce7bf4b595
 MD5 35d59cc366e70a5b86cf155c6e883ef5 commons-grant-1.0_beta5.ebuild 1620
 RMD160 3541628e0e8ba8b0f03413e4b2392def14e2be10 commons-grant-1.0_beta5.ebuild 1620
 SHA256 57718786f73f3a43bd45231da002960d7a14e57cc2bf7adece2996ce7bf4b595 commons-grant-1.0_beta5.ebuild 1620
-MISC ChangeLog 599 RMD160 3e7501fa3921848acef7db1fcb4e3991408345f8 SHA1 27b87406205e8343f0e196c7011d6b086a4ca834 SHA256 7e07c915e8dbbe090f521661b6a2ada8f8f1ae72877ad67796fcddcea0782f18
-MD5 a14a4d21f30e6e1919e432fea267abde ChangeLog 599
-RMD160 3e7501fa3921848acef7db1fcb4e3991408345f8 ChangeLog 599
-SHA256 7e07c915e8dbbe090f521661b6a2ada8f8f1ae72877ad67796fcddcea0782f18 ChangeLog 599
+MISC ChangeLog 785 RMD160 de7d463eb66a826121feb4b8ac7d14c9e465c9d9 SHA1 0bf7bcf5ae6c7a36f8e3efe649fff697f2a7b0b2 SHA256 06c7ab3f9c762d65cc07b86612287b47c2fb2e662da0cba32f753fa5add5a9f5
+MD5 89c9b20bfb59843e47ee59696933203a ChangeLog 785
+RMD160 de7d463eb66a826121feb4b8ac7d14c9e465c9d9 ChangeLog 785
+SHA256 06c7ab3f9c762d65cc07b86612287b47c2fb2e662da0cba32f753fa5add5a9f5 ChangeLog 785
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -29,9 +29,9 @@ MD5 8a3ba5de646cad4425e22dfc3a4f8615 files/digest-commons-grant-1.0_beta5-r1 337
 RMD160 05471245d2403b1f6cf9a69f9c0c8a686375cbd3 files/digest-commons-grant-1.0_beta5-r1 337
 SHA256 d22823ce82bae4e7fdd9bc96cfe8b43df85af40ede4cd0d524105706e1205a05 files/digest-commons-grant-1.0_beta5-r1 337
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFEwqrQgo/w9rxVVVERArMhAJwM0JLwlIsdK+u1vRYQCSoDo2D6lQCglw8O
-ZAJehOp9j0tJEkp6EWNFdSg=
-=FFpd
+iD8DBQFGMm8icxLzpIGCsLQRAs5DAJ96x37fAcW5Q/oRuuBDQoZcUM5+VQCbB4hi
+1oSmZRIIY+GAL8hJSQlITO8=
+=1Vyw
 -----END PGP SIGNATURE-----
diff --git a/dev-java/commons-grant/commons-grant-1.0_beta5-r1.ebuild b/dev-java/commons-grant/commons-grant-1.0_beta5-r1.ebuild
index f8c6ee1ca3ff..868c46595764 100644
--- a/dev-java/commons-grant/commons-grant-1.0_beta5-r1.ebuild
+++ b/dev-java/commons-grant/commons-grant-1.0_beta5-r1.ebuild
@@ -1,9 +1,12 @@
-# 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/commons-grant/commons-grant-1.0_beta5-r1.ebuild,v 1.1 2006/07/22 22:46:32 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-grant/commons-grant-1.0_beta5-r1.ebuild,v 1.2 2007/04/27 21:46:08 betelgeuse Exp $
 
 # Note: Upstream is dead... only place to find is on the ibiblio maven repo
 # and on jpackage.org
+
+JAVA_PKG_IUSE="doc source"
+
 inherit java-pkg-2 java-ant-2 eutils rpm
 MY_PN="jakarta-${PN}"
 SNAPSHOT_DATE="20040118"
@@ -16,11 +19,9 @@ DESCRIPTION="A small collection of hacks to make using Ant in an embedded envinr
 # This link seems dead, but I don't have anywhere else to turn
 HOMEPAGE="http://jakarta.apache.org/commons/sandbox/grant/"
 SRC_URI="mirror://jpackage/1.6/generic/free/SRPMS/${MY_P}-${JPACKAGE_REVISION}jpp.src.rpm"
-DEPEND=">=virtual/jdk-1.3
-	source? ( app-arch/zip )
-	dev-java/ant-core
-	dev-java/junit"
-RDEPEND=">=virtual/jre-1.3"
+DEPEND=">=virtual/jdk-1.3"
+RDEPEND=">=virtual/jre-1.3
+	dev-java/ant-core"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -29,25 +30,20 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 src_unpack(){
 	rpm_src_unpack
-	cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo.diff
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-gentoo.diff"
 	mkdir -p target/lib
 	cd target/lib
-	java-pkg_jar-from junit
-}
-
-src_compile(){
-	local antflags="jar"
-	use doc && antflags="${antflags} javadoc"
-	eant ${antflags} || die "compile failed"
+	java-pkg_jar-from ant-core
 }
 
 src_install(){
 	java-pkg_newjar target/${PN}-1.0-beta-4.jar ${PN}.jar
-	use doc && java-pkg_dohtml -r dist/docs/api
+	use doc && java-pkg_dojavadoc dist/docs/api
 	use source && java-pkg_dosrc src/java/*
 }
 
-src_test() {
-	eant test || die "Test failed"
-}
+#No unit tests although the target exists
+#src_test() {
+#	eant test || die "Test failed"
+#}