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