| 1 |
commit: cd1b994ad410920037c617172adefe969a0d58ce |
| 2 |
Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Aug 19 22:46:24 2019 +0000 |
| 4 |
Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Aug 19 22:46:24 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd1b994a |
| 7 |
|
| 8 |
app-emulation/wine-vanilla: Sync with ::wine |
| 9 |
|
| 10 |
Port rogue change |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.71, Repoman-2.3.17 |
| 13 |
Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org> |
| 14 |
|
| 15 |
app-emulation/wine-vanilla/wine-vanilla-4.14.ebuild | 7 +++++-- |
| 16 |
app-emulation/wine-vanilla/wine-vanilla-9999.ebuild | 7 +++++-- |
| 17 |
2 files changed, 10 insertions(+), 4 deletions(-) |
| 18 |
|
| 19 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.14.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.14.ebuild |
| 20 |
index da7b7468027..d6779b0d96a 100644 |
| 21 |
--- a/app-emulation/wine-vanilla/wine-vanilla-4.14.ebuild |
| 22 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.14.ebuild |
| 23 |
@@ -368,7 +368,7 @@ multilib_src_configure() { |
| 24 |
--libexecdir="${MY_LIBEXECDIR}" |
| 25 |
--localstatedir="${MY_LOCALSTATEDIR}" |
| 26 |
--mandir="${MY_MANDIR}" |
| 27 |
- --sysconfdir=/etc/wine |
| 28 |
+ --sysconfdir="${EPREFIX}/etc/wine" |
| 29 |
$(use_with alsa) |
| 30 |
$(use_with capi) |
| 31 |
$(use_with lcms cms) |
| 32 |
@@ -481,6 +481,9 @@ multilib_src_install_all() { |
| 33 |
use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055 |
| 34 |
use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader} |
| 35 |
|
| 36 |
+ # Avoid double prefix from dosym and make_wrapper |
| 37 |
+ MY_PREFIX=${MY_PREFIX#${EPREFIX}} |
| 38 |
+ |
| 39 |
if use abi_x86_64 && ! use abi_x86_32; then |
| 40 |
dosym wine64 "${MY_PREFIX}"/bin/wine # 404331 |
| 41 |
dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader |
| 42 |
@@ -491,7 +494,7 @@ multilib_src_install_all() { |
| 43 |
# Make wrappers for binaries for handling multiple variants |
| 44 |
# Note: wrappers instead of symlinks because some are shell which use basename |
| 45 |
local b |
| 46 |
- for b in "${D%/}${MY_PREFIX}"/bin/*; do |
| 47 |
+ for b in "${ED%/}${MY_PREFIX}"/bin/*; do |
| 48 |
make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}" |
| 49 |
done |
| 50 |
eshopts_pop |
| 51 |
|
| 52 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild |
| 53 |
index da7b7468027..d6779b0d96a 100644 |
| 54 |
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild |
| 55 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild |
| 56 |
@@ -368,7 +368,7 @@ multilib_src_configure() { |
| 57 |
--libexecdir="${MY_LIBEXECDIR}" |
| 58 |
--localstatedir="${MY_LOCALSTATEDIR}" |
| 59 |
--mandir="${MY_MANDIR}" |
| 60 |
- --sysconfdir=/etc/wine |
| 61 |
+ --sysconfdir="${EPREFIX}/etc/wine" |
| 62 |
$(use_with alsa) |
| 63 |
$(use_with capi) |
| 64 |
$(use_with lcms cms) |
| 65 |
@@ -481,6 +481,9 @@ multilib_src_install_all() { |
| 66 |
use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055 |
| 67 |
use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader} |
| 68 |
|
| 69 |
+ # Avoid double prefix from dosym and make_wrapper |
| 70 |
+ MY_PREFIX=${MY_PREFIX#${EPREFIX}} |
| 71 |
+ |
| 72 |
if use abi_x86_64 && ! use abi_x86_32; then |
| 73 |
dosym wine64 "${MY_PREFIX}"/bin/wine # 404331 |
| 74 |
dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader |
| 75 |
@@ -491,7 +494,7 @@ multilib_src_install_all() { |
| 76 |
# Make wrappers for binaries for handling multiple variants |
| 77 |
# Note: wrappers instead of symlinks because some are shell which use basename |
| 78 |
local b |
| 79 |
- for b in "${D%/}${MY_PREFIX}"/bin/*; do |
| 80 |
+ for b in "${ED%/}${MY_PREFIX}"/bin/*; do |
| 81 |
make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}" |
| 82 |
done |
| 83 |
eshopts_pop |
Archives