app-emulation/wine-d3d9: QA, use failglob

Addresses some of the issues in #615218

Package-Manager: Portage-2.3.3, Repoman-2.3.1

7 files changed, 91 insertions, 35 deletions

diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.0.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.0.ebuild
index 2d32ef35e24c..bdb69354a6c9 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-2.0.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.0.ebuild
@@ -452,7 +452,6 @@ multilib_src_test() {
 
 multilib_src_install_all() {
 	local DOCS=( ANNOUNCE AUTHORS README )
-	local l
 	add_locale_docs() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
@@ -485,22 +484,31 @@ multilib_src_install_all() {
 		dosym "${MY_PREFIX}"/bin/wine{64,}-preloader
 	fi
 
+	# Failglob for bin and man loops
+	local glob_state=$(shopt -p failglob)
+	shopt -s failglob
+
 	# Make wrappers for binaries for handling multiple variants
 	# Note: wrappers instead of symlinks because some are shell which use basename
+	local b
 	for b in "${D%/}${MY_PREFIX}"/bin/*; do
-		make_wrapper ${b##*/}-${WINE_VARIANT} "${MY_PREFIX}"/bin/${b##*/}
+		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
 	done
 
 	# respect LINGUAS when installing man pages, #469418
+	local l
 	for l in de fr pl; do
 		use linguas_${l} || rm -r "${D%/}${MY_MANDIR}"/${l}*
 	done
 
+	local m
 	for m in "${D%/}${MY_MANDIR}"/*/*; do
-		new_man=${m##*/}
-		new_man=${new_man%%.1}
-		newman "${m}" ${new_man##*/}-${WINE_VARIANT}.1
+		new_man="${m##*/}"
+		new_man="${new_man%%.1}"
+		newman "${m}" "${new_man##*/}-${WINE_VARIANT}.1"
 	done
+
+	eval "${glob_state}"
 }
 
 pkg_postinst() {
diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.1.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.1.ebuild
index 2b6973341d34..5b66aee363e1 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-2.1.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.1.ebuild
@@ -452,7 +452,6 @@ multilib_src_test() {
 
 multilib_src_install_all() {
 	local DOCS=( ANNOUNCE AUTHORS README )
-	local l
 	add_locale_docs() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
@@ -485,22 +484,31 @@ multilib_src_install_all() {
 		dosym "${MY_PREFIX}"/bin/wine{64,}-preloader
 	fi
 
+	# Failglob for bin and man loops
+	local glob_state=$(shopt -p failglob)
+	shopt -s failglob
+
 	# Make wrappers for binaries for handling multiple variants
 	# Note: wrappers instead of symlinks because some are shell which use basename
+	local b
 	for b in "${D%/}${MY_PREFIX}"/bin/*; do
-		make_wrapper ${b##*/}-${WINE_VARIANT} "${MY_PREFIX}"/bin/${b##*/}
+		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
 	done
 
 	# respect LINGUAS when installing man pages, #469418
+	local l
 	for l in de fr pl; do
 		use linguas_${l} || rm -r "${D%/}${MY_MANDIR}"/${l}*
 	done
 
+	local m
 	for m in "${D%/}${MY_MANDIR}"/*/*; do
-		new_man=${m##*/}
-		new_man=${new_man%%.1}
-		newman "${m}" ${new_man##*/}-${WINE_VARIANT}.1
+		new_man="${m##*/}"
+		new_man="${new_man%%.1}"
+		newman "${m}" "${new_man##*/}-${WINE_VARIANT}.1"
 	done
+
+	eval "${glob_state}"
 }
 
 pkg_postinst() {
diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.2.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.2.ebuild
index 2b6973341d34..5b66aee363e1 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-2.2.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.2.ebuild
@@ -452,7 +452,6 @@ multilib_src_test() {
 
 multilib_src_install_all() {
 	local DOCS=( ANNOUNCE AUTHORS README )
-	local l
 	add_locale_docs() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
@@ -485,22 +484,31 @@ multilib_src_install_all() {
 		dosym "${MY_PREFIX}"/bin/wine{64,}-preloader
 	fi
 
+	# Failglob for bin and man loops
+	local glob_state=$(shopt -p failglob)
+	shopt -s failglob
+
 	# Make wrappers for binaries for handling multiple variants
 	# Note: wrappers instead of symlinks because some are shell which use basename
+	local b
 	for b in "${D%/}${MY_PREFIX}"/bin/*; do
-		make_wrapper ${b##*/}-${WINE_VARIANT} "${MY_PREFIX}"/bin/${b##*/}
+		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
 	done
 
 	# respect LINGUAS when installing man pages, #469418
+	local l
 	for l in de fr pl; do
 		use linguas_${l} || rm -r "${D%/}${MY_MANDIR}"/${l}*
 	done
 
+	local m
 	for m in "${D%/}${MY_MANDIR}"/*/*; do
-		new_man=${m##*/}
-		new_man=${new_man%%.1}
-		newman "${m}" ${new_man##*/}-${WINE_VARIANT}.1
+		new_man="${m##*/}"
+		new_man="${new_man%%.1}"
+		newman "${m}" "${new_man##*/}-${WINE_VARIANT}.1"
 	done
+
+	eval "${glob_state}"
 }
 
 pkg_postinst() {
diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.3.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.3.ebuild
index 2b6973341d34..5b66aee363e1 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-2.3.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.3.ebuild
@@ -452,7 +452,6 @@ multilib_src_test() {
 
 multilib_src_install_all() {
 	local DOCS=( ANNOUNCE AUTHORS README )
-	local l
 	add_locale_docs() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
@@ -485,22 +484,31 @@ multilib_src_install_all() {
 		dosym "${MY_PREFIX}"/bin/wine{64,}-preloader
 	fi
 
+	# Failglob for bin and man loops
+	local glob_state=$(shopt -p failglob)
+	shopt -s failglob
+
 	# Make wrappers for binaries for handling multiple variants
 	# Note: wrappers instead of symlinks because some are shell which use basename
+	local b
 	for b in "${D%/}${MY_PREFIX}"/bin/*; do
-		make_wrapper ${b##*/}-${WINE_VARIANT} "${MY_PREFIX}"/bin/${b##*/}
+		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
 	done
 
 	# respect LINGUAS when installing man pages, #469418
+	local l
 	for l in de fr pl; do
 		use linguas_${l} || rm -r "${D%/}${MY_MANDIR}"/${l}*
 	done
 
+	local m
 	for m in "${D%/}${MY_MANDIR}"/*/*; do
-		new_man=${m##*/}
-		new_man=${new_man%%.1}
-		newman "${m}" ${new_man##*/}-${WINE_VARIANT}.1
+		new_man="${m##*/}"
+		new_man="${new_man%%.1}"
+		newman "${m}" "${new_man##*/}-${WINE_VARIANT}.1"
 	done
+
+	eval "${glob_state}"
 }
 
 pkg_postinst() {
diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.4.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.4.ebuild
index badba49da229..ba768c017256 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-2.4.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.4.ebuild
@@ -452,7 +452,6 @@ multilib_src_test() {
 
 multilib_src_install_all() {
 	local DOCS=( ANNOUNCE AUTHORS README )
-	local l
 	add_locale_docs() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
@@ -485,22 +484,31 @@ multilib_src_install_all() {
 		dosym "${MY_PREFIX}"/bin/wine{64,}-preloader
 	fi
 
+	# Failglob for bin and man loops
+	local glob_state=$(shopt -p failglob)
+	shopt -s failglob
+
 	# Make wrappers for binaries for handling multiple variants
 	# Note: wrappers instead of symlinks because some are shell which use basename
+	local b
 	for b in "${D%/}${MY_PREFIX}"/bin/*; do
-		make_wrapper ${b##*/}-${WINE_VARIANT} "${MY_PREFIX}"/bin/${b##*/}
+		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
 	done
 
 	# respect LINGUAS when installing man pages, #469418
+	local l
 	for l in de fr pl; do
 		use linguas_${l} || rm -r "${D%/}${MY_MANDIR}"/${l}*
 	done
 
+	local m
 	for m in "${D%/}${MY_MANDIR}"/*/*; do
-		new_man=${m##*/}
-		new_man=${new_man%%.1}
-		newman "${m}" ${new_man##*/}-${WINE_VARIANT}.1
+		new_man="${m##*/}"
+		new_man="${new_man%%.1}"
+		newman "${m}" "${new_man##*/}-${WINE_VARIANT}.1"
 	done
+
+	eval "${glob_state}"
 }
 
 pkg_postinst() {
diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.5.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.5.ebuild
index badba49da229..ba768c017256 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-2.5.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.5.ebuild
@@ -452,7 +452,6 @@ multilib_src_test() {
 
 multilib_src_install_all() {
 	local DOCS=( ANNOUNCE AUTHORS README )
-	local l
 	add_locale_docs() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
@@ -485,22 +484,31 @@ multilib_src_install_all() {
 		dosym "${MY_PREFIX}"/bin/wine{64,}-preloader
 	fi
 
+	# Failglob for bin and man loops
+	local glob_state=$(shopt -p failglob)
+	shopt -s failglob
+
 	# Make wrappers for binaries for handling multiple variants
 	# Note: wrappers instead of symlinks because some are shell which use basename
+	local b
 	for b in "${D%/}${MY_PREFIX}"/bin/*; do
-		make_wrapper ${b##*/}-${WINE_VARIANT} "${MY_PREFIX}"/bin/${b##*/}
+		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
 	done
 
 	# respect LINGUAS when installing man pages, #469418
+	local l
 	for l in de fr pl; do
 		use linguas_${l} || rm -r "${D%/}${MY_MANDIR}"/${l}*
 	done
 
+	local m
 	for m in "${D%/}${MY_MANDIR}"/*/*; do
-		new_man=${m##*/}
-		new_man=${new_man%%.1}
-		newman "${m}" ${new_man##*/}-${WINE_VARIANT}.1
+		new_man="${m##*/}"
+		new_man="${new_man%%.1}"
+		newman "${m}" "${new_man##*/}-${WINE_VARIANT}.1"
 	done
+
+	eval "${glob_state}"
 }
 
 pkg_postinst() {
diff --git a/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild b/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild
index badba49da229..ba768c017256 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild
@@ -452,7 +452,6 @@ multilib_src_test() {
 
 multilib_src_install_all() {
 	local DOCS=( ANNOUNCE AUTHORS README )
-	local l
 	add_locale_docs() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
@@ -485,22 +484,31 @@ multilib_src_install_all() {
 		dosym "${MY_PREFIX}"/bin/wine{64,}-preloader
 	fi
 
+	# Failglob for bin and man loops
+	local glob_state=$(shopt -p failglob)
+	shopt -s failglob
+
 	# Make wrappers for binaries for handling multiple variants
 	# Note: wrappers instead of symlinks because some are shell which use basename
+	local b
 	for b in "${D%/}${MY_PREFIX}"/bin/*; do
-		make_wrapper ${b##*/}-${WINE_VARIANT} "${MY_PREFIX}"/bin/${b##*/}
+		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
 	done
 
 	# respect LINGUAS when installing man pages, #469418
+	local l
 	for l in de fr pl; do
 		use linguas_${l} || rm -r "${D%/}${MY_MANDIR}"/${l}*
 	done
 
+	local m
 	for m in "${D%/}${MY_MANDIR}"/*/*; do
-		new_man=${m##*/}
-		new_man=${new_man%%.1}
-		newman "${m}" ${new_man##*/}-${WINE_VARIANT}.1
+		new_man="${m##*/}"
+		new_man="${new_man%%.1}"
+		newman "${m}" "${new_man##*/}-${WINE_VARIANT}.1"
 	done
+
+	eval "${glob_state}"
 }
 
 pkg_postinst() {