From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5198A139694 for ; Tue, 11 Apr 2017 11:46:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9FE2E21C08B; Tue, 11 Apr 2017 11:46:39 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7056321C08B for ; Tue, 11 Apr 2017 11:46:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 48C9B33E4AD for ; Tue, 11 Apr 2017 11:46:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 661DC742E for ; Tue, 11 Apr 2017 11:46:34 +0000 (UTC) From: "NP Hardass" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "NP Hardass" Message-ID: <1491911188.639e586ee7b96f450407a4408f78aa0794679161.np-hardass@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-any/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/wine-any/wine-any-2.0.ebuild app-emulation/wine-any/wine-any-2.1.ebuild app-emulation/wine-any/wine-any-2.2.ebuild app-emulation/wine-any/wine-any-2.3.ebuild app-emulation/wine-any/wine-any-2.4.ebuild app-emulation/wine-any/wine-any-2.5.ebuild app-emulation/wine-any/wine-any-9999.ebuild X-VCS-Directories: app-emulation/wine-any/ X-VCS-Committer: np-hardass X-VCS-Committer-Name: NP Hardass X-VCS-Revision: 639e586ee7b96f450407a4408f78aa0794679161 X-VCS-Branch: master Date: Tue, 11 Apr 2017 11:46:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 41d5f7a8-ccef-4797-ace2-3d6861230bfc X-Archives-Hash: 9aeb2580eae80a8263d1774c80da9082 commit: 639e586ee7b96f450407a4408f78aa0794679161 Author: NP-Hardass gentoo org> AuthorDate: Tue Apr 11 11:39:55 2017 +0000 Commit: NP Hardass gentoo 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() {