[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-vanilla/

[Nick Sarnie]

commit:     bece33505094b0260a35941efe3bc0db0d68f543
Author:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 11 01:40:28 2021 +0000
Commit:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Sat Sep 11 01:42:24 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bece3350

app-emulation/wine-vanilla: Sync with ::wine

Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>

 app-emulation/wine-vanilla/Manifest                    |  1 +
 ...ne-vanilla-9999.ebuild => wine-vanilla-6.17.ebuild} | 18 ------------------
 app-emulation/wine-vanilla/wine-vanilla-9999.ebuild    | 18 ------------------
 3 files changed, 1 insertion(+), 36 deletions(-)

diff --git a/app-emulation/wine-vanilla/Manifest 
b/app-emulation/wine-vanilla/Manifest
index 35bcbf162a2..01101e8aa25 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -5,3 +5,4 @@ DIST wine-6.13.tar.xz 24704408 BLAKE2B 
abd79fd0d2a364fd6b7c2713924ad9883cf62e0fe
 DIST wine-6.14.tar.xz 24721316 BLAKE2B 
3965d4071006a54f595baf329c1b238c4faa506d60597cfb5f8ccb127b9881d34d66e89cbdeff0d05a5e4a203a541edea8953565e2edf464ce4d2bfbf5e7a437
 SHA512 
261858dcf11604a6078b39faf64bd05288194647f8397efe03abcda1934ec5452e18f85dbb269e728ef532ac8ad39af5bbf5d8603f3598a20e2ef16f60405581
 DIST wine-6.15.tar.xz 24751680 BLAKE2B 
f1e8df4f6a65f5776b260edf5a12a48810b24ea668be5ef8b405b64a057a16329a30d0b295eefb8f79d378faa243c20884de543e96213ed5ee22b6c752dab028
 SHA512 
bb4420a6fb0455aaab2f45354ea470acba9feeaea07b6c2cbf8afd49a6ef97bfc794cee330ecb12fb2098994738227d149cd5685d29310bb6cd0ed25d5fdc8bf
 DIST wine-6.16.tar.xz 24789520 BLAKE2B 
473ddec26139f7fedc091e2e037a88c8bde6f4061b196995aaa7e0352969fc8920edb47754c97478468a482f1d5a9be9e2cf858061d3add183fd90ee135a6ec3
 SHA512 
83d97eefeb35ee85d6ae180056d7b0e5864a90e1c2b63b6fd77d5cd38038b4eaa1fd067e7d5c5ee56d8cd811149db23a8581e1497bc1e36f9adad1012296b96e
+DIST wine-6.17.tar.xz 24838704 BLAKE2B 
98014c8226db703a62e7c9e73eb5d76a10eb751e81e0f20bf409099bca4ce5a996f67401e6f39b140671c82aded8c7ccd483199990e55c9590715651ea5ae0db
 SHA512 
87550105e27afedc02084172bbb84793891db711ee443bb2626fea56e720517205a06944198c1d05958d47025ad31d9c890d539cd9e60fadfe2947d83325a658

diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-6.17.ebuild
similarity index 97%
copy from app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
copy to app-emulation/wine-vanilla/wine-vanilla-6.17.ebuild
index 7b3156ca675..70c9eed8db2 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.17.ebuild
@@ -498,24 +498,6 @@ multilib_src_install_all() {
                        "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
        fi
 
-       # Remove wineconsole if neither backend is installed #551124
-       if ! use X; then
-               rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
-               rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
-
-               if ! use mingw; then
-                       rm_wineconsole() {
-                               rm 
"${D%/}/usr/$(get_libdir)/wine-${WINE_VARIANT}"/wine/{,fakedlls/}wineconsole.exe*
 || die
-                       }
-               else
-                       rm_wineconsole() {
-                               rm 
"${D%/}/usr/$(get_libdir)/wine-${WINE_VARIANT}"/wine/wineconsole.exe* || die
-                       }
-               fi
-
-               multilib_foreach_abi rm_wineconsole
-       fi
-
        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}
 

diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
index 7b3156ca675..70c9eed8db2 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
@@ -498,24 +498,6 @@ multilib_src_install_all() {
                        "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
        fi
 
-       # Remove wineconsole if neither backend is installed #551124
-       if ! use X; then
-               rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
-               rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
-
-               if ! use mingw; then
-                       rm_wineconsole() {
-                               rm 
"${D%/}/usr/$(get_libdir)/wine-${WINE_VARIANT}"/wine/{,fakedlls/}wineconsole.exe*
 || die
-                       }
-               else
-                       rm_wineconsole() {
-                               rm 
"${D%/}/usr/$(get_libdir)/wine-${WINE_VARIANT}"/wine/wineconsole.exe* || die
-                       }
-               fi
-
-               multilib_foreach_abi rm_wineconsole
-       fi
-
        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}