Bourne-compliant parameter substitution

26 files changed, 65 insertions, 36 deletions

diff --git a/app-portage/portage-bashrc-mv/Manifest b/app-portage/portage-bashrc-mv/Manifest
index cd59d86d..cba22358 100644
--- a/app-portage/portage-bashrc-mv/Manifest
+++ b/app-portage/portage-bashrc-mv/Manifest
@@ -1 +1 @@
-DIST portage-bashrc-mv-13.9.tar.gz 13585 SHA256 4442351de6ed7ee123f50fd228ced9e90adee1068623a0557967007abc6e2d29
+DIST portage-bashrc-mv-13.10.tar.gz 13585 SHA256 e599d67b203538fc9dc6406b8aac54a3d5aa61e60773bf2ad4f0d376a286c6e0
diff --git a/app-portage/portage-bashrc-mv/portage-bashrc-mv-13.9.ebuild b/app-portage/portage-bashrc-mv/portage-bashrc-mv-13.10.ebuild
index 81dee804..81dee804 100644
--- a/app-portage/portage-bashrc-mv/portage-bashrc-mv-13.9.ebuild
+++ b/app-portage/portage-bashrc-mv/portage-bashrc-mv-13.10.ebuild
diff --git a/app-portage/trickyfetch/Manifest b/app-portage/trickyfetch/Manifest
index 525cb278..464fb572 100644
--- a/app-portage/trickyfetch/Manifest
+++ b/app-portage/trickyfetch/Manifest
@@ -1 +1 @@
-DIST trickyfetch-8.8.tar.gz 10950 SHA256 fd26815f42f8b6b166f850fb893d6aac9bd62f4bc170790d645ad6320df8a85f
+DIST trickyfetch-8.9.tar.gz 10976 SHA256 f75efe3a5b5f1622cad352ba1e9525bd7e9dac7c20a5da1aa4c7b46a6f2fb798
diff --git a/app-portage/trickyfetch/trickyfetch-8.8.ebuild b/app-portage/trickyfetch/trickyfetch-8.9.ebuild
index ec5f6700..ec5f6700 100644
--- a/app-portage/trickyfetch/trickyfetch-8.8.ebuild
+++ b/app-portage/trickyfetch/trickyfetch-8.9.ebuild
diff --git a/app-shells/runtitle/Manifest b/app-shells/runtitle/Manifest
index 5bb42a08..ee8f1e94 100644
--- a/app-shells/runtitle/Manifest
+++ b/app-shells/runtitle/Manifest
@@ -1 +1 @@
-DIST runtitle-2.7.tar.gz 3372 SHA256 6ea63935ad18ad3544e42db4ca93a218e1c9b7e3b70033af07cdc3c74e278022
+DIST runtitle-2.8.tar.gz 3368 SHA256 faeac3525169d6031ebf067b64e81a2af6536f4232b9363c034d2ba91f04c19c
diff --git a/app-shells/runtitle/runtitle-2.7.ebuild b/app-shells/runtitle/runtitle-2.8.ebuild
index 42e6458f..42e6458f 100644
--- a/app-shells/runtitle/runtitle-2.7.ebuild
+++ b/app-shells/runtitle/runtitle-2.8.ebuild
diff --git a/app-shells/schily-tools/files/setuarg.patch b/app-shells/schily-tools/files/setuarg.patch
new file mode 100644
index 00000000..46ce6ec2
--- /dev/null
+++ b/app-shells/schily-tools/files/setuarg.patch
@@ -0,0 +1,27 @@
+--- 1/sh/macro.c
++++ 1/sh/macro.c
+@@ -322,6 +322,7 @@
+ 		if ((c = readwc(), dolchar(c))) {
+ 			struct namnod *n = (struct namnod *)NIL;
+ 			int		dolg = 0;
++			int		isg = 1;
+ 			int		vsize = -1;
+ 			BOOL		bra;
+ 			BOOL		nulflg;
+@@ -362,6 +363,7 @@
+ 						atflag = 1;
+ 					}
+ 					dolg = 1;
++					isg++;
+ 					c = 1;
+ 				} else if (digit(c)) {
+ 					c -= '0';
+@@ -622,7 +624,7 @@
+ 						error(badsub);
+ 					}
+ 				}
+-			} else if (flags & setflg) {
++			} else if ((flags & setflg) && isg == 0) {
+ 				failed(id, unset);
+ 			}
+ 			goto retry;
diff --git a/app-shells/schily-tools/schily-tools-2016.07.06.ebuild b/app-shells/schily-tools/schily-tools-2016.07.06.ebuild
index 38477a61..77879a00 100644
--- a/app-shells/schily-tools/schily-tools-2016.07.06.ebuild
+++ b/app-shells/schily-tools/schily-tools-2016.07.06.ebuild
@@ -17,6 +17,8 @@ HOMEPAGE="https://sourceforge.net/projects/schilytools/"
 KEYWORDS="~amd64 ~x86"
 IUSE="acl caps static-libs system-libschily system-star xattr"
 
+PATCHES=("$FILESDIR"/setuarg.patch)
+
 add_iuse_expand() {
 	local i j
 	j=${1}
@@ -151,7 +153,7 @@ targets() {
 			continue;;
 		esac
 		mv -v UNUSED_TARGETS/??"${i}" TARGETS || die
-		targets=${targets}${targets:+ }${i}
+		targets=${targets}${targets:+\ }${i}
 	done
 }
 
diff --git a/app-shells/zsh-completions/zsh-completions-0.18.0.ebuild b/app-shells/zsh-completions/zsh-completions-0.18.0.ebuild
index d56ebf5e..00da49ba 100644
--- a/app-shells/zsh-completions/zsh-completions-0.18.0.ebuild
+++ b/app-shells/zsh-completions/zsh-completions-0.18.0.ebuild
@@ -10,8 +10,8 @@ case ${PV} in
 	EGIT_REPO_URI="git://github.com/zsh-users/${PN}.git"
 	inherit git-r3
 	PROPERTIES="live"
-	KEYWORDS=""
-	SRC_URI="";;
+	KEYWORDS=
+	SRC_URI=;;
 *)
 	LIVE=false
 	#RESTRICT="mirror"
@@ -25,10 +25,7 @@ DESCRIPTION="Additional completion definitions for Zsh"
 HOMEPAGE="https://gentoo.org/zsh-users/zsh-completions/"
 LICENSE="ZSH"
 SLOT="0"
-if ${LIVE}
-then	DEPEND=""
-else	DEPEND=""
-fi
+DEPEND=
 
 IUSE=""
 declare -a FILES
@@ -54,10 +51,10 @@ calculate_data() {
 		case ${curr} in
 		'+'*)
 			curr="completion_${curr#?}"
-			IUSE="${IUSE}${IUSE:+ }+${curr}";;
+			IUSE=${IUSE}${IUSE:+\ }+${curr};;
 		*)
 			curr="completion_${curr}"
-			IUSE="${IUSE}${IUSE:+ }${curr}";;
+			IUSE=${IUSE}${IUSE:+\ }${curr};;
 		esac
 		for currfile in ${comp#* }
 		do	used_value currfile
diff --git a/app-shells/zsh-completions/zsh-completions-99999999.ebuild b/app-shells/zsh-completions/zsh-completions-99999999.ebuild
index d56ebf5e..429b307d 100644
--- a/app-shells/zsh-completions/zsh-completions-99999999.ebuild
+++ b/app-shells/zsh-completions/zsh-completions-99999999.ebuild
@@ -54,10 +54,10 @@ calculate_data() {
 		case ${curr} in
 		'+'*)
 			curr="completion_${curr#?}"
-			IUSE="${IUSE}${IUSE:+ }+${curr}";;
+			IUSE=${IUSE}${IUSE:+\ }'+'${curr};;
 		*)
 			curr="completion_${curr}"
-			IUSE="${IUSE}${IUSE:+ }${curr}";;
+			IUSE=${IUSE}${IUSE:+\ }${curr};;
 		esac
 		for currfile in ${comp#* }
 		do	used_value currfile
diff --git a/eclass/mv_mozextension-r1.eclass b/eclass/mv_mozextension-r1.eclass
index 45178329..b50973d1 100644
--- a/eclass/mv_mozextension-r1.eclass
+++ b/eclass/mv_mozextension-r1.eclass
@@ -78,9 +78,12 @@ moz_phases() {
 	OPTIND=1
 	while getopts 'cCn' opt
 	do	case ${opt} in
-		c)	o=" -c";;
-		n)	o=" -n";;
-		C)	o=;;
+		c)
+			o=" -c";;
+		n)
+			o=" -n";;
+		C)
+			o=;;
 		esac
 	done
 	shift $(( ${OPTIND} - 1 ))
@@ -119,12 +122,12 @@ moz_rdepend() {
 		esac
 		case ${mode} in
 		*s*)
-			rdep="${rdep}${rdep:+ }browser_${i}? ( www-client/${i} )"
+			rdep=${rdep}${rdep:+\ }"browser_${i}? ( www-client/${i} )"
 			c=${c}a;;
 		esac
 		case ${mode} in
 		*b*)
-			rdep="${rdep}${rdep:+ }browser_${i}-bin? ( www-client/${i}-bin )"
+			rdep=${rdep}${rdep:+\ }"browser_${i}-bin? ( www-client/${i}-bin )"
 			c=${c}a;;
 		esac
 	done
@@ -154,11 +157,11 @@ moz_iuse() {
 	for i in firefox palemoon seamonkey
 	do	case "${*}" in
 		*"${i}"?source*)
-			iuse="${iuse}${iuse:+ }browser_${i}";;
+			iuse=${iuse}${iuse:+\ }"browser_${i}";;
 		*"${i}"?bin*)
-			iuse="${iuse}${iuse:+ }browser_${i}-bin";;
+			iuse=${iuse}${iuse:+\ }"browser_${i}-bin";;
 		*"${i}"*)
-			iuse="${iuse}${iuse:+ }browser_${i} browser_${i}-bin";;
+			iuse=${iuse}${iuse:+\ }"browser_${i} browser_${i}-bin";;
 		esac
 	done
 	[ -n "${iuse}" ] || die "args must be [firefox|palemoon|seamonkey][-source|-bin]"
diff --git a/games-rpg/magus/magus-1.3.1.ebuild b/games-rpg/magus/magus-1.3.1.ebuild
index bc8dcbfc..9db7ad09 100644
--- a/games-rpg/magus/magus-1.3.1.ebuild
+++ b/games-rpg/magus/magus-1.3.1.ebuild
@@ -42,9 +42,9 @@ add_type_to_iuse() {
 	local t i
 	t=${1}
 	shift
-	REQUIRED_USE+=${REQUIRED_USE:+ }'^^ ('
+	REQUIRED_USE+=${REQUIRED_USE:+\ }'^^ ('
 	for i
-	do	IUSE+="${IUSE:+ }${t}_${i}"
+	do	IUSE+=${IUSE:+\ }${t}_${i}
 		REQUIRED_USE+=" ${t}_${i}"
 	done
 	REQUIRED_USE+=' )'
diff --git a/games-rpg/magus/magus-1.3.3.ebuild b/games-rpg/magus/magus-1.3.3.ebuild
index bc8dcbfc..9db7ad09 100644
--- a/games-rpg/magus/magus-1.3.3.ebuild
+++ b/games-rpg/magus/magus-1.3.3.ebuild
@@ -42,9 +42,9 @@ add_type_to_iuse() {
 	local t i
 	t=${1}
 	shift
-	REQUIRED_USE+=${REQUIRED_USE:+ }'^^ ('
+	REQUIRED_USE+=${REQUIRED_USE:+\ }'^^ ('
 	for i
-	do	IUSE+="${IUSE:+ }${t}_${i}"
+	do	IUSE+=${IUSE:+\ }${t}_${i}
 		REQUIRED_USE+=" ${t}_${i}"
 	done
 	REQUIRED_USE+=' )'
diff --git a/games-rpg/magus/magus-99999999.ebuild b/games-rpg/magus/magus-99999999.ebuild
index bc8dcbfc..9db7ad09 100644
--- a/games-rpg/magus/magus-99999999.ebuild
+++ b/games-rpg/magus/magus-99999999.ebuild
@@ -42,9 +42,9 @@ add_type_to_iuse() {
 	local t i
 	t=${1}
 	shift
-	REQUIRED_USE+=${REQUIRED_USE:+ }'^^ ('
+	REQUIRED_USE+=${REQUIRED_USE:+\ }'^^ ('
 	for i
-	do	IUSE+="${IUSE:+ }${t}_${i}"
+	do	IUSE+=${IUSE:+\ }${t}_${i}
 		REQUIRED_USE+=" ${t}_${i}"
 	done
 	REQUIRED_USE+=' )'
diff --git a/media-tv/sundtek-tv/files/sundtek.initd b/media-tv/sundtek-tv/files/sundtek.initd
index fb374f43..9faf7db2 100644
--- a/media-tv/sundtek-tv/files/sundtek.initd
+++ b/media-tv/sundtek-tv/files/sundtek.initd
@@ -6,12 +6,12 @@ description="sundtek TV mediaclient"
 
 set_preload() {
 	yesno ${preload:-NO} || return 0
-	LD_PRELOAD=${preload_lib:-/usr/lib}/libmediaclient.so${LD_PRELOAD:+ }${LD_PRELOAD-}
+	LD_PRELOAD=${preload_lib:-/usr/lib}/libmediaclient.so${LD_PRELOAD:+\ }${LD_PRELOAD-}
 	export LD_PRELOAD
 }
 
 start() {
-	ebegin "Starting ${SVCNAME}"
+	ebegin "Starting $SVCNAME"
 	(
 		set_preload
 		/opt/bin/mediaclient --start=4
@@ -20,7 +20,7 @@ start() {
 }
 
 stop() {
-	ebegin "Stopping ${SVCNAME}"
+	ebegin "Stopping $SVCNAME"
 	(
 		set_preload
 		timeout -k "${killtime:-15}" "${termtime:-15}" /opt/bin/mediaclient --shutdown
diff --git a/media-tv/sundtek-tv/sundtek-tv-160623.182622.ebuild b/media-tv/sundtek-tv/sundtek-tv-160623.182622-r1.ebuild
index b1a0d784..b1a0d784 100644
--- a/media-tv/sundtek-tv/sundtek-tv-160623.182622.ebuild
+++ b/media-tv/sundtek-tv/sundtek-tv-160623.182622-r1.ebuild
diff --git a/media-video/video-mv/Manifest b/media-video/video-mv/Manifest
index 94708fd7..a4b02dac 100644
--- a/media-video/video-mv/Manifest
+++ b/media-video/video-mv/Manifest
@@ -1 +1 @@
-DIST video-mv-9.2.tar.gz 18384 SHA256 e01f8e24ecb391781e7f9ae4db28129fca6e6253861356cf2bbfdf8772b1bfa7
+DIST video-mv-9.3.tar.gz 18396 SHA256 c8091625389ce4fc1c6e23af3cccad1076221a464dc8a835c85141139685a5e6
diff --git a/media-video/video-mv/video-mv-9.2.ebuild b/media-video/video-mv/video-mv-9.3.ebuild
index dddaad74..dddaad74 100644
--- a/media-video/video-mv/video-mv-9.2.ebuild
+++ b/media-video/video-mv/video-mv-9.3.ebuild
diff --git a/net-firewall/firewall-mv/Manifest b/net-firewall/firewall-mv/Manifest
index a92bd193..030a5fe9 100644
--- a/net-firewall/firewall-mv/Manifest
+++ b/net-firewall/firewall-mv/Manifest
@@ -1 +1 @@
-DIST firewall-mv-9.1.tar.gz 16109 SHA256 f71dc8972b90aee155dcc3f1ae6563e20390ca9f8fff7eda72ed0559afe15a3c
+DIST firewall-mv-9.2.tar.gz 16115 SHA256 3cc07be944f411dd9143de8c4665537bf02c4f3da79cc1f265bb96959adcde25
diff --git a/net-firewall/firewall-mv/firewall-mv-9.1.ebuild b/net-firewall/firewall-mv/firewall-mv-9.2.ebuild
index e86df95e..e86df95e 100644
--- a/net-firewall/firewall-mv/firewall-mv-9.1.ebuild
+++ b/net-firewall/firewall-mv/firewall-mv-9.2.ebuild
diff --git a/sys-apps/cpi/Manifest b/sys-apps/cpi/Manifest
index cace6114..686829ef 100644
--- a/sys-apps/cpi/Manifest
+++ b/sys-apps/cpi/Manifest
@@ -1 +1 @@
-DIST cpi-2.10.tar.gz 3416 SHA256 67d6ea00b9817c1da523158ea61ed4441683343b9df83babdf1b707ac7d6d35f
+DIST cpi-2.11.tar.gz 3417 SHA256 766b57e1efdff25acbeeef0d6b507066f8907cf62645bd27d183be33744aba7b
diff --git a/sys-apps/cpi/cpi-2.10.ebuild b/sys-apps/cpi/cpi-2.11.ebuild
index bd33c28f..bd33c28f 100644
--- a/sys-apps/cpi/cpi-2.10.ebuild
+++ b/sys-apps/cpi/cpi-2.11.ebuild
diff --git a/sys-apps/starter/Manifest b/sys-apps/starter/Manifest
index d6e19102..8870d18c 100644
--- a/sys-apps/starter/Manifest
+++ b/sys-apps/starter/Manifest
@@ -1 +1 @@
-DIST starter-2.15.tar.gz 6504 SHA256 ee2b600f691970c6da38d15d279eacce10396a7abf66cc260cb493d49b60d95a
+DIST starter-2.16.tar.gz 6508 SHA256 762693b463f1db7fc2c691d143faadf33dffe8768c9af8222666ce828477a071
diff --git a/sys-apps/starter/starter-2.15.ebuild b/sys-apps/starter/starter-2.16.ebuild
index b97ea0fd..b97ea0fd 100644
--- a/sys-apps/starter/starter-2.15.ebuild
+++ b/sys-apps/starter/starter-2.16.ebuild
diff --git a/sys-kernel/kernel/Manifest b/sys-kernel/kernel/Manifest
index edc0ffab..3a829739 100644
--- a/sys-kernel/kernel/Manifest
+++ b/sys-kernel/kernel/Manifest
@@ -1 +1 @@
-DIST kernel-1.46.tar.gz 8190 SHA256 996cfb5016adf868d866dd0bf7ca599f119e58360092d720510da4b6618d39be
+DIST kernel-1.47.tar.gz 8194 SHA256 c59a91c0a5264598dc11d133428f76223ed00256e9f9c16cd16d3adea987d7ec
diff --git a/sys-kernel/kernel/kernel-1.46.ebuild b/sys-kernel/kernel/kernel-1.47.ebuild
index 913d8461..913d8461 100644
--- a/sys-kernel/kernel/kernel-1.46.ebuild
+++ b/sys-kernel/kernel/kernel-1.47.ebuild