diff options
| author |   NP-Hardass <NP-Hardass@gentoo.org> | 2016-12-30 17:40:38 -0500 |
|---|---|---|
| committer | NP-Hardass <NP-Hardass@gentoo.org> | 2016-12-30 17:42:35 -0500 |
| commit | 493600f430ad8bdeb9b421b3ee4a3a18b556c552 (patch) | |
| tree | 43cf9cc00162d872de5a2ad86fa02581925f2272 /app-emulation/wine/wine-1.8-r3.ebuild | |
| parent | media-libs/atlas-c++: remove unused patches. (diff) | |
| download | gentoo-493600f430ad8bdeb9b421b3ee4a3a18b556c552.tar.gz gentoo-493600f430ad8bdeb9b421b3ee4a3a18b556c552.tar.bz2 gentoo-493600f430ad8bdeb9b421b3ee4a3a18b556c552.zip | |
app-emulation/wine: update to use multilib_foreach_abi in src_install
Uses multilib_foreach_abi to rm wineconsole now, so it should handle
systems with merged libdirs, as per mgorny's request.
Package-Manager: portage-2.3.0
Diffstat (limited to 'app-emulation/wine/wine-1.8-r3.ebuild')
| -rw-r--r-- | app-emulation/wine/wine-1.8-r3.ebuild | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app-emulation/wine/wine-1.8-r3.ebuild b/app-emulation/wine/wine-1.8-r3.ebuild index 02b5c87249c7..696da26c13dd 100644 --- a/app-emulation/wine/wine-1.8-r3.ebuild +++ b/app-emulation/wine/wine-1.8-r3.ebuild @@ -485,8 +485,10 @@ multilib_src_install_all() { if ! use X && ! use ncurses; then rm "${D}"/usr/bin/wineconsole* || die rm "${D}"/usr/share/man/man1/wineconsole* || die - use abi_x86_32 && rm "${D}"/usr/lib32/wine/{,fakedlls/}wineconsole.exe* || die - use abi_x86_64 && rm "${D}"/usr/lib64/wine/{,fakedlls/}wineconsole.exe* || die + rm_wineconsole() { + rm "${D}usr/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die + } + multilib_foreach_abi rm_wineconsole fi use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055 |