Switch to java-pkg_dojavadoc and otherwise cleanup ebuilds.

Package-Manager: portage-2.1.2.7

4 files changed, 42 insertions, 31 deletions

diff --git a/dev-java/avalon-framework/ChangeLog b/dev-java/avalon-framework/ChangeLog
index f875dce2d656..5abd9dffc4e4 100644
--- a/dev-java/avalon-framework/ChangeLog
+++ b/dev-java/avalon-framework/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/avalon-framework
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-framework/ChangeLog,v 1.15 2007/05/06 07:52:51 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-framework/ChangeLog,v 1.16 2007/05/27 00:14:19 betelgeuse Exp $
+
+  27 May 2007; Petteri Räty <betelgeuse@gentoo.org>
+  avalon-framework-4.1.5-r1.ebuild, avalon-framework-4.2.0-r1.ebuild:
+  Switch to java-pkg_dojavadoc and otherwise cleanup ebuilds.
 
   06 May 2007; Tobias Scherbaum <dertobi123@gentoo.org>
   avalon-framework-4.1.5.ebuild:
@@ -63,6 +67,7 @@
   avalon-framework-4.2.0.ebuild:
   Added ~ppc64 to KEYWORDS
 
+*avalon-framework-4.2.0 (28 Feb 2005)
 *avalon-framework-4.1.5 (28 Feb 2005)
 
   28 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> +metadata.xml,
diff --git a/dev-java/avalon-framework/Manifest b/dev-java/avalon-framework/Manifest
index 971bb094bf02..8a1fb822fbbc 100644
--- a/dev-java/avalon-framework/Manifest
+++ b/dev-java/avalon-framework/Manifest
@@ -1,29 +1,32 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX build.xml 1838 RMD160 a8ab0340a5999e8988c295f2317e66198e0d9284 SHA1 d4d3a60b53e78faf36b0c0c13ea32262eca85e79 SHA256 336dbf8253d921987528416da50b557c786313b2c0fd2454b2b25afb6d5a020d
 MD5 3c945053b5c79d286570b89c81418996 files/build.xml 1838
 RMD160 a8ab0340a5999e8988c295f2317e66198e0d9284 files/build.xml 1838
 SHA256 336dbf8253d921987528416da50b557c786313b2c0fd2454b2b25afb6d5a020d files/build.xml 1838
 DIST avalon-framework-4.1.5.src.tar.gz 99475 RMD160 2399c240446694d99fbf39c43279c00decd55342 SHA1 932ea06702beee4124eaa7103b77ac949dc81f83 SHA256 29ec054ff5da5dede98e90156fb2f3037c617a04f9fa2753ab034718031e058d
 DIST avalon-framework-4.2.0-src.tar.gz 68887 RMD160 03b49287a05c95fabe70aaeacfc2103e4cfc8436 SHA1 0a9dc2b80c4cc6365134a8f3b06f1d1c84ddd8c4 SHA256 16374c0a1f67e21c5d44030ba2a01df614775a9c3ec3a387632c3c6e592d8e7d
-EBUILD avalon-framework-4.1.5-r1.ebuild 1112 RMD160 ec75ea942f4fd504a9590447f99e01f2d8455d77 SHA1 a1bc8185ccf6e4c9cb7791b9d793ba31378aa430 SHA256 8065de59404cf42400d684c9ca4cc94cab7f65e557abe8bd7472f360cc0a3f03
-MD5 334f999a5bc7b862f0af1150672ded01 avalon-framework-4.1.5-r1.ebuild 1112
-RMD160 ec75ea942f4fd504a9590447f99e01f2d8455d77 avalon-framework-4.1.5-r1.ebuild 1112
-SHA256 8065de59404cf42400d684c9ca4cc94cab7f65e557abe8bd7472f360cc0a3f03 avalon-framework-4.1.5-r1.ebuild 1112
+EBUILD avalon-framework-4.1.5-r1.ebuild 1079 RMD160 f1eb43b254c8613494a18275750d43dcad99cdde SHA1 21ad9891bd31dbf6defb9a35b30b5ff20a466e84 SHA256 a8da4c4af8709ac540ba329a8f6edd77a1a6f6a194fca3e991ecd363438fbae5
+MD5 aa44b5f6d206cf5ff74ebb9ac794e83c avalon-framework-4.1.5-r1.ebuild 1079
+RMD160 f1eb43b254c8613494a18275750d43dcad99cdde avalon-framework-4.1.5-r1.ebuild 1079
+SHA256 a8da4c4af8709ac540ba329a8f6edd77a1a6f6a194fca3e991ecd363438fbae5 avalon-framework-4.1.5-r1.ebuild 1079
 EBUILD avalon-framework-4.1.5.ebuild 1280 RMD160 e81439fde435714c6ed17301bb90d4bf2a4bb065 SHA1 6c58c9d1db4e3752821761f3ce18a962c0571215 SHA256 b053ee3376e21db96ad781566732726d88bfbf468e63d5119a77fc08a693583b
 MD5 be51cb5a80a35e348193b9dc7f3f55ae avalon-framework-4.1.5.ebuild 1280
 RMD160 e81439fde435714c6ed17301bb90d4bf2a4bb065 avalon-framework-4.1.5.ebuild 1280
 SHA256 b053ee3376e21db96ad781566732726d88bfbf468e63d5119a77fc08a693583b avalon-framework-4.1.5.ebuild 1280
-EBUILD avalon-framework-4.2.0-r1.ebuild 1160 RMD160 20e3a62a4b1d3561d86f8a0134ace65c8b55a723 SHA1 fa92240e0a13b976f0315d1b663ae47d9faecb23 SHA256 5e3d76bead249d62e85591419372d7f8ceac852e894e37e5477b6f2b4fc58575
-MD5 ee288ad6d569b480104657c9e2c4c505 avalon-framework-4.2.0-r1.ebuild 1160
-RMD160 20e3a62a4b1d3561d86f8a0134ace65c8b55a723 avalon-framework-4.2.0-r1.ebuild 1160
-SHA256 5e3d76bead249d62e85591419372d7f8ceac852e894e37e5477b6f2b4fc58575 avalon-framework-4.2.0-r1.ebuild 1160
+EBUILD avalon-framework-4.2.0-r1.ebuild 1095 RMD160 4d074774a3957b5c4520b06152a6376ffc6b5ca2 SHA1 1d7d21dd78586d9f318952ad0e0a3733c5b5d155 SHA256 28610f4ca93c8a99e18ecc7dbbac1df19e313fa3259743230a929499ab4a78ab
+MD5 a79dfc09a9533de74ed6b7dd987fe456 avalon-framework-4.2.0-r1.ebuild 1095
+RMD160 4d074774a3957b5c4520b06152a6376ffc6b5ca2 avalon-framework-4.2.0-r1.ebuild 1095
+SHA256 28610f4ca93c8a99e18ecc7dbbac1df19e313fa3259743230a929499ab4a78ab avalon-framework-4.2.0-r1.ebuild 1095
 EBUILD avalon-framework-4.2.0.ebuild 1285 RMD160 7c6eb290f28845176fcb688bd6feb5742af19bbc SHA1 a33bad15bbe6aa2351f6337b002d138965c29c40 SHA256 4430c0bac2efec5fa2ac2f6c7604bd090552169d91ada14ca667e3b4cc5269cc
 MD5 6bf022e65009522877af11ae4b6c52c3 avalon-framework-4.2.0.ebuild 1285
 RMD160 7c6eb290f28845176fcb688bd6feb5742af19bbc avalon-framework-4.2.0.ebuild 1285
 SHA256 4430c0bac2efec5fa2ac2f6c7604bd090552169d91ada14ca667e3b4cc5269cc avalon-framework-4.2.0.ebuild 1285
-MISC ChangeLog 2646 RMD160 e86702ca80d540bd0dbfe3c3e8db03926cc0335d SHA1 64f3c66da0147f89f82c5a405c9f798be29efc3f SHA256 c17641c29e2e961aab678e20c8ce2f23e1d42136131acef2e4f0a170d9eaa168
-MD5 81f8db56035fb14cef753c87da05c4b5 ChangeLog 2646
-RMD160 e86702ca80d540bd0dbfe3c3e8db03926cc0335d ChangeLog 2646
-SHA256 c17641c29e2e961aab678e20c8ce2f23e1d42136131acef2e4f0a170d9eaa168 ChangeLog 2646
+MISC ChangeLog 2870 RMD160 84ab629202ff3f91cb21055e0fcb72e7fb771deb SHA1 2cda2aebf00d71086ed07e20c063260f51a9311a SHA256 105a8de86d451a9d3192f813f9f8dcf21e1709d17a48132a1b3a0051a64e3b6b
+MD5 12aeb54fa1fe856c9e525f4dd318bdee ChangeLog 2870
+RMD160 84ab629202ff3f91cb21055e0fcb72e7fb771deb ChangeLog 2870
+SHA256 105a8de86d451a9d3192f813f9f8dcf21e1709d17a48132a1b3a0051a64e3b6b ChangeLog 2870
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -40,3 +43,10 @@ SHA256 3d2d738b596fd368ea6fb1c4cdbf972e24dbd37178bb8223ea1599bef653df3f files/di
 MD5 61835ed35499ac399b002b2d83f7c9b3 files/digest-avalon-framework-4.2.0-r1 277
 RMD160 1a2136f3e60ae14d2a3bd31b243dd8b2bbcfd393 files/digest-avalon-framework-4.2.0-r1 277
 SHA256 3d2d738b596fd368ea6fb1c4cdbf972e24dbd37178bb8223ea1599bef653df3f files/digest-avalon-framework-4.2.0-r1 277
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGWM1fcxLzpIGCsLQRAovgAJoDcCcsbTBnF/qtIyO5A9U7UkyanACfSWq+
+evdiR8M4tGESdnb4Wcs3WNA=
+=BFTo
+-----END PGP SIGNATURE-----
diff --git a/dev-java/avalon-framework/avalon-framework-4.1.5-r1.ebuild b/dev-java/avalon-framework/avalon-framework-4.1.5-r1.ebuild
index e82eda2072fe..0e1e3eed7c12 100644
--- a/dev-java/avalon-framework/avalon-framework-4.1.5-r1.ebuild
+++ b/dev-java/avalon-framework/avalon-framework-4.1.5-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-framework/avalon-framework-4.1.5-r1.ebuild,v 1.6 2007/02/13 19:46:46 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-framework/avalon-framework-4.1.5-r1.ebuild,v 1.7 2007/05/27 00:14:19 betelgeuse Exp $
+
+JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2
 
@@ -11,7 +13,7 @@ SRC_URI="mirror://apache/avalon/avalon-framework/source/${P}.src.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="4.1"
 KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="doc source"
+IUSE=""
 
 COMMON_DEP="
 	=dev-java/avalon-logkit-2*
@@ -19,8 +21,6 @@ COMMON_DEP="
 RDEPEND=">=virtual/jre-1.4
 	${COMMON_DEP}"
 DEPEND=">=virtual/jdk-1.4
-	>=dev-java/ant-core-1.5
-	source? ( app-arch/zip )
 	${COMMON_DEP}"
 
 S="${WORKDIR}/${PN}"
@@ -37,6 +37,6 @@ src_unpack() {
 src_install() {
 	java-pkg_dojar ${S}/dist/avalon-framework.jar
 
-	use doc && java-pkg_dohtml -r ${S}/target/docs/*
+	use doc && java-pkg_dojavadoc "${S}"/target/docs
 	use source && java-pkg_dosrc impl/src/java/*
 }
diff --git a/dev-java/avalon-framework/avalon-framework-4.2.0-r1.ebuild b/dev-java/avalon-framework/avalon-framework-4.2.0-r1.ebuild
index 2f76031e4c07..0557727ee3f1 100644
--- a/dev-java/avalon-framework/avalon-framework-4.2.0-r1.ebuild
+++ b/dev-java/avalon-framework/avalon-framework-4.2.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/avalon-framework/avalon-framework-4.2.0-r1.ebuild,v 1.4 2006/10/17 03:35:12 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-framework/avalon-framework-4.2.0-r1.ebuild,v 1.5 2007/05/27 00:14:19 betelgeuse Exp $
+
+JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2
 
@@ -11,36 +13,30 @@ SRC_URI="mirror://apache/avalon/avalon-framework/source/${P}-src.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="4.2"
 KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="doc source"
+IUSE=""
 
 COMMON_DEP="=dev-java/avalon-logkit-2*
 	>=dev-java/log4j-1.2.9"
 RDEPEND=">=virtual/jre-1.4
 	${COMMON_DEP}"
 DEPEND=">=virtual/jdk-1.4
-	>=dev-java/ant-core-1.5
-	source? ( app-arch/zip )
 	${COMMON_DEP}"
 
 S="${WORKDIR}/${PN}"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
-	cp ${FILESDIR}/build.xml ./build.xml || die "ANT update failure!"
+	cp "${FILESDIR}/build.xml" ./build.xml || die "ANT update failure!"
 	local libs="log4j,avalon-logkit-2.0"
 	echo "classpath=$(java-pkg_getjars ${libs})" > build.properties
 }
 
-src_compile() {
-	eant jar $(use_doc)
-}
-
 src_install() {
 	java-pkg_dojar ${S}/dist/avalon-framework.jar
 
-	dodoc NOTICE.TXT
-	use doc && java-pkg_dohtml -r ${S}/target/docs/*
+	dodoc NOTICE.TXT || die
+	use doc && java-pkg_dojavadoc target/docs
 	use source && java-pkg_dosrc impl/src/java/*
 }