From 7c4147f1eb6595959d809537c8c45ac97331394a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Petteri=20R=C3=A4ty?= Date: Sat, 14 Apr 2007 19:43:33 +0000 Subject: [PATCH] Migrate to splitted ant. Package-Manager: portage-2.1.2.3 --- dev-java/xjavadoc/ChangeLog | 5 ++++- dev-java/xjavadoc/xjavadoc-1.1-r1.ebuild | 13 ++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dev-java/xjavadoc/ChangeLog b/dev-java/xjavadoc/ChangeLog index f293463d4d1e..931b63e4af08 100644 --- a/dev-java/xjavadoc/ChangeLog +++ b/dev-java/xjavadoc/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-java/xjavadoc # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/xjavadoc/ChangeLog,v 1.9 2007/02/18 20:13:24 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/xjavadoc/ChangeLog,v 1.10 2007/04/14 19:43:33 betelgeuse Exp $ + + 14 Apr 2007; Petteri Räty xjavadoc-1.1-r1.ebuild: + Migrate to splitted ant. 18 Feb 2007; Petteri Räty -xjavadoc-1.1.ebuild: Remove generation 1 ebuild. diff --git a/dev-java/xjavadoc/xjavadoc-1.1-r1.ebuild b/dev-java/xjavadoc/xjavadoc-1.1-r1.ebuild index ffcb5b119793..503994cc6599 100644 --- a/dev-java/xjavadoc/xjavadoc-1.1-r1.ebuild +++ b/dev-java/xjavadoc/xjavadoc-1.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/xjavadoc/xjavadoc-1.1-r1.ebuild,v 1.4 2007/02/18 10:07:29 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/xjavadoc/xjavadoc-1.1-r1.ebuild,v 1.5 2007/04/14 19:43:33 betelgeuse Exp $ inherit eutils java-pkg-2 java-ant-2 @@ -18,9 +18,8 @@ COMMON_DEPEND="dev-java/commons-collections" RDEPEND=">=virtual/jre-1.4 ${COMMON_DEPEND}" -# full ant needed for JJTree and JavaCC tasks, part of ant-nodeps.jar DEPEND=">=virtual/jdk-1.4 - dev-java/ant + || ( dev-java/ant-nodeps dev-java/ant-tasks ) dev-java/javacc ${COMMON_DEPEND} source? ( app-arch/zip )" @@ -28,18 +27,18 @@ DEPEND=">=virtual/jdk-1.4 src_unpack() { unpack ${A} - cd ${S} + cd "${S}" # remove the junit tests, would need xdoclet, causing circular dep epatch ${FILESDIR}/${P}-nojunit.patch - cd ${S}/lib - rm -f *.jar + cd "${S}/lib" + rm -v *.jar || die java-pkg_jar-from commons-collections java-pkg_jar-from --build-only javacc } src_compile() { - eant jar + ANT_TASKS="ant-nodeps" eant jar } src_install() { -- 2.26.2