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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5EA8115808B for ; Sun, 10 Apr 2022 20:43:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 31A11E09F9; Sun, 10 Apr 2022 20:43:41 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B8AB3E09F4 for ; Sun, 10 Apr 2022 20:43:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D468E341884 for ; Sun, 10 Apr 2022 20:43:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3165C391 for ; Sun, 10 Apr 2022 20:43:35 +0000 (UTC) From: "Nick Sarnie" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nick Sarnie" Message-ID: <1649623387.09e40e8a3062a84f9b22229bcdca50a19b45f807.sarnex@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-staging/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/wine-staging/wine-staging-7.3.ebuild app-emulation/wine-staging/wine-staging-7.4.ebuild app-emulation/wine-staging/wine-staging-7.5.ebuild app-emulation/wine-staging/wine-staging-7.6.ebuild app-emulation/wine-staging/wine-staging-9999.ebuild X-VCS-Directories: app-emulation/wine-staging/ X-VCS-Committer: sarnex X-VCS-Committer-Name: Nick Sarnie X-VCS-Revision: 09e40e8a3062a84f9b22229bcdca50a19b45f807 X-VCS-Branch: master Date: Sun, 10 Apr 2022 20:43:35 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 15bc2593-bf90-4c13-b823-e815473b74f1 X-Archives-Hash: e8b82e1a2c2356d352f45434e1600cfd commit: 09e40e8a3062a84f9b22229bcdca50a19b45f807 Author: Nick Sarnie gentoo org> AuthorDate: Sun Apr 10 20:41:55 2022 +0000 Commit: Nick Sarnie gentoo org> CommitDate: Sun Apr 10 20:43:07 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09e40e8a app-emulation/wine-staging: Sync with ::wine Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Nick Sarnie gentoo.org> app-emulation/wine-staging/wine-staging-7.3.ebuild | 10 +++++----- app-emulation/wine-staging/wine-staging-7.4.ebuild | 10 +++++----- app-emulation/wine-staging/wine-staging-7.5.ebuild | 10 +++++----- app-emulation/wine-staging/wine-staging-7.6.ebuild | 10 +++++----- app-emulation/wine-staging/wine-staging-9999.ebuild | 10 +++++----- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/app-emulation/wine-staging/wine-staging-7.3.ebuild b/app-emulation/wine-staging/wine-staging-7.3.ebuild index eac3a1f79a98..6cdb36031f36 100644 --- a/app-emulation/wine-staging/wine-staging-7.3.ebuild +++ b/app-emulation/wine-staging/wine-staging-7.3.ebuild @@ -547,12 +547,12 @@ multilib_src_install_all() { find "${ED}" -name *.la -delete || die if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script - rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \ - "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die + rm "${D%}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \ + "${D%}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die fi - use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055 - use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader} + use abi_x86_32 && pax-mark psmr "${D%}${MY_PREFIX}"/bin/wine{,-preloader} #255055 + use abi_x86_64 && pax-mark psmr "${D%}${MY_PREFIX}"/bin/wine64{,-preloader} # Avoid double prefix from dosym and make_wrapper MY_PREFIX=${MY_PREFIX#${EPREFIX}} @@ -567,7 +567,7 @@ multilib_src_install_all() { # 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 "${ED%/}${MY_PREFIX}"/bin/*; do + for b in "${ED%}${MY_PREFIX}"/bin/*; do make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}" done eshopts_pop diff --git a/app-emulation/wine-staging/wine-staging-7.4.ebuild b/app-emulation/wine-staging/wine-staging-7.4.ebuild index eac3a1f79a98..6cdb36031f36 100644 --- a/app-emulation/wine-staging/wine-staging-7.4.ebuild +++ b/app-emulation/wine-staging/wine-staging-7.4.ebuild @@ -547,12 +547,12 @@ multilib_src_install_all() { find "${ED}" -name *.la -delete || die if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script - rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \ - "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die + rm "${D%}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \ + "${D%}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die fi - use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055 - use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader} + use abi_x86_32 && pax-mark psmr "${D%}${MY_PREFIX}"/bin/wine{,-preloader} #255055 + use abi_x86_64 && pax-mark psmr "${D%}${MY_PREFIX}"/bin/wine64{,-preloader} # Avoid double prefix from dosym and make_wrapper MY_PREFIX=${MY_PREFIX#${EPREFIX}} @@ -567,7 +567,7 @@ multilib_src_install_all() { # 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 "${ED%/}${MY_PREFIX}"/bin/*; do + for b in "${ED%}${MY_PREFIX}"/bin/*; do make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}" done eshopts_pop diff --git a/app-emulation/wine-staging/wine-staging-7.5.ebuild b/app-emulation/wine-staging/wine-staging-7.5.ebuild index eac3a1f79a98..6cdb36031f36 100644 --- a/app-emulation/wine-staging/wine-staging-7.5.ebuild +++ b/app-emulation/wine-staging/wine-staging-7.5.ebuild @@ -547,12 +547,12 @@ multilib_src_install_all() { find "${ED}" -name *.la -delete || die if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script - rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \ - "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die + rm "${D%}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \ + "${D%}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die fi - use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055 - use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader} + use abi_x86_32 && pax-mark psmr "${D%}${MY_PREFIX}"/bin/wine{,-preloader} #255055 + use abi_x86_64 && pax-mark psmr "${D%}${MY_PREFIX}"/bin/wine64{,-preloader} # Avoid double prefix from dosym and make_wrapper MY_PREFIX=${MY_PREFIX#${EPREFIX}} @@ -567,7 +567,7 @@ multilib_src_install_all() { # 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 "${ED%/}${MY_PREFIX}"/bin/*; do + for b in "${ED%}${MY_PREFIX}"/bin/*; do make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}" done eshopts_pop diff --git a/app-emulation/wine-staging/wine-staging-7.6.ebuild b/app-emulation/wine-staging/wine-staging-7.6.ebuild index cf7e3d6df0ec..3af57b1a2e46 100644 --- a/app-emulation/wine-staging/wine-staging-7.6.ebuild +++ b/app-emulation/wine-staging/wine-staging-7.6.ebuild @@ -547,12 +547,12 @@ multilib_src_install_all() { find "${ED}" -name *.la -delete || die if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script - rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \ - "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die + rm "${D%}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \ + "${D%}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die fi - use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055 - use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader} + use abi_x86_32 && pax-mark psmr "${D%}${MY_PREFIX}"/bin/wine{,-preloader} #255055 + use abi_x86_64 && pax-mark psmr "${D%}${MY_PREFIX}"/bin/wine64{,-preloader} # Avoid double prefix from dosym and make_wrapper MY_PREFIX=${MY_PREFIX#${EPREFIX}} @@ -567,7 +567,7 @@ multilib_src_install_all() { # 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 "${ED%/}${MY_PREFIX}"/bin/*; do + for b in "${ED%}${MY_PREFIX}"/bin/*; do make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}" done eshopts_pop diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild index cf7e3d6df0ec..3af57b1a2e46 100644 --- a/app-emulation/wine-staging/wine-staging-9999.ebuild +++ b/app-emulation/wine-staging/wine-staging-9999.ebuild @@ -547,12 +547,12 @@ multilib_src_install_all() { find "${ED}" -name *.la -delete || die if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script - rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \ - "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die + rm "${D%}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \ + "${D%}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die fi - use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055 - use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader} + use abi_x86_32 && pax-mark psmr "${D%}${MY_PREFIX}"/bin/wine{,-preloader} #255055 + use abi_x86_64 && pax-mark psmr "${D%}${MY_PREFIX}"/bin/wine64{,-preloader} # Avoid double prefix from dosym and make_wrapper MY_PREFIX=${MY_PREFIX#${EPREFIX}} @@ -567,7 +567,7 @@ multilib_src_install_all() { # 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 "${ED%/}${MY_PREFIX}"/bin/*; do + for b in "${ED%}${MY_PREFIX}"/bin/*; do make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}" done eshopts_pop