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 2E2F2138334 for ; Mon, 19 Aug 2019 22:45:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 52073E0849; Mon, 19 Aug 2019 22:45:10 +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-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 27E43E0849 for ; Mon, 19 Aug 2019 22:45:10 +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 7F2E7349E7D for ; Mon, 19 Aug 2019 22:45:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 89C654D3 for ; Mon, 19 Aug 2019 22:45:06 +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: <1566254479.6bddcf8783c273d9ff4c9ec496d9119a4a2243ef.sarnex@gentoo> Subject: [gentoo-commits] repo/proj/wine:master commit in: app-emulation/wine-vanilla/ X-VCS-Repository: repo/proj/wine X-VCS-Files: app-emulation/wine-vanilla/wine-vanilla-4.14.ebuild app-emulation/wine-vanilla/wine-vanilla-9999.ebuild X-VCS-Directories: app-emulation/wine-vanilla/ X-VCS-Committer: sarnex X-VCS-Committer-Name: Nick Sarnie X-VCS-Revision: 6bddcf8783c273d9ff4c9ec496d9119a4a2243ef X-VCS-Branch: master Date: Mon, 19 Aug 2019 22:45:06 +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: 13166007-39cb-4337-8741-7355020d61ba X-Archives-Hash: 7cd089ffb67dd2de312f3e36740b53eb commit: 6bddcf8783c273d9ff4c9ec496d9119a4a2243ef Author: Nick Sarnie gentoo org> AuthorDate: Mon Aug 19 22:41:19 2019 +0000 Commit: Nick Sarnie gentoo org> CommitDate: Mon Aug 19 22:41:19 2019 +0000 URL: https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=6bddcf87 app-emulation/wine-vanilla: Apply rogue commit to revbump Fixes: https://bugs.gentoo.org/692502 Package-Manager: Portage-2.3.71, Repoman-2.3.17 Signed-off-by: Nick Sarnie gentoo.org> app-emulation/wine-vanilla/wine-vanilla-4.14.ebuild | 7 +++++-- app-emulation/wine-vanilla/wine-vanilla-9999.ebuild | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.14.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.14.ebuild index da7b746..d6779b0 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-4.14.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-4.14.ebuild @@ -368,7 +368,7 @@ multilib_src_configure() { --libexecdir="${MY_LIBEXECDIR}" --localstatedir="${MY_LOCALSTATEDIR}" --mandir="${MY_MANDIR}" - --sysconfdir=/etc/wine + --sysconfdir="${EPREFIX}/etc/wine" $(use_with alsa) $(use_with capi) $(use_with lcms cms) @@ -481,6 +481,9 @@ multilib_src_install_all() { 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}} + if use abi_x86_64 && ! use abi_x86_32; then dosym wine64 "${MY_PREFIX}"/bin/wine # 404331 dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader @@ -491,7 +494,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 "${D%/}${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-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild index da7b746..d6779b0 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild @@ -368,7 +368,7 @@ multilib_src_configure() { --libexecdir="${MY_LIBEXECDIR}" --localstatedir="${MY_LOCALSTATEDIR}" --mandir="${MY_MANDIR}" - --sysconfdir=/etc/wine + --sysconfdir="${EPREFIX}/etc/wine" $(use_with alsa) $(use_with capi) $(use_with lcms cms) @@ -481,6 +481,9 @@ multilib_src_install_all() { 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}} + if use abi_x86_64 && ! use abi_x86_32; then dosym wine64 "${MY_PREFIX}"/bin/wine # 404331 dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader @@ -491,7 +494,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 "${D%/}${MY_PREFIX}"/bin/*; do + for b in "${ED%/}${MY_PREFIX}"/bin/*; do make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}" done eshopts_pop