amd64 stable, bug #195571. Added quotes, still missing from older soon to be removed versions.

(Portage version: 2.1.3.12)

3 files changed, 41 insertions, 39 deletions

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index c38249ee5e18..7fc37ac6750d 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,9 +1,11 @@
 # ChangeLog for www-servers/tomcat
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.166 2007/10/12 02:16:08 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.167 2007/10/12 02:47:16 wltjr Exp $
 
-  12 Oct 2007; William L. Thomson Jr. <wltjr@gentoo.org> ChangeLog:
-  amd64 stable, bug #195571.
+  12 Oct 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  tomcat-5.5.25.ebuild, tomcat-6.0.14.ebuild:
+  amd64 stable, bug #195571. Added quotes, still missing from older soon to be
+  removed versions.
 
   21 Sep 2007; William L. Thomson Jr. <wltjr@gentoo.org>
   tomcat-5.5.25.ebuild:
diff --git a/www-servers/tomcat/tomcat-5.5.25.ebuild b/www-servers/tomcat/tomcat-5.5.25.ebuild
index 9eb67e396f75..a15503b88e88 100644
--- a/www-servers/tomcat/tomcat-5.5.25.ebuild
+++ b/www-servers/tomcat/tomcat-5.5.25.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/www-servers/tomcat/tomcat-5.5.25.ebuild,v 1.3 2007/09/21 14:49:42 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.25.ebuild,v 1.4 2007/10/12 02:47:16 wltjr Exp $
 
 WANT_ANT_TASKS="ant-trax"
 
@@ -12,7 +12,7 @@ MY_P="apache-${P}-src"
 SLOT="5.5"
 SRC_URI="mirror://apache/${PN}/${PN}-5/v${PV}/src/${MY_P}.tar.gz"
 HOMEPAGE="http://tomcat.apache.org/"
-KEYWORDS="~amd64 -ppc -ppc64 ~x86"
+KEYWORDS="amd64 -ppc -ppc64 ~x86"
 LICENSE="Apache-2.0"
 
 IUSE="admin java5 doc examples source test"
@@ -66,15 +66,15 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	epatch "${FILESDIR}/${SLOT}/main_tomcat_catalina_jasper_build_xml.patch"
 
 	use examples && epatch "${FILESDIR}/${SLOT}/jsr152_jsr154_examples_build_xml.patch"
 
 	# avoid packed jars :-)
-	mkdir -p ${S}/build/build/common
-	cd ${S}/build/build
+	mkdir -p "${S}"/build/build/common
+	cd "${S}"/build/build
 
 	mkdir ./bin && cd ./bin
 	java-pkg_jar-from commons-logging commons-logging-api.jar
@@ -82,12 +82,12 @@ src_unpack() {
 	if ! use java5; then
 		java-pkg_jar-from mx4j-core-3.0 mx4j.jar jmx.jar
 		java-pkg_jar-from mx4j-core-3.0 mx4j-rjmx.jar jmx-remote.jar
-		mkdir ${S}/build/build/common/endorsed && cd ${S}/build/build/common/endorsed
+		mkdir "${S}"/build/build/common/endorsed && cd "${S}"/build/build/common/endorsed
 		java-pkg_jar-from xml-commons-external-1.3 xml-apis.jar
 		java-pkg_jar-from xerces-2 xercesImpl.jar
 	fi
 
-	mkdir ${S}/build/build/common/lib && cd ${S}/build/build/common/lib
+	mkdir "${S}"/build/build/common/lib && cd "${S}"/build/build/common/lib
 	java-pkg_jar-from ant-core
 	java-pkg_jar-from commons-collections
 	java-pkg_jar-from commons-dbcp
@@ -95,7 +95,7 @@ src_unpack() {
 	java-pkg_jar-from commons-pool
 	java-pkg_jar-from tomcat-servlet-api-2.4
 
-	mkdir -p ${S}/build/build/server/lib && cd ${S}/build/build/server/lib
+	mkdir -p "${S}"/build/build/server/lib && cd "${S}"/build/build/server/lib
 	java-pkg_jar-from commons-beanutils-1.7 commons-beanutils.jar
 	java-pkg_jar-from commons-digester
 	java-pkg_jar-from commons-modeler
@@ -151,11 +151,11 @@ src_compile(){
 }
 
 src_install() {
-	cd ${S}/build/build
+	cd "${S}"/build/build
 
 	# init.d, conf.d
-	newinitd ${FILESDIR}/${SLOT}/tomcat.init.2 ${TOMCAT_NAME}
-	newconfd ${FILESDIR}/${SLOT}/tomcat.conf.2 ${TOMCAT_NAME}
+	newinitd "${FILESDIR}"/${SLOT}/tomcat.init.2 ${TOMCAT_NAME}
+	newconfd "${FILESDIR}"/${SLOT}/tomcat.conf.2 ${TOMCAT_NAME}
 
 	# create dir structure
 	diropts -m755 -o tomcat -g tomcat
@@ -182,10 +182,10 @@ src_install() {
 	# copy the manager and admin context's to the right position
 	mkdir -p conf/Catalina/localhost
 	if use admin; then
-		cp ${S}/container/webapps/admin/admin.xml \
+		cp "${S}"/container/webapps/admin/admin.xml \
 			conf/Catalina/localhost
 	fi
-	cp ${S}/container/webapps/manager/manager.xml \
+	cp "${S}"/container/webapps/manager/manager.xml \
 		conf/Catalina/localhost
 
 	# make the jars available via java-pkg_getjar and jar-from, etc
@@ -229,24 +229,24 @@ src_install() {
 
 	# copy over the directories
 	chown -R tomcat:tomcat webapps/* conf/*
-	cp -pR conf/* ${D}/etc/${TOMCAT_NAME} || die "failed to copy conf"
-	cp -HR bin common server ${D}/usr/share/${TOMCAT_NAME} || die "failed to copy"
+	cp -pR conf/* "${D}"/etc/${TOMCAT_NAME} || die "failed to copy conf"
+	cp -HR bin common server "${D}"/usr/share/${TOMCAT_NAME} || die "failed to copy"
 
 	# replace catalina.policy with gentoo specific one bug #176701
-	cp ${FILESDIR}/${SLOT}/catalina.policy ${D}/etc/${TOMCAT_NAME} || die "failed to replace catalina.policy"
+	cp "${FILESDIR}"/${SLOT}/catalina.policy "${D}"/etc/${TOMCAT_NAME} || die "failed to replace catalina.policy"
 
 	keepdir               ${WEBAPPS_DIR}
-	set_webapps_perms     ${D}/${WEBAPPS_DIR}
+	set_webapps_perms     "${D}"/${WEBAPPS_DIR}
 
 	# Copy over webapps, some controlled by use flags
 	cp -p ../RELEASE-NOTES webapps/ROOT/RELEASE-NOTES.txt
-	cp -pr webapps/ROOT ${D}${CATALINA_BASE}/webapps
+	cp -pr webapps/ROOT "${D}"${CATALINA_BASE}/webapps
 	if use doc; then
-		cp -pr webapps/tomcat-docs ${D}${CATALINA_BASE}/webapps
+		cp -pr webapps/tomcat-docs "${D}"${CATALINA_BASE}/webapps
 	fi
 	if use examples; then
 		cp -pr webapps/{jsp-examples,servlets-examples,webdav} \
-			${D}${CATALINA_BASE}/webapps
+			"${D}"${CATALINA_BASE}/webapps
 	fi
 
 	# symlink the directories to make CATALINA_BASE possible
@@ -255,7 +255,7 @@ src_install() {
 	dosym /var/tmp/${TOMCAT_NAME} ${CATALINA_BASE}/temp
 	dosym /var/run/${TOMCAT_NAME} ${CATALINA_BASE}/work
 
-	dodoc  ${S}/build/{RELEASE-NOTES,RUNNING.txt}
+	dodoc  "${S}"/build/{RELEASE-NOTES,RUNNING.txt}
 	fperms 640 /etc/${TOMCAT_NAME}/tomcat-users.xml
 }
 
diff --git a/www-servers/tomcat/tomcat-6.0.14.ebuild b/www-servers/tomcat/tomcat-6.0.14.ebuild
index 84a73c1b1702..666bc0076cb5 100644
--- a/www-servers/tomcat/tomcat-6.0.14.ebuild
+++ b/www-servers/tomcat/tomcat-6.0.14.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/www-servers/tomcat/tomcat-6.0.14.ebuild,v 1.5 2007/08/31 21:42:30 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.14.ebuild,v 1.6 2007/10/12 02:47:16 wltjr Exp $
 
 WANT_ANT_TASKS="ant-trax"
 
@@ -89,8 +89,8 @@ src_install() {
 	local CATALINA_BASE=/var/lib/${TOMCAT_NAME}/
 
 	# init.d, conf.d
-	newinitd ${FILESDIR}/${SLOT}/tomcat.init ${TOMCAT_NAME}
-	newconfd ${FILESDIR}/${SLOT}/tomcat.conf ${TOMCAT_NAME}
+	newinitd "${FILESDIR}"/${SLOT}/tomcat.init ${TOMCAT_NAME}
+	newconfd "${FILESDIR}"/${SLOT}/tomcat.conf ${TOMCAT_NAME}
 
 	# create dir structure
 	dodir /usr/share/${TOMCAT_NAME}
@@ -110,8 +110,8 @@ src_install() {
 
 	cd "${S}"
 	# fix context's so webapps will be deployed
-	sed -i -e 's:Context a:Context docBase="${catalina.home}/webapps/host-manager"  a:' ${S}/webapps/host-manager/META-INF/context.xml
-	sed -i -e 's:Context a:Context docBase="${catalina.home}/webapps/manager"  a:' ${S}/webapps/manager/META-INF/context.xml
+	sed -i -e 's:Context a:Context docBase="${catalina.home}/webapps/host-manager"  a:' "${S}"/webapps/host-manager/META-INF/context.xml
+	sed -i -e 's:Context a:Context docBase="${catalina.home}/webapps/manager"  a:' "${S}"/webapps/manager/META-INF/context.xml
 
 	# replace the default pw with a random one, see #92281
 	local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
@@ -119,15 +119,15 @@ src_install() {
 
 	# copy over the directories
 	chown -R tomcat:tomcat webapps/* conf/*
-	cp -pR conf/* ${D}/etc/${TOMCAT_NAME} || die "failed to copy conf"
-	cp -pPR output/build/bin ${D}/usr/share/${TOMCAT_NAME} \
+	cp -pR conf/* "${D}"/etc/${TOMCAT_NAME} || die "failed to copy conf"
+	cp -pPR output/build/bin "${D}"/usr/share/${TOMCAT_NAME} \
 		|| die "failed to copy"
 
 	# replace catalina.policy with gentoo specific one bug #176701
-#	cp ${FILESDIR}/${SLOT}/catalina.policy ${D}/etc/${TOMCAT_NAME} \
+#	cp ${FILESDIR}/${SLOT}/catalina.policy "${D}"/etc/${TOMCAT_NAME} \
 #		|| die "failed to replace catalina.policy"
 
-	cp ${T}/tomcat6-deps/jdt/jasper-jdt.jar ${D}/usr/share/${TOMCAT_NAME}/lib \
+	cp "${T}"/tomcat6-deps/jdt/jasper-jdt.jar "${D}"/usr/share/${TOMCAT_NAME}/lib \
 		|| die "failed to copy"
 
 	cd "${D}/usr/share/${TOMCAT_NAME}/lib"
@@ -137,22 +137,22 @@ src_install() {
 
 	# Copy over webapps, some controlled by use flags
 	cp -p RELEASE-NOTES webapps/ROOT/RELEASE-NOTES.txt
-	cp -pr webapps/ROOT ${D}${CATALINA_BASE}/webapps
+	cp -pr webapps/ROOT "${D}"${CATALINA_BASE}/webapps
 
 	diropts -m755 -o tomcat -g tomcat
 	dodir ${TOMCAT_HOME}/webapps
-	cp -pr webapps/host-manager ${D}${TOMCAT_HOME}/webapps
-	cp -pr webapps/manager ${D}${TOMCAT_HOME}/webapps
+	cp -pr webapps/host-manager "${D}"${TOMCAT_HOME}/webapps
+	cp -pr webapps/manager "${D}"${TOMCAT_HOME}/webapps
 
 	if use doc; then
-		cp -pr output/build/webapps/docs ${D}${CATALINA_BASE}/webapps
+		cp -pr output/build/webapps/docs "${D}"${CATALINA_BASE}/webapps
 	fi
 	if use examples; then
 		cd output/build/webapps/examples/WEB-INF/lib
 		java-pkg_jar-from jakarta-jstl jstl.jar
 		java-pkg_jar-from jakarta-jstl standard.jar
 		cd "${S}"
-		cp -pPr output/build/webapps/examples ${D}${CATALINA_BASE}/webapps
+		cp -pPr output/build/webapps/examples "${D}"${CATALINA_BASE}/webapps
 	fi
 
 	# symlink the directories to make CATALINA_BASE possible
@@ -165,7 +165,7 @@ src_install() {
 	dosym ${TOMCAT_HOME}/webapps/host-manager/META-INF/context.xml /etc/${TOMCAT_NAME}/Catalina/localhost/host-manager.xml
 	dosym ${TOMCAT_HOME}/webapps/manager/META-INF/context.xml /etc/${TOMCAT_NAME}/Catalina/localhost/manager.xml
 
-	dodoc  ${S}/{RELEASE-NOTES,RUNNING.txt}
+	dodoc  "${S}"/{RELEASE-NOTES,RUNNING.txt}
 	fperms 640 /etc/${TOMCAT_NAME}/tomcat-users.xml
 }