diff options
| author |   Nick Sarnie <sarnex@gentoo.org> | 2019-08-19 18:41:19 -0400 |
|---|---|---|
| committer | Nick Sarnie <sarnex@gentoo.org> | 2019-08-19 18:41:19 -0400 |
| commit | 6bddcf8783c273d9ff4c9ec496d9119a4a2243ef (patch) | |
| tree | 3e06d9ba9834d02bc22f028477ce7f4dc08760ff | |
| parent | app-emulation/wine-staging: Bump to 4.14 (diff) | |
| download | wine-6bddcf87.tar.gz wine-6bddcf87.tar.bz2 wine-6bddcf87.zip | |
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 <sarnex@gentoo.org>
| -rw-r--r-- | app-emulation/wine-vanilla/wine-vanilla-4.14.ebuild | 7 | ||||
| -rw-r--r-- | 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 |