From 1e9a92af569aa130d969918df0e03663469389a2 Mon Sep 17 00:00:00 2001
From: Vlastimil Babka <caster@gentoo.org>
Date: Wed, 29 Nov 2006 15:31:29 +0000
Subject: [PATCH] Better quoting, removed stray RDEPEND from DEPEND.
 Package-Manager: portage-2.1.2_rc2-r3

---
 dev-java/ant-core/ChangeLog                 |  6 +++++-
 dev-java/ant-core/Manifest                  | 16 ++++++++--------
 dev-java/ant-core/ant-core-1.6.5-r14.ebuild | 21 ++++++++++-----------
 3 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/dev-java/ant-core/ChangeLog b/dev-java/ant-core/ChangeLog
index 3312ce42dfdd..5d8f702b99c8 100644
--- a/dev-java/ant-core/ChangeLog
+++ b/dev-java/ant-core/ChangeLog
@@ -1,11 +1,15 @@
 # ChangeLog for dev-java/ant-core
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.56 2006/10/15 18:35:21 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.57 2006/11/29 15:31:29 caster Exp $
 
 # Ant-core blocks lower/older versions of ant-tasks, 
 # since it will not run when there is a version mismatch betwean the 2 packages
 # Please unemerge ant-tasks when updating ant-core.
 
+  29 Nov 2006; Vlastimil Babka <caster@gentoo.org>
+  ant-core-1.6.5-r14.ebuild:
+  Better quoting, removed stray RDEPEND from DEPEND.
+
   15 Oct 2006; Tobias Scherbaum <dertobi123@gentoo.org>
   ant-core-1.6.5-r14.ebuild:
   ppc stable. bug #147254
diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest
index c9b8d81f15e7..4e07be9396e7 100644
--- a/dev-java/ant-core/Manifest
+++ b/dev-java/ant-core/Manifest
@@ -24,18 +24,18 @@ EBUILD ant-core-1.6.2-r5.ebuild 2065 RMD160 7b40e7dc6be31d0665f929b22714675997d3
 MD5 bea43763ad224e91d869a4837ed01ac0 ant-core-1.6.2-r5.ebuild 2065
 RMD160 7b40e7dc6be31d0665f929b22714675997d33f15 ant-core-1.6.2-r5.ebuild 2065
 SHA256 81a0ff08e46cdba1ce651e3b77b282a669b68fb56aef762a6c868c58504fba0d ant-core-1.6.2-r5.ebuild 2065
-EBUILD ant-core-1.6.5-r14.ebuild 1856 RMD160 1c98500f1ad5c5cfe54e77605c0feeec2f4a9cab SHA1 e25b8527398ba4668fbc52479529b71bd3e278cd SHA256 3dc6b4b17bcfb72ba027ee5367dea3645456f76f789ed0acc446ea1cfe1217c0
-MD5 19cbfca9693bfd661f8354031073943e ant-core-1.6.5-r14.ebuild 1856
-RMD160 1c98500f1ad5c5cfe54e77605c0feeec2f4a9cab ant-core-1.6.5-r14.ebuild 1856
-SHA256 3dc6b4b17bcfb72ba027ee5367dea3645456f76f789ed0acc446ea1cfe1217c0 ant-core-1.6.5-r14.ebuild 1856
+EBUILD ant-core-1.6.5-r14.ebuild 1858 RMD160 1dff6e914ce7cf61b3e43ecd8a3f8649b54cbe49 SHA1 091046be56c641bc8f48876761a1300d88edba6c SHA256 d3aa3b0b072626abd77607a6788c14c97a00fb174c7e8daa6f948f897394ca9e
+MD5 5eae4a13094ad5c03bb9b1a736b23434 ant-core-1.6.5-r14.ebuild 1858
+RMD160 1dff6e914ce7cf61b3e43ecd8a3f8649b54cbe49 ant-core-1.6.5-r14.ebuild 1858
+SHA256 d3aa3b0b072626abd77607a6788c14c97a00fb174c7e8daa6f948f897394ca9e ant-core-1.6.5-r14.ebuild 1858
 EBUILD ant-core-1.6.5-r2.ebuild 1978 RMD160 7b0e737096eecb1b43e8e38baeea5fa72fae58ed SHA1 06b8403882572608e84b9b32bd7dddb9c7a1290c SHA256 7a409add646f81750f7aba528f0c8bb352051580ac1b9b7bbf05565d43aefe0b
 MD5 c10aa50c455475738459a716c561de2c ant-core-1.6.5-r2.ebuild 1978
 RMD160 7b0e737096eecb1b43e8e38baeea5fa72fae58ed ant-core-1.6.5-r2.ebuild 1978
 SHA256 7a409add646f81750f7aba528f0c8bb352051580ac1b9b7bbf05565d43aefe0b ant-core-1.6.5-r2.ebuild 1978
-MISC ChangeLog 22148 RMD160 964da18fe913d55feb460934afaeb8ace9d7f05b SHA1 0637b34c257fc9e9ac3a5449e1b82c9d2e7e34da SHA256 03b202f1d055f5ee719f94b51b32831c35556a14fd9dd8466b4674c2a06890d2
-MD5 06a00d5cba33fdfdd799015526f96c6d ChangeLog 22148
-RMD160 964da18fe913d55feb460934afaeb8ace9d7f05b ChangeLog 22148
-SHA256 03b202f1d055f5ee719f94b51b32831c35556a14fd9dd8466b4674c2a06890d2 ChangeLog 22148
+MISC ChangeLog 22278 RMD160 01e3d9816ccb68d0a7d4380c4e15a20ce744bc73 SHA1 022d34cc35111533e10f80644331c321a37f5658 SHA256 307676c70e42330eb990ad34c4d04dfc9669adae75c6e5bba358681f29733945
+MD5 97aaef851793f803d433dd975c9b127d ChangeLog 22278
+RMD160 01e3d9816ccb68d0a7d4380c4e15a20ce744bc73 ChangeLog 22278
+SHA256 307676c70e42330eb990ad34c4d04dfc9669adae75c6e5bba358681f29733945 ChangeLog 22278
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
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
-- 
2.26.2