Enclosing variables in quotes and fixing other shortcomings

Signed-off-by: ormorph <roma251078@mail.ru>

36 files changed, 171 insertions, 178 deletions

diff --git a/trinity-apps/chalk/chalk-14.0.12.ebuild b/trinity-apps/chalk/chalk-14.0.12.ebuild
index 0ea3de5e..1306e401 100644
--- a/trinity-apps/chalk/chalk-14.0.12.ebuild
+++ b/trinity-apps/chalk/chalk-14.0.12.ebuild
@@ -75,15 +75,15 @@ src_prepare() {
 		fi
 	done
 
-	echo "SUBDIRS=$dirlist kross" > ${S}/lib/Makefile.am
-	echo "SUBDIRS= api main" > ${S}/lib/kross/Makefile.am
-	echo "SUBDIRS= chalk" >${S}/filters/Makefile.am
+	echo "SUBDIRS=$dirlist kross" > "${S}/lib/Makefile.am"
+	echo "SUBDIRS= api main" > "${S}/lib/kross/Makefile.am"
+	echo "SUBDIRS= chalk" >"${S}/filters/Makefile.am"
 
 	trinity-meta-2_src_prepare
 
-	echo 'all:' > ${S}/Makefile.am
-	echo 'install:' >> ${S}/Makefile.am
-	echo '.PHONY: all' >> ${S}/Makefile.am
+	echo 'all:' > "${S}/Makefile.am"
+	echo 'install:' >> "${S}/Makefile.am"
+	echo '.PHONY: all' >> "${S}/Makefile.am"
 }
 
 src_configure() {
diff --git a/trinity-apps/chalk/chalk-14.0.13.ebuild b/trinity-apps/chalk/chalk-14.0.13.ebuild
index e5324378..d032bf61 100644
--- a/trinity-apps/chalk/chalk-14.0.13.ebuild
+++ b/trinity-apps/chalk/chalk-14.0.13.ebuild
@@ -80,15 +80,15 @@ src_prepare() {
 		echo -e "KDE_LANG = en\nSUBDIRS = ${PN}" >"${S}/doc/Makefile.am" || die
 	fi
 
-	echo "SUBDIRS=$dirlist kross" > ${S}/lib/Makefile.am
-	echo "SUBDIRS= api main" > ${S}/lib/kross/Makefile.am
-	echo "SUBDIRS= chalk" >${S}/filters/Makefile.am
+	echo "SUBDIRS=$dirlist kross" > "${S}/lib/Makefile.am"
+	echo "SUBDIRS= api main" > "${S}/lib/kross/Makefile.am"
+	echo "SUBDIRS= chalk" >"${S}/filters/Makefile.am"
 
 	trinity-meta-2_src_prepare
 
-	echo 'all:' > ${S}/Makefile.am
-	echo 'install:' >> ${S}/Makefile.am
-	echo '.PHONY: all' >> ${S}/Makefile.am
+	echo 'all:' > "${S}/Makefile.am"
+	echo 'install:' >> "${S}/Makefile.am"
+	echo '.PHONY: all' >> "${S}/Makefile.am"
 }
 
 src_configure() {
diff --git a/trinity-apps/chalk/chalk-9999.ebuild b/trinity-apps/chalk/chalk-9999.ebuild
index f9f3c739..e715e0ef 100644
--- a/trinity-apps/chalk/chalk-9999.ebuild
+++ b/trinity-apps/chalk/chalk-9999.ebuild
@@ -80,15 +80,15 @@ src_prepare() {
 		echo -e "KDE_LANG = en\nSUBDIRS = ${PN}" >"${S}/doc/Makefile.am" || die
 	fi
 
-	echo "SUBDIRS=$dirlist kross" > ${S}/lib/Makefile.am
-	echo "SUBDIRS= api main" > ${S}/lib/kross/Makefile.am
-	echo "SUBDIRS= chalk" >${S}/filters/Makefile.am
+	echo "SUBDIRS=$dirlist kross" > "${S}/lib/Makefile.am"
+	echo "SUBDIRS= api main" > "${S}/lib/kross/Makefile.am"
+	echo "SUBDIRS= chalk" >"${S}/filters/Makefile.am"
 
 	trinity-meta-2_src_prepare
 
-	echo 'all:' > ${S}/Makefile.am
-	echo 'install:' >> ${S}/Makefile.am
-	echo '.PHONY: all' >> ${S}/Makefile.am
+	echo 'all:' > "${S}/Makefile.am"
+	echo 'install:' >> "${S}/Makefile.am"
+	echo '.PHONY: all' >> "${S}/Makefile.am"
 }
 
 src_configure() {
diff --git a/trinity-apps/karbon/karbon-14.0.12.ebuild b/trinity-apps/karbon/karbon-14.0.12.ebuild
index 9c1ef3f5..924e6174 100644
--- a/trinity-apps/karbon/karbon-14.0.12.ebuild
+++ b/trinity-apps/karbon/karbon-14.0.12.ebuild
@@ -42,7 +42,7 @@ KMCOPYLIB="
 
 src_unpack() {
 	trinity-meta-2_src_unpack
-	echo "SUBDIRS = liboofilter karbon" > ${S}/filters/Makefile.am
+	echo "SUBDIRS = liboofilter karbon" > "${S}/filters/Makefile.am"
 }
 
 src_prepare() {
@@ -64,11 +64,11 @@ src_prepare() {
 			libname=""
 		fi
 	done
-	echo "SUBDIRS=$dirlist" > ${S}/lib/Makefile.am
+	echo "SUBDIRS=$dirlist" > "${S}/lib/Makefile.am"
 	trinity-meta-2_src_prepare
-	echo 'all:' > ${S}/Makefile.am
-	echo 'install:' >> ${S}/Makefile.am
-	echo '.PHONY: all' >> ${S}/Makefile.am
+	echo 'all:' > "${S}/Makefile.am"
+	echo 'install:' >> "${S}/Makefile.am"
+	echo '.PHONY: all' >> "${S}/Makefile.am"
 }
 
 src_configure() {
diff --git a/trinity-apps/karbon/karbon-14.0.13.ebuild b/trinity-apps/karbon/karbon-14.0.13.ebuild
index cf4b0d51..0928db2d 100644
--- a/trinity-apps/karbon/karbon-14.0.13.ebuild
+++ b/trinity-apps/karbon/karbon-14.0.13.ebuild
@@ -44,7 +44,7 @@ KMCOPYLIB="
 
 src_unpack() {
 	trinity-meta-2_src_unpack
-	echo "SUBDIRS = liboofilter karbon" > ${S}/filters/Makefile.am
+	echo "SUBDIRS = liboofilter karbon" > "${S}/filters/Makefile.am"
 }
 
 src_prepare() {
@@ -69,11 +69,11 @@ src_prepare() {
 	if use handbook ; then
 		echo -e "KDE_LANG = en\nSUBDIRS = ${PN}" >"${S}/doc/Makefile.am" || die
 	fi
-	echo "SUBDIRS=$dirlist" > ${S}/lib/Makefile.am
+	echo "SUBDIRS=$dirlist" > "${S}/lib/Makefile.am"
 	trinity-meta-2_src_prepare
-	echo 'all:' > ${S}/Makefile.am
-	echo 'install:' >> ${S}/Makefile.am
-	echo '.PHONY: all' >> ${S}/Makefile.am
+	echo 'all:' > "${S}/Makefile.am"
+	echo 'install:' >> "${S}/Makefile.am"
+	echo '.PHONY: all' >> "${S}/Makefile.am"
 }
 
 src_configure() {
diff --git a/trinity-apps/karbon/karbon-9999.ebuild b/trinity-apps/karbon/karbon-9999.ebuild
index d61c0fdc..b17f2729 100644
--- a/trinity-apps/karbon/karbon-9999.ebuild
+++ b/trinity-apps/karbon/karbon-9999.ebuild
@@ -44,7 +44,7 @@ KMCOPYLIB="
 
 src_unpack() {
 	trinity-meta-2_src_unpack
-	echo "SUBDIRS = liboofilter karbon" > ${S}/filters/Makefile.am
+	echo "SUBDIRS = liboofilter karbon" > "${S}/filters/Makefile.am"
 }
 
 src_prepare() {
@@ -69,11 +69,11 @@ src_prepare() {
 	if use handbook ; then
 		echo -e "KDE_LANG = en\nSUBDIRS = ${PN}" >"${S}/doc/Makefile.am" || die
 	fi
-	echo "SUBDIRS=$dirlist" > ${S}/lib/Makefile.am
+	echo "SUBDIRS=$dirlist" > "${S}/lib/Makefile.am"
 	trinity-meta-2_src_prepare
-	echo 'all:' > ${S}/Makefile.am
-	echo 'install:' >> ${S}/Makefile.am
-	echo '.PHONY: all' >> ${S}/Makefile.am
+	echo 'all:' > "${S}/Makefile.am"
+	echo 'install:' >> "${S}/Makefile.am"
+	echo '.PHONY: all' >> "${S}/Makefile.am"
 }
 
 src_configure() {
diff --git a/trinity-apps/kchart/kchart-14.0.12.ebuild b/trinity-apps/kchart/kchart-14.0.12.ebuild
index 0316c4e1..2f5e8326 100644
--- a/trinity-apps/kchart/kchart-14.0.12.ebuild
+++ b/trinity-apps/kchart/kchart-14.0.12.ebuild
@@ -38,7 +38,7 @@ KMCOPYLIB="libkformula lib/kformula
 
 src_unpack() {
 	trinity-meta-2_src_unpack
-	echo "SUBDIRS = kchart" > ${S}/filters/Makefile.am
+	echo "SUBDIRS = kchart" > "${S}/filters/Makefile.am"
 }
 
 src_prepare() {
@@ -62,16 +62,15 @@ src_prepare() {
 			libname=""
 		fi
 	done
-	echo "SUBDIRS=$dirlist" > ${S}/lib/Makefile.am
+	echo "SUBDIRS=$dirlist" > "${S}/lib/Makefile.am"
 	trinity-meta-2_src_prepare
 
-	echo 'all:' > ${S}/Makefile.am
-	echo 'install:' >> ${S}/Makefile.am
-	echo '.PHONY: all' >> ${S}/Makefile.am
+	echo 'all:' > "${S}/Makefile.am"
+	echo 'install:' >> "${S}/Makefile.am"
+	echo '.PHONY: all' >> "${S}/Makefile.am"
 }
 
 src_configure() {
-	append-cxxflags "-std=c++11"
 	trinity-meta-2_src_configure
 }
 
diff --git a/trinity-apps/kchart/kchart-14.0.13.ebuild b/trinity-apps/kchart/kchart-14.0.13.ebuild
index 4a0e665b..12850ce2 100644
--- a/trinity-apps/kchart/kchart-14.0.13.ebuild
+++ b/trinity-apps/kchart/kchart-14.0.13.ebuild
@@ -40,7 +40,7 @@ KMCOPYLIB="libkformula lib/kformula
 
 src_unpack() {
 	trinity-meta-2_src_unpack
-	echo "SUBDIRS = kchart" > ${S}/filters/Makefile.am
+	echo "SUBDIRS = kchart" > "${S}/filters/Makefile.am"
 }
 
 src_prepare() {
@@ -67,16 +67,15 @@ src_prepare() {
 	if use handbook ; then
 		echo -e "KDE_LANG = en\nSUBDIRS = ${PN}" >"${S}/doc/Makefile.am" || die
 	fi
-	echo "SUBDIRS=$dirlist" > ${S}/lib/Makefile.am
+	echo "SUBDIRS=$dirlist" > "${S}/lib/Makefile.am"
 	trinity-meta-2_src_prepare
 
-	echo 'all:' > ${S}/Makefile.am
-	echo 'install:' >> ${S}/Makefile.am
-	echo '.PHONY: all' >> ${S}/Makefile.am
+	echo 'all:' > "${S}/Makefile.am"
+	echo 'install:' >> "${S}/Makefile.am"
+	echo '.PHONY: all' >> "${S}/Makefile.am"
 }
 
 src_configure() {
-	append-cxxflags "-std=c++11"
 	trinity-meta-2_src_configure
 }
 
diff --git a/trinity-apps/kchart/kchart-9999.ebuild b/trinity-apps/kchart/kchart-9999.ebuild
index 3ca1db17..f5604dbc 100644
--- a/trinity-apps/kchart/kchart-9999.ebuild
+++ b/trinity-apps/kchart/kchart-9999.ebuild
@@ -40,7 +40,7 @@ KMCOPYLIB="libkformula lib/kformula
 
 src_unpack() {
 	trinity-meta-2_src_unpack
-	echo "SUBDIRS = kchart" > ${S}/filters/Makefile.am
+	echo "SUBDIRS = kchart" > "${S}/filters/Makefile.am"
 }
 
 src_prepare() {
@@ -67,16 +67,15 @@ src_prepare() {
 	if use handbook ; then
 		echo -e "KDE_LANG = en\nSUBDIRS = ${PN}" >"${S}/doc/Makefile.am" || die
 	fi
-	echo "SUBDIRS=$dirlist" > ${S}/lib/Makefile.am
+	echo "SUBDIRS=$dirlist" > "${S}/lib/Makefile.am"
 	trinity-meta-2_src_prepare
 
-	echo 'all:' > ${S}/Makefile.am
-	echo 'install:' >> ${S}/Makefile.am
-	echo '.PHONY: all' >> ${S}/Makefile.am
+	echo 'all:' > "${S}/Makefile.am"
+	echo 'install:' >> "${S}/Makefile.am"
+	echo '.PHONY: all' >> "${S}/Makefile.am"
 }
 
 src_configure() {
-	append-cxxflags "-std=c++11"
 	trinity-meta-2_src_configure
 }
 
diff --git a/trinity-apps/kexi/kexi-14.0.12.ebuild b/trinity-apps/kexi/kexi-14.0.12.ebuild
index 977b5179..7673bec9 100644
--- a/trinity-apps/kexi/kexi-14.0.12.ebuild
+++ b/trinity-apps/kexi/kexi-14.0.12.ebuild
@@ -68,7 +68,7 @@ src_prepare() {
 		fi
 	done
 
-	echo "SUBDIRS=$dirlist kross" > ${S}/lib/Makefile.am
+	echo "SUBDIRS=$dirlist kross" > "${S}/lib/Makefile.am"
 
 	sed -i "${S}/kexi/migration/keximigratetest.cpp" \
 	-e "/TDEApplication/ s|\");|\", true, true, true);|"
@@ -84,9 +84,9 @@ src_prepare() {
 
 	trinity-meta-2_src_prepare
 
-	echo 'all:' > ${S}/Makefile.am
-	echo 'install:' >> ${S}/Makefile.am
-	echo '.PHONY: all' >> ${S}/Makefile.am
+	echo 'all:' > "${S}/Makefile.am"
+	echo 'install:' >> "${S}/Makefile.am"
+	echo '.PHONY: all' >> "${S}/Makefile.am"
 }
 
 src_configure() {
diff --git a/trinity-apps/kexi/kexi-14.0.13.ebuild b/trinity-apps/kexi/kexi-14.0.13.ebuild
index 408e3712..692cf3d7 100644
--- a/trinity-apps/kexi/kexi-14.0.13.ebuild
+++ b/trinity-apps/kexi/kexi-14.0.13.ebuild
@@ -73,7 +73,7 @@ src_prepare() {
 		echo -e "KDE_LANG = en\nSUBDIRS = ${PN}" >"${S}/doc/Makefile.am" || die
 	fi
 
-	echo "SUBDIRS=$dirlist kross" > ${S}/lib/Makefile.am
+	echo "SUBDIRS=$dirlist kross" > "${S}/lib/Makefile.am"
 
 	sed -i "${S}/kexi/migration/keximigratetest.cpp" \
 	-e "/TDEApplication/ s|\");|\", true, true, true);|"
@@ -89,9 +89,9 @@ src_prepare() {
 
 	trinity-meta-2_src_prepare
 
-	echo 'all:' > ${S}/Makefile.am
-	echo 'install:' >> ${S}/Makefile.am
-	echo '.PHONY: all' >> ${S}/Makefile.am
+	echo 'all:' > "${S}/Makefile.am"
+	echo 'install:' >> "${S}/Makefile.am"
+	echo '.PHONY: all' >> "${S}/Makefile.am"
 }
 
 src_configure() {
diff --git a/trinity-apps/kexi/kexi-9999.ebuild b/trinity-apps/kexi/kexi-9999.ebuild
index dc4d11c4..10c51fc8 100644
--- a/trinity-apps/kexi/kexi-9999.ebuild
+++ b/trinity-apps/kexi/kexi-9999.ebuild
@@ -73,7 +73,7 @@ src_prepare() {
 		echo -e "KDE_LANG = en\nSUBDIRS = ${PN}" >"${S}/doc/Makefile.am" || die
 	fi
 
-	echo "SUBDIRS=$dirlist kross" > ${S}/lib/Makefile.am
+	echo "SUBDIRS=$dirlist kross" > "${S}/lib/Makefile.am"
 
 	sed -i "${S}/kexi/migration/keximigratetest.cpp" \
 	-e "/TDEApplication/ s|\");|\", true, true, true);|"
@@ -89,9 +89,9 @@ src_prepare() {
 
 	trinity-meta-2_src_prepare
 
-	echo 'all:' > ${S}/Makefile.am
-	echo 'install:' >> ${S}/Makefile.am
-	echo '.PHONY: all' >> ${S}/Makefile.am
+	echo 'all:' > "${S}/Makefile.am"
+	echo 'install:' >> "${S}/Makefile.am"
+	echo '.PHONY: all' >> "${S}/Makefile.am"
 }
 
 src_configure() {
diff --git a/trinity-apps/kformula/kformula-14.0.12.ebuild b/trinity-apps/kformula/kformula-14.0.12.ebuild
index 20879770..1527276d 100644
--- a/trinity-apps/kformula/kformula-14.0.12.ebuild
+++ b/trinity-apps/kformula/kformula-14.0.12.ebuild
@@ -54,13 +54,13 @@ src_prepare() {
 			libname=""
 		fi
 	done
-	echo "SUBDIRS=$dirlis" > ${S}/lib/Makefile.am
-	echo "SUBDIRS= kformula" > ${S}/filters/Makefile.am
+	echo "SUBDIRS=$dirlis" > "${S}/lib/Makefile.am"
+	echo "SUBDIRS= kformula" > "${S}/filters/Makefile.am"
 	trinity-meta-2_src_prepare
 
-	echo 'all:' > ${S}/Makefile.am
-	echo 'install:' >> ${S}/Makefile.am
-	echo '.PHONY: all' >> ${S}/Makefile.am
+	echo 'all:' > "${S}/Makefile.am"
+	echo 'install:' >> "${S}/Makefile.am"
+	echo '.PHONY: all' >> "${S}/Makefile.am"
 }
 
 src_configure() {
diff --git a/trinity-apps/kformula/kformula-14.0.13.ebuild b/trinity-apps/kformula/kformula-14.0.13.ebuild
index ac4677cd..642a8891 100644
--- a/trinity-apps/kformula/kformula-14.0.13.ebuild
+++ b/trinity-apps/kformula/kformula-14.0.13.ebuild
@@ -60,13 +60,13 @@ src_prepare() {
 	if use handbook ; then
 		echo -e "KDE_LANG = en\nSUBDIRS = ${PN}" >"${S}/doc/Makefile.am" || die
 	fi
-	echo "SUBDIRS=$dirlis" > ${S}/lib/Makefile.am
-	echo "SUBDIRS= kformula" > ${S}/filters/Makefile.am
+	echo "SUBDIRS=$dirlis" > "${S}/lib/Makefile.am"
+	echo "SUBDIRS= kformula" > "${S}/filters/Makefile.am"
 	trinity-meta-2_src_prepare
 
-	echo 'all:' > ${S}/Makefile.am
-	echo 'install:' >> ${S}/Makefile.am
-	echo '.PHONY: all' >> ${S}/Makefile.am
+	echo 'all:' > "${S}/Makefile.am"
+	echo 'install:' >> "${S}/Makefile.am"
+	echo '.PHONY: all' >> "${S}/Makefile.am"
 }
 
 src_configure() {
diff --git a/trinity-apps/kformula/kformula-9999.ebuild b/trinity-apps/kformula/kformula-9999.ebuild
index a31b5a71..22abbd33 100644
--- a/trinity-apps/kformula/kformula-9999.ebuild
+++ b/trinity-apps/kformula/kformula-9999.ebuild
@@ -60,13 +60,13 @@ src_prepare() {
 	if use handbook ; then
 		echo -e "KDE_LANG = en\nSUBDIRS = ${PN}" >"${S}/doc/Makefile.am" || die
 	fi
-	echo "SUBDIRS=$dirlis" > ${S}/lib/Makefile.am
-	echo "SUBDIRS= kformula" > ${S}/filters/Makefile.am
+	echo "SUBDIRS=$dirlis" > "${S}/lib/Makefile.am"
+	echo "SUBDIRS= kformula" > "${S}/filters/Makefile.am"
 	trinity-meta-2_src_prepare
 
-	echo 'all:' > ${S}/Makefile.am
-	echo 'install:' >> ${S}/Makefile.am
-	echo '.PHONY: all' >> ${S}/Makefile.am
+	echo 'all:' > "${S}/Makefile.am"
+	echo 'install:' >> "${S}/Makefile.am"
+	echo '.PHONY: all' >> "${S}/Makefile.am"
 }
 
 src_configure() {
diff --git a/trinity-apps/kivio/kivio-14.0.12.ebuild b/trinity-apps/kivio/kivio-14.0.12.ebuild
index 64dca733..df755502 100644
--- a/trinity-apps/kivio/kivio-14.0.12.ebuild
+++ b/trinity-apps/kivio/kivio-14.0.12.ebuild
@@ -57,14 +57,14 @@ src_prepare() {
 		fi
 	done
 
-	echo "SUBDIRS=$dirlist" > ${S}/lib/Makefile.am
-	echo "SUBDIRS= kivio" > ${S}/filters/Makefile.am
+	echo "SUBDIRS=$dirlist" > "${S}/lib/Makefile.am"
+	echo "SUBDIRS= kivio" > "${S}/filters/Makefile.am"
 
 	trinity-meta-2_src_prepare
 
-	echo 'all:' > ${S}/Makefile.am
-	echo 'install:' >> ${S}/Makefile.am
-	echo '.PHONY: all' >> ${S}/Makefile.am
+	echo 'all:' > "${S}/Makefile.am"
+	echo 'install:' >> "${S}/Makefile.am"
+	echo '.PHONY: all' >> "${S}/Makefile.am"
 }
 
 src_configure() {
diff --git a/trinity-apps/kivio/kivio-14.0.13.ebuild b/trinity-apps/kivio/kivio-14.0.13.ebuild
index 7564116d..8db885aa 100644
--- a/trinity-apps/kivio/kivio-14.0.13.ebuild
+++ b/trinity-apps/kivio/kivio-14.0.13.ebuild
@@ -62,15 +62,14 @@ src_prepare() {
 		echo -e "KDE_LANG = en\nSUBDIRS = ${PN}" >"${S}/doc/Makefile.am" || die
 	fi
 
-
-	echo "SUBDIRS=$dirlist" > ${S}/lib/Makefile.am
-	echo "SUBDIRS= kivio" > ${S}/filters/Makefile.am
+	echo "SUBDIRS=$dirlist" > "${S}/lib/Makefile.am"
+	echo "SUBDIRS= kivio" > "${S}/filters/Makefile.am"
 
 	trinity-meta-2_src_prepare
 
-	echo 'all:' > ${S}/Makefile.am
-	echo 'install:' >> ${S}/Makefile.am
-	echo '.PHONY: all' >> ${S}/Makefile.am
+	echo 'all:' > "${S}/Makefile.am"
+	echo 'install:' >> "${S}/Makefile.am"
+	echo '.PHONY: all' >> "${S}/Makefile.am"
 }
 
 src_configure() {
diff --git a/trinity-apps/kivio/kivio-9999.ebuild b/trinity-apps/kivio/kivio-9999.ebuild
index 55422870..e31b9876 100644
--- a/trinity-apps/kivio/kivio-9999.ebuild
+++ b/trinity-apps/kivio/kivio-9999.ebuild
@@ -62,15 +62,14 @@ src_prepare() {
 		echo -e "KDE_LANG = en\nSUBDIRS = ${PN}" >"${S}/doc/Makefile.am" || die
 	fi
 
-
-	echo "SUBDIRS=$dirlist" > ${S}/lib/Makefile.am
-	echo "SUBDIRS= kivio" > ${S}/filters/Makefile.am
+	echo "SUBDIRS=$dirlist" > "${S}/lib/Makefile.am"
+	echo "SUBDIRS= kivio" > "${S}/filters/Makefile.am"
 
 	trinity-meta-2_src_prepare
 
-	echo 'all:' > ${S}/Makefile.am
-	echo 'install:' >> ${S}/Makefile.am
-	echo '.PHONY: all' >> ${S}/Makefile.am
+	echo 'all:' > "${S}/Makefile.am"
+	echo 'install:' >> "${S}/Makefile.am"
+	echo '.PHONY: all' >> "${S}/Makefile.am"
 }
 
 src_configure() {
diff --git a/trinity-apps/koshell/koshell-14.0.12.ebuild b/trinity-apps/koshell/koshell-14.0.12.ebuild
index cfbaf02c..6566c0bc 100644
--- a/trinity-apps/koshell/koshell-14.0.12.ebuild
+++ b/trinity-apps/koshell/koshell-14.0.12.ebuild
@@ -54,12 +54,12 @@ src_prepare() {
 			libname=""
 		fi
 	done
-	echo "SUBDIRS=$dirlist" > ${S}/lib/Makefile.am
+	echo "SUBDIRS=$dirlist" > "${S}/lib/Makefile.am"
 	trinity-meta-2_src_prepare
 
-	echo 'all:' > ${S}/Makefile.am
-	echo 'install:' >> ${S}/Makefile.am
-	echo '.PHONY: all' >> ${S}/Makefile.am
+	echo 'all:' > "${S}/Makefile.am"
+	echo 'install:' >> "${S}/Makefile.am"
+	echo '.PHONY: all' >> "${S}/Makefile.am"
 }
 
 src_configure() {
diff --git a/trinity-apps/koshell/koshell-14.0.13.ebuild b/trinity-apps/koshell/koshell-14.0.13.ebuild
index 587013db..763e8aef 100644
--- a/trinity-apps/koshell/koshell-14.0.13.ebuild
+++ b/trinity-apps/koshell/koshell-14.0.13.ebuild
@@ -60,12 +60,12 @@ src_prepare() {
 	if use handbook ; then
 		echo -e "KDE_LANG = en\nSUBDIRS = ${PN}" >"${S}/doc/Makefile.am" || die
 	fi
-	echo "SUBDIRS=$dirlist" > ${S}/lib/Makefile.am
+	echo "SUBDIRS=$dirlist" > "${S}/lib/Makefile.am"
 	trinity-meta-2_src_prepare
 
-	echo 'all:' > ${S}/Makefile.am
-	echo 'install:' >> ${S}/Makefile.am
-	echo '.PHONY: all' >> ${S}/Makefile.am
+	echo 'all:' > "${S}/Makefile.am"
+	echo 'install:' >> "${S}/Makefile.am"
+	echo '.PHONY: all' >> "${S}/Makefile.am"
 }
 
 src_configure() {
diff --git a/trinity-apps/koshell/koshell-9999.ebuild b/trinity-apps/koshell/koshell-9999.ebuild
index 7f843379..c329ef69 100644
--- a/trinity-apps/koshell/koshell-9999.ebuild
+++ b/trinity-apps/koshell/koshell-9999.ebuild
@@ -60,12 +60,12 @@ src_prepare() {
 	if use handbook ; then
 		echo -e "KDE_LANG = en\nSUBDIRS = ${PN}" >"${S}/doc/Makefile.am" || die
 	fi
-	echo "SUBDIRS=$dirlist" > ${S}/lib/Makefile.am
+	echo "SUBDIRS=$dirlist" > "${S}/lib/Makefile.am"
 	trinity-meta-2_src_prepare
 
-	echo 'all:' > ${S}/Makefile.am
-	echo 'install:' >> ${S}/Makefile.am
-	echo '.PHONY: all' >> ${S}/Makefile.am
+	echo 'all:' > "${S}/Makefile.am"
+	echo 'install:' >> "${S}/Makefile.am"
+	echo '.PHONY: all' >> "${S}/Makefile.am"
 }
 
 src_configure() {
diff --git a/trinity-apps/kplato/kplato-14.0.12.ebuild b/trinity-apps/kplato/kplato-14.0.12.ebuild
index cfc2a952..730b261f 100644
--- a/trinity-apps/kplato/kplato-14.0.12.ebuild
+++ b/trinity-apps/kplato/kplato-14.0.12.ebuild
@@ -50,12 +50,12 @@ src_prepare() {
 			libname=""
 		fi
 	done
-	echo "SUBDIRS=$dirlist" > ${S}/lib/Makefile.am
+	echo "SUBDIRS=$dirlist" > "${S}/lib/Makefile.am"
 	trinity-meta-2_src_prepare
 
-	echo 'all:' > ${S}/Makefile.am
-	echo 'install:' >> ${S}/Makefile.am
-	echo '.PHONY: all' >> ${S}/Makefile.am
+	echo 'all:' > "${S}/Makefile.am"
+	echo 'install:' >> "${S}/Makefile.am"
+	echo '.PHONY: all' >> "${S}/Makefile.am"
 }
 
 src_configure() {
diff --git a/trinity-apps/kplato/kplato-14.0.13.ebuild b/trinity-apps/kplato/kplato-14.0.13.ebuild
index 66e10d45..4ad5d586 100644
--- a/trinity-apps/kplato/kplato-14.0.13.ebuild
+++ b/trinity-apps/kplato/kplato-14.0.13.ebuild
@@ -57,12 +57,12 @@ src_prepare() {
 		echo -e "KDE_LANG = en\nSUBDIRS = ${PN}" >"${S}/doc/Makefile.am" || die
 	fi
 
-	echo "SUBDIRS=$dirlist" > ${S}/lib/Makefile.am
+	echo "SUBDIRS=$dirlist" > "${S}/lib/Makefile.am"
 	trinity-meta-2_src_prepare
 
-	echo 'all:' > ${S}/Makefile.am
-	echo 'install:' >> ${S}/Makefile.am
-	echo '.PHONY: all' >> ${S}/Makefile.am
+	echo 'all:' > "${S}/Makefile.am"
+	echo 'install:' >> "${S}/Makefile.am"
+	echo '.PHONY: all' >> "${S}/Makefile.am"
 }
 
 src_configure() {
diff --git a/trinity-apps/kplato/kplato-9999.ebuild b/trinity-apps/kplato/kplato-9999.ebuild
index 041204fe..bbe0d593 100644
--- a/trinity-apps/kplato/kplato-9999.ebuild
+++ b/trinity-apps/kplato/kplato-9999.ebuild
@@ -57,12 +57,12 @@ src_prepare() {
 		echo -e "KDE_LANG = en\nSUBDIRS = ${PN}" >"${S}/doc/Makefile.am" || die
 	fi
 
-	echo "SUBDIRS=$dirlist" > ${S}/lib/Makefile.am
+	echo "SUBDIRS=$dirlist" > "${S}/lib/Makefile.am"
 	trinity-meta-2_src_prepare
 
-	echo 'all:' > ${S}/Makefile.am
-	echo 'install:' >> ${S}/Makefile.am
-	echo '.PHONY: all' >> ${S}/Makefile.am
+	echo 'all:' > "${S}/Makefile.am"
+	echo 'install:' >> "${S}/Makefile.am"
+	echo '.PHONY: all' >> "${S}/Makefile.am"
 }
 
 src_configure() {
diff --git a/trinity-apps/kpresenter/kpresenter-14.0.12.ebuild b/trinity-apps/kpresenter/kpresenter-14.0.12.ebuild
index ff6fc266..19c3a94f 100644
--- a/trinity-apps/kpresenter/kpresenter-14.0.12.ebuild
+++ b/trinity-apps/kpresenter/kpresenter-14.0.12.ebuild
@@ -55,8 +55,8 @@ src_prepare() {
 		fi
 	done
 
-	echo "SUBDIRS=$dirlist" > ${S}/lib/Makefile.am
-	echo "SUBDIRS = liboofilter libdialogfilter kpresenter" > ${S}/filters/Makefile.am
+	echo "SUBDIRS=$dirlist" > "${S}/lib/Makefile.am"
+	echo "SUBDIRS = liboofilter libdialogfilter kpresenter" > "${S}/filters/Makefile.am"
 
 	if ! use arts ; then
 	   sed -i "s/-lsoundserver_idl -lmcop//" "${S}/kpresenter/Makefile.am"
diff --git a/trinity-apps/kpresenter/kpresenter-14.0.13.ebuild b/trinity-apps/kpresenter/kpresenter-14.0.13.ebuild
index 3e0f553e..62e19d78 100644
--- a/trinity-apps/kpresenter/kpresenter-14.0.13.ebuild
+++ b/trinity-apps/kpresenter/kpresenter-14.0.13.ebuild
@@ -61,8 +61,8 @@ src_prepare() {
 		echo -e "KDE_LANG = en\nSUBDIRS = ${PN}" >"${S}/doc/Makefile.am" || die
 	fi
 
-	echo "SUBDIRS=$dirlist" > ${S}/lib/Makefile.am
-	echo "SUBDIRS = liboofilter libdialogfilter kpresenter" > ${S}/filters/Makefile.am
+	echo "SUBDIRS=$dirlist" > "${S}/lib/Makefile.am"
+	echo "SUBDIRS = liboofilter libdialogfilter kpresenter" > "${S}/filters/Makefile.am"
 
 	if ! use arts ; then
 	   sed -i "s/-lsoundserver_idl -lmcop//" "${S}/kpresenter/Makefile.am"
@@ -99,4 +99,3 @@ src_install() {
 		popd
 	fi
 }
-
diff --git a/trinity-apps/kpresenter/kpresenter-9999.ebuild b/trinity-apps/kpresenter/kpresenter-9999.ebuild
index a6975dfd..8b5b40ba 100644
--- a/trinity-apps/kpresenter/kpresenter-9999.ebuild
+++ b/trinity-apps/kpresenter/kpresenter-9999.ebuild
@@ -61,8 +61,8 @@ src_prepare() {
 		echo -e "KDE_LANG = en\nSUBDIRS = ${PN}" >"${S}/doc/Makefile.am" || die
 	fi
 
-	echo "SUBDIRS=$dirlist" > ${S}/lib/Makefile.am
-	echo "SUBDIRS = liboofilter libdialogfilter kpresenter" > ${S}/filters/Makefile.am
+	echo "SUBDIRS=$dirlist" > "${S}/lib/Makefile.am"
+	echo "SUBDIRS = liboofilter libdialogfilter kpresenter" > "${S}/filters/Makefile.am"
 
 	if ! use arts ; then
 	   sed -i "s/-lsoundserver_idl -lmcop//" "${S}/kpresenter/Makefile.am"
@@ -99,4 +99,3 @@ src_install() {
 		popd
 	fi
 }
-
diff --git a/trinity-apps/kspread/kspread-14.0.12.ebuild b/trinity-apps/kspread/kspread-14.0.12.ebuild
index addb017a..ab8e8e33 100644
--- a/trinity-apps/kspread/kspread-14.0.12.ebuild
+++ b/trinity-apps/kspread/kspread-14.0.12.ebuild
@@ -65,23 +65,23 @@ src_prepare() {
 			libname=""
 		fi
 	done
-	echo "SUBDIRS=$dirlist kross" > ${S}/lib/Makefile.am
+	echo "SUBDIRS=$dirlist kross" > "${S}/lib/Makefile.am"
 
 	sed -i "${S}/kexi/migration/keximigratetest.cpp" \
 	-e "/TDEApplication/ s|\");|\", true, true, true);|"
 
-	echo "SUBDIRS = liboofilter kspread" > ${S}/filters/Makefile.am
-	echo "SUBDIRS = applixspread csv dbase gnumeric latex opencalc html qpro excel kexi" > ${S}/filters/kspread/Makefile.am
+	echo "SUBDIRS = liboofilter kspread" > "${S}/filters/Makefile.am"
+	echo "SUBDIRS = applixspread csv dbase gnumeric latex opencalc html qpro excel kexi" > "${S}/filters/kspread/Makefile.am"
 	for i in $(find "${S}"/lib -iname "*\.ui"); do
 		uic-tqt ${i} > ${i%.ui}.h
 	done
-	echo "SUBDIRS = kexidb" > ${S}/kexi/Makefile.am
+	echo "SUBDIRS = kexidb" > "${S}/kexi/Makefile.am"
 
 	trinity-meta-2_src_prepare
 
-	echo 'all:' > ${S}/Makefile.am
-	echo 'install:' >> ${S}/Makefile.am
-	echo '.PHONY: all' >> ${S}/Makefile.am
+	echo 'all:' > "${S}/Makefile.am"
+	echo 'install:' >> "${S}/Makefile.am"
+	echo '.PHONY: all' >> "${S}/Makefile.am"
 }
 
 src_configure() {
diff --git a/trinity-apps/kspread/kspread-14.0.13.ebuild b/trinity-apps/kspread/kspread-14.0.13.ebuild
index 27f57d57..287bc90c 100644
--- a/trinity-apps/kspread/kspread-14.0.13.ebuild
+++ b/trinity-apps/kspread/kspread-14.0.13.ebuild
@@ -70,23 +70,23 @@ src_prepare() {
 	if use handbook ; then
 		echo -e "KDE_LANG = en\nSUBDIRS = ${PN}" >"${S}/doc/Makefile.am" || die
 	fi
-	echo "SUBDIRS=$dirlist kross" > ${S}/lib/Makefile.am
+	echo "SUBDIRS=$dirlist kross" > "${S}/lib/Makefile.am"
 
 	sed -i "${S}/kexi/migration/keximigratetest.cpp" \
 	-e "/TDEApplication/ s|\");|\", true, true, true);|"
 
-	echo "SUBDIRS = liboofilter kspread" > ${S}/filters/Makefile.am
-	echo "SUBDIRS = applixspread csv dbase gnumeric latex opencalc html qpro excel kexi" > ${S}/filters/kspread/Makefile.am
+	echo "SUBDIRS = liboofilter kspread" > "${S}/filters/Makefile.am"
+	echo "SUBDIRS = applixspread csv dbase gnumeric latex opencalc html qpro excel kexi" > "${S}/filters/kspread/Makefile.am"
 	for i in $(find "${S}"/lib -iname "*\.ui"); do
 		uic-tqt ${i} > ${i%.ui}.h
 	done
-	echo "SUBDIRS = kexidb" > ${S}/kexi/Makefile.am
+	echo "SUBDIRS = kexidb" > "${S}/kexi/Makefile.am"
 
 	trinity-meta-2_src_prepare
 
-	echo 'all:' > ${S}/Makefile.am
-	echo 'install:' >> ${S}/Makefile.am
-	echo '.PHONY: all' >> ${S}/Makefile.am
+	echo 'all:' > "${S}/Makefile.am"
+	echo 'install:' >> "${S}/Makefile.am"
+	echo '.PHONY: all' >> "${S}/Makefile.am"
 }
 
 src_configure() {
diff --git a/trinity-apps/kspread/kspread-9999.ebuild b/trinity-apps/kspread/kspread-9999.ebuild
index 6d67f59b..49e6e0e3 100644
--- a/trinity-apps/kspread/kspread-9999.ebuild
+++ b/trinity-apps/kspread/kspread-9999.ebuild
@@ -70,23 +70,23 @@ src_prepare() {
 	if use handbook ; then
 		echo -e "KDE_LANG = en\nSUBDIRS = ${PN}" >"${S}/doc/Makefile.am" || die
 	fi
-	echo "SUBDIRS=$dirlist kross" > ${S}/lib/Makefile.am
+	echo "SUBDIRS=$dirlist kross" > "${S}/lib/Makefile.am"
 
 	sed -i "${S}/kexi/migration/keximigratetest.cpp" \
 	-e "/TDEApplication/ s|\");|\", true, true, true);|"
 
-	echo "SUBDIRS = liboofilter kspread" > ${S}/filters/Makefile.am
-	echo "SUBDIRS = applixspread csv dbase gnumeric latex opencalc html qpro excel kexi" > ${S}/filters/kspread/Makefile.am
+	echo "SUBDIRS = liboofilter kspread" > "${S}/filters/Makefile.am"
+	echo "SUBDIRS = applixspread csv dbase gnumeric latex opencalc html qpro excel kexi" > "${S}/filters/kspread/Makefile.am"
 	for i in $(find "${S}"/lib -iname "*\.ui"); do
 		uic-tqt ${i} > ${i%.ui}.h
 	done
-	echo "SUBDIRS = kexidb" > ${S}/kexi/Makefile.am
+	echo "SUBDIRS = kexidb" > "${S}/kexi/Makefile.am"
 
 	trinity-meta-2_src_prepare
 
-	echo 'all:' > ${S}/Makefile.am
-	echo 'install:' >> ${S}/Makefile.am
-	echo '.PHONY: all' >> ${S}/Makefile.am
+	echo 'all:' > "${S}/Makefile.am"
+	echo 'install:' >> "${S}/Makefile.am"
+	echo '.PHONY: all' >> "${S}/Makefile.am"
 }
 
 src_configure() {
diff --git a/trinity-apps/kugar/kugar-14.0.12.ebuild b/trinity-apps/kugar/kugar-14.0.12.ebuild
index 3e763aa0..54b68716 100644
--- a/trinity-apps/kugar/kugar-14.0.12.ebuild
+++ b/trinity-apps/kugar/kugar-14.0.12.ebuild
@@ -58,14 +58,14 @@ src_prepare() {
 		fi
 	done
 
-	echo "SUBDIRS=$dirlist" > ${S}/lib/Makefile.am
-	echo "SUBDIRS= kugar" > ${S}/filters/Makefile.am
+	echo "SUBDIRS=$dirlist" > "${S}/lib/Makefile.am"
+	echo "SUBDIRS= kugar" > "${S}/filters/Makefile.am"
 
 	trinity-meta-2_src_prepare
 
-	echo 'all:' > ${S}/Makefile.am
-	echo 'install:' >> ${S}/Makefile.am
-	echo '.PHONY: all' >> ${S}/Makefile.am
+	echo 'all:' > "${S}/Makefile.am"
+	echo 'install:' >> "${S}/Makefile.am"
+	echo '.PHONY: all' >> "${S}/Makefile.am"
 }
 
 src_configure() {
diff --git a/trinity-apps/kugar/kugar-14.0.13.ebuild b/trinity-apps/kugar/kugar-14.0.13.ebuild
index 11473ce7..229ed91c 100644
--- a/trinity-apps/kugar/kugar-14.0.13.ebuild
+++ b/trinity-apps/kugar/kugar-14.0.13.ebuild
@@ -63,14 +63,14 @@ src_prepare() {
 		echo -e "KDE_LANG = en\nSUBDIRS = ${PN}" >"${S}/doc/Makefile.am" || die
 	fi
 
-	echo "SUBDIRS=$dirlist" > ${S}/lib/Makefile.am
-	echo "SUBDIRS= kugar" > ${S}/filters/Makefile.am
+	echo "SUBDIRS=$dirlist" > "${S}/lib/Makefile.am"
+	echo "SUBDIRS= kugar" > "${S}/filters/Makefile.am"
 
 	trinity-meta-2_src_prepare
 
-	echo 'all:' > ${S}/Makefile.am
-	echo 'install:' >> ${S}/Makefile.am
-	echo '.PHONY: all' >> ${S}/Makefile.am
+	echo 'all:' > "${S}/Makefile.am"
+	echo 'install:' >> "${S}/Makefile.am"
+	echo '.PHONY: all' >> "${S}/Makefile.am"
 }
 
 src_configure() {
diff --git a/trinity-apps/kugar/kugar-9999.ebuild b/trinity-apps/kugar/kugar-9999.ebuild
index 63a41cc1..1aa28b54 100644
--- a/trinity-apps/kugar/kugar-9999.ebuild
+++ b/trinity-apps/kugar/kugar-9999.ebuild
@@ -63,14 +63,14 @@ src_prepare() {
 		echo -e "KDE_LANG = en\nSUBDIRS = ${PN}" >"${S}/doc/Makefile.am" || die
 	fi
 
-	echo "SUBDIRS=$dirlist" > ${S}/lib/Makefile.am
-	echo "SUBDIRS= kugar" > ${S}/filters/Makefile.am
+	echo "SUBDIRS=$dirlist" > "${S}/lib/Makefile.am"
+	echo "SUBDIRS= kugar" > "${S}/filters/Makefile.am"
 
 	trinity-meta-2_src_prepare
 
-	echo 'all:' > ${S}/Makefile.am
-	echo 'install:' >> ${S}/Makefile.am
-	echo '.PHONY: all' >> ${S}/Makefile.am
+	echo 'all:' > "${S}/Makefile.am"
+	echo 'install:' >> "${S}/Makefile.am"
+	echo '.PHONY: all' >> "${S}/Makefile.am"
 }
 
 src_configure() {
diff --git a/trinity-apps/kword/kword-14.0.12.ebuild b/trinity-apps/kword/kword-14.0.12.ebuild
index fd1c16f3..45c4138f 100644
--- a/trinity-apps/kword/kword-14.0.12.ebuild
+++ b/trinity-apps/kword/kword-14.0.12.ebuild
@@ -63,8 +63,8 @@ src_prepare() {
 		fi
 	done
 
-	echo "SUBDIRS=$dirlist" > ${S}/lib/Makefile.am
-	echo "SUBDIRS = liboofilter kword" > ${S}/filters/Makefile.am
+	echo "SUBDIRS=$dirlist" > "${S}/lib/Makefile.am"
+	echo "SUBDIRS = liboofilter kword" > "${S}/filters/Makefile.am"
 
 	for i in $(find "${S}"/lib -iname "*\.ui"); do
 		uic-tqt ${i} > ${i%.ui}.h
@@ -76,9 +76,9 @@ src_prepare() {
 
 	trinity-meta-2_src_prepare
 
-	echo 'all:' > ${S}/Makefile.am
-	echo 'install:' >> ${S}/Makefile.am
-	echo '.PHONY: all' >> ${S}/Makefile.am
+	echo 'all:' > "${S}/Makefile.am"
+	echo 'install:' >> "${S}/Makefile.am"
+	echo '.PHONY: all' >> "${S}/Makefile.am"
 }
 
 src_configure() {
diff --git a/trinity-apps/kword/kword-14.0.13.ebuild b/trinity-apps/kword/kword-14.0.13.ebuild
index 2828000d..9bb28dfb 100644
--- a/trinity-apps/kword/kword-14.0.13.ebuild
+++ b/trinity-apps/kword/kword-14.0.13.ebuild
@@ -68,8 +68,8 @@ src_prepare() {
 		echo -e "KDE_LANG = en\nSUBDIRS = ${PN}" >"${S}/doc/Makefile.am" || die
 	fi
 
-	echo "SUBDIRS=$dirlist" > ${S}/lib/Makefile.am
-	echo "SUBDIRS = liboofilter kword" > ${S}/filters/Makefile.am
+	echo "SUBDIRS=$dirlist" > "${S}/lib/Makefile.am"
+	echo "SUBDIRS = liboofilter kword" > "${S}/filters/Makefile.am"
 
 	for i in $(find "${S}"/lib -iname "*\.ui"); do
 		uic-tqt ${i} > ${i%.ui}.h
@@ -77,9 +77,9 @@ src_prepare() {
 
 	trinity-meta-2_src_prepare
 
-	echo 'all:' > ${S}/Makefile.am
-	echo 'install:' >> ${S}/Makefile.am
-	echo '.PHONY: all' >> ${S}/Makefile.am
+	echo 'all:' > "${S}/Makefile.am"
+	echo 'install:' >> "${S}/Makefile.am"
+	echo '.PHONY: all' >> "${S}/Makefile.am"
 }
 
 src_configure() {
diff --git a/trinity-apps/kword/kword-9999.ebuild b/trinity-apps/kword/kword-9999.ebuild
index 1f4eb5bf..d6798690 100644
--- a/trinity-apps/kword/kword-9999.ebuild
+++ b/trinity-apps/kword/kword-9999.ebuild
@@ -68,8 +68,8 @@ src_prepare() {
 		echo -e "KDE_LANG = en\nSUBDIRS = ${PN}" >"${S}/doc/Makefile.am" || die
 	fi
 
-	echo "SUBDIRS=$dirlist" > ${S}/lib/Makefile.am
-	echo "SUBDIRS = liboofilter kword" > ${S}/filters/Makefile.am
+	echo "SUBDIRS=$dirlist" > "${S}/lib/Makefile.am"
+	echo "SUBDIRS = liboofilter kword" > "${S}/filters/Makefile.am"
 
 	for i in $(find "${S}"/lib -iname "*\.ui"); do
 		uic-tqt ${i} > ${i%.ui}.h
@@ -77,9 +77,9 @@ src_prepare() {
 
 	trinity-meta-2_src_prepare
 
-	echo 'all:' > ${S}/Makefile.am
-	echo 'install:' >> ${S}/Makefile.am
-	echo '.PHONY: all' >> ${S}/Makefile.am
+	echo 'all:' > "${S}/Makefile.am"
+	echo 'install:' >> "${S}/Makefile.am"
+	echo '.PHONY: all' >> "${S}/Makefile.am"
 }
 
 src_configure() {