fix quoting to a lot of patch calls

hanetzer · Jan 21, 2017 · 62fa24b · 62fa24b
1 parent 9fc147e
commit 62fa24b
Show file tree

Hide file tree

Showing 68 changed files with 92 additions and 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -28,7 +28,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	epatch ${PATCHES[@]}
+	epatch "${PATCHES[@]}"
 	epatch_user
 }
 

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -24,7 +24,7 @@ S=${WORKDIR}
 
 src_unpack() {
 	unpack ${A}
-	epatch ${FILESDIR}/qmHandle-gentoo-svc.patch
+	epatch "${FILESDIR}"/qmHandle-gentoo-svc.patch
 }
 
 src_install() {