From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-943648-garchives=archives.gentoo.org@lists.gentoo.org>
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 D930B139696
for <garchives@archives.gentoo.org>; Tue, 11 Apr 2017 11:46:39 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 2BDA421C07F;
Tue, 11 Apr 2017 11:46:39 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(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 E73C621C012
for <gentoo-commits@lists.gentoo.org>; Tue, 11 Apr 2017 11:46:38 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(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 B402D3412CB
for <gentoo-commits@lists.gentoo.org>; Tue, 11 Apr 2017 11:46:35 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 233BB69BC
for <gentoo-commits@lists.gentoo.org>; Tue, 11 Apr 2017 11:46:34 +0000 (UTC)
From: "NP Hardass" <np-hardass@gentoo.org>
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" <np-hardass@gentoo.org>
Message-ID: <1491911182.d14c0c08fcf30b35faebd1c93254d13a08d23b3d.np-hardass@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-vanilla/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-emulation/wine-vanilla/wine-vanilla-2.0.ebuild app-emulation/wine-vanilla/wine-vanilla-2.1.ebuild app-emulation/wine-vanilla/wine-vanilla-2.2.ebuild app-emulation/wine-vanilla/wine-vanilla-2.3.ebuild app-emulation/wine-vanilla/wine-vanilla-2.4.ebuild app-emulation/wine-vanilla/wine-vanilla-2.5.ebuild app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
X-VCS-Directories: app-emulation/wine-vanilla/
X-VCS-Committer: np-hardass
X-VCS-Committer-Name: NP Hardass
X-VCS-Revision: d14c0c08fcf30b35faebd1c93254d13a08d23b3d
X-VCS-Branch: master
Date: Tue, 11 Apr 2017 11:46:34 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: de7017cd-5be3-49e9-afdc-c87bcafbd28b
X-Archives-Hash: d27da3df4b8ae9d9a2c5b04c5c69f7fe
commit: d14c0c08fcf30b35faebd1c93254d13a08d23b3d
Author: NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 11 11:35:47 2017 +0000
Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Tue Apr 11 11:46:22 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d14c0c08
app-emulation/wine-vanilla: QA, use failglob
Addresses some of the issues in #615218
Package-Manager: Portage-2.3.3, Repoman-2.3.1
app-emulation/wine-vanilla/wine-vanilla-2.0.ebuild | 18 +++++++++++++-----
app-emulation/wine-vanilla/wine-vanilla-2.1.ebuild | 18 +++++++++++++-----
app-emulation/wine-vanilla/wine-vanilla-2.2.ebuild | 18 +++++++++++++-----
app-emulation/wine-vanilla/wine-vanilla-2.3.ebuild | 18 +++++++++++++-----
app-emulation/wine-vanilla/wine-vanilla-2.4.ebuild | 18 +++++++++++++-----
app-emulation/wine-vanilla/wine-vanilla-2.5.ebuild | 18 +++++++++++++-----
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() {