x86; quote parameterized strings

(Portage version: 2.0.54)

3 files changed, 27 insertions, 52 deletions

diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog
index a2e412635a0c..0832862dc9a9 100644
--- a/net-proxy/squid/ChangeLog
+++ b/net-proxy/squid/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-proxy/squid
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.64 2006/02/07 21:43:40 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.65 2006/03/06 21:19:19 mrness Exp $
+
+  06 Mar 2006; Alin Nastac <mrness@gentoo.org> squid-2.5.12-r1.ebuild:
+  Stable on x86.
 
   07 Feb 2006; Simon Stelling <blubb@gentoo.org> squid-2.5.12.ebuild:
   stable on amd64
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index 9909c93b418c..c37f4790b515 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -1,42 +1,14 @@
 MD5 accdcd64e23824d869f02b660cb0be76 ChangeLog 25246
-RMD160 80fac6077a89386af39c50b29075d7845bfb1c01 ChangeLog 25246
-SHA256 b47d6b1ac0aa818087c86cf0fe777020eebafd50bc7f8fe68273fec69e3523a7 ChangeLog 25246
 MD5 9aae33d4872e127be17e8a1bc587c2a7 files/digest-squid-2.5.11 157
-RMD160 c334003b5aae7976cd195c7d53d649c350fa97ee files/digest-squid-2.5.11 157
-SHA256 0e2ccc11ae92d8033fc5b7f8c00e94213c33db557a8408840cfb2b6f0a7a0370 files/digest-squid-2.5.11 157
 MD5 3e02deef24558936110d58663433ace3 files/digest-squid-2.5.12 157
-RMD160 6cdf8c7e01c3c4b9b0cfb79c13fc147d273e078a files/digest-squid-2.5.12 157
-SHA256 fd500578b39805ddd276ad03746e706ad8d60020a906c24aca96780e80bd4b62 files/digest-squid-2.5.12 157
 MD5 5d6f903d6b8e8bbcd6fd6f93b8db5986 files/digest-squid-2.5.12-r1 157
-RMD160 b025814cb267fc22faceb925723b928a30fcc140 files/digest-squid-2.5.12-r1 157
-SHA256 99a17a9f9c8ff0597b736af8d151993c169f2bd6767369ab33d54f2e01c6d20b files/digest-squid-2.5.12-r1 157
 MD5 8e7207b10699502e573d9d60ff0e07a6 files/squid.confd 437
-RMD160 8fdfc1416b2f5aaa2964affc25e5fb140f6555c5 files/squid.confd 437
-SHA256 d90a92f886764f56fd928ec3340da078a8ff35576a8339fa91b1ce59d0d02a34 files/squid.confd 437
 MD5 6f30a7f5c48ec35a7044acb189c858c5 files/squid.cron 133
-RMD160 f1ecb5957645deea4cd1ecedbf808172ee8330a6 files/squid.cron 133
-SHA256 e3522246629d51381313db1632e083b1df06d1caee9790d4345f2b9f1ba05210 files/squid.cron 133
 MD5 29c067429711e7189923fcfc522000b3 files/squid.initd 2015
-RMD160 c3aeee9fa6da941ce0bb8eed5b451949f07476f7 files/squid.initd 2015
-SHA256 3211f0f1a17aa5e4bf7e1c5177b1e48d5d75b185f0bcbf5cec0e70d33380b2ff files/squid.initd 2015
 MD5 59d7ba17075734a74e527151edef9075 files/squid.initd-logrotate 1909
-RMD160 879def42ae96e802e271fb232c960c8b40c16be3 files/squid.initd-logrotate 1909
-SHA256 21a177768d9c260ca9748b49474072e8c1cb5e18ec80833c36db43e6dc0003a3 files/squid.initd-logrotate 1909
 MD5 5286e7e73ca5687381fa09ff41dccbd1 files/squid.logrotate 101
-RMD160 57f6c2461bd8948524dc08c2665593234380891e files/squid.logrotate 101
-SHA256 29e97214612a8656d2d2d60e20451f9e23a9550e58a7af2050bf83fb7af485f6 files/squid.logrotate 101
 MD5 2957ca0ec8bf84e4af8ed5adef7acb90 files/squid.pam 315
-RMD160 ff8a56fd5e8d4e0fde70853162a757476f3b7893 files/squid.pam 315
-SHA256 dec9bd5ea16977fa334db04eb657e0598af411dad7ff279acf86beddcd22a8fd files/squid.pam 315
 MD5 cf398556bce540358644ce9a452abfba metadata.xml 241
-RMD160 f966fc130df3c4340939cfbc501781ec74c5ab02 metadata.xml 241
-SHA256 f00eeb2aa39f141db6914b1e6d6da77c278225c70276e3bd9fbb13ee34080b08 metadata.xml 241
 MD5 e134f5c38aadc2fd333ac8b006dbc252 squid-2.5.11.ebuild 6389
-RMD160 30c6c69d4dea0b1d84c29baa52a30e812b03b591 squid-2.5.11.ebuild 6389
-SHA256 03166c62e586a6b3792ac8e9e6e1617e3f8e1d8d72396578f463d70540e571b6 squid-2.5.11.ebuild 6389
-MD5 1b95dc2beca2cfd9149d02f87f9e6c41 squid-2.5.12-r1.ebuild 6719
-RMD160 1a994695d188d7cc14eadf81aa8d54d90b0931f7 squid-2.5.12-r1.ebuild 6719
-SHA256 d216127b942632f27274ba5bde3ee24a29bcd08fa890b8b1358b5c2a86c3021f squid-2.5.12-r1.ebuild 6719
+MD5 64efb5e676306c70a208df61785cd1de squid-2.5.12-r1.ebuild 6760
 MD5 ac886689f2b0bcdeb4a449ff6069541f squid-2.5.12.ebuild 6412
-RMD160 4eddd2fa8934291b6dd5f8cf360be2ff84f6e713 squid-2.5.12.ebuild 6412
-SHA256 5707e3d96515e6259761bae3f7ee61ff0c65e73dff47e558674c22b3a794e684 squid-2.5.12.ebuild 6412
diff --git a/net-proxy/squid/squid-2.5.12-r1.ebuild b/net-proxy/squid/squid-2.5.12-r1.ebuild
index e9ee5a5c2940..d44fb0d75338 100644
--- a/net-proxy/squid/squid-2.5.12-r1.ebuild
+++ b/net-proxy/squid/squid-2.5.12-r1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-2.5.12-r1.ebuild,v 1.1 2006/01/24 18:15:02 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-2.5.12-r1.ebuild,v 1.2 2006/03/06 21:19:19 mrness Exp $
 
 inherit eutils pam toolchain-funcs flag-o-matic
 
 #lame archive versioning scheme..
-S_PV=${PV%.*}
-S_PL=${PV##*.}
-S_PL=${S_PL/_rc/-RC}
-S_PP=${PN}-${S_PV}.STABLE${S_PL}
+S_PV="${PV%.*}"
+S_PL="${PV##*.}"
+S_PL="${S_PL/_rc/-RC}"
+S_PP="${PN}-${S_PV}.STABLE${S_PL}"
 PATCH_VERSION="20060124"
 
 DESCRIPTION="A caching web proxy, with advanced features"
@@ -16,11 +16,9 @@ HOMEPAGE="http://www.squid-cache.org/"
 SRC_URI="http://www.squid-cache.org/Versions/v2/${S_PV}/${S_PP}.tar.gz
 	mirror://gentoo/${S_PP}-patches-${PATCH_VERSION}.tar.gz"
 
-S=${WORKDIR}/${S_PP}
-
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="pam ldap ssl sasl snmp debug selinux underscores logrotate customlog zero-penalty-hit follow-xff"
 
 RDEPEND="pam? ( virtual/pam )
@@ -31,6 +29,8 @@ RDEPEND="pam? ( virtual/pam )
 	!mips? ( logrotate? ( app-admin/logrotate ) )"
 DEPEND="${RDEPEND} dev-lang/perl"
 
+S="${WORKDIR}/${S_PP}"
+
 pkg_setup() {
 	enewgroup squid 31
 	enewuser squid 31 -1 /var/cache/squid squid
@@ -38,14 +38,14 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A} || die "unpack failed"
-	cd ${S} || die "dir ${S} not found"
+	cd "${S}" || die "dir ${S} not found"
 
 	# Do bulk patching from squids bug fix list as well as our patches
-	use customlog || rm ${WORKDIR}/patch/9*customlog*
-	use zero-penalty-hit || rm ${WORKDIR}/patch/9*ToS_Hit*
-	use follow-xff || rm ${WORKDIR}/patch/9*follow_xff*
+	use customlog || rm "${WORKDIR}"/patch/9*customlog*
+	use zero-penalty-hit || rm "${WORKDIR}"/patch/9*ToS_Hit*
+	use follow-xff || rm "${WORKDIR}"/patch/9*follow_xff*
 	EPATCH_SUFFIX="patch"
-	epatch ${WORKDIR}/patch
+	epatch "${WORKDIR}/patch"
 
 	#hmm #10865
 	sed -i -e 's%^\(LINK =.*\)\(-o.*\)%\1\$(XTRA_LIBS) \2%' \
@@ -111,8 +111,8 @@ src_compile() {
 		--enable-auth="basic,digest,ntlm" \
 		--enable-removal-policies="lru,heap" \
 		--enable-digest-auth-helpers="password" \
-		--enable-basic-auth-helpers=${basic_modules} \
-		--enable-external-acl-helpers=${ext_helpers} \
+		--enable-basic-auth-helpers="${basic_modules}" \
+		--enable-external-acl-helpers="${ext_helpers}" \
 		--enable-ntlm-auth-helpers="SMB,fakeauth,no_check,winbind" \
 		--enable-linux-netfilter \
 		--enable-ident-lookups \
@@ -144,7 +144,7 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die "make install failed"
 
 	#--enable-icmp
 	#make -C src install-pinger libexecdir=${D}/usr/lib/squid || die
@@ -152,13 +152,13 @@ src_install() {
 	#chmod 4750 ${D}/usr/lib/squid/pinger
 
 	#need suid root for looking into /etc/shadow
-	chown root:squid ${D}/usr/lib/squid/ncsa_auth
-	chown root:squid ${D}/usr/lib/squid/pam_auth
-	chmod 4750 ${D}/usr/lib/squid/ncsa_auth
-	chmod 4750 ${D}/usr/lib/squid/pam_auth
+	fowners root:squid /usr/lib/squid/ncsa_auth
+	fowners root:squid /usr/lib/squid/pam_auth
+	fperms 4750 /usr/lib/squid/ncsa_auth
+	fperms 4750 /usr/lib/squid/pam_auth
 
 	#some clean ups
-	rm -f ${D}/usr/bin/Run*
+	rm -f "${D}"/usr/bin/Run*
 
 	#simply switch this symlink to choose the desired language..
 	dosym /usr/lib/squid/errors/English /etc/squid/errors
@@ -183,7 +183,7 @@ src_install() {
 		newexe "${FILESDIR}/squid.cron" squid.cron
 	fi
 
-	rm -rf ${D}/var
+	rm -rf "${D}"/var
 	diropts -m0755 -o squid -g squid
 	keepdir /var/cache/squid /var/log/squid
 }