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