Gentoo Archives: gentoo-commits

From: Nick Sarnie <sarnex@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-staging/
Date: Sat, 11 Sep 2021 01:42:52
Message-Id: 1631324551.28aac978151dec2eb973e961b79059dcf33fb4de.sarnex@gentoo
1 commit: 28aac978151dec2eb973e961b79059dcf33fb4de
2 Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 11 01:41:19 2021 +0000
4 Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 11 01:42:31 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28aac978
7
8 app-emulation/wine-staging: Sync with ::wine
9
10 Package-Manager: Portage-3.0.23, Repoman-3.0.3
11 Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>
12
13 app-emulation/wine-staging/Manifest | 2 ++
14 ...ne-staging-9999.ebuild => wine-staging-6.17.ebuild} | 18 ------------------
15 app-emulation/wine-staging/wine-staging-9999.ebuild | 18 ------------------
16 3 files changed, 2 insertions(+), 36 deletions(-)
17
18 diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
19 index e0a7148a96c..3573bd86e3c 100644
20 --- a/app-emulation/wine-staging/Manifest
21 +++ b/app-emulation/wine-staging/Manifest
22 @@ -3,7 +3,9 @@ DIST wine-6.13.tar.xz 24704408 BLAKE2B abd79fd0d2a364fd6b7c2713924ad9883cf62e0fe
23 DIST wine-6.14.tar.xz 24721316 BLAKE2B 3965d4071006a54f595baf329c1b238c4faa506d60597cfb5f8ccb127b9881d34d66e89cbdeff0d05a5e4a203a541edea8953565e2edf464ce4d2bfbf5e7a437 SHA512 261858dcf11604a6078b39faf64bd05288194647f8397efe03abcda1934ec5452e18f85dbb269e728ef532ac8ad39af5bbf5d8603f3598a20e2ef16f60405581
24 DIST wine-6.15.tar.xz 24751680 BLAKE2B f1e8df4f6a65f5776b260edf5a12a48810b24ea668be5ef8b405b64a057a16329a30d0b295eefb8f79d378faa243c20884de543e96213ed5ee22b6c752dab028 SHA512 bb4420a6fb0455aaab2f45354ea470acba9feeaea07b6c2cbf8afd49a6ef97bfc794cee330ecb12fb2098994738227d149cd5685d29310bb6cd0ed25d5fdc8bf
25 DIST wine-6.16.tar.xz 24789520 BLAKE2B 473ddec26139f7fedc091e2e037a88c8bde6f4061b196995aaa7e0352969fc8920edb47754c97478468a482f1d5a9be9e2cf858061d3add183fd90ee135a6ec3 SHA512 83d97eefeb35ee85d6ae180056d7b0e5864a90e1c2b63b6fd77d5cd38038b4eaa1fd067e7d5c5ee56d8cd811149db23a8581e1497bc1e36f9adad1012296b96e
26 +DIST wine-6.17.tar.xz 24838704 BLAKE2B 98014c8226db703a62e7c9e73eb5d76a10eb751e81e0f20bf409099bca4ce5a996f67401e6f39b140671c82aded8c7ccd483199990e55c9590715651ea5ae0db SHA512 87550105e27afedc02084172bbb84793891db711ee443bb2626fea56e720517205a06944198c1d05958d47025ad31d9c890d539cd9e60fadfe2947d83325a658
27 DIST wine-staging-6.13.tar.gz 9658122 BLAKE2B cce777895de69df8c659f010e432ee1d1f1e13c79d5453f4460e63e2572aaa7a9c92786170707c5616a8d182138822c0c6e27897706f919daf5597f6b595e478 SHA512 83a40b5a344db334541d94d58d287a1b8ff616114051129db20ac6b0365004a8753ec8d77a16da54ac26400eaa3e2d147d50a5ac8e17203898eb61cb06ff1f0c
28 DIST wine-staging-6.14.tar.gz 9658088 BLAKE2B d64bc0476b3d46b9ba812c956bb1eab1e4c3ec0dbd2145ae1f38c95ebd9b7151222e375690c1bd601f3416f362e50ea3f670e9940977005dc67623de22e82485 SHA512 5b4db5c1af316c8e18e2e318152a44e45521dd939e3a341dd533e819263109237c4fd0e25ee2b23bb7cc75f4c4afd7d8900b23d83f955e4ff56ee5fe7aa84fd0
29 DIST wine-staging-6.15.tar.gz 9654539 BLAKE2B 943cebf79bfe906a9dde42cfae13443059d89cd8996a2d25fad685796605a3a45b05f960c9dfb05d968ed919a23b273ecc56aa4fcd98cc38dcc45c22813d830e SHA512 652e8319e4a06f64b7e4c05a139194b6b7189777632d26d79a3160447339cc5a93b42d810d8379eb7821485ccbbe8cd8e16e09e5223886027fae2f7737b8a115
30 DIST wine-staging-6.16.tar.gz 9655388 BLAKE2B 50feca959b0ff9056ed9e6f81f3dd11350391f30e4048ee6e4d4e5feaa837e31b580c22e63b6213fc77d866b362eb7922fd2c076bd9b6675abfe591a178a2d9c SHA512 2789200466adaae2f4fa4afcbb6aa88619748e69a2cb39c1ac957b408c8021e2cbac7ad0b1f2e295cd87640f494e173739df076743ec0606e4b13e83d0ac2824
31 +DIST wine-staging-6.17.tar.gz 9655082 BLAKE2B 9f2e0c800f221ecacba71942ef306fa5e2e8510572467ee528a58b0a63dc416281036eea419c55f46c7688418121184e620017e077ea873f3aadcda29f51f3ae SHA512 c1eaa3682effd7a555ba2deed85a196eca5a9824634f3daba9453d861b0c74c456f6cddf0c1f47e003dc31c4ff7e7b049234e20afd2ce6bc6cbe6e03e87101ec
32
33 diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-6.17.ebuild
34 similarity index 97%
35 copy from app-emulation/wine-staging/wine-staging-9999.ebuild
36 copy to app-emulation/wine-staging/wine-staging-6.17.ebuild
37 index 1b3a52f7970..f8a707ae863 100644
38 --- a/app-emulation/wine-staging/wine-staging-9999.ebuild
39 +++ b/app-emulation/wine-staging/wine-staging-6.17.ebuild
40 @@ -577,24 +577,6 @@ multilib_src_install_all() {
41 "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
42 fi
43
44 - # Remove wineconsole if neither backend is installed #551124
45 - if ! use X; then
46 - rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
47 - rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
48 -
49 - if ! use mingw; then
50 - rm_wineconsole() {
51 - rm "${D%/}/usr/$(get_libdir)/wine-${WINE_VARIANT}"/wine/{,fakedlls/}wineconsole.exe* || die
52 - }
53 - else
54 - rm_wineconsole() {
55 - rm "${D%/}/usr/$(get_libdir)/wine-${WINE_VARIANT}"/wine/wineconsole.exe* || die
56 - }
57 - fi
58 -
59 - multilib_foreach_abi rm_wineconsole
60 - fi
61 -
62 use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
63 use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
64
65
66 diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
67 index 1b3a52f7970..f8a707ae863 100644
68 --- a/app-emulation/wine-staging/wine-staging-9999.ebuild
69 +++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
70 @@ -577,24 +577,6 @@ multilib_src_install_all() {
71 "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
72 fi
73
74 - # Remove wineconsole if neither backend is installed #551124
75 - if ! use X; then
76 - rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
77 - rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
78 -
79 - if ! use mingw; then
80 - rm_wineconsole() {
81 - rm "${D%/}/usr/$(get_libdir)/wine-${WINE_VARIANT}"/wine/{,fakedlls/}wineconsole.exe* || die
82 - }
83 - else
84 - rm_wineconsole() {
85 - rm "${D%/}/usr/$(get_libdir)/wine-${WINE_VARIANT}"/wine/wineconsole.exe* || die
86 - }
87 - fi
88 -
89 - multilib_foreach_abi rm_wineconsole
90 - fi
91 -
92 use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
93 use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}