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

diff --git a/app-emulation/wine/wine-1.8-r3.ebuild b/app-emulation/wine/wine-1.8-r3.ebuild
index 02b5c87249c760d11c4d4892c460fa755ab1e095..696da26c13dd60b68bd055349bd304c0f0b4919c 100644 (file)
--- 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

diff --git a/app-emulation/wine/wine-1.8.1-r3.ebuild b/app-emulation/wine/wine-1.8.1-r3.ebuild
index 7c8a9ce3b60e8c784c5f1934f70686d5f59fc06e..e1eb2098deb934c5049d873b1f9948875e6eeda1 100644 (file)
--- a/app-emulation/wine/wine-1.8.1-r3.ebuild
+++ b/app-emulation/wine/wine-1.8.1-r3.ebuild
@@ -491,8 +491,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

diff --git a/app-emulation/wine/wine-1.8.2-r2.ebuild b/app-emulation/wine/wine-1.8.2-r2.ebuild
index a13d73614fccddc94e461ba24e3521315aa7d977..522fd97225dd10dc81af4aaf9a96a955d9757d3f 100644 (file)
--- a/app-emulation/wine/wine-1.8.2-r2.ebuild
+++ b/app-emulation/wine/wine-1.8.2-r2.ebuild
@@ -491,8 +491,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

diff --git a/app-emulation/wine/wine-1.8.3-r1.ebuild b/app-emulation/wine/wine-1.8.3-r1.ebuild
index eddb6f2807bb07776dea09466c730862ba3b13fd..429315cb8624493f01909bae69f1d7102cdb728d 100644 (file)
--- a/app-emulation/wine/wine-1.8.3-r1.ebuild
+++ b/app-emulation/wine/wine-1.8.3-r1.ebuild
@@ -490,8 +490,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

diff --git a/app-emulation/wine/wine-1.8.4.ebuild b/app-emulation/wine/wine-1.8.4.ebuild
index 0a8889290ad70862a32ee9a13ba7c8fe5df7d1f6..bc8d807a594e2270b9b60e50a2ec15774e3ef759 100644 (file)
--- a/app-emulation/wine/wine-1.8.4.ebuild
+++ b/app-emulation/wine/wine-1.8.4.ebuild
@@ -489,8 +489,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

diff --git a/app-emulation/wine/wine-1.9.10-r3.ebuild b/app-emulation/wine/wine-1.9.10-r3.ebuild
index 06559b172531c3a2fa5905b1af99755e7d3c1de8..e268ad11cac6c328d32dd78db61119b6b7c225bd 100644 (file)
--- a/app-emulation/wine/wine-1.9.10-r3.ebuild
+++ b/app-emulation/wine/wine-1.9.10-r3.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

diff --git a/app-emulation/wine/wine-1.9.11-r3.ebuild b/app-emulation/wine/wine-1.9.11-r3.ebuild
index 06559b172531c3a2fa5905b1af99755e7d3c1de8..e268ad11cac6c328d32dd78db61119b6b7c225bd 100644 (file)
--- a/app-emulation/wine/wine-1.9.11-r3.ebuild
+++ b/app-emulation/wine/wine-1.9.11-r3.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

diff --git a/app-emulation/wine/wine-1.9.12-r2.ebuild b/app-emulation/wine/wine-1.9.12-r2.ebuild
index 4d1c5ee9ada492db5c6e2fb961695e045d8be99f..f8713ef13c453b0b08d2f6f8c0d49293a7de7a8f 100644 (file)
--- 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

diff --git a/app-emulation/wine/wine-1.9.13-r2.ebuild b/app-emulation/wine/wine-1.9.13-r2.ebuild
index 1f4a9c950dece63fd15e4ec26085771642e86bdc..6cee7052b610761020215ba8ee1420c2624edcdb 100644 (file)
--- a/app-emulation/wine/wine-1.9.13-r2.ebuild
+++ b/app-emulation/wine/wine-1.9.13-r2.ebuild
@@ -508,8 +508,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

diff --git a/app-emulation/wine/wine-1.9.14-r2.ebuild b/app-emulation/wine/wine-1.9.14-r2.ebuild
index 1f4a9c950dece63fd15e4ec26085771642e86bdc..6cee7052b610761020215ba8ee1420c2624edcdb 100644 (file)
--- a/app-emulation/wine/wine-1.9.14-r2.ebuild
+++ b/app-emulation/wine/wine-1.9.14-r2.ebuild
@@ -508,8 +508,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

diff --git a/app-emulation/wine/wine-1.9.15-r1.ebuild b/app-emulation/wine/wine-1.9.15-r1.ebuild
index 1f4a9c950dece63fd15e4ec26085771642e86bdc..6cee7052b610761020215ba8ee1420c2624edcdb 100644 (file)
--- a/app-emulation/wine/wine-1.9.15-r1.ebuild
+++ b/app-emulation/wine/wine-1.9.15-r1.ebuild
@@ -508,8 +508,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

diff --git a/app-emulation/wine/wine-1.9.16.ebuild b/app-emulation/wine/wine-1.9.16.ebuild
index 1f4a9c950dece63fd15e4ec26085771642e86bdc..6cee7052b610761020215ba8ee1420c2624edcdb 100644 (file)
--- a/app-emulation/wine/wine-1.9.16.ebuild
+++ b/app-emulation/wine/wine-1.9.16.ebuild
@@ -508,8 +508,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

diff --git a/app-emulation/wine/wine-1.9.17.ebuild b/app-emulation/wine/wine-1.9.17.ebuild
index 9e5e124a96a743c1ae6f66aafd6cc3cc888dd58c..5e3df5f6faed47af70d9a696f0d7e82f836cba38 100644 (file)
--- a/app-emulation/wine/wine-1.9.17.ebuild
+++ b/app-emulation/wine/wine-1.9.17.ebuild
@@ -508,8 +508,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

diff --git a/app-emulation/wine/wine-1.9.18.ebuild b/app-emulation/wine/wine-1.9.18.ebuild
index c90f2c9255e4315505d134016ac4b8a277173927..54f72c07787631ba95a24513769dba4d1c521780 100644 (file)
--- a/app-emulation/wine/wine-1.9.18.ebuild
+++ b/app-emulation/wine/wine-1.9.18.ebuild
@@ -508,8 +508,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

diff --git a/app-emulation/wine/wine-1.9.19-r1.ebuild b/app-emulation/wine/wine-1.9.19-r1.ebuild
index 5c1f95b61bac03c794fec085be05d3a8b7bd6195..5eba6e1a5b42f1ce03beae5d704516be2884d192 100644 (file)
--- a/app-emulation/wine/wine-1.9.19-r1.ebuild
+++ b/app-emulation/wine/wine-1.9.19-r1.ebuild
@@ -510,8 +510,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

diff --git a/app-emulation/wine/wine-1.9.20.ebuild b/app-emulation/wine/wine-1.9.20.ebuild
index 5c1f95b61bac03c794fec085be05d3a8b7bd6195..5eba6e1a5b42f1ce03beae5d704516be2884d192 100644 (file)
--- a/app-emulation/wine/wine-1.9.20.ebuild
+++ b/app-emulation/wine/wine-1.9.20.ebuild
@@ -510,8 +510,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

diff --git a/app-emulation/wine/wine-1.9.4-r3.ebuild b/app-emulation/wine/wine-1.9.4-r3.ebuild
index 7b4221cb0274765c155e691eaa73f534ba129899..ad953d14a3714b21067a4f94cec7088b29206dad 100644 (file)
--- a/app-emulation/wine/wine-1.9.4-r3.ebuild
+++ b/app-emulation/wine/wine-1.9.4-r3.ebuild
@@ -488,8 +488,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

diff --git a/app-emulation/wine/wine-1.9.5-r3.ebuild b/app-emulation/wine/wine-1.9.5-r3.ebuild
index 49b9dc78c43a2176e7df2d2fd7090e543999c433..b0535821edb8374eb8020770d88c95fa31588dea 100644 (file)
--- a/app-emulation/wine/wine-1.9.5-r3.ebuild
+++ b/app-emulation/wine/wine-1.9.5-r3.ebuild
@@ -490,8 +490,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

diff --git a/app-emulation/wine/wine-1.9.6-r3.ebuild b/app-emulation/wine/wine-1.9.6-r3.ebuild
index 186ee04c6675217139b28596c6409a4dfb9e8ffc..fcfa5a0d7c2c62e70e1897f7197b5006cf972af2 100644 (file)
--- a/app-emulation/wine/wine-1.9.6-r3.ebuild
+++ b/app-emulation/wine/wine-1.9.6-r3.ebuild
@@ -487,8 +487,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

diff --git a/app-emulation/wine/wine-1.9.7-r3.ebuild b/app-emulation/wine/wine-1.9.7-r3.ebuild
index 186ee04c6675217139b28596c6409a4dfb9e8ffc..fcfa5a0d7c2c62e70e1897f7197b5006cf972af2 100644 (file)
--- a/app-emulation/wine/wine-1.9.7-r3.ebuild
+++ b/app-emulation/wine/wine-1.9.7-r3.ebuild
@@ -487,8 +487,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

diff --git a/app-emulation/wine/wine-1.9.8-r2.ebuild b/app-emulation/wine/wine-1.9.8-r2.ebuild
index 278a370387faceccb1e1b69ac0735d05a12a70d0..1c6bc3b2af9b3dc1ae17f983789912b0287f88ec 100644 (file)
--- a/app-emulation/wine/wine-1.9.8-r2.ebuild
+++ b/app-emulation/wine/wine-1.9.8-r2.ebuild
@@ -487,8 +487,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

diff --git a/app-emulation/wine/wine-1.9.9-r3.ebuild b/app-emulation/wine/wine-1.9.9-r3.ebuild
index 919a4fa932602069a9f47f2bd0af3ddea067ef76..16bdcb6e8a0f754b5224505f00088f19dabfec65 100644 (file)
--- a/app-emulation/wine/wine-1.9.9-r3.ebuild
+++ b/app-emulation/wine/wine-1.9.9-r3.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

diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
index 5c1f95b61bac03c794fec085be05d3a8b7bd6195..5eba6e1a5b42f1ce03beae5d704516be2884d192 100644 (file)
--- a/app-emulation/wine/wine-9999.ebuild
+++ b/app-emulation/wine/wine-9999.ebuild
@@ -510,8 +510,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