From 493600f430ad8bdeb9b421b3ee4a3a18b556c552 Mon Sep 17 00:00:00 2001
From: NP-Hardass <NP-Hardass@gentoo.org>
Date: Fri, 30 Dec 2016 17:40:38 -0500
Subject: 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
---
 app-emulation/wine/wine-1.9.12-r2.ebuild | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'app-emulation/wine/wine-1.9.12-r2.ebuild')

diff --git a/app-emulation/wine/wine-1.9.12-r2.ebuild b/app-emulation/wine/wine-1.9.12-r2.ebuild
index 4d1c5ee9ada4..f8713ef13c45 100644
--- a/app-emulation/wine/wine-1.9.12-r2.ebuild
+++ b/app-emulation/wine/wine-1.9.12-r2.ebuild
@@ -509,8 +509,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
-- 
cgit v1.2.3-65-gdbad