Switch to java-pkg_dojavadoc and otherwise cleanup ebuilds.

(Portage version: 2.1.2.7)

3 files changed, 20 insertions, 19 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/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/*
 }