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

Addresses some of the issues in #615218

Package-Manager: Portage-2.3.3, Repoman-2.3.1

diff --git a/app-emulation/wine-staging/wine-staging-2.0.ebuild b/app-emulation/wine-staging/wine-staging-2.0.ebuild
index 18a5e659b2dd2621493de947d812e74f02f1bdd8..b70eb9a6b1d27db962d39d631f393a6934a8bc41 100644 (file)
--- a/app-emulation/wine-staging/wine-staging-2.0.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.0.ebuild
@@ -490,7 +490,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} )
@@ -523,22 +522,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-staging/wine-staging-2.1.ebuild b/app-emulation/wine-staging/wine-staging-2.1.ebuild
index f2288f09301cf4888b903a6d9e1b4c2ce9f4d864..a1f3318dbd792e2cba4018d5afbb3b690ffa065c 100644 (file)
--- a/app-emulation/wine-staging/wine-staging-2.1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.1.ebuild
@@ -489,7 +489,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} )
@@ -522,22 +521,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-staging/wine-staging-2.2.ebuild b/app-emulation/wine-staging/wine-staging-2.2.ebuild
index f2288f09301cf4888b903a6d9e1b4c2ce9f4d864..a1f3318dbd792e2cba4018d5afbb3b690ffa065c 100644 (file)
--- a/app-emulation/wine-staging/wine-staging-2.2.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.2.ebuild
@@ -489,7 +489,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} )
@@ -522,22 +521,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-staging/wine-staging-2.3.ebuild b/app-emulation/wine-staging/wine-staging-2.3.ebuild
index f2288f09301cf4888b903a6d9e1b4c2ce9f4d864..a1f3318dbd792e2cba4018d5afbb3b690ffa065c 100644 (file)
--- a/app-emulation/wine-staging/wine-staging-2.3.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.3.ebuild
@@ -489,7 +489,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} )
@@ -522,22 +521,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-staging/wine-staging-2.4.ebuild b/app-emulation/wine-staging/wine-staging-2.4.ebuild
index e53b6d79eb820640f1f6aee12bc41cb3a549d27d..514c69d95197539bd1bc5b4dee0678fb968ab6ac 100644 (file)
--- a/app-emulation/wine-staging/wine-staging-2.4.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.4.ebuild
@@ -489,7 +489,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} )
@@ -522,22 +521,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-staging/wine-staging-2.5.ebuild b/app-emulation/wine-staging/wine-staging-2.5.ebuild
index e53b6d79eb820640f1f6aee12bc41cb3a549d27d..514c69d95197539bd1bc5b4dee0678fb968ab6ac 100644 (file)
--- a/app-emulation/wine-staging/wine-staging-2.5.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.5.ebuild
@@ -489,7 +489,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} )
@@ -522,22 +521,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-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
index e53b6d79eb820640f1f6aee12bc41cb3a549d27d..514c69d95197539bd1bc5b4dee0678fb968ab6ac 100644 (file)
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -489,7 +489,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} )
@@ -522,22 +521,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() {