diff options
author | NP-Hardass <NP-Hardass@gentoo.org> | 2017-04-11 07:35:47 -0400 |
---|---|---|
committer | NP-Hardass <NP-Hardass@gentoo.org> | 2017-04-11 07:46:22 -0400 |
commit | d14c0c08fcf30b35faebd1c93254d13a08d23b3d (patch) | |
tree | 81d5310b76dc0daa8337e01daaccb64e0473aaa9 /app-emulation/wine-vanilla | |
parent | 013167e5255e79d039a628532606bf68f6c3a665 (diff) | |
download | gentoo-d14c0c08fcf30b35faebd1c93254d13a08d23b3d.tar.gz gentoo-d14c0c08fcf30b35faebd1c93254d13a08d23b3d.tar.xz |
app-emulation/wine-vanilla: QA, use failglob
Addresses some of the issues in #615218
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'app-emulation/wine-vanilla')
-rw-r--r-- | app-emulation/wine-vanilla/wine-vanilla-2.0.ebuild | 18 | ||||
-rw-r--r-- | app-emulation/wine-vanilla/wine-vanilla-2.1.ebuild | 18 | ||||
-rw-r--r-- | app-emulation/wine-vanilla/wine-vanilla-2.2.ebuild | 18 | ||||
-rw-r--r-- | app-emulation/wine-vanilla/wine-vanilla-2.3.ebuild | 18 | ||||
-rw-r--r-- | app-emulation/wine-vanilla/wine-vanilla-2.4.ebuild | 18 | ||||
-rw-r--r-- | app-emulation/wine-vanilla/wine-vanilla-2.5.ebuild | 18 | ||||
-rw-r--r-- | app-emulation/wine-vanilla/wine-vanilla-9999.ebuild | 18 |
7 files changed, 91 insertions, 35 deletions
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0.ebuild index 2798232a3dc..534dc092804 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.0.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.0.ebuild @@ -418,7 +418,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} ) @@ -451,22 +450,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-vanilla/wine-vanilla-2.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.1.ebuild index 51cffe1c602..7692f07caf9 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.1.ebuild @@ -418,7 +418,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} ) @@ -451,22 +450,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-vanilla/wine-vanilla-2.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.2.ebuild index 51cffe1c602..7692f07caf9 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.2.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.2.ebuild @@ -418,7 +418,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} ) @@ -451,22 +450,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-vanilla/wine-vanilla-2.3.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.3.ebuild index 51cffe1c602..7692f07caf9 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.3.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.3.ebuild @@ -418,7 +418,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} ) @@ -451,22 +450,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-vanilla/wine-vanilla-2.4.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.4.ebuild index c21891ba821..a0e73034ed1 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.4.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.4.ebuild @@ -418,7 +418,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} ) @@ -451,22 +450,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-vanilla/wine-vanilla-2.5.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.5.ebuild index c21891ba821..a0e73034ed1 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.5.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.5.ebuild @@ -418,7 +418,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} ) @@ -451,22 +450,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-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild index c21891ba821..a0e73034ed1 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild @@ -418,7 +418,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} ) @@ -451,22 +450,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() { |