Cleanup ebuild.

Package-Manager: portage-2.1.4.1

3 files changed, 27 insertions, 19 deletions

diff --git a/dev-java/commons-digester/ChangeLog b/dev-java/commons-digester/ChangeLog
index eb67642e9d6d..690c01f12fb5 100644
--- a/dev-java/commons-digester/ChangeLog
+++ b/dev-java/commons-digester/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/commons-digester
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-digester/ChangeLog,v 1.46 2008/01/21 13:26:14 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-digester/ChangeLog,v 1.47 2008/02/08 15:10:52 betelgeuse Exp $
+
+  08 Feb 2008; Petteri Räty <betelgeuse@gentoo.org>
+  commons-digester-1.8.ebuild:
+  Cleanup ebuild.
 
   21 Jan 2008; Vlastimil Babka <caster@gentoo.org>
   commons-digester-1.7-r2.ebuild, commons-digester-1.8.ebuild:
diff --git a/dev-java/commons-digester/Manifest b/dev-java/commons-digester/Manifest
index 9cd1191883ea..266c9de8a8e4 100644
--- a/dev-java/commons-digester/Manifest
+++ b/dev-java/commons-digester/Manifest
@@ -1,8 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 1.7-build.xml-jar-target.patch 1148 RMD160 9387b53ab675cc223db2824b0dadd994994ce16e SHA1 59cbb1207313b24b0cbcf0f81e973c1c6d34af09 SHA256 c1a0724bd448bb2d98ae58d72d3b842c8313a9933df13dac56c9ea6e835bb69d
 AUX 1.8-build.xml-jar-target.patch 1824 RMD160 4551dae52a428c91079029431e2bc4fbd51dfe82 SHA1 dd175de66aa0967dea45e57a8ada643dcb6dd2e3 SHA256 9faa97825bb85c6d0c0e31e08a278e39e808b9a6ac98c47e6aa0af6992ccbf36
 DIST commons-digester-1.7-src.tar.gz 237780 RMD160 ae5689a2520d0c70619d40704a66201b46ee280e SHA1 b83eafe7b7c3e150bf36b5f86b008f42c2891fe9 SHA256 b08cea063578c272374df08be010f4a841c87a5cea278f4bd20f89531eeab069
 DIST commons-digester-1.8-src.tar.gz 279771 RMD160 e1b90e30a4783061150f2c4c34a78ec515fde920 SHA1 5f7615040ae8e687a0a4e890cb542470c15c60fe SHA256 d9a965c82828a881d2ab6256fba7076f62815a9545b3af9d553dc5271577182b
 EBUILD commons-digester-1.7-r2.ebuild 2102 RMD160 522b5b5a981a6f6487501f3f1892a60e4bf3798a SHA1 3c43582e959ce12138ac63a82ccc1f2de708432b SHA256 3e055e2a67e18598ccc1b8f30dd9b2687e1fcf9fe96b8e99d586092d8649b8a3
-EBUILD commons-digester-1.8.ebuild 2100 RMD160 323f4522b688b03dac22c3f35a1a9c3d00f3b605 SHA1 6cb58eb26c33a7be03302813c0417a941aac290c SHA256 b39c224677699bbac502257fd7bf92b9ae2f2ed148040996d6c7f43a13e2b3b3
-MISC ChangeLog 6595 RMD160 3cd3b82aed9e9958dbe90faba74c7e52d5cd4db6 SHA1 62ee0db7460d4a2c49e0926edef7d5897f64d8c3 SHA256 5281a4cf3fc2122b93fda97c31c8da8ab5b33e00bbe84b84940dbec1e1329849
+EBUILD commons-digester-1.8.ebuild 1974 RMD160 f88df4247e6702e49faae503613381f93667d340 SHA1 2259b5ca4093df5996bd99154afd77e3d2c9a4fb SHA256 4e19a303accb2d4abe5d80c11e151e934c588704409428fc5103436efa0f9965
+MISC ChangeLog 6702 RMD160 73682e3867725fb2df54ecf75fde31facf62b844 SHA1 31b8c59d66815cba838279f2677e23b7c45da48e SHA256 16ee42bd63df960f8dd83d2a775d277ac7d123a0a7257b07c504f9ef766c8453
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHrHAAcxLzpIGCsLQRAkWZAJ4nqroL5EBxMhtiT6S+0Tj+hrWWmACeOa4q
+U67wfgWbFvM8WLoLR8R3dMs=
+=llij
+-----END PGP SIGNATURE-----
diff --git a/dev-java/commons-digester/commons-digester-1.8.ebuild b/dev-java/commons-digester/commons-digester-1.8.ebuild
index ecb7fae5b1c6..c6756090a2f3 100644
--- a/dev-java/commons-digester/commons-digester-1.8.ebuild
+++ b/dev-java/commons-digester/commons-digester-1.8.ebuild
@@ -1,6 +1,9 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-digester/commons-digester-1.8.ebuild,v 1.2 2008/01/21 13:26:14 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-digester/commons-digester-1.8.ebuild,v 1.3 2008/02/08 15:10:52 betelgeuse Exp $
+
+EAPI=1
+JAVA_PKG_IUSE="doc examples source test"
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -12,18 +15,16 @@ SRC_URI="mirror://apache/jakarta/commons/digester/source/${MY_P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="doc examples source test"
+IUSE=""
 
 # 1.3 support might be possible by adding an additional depend on
 # xml-commons[-external, but 1.3 is gone anyway
 RDEPEND=">=virtual/jre-1.4
-	=dev-java/commons-beanutils-1.6*
+	dev-java/commons-beanutils:1.6
 	>=dev-java/commons-collections-2.1
 	>=dev-java/commons-logging-1.0.2"
 DEPEND=">=virtual/jdk-1.4
-	>=dev-java/ant-core-1.4
-	test? ( =dev-java/junit-3* )
-	source? ( app-arch/zip )
+	test? ( dev-java/junit:0 )
 	${RDEPEND}"
 
 S="${WORKDIR}/${P}-src"
@@ -46,10 +47,6 @@ src_unpack() {
 		commons-logging.jar)" >> build.properties
 }
 
-src_compile() {
-	eant jar $(use_doc)
-}
-
 src_test() {
 	eant -Djunit.jar="$(java-pkg_getjar --build-only junit junit.jar)" test
 }
@@ -57,12 +54,9 @@ src_test() {
 src_install() {
 	java-pkg_dojar "dist/${PN}.jar"
 
-	dodoc NOTICE.txt RELEASE-NOTES.txt
+	dodoc NOTICE.txt RELEASE-NOTES.txt || die
 
-	use doc && dohtml -r dist/docs/api
+	use doc && java-pkg_dojavadoc dist/docs/api
 	use source && java-pkg_dosrc src/java/org
-	if use examples; then
-		dodir "/usr/share/doc/${PF}/examples"
-		cp -r src/examples/* "${D}/usr/share/doc/${PF}/examples"
-	fi
+	use examples && java-pkg_doexamples src/examples
 }