commit: 639e586ee7b96f450407a4408f78aa0794679161
Author: NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 11 11:39:55 2017 +0000
Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Tue Apr 11 11:46:28 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=639e586e
app-emulation/wine-any: QA, use failglob
Addresses some of the issues in #615218
Package-Manager: Portage-2.3.3, Repoman-2.3.1
app-emulation/wine-any/wine-any-2.0.ebuild | 18 +++++++++++++-----
app-emulation/wine-any/wine-any-2.1.ebuild | 18 +++++++++++++-----
app-emulation/wine-any/wine-any-2.2.ebuild | 18 +++++++++++++-----
app-emulation/wine-any/wine-any-2.3.ebuild | 18 +++++++++++++-----
app-emulation/wine-any/wine-any-2.4.ebuild | 18 +++++++++++++-----
app-emulation/wine-any/wine-any-2.5.ebuild | 18 +++++++++++++-----
app-emulation/wine-any/wine-any-9999.ebuild | 18 +++++++++++++-----
7 files changed, 91 insertions(+), 35 deletions(-)
diff --git a/app-emulation/wine-any/wine-any-2.0.ebuild
b/app-emulation/wine-any/wine-any-2.0.ebuild
index 3cdfb2f30ab..58fb0f20dda 100644
--- a/app-emulation/wine-any/wine-any-2.0.ebuild
+++ b/app-emulation/wine-any/wine-any-2.0.ebuild
@@ -512,7 +512,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} )
@@ -545,22 +544,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-any/wine-any-2.1.ebuild
b/app-emulation/wine-any/wine-any-2.1.ebuild
index 88e2cd700de..c87d49433e7 100644
--- a/app-emulation/wine-any/wine-any-2.1.ebuild
+++ b/app-emulation/wine-any/wine-any-2.1.ebuild
@@ -512,7 +512,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} )
@@ -545,22 +544,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-any/wine-any-2.2.ebuild
b/app-emulation/wine-any/wine-any-2.2.ebuild
index 88e2cd700de..c87d49433e7 100644
--- a/app-emulation/wine-any/wine-any-2.2.ebuild
+++ b/app-emulation/wine-any/wine-any-2.2.ebuild
@@ -512,7 +512,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} )
@@ -545,22 +544,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-any/wine-any-2.3.ebuild
b/app-emulation/wine-any/wine-any-2.3.ebuild
index 88e2cd700de..c87d49433e7 100644
--- a/app-emulation/wine-any/wine-any-2.3.ebuild
+++ b/app-emulation/wine-any/wine-any-2.3.ebuild
@@ -512,7 +512,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} )
@@ -545,22 +544,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-any/wine-any-2.4.ebuild
b/app-emulation/wine-any/wine-any-2.4.ebuild
index 35211f1a29b..03a2d7e69b8 100644
--- a/app-emulation/wine-any/wine-any-2.4.ebuild
+++ b/app-emulation/wine-any/wine-any-2.4.ebuild
@@ -512,7 +512,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} )
@@ -545,22 +544,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-any/wine-any-2.5.ebuild
b/app-emulation/wine-any/wine-any-2.5.ebuild
index 35211f1a29b..03a2d7e69b8 100644
--- a/app-emulation/wine-any/wine-any-2.5.ebuild
+++ b/app-emulation/wine-any/wine-any-2.5.ebuild
@@ -512,7 +512,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} )
@@ -545,22 +544,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-any/wine-any-9999.ebuild
b/app-emulation/wine-any/wine-any-9999.ebuild
index 35211f1a29b..03a2d7e69b8 100644
--- a/app-emulation/wine-any/wine-any-9999.ebuild
+++ b/app-emulation/wine-any/wine-any-9999.ebuild
@@ -512,7 +512,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} )
@@ -545,22 +544,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() {
