diff options
author | Vlastimil Babka <caster@gentoo.org> | 2006-11-29 15:31:29 +0000 |
---|---|---|
committer | Vlastimil Babka <caster@gentoo.org> | 2006-11-29 15:31:29 +0000 |
commit | 06374f5d8272f3a9df8f3c94964086abf80554a3 (patch) | |
tree | 3beb3eed332d72f76fad5af18c77bcc8eec531a7 /dev-java/ant-core/ant-core-1.6.5-r14.ebuild | |
parent | amd64 stable, 151836 (diff) | |
download | gentoo-2-06374f5d8272f3a9df8f3c94964086abf80554a3.tar.gz gentoo-2-06374f5d8272f3a9df8f3c94964086abf80554a3.tar.bz2 gentoo-2-06374f5d8272f3a9df8f3c94964086abf80554a3.zip |
Better quoting, removed stray RDEPEND from DEPEND.
(Portage version: 2.1.2_rc2-r3)
Diffstat (limited to 'dev-java/ant-core/ant-core-1.6.5-r14.ebuild')
-rw-r--r-- | dev-java/ant-core/ant-core-1.6.5-r14.ebuild | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/dev-java/ant-core/ant-core-1.6.5-r14.ebuild b/dev-java/ant-core/ant-core-1.6.5-r14.ebuild index 321daa76472b..ec655217fdff 100644 --- a/dev-java/ant-core/ant-core-1.6.5-r14.ebuild +++ b/dev-java/ant-core/ant-core-1.6.5-r14.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.6.5-r14.ebuild,v 1.8 2006/10/15 18:35:21 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.6.5-r14.ebuild,v 1.9 2006/11/29 15:31:29 caster Exp $ inherit java-pkg-2 eutils toolchain-funcs java-ant-2 @@ -15,8 +15,7 @@ SLOT="0" KEYWORDS="amd64 ia64 ppc ppc64 x86 ~x86-fbsd" IUSE="doc source" -DEPEND="${RDEPEND} - source? ( app-arch/zip ) +DEPEND="source? ( app-arch/zip ) >=virtual/jdk-1.4 !<dev-java/ant-tasks-${PV}" RDEPEND=">=virtual/jdk-1.4 @@ -26,11 +25,11 @@ S="${WORKDIR}/apache-ant-${PV}" src_unpack() { unpack ${A} - cd ${S} + cd "${S}" # Patch build.sh to die with non-zero exit code in case of errors. # This patch may be useful for all ant versions. - epatch ${FILESDIR}/build.sh-exit-fix.patch + epatch "${FILESDIR}/build.sh-exit-fix.patch" } src_compile() { @@ -39,7 +38,7 @@ src_compile() { export THREADS_FLAG="green" fi - ./build.sh -Ddist.dir=${D}/usr/share/${PN} || die "failed to build" + ./build.sh -Ddist.dir="${D}/usr/share/${PN}" || die "failed to build" if use doc; then ./build.sh dist_javadocs || die "failed to build docs" @@ -47,16 +46,16 @@ src_compile() { } src_install() { - newbin ${FILESDIR}/${PV}-ant ant || die "failed to install wrapper" + newbin "${FILESDIR}/${PV}-ant" ant || die "failed to install wrapper" - dodir /usr/share/${PN}/bin + dodir "/usr/share/${PN}/bin" for each in antRun runant.pl runant.py complete-ant-cmd.pl ; do - dobin ${S}/src/script/${each} - dosym /usr/bin/${each} /usr/share/${PN}/bin/${each} + dobin "${S}/src/script/${each}" + dosym "/usr/bin/${each}" "/usr/share/${PN}/bin/${each}" done dodir /etc/env.d - echo "ANT_HOME=\"/usr/share/${PN}\"" > ${D}/etc/env.d/20ant + echo "ANT_HOME=\"/usr/share/${PN}\"" > "${D}/etc/env.d/20ant" java-pkg_dojar build/lib/ant.jar java-pkg_dojar build/lib/ant-launcher.jar |