Fix variable quoting. resin-3.0.22 will be removed soon, so it was not fixed.

Package-Manager: portage-2.1.3.12

5 files changed, 90 insertions, 86 deletions

diff --git a/www-servers/resin/ChangeLog b/www-servers/resin/ChangeLog
index debd30b5f5ab..7568220031eb 100644
--- a/www-servers/resin/ChangeLog
+++ b/www-servers/resin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-servers/resin
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.54 2007/10/08 12:39:49 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.55 2007/10/08 12:51:15 nelchael Exp $
+
+  08 Oct 2007; Krzysiek Pawlik <nelchael@gentoo.org> resin-2.1.17.ebuild,
+  resin-3.0.24.ebuild, resin-3.1.2.ebuild:
+  Fix variable quoting.
 
   08 Oct 2007; Krzysiek Pawlik <nelchael@gentoo.org> resin-3.1.2.ebuild:
   Raise maximum memory to 384m, see bug #194860.
diff --git a/www-servers/resin/Manifest b/www-servers/resin/Manifest
index d37ed4756ae0..70149f24de7b 100644
--- a/www-servers/resin/Manifest
+++ b/www-servers/resin/Manifest
@@ -57,26 +57,26 @@ DIST resin-2.1.17.tar.gz 3239401 RMD160 5fcf2e7680bfad1531cf75d384dcd8f15c19f639
 DIST resin-3.0.22-src.tar.gz 5467522 RMD160 093cdcfa8bcd14a30ff54cc9cb8001ace10bbfc6 SHA1 23d4f2fd233033adb0b08f8fcdcb81a1f0aab3fe SHA256 0da5617b6867a0d40e59d2dfe2518158567506fea2c1273d56290c146a64849a
 DIST resin-3.0.24-src.zip 10688883 RMD160 84aeee1482ac41d4e596c6800c7ab72c3a448d54 SHA1 76e40d628b662d1b64a8ae4772b7140b0eeaed54 SHA256 d7862e12245f5620dd198bdf10e3c5486fe6bd6262bdf0be3a7bb29280e70a1c
 DIST resin-3.1.2-src.zip 13317024 RMD160 33989f69c6d757fe5cf4ea50077f503fc68e98d1 SHA1 643fb194f6762b273131ea63a0e66ab9ca283bb0 SHA256 3e56d9437091597b7d0bf6523254b753733533dbfbb4160af21b1cadf793d081
-EBUILD resin-2.1.17.ebuild 2692 RMD160 0232cdd890d7a737c054adaa3e75f5495010c10a SHA1 f7cac0fe9e64b79adba3570fee3af8e1ad2abbdb SHA256 d24ddd63f3a728cf8b03af0745eb0580e5baf5e9b9d4ada6646a5f173c6fcf1e
-MD5 bf58f83bd839b688857fd2bd18009a6f resin-2.1.17.ebuild 2692
-RMD160 0232cdd890d7a737c054adaa3e75f5495010c10a resin-2.1.17.ebuild 2692
-SHA256 d24ddd63f3a728cf8b03af0745eb0580e5baf5e9b9d4ada6646a5f173c6fcf1e resin-2.1.17.ebuild 2692
+EBUILD resin-2.1.17.ebuild 2704 RMD160 7b1f3b711c566ef25afd27175087dfa504383b48 SHA1 8d119c890b48634872068c7de52b563bce80c62d SHA256 809961945e47d16a6c3d8c087dbd717a550b253febc7093ff573ccc9e23cc945
+MD5 0dc9d09531e2440e0915c697d24dc058 resin-2.1.17.ebuild 2704
+RMD160 7b1f3b711c566ef25afd27175087dfa504383b48 resin-2.1.17.ebuild 2704
+SHA256 809961945e47d16a6c3d8c087dbd717a550b253febc7093ff573ccc9e23cc945 resin-2.1.17.ebuild 2704
 EBUILD resin-3.0.22.ebuild 3667 RMD160 21cb66b4aec9bd3994f88e766f4313dcab708753 SHA1 0f4281f5d5da4a811de841138a5ead36074f945f SHA256 c3e4842b8790fc78c48bb1ef86bd8d4d7b242281d24e032975ea8e51b1a1f1d7
 MD5 650987afe69c1660efb6d2f8146b596a resin-3.0.22.ebuild 3667
 RMD160 21cb66b4aec9bd3994f88e766f4313dcab708753 resin-3.0.22.ebuild 3667
 SHA256 c3e4842b8790fc78c48bb1ef86bd8d4d7b242281d24e032975ea8e51b1a1f1d7 resin-3.0.22.ebuild 3667
-EBUILD resin-3.0.24.ebuild 3774 RMD160 5b4dc1aa9c9367335f80ed5f9ad3ed25122e8796 SHA1 3f76e990cb6b2453b5e8a20d5d6b8985a53db570 SHA256 dc1de6d196ca3457ddb1dea2e9477f87c29f1dc989716c7f013a693c0630955c
-MD5 dd1c0044e3bc21aa08b50441df7d86d8 resin-3.0.24.ebuild 3774
-RMD160 5b4dc1aa9c9367335f80ed5f9ad3ed25122e8796 resin-3.0.24.ebuild 3774
-SHA256 dc1de6d196ca3457ddb1dea2e9477f87c29f1dc989716c7f013a693c0630955c resin-3.0.24.ebuild 3774
-EBUILD resin-3.1.2.ebuild 3636 RMD160 28358d40da51de5a69d3a4be707865a1cb4d34bd SHA1 a7653543d1ef0adc004c627d68456c4294992c4e SHA256 09d81fa1cc4792e95574761b84c7df1e59f05a2f6582583b103f7cf274830959
-MD5 060fa9e0f0af63d1831992f8be8dc0f4 resin-3.1.2.ebuild 3636
-RMD160 28358d40da51de5a69d3a4be707865a1cb4d34bd resin-3.1.2.ebuild 3636
-SHA256 09d81fa1cc4792e95574761b84c7df1e59f05a2f6582583b103f7cf274830959 resin-3.1.2.ebuild 3636
-MISC ChangeLog 11287 RMD160 f2d275b6a58595f193c07bded3fe0205b0444112 SHA1 428f158d916eee9c531f01c65825a61932130bf4 SHA256 2a2f0b1f354df68e7410cff3f3b071277d56b08f211048769fdabd867e84ce41
-MD5 544f048c631821ea65b2b5246cfc614d ChangeLog 11287
-RMD160 f2d275b6a58595f193c07bded3fe0205b0444112 ChangeLog 11287
-SHA256 2a2f0b1f354df68e7410cff3f3b071277d56b08f211048769fdabd867e84ce41 ChangeLog 11287
+EBUILD resin-3.0.24.ebuild 3835 RMD160 862af164c24ea906d69daf5b0c4eb7c4e97040e8 SHA1 ef88fcf3c72068cd67383e4c452c64d5281d8b04 SHA256 d8644f9c1312dc199164ddf7408a2abb016b8e80c254356bf5cd4bec8645976d
+MD5 0a76900c94026fd3519a31ccd2fce1d6 resin-3.0.24.ebuild 3835
+RMD160 862af164c24ea906d69daf5b0c4eb7c4e97040e8 resin-3.0.24.ebuild 3835
+SHA256 d8644f9c1312dc199164ddf7408a2abb016b8e80c254356bf5cd4bec8645976d resin-3.0.24.ebuild 3835
+EBUILD resin-3.1.2.ebuild 3698 RMD160 e5df5fc3d382b53923906b0796b8375ebbebff46 SHA1 3f1e5986d32513cb2e94eab2279239244c093a7d SHA256 fc3ae14446401256650e7d1b44c12567e8e2263980587d4d6b329f6cc92b2d34
+MD5 3818e906d7b8f5180c36f6258f36fa78 resin-3.1.2.ebuild 3698
+RMD160 e5df5fc3d382b53923906b0796b8375ebbebff46 resin-3.1.2.ebuild 3698
+SHA256 fc3ae14446401256650e7d1b44c12567e8e2263980587d4d6b329f6cc92b2d34 resin-3.1.2.ebuild 3698
+MISC ChangeLog 11429 RMD160 729178a511b2b8dac070f3f383700a7129d92926 SHA1 3e3f0c3c12993fbfa3f9eba4118522256987e17d SHA256 99302c3536d53409e439a367442c6fd2916e90edf6752f644c62c789b82e039b
+MD5 e482866dc96b097c4b606c5996e04ff5 ChangeLog 11429
+RMD160 729178a511b2b8dac070f3f383700a7129d92926 ChangeLog 11429
+SHA256 99302c3536d53409e439a367442c6fd2916e90edf6752f644c62c789b82e039b ChangeLog 11429
 MISC metadata.xml 229 RMD160 a9b4042458f9aae459c108c2917745af68bd1d45 SHA1 087c10f53259e3702a47b6c43c4365fd16d8c201 SHA256 79bb370ed491d8c5f4c42086fcbd3affc893943b56254f98b5a9c9f369792884
 MD5 2696a2548331ef205bf10abad6802180 metadata.xml 229
 RMD160 a9b4042458f9aae459c108c2917745af68bd1d45 metadata.xml 229
@@ -96,7 +96,7 @@ SHA256 fa0fd17591fb94b90a16268874a84d0dcc6ad57ecd417a804207c1b9f23b0f4f files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHCiUego/w9rxVVVERAiUxAJ47/jWyYCmlgEvi7iV8OhIw1bTHIACfZY4b
-PGbEgloQZkORwEwW71BaggM=
-=6bBY
+iD4DBQFHCifNgo/w9rxVVVERAgNtAKC8lnUp0+Kyk1Gk0G+0AOh/DrRqEgCXQL3u
+wm154KzcvzRet6B9XHDyRQ==
+=RKe5
 -----END PGP SIGNATURE-----
diff --git a/www-servers/resin/resin-2.1.17.ebuild b/www-servers/resin/resin-2.1.17.ebuild
index fc5fd382f9c1..c797f881648b 100644
--- a/www-servers/resin/resin-2.1.17.ebuild
+++ b/www-servers/resin/resin-2.1.17.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/resin/resin-2.1.17.ebuild,v 1.6 2007/04/21 20:49:17 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-2.1.17.ebuild,v 1.7 2007/10/08 12:51:15 nelchael Exp $
 
 inherit java-pkg eutils
 
@@ -17,20 +17,20 @@ IUSE=""
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PV}/${PN}.diff
+	cd "${S}"
+	epatch "${FILESDIR}/${PV}/${PN}.diff"
 }
 
 pkg_preinst() {
 	enewgroup resin
 	enewuser resin -1 /bin/bash /opt/resin resin
-	chown -R resin:resin ${D}/opt/resin
-	chown -R resin:resin ${D}/var/log/${PN}
+	chown -R resin:resin "${D}/opt/resin"
+	chown -R resin:resin "${D}/var/log/${PN}"
 }
 src_compile() {	:; }
 
 src_install() {
-	cd ${S}
+	cd "${S}"
 	RESIN_HOME="/opt/resin"
 	diropts -m0755
 
@@ -57,7 +57,7 @@ src_install() {
 		contrib \
 		webapps \
 		xsl \
-	${D}${RESIN_HOME} || die
+	"${D}${RESIN_HOME}" || die
 	dosym /usr/share/${PN}/lib ${RESIN_HOME}/lib
 }
 
diff --git a/www-servers/resin/resin-3.0.24.ebuild b/www-servers/resin/resin-3.0.24.ebuild
index 60ce03ab5d94..9244a3a61d7a 100644
--- a/www-servers/resin/resin-3.0.24.ebuild
+++ b/www-servers/resin/resin-3.0.24.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/resin/resin-3.0.24.ebuild,v 1.3 2007/09/19 19:05:00 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-3.0.24.ebuild,v 1.4 2007/10/08 12:51:15 nelchael Exp $
 
 JAVA_PKG_IUSE="doc source"
 
@@ -54,22 +54,22 @@ src_compile() {
 
 	append-flags -fPIC -DPIC
 
-	chmod 755 ${S}/configure
+	chmod 755 "${S}/configure"
 	econf --prefix=${RESIN_HOME} || die "econf failed"
 
 	einfo "Building libraries..."
 	# Broken with -jn where n > 1
 	emake -j1 || die "emake failed"
 
-	mkdir ${S}/lib
-	cd ${S}/lib
+	mkdir "${S}/lib"
+	cd "${S}/lib"
 	java-pkg_jar-from sun-jaf
 	java-pkg_jar-from sun-javamail
 	java-pkg_jar-from iso-relax
 	java-pkg_jar-from aopalliance-1
 	java-pkg_jar-from resin-servlet-api-2.4
 	ln -s $(java-config --jdk-home)/lib/tools.jar
-	cd ${S}
+	cd "${S}"
 
 	einfo "Building jars..."
 	eant || die "ant failed"
@@ -83,10 +83,10 @@ src_compile() {
 
 src_install() {
 
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die
 
 	dodir /etc/
-	mv ${D}/${RESIN_HOME}/conf ${D}/etc/resin
+	mv "${D}/${RESIN_HOME}/conf" "${D}/etc/resin"
 	dosym /etc/resin ${RESIN_HOME}/conf
 
 	keepdir /var/log/resin
@@ -98,43 +98,43 @@ src_install() {
 
 	dodoc README
 
-	newinitd ${FILESDIR}/${PV}/resin.init resin
-	newconfd ${FILESDIR}/${PV}/resin.conf resin
+	newinitd "${FILESDIR}/${PV}/resin.init" resin
+	newconfd "${FILESDIR}/${PV}/resin.conf" resin
 
-	rm -f ${S}/lib/tools.jar
-	java-pkg_dojar ${S}/lib/*.jar
-	rm -fr ${D}/${RESIN_HOME}/lib
+	rm -f "${S}/lib/tools.jar"
+	java-pkg_dojar "${S}"/lib/*.jar
+	rm -fr "${D}/${RESIN_HOME}/lib"
 	dosym /usr/share/resin/lib ${RESIN_HOME}/lib
 
 	dodir /var/lib/resin/webapps
-	mv ${D}/${RESIN_HOME}/webapps/* ${D}/var/lib/resin/webapps
-	rm -rf ${D}/${RESIN_HOME}/webapps
+	mv "${D}"/${RESIN_HOME}/webapps/* "${D}/var/lib/resin/webapps"
+	rm -rf "${D}/${RESIN_HOME}/webapps"
 	dosym /var/lib/resin/webapps ${RESIN_HOME}/webapps
 
 	dosym /etc/resin/resin.conf /etc/resin/resin.xml
 
 	use source && {
 		einfo "Zipping source..."
-		java-pkg_dosrc ${S}/modules/*/src/* 2> /dev/null
+		java-pkg_dosrc "${S}"/modules/*/src/* 2> /dev/null
 	}
 
 	einfo "Removing unneeded files..."
-	rm -f ${D}/${RESIN_HOME}/bin/*.in
-	rm -f ${D}/etc/resin/*.orig
+	rm -f "${D}"/${RESIN_HOME}/bin/*.in
+	rm -f "${D}"/etc/resin/*.orig
 
 	einfo "Fixing permissions..."
-	chown -R resin:resin ${D}${RESIN_HOME}
-	chown -R resin:resin ${D}/etc/resin
-	chown -R resin:resin ${D}/var/log/resin
-	chown -R resin:resin ${D}/var/lib/resin
-	chown -R resin:resin ${D}/var/run/resin
-
-	chmod 755 ${D}${RESIN_HOME}/bin/*
-	chmod 644 ${D}/etc/conf.d/resin
-	chmod 755 ${D}/etc/init.d/resin
-	chmod 750 ${D}/var/lib/resin
-	chmod 750 ${D}/var/run/resin
-	chmod 750 ${D}/etc/resin
+	chown -R resin:resin "${D}${RESIN_HOME}"
+	chown -R resin:resin "${D}/etc/resin"
+	chown -R resin:resin "${D}/var/log/resin"
+	chown -R resin:resin "${D}/var/lib/resin"
+	chown -R resin:resin "${D}/var/run/resin"
+
+	chmod 755 "${D}${RESIN_HOME}"/bin/*
+	chmod 644 "${D}/etc/conf.d/resin"
+	chmod 755 "${D}/etc/init.d/resin"
+	chmod 750 "${D}/var/lib/resin"
+	chmod 750 "${D}/var/run/resin"
+	chmod 750 "${D}/etc/resin"
 
 }
 
diff --git a/www-servers/resin/resin-3.1.2.ebuild b/www-servers/resin/resin-3.1.2.ebuild
index ad64f023c76e..452f49c0add8 100644
--- a/www-servers/resin/resin-3.1.2.ebuild
+++ b/www-servers/resin/resin-3.1.2.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/resin/resin-3.1.2.ebuild,v 1.2 2007/10/08 12:39:49 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-3.1.2.ebuild,v 1.3 2007/10/08 12:51:15 nelchael Exp $
 
 JAVA_PKG_IUSE="doc source"
 
@@ -56,22 +56,22 @@ src_compile() {
 
 	append-flags -fPIC -DPIC
 
-	chmod 755 ${S}/configure
+	chmod 755 "${S}/configure"
 	econf --prefix=${RESIN_HOME} || die "econf failed"
 
 	einfo "Building libraries..."
 	# Broken with -jn where n > 1
 	emake -j1 || die "emake failed"
 
-	mkdir ${S}/lib
-	cd ${S}/lib
+	mkdir "${S}/lib"
+	cd "${S}/lib"
 	java-pkg_jar-from sun-jaf
 	java-pkg_jar-from sun-javamail
 	java-pkg_jar-from iso-relax
 	java-pkg_jar-from aopalliance-1
 	java-pkg_jar-from resin-servlet-api-2.5 resin-servlet-api.jar jsdk-15.jar
 	ln -s $(java-config --jdk-home)/lib/tools.jar
-	cd ${S}
+	cd "${S}"
 
 	einfo "Building jars..."
 	eant || die "ant failed"
@@ -85,10 +85,10 @@ src_compile() {
 
 src_install() {
 
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die
 
 	dodir /etc/
-	mv ${D}/${RESIN_HOME}/conf ${D}/etc/resin
+	mv "${D}/${RESIN_HOME}/conf" "${D}/etc/resin"
 	dosym /etc/resin ${RESIN_HOME}/conf
 
 	keepdir /var/log/resin
@@ -98,49 +98,49 @@ src_install() {
 	dosym /var/log/resin ${RESIN_HOME}/logs
 	dosym /var/log/resin ${RESIN_HOME}/log
 
-	dodoc README ${S}/conf/*.conf
+	dodoc README "${S}"/conf/*.conf
 
-	newinitd ${FILESDIR}/${PV}/resin.init resin
-	newconfd ${FILESDIR}/${PV}/resin.conf resin
+	newinitd "${FILESDIR}/${PV}/resin.init" resin
+	newconfd "${FILESDIR}/${PV}/resin.conf" resin
 
-	rm -f ${S}/lib/tools.jar
-	java-pkg_dojar ${S}/lib/*.jar
-	rm -fr ${D}/${RESIN_HOME}/lib
+	rm -f "${S}/lib/tools.jar"
+	java-pkg_dojar "${S}"/lib/*.jar
+	rm -fr "${D}/${RESIN_HOME}/lib"
 	dosym /usr/share/resin/lib ${RESIN_HOME}/lib
 	keepdir /usr/share/resin/log
 
 	dodir /var/lib/resin/webapps
-	mv ${D}/${RESIN_HOME}/webapps/* ${D}/var/lib/resin/webapps
-	rm -rf ${D}/${RESIN_HOME}/webapps
+	mv "${D}"/${RESIN_HOME}/webapps/* "${D}/var/lib/resin/webapps"
+	rm -rf "${D}/${RESIN_HOME}/webapps"
 	dosym /var/lib/resin/webapps ${RESIN_HOME}/webapps
 
 	dosym /etc/resin/resin.conf /etc/resin/resin.xml
 
 	use admin && {
-		cp -a ${S}/php ${D}/${RESIN_HOME}/ || die "cp failed"
+		cp -a "${S}/php" "${D}/${RESIN_HOME}/" || die "cp failed"
 	}
 
 	use source && {
 		einfo "Zipping source..."
-		java-pkg_dosrc ${S}/modules/*/src/* 2> /dev/null
+		java-pkg_dosrc "${S}"/modules/*/src/* 2> /dev/null
 	}
 
 	einfo "Removing unneeded files..."
-	rm -fr ${D}/${RESIN_HOME}/bin
-	rm -f ${D}/etc/resin/*.orig
+	rm -fr "${D}/${RESIN_HOME}/bin"
+	rm -f "${D}"/etc/resin/*.orig
 
 	einfo "Fixing permissions..."
-	chown -R resin:resin ${D}${RESIN_HOME}
-	chown -R resin:resin ${D}/etc/resin
-	chown -R resin:resin ${D}/var/log/resin
-	chown -R resin:resin ${D}/var/lib/resin
-	chown -R resin:resin ${D}/var/run/resin
-
-	chmod 644 ${D}/etc/conf.d/resin
-	chmod 755 ${D}/etc/init.d/resin
-	chmod 750 ${D}/var/lib/resin
-	chmod 750 ${D}/var/run/resin
-	chmod 750 ${D}/etc/resin
+	chown -R resin:resin "${D}${RESIN_HOME}"
+	chown -R resin:resin "${D}/etc/resin"
+	chown -R resin:resin "${D}/var/log/resin"
+	chown -R resin:resin "${D}/var/lib/resin"
+	chown -R resin:resin "${D}/var/run/resin"
+
+	chmod 644 "${D}/etc/conf.d/resin"
+	chmod 755 "${D}/etc/init.d/resin"
+	chmod 750 "${D}/var/lib/resin"
+	chmod 750 "${D}/var/run/resin"
+	chmod 750 "${D}/etc/resin"
 
 }