fix quoting to a lot of patch calls

68 files changed, 92 insertions, 93 deletions

diff --git a/app-admin/procinfo-ng/procinfo-ng-2.0.304-r1.ebuild b/app-admin/procinfo-ng/procinfo-ng-2.0.304-r1.ebuild
index 6dca06bfb69b..7f723d87ff84 100644
--- a/app-admin/procinfo-ng/procinfo-ng-2.0.304-r1.ebuild
+++ b/app-admin/procinfo-ng/procinfo-ng-2.0.304-r1.ebuild
@@ -24,10 +24,10 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	"${FILESDIR}"/${P}-as-needed.patch
 	"${FILESDIR}"/${P}-man.patch
-	)
+)
 
 src_prepare() {
-	epatch ${PATCHES[@]}
+	epatch "${PATCHES[@]}"
 	# removing -s flag as portage does the stripping part and add support
 	# for custom LDFLAGS. Plus correct for --as-needed
 	sed \
diff --git a/app-benchmarks/acovea/acovea-5.1.1-r1.ebuild b/app-benchmarks/acovea/acovea-5.1.1-r1.ebuild
index 1e8c42409b34..4e296d80bd27 100644
--- a/app-benchmarks/acovea/acovea-5.1.1-r1.ebuild
+++ b/app-benchmarks/acovea/acovea-5.1.1-r1.ebuild
@@ -30,7 +30,7 @@ src_prepare() {
 		"${FILESDIR}"/${P}-underlinking.patch
 
 	if has_version ">=dev-libs/libevocosm-3.3.0"; then
-		epatch ${FILESDIR}"/${P}-libevocosm.patch"
+		epatch "${FILESDIR}"/${P}-libevocosm.patch
 	fi
 
 	eautomake
diff --git a/app-benchmarks/acovea/acovea-5.1.1.ebuild b/app-benchmarks/acovea/acovea-5.1.1.ebuild
index 55ec6e4cf165..f60d06355836 100644
--- a/app-benchmarks/acovea/acovea-5.1.1.ebuild
+++ b/app-benchmarks/acovea/acovea-5.1.1.ebuild
@@ -29,7 +29,7 @@ src_prepare() {
 		"${FILESDIR}"/${P}-glibc-212.patch
 
 	if has_version ">=dev-libs/libevocosm-3.3.0"; then
-		epatch ${FILESDIR}"/${P}-libevocosm.patch"
+		epatch "${FILESDIR}"/${P}-libevocosm.patch
 	fi
 
 	eautomake
diff --git a/app-dicts/wordnet/wordnet-3.0-r4.ebuild b/app-dicts/wordnet/wordnet-3.0-r4.ebuild
index c23524b5ba54..0a5853b71646 100644
--- a/app-dicts/wordnet/wordnet-3.0-r4.ebuild
+++ b/app-dicts/wordnet/wordnet-3.0-r4.ebuild
@@ -40,8 +40,9 @@ PATCHES=(
 	"${FILESDIR}"/${P}-format-security.patch
 	"${FILESDIR}"/${P}-src_stubs_c.patch
 )
+
 src_prepare() {
-	epatch ${PATCHES[@]}
+	epatch "${PATCHES[@]}"
 	# Don't install all the extra docs (html, pdf, ps) without doc USE flag.
 	if ! use doc; then
 		sed -i -e "s:SUBDIRS =.*:SUBDIRS = man:" doc/Makefile.am || die
diff --git a/app-dicts/wordnet/wordnet-3.0-r5.ebuild b/app-dicts/wordnet/wordnet-3.0-r5.ebuild
index e3018e460a13..14c3929d0fa6 100644
--- a/app-dicts/wordnet/wordnet-3.0-r5.ebuild
+++ b/app-dicts/wordnet/wordnet-3.0-r5.ebuild
@@ -44,7 +44,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	epatch ${PATCHES[@]}
+	epatch "${PATCHES[@]}"
 	eapply_user
 
 	# Don't install all the extra docs (html, pdf, ps) without doc USE flag.
diff --git a/app-laptop/ibam/ibam-0.5.2-r3.ebuild b/app-laptop/ibam/ibam-0.5.2-r3.ebuild
index 21db0e9f2c42..894658ba68a8 100644
--- a/app-laptop/ibam/ibam-0.5.2-r3.ebuild
+++ b/app-laptop/ibam/ibam-0.5.2-r3.ebuild
@@ -34,8 +34,8 @@ src_prepare() {
 		"${WORKDIR}"/${PN}_${PV}-${PATCH_LEVEL}.diff
 
 	local f
-	for f in `find . -name '*.dpatch'`; do
-		epatch ${f}
+	for f in $(find . -name '*.dpatch'); do
+		epatch "${f}"
 	done
 }
 
diff --git a/app-office/texmacs/texmacs-1.99.2-r1.ebuild b/app-office/texmacs/texmacs-1.99.2-r1.ebuild
index 1803cf4b9329..596e147aaa30 100644
--- a/app-office/texmacs/texmacs-1.99.2-r1.ebuild
+++ b/app-office/texmacs/texmacs-1.99.2-r1.ebuild
@@ -56,7 +56,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	epatch ${PATCHES[@]}
+	epatch "${PATCHES[@]}"
 
 	mv configure.{in,ac} || die
 
diff --git a/app-office/texstudio/texstudio-2.10.8.ebuild b/app-office/texstudio/texstudio-2.10.8.ebuild
index bdf22a040401..0e4f4b172ad3 100644
--- a/app-office/texstudio/texstudio-2.10.8.ebuild
+++ b/app-office/texstudio/texstudio-2.10.8.ebuild
@@ -59,7 +59,7 @@ S="${WORKDIR}"/${P/-/}
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.6.4-hunspell-quazip.patch
 	"${FILESDIR}"/${PN}-2.10.6-desktop.patch
-	)
+)
 
 src_prepare() {
 	find hunspell quazip utilities/poppler-data qtsingleapplication -delete || die
@@ -82,7 +82,7 @@ src_prepare() {
 	cp "${FILESDIR}"/texmakerx_my.pri ${PN}.pri || die
 	eprefixify ${PN}.pri
 
-	epatch ${PATCHES[@]}
+	epatch "${PATCHES[@]}"
 }
 
 src_configure() {
diff --git a/app-text/cmigemo/cmigemo-1.3c.ebuild b/app-text/cmigemo/cmigemo-1.3c.ebuild
index 0821d28aa8f0..cb981f17682d 100644
--- a/app-text/cmigemo/cmigemo-1.3c.ebuild
+++ b/app-text/cmigemo/cmigemo-1.3c.ebuild
@@ -21,7 +21,7 @@ RDEPEND="app-dicts/migemo-dict
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${PN}-1.2-migemo-dict.diff
+	epatch "${FILESDIR}"/${PN}-1.2-migemo-dict.diff
 	touch ${S}/dict/SKK-JISYO.L
 
 	# Bug #246953
diff --git a/app-text/htmlinc/htmlinc-1.0_beta1.ebuild b/app-text/htmlinc/htmlinc-1.0_beta1.ebuild
index 59f6850d7686..45fd45f2ae0c 100644
--- a/app-text/htmlinc/htmlinc-1.0_beta1.ebuild
+++ b/app-text/htmlinc/htmlinc-1.0_beta1.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/htmlinc
 
 src_unpack() {
 	unpack ${A}
-	epatch ${FILESDIR}/htmlinc-gcc3-gentoo.patch
+	epatch "${FILESDIR}"/htmlinc-gcc3-gentoo.patch
 }
 
 src_compile() {
diff --git a/app-text/info2html/info2html-2.0.ebuild b/app-text/info2html/info2html-2.0.ebuild
index d81b205df614..6f2a61d25c71 100644
--- a/app-text/info2html/info2html-2.0.ebuild
+++ b/app-text/info2html/info2html-2.0.ebuild
@@ -23,7 +23,7 @@ src_unpack() {
 
 	# filter user-provided data to prevent cross-frame/site scripting attacks
 	# bug #91354 (fix from Werner Fink)
-	epatch ${FILESDIR}/info2html-2.0-xss.patch
+	epatch "${FILESDIR}"/info2html-2.0-xss.patch
 
 	# Fixup INFODIR for paths in /etc/profile.env INFOPATH
 	infos=$(grep "^export INFOPATH=" /etc/profile.env | tail -n 1 |\
diff --git a/app-text/uudeview/uudeview-0.5.20-r2.ebuild b/app-text/uudeview/uudeview-0.5.20-r2.ebuild
index 596469621671..a6b645bf3c59 100644
--- a/app-text/uudeview/uudeview-0.5.20-r2.ebuild
+++ b/app-text/uudeview/uudeview-0.5.20-r2.ebuild
@@ -30,7 +30,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	epatch ${PATCHES[@]}
+	epatch "${PATCHES[@]}"
 
 	mv configure.in configure.ac || die
 
diff --git a/dev-db/freetds/freetds-0.91-r1.ebuild b/dev-db/freetds/freetds-0.91-r1.ebuild
index 868c23521774..7b4c4d80058f 100644
--- a/dev-db/freetds/freetds-0.91-r1.ebuild
+++ b/dev-db/freetds/freetds-0.91-r1.ebuild
@@ -25,7 +25,7 @@ RDEPEND="${DEPEND}"
 src_prepare() {
 	config_rpath_update
 	sed -ie 's:with_iodbc/include":with_iodbc/include/iodbc":' configure.ac || die
-	epatch ${FILESDIR}/freetds-0.91-fix_field_aliases.patch
+	epatch "${FILESDIR}"/freetds-0.91-fix_field_aliases.patch
 	eautoreconf
 }
 
diff --git a/dev-java/freemarker/freemarker-2.3.13-r2.ebuild b/dev-java/freemarker/freemarker-2.3.13-r2.ebuild
index fe9e4adec64b..b012abf10496 100644
--- a/dev-java/freemarker/freemarker-2.3.13-r2.ebuild
+++ b/dev-java/freemarker/freemarker-2.3.13-r2.ebuild
@@ -47,7 +47,7 @@ java_prepare() {
 	java-pkg_clean
 
 	# Apply patches.
-	epatch ${PATCHES[@]}
+	epatch "${PATCHES[@]}"
 
 	# Weed out comments (some contain UTF-8 chars javac cannnot deal with).
 	sed -i -e '/*/d;' \
diff --git a/dev-java/gnu-hylafax/gnu-hylafax-1.0.3-r2.ebuild b/dev-java/gnu-hylafax/gnu-hylafax-1.0.3-r2.ebuild
index 04bfbb815c71..ebfbb6697d6f 100644
--- a/dev-java/gnu-hylafax/gnu-hylafax-1.0.3-r2.ebuild
+++ b/dev-java/gnu-hylafax/gnu-hylafax-1.0.3-r2.ebuild
@@ -36,9 +36,8 @@ JAVA_GENTOO_CLASSPATH="
 
 S="${WORKDIR}/${P}"
 
-# bug 546502
 PATCHES=(
-	"${FILESDIR}"/"${P}"-ClientPool.patch
+	"${FILESDIR}"/"${P}"-ClientPool.patch #546502
 )
 
 java_prepare() {
@@ -48,6 +47,5 @@ java_prepare() {
 	# tarball contains the same sources in gnu-.../sources and gnu-.../main/
 	rm -r gnu-hylafax-*/sources || die
 
-	epatch ${PATCHES[@]}
-
+	epatch "${PATCHES[@]}"
 }
diff --git a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1.ebuild b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1.ebuild
index a511edf66938..b132b4634872 100644
--- a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1.ebuild
+++ b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1.ebuild
@@ -48,7 +48,7 @@ PATCHES=(
 
 java_prepare() {
 	cp "${FILESDIR}"/${P}-build.xml build.xml || die
-	epatch ${PATCHES[@]}
+	epatch "${PATCHES[@]}"
 }
 
 EANT_TEST_GENTOO_CLASSPATH="
diff --git a/dev-java/jung/jung-1.7.6.ebuild b/dev-java/jung/jung-1.7.6.ebuild
index cde5e76072aa..ec7cf854723f 100644
--- a/dev-java/jung/jung-1.7.6.ebuild
+++ b/dev-java/jung/jung-1.7.6.ebuild
@@ -32,7 +32,7 @@ PATCHES=( "${FILESDIR}/${P}-build.xml.patch" )
 S="${WORKDIR}/src"
 
 java_prepare() {
-	epatch ${PATCHES}
+	epatch "${PATCHES[@]}"
 	rm -R doc/*
 	find "${WORKDIR}" -iname '*.jar' -delete
 	find "${WORKDIR}" -iname '*.class' -delete
diff --git a/dev-java/jusb/jusb-0.4.4-r1.ebuild b/dev-java/jusb/jusb-0.4.4-r1.ebuild
index 80aca1eac76e..129ff2bcbae2 100644
--- a/dev-java/jusb/jusb-0.4.4-r1.ebuild
+++ b/dev-java/jusb/jusb-0.4.4-r1.ebuild
@@ -40,9 +40,9 @@ src_unpack() {
 	# The struct usbdevfs_ctrltransfer is different
 	# in latest 2.4 and 2.6 kernels. This patch is
 	# to make jusb compile on 2.6 kernels
-	! kernel_is 2 4 && epatch ${FILESDIR}/${P}-native.patch
+	! kernel_is 2 4 && epatch "${FILESDIR}"/${P}-native.patch
 
-	epatch ${FILESDIR}/${P}-makefile.patch
+	epatch "${FILESDIR}"/${P}-makefile.patch
 
 	sed -i \
 		-e 's#-shared#-shared -Wl,-soname=libjusb.so#' \
diff --git a/dev-lang/ferite/ferite-1.1.17-r1.ebuild b/dev-lang/ferite/ferite-1.1.17-r1.ebuild
index 1bd7daee9cca..e09d103ce87f 100644
--- a/dev-lang/ferite/ferite-1.1.17-r1.ebuild
+++ b/dev-lang/ferite/ferite-1.1.17-r1.ebuild
@@ -21,7 +21,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	epatch ${FILESDIR}/ferite-pcre.patch || die
+	epatch "${FILESDIR}"/ferite-pcre.patch
 
 	# use docsdir variable, install to DESTDIR
 	sed \
diff --git a/dev-libs/libmcal/libmcal-0.7-r5.ebuild b/dev-libs/libmcal/libmcal-0.7-r5.ebuild
index 1255038a7a18..b6cf67120ac4 100644
--- a/dev-libs/libmcal/libmcal-0.7-r5.ebuild
+++ b/dev-libs/libmcal/libmcal-0.7-r5.ebuild
@@ -28,10 +28,10 @@ src_unpack() {
 		sed -e 's|/var/calendar|/var/spool/calendar|g' -i ${i}
 	done
 	cd ${S}
-	epatch ${FILESDIR}/${P}-fpic.patch
-	epatch ${FILESDIR}/${P}-libdir.patch
-	epatch ${FILESDIR}/${P}-gcc4.patch
-	epatch ${FILESDIR}/${P}-flexfix.patch
+	epatch "${FILESDIR}"/${P}-fpic.patch
+	epatch "${FILESDIR}"/${P}-libdir.patch
+	epatch "${FILESDIR}"/${P}-gcc4.patch
+	epatch "${FILESDIR}"/${P}-flexfix.patch
 }
 
 src_compile() {
diff --git a/dev-libs/log4sh/log4sh-1.2.5-r1.ebuild b/dev-libs/log4sh/log4sh-1.2.5-r1.ebuild
index 599ee52a5910..7e60feefb5b8 100644
--- a/dev-libs/log4sh/log4sh-1.2.5-r1.ebuild
+++ b/dev-libs/log4sh/log4sh-1.2.5-r1.ebuild
@@ -18,7 +18,7 @@ RDEPEND="app-shells/bash"
 src_unpack() {
 	unpack ${A} && cd ${S}
 	# bug 94069
-	epatch ${FILESDIR}/${P}-fix-insecure-tmp-creation.diff
+	epatch "${FILESDIR}"/${P}-fix-insecure-tmp-creation.diff
 }
 
 src_test() {
diff --git a/dev-tcltk/tcllib/tcllib-1.15-r2.ebuild b/dev-tcltk/tcllib/tcllib-1.15-r2.ebuild
index bae6bdacca6c..0bb3250ec477 100644
--- a/dev-tcltk/tcllib/tcllib-1.15-r2.ebuild
+++ b/dev-tcltk/tcllib/tcllib-1.15-r2.ebuild
@@ -33,7 +33,7 @@ PATCHES=(
 src_prepare() {
 	has_version ">=dev-lang/tcl-8.6" && \
 		PATCHES+=( "${FILESDIR}"/${P}-test.patch )
-	epatch ${PATCHES[@]}
+	epatch "${PATCHES[@]}"
 }
 
 src_test() {
diff --git a/dev-tcltk/tcllib/tcllib-1.16.ebuild b/dev-tcltk/tcllib/tcllib-1.16.ebuild
index 22a176ca6d6e..e3a80903dd7f 100644
--- a/dev-tcltk/tcllib/tcllib-1.16.ebuild
+++ b/dev-tcltk/tcllib/tcllib-1.16.ebuild
@@ -33,7 +33,7 @@ PATCHES=( "${FILESDIR}"/${P}-XSS-vuln.patch )
 src_prepare() {
 	has_version ">=dev-lang/tcl-8.6" && \
 		PATCHES+=( "${FILESDIR}"/${P}-test.patch )
-	epatch ${PATCHES[@]}
+	epatch "${PATCHES[@]}"
 
 	sed \
 		-e '/testsNeedTcl/s:8.5:8.6:g' \
diff --git a/dev-tcltk/tclpython/tclpython-4.1-r4.ebuild b/dev-tcltk/tclpython/tclpython-4.1-r4.ebuild
index 0600d171fede..62c604091c21 100644
--- a/dev-tcltk/tclpython/tclpython-4.1-r4.ebuild
+++ b/dev-tcltk/tclpython/tclpython-4.1-r4.ebuild
@@ -28,7 +28,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	epatch ${PATCHES[@]}
+	epatch "${PATCHES[@]}"
 }
 
 src_compile() {
diff --git a/dev-tcltk/tclpython/tclpython-4.1-r6.ebuild b/dev-tcltk/tclpython/tclpython-4.1-r6.ebuild
index ffa764f951c1..810a4504a82d 100644
--- a/dev-tcltk/tclpython/tclpython-4.1-r6.ebuild
+++ b/dev-tcltk/tclpython/tclpython-4.1-r6.ebuild
@@ -29,7 +29,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	epatch ${PATCHES[@]}
+	epatch "${PATCHES[@]}"
 }
 
 src_compile() {
diff --git a/dev-util/dropwatch/dropwatch-1.4-r1.ebuild b/dev-util/dropwatch/dropwatch-1.4-r1.ebuild
index 077335fd44bb..122c404c8a8f 100644
--- a/dev-util/dropwatch/dropwatch-1.4-r1.ebuild
+++ b/dev-util/dropwatch/dropwatch-1.4-r1.ebuild
@@ -28,7 +28,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	epatch ${PATCHES[@]}
+	epatch "${PATCHES[@]}"
 	epatch_user
 }
 
diff --git a/eclass/bzr.eclass b/eclass/bzr.eclass
index 9b457f2b6d77..3d88960accac 100644
--- a/eclass/bzr.eclass
+++ b/eclass/bzr.eclass
@@ -290,13 +290,13 @@ bzr_bootstrap() {
 
 		for patch in ${EBZR_PATCHES} ; do
 			if [[ -f ${patch} ]] ; then
-				epatch ${patch}
+				epatch "${patch}"
 			else
 				# This loop takes care of wildcarded patches given via
 				# EBZR_PATCHES in an ebuild
 				for lpatch in "${FILESDIR}"/${patch} ; do
 					if [[ -f ${lpatch} ]] ; then
-						epatch ${lpatch}
+						epatch "${lpatch}"
 					else
 						die "${EBZR}: ${patch} is not found"
 					fi
diff --git a/games-rpg/mana/mana-0.6.1.ebuild b/games-rpg/mana/mana-0.6.1.ebuild
index 35833ae71d7b..24297b0ffb08 100644
--- a/games-rpg/mana/mana-0.6.1.ebuild
+++ b/games-rpg/mana/mana-0.6.1.ebuild
@@ -41,10 +41,10 @@ PATCHES=(
 	"${FILESDIR}"/${P}-Fix-missing-virtual-destructors-and-guichan-use.patch
 	"${FILESDIR}"/${P}-Trick-gcc-into-importing-C99-stdint.h-when-C-11-is-n.patch
 	"${FILESDIR}"/${P}-Import-cstdint-for-int64_t.patch
-	)
+)
 
 src_prepare() {
-	epatch ${PATCHES[@]}
+	epatch "${PATCHES[@]}"
 	epatch_user
 
 	if [[ ${LINGUAS+set} ]]; then
diff --git a/media-libs/emfengine/emfengine-0.8.ebuild b/media-libs/emfengine/emfengine-0.8.ebuild
index 7a66797fdfc6..75adac382c73 100644
--- a/media-libs/emfengine/emfengine-0.8.ebuild
+++ b/media-libs/emfengine/emfengine-0.8.ebuild
@@ -32,11 +32,11 @@ PATCHES=(
 	"${FILESDIR}/0.7-config.patch"
 	"${FILESDIR}/0.7-header.patch"
 	"${FILESDIR}"/${PV}-example.patch
-	)
+)
 
 src_prepare() {
 	edos2unix EmfEngine.pro
-	epatch ${PATCHES[@]}
+	epatch "${PATCHES[@]}"
 	sed \
 		-e "s:/usr/local/lib/libEMF.a:-lEMF:g" \
 		-e "s:/usr/local/include:${EPREFIX}/usr/include/:g" \
diff --git a/media-sound/audicle/audicle-1.0.0.7-r1.ebuild b/media-sound/audicle/audicle-1.0.0.7-r1.ebuild
index acaf33a16503..2e8c0861bbb6 100644
--- a/media-sound/audicle/audicle-1.0.0.7-r1.ebuild
+++ b/media-sound/audicle/audicle-1.0.0.7-r1.ebuild
@@ -40,7 +40,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	epatch ${PATCHES[@]}
+	epatch "${PATCHES[@]}"
 
 	sed -i \
 		-e 's@../ftgl_lib/FTGL/include@/usr/include/FTGL@' \
diff --git a/net-analyzer/poink/poink-2.03.ebuild b/net-analyzer/poink/poink-2.03.ebuild
index 356775514c51..73c493f824c9 100644
--- a/net-analyzer/poink/poink-2.03.ebuild
+++ b/net-analyzer/poink/poink-2.03.ebuild
@@ -15,7 +15,7 @@ DEPEND=""
 
 src_unpack() {
 	unpack ${A}
-	epatch ${FILESDIR}/${PN}-2.03-signed-char-fixup.patch
+	epatch "${FILESDIR}"/${PN}-2.03-signed-char-fixup.patch
 }
 
 src_compile() {
diff --git a/net-analyzer/sslsniff/sslsniff-0.8-r2.ebuild b/net-analyzer/sslsniff/sslsniff-0.8-r2.ebuild
index 998780d7849d..34cc8f65c72a 100644
--- a/net-analyzer/sslsniff/sslsniff-0.8-r2.ebuild
+++ b/net-analyzer/sslsniff/sslsniff-0.8-r2.ebuild
@@ -30,7 +30,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	epatch ${PATCHES[@]}
+	epatch "${PATCHES[@]}"
 	epatch_user
 
 	eautoreconf
diff --git a/net-fs/samba/samba-4.2.11.ebuild b/net-fs/samba/samba-4.2.11.ebuild
index 7422b295428b..a06ae87c4baa 100644
--- a/net-fs/samba/samba-4.2.11.ebuild
+++ b/net-fs/samba/samba-4.2.11.ebuild
@@ -120,7 +120,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch ${PATCHES[@]}
+	epatch "${PATCHES[@]}"
 
 	# install the patches from tarball(s)
 	EPATCH_SUFFIX="patch" \
diff --git a/net-fs/samba/samba-4.2.14.ebuild b/net-fs/samba/samba-4.2.14.ebuild
index 1c597547bb8c..076a97362616 100644
--- a/net-fs/samba/samba-4.2.14.ebuild
+++ b/net-fs/samba/samba-4.2.14.ebuild
@@ -120,7 +120,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch ${PATCHES[@]}
+	epatch "${PATCHES[@]}"
 
 	# install the patches from tarball(s)
 	EPATCH_SUFFIX="patch" \
diff --git a/net-libs/http-parser/http-parser-2.6.1.ebuild b/net-libs/http-parser/http-parser-2.6.1.ebuild
index ae7e9ebe60d2..7efb09979fa3 100644
--- a/net-libs/http-parser/http-parser-2.6.1.ebuild
+++ b/net-libs/http-parser/http-parser-2.6.1.ebuild
@@ -26,7 +26,7 @@ PATCHES=(
 
 src_prepare() {
 	tc-export CC AR
-	epatch ${PATCHES[@]}
+	epatch "${PATCHES[@]}"
 	multilib_copy_sources
 }
 
diff --git a/net-libs/http-parser/http-parser-2.6.2.ebuild b/net-libs/http-parser/http-parser-2.6.2.ebuild
index 947e47d6ed56..e926ae32e895 100644
--- a/net-libs/http-parser/http-parser-2.6.2.ebuild
+++ b/net-libs/http-parser/http-parser-2.6.2.ebuild
@@ -26,7 +26,7 @@ PATCHES=(
 
 src_prepare() {
 	tc-export CC AR
-	epatch ${PATCHES[@]}
+	epatch "${PATCHES[@]}"
 	multilib_copy_sources
 }
 
diff --git a/net-mail/qlogtools/qlogtools-3.1.ebuild b/net-mail/qlogtools/qlogtools-3.1.ebuild
index 89bfa4f29c20..aa9070f6067d 100644
--- a/net-mail/qlogtools/qlogtools-3.1.ebuild
+++ b/net-mail/qlogtools/qlogtools-3.1.ebuild
@@ -18,7 +18,7 @@ RDEPEND="!app-text/multitail"
 
 src_unpack() {
 	unpack ${A}
-	EPATCH_OPTS="-p1 -d ${P}" epatch ${FILESDIR}/qlogtools-3.1-errno.patch
+	EPATCH_OPTS="-p1 -d ${P}" epatch "${FILESDIR}"/qlogtools-3.1-errno.patch
 }
 
 src_compile() {
diff --git a/net-mail/qmhandle/qmhandle-1.2.0-r1.ebuild b/net-mail/qmhandle/qmhandle-1.2.0-r1.ebuild
index 67c53495af70..2237291b4e1b 100644
--- a/net-mail/qmhandle/qmhandle-1.2.0-r1.ebuild
+++ b/net-mail/qmhandle/qmhandle-1.2.0-r1.ebuild
@@ -24,7 +24,7 @@ S=${WORKDIR}
 
 src_unpack() {
 	unpack ${A}
-	epatch ${FILESDIR}/qmHandle-gentoo-svc.patch
+	epatch "${FILESDIR}"/qmHandle-gentoo-svc.patch
 }
 
 src_install() {
diff --git a/net-misc/iputils/iputils-20160308.ebuild b/net-misc/iputils/iputils-20160308.ebuild
index 65a21100ed29..a42116f5a72f 100644
--- a/net-misc/iputils/iputils-20160308.ebuild
+++ b/net-misc/iputils/iputils-20160308.ebuild
@@ -63,7 +63,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	epatch ${PATCHES[@]}
+	epatch "${PATCHES[@]}"
 	use SECURITY_HAZARD && epatch "${FILESDIR}"/${PN}-20150815-nonroot-floodping.patch
 }
 
diff --git a/net-misc/mosh/mosh-1.2.5-r1.ebuild b/net-misc/mosh/mosh-1.2.5-r1.ebuild
index f0341d3d4269..e6bc6b42ffbc 100644
--- a/net-misc/mosh/mosh-1.2.5-r1.ebuild
+++ b/net-misc/mosh/mosh-1.2.5-r1.ebuild
@@ -39,7 +39,7 @@ PATCHES=(
 
 src_prepare() {
 	# apply patches.
-	epatch ${PATCHES[@]}
+	epatch "${PATCHES[@]}"
 
 	eautoreconf
 }
diff --git a/net-misc/quagga/quagga-1.0.20160315-r4.ebuild b/net-misc/quagga/quagga-1.0.20160315-r4.ebuild
index 803f34ec9d81..009b6d452070 100644
--- a/net-misc/quagga/quagga-1.0.20160315-r4.ebuild
+++ b/net-misc/quagga/quagga-1.0.20160315-r4.ebuild
@@ -60,7 +60,7 @@ src_prepare() {
 	# http://hasso.linux.ee/doku.php/english:network:quagga
 	use bgpclassless && eapply -p0 "${DISTDIR}/${CLASSLESS_BGP_PATCH}"
 
-	epatch ${PATCHES[@]}
+	epatch "${PATCHES[@]}"
 	eapply_user
 	eautoreconf
 }
diff --git a/net-misc/stone/stone-2.3e-r1.ebuild b/net-misc/stone/stone-2.3e-r1.ebuild
index 27d02fce8bcc..0d938fc7b3b7 100644
--- a/net-misc/stone/stone-2.3e-r1.ebuild
+++ b/net-misc/stone/stone-2.3e-r1.ebuild
@@ -26,7 +26,7 @@ src_prepare() {
 	tc-export CC
 	append-cflags "-D_GNU_SOURCE"
 
-	epatch ${PATCHES[@]}
+	epatch "${PATCHES[@]}"
 	epatch_user
 }
 
diff --git a/net-p2p/retroshare/retroshare-0.6.0.ebuild b/net-p2p/retroshare/retroshare-0.6.0.ebuild
index 2be0879327b7..ce61c8a2cfc7 100644
--- a/net-p2p/retroshare/retroshare-0.6.0.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.0.ebuild
@@ -101,7 +101,7 @@ src_prepare() {
 		retroshare-gui/src/retroshare-gui.pro \
 		retroshare-nogui/src/retroshare-nogui.pro || die 'sed on retroshare-gui/src/retroshare-gui.pro failed'
 
-	epatch ${PATCHES[@]}
+	epatch "${PATCHES[@]}"
 	eapply_user
 }
 
diff --git a/net-print/npadmin/npadmin-0.8.7.ebuild b/net-print/npadmin/npadmin-0.8.7.ebuild
index 0518079540fc..9b9daa2f86af 100644
--- a/net-print/npadmin/npadmin-0.8.7.ebuild
+++ b/net-print/npadmin/npadmin-0.8.7.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
 
 src_unpack() {
 	unpack ${A}
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${P}-stdlib.patch
+	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${P}-stdlib.patch
 }
 
 src_compile() {
diff --git a/net-proxy/bfilter/bfilter-1.1.4-r2.ebuild b/net-proxy/bfilter/bfilter-1.1.4-r2.ebuild
index 1096d815e601..4a3079ca28f6 100644
--- a/net-proxy/bfilter/bfilter-1.1.4-r2.ebuild
+++ b/net-proxy/bfilter/bfilter-1.1.4-r2.ebuild
@@ -36,7 +36,7 @@ PATCHES=(
 RESTRICT="test" # boost's test API has changed
 
 src_prepare() {
-	epatch ${PATCHES[@]}
+	epatch "${PATCHES[@]}"
 
 	# Some includes are missing and this breaks updates of ACE
 	sed -i \
diff --git a/net-wireless/adm8211/adm8211-20060111.ebuild b/net-wireless/adm8211/adm8211-20060111.ebuild
index df9c975a56fa..ec4af77bce51 100644
--- a/net-wireless/adm8211/adm8211-20060111.ebuild
+++ b/net-wireless/adm8211/adm8211-20060111.ebuild
@@ -40,12 +40,12 @@ src_unpack() {
 	unpack ${A}
 
 	cd ${S}
-	epatch ${FILESDIR}/01-fix-up-build-breaks-from-2.6.19.patch
-	epatch ${FILESDIR}/02-Use-ieee80211_generic_get_stats.patch
-	epatch ${FILESDIR}/03-fix-work_struct-build-breakage.patch
-	epatch ${FILESDIR}/04-fix-set-essid-for-WE-21.patch
-	epatch ${FILESDIR}/05-update-email-address-from-jkmaline-cc.hut.fi-to.patch
-	kernel_is ge 2 6 22 && epatch ${FILESDIR}/06-adm8211-fix-build-breakage-from-skb-mac.raw.patch
+	epatch "${FILESDIR}"/01-fix-up-build-breaks-from-2.6.19.patch
+	epatch "${FILESDIR}"/02-Use-ieee80211_generic_get_stats.patch
+	epatch "${FILESDIR}"/03-fix-work_struct-build-breakage.patch
+	epatch "${FILESDIR}"/04-fix-set-essid-for-WE-21.patch
+	epatch "${FILESDIR}"/05-update-email-address-from-jkmaline-cc.hut.fi-to.patch
+	kernel_is ge 2 6 22 && epatch "${FILESDIR}"/06-adm8211-fix-build-breakage-from-skb-mac.raw.patch
 
 	convert_to_m ${S}/Makefile
 }
diff --git a/sci-biology/bwa/bwa-0.7.12.ebuild b/sci-biology/bwa/bwa-0.7.12.ebuild
index 76ed0cca912b..bf0759d89ce7 100644
--- a/sci-biology/bwa/bwa-0.7.12.ebuild
+++ b/sci-biology/bwa/bwa-0.7.12.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="amd64 x86 ~x64-macos"
 PATCHES=( "${FILESDIR}"/${P}-Makefile.patch )
 
 src_prepare() {
-	epatch ${PATCHES[@]}
+	epatch "${PATCHES[@]}"
 	tc-export CC AR
 }
 
diff --git a/sci-chemistry/autodock/autodock-4.2.6.ebuild b/sci-chemistry/autodock/autodock-4.2.6.ebuild
index 10d018292e93..bd9fc7dd4fc3 100644
--- a/sci-chemistry/autodock/autodock-4.2.6.ebuild
+++ b/sci-chemistry/autodock/autodock-4.2.6.ebuild
@@ -32,7 +32,7 @@ PATCHES=(
 src_prepare() {
 	local i
 
-	epatch ${PATCHES[@]}
+	epatch "${PATCHES[@]}"
 
 	sed \
 		-e "s/\tcsh/\tsh/" \
diff --git a/sci-chemistry/pdb2pqr/pdb2pqr-1.9.0-r1.ebuild b/sci-chemistry/pdb2pqr/pdb2pqr-1.9.0-r1.ebuild
index 7359b9094128..8e7f367ab62b 100644
--- a/sci-chemistry/pdb2pqr/pdb2pqr-1.9.0-r1.ebuild
+++ b/sci-chemistry/pdb2pqr/pdb2pqr-1.9.0-r1.ebuild
@@ -49,7 +49,7 @@ src_prepare() {
 	export CXXFLAGS="${CXXFLAGS}"
 	export LDFLAGS="${LDFLAGS}"
 
-	epatch ${PATCHES[@]}
+	epatch "${PATCHES[@]}"
 	tc-export CXX
 	rm -rf scons || die
 
diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.4.3.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.4.3.ebuild
index 08db006bd4db..d4a5d6a9ac92 100644
--- a/sci-geosciences/gpsbabel/gpsbabel-1.4.3.ebuild
+++ b/sci-geosciences/gpsbabel/gpsbabel-1.4.3.ebuild
@@ -45,7 +45,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	epatch ${PATCHES[@]}
+	epatch "${PATCHES[@]}"
 	epatch_user
 	rm -rf shapelib || die
 
diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.4.4.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.4.4.ebuild
index c0db65f11119..dbb2764012ac 100644
--- a/sci-geosciences/gpsbabel/gpsbabel-1.4.4.ebuild
+++ b/sci-geosciences/gpsbabel/gpsbabel-1.4.4.ebuild
@@ -45,7 +45,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	epatch ${PATCHES[@]}
+	epatch "${PATCHES[@]}"
 	epatch_user
 	rm -rf shapelib || die
 
diff --git a/sci-libs/linux-gpib/linux-gpib-3.2.21-r1.ebuild b/sci-libs/linux-gpib/linux-gpib-3.2.21-r1.ebuild
index 8a70950b9d19..5ba9019bf430 100644
--- a/sci-libs/linux-gpib/linux-gpib-3.2.21-r1.ebuild
+++ b/sci-libs/linux-gpib/linux-gpib-3.2.21-r1.ebuild
@@ -61,7 +61,7 @@ pkg_setup () {
 }
 
 src_prepare () {
-	epatch ${PATCHES[@]}
+	epatch "${PATCHES[@]}"
 	epatch_user
 	eautoreconf
 }
diff --git a/sci-mathematics/prover9/prover9-2009.11a.ebuild b/sci-mathematics/prover9/prover9-2009.11a.ebuild
index 0210411c0fcf..621cf7b9b2c0 100644
--- a/sci-mathematics/prover9/prover9-2009.11a.ebuild
+++ b/sci-mathematics/prover9/prover9-2009.11a.ebuild
@@ -31,7 +31,7 @@ S="${WORKDIR}/${MY_P}/"
 
 src_prepare() {
 	MAKEOPTS+=" -j1"
-	epatch ${PATCHES[@]}
+	epatch "${PATCHES[@]}"
 	sed \
 		-e "/^CC =/s:gcc:$(tc-getCC):g" \
 		-i */Makefile || die
diff --git a/sci-mathematics/twelf/twelf-1.7.1.ebuild b/sci-mathematics/twelf/twelf-1.7.1.ebuild
index 7a097dd7aa21..36b867b7e2df 100644
--- a/sci-mathematics/twelf/twelf-1.7.1.ebuild
+++ b/sci-mathematics/twelf/twelf-1.7.1.ebuild
@@ -43,10 +43,10 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.7.1-emacs-twelf-init.patch"
 	"${FILESDIR}/${PN}-1.7.1-Makefile.patch"
 	"${FILESDIR}/${PN}-1.7.1-mlton-mlb.patch"
-	)
+)
 
 src_prepare() {
-	epatch ${PATCHES[@]}
+	epatch "${PATCHES[@]}"
 	sed \
 		-e "s@/usr/bin@${ROOT}usr/bin@g" \
 		-e "s@/usr/share@${ROOT}usr/share@" \
diff --git a/sci-visualization/nonolith-connect/nonolith-connect-1.1.ebuild b/sci-visualization/nonolith-connect/nonolith-connect-1.1.ebuild
index 19ded55ce79a..55e357b9271c 100644
--- a/sci-visualization/nonolith-connect/nonolith-connect-1.1.ebuild
+++ b/sci-visualization/nonolith-connect/nonolith-connect-1.1.ebuild
@@ -28,7 +28,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch ${PATCHES[@]}
+	epatch "${PATCHES[@]}"
 }
 
 src_configure() {
diff --git a/sys-apps/mouseemu/mouseemu-0.12.ebuild b/sys-apps/mouseemu/mouseemu-0.12.ebuild
index b0c33169a8e8..377c584b949e 100644
--- a/sys-apps/mouseemu/mouseemu-0.12.ebuild
+++ b/sys-apps/mouseemu/mouseemu-0.12.ebuild
@@ -15,8 +15,8 @@ DEPEND=""
 
 src_unpack() {
 	unpack ${A}
-	mv ${WORKDIR}/${PN} ${WORKDIR}/${P}
-	epatch ${FILESDIR}/${P}-fix.diff
+	mv "${WORKDIR}/${PN}" "${WORKDIR}/${P}"
+	epatch "${FILESDIR}"/${P}-fix.diff
 }
 
 src_compile() {
diff --git a/sys-apps/sparc-utils/sparc-utils-1.9-r4.ebuild b/sys-apps/sparc-utils/sparc-utils-1.9-r4.ebuild
index 5b50f6951d84..6791500bcd96 100644
--- a/sys-apps/sparc-utils/sparc-utils-1.9-r4.ebuild
+++ b/sys-apps/sparc-utils/sparc-utils-1.9-r4.ebuild
@@ -29,7 +29,7 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	epatch ${WORKDIR}/${PN}_${PV}-3.diff
+	epatch "${WORKDIR}/${PN}_${PV}-3.diff"
 	sed -i -e 's:#include <linux/elf.h>:#include <elf.h>:' \
 	  ${S}/elftoaout*/elftoaout.c
 }
diff --git a/sys-apps/xmbmon/xmbmon-2.0.5-r1.ebuild b/sys-apps/xmbmon/xmbmon-2.0.5-r1.ebuild
index 92ef5f4546da..5fade8193262 100644
--- a/sys-apps/xmbmon/xmbmon-2.0.5-r1.ebuild
+++ b/sys-apps/xmbmon/xmbmon-2.0.5-r1.ebuild
@@ -26,7 +26,7 @@ S=${WORKDIR}/${MY_P}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	# epatch ${DISTDIR}/${MY_P}_A7N8X-VM.patch
+	# epatch "${DISTDIR}"/${MY_P}_A7N8X-VM.patch
 	epatch "${DISTDIR}"/${MY_P}_fflush.patch
 	epatch "${FILESDIR}"/${P}-amd64.patch
 	epatch "${FILESDIR}"/${P}-pid.patch
diff --git a/sys-auth/pam_dotfile/pam_dotfile-0.7-r1.ebuild b/sys-auth/pam_dotfile/pam_dotfile-0.7-r1.ebuild
index 03258521861b..c8522a04c1da 100644
--- a/sys-auth/pam_dotfile/pam_dotfile-0.7-r1.ebuild
+++ b/sys-auth/pam_dotfile/pam_dotfile-0.7-r1.ebuild
@@ -26,7 +26,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	EPATCH_SUFFIX="patch" epatch ${WORKDIR}/${PV}
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/${PV}"
 
 	AT_M4DIR="${WORKDIR}/${PV}/m4" eautoreconf
 }
diff --git a/sys-auth/pam_ldap/pam_ldap-183.ebuild b/sys-auth/pam_ldap/pam_ldap-183.ebuild
index 26d0b176c654..abd77007d430 100644
--- a/sys-auth/pam_ldap/pam_ldap-183.ebuild
+++ b/sys-auth/pam_ldap/pam_ldap-183.ebuild
@@ -19,7 +19,7 @@ DEPEND=">=sys-libs/glibc-2.1.3
 
 src_unpack() {
 	unpack ${A}
-	#EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-176-fix-referral-tls.patch
+	#EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-176-fix-referral-tls.patch
 
 	cd "${S}"
 	eautoreconf
diff --git a/sys-auth/pam_ldap/pam_ldap-184.ebuild b/sys-auth/pam_ldap/pam_ldap-184.ebuild
index 81553da9589e..20c575e3cd5b 100644
--- a/sys-auth/pam_ldap/pam_ldap-184.ebuild
+++ b/sys-auth/pam_ldap/pam_ldap-184.ebuild
@@ -19,7 +19,7 @@ DEPEND=">=sys-libs/glibc-2.1.3
 
 src_unpack() {
 	unpack ${A}
-	#EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-176-fix-referral-tls.patch
+	#EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-176-fix-referral-tls.patch
 
 	cd "${S}"
 	eautoreconf
diff --git a/sys-boot/milo/milo-2.4.18.ebuild b/sys-boot/milo/milo-2.4.18.ebuild
index 037a6d57191a..9d3669201dc5 100644
--- a/sys-boot/milo/milo-2.4.18.ebuild
+++ b/sys-boot/milo/milo-2.4.18.ebuild
@@ -89,9 +89,9 @@ src_unpack() {
 
 	# gcc3 fixes, and some tweaks to get a build, also
 	# reiserfs support for the kernel (and milo).
-	cd ${WORKDIR}/linux; epatch ${FILESDIR}/linux-${kernel_version}-gcc3-milo.diff || die
-	cd ${WORKDIR}/linux; epatch ${DISTDIR}/linux-2.2.20-reiserfs-3.5.35.diff.bz2 || die
-	cd ${S}; epatch ${FILESDIR}/milo-${milo_version}-gcc3-gentoo.diff || die
+	cd ${WORKDIR}/linux; epatch "${FILESDIR}"/linux-${kernel_version}-gcc3-milo.diff || die
+	cd ${WORKDIR}/linux; epatch "${DISTDIR}"/linux-2.2.20-reiserfs-3.5.35.diff.bz2 || die
+	cd ${S}; epatch "${FILESDIR}"/milo-${milo_version}-gcc3-gentoo.diff || die
 }
 
 src_compile() {
diff --git a/sys-cluster/slurm/slurm-16.05.2.ebuild b/sys-cluster/slurm/slurm-16.05.2.ebuild
index 8bfaf5fc265b..3cebf3befcba 100644
--- a/sys-cluster/slurm/slurm-16.05.2.ebuild
+++ b/sys-cluster/slurm/slurm-16.05.2.ebuild
@@ -72,7 +72,7 @@ pkg_setup() {
 
 src_prepare() {
 	if [ ${#PATCHES[0]} -ne 0 ]; then
-		epatch ${PATCHES[@]}
+		epatch "${PATCHES[@]}"
 	fi
 	eapply_user
 	# pids should go to /var/run/slurm
diff --git a/sys-devel/gcc/gcc-3.4.6-r2.ebuild b/sys-devel/gcc/gcc-3.4.6-r2.ebuild
index bcf8dc04b382..1a67640e161c 100644
--- a/sys-devel/gcc/gcc-3.4.6-r2.ebuild
+++ b/sys-devel/gcc/gcc-3.4.6-r2.ebuild
@@ -32,7 +32,7 @@ src_prepare() {
 	# if you attempt to build gcj.
 	if use objc && ! use gcj ; then
 		epatch "${FILESDIR}"/3.4.3/libffi-without-libgcj.patch
-		#epatch ${FILESDIR}/3.4.3/libffi-nogcj-lib-path-fix.patch
+		#epatch "${FILESDIR}"/3.4.3/libffi-nogcj-lib-path-fix.patch
 	fi
 
 	# Fix cross-compiling
diff --git a/sys-fs/ocfs2-tools/ocfs2-tools-1.8.2-r1.ebuild b/sys-fs/ocfs2-tools/ocfs2-tools-1.8.2-r1.ebuild
index afde938a5191..dbc30d9c272d 100644
--- a/sys-fs/ocfs2-tools/ocfs2-tools-1.8.2-r1.ebuild
+++ b/sys-fs/ocfs2-tools/ocfs2-tools-1.8.2-r1.ebuild
@@ -43,9 +43,9 @@ DOCS=(
 MAKEOPTS+=" -j1"
 
 PATCHES=(
-		"${FILESDIR}/${PN}-1.6.4-asneeded.patch"
-		"${FILESDIR}/${PN}-recent-kernels.patch"
-		)
+	"${FILESDIR}/${PN}-1.6.4-asneeded.patch"
+	"${FILESDIR}/${PN}-recent-kernels.patch"
+)
 
 pkg_setup() {
 	python_set_active_version 2
@@ -58,7 +58,7 @@ src_prepare() {
 	sed -e 's:"/dlm/":"/sys/kernel/dlm":g' \
 		-i libo2dlm/o2dlm_test.c \
 		-i libocfs2/dlm.c || die "sed failed"
-	epatch ${PATCHES[@]}
+	epatch "${PATCHES[@]}"
 	rm -f aclocal.m4
 	AT_M4DIR=. eautoreconf
 }
diff --git a/x11-misc/imwheel/imwheel-1.0.0_pre12.ebuild b/x11-misc/imwheel/imwheel-1.0.0_pre12.ebuild
index 538676ef2a2e..aea2d6f1416a 100644
--- a/x11-misc/imwheel/imwheel-1.0.0_pre12.ebuild
+++ b/x11-misc/imwheel/imwheel-1.0.0_pre12.ebuild
@@ -30,7 +30,7 @@ S=${WORKDIR}/${P/_/}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	#epatch ${FILESDIR}/${P}-gentoo.diff
+	#epatch "${FILESDIR}"/${P}-gentoo.diff
 	sed -i -e "s:/etc:${D}/etc:g" Makefile.am || die
 	sed -i -e "s:/etc:${D}/etc:g" Makefile.in || die
 }
diff --git a/x11-wm/icewm/icewm-1.3.11.ebuild b/x11-wm/icewm/icewm-1.3.11.ebuild
index 663a0c408acd..32e1aea7158f 100644
--- a/x11-wm/icewm/icewm-1.3.11.ebuild
+++ b/x11-wm/icewm/icewm-1.3.11.ebuild
@@ -66,7 +66,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	epatch ${PATCHES[@]}
+	epatch "${PATCHES[@]}"
 
 	# Fix bug #486710
 	use uclibc && epatch "${FILESDIR}/${PN}-1.3.8-uclibc.patch"
diff --git a/x11-wm/icewm/icewm-1.3.12.ebuild b/x11-wm/icewm/icewm-1.3.12.ebuild
index 06349ee9292f..6384a189a6c1 100644
--- a/x11-wm/icewm/icewm-1.3.12.ebuild
+++ b/x11-wm/icewm/icewm-1.3.12.ebuild
@@ -66,7 +66,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	epatch ${PATCHES[@]}
+	epatch "${PATCHES[@]}"
 
 	# Fix bug #486710
 	use uclibc && epatch "${FILESDIR}/${PN}-1.3.8-uclibc.patch"