Fix tons of quoting errors

(Portage version: 2.1.4_rc12)

6 files changed, 78 insertions, 70 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/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
 }