subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: app\-emulation\/wine\-staging\/"

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

2024-04-23 Thread Ionen Wolkens

commit: 95d207db16dc656c42f07f087c2cc59bf9eb3f2d
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Apr 23 09:16:21 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Apr 23 09:32:05 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95d207db

app-emulation/wine-staging: bump WINE_MONO to 9.1.0 in live

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/wine-staging-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/wine-staging/wine-staging-.ebuild 
b/app-emulation/wine-staging/wine-staging-.ebuild
index 2c9f8fc4ef2a..f4a2a5ce7f73 100644
--- a/app-emulation/wine-staging/wine-staging-.ebuild
+++ b/app-emulation/wine-staging/wine-staging-.ebuild
@@ -9,7 +9,7 @@ inherit autotools edo flag-o-matic multilib multilib-build 
optfeature
 inherit prefix python-any-r1 toolchain-funcs wrapper
 
 WINE_GECKO=2.47.4
-WINE_MONO=9.0.0
+WINE_MONO=9.1.0
 WINE_P=wine-$(ver_cut 1-2)
 
 if [[ ${PV} == * ]]; then

[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-staging/files/, app-emulation/wine-staging/

2024-04-22 Thread Ionen Wolkens

commit: 429da42ae3671c7c84f9d3252dbbfa988aef2001
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Apr 22 15:49:33 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Apr 22 20:31:12 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=429da42a

app-emulation/wine-staging: drop 9.3, 9.4.1

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/Manifest|   4 -
 .../files/wine-staging-9.4-wayland-egl.patch   |  16 -
 app-emulation/wine-staging/wine-staging-9.3.ebuild | 477 
 .../wine-staging/wine-staging-9.4.1.ebuild | 478 -
 4 files changed, 975 deletions(-)

diff --git a/app-emulation/wine-staging/Manifest 
b/app-emulation/wine-staging/Manifest
index 700536551f03..4ae8f88e9f68 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,12 +1,8 @@
 DIST wine-9.0.tar.xz 30007216 BLAKE2B 
cf53177201a2f7eeb35d0d8ce220f80808d979099a928ad60652d1dee92620c433cc105dffab4e9309f41766087ad1544ef49d2922538bb420d62f6dd64117a1
 SHA512 
838daf2c4581f83f8573b988036f517d57b84894b090a2a17433255d6d044dfa880e6724cdb83082a36c333df9d2083ab68ae53927622a620edd59f33462ada4
-DIST wine-9.3.tar.xz 30098792 BLAKE2B 
fa6f0c73f0886918b035557a37c0553feeea5692ae15e8d67fc4360c59c1bbab9f7f93e58ae29a41800da50b961b49957cf2d060d6b5da34bd956bf7cb3e5fab
 SHA512 
3d75a0e1360765aca453d120e1f47fb50716119f3cab2be1176003a19bba31a6affae4a845840ce52665d97e0edd46dc78a13462d6d6a7e861cd970a0a3d4d1d
-DIST wine-9.4.tar.xz 30166096 BLAKE2B 
bd65086e6f6e11bc6c7cd65dba6e6997911851f1a2f25cad0b4f8100d695df3c76b0799768ab9047dfd5d8afc7c749a5e5c88003d2f4ca69f417387cc06d527d
 SHA512 
fbc927b04f75fe48e52efb6599ffc84f27f1a08d180386e782c94b37b54ab2a3540ed6cd387d7a59f5aca4df2c9ac3e3c127c3067c16e2357e57b4b0a0ced99d
 DIST wine-9.5.tar.xz 30371420 BLAKE2B 
c14ebf02f0f5b91bc2b2517ff3630f22c6af7fdc827c5d024d809a383a65446284a5349c8109835112f5353f361088f4f32de1a3d04299fbf39deacbc0e8e8bf
 SHA512 
8ccad8f6e6b1428886dee9fae771796e2021b4122cd96464350352bede25421406e6a6a0fdd63d8b99b896db8dc529aa6e05d6ac7966bee49ce3055b18a8af91
 DIST wine-9.6.tar.xz 30261488 BLAKE2B 
53115a8a80593856679718b2055340860221701bc82a784a111a992f5e67b031d7407a16f6df6d4da67f382f30c35d2dd82af2a671a058a76b621c91199e426e
 SHA512 
cc2ea5597636da8d392d1d63b9c135679eff69ea671dc6b53b6f2d44a890aee0e17275174485f6e8dd99c7db737eb82a800a2b05c4966f15e28167c5a6098922
 DIST wine-9.7.tar.xz 30281616 BLAKE2B 
4d27f6f2dfd088a0590bfce7228c7eca25b66a9a04706ddecb25af6364e83100c15a78c8d46f3294a42dc7f3503756506f752a02d7058a72ce16716994b334bc
 SHA512 
0c15c3a0901162a386126f2dc987b276b379cc027fc72d9e31cf3122614742f876f30a5f24a495f546cd9c5bd5efce096bd9ca190d0f378fea3d42a298a06e80
 DIST wine-staging-9.0.tar.gz 9577631 BLAKE2B 
0012978f54c618e73d407dd49dccff02853912d0c015098889802518e8c51b280f5d60e11291335dafc68944ee01cbcb7fd6c5825ef10ae1520c7b82d9846718
 SHA512 
362209fcadcf029152b681c76beb231d0cc8de1609b994094f1dc88ab871fddda08b3d8c2fe36ceb38909a9d634c1ade864ca0f28a6a7715ec286a8b2884981f
-DIST wine-staging-9.3.tar.gz 9672031 BLAKE2B 
9613d3ac8aab4208e1f4392e7fdf0f673a6159751665b2f0ab868b9140edaf32f1d4bbb5efe75458e4cce910385ebe6cec2b898f172bd0e0de87bdc675bfe221
 SHA512 
56a92cd8bbc1ba7fda9fea9d998efac44d2a805d4ebb4253a37ecff8edd51852773f848556935f05418f488698e1ec4cc52a79327f7f5d77390af90f95f9bdf6
-DIST wine-staging-9.4.1.tar.gz 9482082 BLAKE2B 
59f0b513c7df9c46a8f6ff034a2f67b92f4bb19cb1375a8ff979b7ab01223d425daf7047bd5166e946599bafe5e3ce7aa2670f893f8f6871e8c692dbe0577617
 SHA512 
897d9c292fc7d399591490fb53c62e80caab9a16619a261a84fa5b2f4a6ae5c389a6a39f29925532841c8c74254e80aa7cb764f60cf64cd431526b347df559ca
 DIST wine-staging-9.5.tar.gz 9526239 BLAKE2B 
a6f5a351a3979fc81a0d8c6325da4f08021d19eb7ac6ad52906a6fcf19552f01bdc8fbebc9b33fc82e14cdd6e6d50347dc7bc73e622d589d2e9eec5d577d3158
 SHA512 
8c756fe505092e21dd37c709ac3917c305b70881c05270f0e188ccdf9ff36b9fd224adad424d37c6919637d2af55afbfba49079eb5b6708a6cf4f2dd98966784
 DIST wine-staging-9.6.tar.gz 9522775 BLAKE2B 
5598d408774e3142d6de5ccddccb68d8e1e4544c43b5691751599e6b86df6b8899f6113b8b58d75fb8e032a6c7aed9ffbb3ecb1553aa2d7593d69513e9a0177a
 SHA512 
83691eb560c860d40669a524196a522007c76420b5b5076da4f446a4180fee7558ef228cf1f4179eb78a6d36c8ab78fd2784ffc879b0aacbef7c72a7f88e7ed2
 DIST wine-staging-9.7.tar.gz 9573710 BLAKE2B 
34eee97f51268c07d649f0ed498b5e92bbc8bb1d8cee860040ee660d968307a7d9d3b59305567c50338d2ce97b3071f615b8782ca74716b42904ae4514404316
 SHA512 
3c5f100f715c6b3399c356b304b8eca1e51706e03782f2f834965474a7efeca4174ae806dff85080cded93501e9cfcd097eca43230d9425c78ae73a6f4485c76

diff --git 
a/app-emulation/wine-staging/files/wine-staging-9.4-wayland-egl.patch 
b/app-emulation/wine-staging/files/wine-staging-9.4-wayland-egl.patch
deleted file mode 100644
index 0c6f8084f480..
--- a/app-emulation/wine-staging/files/wine-staging-9.4-wayland-egl.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Unsure how this check is

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

2024-04-22 Thread Ionen Wolkens

commit: d8c7ecb8fbbdbcbef6b9804e93b0d0669e0f28fc
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Apr 22 19:59:03 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Apr 22 20:31:13 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8c7ecb8

app-emulation/wine-staging: "fix" build with gcc-14

All versions currently broken due to the staging patchset itself
(>=vanilla-9 and proton-9.0. are fine). Given amount of wine
variants and versions, going for the lazy "fix" in these for now.
Given the active development, imagine will be able to cleanup later.

Closes: https://bugs.gentoo.org/919758
Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/wine-staging-9.0.ebuild  | 5 +
 app-emulation/wine-staging/wine-staging-9.5.ebuild  | 5 +
 app-emulation/wine-staging/wine-staging-9.6.ebuild  | 5 +
 app-emulation/wine-staging/wine-staging-9.7.ebuild  | 5 +
 app-emulation/wine-staging/wine-staging-.ebuild | 5 +
 5 files changed, 25 insertions(+)

diff --git a/app-emulation/wine-staging/wine-staging-9.0.ebuild 
b/app-emulation/wine-staging/wine-staging-9.0.ebuild
index 7a0bdfdd539c..537675f10ba0 100644
--- a/app-emulation/wine-staging/wine-staging-9.0.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.0.ebuild
@@ -337,6 +337,11 @@ src_configure() {
strip-unsupported-flags
fi
 
+   # >=wine-vanilla-9 has proper fixes and builds with gcc-14, but
+   # staging patchset is messier and would rather not have to worry
+   # about it (try to remove on bump now and then, bug #919758)
+   append-cflags $(test-flags-CC -Wno-error=incompatible-pointer-types)
+
if use mingw; then
use crossdev-mingw || 
PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
 

diff --git a/app-emulation/wine-staging/wine-staging-9.5.ebuild 
b/app-emulation/wine-staging/wine-staging-9.5.ebuild
index ff73fe1caa6e..08b56968b3ac 100644
--- a/app-emulation/wine-staging/wine-staging-9.5.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.5.ebuild
@@ -337,6 +337,11 @@ src_configure() {
strip-unsupported-flags
fi
 
+   # >=wine-vanilla-9 has proper fixes and builds with gcc-14, but
+   # staging patchset is messier and would rather not have to worry
+   # about it (try to remove on bump now and then, bug #919758)
+   append-cflags $(test-flags-CC -Wno-error=incompatible-pointer-types)
+
if use mingw; then
use crossdev-mingw || 
PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
 

diff --git a/app-emulation/wine-staging/wine-staging-9.6.ebuild 
b/app-emulation/wine-staging/wine-staging-9.6.ebuild
index e7ecd6c1b120..2c9f8fc4ef2a 100644
--- a/app-emulation/wine-staging/wine-staging-9.6.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.6.ebuild
@@ -332,6 +332,11 @@ src_configure() {
strip-unsupported-flags
fi
 
+   # >=wine-vanilla-9 has proper fixes and builds with gcc-14, but
+   # staging patchset is messier and would rather not have to worry
+   # about it (try to remove on bump now and then, bug #919758)
+   append-cflags $(test-flags-CC -Wno-error=incompatible-pointer-types)
+
if use mingw; then
use crossdev-mingw || 
PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
 

diff --git a/app-emulation/wine-staging/wine-staging-9.7.ebuild 
b/app-emulation/wine-staging/wine-staging-9.7.ebuild
index e7ecd6c1b120..2c9f8fc4ef2a 100644
--- a/app-emulation/wine-staging/wine-staging-9.7.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.7.ebuild
@@ -332,6 +332,11 @@ src_configure() {
strip-unsupported-flags
fi
 
+   # >=wine-vanilla-9 has proper fixes and builds with gcc-14, but
+   # staging patchset is messier and would rather not have to worry
+   # about it (try to remove on bump now and then, bug #919758)
+   append-cflags $(test-flags-CC -Wno-error=incompatible-pointer-types)
+
if use mingw; then
use crossdev-mingw || 
PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
 

diff --git a/app-emulation/wine-staging/wine-staging-.ebuild 
b/app-emulation/wine-staging/wine-staging-.ebuild
index e7ecd6c1b120..2c9f8fc4ef2a 100644
--- a/app-emulation/wine-staging/wine-staging-.ebuild
+++ b/app-emulation/wine-staging/wine-staging-.ebuild
@@ -332,6 +332,11 @@ src_configure() {
strip-unsupported-flags
fi
 
+   # >=wine-vanilla-9 has proper fixes and builds with gcc-14, but
+   # staging patchset is messier and would rather not have to worry
+   # about it (try to remove on bump now and then, bug #919758)
+   append-cflags $(test-flags-CC -Wno-error=incompatible-pointer-types)
+
if use mingw; then
use crossdev-mingw || 
PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}

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

2024-04-21 Thread Ionen Wolkens

commit: d3da072a03b95550f3124dd8121a29b4288d8ea2
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sun Apr 21 16:36:45 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sun Apr 21 16:36:55 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3da072a

app-emulation/wine-staging: add 9.7

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/Manifest|   2 +
 app-emulation/wine-staging/wine-staging-9.7.ebuild | 472 +
 2 files changed, 474 insertions(+)

diff --git a/app-emulation/wine-staging/Manifest 
b/app-emulation/wine-staging/Manifest
index 9c7d5f8550be..700536551f03 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -3,8 +3,10 @@ DIST wine-9.3.tar.xz 30098792 BLAKE2B 
fa6f0c73f0886918b035557a37c0553feeea5692ae
 DIST wine-9.4.tar.xz 30166096 BLAKE2B 
bd65086e6f6e11bc6c7cd65dba6e6997911851f1a2f25cad0b4f8100d695df3c76b0799768ab9047dfd5d8afc7c749a5e5c88003d2f4ca69f417387cc06d527d
 SHA512 
fbc927b04f75fe48e52efb6599ffc84f27f1a08d180386e782c94b37b54ab2a3540ed6cd387d7a59f5aca4df2c9ac3e3c127c3067c16e2357e57b4b0a0ced99d
 DIST wine-9.5.tar.xz 30371420 BLAKE2B 
c14ebf02f0f5b91bc2b2517ff3630f22c6af7fdc827c5d024d809a383a65446284a5349c8109835112f5353f361088f4f32de1a3d04299fbf39deacbc0e8e8bf
 SHA512 
8ccad8f6e6b1428886dee9fae771796e2021b4122cd96464350352bede25421406e6a6a0fdd63d8b99b896db8dc529aa6e05d6ac7966bee49ce3055b18a8af91
 DIST wine-9.6.tar.xz 30261488 BLAKE2B 
53115a8a80593856679718b2055340860221701bc82a784a111a992f5e67b031d7407a16f6df6d4da67f382f30c35d2dd82af2a671a058a76b621c91199e426e
 SHA512 
cc2ea5597636da8d392d1d63b9c135679eff69ea671dc6b53b6f2d44a890aee0e17275174485f6e8dd99c7db737eb82a800a2b05c4966f15e28167c5a6098922
+DIST wine-9.7.tar.xz 30281616 BLAKE2B 
4d27f6f2dfd088a0590bfce7228c7eca25b66a9a04706ddecb25af6364e83100c15a78c8d46f3294a42dc7f3503756506f752a02d7058a72ce16716994b334bc
 SHA512 
0c15c3a0901162a386126f2dc987b276b379cc027fc72d9e31cf3122614742f876f30a5f24a495f546cd9c5bd5efce096bd9ca190d0f378fea3d42a298a06e80
 DIST wine-staging-9.0.tar.gz 9577631 BLAKE2B 
0012978f54c618e73d407dd49dccff02853912d0c015098889802518e8c51b280f5d60e11291335dafc68944ee01cbcb7fd6c5825ef10ae1520c7b82d9846718
 SHA512 
362209fcadcf029152b681c76beb231d0cc8de1609b994094f1dc88ab871fddda08b3d8c2fe36ceb38909a9d634c1ade864ca0f28a6a7715ec286a8b2884981f
 DIST wine-staging-9.3.tar.gz 9672031 BLAKE2B 
9613d3ac8aab4208e1f4392e7fdf0f673a6159751665b2f0ab868b9140edaf32f1d4bbb5efe75458e4cce910385ebe6cec2b898f172bd0e0de87bdc675bfe221
 SHA512 
56a92cd8bbc1ba7fda9fea9d998efac44d2a805d4ebb4253a37ecff8edd51852773f848556935f05418f488698e1ec4cc52a79327f7f5d77390af90f95f9bdf6
 DIST wine-staging-9.4.1.tar.gz 9482082 BLAKE2B 
59f0b513c7df9c46a8f6ff034a2f67b92f4bb19cb1375a8ff979b7ab01223d425daf7047bd5166e946599bafe5e3ce7aa2670f893f8f6871e8c692dbe0577617
 SHA512 
897d9c292fc7d399591490fb53c62e80caab9a16619a261a84fa5b2f4a6ae5c389a6a39f29925532841c8c74254e80aa7cb764f60cf64cd431526b347df559ca
 DIST wine-staging-9.5.tar.gz 9526239 BLAKE2B 
a6f5a351a3979fc81a0d8c6325da4f08021d19eb7ac6ad52906a6fcf19552f01bdc8fbebc9b33fc82e14cdd6e6d50347dc7bc73e622d589d2e9eec5d577d3158
 SHA512 
8c756fe505092e21dd37c709ac3917c305b70881c05270f0e188ccdf9ff36b9fd224adad424d37c6919637d2af55afbfba49079eb5b6708a6cf4f2dd98966784
 DIST wine-staging-9.6.tar.gz 9522775 BLAKE2B 
5598d408774e3142d6de5ccddccb68d8e1e4544c43b5691751599e6b86df6b8899f6113b8b58d75fb8e032a6c7aed9ffbb3ecb1553aa2d7593d69513e9a0177a
 SHA512 
83691eb560c860d40669a524196a522007c76420b5b5076da4f446a4180fee7558ef228cf1f4179eb78a6d36c8ab78fd2784ffc879b0aacbef7c72a7f88e7ed2
+DIST wine-staging-9.7.tar.gz 9573710 BLAKE2B 
34eee97f51268c07d649f0ed498b5e92bbc8bb1d8cee860040ee660d968307a7d9d3b59305567c50338d2ce97b3071f615b8782ca74716b42904ae4514404316
 SHA512 
3c5f100f715c6b3399c356b304b8eca1e51706e03782f2f834965474a7efeca4174ae806dff85080cded93501e9cfcd097eca43230d9425c78ae73a6f4485c76

diff --git a/app-emulation/wine-staging/wine-staging-9.7.ebuild 
b/app-emulation/wine-staging/wine-staging-9.7.ebuild
new file mode 100644
index ..e7ecd6c1b120
--- /dev/null
+++ b/app-emulation/wine-staging/wine-staging-9.7.ebuild
@@ -0,0 +1,472 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+PYTHON_COMPAT=( python3_{10..12} )
+inherit autotools edo flag-o-matic multilib multilib-build optfeature
+inherit prefix python-any-r1 toolchain-funcs wrapper
+
+WINE_GECKO=2.47.4
+WINE_MONO=9.0.0
+WINE_P=wine-$(ver_cut 1-2)
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine-staging.git;
+   WINE_EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git;
+else
+   (( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 
1).0
+   SRC_URI="
+

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

2024-04-09 Thread Ionen Wolkens

commit: 6533f624c6ca6027012d4b01efd6b2b4d07efef7
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Apr  9 11:59:27 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Apr  9 11:59:30 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6533f624

app-emulation/wine-staging: remove obsolete USE=-mingw patch skips

Neither are needed anymore, and the 2nd is also missing in 9.6+
build failure wrt bug #929001.

Closes: https://bugs.gentoo.org/929001
Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/wine-staging-9.6.ebuild  | 5 -
 app-emulation/wine-staging/wine-staging-.ebuild | 5 -
 2 files changed, 10 deletions(-)

diff --git a/app-emulation/wine-staging/wine-staging-9.6.ebuild 
b/app-emulation/wine-staging/wine-staging-9.6.ebuild
index ff73fe1caa6e..e7ecd6c1b120 100644
--- a/app-emulation/wine-staging/wine-staging-9.6.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.6.ebuild
@@ -222,11 +222,6 @@ src_prepare() {
local patchinstallargs=(
--all
--no-autoconf
-   # patches known broken with USE=-mingw, retry occasionally (bug 
#921360)
-   $(usev !mingw '
-   -W winedevice-Default_Drivers
-   -W fltmgr.sys-FltBuildDefaultSecurityDescriptor
-   ')
${MY_WINE_STAGING_CONF}
)
 

diff --git a/app-emulation/wine-staging/wine-staging-.ebuild 
b/app-emulation/wine-staging/wine-staging-.ebuild
index ff73fe1caa6e..e7ecd6c1b120 100644
--- a/app-emulation/wine-staging/wine-staging-.ebuild
+++ b/app-emulation/wine-staging/wine-staging-.ebuild
@@ -222,11 +222,6 @@ src_prepare() {
local patchinstallargs=(
--all
--no-autoconf
-   # patches known broken with USE=-mingw, retry occasionally (bug 
#921360)
-   $(usev !mingw '
-   -W winedevice-Default_Drivers
-   -W fltmgr.sys-FltBuildDefaultSecurityDescriptor
-   ')
${MY_WINE_STAGING_CONF}
)

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

2024-04-05 Thread Ionen Wolkens

commit: ae91dc7be6e64895495225c86ec9065410b54ecd
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Apr  6 03:16:36 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Apr  6 03:37:22 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae91dc7b

app-emulation/wine-staging: add 9.6

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/Manifest|   2 +
 app-emulation/wine-staging/wine-staging-9.6.ebuild | 477 +
 2 files changed, 479 insertions(+)

diff --git a/app-emulation/wine-staging/Manifest 
b/app-emulation/wine-staging/Manifest
index 0f090131461b..9c7d5f8550be 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -2,7 +2,9 @@ DIST wine-9.0.tar.xz 30007216 BLAKE2B 
cf53177201a2f7eeb35d0d8ce220f80808d979099a
 DIST wine-9.3.tar.xz 30098792 BLAKE2B 
fa6f0c73f0886918b035557a37c0553feeea5692ae15e8d67fc4360c59c1bbab9f7f93e58ae29a41800da50b961b49957cf2d060d6b5da34bd956bf7cb3e5fab
 SHA512 
3d75a0e1360765aca453d120e1f47fb50716119f3cab2be1176003a19bba31a6affae4a845840ce52665d97e0edd46dc78a13462d6d6a7e861cd970a0a3d4d1d
 DIST wine-9.4.tar.xz 30166096 BLAKE2B 
bd65086e6f6e11bc6c7cd65dba6e6997911851f1a2f25cad0b4f8100d695df3c76b0799768ab9047dfd5d8afc7c749a5e5c88003d2f4ca69f417387cc06d527d
 SHA512 
fbc927b04f75fe48e52efb6599ffc84f27f1a08d180386e782c94b37b54ab2a3540ed6cd387d7a59f5aca4df2c9ac3e3c127c3067c16e2357e57b4b0a0ced99d
 DIST wine-9.5.tar.xz 30371420 BLAKE2B 
c14ebf02f0f5b91bc2b2517ff3630f22c6af7fdc827c5d024d809a383a65446284a5349c8109835112f5353f361088f4f32de1a3d04299fbf39deacbc0e8e8bf
 SHA512 
8ccad8f6e6b1428886dee9fae771796e2021b4122cd96464350352bede25421406e6a6a0fdd63d8b99b896db8dc529aa6e05d6ac7966bee49ce3055b18a8af91
+DIST wine-9.6.tar.xz 30261488 BLAKE2B 
53115a8a80593856679718b2055340860221701bc82a784a111a992f5e67b031d7407a16f6df6d4da67f382f30c35d2dd82af2a671a058a76b621c91199e426e
 SHA512 
cc2ea5597636da8d392d1d63b9c135679eff69ea671dc6b53b6f2d44a890aee0e17275174485f6e8dd99c7db737eb82a800a2b05c4966f15e28167c5a6098922
 DIST wine-staging-9.0.tar.gz 9577631 BLAKE2B 
0012978f54c618e73d407dd49dccff02853912d0c015098889802518e8c51b280f5d60e11291335dafc68944ee01cbcb7fd6c5825ef10ae1520c7b82d9846718
 SHA512 
362209fcadcf029152b681c76beb231d0cc8de1609b994094f1dc88ab871fddda08b3d8c2fe36ceb38909a9d634c1ade864ca0f28a6a7715ec286a8b2884981f
 DIST wine-staging-9.3.tar.gz 9672031 BLAKE2B 
9613d3ac8aab4208e1f4392e7fdf0f673a6159751665b2f0ab868b9140edaf32f1d4bbb5efe75458e4cce910385ebe6cec2b898f172bd0e0de87bdc675bfe221
 SHA512 
56a92cd8bbc1ba7fda9fea9d998efac44d2a805d4ebb4253a37ecff8edd51852773f848556935f05418f488698e1ec4cc52a79327f7f5d77390af90f95f9bdf6
 DIST wine-staging-9.4.1.tar.gz 9482082 BLAKE2B 
59f0b513c7df9c46a8f6ff034a2f67b92f4bb19cb1375a8ff979b7ab01223d425daf7047bd5166e946599bafe5e3ce7aa2670f893f8f6871e8c692dbe0577617
 SHA512 
897d9c292fc7d399591490fb53c62e80caab9a16619a261a84fa5b2f4a6ae5c389a6a39f29925532841c8c74254e80aa7cb764f60cf64cd431526b347df559ca
 DIST wine-staging-9.5.tar.gz 9526239 BLAKE2B 
a6f5a351a3979fc81a0d8c6325da4f08021d19eb7ac6ad52906a6fcf19552f01bdc8fbebc9b33fc82e14cdd6e6d50347dc7bc73e622d589d2e9eec5d577d3158
 SHA512 
8c756fe505092e21dd37c709ac3917c305b70881c05270f0e188ccdf9ff36b9fd224adad424d37c6919637d2af55afbfba49079eb5b6708a6cf4f2dd98966784
+DIST wine-staging-9.6.tar.gz 9522775 BLAKE2B 
5598d408774e3142d6de5ccddccb68d8e1e4544c43b5691751599e6b86df6b8899f6113b8b58d75fb8e032a6c7aed9ffbb3ecb1553aa2d7593d69513e9a0177a
 SHA512 
83691eb560c860d40669a524196a522007c76420b5b5076da4f446a4180fee7558ef228cf1f4179eb78a6d36c8ab78fd2784ffc879b0aacbef7c72a7f88e7ed2

diff --git a/app-emulation/wine-staging/wine-staging-9.6.ebuild 
b/app-emulation/wine-staging/wine-staging-9.6.ebuild
new file mode 100644
index ..ff73fe1caa6e
--- /dev/null
+++ b/app-emulation/wine-staging/wine-staging-9.6.ebuild
@@ -0,0 +1,477 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+PYTHON_COMPAT=( python3_{10..12} )
+inherit autotools edo flag-o-matic multilib multilib-build optfeature
+inherit prefix python-any-r1 toolchain-funcs wrapper
+
+WINE_GECKO=2.47.4
+WINE_MONO=9.0.0
+WINE_P=wine-$(ver_cut 1-2)
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine-staging.git;
+   WINE_EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git;
+else
+   (( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 
1).0
+   SRC_URI="
+   https://dl.winehq.org/wine/source/${WINE_SDIR}/${WINE_P}.tar.xz
+   
https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="-* ~amd64 ~x86"
+fi
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging 
patchset"
+HOMEPAGE="
+   https://wiki.winehq.org/Wine-Staging
+

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

2024-03-24 Thread Ionen Wolkens

commit: 5d08c93d5ec41658468afe23cc0cb816ad682fd1
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sun Mar 24 18:30:37 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sun Mar 24 18:37:35 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d08c93d

app-emulation/wine-staging: filter -Wl,-z,* ... for CFLAGS

test-flags-CC was not meant to test LDFLAGS and -Wl,* are no-ops
at compile-time and thus don't get stripped even if they don't work
(same happens when using strip-unsupported-flags) and then if a
package compiles and links anything at same time it fails.

This used not to be a big problem but now that 23.0 profiles
do -Wl,-z,pack-relative-relocs (mingw ld has no -z) this is
hitting bashrc-mv users that tend to do CFLAGS="${LDFLAGS}"
by default. Tempting to ignore it because of how wrong it is,
but well.

An alternate route could be to eventually have strip-flags
and/or strip-unsupported-flags remove -Wl,* from non-LDFLAGS
given this could affect more than mingw (e.g. switching to
bfd when there is a lld-only option).

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/wine-staging-9.0.ebuild   | 6 ++
 app-emulation/wine-staging/wine-staging-9.3.ebuild   | 6 ++
 app-emulation/wine-staging/wine-staging-9.4.1.ebuild | 6 ++
 app-emulation/wine-staging/wine-staging-9.5.ebuild   | 6 ++
 app-emulation/wine-staging/wine-staging-.ebuild  | 6 ++
 5 files changed, 30 insertions(+)

diff --git a/app-emulation/wine-staging/wine-staging-9.0.ebuild 
b/app-emulation/wine-staging/wine-staging-9.0.ebuild
index 690bb4e4dc33..7a0bdfdd539c 100644
--- a/app-emulation/wine-staging/wine-staging-9.0.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.0.ebuild
@@ -353,6 +353,12 @@ src_configure() {
CROSSCFLAGS="${CROSSCFLAGS:-$(
filter-flags '-fstack-protector*' #870136
filter-flags '-mfunction-return=thunk*' #878849
+
+   # some bashrc-mv users tend to do 
CFLAGS="${LDFLAGS}" and then
+   # strip-unsupported-flags miss these during 
compile-only tests
+   # (primarily done for 23.0 profiles' -z, not 
full coverage)
+   filter-flags '-Wl,-z,*'
+
CC=${mingwcc} test-flags-CC ${CFLAGS:--O2}
)}"
 

diff --git a/app-emulation/wine-staging/wine-staging-9.3.ebuild 
b/app-emulation/wine-staging/wine-staging-9.3.ebuild
index d47f91ceb1aa..ff73fe1caa6e 100644
--- a/app-emulation/wine-staging/wine-staging-9.3.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.3.ebuild
@@ -353,6 +353,12 @@ src_configure() {
CROSSCFLAGS="${CROSSCFLAGS:-$(
filter-flags '-fstack-protector*' #870136
filter-flags '-mfunction-return=thunk*' #878849
+
+   # some bashrc-mv users tend to do 
CFLAGS="${LDFLAGS}" and then
+   # strip-unsupported-flags miss these during 
compile-only tests
+   # (primarily done for 23.0 profiles' -z, not 
full coverage)
+   filter-flags '-Wl,-z,*'
+
CC=${mingwcc} test-flags-CC ${CFLAGS:--O2}
)}"
 

diff --git a/app-emulation/wine-staging/wine-staging-9.4.1.ebuild 
b/app-emulation/wine-staging/wine-staging-9.4.1.ebuild
index d9575ddd837a..a8e8379b00b3 100644
--- a/app-emulation/wine-staging/wine-staging-9.4.1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.4.1.ebuild
@@ -354,6 +354,12 @@ src_configure() {
CROSSCFLAGS="${CROSSCFLAGS:-$(
filter-flags '-fstack-protector*' #870136
filter-flags '-mfunction-return=thunk*' #878849
+
+   # some bashrc-mv users tend to do 
CFLAGS="${LDFLAGS}" and then
+   # strip-unsupported-flags miss these during 
compile-only tests
+   # (primarily done for 23.0 profiles' -z, not 
full coverage)
+   filter-flags '-Wl,-z,*'
+
CC=${mingwcc} test-flags-CC ${CFLAGS:--O2}
)}"
 

diff --git a/app-emulation/wine-staging/wine-staging-9.5.ebuild 
b/app-emulation/wine-staging/wine-staging-9.5.ebuild
index d47f91ceb1aa..ff73fe1caa6e 100644
--- a/app-emulation/wine-staging/wine-staging-9.5.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.5.ebuild
@@ -353,6 +353,12 @@ src_configure() {
CROSSCFLAGS="${CROSSCFLAGS:-$(
filter-flags '-fstack-protector*' #870136
filter-flags '-mfunction-return=thunk*' #878849
+
+   # some bashrc-mv users tend to do

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

2024-03-23 Thread Ionen Wolkens

commit: cb10b4bc05176b7ca92698ef0d053c734196a4cd
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sun Mar 24 04:01:55 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sun Mar 24 04:24:40 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb10b4bc

app-emulation/wine-staging: add 9.5

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/Manifest|   2 +
 app-emulation/wine-staging/wine-staging-9.5.ebuild | 471 +
 2 files changed, 473 insertions(+)

diff --git a/app-emulation/wine-staging/Manifest 
b/app-emulation/wine-staging/Manifest
index 6aa059f0eb17..0f090131461b 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,6 +1,8 @@
 DIST wine-9.0.tar.xz 30007216 BLAKE2B 
cf53177201a2f7eeb35d0d8ce220f80808d979099a928ad60652d1dee92620c433cc105dffab4e9309f41766087ad1544ef49d2922538bb420d62f6dd64117a1
 SHA512 
838daf2c4581f83f8573b988036f517d57b84894b090a2a17433255d6d044dfa880e6724cdb83082a36c333df9d2083ab68ae53927622a620edd59f33462ada4
 DIST wine-9.3.tar.xz 30098792 BLAKE2B 
fa6f0c73f0886918b035557a37c0553feeea5692ae15e8d67fc4360c59c1bbab9f7f93e58ae29a41800da50b961b49957cf2d060d6b5da34bd956bf7cb3e5fab
 SHA512 
3d75a0e1360765aca453d120e1f47fb50716119f3cab2be1176003a19bba31a6affae4a845840ce52665d97e0edd46dc78a13462d6d6a7e861cd970a0a3d4d1d
 DIST wine-9.4.tar.xz 30166096 BLAKE2B 
bd65086e6f6e11bc6c7cd65dba6e6997911851f1a2f25cad0b4f8100d695df3c76b0799768ab9047dfd5d8afc7c749a5e5c88003d2f4ca69f417387cc06d527d
 SHA512 
fbc927b04f75fe48e52efb6599ffc84f27f1a08d180386e782c94b37b54ab2a3540ed6cd387d7a59f5aca4df2c9ac3e3c127c3067c16e2357e57b4b0a0ced99d
+DIST wine-9.5.tar.xz 30371420 BLAKE2B 
c14ebf02f0f5b91bc2b2517ff3630f22c6af7fdc827c5d024d809a383a65446284a5349c8109835112f5353f361088f4f32de1a3d04299fbf39deacbc0e8e8bf
 SHA512 
8ccad8f6e6b1428886dee9fae771796e2021b4122cd96464350352bede25421406e6a6a0fdd63d8b99b896db8dc529aa6e05d6ac7966bee49ce3055b18a8af91
 DIST wine-staging-9.0.tar.gz 9577631 BLAKE2B 
0012978f54c618e73d407dd49dccff02853912d0c015098889802518e8c51b280f5d60e11291335dafc68944ee01cbcb7fd6c5825ef10ae1520c7b82d9846718
 SHA512 
362209fcadcf029152b681c76beb231d0cc8de1609b994094f1dc88ab871fddda08b3d8c2fe36ceb38909a9d634c1ade864ca0f28a6a7715ec286a8b2884981f
 DIST wine-staging-9.3.tar.gz 9672031 BLAKE2B 
9613d3ac8aab4208e1f4392e7fdf0f673a6159751665b2f0ab868b9140edaf32f1d4bbb5efe75458e4cce910385ebe6cec2b898f172bd0e0de87bdc675bfe221
 SHA512 
56a92cd8bbc1ba7fda9fea9d998efac44d2a805d4ebb4253a37ecff8edd51852773f848556935f05418f488698e1ec4cc52a79327f7f5d77390af90f95f9bdf6
 DIST wine-staging-9.4.1.tar.gz 9482082 BLAKE2B 
59f0b513c7df9c46a8f6ff034a2f67b92f4bb19cb1375a8ff979b7ab01223d425daf7047bd5166e946599bafe5e3ce7aa2670f893f8f6871e8c692dbe0577617
 SHA512 
897d9c292fc7d399591490fb53c62e80caab9a16619a261a84fa5b2f4a6ae5c389a6a39f29925532841c8c74254e80aa7cb764f60cf64cd431526b347df559ca
+DIST wine-staging-9.5.tar.gz 9526239 BLAKE2B 
a6f5a351a3979fc81a0d8c6325da4f08021d19eb7ac6ad52906a6fcf19552f01bdc8fbebc9b33fc82e14cdd6e6d50347dc7bc73e622d589d2e9eec5d577d3158
 SHA512 
8c756fe505092e21dd37c709ac3917c305b70881c05270f0e188ccdf9ff36b9fd224adad424d37c6919637d2af55afbfba49079eb5b6708a6cf4f2dd98966784

diff --git a/app-emulation/wine-staging/wine-staging-9.5.ebuild 
b/app-emulation/wine-staging/wine-staging-9.5.ebuild
new file mode 100644
index ..d47f91ceb1aa
--- /dev/null
+++ b/app-emulation/wine-staging/wine-staging-9.5.ebuild
@@ -0,0 +1,471 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+PYTHON_COMPAT=( python3_{10..12} )
+inherit autotools edo flag-o-matic multilib multilib-build optfeature
+inherit prefix python-any-r1 toolchain-funcs wrapper
+
+WINE_GECKO=2.47.4
+WINE_MONO=9.0.0
+WINE_P=wine-$(ver_cut 1-2)
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine-staging.git;
+   WINE_EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git;
+else
+   (( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 
1).0
+   SRC_URI="
+   https://dl.winehq.org/wine/source/${WINE_SDIR}/${WINE_P}.tar.xz
+   
https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="-* ~amd64 ~x86"
+fi
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging 
patchset"
+HOMEPAGE="
+   https://wiki.winehq.org/Wine-Staging
+   https://gitlab.winehq.org/wine/wine-staging/
+"
+
+S="${WORKDIR}/${WINE_P}"
+
+LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
+SLOT="${PV}"
+IUSE="
+   +X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos
+   llvm-libunwind custom-cflags +fontconfig +gecko gphoto2 +gstreamer
+   kerberos +mingw +mono netapi nls opencl +opengl osmesa pcap perl
+   pulseaudio samba

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

2024-03-23 Thread Ionen Wolkens

commit: 0ddafceda1b39e9364a2f967fc7a36ff6032b327
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sun Mar 24 04:01:38 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sun Mar 24 04:24:40 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ddafced

app-emulation/wine-staging: drop 9.1, 9.2, 9.4

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/Manifest|   5 -
 app-emulation/wine-staging/wine-staging-9.1.ebuild | 471 
 app-emulation/wine-staging/wine-staging-9.2.ebuild | 471 
 app-emulation/wine-staging/wine-staging-9.4.ebuild | 472 -
 4 files changed, 1419 deletions(-)

diff --git a/app-emulation/wine-staging/Manifest 
b/app-emulation/wine-staging/Manifest
index 9f60367ff5c5..6aa059f0eb17 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,11 +1,6 @@
 DIST wine-9.0.tar.xz 30007216 BLAKE2B 
cf53177201a2f7eeb35d0d8ce220f80808d979099a928ad60652d1dee92620c433cc105dffab4e9309f41766087ad1544ef49d2922538bb420d62f6dd64117a1
 SHA512 
838daf2c4581f83f8573b988036f517d57b84894b090a2a17433255d6d044dfa880e6724cdb83082a36c333df9d2083ab68ae53927622a620edd59f33462ada4
-DIST wine-9.1.tar.xz 30028220 BLAKE2B 
92d4bbaf02b414b657351fb51cb3d3a5a267ab9242a3effc8296fa73b540e23dce534d4e3e82b492f4b8539ce459b40e6d44f6708da4e5585ab2afb22045b8cf
 SHA512 
12ec508b1e457a94391ab3072ed602ff07da2e5beb4bbe4f76e42d71e87f7fa11f6531f1f1c71e96e884b10a99240a9eaf999867479b8eeadf3576df46e0a73a
-DIST wine-9.2.tar.xz 30062580 BLAKE2B 
f7deac8b89d99df3cb5ff264c2cc572b696a5885051753263dabceedbf27298d7bec5d96e0047d8d3b6c401608ad0ddd384bb1e2b48f698bdee331e2895e48f9
 SHA512 
9bffc10e573cc0ee0aaa37b09dda642c64c1456e39518256e39a752dc249e67283dece865cdb3e495b0950553a0dc004d906ecfc032c8fff936f3ef71c2d1a0d
 DIST wine-9.3.tar.xz 30098792 BLAKE2B 
fa6f0c73f0886918b035557a37c0553feeea5692ae15e8d67fc4360c59c1bbab9f7f93e58ae29a41800da50b961b49957cf2d060d6b5da34bd956bf7cb3e5fab
 SHA512 
3d75a0e1360765aca453d120e1f47fb50716119f3cab2be1176003a19bba31a6affae4a845840ce52665d97e0edd46dc78a13462d6d6a7e861cd970a0a3d4d1d
 DIST wine-9.4.tar.xz 30166096 BLAKE2B 
bd65086e6f6e11bc6c7cd65dba6e6997911851f1a2f25cad0b4f8100d695df3c76b0799768ab9047dfd5d8afc7c749a5e5c88003d2f4ca69f417387cc06d527d
 SHA512 
fbc927b04f75fe48e52efb6599ffc84f27f1a08d180386e782c94b37b54ab2a3540ed6cd387d7a59f5aca4df2c9ac3e3c127c3067c16e2357e57b4b0a0ced99d
 DIST wine-staging-9.0.tar.gz 9577631 BLAKE2B 
0012978f54c618e73d407dd49dccff02853912d0c015098889802518e8c51b280f5d60e11291335dafc68944ee01cbcb7fd6c5825ef10ae1520c7b82d9846718
 SHA512 
362209fcadcf029152b681c76beb231d0cc8de1609b994094f1dc88ab871fddda08b3d8c2fe36ceb38909a9d634c1ade864ca0f28a6a7715ec286a8b2884981f
-DIST wine-staging-9.1.tar.gz 9650475 BLAKE2B 
d5ef171f5314c3d980bf3404b4a7e51b57e8320fb3b08c42231078816b821b6a019e9d0dc2b11607d6f74bc7ab7c495166acafdc3c093136a44c9716084d7e9e
 SHA512 
070e09acf8bca60a4f2512874f48f653cc03a7fcfcfef34b4f292731d49e0670a5cf69557c268fc5dc11f0a7a8e0e7347d9665b98e6bb47e0521e3fe164ff118
-DIST wine-staging-9.2.tar.gz 9662465 BLAKE2B 
6b78558c9b4ff5d6afb1e44163e35bef2bd56c4dd492262e479d191490dd97a2a008e6c4d8b6f5a4305e1195781519e5cee94eb2c80ab76e87a522127c692e1b
 SHA512 
9b04e1359c1b485fabc7de5b3e685f8e8b8f60951b0168484aaaecce9e524df45813edfdf4a6f3b1b69bffee4e3ba4c5b7eeabcdf260f1409d1d72f0e9a00cd0
 DIST wine-staging-9.3.tar.gz 9672031 BLAKE2B 
9613d3ac8aab4208e1f4392e7fdf0f673a6159751665b2f0ab868b9140edaf32f1d4bbb5efe75458e4cce910385ebe6cec2b898f172bd0e0de87bdc675bfe221
 SHA512 
56a92cd8bbc1ba7fda9fea9d998efac44d2a805d4ebb4253a37ecff8edd51852773f848556935f05418f488698e1ec4cc52a79327f7f5d77390af90f95f9bdf6
 DIST wine-staging-9.4.1.tar.gz 9482082 BLAKE2B 
59f0b513c7df9c46a8f6ff034a2f67b92f4bb19cb1375a8ff979b7ab01223d425daf7047bd5166e946599bafe5e3ce7aa2670f893f8f6871e8c692dbe0577617
 SHA512 
897d9c292fc7d399591490fb53c62e80caab9a16619a261a84fa5b2f4a6ae5c389a6a39f29925532841c8c74254e80aa7cb764f60cf64cd431526b347df559ca
-DIST wine-staging-9.4.tar.gz 9481864 BLAKE2B 
71d1f33039b7d0d6642931b4e9d80a963313c3321c57e7261478bc4b05e50aada6c60b6ffe9708c665865a93e02bc38846df34078e20403e5437a6380462a708
 SHA512 
ba348f8bdd0d1bfd7d193e616864633e7cb68faccd23ead1588ad1fdc2287abc89e98b17532775ce0f94fb469240dccfd08ce026a93e9719e181b036d3a74cc9

diff --git a/app-emulation/wine-staging/wine-staging-9.1.ebuild 
b/app-emulation/wine-staging/wine-staging-9.1.ebuild
deleted file mode 100644
index 5b678ff26992..
--- a/app-emulation/wine-staging/wine-staging-9.1.ebuild
+++ /dev/null
@@ -1,471 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-PYTHON_COMPAT=( python3_{10..12} )
-inherit autotools edo flag-o-matic multilib multilib-build optfeature
-inherit prefix python-any-r1 toolchain-funcs wrapper
-
-WINE_GECKO=2.47.4
-WINE_MONO=8.1.0

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

2024-03-22 Thread Ionen Wolkens

commit: b60b1e0c5e38b8861993e73e8386b14b32640aed
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Mar 22 12:26:33 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Mar 22 12:30:42 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b60b1e0c

app-emulation/wine-staging: reword USE=wow64 again

There is alternate realities where OpenGL works great for some, and is
1fps unusable for others (likely depending on what is being run and/or
drivers). So saying "slightly" may be misleading.

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/wine-staging/metadata.xml 
b/app-emulation/wine-staging/metadata.xml
index cf4b9875b106..e20c128974c9 100644
--- a/app-emulation/wine-staging/metadata.xml
+++ b/app-emulation/wine-staging/metadata.xml
@@ -31,7 +31,7 @@ This variant of the Wine packaging includes the Wine-Staging 
patchset.

Enable running 32bit applications without 32bit ELF
multilib by mapping to 64bit calls (experimental,
-   may have slightly worse OpenGL performance or other
+   *may* have worse/unusable OpenGL performance or other
issues compared to USE=abi_x86_32, also lacks 16bit
support) -- still need 
dev-util/mingw64-toolchain
with abi_x86_32 which itself does not need multilib

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

2024-03-10 Thread Ionen Wolkens

commit: 5f1c8526a3cace8eecd1c86766a2ce656e09c3ad
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sun Mar 10 09:21:38 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sun Mar 10 13:09:08 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f1c8526

app-emulation/wine-staging: add 9.4.1

Supposedly 9.4 fails to build but builds fine here? And does not
seem like the related bit were disabled. Looking at the bug and
how it was using gcc10 suppose it may only happen with older
toolchains.

Either way 9.4.1 is the hotfix for that.

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/Manifest|   1 +
 .../wine-staging/wine-staging-9.4.1.ebuild | 472 +
 2 files changed, 473 insertions(+)

diff --git a/app-emulation/wine-staging/Manifest 
b/app-emulation/wine-staging/Manifest
index 4d19f62c831a..9f60367ff5c5 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -7,4 +7,5 @@ DIST wine-staging-9.0.tar.gz 9577631 BLAKE2B 
0012978f54c618e73d407dd49dccff02853
 DIST wine-staging-9.1.tar.gz 9650475 BLAKE2B 
d5ef171f5314c3d980bf3404b4a7e51b57e8320fb3b08c42231078816b821b6a019e9d0dc2b11607d6f74bc7ab7c495166acafdc3c093136a44c9716084d7e9e
 SHA512 
070e09acf8bca60a4f2512874f48f653cc03a7fcfcfef34b4f292731d49e0670a5cf69557c268fc5dc11f0a7a8e0e7347d9665b98e6bb47e0521e3fe164ff118
 DIST wine-staging-9.2.tar.gz 9662465 BLAKE2B 
6b78558c9b4ff5d6afb1e44163e35bef2bd56c4dd492262e479d191490dd97a2a008e6c4d8b6f5a4305e1195781519e5cee94eb2c80ab76e87a522127c692e1b
 SHA512 
9b04e1359c1b485fabc7de5b3e685f8e8b8f60951b0168484aaaecce9e524df45813edfdf4a6f3b1b69bffee4e3ba4c5b7eeabcdf260f1409d1d72f0e9a00cd0
 DIST wine-staging-9.3.tar.gz 9672031 BLAKE2B 
9613d3ac8aab4208e1f4392e7fdf0f673a6159751665b2f0ab868b9140edaf32f1d4bbb5efe75458e4cce910385ebe6cec2b898f172bd0e0de87bdc675bfe221
 SHA512 
56a92cd8bbc1ba7fda9fea9d998efac44d2a805d4ebb4253a37ecff8edd51852773f848556935f05418f488698e1ec4cc52a79327f7f5d77390af90f95f9bdf6
+DIST wine-staging-9.4.1.tar.gz 9482082 BLAKE2B 
59f0b513c7df9c46a8f6ff034a2f67b92f4bb19cb1375a8ff979b7ab01223d425daf7047bd5166e946599bafe5e3ce7aa2670f893f8f6871e8c692dbe0577617
 SHA512 
897d9c292fc7d399591490fb53c62e80caab9a16619a261a84fa5b2f4a6ae5c389a6a39f29925532841c8c74254e80aa7cb764f60cf64cd431526b347df559ca
 DIST wine-staging-9.4.tar.gz 9481864 BLAKE2B 
71d1f33039b7d0d6642931b4e9d80a963313c3321c57e7261478bc4b05e50aada6c60b6ffe9708c665865a93e02bc38846df34078e20403e5437a6380462a708
 SHA512 
ba348f8bdd0d1bfd7d193e616864633e7cb68faccd23ead1588ad1fdc2287abc89e98b17532775ce0f94fb469240dccfd08ce026a93e9719e181b036d3a74cc9

diff --git a/app-emulation/wine-staging/wine-staging-9.4.1.ebuild 
b/app-emulation/wine-staging/wine-staging-9.4.1.ebuild
new file mode 100644
index ..d9575ddd837a
--- /dev/null
+++ b/app-emulation/wine-staging/wine-staging-9.4.1.ebuild
@@ -0,0 +1,472 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+PYTHON_COMPAT=( python3_{10..12} )
+inherit autotools edo flag-o-matic multilib multilib-build optfeature
+inherit prefix python-any-r1 toolchain-funcs wrapper
+
+WINE_GECKO=2.47.4
+WINE_MONO=9.0.0
+WINE_P=wine-$(ver_cut 1-2)
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine-staging.git;
+   WINE_EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git;
+else
+   (( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 
1).0
+   SRC_URI="
+   https://dl.winehq.org/wine/source/${WINE_SDIR}/${WINE_P}.tar.xz
+   
https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="-* ~amd64 ~x86"
+fi
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging 
patchset"
+HOMEPAGE="
+   https://wiki.winehq.org/Wine-Staging
+   https://gitlab.winehq.org/wine/wine-staging/
+"
+
+S="${WORKDIR}/${WINE_P}"
+
+LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
+SLOT="${PV}"
+IUSE="
+   +X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos
+   llvm-libunwind custom-cflags +fontconfig +gecko gphoto2 +gstreamer
+   kerberos +mingw +mono netapi nls opencl +opengl osmesa pcap perl
+   pulseaudio samba scanner +sdl selinux smartcard +ssl +strip
+   +truetype udev udisks +unwind usb v4l +vulkan wayland wow64
+   +xcomposite xinerama
+"
+# bug #551124 for truetype
+# TODO: wow64 can be done without mingw if using clang (needs bug #912237)
+REQUIRED_USE="
+   X? ( truetype )
+   crossdev-mingw? ( mingw )
+   wow64? ( abi_x86_64 !abi_x86_32 mingw )
+"
+
+# tests are non-trivial to run, can hang easily, don't play well with
+# sandbox, and several need real opengl/vulkan or network access
+RESTRICT="test"
+
+# `grep WINE_CHECK_SONAME configure.ac` + if

[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-staging/, app-emulation/wine-staging/files/

2024-03-08 Thread Ionen Wolkens

commit: f0316ed546405b2fbdb61f7264a32cc189b72e2d
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Mar  9 04:03:35 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Mar  9 04:03:35 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0316ed5

app-emulation/wine-staging: add 9.4

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/Manifest|   2 +
 .../files/wine-staging-9.4-wayland-egl.patch   |  16 +
 app-emulation/wine-staging/wine-staging-9.4.ebuild | 472 +
 3 files changed, 490 insertions(+)

diff --git a/app-emulation/wine-staging/Manifest 
b/app-emulation/wine-staging/Manifest
index 4c66cdb14d20..4d19f62c831a 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -2,7 +2,9 @@ DIST wine-9.0.tar.xz 30007216 BLAKE2B 
cf53177201a2f7eeb35d0d8ce220f80808d979099a
 DIST wine-9.1.tar.xz 30028220 BLAKE2B 
92d4bbaf02b414b657351fb51cb3d3a5a267ab9242a3effc8296fa73b540e23dce534d4e3e82b492f4b8539ce459b40e6d44f6708da4e5585ab2afb22045b8cf
 SHA512 
12ec508b1e457a94391ab3072ed602ff07da2e5beb4bbe4f76e42d71e87f7fa11f6531f1f1c71e96e884b10a99240a9eaf999867479b8eeadf3576df46e0a73a
 DIST wine-9.2.tar.xz 30062580 BLAKE2B 
f7deac8b89d99df3cb5ff264c2cc572b696a5885051753263dabceedbf27298d7bec5d96e0047d8d3b6c401608ad0ddd384bb1e2b48f698bdee331e2895e48f9
 SHA512 
9bffc10e573cc0ee0aaa37b09dda642c64c1456e39518256e39a752dc249e67283dece865cdb3e495b0950553a0dc004d906ecfc032c8fff936f3ef71c2d1a0d
 DIST wine-9.3.tar.xz 30098792 BLAKE2B 
fa6f0c73f0886918b035557a37c0553feeea5692ae15e8d67fc4360c59c1bbab9f7f93e58ae29a41800da50b961b49957cf2d060d6b5da34bd956bf7cb3e5fab
 SHA512 
3d75a0e1360765aca453d120e1f47fb50716119f3cab2be1176003a19bba31a6affae4a845840ce52665d97e0edd46dc78a13462d6d6a7e861cd970a0a3d4d1d
+DIST wine-9.4.tar.xz 30166096 BLAKE2B 
bd65086e6f6e11bc6c7cd65dba6e6997911851f1a2f25cad0b4f8100d695df3c76b0799768ab9047dfd5d8afc7c749a5e5c88003d2f4ca69f417387cc06d527d
 SHA512 
fbc927b04f75fe48e52efb6599ffc84f27f1a08d180386e782c94b37b54ab2a3540ed6cd387d7a59f5aca4df2c9ac3e3c127c3067c16e2357e57b4b0a0ced99d
 DIST wine-staging-9.0.tar.gz 9577631 BLAKE2B 
0012978f54c618e73d407dd49dccff02853912d0c015098889802518e8c51b280f5d60e11291335dafc68944ee01cbcb7fd6c5825ef10ae1520c7b82d9846718
 SHA512 
362209fcadcf029152b681c76beb231d0cc8de1609b994094f1dc88ab871fddda08b3d8c2fe36ceb38909a9d634c1ade864ca0f28a6a7715ec286a8b2884981f
 DIST wine-staging-9.1.tar.gz 9650475 BLAKE2B 
d5ef171f5314c3d980bf3404b4a7e51b57e8320fb3b08c42231078816b821b6a019e9d0dc2b11607d6f74bc7ab7c495166acafdc3c093136a44c9716084d7e9e
 SHA512 
070e09acf8bca60a4f2512874f48f653cc03a7fcfcfef34b4f292731d49e0670a5cf69557c268fc5dc11f0a7a8e0e7347d9665b98e6bb47e0521e3fe164ff118
 DIST wine-staging-9.2.tar.gz 9662465 BLAKE2B 
6b78558c9b4ff5d6afb1e44163e35bef2bd56c4dd492262e479d191490dd97a2a008e6c4d8b6f5a4305e1195781519e5cee94eb2c80ab76e87a522127c692e1b
 SHA512 
9b04e1359c1b485fabc7de5b3e685f8e8b8f60951b0168484aaaecce9e524df45813edfdf4a6f3b1b69bffee4e3ba4c5b7eeabcdf260f1409d1d72f0e9a00cd0
 DIST wine-staging-9.3.tar.gz 9672031 BLAKE2B 
9613d3ac8aab4208e1f4392e7fdf0f673a6159751665b2f0ab868b9140edaf32f1d4bbb5efe75458e4cce910385ebe6cec2b898f172bd0e0de87bdc675bfe221
 SHA512 
56a92cd8bbc1ba7fda9fea9d998efac44d2a805d4ebb4253a37ecff8edd51852773f848556935f05418f488698e1ec4cc52a79327f7f5d77390af90f95f9bdf6
+DIST wine-staging-9.4.tar.gz 9481864 BLAKE2B 
71d1f33039b7d0d6642931b4e9d80a963313c3321c57e7261478bc4b05e50aada6c60b6ffe9708c665865a93e02bc38846df34078e20403e5437a6380462a708
 SHA512 
ba348f8bdd0d1bfd7d193e616864633e7cb68faccd23ead1588ad1fdc2287abc89e98b17532775ce0f94fb469240dccfd08ce026a93e9719e181b036d3a74cc9

diff --git 
a/app-emulation/wine-staging/files/wine-staging-9.4-wayland-egl.patch 
b/app-emulation/wine-staging/files/wine-staging-9.4-wayland-egl.patch
new file mode 100644
index ..0c6f8084f480
--- /dev/null
+++ b/app-emulation/wine-staging/files/wine-staging-9.4-wayland-egl.patch
@@ -0,0 +1,16 @@
+Unsure how this check is supposed to work, HAVE_LIBWAYLAND_EGL is never set
+as a variable but rather output as a "#define" line. Assume been last minute
+upstream oversight.
+
+We check the requirements from the ebuild itself, so let's just drop the check
+as a quick fix for now. Assume that it will be fixed in wine-9.5.
+--- a/configure.ac
 b/configure.ac
+@@ -1392,7 +1392,2 @@
+   [WAYLAND_EGL_LIBS=""],[$WAYLAND_EGL_LIBS])])])
+-if test "x$with_wayland" != "x"
+-then
+-WINE_NOTICE_WITH(opengl, [test -z "$ac_cv_lib_soname_EGL" -o -z 
"$HAVE_LIBWAYLAND_EGL"],
+-[EGL ${notice_platform}development files not found, the 
Wayland driver won't support OpenGL])
+-fi
+ fi

diff --git a/app-emulation/wine-staging/wine-staging-9.4.ebuild 
b/app-emulation/wine-staging/wine-staging-9.4.ebuild
new file mode 100644
index ..d7f5f217c76a
--- /dev/null
+++

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

2024-03-04 Thread Ionen Wolkens

commit: 06251e3d4a17edb283d01357e394319e7de6596b
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Mar  5 05:59:21 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Mar  5 06:02:51 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06251e3d

app-emulation/wine-staging: "fix" VariableOrderWrong for S

Normally pkgcheck wouldn't nag about this if it was inside
the  block, but this is a special case where the value
is the same for both.

Meant to keep S closer to SRC_URI still, but fairly harmless
to move it below DESCRIPTION to avoid nagging.

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/wine-staging-9.0.ebuild  | 3 ++-
 app-emulation/wine-staging/wine-staging-9.1.ebuild  | 3 ++-
 app-emulation/wine-staging/wine-staging-9.2.ebuild  | 3 ++-
 app-emulation/wine-staging/wine-staging-9.3.ebuild  | 3 ++-
 app-emulation/wine-staging/wine-staging-.ebuild | 3 ++-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app-emulation/wine-staging/wine-staging-9.0.ebuild 
b/app-emulation/wine-staging/wine-staging-9.0.ebuild
index bc8e31eca376..690bb4e4dc33 100644
--- a/app-emulation/wine-staging/wine-staging-9.0.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.0.ebuild
@@ -23,7 +23,6 @@ else

https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
KEYWORDS="-* ~amd64 ~x86"
 fi
-S="${WORKDIR}/${WINE_P}"
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging 
patchset"
 HOMEPAGE="
@@ -31,6 +30,8 @@ HOMEPAGE="
https://gitlab.winehq.org/wine/wine-staging/
 "
 
+S="${WORKDIR}/${WINE_P}"
+
 LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
 SLOT="${PV}"
 IUSE="

diff --git a/app-emulation/wine-staging/wine-staging-9.1.ebuild 
b/app-emulation/wine-staging/wine-staging-9.1.ebuild
index 51b9fa2f2d1f..5b678ff26992 100644
--- a/app-emulation/wine-staging/wine-staging-9.1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.1.ebuild
@@ -23,7 +23,6 @@ else

https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
KEYWORDS="-* ~amd64 ~x86"
 fi
-S="${WORKDIR}/${WINE_P}"
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging 
patchset"
 HOMEPAGE="
@@ -31,6 +30,8 @@ HOMEPAGE="
https://gitlab.winehq.org/wine/wine-staging/
 "
 
+S="${WORKDIR}/${WINE_P}"
+
 LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
 SLOT="${PV}"
 IUSE="

diff --git a/app-emulation/wine-staging/wine-staging-9.2.ebuild 
b/app-emulation/wine-staging/wine-staging-9.2.ebuild
index 662ff1444ee7..d47f91ceb1aa 100644
--- a/app-emulation/wine-staging/wine-staging-9.2.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.2.ebuild
@@ -23,7 +23,6 @@ else

https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
KEYWORDS="-* ~amd64 ~x86"
 fi
-S="${WORKDIR}/${WINE_P}"
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging 
patchset"
 HOMEPAGE="
@@ -31,6 +30,8 @@ HOMEPAGE="
https://gitlab.winehq.org/wine/wine-staging/
 "
 
+S="${WORKDIR}/${WINE_P}"
+
 LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
 SLOT="${PV}"
 IUSE="

diff --git a/app-emulation/wine-staging/wine-staging-9.3.ebuild 
b/app-emulation/wine-staging/wine-staging-9.3.ebuild
index 662ff1444ee7..d47f91ceb1aa 100644
--- a/app-emulation/wine-staging/wine-staging-9.3.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.3.ebuild
@@ -23,7 +23,6 @@ else

https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
KEYWORDS="-* ~amd64 ~x86"
 fi
-S="${WORKDIR}/${WINE_P}"
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging 
patchset"
 HOMEPAGE="
@@ -31,6 +30,8 @@ HOMEPAGE="
https://gitlab.winehq.org/wine/wine-staging/
 "
 
+S="${WORKDIR}/${WINE_P}"
+
 LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
 SLOT="${PV}"
 IUSE="

diff --git a/app-emulation/wine-staging/wine-staging-.ebuild 
b/app-emulation/wine-staging/wine-staging-.ebuild
index 662ff1444ee7..d47f91ceb1aa 100644
--- a/app-emulation/wine-staging/wine-staging-.ebuild
+++ b/app-emulation/wine-staging/wine-staging-.ebuild
@@ -23,7 +23,6 @@ else

https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
KEYWORDS="-* ~amd64 ~x86"
 fi
-S="${WORKDIR}/${WINE_P}"
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging 
patchset"
 HOMEPAGE="
@@ -31,6 +30,8 @@ HOMEPAGE="
https://gitlab.winehq.org/wine/wine-staging/
 "
 
+S="${WORKDIR}/${WINE_P}"
+
 LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
 SLOT="${PV}"
 IUSE="

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

2024-03-04 Thread Ionen Wolkens

commit: fd7e80fa1cf4a1dbc7819cbcf7a450887209fc50
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Mar  5 05:54:03 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Mar  5 05:55:43 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd7e80fa

app-emulation/wine-staging: improve USE=wow64 description further

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/metadata.xml | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app-emulation/wine-staging/metadata.xml 
b/app-emulation/wine-staging/metadata.xml
index 492b95e98827..cf4b9875b106 100644
--- a/app-emulation/wine-staging/metadata.xml
+++ b/app-emulation/wine-staging/metadata.xml
@@ -31,9 +31,10 @@ This variant of the Wine packaging includes the Wine-Staging 
patchset.

Enable running 32bit applications without 32bit ELF
multilib by mapping to 64bit calls (experimental,
-   may have worse OpenGL performance or other issues
-   compared to USE=abi_x86_32) -- still requires (just)
-   dev-util/mingw64-toolchain with abi_x86_32
+   may have slightly worse OpenGL performance or other
+   issues compared to USE=abi_x86_32, also lacks 16bit
+   support) -- still need 
dev-util/mingw64-toolchain
+   with abi_x86_32 which itself does not need multilib

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

2024-03-04 Thread Ionen Wolkens

commit: 9f5c6e42daa2b9dac695e82b504af0fff426
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Mar  5 05:57:14 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Mar  5 06:02:51 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f5c6e42

app-emulation/wine-staging: drop 8.0, 8.21

Use wine-vanilla if you still need 8.x.

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/Manifest|   4 -
 app-emulation/wine-staging/wine-staging-8.0.ebuild | 399 --
 .../wine-staging/wine-staging-8.21.ebuild  | 466 -
 3 files changed, 869 deletions(-)

diff --git a/app-emulation/wine-staging/Manifest 
b/app-emulation/wine-staging/Manifest
index 0330f4dae634..4c66cdb14d20 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,11 +1,7 @@
-DIST wine-8.0.tar.xz 29054044 BLAKE2B 
baf8f96b665119c9f38a148a2472dbe8f6ca8d4641d9d09d48cb72cb4de2585c274b8b7981c2fa622ead6da2f087c57652e9b48edc8a17c0cfd6be9a36732f02
 SHA512 
53ba813b260a65a271ec575822725b97631f60038fb026dcc0fe66862711eedcc29a8feb29ff54ae4f64458f85c290d8f3838eff5e4c77a5420a7d2b951fef77
-DIST wine-8.21.tar.xz 29919212 BLAKE2B 
2e1c135d1c247f4b268c0323538748944b01fe65c82dee27d81f70613aa2fe632c1b4d696f05838a6ab801579a4d13a191de0f4c1a2ed40ca767499a98c3
 SHA512 
4d04d40141d2ea5e548b76aed870ac28d8a03241ffd4e761979c795310baa19136e54a8e518c6ea9bf563c3b23d3c4eb1baefc9906d7eeca469e9942ff99dc40
 DIST wine-9.0.tar.xz 30007216 BLAKE2B 
cf53177201a2f7eeb35d0d8ce220f80808d979099a928ad60652d1dee92620c433cc105dffab4e9309f41766087ad1544ef49d2922538bb420d62f6dd64117a1
 SHA512 
838daf2c4581f83f8573b988036f517d57b84894b090a2a17433255d6d044dfa880e6724cdb83082a36c333df9d2083ab68ae53927622a620edd59f33462ada4
 DIST wine-9.1.tar.xz 30028220 BLAKE2B 
92d4bbaf02b414b657351fb51cb3d3a5a267ab9242a3effc8296fa73b540e23dce534d4e3e82b492f4b8539ce459b40e6d44f6708da4e5585ab2afb22045b8cf
 SHA512 
12ec508b1e457a94391ab3072ed602ff07da2e5beb4bbe4f76e42d71e87f7fa11f6531f1f1c71e96e884b10a99240a9eaf999867479b8eeadf3576df46e0a73a
 DIST wine-9.2.tar.xz 30062580 BLAKE2B 
f7deac8b89d99df3cb5ff264c2cc572b696a5885051753263dabceedbf27298d7bec5d96e0047d8d3b6c401608ad0ddd384bb1e2b48f698bdee331e2895e48f9
 SHA512 
9bffc10e573cc0ee0aaa37b09dda642c64c1456e39518256e39a752dc249e67283dece865cdb3e495b0950553a0dc004d906ecfc032c8fff936f3ef71c2d1a0d
 DIST wine-9.3.tar.xz 30098792 BLAKE2B 
fa6f0c73f0886918b035557a37c0553feeea5692ae15e8d67fc4360c59c1bbab9f7f93e58ae29a41800da50b961b49957cf2d060d6b5da34bd956bf7cb3e5fab
 SHA512 
3d75a0e1360765aca453d120e1f47fb50716119f3cab2be1176003a19bba31a6affae4a845840ce52665d97e0edd46dc78a13462d6d6a7e861cd970a0a3d4d1d
-DIST wine-staging-8.0.tar.gz 9529620 BLAKE2B 
c9540195ea885d9f1e980232b0af471e92c61eb079cae35fdb3af5c13d4660b3466f751772440e38f15874082db296d16d1f1d68827a505b2dd949617eda0203
 SHA512 
76a729d7ced1ff634ddb455ddfaa66ca103b652f43cd152b57ada7431bb5fbb74f5e92bf2f4f329b6df6f5908130afad84e609cbce6df645d6cf8131e9b949f9
-DIST wine-staging-8.21.tar.gz 9669500 BLAKE2B 
600ad4b5696a38adefbde2fb9f51623dc7a7d9249ba15ceddcf1062040d840064285c6d2602266fd90f3658f0bdfe2fbca6a486f40e6e3f317fe704553ce39c7
 SHA512 
abba6084f2aefa8507c2a79c688b717f8137375168e5457ee40a0c96bfce31e9dc44370ecb5a8e8a397e90ce2eb8543fd07b447bf48c4b2d4c68aac9b3674214
 DIST wine-staging-9.0.tar.gz 9577631 BLAKE2B 
0012978f54c618e73d407dd49dccff02853912d0c015098889802518e8c51b280f5d60e11291335dafc68944ee01cbcb7fd6c5825ef10ae1520c7b82d9846718
 SHA512 
362209fcadcf029152b681c76beb231d0cc8de1609b994094f1dc88ab871fddda08b3d8c2fe36ceb38909a9d634c1ade864ca0f28a6a7715ec286a8b2884981f
 DIST wine-staging-9.1.tar.gz 9650475 BLAKE2B 
d5ef171f5314c3d980bf3404b4a7e51b57e8320fb3b08c42231078816b821b6a019e9d0dc2b11607d6f74bc7ab7c495166acafdc3c093136a44c9716084d7e9e
 SHA512 
070e09acf8bca60a4f2512874f48f653cc03a7fcfcfef34b4f292731d49e0670a5cf69557c268fc5dc11f0a7a8e0e7347d9665b98e6bb47e0521e3fe164ff118
 DIST wine-staging-9.2.tar.gz 9662465 BLAKE2B 
6b78558c9b4ff5d6afb1e44163e35bef2bd56c4dd492262e479d191490dd97a2a008e6c4d8b6f5a4305e1195781519e5cee94eb2c80ab76e87a522127c692e1b
 SHA512 
9b04e1359c1b485fabc7de5b3e685f8e8b8f60951b0168484aaaecce9e524df45813edfdf4a6f3b1b69bffee4e3ba4c5b7eeabcdf260f1409d1d72f0e9a00cd0

diff --git a/app-emulation/wine-staging/wine-staging-8.0.ebuild 
b/app-emulation/wine-staging/wine-staging-8.0.ebuild
deleted file mode 100644
index f851c01b3b71..
--- a/app-emulation/wine-staging/wine-staging-8.0.ebuild
+++ /dev/null
@@ -1,399 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-inherit autotools flag-o-matic multilib multilib-build
-inherit prefix toolchain-funcs wrapper
-
-WINE_GECKO=2.47.3
-WINE_MONO=7.4.0
-
-if [[ ${PV} == * ]]; then
-   inherit git-r3
-

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

2024-02-26 Thread Ionen Wolkens

commit: 0ac14d5d16ba134702c1622c8cd0f18a5501e369
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Feb 26 23:23:39 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Feb 26 23:46:51 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ac14d5d

app-emulation/wine-staging: sort inherits

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/wine-staging-9.1.ebuild  | 2 +-
 app-emulation/wine-staging/wine-staging-9.2.ebuild  | 2 +-
 app-emulation/wine-staging/wine-staging-9.3.ebuild  | 2 +-
 app-emulation/wine-staging/wine-staging-.ebuild | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app-emulation/wine-staging/wine-staging-9.1.ebuild 
b/app-emulation/wine-staging/wine-staging-9.1.ebuild
index 4ec98f70e1f8..51b9fa2f2d1f 100644
--- a/app-emulation/wine-staging/wine-staging-9.1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
 PYTHON_COMPAT=( python3_{10..12} )
-inherit autotools edo flag-o-matic optfeature multilib multilib-build
+inherit autotools edo flag-o-matic multilib multilib-build optfeature
 inherit prefix python-any-r1 toolchain-funcs wrapper
 
 WINE_GECKO=2.47.4

diff --git a/app-emulation/wine-staging/wine-staging-9.2.ebuild 
b/app-emulation/wine-staging/wine-staging-9.2.ebuild
index 92927ae372ba..662ff1444ee7 100644
--- a/app-emulation/wine-staging/wine-staging-9.2.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
 PYTHON_COMPAT=( python3_{10..12} )
-inherit autotools edo flag-o-matic optfeature multilib multilib-build
+inherit autotools edo flag-o-matic multilib multilib-build optfeature
 inherit prefix python-any-r1 toolchain-funcs wrapper
 
 WINE_GECKO=2.47.4

diff --git a/app-emulation/wine-staging/wine-staging-9.3.ebuild 
b/app-emulation/wine-staging/wine-staging-9.3.ebuild
index 92927ae372ba..662ff1444ee7 100644
--- a/app-emulation/wine-staging/wine-staging-9.3.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.3.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
 PYTHON_COMPAT=( python3_{10..12} )
-inherit autotools edo flag-o-matic optfeature multilib multilib-build
+inherit autotools edo flag-o-matic multilib multilib-build optfeature
 inherit prefix python-any-r1 toolchain-funcs wrapper
 
 WINE_GECKO=2.47.4

diff --git a/app-emulation/wine-staging/wine-staging-.ebuild 
b/app-emulation/wine-staging/wine-staging-.ebuild
index 92927ae372ba..662ff1444ee7 100644
--- a/app-emulation/wine-staging/wine-staging-.ebuild
+++ b/app-emulation/wine-staging/wine-staging-.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
 PYTHON_COMPAT=( python3_{10..12} )
-inherit autotools edo flag-o-matic optfeature multilib multilib-build
+inherit autotools edo flag-o-matic multilib multilib-build optfeature
 inherit prefix python-any-r1 toolchain-funcs wrapper
 
 WINE_GECKO=2.47.4

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

2024-02-26 Thread Ionen Wolkens

commit: 1a2eeeff3fb408fbf21681d332987cf0358cc0ac
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Feb 26 23:20:08 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Feb 26 23:46:51 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a2eeeff

app-emulation/wine-staging: drop -fno-plt filtering

Not that this means that it works.

Logic was inverted in 8.21+ and I meant to correct it, but after
all I don't think I want to even care for this and users with
USE=custom-cflags are on their own.

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/wine-staging-8.0.ebuild  | 1 -
 app-emulation/wine-staging/wine-staging-8.21.ebuild | 2 --
 app-emulation/wine-staging/wine-staging-9.0.ebuild  | 2 --
 app-emulation/wine-staging/wine-staging-9.1.ebuild  | 2 --
 app-emulation/wine-staging/wine-staging-9.2.ebuild  | 2 --
 app-emulation/wine-staging/wine-staging-9.3.ebuild  | 2 --
 app-emulation/wine-staging/wine-staging-.ebuild | 2 --
 7 files changed, 13 deletions(-)

diff --git a/app-emulation/wine-staging/wine-staging-8.0.ebuild 
b/app-emulation/wine-staging/wine-staging-8.0.ebuild
index 8cf4172ff020..f851c01b3b71 100644
--- a/app-emulation/wine-staging/wine-staging-8.0.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.0.ebuild
@@ -275,7 +275,6 @@ src_configure() {
 
tc-ld-force-bfd # builds with non-bfd but broken at runtime (bug 
#867097)
filter-lto # build failure
-   use mingw || filter-flags -fno-plt # build failure
use custom-cflags || strip-flags # can break in obscure ways at runtime
use crossdev-mingw || 
PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
 

diff --git a/app-emulation/wine-staging/wine-staging-8.21.ebuild 
b/app-emulation/wine-staging/wine-staging-8.21.ebuild
index 0af9b3b34ab1..fee2fc010537 100644
--- a/app-emulation/wine-staging/wine-staging-8.21.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.21.ebuild
@@ -331,8 +331,6 @@ src_configure() {
if use mingw; then
use crossdev-mingw || 
PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
 
-   filter-flags -fno-plt # build failure
-
# CROSSCC was formerly recognized by wine, thus been using 
similar
# variables (subject to change, esp. if ever make a 
mingw.eclass).
local 
mingwcc_amd64=${CROSSCC:-${CROSSCC_amd64:-x86_64-w64-mingw32-gcc}}

diff --git a/app-emulation/wine-staging/wine-staging-9.0.ebuild 
b/app-emulation/wine-staging/wine-staging-9.0.ebuild
index f9096affab24..bc8e31eca376 100644
--- a/app-emulation/wine-staging/wine-staging-9.0.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.0.ebuild
@@ -339,8 +339,6 @@ src_configure() {
if use mingw; then
use crossdev-mingw || 
PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
 
-   filter-flags -fno-plt # build failure
-
# CROSSCC was formerly recognized by wine, thus been using 
similar
# variables (subject to change, esp. if ever make a 
mingw.eclass).
local 
mingwcc_amd64=${CROSSCC:-${CROSSCC_amd64:-x86_64-w64-mingw32-gcc}}

diff --git a/app-emulation/wine-staging/wine-staging-9.1.ebuild 
b/app-emulation/wine-staging/wine-staging-9.1.ebuild
index 4ec95df08d29..4ec98f70e1f8 100644
--- a/app-emulation/wine-staging/wine-staging-9.1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.1.ebuild
@@ -339,8 +339,6 @@ src_configure() {
if use mingw; then
use crossdev-mingw || 
PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
 
-   filter-flags -fno-plt # build failure
-
# CROSSCC was formerly recognized by wine, thus been using 
similar
# variables (subject to change, esp. if ever make a 
mingw.eclass).
local 
mingwcc_amd64=${CROSSCC:-${CROSSCC_amd64:-x86_64-w64-mingw32-gcc}}

diff --git a/app-emulation/wine-staging/wine-staging-9.2.ebuild 
b/app-emulation/wine-staging/wine-staging-9.2.ebuild
index 6b83fcb60f31..92927ae372ba 100644
--- a/app-emulation/wine-staging/wine-staging-9.2.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.2.ebuild
@@ -339,8 +339,6 @@ src_configure() {
if use mingw; then
use crossdev-mingw || 
PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
 
-   filter-flags -fno-plt # build failure
-
# CROSSCC was formerly recognized by wine, thus been using 
similar
# variables (subject to change, esp. if ever make a 
mingw.eclass).
local 
mingwcc_amd64=${CROSSCC:-${CROSSCC_amd64:-x86_64-w64-mingw32-gcc}}

diff --git a/app-emulation/wine-staging/wine-staging-9.3.ebuild 
b/app-emulation/wine-staging/wine-staging-9.3.ebuild
index 6b83fcb60f31..92927ae372ba 100644
--- a/app-emulation/wine-staging/wine-staging-9.3.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.3.ebuild
@@ -339,8 +339,6 @@ src_configure() {

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

2024-02-24 Thread Ionen Wolkens

commit: 4cbd28126e1f9efd260b1906d10e7e824c82faa5
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sun Feb 25 00:53:09 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sun Feb 25 01:18:35 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cbd2812

app-emulation/wine-staging: add 9.3

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/Manifest|   2 +
 app-emulation/wine-staging/wine-staging-9.3.ebuild | 472 +
 2 files changed, 474 insertions(+)

diff --git a/app-emulation/wine-staging/Manifest 
b/app-emulation/wine-staging/Manifest
index 427b2d99f317..0330f4dae634 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -3,8 +3,10 @@ DIST wine-8.21.tar.xz 29919212 BLAKE2B 
2e1c135d1c247f4b268c0323538748944b01fe65c
 DIST wine-9.0.tar.xz 30007216 BLAKE2B 
cf53177201a2f7eeb35d0d8ce220f80808d979099a928ad60652d1dee92620c433cc105dffab4e9309f41766087ad1544ef49d2922538bb420d62f6dd64117a1
 SHA512 
838daf2c4581f83f8573b988036f517d57b84894b090a2a17433255d6d044dfa880e6724cdb83082a36c333df9d2083ab68ae53927622a620edd59f33462ada4
 DIST wine-9.1.tar.xz 30028220 BLAKE2B 
92d4bbaf02b414b657351fb51cb3d3a5a267ab9242a3effc8296fa73b540e23dce534d4e3e82b492f4b8539ce459b40e6d44f6708da4e5585ab2afb22045b8cf
 SHA512 
12ec508b1e457a94391ab3072ed602ff07da2e5beb4bbe4f76e42d71e87f7fa11f6531f1f1c71e96e884b10a99240a9eaf999867479b8eeadf3576df46e0a73a
 DIST wine-9.2.tar.xz 30062580 BLAKE2B 
f7deac8b89d99df3cb5ff264c2cc572b696a5885051753263dabceedbf27298d7bec5d96e0047d8d3b6c401608ad0ddd384bb1e2b48f698bdee331e2895e48f9
 SHA512 
9bffc10e573cc0ee0aaa37b09dda642c64c1456e39518256e39a752dc249e67283dece865cdb3e495b0950553a0dc004d906ecfc032c8fff936f3ef71c2d1a0d
+DIST wine-9.3.tar.xz 30098792 BLAKE2B 
fa6f0c73f0886918b035557a37c0553feeea5692ae15e8d67fc4360c59c1bbab9f7f93e58ae29a41800da50b961b49957cf2d060d6b5da34bd956bf7cb3e5fab
 SHA512 
3d75a0e1360765aca453d120e1f47fb50716119f3cab2be1176003a19bba31a6affae4a845840ce52665d97e0edd46dc78a13462d6d6a7e861cd970a0a3d4d1d
 DIST wine-staging-8.0.tar.gz 9529620 BLAKE2B 
c9540195ea885d9f1e980232b0af471e92c61eb079cae35fdb3af5c13d4660b3466f751772440e38f15874082db296d16d1f1d68827a505b2dd949617eda0203
 SHA512 
76a729d7ced1ff634ddb455ddfaa66ca103b652f43cd152b57ada7431bb5fbb74f5e92bf2f4f329b6df6f5908130afad84e609cbce6df645d6cf8131e9b949f9
 DIST wine-staging-8.21.tar.gz 9669500 BLAKE2B 
600ad4b5696a38adefbde2fb9f51623dc7a7d9249ba15ceddcf1062040d840064285c6d2602266fd90f3658f0bdfe2fbca6a486f40e6e3f317fe704553ce39c7
 SHA512 
abba6084f2aefa8507c2a79c688b717f8137375168e5457ee40a0c96bfce31e9dc44370ecb5a8e8a397e90ce2eb8543fd07b447bf48c4b2d4c68aac9b3674214
 DIST wine-staging-9.0.tar.gz 9577631 BLAKE2B 
0012978f54c618e73d407dd49dccff02853912d0c015098889802518e8c51b280f5d60e11291335dafc68944ee01cbcb7fd6c5825ef10ae1520c7b82d9846718
 SHA512 
362209fcadcf029152b681c76beb231d0cc8de1609b994094f1dc88ab871fddda08b3d8c2fe36ceb38909a9d634c1ade864ca0f28a6a7715ec286a8b2884981f
 DIST wine-staging-9.1.tar.gz 9650475 BLAKE2B 
d5ef171f5314c3d980bf3404b4a7e51b57e8320fb3b08c42231078816b821b6a019e9d0dc2b11607d6f74bc7ab7c495166acafdc3c093136a44c9716084d7e9e
 SHA512 
070e09acf8bca60a4f2512874f48f653cc03a7fcfcfef34b4f292731d49e0670a5cf69557c268fc5dc11f0a7a8e0e7347d9665b98e6bb47e0521e3fe164ff118
 DIST wine-staging-9.2.tar.gz 9662465 BLAKE2B 
6b78558c9b4ff5d6afb1e44163e35bef2bd56c4dd492262e479d191490dd97a2a008e6c4d8b6f5a4305e1195781519e5cee94eb2c80ab76e87a522127c692e1b
 SHA512 
9b04e1359c1b485fabc7de5b3e685f8e8b8f60951b0168484aaaecce9e524df45813edfdf4a6f3b1b69bffee4e3ba4c5b7eeabcdf260f1409d1d72f0e9a00cd0
+DIST wine-staging-9.3.tar.gz 9672031 BLAKE2B 
9613d3ac8aab4208e1f4392e7fdf0f673a6159751665b2f0ab868b9140edaf32f1d4bbb5efe75458e4cce910385ebe6cec2b898f172bd0e0de87bdc675bfe221
 SHA512 
56a92cd8bbc1ba7fda9fea9d998efac44d2a805d4ebb4253a37ecff8edd51852773f848556935f05418f488698e1ec4cc52a79327f7f5d77390af90f95f9bdf6

diff --git a/app-emulation/wine-staging/wine-staging-9.3.ebuild 
b/app-emulation/wine-staging/wine-staging-9.3.ebuild
new file mode 100644
index ..6b83fcb60f31
--- /dev/null
+++ b/app-emulation/wine-staging/wine-staging-9.3.ebuild
@@ -0,0 +1,472 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+PYTHON_COMPAT=( python3_{10..12} )
+inherit autotools edo flag-o-matic optfeature multilib multilib-build
+inherit prefix python-any-r1 toolchain-funcs wrapper
+
+WINE_GECKO=2.47.4
+WINE_MONO=9.0.0
+WINE_P=wine-$(ver_cut 1-2)
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine-staging.git;
+   WINE_EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git;
+else
+   (( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 
1).0
+   SRC_URI="
+

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

2024-02-16 Thread Ionen Wolkens

commit: bd830da1d6808098a20bffd01559cbda993b95b4
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Feb 16 10:31:37 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Feb 16 10:50:45 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd830da1

app-emulation/wine-staging: optfeature on game-device-udev-rules

In 9.1+, wine defaults to using /dev/hidraw* for some extra gamepads,
most notably Sony DualShock4 which may come as unexpected. /dev/hidraw*
access is restricted to root by default leaving users with a situation
that seem like a wine regression.

Only a optfeature since most gamepads do not need this (xbox one,
about any 3rd party gamepads, etc...). Hopefully the optfeature is
noticed by affected users.

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/wine-staging-9.1.ebuild  | 5 -
 app-emulation/wine-staging/wine-staging-9.2.ebuild  | 5 -
 app-emulation/wine-staging/wine-staging-.ebuild | 5 -
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/app-emulation/wine-staging/wine-staging-9.1.ebuild 
b/app-emulation/wine-staging/wine-staging-9.1.ebuild
index f9096affab24..4ec95df08d29 100644
--- a/app-emulation/wine-staging/wine-staging-9.1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
 PYTHON_COMPAT=( python3_{10..12} )
-inherit autotools edo flag-o-matic multilib multilib-build
+inherit autotools edo flag-o-matic optfeature multilib multilib-build
 inherit prefix python-any-r1 toolchain-funcs wrapper
 
 WINE_GECKO=2.47.4
@@ -461,6 +461,9 @@ pkg_postinst() {
ewarn "applications under ${PN} will likely not be usable."
fi
 
+   optfeature "/dev/hidraw* access used for *some* controllers (e.g. 
DualShock4)" \
+   games-util/game-device-udev-rules
+
eselect wine update --if-unset || die
 }
 

diff --git a/app-emulation/wine-staging/wine-staging-9.2.ebuild 
b/app-emulation/wine-staging/wine-staging-9.2.ebuild
index 9790d6480e7e..6b83fcb60f31 100644
--- a/app-emulation/wine-staging/wine-staging-9.2.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
 PYTHON_COMPAT=( python3_{10..12} )
-inherit autotools edo flag-o-matic multilib multilib-build
+inherit autotools edo flag-o-matic optfeature multilib multilib-build
 inherit prefix python-any-r1 toolchain-funcs wrapper
 
 WINE_GECKO=2.47.4
@@ -461,6 +461,9 @@ pkg_postinst() {
ewarn "applications under ${PN} will likely not be usable."
fi
 
+   optfeature "/dev/hidraw* access used for *some* controllers (e.g. 
DualShock4)" \
+   games-util/game-device-udev-rules
+
eselect wine update --if-unset || die
 }
 

diff --git a/app-emulation/wine-staging/wine-staging-.ebuild 
b/app-emulation/wine-staging/wine-staging-.ebuild
index 9790d6480e7e..6b83fcb60f31 100644
--- a/app-emulation/wine-staging/wine-staging-.ebuild
+++ b/app-emulation/wine-staging/wine-staging-.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
 PYTHON_COMPAT=( python3_{10..12} )
-inherit autotools edo flag-o-matic multilib multilib-build
+inherit autotools edo flag-o-matic optfeature multilib multilib-build
 inherit prefix python-any-r1 toolchain-funcs wrapper
 
 WINE_GECKO=2.47.4
@@ -461,6 +461,9 @@ pkg_postinst() {
ewarn "applications under ${PN} will likely not be usable."
fi
 
+   optfeature "/dev/hidraw* access used for *some* controllers (e.g. 
DualShock4)" \
+   games-util/game-device-udev-rules
+
eselect wine update --if-unset || die
 }

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

2024-02-10 Thread Ionen Wolkens

commit: 7f6bda45522f10e9e64d00735b6472334bf0aa68
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sun Feb 11 05:22:08 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sun Feb 11 05:22:08 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f6bda45

app-emulation/wine-staging: add 9.2

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/Manifest|   2 +
 app-emulation/wine-staging/wine-staging-9.2.ebuild | 469 +
 2 files changed, 471 insertions(+)

diff --git a/app-emulation/wine-staging/Manifest 
b/app-emulation/wine-staging/Manifest
index c023324e0634..427b2d99f317 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -2,7 +2,9 @@ DIST wine-8.0.tar.xz 29054044 BLAKE2B 
baf8f96b665119c9f38a148a2472dbe8f6ca8d4641
 DIST wine-8.21.tar.xz 29919212 BLAKE2B 
2e1c135d1c247f4b268c0323538748944b01fe65c82dee27d81f70613aa2fe632c1b4d696f05838a6ab801579a4d13a191de0f4c1a2ed40ca767499a98c3
 SHA512 
4d04d40141d2ea5e548b76aed870ac28d8a03241ffd4e761979c795310baa19136e54a8e518c6ea9bf563c3b23d3c4eb1baefc9906d7eeca469e9942ff99dc40
 DIST wine-9.0.tar.xz 30007216 BLAKE2B 
cf53177201a2f7eeb35d0d8ce220f80808d979099a928ad60652d1dee92620c433cc105dffab4e9309f41766087ad1544ef49d2922538bb420d62f6dd64117a1
 SHA512 
838daf2c4581f83f8573b988036f517d57b84894b090a2a17433255d6d044dfa880e6724cdb83082a36c333df9d2083ab68ae53927622a620edd59f33462ada4
 DIST wine-9.1.tar.xz 30028220 BLAKE2B 
92d4bbaf02b414b657351fb51cb3d3a5a267ab9242a3effc8296fa73b540e23dce534d4e3e82b492f4b8539ce459b40e6d44f6708da4e5585ab2afb22045b8cf
 SHA512 
12ec508b1e457a94391ab3072ed602ff07da2e5beb4bbe4f76e42d71e87f7fa11f6531f1f1c71e96e884b10a99240a9eaf999867479b8eeadf3576df46e0a73a
+DIST wine-9.2.tar.xz 30062580 BLAKE2B 
f7deac8b89d99df3cb5ff264c2cc572b696a5885051753263dabceedbf27298d7bec5d96e0047d8d3b6c401608ad0ddd384bb1e2b48f698bdee331e2895e48f9
 SHA512 
9bffc10e573cc0ee0aaa37b09dda642c64c1456e39518256e39a752dc249e67283dece865cdb3e495b0950553a0dc004d906ecfc032c8fff936f3ef71c2d1a0d
 DIST wine-staging-8.0.tar.gz 9529620 BLAKE2B 
c9540195ea885d9f1e980232b0af471e92c61eb079cae35fdb3af5c13d4660b3466f751772440e38f15874082db296d16d1f1d68827a505b2dd949617eda0203
 SHA512 
76a729d7ced1ff634ddb455ddfaa66ca103b652f43cd152b57ada7431bb5fbb74f5e92bf2f4f329b6df6f5908130afad84e609cbce6df645d6cf8131e9b949f9
 DIST wine-staging-8.21.tar.gz 9669500 BLAKE2B 
600ad4b5696a38adefbde2fb9f51623dc7a7d9249ba15ceddcf1062040d840064285c6d2602266fd90f3658f0bdfe2fbca6a486f40e6e3f317fe704553ce39c7
 SHA512 
abba6084f2aefa8507c2a79c688b717f8137375168e5457ee40a0c96bfce31e9dc44370ecb5a8e8a397e90ce2eb8543fd07b447bf48c4b2d4c68aac9b3674214
 DIST wine-staging-9.0.tar.gz 9577631 BLAKE2B 
0012978f54c618e73d407dd49dccff02853912d0c015098889802518e8c51b280f5d60e11291335dafc68944ee01cbcb7fd6c5825ef10ae1520c7b82d9846718
 SHA512 
362209fcadcf029152b681c76beb231d0cc8de1609b994094f1dc88ab871fddda08b3d8c2fe36ceb38909a9d634c1ade864ca0f28a6a7715ec286a8b2884981f
 DIST wine-staging-9.1.tar.gz 9650475 BLAKE2B 
d5ef171f5314c3d980bf3404b4a7e51b57e8320fb3b08c42231078816b821b6a019e9d0dc2b11607d6f74bc7ab7c495166acafdc3c093136a44c9716084d7e9e
 SHA512 
070e09acf8bca60a4f2512874f48f653cc03a7fcfcfef34b4f292731d49e0670a5cf69557c268fc5dc11f0a7a8e0e7347d9665b98e6bb47e0521e3fe164ff118
+DIST wine-staging-9.2.tar.gz 9662465 BLAKE2B 
6b78558c9b4ff5d6afb1e44163e35bef2bd56c4dd492262e479d191490dd97a2a008e6c4d8b6f5a4305e1195781519e5cee94eb2c80ab76e87a522127c692e1b
 SHA512 
9b04e1359c1b485fabc7de5b3e685f8e8b8f60951b0168484aaaecce9e524df45813edfdf4a6f3b1b69bffee4e3ba4c5b7eeabcdf260f1409d1d72f0e9a00cd0

diff --git a/app-emulation/wine-staging/wine-staging-9.2.ebuild 
b/app-emulation/wine-staging/wine-staging-9.2.ebuild
new file mode 100644
index ..9790d6480e7e
--- /dev/null
+++ b/app-emulation/wine-staging/wine-staging-9.2.ebuild
@@ -0,0 +1,469 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+PYTHON_COMPAT=( python3_{10..12} )
+inherit autotools edo flag-o-matic multilib multilib-build
+inherit prefix python-any-r1 toolchain-funcs wrapper
+
+WINE_GECKO=2.47.4
+WINE_MONO=9.0.0
+WINE_P=wine-$(ver_cut 1-2)
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine-staging.git;
+   WINE_EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git;
+else
+   (( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 
1).0
+   SRC_URI="
+   https://dl.winehq.org/wine/source/${WINE_SDIR}/${WINE_P}.tar.xz
+   
https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="-* ~amd64 ~x86"
+fi
+S="${WORKDIR}/${WINE_P}"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging 
patchset"
+HOMEPAGE="
+   https://wiki.winehq.org/Wine-Staging
+

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

2024-01-26 Thread Ionen Wolkens

commit: 66a115974bbcc1c5b8e028940737e711fb44ab78
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Jan 27 07:24:49 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Jan 27 07:46:27 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66a11597

app-emulation/wine-staging: add 9.1

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/Manifest|   2 +
 app-emulation/wine-staging/wine-staging-9.1.ebuild | 469 +
 2 files changed, 471 insertions(+)

diff --git a/app-emulation/wine-staging/Manifest 
b/app-emulation/wine-staging/Manifest
index 485651f2d1ad..c023324e0634 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,6 +1,8 @@
 DIST wine-8.0.tar.xz 29054044 BLAKE2B 
baf8f96b665119c9f38a148a2472dbe8f6ca8d4641d9d09d48cb72cb4de2585c274b8b7981c2fa622ead6da2f087c57652e9b48edc8a17c0cfd6be9a36732f02
 SHA512 
53ba813b260a65a271ec575822725b97631f60038fb026dcc0fe66862711eedcc29a8feb29ff54ae4f64458f85c290d8f3838eff5e4c77a5420a7d2b951fef77
 DIST wine-8.21.tar.xz 29919212 BLAKE2B 
2e1c135d1c247f4b268c0323538748944b01fe65c82dee27d81f70613aa2fe632c1b4d696f05838a6ab801579a4d13a191de0f4c1a2ed40ca767499a98c3
 SHA512 
4d04d40141d2ea5e548b76aed870ac28d8a03241ffd4e761979c795310baa19136e54a8e518c6ea9bf563c3b23d3c4eb1baefc9906d7eeca469e9942ff99dc40
 DIST wine-9.0.tar.xz 30007216 BLAKE2B 
cf53177201a2f7eeb35d0d8ce220f80808d979099a928ad60652d1dee92620c433cc105dffab4e9309f41766087ad1544ef49d2922538bb420d62f6dd64117a1
 SHA512 
838daf2c4581f83f8573b988036f517d57b84894b090a2a17433255d6d044dfa880e6724cdb83082a36c333df9d2083ab68ae53927622a620edd59f33462ada4
+DIST wine-9.1.tar.xz 30028220 BLAKE2B 
92d4bbaf02b414b657351fb51cb3d3a5a267ab9242a3effc8296fa73b540e23dce534d4e3e82b492f4b8539ce459b40e6d44f6708da4e5585ab2afb22045b8cf
 SHA512 
12ec508b1e457a94391ab3072ed602ff07da2e5beb4bbe4f76e42d71e87f7fa11f6531f1f1c71e96e884b10a99240a9eaf999867479b8eeadf3576df46e0a73a
 DIST wine-staging-8.0.tar.gz 9529620 BLAKE2B 
c9540195ea885d9f1e980232b0af471e92c61eb079cae35fdb3af5c13d4660b3466f751772440e38f15874082db296d16d1f1d68827a505b2dd949617eda0203
 SHA512 
76a729d7ced1ff634ddb455ddfaa66ca103b652f43cd152b57ada7431bb5fbb74f5e92bf2f4f329b6df6f5908130afad84e609cbce6df645d6cf8131e9b949f9
 DIST wine-staging-8.21.tar.gz 9669500 BLAKE2B 
600ad4b5696a38adefbde2fb9f51623dc7a7d9249ba15ceddcf1062040d840064285c6d2602266fd90f3658f0bdfe2fbca6a486f40e6e3f317fe704553ce39c7
 SHA512 
abba6084f2aefa8507c2a79c688b717f8137375168e5457ee40a0c96bfce31e9dc44370ecb5a8e8a397e90ce2eb8543fd07b447bf48c4b2d4c68aac9b3674214
 DIST wine-staging-9.0.tar.gz 9577631 BLAKE2B 
0012978f54c618e73d407dd49dccff02853912d0c015098889802518e8c51b280f5d60e11291335dafc68944ee01cbcb7fd6c5825ef10ae1520c7b82d9846718
 SHA512 
362209fcadcf029152b681c76beb231d0cc8de1609b994094f1dc88ab871fddda08b3d8c2fe36ceb38909a9d634c1ade864ca0f28a6a7715ec286a8b2884981f
+DIST wine-staging-9.1.tar.gz 9650475 BLAKE2B 
d5ef171f5314c3d980bf3404b4a7e51b57e8320fb3b08c42231078816b821b6a019e9d0dc2b11607d6f74bc7ab7c495166acafdc3c093136a44c9716084d7e9e
 SHA512 
070e09acf8bca60a4f2512874f48f653cc03a7fcfcfef34b4f292731d49e0670a5cf69557c268fc5dc11f0a7a8e0e7347d9665b98e6bb47e0521e3fe164ff118

diff --git a/app-emulation/wine-staging/wine-staging-9.1.ebuild 
b/app-emulation/wine-staging/wine-staging-9.1.ebuild
new file mode 100644
index ..f9096affab24
--- /dev/null
+++ b/app-emulation/wine-staging/wine-staging-9.1.ebuild
@@ -0,0 +1,469 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+PYTHON_COMPAT=( python3_{10..12} )
+inherit autotools edo flag-o-matic multilib multilib-build
+inherit prefix python-any-r1 toolchain-funcs wrapper
+
+WINE_GECKO=2.47.4
+WINE_MONO=8.1.0
+WINE_P=wine-$(ver_cut 1-2)
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine-staging.git;
+   WINE_EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git;
+else
+   (( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 
1).0
+   SRC_URI="
+   https://dl.winehq.org/wine/source/${WINE_SDIR}/${WINE_P}.tar.xz
+   
https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="-* ~amd64 ~x86"
+fi
+S="${WORKDIR}/${WINE_P}"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging 
patchset"
+HOMEPAGE="
+   https://wiki.winehq.org/Wine-Staging
+   https://gitlab.winehq.org/wine/wine-staging/
+"
+
+LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
+SLOT="${PV}"
+IUSE="
+   +X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos
+   llvm-libunwind custom-cflags +fontconfig +gecko gphoto2 +gstreamer
+   kerberos +mingw +mono netapi nls opencl +opengl osmesa pcap perl
+   pulseaudio samba scanner +sdl

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

2024-01-17 Thread Ionen Wolkens

commit: 6712364a36b0a18fcac531158458885d6374cdd3
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Jan 17 18:23:32 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Jan 17 18:47:12 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6712364a

app-emulation/wine-staging: mention toolchain in wow64 description

Or else it may come as confusing if users try to disable
USE=abi_x86_32 and then a dependency still requests it.

mingw64-toolchain is the only one needed, no need for glibc, gcc,
mesa/nvidia, gstreamer, etc... and it works even on no-multilib
profiles where the USE is unmasked.

There are alternatives to mingw64-toolchain, but let's not go
into confusing details in the USE desc.

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/metadata.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app-emulation/wine-staging/metadata.xml 
b/app-emulation/wine-staging/metadata.xml
index d8d6c517c417..492b95e98827 100644
--- a/app-emulation/wine-staging/metadata.xml
+++ b/app-emulation/wine-staging/metadata.xml
@@ -32,7 +32,8 @@ This variant of the Wine packaging includes the Wine-Staging 
patchset.
Enable running 32bit applications without 32bit ELF
multilib by mapping to 64bit calls (experimental,
may have worse OpenGL performance or other issues
-   compared to USE=abi_x86_32)
+   compared to USE=abi_x86_32) -- still requires (just)
+   dev-util/mingw64-toolchain with abi_x86_32

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

2024-01-17 Thread Ionen Wolkens

commit: a03b75b1934b01cc23ed28d31c0c7f51fa7d8150
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Jan 17 15:50:06 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Jan 17 16:04:43 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a03b75b1

app-emulation/wine-staging: add ebuild comment tip for user patches

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/wine-staging-8.0.ebuild  | 5 -
 app-emulation/wine-staging/wine-staging-8.21.ebuild | 3 +++
 app-emulation/wine-staging/wine-staging-9.0.ebuild  | 3 +++
 app-emulation/wine-staging/wine-staging-.ebuild | 3 +++
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/app-emulation/wine-staging/wine-staging-8.0.ebuild 
b/app-emulation/wine-staging/wine-staging-8.0.ebuild
index b28e3e16486b..8cf4172ff020 100644
--- a/app-emulation/wine-staging/wine-staging-8.0.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -222,6 +222,9 @@ src_prepare() {
# always update for patches (including user's wrt #432348)
eautoreconf
tools/make_requests || die # perl
+   # tip: if need more for user patches, with portage can e.g. do
+   # echo "post_src_prepare() { tools/make_specfiles || die; }" \
+   # > /etc/portage/env/app-emulation/wine-staging
 }
 
 src_configure() {

diff --git a/app-emulation/wine-staging/wine-staging-8.21.ebuild 
b/app-emulation/wine-staging/wine-staging-8.21.ebuild
index 3a29caad4415..0af9b3b34ab1 100644
--- a/app-emulation/wine-staging/wine-staging-8.21.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.21.ebuild
@@ -259,6 +259,9 @@ src_prepare() {
# always update for patches (including user's wrt #432348)
eautoreconf
tools/make_requests || die # perl
+   # tip: if need more for user patches, with portage can e.g. do
+   # echo "post_src_prepare() { tools/make_specfiles || die; }" \
+   # > /etc/portage/env/app-emulation/wine-staging
 }
 
 src_configure() {

diff --git a/app-emulation/wine-staging/wine-staging-9.0.ebuild 
b/app-emulation/wine-staging/wine-staging-9.0.ebuild
index 408a9b701dc8..f9096affab24 100644
--- a/app-emulation/wine-staging/wine-staging-9.0.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.0.ebuild
@@ -267,6 +267,9 @@ src_prepare() {
# always update for patches (including user's wrt #432348)
eautoreconf
tools/make_requests || die # perl
+   # tip: if need more for user patches, with portage can e.g. do
+   # echo "post_src_prepare() { tools/make_specfiles || die; }" \
+   # > /etc/portage/env/app-emulation/wine-staging
 }
 
 src_configure() {

diff --git a/app-emulation/wine-staging/wine-staging-.ebuild 
b/app-emulation/wine-staging/wine-staging-.ebuild
index 408a9b701dc8..f9096affab24 100644
--- a/app-emulation/wine-staging/wine-staging-.ebuild
+++ b/app-emulation/wine-staging/wine-staging-.ebuild
@@ -267,6 +267,9 @@ src_prepare() {
# always update for patches (including user's wrt #432348)
eautoreconf
tools/make_requests || die # perl
+   # tip: if need more for user patches, with portage can e.g. do
+   # echo "post_src_prepare() { tools/make_specfiles || die; }" \
+   # > /etc/portage/env/app-emulation/wine-staging
 }
 
 src_configure() {

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

2024-01-16 Thread Ionen Wolkens

commit: 74197cbb160c3a8c9e636868b422319431e73ad1
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Jan 16 22:12:05 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Jan 16 22:20:24 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74197cbb

app-emulation/wine-staging: add 9.0

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/Manifest|   2 +
 app-emulation/wine-staging/wine-staging-9.0.ebuild | 466 +
 2 files changed, 468 insertions(+)

diff --git a/app-emulation/wine-staging/Manifest 
b/app-emulation/wine-staging/Manifest
index e4187f89033e..485651f2d1ad 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,4 +1,6 @@
 DIST wine-8.0.tar.xz 29054044 BLAKE2B 
baf8f96b665119c9f38a148a2472dbe8f6ca8d4641d9d09d48cb72cb4de2585c274b8b7981c2fa622ead6da2f087c57652e9b48edc8a17c0cfd6be9a36732f02
 SHA512 
53ba813b260a65a271ec575822725b97631f60038fb026dcc0fe66862711eedcc29a8feb29ff54ae4f64458f85c290d8f3838eff5e4c77a5420a7d2b951fef77
 DIST wine-8.21.tar.xz 29919212 BLAKE2B 
2e1c135d1c247f4b268c0323538748944b01fe65c82dee27d81f70613aa2fe632c1b4d696f05838a6ab801579a4d13a191de0f4c1a2ed40ca767499a98c3
 SHA512 
4d04d40141d2ea5e548b76aed870ac28d8a03241ffd4e761979c795310baa19136e54a8e518c6ea9bf563c3b23d3c4eb1baefc9906d7eeca469e9942ff99dc40
+DIST wine-9.0.tar.xz 30007216 BLAKE2B 
cf53177201a2f7eeb35d0d8ce220f80808d979099a928ad60652d1dee92620c433cc105dffab4e9309f41766087ad1544ef49d2922538bb420d62f6dd64117a1
 SHA512 
838daf2c4581f83f8573b988036f517d57b84894b090a2a17433255d6d044dfa880e6724cdb83082a36c333df9d2083ab68ae53927622a620edd59f33462ada4
 DIST wine-staging-8.0.tar.gz 9529620 BLAKE2B 
c9540195ea885d9f1e980232b0af471e92c61eb079cae35fdb3af5c13d4660b3466f751772440e38f15874082db296d16d1f1d68827a505b2dd949617eda0203
 SHA512 
76a729d7ced1ff634ddb455ddfaa66ca103b652f43cd152b57ada7431bb5fbb74f5e92bf2f4f329b6df6f5908130afad84e609cbce6df645d6cf8131e9b949f9
 DIST wine-staging-8.21.tar.gz 9669500 BLAKE2B 
600ad4b5696a38adefbde2fb9f51623dc7a7d9249ba15ceddcf1062040d840064285c6d2602266fd90f3658f0bdfe2fbca6a486f40e6e3f317fe704553ce39c7
 SHA512 
abba6084f2aefa8507c2a79c688b717f8137375168e5457ee40a0c96bfce31e9dc44370ecb5a8e8a397e90ce2eb8543fd07b447bf48c4b2d4c68aac9b3674214
+DIST wine-staging-9.0.tar.gz 9577631 BLAKE2B 
0012978f54c618e73d407dd49dccff02853912d0c015098889802518e8c51b280f5d60e11291335dafc68944ee01cbcb7fd6c5825ef10ae1520c7b82d9846718
 SHA512 
362209fcadcf029152b681c76beb231d0cc8de1609b994094f1dc88ab871fddda08b3d8c2fe36ceb38909a9d634c1ade864ca0f28a6a7715ec286a8b2884981f

diff --git a/app-emulation/wine-staging/wine-staging-9.0.ebuild 
b/app-emulation/wine-staging/wine-staging-9.0.ebuild
new file mode 100644
index ..408a9b701dc8
--- /dev/null
+++ b/app-emulation/wine-staging/wine-staging-9.0.ebuild
@@ -0,0 +1,466 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+PYTHON_COMPAT=( python3_{10..12} )
+inherit autotools edo flag-o-matic multilib multilib-build
+inherit prefix python-any-r1 toolchain-funcs wrapper
+
+WINE_GECKO=2.47.4
+WINE_MONO=8.1.0
+WINE_P=wine-$(ver_cut 1-2)
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine-staging.git;
+   WINE_EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git;
+else
+   (( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 
1).0
+   SRC_URI="
+   https://dl.winehq.org/wine/source/${WINE_SDIR}/${WINE_P}.tar.xz
+   
https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="-* ~amd64 ~x86"
+fi
+S="${WORKDIR}/${WINE_P}"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging 
patchset"
+HOMEPAGE="
+   https://wiki.winehq.org/Wine-Staging
+   https://gitlab.winehq.org/wine/wine-staging/
+"
+
+LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
+SLOT="${PV}"
+IUSE="
+   +X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos
+   llvm-libunwind custom-cflags +fontconfig +gecko gphoto2 +gstreamer
+   kerberos +mingw +mono netapi nls opencl +opengl osmesa pcap perl
+   pulseaudio samba scanner +sdl selinux smartcard +ssl +strip
+   +truetype udev udisks +unwind usb v4l +vulkan wayland wow64
+   +xcomposite xinerama
+"
+# bug #551124 for truetype
+# TODO: wow64 can be done without mingw if using clang (needs bug #912237)
+REQUIRED_USE="
+   X? ( truetype )
+   crossdev-mingw? ( mingw )
+   wow64? ( abi_x86_64 !abi_x86_32 mingw )
+"
+
+# tests are non-trivial to run, can hang easily, don't play well with
+# sandbox, and several need real opengl/vulkan or network access
+RESTRICT="test"
+
+# `grep WINE_CHECK_SONAME configure.ac` + if not directly linked
+WINE_DLOPEN_DEPEND="
+   X? (
+

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

2024-01-16 Thread Ionen Wolkens

commit: 763d08c7f26d620252c44ae89a7495ba38e43c81
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Jan 16 22:11:56 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Jan 16 22:20:24 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=763d08c7

app-emulation/wine-staging: drop 8.19, 8.20

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/Manifest|   4 -
 .../wine-staging/wine-staging-8.19.ebuild  | 457 -
 .../wine-staging/wine-staging-8.20.ebuild  | 457 -
 3 files changed, 918 deletions(-)

diff --git a/app-emulation/wine-staging/Manifest 
b/app-emulation/wine-staging/Manifest
index cb2973b7d21b..e4187f89033e 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,8 +1,4 @@
 DIST wine-8.0.tar.xz 29054044 BLAKE2B 
baf8f96b665119c9f38a148a2472dbe8f6ca8d4641d9d09d48cb72cb4de2585c274b8b7981c2fa622ead6da2f087c57652e9b48edc8a17c0cfd6be9a36732f02
 SHA512 
53ba813b260a65a271ec575822725b97631f60038fb026dcc0fe66862711eedcc29a8feb29ff54ae4f64458f85c290d8f3838eff5e4c77a5420a7d2b951fef77
-DIST wine-8.19.tar.xz 29858012 BLAKE2B 
21a7ab99df8acba6a4de0bbd58ccc2ea3186e99e8caac0d3cae130ba5cfed632fd47218d2029688df789f6930073ba1cfde8fbd7f764db44a55d49547e374f50
 SHA512 
ad4178c5e9f336eb968f0c378e3819794507447728acd10d642c1d66e0745837e47a70579bc9c7d9bec4510ca47e230bf4ab05ddf39323669ed24a6fce9f8c02
-DIST wine-8.20.tar.xz 29879412 BLAKE2B 
207c247bfba3cce7b378eb1a70188fe67aa669b09474ca1689447fa4f2edaa368ab6c81c16c1a6cc06b69216b44521f15d588563c715e5738c1e148874862c9f
 SHA512 
86dffc3c9e01506ff2ff75663f48bb3b18a6afaf6381fc3c43c476481cb5c0570129550d2047059f528855e454a629c63e8beb85d5c591d1fdb7a066fbca2623
 DIST wine-8.21.tar.xz 29919212 BLAKE2B 
2e1c135d1c247f4b268c0323538748944b01fe65c82dee27d81f70613aa2fe632c1b4d696f05838a6ab801579a4d13a191de0f4c1a2ed40ca767499a98c3
 SHA512 
4d04d40141d2ea5e548b76aed870ac28d8a03241ffd4e761979c795310baa19136e54a8e518c6ea9bf563c3b23d3c4eb1baefc9906d7eeca469e9942ff99dc40
 DIST wine-staging-8.0.tar.gz 9529620 BLAKE2B 
c9540195ea885d9f1e980232b0af471e92c61eb079cae35fdb3af5c13d4660b3466f751772440e38f15874082db296d16d1f1d68827a505b2dd949617eda0203
 SHA512 
76a729d7ced1ff634ddb455ddfaa66ca103b652f43cd152b57ada7431bb5fbb74f5e92bf2f4f329b6df6f5908130afad84e609cbce6df645d6cf8131e9b949f9
-DIST wine-staging-8.19.tar.gz 9606625 BLAKE2B 
aaa69556e417f566b198b53ca451c4636be32d11fa5ebd1e4dd3cd9b9fdc3ddba33cb4e2ba1cfc0a4806d7a145c7f0fde67182fc97f1bc040de0af2ecc78e433
 SHA512 
764cb824250aba7390dcede8b5269fc2c58f3bab8e0bef5e7bfb33ba553d1b506e0e5d8e11e6ee960958bd22086127c178e418767e8051c2767949b74df2afb1
-DIST wine-staging-8.20.tar.gz 9672931 BLAKE2B 
e2a86b03c2fd99153583e23053a29779e2ae6800ea7786c43ccad48d0456b534e2e91036111361e39640403d4e44b526bdbf3c8120bf9c230e739b9fea8f745c
 SHA512 
0a107830a3589c91e8573323ce074209c52284e63561ccf3191afe03b586d93de8911b1432736069174a52dd6cbb53ebbca1c5e812b3e765a73e231df1251ccc
 DIST wine-staging-8.21.tar.gz 9669500 BLAKE2B 
600ad4b5696a38adefbde2fb9f51623dc7a7d9249ba15ceddcf1062040d840064285c6d2602266fd90f3658f0bdfe2fbca6a486f40e6e3f317fe704553ce39c7
 SHA512 
abba6084f2aefa8507c2a79c688b717f8137375168e5457ee40a0c96bfce31e9dc44370ecb5a8e8a397e90ce2eb8543fd07b447bf48c4b2d4c68aac9b3674214

diff --git a/app-emulation/wine-staging/wine-staging-8.19.ebuild 
b/app-emulation/wine-staging/wine-staging-8.19.ebuild
deleted file mode 100644
index 2f2a3a83109b..
--- a/app-emulation/wine-staging/wine-staging-8.19.ebuild
+++ /dev/null
@@ -1,457 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-PYTHON_COMPAT=( python3_{10..12} )
-inherit autotools edo flag-o-matic multilib multilib-build
-inherit prefix python-any-r1 toolchain-funcs wrapper
-
-WINE_GECKO=2.47.4
-WINE_MONO=8.1.0
-WINE_P=wine-$(ver_cut 1-2)
-
-if [[ ${PV} == * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine-staging.git;
-   WINE_EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git;
-else
-   (( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 
1).0
-   SRC_URI="
-   https://dl.winehq.org/wine/source/${WINE_SDIR}/${WINE_P}.tar.xz
-   
https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="-* ~amd64 ~x86"
-fi
-S="${WORKDIR}/${WINE_P}"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging 
patchset"
-HOMEPAGE="
-   https://wiki.winehq.org/Wine-Staging
-   https://gitlab.winehq.org/wine/wine-staging/;
-
-LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
-SLOT="${PV}"
-IUSE="
-   +X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos
-   llvm-libunwind custom-cflags +fontconfig +gecko gphoto2 +gstreamer
-

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

2024-01-16 Thread Ionen Wolkens

commit: ae9d139fd1a21b247d2586bc40cbb9200d64507a
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Jan 16 21:38:46 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Jan 16 22:20:24 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae9d139f

app-emulation/wine-staging: reword USE=wow64 description

"WIP" does not feel entirely right anymore, albeit experimental
feels still fitting. Wine's announcement also mentions worse
performance so let's mention it here too.

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/metadata.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app-emulation/wine-staging/metadata.xml 
b/app-emulation/wine-staging/metadata.xml
index 41ee07d0e044..d8d6c517c417 100644
--- a/app-emulation/wine-staging/metadata.xml
+++ b/app-emulation/wine-staging/metadata.xml
@@ -30,8 +30,9 @@ This variant of the Wine packaging includes the Wine-Staging 
patchset.
Enable gamepad support using 
media-libs/libsdl2

Enable running 32bit applications without 32bit ELF
-   multilib by mapping to 64bit calls (experimental/WIP,
-   USE=abi_x86_32 is recommended for complete support)
+   multilib by mapping to 64bit calls (experimental,
+   may have worse OpenGL performance or other issues
+   compared to USE=abi_x86_32)

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

2024-01-13 Thread Ionen Wolkens

commit: 4b0fe4256af6719adc8fcc4f2f626afda9b324e3
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Jan 13 12:11:10 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Jan 13 13:10:22 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b0fe425

app-emulation/wine-staging: adjust style

Not touching 8.x given 9.0 is soon, and these will be dropped once
new 9.1 development cycle starts.

Signed-off-by: Ionen Wolkens  gentoo.org>

 .../wine-staging/wine-staging-.ebuild  | 24 ++
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/app-emulation/wine-staging/wine-staging-.ebuild 
b/app-emulation/wine-staging/wine-staging-.ebuild
index 841cad91bcda..408a9b701dc8 100644
--- a/app-emulation/wine-staging/wine-staging-.ebuild
+++ b/app-emulation/wine-staging/wine-staging-.ebuild
@@ -28,7 +28,8 @@ S="${WORKDIR}/${WINE_P}"
 DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging 
patchset"
 HOMEPAGE="
https://wiki.winehq.org/Wine-Staging
-   https://gitlab.winehq.org/wine/wine-staging/;
+   https://gitlab.winehq.org/wine/wine-staging/
+"
 
 LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
 SLOT="${PV}"
@@ -38,13 +39,15 @@ IUSE="
kerberos +mingw +mono netapi nls opencl +opengl osmesa pcap perl
pulseaudio samba scanner +sdl selinux smartcard +ssl +strip
+truetype udev udisks +unwind usb v4l +vulkan wayland wow64
-   +xcomposite xinerama"
+   +xcomposite xinerama
+"
 # bug #551124 for truetype
 # TODO: wow64 can be done without mingw if using clang (needs bug #912237)
 REQUIRED_USE="
X? ( truetype )
crossdev-mingw? ( mingw )
-   wow64? ( abi_x86_64 !abi_x86_32 mingw )"
+   wow64? ( abi_x86_64 !abi_x86_32 mingw )
+"
 
 # tests are non-trivial to run, can hang easily, don't play well with
 # sandbox, and several need real opengl/vulkan or network access
@@ -75,7 +78,8 @@ WINE_DLOPEN_DEPEND="
truetype? ( media-libs/freetype[${MULTILIB_USEDEP}] )
udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-   vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )"
+   vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
+"
 WINE_COMMON_DEPEND="
${WINE_DLOPEN_DEPEND}
X? (
@@ -104,7 +108,8 @@ WINE_COMMON_DEPEND="
wayland? (
dev-libs/wayland[${MULTILIB_USEDEP}]
x11-libs/libxkbcommon[${MULTILIB_USEDEP}]
-   )"
+   )
+"
 RDEPEND="
${WINE_COMMON_DEPEND}
app-emulation/wine-desktop-common
@@ -126,11 +131,13 @@ RDEPEND="
)
samba? ( net-fs/samba[winbind] )
selinux? ( sec-policy/selinux-wine )
-   udisks? ( sys-fs/udisks:2 )"
+   udisks? ( sys-fs/udisks:2 )
+"
 DEPEND="
${WINE_COMMON_DEPEND}
sys-kernel/linux-headers
-   X? ( x11-base/xorg-proto )"
+   X? ( x11-base/xorg-proto )
+"
 # gitapply.sh prefers git but can fallback to patch+extras
 BDEPEND="
${PYTHON_DEPS}
@@ -154,7 +161,8 @@ BDEPEND="
wow64? ( dev-util/mingw64-toolchain[abi_x86_32] )
) )
nls? ( sys-devel/gettext )
-   wayland? ( dev-util/wayland-scanner )"
+   wayland? ( dev-util/wayland-scanner )
+"
 IDEPEND=">=app-eselect/eselect-wine-2"
 
 QA_CONFIG_IMPL_DECL_SKIP=(

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

2024-01-08 Thread Ionen Wolkens

commit: 6402e091dcb61df507670fc5791ace0bf57f030f
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Jan  8 12:44:49 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Jan  8 12:57:51 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6402e091

Revert "app-emulation/wine-staging: sys-devel/flex -> app-alternatives/lex"

This reverts commit 9e9eec942174e0964b399820071937458f19e62e.

This may not set LEX, but that's because wine does not respect
this variable in the first place and looks for flex directly.

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/wine-staging-8.0.ebuild  | 4 ++--
 app-emulation/wine-staging/wine-staging-8.19.ebuild | 4 ++--
 app-emulation/wine-staging/wine-staging-8.20.ebuild | 4 ++--
 app-emulation/wine-staging/wine-staging-8.21.ebuild | 2 +-
 app-emulation/wine-staging/wine-staging-.ebuild | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app-emulation/wine-staging/wine-staging-8.0.ebuild 
b/app-emulation/wine-staging/wine-staging-8.0.ebuild
index b5aefc9f7b29..b28e3e16486b 100644
--- a/app-emulation/wine-staging/wine-staging-8.0.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -122,7 +122,7 @@ BDEPEND="
dev-lang/perl
sys-devel/binutils
sys-devel/bison
-   app-alternatives/lex
+   sys-devel/flex
virtual/pkgconfig
mingw? ( !crossdev-mingw? (
>=dev-util/mingw64-toolchain-10.0.0_p1-r2[${MULTILIB_USEDEP}]

diff --git a/app-emulation/wine-staging/wine-staging-8.19.ebuild 
b/app-emulation/wine-staging/wine-staging-8.19.ebuild
index 9bb77c38b43b..2f2a3a83109b 100644
--- a/app-emulation/wine-staging/wine-staging-8.19.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -144,7 +144,7 @@ BDEPEND="
)
dev-lang/perl
sys-devel/bison
-   app-alternatives/lex
+   sys-devel/flex
virtual/pkgconfig
mingw? ( !crossdev-mingw? (
>=dev-util/mingw64-toolchain-10.0.0_p1-r2[${MULTILIB_USEDEP}]

diff --git a/app-emulation/wine-staging/wine-staging-8.20.ebuild 
b/app-emulation/wine-staging/wine-staging-8.20.ebuild
index 9bb77c38b43b..2f2a3a83109b 100644
--- a/app-emulation/wine-staging/wine-staging-8.20.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -144,7 +144,7 @@ BDEPEND="
)
dev-lang/perl
sys-devel/bison
-   app-alternatives/lex
+   sys-devel/flex
virtual/pkgconfig
mingw? ( !crossdev-mingw? (
>=dev-util/mingw64-toolchain-10.0.0_p1-r2[${MULTILIB_USEDEP}]

diff --git a/app-emulation/wine-staging/wine-staging-8.21.ebuild 
b/app-emulation/wine-staging/wine-staging-8.21.ebuild
index 15a121d10045..3a29caad4415 100644
--- a/app-emulation/wine-staging/wine-staging-8.21.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.21.ebuild
@@ -147,7 +147,7 @@ BDEPEND="
)
dev-lang/perl
sys-devel/bison
-   app-alternatives/lex
+   sys-devel/flex
virtual/pkgconfig
mingw? ( !crossdev-mingw? (
>=dev-util/mingw64-toolchain-10.0.0_p1-r2[${MULTILIB_USEDEP}]

diff --git a/app-emulation/wine-staging/wine-staging-.ebuild 
b/app-emulation/wine-staging/wine-staging-.ebuild
index 09f635ab0060..841cad91bcda 100644
--- a/app-emulation/wine-staging/wine-staging-.ebuild
+++ b/app-emulation/wine-staging/wine-staging-.ebuild
@@ -147,7 +147,7 @@ BDEPEND="
)
dev-lang/perl
sys-devel/bison
-   app-alternatives/lex
+   sys-devel/flex
virtual/pkgconfig
mingw? ( !crossdev-mingw? (
>=dev-util/mingw64-toolchain-10.0.0_p1-r2[${MULTILIB_USEDEP}]

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

2024-01-04 Thread Ionen Wolkens

commit: 368a264f5f0bd1cfe1107a131e0f0c4c3128d867
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Jan  4 17:30:55 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Jan  4 18:05:29 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=368a264f

app-emulation/wine-staging: skip patches broken with USE=-mingw

Closes: https://bugs.gentoo.org/921360
Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/wine-staging-8.21.ebuild | 7 ++-
 app-emulation/wine-staging/wine-staging-.ebuild | 5 +
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app-emulation/wine-staging/wine-staging-8.21.ebuild 
b/app-emulation/wine-staging/wine-staging-8.21.ebuild
index bd1e1b1b87a8..3a29caad4415 100644
--- a/app-emulation/wine-staging/wine-staging-8.21.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -213,6 +213,11 @@ src_prepare() {
local patchinstallargs=(
--all
--no-autoconf
+   # patches known broken with USE=-mingw, retry occasionally (bug 
#921360)
+   $(usev !mingw '
+   -W winedevice-Default_Drivers
+   -W fltmgr.sys-FltBuildDefaultSecurityDescriptor
+   ')
${MY_WINE_STAGING_CONF}
)
 

diff --git a/app-emulation/wine-staging/wine-staging-.ebuild 
b/app-emulation/wine-staging/wine-staging-.ebuild
index ab626045c10d..841cad91bcda 100644
--- a/app-emulation/wine-staging/wine-staging-.ebuild
+++ b/app-emulation/wine-staging/wine-staging-.ebuild
@@ -213,6 +213,11 @@ src_prepare() {
local patchinstallargs=(
--all
--no-autoconf
+   # patches known broken with USE=-mingw, retry occasionally (bug 
#921360)
+   $(usev !mingw '
+   -W winedevice-Default_Drivers
+   -W fltmgr.sys-FltBuildDefaultSecurityDescriptor
+   ')
${MY_WINE_STAGING_CONF}
)

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

2024-01-04 Thread Ionen Wolkens

commit: 50d0e1acb2f4fde8a23db008f62a15780a92e9ab
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Jan  4 14:01:42 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Jan  4 14:07:56 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50d0e1ac

app-emulation/wine-staging: update live

File adds a .md extension, and fwiw use a wildcard so that it
can work with bit older commits too. Haven't kept track which
commit wine-staging is currently based on too so this is safer
without looking closer.

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/wine-staging-.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-emulation/wine-staging/wine-staging-.ebuild 
b/app-emulation/wine-staging/wine-staging-.ebuild
index 412a337b3b2a..ab626045c10d 100644
--- a/app-emulation/wine-staging/wine-staging-.ebuild
+++ b/app-emulation/wine-staging/wine-staging-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -428,7 +428,7 @@ src_install() {
fi
fi
 
-   dodoc ANNOUNCE AUTHORS README* documentation/README*
+   dodoc ANNOUNCE* AUTHORS README* documentation/README*
 }
 
 pkg_postinst() {

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

2023-12-08 Thread Ionen Wolkens

commit: bc10aebfbb825c56356f03251bca2ab46122b2df
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Dec  8 08:38:30 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Dec  8 08:48:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc10aebf

app-emulation/wine-staging: tentatively drop -mno-avx in live

Upstream passes -mpreferred-stack-boundary=2 for x86 by default
now which should in theory resolve this.

If no issues, will likely replace -mno-avx in other mingw-using
packages like dxvk too (requires a x86-check, invalid for amd64).

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/wine-staging-.ebuild | 7 ---
 1 file changed, 7 deletions(-)

diff --git a/app-emulation/wine-staging/wine-staging-.ebuild 
b/app-emulation/wine-staging/wine-staging-.ebuild
index bd1e1b1b87a8..412a337b3b2a 100644
--- a/app-emulation/wine-staging/wine-staging-.ebuild
+++ b/app-emulation/wine-staging/wine-staging-.ebuild
@@ -338,13 +338,6 @@ src_configure() {
CROSSCFLAGS="${CROSSCFLAGS:-$(
filter-flags '-fstack-protector*' #870136
filter-flags '-mfunction-return=thunk*' #878849
-
-   # -mavx with mingw-gcc has a history of obscure 
issues and
-   # disabling is seen as safer, e.g. 
`WINEARCH=win32 winecfg`
-   # crashes with -march=skylake >=wine-8.10, 
similar issues with
-   # znver4: 
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273
-   append-cflags -mno-avx #912268
-
CC=${mingwcc} test-flags-CC ${CFLAGS:--O2}
)}"

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

2023-11-24 Thread Ionen Wolkens

commit: b4555d39d86746067671ceda71e5e1d3c614a20c
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Nov 25 07:05:46 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Nov 25 07:05:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4555d39

app-emulation/wine-staging: drop 8.17.1, 8.18

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/Manifest|   4 -
 .../wine-staging/wine-staging-8.17.1.ebuild| 457 -
 .../wine-staging/wine-staging-8.18.ebuild  | 457 -
 3 files changed, 918 deletions(-)

diff --git a/app-emulation/wine-staging/Manifest 
b/app-emulation/wine-staging/Manifest
index 2f2c1809c3bd..335a81fdf25c 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,10 +1,6 @@
 DIST wine-8.0.tar.xz 29054044 BLAKE2B 
baf8f96b665119c9f38a148a2472dbe8f6ca8d4641d9d09d48cb72cb4de2585c274b8b7981c2fa622ead6da2f087c57652e9b48edc8a17c0cfd6be9a36732f02
 SHA512 
53ba813b260a65a271ec575822725b97631f60038fb026dcc0fe66862711eedcc29a8feb29ff54ae4f64458f85c290d8f3838eff5e4c77a5420a7d2b951fef77
-DIST wine-8.17.tar.xz 29559704 BLAKE2B 
dea71eaecf0ce3abff2ff9fd3ac65a8df0d606b718c176548976ae4c34228b269b3637efd23ef3ea5035df6b4df34b1e74a1f0b236a3b2864a914d6fc688d44e
 SHA512 
3826e20494a919ef1972d91c9391a3ae916d52b55e62e8fb7fc2c9c3ae6a7b363b40d8388cb4b9b3e45bae134a2de46e8158f8eaec7948216d9cd8ef32ab627f
-DIST wine-8.18.tar.xz 29844232 BLAKE2B 
0d3062bba451bbf0b7dec4a48a5fc658c6d281db5c57c2b9ad416ac2e7dcb947336bdd42b5b2062fc614b691b6419b7795decd24a7b0474bec7aaff1027b3632
 SHA512 
0f8e6b5c6709930bc7f774d92cd025976f6442c3785a224b5988a37152f3a875150b228f12442e9b9c0d9e7884568aca26159df86d48f2550a630625fef3c8b9
 DIST wine-8.19.tar.xz 29858012 BLAKE2B 
21a7ab99df8acba6a4de0bbd58ccc2ea3186e99e8caac0d3cae130ba5cfed632fd47218d2029688df789f6930073ba1cfde8fbd7f764db44a55d49547e374f50
 SHA512 
ad4178c5e9f336eb968f0c378e3819794507447728acd10d642c1d66e0745837e47a70579bc9c7d9bec4510ca47e230bf4ab05ddf39323669ed24a6fce9f8c02
 DIST wine-8.20.tar.xz 29879412 BLAKE2B 
207c247bfba3cce7b378eb1a70188fe67aa669b09474ca1689447fa4f2edaa368ab6c81c16c1a6cc06b69216b44521f15d588563c715e5738c1e148874862c9f
 SHA512 
86dffc3c9e01506ff2ff75663f48bb3b18a6afaf6381fc3c43c476481cb5c0570129550d2047059f528855e454a629c63e8beb85d5c591d1fdb7a066fbca2623
 DIST wine-staging-8.0.tar.gz 9529620 BLAKE2B 
c9540195ea885d9f1e980232b0af471e92c61eb079cae35fdb3af5c13d4660b3466f751772440e38f15874082db296d16d1f1d68827a505b2dd949617eda0203
 SHA512 
76a729d7ced1ff634ddb455ddfaa66ca103b652f43cd152b57ada7431bb5fbb74f5e92bf2f4f329b6df6f5908130afad84e609cbce6df645d6cf8131e9b949f9
-DIST wine-staging-8.17.1.tar.gz 9569937 BLAKE2B 
8db9aa679d18b8a6da6d287e0b4ad717ab76bc809e14a8117d1b2fddf91d232c4face730f327884ae294f295b5f7d5ca9a113361389c7b5c0889e71775c0d795
 SHA512 
ae015251c5dd1bf23be038362ec2acbf351836a9bd9e7c2ef2d005fa36b75de18919ecba99b43b881e2fa63edc99b07ad1665a25b9efb486a986cf06d51083a6
-DIST wine-staging-8.18.tar.gz 9610710 BLAKE2B 
785031988fb43722bdef1e9f277b97569cf85c927dc997cb18039ce9d8095f50d5c42b4fb789a358af41a8bfd7b84d4260296cc968fea7965aa549e25d6ecd55
 SHA512 
1016849b3381a3ac039c2376517a5c7857f632eb1e49e9e3d6feedbc8c4e182da1a7117e89a1a1e4798121176e04b8f91cf3f3c001abf767398a3c3cd38850fb
 DIST wine-staging-8.19.tar.gz 9606625 BLAKE2B 
aaa69556e417f566b198b53ca451c4636be32d11fa5ebd1e4dd3cd9b9fdc3ddba33cb4e2ba1cfc0a4806d7a145c7f0fde67182fc97f1bc040de0af2ecc78e433
 SHA512 
764cb824250aba7390dcede8b5269fc2c58f3bab8e0bef5e7bfb33ba553d1b506e0e5d8e11e6ee960958bd22086127c178e418767e8051c2767949b74df2afb1
 DIST wine-staging-8.20.tar.gz 9672931 BLAKE2B 
e2a86b03c2fd99153583e23053a29779e2ae6800ea7786c43ccad48d0456b534e2e91036111361e39640403d4e44b526bdbf3c8120bf9c230e739b9fea8f745c
 SHA512 
0a107830a3589c91e8573323ce074209c52284e63561ccf3191afe03b586d93de8911b1432736069174a52dd6cbb53ebbca1c5e812b3e765a73e231df1251ccc

diff --git a/app-emulation/wine-staging/wine-staging-8.17.1.ebuild 
b/app-emulation/wine-staging/wine-staging-8.17.1.ebuild
deleted file mode 100644
index 7814d829f071..
--- a/app-emulation/wine-staging/wine-staging-8.17.1.ebuild
+++ /dev/null
@@ -1,457 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-PYTHON_COMPAT=( python3_{10..12} )
-inherit autotools edo flag-o-matic multilib multilib-build
-inherit prefix python-any-r1 toolchain-funcs wrapper
-
-WINE_GECKO=2.47.4
-WINE_MONO=8.0.0
-WINE_P=wine-$(ver_cut 1-2)
-
-if [[ ${PV} == * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine-staging.git;
-   WINE_EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git;
-else
-   (( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 
1).0
-   SRC_URI="
-

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

2023-11-24 Thread Ionen Wolkens

commit: 33ad35e4a97e7bc3e2aee5cf5c728a0b32141a14
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Nov 25 07:06:24 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Nov 25 07:06:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33ad35e4

app-emulation/wine-staging: add 8.21

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/Manifest|   2 +
 .../wine-staging/wine-staging-8.21.ebuild  | 460 +
 2 files changed, 462 insertions(+)

diff --git a/app-emulation/wine-staging/Manifest 
b/app-emulation/wine-staging/Manifest
index 335a81fdf25c..cb2973b7d21b 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,6 +1,8 @@
 DIST wine-8.0.tar.xz 29054044 BLAKE2B 
baf8f96b665119c9f38a148a2472dbe8f6ca8d4641d9d09d48cb72cb4de2585c274b8b7981c2fa622ead6da2f087c57652e9b48edc8a17c0cfd6be9a36732f02
 SHA512 
53ba813b260a65a271ec575822725b97631f60038fb026dcc0fe66862711eedcc29a8feb29ff54ae4f64458f85c290d8f3838eff5e4c77a5420a7d2b951fef77
 DIST wine-8.19.tar.xz 29858012 BLAKE2B 
21a7ab99df8acba6a4de0bbd58ccc2ea3186e99e8caac0d3cae130ba5cfed632fd47218d2029688df789f6930073ba1cfde8fbd7f764db44a55d49547e374f50
 SHA512 
ad4178c5e9f336eb968f0c378e3819794507447728acd10d642c1d66e0745837e47a70579bc9c7d9bec4510ca47e230bf4ab05ddf39323669ed24a6fce9f8c02
 DIST wine-8.20.tar.xz 29879412 BLAKE2B 
207c247bfba3cce7b378eb1a70188fe67aa669b09474ca1689447fa4f2edaa368ab6c81c16c1a6cc06b69216b44521f15d588563c715e5738c1e148874862c9f
 SHA512 
86dffc3c9e01506ff2ff75663f48bb3b18a6afaf6381fc3c43c476481cb5c0570129550d2047059f528855e454a629c63e8beb85d5c591d1fdb7a066fbca2623
+DIST wine-8.21.tar.xz 29919212 BLAKE2B 
2e1c135d1c247f4b268c0323538748944b01fe65c82dee27d81f70613aa2fe632c1b4d696f05838a6ab801579a4d13a191de0f4c1a2ed40ca767499a98c3
 SHA512 
4d04d40141d2ea5e548b76aed870ac28d8a03241ffd4e761979c795310baa19136e54a8e518c6ea9bf563c3b23d3c4eb1baefc9906d7eeca469e9942ff99dc40
 DIST wine-staging-8.0.tar.gz 9529620 BLAKE2B 
c9540195ea885d9f1e980232b0af471e92c61eb079cae35fdb3af5c13d4660b3466f751772440e38f15874082db296d16d1f1d68827a505b2dd949617eda0203
 SHA512 
76a729d7ced1ff634ddb455ddfaa66ca103b652f43cd152b57ada7431bb5fbb74f5e92bf2f4f329b6df6f5908130afad84e609cbce6df645d6cf8131e9b949f9
 DIST wine-staging-8.19.tar.gz 9606625 BLAKE2B 
aaa69556e417f566b198b53ca451c4636be32d11fa5ebd1e4dd3cd9b9fdc3ddba33cb4e2ba1cfc0a4806d7a145c7f0fde67182fc97f1bc040de0af2ecc78e433
 SHA512 
764cb824250aba7390dcede8b5269fc2c58f3bab8e0bef5e7bfb33ba553d1b506e0e5d8e11e6ee960958bd22086127c178e418767e8051c2767949b74df2afb1
 DIST wine-staging-8.20.tar.gz 9672931 BLAKE2B 
e2a86b03c2fd99153583e23053a29779e2ae6800ea7786c43ccad48d0456b534e2e91036111361e39640403d4e44b526bdbf3c8120bf9c230e739b9fea8f745c
 SHA512 
0a107830a3589c91e8573323ce074209c52284e63561ccf3191afe03b586d93de8911b1432736069174a52dd6cbb53ebbca1c5e812b3e765a73e231df1251ccc
+DIST wine-staging-8.21.tar.gz 9669500 BLAKE2B 
600ad4b5696a38adefbde2fb9f51623dc7a7d9249ba15ceddcf1062040d840064285c6d2602266fd90f3658f0bdfe2fbca6a486f40e6e3f317fe704553ce39c7
 SHA512 
abba6084f2aefa8507c2a79c688b717f8137375168e5457ee40a0c96bfce31e9dc44370ecb5a8e8a397e90ce2eb8543fd07b447bf48c4b2d4c68aac9b3674214

diff --git a/app-emulation/wine-staging/wine-staging-8.21.ebuild 
b/app-emulation/wine-staging/wine-staging-8.21.ebuild
new file mode 100644
index ..bd1e1b1b87a8
--- /dev/null
+++ b/app-emulation/wine-staging/wine-staging-8.21.ebuild
@@ -0,0 +1,460 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+PYTHON_COMPAT=( python3_{10..12} )
+inherit autotools edo flag-o-matic multilib multilib-build
+inherit prefix python-any-r1 toolchain-funcs wrapper
+
+WINE_GECKO=2.47.4
+WINE_MONO=8.1.0
+WINE_P=wine-$(ver_cut 1-2)
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine-staging.git;
+   WINE_EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git;
+else
+   (( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 
1).0
+   SRC_URI="
+   https://dl.winehq.org/wine/source/${WINE_SDIR}/${WINE_P}.tar.xz
+   
https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="-* ~amd64 ~x86"
+fi
+S="${WORKDIR}/${WINE_P}"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging 
patchset"
+HOMEPAGE="
+   https://wiki.winehq.org/Wine-Staging
+   https://gitlab.winehq.org/wine/wine-staging/;
+
+LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
+SLOT="${PV}"
+IUSE="
+   +X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos
+   llvm-libunwind custom-cflags +fontconfig +gecko gphoto2 +gstreamer
+   kerberos +mingw +mono netapi nls opencl +opengl osmesa pcap perl
+   pulseaudio samba

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

2023-11-14 Thread Ionen Wolkens

commit: d4417605db136803e719ac3503824093c3e98c2b
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Nov 15 05:29:55 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Nov 15 05:55:28 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4417605

app-emulation/wine-staging: update live

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/wine-staging-.ebuild | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app-emulation/wine-staging/wine-staging-.ebuild 
b/app-emulation/wine-staging/wine-staging-.ebuild
index 2f2a3a83109b..bd1e1b1b87a8 100644
--- a/app-emulation/wine-staging/wine-staging-.ebuild
+++ b/app-emulation/wine-staging/wine-staging-.ebuild
@@ -101,7 +101,10 @@ WINE_COMMON_DEPEND="
!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
)
usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
-   wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )"
+   wayland? (
+   dev-libs/wayland[${MULTILIB_USEDEP}]
+   x11-libs/libxkbcommon[${MULTILIB_USEDEP}]
+   )"
 RDEPEND="
${WINE_COMMON_DEPEND}
app-emulation/wine-desktop-common

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

2023-11-11 Thread Ionen Wolkens

commit: a802cc720ece2364e0f4594f87c5b12d39a513ed
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Nov 11 12:34:01 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Nov 11 21:20:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a802cc72

app-emulation/wine-staging: add 8.20

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/Manifest|   2 +
 .../wine-staging/wine-staging-8.20.ebuild  | 457 +
 2 files changed, 459 insertions(+)

diff --git a/app-emulation/wine-staging/Manifest 
b/app-emulation/wine-staging/Manifest
index 615401ff4973..2f2c1809c3bd 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -2,7 +2,9 @@ DIST wine-8.0.tar.xz 29054044 BLAKE2B 
baf8f96b665119c9f38a148a2472dbe8f6ca8d4641
 DIST wine-8.17.tar.xz 29559704 BLAKE2B 
dea71eaecf0ce3abff2ff9fd3ac65a8df0d606b718c176548976ae4c34228b269b3637efd23ef3ea5035df6b4df34b1e74a1f0b236a3b2864a914d6fc688d44e
 SHA512 
3826e20494a919ef1972d91c9391a3ae916d52b55e62e8fb7fc2c9c3ae6a7b363b40d8388cb4b9b3e45bae134a2de46e8158f8eaec7948216d9cd8ef32ab627f
 DIST wine-8.18.tar.xz 29844232 BLAKE2B 
0d3062bba451bbf0b7dec4a48a5fc658c6d281db5c57c2b9ad416ac2e7dcb947336bdd42b5b2062fc614b691b6419b7795decd24a7b0474bec7aaff1027b3632
 SHA512 
0f8e6b5c6709930bc7f774d92cd025976f6442c3785a224b5988a37152f3a875150b228f12442e9b9c0d9e7884568aca26159df86d48f2550a630625fef3c8b9
 DIST wine-8.19.tar.xz 29858012 BLAKE2B 
21a7ab99df8acba6a4de0bbd58ccc2ea3186e99e8caac0d3cae130ba5cfed632fd47218d2029688df789f6930073ba1cfde8fbd7f764db44a55d49547e374f50
 SHA512 
ad4178c5e9f336eb968f0c378e3819794507447728acd10d642c1d66e0745837e47a70579bc9c7d9bec4510ca47e230bf4ab05ddf39323669ed24a6fce9f8c02
+DIST wine-8.20.tar.xz 29879412 BLAKE2B 
207c247bfba3cce7b378eb1a70188fe67aa669b09474ca1689447fa4f2edaa368ab6c81c16c1a6cc06b69216b44521f15d588563c715e5738c1e148874862c9f
 SHA512 
86dffc3c9e01506ff2ff75663f48bb3b18a6afaf6381fc3c43c476481cb5c0570129550d2047059f528855e454a629c63e8beb85d5c591d1fdb7a066fbca2623
 DIST wine-staging-8.0.tar.gz 9529620 BLAKE2B 
c9540195ea885d9f1e980232b0af471e92c61eb079cae35fdb3af5c13d4660b3466f751772440e38f15874082db296d16d1f1d68827a505b2dd949617eda0203
 SHA512 
76a729d7ced1ff634ddb455ddfaa66ca103b652f43cd152b57ada7431bb5fbb74f5e92bf2f4f329b6df6f5908130afad84e609cbce6df645d6cf8131e9b949f9
 DIST wine-staging-8.17.1.tar.gz 9569937 BLAKE2B 
8db9aa679d18b8a6da6d287e0b4ad717ab76bc809e14a8117d1b2fddf91d232c4face730f327884ae294f295b5f7d5ca9a113361389c7b5c0889e71775c0d795
 SHA512 
ae015251c5dd1bf23be038362ec2acbf351836a9bd9e7c2ef2d005fa36b75de18919ecba99b43b881e2fa63edc99b07ad1665a25b9efb486a986cf06d51083a6
 DIST wine-staging-8.18.tar.gz 9610710 BLAKE2B 
785031988fb43722bdef1e9f277b97569cf85c927dc997cb18039ce9d8095f50d5c42b4fb789a358af41a8bfd7b84d4260296cc968fea7965aa549e25d6ecd55
 SHA512 
1016849b3381a3ac039c2376517a5c7857f632eb1e49e9e3d6feedbc8c4e182da1a7117e89a1a1e4798121176e04b8f91cf3f3c001abf767398a3c3cd38850fb
 DIST wine-staging-8.19.tar.gz 9606625 BLAKE2B 
aaa69556e417f566b198b53ca451c4636be32d11fa5ebd1e4dd3cd9b9fdc3ddba33cb4e2ba1cfc0a4806d7a145c7f0fde67182fc97f1bc040de0af2ecc78e433
 SHA512 
764cb824250aba7390dcede8b5269fc2c58f3bab8e0bef5e7bfb33ba553d1b506e0e5d8e11e6ee960958bd22086127c178e418767e8051c2767949b74df2afb1
+DIST wine-staging-8.20.tar.gz 9672931 BLAKE2B 
e2a86b03c2fd99153583e23053a29779e2ae6800ea7786c43ccad48d0456b534e2e91036111361e39640403d4e44b526bdbf3c8120bf9c230e739b9fea8f745c
 SHA512 
0a107830a3589c91e8573323ce074209c52284e63561ccf3191afe03b586d93de8911b1432736069174a52dd6cbb53ebbca1c5e812b3e765a73e231df1251ccc

diff --git a/app-emulation/wine-staging/wine-staging-8.20.ebuild 
b/app-emulation/wine-staging/wine-staging-8.20.ebuild
new file mode 100644
index ..2f2a3a83109b
--- /dev/null
+++ b/app-emulation/wine-staging/wine-staging-8.20.ebuild
@@ -0,0 +1,457 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+PYTHON_COMPAT=( python3_{10..12} )
+inherit autotools edo flag-o-matic multilib multilib-build
+inherit prefix python-any-r1 toolchain-funcs wrapper
+
+WINE_GECKO=2.47.4
+WINE_MONO=8.1.0
+WINE_P=wine-$(ver_cut 1-2)
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine-staging.git;
+   WINE_EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git;
+else
+   (( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 
1).0
+   SRC_URI="
+   https://dl.winehq.org/wine/source/${WINE_SDIR}/${WINE_P}.tar.xz
+   
https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="-* ~amd64 ~x86"
+fi
+S="${WORKDIR}/${WINE_P}"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging 
patchset"
+HOMEPAGE="
+

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

2023-10-30 Thread Ionen Wolkens

commit: fdb23e15e79df28b3b59f989fd5306716d46ef33
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Oct 30 05:48:09 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Oct 30 05:48:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdb23e15

app-emulation/wine-staging: drop 8.15, 8.16

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/Manifest|   4 -
 .../wine-staging/wine-staging-8.15.ebuild  | 457 -
 .../wine-staging/wine-staging-8.16.ebuild  | 457 -
 3 files changed, 918 deletions(-)

diff --git a/app-emulation/wine-staging/Manifest 
b/app-emulation/wine-staging/Manifest
index a970cab224d5..75939c118d6b 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,10 +1,6 @@
 DIST wine-8.0.tar.xz 29054044 BLAKE2B 
baf8f96b665119c9f38a148a2472dbe8f6ca8d4641d9d09d48cb72cb4de2585c274b8b7981c2fa622ead6da2f087c57652e9b48edc8a17c0cfd6be9a36732f02
 SHA512 
53ba813b260a65a271ec575822725b97631f60038fb026dcc0fe66862711eedcc29a8feb29ff54ae4f64458f85c290d8f3838eff5e4c77a5420a7d2b951fef77
-DIST wine-8.15.tar.xz 29427600 BLAKE2B 
9a1bb0de4048e32f78e3630e9e33dc99a117d4fcb4e61285e3fb298de9f1742a7d9c52f0d02dd407ce5c62768d7fecf51947165fbc8e62cf076519caea13a2db
 SHA512 
d450dfe868ac7c7cb26ccc5e6d492c1311395c5f8b150610f5b1e78451d303b63b67c7e0ad48d6a66ae5265c5bc16da970544cf12195d8635cc3fc96c4a26cad
-DIST wine-8.16.tar.xz 29457688 BLAKE2B 
497cefed7990b2c6ae28022276d83e4fb7265cfa99a3c3b88eab56566f125d631cf9310d149a9d4fa05934fa1f26ac2138ec366b16c6d2585f199e3be8ce3beb
 SHA512 
0ba83beacd842e53173c07c30fa4ee57424af0d00b9f168b8bd310c40ea06e26dfc09f4a1991b788a8c4bd2b6eeb439e60b0deff6249424a00fa2940c95662b6
 DIST wine-8.17.tar.xz 29559704 BLAKE2B 
dea71eaecf0ce3abff2ff9fd3ac65a8df0d606b718c176548976ae4c34228b269b3637efd23ef3ea5035df6b4df34b1e74a1f0b236a3b2864a914d6fc688d44e
 SHA512 
3826e20494a919ef1972d91c9391a3ae916d52b55e62e8fb7fc2c9c3ae6a7b363b40d8388cb4b9b3e45bae134a2de46e8158f8eaec7948216d9cd8ef32ab627f
 DIST wine-8.18.tar.xz 29844232 BLAKE2B 
0d3062bba451bbf0b7dec4a48a5fc658c6d281db5c57c2b9ad416ac2e7dcb947336bdd42b5b2062fc614b691b6419b7795decd24a7b0474bec7aaff1027b3632
 SHA512 
0f8e6b5c6709930bc7f774d92cd025976f6442c3785a224b5988a37152f3a875150b228f12442e9b9c0d9e7884568aca26159df86d48f2550a630625fef3c8b9
 DIST wine-staging-8.0.tar.gz 9529620 BLAKE2B 
c9540195ea885d9f1e980232b0af471e92c61eb079cae35fdb3af5c13d4660b3466f751772440e38f15874082db296d16d1f1d68827a505b2dd949617eda0203
 SHA512 
76a729d7ced1ff634ddb455ddfaa66ca103b652f43cd152b57ada7431bb5fbb74f5e92bf2f4f329b6df6f5908130afad84e609cbce6df645d6cf8131e9b949f9
-DIST wine-staging-8.15.tar.gz 9856164 BLAKE2B 
9313c88a436cd73e5b1b0cc44d0c781babcd870cdf89c4111ef1eef6012362123c244360bb7ae39b65317b39f3dfffd0530dd5674507bc0c1824d9d2efeabd3e
 SHA512 
23d956dd9a5d5b8cb4efd5dcb5a0fd5926539b7e45d230920e20a84d27ecd6e4b1cc8285d328a0be622f66c48d453b577a4eeb096f8a866760da81cc47410a2a
-DIST wine-staging-8.16.tar.gz 9865735 BLAKE2B 
83848d86b55961e3f84013bac2c5280dd6a281470ee09cd7f7cfccb1b91f5e62d73e0214bdeb2cfcfb255f387fe8de3b90e50b2e5e96c165f315fd6eb81aea58
 SHA512 
3748c9e41aa4c50e10f2dc7301d059bfeb614adc859bacad3b1d7ff00fa72a8ee65fd527c6ce2c065523002df353b82f17ff601b4cbbc4f7b84b1197ece3d9e2
 DIST wine-staging-8.17.1.tar.gz 9569937 BLAKE2B 
8db9aa679d18b8a6da6d287e0b4ad717ab76bc809e14a8117d1b2fddf91d232c4face730f327884ae294f295b5f7d5ca9a113361389c7b5c0889e71775c0d795
 SHA512 
ae015251c5dd1bf23be038362ec2acbf351836a9bd9e7c2ef2d005fa36b75de18919ecba99b43b881e2fa63edc99b07ad1665a25b9efb486a986cf06d51083a6
 DIST wine-staging-8.18.tar.gz 9610710 BLAKE2B 
785031988fb43722bdef1e9f277b97569cf85c927dc997cb18039ce9d8095f50d5c42b4fb789a358af41a8bfd7b84d4260296cc968fea7965aa549e25d6ecd55
 SHA512 
1016849b3381a3ac039c2376517a5c7857f632eb1e49e9e3d6feedbc8c4e182da1a7117e89a1a1e4798121176e04b8f91cf3f3c001abf767398a3c3cd38850fb

diff --git a/app-emulation/wine-staging/wine-staging-8.15.ebuild 
b/app-emulation/wine-staging/wine-staging-8.15.ebuild
deleted file mode 100644
index 7814d829f071..
--- a/app-emulation/wine-staging/wine-staging-8.15.ebuild
+++ /dev/null
@@ -1,457 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-PYTHON_COMPAT=( python3_{10..12} )
-inherit autotools edo flag-o-matic multilib multilib-build
-inherit prefix python-any-r1 toolchain-funcs wrapper
-
-WINE_GECKO=2.47.4
-WINE_MONO=8.0.0
-WINE_P=wine-$(ver_cut 1-2)
-
-if [[ ${PV} == * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine-staging.git;
-   WINE_EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git;
-else
-   (( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 
1).0
-   SRC_URI="
-

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

2023-10-30 Thread Ionen Wolkens

commit: 2cb9dc659ab1887a4dd33286210c4696e2df9f1b
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Oct 30 05:48:27 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Oct 30 05:48:27 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cb9dc65

app-emulation/wine-staging: add 8.19

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/Manifest|   2 +
 .../wine-staging/wine-staging-8.19.ebuild  | 457 +
 2 files changed, 459 insertions(+)

diff --git a/app-emulation/wine-staging/Manifest 
b/app-emulation/wine-staging/Manifest
index 75939c118d6b..615401ff4973 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,6 +1,8 @@
 DIST wine-8.0.tar.xz 29054044 BLAKE2B 
baf8f96b665119c9f38a148a2472dbe8f6ca8d4641d9d09d48cb72cb4de2585c274b8b7981c2fa622ead6da2f087c57652e9b48edc8a17c0cfd6be9a36732f02
 SHA512 
53ba813b260a65a271ec575822725b97631f60038fb026dcc0fe66862711eedcc29a8feb29ff54ae4f64458f85c290d8f3838eff5e4c77a5420a7d2b951fef77
 DIST wine-8.17.tar.xz 29559704 BLAKE2B 
dea71eaecf0ce3abff2ff9fd3ac65a8df0d606b718c176548976ae4c34228b269b3637efd23ef3ea5035df6b4df34b1e74a1f0b236a3b2864a914d6fc688d44e
 SHA512 
3826e20494a919ef1972d91c9391a3ae916d52b55e62e8fb7fc2c9c3ae6a7b363b40d8388cb4b9b3e45bae134a2de46e8158f8eaec7948216d9cd8ef32ab627f
 DIST wine-8.18.tar.xz 29844232 BLAKE2B 
0d3062bba451bbf0b7dec4a48a5fc658c6d281db5c57c2b9ad416ac2e7dcb947336bdd42b5b2062fc614b691b6419b7795decd24a7b0474bec7aaff1027b3632
 SHA512 
0f8e6b5c6709930bc7f774d92cd025976f6442c3785a224b5988a37152f3a875150b228f12442e9b9c0d9e7884568aca26159df86d48f2550a630625fef3c8b9
+DIST wine-8.19.tar.xz 29858012 BLAKE2B 
21a7ab99df8acba6a4de0bbd58ccc2ea3186e99e8caac0d3cae130ba5cfed632fd47218d2029688df789f6930073ba1cfde8fbd7f764db44a55d49547e374f50
 SHA512 
ad4178c5e9f336eb968f0c378e3819794507447728acd10d642c1d66e0745837e47a70579bc9c7d9bec4510ca47e230bf4ab05ddf39323669ed24a6fce9f8c02
 DIST wine-staging-8.0.tar.gz 9529620 BLAKE2B 
c9540195ea885d9f1e980232b0af471e92c61eb079cae35fdb3af5c13d4660b3466f751772440e38f15874082db296d16d1f1d68827a505b2dd949617eda0203
 SHA512 
76a729d7ced1ff634ddb455ddfaa66ca103b652f43cd152b57ada7431bb5fbb74f5e92bf2f4f329b6df6f5908130afad84e609cbce6df645d6cf8131e9b949f9
 DIST wine-staging-8.17.1.tar.gz 9569937 BLAKE2B 
8db9aa679d18b8a6da6d287e0b4ad717ab76bc809e14a8117d1b2fddf91d232c4face730f327884ae294f295b5f7d5ca9a113361389c7b5c0889e71775c0d795
 SHA512 
ae015251c5dd1bf23be038362ec2acbf351836a9bd9e7c2ef2d005fa36b75de18919ecba99b43b881e2fa63edc99b07ad1665a25b9efb486a986cf06d51083a6
 DIST wine-staging-8.18.tar.gz 9610710 BLAKE2B 
785031988fb43722bdef1e9f277b97569cf85c927dc997cb18039ce9d8095f50d5c42b4fb789a358af41a8bfd7b84d4260296cc968fea7965aa549e25d6ecd55
 SHA512 
1016849b3381a3ac039c2376517a5c7857f632eb1e49e9e3d6feedbc8c4e182da1a7117e89a1a1e4798121176e04b8f91cf3f3c001abf767398a3c3cd38850fb
+DIST wine-staging-8.19.tar.gz 9606625 BLAKE2B 
aaa69556e417f566b198b53ca451c4636be32d11fa5ebd1e4dd3cd9b9fdc3ddba33cb4e2ba1cfc0a4806d7a145c7f0fde67182fc97f1bc040de0af2ecc78e433
 SHA512 
764cb824250aba7390dcede8b5269fc2c58f3bab8e0bef5e7bfb33ba553d1b506e0e5d8e11e6ee960958bd22086127c178e418767e8051c2767949b74df2afb1

diff --git a/app-emulation/wine-staging/wine-staging-8.19.ebuild 
b/app-emulation/wine-staging/wine-staging-8.19.ebuild
new file mode 100644
index ..2f2a3a83109b
--- /dev/null
+++ b/app-emulation/wine-staging/wine-staging-8.19.ebuild
@@ -0,0 +1,457 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+PYTHON_COMPAT=( python3_{10..12} )
+inherit autotools edo flag-o-matic multilib multilib-build
+inherit prefix python-any-r1 toolchain-funcs wrapper
+
+WINE_GECKO=2.47.4
+WINE_MONO=8.1.0
+WINE_P=wine-$(ver_cut 1-2)
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine-staging.git;
+   WINE_EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git;
+else
+   (( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 
1).0
+   SRC_URI="
+   https://dl.winehq.org/wine/source/${WINE_SDIR}/${WINE_P}.tar.xz
+   
https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="-* ~amd64 ~x86"
+fi
+S="${WORKDIR}/${WINE_P}"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging 
patchset"
+HOMEPAGE="
+   https://wiki.winehq.org/Wine-Staging
+   https://gitlab.winehq.org/wine/wine-staging/;
+
+LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
+SLOT="${PV}"
+IUSE="
+   +X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos
+   llvm-libunwind custom-cflags +fontconfig +gecko gphoto2 +gstreamer
+   kerberos +mingw +mono netapi nls opencl +opengl osmesa pcap perl
+   pulseaudio samba

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

2023-10-24 Thread Ionen Wolkens

commit: be286fc360dc50d757d4a6dfe2387d0d6f1eb600
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Oct 24 22:09:45 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Oct 24 22:09:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be286fc3

app-emulation/wine-staging: bump live to wine-mono:8.1.0

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/wine-staging-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/wine-staging/wine-staging-.ebuild 
b/app-emulation/wine-staging/wine-staging-.ebuild
index 7814d829f071..2f2a3a83109b 100644
--- a/app-emulation/wine-staging/wine-staging-.ebuild
+++ b/app-emulation/wine-staging/wine-staging-.ebuild
@@ -9,7 +9,7 @@ inherit autotools edo flag-o-matic multilib multilib-build
 inherit prefix python-any-r1 toolchain-funcs wrapper
 
 WINE_GECKO=2.47.4
-WINE_MONO=8.0.0
+WINE_MONO=8.1.0
 WINE_P=wine-$(ver_cut 1-2)
 
 if [[ ${PV} == * ]]; then

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

2023-10-14 Thread Ionen Wolkens

commit: 729ab54038becc2cce7366cee69c73e7930643f9
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sun Oct 15 02:26:39 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sun Oct 15 02:59:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=729ab540

app-emulation/wine-staging: add 8.18

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/Manifest|   2 +
 .../wine-staging/wine-staging-8.18.ebuild  | 457 +
 2 files changed, 459 insertions(+)

diff --git a/app-emulation/wine-staging/Manifest 
b/app-emulation/wine-staging/Manifest
index 27ca43b97135..a970cab224d5 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -2,7 +2,9 @@ DIST wine-8.0.tar.xz 29054044 BLAKE2B 
baf8f96b665119c9f38a148a2472dbe8f6ca8d4641
 DIST wine-8.15.tar.xz 29427600 BLAKE2B 
9a1bb0de4048e32f78e3630e9e33dc99a117d4fcb4e61285e3fb298de9f1742a7d9c52f0d02dd407ce5c62768d7fecf51947165fbc8e62cf076519caea13a2db
 SHA512 
d450dfe868ac7c7cb26ccc5e6d492c1311395c5f8b150610f5b1e78451d303b63b67c7e0ad48d6a66ae5265c5bc16da970544cf12195d8635cc3fc96c4a26cad
 DIST wine-8.16.tar.xz 29457688 BLAKE2B 
497cefed7990b2c6ae28022276d83e4fb7265cfa99a3c3b88eab56566f125d631cf9310d149a9d4fa05934fa1f26ac2138ec366b16c6d2585f199e3be8ce3beb
 SHA512 
0ba83beacd842e53173c07c30fa4ee57424af0d00b9f168b8bd310c40ea06e26dfc09f4a1991b788a8c4bd2b6eeb439e60b0deff6249424a00fa2940c95662b6
 DIST wine-8.17.tar.xz 29559704 BLAKE2B 
dea71eaecf0ce3abff2ff9fd3ac65a8df0d606b718c176548976ae4c34228b269b3637efd23ef3ea5035df6b4df34b1e74a1f0b236a3b2864a914d6fc688d44e
 SHA512 
3826e20494a919ef1972d91c9391a3ae916d52b55e62e8fb7fc2c9c3ae6a7b363b40d8388cb4b9b3e45bae134a2de46e8158f8eaec7948216d9cd8ef32ab627f
+DIST wine-8.18.tar.xz 29844232 BLAKE2B 
0d3062bba451bbf0b7dec4a48a5fc658c6d281db5c57c2b9ad416ac2e7dcb947336bdd42b5b2062fc614b691b6419b7795decd24a7b0474bec7aaff1027b3632
 SHA512 
0f8e6b5c6709930bc7f774d92cd025976f6442c3785a224b5988a37152f3a875150b228f12442e9b9c0d9e7884568aca26159df86d48f2550a630625fef3c8b9
 DIST wine-staging-8.0.tar.gz 9529620 BLAKE2B 
c9540195ea885d9f1e980232b0af471e92c61eb079cae35fdb3af5c13d4660b3466f751772440e38f15874082db296d16d1f1d68827a505b2dd949617eda0203
 SHA512 
76a729d7ced1ff634ddb455ddfaa66ca103b652f43cd152b57ada7431bb5fbb74f5e92bf2f4f329b6df6f5908130afad84e609cbce6df645d6cf8131e9b949f9
 DIST wine-staging-8.15.tar.gz 9856164 BLAKE2B 
9313c88a436cd73e5b1b0cc44d0c781babcd870cdf89c4111ef1eef6012362123c244360bb7ae39b65317b39f3dfffd0530dd5674507bc0c1824d9d2efeabd3e
 SHA512 
23d956dd9a5d5b8cb4efd5dcb5a0fd5926539b7e45d230920e20a84d27ecd6e4b1cc8285d328a0be622f66c48d453b577a4eeb096f8a866760da81cc47410a2a
 DIST wine-staging-8.16.tar.gz 9865735 BLAKE2B 
83848d86b55961e3f84013bac2c5280dd6a281470ee09cd7f7cfccb1b91f5e62d73e0214bdeb2cfcfb255f387fe8de3b90e50b2e5e96c165f315fd6eb81aea58
 SHA512 
3748c9e41aa4c50e10f2dc7301d059bfeb614adc859bacad3b1d7ff00fa72a8ee65fd527c6ce2c065523002df353b82f17ff601b4cbbc4f7b84b1197ece3d9e2
 DIST wine-staging-8.17.1.tar.gz 9569937 BLAKE2B 
8db9aa679d18b8a6da6d287e0b4ad717ab76bc809e14a8117d1b2fddf91d232c4face730f327884ae294f295b5f7d5ca9a113361389c7b5c0889e71775c0d795
 SHA512 
ae015251c5dd1bf23be038362ec2acbf351836a9bd9e7c2ef2d005fa36b75de18919ecba99b43b881e2fa63edc99b07ad1665a25b9efb486a986cf06d51083a6
+DIST wine-staging-8.18.tar.gz 9610710 BLAKE2B 
785031988fb43722bdef1e9f277b97569cf85c927dc997cb18039ce9d8095f50d5c42b4fb789a358af41a8bfd7b84d4260296cc968fea7965aa549e25d6ecd55
 SHA512 
1016849b3381a3ac039c2376517a5c7857f632eb1e49e9e3d6feedbc8c4e182da1a7117e89a1a1e4798121176e04b8f91cf3f3c001abf767398a3c3cd38850fb

diff --git a/app-emulation/wine-staging/wine-staging-8.18.ebuild 
b/app-emulation/wine-staging/wine-staging-8.18.ebuild
new file mode 100644
index ..7814d829f071
--- /dev/null
+++ b/app-emulation/wine-staging/wine-staging-8.18.ebuild
@@ -0,0 +1,457 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+PYTHON_COMPAT=( python3_{10..12} )
+inherit autotools edo flag-o-matic multilib multilib-build
+inherit prefix python-any-r1 toolchain-funcs wrapper
+
+WINE_GECKO=2.47.4
+WINE_MONO=8.0.0
+WINE_P=wine-$(ver_cut 1-2)
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine-staging.git;
+   WINE_EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git;
+else
+   (( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 
1).0
+   SRC_URI="
+   https://dl.winehq.org/wine/source/${WINE_SDIR}/${WINE_P}.tar.xz
+   
https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="-* ~amd64 ~x86"
+fi
+S="${WORKDIR}/${WINE_P}"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging 
patchset"
+HOMEPAGE="
+

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

2023-10-13 Thread Ionen Wolkens

commit: 4b834f0428566f3fa96f881b1b5fde0fa680c523
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Oct 14 03:30:44 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Oct 14 03:30:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b834f04

app-emulation/wine-staging: drop 8.17

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/Manifest|   1 -
 .../wine-staging/wine-staging-8.17.ebuild  | 457 -
 2 files changed, 458 deletions(-)

diff --git a/app-emulation/wine-staging/Manifest 
b/app-emulation/wine-staging/Manifest
index 03d37cf0fab4..27ca43b97135 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -6,4 +6,3 @@ DIST wine-staging-8.0.tar.gz 9529620 BLAKE2B 
c9540195ea885d9f1e980232b0af471e92c
 DIST wine-staging-8.15.tar.gz 9856164 BLAKE2B 
9313c88a436cd73e5b1b0cc44d0c781babcd870cdf89c4111ef1eef6012362123c244360bb7ae39b65317b39f3dfffd0530dd5674507bc0c1824d9d2efeabd3e
 SHA512 
23d956dd9a5d5b8cb4efd5dcb5a0fd5926539b7e45d230920e20a84d27ecd6e4b1cc8285d328a0be622f66c48d453b577a4eeb096f8a866760da81cc47410a2a
 DIST wine-staging-8.16.tar.gz 9865735 BLAKE2B 
83848d86b55961e3f84013bac2c5280dd6a281470ee09cd7f7cfccb1b91f5e62d73e0214bdeb2cfcfb255f387fe8de3b90e50b2e5e96c165f315fd6eb81aea58
 SHA512 
3748c9e41aa4c50e10f2dc7301d059bfeb614adc859bacad3b1d7ff00fa72a8ee65fd527c6ce2c065523002df353b82f17ff601b4cbbc4f7b84b1197ece3d9e2
 DIST wine-staging-8.17.1.tar.gz 9569937 BLAKE2B 
8db9aa679d18b8a6da6d287e0b4ad717ab76bc809e14a8117d1b2fddf91d232c4face730f327884ae294f295b5f7d5ca9a113361389c7b5c0889e71775c0d795
 SHA512 
ae015251c5dd1bf23be038362ec2acbf351836a9bd9e7c2ef2d005fa36b75de18919ecba99b43b881e2fa63edc99b07ad1665a25b9efb486a986cf06d51083a6
-DIST wine-staging-8.17.tar.gz 9570270 BLAKE2B 
f031961be2d42a3e29c63a5c085ec4d56ffead908f6433791aaff47a3fcd55bca17c5f526618da698c7c312693d2dae703e17ec5c658afea8613bd2c49a634af
 SHA512 
699d3caec080686986a3b66a6c905d4542a3f06a12def3f30ad9d97484c9a0c2ba00ab81ae75a8ec83eaad0ef8029fcc702ac2c1f0a46c60118b9e451afe7613

diff --git a/app-emulation/wine-staging/wine-staging-8.17.ebuild 
b/app-emulation/wine-staging/wine-staging-8.17.ebuild
deleted file mode 100644
index 7814d829f071..
--- a/app-emulation/wine-staging/wine-staging-8.17.ebuild
+++ /dev/null
@@ -1,457 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-PYTHON_COMPAT=( python3_{10..12} )
-inherit autotools edo flag-o-matic multilib multilib-build
-inherit prefix python-any-r1 toolchain-funcs wrapper
-
-WINE_GECKO=2.47.4
-WINE_MONO=8.0.0
-WINE_P=wine-$(ver_cut 1-2)
-
-if [[ ${PV} == * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine-staging.git;
-   WINE_EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git;
-else
-   (( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 
1).0
-   SRC_URI="
-   https://dl.winehq.org/wine/source/${WINE_SDIR}/${WINE_P}.tar.xz
-   
https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="-* ~amd64 ~x86"
-fi
-S="${WORKDIR}/${WINE_P}"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging 
patchset"
-HOMEPAGE="
-   https://wiki.winehq.org/Wine-Staging
-   https://gitlab.winehq.org/wine/wine-staging/;
-
-LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
-SLOT="${PV}"
-IUSE="
-   +X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos
-   llvm-libunwind custom-cflags +fontconfig +gecko gphoto2 +gstreamer
-   kerberos +mingw +mono netapi nls opencl +opengl osmesa pcap perl
-   pulseaudio samba scanner +sdl selinux smartcard +ssl +strip
-   +truetype udev udisks +unwind usb v4l +vulkan wayland wow64
-   +xcomposite xinerama"
-# bug #551124 for truetype
-# TODO: wow64 can be done without mingw if using clang (needs bug #912237)
-REQUIRED_USE="
-   X? ( truetype )
-   crossdev-mingw? ( mingw )
-   wow64? ( abi_x86_64 !abi_x86_32 mingw )"
-
-# tests are non-trivial to run, can hang easily, don't play well with
-# sandbox, and several need real opengl/vulkan or network access
-RESTRICT="test"
-
-# `grep WINE_CHECK_SONAME configure.ac` + if not directly linked
-WINE_DLOPEN_DEPEND="
-   X? (
-   x11-libs/libXcursor[${MULTILIB_USEDEP}]
-   x11-libs/libXfixes[${MULTILIB_USEDEP}]
-   x11-libs/libXi[${MULTILIB_USEDEP}]
-   x11-libs/libXrandr[${MULTILIB_USEDEP}]
-   x11-libs/libXrender[${MULTILIB_USEDEP}]
-   x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-   opengl? (
-   media-libs/libglvnd[X,${MULTILIB_USEDEP}]
-   osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
-   )
-

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

2023-10-10 Thread Ionen Wolkens

commit: 5d38ff175db27ad614786d1e50ef9e930ac0f8d5
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Oct 10 18:57:50 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Oct 10 20:18:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d38ff17

app-emulation/wine-staging: drop 8.13, 8.14

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/Manifest|   4 -
 .../wine-staging/wine-staging-8.13.ebuild  | 457 -
 .../wine-staging/wine-staging-8.14.ebuild  | 457 -
 3 files changed, 918 deletions(-)

diff --git a/app-emulation/wine-staging/Manifest 
b/app-emulation/wine-staging/Manifest
index 1b02ec7ca60f..03d37cf0fab4 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,12 +1,8 @@
 DIST wine-8.0.tar.xz 29054044 BLAKE2B 
baf8f96b665119c9f38a148a2472dbe8f6ca8d4641d9d09d48cb72cb4de2585c274b8b7981c2fa622ead6da2f087c57652e9b48edc8a17c0cfd6be9a36732f02
 SHA512 
53ba813b260a65a271ec575822725b97631f60038fb026dcc0fe66862711eedcc29a8feb29ff54ae4f64458f85c290d8f3838eff5e4c77a5420a7d2b951fef77
-DIST wine-8.13.tar.xz 29379824 BLAKE2B 
fa07edba8e45ef17813e63f793ca18cd05fd421b803d416421ec0fb7aeb4223ae44376a7e75a195e91c30259f27b48c3ed4ab0b613cbb9464b824f51e85ea240
 SHA512 
952c670635f91879cf6908343a04c0f41ae54e213123242e24fc282f9705fbe3b800dc1de454b6cfb1ebb89431b0e6eb3df3b094c1d9f4e69835d0f1b8f4fcb5
-DIST wine-8.14.tar.xz 29412976 BLAKE2B 
239f90dd9c40bbca719231d2a0240e75f803ead314ab7fb8cb90e375a52696700af87ac2cdeff9a2ecb1d1cce271142cf16ce200024c98fb8bd543779aa2423e
 SHA512 
cf293546c29379237e8c2b7526b16faa0df6a255aa1718097be4382604da4f84f7fad8486a931f39020fe63548625641cf68a822c975f56c30aaa2aa8a024176
 DIST wine-8.15.tar.xz 29427600 BLAKE2B 
9a1bb0de4048e32f78e3630e9e33dc99a117d4fcb4e61285e3fb298de9f1742a7d9c52f0d02dd407ce5c62768d7fecf51947165fbc8e62cf076519caea13a2db
 SHA512 
d450dfe868ac7c7cb26ccc5e6d492c1311395c5f8b150610f5b1e78451d303b63b67c7e0ad48d6a66ae5265c5bc16da970544cf12195d8635cc3fc96c4a26cad
 DIST wine-8.16.tar.xz 29457688 BLAKE2B 
497cefed7990b2c6ae28022276d83e4fb7265cfa99a3c3b88eab56566f125d631cf9310d149a9d4fa05934fa1f26ac2138ec366b16c6d2585f199e3be8ce3beb
 SHA512 
0ba83beacd842e53173c07c30fa4ee57424af0d00b9f168b8bd310c40ea06e26dfc09f4a1991b788a8c4bd2b6eeb439e60b0deff6249424a00fa2940c95662b6
 DIST wine-8.17.tar.xz 29559704 BLAKE2B 
dea71eaecf0ce3abff2ff9fd3ac65a8df0d606b718c176548976ae4c34228b269b3637efd23ef3ea5035df6b4df34b1e74a1f0b236a3b2864a914d6fc688d44e
 SHA512 
3826e20494a919ef1972d91c9391a3ae916d52b55e62e8fb7fc2c9c3ae6a7b363b40d8388cb4b9b3e45bae134a2de46e8158f8eaec7948216d9cd8ef32ab627f
 DIST wine-staging-8.0.tar.gz 9529620 BLAKE2B 
c9540195ea885d9f1e980232b0af471e92c61eb079cae35fdb3af5c13d4660b3466f751772440e38f15874082db296d16d1f1d68827a505b2dd949617eda0203
 SHA512 
76a729d7ced1ff634ddb455ddfaa66ca103b652f43cd152b57ada7431bb5fbb74f5e92bf2f4f329b6df6f5908130afad84e609cbce6df645d6cf8131e9b949f9
-DIST wine-staging-8.13.tar.gz 9785058 BLAKE2B 
6c797cd50276009cc23619447a70ac972b5c7ad7684d7bd99f20cd7607b88f911eb89f59df98680ef8786495f2f8ff2910c8bbd930d811bb31147aa230105ce1
 SHA512 
b2104b0893ba27ee7f4f5495f7dee990962ff668786fd95e11af6d3975b7d00bc4ecb2572f280d27fbb6d1672745e0acbdb392ec7b3fd5b330a846783c23e12d
-DIST wine-staging-8.14.tar.gz 9847486 BLAKE2B 
62762efe15007b7a275c4f30c79b398f77078e5ba7ca44f9159d300cc7688439d8efbfae1c7c2faa73a17ceab0de82dbc1fc6338e99f3714fc1212b6e1bf71a8
 SHA512 
c126ddd49f2c89b61448c71779f022f7031b19f1bc346d4aa1e8dbe4845f2c5d80e92810db5e0bbc0cae3d5f8466e2ab9a2c5685923318aedfb79504a7db
 DIST wine-staging-8.15.tar.gz 9856164 BLAKE2B 
9313c88a436cd73e5b1b0cc44d0c781babcd870cdf89c4111ef1eef6012362123c244360bb7ae39b65317b39f3dfffd0530dd5674507bc0c1824d9d2efeabd3e
 SHA512 
23d956dd9a5d5b8cb4efd5dcb5a0fd5926539b7e45d230920e20a84d27ecd6e4b1cc8285d328a0be622f66c48d453b577a4eeb096f8a866760da81cc47410a2a
 DIST wine-staging-8.16.tar.gz 9865735 BLAKE2B 
83848d86b55961e3f84013bac2c5280dd6a281470ee09cd7f7cfccb1b91f5e62d73e0214bdeb2cfcfb255f387fe8de3b90e50b2e5e96c165f315fd6eb81aea58
 SHA512 
3748c9e41aa4c50e10f2dc7301d059bfeb614adc859bacad3b1d7ff00fa72a8ee65fd527c6ce2c065523002df353b82f17ff601b4cbbc4f7b84b1197ece3d9e2
 DIST wine-staging-8.17.1.tar.gz 9569937 BLAKE2B 
8db9aa679d18b8a6da6d287e0b4ad717ab76bc809e14a8117d1b2fddf91d232c4face730f327884ae294f295b5f7d5ca9a113361389c7b5c0889e71775c0d795
 SHA512 
ae015251c5dd1bf23be038362ec2acbf351836a9bd9e7c2ef2d005fa36b75de18919ecba99b43b881e2fa63edc99b07ad1665a25b9efb486a986cf06d51083a6

diff --git a/app-emulation/wine-staging/wine-staging-8.13.ebuild 
b/app-emulation/wine-staging/wine-staging-8.13.ebuild
deleted file mode 100644
index 7814d829f071..
--- a/app-emulation/wine-staging/wine-staging-8.13.ebuild
+++ /dev/null
@@ -1,457 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-

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

2023-10-02 Thread Ionen Wolkens

commit: af3998740256e5f8f8618ae248edd512fff5f0eb
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Oct  2 13:09:06 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Oct  2 13:09:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af399874

app-emulation/wine-staging: cleanup obsolete pkgcheck comment

Fixed with >=dev-util/pkgcheck-0.10.25-r2 and newer tree-sitter-bash.

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/wine-staging-8.13.ebuild   | 1 -
 app-emulation/wine-staging/wine-staging-8.14.ebuild   | 1 -
 app-emulation/wine-staging/wine-staging-8.15.ebuild   | 1 -
 app-emulation/wine-staging/wine-staging-8.16.ebuild   | 1 -
 app-emulation/wine-staging/wine-staging-8.17.1.ebuild | 1 -
 app-emulation/wine-staging/wine-staging-8.17.ebuild   | 1 -
 app-emulation/wine-staging/wine-staging-.ebuild   | 1 -
 7 files changed, 7 deletions(-)

diff --git a/app-emulation/wine-staging/wine-staging-8.13.ebuild 
b/app-emulation/wine-staging/wine-staging-8.13.ebuild
index 9f4dff71c714..7814d829f071 100644
--- a/app-emulation/wine-staging/wine-staging-8.13.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.13.ebuild
@@ -5,7 +5,6 @@ EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
 PYTHON_COMPAT=( python3_{10..12} )
-# note: multilib+wrapper are not unused, currently a pkgcheck false positive
 inherit autotools edo flag-o-matic multilib multilib-build
 inherit prefix python-any-r1 toolchain-funcs wrapper
 

diff --git a/app-emulation/wine-staging/wine-staging-8.14.ebuild 
b/app-emulation/wine-staging/wine-staging-8.14.ebuild
index 9f4dff71c714..7814d829f071 100644
--- a/app-emulation/wine-staging/wine-staging-8.14.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.14.ebuild
@@ -5,7 +5,6 @@ EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
 PYTHON_COMPAT=( python3_{10..12} )
-# note: multilib+wrapper are not unused, currently a pkgcheck false positive
 inherit autotools edo flag-o-matic multilib multilib-build
 inherit prefix python-any-r1 toolchain-funcs wrapper
 

diff --git a/app-emulation/wine-staging/wine-staging-8.15.ebuild 
b/app-emulation/wine-staging/wine-staging-8.15.ebuild
index 9f4dff71c714..7814d829f071 100644
--- a/app-emulation/wine-staging/wine-staging-8.15.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.15.ebuild
@@ -5,7 +5,6 @@ EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
 PYTHON_COMPAT=( python3_{10..12} )
-# note: multilib+wrapper are not unused, currently a pkgcheck false positive
 inherit autotools edo flag-o-matic multilib multilib-build
 inherit prefix python-any-r1 toolchain-funcs wrapper
 

diff --git a/app-emulation/wine-staging/wine-staging-8.16.ebuild 
b/app-emulation/wine-staging/wine-staging-8.16.ebuild
index 9f4dff71c714..7814d829f071 100644
--- a/app-emulation/wine-staging/wine-staging-8.16.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.16.ebuild
@@ -5,7 +5,6 @@ EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
 PYTHON_COMPAT=( python3_{10..12} )
-# note: multilib+wrapper are not unused, currently a pkgcheck false positive
 inherit autotools edo flag-o-matic multilib multilib-build
 inherit prefix python-any-r1 toolchain-funcs wrapper
 

diff --git a/app-emulation/wine-staging/wine-staging-8.17.1.ebuild 
b/app-emulation/wine-staging/wine-staging-8.17.1.ebuild
index 9f4dff71c714..7814d829f071 100644
--- a/app-emulation/wine-staging/wine-staging-8.17.1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.17.1.ebuild
@@ -5,7 +5,6 @@ EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
 PYTHON_COMPAT=( python3_{10..12} )
-# note: multilib+wrapper are not unused, currently a pkgcheck false positive
 inherit autotools edo flag-o-matic multilib multilib-build
 inherit prefix python-any-r1 toolchain-funcs wrapper
 

diff --git a/app-emulation/wine-staging/wine-staging-8.17.ebuild 
b/app-emulation/wine-staging/wine-staging-8.17.ebuild
index 9f4dff71c714..7814d829f071 100644
--- a/app-emulation/wine-staging/wine-staging-8.17.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.17.ebuild
@@ -5,7 +5,6 @@ EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
 PYTHON_COMPAT=( python3_{10..12} )
-# note: multilib+wrapper are not unused, currently a pkgcheck false positive
 inherit autotools edo flag-o-matic multilib multilib-build
 inherit prefix python-any-r1 toolchain-funcs wrapper
 

diff --git a/app-emulation/wine-staging/wine-staging-.ebuild 
b/app-emulation/wine-staging/wine-staging-.ebuild
index 9f4dff71c714..7814d829f071 100644
--- a/app-emulation/wine-staging/wine-staging-.ebuild
+++ b/app-emulation/wine-staging/wine-staging-.ebuild
@@ -5,7 +5,6 @@ EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
 PYTHON_COMPAT=( python3_{10..12} )
-# note: multilib+wrapper are not unused, currently a pkgcheck false positive
 inherit autotools edo flag-o-matic multilib multilib-build
 inherit prefix python-any-r1 toolchain-funcs wrapper

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

2023-09-16 Thread Ionen Wolkens

commit: e855adbb4082bbc514ca973723449d6a3c8b817c
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sun Sep 17 04:06:44 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sun Sep 17 04:06:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e855adbb

app-emulation/wine-staging: add 8.16

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/Manifest|   2 +
 .../wine-staging/wine-staging-8.16.ebuild  | 458 +
 2 files changed, 460 insertions(+)

diff --git a/app-emulation/wine-staging/Manifest 
b/app-emulation/wine-staging/Manifest
index c85fb5703721..30f696360b44 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -2,7 +2,9 @@ DIST wine-8.0.tar.xz 29054044 BLAKE2B 
baf8f96b665119c9f38a148a2472dbe8f6ca8d4641
 DIST wine-8.13.tar.xz 29379824 BLAKE2B 
fa07edba8e45ef17813e63f793ca18cd05fd421b803d416421ec0fb7aeb4223ae44376a7e75a195e91c30259f27b48c3ed4ab0b613cbb9464b824f51e85ea240
 SHA512 
952c670635f91879cf6908343a04c0f41ae54e213123242e24fc282f9705fbe3b800dc1de454b6cfb1ebb89431b0e6eb3df3b094c1d9f4e69835d0f1b8f4fcb5
 DIST wine-8.14.tar.xz 29412976 BLAKE2B 
239f90dd9c40bbca719231d2a0240e75f803ead314ab7fb8cb90e375a52696700af87ac2cdeff9a2ecb1d1cce271142cf16ce200024c98fb8bd543779aa2423e
 SHA512 
cf293546c29379237e8c2b7526b16faa0df6a255aa1718097be4382604da4f84f7fad8486a931f39020fe63548625641cf68a822c975f56c30aaa2aa8a024176
 DIST wine-8.15.tar.xz 29427600 BLAKE2B 
9a1bb0de4048e32f78e3630e9e33dc99a117d4fcb4e61285e3fb298de9f1742a7d9c52f0d02dd407ce5c62768d7fecf51947165fbc8e62cf076519caea13a2db
 SHA512 
d450dfe868ac7c7cb26ccc5e6d492c1311395c5f8b150610f5b1e78451d303b63b67c7e0ad48d6a66ae5265c5bc16da970544cf12195d8635cc3fc96c4a26cad
+DIST wine-8.16.tar.xz 29457688 BLAKE2B 
497cefed7990b2c6ae28022276d83e4fb7265cfa99a3c3b88eab56566f125d631cf9310d149a9d4fa05934fa1f26ac2138ec366b16c6d2585f199e3be8ce3beb
 SHA512 
0ba83beacd842e53173c07c30fa4ee57424af0d00b9f168b8bd310c40ea06e26dfc09f4a1991b788a8c4bd2b6eeb439e60b0deff6249424a00fa2940c95662b6
 DIST wine-staging-8.0.tar.gz 9529620 BLAKE2B 
c9540195ea885d9f1e980232b0af471e92c61eb079cae35fdb3af5c13d4660b3466f751772440e38f15874082db296d16d1f1d68827a505b2dd949617eda0203
 SHA512 
76a729d7ced1ff634ddb455ddfaa66ca103b652f43cd152b57ada7431bb5fbb74f5e92bf2f4f329b6df6f5908130afad84e609cbce6df645d6cf8131e9b949f9
 DIST wine-staging-8.13.tar.gz 9785058 BLAKE2B 
6c797cd50276009cc23619447a70ac972b5c7ad7684d7bd99f20cd7607b88f911eb89f59df98680ef8786495f2f8ff2910c8bbd930d811bb31147aa230105ce1
 SHA512 
b2104b0893ba27ee7f4f5495f7dee990962ff668786fd95e11af6d3975b7d00bc4ecb2572f280d27fbb6d1672745e0acbdb392ec7b3fd5b330a846783c23e12d
 DIST wine-staging-8.14.tar.gz 9847486 BLAKE2B 
62762efe15007b7a275c4f30c79b398f77078e5ba7ca44f9159d300cc7688439d8efbfae1c7c2faa73a17ceab0de82dbc1fc6338e99f3714fc1212b6e1bf71a8
 SHA512 
c126ddd49f2c89b61448c71779f022f7031b19f1bc346d4aa1e8dbe4845f2c5d80e92810db5e0bbc0cae3d5f8466e2ab9a2c5685923318aedfb79504a7db
 DIST wine-staging-8.15.tar.gz 9856164 BLAKE2B 
9313c88a436cd73e5b1b0cc44d0c781babcd870cdf89c4111ef1eef6012362123c244360bb7ae39b65317b39f3dfffd0530dd5674507bc0c1824d9d2efeabd3e
 SHA512 
23d956dd9a5d5b8cb4efd5dcb5a0fd5926539b7e45d230920e20a84d27ecd6e4b1cc8285d328a0be622f66c48d453b577a4eeb096f8a866760da81cc47410a2a
+DIST wine-staging-8.16.tar.gz 9865735 BLAKE2B 
83848d86b55961e3f84013bac2c5280dd6a281470ee09cd7f7cfccb1b91f5e62d73e0214bdeb2cfcfb255f387fe8de3b90e50b2e5e96c165f315fd6eb81aea58
 SHA512 
3748c9e41aa4c50e10f2dc7301d059bfeb614adc859bacad3b1d7ff00fa72a8ee65fd527c6ce2c065523002df353b82f17ff601b4cbbc4f7b84b1197ece3d9e2

diff --git a/app-emulation/wine-staging/wine-staging-8.16.ebuild 
b/app-emulation/wine-staging/wine-staging-8.16.ebuild
new file mode 100644
index ..9f4dff71c714
--- /dev/null
+++ b/app-emulation/wine-staging/wine-staging-8.16.ebuild
@@ -0,0 +1,458 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+PYTHON_COMPAT=( python3_{10..12} )
+# note: multilib+wrapper are not unused, currently a pkgcheck false positive
+inherit autotools edo flag-o-matic multilib multilib-build
+inherit prefix python-any-r1 toolchain-funcs wrapper
+
+WINE_GECKO=2.47.4
+WINE_MONO=8.0.0
+WINE_P=wine-$(ver_cut 1-2)
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine-staging.git;
+   WINE_EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git;
+else
+   (( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 
1).0
+   SRC_URI="
+   https://dl.winehq.org/wine/source/${WINE_SDIR}/${WINE_P}.tar.xz
+   
https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="-* ~amd64 ~x86"
+fi
+S="${WORKDIR}/${WINE_P}"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, with

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

2023-09-16 Thread Ionen Wolkens

commit: d3636c58733727a842a99c2b640f6d053f2206f3
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sun Sep 17 04:03:21 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sun Sep 17 04:03:21 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3636c58

app-emulation/wine-staging: drop 8.11-r1, 8.12

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/Manifest|   4 -
 .../wine-staging/wine-staging-8.11-r1.ebuild   | 412 -
 .../wine-staging/wine-staging-8.12.ebuild  | 412 -
 3 files changed, 828 deletions(-)

diff --git a/app-emulation/wine-staging/Manifest 
b/app-emulation/wine-staging/Manifest
index 596b41c40f94..c85fb5703721 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,12 +1,8 @@
 DIST wine-8.0.tar.xz 29054044 BLAKE2B 
baf8f96b665119c9f38a148a2472dbe8f6ca8d4641d9d09d48cb72cb4de2585c274b8b7981c2fa622ead6da2f087c57652e9b48edc8a17c0cfd6be9a36732f02
 SHA512 
53ba813b260a65a271ec575822725b97631f60038fb026dcc0fe66862711eedcc29a8feb29ff54ae4f64458f85c290d8f3838eff5e4c77a5420a7d2b951fef77
-DIST wine-8.11.tar.xz 29236492 BLAKE2B 
db97b9abde6e1f4c854b449d27bdbafbc91bd75b835d84da401777c6ae2f4f623f2130f470d2e9a3aaf7e737f75d143a07191d38b409c06596373bece3df23c5
 SHA512 
f3e37f51f0a13aacbd41b017fc3d35e197614b03c00f5b9959c0fabc4e89975b5c3f411b38329e45ce6f9d2a2d82952b95e0907fbe2d6ae35cc4bec293825769
-DIST wine-8.12.tar.xz 29276732 BLAKE2B 
c1bf0d32eaf17f06b47dd7ffc495db4874f72ffec7cfca9edd9b2b9def8ab16db2583349950c3af447d85d476aa013914554f990d5f42d5bc8243b9effbaf869
 SHA512 
6b9eab7ca1ed5a13202b1250d8d95f6bd8ee5176f0c39b5358aedaf28f7f23543f4a73bf0782c3b4e50936813fc2a459582b5d294569c976ace784fbd9e0af1b
 DIST wine-8.13.tar.xz 29379824 BLAKE2B 
fa07edba8e45ef17813e63f793ca18cd05fd421b803d416421ec0fb7aeb4223ae44376a7e75a195e91c30259f27b48c3ed4ab0b613cbb9464b824f51e85ea240
 SHA512 
952c670635f91879cf6908343a04c0f41ae54e213123242e24fc282f9705fbe3b800dc1de454b6cfb1ebb89431b0e6eb3df3b094c1d9f4e69835d0f1b8f4fcb5
 DIST wine-8.14.tar.xz 29412976 BLAKE2B 
239f90dd9c40bbca719231d2a0240e75f803ead314ab7fb8cb90e375a52696700af87ac2cdeff9a2ecb1d1cce271142cf16ce200024c98fb8bd543779aa2423e
 SHA512 
cf293546c29379237e8c2b7526b16faa0df6a255aa1718097be4382604da4f84f7fad8486a931f39020fe63548625641cf68a822c975f56c30aaa2aa8a024176
 DIST wine-8.15.tar.xz 29427600 BLAKE2B 
9a1bb0de4048e32f78e3630e9e33dc99a117d4fcb4e61285e3fb298de9f1742a7d9c52f0d02dd407ce5c62768d7fecf51947165fbc8e62cf076519caea13a2db
 SHA512 
d450dfe868ac7c7cb26ccc5e6d492c1311395c5f8b150610f5b1e78451d303b63b67c7e0ad48d6a66ae5265c5bc16da970544cf12195d8635cc3fc96c4a26cad
 DIST wine-staging-8.0.tar.gz 9529620 BLAKE2B 
c9540195ea885d9f1e980232b0af471e92c61eb079cae35fdb3af5c13d4660b3466f751772440e38f15874082db296d16d1f1d68827a505b2dd949617eda0203
 SHA512 
76a729d7ced1ff634ddb455ddfaa66ca103b652f43cd152b57ada7431bb5fbb74f5e92bf2f4f329b6df6f5908130afad84e609cbce6df645d6cf8131e9b949f9
-DIST wine-staging-8.11.tar.gz 9715880 BLAKE2B 
2795389381d6e52215d8b1b2c437a47beaf61e9b36e78f99c45b3fcd79d554f2d4abafcbf34c366dcb7ce4fc14d66b8751466c30648ae0d7c451aaa345c30c5f
 SHA512 
fb7a5f575c092e84afa78868e3b15fa33d67205a5e20deae61a60613714df784b18d54cd32167355ae38543f047f4304bfbc7f2ba2b3f6050c9f738812a15154
-DIST wine-staging-8.12.tar.gz 9764049 BLAKE2B 
739c6dfdcef6e744fc7f6dcee24abdedd5f96b7ad688bdd5cc667627cec0b21d658354369ecc0de71a4ba682636e369105cef3de97dbf095f1ee1025d9a12fc2
 SHA512 
11364b2367e25706b98c168710288b796e9dea1e3400efc0d010ea8827cb8c4187385f53aebd1fda46611902f6619282ea97ce9d7c20fe18aa48c14f15c99d14
 DIST wine-staging-8.13.tar.gz 9785058 BLAKE2B 
6c797cd50276009cc23619447a70ac972b5c7ad7684d7bd99f20cd7607b88f911eb89f59df98680ef8786495f2f8ff2910c8bbd930d811bb31147aa230105ce1
 SHA512 
b2104b0893ba27ee7f4f5495f7dee990962ff668786fd95e11af6d3975b7d00bc4ecb2572f280d27fbb6d1672745e0acbdb392ec7b3fd5b330a846783c23e12d
 DIST wine-staging-8.14.tar.gz 9847486 BLAKE2B 
62762efe15007b7a275c4f30c79b398f77078e5ba7ca44f9159d300cc7688439d8efbfae1c7c2faa73a17ceab0de82dbc1fc6338e99f3714fc1212b6e1bf71a8
 SHA512 
c126ddd49f2c89b61448c71779f022f7031b19f1bc346d4aa1e8dbe4845f2c5d80e92810db5e0bbc0cae3d5f8466e2ab9a2c5685923318aedfb79504a7db
 DIST wine-staging-8.15.tar.gz 9856164 BLAKE2B 
9313c88a436cd73e5b1b0cc44d0c781babcd870cdf89c4111ef1eef6012362123c244360bb7ae39b65317b39f3dfffd0530dd5674507bc0c1824d9d2efeabd3e
 SHA512 
23d956dd9a5d5b8cb4efd5dcb5a0fd5926539b7e45d230920e20a84d27ecd6e4b1cc8285d328a0be622f66c48d453b577a4eeb096f8a866760da81cc47410a2a

diff --git a/app-emulation/wine-staging/wine-staging-8.11-r1.ebuild 
b/app-emulation/wine-staging/wine-staging-8.11-r1.ebuild
deleted file mode 100644
index 55c76dfdc2da..
--- a/app-emulation/wine-staging/wine-staging-8.11-r1.ebuild
+++ /dev/null
@@ -1,412 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-

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

2023-09-02 Thread Ionen Wolkens

commit: c1d12529c023ca1ab6c38d8b609f71fbf7738f59
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Sep  2 14:31:48 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Sep  2 14:32:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1d12529

app-emulation/wine-staging: add 8.15

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/Manifest|   2 +
 .../wine-staging/wine-staging-8.15.ebuild  | 458 +
 2 files changed, 460 insertions(+)

diff --git a/app-emulation/wine-staging/Manifest 
b/app-emulation/wine-staging/Manifest
index 0542891645e2..596b41c40f94 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -3,8 +3,10 @@ DIST wine-8.11.tar.xz 29236492 BLAKE2B 
db97b9abde6e1f4c854b449d27bdbafbc91bd75b8
 DIST wine-8.12.tar.xz 29276732 BLAKE2B 
c1bf0d32eaf17f06b47dd7ffc495db4874f72ffec7cfca9edd9b2b9def8ab16db2583349950c3af447d85d476aa013914554f990d5f42d5bc8243b9effbaf869
 SHA512 
6b9eab7ca1ed5a13202b1250d8d95f6bd8ee5176f0c39b5358aedaf28f7f23543f4a73bf0782c3b4e50936813fc2a459582b5d294569c976ace784fbd9e0af1b
 DIST wine-8.13.tar.xz 29379824 BLAKE2B 
fa07edba8e45ef17813e63f793ca18cd05fd421b803d416421ec0fb7aeb4223ae44376a7e75a195e91c30259f27b48c3ed4ab0b613cbb9464b824f51e85ea240
 SHA512 
952c670635f91879cf6908343a04c0f41ae54e213123242e24fc282f9705fbe3b800dc1de454b6cfb1ebb89431b0e6eb3df3b094c1d9f4e69835d0f1b8f4fcb5
 DIST wine-8.14.tar.xz 29412976 BLAKE2B 
239f90dd9c40bbca719231d2a0240e75f803ead314ab7fb8cb90e375a52696700af87ac2cdeff9a2ecb1d1cce271142cf16ce200024c98fb8bd543779aa2423e
 SHA512 
cf293546c29379237e8c2b7526b16faa0df6a255aa1718097be4382604da4f84f7fad8486a931f39020fe63548625641cf68a822c975f56c30aaa2aa8a024176
+DIST wine-8.15.tar.xz 29427600 BLAKE2B 
9a1bb0de4048e32f78e3630e9e33dc99a117d4fcb4e61285e3fb298de9f1742a7d9c52f0d02dd407ce5c62768d7fecf51947165fbc8e62cf076519caea13a2db
 SHA512 
d450dfe868ac7c7cb26ccc5e6d492c1311395c5f8b150610f5b1e78451d303b63b67c7e0ad48d6a66ae5265c5bc16da970544cf12195d8635cc3fc96c4a26cad
 DIST wine-staging-8.0.tar.gz 9529620 BLAKE2B 
c9540195ea885d9f1e980232b0af471e92c61eb079cae35fdb3af5c13d4660b3466f751772440e38f15874082db296d16d1f1d68827a505b2dd949617eda0203
 SHA512 
76a729d7ced1ff634ddb455ddfaa66ca103b652f43cd152b57ada7431bb5fbb74f5e92bf2f4f329b6df6f5908130afad84e609cbce6df645d6cf8131e9b949f9
 DIST wine-staging-8.11.tar.gz 9715880 BLAKE2B 
2795389381d6e52215d8b1b2c437a47beaf61e9b36e78f99c45b3fcd79d554f2d4abafcbf34c366dcb7ce4fc14d66b8751466c30648ae0d7c451aaa345c30c5f
 SHA512 
fb7a5f575c092e84afa78868e3b15fa33d67205a5e20deae61a60613714df784b18d54cd32167355ae38543f047f4304bfbc7f2ba2b3f6050c9f738812a15154
 DIST wine-staging-8.12.tar.gz 9764049 BLAKE2B 
739c6dfdcef6e744fc7f6dcee24abdedd5f96b7ad688bdd5cc667627cec0b21d658354369ecc0de71a4ba682636e369105cef3de97dbf095f1ee1025d9a12fc2
 SHA512 
11364b2367e25706b98c168710288b796e9dea1e3400efc0d010ea8827cb8c4187385f53aebd1fda46611902f6619282ea97ce9d7c20fe18aa48c14f15c99d14
 DIST wine-staging-8.13.tar.gz 9785058 BLAKE2B 
6c797cd50276009cc23619447a70ac972b5c7ad7684d7bd99f20cd7607b88f911eb89f59df98680ef8786495f2f8ff2910c8bbd930d811bb31147aa230105ce1
 SHA512 
b2104b0893ba27ee7f4f5495f7dee990962ff668786fd95e11af6d3975b7d00bc4ecb2572f280d27fbb6d1672745e0acbdb392ec7b3fd5b330a846783c23e12d
 DIST wine-staging-8.14.tar.gz 9847486 BLAKE2B 
62762efe15007b7a275c4f30c79b398f77078e5ba7ca44f9159d300cc7688439d8efbfae1c7c2faa73a17ceab0de82dbc1fc6338e99f3714fc1212b6e1bf71a8
 SHA512 
c126ddd49f2c89b61448c71779f022f7031b19f1bc346d4aa1e8dbe4845f2c5d80e92810db5e0bbc0cae3d5f8466e2ab9a2c5685923318aedfb79504a7db
+DIST wine-staging-8.15.tar.gz 9856164 BLAKE2B 
9313c88a436cd73e5b1b0cc44d0c781babcd870cdf89c4111ef1eef6012362123c244360bb7ae39b65317b39f3dfffd0530dd5674507bc0c1824d9d2efeabd3e
 SHA512 
23d956dd9a5d5b8cb4efd5dcb5a0fd5926539b7e45d230920e20a84d27ecd6e4b1cc8285d328a0be622f66c48d453b577a4eeb096f8a866760da81cc47410a2a

diff --git a/app-emulation/wine-staging/wine-staging-8.15.ebuild 
b/app-emulation/wine-staging/wine-staging-8.15.ebuild
new file mode 100644
index ..9f4dff71c714
--- /dev/null
+++ b/app-emulation/wine-staging/wine-staging-8.15.ebuild
@@ -0,0 +1,458 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+PYTHON_COMPAT=( python3_{10..12} )
+# note: multilib+wrapper are not unused, currently a pkgcheck false positive
+inherit autotools edo flag-o-matic multilib multilib-build
+inherit prefix python-any-r1 toolchain-funcs wrapper
+
+WINE_GECKO=2.47.4
+WINE_MONO=8.0.0
+WINE_P=wine-$(ver_cut 1-2)
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine-staging.git;
+   WINE_EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git;
+else
+   (( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 
1).0
+

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

2023-08-28 Thread Ionen Wolkens

commit: 19de57ffb76dd9aafb32d5086aa623bdb95c9efd
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Aug 28 11:58:18 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Aug 28 12:13:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19de57ff

app-emulation/wine-staging: warn if nvidia[abi_x86_32] is missing

Hard to know for sure if it's really used or not, but do not
want to introduce a kinda no-op VIDEO_CARDS on wine to actually
depend on it over a warning.

Less of an issue with mesa given other dependencies end up
requiring it (technically the dep is wrong given e.g. nvidia
would not need mesa[abi_x86_32], but well).

(not needed with USE="wow64 -abi_x86_32" for 32bit)

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/wine-staging-8.0.ebuild | 8 
 app-emulation/wine-staging/wine-staging-8.11-r1.ebuild | 8 
 app-emulation/wine-staging/wine-staging-8.12.ebuild| 8 
 app-emulation/wine-staging/wine-staging-8.13.ebuild| 6 ++
 app-emulation/wine-staging/wine-staging-8.14.ebuild| 6 ++
 app-emulation/wine-staging/wine-staging-.ebuild| 6 ++
 6 files changed, 42 insertions(+)

diff --git a/app-emulation/wine-staging/wine-staging-8.0.ebuild 
b/app-emulation/wine-staging/wine-staging-8.0.ebuild
index 66827fdc086d..b28e3e16486b 100644
--- a/app-emulation/wine-staging/wine-staging-8.0.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.0.ebuild
@@ -381,6 +381,14 @@ src_install() {
 }
 
 pkg_postinst() {
+   if use abi_x86_32 && { use opengl || use vulkan; } &&
+   has_version 'x11-drivers/nvidia-drivers[-abi_x86_32]'
+   then
+   ewarn "x11-drivers/nvidia-drivers is installed but is built 
without"
+   ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 
32bit"
+   ewarn "applications under ${PN} will likely not be usable."
+   fi
+
eselect wine update --if-unset || die
 }
 

diff --git a/app-emulation/wine-staging/wine-staging-8.11-r1.ebuild 
b/app-emulation/wine-staging/wine-staging-8.11-r1.ebuild
index 67326eaf843f..55c76dfdc2da 100644
--- a/app-emulation/wine-staging/wine-staging-8.11-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.11-r1.ebuild
@@ -396,6 +396,14 @@ src_install() {
 }
 
 pkg_postinst() {
+   if use abi_x86_32 && { use opengl || use vulkan; } &&
+   has_version 'x11-drivers/nvidia-drivers[-abi_x86_32]'
+   then
+   ewarn "x11-drivers/nvidia-drivers is installed but is built 
without"
+   ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 
32bit"
+   ewarn "applications under ${PN} will likely not be usable."
+   fi
+
eselect wine update --if-unset || die
 }
 

diff --git a/app-emulation/wine-staging/wine-staging-8.12.ebuild 
b/app-emulation/wine-staging/wine-staging-8.12.ebuild
index 67326eaf843f..55c76dfdc2da 100644
--- a/app-emulation/wine-staging/wine-staging-8.12.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.12.ebuild
@@ -396,6 +396,14 @@ src_install() {
 }
 
 pkg_postinst() {
+   if use abi_x86_32 && { use opengl || use vulkan; } &&
+   has_version 'x11-drivers/nvidia-drivers[-abi_x86_32]'
+   then
+   ewarn "x11-drivers/nvidia-drivers is installed but is built 
without"
+   ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 
32bit"
+   ewarn "applications under ${PN} will likely not be usable."
+   fi
+
eselect wine update --if-unset || die
 }
 

diff --git a/app-emulation/wine-staging/wine-staging-8.13.ebuild 
b/app-emulation/wine-staging/wine-staging-8.13.ebuild
index d93f2f74f1f5..9f4dff71c714 100644
--- a/app-emulation/wine-staging/wine-staging-8.13.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.13.ebuild
@@ -442,6 +442,12 @@ pkg_postinst() {
ewarn "work, be warned that it is not unusual that installers 
or other helpers"
ewarn "will attempt to use 32bit and fail. If do not want full 
USE=abi_x86_32,"
ewarn "note the experimental/WIP USE=wow64 can allow 32bit 
without multilib."
+   elif use abi_x86_32 && { use opengl || use vulkan; } &&
+   has_version 'x11-drivers/nvidia-drivers[-abi_x86_32]'
+   then
+   ewarn "x11-drivers/nvidia-drivers is installed but is built 
without"
+   ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 
32bit"
+   ewarn "applications under ${PN} will likely not be usable."
fi
 
eselect wine update --if-unset || die

diff --git a/app-emulation/wine-staging/wine-staging-8.14.ebuild 
b/app-emulation/wine-staging/wine-staging-8.14.ebuild
index d93f2f74f1f5..9f4dff71c714 100644
--- a/app-emulation/wine-staging/wine-staging-8.14.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.14.ebuild
@@ -442,6 +442,12 @@ pkg_postinst() {

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

2023-08-21 Thread Ionen Wolkens

commit: 8aaaf2f6c63b24a93f424e3a67690f7a8f652a34
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Aug 21 10:10:01 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Aug 21 10:10:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8aaaf2f6

app-emulation/wine-staging: add 8.14

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/Manifest|   2 +
 .../wine-staging/wine-staging-8.14.ebuild  | 452 +
 2 files changed, 454 insertions(+)

diff --git a/app-emulation/wine-staging/Manifest 
b/app-emulation/wine-staging/Manifest
index 67b05de391cb..0542891645e2 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -2,7 +2,9 @@ DIST wine-8.0.tar.xz 29054044 BLAKE2B 
baf8f96b665119c9f38a148a2472dbe8f6ca8d4641
 DIST wine-8.11.tar.xz 29236492 BLAKE2B 
db97b9abde6e1f4c854b449d27bdbafbc91bd75b835d84da401777c6ae2f4f623f2130f470d2e9a3aaf7e737f75d143a07191d38b409c06596373bece3df23c5
 SHA512 
f3e37f51f0a13aacbd41b017fc3d35e197614b03c00f5b9959c0fabc4e89975b5c3f411b38329e45ce6f9d2a2d82952b95e0907fbe2d6ae35cc4bec293825769
 DIST wine-8.12.tar.xz 29276732 BLAKE2B 
c1bf0d32eaf17f06b47dd7ffc495db4874f72ffec7cfca9edd9b2b9def8ab16db2583349950c3af447d85d476aa013914554f990d5f42d5bc8243b9effbaf869
 SHA512 
6b9eab7ca1ed5a13202b1250d8d95f6bd8ee5176f0c39b5358aedaf28f7f23543f4a73bf0782c3b4e50936813fc2a459582b5d294569c976ace784fbd9e0af1b
 DIST wine-8.13.tar.xz 29379824 BLAKE2B 
fa07edba8e45ef17813e63f793ca18cd05fd421b803d416421ec0fb7aeb4223ae44376a7e75a195e91c30259f27b48c3ed4ab0b613cbb9464b824f51e85ea240
 SHA512 
952c670635f91879cf6908343a04c0f41ae54e213123242e24fc282f9705fbe3b800dc1de454b6cfb1ebb89431b0e6eb3df3b094c1d9f4e69835d0f1b8f4fcb5
+DIST wine-8.14.tar.xz 29412976 BLAKE2B 
239f90dd9c40bbca719231d2a0240e75f803ead314ab7fb8cb90e375a52696700af87ac2cdeff9a2ecb1d1cce271142cf16ce200024c98fb8bd543779aa2423e
 SHA512 
cf293546c29379237e8c2b7526b16faa0df6a255aa1718097be4382604da4f84f7fad8486a931f39020fe63548625641cf68a822c975f56c30aaa2aa8a024176
 DIST wine-staging-8.0.tar.gz 9529620 BLAKE2B 
c9540195ea885d9f1e980232b0af471e92c61eb079cae35fdb3af5c13d4660b3466f751772440e38f15874082db296d16d1f1d68827a505b2dd949617eda0203
 SHA512 
76a729d7ced1ff634ddb455ddfaa66ca103b652f43cd152b57ada7431bb5fbb74f5e92bf2f4f329b6df6f5908130afad84e609cbce6df645d6cf8131e9b949f9
 DIST wine-staging-8.11.tar.gz 9715880 BLAKE2B 
2795389381d6e52215d8b1b2c437a47beaf61e9b36e78f99c45b3fcd79d554f2d4abafcbf34c366dcb7ce4fc14d66b8751466c30648ae0d7c451aaa345c30c5f
 SHA512 
fb7a5f575c092e84afa78868e3b15fa33d67205a5e20deae61a60613714df784b18d54cd32167355ae38543f047f4304bfbc7f2ba2b3f6050c9f738812a15154
 DIST wine-staging-8.12.tar.gz 9764049 BLAKE2B 
739c6dfdcef6e744fc7f6dcee24abdedd5f96b7ad688bdd5cc667627cec0b21d658354369ecc0de71a4ba682636e369105cef3de97dbf095f1ee1025d9a12fc2
 SHA512 
11364b2367e25706b98c168710288b796e9dea1e3400efc0d010ea8827cb8c4187385f53aebd1fda46611902f6619282ea97ce9d7c20fe18aa48c14f15c99d14
 DIST wine-staging-8.13.tar.gz 9785058 BLAKE2B 
6c797cd50276009cc23619447a70ac972b5c7ad7684d7bd99f20cd7607b88f911eb89f59df98680ef8786495f2f8ff2910c8bbd930d811bb31147aa230105ce1
 SHA512 
b2104b0893ba27ee7f4f5495f7dee990962ff668786fd95e11af6d3975b7d00bc4ecb2572f280d27fbb6d1672745e0acbdb392ec7b3fd5b330a846783c23e12d
+DIST wine-staging-8.14.tar.gz 9847486 BLAKE2B 
62762efe15007b7a275c4f30c79b398f77078e5ba7ca44f9159d300cc7688439d8efbfae1c7c2faa73a17ceab0de82dbc1fc6338e99f3714fc1212b6e1bf71a8
 SHA512 
c126ddd49f2c89b61448c71779f022f7031b19f1bc346d4aa1e8dbe4845f2c5d80e92810db5e0bbc0cae3d5f8466e2ab9a2c5685923318aedfb79504a7db

diff --git a/app-emulation/wine-staging/wine-staging-8.14.ebuild 
b/app-emulation/wine-staging/wine-staging-8.14.ebuild
new file mode 100644
index ..d93f2f74f1f5
--- /dev/null
+++ b/app-emulation/wine-staging/wine-staging-8.14.ebuild
@@ -0,0 +1,452 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+PYTHON_COMPAT=( python3_{10..12} )
+# note: multilib+wrapper are not unused, currently a pkgcheck false positive
+inherit autotools edo flag-o-matic multilib multilib-build
+inherit prefix python-any-r1 toolchain-funcs wrapper
+
+WINE_GECKO=2.47.4
+WINE_MONO=8.0.0
+WINE_P=wine-$(ver_cut 1-2)
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine-staging.git;
+   WINE_EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git;
+else
+   (( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 
1).0
+   SRC_URI="
+   https://dl.winehq.org/wine/source/${WINE_SDIR}/${WINE_P}.tar.xz
+   
https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="-* ~amd64 ~x86"
+fi
+S="${WORKDIR}/${WINE_P}"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, with

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

2023-08-14 Thread Ionen Wolkens

commit: 34c8f499d948e594a22ed16bb05db007e7f77d6f
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Aug 14 12:30:39 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Aug 14 16:39:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34c8f499

app-emulation/wine-staging: more solid wine{64,} symlink handling

To ensure potential situations where the wine binary would
be overwritten by a symlink don't happen.

Current layout worked but future changes or EXTRA_ECONF can
make it rather fragile. Only changing in 8.13/ given wow64
is what complexified this further.

For the record:
abi_x86_64 -abi_x86_32 -wow64 = wine64-only
abi_x86_64 -abi_x86_32 wow64 = wine-only
-abi_x86_64 abi_x86_32 -wow64 = wine-only
abi_x86_64 abi_x86_32 -wow64 = wine and wine64

Could argue that having "wine64" is not really useful, but lot of
scripts and users still expect it and other distros like Alpine are
making the symlink with wow64 too.

Signed-off-by: Ionen Wolkens  gentoo.org>

 .../wine-staging/wine-staging-8.13.ebuild  | 37 --
 .../wine-staging/wine-staging-.ebuild  | 37 --
 2 files changed, 42 insertions(+), 32 deletions(-)

diff --git a/app-emulation/wine-staging/wine-staging-8.13.ebuild 
b/app-emulation/wine-staging/wine-staging-8.13.ebuild
index 9f7c5dfd6147..7141425288ae 100644
--- a/app-emulation/wine-staging/wine-staging-8.13.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.13.ebuild
@@ -384,22 +384,27 @@ src_install() {
use abi_x86_32 && emake DESTDIR="${D}" -C ../build32 install
use abi_x86_64 && emake DESTDIR="${D}" -C ../build64 install # do last
 
-   if use wow64; then
-   # compat symlinks, albeit ideally no one should call "wine64"
-   dosym wine ${WINE_PREFIX}/bin/wine64
-   dosym wine-preloader ${WINE_PREFIX}/bin/wine64-preloader
-   elif use abi_x86_64 && use !abi_x86_32; then
-   # if no 32bit support it instead only installs "wine64" which 
may
-   # come as unexpected, so provide "wine" alongside its man page
-   dosym wine64 ${WINE_PREFIX}/bin/wine
-   dosym wine64-preloader ${WINE_PREFIX}/bin/wine-preloader
-   local man
-   for man in ../build64/loader/wine.*man; do
-   : "${man##*/wine}"
-   : "${_%.*}"
-   insinto ${WINE_DATADIR}/man/${_:+${_#.}/}man1
-   newins ${man} wine.1
-   done
+   # Ensure both wine64 and wine are available if USE=abi_x86_64 (wow64,
+   # -abi_x86_32, and/or EXTRA_ECONF could cause varying scenarios where
+   # one or the other could be missing and that is unexpected for users
+   # and some tools like winetricks)
+   if use abi_x86_64; then
+   if [[ -e ${ED}${WINE_PREFIX}/bin/wine64 && ! -e 
${ED}${WINE_PREFIX}/bin/wine ]]; then
+   dosym wine64 ${WINE_PREFIX}/bin/wine
+   dosym wine64-preloader ${WINE_PREFIX}/bin/wine-preloader
+
+   # also install wine(1) man pages (incl. translations)
+   local man
+   for man in ../build64/loader/wine.*man; do
+   : "${man##*/wine}"
+   : "${_%.*}"
+   insinto ${WINE_DATADIR}/man/${_:+${_#.}/}man1
+   newins ${man} wine.1
+   done
+   elif [[ ! -e ${ED}${WINE_PREFIX}/bin/wine64 && -e 
${ED}${WINE_PREFIX}/bin/wine ]]; then
+   dosym wine ${WINE_PREFIX}/bin/wine64
+   dosym wine-preloader ${WINE_PREFIX}/bin/wine64-preloader
+   fi
fi
 
use perl || rm "${ED}"${WINE_DATADIR}/man/man1/wine{dump,maker}.1 \

diff --git a/app-emulation/wine-staging/wine-staging-.ebuild 
b/app-emulation/wine-staging/wine-staging-.ebuild
index 9f7c5dfd6147..7141425288ae 100644
--- a/app-emulation/wine-staging/wine-staging-.ebuild
+++ b/app-emulation/wine-staging/wine-staging-.ebuild
@@ -384,22 +384,27 @@ src_install() {
use abi_x86_32 && emake DESTDIR="${D}" -C ../build32 install
use abi_x86_64 && emake DESTDIR="${D}" -C ../build64 install # do last
 
-   if use wow64; then
-   # compat symlinks, albeit ideally no one should call "wine64"
-   dosym wine ${WINE_PREFIX}/bin/wine64
-   dosym wine-preloader ${WINE_PREFIX}/bin/wine64-preloader
-   elif use abi_x86_64 && use !abi_x86_32; then
-   # if no 32bit support it instead only installs "wine64" which 
may
-   # come as unexpected, so provide "wine" alongside its man page
-   dosym wine64 ${WINE_PREFIX}/bin/wine
-   dosym wine64-preloader ${WINE_PREFIX}/bin/wine-preloader
-   local man
-

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

2023-08-14 Thread Ionen Wolkens

commit: c431dd7010566a91baa4e3aa3b138d8249e67a7d
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Aug 14 13:50:35 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Aug 14 16:39:25 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c431dd70

app-emulation/wine-staging: "allow" USE=-mingw with clang for latest

Quotes given that is only if EXTRA_ECONF is used.

Explored the idea to support it (after bug #912237 is fixed),
and while it works for a basic setup, getting the ebuild *right*
for all configurations quickly got messy and not sure want the
increased maintenance.

To outline some thoughts:
1. USE=-mingw with clang is different than with gcc, gcc won't build
PE files (old layout) while clang needs it (--enable-archs). Meaning
would need a flag to mirror USE=mingw like USE=pe-clang to apply
similar logic with flags, stripping, and other verifications.
-> automagic depending on tc-is-clang is *possible*, but then can't
have e.g. wow64? ( || ( pe-clang mingw ) ) and need to have more
heuristics-based logic

2. test-flags-* cannot be used with `-target *-windows` given there
won't be any runtime (wine does early tests differently), albeit
*could* fallback to a safe CROSSFLAGS="-g -O2" or so

3. not sure want to deal with every future issues with clang cross
no top of mingw's and, on that note, clang-17 is currently broken
with USE=-mingw given don't believe can safely strip -mabi=ms as a
workaround if cross actually gets used

4. there are a lot of combinations to potentially handle, aka
gcc+mingw, gcc w/o mingw, clang w/o mingw, clang+mingw, gcc+pe-clang,
and some of these with either bfd or lld, and with or without 32bit...
And this is turning rather messy and Wine is already kind of fragile
and tracking runtime issues is difficult

5. ...ideally would want to reduce this by forcing mingw even with gcc
(like wine-proton) to simplify, not add more -- albeit if add clang PE
support then it should likely be combined with dropping non-PE support
to balance (i.e. could require clang with USE=-mingw)

6. wine with clang is less tested by distros, users, and well, me
(hardly even try USE=-mingw builds+runtime anymore as-is, including
with gcc), and feel it's better not pretend to support it

Not excluding revisiting, albeit would rather not deal with this at
the moment.

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/wine-staging-8.0.ebuild |  8 
 app-emulation/wine-staging/wine-staging-8.11-r1.ebuild |  8 
 app-emulation/wine-staging/wine-staging-8.12.ebuild|  8 
 app-emulation/wine-staging/wine-staging-8.13.ebuild| 12 
 app-emulation/wine-staging/wine-staging-.ebuild| 12 
 5 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/app-emulation/wine-staging/wine-staging-8.0.ebuild 
b/app-emulation/wine-staging/wine-staging-8.0.ebuild
index 913b48dd933e..66827fdc086d 100644
--- a/app-emulation/wine-staging/wine-staging-8.0.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.0.ebuild
@@ -204,12 +204,12 @@ src_prepare() {
if tc-is-clang; then
if use mingw; then
# -mabi=ms was ignored by

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

2023-08-14 Thread Ionen Wolkens

commit: 70b13c64ef94d1a6761b6d7324af66f3e38192c0
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Aug 14 10:22:24 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Aug 14 10:25:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70b13c64

app-emulation/wine-staging: pass -mno-avx with mingw unconditionally

Upon further consideration 20894379a00ea6f482884d4159217ce3b1bc21a2
result in rather unexpected behavior even if we consider that
USE=custom-cflags is unsupported, and giving a way to skip -mno-avx
may not be all that worth it.

So revert plus tidy and add this bugref.

Closes: https://bugs.gentoo.org/912268
Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/wine-staging-8.0.ebuild | 7 +--
 app-emulation/wine-staging/wine-staging-8.11-r1.ebuild | 4 +++-
 app-emulation/wine-staging/wine-staging-8.12.ebuild| 4 +++-
 app-emulation/wine-staging/wine-staging-8.13.ebuild| 2 +-
 app-emulation/wine-staging/wine-staging-.ebuild| 2 +-
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/app-emulation/wine-staging/wine-staging-8.0.ebuild 
b/app-emulation/wine-staging/wine-staging-8.0.ebuild
index 02e21b401e18..913b48dd933e 100644
--- a/app-emulation/wine-staging/wine-staging-8.0.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.0.ebuild
@@ -314,14 +314,17 @@ src_configure() {
# use *FLAGS for mingw, but strip unsupported
: "${CROSSCFLAGS:=$(
# >=wine-7.21 configure.ac no longer adds 
-fno-strict by mistake
-   append-cflags '-fno-strict-aliasing'
+   append-cflags -fno-strict-aliasing
+
filter-flags '-fstack-protector*' #870136
filter-flags '-mfunction-return=thunk*' #878849
+
# -mavx with mingw-gcc has a history of obscure 
issues and
# disabling is seen as safer, e.g. 
`WINEARCH=win32 winecfg`
# crashes with -march=skylake >=wine-8.10, 
similar issues with
# znver4: 
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273
-   use custom-cflags || append-cflags -mno-avx
+   append-cflags -mno-avx #912268
+
CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
: "${CROSSLDFLAGS:=$(
filter-flags '-fuse-ld=*'

diff --git a/app-emulation/wine-staging/wine-staging-8.11-r1.ebuild 
b/app-emulation/wine-staging/wine-staging-8.11-r1.ebuild
index 3de52318a359..099bf613a54c 100644
--- a/app-emulation/wine-staging/wine-staging-8.11-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.11-r1.ebuild
@@ -329,11 +329,13 @@ src_configure() {
: "${CROSSCFLAGS:=$(
filter-flags '-fstack-protector*' #870136
filter-flags '-mfunction-return=thunk*' #878849
+
# -mavx with mingw-gcc has a history of obscure 
issues and
# disabling is seen as safer, e.g. 
`WINEARCH=win32 winecfg`
# crashes with -march=skylake >=wine-8.10, 
similar issues with
# znver4: 
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273
-   use custom-cflags || append-cflags -mno-avx
+   append-cflags -mno-avx #912268
+
CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
: "${CROSSLDFLAGS:=$(
filter-flags '-fuse-ld=*'

diff --git a/app-emulation/wine-staging/wine-staging-8.12.ebuild 
b/app-emulation/wine-staging/wine-staging-8.12.ebuild
index 3de52318a359..099bf613a54c 100644
--- a/app-emulation/wine-staging/wine-staging-8.12.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.12.ebuild
@@ -329,11 +329,13 @@ src_configure() {
: "${CROSSCFLAGS:=$(
filter-flags '-fstack-protector*' #870136
filter-flags '-mfunction-return=thunk*' #878849
+
# -mavx with mingw-gcc has a history of obscure 
issues and
# disabling is seen as safer, e.g. 
`WINEARCH=win32 winecfg`
# crashes with -march=skylake >=wine-8.10, 
similar issues with
# znver4: 
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273
-   use custom-cflags || append-cflags -mno-avx
+   append-cflags -mno-avx #912268
+
CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
: "${CROSSLDFLAGS:=$(

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

2023-08-13 Thread Ionen Wolkens

commit: 7e6eea87603252f3b2688e02730ba9a8230477d1
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sun Aug 13 19:32:35 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sun Aug 13 19:39:17 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e6eea87

app-emulation/wine-staging: adjust comments w/ bugref for clang

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/wine-staging-8.0.ebuild | 2 +-
 app-emulation/wine-staging/wine-staging-8.11-r1.ebuild | 2 +-
 app-emulation/wine-staging/wine-staging-8.12.ebuild| 2 +-
 app-emulation/wine-staging/wine-staging-8.13.ebuild| 3 ++-
 app-emulation/wine-staging/wine-staging-.ebuild| 3 ++-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app-emulation/wine-staging/wine-staging-8.0.ebuild 
b/app-emulation/wine-staging/wine-staging-8.0.ebuild
index 9b2fa68aa6e5..02e21b401e18 100644
--- a/app-emulation/wine-staging/wine-staging-8.0.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.0.ebuild
@@ -208,7 +208,7 @@ src_prepare() {
# drop as a quick fix for now which hopefully should be 
safe
sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die
else
-   # ./configure will abort looking for -mabi=ms, so do it 
early
+   # known broken due to bug #912237, require mingw for now
die "building ${PN} with clang requires USE=mingw to be 
enabled"
fi
fi

diff --git a/app-emulation/wine-staging/wine-staging-8.11-r1.ebuild 
b/app-emulation/wine-staging/wine-staging-8.11-r1.ebuild
index f2f9ddf5ead8..3de52318a359 100644
--- a/app-emulation/wine-staging/wine-staging-8.11-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.11-r1.ebuild
@@ -221,7 +221,7 @@ src_prepare() {
# drop as a quick fix for now which hopefully should be 
safe
sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die
else
-   # ./configure will abort looking for -mabi=ms, so do it 
early
+   # known broken due to bug #912237, require mingw for now
die "building ${PN} with clang requires USE=mingw to be 
enabled"
fi
fi

diff --git a/app-emulation/wine-staging/wine-staging-8.12.ebuild 
b/app-emulation/wine-staging/wine-staging-8.12.ebuild
index f2f9ddf5ead8..3de52318a359 100644
--- a/app-emulation/wine-staging/wine-staging-8.12.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.12.ebuild
@@ -221,7 +221,7 @@ src_prepare() {
# drop as a quick fix for now which hopefully should be 
safe
sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die
else
-   # ./configure will abort looking for -mabi=ms, so do it 
early
+   # known broken due to bug #912237, require mingw for now
die "building ${PN} with clang requires USE=mingw to be 
enabled"
fi
fi

diff --git a/app-emulation/wine-staging/wine-staging-8.13.ebuild 
b/app-emulation/wine-staging/wine-staging-8.13.ebuild
index bf30ea0d2af9..beaa12265098 100644
--- a/app-emulation/wine-staging/wine-staging-8.13.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.13.ebuild
@@ -41,6 +41,7 @@ IUSE="
+truetype udev udisks +unwind usb v4l +vulkan wayland wow64
+xcomposite xinerama"
 # bug #551124 for truetype
+# TODO: wow64 can be done without mingw if using clang (needs bug #912237)
 REQUIRED_USE="
X? ( truetype )
crossdev-mingw? ( mingw )
@@ -233,7 +234,7 @@ src_prepare() {
# drop as a quick fix for now which hopefully should be 
safe
sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die
else
-   # ./configure will abort looking for -mabi=ms, so do it 
early
+   # known broken due to bug #912237, require mingw for now
die "building ${PN} with clang requires USE=mingw to be 
enabled"
fi
fi

diff --git a/app-emulation/wine-staging/wine-staging-.ebuild 
b/app-emulation/wine-staging/wine-staging-.ebuild
index bf30ea0d2af9..beaa12265098 100644
--- a/app-emulation/wine-staging/wine-staging-.ebuild
+++ b/app-emulation/wine-staging/wine-staging-.ebuild
@@ -41,6 +41,7 @@ IUSE="
+truetype udev udisks +unwind usb v4l +vulkan wayland wow64
+xcomposite xinerama"
 # bug #551124 for truetype
+# TODO: wow64 can be done without mingw if using clang (needs bug #912237)
 REQUIRED_USE="
X? ( truetype )
crossdev-mingw? ( mingw )
@@ -233,7 +234,7 @@ src_prepare() {
# drop as a quick fix for now which hopefully should be 
safe
sed -i '/MSVCRTFLAGS=/s/-mabi=ms//'

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

2023-08-11 Thread Ionen Wolkens

commit: cbafd7b7750f162971e18fd80474868f05ce3825
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Aug 11 10:47:45 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Aug 11 10:49:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbafd7b7

app-emulation/wine-staging: comment about pkgcheck false positive

Goes away if remove the conf+( CROSS...) block, nested syntax
is probably confusing tree-sitter-bash.

Keep a comment so not removed on a whim.

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/wine-staging-8.13.ebuild | 1 +
 app-emulation/wine-staging/wine-staging-.ebuild | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app-emulation/wine-staging/wine-staging-8.13.ebuild 
b/app-emulation/wine-staging/wine-staging-8.13.ebuild
index 7b7a4e1c36dc..bf30ea0d2af9 100644
--- a/app-emulation/wine-staging/wine-staging-8.13.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.13.ebuild
@@ -5,6 +5,7 @@ EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
 PYTHON_COMPAT=( python3_{10..12} )
+# note: multilib+wrapper are not unused, currently a pkgcheck false positive
 inherit autotools edo flag-o-matic multilib multilib-build
 inherit prefix python-any-r1 toolchain-funcs wrapper
 

diff --git a/app-emulation/wine-staging/wine-staging-.ebuild 
b/app-emulation/wine-staging/wine-staging-.ebuild
index 7b7a4e1c36dc..bf30ea0d2af9 100644
--- a/app-emulation/wine-staging/wine-staging-.ebuild
+++ b/app-emulation/wine-staging/wine-staging-.ebuild
@@ -5,6 +5,7 @@ EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
 PYTHON_COMPAT=( python3_{10..12} )
+# note: multilib+wrapper are not unused, currently a pkgcheck false positive
 inherit autotools edo flag-o-matic multilib multilib-build
 inherit prefix python-any-r1 toolchain-funcs wrapper

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

2023-08-11 Thread Ionen Wolkens

commit: 877936c3513d7ef069423a35a856a5ff7ba5c133
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Aug 11 09:48:23 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Aug 11 10:33:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=877936c3

app-emulation/wine-staging: tentatively allow lld again in latest

Seems fine, no large binaries nor (obvious) issues at runtime.
Please report if there's major issues that would require forcing
bfd again.

Mold still seems broken, no large binaries but been simply getting
a Segmentation Fault when run winecfg.

So do nothing if recognize bfd or lld, but force whichever is
available otherwise.

Leaving alone for older versions as a precaution.

On a side-note, I hope nobody is passing -fuse-ld=lld in CFLAGS
rather than LDFLAGS where it belongs as this would break compile+link
at once mingw64-toolchain PE tests.

Bug: https://bugs.gentoo.org/867097
Signed-off-by: Ionen Wolkens  gentoo.org>

 .../wine-staging/wine-staging-8.13.ebuild  | 23 --
 .../wine-staging/wine-staging-.ebuild  | 23 --
 2 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/app-emulation/wine-staging/wine-staging-8.13.ebuild 
b/app-emulation/wine-staging/wine-staging-8.13.ebuild
index da465be0fe33..7b7a4e1c36dc 100644
--- a/app-emulation/wine-staging/wine-staging-8.13.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.13.ebuild
@@ -137,8 +137,11 @@ BDEPEND="
sys-apps/util-linux
)
)
+   || (
+   sys-devel/binutils
+   sys-devel/lld
+   )
dev-lang/perl
-   sys-devel/binutils
sys-devel/bison
sys-devel/flex
virtual/pkgconfig
@@ -296,18 +299,18 @@ src_configure() {
$(use_with xinerama)
)
 
-   # builds with non-bfd but broken at runtime (bug #867097)
-   # TODO: retest mold and lld, and figure out what's wrong if
-   # still broken given (at least) lld is supposed to work
-   tc-ld-force-bfd
-
filter-lto # build failure
use custom-cflags || strip-flags # can break in obscure ways at runtime
 
-   # temporary workaround for tc-ld-force-bfd not yet enforcing with mold
-   # https://github.com/gentoo/gentoo/pull/28355
-   [[ $($(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) == mold* ]] &&
-   append-ldflags -fuse-ld=bfd
+   # wine uses linker tricks unlikely to work with non-bfd/lld (bug 
#867097)
+   # (do self test until https://github.com/gentoo/gentoo/pull/28355)
+   if [[ $(LC_ALL=C $(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) != 
@(LLD|GNU\ ld)* ]]
+   then
+   has_version -b sys-devel/binutils &&
+   append-ldflags -fuse-ld=bfd ||
+   append-ldflags -fuse-ld=lld
+   strip-unsupported-flags
+   fi
 
if use mingw; then
use crossdev-mingw || 
PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}

diff --git a/app-emulation/wine-staging/wine-staging-.ebuild 
b/app-emulation/wine-staging/wine-staging-.ebuild
index da465be0fe33..7b7a4e1c36dc 100644
--- a/app-emulation/wine-staging/wine-staging-.ebuild
+++ b/app-emulation/wine-staging/wine-staging-.ebuild
@@ -137,8 +137,11 @@ BDEPEND="
sys-apps/util-linux
)
)
+   || (
+   sys-devel/binutils
+   sys-devel/lld
+   )
dev-lang/perl
-   sys-devel/binutils
sys-devel/bison
sys-devel/flex
virtual/pkgconfig
@@ -296,18 +299,18 @@ src_configure() {
$(use_with xinerama)
)
 
-   # builds with non-bfd but broken at runtime (bug #867097)
-   # TODO: retest mold and lld, and figure out what's wrong if
-   # still broken given (at least) lld is supposed to work
-   tc-ld-force-bfd
-
filter-lto # build failure
use custom-cflags || strip-flags # can break in obscure ways at runtime
 
-   # temporary workaround for tc-ld-force-bfd not yet enforcing with mold
-   # https://github.com/gentoo/gentoo/pull/28355
-   [[ $($(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) == mold* ]] &&
-   append-ldflags -fuse-ld=bfd
+   # wine uses linker tricks unlikely to work with non-bfd/lld (bug 
#867097)
+   # (do self test until https://github.com/gentoo/gentoo/pull/28355)
+   if [[ $(LC_ALL=C $(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) != 
@(LLD|GNU\ ld)* ]]
+   then
+   has_version -b sys-devel/binutils &&
+   append-ldflags -fuse-ld=bfd ||
+   append-ldflags -fuse-ld=lld
+   strip-unsupported-flags
+   fi
 
if use mingw; then
use crossdev-mingw || 
PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}

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

2023-08-10 Thread Ionen Wolkens

commit: 4fc9ecd8a0bec1aa49ab2c02fe16a9ba83524908
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Aug 10 22:09:20 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Aug 10 22:14:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fc9ecd8

app-emulation/wine-staging: more emphasis on wow64 being not ready

Being work-in-progress should sound less ready than just experimental.
Want to avoid users too eagerly giving up multilib and then having
a hard time to go back when run into issues. Ideally should keep
a testing mindset and multilib around so can switch back

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/metadata.xml | 2 +-
 app-emulation/wine-staging/wine-staging-8.13.ebuild | 2 +-
 app-emulation/wine-staging/wine-staging-.ebuild | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-emulation/wine-staging/metadata.xml 
b/app-emulation/wine-staging/metadata.xml
index 455c48fd0a96..65b7853a79b7 100644
--- a/app-emulation/wine-staging/metadata.xml
+++ b/app-emulation/wine-staging/metadata.xml
@@ -31,7 +31,7 @@ This variant of the Wine packaging includes the Wine-Staging 
patchset.
Enable gamepad support using 
media-libs/libsdl2

Enable running 32bit applications without 32bit ELF
-   multilib by mapping to 64bit calls (experimental,
+   multilib by mapping to 64bit calls (experimental/WIP,
USE=abi_x86_32 is recommended for complete support)



diff --git a/app-emulation/wine-staging/wine-staging-8.13.ebuild 
b/app-emulation/wine-staging/wine-staging-8.13.ebuild
index 4f0b643cf1f6..ce3852c77cc9 100644
--- a/app-emulation/wine-staging/wine-staging-8.13.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.13.ebuild
@@ -415,7 +415,7 @@ pkg_postinst() {
ewarn "32bit support is disabled. While 64bit applications 
themselves will"
ewarn "work, be warned that it is not unusual that installers 
or other helpers"
ewarn "will attempt to use 32bit and fail. If do not want full 
USE=abi_x86_32,"
-   ewarn "note that the experimental USE=wow64 can allow 32bit 
without multilib."
+   ewarn "note the experimental/WIP USE=wow64 can allow 32bit 
without multilib."
fi
 
eselect wine update --if-unset || die

diff --git a/app-emulation/wine-staging/wine-staging-.ebuild 
b/app-emulation/wine-staging/wine-staging-.ebuild
index 4f0b643cf1f6..ce3852c77cc9 100644
--- a/app-emulation/wine-staging/wine-staging-.ebuild
+++ b/app-emulation/wine-staging/wine-staging-.ebuild
@@ -415,7 +415,7 @@ pkg_postinst() {
ewarn "32bit support is disabled. While 64bit applications 
themselves will"
ewarn "work, be warned that it is not unusual that installers 
or other helpers"
ewarn "will attempt to use 32bit and fail. If do not want full 
USE=abi_x86_32,"
-   ewarn "note that the experimental USE=wow64 can allow 32bit 
without multilib."
+   ewarn "note the experimental/WIP USE=wow64 can allow 32bit 
without multilib."
fi
 
eselect wine update --if-unset || die

[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-staging/, app-emulation/wine-staging/files/

2023-08-10 Thread Ionen Wolkens

commit: 6cdc5b79f51fd9fc6dd436bb2cd5d5a8f17e
Author: Violet Purcell  inventati  org>
AuthorDate: Thu Aug 10 20:37:20 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Aug 10 21:14:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cdc5b79

app-emulation/wine-staging: Fix rpath bug on musl

Signed-off-by: Violet Purcell  inventati.org>
Closes: https://github.com/gentoo/gentoo/pull/32250
Signed-off-by: Ionen Wolkens  gentoo.org>

 .../wine-staging/files/wine-staging-8.13-rpath.patch  | 15 +++
 app-emulation/wine-staging/wine-staging-8.13.ebuild   |  1 +
 app-emulation/wine-staging/wine-staging-.ebuild   |  1 +
 3 files changed, 17 insertions(+)

diff --git a/app-emulation/wine-staging/files/wine-staging-8.13-rpath.patch 
b/app-emulation/wine-staging/files/wine-staging-8.13-rpath.patch
new file mode 100644
index ..5f0d63b0ec33
--- /dev/null
+++ b/app-emulation/wine-staging/files/wine-staging-8.13-rpath.patch
@@ -0,0 +1,15 @@
+Patch Source: 
https://gitlab.alpinelinux.org/alpine/aports/-/blob/master/community/wine/rpath.patch
+Alpine Bug: https://gitlab.alpinelinux.org/alpine/aports/-/issues/13249
+
+--- a/configure.ac
 b/configure.ac
+@@ -784,6 +784,9 @@ case $host_os in
+ [WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS 
-Wl,-z,max-page-size=0x1000"])
+ ;;
+ esac
++
++# do this at the end because it needs double dollar for makefile
++WINE_TRY_CFLAGS([-Wl,-rpath,\\\$ORIGIN],[UNIXLDFLAGS="$UNIXLDFLAGS 
'-Wl,-rpath,\$\$ORIGIN'"])
+ ;;
+ esac
+ 

diff --git a/app-emulation/wine-staging/wine-staging-8.13.ebuild 
b/app-emulation/wine-staging/wine-staging-8.13.ebuild
index d27aaaf1b5d2..4f0b643cf1f6 100644
--- a/app-emulation/wine-staging/wine-staging-8.13.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.13.ebuild
@@ -160,6 +160,7 @@ QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC 
-Wl,-z,notext
 PATCHES=(
"${FILESDIR}"/${PN}-7.17-noexecstack.patch
"${FILESDIR}"/${PN}-7.20-unwind.patch
+   "${FILESDIR}"/${PN}-8.13-rpath.patch
 )
 
 pkg_pretend() {

diff --git a/app-emulation/wine-staging/wine-staging-.ebuild 
b/app-emulation/wine-staging/wine-staging-.ebuild
index d27aaaf1b5d2..4f0b643cf1f6 100644
--- a/app-emulation/wine-staging/wine-staging-.ebuild
+++ b/app-emulation/wine-staging/wine-staging-.ebuild
@@ -160,6 +160,7 @@ QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC 
-Wl,-z,notext
 PATCHES=(
"${FILESDIR}"/${PN}-7.17-noexecstack.patch
"${FILESDIR}"/${PN}-7.20-unwind.patch
+   "${FILESDIR}"/${PN}-8.13-rpath.patch
 )
 
 pkg_pretend() {

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

2023-08-10 Thread Ionen Wolkens

commit: c3dbb1d1feb598b2f35caae200a202389d6bee4a
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Aug 10 19:17:04 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Aug 10 19:27:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3dbb1d1

app-emulation/wine-staging: respect CROSS*FLAGS again

Oops, overlooked while changing this around -- albeit
likely scarcely used when it otherwise use CFLAGS anyway.

Now with more syntax highlighting confusion for vim.

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/wine-staging-8.13.ebuild | 8 
 app-emulation/wine-staging/wine-staging-.ebuild | 8 
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app-emulation/wine-staging/wine-staging-8.13.ebuild 
b/app-emulation/wine-staging/wine-staging-8.13.ebuild
index 3a7cda74ca11..d27aaaf1b5d2 100644
--- a/app-emulation/wine-staging/wine-staging-8.13.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.13.ebuild
@@ -311,7 +311,7 @@ src_configure() {
ac_cv_prog_x86_64_CC="${mingwcc_amd64}"
ac_cv_prog_i386_CC="${mingwcc_x86}"
 
-   CROSSCFLAGS="$(
+   CROSSCFLAGS="${CROSSCFLAGS:-$(
filter-flags '-fstack-protector*' #870136
filter-flags '-mfunction-return=thunk*' #878849
 
@@ -322,13 +322,13 @@ src_configure() {
use custom-cflags || append-cflags -mno-avx
 
CC=${mingwcc} test-flags-CC ${CFLAGS:--O2}
-   )"
+   )}"
 
-   CROSSLDFLAGS="$(
+   CROSSLDFLAGS="${CROSSLDFLAGS:-$(
filter-flags '-fuse-ld=*'
 
CC=${mingwcc} test-flags-CCLD ${LDFLAGS}
-   )"
+   )}"
)
fi
 

diff --git a/app-emulation/wine-staging/wine-staging-.ebuild 
b/app-emulation/wine-staging/wine-staging-.ebuild
index 3a7cda74ca11..d27aaaf1b5d2 100644
--- a/app-emulation/wine-staging/wine-staging-.ebuild
+++ b/app-emulation/wine-staging/wine-staging-.ebuild
@@ -311,7 +311,7 @@ src_configure() {
ac_cv_prog_x86_64_CC="${mingwcc_amd64}"
ac_cv_prog_i386_CC="${mingwcc_x86}"
 
-   CROSSCFLAGS="$(
+   CROSSCFLAGS="${CROSSCFLAGS:-$(
filter-flags '-fstack-protector*' #870136
filter-flags '-mfunction-return=thunk*' #878849
 
@@ -322,13 +322,13 @@ src_configure() {
use custom-cflags || append-cflags -mno-avx
 
CC=${mingwcc} test-flags-CC ${CFLAGS:--O2}
-   )"
+   )}"
 
-   CROSSLDFLAGS="$(
+   CROSSLDFLAGS="${CROSSLDFLAGS:-$(
filter-flags '-fuse-ld=*'
 
CC=${mingwcc} test-flags-CCLD ${LDFLAGS}
-   )"
+   )}"
)
fi

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

2023-08-10 Thread Ionen Wolkens

commit: aac26b5d3bd519a3d12610ae13f6e90072cbbb2e
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Aug 10 12:43:02 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Aug 10 12:43:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aac26b5d

app-emulation/wine-staging: add postinst ewarn to advertise wow64

Didn't want to add this a before given some profiles do not even
leave a choice, but now it feels a build without 32bit is just a
disservice.

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/wine-staging-8.13.ebuild | 7 +++
 app-emulation/wine-staging/wine-staging-.ebuild | 7 +++
 2 files changed, 14 insertions(+)

diff --git a/app-emulation/wine-staging/wine-staging-8.13.ebuild 
b/app-emulation/wine-staging/wine-staging-8.13.ebuild
index 6edbd663cb04..3a7cda74ca11 100644
--- a/app-emulation/wine-staging/wine-staging-8.13.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.13.ebuild
@@ -410,6 +410,13 @@ src_install() {
 }
 
 pkg_postinst() {
+   if use !abi_x86_32 && use !wow64; then
+   ewarn "32bit support is disabled. While 64bit applications 
themselves will"
+   ewarn "work, be warned that it is not unusual that installers 
or other helpers"
+   ewarn "will attempt to use 32bit and fail. If do not want full 
USE=abi_x86_32,"
+   ewarn "note that the experimental USE=wow64 can allow 32bit 
without multilib."
+   fi
+
eselect wine update --if-unset || die
 }
 

diff --git a/app-emulation/wine-staging/wine-staging-.ebuild 
b/app-emulation/wine-staging/wine-staging-.ebuild
index 6edbd663cb04..3a7cda74ca11 100644
--- a/app-emulation/wine-staging/wine-staging-.ebuild
+++ b/app-emulation/wine-staging/wine-staging-.ebuild
@@ -410,6 +410,13 @@ src_install() {
 }
 
 pkg_postinst() {
+   if use !abi_x86_32 && use !wow64; then
+   ewarn "32bit support is disabled. While 64bit applications 
themselves will"
+   ewarn "work, be warned that it is not unusual that installers 
or other helpers"
+   ewarn "will attempt to use 32bit and fail. If do not want full 
USE=abi_x86_32,"
+   ewarn "note that the experimental USE=wow64 can allow 32bit 
without multilib."
+   fi
+
eselect wine update --if-unset || die
 }

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

2023-08-10 Thread Ionen Wolkens

commit: b12f0fea9c499bbfcca62afd8c43549c430fddee
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Aug 10 08:59:37 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Aug 10 10:35:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b12f0fea

app-emulation/wine-staging: extend force-bfd comment with reminder

Would rather stay conservative with wine, but should
probably revisit still.

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/wine-staging-8.13.ebuild | 6 +-
 app-emulation/wine-staging/wine-staging-.ebuild | 6 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app-emulation/wine-staging/wine-staging-8.13.ebuild 
b/app-emulation/wine-staging/wine-staging-8.13.ebuild
index 2032ebd58ea6..d2092db2b690 100644
--- a/app-emulation/wine-staging/wine-staging-8.13.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.13.ebuild
@@ -280,7 +280,11 @@ src_configure() {
$(use_with xinerama)
)
 
-   tc-ld-force-bfd # builds with non-bfd but broken at runtime (bug 
#867097)
+   # builds with non-bfd but broken at runtime (bug #867097)
+   # TODO: retest mold and lld, and figure out what's wrong if
+   # still broken given (at least) lld is supposed to work
+   tc-ld-force-bfd
+
filter-lto # build failure
use custom-cflags || strip-flags # can break in obscure ways at runtime
 

diff --git a/app-emulation/wine-staging/wine-staging-.ebuild 
b/app-emulation/wine-staging/wine-staging-.ebuild
index 2032ebd58ea6..d2092db2b690 100644
--- a/app-emulation/wine-staging/wine-staging-.ebuild
+++ b/app-emulation/wine-staging/wine-staging-.ebuild
@@ -280,7 +280,11 @@ src_configure() {
$(use_with xinerama)
)
 
-   tc-ld-force-bfd # builds with non-bfd but broken at runtime (bug 
#867097)
+   # builds with non-bfd but broken at runtime (bug #867097)
+   # TODO: retest mold and lld, and figure out what's wrong if
+   # still broken given (at least) lld is supposed to work
+   tc-ld-force-bfd
+
filter-lto # build failure
use custom-cflags || strip-flags # can break in obscure ways at runtime

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

2023-08-10 Thread Ionen Wolkens

commit: 86a2e7a119a9dd7fa4ceb50ca9a4e10ca0724632
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Aug 10 08:40:43 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Aug 10 10:14:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86a2e7a1

app-emulation/wine-staging: tentative support for 32bit w/o multilib

This been possible to "build" since early wine-8 but was too
incomplete to be really useful and became more usable since roughly
8.10.

Scarecely tested, but was still able to get hardware accelerated
32bit wglgears.exe (like glxgears) on a no-multilib prefix install.
Not tested on musl yet, but alpine uses it and should work in theory.

Only going enable in current latest 8.13 and  so don't expect
this on wine-proton/vanilla-8.0.x where it'd be near useless
(for wine-proton it likely will not be until wine-proton-9).

Does not feel at a stage where it should be default except on
no-multilib profiles (abi_x86_32 is still recommended and wine itself
outputs a warning about being experimental when using it), but in the
event primarily use 64bit while still needing some 32bit support for
e.g. bad installers, then this should be good enough.

Still requires USE=abi_x86_32 on mingw64-toolchain and wine-gecko
(also dxvk/vkd3d-proton if used), but these have no requirements
on multilib libraries of their own. In the future may potentially
use a different USE on these to avoid confusion and integrate better
with no-multilib profiles.

For convenience moved the CROSS{CC,*FLAGS} out of the loop -- meaning
this no longer tests flags separately for 64+32 but should not be an
issue.

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/metadata.xml|  5 ++
 .../wine-staging/wine-staging-8.13.ebuild  | 96 ++
 .../wine-staging/wine-staging-.ebuild  | 96 ++
 3 files changed, 125 insertions(+), 72 deletions(-)

diff --git a/app-emulation/wine-staging/metadata.xml 
b/app-emulation/wine-staging/metadata.xml
index 3ef81511155b..455c48fd0a96 100644
--- a/app-emulation/wine-staging/metadata.xml
+++ b/app-emulation/wine-staging/metadata.xml
@@ -29,6 +29,11 @@ This variant of the Wine packaging includes the Wine-Staging 
patchset.
Install helpers that require perl 
(winedump/winemaker)
Pull in net-fs/samba with winbind 
for NTLM auth support
Enable gamepad support using 
media-libs/libsdl2
+   
+   Enable running 32bit applications without 32bit ELF
+   multilib by mapping to 64bit calls (experimental,
+   USE=abi_x86_32 is recommended for complete support)
+   



https://bugs.winehq.org/describecomponents.cgi?product=Wine-staging

diff --git a/app-emulation/wine-staging/wine-staging-8.13.ebuild 
b/app-emulation/wine-staging/wine-staging-8.13.ebuild
index 940bb93e3836..2032ebd58ea6 100644
--- a/app-emulation/wine-staging/wine-staging-8.13.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.13.ebuild
@@ -37,11 +37,13 @@ IUSE="
llvm-libunwind custom-cflags +fontconfig +gecko gphoto2 +gstreamer
kerberos +mingw +mono netapi nls opencl +opengl osmesa pcap perl
pulseaudio samba scanner +sdl selinux smartcard +ssl +strip
-   +truetype udev udisks +unwind usb v4l +vulkan wayland +xcomposite
-   xinerama"
+   +truetype udev udisks +unwind usb v4l +vulkan wayland wow64
+   +xcomposite xinerama"
+# bug #551124 for truetype
 REQUIRED_USE="
X? ( truetype )
-   crossdev-mingw? ( mingw )" # bug #551124 for truetype
+   crossdev-mingw? ( mingw )
+   wow64? ( abi_x86_64 !abi_x86_32 mingw )"
 
 # tests are non-trivial to run, can hang easily, don't play well with
 # sandbox, and several need real opengl/vulkan or network access
@@ -108,7 +110,10 @@ RDEPEND="
games-emulation/dosbox-staging
)
)
-   gecko? ( app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}] )
+   gecko? (
+   app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}]
+   wow64? ( app-emulation/wine-gecko[abi_x86_32] )
+   )
gstreamer? ( media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] )
mono? ( app-emulation/wine-mono:${WINE_MONO} )
perl? (
@@ -139,6 +144,7 @@ BDEPEND="
virtual/pkgconfig
mingw? ( !crossdev-mingw? (
>=dev-util/mingw64-toolchain-10.0.0_p1-r2[${MULTILIB_USEDEP}]
+   wow64? ( dev-util/mingw64-toolchain[abi_x86_32] )
) )
nls? ( sys-devel/gettext )
wayland? ( dev-util/wayland-scanner )"
@@ -161,7 +167,8 @@ pkg_pretend() {
 
if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then
local mingw=-w64-mingw32
-   for mingw in $(usev abi_x86_64 x86_64${mingw}) $(usev 
abi_x86_32

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

2023-08-10 Thread Ionen Wolkens

commit: 20894379a00ea6f482884d4159217ce3b1bc21a2
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Aug 10 09:08:22 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Aug 10 10:35:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20894379

app-emulation/wine-staging: skip -mno-avx with USE=custom-cflags

Don't recommend it (even hardly recommend -march=native!), but
some users like ricing their wine and would rather not see this
if it "works for me".

Others like filter-lto stay regardless given that just will not
build.

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/wine-staging-8.0.ebuild | 2 +-
 app-emulation/wine-staging/wine-staging-8.11-r1.ebuild | 2 +-
 app-emulation/wine-staging/wine-staging-8.12.ebuild| 2 +-
 app-emulation/wine-staging/wine-staging-8.13.ebuild| 2 +-
 app-emulation/wine-staging/wine-staging-.ebuild| 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app-emulation/wine-staging/wine-staging-8.0.ebuild 
b/app-emulation/wine-staging/wine-staging-8.0.ebuild
index c8412919b5a8..3c90e7786184 100644
--- a/app-emulation/wine-staging/wine-staging-8.0.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.0.ebuild
@@ -305,7 +305,7 @@ src_configure() {
# disabling is seen as safer, e.g. 
`WINEARCH=win32 winecfg`
# crashes with -march=skylake >=wine-8.10, 
similar issues with
# znver4: 
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273
-   append-cflags -mno-avx
+   use custom-cflags || append-cflags -mno-avx
CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
: "${CROSSLDFLAGS:=$(
filter-flags '-fuse-ld=*'

diff --git a/app-emulation/wine-staging/wine-staging-8.11-r1.ebuild 
b/app-emulation/wine-staging/wine-staging-8.11-r1.ebuild
index 940bb93e3836..1c501de4a39c 100644
--- a/app-emulation/wine-staging/wine-staging-8.11-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.11-r1.ebuild
@@ -318,7 +318,7 @@ src_configure() {
# disabling is seen as safer, e.g. 
`WINEARCH=win32 winecfg`
# crashes with -march=skylake >=wine-8.10, 
similar issues with
# znver4: 
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273
-   append-cflags -mno-avx
+   use custom-cflags || append-cflags -mno-avx
CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
: "${CROSSLDFLAGS:=$(
filter-flags '-fuse-ld=*'

diff --git a/app-emulation/wine-staging/wine-staging-8.12.ebuild 
b/app-emulation/wine-staging/wine-staging-8.12.ebuild
index 940bb93e3836..1c501de4a39c 100644
--- a/app-emulation/wine-staging/wine-staging-8.12.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.12.ebuild
@@ -318,7 +318,7 @@ src_configure() {
# disabling is seen as safer, e.g. 
`WINEARCH=win32 winecfg`
# crashes with -march=skylake >=wine-8.10, 
similar issues with
# znver4: 
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273
-   append-cflags -mno-avx
+   use custom-cflags || append-cflags -mno-avx
CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
: "${CROSSLDFLAGS:=$(
filter-flags '-fuse-ld=*'

diff --git a/app-emulation/wine-staging/wine-staging-8.13.ebuild 
b/app-emulation/wine-staging/wine-staging-8.13.ebuild
index d2092db2b690..7af88917ad54 100644
--- a/app-emulation/wine-staging/wine-staging-8.13.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.13.ebuild
@@ -316,7 +316,7 @@ src_configure() {
# disabling is seen as safer, e.g. 
`WINEARCH=win32 winecfg`
# crashes with -march=skylake >=wine-8.10, 
similar issues with
# znver4: 
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273
-   append-cflags -mno-avx
+   use custom-cflags || append-cflags -mno-avx
 
CC=${mingwcc} test-flags-CC ${CFLAGS:--O2}
)"

diff --git a/app-emulation/wine-staging/wine-staging-.ebuild 
b/app-emulation/wine-staging/wine-staging-.ebuild
index d2092db2b690..7af88917ad54 100644
--- a/app-emulation/wine-staging/wine-staging-.ebuild
+++ b/app-emulation/wine-staging/wine-staging-.ebuild
@@ -316,7 +316,7 @@ src_configure() {
# disabling is seen as safer, e.g. 
`WINEARCH=win32 winecfg`

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

2023-08-10 Thread Ionen Wolkens

commit: 217f59f6808df6c3fe788defeb802c80af5dec00
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Aug 10 10:09:19 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Aug 10 10:35:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=217f59f6

app-emulation/wine-staging: fix finding wine-mono on prefix

Technically needs a revbump, but given never got a bug report despite
being broken since forever I'll consider this low priority.

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/wine-staging-8.0.ebuild | 6 +-
 app-emulation/wine-staging/wine-staging-8.11-r1.ebuild | 5 -
 app-emulation/wine-staging/wine-staging-8.12.ebuild| 5 -
 app-emulation/wine-staging/wine-staging-8.13.ebuild| 5 -
 app-emulation/wine-staging/wine-staging-.ebuild| 5 -
 5 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/app-emulation/wine-staging/wine-staging-8.0.ebuild 
b/app-emulation/wine-staging/wine-staging-8.0.ebuild
index 3c90e7786184..d5832e55b076 100644
--- a/app-emulation/wine-staging/wine-staging-8.0.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.0.ebuild
@@ -4,7 +4,8 @@
 EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
-inherit autotools flag-o-matic multilib multilib-build toolchain-funcs wrapper
+inherit autotools flag-o-matic multilib multilib-build
+inherit prefix toolchain-funcs wrapper
 
 WINE_GECKO=2.47.3
 WINE_MONO=7.4.0
@@ -203,6 +204,9 @@ src_prepare() {
# ensure .desktop calls this variant + slot
sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || die
 
+   # datadir is not where wine-mono is installed, so prefixy alternate 
paths
+   hprefixify -w /get_mono_path/ dlls/mscoree/metahost.c
+
# always update for patches (including user's wrt #432348)
eautoreconf
tools/make_requests || die # perl

diff --git a/app-emulation/wine-staging/wine-staging-8.11-r1.ebuild 
b/app-emulation/wine-staging/wine-staging-8.11-r1.ebuild
index 1c501de4a39c..4c8102d89813 100644
--- a/app-emulation/wine-staging/wine-staging-8.11-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.11-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 MULTILIB_COMPAT=( abi_x86_{32,64} )
 PYTHON_COMPAT=( python3_{10..12} )
 inherit autotools edo flag-o-matic multilib multilib-build
-inherit python-any-r1 toolchain-funcs wrapper
+inherit prefix python-any-r1 toolchain-funcs wrapper
 
 WINE_GECKO=2.47.4
 WINE_MONO=8.0.0
@@ -217,6 +217,9 @@ src_prepare() {
# ensure .desktop calls this variant + slot
sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || die
 
+   # datadir is not where wine-mono is installed, so prefixy alternate 
paths
+   hprefixify -w /get_mono_path/ dlls/mscoree/metahost.c
+
# always update for patches (including user's wrt #432348)
eautoreconf
tools/make_requests || die # perl

diff --git a/app-emulation/wine-staging/wine-staging-8.12.ebuild 
b/app-emulation/wine-staging/wine-staging-8.12.ebuild
index 1c501de4a39c..4c8102d89813 100644
--- a/app-emulation/wine-staging/wine-staging-8.12.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.12.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 MULTILIB_COMPAT=( abi_x86_{32,64} )
 PYTHON_COMPAT=( python3_{10..12} )
 inherit autotools edo flag-o-matic multilib multilib-build
-inherit python-any-r1 toolchain-funcs wrapper
+inherit prefix python-any-r1 toolchain-funcs wrapper
 
 WINE_GECKO=2.47.4
 WINE_MONO=8.0.0
@@ -217,6 +217,9 @@ src_prepare() {
# ensure .desktop calls this variant + slot
sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || die
 
+   # datadir is not where wine-mono is installed, so prefixy alternate 
paths
+   hprefixify -w /get_mono_path/ dlls/mscoree/metahost.c
+
# always update for patches (including user's wrt #432348)
eautoreconf
tools/make_requests || die # perl

diff --git a/app-emulation/wine-staging/wine-staging-8.13.ebuild 
b/app-emulation/wine-staging/wine-staging-8.13.ebuild
index 7af88917ad54..6edbd663cb04 100644
--- a/app-emulation/wine-staging/wine-staging-8.13.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.13.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 MULTILIB_COMPAT=( abi_x86_{32,64} )
 PYTHON_COMPAT=( python3_{10..12} )
 inherit autotools edo flag-o-matic multilib multilib-build
-inherit python-any-r1 toolchain-funcs wrapper
+inherit prefix python-any-r1 toolchain-funcs wrapper
 
 WINE_GECKO=2.47.4
 WINE_MONO=8.0.0
@@ -224,6 +224,9 @@ src_prepare() {
# ensure .desktop calls this variant + slot
sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || die
 
+   # datadir is not where wine-mono is installed, so prefixy alternate 
paths
+   hprefixify -w /get_mono_path/ dlls/mscoree/metahost.c
+
# always update for patches (including user's wrt #432348)
eautoreconf
tools/make_requests || die # perl

diff --git a/app-emulation/wine-staging/wine-staging-.ebuild

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

2023-08-05 Thread Ionen Wolkens

commit: ffd27635124fb7a42f75121f8ba005dfb0238ce2
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sun Aug  6 01:06:53 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sun Aug  6 04:27:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffd27635

app-emulation/wine-staging: drop 8.9.1, 8.10-r1

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/Manifest|   4 -
 .../wine-staging/wine-staging-8.10-r1.ebuild   | 384 -
 .../wine-staging/wine-staging-8.9.1.ebuild | 382 
 3 files changed, 770 deletions(-)

diff --git a/app-emulation/wine-staging/Manifest 
b/app-emulation/wine-staging/Manifest
index dd492b9e09bd..67b05de391cb 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,12 +1,8 @@
 DIST wine-8.0.tar.xz 29054044 BLAKE2B 
baf8f96b665119c9f38a148a2472dbe8f6ca8d4641d9d09d48cb72cb4de2585c274b8b7981c2fa622ead6da2f087c57652e9b48edc8a17c0cfd6be9a36732f02
 SHA512 
53ba813b260a65a271ec575822725b97631f60038fb026dcc0fe66862711eedcc29a8feb29ff54ae4f64458f85c290d8f3838eff5e4c77a5420a7d2b951fef77
-DIST wine-8.10.tar.xz 29225368 BLAKE2B 
78058ccb707ddd63052ab3114e27435f94957b7badbe3001f8123fd536f5b937006b26e2133390ea5d995e9cb8c54940c907dacf910160c085e2bf3f29772caf
 SHA512 
5f141fb63a598482f512ebefef83500c2fa17a5dea87cb25e600e5167820a5990e12aeaec4a18c1467d64f7c122bf54705aa6fa6a2e6b2b4a463fe182f9b0e6e
 DIST wine-8.11.tar.xz 29236492 BLAKE2B 
db97b9abde6e1f4c854b449d27bdbafbc91bd75b835d84da401777c6ae2f4f623f2130f470d2e9a3aaf7e737f75d143a07191d38b409c06596373bece3df23c5
 SHA512 
f3e37f51f0a13aacbd41b017fc3d35e197614b03c00f5b9959c0fabc4e89975b5c3f411b38329e45ce6f9d2a2d82952b95e0907fbe2d6ae35cc4bec293825769
 DIST wine-8.12.tar.xz 29276732 BLAKE2B 
c1bf0d32eaf17f06b47dd7ffc495db4874f72ffec7cfca9edd9b2b9def8ab16db2583349950c3af447d85d476aa013914554f990d5f42d5bc8243b9effbaf869
 SHA512 
6b9eab7ca1ed5a13202b1250d8d95f6bd8ee5176f0c39b5358aedaf28f7f23543f4a73bf0782c3b4e50936813fc2a459582b5d294569c976ace784fbd9e0af1b
 DIST wine-8.13.tar.xz 29379824 BLAKE2B 
fa07edba8e45ef17813e63f793ca18cd05fd421b803d416421ec0fb7aeb4223ae44376a7e75a195e91c30259f27b48c3ed4ab0b613cbb9464b824f51e85ea240
 SHA512 
952c670635f91879cf6908343a04c0f41ae54e213123242e24fc282f9705fbe3b800dc1de454b6cfb1ebb89431b0e6eb3df3b094c1d9f4e69835d0f1b8f4fcb5
-DIST wine-8.9.tar.xz 29198080 BLAKE2B 
dfad284f554c164ac8f95d7c36d8b999217c6375f7720ed05e512e3f16cbc5a08325dad4e56dd59a17b27e53ab3a8331d54dd17b24e459b34d9e408ba93a52f3
 SHA512 
4de85654d2d5c9d48fa2a748eb9bee4477f0ba7fbd2c5dd40ea69662d8f6dfbb6432d1ec9109233d24608dc9554bad525c1e1ecdc86a5d00d133772810b12261
 DIST wine-staging-8.0.tar.gz 9529620 BLAKE2B 
c9540195ea885d9f1e980232b0af471e92c61eb079cae35fdb3af5c13d4660b3466f751772440e38f15874082db296d16d1f1d68827a505b2dd949617eda0203
 SHA512 
76a729d7ced1ff634ddb455ddfaa66ca103b652f43cd152b57ada7431bb5fbb74f5e92bf2f4f329b6df6f5908130afad84e609cbce6df645d6cf8131e9b949f9
-DIST wine-staging-8.10.tar.gz 9703684 BLAKE2B 
1af11df98cc811741148de9d62a37a352c305d05bdb29b3df5e6a9a2a6597a9cc3ed63109523188cf09f01a97873d077760b1761d3251ac2657c77c92c975373
 SHA512 
89282f9edeb47a904f11796cfeda6853bc492701b6ce1a65211ffebf25c5539516c49b687e0ea024a99d3fc6251ed348a14f644babeb64b6dffdd6032e493859
 DIST wine-staging-8.11.tar.gz 9715880 BLAKE2B 
2795389381d6e52215d8b1b2c437a47beaf61e9b36e78f99c45b3fcd79d554f2d4abafcbf34c366dcb7ce4fc14d66b8751466c30648ae0d7c451aaa345c30c5f
 SHA512 
fb7a5f575c092e84afa78868e3b15fa33d67205a5e20deae61a60613714df784b18d54cd32167355ae38543f047f4304bfbc7f2ba2b3f6050c9f738812a15154
 DIST wine-staging-8.12.tar.gz 9764049 BLAKE2B 
739c6dfdcef6e744fc7f6dcee24abdedd5f96b7ad688bdd5cc667627cec0b21d658354369ecc0de71a4ba682636e369105cef3de97dbf095f1ee1025d9a12fc2
 SHA512 
11364b2367e25706b98c168710288b796e9dea1e3400efc0d010ea8827cb8c4187385f53aebd1fda46611902f6619282ea97ce9d7c20fe18aa48c14f15c99d14
 DIST wine-staging-8.13.tar.gz 9785058 BLAKE2B 
6c797cd50276009cc23619447a70ac972b5c7ad7684d7bd99f20cd7607b88f911eb89f59df98680ef8786495f2f8ff2910c8bbd930d811bb31147aa230105ce1
 SHA512 
b2104b0893ba27ee7f4f5495f7dee990962ff668786fd95e11af6d3975b7d00bc4ecb2572f280d27fbb6d1672745e0acbdb392ec7b3fd5b330a846783c23e12d
-DIST wine-staging-8.9.1.tar.gz 9700492 BLAKE2B 
4382cc7226e734f8f592da80d2fba485052f39b829f61a51c523098a185a47a451c7e91badaa792de9ddf4fd80c16fd5d6091cc2d962ecaf455d6bc3d0010efc
 SHA512 
abb25718f965241c1404430c1dffa398c2ffd180328e5456fc58a070f90f818a10285ad5515d74727a43f6de9f6c19129acd6ed6ba866d7b240886bbcabcd990

diff --git a/app-emulation/wine-staging/wine-staging-8.10-r1.ebuild 
b/app-emulation/wine-staging/wine-staging-8.10-r1.ebuild
deleted file mode 100644
index e42a0756d4a3..
--- a/app-emulation/wine-staging/wine-staging-8.10-r1.ebuild
+++ /dev/null
@@ -1,384 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-

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

2023-07-23 Thread Ionen Wolkens

commit: 099596125e913f3f124b9575349b058042546a2c
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sun Jul 23 16:19:17 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sun Jul 23 16:57:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09959612

app-emulation/wine-staging: add 8.13

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/Manifest|   2 +
 .../wine-staging/wine-staging-8.13.ebuild  | 387 +
 2 files changed, 389 insertions(+)

diff --git a/app-emulation/wine-staging/Manifest 
b/app-emulation/wine-staging/Manifest
index fc5c88b41388..dd492b9e09bd 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -2,9 +2,11 @@ DIST wine-8.0.tar.xz 29054044 BLAKE2B 
baf8f96b665119c9f38a148a2472dbe8f6ca8d4641
 DIST wine-8.10.tar.xz 29225368 BLAKE2B 
78058ccb707ddd63052ab3114e27435f94957b7badbe3001f8123fd536f5b937006b26e2133390ea5d995e9cb8c54940c907dacf910160c085e2bf3f29772caf
 SHA512 
5f141fb63a598482f512ebefef83500c2fa17a5dea87cb25e600e5167820a5990e12aeaec4a18c1467d64f7c122bf54705aa6fa6a2e6b2b4a463fe182f9b0e6e
 DIST wine-8.11.tar.xz 29236492 BLAKE2B 
db97b9abde6e1f4c854b449d27bdbafbc91bd75b835d84da401777c6ae2f4f623f2130f470d2e9a3aaf7e737f75d143a07191d38b409c06596373bece3df23c5
 SHA512 
f3e37f51f0a13aacbd41b017fc3d35e197614b03c00f5b9959c0fabc4e89975b5c3f411b38329e45ce6f9d2a2d82952b95e0907fbe2d6ae35cc4bec293825769
 DIST wine-8.12.tar.xz 29276732 BLAKE2B 
c1bf0d32eaf17f06b47dd7ffc495db4874f72ffec7cfca9edd9b2b9def8ab16db2583349950c3af447d85d476aa013914554f990d5f42d5bc8243b9effbaf869
 SHA512 
6b9eab7ca1ed5a13202b1250d8d95f6bd8ee5176f0c39b5358aedaf28f7f23543f4a73bf0782c3b4e50936813fc2a459582b5d294569c976ace784fbd9e0af1b
+DIST wine-8.13.tar.xz 29379824 BLAKE2B 
fa07edba8e45ef17813e63f793ca18cd05fd421b803d416421ec0fb7aeb4223ae44376a7e75a195e91c30259f27b48c3ed4ab0b613cbb9464b824f51e85ea240
 SHA512 
952c670635f91879cf6908343a04c0f41ae54e213123242e24fc282f9705fbe3b800dc1de454b6cfb1ebb89431b0e6eb3df3b094c1d9f4e69835d0f1b8f4fcb5
 DIST wine-8.9.tar.xz 29198080 BLAKE2B 
dfad284f554c164ac8f95d7c36d8b999217c6375f7720ed05e512e3f16cbc5a08325dad4e56dd59a17b27e53ab3a8331d54dd17b24e459b34d9e408ba93a52f3
 SHA512 
4de85654d2d5c9d48fa2a748eb9bee4477f0ba7fbd2c5dd40ea69662d8f6dfbb6432d1ec9109233d24608dc9554bad525c1e1ecdc86a5d00d133772810b12261
 DIST wine-staging-8.0.tar.gz 9529620 BLAKE2B 
c9540195ea885d9f1e980232b0af471e92c61eb079cae35fdb3af5c13d4660b3466f751772440e38f15874082db296d16d1f1d68827a505b2dd949617eda0203
 SHA512 
76a729d7ced1ff634ddb455ddfaa66ca103b652f43cd152b57ada7431bb5fbb74f5e92bf2f4f329b6df6f5908130afad84e609cbce6df645d6cf8131e9b949f9
 DIST wine-staging-8.10.tar.gz 9703684 BLAKE2B 
1af11df98cc811741148de9d62a37a352c305d05bdb29b3df5e6a9a2a6597a9cc3ed63109523188cf09f01a97873d077760b1761d3251ac2657c77c92c975373
 SHA512 
89282f9edeb47a904f11796cfeda6853bc492701b6ce1a65211ffebf25c5539516c49b687e0ea024a99d3fc6251ed348a14f644babeb64b6dffdd6032e493859
 DIST wine-staging-8.11.tar.gz 9715880 BLAKE2B 
2795389381d6e52215d8b1b2c437a47beaf61e9b36e78f99c45b3fcd79d554f2d4abafcbf34c366dcb7ce4fc14d66b8751466c30648ae0d7c451aaa345c30c5f
 SHA512 
fb7a5f575c092e84afa78868e3b15fa33d67205a5e20deae61a60613714df784b18d54cd32167355ae38543f047f4304bfbc7f2ba2b3f6050c9f738812a15154
 DIST wine-staging-8.12.tar.gz 9764049 BLAKE2B 
739c6dfdcef6e744fc7f6dcee24abdedd5f96b7ad688bdd5cc667627cec0b21d658354369ecc0de71a4ba682636e369105cef3de97dbf095f1ee1025d9a12fc2
 SHA512 
11364b2367e25706b98c168710288b796e9dea1e3400efc0d010ea8827cb8c4187385f53aebd1fda46611902f6619282ea97ce9d7c20fe18aa48c14f15c99d14
+DIST wine-staging-8.13.tar.gz 9785058 BLAKE2B 
6c797cd50276009cc23619447a70ac972b5c7ad7684d7bd99f20cd7607b88f911eb89f59df98680ef8786495f2f8ff2910c8bbd930d811bb31147aa230105ce1
 SHA512 
b2104b0893ba27ee7f4f5495f7dee990962ff668786fd95e11af6d3975b7d00bc4ecb2572f280d27fbb6d1672745e0acbdb392ec7b3fd5b330a846783c23e12d
 DIST wine-staging-8.9.1.tar.gz 9700492 BLAKE2B 
4382cc7226e734f8f592da80d2fba485052f39b829f61a51c523098a185a47a451c7e91badaa792de9ddf4fd80c16fd5d6091cc2d962ecaf455d6bc3d0010efc
 SHA512 
abb25718f965241c1404430c1dffa398c2ffd180328e5456fc58a070f90f818a10285ad5515d74727a43f6de9f6c19129acd6ed6ba866d7b240886bbcabcd990

diff --git a/app-emulation/wine-staging/wine-staging-8.13.ebuild 
b/app-emulation/wine-staging/wine-staging-8.13.ebuild
new file mode 100644
index ..940bb93e3836
--- /dev/null
+++ b/app-emulation/wine-staging/wine-staging-8.13.ebuild
@@ -0,0 +1,387 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+PYTHON_COMPAT=( python3_{10..12} )
+inherit autotools edo flag-o-matic multilib multilib-build
+inherit python-any-r1 toolchain-funcs wrapper
+
+WINE_GECKO=2.47.4
+WINE_MONO=8.0.0
+WINE_P=wine-$(ver_cut 1-2)
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+

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

2023-07-09 Thread Ionen Wolkens

commit: be0e0c5c9c74d3d32c2d3d2d2d8b3da33c85d066
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sun Jul  9 05:23:04 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sun Jul  9 06:39:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be0e0c5c

app-emulation/wine-staging: drop 8.7, 8.8

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/Manifest|   4 -
 app-emulation/wine-staging/wine-staging-8.7.ebuild | 381 -
 app-emulation/wine-staging/wine-staging-8.8.ebuild | 381 -
 3 files changed, 766 deletions(-)

diff --git a/app-emulation/wine-staging/Manifest 
b/app-emulation/wine-staging/Manifest
index ab7f513d5e36..8fa0149c7e6e 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,12 +1,8 @@
 DIST wine-8.0.tar.xz 29054044 BLAKE2B 
baf8f96b665119c9f38a148a2472dbe8f6ca8d4641d9d09d48cb72cb4de2585c274b8b7981c2fa622ead6da2f087c57652e9b48edc8a17c0cfd6be9a36732f02
 SHA512 
53ba813b260a65a271ec575822725b97631f60038fb026dcc0fe66862711eedcc29a8feb29ff54ae4f64458f85c290d8f3838eff5e4c77a5420a7d2b951fef77
 DIST wine-8.10.tar.xz 29225368 BLAKE2B 
78058ccb707ddd63052ab3114e27435f94957b7badbe3001f8123fd536f5b937006b26e2133390ea5d995e9cb8c54940c907dacf910160c085e2bf3f29772caf
 SHA512 
5f141fb63a598482f512ebefef83500c2fa17a5dea87cb25e600e5167820a5990e12aeaec4a18c1467d64f7c122bf54705aa6fa6a2e6b2b4a463fe182f9b0e6e
 DIST wine-8.11.tar.xz 29236492 BLAKE2B 
db97b9abde6e1f4c854b449d27bdbafbc91bd75b835d84da401777c6ae2f4f623f2130f470d2e9a3aaf7e737f75d143a07191d38b409c06596373bece3df23c5
 SHA512 
f3e37f51f0a13aacbd41b017fc3d35e197614b03c00f5b9959c0fabc4e89975b5c3f411b38329e45ce6f9d2a2d82952b95e0907fbe2d6ae35cc4bec293825769
-DIST wine-8.7.tar.xz 29158096 BLAKE2B 
73bd0b5a6eec8a2e37301d8b0f8e9be1ad757f07df3471b0cea17aac6716d456eea1d36fa22bd2451e6cc7662b2b36e4ca628d65216c60d5950f5b439fd2052c
 SHA512 
0a7fe9ad86cf931527c2149207473bf4671d1098af7c21f1b740dfaa84486a8e235fea99b1cad035ff9c3eb20810caab53d51051d63efe626514b79309904d93
-DIST wine-8.8.tar.xz 29181484 BLAKE2B 
43a79fb34f86382cbd8dd3b3aa16f104d02a8e86fd8d47afb157865b707b71674199c4ae748f8b3e3de4ae1e63d70a18fca0d09d7716c178a4c9c21d21c092ac
 SHA512 
e56427680c940970153b1996841c70d540a0a2572ab980c4d77cf7225efd7c26c91ef9b0548b73d51e78afa55a7e324d5d93f6211f5eb5d5698ab9ff421e26de
 DIST wine-8.9.tar.xz 29198080 BLAKE2B 
dfad284f554c164ac8f95d7c36d8b999217c6375f7720ed05e512e3f16cbc5a08325dad4e56dd59a17b27e53ab3a8331d54dd17b24e459b34d9e408ba93a52f3
 SHA512 
4de85654d2d5c9d48fa2a748eb9bee4477f0ba7fbd2c5dd40ea69662d8f6dfbb6432d1ec9109233d24608dc9554bad525c1e1ecdc86a5d00d133772810b12261
 DIST wine-staging-8.0.tar.gz 9529620 BLAKE2B 
c9540195ea885d9f1e980232b0af471e92c61eb079cae35fdb3af5c13d4660b3466f751772440e38f15874082db296d16d1f1d68827a505b2dd949617eda0203
 SHA512 
76a729d7ced1ff634ddb455ddfaa66ca103b652f43cd152b57ada7431bb5fbb74f5e92bf2f4f329b6df6f5908130afad84e609cbce6df645d6cf8131e9b949f9
 DIST wine-staging-8.10.tar.gz 9703684 BLAKE2B 
1af11df98cc811741148de9d62a37a352c305d05bdb29b3df5e6a9a2a6597a9cc3ed63109523188cf09f01a97873d077760b1761d3251ac2657c77c92c975373
 SHA512 
89282f9edeb47a904f11796cfeda6853bc492701b6ce1a65211ffebf25c5539516c49b687e0ea024a99d3fc6251ed348a14f644babeb64b6dffdd6032e493859
 DIST wine-staging-8.11.tar.gz 9715880 BLAKE2B 
2795389381d6e52215d8b1b2c437a47beaf61e9b36e78f99c45b3fcd79d554f2d4abafcbf34c366dcb7ce4fc14d66b8751466c30648ae0d7c451aaa345c30c5f
 SHA512 
fb7a5f575c092e84afa78868e3b15fa33d67205a5e20deae61a60613714df784b18d54cd32167355ae38543f047f4304bfbc7f2ba2b3f6050c9f738812a15154
-DIST wine-staging-8.7.tar.gz 9524736 BLAKE2B 
4ae32c77024c41fe660090889958e0016dc6e0d189c1cc938e305cc72297a924ea8209244374baa651ded3bdf62352f9b41e15bb163f200b9b0b3f18ccac2ea5
 SHA512 
42a32b3a5420f358085c510250f3204bc5eb7430c447e7bb5b25046245cf3c54f02684226daffedb65dce093cfa513424523e55d4d3a5b416fdff6e4e1e4a161
-DIST wine-staging-8.8.tar.gz 9509284 BLAKE2B 
f8a25b9a3a52b8bfc98d8eea6c22f9648d8e6040d12dd4a8a2dd13199ced954292f141c4b4ae4fc7748d5fa7f6b0fa1cdd535a27b1495150bdee5f50b940ab8d
 SHA512 
7178ab98ca77a2892f9c827d1af51c9b98fe8c9559f6708fc63f73d3ebed96bd1a158179c5eed83d4c89bc57f0120e9cafddb1e0dbb77587054ae29a60eddaf5
 DIST wine-staging-8.9.1.tar.gz 9700492 BLAKE2B 
4382cc7226e734f8f592da80d2fba485052f39b829f61a51c523098a185a47a451c7e91badaa792de9ddf4fd80c16fd5d6091cc2d962ecaf455d6bc3d0010efc
 SHA512 
abb25718f965241c1404430c1dffa398c2ffd180328e5456fc58a070f90f818a10285ad5515d74727a43f6de9f6c19129acd6ed6ba866d7b240886bbcabcd990

diff --git a/app-emulation/wine-staging/wine-staging-8.7.ebuild 
b/app-emulation/wine-staging/wine-staging-8.7.ebuild
deleted file mode 100644
index 3d3ed519862c..
--- a/app-emulation/wine-staging/wine-staging-8.7.ebuild
+++ /dev/null
@@ -1,381 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-

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

2023-07-09 Thread Ionen Wolkens

commit: 9a00e1f8f7f7a2ce4c53fd10733b723343127c70
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sun Jul  9 05:27:21 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sun Jul  9 06:39:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a00e1f8

app-emulation/wine-staging: add 8.12

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/Manifest|   2 +
 .../wine-staging/wine-staging-8.12.ebuild  | 387 +
 2 files changed, 389 insertions(+)

diff --git a/app-emulation/wine-staging/Manifest 
b/app-emulation/wine-staging/Manifest
index 8fa0149c7e6e..fc5c88b41388 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,8 +1,10 @@
 DIST wine-8.0.tar.xz 29054044 BLAKE2B 
baf8f96b665119c9f38a148a2472dbe8f6ca8d4641d9d09d48cb72cb4de2585c274b8b7981c2fa622ead6da2f087c57652e9b48edc8a17c0cfd6be9a36732f02
 SHA512 
53ba813b260a65a271ec575822725b97631f60038fb026dcc0fe66862711eedcc29a8feb29ff54ae4f64458f85c290d8f3838eff5e4c77a5420a7d2b951fef77
 DIST wine-8.10.tar.xz 29225368 BLAKE2B 
78058ccb707ddd63052ab3114e27435f94957b7badbe3001f8123fd536f5b937006b26e2133390ea5d995e9cb8c54940c907dacf910160c085e2bf3f29772caf
 SHA512 
5f141fb63a598482f512ebefef83500c2fa17a5dea87cb25e600e5167820a5990e12aeaec4a18c1467d64f7c122bf54705aa6fa6a2e6b2b4a463fe182f9b0e6e
 DIST wine-8.11.tar.xz 29236492 BLAKE2B 
db97b9abde6e1f4c854b449d27bdbafbc91bd75b835d84da401777c6ae2f4f623f2130f470d2e9a3aaf7e737f75d143a07191d38b409c06596373bece3df23c5
 SHA512 
f3e37f51f0a13aacbd41b017fc3d35e197614b03c00f5b9959c0fabc4e89975b5c3f411b38329e45ce6f9d2a2d82952b95e0907fbe2d6ae35cc4bec293825769
+DIST wine-8.12.tar.xz 29276732 BLAKE2B 
c1bf0d32eaf17f06b47dd7ffc495db4874f72ffec7cfca9edd9b2b9def8ab16db2583349950c3af447d85d476aa013914554f990d5f42d5bc8243b9effbaf869
 SHA512 
6b9eab7ca1ed5a13202b1250d8d95f6bd8ee5176f0c39b5358aedaf28f7f23543f4a73bf0782c3b4e50936813fc2a459582b5d294569c976ace784fbd9e0af1b
 DIST wine-8.9.tar.xz 29198080 BLAKE2B 
dfad284f554c164ac8f95d7c36d8b999217c6375f7720ed05e512e3f16cbc5a08325dad4e56dd59a17b27e53ab3a8331d54dd17b24e459b34d9e408ba93a52f3
 SHA512 
4de85654d2d5c9d48fa2a748eb9bee4477f0ba7fbd2c5dd40ea69662d8f6dfbb6432d1ec9109233d24608dc9554bad525c1e1ecdc86a5d00d133772810b12261
 DIST wine-staging-8.0.tar.gz 9529620 BLAKE2B 
c9540195ea885d9f1e980232b0af471e92c61eb079cae35fdb3af5c13d4660b3466f751772440e38f15874082db296d16d1f1d68827a505b2dd949617eda0203
 SHA512 
76a729d7ced1ff634ddb455ddfaa66ca103b652f43cd152b57ada7431bb5fbb74f5e92bf2f4f329b6df6f5908130afad84e609cbce6df645d6cf8131e9b949f9
 DIST wine-staging-8.10.tar.gz 9703684 BLAKE2B 
1af11df98cc811741148de9d62a37a352c305d05bdb29b3df5e6a9a2a6597a9cc3ed63109523188cf09f01a97873d077760b1761d3251ac2657c77c92c975373
 SHA512 
89282f9edeb47a904f11796cfeda6853bc492701b6ce1a65211ffebf25c5539516c49b687e0ea024a99d3fc6251ed348a14f644babeb64b6dffdd6032e493859
 DIST wine-staging-8.11.tar.gz 9715880 BLAKE2B 
2795389381d6e52215d8b1b2c437a47beaf61e9b36e78f99c45b3fcd79d554f2d4abafcbf34c366dcb7ce4fc14d66b8751466c30648ae0d7c451aaa345c30c5f
 SHA512 
fb7a5f575c092e84afa78868e3b15fa33d67205a5e20deae61a60613714df784b18d54cd32167355ae38543f047f4304bfbc7f2ba2b3f6050c9f738812a15154
+DIST wine-staging-8.12.tar.gz 9764049 BLAKE2B 
739c6dfdcef6e744fc7f6dcee24abdedd5f96b7ad688bdd5cc667627cec0b21d658354369ecc0de71a4ba682636e369105cef3de97dbf095f1ee1025d9a12fc2
 SHA512 
11364b2367e25706b98c168710288b796e9dea1e3400efc0d010ea8827cb8c4187385f53aebd1fda46611902f6619282ea97ce9d7c20fe18aa48c14f15c99d14
 DIST wine-staging-8.9.1.tar.gz 9700492 BLAKE2B 
4382cc7226e734f8f592da80d2fba485052f39b829f61a51c523098a185a47a451c7e91badaa792de9ddf4fd80c16fd5d6091cc2d962ecaf455d6bc3d0010efc
 SHA512 
abb25718f965241c1404430c1dffa398c2ffd180328e5456fc58a070f90f818a10285ad5515d74727a43f6de9f6c19129acd6ed6ba866d7b240886bbcabcd990

diff --git a/app-emulation/wine-staging/wine-staging-8.12.ebuild 
b/app-emulation/wine-staging/wine-staging-8.12.ebuild
new file mode 100644
index ..940bb93e3836
--- /dev/null
+++ b/app-emulation/wine-staging/wine-staging-8.12.ebuild
@@ -0,0 +1,387 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+PYTHON_COMPAT=( python3_{10..12} )
+inherit autotools edo flag-o-matic multilib multilib-build
+inherit python-any-r1 toolchain-funcs wrapper
+
+WINE_GECKO=2.47.4
+WINE_MONO=8.0.0
+WINE_P=wine-$(ver_cut 1-2)
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine-staging.git;
+   WINE_EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git;
+else
+   (( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 
1).0
+   SRC_URI="
+   https://dl.winehq.org/wine/source/${WINE_SDIR}/${WINE_P}.tar.xz
+   
https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz ->

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

2023-06-26 Thread Ionen Wolkens

commit: 75781d879c5ba96c542e4253a848fc817bf28205
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Jun 26 09:38:55 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Jun 26 10:10:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75781d87

app-emulation/wine-staging: pass -mno-avx for mingw cross

AVX issues with mingw-gcc aren't exactly new, e.g.
https://bugs.winehq.org/show_bug.cgi?id=45289
Been known to cause issues with dxvk too, albeit unsure
if that's still relevant as issues are scattered/lost.

Newly, >=wine-8.10 is likely to crash doing anything
at all 32bit if used -march=native (w/ avx) and 32bit
(e.g. `WINEARCH=win32 winecfg`).

Adding this to every packages using mingw as a precaution,
not believed there is much to gain from keeping AVX given
the fragility here (note only revbumping wine-8.10 and 8.11
as they are affected the worst). May revisit eventually with
a newer GCC.

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/wine-staging-8.0.ebuild   | 5 +
 .../{wine-staging-8.10.ebuild => wine-staging-8.10-r1.ebuild}| 5 +
 .../{wine-staging-8.11.ebuild => wine-staging-8.11-r1.ebuild}| 5 +
 app-emulation/wine-staging/wine-staging-8.7.ebuild   | 5 +
 app-emulation/wine-staging/wine-staging-8.8.ebuild   | 5 +
 app-emulation/wine-staging/wine-staging-8.9.1.ebuild | 5 +
 app-emulation/wine-staging/wine-staging-.ebuild  | 5 +
 7 files changed, 35 insertions(+)

diff --git a/app-emulation/wine-staging/wine-staging-8.0.ebuild 
b/app-emulation/wine-staging/wine-staging-8.0.ebuild
index 06a39f07e0f3..c8412919b5a8 100644
--- a/app-emulation/wine-staging/wine-staging-8.0.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.0.ebuild
@@ -301,6 +301,11 @@ src_configure() {
append-cflags '-fno-strict-aliasing'
filter-flags '-fstack-protector*' #870136
filter-flags '-mfunction-return=thunk*' #878849
+   # -mavx with mingw-gcc has a history of obscure 
issues and
+   # disabling is seen as safer, e.g. 
`WINEARCH=win32 winecfg`
+   # crashes with -march=skylake >=wine-8.10, 
similar issues with
+   # znver4: 
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273
+   append-cflags -mno-avx
CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
: "${CROSSLDFLAGS:=$(
filter-flags '-fuse-ld=*'

diff --git a/app-emulation/wine-staging/wine-staging-8.10.ebuild 
b/app-emulation/wine-staging/wine-staging-8.10-r1.ebuild
similarity index 97%
rename from app-emulation/wine-staging/wine-staging-8.10.ebuild
rename to app-emulation/wine-staging/wine-staging-8.10-r1.ebuild
index 7096d33eb0ec..e42a0756d4a3 100644
--- a/app-emulation/wine-staging/wine-staging-8.10.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.10-r1.ebuild
@@ -311,6 +311,11 @@ src_configure() {
: "${CROSSCFLAGS:=$(
filter-flags '-fstack-protector*' #870136
filter-flags '-mfunction-return=thunk*' #878849
+   # -mavx with mingw-gcc has a history of obscure 
issues and
+   # disabling is seen as safer, e.g. 
`WINEARCH=win32 winecfg`
+   # crashes with -march=skylake >=wine-8.10, 
similar issues with
+   # znver4: 
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273
+   append-cflags -mno-avx
CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
: "${CROSSLDFLAGS:=$(
filter-flags '-fuse-ld=*'

diff --git a/app-emulation/wine-staging/wine-staging-8.11.ebuild 
b/app-emulation/wine-staging/wine-staging-8.11-r1.ebuild
similarity index 97%
rename from app-emulation/wine-staging/wine-staging-8.11.ebuild
rename to app-emulation/wine-staging/wine-staging-8.11-r1.ebuild
index a11cbb764ad0..940bb93e3836 100644
--- a/app-emulation/wine-staging/wine-staging-8.11.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.11-r1.ebuild
@@ -314,6 +314,11 @@ src_configure() {
: "${CROSSCFLAGS:=$(
filter-flags '-fstack-protector*' #870136
filter-flags '-mfunction-return=thunk*' #878849
+   # -mavx with mingw-gcc has a history of obscure 
issues and
+   # disabling is seen as safer, e.g. 
`WINEARCH=win32 winecfg`
+   # crashes with -march=skylake >=wine-8.10, 
similar issues with
+

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

2023-06-25 Thread Ionen Wolkens

commit: 29d09cd5e8543ecdf666e926c8d9282806b15be6
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sun Jun 25 04:16:11 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sun Jun 25 06:02:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29d09cd5

app-emulation/wine-staging: add 8.11

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/Manifest|   2 +
 .../wine-staging/wine-staging-8.11.ebuild  | 382 +
 2 files changed, 384 insertions(+)

diff --git a/app-emulation/wine-staging/Manifest 
b/app-emulation/wine-staging/Manifest
index 09b22a9204da..ab7f513d5e36 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,10 +1,12 @@
 DIST wine-8.0.tar.xz 29054044 BLAKE2B 
baf8f96b665119c9f38a148a2472dbe8f6ca8d4641d9d09d48cb72cb4de2585c274b8b7981c2fa622ead6da2f087c57652e9b48edc8a17c0cfd6be9a36732f02
 SHA512 
53ba813b260a65a271ec575822725b97631f60038fb026dcc0fe66862711eedcc29a8feb29ff54ae4f64458f85c290d8f3838eff5e4c77a5420a7d2b951fef77
 DIST wine-8.10.tar.xz 29225368 BLAKE2B 
78058ccb707ddd63052ab3114e27435f94957b7badbe3001f8123fd536f5b937006b26e2133390ea5d995e9cb8c54940c907dacf910160c085e2bf3f29772caf
 SHA512 
5f141fb63a598482f512ebefef83500c2fa17a5dea87cb25e600e5167820a5990e12aeaec4a18c1467d64f7c122bf54705aa6fa6a2e6b2b4a463fe182f9b0e6e
+DIST wine-8.11.tar.xz 29236492 BLAKE2B 
db97b9abde6e1f4c854b449d27bdbafbc91bd75b835d84da401777c6ae2f4f623f2130f470d2e9a3aaf7e737f75d143a07191d38b409c06596373bece3df23c5
 SHA512 
f3e37f51f0a13aacbd41b017fc3d35e197614b03c00f5b9959c0fabc4e89975b5c3f411b38329e45ce6f9d2a2d82952b95e0907fbe2d6ae35cc4bec293825769
 DIST wine-8.7.tar.xz 29158096 BLAKE2B 
73bd0b5a6eec8a2e37301d8b0f8e9be1ad757f07df3471b0cea17aac6716d456eea1d36fa22bd2451e6cc7662b2b36e4ca628d65216c60d5950f5b439fd2052c
 SHA512 
0a7fe9ad86cf931527c2149207473bf4671d1098af7c21f1b740dfaa84486a8e235fea99b1cad035ff9c3eb20810caab53d51051d63efe626514b79309904d93
 DIST wine-8.8.tar.xz 29181484 BLAKE2B 
43a79fb34f86382cbd8dd3b3aa16f104d02a8e86fd8d47afb157865b707b71674199c4ae748f8b3e3de4ae1e63d70a18fca0d09d7716c178a4c9c21d21c092ac
 SHA512 
e56427680c940970153b1996841c70d540a0a2572ab980c4d77cf7225efd7c26c91ef9b0548b73d51e78afa55a7e324d5d93f6211f5eb5d5698ab9ff421e26de
 DIST wine-8.9.tar.xz 29198080 BLAKE2B 
dfad284f554c164ac8f95d7c36d8b999217c6375f7720ed05e512e3f16cbc5a08325dad4e56dd59a17b27e53ab3a8331d54dd17b24e459b34d9e408ba93a52f3
 SHA512 
4de85654d2d5c9d48fa2a748eb9bee4477f0ba7fbd2c5dd40ea69662d8f6dfbb6432d1ec9109233d24608dc9554bad525c1e1ecdc86a5d00d133772810b12261
 DIST wine-staging-8.0.tar.gz 9529620 BLAKE2B 
c9540195ea885d9f1e980232b0af471e92c61eb079cae35fdb3af5c13d4660b3466f751772440e38f15874082db296d16d1f1d68827a505b2dd949617eda0203
 SHA512 
76a729d7ced1ff634ddb455ddfaa66ca103b652f43cd152b57ada7431bb5fbb74f5e92bf2f4f329b6df6f5908130afad84e609cbce6df645d6cf8131e9b949f9
 DIST wine-staging-8.10.tar.gz 9703684 BLAKE2B 
1af11df98cc811741148de9d62a37a352c305d05bdb29b3df5e6a9a2a6597a9cc3ed63109523188cf09f01a97873d077760b1761d3251ac2657c77c92c975373
 SHA512 
89282f9edeb47a904f11796cfeda6853bc492701b6ce1a65211ffebf25c5539516c49b687e0ea024a99d3fc6251ed348a14f644babeb64b6dffdd6032e493859
+DIST wine-staging-8.11.tar.gz 9715880 BLAKE2B 
2795389381d6e52215d8b1b2c437a47beaf61e9b36e78f99c45b3fcd79d554f2d4abafcbf34c366dcb7ce4fc14d66b8751466c30648ae0d7c451aaa345c30c5f
 SHA512 
fb7a5f575c092e84afa78868e3b15fa33d67205a5e20deae61a60613714df784b18d54cd32167355ae38543f047f4304bfbc7f2ba2b3f6050c9f738812a15154
 DIST wine-staging-8.7.tar.gz 9524736 BLAKE2B 
4ae32c77024c41fe660090889958e0016dc6e0d189c1cc938e305cc72297a924ea8209244374baa651ded3bdf62352f9b41e15bb163f200b9b0b3f18ccac2ea5
 SHA512 
42a32b3a5420f358085c510250f3204bc5eb7430c447e7bb5b25046245cf3c54f02684226daffedb65dce093cfa513424523e55d4d3a5b416fdff6e4e1e4a161
 DIST wine-staging-8.8.tar.gz 9509284 BLAKE2B 
f8a25b9a3a52b8bfc98d8eea6c22f9648d8e6040d12dd4a8a2dd13199ced954292f141c4b4ae4fc7748d5fa7f6b0fa1cdd535a27b1495150bdee5f50b940ab8d
 SHA512 
7178ab98ca77a2892f9c827d1af51c9b98fe8c9559f6708fc63f73d3ebed96bd1a158179c5eed83d4c89bc57f0120e9cafddb1e0dbb77587054ae29a60eddaf5
 DIST wine-staging-8.9.1.tar.gz 9700492 BLAKE2B 
4382cc7226e734f8f592da80d2fba485052f39b829f61a51c523098a185a47a451c7e91badaa792de9ddf4fd80c16fd5d6091cc2d962ecaf455d6bc3d0010efc
 SHA512 
abb25718f965241c1404430c1dffa398c2ffd180328e5456fc58a070f90f818a10285ad5515d74727a43f6de9f6c19129acd6ed6ba866d7b240886bbcabcd990

diff --git a/app-emulation/wine-staging/wine-staging-8.11.ebuild 
b/app-emulation/wine-staging/wine-staging-8.11.ebuild
new file mode 100644
index ..a11cbb764ad0
--- /dev/null
+++ b/app-emulation/wine-staging/wine-staging-8.11.ebuild
@@ -0,0 +1,382 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+PYTHON_COMPAT=( python3_{10..12} )
+inherit autotools edo

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

2023-06-24 Thread Ionen Wolkens

commit: b6c0730a41163808e0df5fec7a528e5347e2e53f
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Jun 24 14:53:51 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Jun 24 15:04:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6c0730a

app-emulation/wine-staging: add workaround for smart-live-rebuild

Tentative fix for smart-live-rebuild ignoring wine-staging-
(believed to be due to seeing EGIT_COMMIT).

Not tested, but should work in theory.

Could mark them local but want to ensure nothing git-r3_src_unpack
set was preserved to be sure.

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/wine-staging-.ebuild | 14 +-
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/app-emulation/wine-staging/wine-staging-.ebuild 
b/app-emulation/wine-staging/wine-staging-.ebuild
index c811b766776f..a11cbb764ad0 100644
--- a/app-emulation/wine-staging/wine-staging-.ebuild
+++ b/app-emulation/wine-staging/wine-staging-.ebuild
@@ -180,11 +180,15 @@ src_unpack() {
EGIT_CHECKOUT_DIR=${WORKDIR}/${P}
git-r3_src_unpack
 
-   EGIT_COMMIT=$(<"${EGIT_CHECKOUT_DIR}"/staging/upstream-commit) 
|| die
-   EGIT_REPO_URI=${WINE_EGIT_REPO_URI}
-   EGIT_CHECKOUT_DIR=${S}
-   einfo "Fetching Wine commit matching the current patchset by 
default (${EGIT_COMMIT})"
-   git-r3_src_unpack
+   # hack: use subshell to preserve state (including what git-r3 
unpack
+   # sets) for smart-live-rebuild as this is not the repo to look 
at
+   (
+   
EGIT_COMMIT=$(<"${EGIT_CHECKOUT_DIR}"/staging/upstream-commit) || die
+   EGIT_REPO_URI=${WINE_EGIT_REPO_URI}
+   EGIT_CHECKOUT_DIR=${S}
+   einfo "Fetching Wine commit matching the current 
patchset by default (${EGIT_COMMIT})"
+   git-r3_src_unpack
+   )
else
default
fi

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

2023-06-23 Thread Ionen Wolkens

commit: 5fb13b54066d72257998993f57f83e2f6fc94c0f
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Jun 24 04:37:22 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Jun 24 04:54:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fb13b54

app-emulation/wine-staging: remove -fno-strict-aliasing workaround

Unfortunately the option itself is still needed, but the build system
now handles passing it properly again.

This got fixed in 8.10 but missed the fix at the time.

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/wine-staging-8.10.ebuild | 2 --
 app-emulation/wine-staging/wine-staging-.ebuild | 2 --
 2 files changed, 4 deletions(-)

diff --git a/app-emulation/wine-staging/wine-staging-8.10.ebuild 
b/app-emulation/wine-staging/wine-staging-8.10.ebuild
index 767e89f5480c..7096d33eb0ec 100644
--- a/app-emulation/wine-staging/wine-staging-8.10.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.10.ebuild
@@ -309,8 +309,6 @@ src_configure() {
 
# use *FLAGS for mingw, but strip unsupported
: "${CROSSCFLAGS:=$(
-   # >=wine-7.21 configure.ac no longer adds 
-fno-strict by mistake
-   append-cflags '-fno-strict-aliasing'
filter-flags '-fstack-protector*' #870136
filter-flags '-mfunction-return=thunk*' #878849
CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"

diff --git a/app-emulation/wine-staging/wine-staging-.ebuild 
b/app-emulation/wine-staging/wine-staging-.ebuild
index 7fe254ee3ba8..c811b766776f 100644
--- a/app-emulation/wine-staging/wine-staging-.ebuild
+++ b/app-emulation/wine-staging/wine-staging-.ebuild
@@ -308,8 +308,6 @@ src_configure() {
 
# use *FLAGS for mingw, but strip unsupported
: "${CROSSCFLAGS:=$(
-   # >=wine-7.21 configure.ac no longer adds 
-fno-strict by mistake
-   append-cflags '-fno-strict-aliasing'
filter-flags '-fstack-protector*' #870136
filter-flags '-mfunction-return=thunk*' #878849
CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"

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

2023-06-15 Thread Ionen Wolkens

commit: 5007039d4fdb1eccc6375531a2478974558d38c3
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Jun 16 03:06:28 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Jun 16 03:08:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5007039d

app-emulation/wine-staging: update live

Closes: https://bugs.gentoo.org/908559
Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/wine-staging-.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app-emulation/wine-staging/wine-staging-.ebuild 
b/app-emulation/wine-staging/wine-staging-.ebuild
index 767e89f5480c..7fe254ee3ba8 100644
--- a/app-emulation/wine-staging/wine-staging-.ebuild
+++ b/app-emulation/wine-staging/wine-staging-.ebuild
@@ -194,7 +194,6 @@ src_prepare() {
local patchinstallargs=(
--all
--no-autoconf
-   -W winemenubuilder-Desktop_Icon_Path #652176
${MY_WINE_STAGING_CONF}
)

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

2023-06-11 Thread Ionen Wolkens

commit: e86df1e09df7b2e1da74a39185fabe4e50bba858
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sun Jun 11 08:29:01 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sun Jun 11 08:29:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e86df1e0

app-emulation/wine-staging: add 8.10

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/Manifest|   2 +
 .../wine-staging/wine-staging-8.10.ebuild  | 381 +
 2 files changed, 383 insertions(+)

diff --git a/app-emulation/wine-staging/Manifest 
b/app-emulation/wine-staging/Manifest
index 822f1a14fe64..09b22a9204da 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,8 +1,10 @@
 DIST wine-8.0.tar.xz 29054044 BLAKE2B 
baf8f96b665119c9f38a148a2472dbe8f6ca8d4641d9d09d48cb72cb4de2585c274b8b7981c2fa622ead6da2f087c57652e9b48edc8a17c0cfd6be9a36732f02
 SHA512 
53ba813b260a65a271ec575822725b97631f60038fb026dcc0fe66862711eedcc29a8feb29ff54ae4f64458f85c290d8f3838eff5e4c77a5420a7d2b951fef77
+DIST wine-8.10.tar.xz 29225368 BLAKE2B 
78058ccb707ddd63052ab3114e27435f94957b7badbe3001f8123fd536f5b937006b26e2133390ea5d995e9cb8c54940c907dacf910160c085e2bf3f29772caf
 SHA512 
5f141fb63a598482f512ebefef83500c2fa17a5dea87cb25e600e5167820a5990e12aeaec4a18c1467d64f7c122bf54705aa6fa6a2e6b2b4a463fe182f9b0e6e
 DIST wine-8.7.tar.xz 29158096 BLAKE2B 
73bd0b5a6eec8a2e37301d8b0f8e9be1ad757f07df3471b0cea17aac6716d456eea1d36fa22bd2451e6cc7662b2b36e4ca628d65216c60d5950f5b439fd2052c
 SHA512 
0a7fe9ad86cf931527c2149207473bf4671d1098af7c21f1b740dfaa84486a8e235fea99b1cad035ff9c3eb20810caab53d51051d63efe626514b79309904d93
 DIST wine-8.8.tar.xz 29181484 BLAKE2B 
43a79fb34f86382cbd8dd3b3aa16f104d02a8e86fd8d47afb157865b707b71674199c4ae748f8b3e3de4ae1e63d70a18fca0d09d7716c178a4c9c21d21c092ac
 SHA512 
e56427680c940970153b1996841c70d540a0a2572ab980c4d77cf7225efd7c26c91ef9b0548b73d51e78afa55a7e324d5d93f6211f5eb5d5698ab9ff421e26de
 DIST wine-8.9.tar.xz 29198080 BLAKE2B 
dfad284f554c164ac8f95d7c36d8b999217c6375f7720ed05e512e3f16cbc5a08325dad4e56dd59a17b27e53ab3a8331d54dd17b24e459b34d9e408ba93a52f3
 SHA512 
4de85654d2d5c9d48fa2a748eb9bee4477f0ba7fbd2c5dd40ea69662d8f6dfbb6432d1ec9109233d24608dc9554bad525c1e1ecdc86a5d00d133772810b12261
 DIST wine-staging-8.0.tar.gz 9529620 BLAKE2B 
c9540195ea885d9f1e980232b0af471e92c61eb079cae35fdb3af5c13d4660b3466f751772440e38f15874082db296d16d1f1d68827a505b2dd949617eda0203
 SHA512 
76a729d7ced1ff634ddb455ddfaa66ca103b652f43cd152b57ada7431bb5fbb74f5e92bf2f4f329b6df6f5908130afad84e609cbce6df645d6cf8131e9b949f9
+DIST wine-staging-8.10.tar.gz 9703684 BLAKE2B 
1af11df98cc811741148de9d62a37a352c305d05bdb29b3df5e6a9a2a6597a9cc3ed63109523188cf09f01a97873d077760b1761d3251ac2657c77c92c975373
 SHA512 
89282f9edeb47a904f11796cfeda6853bc492701b6ce1a65211ffebf25c5539516c49b687e0ea024a99d3fc6251ed348a14f644babeb64b6dffdd6032e493859
 DIST wine-staging-8.7.tar.gz 9524736 BLAKE2B 
4ae32c77024c41fe660090889958e0016dc6e0d189c1cc938e305cc72297a924ea8209244374baa651ded3bdf62352f9b41e15bb163f200b9b0b3f18ccac2ea5
 SHA512 
42a32b3a5420f358085c510250f3204bc5eb7430c447e7bb5b25046245cf3c54f02684226daffedb65dce093cfa513424523e55d4d3a5b416fdff6e4e1e4a161
 DIST wine-staging-8.8.tar.gz 9509284 BLAKE2B 
f8a25b9a3a52b8bfc98d8eea6c22f9648d8e6040d12dd4a8a2dd13199ced954292f141c4b4ae4fc7748d5fa7f6b0fa1cdd535a27b1495150bdee5f50b940ab8d
 SHA512 
7178ab98ca77a2892f9c827d1af51c9b98fe8c9559f6708fc63f73d3ebed96bd1a158179c5eed83d4c89bc57f0120e9cafddb1e0dbb77587054ae29a60eddaf5
 DIST wine-staging-8.9.1.tar.gz 9700492 BLAKE2B 
4382cc7226e734f8f592da80d2fba485052f39b829f61a51c523098a185a47a451c7e91badaa792de9ddf4fd80c16fd5d6091cc2d962ecaf455d6bc3d0010efc
 SHA512 
abb25718f965241c1404430c1dffa398c2ffd180328e5456fc58a070f90f818a10285ad5515d74727a43f6de9f6c19129acd6ed6ba866d7b240886bbcabcd990

diff --git a/app-emulation/wine-staging/wine-staging-8.10.ebuild 
b/app-emulation/wine-staging/wine-staging-8.10.ebuild
new file mode 100644
index ..767e89f5480c
--- /dev/null
+++ b/app-emulation/wine-staging/wine-staging-8.10.ebuild
@@ -0,0 +1,381 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+PYTHON_COMPAT=( python3_{10..12} )
+inherit autotools edo flag-o-matic multilib multilib-build
+inherit python-any-r1 toolchain-funcs wrapper
+
+WINE_GECKO=2.47.4
+WINE_MONO=8.0.0
+WINE_P=wine-$(ver_cut 1-2)
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine-staging.git;
+   WINE_EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git;
+else
+   (( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 
1).0
+   SRC_URI="
+   https://dl.winehq.org/wine/source/${WINE_SDIR}/${WINE_P}.tar.xz
+   
https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz ->

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

2023-06-02 Thread Ionen Wolkens

commit: e21edcd77f0cb9f9a6d48605ba19df97f6b90c04
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Jun  2 04:44:17 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Jun  2 06:53:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e21edcd7

app-emulation/wine-staging: USE=-debug -> global USE=strip in live

Will update the old ebuilds eventually but given this triggers
a rebuild with --changed-use (default enabled), will wait till
a few bumps and maybe stable to give a chance for people to
update and depclean old rather than unnecessarily rebuild all.

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/wine-staging-.ebuild | 18 +++---
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/app-emulation/wine-staging/wine-staging-.ebuild 
b/app-emulation/wine-staging/wine-staging-.ebuild
index 91fff75c3a4c..767e89f5480c 100644
--- a/app-emulation/wine-staging/wine-staging-.ebuild
+++ b/app-emulation/wine-staging/wine-staging-.ebuild
@@ -34,9 +34,9 @@ LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 
libtiff"
 SLOT="${PV}"
 IUSE="
+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos
-   llvm-libunwind debug custom-cflags +fontconfig +gecko gphoto2
-   +gstreamer kerberos +mingw +mono netapi nls opencl +opengl osmesa
-   pcap perl pulseaudio samba scanner +sdl selinux smartcard +ssl
+   llvm-libunwind custom-cflags +fontconfig +gecko gphoto2 +gstreamer
+   kerberos +mingw +mono netapi nls opencl +opengl osmesa pcap perl
+   pulseaudio samba scanner +sdl selinux smartcard +ssl +strip
+truetype udev udisks +unwind usb v4l +vulkan wayland +xcomposite
xinerama"
 REQUIRED_USE="
@@ -356,13 +356,17 @@ src_install() {
make_wrapper "${bin##*/}-${P#wine-}" "${bin#"${ED}"}"
done
 
-   # don't let portage try to strip PE files with the wrong
-   # strip executable and instead handle it here (saves ~120MB)
if use mingw; then
+   # don't let portage try to strip PE files with the wrong
+   # strip executable and instead handle it here (saves ~120MB)
dostrip -x ${WINE_PREFIX}/wine/{i386,x86_64}-windows
-   use debug ||
+
+   if use strip; then
+   ebegin "Stripping Windows (PE) binaries"
find "${ED}"${WINE_PREFIX}/wine/*-windows -regex 
'.*\.\(a\|dll\|exe\)' \
-   -exec $(usex abi_x86_64 x86_64 
i686)-w64-mingw32-strip --strip-unneeded {} + || die
+   -exec $(usex abi_x86_64 x86_64 
i686)-w64-mingw32-strip --strip-unneeded {} +
+   eend ${?} || die
+   fi
fi
 
dodoc ANNOUNCE AUTHORS README* documentation/README*

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

2023-05-28 Thread Ionen Wolkens

commit: 7733d1bb0d145af256715304d69c5cac15e5b5d8
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon May 29 00:19:50 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon May 29 00:30:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7733d1bb

app-emulation/wine-staging: add 8.9.1

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/Manifest|   2 +
 .../wine-staging/wine-staging-8.9.1.ebuild | 377 +
 2 files changed, 379 insertions(+)

diff --git a/app-emulation/wine-staging/Manifest 
b/app-emulation/wine-staging/Manifest
index aa9c4dc4883d..822f1a14fe64 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,6 +1,8 @@
 DIST wine-8.0.tar.xz 29054044 BLAKE2B 
baf8f96b665119c9f38a148a2472dbe8f6ca8d4641d9d09d48cb72cb4de2585c274b8b7981c2fa622ead6da2f087c57652e9b48edc8a17c0cfd6be9a36732f02
 SHA512 
53ba813b260a65a271ec575822725b97631f60038fb026dcc0fe66862711eedcc29a8feb29ff54ae4f64458f85c290d8f3838eff5e4c77a5420a7d2b951fef77
 DIST wine-8.7.tar.xz 29158096 BLAKE2B 
73bd0b5a6eec8a2e37301d8b0f8e9be1ad757f07df3471b0cea17aac6716d456eea1d36fa22bd2451e6cc7662b2b36e4ca628d65216c60d5950f5b439fd2052c
 SHA512 
0a7fe9ad86cf931527c2149207473bf4671d1098af7c21f1b740dfaa84486a8e235fea99b1cad035ff9c3eb20810caab53d51051d63efe626514b79309904d93
 DIST wine-8.8.tar.xz 29181484 BLAKE2B 
43a79fb34f86382cbd8dd3b3aa16f104d02a8e86fd8d47afb157865b707b71674199c4ae748f8b3e3de4ae1e63d70a18fca0d09d7716c178a4c9c21d21c092ac
 SHA512 
e56427680c940970153b1996841c70d540a0a2572ab980c4d77cf7225efd7c26c91ef9b0548b73d51e78afa55a7e324d5d93f6211f5eb5d5698ab9ff421e26de
+DIST wine-8.9.tar.xz 29198080 BLAKE2B 
dfad284f554c164ac8f95d7c36d8b999217c6375f7720ed05e512e3f16cbc5a08325dad4e56dd59a17b27e53ab3a8331d54dd17b24e459b34d9e408ba93a52f3
 SHA512 
4de85654d2d5c9d48fa2a748eb9bee4477f0ba7fbd2c5dd40ea69662d8f6dfbb6432d1ec9109233d24608dc9554bad525c1e1ecdc86a5d00d133772810b12261
 DIST wine-staging-8.0.tar.gz 9529620 BLAKE2B 
c9540195ea885d9f1e980232b0af471e92c61eb079cae35fdb3af5c13d4660b3466f751772440e38f15874082db296d16d1f1d68827a505b2dd949617eda0203
 SHA512 
76a729d7ced1ff634ddb455ddfaa66ca103b652f43cd152b57ada7431bb5fbb74f5e92bf2f4f329b6df6f5908130afad84e609cbce6df645d6cf8131e9b949f9
 DIST wine-staging-8.7.tar.gz 9524736 BLAKE2B 
4ae32c77024c41fe660090889958e0016dc6e0d189c1cc938e305cc72297a924ea8209244374baa651ded3bdf62352f9b41e15bb163f200b9b0b3f18ccac2ea5
 SHA512 
42a32b3a5420f358085c510250f3204bc5eb7430c447e7bb5b25046245cf3c54f02684226daffedb65dce093cfa513424523e55d4d3a5b416fdff6e4e1e4a161
 DIST wine-staging-8.8.tar.gz 9509284 BLAKE2B 
f8a25b9a3a52b8bfc98d8eea6c22f9648d8e6040d12dd4a8a2dd13199ced954292f141c4b4ae4fc7748d5fa7f6b0fa1cdd535a27b1495150bdee5f50b940ab8d
 SHA512 
7178ab98ca77a2892f9c827d1af51c9b98fe8c9559f6708fc63f73d3ebed96bd1a158179c5eed83d4c89bc57f0120e9cafddb1e0dbb77587054ae29a60eddaf5
+DIST wine-staging-8.9.1.tar.gz 9700492 BLAKE2B 
4382cc7226e734f8f592da80d2fba485052f39b829f61a51c523098a185a47a451c7e91badaa792de9ddf4fd80c16fd5d6091cc2d962ecaf455d6bc3d0010efc
 SHA512 
abb25718f965241c1404430c1dffa398c2ffd180328e5456fc58a070f90f818a10285ad5515d74727a43f6de9f6c19129acd6ed6ba866d7b240886bbcabcd990

diff --git a/app-emulation/wine-staging/wine-staging-8.9.1.ebuild 
b/app-emulation/wine-staging/wine-staging-8.9.1.ebuild
new file mode 100644
index ..91fff75c3a4c
--- /dev/null
+++ b/app-emulation/wine-staging/wine-staging-8.9.1.ebuild
@@ -0,0 +1,377 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+PYTHON_COMPAT=( python3_{10..12} )
+inherit autotools edo flag-o-matic multilib multilib-build
+inherit python-any-r1 toolchain-funcs wrapper
+
+WINE_GECKO=2.47.4
+WINE_MONO=8.0.0
+WINE_P=wine-$(ver_cut 1-2)
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine-staging.git;
+   WINE_EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git;
+else
+   (( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 
1).0
+   SRC_URI="
+   https://dl.winehq.org/wine/source/${WINE_SDIR}/${WINE_P}.tar.xz
+   
https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="-* ~amd64 ~x86"
+fi
+S="${WORKDIR}/${WINE_P}"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging 
patchset"
+HOMEPAGE="
+   https://wiki.winehq.org/Wine-Staging
+   https://gitlab.winehq.org/wine/wine-staging/;
+
+LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
+SLOT="${PV}"
+IUSE="
+   +X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos
+   llvm-libunwind debug custom-cflags +fontconfig +gecko gphoto2
+   +gstreamer kerberos +mingw +mono netapi nls opencl +opengl osmesa
+   pcap perl pulseaudio samba scanner

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

2023-05-28 Thread Ionen Wolkens

commit: 4ccfcba072ca30bd45813116b73f84239d725cd0
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon May 29 00:12:48 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon May 29 00:28:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ccfcba0

app-emulation/wine-staging: ver_cut wine's PV to accommodate x.x.1

Guess this could become needed more frequently, so may
as well keep it in place permanently.

Note that this is fine in  too where need to set S to "something"
which can be wine- and ver_cut 1-2 gives that.

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/wine-staging-.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app-emulation/wine-staging/wine-staging-.ebuild 
b/app-emulation/wine-staging/wine-staging-.ebuild
index 8a669db66bf4..91fff75c3a4c 100644
--- a/app-emulation/wine-staging/wine-staging-.ebuild
+++ b/app-emulation/wine-staging/wine-staging-.ebuild
@@ -10,6 +10,7 @@ inherit python-any-r1 toolchain-funcs wrapper
 
 WINE_GECKO=2.47.4
 WINE_MONO=8.0.0
+WINE_P=wine-$(ver_cut 1-2)
 
 if [[ ${PV} == * ]]; then
inherit git-r3
@@ -18,11 +19,11 @@ if [[ ${PV} == * ]]; then
 else
(( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 
1).0
SRC_URI="
-   https://dl.winehq.org/wine/source/${WINE_SDIR}/wine-${PV}.tar.xz
+   https://dl.winehq.org/wine/source/${WINE_SDIR}/${WINE_P}.tar.xz

https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
KEYWORDS="-* ~amd64 ~x86"
 fi
-S="${WORKDIR}/wine-${PV}"
+S="${WORKDIR}/${WINE_P}"
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging 
patchset"
 HOMEPAGE="

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

2023-05-26 Thread Ionen Wolkens

commit: 1ca37803959019cc7d1a3ca56379826802eb591d
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri May 26 20:44:57 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri May 26 21:53:27 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ca37803

app-emulation/wine-staging: drop 8.5, 8.6.1

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/Manifest|   4 -
 app-emulation/wine-staging/wine-staging-8.5.ebuild | 375 -
 .../wine-staging/wine-staging-8.6.1.ebuild | 375 -
 3 files changed, 754 deletions(-)

diff --git a/app-emulation/wine-staging/Manifest 
b/app-emulation/wine-staging/Manifest
index beaebb52026c..aa9c4dc4883d 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,10 +1,6 @@
 DIST wine-8.0.tar.xz 29054044 BLAKE2B 
baf8f96b665119c9f38a148a2472dbe8f6ca8d4641d9d09d48cb72cb4de2585c274b8b7981c2fa622ead6da2f087c57652e9b48edc8a17c0cfd6be9a36732f02
 SHA512 
53ba813b260a65a271ec575822725b97631f60038fb026dcc0fe66862711eedcc29a8feb29ff54ae4f64458f85c290d8f3838eff5e4c77a5420a7d2b951fef77
-DIST wine-8.5.tar.xz 29064032 BLAKE2B 
35fa6d7ec88ff67d9acf13466b3618eb45d664bed0a9ee581e46cb6e7692395837c8c8e86dead1dbcad582ef29c674a0df4b7180addee837b466eba7fdcd350a
 SHA512 
f6aaab8a32eb7bce7f48d21d99417c9e6e8fe41b3d36320762775ef954db7ddd4fcff01d56475f35038d814557834a41a9e3ae85e5cae8a1b820c5044b42a327
-DIST wine-8.6.tar.xz 29118124 BLAKE2B 
e4659785722f0c1adb9ce4a156fbafc8484977a5fe2f4a6e1d5eaf8f1f14c6787f080b9d389cdd8716eb7fd00ee2879fab2042af5dcb970530d2e19628442c73
 SHA512 
602680675f5e062121767769106199179c52a6dd93e97b9b8b4d8365134c72f7745e37d4e3edf6c89c553fb1bfe55b914e77177508fb4f032410d423359abba7
 DIST wine-8.7.tar.xz 29158096 BLAKE2B 
73bd0b5a6eec8a2e37301d8b0f8e9be1ad757f07df3471b0cea17aac6716d456eea1d36fa22bd2451e6cc7662b2b36e4ca628d65216c60d5950f5b439fd2052c
 SHA512 
0a7fe9ad86cf931527c2149207473bf4671d1098af7c21f1b740dfaa84486a8e235fea99b1cad035ff9c3eb20810caab53d51051d63efe626514b79309904d93
 DIST wine-8.8.tar.xz 29181484 BLAKE2B 
43a79fb34f86382cbd8dd3b3aa16f104d02a8e86fd8d47afb157865b707b71674199c4ae748f8b3e3de4ae1e63d70a18fca0d09d7716c178a4c9c21d21c092ac
 SHA512 
e56427680c940970153b1996841c70d540a0a2572ab980c4d77cf7225efd7c26c91ef9b0548b73d51e78afa55a7e324d5d93f6211f5eb5d5698ab9ff421e26de
 DIST wine-staging-8.0.tar.gz 9529620 BLAKE2B 
c9540195ea885d9f1e980232b0af471e92c61eb079cae35fdb3af5c13d4660b3466f751772440e38f15874082db296d16d1f1d68827a505b2dd949617eda0203
 SHA512 
76a729d7ced1ff634ddb455ddfaa66ca103b652f43cd152b57ada7431bb5fbb74f5e92bf2f4f329b6df6f5908130afad84e609cbce6df645d6cf8131e9b949f9
-DIST wine-staging-8.5.tar.gz 9530306 BLAKE2B 
9457fb44aea427c2c09d6329f2f585ae7e14ca32950204019136616d73ad1b83b629297499197b91fb542784b8e5b6edd8743ee6a72794ce58ef5c6b1d27f308
 SHA512 
9d347c55a62f661bdcc102d373e05d162217b7b1348bdb6f2b114d20e35146862379d2cf03a96916bd1d52166a538af55d48e25a169cd6ee23818673bd35909a
-DIST wine-staging-8.6.1.tar.gz 9527141 BLAKE2B 
be43c642e6caa0f7e28a0aa45f736b839fe277a54c573955940523b6a27a0e4b7b5d531a027aab4a3c21a413fcac129dc16a7241700f2f848061fadafc9e695f
 SHA512 
28bb066b55293e73df072cceb27a191365d6a319d859e6797bc443e830bb6ddd22cdbf7d9692b43e8eb7f2feb68ac1205aa440c60b37ab7c10ebeab83aa590ce
 DIST wine-staging-8.7.tar.gz 9524736 BLAKE2B 
4ae32c77024c41fe660090889958e0016dc6e0d189c1cc938e305cc72297a924ea8209244374baa651ded3bdf62352f9b41e15bb163f200b9b0b3f18ccac2ea5
 SHA512 
42a32b3a5420f358085c510250f3204bc5eb7430c447e7bb5b25046245cf3c54f02684226daffedb65dce093cfa513424523e55d4d3a5b416fdff6e4e1e4a161
 DIST wine-staging-8.8.tar.gz 9509284 BLAKE2B 
f8a25b9a3a52b8bfc98d8eea6c22f9648d8e6040d12dd4a8a2dd13199ced954292f141c4b4ae4fc7748d5fa7f6b0fa1cdd535a27b1495150bdee5f50b940ab8d
 SHA512 
7178ab98ca77a2892f9c827d1af51c9b98fe8c9559f6708fc63f73d3ebed96bd1a158179c5eed83d4c89bc57f0120e9cafddb1e0dbb77587054ae29a60eddaf5

diff --git a/app-emulation/wine-staging/wine-staging-8.5.ebuild 
b/app-emulation/wine-staging/wine-staging-8.5.ebuild
deleted file mode 100644
index 74867a1f4c4c..
--- a/app-emulation/wine-staging/wine-staging-8.5.ebuild
+++ /dev/null
@@ -1,375 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-PYTHON_COMPAT=( python3_{10..12} )
-inherit autotools edo flag-o-matic multilib multilib-build
-inherit python-any-r1 toolchain-funcs wrapper
-
-WINE_GECKO=2.47.3
-WINE_MONO=7.4.0
-
-if [[ ${PV} == * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine-staging.git;
-   WINE_EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git;
-else
-   (( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 
1).0
-   SRC_URI="
-   https://dl.winehq.org/wine/source/${WINE_SDIR}/wine-${PV}.tar.xz
-

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

2023-05-23 Thread Ionen Wolkens

commit: 3952bcc96358b1b5ce44ebb7de7c611da546b921
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue May 23 17:02:47 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue May 23 17:14:08 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3952bcc9

app-emulation/wine-staging: enable py3.12

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/wine-staging-8.5.ebuild   | 2 +-
 app-emulation/wine-staging/wine-staging-8.6.1.ebuild | 2 +-
 app-emulation/wine-staging/wine-staging-8.7.ebuild   | 2 +-
 app-emulation/wine-staging/wine-staging-8.8.ebuild   | 2 +-
 app-emulation/wine-staging/wine-staging-.ebuild  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app-emulation/wine-staging/wine-staging-8.5.ebuild 
b/app-emulation/wine-staging/wine-staging-8.5.ebuild
index df75c4969c98..74867a1f4c4c 100644
--- a/app-emulation/wine-staging/wine-staging-8.5.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.5.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit autotools edo flag-o-matic multilib multilib-build
 inherit python-any-r1 toolchain-funcs wrapper
 

diff --git a/app-emulation/wine-staging/wine-staging-8.6.1.ebuild 
b/app-emulation/wine-staging/wine-staging-8.6.1.ebuild
index 18f222e446b5..e63cedce7e25 100644
--- a/app-emulation/wine-staging/wine-staging-8.6.1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.6.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit autotools edo flag-o-matic multilib multilib-build
 inherit python-any-r1 toolchain-funcs wrapper
 

diff --git a/app-emulation/wine-staging/wine-staging-8.7.ebuild 
b/app-emulation/wine-staging/wine-staging-8.7.ebuild
index bf02447a2a5e..50cd09f01e47 100644
--- a/app-emulation/wine-staging/wine-staging-8.7.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.7.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit autotools edo flag-o-matic multilib multilib-build
 inherit python-any-r1 toolchain-funcs wrapper
 

diff --git a/app-emulation/wine-staging/wine-staging-8.8.ebuild 
b/app-emulation/wine-staging/wine-staging-8.8.ebuild
index b969d1e39e6f..356b6bd8d790 100644
--- a/app-emulation/wine-staging/wine-staging-8.8.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.8.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit autotools edo flag-o-matic multilib multilib-build
 inherit python-any-r1 toolchain-funcs wrapper
 

diff --git a/app-emulation/wine-staging/wine-staging-.ebuild 
b/app-emulation/wine-staging/wine-staging-.ebuild
index f7df0cbdef65..8a669db66bf4 100644
--- a/app-emulation/wine-staging/wine-staging-.ebuild
+++ b/app-emulation/wine-staging/wine-staging-.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit autotools edo flag-o-matic multilib multilib-build
 inherit python-any-r1 toolchain-funcs wrapper

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

2023-05-22 Thread Sam James

commit: ce054fc125732b6dd575de4a09ebbe5130ef2b4b
Author: Sam James  gentoo  org>
AuthorDate: Tue May 23 02:50:46 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May 23 02:51:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce054fc1

app-emulation/wine-staging: defer to new global USE=vulkan description

Signed-off-by: Sam James  gentoo.org>

 app-emulation/wine-staging/metadata.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app-emulation/wine-staging/metadata.xml 
b/app-emulation/wine-staging/metadata.xml
index 6b988d9f6ff4..3ef81511155b 100644
--- a/app-emulation/wine-staging/metadata.xml
+++ b/app-emulation/wine-staging/metadata.xml
@@ -29,7 +29,6 @@ This variant of the Wine packaging includes the Wine-Staging 
patchset.
Install helpers that require perl 
(winedump/winemaker)
Pull in net-fs/samba with winbind 
for NTLM auth support
Enable gamepad support using 
media-libs/libsdl2
-   Enable Vulkan drivers



https://bugs.winehq.org/describecomponents.cgi?product=Wine-staging

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

2023-05-19 Thread Ionen Wolkens

commit: 311fcfc5dc53bdf75968386dcd5e2346c8497258
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri May 19 07:59:29 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri May 19 08:15:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=311fcfc5

app-emulation/wine-staging: bump live to wine-mono:8.0.0

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/wine-staging-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/wine-staging/wine-staging-.ebuild 
b/app-emulation/wine-staging/wine-staging-.ebuild
index b969d1e39e6f..f7df0cbdef65 100644
--- a/app-emulation/wine-staging/wine-staging-.ebuild
+++ b/app-emulation/wine-staging/wine-staging-.ebuild
@@ -9,7 +9,7 @@ inherit autotools edo flag-o-matic multilib multilib-build
 inherit python-any-r1 toolchain-funcs wrapper
 
 WINE_GECKO=2.47.4
-WINE_MONO=7.4.0
+WINE_MONO=8.0.0
 
 if [[ ${PV} == * ]]; then
inherit git-r3

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

2023-05-14 Thread Ionen Wolkens

commit: aa38e537f3be64dd8dd654128a48a7dedf289e68
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sun May 14 02:49:51 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sun May 14 23:47:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa38e537

app-emulation/wine-staging: cleanup py3.9

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/wine-staging-8.5.ebuild   | 2 +-
 app-emulation/wine-staging/wine-staging-8.6.1.ebuild | 2 +-
 app-emulation/wine-staging/wine-staging-8.7.ebuild   | 2 +-
 app-emulation/wine-staging/wine-staging-.ebuild  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app-emulation/wine-staging/wine-staging-8.5.ebuild 
b/app-emulation/wine-staging/wine-staging-8.5.ebuild
index 1d9218bfa197..df75c4969c98 100644
--- a/app-emulation/wine-staging/wine-staging-8.5.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.5.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 inherit autotools edo flag-o-matic multilib multilib-build
 inherit python-any-r1 toolchain-funcs wrapper
 

diff --git a/app-emulation/wine-staging/wine-staging-8.6.1.ebuild 
b/app-emulation/wine-staging/wine-staging-8.6.1.ebuild
index cab12fde862c..18f222e446b5 100644
--- a/app-emulation/wine-staging/wine-staging-8.6.1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.6.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 inherit autotools edo flag-o-matic multilib multilib-build
 inherit python-any-r1 toolchain-funcs wrapper
 

diff --git a/app-emulation/wine-staging/wine-staging-8.7.ebuild 
b/app-emulation/wine-staging/wine-staging-8.7.ebuild
index f7296349f46f..bf02447a2a5e 100644
--- a/app-emulation/wine-staging/wine-staging-8.7.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.7.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 inherit autotools edo flag-o-matic multilib multilib-build
 inherit python-any-r1 toolchain-funcs wrapper
 

diff --git a/app-emulation/wine-staging/wine-staging-.ebuild 
b/app-emulation/wine-staging/wine-staging-.ebuild
index bbf0f0ca9656..4f23f0fc4c4e 100644
--- a/app-emulation/wine-staging/wine-staging-.ebuild
+++ b/app-emulation/wine-staging/wine-staging-.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 inherit autotools edo flag-o-matic multilib multilib-build
 inherit python-any-r1 toolchain-funcs wrapper

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

2023-05-14 Thread Ionen Wolkens

commit: 4c94f56bbecb6fe2e573193d2950bbbf8bd24c78
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sun May 14 23:55:45 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sun May 14 23:55:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c94f56b

app-emulation/wine-staging: revert SRC_URI to github

While the link works, unfortunately without proper releases
this results in the hash being added to S and it would be
a pain to update every time.

So back to github we go for now (well, not for live).

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/wine-staging-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/wine-staging/wine-staging-.ebuild 
b/app-emulation/wine-staging/wine-staging-.ebuild
index 4f23f0fc4c4e..b969d1e39e6f 100644
--- a/app-emulation/wine-staging/wine-staging-.ebuild
+++ b/app-emulation/wine-staging/wine-staging-.ebuild
@@ -19,7 +19,7 @@ else
(( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 
1).0
SRC_URI="
https://dl.winehq.org/wine/source/${WINE_SDIR}/wine-${PV}.tar.xz
-   
https://gitlab.winehq.org/wine/wine-staging/-/archive/v${PV}/${P}.tar.bz2;
+   
https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
KEYWORDS="-* ~amd64 ~x86"
 fi
 S="${WORKDIR}/wine-${PV}"

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

2023-05-14 Thread Ionen Wolkens

commit: c9d1ca38838042080f9516b22cd3afa2fe03e08c
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sun May 14 23:57:52 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sun May 14 23:57:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9d1ca38

app-emulation/wine-staging: add 8.8

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/Manifest|   2 +
 app-emulation/wine-staging/wine-staging-8.8.ebuild | 376 +
 2 files changed, 378 insertions(+)

diff --git a/app-emulation/wine-staging/Manifest 
b/app-emulation/wine-staging/Manifest
index bebc7848213e..beaebb52026c 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -2,7 +2,9 @@ DIST wine-8.0.tar.xz 29054044 BLAKE2B 
baf8f96b665119c9f38a148a2472dbe8f6ca8d4641
 DIST wine-8.5.tar.xz 29064032 BLAKE2B 
35fa6d7ec88ff67d9acf13466b3618eb45d664bed0a9ee581e46cb6e7692395837c8c8e86dead1dbcad582ef29c674a0df4b7180addee837b466eba7fdcd350a
 SHA512 
f6aaab8a32eb7bce7f48d21d99417c9e6e8fe41b3d36320762775ef954db7ddd4fcff01d56475f35038d814557834a41a9e3ae85e5cae8a1b820c5044b42a327
 DIST wine-8.6.tar.xz 29118124 BLAKE2B 
e4659785722f0c1adb9ce4a156fbafc8484977a5fe2f4a6e1d5eaf8f1f14c6787f080b9d389cdd8716eb7fd00ee2879fab2042af5dcb970530d2e19628442c73
 SHA512 
602680675f5e062121767769106199179c52a6dd93e97b9b8b4d8365134c72f7745e37d4e3edf6c89c553fb1bfe55b914e77177508fb4f032410d423359abba7
 DIST wine-8.7.tar.xz 29158096 BLAKE2B 
73bd0b5a6eec8a2e37301d8b0f8e9be1ad757f07df3471b0cea17aac6716d456eea1d36fa22bd2451e6cc7662b2b36e4ca628d65216c60d5950f5b439fd2052c
 SHA512 
0a7fe9ad86cf931527c2149207473bf4671d1098af7c21f1b740dfaa84486a8e235fea99b1cad035ff9c3eb20810caab53d51051d63efe626514b79309904d93
+DIST wine-8.8.tar.xz 29181484 BLAKE2B 
43a79fb34f86382cbd8dd3b3aa16f104d02a8e86fd8d47afb157865b707b71674199c4ae748f8b3e3de4ae1e63d70a18fca0d09d7716c178a4c9c21d21c092ac
 SHA512 
e56427680c940970153b1996841c70d540a0a2572ab980c4d77cf7225efd7c26c91ef9b0548b73d51e78afa55a7e324d5d93f6211f5eb5d5698ab9ff421e26de
 DIST wine-staging-8.0.tar.gz 9529620 BLAKE2B 
c9540195ea885d9f1e980232b0af471e92c61eb079cae35fdb3af5c13d4660b3466f751772440e38f15874082db296d16d1f1d68827a505b2dd949617eda0203
 SHA512 
76a729d7ced1ff634ddb455ddfaa66ca103b652f43cd152b57ada7431bb5fbb74f5e92bf2f4f329b6df6f5908130afad84e609cbce6df645d6cf8131e9b949f9
 DIST wine-staging-8.5.tar.gz 9530306 BLAKE2B 
9457fb44aea427c2c09d6329f2f585ae7e14ca32950204019136616d73ad1b83b629297499197b91fb542784b8e5b6edd8743ee6a72794ce58ef5c6b1d27f308
 SHA512 
9d347c55a62f661bdcc102d373e05d162217b7b1348bdb6f2b114d20e35146862379d2cf03a96916bd1d52166a538af55d48e25a169cd6ee23818673bd35909a
 DIST wine-staging-8.6.1.tar.gz 9527141 BLAKE2B 
be43c642e6caa0f7e28a0aa45f736b839fe277a54c573955940523b6a27a0e4b7b5d531a027aab4a3c21a413fcac129dc16a7241700f2f848061fadafc9e695f
 SHA512 
28bb066b55293e73df072cceb27a191365d6a319d859e6797bc443e830bb6ddd22cdbf7d9692b43e8eb7f2feb68ac1205aa440c60b37ab7c10ebeab83aa590ce
 DIST wine-staging-8.7.tar.gz 9524736 BLAKE2B 
4ae32c77024c41fe660090889958e0016dc6e0d189c1cc938e305cc72297a924ea8209244374baa651ded3bdf62352f9b41e15bb163f200b9b0b3f18ccac2ea5
 SHA512 
42a32b3a5420f358085c510250f3204bc5eb7430c447e7bb5b25046245cf3c54f02684226daffedb65dce093cfa513424523e55d4d3a5b416fdff6e4e1e4a161
+DIST wine-staging-8.8.tar.gz 9509284 BLAKE2B 
f8a25b9a3a52b8bfc98d8eea6c22f9648d8e6040d12dd4a8a2dd13199ced954292f141c4b4ae4fc7748d5fa7f6b0fa1cdd535a27b1495150bdee5f50b940ab8d
 SHA512 
7178ab98ca77a2892f9c827d1af51c9b98fe8c9559f6708fc63f73d3ebed96bd1a158179c5eed83d4c89bc57f0120e9cafddb1e0dbb77587054ae29a60eddaf5

diff --git a/app-emulation/wine-staging/wine-staging-8.8.ebuild 
b/app-emulation/wine-staging/wine-staging-8.8.ebuild
new file mode 100644
index ..b969d1e39e6f
--- /dev/null
+++ b/app-emulation/wine-staging/wine-staging-8.8.ebuild
@@ -0,0 +1,376 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+PYTHON_COMPAT=( python3_{10..11} )
+inherit autotools edo flag-o-matic multilib multilib-build
+inherit python-any-r1 toolchain-funcs wrapper
+
+WINE_GECKO=2.47.4
+WINE_MONO=7.4.0
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine-staging.git;
+   WINE_EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git;
+else
+   (( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 
1).0
+   SRC_URI="
+   https://dl.winehq.org/wine/source/${WINE_SDIR}/wine-${PV}.tar.xz
+   
https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="-* ~amd64 ~x86"
+fi
+S="${WORKDIR}/wine-${PV}"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging 
patchset"
+HOMEPAGE="
+   https://wiki.winehq.org/Wine-Staging
+

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

2023-05-13 Thread Ionen Wolkens

commit: 1b0dcc89fcbf96bc646154eb63040112da33ab58
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat May 13 07:56:10 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat May 13 08:07:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b0dcc89

app-emulation/wine-staging: add bugs-to to metadata

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-emulation/wine-staging/metadata.xml 
b/app-emulation/wine-staging/metadata.xml
index b67374f154aa..6b988d9f6ff4 100644
--- a/app-emulation/wine-staging/metadata.xml
+++ b/app-emulation/wine-staging/metadata.xml
@@ -32,6 +32,7 @@ This variant of the Wine packaging includes the Wine-Staging 
patchset.
Enable Vulkan drivers


+   
https://bugs.winehq.org/describecomponents.cgi?product=Wine-staging
wine-staging/wine-staging

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

2023-05-13 Thread Ionen Wolkens

commit: 11e9fe6867cb3658c588626599264ad9fb2f8f83
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat May 13 07:50:08 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat May 13 08:07:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11e9fe68

app-emulation/wine-staging: update to use winehq's gitlab

Migrated leaving github as a mirror.

Leaving the old SRC_URIs alone, and update in  for use with
next release (assuming that it still doesn't get proper release
artifacts on dl.winehq.org).

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/wine-staging-8.0.ebuild   | 6 --
 app-emulation/wine-staging/wine-staging-8.5.ebuild   | 6 --
 app-emulation/wine-staging/wine-staging-8.6.1.ebuild | 6 --
 app-emulation/wine-staging/wine-staging-8.7.ebuild   | 4 +++-
 app-emulation/wine-staging/wine-staging-.ebuild  | 8 +---
 5 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/app-emulation/wine-staging/wine-staging-8.0.ebuild 
b/app-emulation/wine-staging/wine-staging-8.0.ebuild
index 3b1d7f1ce6fe..06a39f07e0f3 100644
--- a/app-emulation/wine-staging/wine-staging-8.0.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.0.ebuild
@@ -11,7 +11,7 @@ WINE_MONO=7.4.0
 
 if [[ ${PV} == * ]]; then
inherit git-r3
-   EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git;
+   EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine-staging.git;
WINE_EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git;
 else
(( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 
1).0
@@ -23,7 +23,9 @@ fi
 S="${WORKDIR}/wine-${PV}"
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging 
patchset"
-HOMEPAGE="https://wiki.winehq.org/Wine-Staging;
+HOMEPAGE="
+   https://wiki.winehq.org/Wine-Staging
+   https://gitlab.winehq.org/wine/wine-staging/;
 
 LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
 SLOT="${PV}"

diff --git a/app-emulation/wine-staging/wine-staging-8.5.ebuild 
b/app-emulation/wine-staging/wine-staging-8.5.ebuild
index 1f2310f1a252..1d9218bfa197 100644
--- a/app-emulation/wine-staging/wine-staging-8.5.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.5.ebuild
@@ -13,7 +13,7 @@ WINE_MONO=7.4.0
 
 if [[ ${PV} == * ]]; then
inherit git-r3
-   EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git;
+   EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine-staging.git;
WINE_EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git;
 else
(( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 
1).0
@@ -25,7 +25,9 @@ fi
 S="${WORKDIR}/wine-${PV}"
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging 
patchset"
-HOMEPAGE="https://wiki.winehq.org/Wine-Staging;
+HOMEPAGE="
+   https://wiki.winehq.org/Wine-Staging
+   https://gitlab.winehq.org/wine/wine-staging/;
 
 LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
 SLOT="${PV}"

diff --git a/app-emulation/wine-staging/wine-staging-8.6.1.ebuild 
b/app-emulation/wine-staging/wine-staging-8.6.1.ebuild
index ad9ce9a33eff..cab12fde862c 100644
--- a/app-emulation/wine-staging/wine-staging-8.6.1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.6.1.ebuild
@@ -13,7 +13,7 @@ WINE_MONO=7.4.0
 
 if [[ ${PV} == * ]]; then
inherit git-r3
-   EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git;
+   EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine-staging.git;
WINE_EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git;
 else
(( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 
1).0
@@ -25,7 +25,9 @@ fi
 S="${WORKDIR}/wine-$(ver_cut 1-2)"
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging 
patchset"
-HOMEPAGE="https://wiki.winehq.org/Wine-Staging;
+HOMEPAGE="
+   https://wiki.winehq.org/Wine-Staging
+   https://gitlab.winehq.org/wine/wine-staging/;
 
 LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
 SLOT="${PV}"

diff --git a/app-emulation/wine-staging/wine-staging-8.7.ebuild 
b/app-emulation/wine-staging/wine-staging-8.7.ebuild
index 0865619a8b23..f7296349f46f 100644
--- a/app-emulation/wine-staging/wine-staging-8.7.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.7.ebuild
@@ -25,7 +25,9 @@ fi
 S="${WORKDIR}/wine-${PV}"
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging 
patchset"
-HOMEPAGE="https://wiki.winehq.org/Wine-Staging;
+HOMEPAGE="
+   https://wiki.winehq.org/Wine-Staging
+   https://gitlab.winehq.org/wine/wine-staging/;
 
 LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
 SLOT="${PV}"

diff --git a/app-emulation/wine-staging/wine-staging-.ebuild 
b/app-emulation/wine-staging/wine-staging-.ebuild
index 0865619a8b23..bbf0f0ca9656 100644
---

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

2023-05-01 Thread Ionen Wolkens

commit: a9ebee392a071915a1f6d901e0cb51e2a8d16a19
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon May  1 11:14:00 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon May  1 11:17:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9ebee39

app-emulation/wine-staging: allow dosbox-staging alternative

Albeit considered removing this USE altogether before (optfeature).
Kept it mostly because of how long it's been there, may revisit this
eventually (in wine-proton it's already gone and is not even mentioned
given Wine itself will advertise it if attempt to use dos).

Not really worth a revbump, ultimately a user could just USE=-dos
and install whichever they want too.

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/wine-staging-8.0.ebuild   | 7 ++-
 app-emulation/wine-staging/wine-staging-8.5.ebuild   | 7 ++-
 app-emulation/wine-staging/wine-staging-8.6.1.ebuild | 7 ++-
 app-emulation/wine-staging/wine-staging-8.7.ebuild   | 7 ++-
 app-emulation/wine-staging/wine-staging-.ebuild  | 7 ++-
 5 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/app-emulation/wine-staging/wine-staging-8.0.ebuild 
b/app-emulation/wine-staging/wine-staging-8.0.ebuild
index b026f1191e19..3b1d7f1ce6fe 100644
--- a/app-emulation/wine-staging/wine-staging-8.0.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.0.ebuild
@@ -95,7 +95,12 @@ WINE_COMMON_DEPEND="
 RDEPEND="
${WINE_COMMON_DEPEND}
app-emulation/wine-desktop-common
-   dos? ( games-emulation/dosbox )
+   dos? (
+   || (
+   games-emulation/dosbox
+   games-emulation/dosbox-staging
+   )
+   )
gecko? ( app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}] )
gstreamer? ( media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] )
mono? ( app-emulation/wine-mono:${WINE_MONO} )

diff --git a/app-emulation/wine-staging/wine-staging-8.5.ebuild 
b/app-emulation/wine-staging/wine-staging-8.5.ebuild
index 55c1dba456f6..1f2310f1a252 100644
--- a/app-emulation/wine-staging/wine-staging-8.5.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.5.ebuild
@@ -99,7 +99,12 @@ WINE_COMMON_DEPEND="
 RDEPEND="
${WINE_COMMON_DEPEND}
app-emulation/wine-desktop-common
-   dos? ( games-emulation/dosbox )
+   dos? (
+   || (
+   games-emulation/dosbox
+   games-emulation/dosbox-staging
+   )
+   )
gecko? ( app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}] )
gstreamer? ( media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] )
mono? ( app-emulation/wine-mono:${WINE_MONO} )

diff --git a/app-emulation/wine-staging/wine-staging-8.6.1.ebuild 
b/app-emulation/wine-staging/wine-staging-8.6.1.ebuild
index 838b42bb44f6..ad9ce9a33eff 100644
--- a/app-emulation/wine-staging/wine-staging-8.6.1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.6.1.ebuild
@@ -99,7 +99,12 @@ WINE_COMMON_DEPEND="
 RDEPEND="
${WINE_COMMON_DEPEND}
app-emulation/wine-desktop-common
-   dos? ( games-emulation/dosbox )
+   dos? (
+   || (
+   games-emulation/dosbox
+   games-emulation/dosbox-staging
+   )
+   )
gecko? ( app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}] )
gstreamer? ( media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] )
mono? ( app-emulation/wine-mono:${WINE_MONO} )

diff --git a/app-emulation/wine-staging/wine-staging-8.7.ebuild 
b/app-emulation/wine-staging/wine-staging-8.7.ebuild
index 5fa84f123373..0865619a8b23 100644
--- a/app-emulation/wine-staging/wine-staging-8.7.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.7.ebuild
@@ -99,7 +99,12 @@ WINE_COMMON_DEPEND="
 RDEPEND="
${WINE_COMMON_DEPEND}
app-emulation/wine-desktop-common
-   dos? ( games-emulation/dosbox )
+   dos? (
+   || (
+   games-emulation/dosbox
+   games-emulation/dosbox-staging
+   )
+   )
gecko? ( app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}] )
gstreamer? ( media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] )
mono? ( app-emulation/wine-mono:${WINE_MONO} )

diff --git a/app-emulation/wine-staging/wine-staging-.ebuild 
b/app-emulation/wine-staging/wine-staging-.ebuild
index 5fa84f123373..0865619a8b23 100644
--- a/app-emulation/wine-staging/wine-staging-.ebuild
+++ b/app-emulation/wine-staging/wine-staging-.ebuild
@@ -99,7 +99,12 @@ WINE_COMMON_DEPEND="
 RDEPEND="
${WINE_COMMON_DEPEND}
app-emulation/wine-desktop-common
-   dos? ( games-emulation/dosbox )
+   dos? (
+   || (
+   games-emulation/dosbox
+   games-emulation/dosbox-staging
+

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

2023-04-29 Thread Ionen Wolkens

commit: bb62cf0b7099c567c9cf43b78a82ee07771d682b
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Apr 29 09:31:24 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Apr 29 09:42:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb62cf0b

app-emulation/wine-staging: remove obsolete clash-protection filter

ICE was fixed (bug #758914), if still run into this then updating
gcc to a newer _p* snapshot should sort it (alternatively, use
released >=gcc-13.1.0).

Note that -fstack-protector* (bug #870136) is still needed, while
mingw64-runtime-11.0.0 add some degree of support, it still seems
to fail for Wine itself.

Bug: https://bugs.gentoo.org/758914
Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/wine-staging-8.0.ebuild   | 1 -
 app-emulation/wine-staging/wine-staging-8.5.ebuild   | 1 -
 app-emulation/wine-staging/wine-staging-8.6.1.ebuild | 1 -
 app-emulation/wine-staging/wine-staging-.ebuild  | 1 -
 4 files changed, 4 deletions(-)

diff --git a/app-emulation/wine-staging/wine-staging-8.0.ebuild 
b/app-emulation/wine-staging/wine-staging-8.0.ebuild
index 46496d8f280b..b026f1191e19 100644
--- a/app-emulation/wine-staging/wine-staging-8.0.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.0.ebuild
@@ -292,7 +292,6 @@ src_configure() {
: "${CROSSCFLAGS:=$(
# >=wine-7.21 configure.ac no longer adds 
-fno-strict by mistake
append-cflags '-fno-strict-aliasing'
-   filter-flags '-fstack-clash-protection' #758914
filter-flags '-fstack-protector*' #870136
filter-flags '-mfunction-return=thunk*' #878849
CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"

diff --git a/app-emulation/wine-staging/wine-staging-8.5.ebuild 
b/app-emulation/wine-staging/wine-staging-8.5.ebuild
index 5f90e2ce8870..55c1dba456f6 100644
--- a/app-emulation/wine-staging/wine-staging-8.5.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.5.ebuild
@@ -302,7 +302,6 @@ src_configure() {
: "${CROSSCFLAGS:=$(
# >=wine-7.21 configure.ac no longer adds 
-fno-strict by mistake
append-cflags '-fno-strict-aliasing'
-   filter-flags '-fstack-clash-protection' #758914
filter-flags '-fstack-protector*' #870136
filter-flags '-mfunction-return=thunk*' #878849
CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"

diff --git a/app-emulation/wine-staging/wine-staging-8.6.1.ebuild 
b/app-emulation/wine-staging/wine-staging-8.6.1.ebuild
index 61b4b60e0323..838b42bb44f6 100644
--- a/app-emulation/wine-staging/wine-staging-8.6.1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.6.1.ebuild
@@ -302,7 +302,6 @@ src_configure() {
: "${CROSSCFLAGS:=$(
# >=wine-7.21 configure.ac no longer adds 
-fno-strict by mistake
append-cflags '-fno-strict-aliasing'
-   filter-flags '-fstack-clash-protection' #758914
filter-flags '-fstack-protector*' #870136
filter-flags '-mfunction-return=thunk*' #878849
CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"

diff --git a/app-emulation/wine-staging/wine-staging-.ebuild 
b/app-emulation/wine-staging/wine-staging-.ebuild
index 4057184984fe..5fa84f123373 100644
--- a/app-emulation/wine-staging/wine-staging-.ebuild
+++ b/app-emulation/wine-staging/wine-staging-.ebuild
@@ -303,7 +303,6 @@ src_configure() {
: "${CROSSCFLAGS:=$(
# >=wine-7.21 configure.ac no longer adds 
-fno-strict by mistake
append-cflags '-fno-strict-aliasing'
-   filter-flags '-fstack-clash-protection' #758914
filter-flags '-fstack-protector*' #870136
filter-flags '-mfunction-return=thunk*' #878849
CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"

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

2023-04-29 Thread Ionen Wolkens

commit: f4f2c9751b5b5568bd25c59a2bf4fa5cfa317d20
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Apr 29 09:31:54 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Apr 29 09:42:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4f2c975

app-emulation/wine-staging: add 8.7

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/Manifest|   2 +
 app-emulation/wine-staging/wine-staging-8.7.ebuild | 369 +
 2 files changed, 371 insertions(+)

diff --git a/app-emulation/wine-staging/Manifest 
b/app-emulation/wine-staging/Manifest
index c5e47ac0aa9f..bebc7848213e 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,6 +1,8 @@
 DIST wine-8.0.tar.xz 29054044 BLAKE2B 
baf8f96b665119c9f38a148a2472dbe8f6ca8d4641d9d09d48cb72cb4de2585c274b8b7981c2fa622ead6da2f087c57652e9b48edc8a17c0cfd6be9a36732f02
 SHA512 
53ba813b260a65a271ec575822725b97631f60038fb026dcc0fe66862711eedcc29a8feb29ff54ae4f64458f85c290d8f3838eff5e4c77a5420a7d2b951fef77
 DIST wine-8.5.tar.xz 29064032 BLAKE2B 
35fa6d7ec88ff67d9acf13466b3618eb45d664bed0a9ee581e46cb6e7692395837c8c8e86dead1dbcad582ef29c674a0df4b7180addee837b466eba7fdcd350a
 SHA512 
f6aaab8a32eb7bce7f48d21d99417c9e6e8fe41b3d36320762775ef954db7ddd4fcff01d56475f35038d814557834a41a9e3ae85e5cae8a1b820c5044b42a327
 DIST wine-8.6.tar.xz 29118124 BLAKE2B 
e4659785722f0c1adb9ce4a156fbafc8484977a5fe2f4a6e1d5eaf8f1f14c6787f080b9d389cdd8716eb7fd00ee2879fab2042af5dcb970530d2e19628442c73
 SHA512 
602680675f5e062121767769106199179c52a6dd93e97b9b8b4d8365134c72f7745e37d4e3edf6c89c553fb1bfe55b914e77177508fb4f032410d423359abba7
+DIST wine-8.7.tar.xz 29158096 BLAKE2B 
73bd0b5a6eec8a2e37301d8b0f8e9be1ad757f07df3471b0cea17aac6716d456eea1d36fa22bd2451e6cc7662b2b36e4ca628d65216c60d5950f5b439fd2052c
 SHA512 
0a7fe9ad86cf931527c2149207473bf4671d1098af7c21f1b740dfaa84486a8e235fea99b1cad035ff9c3eb20810caab53d51051d63efe626514b79309904d93
 DIST wine-staging-8.0.tar.gz 9529620 BLAKE2B 
c9540195ea885d9f1e980232b0af471e92c61eb079cae35fdb3af5c13d4660b3466f751772440e38f15874082db296d16d1f1d68827a505b2dd949617eda0203
 SHA512 
76a729d7ced1ff634ddb455ddfaa66ca103b652f43cd152b57ada7431bb5fbb74f5e92bf2f4f329b6df6f5908130afad84e609cbce6df645d6cf8131e9b949f9
 DIST wine-staging-8.5.tar.gz 9530306 BLAKE2B 
9457fb44aea427c2c09d6329f2f585ae7e14ca32950204019136616d73ad1b83b629297499197b91fb542784b8e5b6edd8743ee6a72794ce58ef5c6b1d27f308
 SHA512 
9d347c55a62f661bdcc102d373e05d162217b7b1348bdb6f2b114d20e35146862379d2cf03a96916bd1d52166a538af55d48e25a169cd6ee23818673bd35909a
 DIST wine-staging-8.6.1.tar.gz 9527141 BLAKE2B 
be43c642e6caa0f7e28a0aa45f736b839fe277a54c573955940523b6a27a0e4b7b5d531a027aab4a3c21a413fcac129dc16a7241700f2f848061fadafc9e695f
 SHA512 
28bb066b55293e73df072cceb27a191365d6a319d859e6797bc443e830bb6ddd22cdbf7d9692b43e8eb7f2feb68ac1205aa440c60b37ab7c10ebeab83aa590ce
+DIST wine-staging-8.7.tar.gz 9524736 BLAKE2B 
4ae32c77024c41fe660090889958e0016dc6e0d189c1cc938e305cc72297a924ea8209244374baa651ded3bdf62352f9b41e15bb163f200b9b0b3f18ccac2ea5
 SHA512 
42a32b3a5420f358085c510250f3204bc5eb7430c447e7bb5b25046245cf3c54f02684226daffedb65dce093cfa513424523e55d4d3a5b416fdff6e4e1e4a161

diff --git a/app-emulation/wine-staging/wine-staging-8.7.ebuild 
b/app-emulation/wine-staging/wine-staging-8.7.ebuild
new file mode 100644
index ..5fa84f123373
--- /dev/null
+++ b/app-emulation/wine-staging/wine-staging-8.7.ebuild
@@ -0,0 +1,369 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+PYTHON_COMPAT=( python3_{9..11} )
+inherit autotools edo flag-o-matic multilib multilib-build
+inherit python-any-r1 toolchain-funcs wrapper
+
+WINE_GECKO=2.47.4
+WINE_MONO=7.4.0
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git;
+   WINE_EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git;
+else
+   (( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 
1).0
+   SRC_URI="
+   https://dl.winehq.org/wine/source/${WINE_SDIR}/wine-${PV}.tar.xz
+   
https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="-* ~amd64 ~x86"
+fi
+S="${WORKDIR}/wine-${PV}"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging 
patchset"
+HOMEPAGE="https://wiki.winehq.org/Wine-Staging;
+
+LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
+SLOT="${PV}"
+IUSE="
+   +X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos
+   llvm-libunwind debug custom-cflags +fontconfig +gecko gphoto2
+   +gstreamer kerberos +mingw +mono netapi nls opencl +opengl osmesa
+   pcap perl pulseaudio samba scanner +sdl selinux smartcard +ssl
+   +truetype udev udisks +unwind usb v4l +vulkan wayland

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

2023-04-23 Thread Ionen Wolkens

commit: 4791f57ebc94aa4ad5356e2171ca274b51f328f8
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Apr 24 03:06:39 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Apr 24 03:18:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4791f57e

app-emulation/wine-staging: drop 8.3, 8.4

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/Manifest|   4 -
 app-emulation/wine-staging/wine-staging-8.3.ebuild | 366 
 app-emulation/wine-staging/wine-staging-8.4.ebuild | 369 -
 3 files changed, 739 deletions(-)

diff --git a/app-emulation/wine-staging/Manifest 
b/app-emulation/wine-staging/Manifest
index 75698bd47154..c5e47ac0aa9f 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,10 +1,6 @@
 DIST wine-8.0.tar.xz 29054044 BLAKE2B 
baf8f96b665119c9f38a148a2472dbe8f6ca8d4641d9d09d48cb72cb4de2585c274b8b7981c2fa622ead6da2f087c57652e9b48edc8a17c0cfd6be9a36732f02
 SHA512 
53ba813b260a65a271ec575822725b97631f60038fb026dcc0fe66862711eedcc29a8feb29ff54ae4f64458f85c290d8f3838eff5e4c77a5420a7d2b951fef77
-DIST wine-8.3.tar.xz 28983532 BLAKE2B 
b811a13aaa87f186c744254059d40fdf0740da42cf788acb2375c04cf3ecc281c92afc7bb7830d5797624d96f803edcb2d2778c5da378d89938fe0b68e72a287
 SHA512 
9c0c86f1d523cc65fe6bcb2f98e73f8909282eda1c04516ff35a32833e469421e099fe1351c3078ac96aa7884fc194a77fcf2ba8863e2a227316fd84562f1f5a
-DIST wine-8.4.tar.xz 29031312 BLAKE2B 
0b91267a68e4e332544d273646bb1e9389c3af3f48069ab7942096af5512e86a61d39788d91c221b4ae96e81858cfdff1e43a658ba407ff1450b6d752b8a3235
 SHA512 
8de144a65c0a3a2984fabc1294b647b8581da5fa8bd28a9ff756ab59256ee2b453d898453fc902bbc372a4e017a8e29b1eeef917f137ec1134ac08b671eccc7d
 DIST wine-8.5.tar.xz 29064032 BLAKE2B 
35fa6d7ec88ff67d9acf13466b3618eb45d664bed0a9ee581e46cb6e7692395837c8c8e86dead1dbcad582ef29c674a0df4b7180addee837b466eba7fdcd350a
 SHA512 
f6aaab8a32eb7bce7f48d21d99417c9e6e8fe41b3d36320762775ef954db7ddd4fcff01d56475f35038d814557834a41a9e3ae85e5cae8a1b820c5044b42a327
 DIST wine-8.6.tar.xz 29118124 BLAKE2B 
e4659785722f0c1adb9ce4a156fbafc8484977a5fe2f4a6e1d5eaf8f1f14c6787f080b9d389cdd8716eb7fd00ee2879fab2042af5dcb970530d2e19628442c73
 SHA512 
602680675f5e062121767769106199179c52a6dd93e97b9b8b4d8365134c72f7745e37d4e3edf6c89c553fb1bfe55b914e77177508fb4f032410d423359abba7
 DIST wine-staging-8.0.tar.gz 9529620 BLAKE2B 
c9540195ea885d9f1e980232b0af471e92c61eb079cae35fdb3af5c13d4660b3466f751772440e38f15874082db296d16d1f1d68827a505b2dd949617eda0203
 SHA512 
76a729d7ced1ff634ddb455ddfaa66ca103b652f43cd152b57ada7431bb5fbb74f5e92bf2f4f329b6df6f5908130afad84e609cbce6df645d6cf8131e9b949f9
-DIST wine-staging-8.3.tar.gz 9523336 BLAKE2B 
3fdb6343ab3735e9235ea3d99e3da4d392de9620d93e85e2bd3b13ae2e0eca2654b2b48230a3bfd7c66ead1fb751ddb092b361943f7a95eb3df5a240c2b9e32b
 SHA512 
e2b1dc107088f716f1c7e80bc25b152ff5c2c4c4a6f29a60e42eabdea0e8b5df84eaeaf8b978f5aefc3f9ad5962eb74784d5a98b95fa3694485d00f3fa628ce6
-DIST wine-staging-8.4.tar.gz 9522340 BLAKE2B 
b9fb08f529c9c24d9d6b09adbb359b265e246b8f4651eef0983d10b9c84afbdc9c58e04180e802cd3a7d0951f12ff46495b1ec0508e02f5b76ae7d0d987dc22c
 SHA512 
96a6a870020e59f8437c65604536fec4b80d7d9e5a937e5d0a6cb0b2b4e544e6153fa0cdf2a8fd2c32d090001334e68124c2855c6a2a1454fdcdb6ea23d75fd7
 DIST wine-staging-8.5.tar.gz 9530306 BLAKE2B 
9457fb44aea427c2c09d6329f2f585ae7e14ca32950204019136616d73ad1b83b629297499197b91fb542784b8e5b6edd8743ee6a72794ce58ef5c6b1d27f308
 SHA512 
9d347c55a62f661bdcc102d373e05d162217b7b1348bdb6f2b114d20e35146862379d2cf03a96916bd1d52166a538af55d48e25a169cd6ee23818673bd35909a
 DIST wine-staging-8.6.1.tar.gz 9527141 BLAKE2B 
be43c642e6caa0f7e28a0aa45f736b839fe277a54c573955940523b6a27a0e4b7b5d531a027aab4a3c21a413fcac129dc16a7241700f2f848061fadafc9e695f
 SHA512 
28bb066b55293e73df072cceb27a191365d6a319d859e6797bc443e830bb6ddd22cdbf7d9692b43e8eb7f2feb68ac1205aa440c60b37ab7c10ebeab83aa590ce

diff --git a/app-emulation/wine-staging/wine-staging-8.3.ebuild 
b/app-emulation/wine-staging/wine-staging-8.3.ebuild
deleted file mode 100644
index 48fe559d673c..
--- a/app-emulation/wine-staging/wine-staging-8.3.ebuild
+++ /dev/null
@@ -1,366 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-PYTHON_COMPAT=( python3_{9..11} )
-inherit autotools edo flag-o-matic multilib multilib-build
-inherit python-any-r1 toolchain-funcs wrapper
-
-WINE_GECKO=2.47.3
-WINE_MONO=7.4.0
-
-if [[ ${PV} == * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git;
-   WINE_EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git;
-else
-   (( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 
1).0
-   SRC_URI="
-   https://dl.winehq.org/wine/source/${WINE_SDIR}/wine-${PV}.tar.xz
-

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

2023-04-22 Thread Ionen Wolkens

commit: 7dd3f0e5e4cdb858f566f4e0475264958d6b0d22
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Apr 22 05:23:33 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Apr 22 06:51:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7dd3f0e5

app-emulation/wine-staging: update live

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/wine-staging-.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app-emulation/wine-staging/wine-staging-.ebuild 
b/app-emulation/wine-staging/wine-staging-.ebuild
index bf3c16243629..4057184984fe 100644
--- a/app-emulation/wine-staging/wine-staging-.ebuild
+++ b/app-emulation/wine-staging/wine-staging-.ebuild
@@ -132,7 +132,8 @@ BDEPEND="
mingw? ( !crossdev-mingw? (
>=dev-util/mingw64-toolchain-10.0.0_p1-r2[${MULTILIB_USEDEP}]
) )
-   nls? ( sys-devel/gettext )"
+   nls? ( sys-devel/gettext )
+   wayland? ( dev-util/wayland-scanner )"
 IDEPEND=">=app-eselect/eselect-wine-2"
 
 QA_CONFIG_IMPL_DECL_SKIP=(

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

2023-04-17 Thread Ionen Wolkens

commit: 75870f45272bf53da7a979d9ca8891336c97a6a3
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Apr 17 05:56:12 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Apr 17 06:18:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75870f45

app-emulation/wine-staging: add 8.6.1

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/Manifest|   2 +
 .../wine-staging/wine-staging-8.6.1.ebuild | 369 +
 2 files changed, 371 insertions(+)

diff --git a/app-emulation/wine-staging/Manifest 
b/app-emulation/wine-staging/Manifest
index ec414e8b5d9c..75698bd47154 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -2,7 +2,9 @@ DIST wine-8.0.tar.xz 29054044 BLAKE2B 
baf8f96b665119c9f38a148a2472dbe8f6ca8d4641
 DIST wine-8.3.tar.xz 28983532 BLAKE2B 
b811a13aaa87f186c744254059d40fdf0740da42cf788acb2375c04cf3ecc281c92afc7bb7830d5797624d96f803edcb2d2778c5da378d89938fe0b68e72a287
 SHA512 
9c0c86f1d523cc65fe6bcb2f98e73f8909282eda1c04516ff35a32833e469421e099fe1351c3078ac96aa7884fc194a77fcf2ba8863e2a227316fd84562f1f5a
 DIST wine-8.4.tar.xz 29031312 BLAKE2B 
0b91267a68e4e332544d273646bb1e9389c3af3f48069ab7942096af5512e86a61d39788d91c221b4ae96e81858cfdff1e43a658ba407ff1450b6d752b8a3235
 SHA512 
8de144a65c0a3a2984fabc1294b647b8581da5fa8bd28a9ff756ab59256ee2b453d898453fc902bbc372a4e017a8e29b1eeef917f137ec1134ac08b671eccc7d
 DIST wine-8.5.tar.xz 29064032 BLAKE2B 
35fa6d7ec88ff67d9acf13466b3618eb45d664bed0a9ee581e46cb6e7692395837c8c8e86dead1dbcad582ef29c674a0df4b7180addee837b466eba7fdcd350a
 SHA512 
f6aaab8a32eb7bce7f48d21d99417c9e6e8fe41b3d36320762775ef954db7ddd4fcff01d56475f35038d814557834a41a9e3ae85e5cae8a1b820c5044b42a327
+DIST wine-8.6.tar.xz 29118124 BLAKE2B 
e4659785722f0c1adb9ce4a156fbafc8484977a5fe2f4a6e1d5eaf8f1f14c6787f080b9d389cdd8716eb7fd00ee2879fab2042af5dcb970530d2e19628442c73
 SHA512 
602680675f5e062121767769106199179c52a6dd93e97b9b8b4d8365134c72f7745e37d4e3edf6c89c553fb1bfe55b914e77177508fb4f032410d423359abba7
 DIST wine-staging-8.0.tar.gz 9529620 BLAKE2B 
c9540195ea885d9f1e980232b0af471e92c61eb079cae35fdb3af5c13d4660b3466f751772440e38f15874082db296d16d1f1d68827a505b2dd949617eda0203
 SHA512 
76a729d7ced1ff634ddb455ddfaa66ca103b652f43cd152b57ada7431bb5fbb74f5e92bf2f4f329b6df6f5908130afad84e609cbce6df645d6cf8131e9b949f9
 DIST wine-staging-8.3.tar.gz 9523336 BLAKE2B 
3fdb6343ab3735e9235ea3d99e3da4d392de9620d93e85e2bd3b13ae2e0eca2654b2b48230a3bfd7c66ead1fb751ddb092b361943f7a95eb3df5a240c2b9e32b
 SHA512 
e2b1dc107088f716f1c7e80bc25b152ff5c2c4c4a6f29a60e42eabdea0e8b5df84eaeaf8b978f5aefc3f9ad5962eb74784d5a98b95fa3694485d00f3fa628ce6
 DIST wine-staging-8.4.tar.gz 9522340 BLAKE2B 
b9fb08f529c9c24d9d6b09adbb359b265e246b8f4651eef0983d10b9c84afbdc9c58e04180e802cd3a7d0951f12ff46495b1ec0508e02f5b76ae7d0d987dc22c
 SHA512 
96a6a870020e59f8437c65604536fec4b80d7d9e5a937e5d0a6cb0b2b4e544e6153fa0cdf2a8fd2c32d090001334e68124c2855c6a2a1454fdcdb6ea23d75fd7
 DIST wine-staging-8.5.tar.gz 9530306 BLAKE2B 
9457fb44aea427c2c09d6329f2f585ae7e14ca32950204019136616d73ad1b83b629297499197b91fb542784b8e5b6edd8743ee6a72794ce58ef5c6b1d27f308
 SHA512 
9d347c55a62f661bdcc102d373e05d162217b7b1348bdb6f2b114d20e35146862379d2cf03a96916bd1d52166a538af55d48e25a169cd6ee23818673bd35909a
+DIST wine-staging-8.6.1.tar.gz 9527141 BLAKE2B 
be43c642e6caa0f7e28a0aa45f736b839fe277a54c573955940523b6a27a0e4b7b5d531a027aab4a3c21a413fcac129dc16a7241700f2f848061fadafc9e695f
 SHA512 
28bb066b55293e73df072cceb27a191365d6a319d859e6797bc443e830bb6ddd22cdbf7d9692b43e8eb7f2feb68ac1205aa440c60b37ab7c10ebeab83aa590ce

diff --git a/app-emulation/wine-staging/wine-staging-8.6.1.ebuild 
b/app-emulation/wine-staging/wine-staging-8.6.1.ebuild
new file mode 100644
index ..61b4b60e0323
--- /dev/null
+++ b/app-emulation/wine-staging/wine-staging-8.6.1.ebuild
@@ -0,0 +1,369 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+PYTHON_COMPAT=( python3_{9..11} )
+inherit autotools edo flag-o-matic multilib multilib-build
+inherit python-any-r1 toolchain-funcs wrapper
+
+WINE_GECKO=2.47.4
+WINE_MONO=7.4.0
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git;
+   WINE_EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git;
+else
+   (( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 
1).0
+   SRC_URI="
+   https://dl.winehq.org/wine/source/${WINE_SDIR}/wine-$(ver_cut 
1-2).tar.xz
+   
https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="-* ~amd64 ~x86"
+fi
+S="${WORKDIR}/wine-$(ver_cut 1-2)"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging 
patchset"
+HOMEPAGE="https://wiki.winehq.org/Wine-Staging;
+
+LICENSE="LGPL-2.1+

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

2023-04-11 Thread Ionen Wolkens

commit: f072942fbf2a3f9ce6613b514ad5ea1f73f366db
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Apr 11 12:00:41 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Apr 11 12:00:41 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f072942f

app-emulation/wine-staging: bump to wine-gecko-2.47.4 in live

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/wine-staging-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/wine-staging/wine-staging-.ebuild 
b/app-emulation/wine-staging/wine-staging-.ebuild
index 5f90e2ce8870..bf3c16243629 100644
--- a/app-emulation/wine-staging/wine-staging-.ebuild
+++ b/app-emulation/wine-staging/wine-staging-.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{9..11} )
 inherit autotools edo flag-o-matic multilib multilib-build
 inherit python-any-r1 toolchain-funcs wrapper
 
-WINE_GECKO=2.47.3
+WINE_GECKO=2.47.4
 WINE_MONO=7.4.0
 
 if [[ ${PV} == * ]]; then

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

2023-03-31 Thread Ionen Wolkens

commit: 1cc0f7496ab07fd4d4609b0a09f247e31f4a4bb6
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Apr  1 05:26:19 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Apr  1 05:49:29 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cc0f749

app-emulation/wine-staging: add 8.5

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/Manifest|   2 +
 app-emulation/wine-staging/wine-staging-8.5.ebuild | 369 +
 2 files changed, 371 insertions(+)

diff --git a/app-emulation/wine-staging/Manifest 
b/app-emulation/wine-staging/Manifest
index 8452c64d3c73..ec414e8b5d9c 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,6 +1,8 @@
 DIST wine-8.0.tar.xz 29054044 BLAKE2B 
baf8f96b665119c9f38a148a2472dbe8f6ca8d4641d9d09d48cb72cb4de2585c274b8b7981c2fa622ead6da2f087c57652e9b48edc8a17c0cfd6be9a36732f02
 SHA512 
53ba813b260a65a271ec575822725b97631f60038fb026dcc0fe66862711eedcc29a8feb29ff54ae4f64458f85c290d8f3838eff5e4c77a5420a7d2b951fef77
 DIST wine-8.3.tar.xz 28983532 BLAKE2B 
b811a13aaa87f186c744254059d40fdf0740da42cf788acb2375c04cf3ecc281c92afc7bb7830d5797624d96f803edcb2d2778c5da378d89938fe0b68e72a287
 SHA512 
9c0c86f1d523cc65fe6bcb2f98e73f8909282eda1c04516ff35a32833e469421e099fe1351c3078ac96aa7884fc194a77fcf2ba8863e2a227316fd84562f1f5a
 DIST wine-8.4.tar.xz 29031312 BLAKE2B 
0b91267a68e4e332544d273646bb1e9389c3af3f48069ab7942096af5512e86a61d39788d91c221b4ae96e81858cfdff1e43a658ba407ff1450b6d752b8a3235
 SHA512 
8de144a65c0a3a2984fabc1294b647b8581da5fa8bd28a9ff756ab59256ee2b453d898453fc902bbc372a4e017a8e29b1eeef917f137ec1134ac08b671eccc7d
+DIST wine-8.5.tar.xz 29064032 BLAKE2B 
35fa6d7ec88ff67d9acf13466b3618eb45d664bed0a9ee581e46cb6e7692395837c8c8e86dead1dbcad582ef29c674a0df4b7180addee837b466eba7fdcd350a
 SHA512 
f6aaab8a32eb7bce7f48d21d99417c9e6e8fe41b3d36320762775ef954db7ddd4fcff01d56475f35038d814557834a41a9e3ae85e5cae8a1b820c5044b42a327
 DIST wine-staging-8.0.tar.gz 9529620 BLAKE2B 
c9540195ea885d9f1e980232b0af471e92c61eb079cae35fdb3af5c13d4660b3466f751772440e38f15874082db296d16d1f1d68827a505b2dd949617eda0203
 SHA512 
76a729d7ced1ff634ddb455ddfaa66ca103b652f43cd152b57ada7431bb5fbb74f5e92bf2f4f329b6df6f5908130afad84e609cbce6df645d6cf8131e9b949f9
 DIST wine-staging-8.3.tar.gz 9523336 BLAKE2B 
3fdb6343ab3735e9235ea3d99e3da4d392de9620d93e85e2bd3b13ae2e0eca2654b2b48230a3bfd7c66ead1fb751ddb092b361943f7a95eb3df5a240c2b9e32b
 SHA512 
e2b1dc107088f716f1c7e80bc25b152ff5c2c4c4a6f29a60e42eabdea0e8b5df84eaeaf8b978f5aefc3f9ad5962eb74784d5a98b95fa3694485d00f3fa628ce6
 DIST wine-staging-8.4.tar.gz 9522340 BLAKE2B 
b9fb08f529c9c24d9d6b09adbb359b265e246b8f4651eef0983d10b9c84afbdc9c58e04180e802cd3a7d0951f12ff46495b1ec0508e02f5b76ae7d0d987dc22c
 SHA512 
96a6a870020e59f8437c65604536fec4b80d7d9e5a937e5d0a6cb0b2b4e544e6153fa0cdf2a8fd2c32d090001334e68124c2855c6a2a1454fdcdb6ea23d75fd7
+DIST wine-staging-8.5.tar.gz 9530306 BLAKE2B 
9457fb44aea427c2c09d6329f2f585ae7e14ca32950204019136616d73ad1b83b629297499197b91fb542784b8e5b6edd8743ee6a72794ce58ef5c6b1d27f308
 SHA512 
9d347c55a62f661bdcc102d373e05d162217b7b1348bdb6f2b114d20e35146862379d2cf03a96916bd1d52166a538af55d48e25a169cd6ee23818673bd35909a

diff --git a/app-emulation/wine-staging/wine-staging-8.5.ebuild 
b/app-emulation/wine-staging/wine-staging-8.5.ebuild
new file mode 100644
index ..5f90e2ce8870
--- /dev/null
+++ b/app-emulation/wine-staging/wine-staging-8.5.ebuild
@@ -0,0 +1,369 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+PYTHON_COMPAT=( python3_{9..11} )
+inherit autotools edo flag-o-matic multilib multilib-build
+inherit python-any-r1 toolchain-funcs wrapper
+
+WINE_GECKO=2.47.3
+WINE_MONO=7.4.0
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git;
+   WINE_EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git;
+else
+   (( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 
1).0
+   SRC_URI="
+   https://dl.winehq.org/wine/source/${WINE_SDIR}/wine-${PV}.tar.xz
+   
https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="-* ~amd64 ~x86"
+fi
+S="${WORKDIR}/wine-${PV}"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging 
patchset"
+HOMEPAGE="https://wiki.winehq.org/Wine-Staging;
+
+LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
+SLOT="${PV}"
+IUSE="
+   +X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos
+   llvm-libunwind debug custom-cflags +fontconfig +gecko gphoto2
+   +gstreamer kerberos +mingw +mono netapi nls opencl +opengl osmesa
+   pcap perl pulseaudio samba scanner +sdl selinux smartcard +ssl
+   +truetype udev udisks +unwind usb v4l +vulkan wayland

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

2023-03-31 Thread Ionen Wolkens

commit: 57042381a29ab2a63b44cd2f61a123242055c9e5
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Apr  1 05:23:59 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Apr  1 05:49:28 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57042381

app-emulation/wine-staging: drop 8.1, 8.2

Guess can keep "stable" 8.0 for now, albeit it doesn't make
that much sense with wine-staging given it won't get updated
when e.g. 8.0.1 comes out.

Just to keep "some" non-vanilla extras for regressions anyway,
can remove old versions when they start to cause problems.

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/Manifest|   4 -
 app-emulation/wine-staging/wine-staging-8.1.ebuild | 359 
 app-emulation/wine-staging/wine-staging-8.2.ebuild | 364 -
 3 files changed, 727 deletions(-)

diff --git a/app-emulation/wine-staging/Manifest 
b/app-emulation/wine-staging/Manifest
index 5935f910d20b..8452c64d3c73 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,10 +1,6 @@
 DIST wine-8.0.tar.xz 29054044 BLAKE2B 
baf8f96b665119c9f38a148a2472dbe8f6ca8d4641d9d09d48cb72cb4de2585c274b8b7981c2fa622ead6da2f087c57652e9b48edc8a17c0cfd6be9a36732f02
 SHA512 
53ba813b260a65a271ec575822725b97631f60038fb026dcc0fe66862711eedcc29a8feb29ff54ae4f64458f85c290d8f3838eff5e4c77a5420a7d2b951fef77
-DIST wine-8.1.tar.xz 29083080 BLAKE2B 
6eed2128627f15159ad80588ebe839de76cb9a536797d7da136b61f56033ece60c60208702b7928cdb297c1d8730baae0d6bb0ac7a0473c34ed44b5c5edaaec5
 SHA512 
3f0477c26f293cf928acbdae2ffb98740ac227a605ec90f3ab3d35c0dbca2037529ff4e4de0b69cc975579ad14dc2fb8b52e050cfd99cffcc627418cf8cb4346
-DIST wine-8.2.tar.xz 29129032 BLAKE2B 
831a5d1c8228050db9257ed60dc77ed0a391f16ee16d2e5563eabbf8f7d988655477327e1081baf947b173e8eb716b15fb72d1daa70d5ade52508c7f1cc2c231
 SHA512 
d0b8bb8c6d75034519bdf48d52b89f9d44ba4f7306a0b8f860cbb2c4c39d8fae3c2d9c12be37427b9a9cbdb7dd8701844d0a74c245dd7a9e8a423cb56962b254
 DIST wine-8.3.tar.xz 28983532 BLAKE2B 
b811a13aaa87f186c744254059d40fdf0740da42cf788acb2375c04cf3ecc281c92afc7bb7830d5797624d96f803edcb2d2778c5da378d89938fe0b68e72a287
 SHA512 
9c0c86f1d523cc65fe6bcb2f98e73f8909282eda1c04516ff35a32833e469421e099fe1351c3078ac96aa7884fc194a77fcf2ba8863e2a227316fd84562f1f5a
 DIST wine-8.4.tar.xz 29031312 BLAKE2B 
0b91267a68e4e332544d273646bb1e9389c3af3f48069ab7942096af5512e86a61d39788d91c221b4ae96e81858cfdff1e43a658ba407ff1450b6d752b8a3235
 SHA512 
8de144a65c0a3a2984fabc1294b647b8581da5fa8bd28a9ff756ab59256ee2b453d898453fc902bbc372a4e017a8e29b1eeef917f137ec1134ac08b671eccc7d
 DIST wine-staging-8.0.tar.gz 9529620 BLAKE2B 
c9540195ea885d9f1e980232b0af471e92c61eb079cae35fdb3af5c13d4660b3466f751772440e38f15874082db296d16d1f1d68827a505b2dd949617eda0203
 SHA512 
76a729d7ced1ff634ddb455ddfaa66ca103b652f43cd152b57ada7431bb5fbb74f5e92bf2f4f329b6df6f5908130afad84e609cbce6df645d6cf8131e9b949f9
-DIST wine-staging-8.1.tar.gz 9527176 BLAKE2B 
363243a4a04bc767099b74f3b7613463d99da82996c176e68b9233cbf51c87ecd143840f7729a3edc31ac004b771b89ec3d57a0276b26e30d475feb273d09257
 SHA512 
c5c3111b27de7d3bf1d7a3a53f33e8d78c5006f22ff0361f77392455fa69b0afd7c58406515ace04b2df7e1dfb20e3adf9d874e5e8be09c9032c1c1aa31fe696
-DIST wine-staging-8.2.tar.gz 9528476 BLAKE2B 
e6fb4d15e9b94c9196c1f472ac50fbd3eabe34ef4a54493ca11b702448c4039c5a4f13fb1119a88477924e204c6e1972b1b25efe742118beec01f71a9d879aa2
 SHA512 
24bbfb6d03ca8282de058019cbbee57b36f8fdcf3e485f2ca94dbcf50614cf6c80e31103196d11fe48c77953d59a741ae2baf6987e56a88bea038ed16b692ad9
 DIST wine-staging-8.3.tar.gz 9523336 BLAKE2B 
3fdb6343ab3735e9235ea3d99e3da4d392de9620d93e85e2bd3b13ae2e0eca2654b2b48230a3bfd7c66ead1fb751ddb092b361943f7a95eb3df5a240c2b9e32b
 SHA512 
e2b1dc107088f716f1c7e80bc25b152ff5c2c4c4a6f29a60e42eabdea0e8b5df84eaeaf8b978f5aefc3f9ad5962eb74784d5a98b95fa3694485d00f3fa628ce6
 DIST wine-staging-8.4.tar.gz 9522340 BLAKE2B 
b9fb08f529c9c24d9d6b09adbb359b265e246b8f4651eef0983d10b9c84afbdc9c58e04180e802cd3a7d0951f12ff46495b1ec0508e02f5b76ae7d0d987dc22c
 SHA512 
96a6a870020e59f8437c65604536fec4b80d7d9e5a937e5d0a6cb0b2b4e544e6153fa0cdf2a8fd2c32d090001334e68124c2855c6a2a1454fdcdb6ea23d75fd7

diff --git a/app-emulation/wine-staging/wine-staging-8.1.ebuild 
b/app-emulation/wine-staging/wine-staging-8.1.ebuild
deleted file mode 100644
index 99e23c456d39..
--- a/app-emulation/wine-staging/wine-staging-8.1.ebuild
+++ /dev/null
@@ -1,359 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-inherit autotools flag-o-matic multilib multilib-build toolchain-funcs wrapper
-
-WINE_GECKO=2.47.3
-WINE_MONO=7.4.0
-
-if [[ ${PV} == * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git;
-   WINE_EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git;
-else
-   ((

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

2023-03-19 Thread Ionen Wolkens

commit: f874f0f48a15e81c838dd4de2117215816d9931d
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sun Mar 19 05:02:43 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sun Mar 19 08:24:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f874f0f4

app-emulation/wine-staging: add 8.4

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/Manifest|   2 +
 app-emulation/wine-staging/wine-staging-8.4.ebuild | 369 +
 2 files changed, 371 insertions(+)

diff --git a/app-emulation/wine-staging/Manifest 
b/app-emulation/wine-staging/Manifest
index 197982707bc1..5935f910d20b 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -2,7 +2,9 @@ DIST wine-8.0.tar.xz 29054044 BLAKE2B 
baf8f96b665119c9f38a148a2472dbe8f6ca8d4641
 DIST wine-8.1.tar.xz 29083080 BLAKE2B 
6eed2128627f15159ad80588ebe839de76cb9a536797d7da136b61f56033ece60c60208702b7928cdb297c1d8730baae0d6bb0ac7a0473c34ed44b5c5edaaec5
 SHA512 
3f0477c26f293cf928acbdae2ffb98740ac227a605ec90f3ab3d35c0dbca2037529ff4e4de0b69cc975579ad14dc2fb8b52e050cfd99cffcc627418cf8cb4346
 DIST wine-8.2.tar.xz 29129032 BLAKE2B 
831a5d1c8228050db9257ed60dc77ed0a391f16ee16d2e5563eabbf8f7d988655477327e1081baf947b173e8eb716b15fb72d1daa70d5ade52508c7f1cc2c231
 SHA512 
d0b8bb8c6d75034519bdf48d52b89f9d44ba4f7306a0b8f860cbb2c4c39d8fae3c2d9c12be37427b9a9cbdb7dd8701844d0a74c245dd7a9e8a423cb56962b254
 DIST wine-8.3.tar.xz 28983532 BLAKE2B 
b811a13aaa87f186c744254059d40fdf0740da42cf788acb2375c04cf3ecc281c92afc7bb7830d5797624d96f803edcb2d2778c5da378d89938fe0b68e72a287
 SHA512 
9c0c86f1d523cc65fe6bcb2f98e73f8909282eda1c04516ff35a32833e469421e099fe1351c3078ac96aa7884fc194a77fcf2ba8863e2a227316fd84562f1f5a
+DIST wine-8.4.tar.xz 29031312 BLAKE2B 
0b91267a68e4e332544d273646bb1e9389c3af3f48069ab7942096af5512e86a61d39788d91c221b4ae96e81858cfdff1e43a658ba407ff1450b6d752b8a3235
 SHA512 
8de144a65c0a3a2984fabc1294b647b8581da5fa8bd28a9ff756ab59256ee2b453d898453fc902bbc372a4e017a8e29b1eeef917f137ec1134ac08b671eccc7d
 DIST wine-staging-8.0.tar.gz 9529620 BLAKE2B 
c9540195ea885d9f1e980232b0af471e92c61eb079cae35fdb3af5c13d4660b3466f751772440e38f15874082db296d16d1f1d68827a505b2dd949617eda0203
 SHA512 
76a729d7ced1ff634ddb455ddfaa66ca103b652f43cd152b57ada7431bb5fbb74f5e92bf2f4f329b6df6f5908130afad84e609cbce6df645d6cf8131e9b949f9
 DIST wine-staging-8.1.tar.gz 9527176 BLAKE2B 
363243a4a04bc767099b74f3b7613463d99da82996c176e68b9233cbf51c87ecd143840f7729a3edc31ac004b771b89ec3d57a0276b26e30d475feb273d09257
 SHA512 
c5c3111b27de7d3bf1d7a3a53f33e8d78c5006f22ff0361f77392455fa69b0afd7c58406515ace04b2df7e1dfb20e3adf9d874e5e8be09c9032c1c1aa31fe696
 DIST wine-staging-8.2.tar.gz 9528476 BLAKE2B 
e6fb4d15e9b94c9196c1f472ac50fbd3eabe34ef4a54493ca11b702448c4039c5a4f13fb1119a88477924e204c6e1972b1b25efe742118beec01f71a9d879aa2
 SHA512 
24bbfb6d03ca8282de058019cbbee57b36f8fdcf3e485f2ca94dbcf50614cf6c80e31103196d11fe48c77953d59a741ae2baf6987e56a88bea038ed16b692ad9
 DIST wine-staging-8.3.tar.gz 9523336 BLAKE2B 
3fdb6343ab3735e9235ea3d99e3da4d392de9620d93e85e2bd3b13ae2e0eca2654b2b48230a3bfd7c66ead1fb751ddb092b361943f7a95eb3df5a240c2b9e32b
 SHA512 
e2b1dc107088f716f1c7e80bc25b152ff5c2c4c4a6f29a60e42eabdea0e8b5df84eaeaf8b978f5aefc3f9ad5962eb74784d5a98b95fa3694485d00f3fa628ce6
+DIST wine-staging-8.4.tar.gz 9522340 BLAKE2B 
b9fb08f529c9c24d9d6b09adbb359b265e246b8f4651eef0983d10b9c84afbdc9c58e04180e802cd3a7d0951f12ff46495b1ec0508e02f5b76ae7d0d987dc22c
 SHA512 
96a6a870020e59f8437c65604536fec4b80d7d9e5a937e5d0a6cb0b2b4e544e6153fa0cdf2a8fd2c32d090001334e68124c2855c6a2a1454fdcdb6ea23d75fd7

diff --git a/app-emulation/wine-staging/wine-staging-8.4.ebuild 
b/app-emulation/wine-staging/wine-staging-8.4.ebuild
new file mode 100644
index ..5f90e2ce8870
--- /dev/null
+++ b/app-emulation/wine-staging/wine-staging-8.4.ebuild
@@ -0,0 +1,369 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+PYTHON_COMPAT=( python3_{9..11} )
+inherit autotools edo flag-o-matic multilib multilib-build
+inherit python-any-r1 toolchain-funcs wrapper
+
+WINE_GECKO=2.47.3
+WINE_MONO=7.4.0
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git;
+   WINE_EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git;
+else
+   (( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 
1).0
+   SRC_URI="
+   https://dl.winehq.org/wine/source/${WINE_SDIR}/wine-${PV}.tar.xz
+   
https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="-* ~amd64 ~x86"
+fi
+S="${WORKDIR}/wine-${PV}"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging 
patchset"
+HOMEPAGE="https://wiki.winehq.org/Wine-Staging;
+
+LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB

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

2023-03-16 Thread Ionen Wolkens

commit: 29e4a14ba29f05f5a591c7443732bffab5edc2b5
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Mar 16 21:30:57 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Mar 16 21:48:41 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29e4a14b

app-emulation/wine-staging: add IUSE=wayland in live

Not that should expect this to be useful yet, it's early
work in progress. But the option exists so let's add it
for anyone interested.

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/wine-staging-.ebuild | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app-emulation/wine-staging/wine-staging-.ebuild 
b/app-emulation/wine-staging/wine-staging-.ebuild
index 48fe559d673c..5f90e2ce8870 100644
--- a/app-emulation/wine-staging/wine-staging-.ebuild
+++ b/app-emulation/wine-staging/wine-staging-.ebuild
@@ -34,7 +34,8 @@ IUSE="
llvm-libunwind debug custom-cflags +fontconfig +gecko gphoto2
+gstreamer kerberos +mingw +mono netapi nls opencl +opengl osmesa
pcap perl pulseaudio samba scanner +sdl selinux smartcard +ssl
-   +truetype udev udisks +unwind usb v4l +vulkan +xcomposite xinerama"
+   +truetype udev udisks +unwind usb v4l +vulkan wayland +xcomposite
+   xinerama"
 REQUIRED_USE="
X? ( truetype )
crossdev-mingw? ( mingw )" # bug #551124 for truetype
@@ -93,7 +94,8 @@ WINE_COMMON_DEPEND="
llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
)
-   usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )"
+   usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
+   wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )"
 RDEPEND="
${WINE_COMMON_DEPEND}
app-emulation/wine-desktop-common
@@ -250,6 +252,7 @@ src_configure() {
$(use_with usb)
$(use_with v4l v4l2)
$(use_with vulkan)
+   $(use_with wayland)
$(use_with xcomposite)
$(use_with xinerama)
)

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

2023-03-08 Thread Ionen Wolkens

commit: 538a9b0d5b4da1675ff93908999e3e88ce38be4d
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Mar  8 09:58:08 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Mar  8 10:03:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=538a9b0d

app-emulation/wine-staging: skip QA for implicit __clear_cache too

Tests for a compiler builtin that is not declared by anything, however
we can lazily ignore it because __clear_cache is not used by wine on
amd64+x86 either way.

Closes: https://bugs.gentoo.org/900334
Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/wine-staging-8.0.ebuild  | 5 -
 app-emulation/wine-staging/wine-staging-8.1.ebuild  | 5 -
 app-emulation/wine-staging/wine-staging-8.2.ebuild  | 5 -
 app-emulation/wine-staging/wine-staging-8.3.ebuild  | 5 -
 app-emulation/wine-staging/wine-staging-.ebuild | 5 -
 5 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/app-emulation/wine-staging/wine-staging-8.0.ebuild 
b/app-emulation/wine-staging/wine-staging-8.0.ebuild
index 6d0fce43bdc4..46496d8f280b 100644
--- a/app-emulation/wine-staging/wine-staging-8.0.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.0.ebuild
@@ -122,7 +122,10 @@ BDEPEND="
nls? ( sys-devel/gettext )"
 IDEPEND=">=app-eselect/eselect-wine-2"
 
-QA_CONFIG_IMPL_DECL_SKIP=( res_getservers )
+QA_CONFIG_IMPL_DECL_SKIP=(
+   __clear_cache # unused on amd64+x86 (bug #900334)
+   res_getservers # false positive
+)
 QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
 
 PATCHES=(

diff --git a/app-emulation/wine-staging/wine-staging-8.1.ebuild 
b/app-emulation/wine-staging/wine-staging-8.1.ebuild
index 4c27aba38ee4..99e23c456d39 100644
--- a/app-emulation/wine-staging/wine-staging-8.1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.1.ebuild
@@ -122,7 +122,10 @@ BDEPEND="
nls? ( sys-devel/gettext )"
 IDEPEND=">=app-eselect/eselect-wine-2"
 
-QA_CONFIG_IMPL_DECL_SKIP=( res_getservers )
+QA_CONFIG_IMPL_DECL_SKIP=(
+   __clear_cache # unused on amd64+x86 (bug #900334)
+   res_getservers # false positive
+)
 QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
 
 PATCHES=(

diff --git a/app-emulation/wine-staging/wine-staging-8.2.ebuild 
b/app-emulation/wine-staging/wine-staging-8.2.ebuild
index 9457d9533997..6a7f5b83594b 100644
--- a/app-emulation/wine-staging/wine-staging-8.2.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.2.ebuild
@@ -132,7 +132,10 @@ BDEPEND="
nls? ( sys-devel/gettext )"
 IDEPEND=">=app-eselect/eselect-wine-2"
 
-QA_CONFIG_IMPL_DECL_SKIP=( res_getservers )
+QA_CONFIG_IMPL_DECL_SKIP=(
+   __clear_cache # unused on amd64+x86 (bug #900334)
+   res_getservers # false positive
+)
 QA_FLAGS_IGNORED="usr/lib/.*/wine/.*-unix/odbc32.so" # has no compiled objects
 QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
 

diff --git a/app-emulation/wine-staging/wine-staging-8.3.ebuild 
b/app-emulation/wine-staging/wine-staging-8.3.ebuild
index bcdbcf4db2b8..48fe559d673c 100644
--- a/app-emulation/wine-staging/wine-staging-8.3.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.3.ebuild
@@ -133,7 +133,10 @@ BDEPEND="
nls? ( sys-devel/gettext )"
 IDEPEND=">=app-eselect/eselect-wine-2"
 
-QA_CONFIG_IMPL_DECL_SKIP=( res_getservers )
+QA_CONFIG_IMPL_DECL_SKIP=(
+   __clear_cache # unused on amd64+x86 (bug #900334)
+   res_getservers # false positive
+)
 QA_FLAGS_IGNORED="usr/lib/.*/wine/.*-unix/odbc32.so" # has no compiled objects
 QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
 

diff --git a/app-emulation/wine-staging/wine-staging-.ebuild 
b/app-emulation/wine-staging/wine-staging-.ebuild
index bcdbcf4db2b8..48fe559d673c 100644
--- a/app-emulation/wine-staging/wine-staging-.ebuild
+++ b/app-emulation/wine-staging/wine-staging-.ebuild
@@ -133,7 +133,10 @@ BDEPEND="
nls? ( sys-devel/gettext )"
 IDEPEND=">=app-eselect/eselect-wine-2"
 
-QA_CONFIG_IMPL_DECL_SKIP=( res_getservers )
+QA_CONFIG_IMPL_DECL_SKIP=(
+   __clear_cache # unused on amd64+x86 (bug #900334)
+   res_getservers # false positive
+)
 QA_FLAGS_IGNORED="usr/lib/.*/wine/.*-unix/odbc32.so" # has no compiled objects
 QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext

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

2023-03-05 Thread Ionen Wolkens

commit: 75f7303b4da79ce4281e79f66fc631eaaff691fa
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sun Mar  5 09:08:48 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sun Mar  5 09:26:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75f7303b

app-emulation/wine-staging: add 8.3

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/Manifest|   2 +
 app-emulation/wine-staging/wine-staging-8.3.ebuild | 363 +
 2 files changed, 365 insertions(+)

diff --git a/app-emulation/wine-staging/Manifest 
b/app-emulation/wine-staging/Manifest
index 79910483b818..197982707bc1 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,6 +1,8 @@
 DIST wine-8.0.tar.xz 29054044 BLAKE2B 
baf8f96b665119c9f38a148a2472dbe8f6ca8d4641d9d09d48cb72cb4de2585c274b8b7981c2fa622ead6da2f087c57652e9b48edc8a17c0cfd6be9a36732f02
 SHA512 
53ba813b260a65a271ec575822725b97631f60038fb026dcc0fe66862711eedcc29a8feb29ff54ae4f64458f85c290d8f3838eff5e4c77a5420a7d2b951fef77
 DIST wine-8.1.tar.xz 29083080 BLAKE2B 
6eed2128627f15159ad80588ebe839de76cb9a536797d7da136b61f56033ece60c60208702b7928cdb297c1d8730baae0d6bb0ac7a0473c34ed44b5c5edaaec5
 SHA512 
3f0477c26f293cf928acbdae2ffb98740ac227a605ec90f3ab3d35c0dbca2037529ff4e4de0b69cc975579ad14dc2fb8b52e050cfd99cffcc627418cf8cb4346
 DIST wine-8.2.tar.xz 29129032 BLAKE2B 
831a5d1c8228050db9257ed60dc77ed0a391f16ee16d2e5563eabbf8f7d988655477327e1081baf947b173e8eb716b15fb72d1daa70d5ade52508c7f1cc2c231
 SHA512 
d0b8bb8c6d75034519bdf48d52b89f9d44ba4f7306a0b8f860cbb2c4c39d8fae3c2d9c12be37427b9a9cbdb7dd8701844d0a74c245dd7a9e8a423cb56962b254
+DIST wine-8.3.tar.xz 28983532 BLAKE2B 
b811a13aaa87f186c744254059d40fdf0740da42cf788acb2375c04cf3ecc281c92afc7bb7830d5797624d96f803edcb2d2778c5da378d89938fe0b68e72a287
 SHA512 
9c0c86f1d523cc65fe6bcb2f98e73f8909282eda1c04516ff35a32833e469421e099fe1351c3078ac96aa7884fc194a77fcf2ba8863e2a227316fd84562f1f5a
 DIST wine-staging-8.0.tar.gz 9529620 BLAKE2B 
c9540195ea885d9f1e980232b0af471e92c61eb079cae35fdb3af5c13d4660b3466f751772440e38f15874082db296d16d1f1d68827a505b2dd949617eda0203
 SHA512 
76a729d7ced1ff634ddb455ddfaa66ca103b652f43cd152b57ada7431bb5fbb74f5e92bf2f4f329b6df6f5908130afad84e609cbce6df645d6cf8131e9b949f9
 DIST wine-staging-8.1.tar.gz 9527176 BLAKE2B 
363243a4a04bc767099b74f3b7613463d99da82996c176e68b9233cbf51c87ecd143840f7729a3edc31ac004b771b89ec3d57a0276b26e30d475feb273d09257
 SHA512 
c5c3111b27de7d3bf1d7a3a53f33e8d78c5006f22ff0361f77392455fa69b0afd7c58406515ace04b2df7e1dfb20e3adf9d874e5e8be09c9032c1c1aa31fe696
 DIST wine-staging-8.2.tar.gz 9528476 BLAKE2B 
e6fb4d15e9b94c9196c1f472ac50fbd3eabe34ef4a54493ca11b702448c4039c5a4f13fb1119a88477924e204c6e1972b1b25efe742118beec01f71a9d879aa2
 SHA512 
24bbfb6d03ca8282de058019cbbee57b36f8fdcf3e485f2ca94dbcf50614cf6c80e31103196d11fe48c77953d59a741ae2baf6987e56a88bea038ed16b692ad9
+DIST wine-staging-8.3.tar.gz 9523336 BLAKE2B 
3fdb6343ab3735e9235ea3d99e3da4d392de9620d93e85e2bd3b13ae2e0eca2654b2b48230a3bfd7c66ead1fb751ddb092b361943f7a95eb3df5a240c2b9e32b
 SHA512 
e2b1dc107088f716f1c7e80bc25b152ff5c2c4c4a6f29a60e42eabdea0e8b5df84eaeaf8b978f5aefc3f9ad5962eb74784d5a98b95fa3694485d00f3fa628ce6

diff --git a/app-emulation/wine-staging/wine-staging-8.3.ebuild 
b/app-emulation/wine-staging/wine-staging-8.3.ebuild
new file mode 100644
index ..bcdbcf4db2b8
--- /dev/null
+++ b/app-emulation/wine-staging/wine-staging-8.3.ebuild
@@ -0,0 +1,363 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+PYTHON_COMPAT=( python3_{9..11} )
+inherit autotools edo flag-o-matic multilib multilib-build
+inherit python-any-r1 toolchain-funcs wrapper
+
+WINE_GECKO=2.47.3
+WINE_MONO=7.4.0
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git;
+   WINE_EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git;
+else
+   (( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 
1).0
+   SRC_URI="
+   https://dl.winehq.org/wine/source/${WINE_SDIR}/wine-${PV}.tar.xz
+   
https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="-* ~amd64 ~x86"
+fi
+S="${WORKDIR}/wine-${PV}"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging 
patchset"
+HOMEPAGE="https://wiki.winehq.org/Wine-Staging;
+
+LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
+SLOT="${PV}"
+IUSE="
+   +X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos
+   llvm-libunwind debug custom-cflags +fontconfig +gecko gphoto2
+   +gstreamer kerberos +mingw +mono netapi nls opencl +opengl osmesa
+   pcap perl pulseaudio samba scanner +sdl selinux smartcard +ssl
+   +truetype udev udisks +unwind usb v4l +vulkan +xcomposite

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

2023-03-04 Thread Ionen Wolkens

commit: bfc69afe16b71415864148b1d9aff09340d908d4
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Mar  4 10:57:06 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Mar  4 12:06:25 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfc69afe

app-emulation/wine-staging: skip QA for implicit res_getservers

Test is failing on error when it should.

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/wine-staging-8.0.ebuild  | 1 +
 app-emulation/wine-staging/wine-staging-8.1.ebuild  | 1 +
 app-emulation/wine-staging/wine-staging-8.2.ebuild  | 1 +
 app-emulation/wine-staging/wine-staging-.ebuild | 1 +
 4 files changed, 4 insertions(+)

diff --git a/app-emulation/wine-staging/wine-staging-8.0.ebuild 
b/app-emulation/wine-staging/wine-staging-8.0.ebuild
index b23645292240..6d0fce43bdc4 100644
--- a/app-emulation/wine-staging/wine-staging-8.0.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.0.ebuild
@@ -122,6 +122,7 @@ BDEPEND="
nls? ( sys-devel/gettext )"
 IDEPEND=">=app-eselect/eselect-wine-2"
 
+QA_CONFIG_IMPL_DECL_SKIP=( res_getservers )
 QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
 
 PATCHES=(

diff --git a/app-emulation/wine-staging/wine-staging-8.1.ebuild 
b/app-emulation/wine-staging/wine-staging-8.1.ebuild
index 887f0e540454..4c27aba38ee4 100644
--- a/app-emulation/wine-staging/wine-staging-8.1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.1.ebuild
@@ -122,6 +122,7 @@ BDEPEND="
nls? ( sys-devel/gettext )"
 IDEPEND=">=app-eselect/eselect-wine-2"
 
+QA_CONFIG_IMPL_DECL_SKIP=( res_getservers )
 QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
 
 PATCHES=(

diff --git a/app-emulation/wine-staging/wine-staging-8.2.ebuild 
b/app-emulation/wine-staging/wine-staging-8.2.ebuild
index 3c2601e3bcf8..9457d9533997 100644
--- a/app-emulation/wine-staging/wine-staging-8.2.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.2.ebuild
@@ -132,6 +132,7 @@ BDEPEND="
nls? ( sys-devel/gettext )"
 IDEPEND=">=app-eselect/eselect-wine-2"
 
+QA_CONFIG_IMPL_DECL_SKIP=( res_getservers )
 QA_FLAGS_IGNORED="usr/lib/.*/wine/.*-unix/odbc32.so" # has no compiled objects
 QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
 

diff --git a/app-emulation/wine-staging/wine-staging-.ebuild 
b/app-emulation/wine-staging/wine-staging-.ebuild
index b7b0d4577f20..bcdbcf4db2b8 100644
--- a/app-emulation/wine-staging/wine-staging-.ebuild
+++ b/app-emulation/wine-staging/wine-staging-.ebuild
@@ -133,6 +133,7 @@ BDEPEND="
nls? ( sys-devel/gettext )"
 IDEPEND=">=app-eselect/eselect-wine-2"
 
+QA_CONFIG_IMPL_DECL_SKIP=( res_getservers )
 QA_FLAGS_IGNORED="usr/lib/.*/wine/.*-unix/odbc32.so" # has no compiled objects
 QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext

[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-staging/, app-emulation/wine-staging/files/

2023-03-04 Thread Ionen Wolkens

commit: 809556bf1566de14e93649b02c294d2a185c7447
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Mar  4 09:47:26 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Mar  4 12:06:25 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=809556bf

app-emulation/wine-staging: drop 7.19, 7.22

These are very close to stable wine-staging-8.0, bare lacking some
bug fixes. Should be little reason to keep, please use 8.0 instead.
If you need actual wine-7, then consider wine-vanilla-7.0.x instead.

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/Manifest|   4 -
 .../files/wine-staging-7.17-unwind.patch   |  40 ---
 .../wine-staging/wine-staging-7.19.ebuild  | 351 
 .../wine-staging/wine-staging-7.22.ebuild  | 355 -
 4 files changed, 750 deletions(-)

diff --git a/app-emulation/wine-staging/Manifest 
b/app-emulation/wine-staging/Manifest
index f7d99928c547..79910483b818 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,10 +1,6 @@
-DIST wine-7.19.tar.xz 28502612 BLAKE2B 
b7b270656955c7a1e1d84e8bbc7e3e8abff5aedadb5e8a458f0b1109d746875a359f3d2f53b1c9c6caae65d17fd1d205466cd3a884034a8bad6afe9456f13b5d
 SHA512 
f76dbda97cccad4c0f249b5dd4e8d48afa832134f1704ae228650bb73ee82823e628b23bd53a3f8729e06a8933597ff2fffa5551f156fc9c9181b67c066747d5
-DIST wine-7.22.tar.xz 28974052 BLAKE2B 
c86466964817b916ee8f7b687f193eda8bdd3fb17152ab1565971e36f43b12b540033ac1c5fa5d15576041febd32cf1ea2955732c5386debcbda46fb3acca0f1
 SHA512 
bf58a5b98bef5b291aff1eca3f94c28da95990e4c8da9af5e9e28b9480d57163d088b501b0c1bca5b568bf586dd9933cdc1ea1f371b78d95c94e2d25d0a65efc
 DIST wine-8.0.tar.xz 29054044 BLAKE2B 
baf8f96b665119c9f38a148a2472dbe8f6ca8d4641d9d09d48cb72cb4de2585c274b8b7981c2fa622ead6da2f087c57652e9b48edc8a17c0cfd6be9a36732f02
 SHA512 
53ba813b260a65a271ec575822725b97631f60038fb026dcc0fe66862711eedcc29a8feb29ff54ae4f64458f85c290d8f3838eff5e4c77a5420a7d2b951fef77
 DIST wine-8.1.tar.xz 29083080 BLAKE2B 
6eed2128627f15159ad80588ebe839de76cb9a536797d7da136b61f56033ece60c60208702b7928cdb297c1d8730baae0d6bb0ac7a0473c34ed44b5c5edaaec5
 SHA512 
3f0477c26f293cf928acbdae2ffb98740ac227a605ec90f3ab3d35c0dbca2037529ff4e4de0b69cc975579ad14dc2fb8b52e050cfd99cffcc627418cf8cb4346
 DIST wine-8.2.tar.xz 29129032 BLAKE2B 
831a5d1c8228050db9257ed60dc77ed0a391f16ee16d2e5563eabbf8f7d988655477327e1081baf947b173e8eb716b15fb72d1daa70d5ade52508c7f1cc2c231
 SHA512 
d0b8bb8c6d75034519bdf48d52b89f9d44ba4f7306a0b8f860cbb2c4c39d8fae3c2d9c12be37427b9a9cbdb7dd8701844d0a74c245dd7a9e8a423cb56962b254
-DIST wine-staging-7.19.tar.gz 9523048 BLAKE2B 
e53fd47af493cbdc4542f908a39557324d70ad67ff2e06c80296c006a63518e43988750cab2f4d3d9197fc9c8a1e61ed4d96bcc310b82b6cfc8ec12b941f1c5c
 SHA512 
c51cb18c4ae00eccf414f5edda18ebf363674ba7cfa95da135b3a43b7c012c086d454d6ac32b22d98e611bb87e55c3e1ee95571a4a0c9713028b5ac38e8aed3f
-DIST wine-staging-7.22.tar.gz 9528424 BLAKE2B 
e41f24f924117259715505f4f9998ef23a657bca5b0e285feb7f9fd732e6b566a495f48ec59af09b1d4d51db522b051028f6cbba748256e939929fbf978f0e44
 SHA512 
5fdac19ec290c67767fac71abe07d9350ec431919c67a0f2d2df18ced20f1d3dddb921b3d5586d03add187c6281e1a691cc220e8d2d5ad4eeb94015721479d65
 DIST wine-staging-8.0.tar.gz 9529620 BLAKE2B 
c9540195ea885d9f1e980232b0af471e92c61eb079cae35fdb3af5c13d4660b3466f751772440e38f15874082db296d16d1f1d68827a505b2dd949617eda0203
 SHA512 
76a729d7ced1ff634ddb455ddfaa66ca103b652f43cd152b57ada7431bb5fbb74f5e92bf2f4f329b6df6f5908130afad84e609cbce6df645d6cf8131e9b949f9
 DIST wine-staging-8.1.tar.gz 9527176 BLAKE2B 
363243a4a04bc767099b74f3b7613463d99da82996c176e68b9233cbf51c87ecd143840f7729a3edc31ac004b771b89ec3d57a0276b26e30d475feb273d09257
 SHA512 
c5c3111b27de7d3bf1d7a3a53f33e8d78c5006f22ff0361f77392455fa69b0afd7c58406515ace04b2df7e1dfb20e3adf9d874e5e8be09c9032c1c1aa31fe696
 DIST wine-staging-8.2.tar.gz 9528476 BLAKE2B 
e6fb4d15e9b94c9196c1f472ac50fbd3eabe34ef4a54493ca11b702448c4039c5a4f13fb1119a88477924e204c6e1972b1b25efe742118beec01f71a9d879aa2
 SHA512 
24bbfb6d03ca8282de058019cbbee57b36f8fdcf3e485f2ca94dbcf50614cf6c80e31103196d11fe48c77953d59a741ae2baf6987e56a88bea038ed16b692ad9

diff --git a/app-emulation/wine-staging/files/wine-staging-7.17-unwind.patch 
b/app-emulation/wine-staging/files/wine-staging-7.17-unwind.patch
deleted file mode 100644
index 52512ca82968..
--- a/app-emulation/wine-staging/files/wine-staging-7.17-unwind.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Fix build with llvm-libunwind, and also fix for non-llvm libunwind
-when using clang+bfd given clang doesn't have _Unwind_Find_FDE in
-its rtlib and expects it from llvm-libunwind.
-
-The _CONFIG_H_ check is for Rip - 
1),  );
- 
- if (fde)
- return dwarf_virtual_unwind( context->Rip, 
>EstablisherFrame, context, fde,
-  , >LanguageHandler, 
>HandlerData );
-+#endif
- #ifdef HAVE_LIBUNWIND
-

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

2023-02-23 Thread Ionen Wolkens

commit: 608aa7d3db1eaf3c224caecabfbb2596fc205763
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Feb 23 09:58:45 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Feb 23 09:58:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=608aa7d3

app-emulation/wine-staging: add IUSE=smartcard in live

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/wine-staging-.ebuild | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app-emulation/wine-staging/wine-staging-.ebuild 
b/app-emulation/wine-staging/wine-staging-.ebuild
index 3c2601e3bcf8..b7b0d4577f20 100644
--- a/app-emulation/wine-staging/wine-staging-.ebuild
+++ b/app-emulation/wine-staging/wine-staging-.ebuild
@@ -32,8 +32,8 @@ SLOT="${PV}"
 IUSE="
+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos
llvm-libunwind debug custom-cflags +fontconfig +gecko gphoto2
-   +gstreamer kerberos +mingw +mono netapi nls opencl +opengl
-   osmesa pcap perl pulseaudio samba scanner +sdl selinux +ssl
+   +gstreamer kerberos +mingw +mono netapi nls opencl +opengl osmesa
+   pcap perl pulseaudio samba scanner +sdl selinux smartcard +ssl
+truetype udev udisks +unwind usb v4l +vulkan +xcomposite xinerama"
 REQUIRED_USE="
X? ( truetype )
@@ -87,6 +87,7 @@ WINE_COMMON_DEPEND="
pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
scanner? ( media-gfx/sane-backends[${MULTILIB_USEDEP}] )
+   smartcard? ( sys-apps/pcsc-lite[${MULTILIB_USEDEP}] )
udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
unwind? (
llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
@@ -236,6 +237,7 @@ src_configure() {
$(use_with pulseaudio pulse)
$(use_with scanner sane)
$(use_with sdl)
+   $(use_with smartcard pcsclite)
$(use_with ssl gnutls)
$(use_with truetype freetype)
$(use_with udev)

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

2023-02-18 Thread Ionen Wolkens

commit: 431315fe96b82cd420329e084fc148fbabfced25
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sun Feb 19 06:06:34 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sun Feb 19 06:23:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=431315fe

app-emulation/wine-staging: add QA_FLAGS_IGNORED for odbc32.so

It has no object files (just links with ntdll.so), and so there
is no occasions to actually use CFLAGS and this confuses the
check (LDFLAGS checks fine).

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-staging/wine-staging-.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-emulation/wine-staging/wine-staging-.ebuild 
b/app-emulation/wine-staging/wine-staging-.ebuild
index 4669a0af9c66..3c2601e3bcf8 100644
--- a/app-emulation/wine-staging/wine-staging-.ebuild
+++ b/app-emulation/wine-staging/wine-staging-.ebuild
@@ -132,6 +132,7 @@ BDEPEND="
nls? ( sys-devel/gettext )"
 IDEPEND=">=app-eselect/eselect-wine-2"
 
+QA_FLAGS_IGNORED="usr/lib/.*/wine/.*-unix/odbc32.so" # has no compiled objects
 QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
 
 PATCHES=(

1 2 3 4 5 >

1 - 100 of 435 matches

Mail list logo