Fix tons of quoting errors

Package-Manager: portage-2.1.4_rc12

7 files changed, 102 insertions, 94 deletions

diff --git a/sci-misc/qcad/ChangeLog b/sci-misc/qcad/ChangeLog
index df85de68bfe7..8960487144bc 100644
--- a/sci-misc/qcad/ChangeLog
+++ b/sci-misc/qcad/ChangeLog
@@ -1,10 +1,18 @@
 # ChangeLog for sci-misc/qcad
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/qcad/ChangeLog,v 1.23 2007/08/10 19:43:38 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/qcad/ChangeLog,v 1.24 2007/12/31 19:24:55 je_fro Exp $
+
+  31 Dec 2007; Jeff Gardner <je_fro@gentoo.org> qcad-2.0.4.0-r1.ebuild,
+  qcad-2.0.4.0-r2.ebuild, qcad-2.0.4.0-r3.ebuild, qcad-2.0.4.0-r4.ebuild,
+  qcad-2.0.4.0-r5.ebuild:
+  Fix tons of quoting errors
+
+  31 Dec 2007; Jeff Gardner <je_fro@gentoo.org> ChangeLog:
+  Fix my email address
 
 *qcad-2.0.4.0-r5 (10 Aug 2007)
 
-  10 Aug 2007; <jeff@gentoo.org> +qcad-2.0.4.0-r5.ebuild:
+  10 Aug 2007; <je_fro@gentoo.org> +qcad-2.0.4.0-r5.ebuild:
   Fix make_desktop_entry.
 
   15 Nov 2006; Markus Rothe <corsair@gentoo.org> qcad-2.0.4.0-r3.ebuild:
diff --git a/sci-misc/qcad/Manifest b/sci-misc/qcad/Manifest
index 143c798183f8..c6ee6c1e54bd 100644
--- a/sci-misc/qcad/Manifest
+++ b/sci-misc/qcad/Manifest
@@ -12,30 +12,30 @@ RMD160 131cd2473686ef51326d73f7b2bcddc5b99eedb3 files/qcad-2.0.4.0-1.src-intptr.
 SHA256 0b7c0ee65e369aa46e9b0652b5f83fd1961c38f1fee10e9bf86cc1daa19cb7f1 files/qcad-2.0.4.0-1.src-intptr.patch 1174
 DIST qcad-2.0.4.0-1.src.tar.gz 3169984 RMD160 8fca24b30e89734f12b02a3b131d364a73c590e7 SHA1 50c2d022b1f48649e90df11fc71f5b2d4d63f4a0 SHA256 08c243f790ed1e13d1f7b060e37baad10e7005bf518b746e5a6a190324eeffbe
 DIST qcad-manual-200404.tar.bz2 1648761 RMD160 600e82d5b17502b3d3e1f86f8e267c3e71b8f41f SHA1 e907beb23b3bac2b3cb6ff7f23616454806251c0 SHA256 ee93845b06100e3d43e839b8880e196203810bcc7786a3a91196a07df84e67c6
-EBUILD qcad-2.0.4.0-r1.ebuild 2654 RMD160 b36a956fcbd4ef66ec20d54d9bf77501559b1dd2 SHA1 6e291d8e6a41a4b39dae90e960345671aa3bab98 SHA256 4d1007f818dd5f5e2ae1eca2a26f57c7eec5e8505a6921b3db82f772a5e79ad6
-MD5 c93704f498e05599088e68cbd5d6aa85 qcad-2.0.4.0-r1.ebuild 2654
-RMD160 b36a956fcbd4ef66ec20d54d9bf77501559b1dd2 qcad-2.0.4.0-r1.ebuild 2654
-SHA256 4d1007f818dd5f5e2ae1eca2a26f57c7eec5e8505a6921b3db82f772a5e79ad6 qcad-2.0.4.0-r1.ebuild 2654
-EBUILD qcad-2.0.4.0-r2.ebuild 2697 RMD160 2222260bb254f7924606b98f5a557c068e6b8246 SHA1 9695f7c603cf31f5ddd5d69a53dee0152013637b SHA256 dc9924331fbaeadafaf3ef14a024f2b18790d8ec48cacfd5352169cc93dcc7ba
-MD5 fe7dc4a73866ef30d0f402fdcc50ce49 qcad-2.0.4.0-r2.ebuild 2697
-RMD160 2222260bb254f7924606b98f5a557c068e6b8246 qcad-2.0.4.0-r2.ebuild 2697
-SHA256 dc9924331fbaeadafaf3ef14a024f2b18790d8ec48cacfd5352169cc93dcc7ba qcad-2.0.4.0-r2.ebuild 2697
-EBUILD qcad-2.0.4.0-r3.ebuild 2628 RMD160 c667ac73887a1b979e0bbc4a70315f7d2d9f6bad SHA1 8e5589c117fa019c7a45d1d8e480ed76f9bd600b SHA256 1565e4a0bc8001bfa1845b161dab5253e474944f34bbc9da7e27e64beed24637
-MD5 b186343c350d3766d937d9dbe48cdd36 qcad-2.0.4.0-r3.ebuild 2628
-RMD160 c667ac73887a1b979e0bbc4a70315f7d2d9f6bad qcad-2.0.4.0-r3.ebuild 2628
-SHA256 1565e4a0bc8001bfa1845b161dab5253e474944f34bbc9da7e27e64beed24637 qcad-2.0.4.0-r3.ebuild 2628
-EBUILD qcad-2.0.4.0-r4.ebuild 2743 RMD160 2ea9d8d60181c93ad75b37a860d25b4750367b6c SHA1 7e7568d7ee9bdf042f1aa9622f6eb4ab5f0e3430 SHA256 bacdd7b6b30c4ec4ccdb5900e53fccb4ea53951853ec51f0a0c8bd5bab8c248d
-MD5 9eb374af4efa735296806fa4a764dfc1 qcad-2.0.4.0-r4.ebuild 2743
-RMD160 2ea9d8d60181c93ad75b37a860d25b4750367b6c qcad-2.0.4.0-r4.ebuild 2743
-SHA256 bacdd7b6b30c4ec4ccdb5900e53fccb4ea53951853ec51f0a0c8bd5bab8c248d qcad-2.0.4.0-r4.ebuild 2743
-EBUILD qcad-2.0.4.0-r5.ebuild 2772 RMD160 c5947685cabb715a5f69dc8978926928e602ffb1 SHA1 16d15ff45b3a6c390621841da104e60afbcf0782 SHA256 da2a398c03f5fa35f7a4e73731e96eb0706b3caf46694737da674a2d3e64e752
-MD5 3849a4f2f45a97b7b30ea73214e2a137 qcad-2.0.4.0-r5.ebuild 2772
-RMD160 c5947685cabb715a5f69dc8978926928e602ffb1 qcad-2.0.4.0-r5.ebuild 2772
-SHA256 da2a398c03f5fa35f7a4e73731e96eb0706b3caf46694737da674a2d3e64e752 qcad-2.0.4.0-r5.ebuild 2772
-MISC ChangeLog 7826 RMD160 453d5f9e14107a14d5195cffa9e2deff8826e696 SHA1 3e217186da3d9ffa521488b154ed7717ae77045f SHA256 16cb9e5d7026b8c2915e72aa52712dfcfc58ec8cd93562246552fe8f106f75da
-MD5 d7a56e6c4bdf6085fc762c3c161089f3 ChangeLog 7826
-RMD160 453d5f9e14107a14d5195cffa9e2deff8826e696 ChangeLog 7826
-SHA256 16cb9e5d7026b8c2915e72aa52712dfcfc58ec8cd93562246552fe8f106f75da ChangeLog 7826
+EBUILD qcad-2.0.4.0-r1.ebuild 2676 RMD160 9e8dca79e5ccd9c8af5cb0073d4cba46810ab6c5 SHA1 c53006c2a46103a4a176b427465557c043a49cf9 SHA256 e0105d05dd7896f00b01625ea93cc3305d26a19af015b34ac7fb9de6a999365a
+MD5 29d53495c0a633649bf2f5b9c8828296 qcad-2.0.4.0-r1.ebuild 2676
+RMD160 9e8dca79e5ccd9c8af5cb0073d4cba46810ab6c5 qcad-2.0.4.0-r1.ebuild 2676
+SHA256 e0105d05dd7896f00b01625ea93cc3305d26a19af015b34ac7fb9de6a999365a qcad-2.0.4.0-r1.ebuild 2676
+EBUILD qcad-2.0.4.0-r2.ebuild 2726 RMD160 994220ed3e842bb217b1fddc8a48878307852084 SHA1 9f4abd6850b8ff6e412cecac47514a0fffcc267a SHA256 fc31214766bfeeba5ecb955844dedc4ef30791b953f7786e041880effc3a20d6
+MD5 61b689cbb4d15f6207b42a943af9a00a qcad-2.0.4.0-r2.ebuild 2726
+RMD160 994220ed3e842bb217b1fddc8a48878307852084 qcad-2.0.4.0-r2.ebuild 2726
+SHA256 fc31214766bfeeba5ecb955844dedc4ef30791b953f7786e041880effc3a20d6 qcad-2.0.4.0-r2.ebuild 2726
+EBUILD qcad-2.0.4.0-r3.ebuild 2658 RMD160 5301a3855099e5de36f2835faf70ae458737bc37 SHA1 6c0bc0369f48a09b775011b6ddc6085ad692ac97 SHA256 32333c158c7ec82638c2b973da2452685612d880ce10301061ab42eaccd731b4
+MD5 3d526ba3f03db9e9167bb7b1c72c364b qcad-2.0.4.0-r3.ebuild 2658
+RMD160 5301a3855099e5de36f2835faf70ae458737bc37 qcad-2.0.4.0-r3.ebuild 2658
+SHA256 32333c158c7ec82638c2b973da2452685612d880ce10301061ab42eaccd731b4 qcad-2.0.4.0-r3.ebuild 2658
+EBUILD qcad-2.0.4.0-r4.ebuild 2773 RMD160 399fe081650a1791110b9f8df5707e7f1c4da6ae SHA1 1a87323d2d611802aa294eeaf3d0642bfd80a25b SHA256 5e627325970f4711968c59dc3dd934ae03a6fee58b5fba4c45036492acc38722
+MD5 84d4988f897fab366bded109b9403ea7 qcad-2.0.4.0-r4.ebuild 2773
+RMD160 399fe081650a1791110b9f8df5707e7f1c4da6ae qcad-2.0.4.0-r4.ebuild 2773
+SHA256 5e627325970f4711968c59dc3dd934ae03a6fee58b5fba4c45036492acc38722 qcad-2.0.4.0-r4.ebuild 2773
+EBUILD qcad-2.0.4.0-r5.ebuild 2802 RMD160 de4f4ad3cb4c474146f024bc0521b23fd207d1ee SHA1 a42c0f93efd891158c65f98fa7dfaceec4364e73 SHA256 94c641c76e620a63da21be933c24e29c07dfc40042f8e45701bd6eacd9b798ba
+MD5 99aca65342648d7021c67152ad641b87 qcad-2.0.4.0-r5.ebuild 2802
+RMD160 de4f4ad3cb4c474146f024bc0521b23fd207d1ee qcad-2.0.4.0-r5.ebuild 2802
+SHA256 94c641c76e620a63da21be933c24e29c07dfc40042f8e45701bd6eacd9b798ba qcad-2.0.4.0-r5.ebuild 2802
+MISC ChangeLog 8113 RMD160 251350b2e1d2c56ec9b7c024f6a4d589d8b72e8f SHA1 130e026a23497319bdece2815c1c014360337150 SHA256 c23632d514864c9a69b5123e11063b609365ddbb9618a2a11337a576774e87a6
+MD5 f41053515150f67490cf965807644348 ChangeLog 8113
+RMD160 251350b2e1d2c56ec9b7c024f6a4d589d8b72e8f ChangeLog 8113
+SHA256 c23632d514864c9a69b5123e11063b609365ddbb9618a2a11337a576774e87a6 ChangeLog 8113
 MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 metadata.xml 156
diff --git a/sci-misc/qcad/qcad-2.0.4.0-r1.ebuild b/sci-misc/qcad/qcad-2.0.4.0-r1.ebuild
index 2a45069e2d19..2299708a9c5f 100644
--- a/sci-misc/qcad/qcad-2.0.4.0-r1.ebuild
+++ b/sci-misc/qcad/qcad-2.0.4.0-r1.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/sci-misc/qcad/qcad-2.0.4.0-r1.ebuild,v 1.10 2007/08/10 19:43:38 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r1.ebuild,v 1.11 2007/12/31 19:24:55 je_fro Exp $
 
 inherit kde-functions eutils
 
@@ -24,7 +24,7 @@ need-qt 3.3
 src_unpack() {
 	unpack ${A}
 #	mv doc ${S}/qcad/
-	cd ${S}
+	cd "${S}"
 	echo >> defs.pro "DEFINES += _REENTRANT QT_THREAD_SUPPORT"
 	echo >> defs.pro "CONFIG += thread release"
 	echo >> defs.pro "QMAKE_CFLAGS_RELEASE += ${CFLAGS}"
@@ -33,14 +33,14 @@ src_unpack() {
 		sed -i -e 's~qmake~${QTDIR}/bin/qmake~g' $file || \
 			die "unable to correct path to qmake in $file"
 	done
-	epatch ${FILESDIR}/${MY_P}-gentoo.patch
-	epatch ${FILESDIR}/manual.patch-r1
-	cd ${S}/scripts
+	epatch "${FILESDIR}"/${MY_P}-gentoo.patch
+	epatch "${FILESDIR}"/manual.patch-r1
+	cd "${S}"/scripts
 	sed -i -e 's/^make/make ${MAKEOPTS}/' build_qcad.sh || \
 		die "unable to add MAKEOPTS"
 	sed -i -e 's/^\.\/configure/.\/configure --host=${CHOST}/' build_qcad.sh \
 		|| die "unable to set CHOST"
-	cd ${S}/qcad/src
+	cd "${S}"/qcad/src
 	sed -i -e "s:FULLASSISTANTPATH:${QTDIR}/bin:" qc_applicationwindow.cpp \
 		|| die "sed failed on assistant path"
 	sed -i -e "s:QCADDOCPATH:/usr/share/doc/${PF}:" \
@@ -55,14 +55,14 @@ src_compile() {
 	# this is a fake homedir that is writeable under the sandbox, so that the build process
 	# can do anything it wants with it.
 	REALHOME="$HOME"
-	mkdir -p $T/fakehome/.kde
-	mkdir -p $T/fakehome/.qt
+	mkdir -p "$T"/fakehome/.kde
+	mkdir -p "$T"/fakehome/.qt
 	export HOME="$T/fakehome"
 	# things that should access the real homedir
 	[ -d "$REALHOME/.ccache" ] && ln -sf "$REALHOME/.ccache" "$HOME/"
 	cd scripts
 	sh build_qcad.sh || die "build failed"
-	if ! test -f ${S}/qcad/qcad; then
+	if ! test -f "${S}"/qcad/qcad; then
 		die "no binary created, build failed"
 	fi
 }
@@ -75,13 +75,13 @@ src_install () {
 	chmod ugo+rx qcad
 	dobin qcad
 	dodir /usr/share/${P}
-	cp -pPR patterns examples fonts qm ${D}/usr/share/${P}
+	cp -pPR patterns examples fonts qm "${D}"/usr/share/${P}
 	cd ..
 	dodoc README
 	if use doc; then
 		insinto /usr/share/doc/${PF}/
-		cd ${WORKDIR}
-		cp -pPR qcaddoc.adp cad ${D}usr/share/doc/${PF}
+		cd "${WORKDIR}"
+		cp -pPR qcaddoc.adp cad "${D}"usr/share/doc/${PF}
 	fi
 	make_desktop_entry ${PN} ${PN} ${PN} Office
 }
diff --git a/sci-misc/qcad/qcad-2.0.4.0-r2.ebuild b/sci-misc/qcad/qcad-2.0.4.0-r2.ebuild
index 25877240b722..9f8dfaff062b 100644
--- a/sci-misc/qcad/qcad-2.0.4.0-r2.ebuild
+++ b/sci-misc/qcad/qcad-2.0.4.0-r2.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/sci-misc/qcad/qcad-2.0.4.0-r2.ebuild,v 1.5 2007/08/10 19:43:38 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r2.ebuild,v 1.6 2007/12/31 19:24:55 je_fro Exp $
 
 inherit kde-functions eutils
 
@@ -24,8 +24,8 @@ need-qt 3.3
 src_unpack() {
 	unpack ${A}
 	# Bug 112864 - fix dir unpack bug
-	touch ${WORKDIR}
-	cd ${S}
+	touch "${WORKDIR}"
+	cd "${S}"
 	echo >> defs.pro "DEFINES += _REENTRANT QT_THREAD_SUPPORT"
 	echo >> defs.pro "CONFIG += thread release"
 	echo >> defs.pro "QMAKE_CFLAGS_RELEASE += ${CFLAGS}"
@@ -34,14 +34,14 @@ src_unpack() {
 		sed -i -e 's~qmake~${QTDIR}/bin/qmake~g' $file || \
 			die "unable to correct path to qmake in $file"
 	done
-	epatch ${FILESDIR}/${MY_P}-gentoo.patch
-	epatch ${FILESDIR}/manual.patch-r1
-	cd ${S}/scripts
+	epatch "${FILESDIR}"/${MY_P}-gentoo.patch
+	epatch "${FILESDIR}"/manual.patch-r1
+	cd "${S}"/scripts
 	sed -i -e 's/^make/make ${MAKEOPTS}/' build_qcad.sh || \
 		die "unable to add MAKEOPTS"
 	sed -i -e 's/^\.\/configure/.\/configure --host=${CHOST}/' build_qcad.sh \
 		|| die "unable to set CHOST"
-	cd ${S}/qcad/src
+	cd "${S}"/qcad/src
 	sed -i -e "s:FULLASSISTANTPATH:${QTDIR}/bin:" qc_applicationwindow.cpp \
 		|| die "sed failed on assistant path"
 	sed -i -e "s:QCADDOCPATH:/usr/share/doc/${PF}:" \
@@ -56,14 +56,14 @@ src_compile() {
 	# this is a fake homedir that is writeable under the sandbox, so that the build process
 	# can do anything it wants with it.
 	REALHOME="$HOME"
-	mkdir -p $T/fakehome/.kde
-	mkdir -p $T/fakehome/.qt
-	export HOME="$T/fakehome"
+	mkdir -p "${T}"/fakehome/.kde
+	mkdir -p "${T}"fakehome/.qt
+	export HOME="${T}/fakehome"
 	# things that should access the real homedir
 	[ -d "$REALHOME/.ccache" ] && ln -sf "$REALHOME/.ccache" "$HOME/"
 	cd scripts
 	sh build_qcad.sh || die "build failed"
-	if ! test -f ${S}/qcad/qcad; then
+	if ! test -f "${S}"/qcad/qcad; then
 		die "no binary created, build failed"
 	fi
 }
@@ -76,13 +76,13 @@ src_install () {
 	chmod ugo+rx qcad
 	dobin qcad
 	dodir /usr/share/${P}
-	cp -pPR patterns examples fonts qm ${D}/usr/share/${P}
+	cp -pPR patterns examples fonts qm "${D}"/usr/share/${P}
 	cd ..
 	dodoc README
 	if use doc; then
 		insinto /usr/share/doc/${PF}/
-		cd ${WORKDIR}
-		cp -pPR qcaddoc.adp cad ${D}usr/share/doc/${PF}
+		cd "${WORKDIR}"
+		cp -pPR qcaddoc.adp cad "${D}"usr/share/doc/${PF}
 	fi
 	make_desktop_entry ${PN} ${PN} ${PN} Office
 }
diff --git a/sci-misc/qcad/qcad-2.0.4.0-r3.ebuild b/sci-misc/qcad/qcad-2.0.4.0-r3.ebuild
index 902f637996e1..5bf0740324ac 100644
--- a/sci-misc/qcad/qcad-2.0.4.0-r3.ebuild
+++ b/sci-misc/qcad/qcad-2.0.4.0-r3.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/sci-misc/qcad/qcad-2.0.4.0-r3.ebuild,v 1.11 2007/08/10 19:43:38 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r3.ebuild,v 1.12 2007/12/31 19:24:55 je_fro Exp $
 
 inherit kde-functions eutils
 
@@ -24,8 +24,8 @@ need-qt 3.3
 src_unpack() {
 	unpack ${A}
 	# Bug 112864 - fix dir unpack bug
-	touch ${WORKDIR}
-	cd ${S}
+	touch "${WORKDIR}"
+	cd "${S}"
 	echo >> defs.pro "DEFINES += _REENTRANT QT_THREAD_SUPPORT"
 	echo >> defs.pro "CONFIG += thread release"
 	echo >> defs.pro "QMAKE_CFLAGS_RELEASE += ${CFLAGS}"
@@ -34,15 +34,15 @@ src_unpack() {
 		sed -i -e 's~qmake~${QTDIR}/bin/qmake~g' $file || \
 			die "unable to correct path to qmake in $file"
 	done
-	epatch ${FILESDIR}/${MY_P}-gentoo.patch
-	epatch ${FILESDIR}/manual.patch-r1
-	epatch ${FILESDIR}/${MY_P}-intptr.patch
-	cd ${S}/scripts
+	epatch "${FILESDIR}"/${MY_P}-gentoo.patch
+	epatch "${FILESDIR}"/manual.patch-r1
+	epatch "${FILESDIR}"/${MY_P}-intptr.patch
+	cd "${S}"/scripts
 	sed -i -e 's/^make/make ${MAKEOPTS}/' build_qcad.sh || \
 		die "unable to add MAKEOPTS"
 	sed -i -e 's/^\.\/configure/.\/configure --host=${CHOST}/' build_qcad.sh \
 		|| die "unable to set CHOST"
-	cd ${S}/qcad/src
+	cd "${S}"/qcad/src
 	sed -i -e "s:FULLASSISTANTPATH:${QTDIR}/bin:" qc_applicationwindow.cpp \
 		|| die "sed failed on assistant path"
 	sed -i -e "s:QCADDOCPATH:/usr/share/doc/${PF}:" \
@@ -57,14 +57,14 @@ src_compile() {
 	# this is a fake homedir that is writeable under the sandbox, so that the build process
 	# can do anything it wants with it.
 	REALHOME="$HOME"
-	mkdir -p $T/fakehome/.kde
-	mkdir -p $T/fakehome/.qt
+	mkdir -p "${T}"/fakehome/.kde
+	mkdir -p "${T}"/fakehome/.qt
 	export HOME="$T/fakehome"
 	# things that should access the real homedir
 	[ -d "$REALHOME/.ccache" ] && ln -sf "$REALHOME/.ccache" "$HOME/"
 	cd scripts
 	sh build_qcad.sh || die "build failed"
-	if ! test -f ${S}/qcad/qcad; then
+	if ! test -f "${S}"/qcad/qcad; then
 		die "no binary created, build failed"
 	fi
 }
@@ -73,13 +73,13 @@ src_install () {
 	cd qcad
 	dobin qcad
 	dodir /usr/share/${P}
-	cp -pPR patterns examples fonts qm ${D}/usr/share/${P}
+	cp -pPR patterns examples fonts qm "${D}"/usr/share/${P}
 	cd ..
 	dodoc README
 	if use doc; then
 		insinto /usr/share/doc/${PF}/
-		cd ${WORKDIR}
-		cp -pPR qcaddoc.adp cad ${D}usr/share/doc/${PF}
+		cd "${WORKDIR}"
+		cp -pPR qcaddoc.adp cad "${D}"usr/share/doc/${PF}
 	fi
 	make_desktop_entry ${PN} ${PN} ${PN} Office
 }
diff --git a/sci-misc/qcad/qcad-2.0.4.0-r4.ebuild b/sci-misc/qcad/qcad-2.0.4.0-r4.ebuild
index d2252449cb6a..c94ebf99b089 100644
--- a/sci-misc/qcad/qcad-2.0.4.0-r4.ebuild
+++ b/sci-misc/qcad/qcad-2.0.4.0-r4.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/sci-misc/qcad/qcad-2.0.4.0-r4.ebuild,v 1.3 2007/08/10 19:43:38 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r4.ebuild,v 1.4 2007/12/31 19:24:55 je_fro Exp $
 
 inherit kde-functions eutils
 
@@ -24,8 +24,8 @@ need-qt 3.3
 src_unpack() {
 	unpack ${A}
 	# Bug 112864 - fix dir unpack bug
-	touch ${WORKDIR}
-	cd ${S}
+	touch "${WORKDIR}"
+	cd "${S}"
 	echo >> defs.pro "DEFINES += _REENTRANT QT_THREAD_SUPPORT"
 	echo >> defs.pro "CONFIG += thread release"
 	echo >> defs.pro "QMAKE_CFLAGS_RELEASE += ${CFLAGS}"
@@ -34,15 +34,15 @@ src_unpack() {
 		sed -i -e 's~qmake~${QTDIR}/bin/qmake~g' $file || \
 			die "unable to correct path to qmake in $file"
 	done
-	epatch ${FILESDIR}/${MY_P}-gentoo.patch
-	epatch ${FILESDIR}/manual.patch-r1
-	epatch ${FILESDIR}/${MY_P}-intptr.patch
-	cd ${S}/scripts
+	epatch "${FILESDIR}"/${MY_P}-gentoo.patch
+	epatch "${FILESDIR}"/manual.patch-r1
+	epatch "${FILESDIR}"/${MY_P}-intptr.patch
+	cd "${S}"/scripts
 	sed -i -e 's/^make/make ${MAKEOPTS}/' build_qcad.sh || \
 		die "unable to add MAKEOPTS"
 	sed -i -e 's/^\.\/configure/.\/configure --host=${CHOST}/' build_qcad.sh \
 		|| die "unable to set CHOST"
-	cd ${S}/qcad/src
+	cd "${S}"/qcad/src
 	sed -i -e "s:FULLASSISTANTPATH:${QTDIR}/bin:" qc_applicationwindow.cpp \
 		|| die "sed failed on assistant path"
 	sed -i -e "s:QCADDOCPATH:/usr/share/doc/${PF}:" \
@@ -57,14 +57,14 @@ src_compile() {
 	# this is a fake homedir that is writeable under the sandbox, so that the build process
 	# can do anything it wants with it.
 	REALHOME="$HOME"
-	mkdir -p $T/fakehome/.kde
-	mkdir -p $T/fakehome/.qt
+	mkdir -p "${T}"/fakehome/.kde
+	mkdir -p "${T}"/fakehome/.qt
 	export HOME="$T/fakehome"
 	# things that should access the real homedir
 	[ -d "$REALHOME/.ccache" ] && ln -sf "$REALHOME/.ccache" "$HOME/"
 	cd scripts
 	sh build_qcad.sh || die "build failed"
-	if ! test -f ${S}/qcad/qcad; then
+	if ! test -f "${S}"/qcad/qcad; then
 		die "no binary created, build failed"
 	fi
 }
@@ -77,13 +77,13 @@ src_install () {
 	chmod ugo+rx qcad
 	dobin qcad
 	dodir /usr/share/${P}
-	cp -pPR patterns examples fonts qm ${D}/usr/share/${P}
+	cp -pPR patterns examples fonts qm "${D}"/usr/share/${P}
 	cd ..
 	dodoc README
 	if use doc; then
 		insinto /usr/share/doc/${PF}/
-		cd ${WORKDIR}
-		cp -pPR qcaddoc.adp cad ${D}usr/share/doc/${PF}
+		cd "${WORKDIR}"
+		cp -pPR qcaddoc.adp cad "${D}"usr/share/doc/${PF}
 	fi
 	make_desktop_entry ${PN} ${PN} ${PN} Office
 }
diff --git a/sci-misc/qcad/qcad-2.0.4.0-r5.ebuild b/sci-misc/qcad/qcad-2.0.4.0-r5.ebuild
index e625cb868902..a73257d00b5f 100644
--- a/sci-misc/qcad/qcad-2.0.4.0-r5.ebuild
+++ b/sci-misc/qcad/qcad-2.0.4.0-r5.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/sci-misc/qcad/qcad-2.0.4.0-r5.ebuild,v 1.1 2007/08/10 19:43:38 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r5.ebuild,v 1.2 2007/12/31 19:24:55 je_fro Exp $
 
 inherit kde-functions eutils
 
@@ -24,8 +24,8 @@ need-qt 3.3
 src_unpack() {
 	unpack ${A}
 	# Bug 112864 - fix dir unpack bug
-	touch ${WORKDIR}
-	cd ${S}
+	touch "${WORKDIR}"
+	cd "${S}"
 	echo >> defs.pro "DEFINES += _REENTRANT QT_THREAD_SUPPORT"
 	echo >> defs.pro "CONFIG += thread release"
 	echo >> defs.pro "QMAKE_CFLAGS_RELEASE += ${CFLAGS}"
@@ -34,15 +34,15 @@ src_unpack() {
 		sed -i -e 's~qmake~${QTDIR}/bin/qmake~g' $file || \
 			die "unable to correct path to qmake in $file"
 	done
-	epatch ${FILESDIR}/${MY_P}-gentoo.patch
-	epatch ${FILESDIR}/manual.patch-r1
-	epatch ${FILESDIR}/${MY_P}-intptr.patch
-	cd ${S}/scripts
+	epatch "${FILESDIR}"/${MY_P}-gentoo.patch
+	epatch "${FILESDIR}"/manual.patch-r1
+	epatch "${FILESDIR}"/${MY_P}-intptr.patch
+	cd "${S}"/scripts
 	sed -i -e 's/^make/make ${MAKEOPTS}/' build_qcad.sh || \
 		die "unable to add MAKEOPTS"
 	sed -i -e 's/^\.\/configure/.\/configure --host=${CHOST}/' build_qcad.sh \
 		|| die "unable to set CHOST"
-	cd ${S}/qcad/src
+	cd "${S}"/qcad/src
 	sed -i -e "s:FULLASSISTANTPATH:${QTDIR}/bin:" qc_applicationwindow.cpp \
 		|| die "sed failed on assistant path"
 	sed -i -e "s:QCADDOCPATH:/usr/share/doc/${PF}:" \
@@ -57,14 +57,14 @@ src_compile() {
 	# this is a fake homedir that is writeable under the sandbox, so that the build process
 	# can do anything it wants with it.
 	REALHOME="$HOME"
-	mkdir -p $T/fakehome/.kde
-	mkdir -p $T/fakehome/.qt
+	mkdir -p "${T}"/fakehome/.kde
+	mkdir -p "${T}"/fakehome/.qt
 	export HOME="$T/fakehome"
 	# things that should access the real homedir
 	[ -d "$REALHOME/.ccache" ] && ln -sf "$REALHOME/.ccache" "$HOME/"
 	cd scripts
 	sh build_qcad.sh || die "build failed"
-	if ! test -f ${S}/qcad/qcad; then
+	if ! test -f "${S}"/qcad/qcad; then
 		die "no binary created, build failed"
 	fi
 }
@@ -77,14 +77,14 @@ src_install () {
 	chmod ugo+rx qcad
 	dobin qcad
 	dodir /usr/share/${P}
-	cp -pPR patterns examples fonts qm ${D}/usr/share/${P}
+	cp -pPR patterns examples fonts qm "${D}"/usr/share/${P}
 	doicon src/xpm/${PN}.xpm
 	make_desktop_entry ${PN} QCad ${PN}.xpm Office
 	cd ..
 	dodoc README
 	if use doc; then
 		insinto /usr/share/doc/${PF}/
-		cd ${WORKDIR}
-		cp -pPR qcaddoc.adp cad ${D}usr/share/doc/${PF}
+		cd "${WORKDIR}"
+		cp -pPR qcaddoc.adp cad "${D}"usr/share/doc/${PF}
 	fi
 }