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

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

2024-07-06 Thread Ionen Wolkens

commit: 571e804223ddb840722f40486c72267ce95d2be4
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Jul  6 07:02:48 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Jul  6 07:02:54 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=571e8042

app-emulation/wine-proton: update live

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

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

diff --git a/app-emulation/wine-proton/wine-proton-9.0..ebuild 
b/app-emulation/wine-proton/wine-proton-9.0..ebuild
index 9c233aee5903..78a63d876e93 100644
--- a/app-emulation/wine-proton/wine-proton-9.0..ebuild
+++ b/app-emulation/wine-proton/wine-proton-9.0..ebuild
@@ -9,7 +9,7 @@ inherit autotools flag-o-matic multilib multilib-build prefix
 inherit python-any-r1 readme.gentoo-r1 toolchain-funcs wrapper
 
 WINE_GECKO=2.47.4
-WINE_MONO=9.1.0
+WINE_MONO=9.2.0
 WINE_PV=$(ver_rs 2 -)
 
 if [[ ${PV} == * ]]; then

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

2024-07-03 Thread Jakov Smolić

commit: 01db80999de5a5c7b00b11e54cd8bf7250db27bb
Author: Jakov Smolić  gentoo  org>
AuthorDate: Wed Jul  3 16:31:32 2024 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Wed Jul  3 16:31:32 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01db8099

app-emulation/wine-mono: Stabilize 9.1.0 x86, #935385

Signed-off-by: Jakov Smolić  gentoo.org>

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

diff --git a/app-emulation/wine-mono/wine-mono-9.1.0.ebuild 
b/app-emulation/wine-mono/wine-mono-9.1.0.ebuild
index f756896e7c2e..c6836b10 100644
--- a/app-emulation/wine-mono/wine-mono-9.1.0.ebuild
+++ b/app-emulation/wine-mono/wine-mono-9.1.0.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="+shared"
 
 src_install() {

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

2024-07-03 Thread Jakov Smolić

commit: 9a6ab39ca8cb46b050b2f06b3ee960bef7066f01
Author: Jakov Smolić  gentoo  org>
AuthorDate: Wed Jul  3 16:31:34 2024 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Wed Jul  3 16:31:34 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a6ab39c

app-emulation/wine-mono: Stabilize 9.1.0 amd64, #935385

Signed-off-by: Jakov Smolić  gentoo.org>

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

diff --git a/app-emulation/wine-mono/wine-mono-9.1.0.ebuild 
b/app-emulation/wine-mono/wine-mono-9.1.0.ebuild
index c6836b10..420d2e8387b2 100644
--- a/app-emulation/wine-mono/wine-mono-9.1.0.ebuild
+++ b/app-emulation/wine-mono/wine-mono-9.1.0.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1"
 SLOT="${PV}"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="+shared"
 
 src_install() {

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

2024-07-01 Thread Ionen Wolkens

commit: 5d344166d4345e4466454cb59457f2d51a001aed
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Mon Jul  1 20:12:07 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Jul  2 01:56:58 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d344166

app-emulation/wine-vanilla: remove unused patch

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Ionen Wolkens  gentoo.org>

 .../wine-vanilla-9.8-musl-ioctls-header.patch  | 30 --
 1 file changed, 30 deletions(-)

diff --git 
a/app-emulation/wine-vanilla/files/wine-vanilla-9.8-musl-ioctls-header.patch 
b/app-emulation/wine-vanilla/files/wine-vanilla-9.8-musl-ioctls-header.patch
deleted file mode 100644
index 7aa1a4c00587..
--- a/app-emulation/wine-vanilla/files/wine-vanilla-9.8-musl-ioctls-header.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://bugs.gentoo.org/931341
-https://gitlab.winehq.org/wine/wine/-/commit/24ca848c568d5a2786abd26f2e7314b2e3f509f3
-From: Fotios Valasiadis 
-Date: Sun, 5 May 2024 03:34:57 +0300
-Subject: [PATCH] ntdll/unix: Fix building on musl by explicitly including
- asm/ioctls.h.
-
-After commit 898ab8dab19d498c17859f39a55e317ee7e367a5 wine would no longer
-build on musl.
-
-Issue is that apparently TCSETS2 isn't defined when including sys/ioctl.h.
-
-A little digging shows that glibc goes ahead and includes asm/ioctls.h in
-sys/ioctl.h, providing said macro.  Musl on the other hand doesn't and relies
-on bits/ioctl.h, which lacks said macro.
-
-Signed-off-by: Fotios Valasiadis 
 a/dlls/ntdll/unix/serial.c
-+++ b/dlls/ntdll/unix/serial.c
-@@ -33,6 +33,7 @@
- #include 
- #ifdef HAVE_ASM_TERMBITS_H
- # include 
-+# include 
- #else
- # include 
- #endif
--- 
-GitLab
-

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

2024-07-01 Thread Ionen Wolkens

commit: 7497f6a2ec1407bb281497a7af43003b9dccaf8a
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Mon Jul  1 20:11:47 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Jul  2 01:56:58 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7497f6a2

app-emulation/wine-staging: remove unused patch

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Ionen Wolkens  gentoo.org>

 .../wine-staging-9.8-musl-ioctls-header.patch  | 30 --
 1 file changed, 30 deletions(-)

diff --git 
a/app-emulation/wine-staging/files/wine-staging-9.8-musl-ioctls-header.patch 
b/app-emulation/wine-staging/files/wine-staging-9.8-musl-ioctls-header.patch
deleted file mode 100644
index 7aa1a4c00587..
--- a/app-emulation/wine-staging/files/wine-staging-9.8-musl-ioctls-header.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://bugs.gentoo.org/931341
-https://gitlab.winehq.org/wine/wine/-/commit/24ca848c568d5a2786abd26f2e7314b2e3f509f3
-From: Fotios Valasiadis 
-Date: Sun, 5 May 2024 03:34:57 +0300
-Subject: [PATCH] ntdll/unix: Fix building on musl by explicitly including
- asm/ioctls.h.
-
-After commit 898ab8dab19d498c17859f39a55e317ee7e367a5 wine would no longer
-build on musl.
-
-Issue is that apparently TCSETS2 isn't defined when including sys/ioctl.h.
-
-A little digging shows that glibc goes ahead and includes asm/ioctls.h in
-sys/ioctl.h, providing said macro.  Musl on the other hand doesn't and relies
-on bits/ioctl.h, which lacks said macro.
-
-Signed-off-by: Fotios Valasiadis 
 a/dlls/ntdll/unix/serial.c
-+++ b/dlls/ntdll/unix/serial.c
-@@ -33,6 +33,7 @@
- #include 
- #ifdef HAVE_ASM_TERMBITS_H
- # include 
-+# include 
- #else
- # include 
- #endif
--- 
-GitLab
-

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

2024-06-30 Thread Ionen Wolkens

commit: 3606bf1179406da15fbe3a07fde7f8536671108a
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sun Jun 30 06:25:50 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sun Jun 30 06:48:46 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3606bf11

app-emulation/wine-staging: update 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 70fc1d8d7acb..f37334b9fc3c 100644
--- a/app-emulation/wine-staging/wine-staging-.ebuild
+++ b/app-emulation/wine-staging/wine-staging-.ebuild
@@ -37,8 +37,8 @@ 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
+   kerberos +mingw +mono netapi nls odbc opencl +opengl osmesa pcap
+   perl pulseaudio samba scanner +sdl selinux smartcard +ssl +strip
+truetype udev udisks +unwind usb v4l +vulkan wayland wow64
+xcomposite xinerama
 "
@@ -95,6 +95,7 @@ WINE_COMMON_DEPEND="
media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
)
+   odbc? ( dev-db/unixODBC[${MULTILIB_USEDEP}] )
opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
@@ -297,6 +298,7 @@ src_configure() {
$(use_with mingw)
$(use_with netapi)
$(use_with nls gettext)
+   $(use_with odbc)
$(use_with opencl)
$(use_with opengl)
$(use_with osmesa)

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

2024-06-29 Thread Ionen Wolkens

commit: 5bf2a8183f5965ee45ca245429efd7d11298750a
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Jun 29 08:12:11 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Jun 29 10:35:15 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bf2a818

app-emulation/wine-vanilla: add 9.12

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

 app-emulation/wine-vanilla/Manifest|   1 +
 .../wine-vanilla/wine-vanilla-9.12.ebuild  | 439 +
 2 files changed, 440 insertions(+)

diff --git a/app-emulation/wine-vanilla/Manifest 
b/app-emulation/wine-vanilla/Manifest
index 957426e32f64..4e57f389800a 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -3,4 +3,5 @@ DIST wine-8.0.2.tar.xz 29060452 BLAKE2B 
dcffaba6c90c4e02a7bc591a81e11aced06c0063
 DIST wine-9.0.tar.xz 30007216 BLAKE2B 
cf53177201a2f7eeb35d0d8ce220f80808d979099a928ad60652d1dee92620c433cc105dffab4e9309f41766087ad1544ef49d2922538bb420d62f6dd64117a1
 SHA512 
838daf2c4581f83f8573b988036f517d57b84894b090a2a17433255d6d044dfa880e6724cdb83082a36c333df9d2083ab68ae53927622a620edd59f33462ada4
 DIST wine-9.10.tar.xz 30289048 BLAKE2B 
8c9001f2edac31636a82f0bd0a02d69b7fc0a20560a568bbff5f46c111ec3b623652a3ec4b9df48a153cf346e580979196496d9c8416794c4be70e7705dbb411
 SHA512 
f76e62b40e72af241c6f88dbcdb767720c36496b9deb9cc1246cea967573bbafd46b7000117d3c64f499d175ac1c7299ebba3f476574bf9b18f6d9744ba7a3e2
 DIST wine-9.11.tar.xz 30301904 BLAKE2B 
745cab93268f51a3d31562af6d392fec5ed0d18aeca3684d0d3ef68ef144e20ec2c0879853f67538db833ec89321e1b1e09533882802eb68452ad3fed87193cf
 SHA512 
695170140372f169e78e90a66d938839c70f9647531ae8d782c58fb0450460174f2958f7656f8d516447a22ef6e792a8c89f2f18c25fac847adf46bc51184999
+DIST wine-9.12.tar.xz 30339552 BLAKE2B 
e114b3a1db237345b9f86cb3a9f1e0040067275eb6c840e480f5fe6f4fa67ba9d4603b2006552ba2ef0ed45e53de9a25b67d4a50e24fad6a9b0e06d1e95763c7
 SHA512 
00c25cb11feed3625ebd8dc76fa35930d07d51182be4537c488ac4e713d6f9c61b974b19eafb57f54630376346dc1749c4d36a18d0f72748b34052cc7322df19
 DIST wine-9.9.tar.xz 30265476 BLAKE2B 
a2557044b10252c1b1ae023e10863c601e9159d64eda2ce1d8aab4dbb9efffa1b4b15ed27a9edbf6f2bba148c2bb07e729bd706bac9fe17f91c826c74b5980e6
 SHA512 
df016411933b5447bef9b48f67c58e12d6d33ef0c24045ab03c92821dcccbf84335d1a2d765e6d6cf3a743598317010b8ae6f69de3661733e4fa43febec873dd

diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.12.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-9.12.ebuild
new file mode 100644
index ..27cb53b52387
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.12.ebuild
@@ -0,0 +1,439 @@
+# 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 optfeature
+inherit prefix toolchain-funcs wrapper
+
+WINE_GECKO=2.47.4
+WINE_MONO=9.2.0
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   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;
+   S="${WORKDIR}/wine-${PV}"
+   KEYWORDS="-* ~amd64 ~x86"
+fi
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, without external 
patchsets"
+HOMEPAGE="
+   https://www.winehq.org/
+   https://gitlab.winehq.org/wine/wine/
+"
+
+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 odbc 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-vanilla/

2024-06-29 Thread Ionen Wolkens

commit: f6ff54bd1ad8e05d1aceea08691cbabb3f5bd7a3
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Jun 29 08:11:37 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Jun 29 10:35:15 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6ff54bd

app-emulation/wine-vanilla: drop 9.7, 9.8

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

 app-emulation/wine-vanilla/Manifest|   2 -
 app-emulation/wine-vanilla/wine-vanilla-9.7.ebuild | 439 
 app-emulation/wine-vanilla/wine-vanilla-9.8.ebuild | 440 -
 3 files changed, 881 deletions(-)

diff --git a/app-emulation/wine-vanilla/Manifest 
b/app-emulation/wine-vanilla/Manifest
index 34510424d7ed..957426e32f64 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -3,6 +3,4 @@ DIST wine-8.0.2.tar.xz 29060452 BLAKE2B 
dcffaba6c90c4e02a7bc591a81e11aced06c0063
 DIST wine-9.0.tar.xz 30007216 BLAKE2B 
cf53177201a2f7eeb35d0d8ce220f80808d979099a928ad60652d1dee92620c433cc105dffab4e9309f41766087ad1544ef49d2922538bb420d62f6dd64117a1
 SHA512 
838daf2c4581f83f8573b988036f517d57b84894b090a2a17433255d6d044dfa880e6724cdb83082a36c333df9d2083ab68ae53927622a620edd59f33462ada4
 DIST wine-9.10.tar.xz 30289048 BLAKE2B 
8c9001f2edac31636a82f0bd0a02d69b7fc0a20560a568bbff5f46c111ec3b623652a3ec4b9df48a153cf346e580979196496d9c8416794c4be70e7705dbb411
 SHA512 
f76e62b40e72af241c6f88dbcdb767720c36496b9deb9cc1246cea967573bbafd46b7000117d3c64f499d175ac1c7299ebba3f476574bf9b18f6d9744ba7a3e2
 DIST wine-9.11.tar.xz 30301904 BLAKE2B 
745cab93268f51a3d31562af6d392fec5ed0d18aeca3684d0d3ef68ef144e20ec2c0879853f67538db833ec89321e1b1e09533882802eb68452ad3fed87193cf
 SHA512 
695170140372f169e78e90a66d938839c70f9647531ae8d782c58fb0450460174f2958f7656f8d516447a22ef6e792a8c89f2f18c25fac847adf46bc51184999
-DIST wine-9.7.tar.xz 30281616 BLAKE2B 
4d27f6f2dfd088a0590bfce7228c7eca25b66a9a04706ddecb25af6364e83100c15a78c8d46f3294a42dc7f3503756506f752a02d7058a72ce16716994b334bc
 SHA512 
0c15c3a0901162a386126f2dc987b276b379cc027fc72d9e31cf3122614742f876f30a5f24a495f546cd9c5bd5efce096bd9ca190d0f378fea3d42a298a06e80
-DIST wine-9.8.tar.xz 30297460 BLAKE2B 
689d1b4e55f7d66b8fad8432ad35a52e2fad303e8a9382b8893222c696697efa5de5b56cc2b933bed96d6382f9fdc919fa15e6517ffdb50105cdaea904a7d77f
 SHA512 
3d1b0e6b7b633a0b45ba6b23e741e808dec29355721baf4489c3ad34c67d714b40897ef510c4a84f31be390d7f8b86b93a725787d733eaf77df5c82b322d2662
 DIST wine-9.9.tar.xz 30265476 BLAKE2B 
a2557044b10252c1b1ae023e10863c601e9159d64eda2ce1d8aab4dbb9efffa1b4b15ed27a9edbf6f2bba148c2bb07e729bd706bac9fe17f91c826c74b5980e6
 SHA512 
df016411933b5447bef9b48f67c58e12d6d33ef0c24045ab03c92821dcccbf84335d1a2d765e6d6cf3a743598317010b8ae6f69de3661733e4fa43febec873dd

diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.7.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-9.7.ebuild
deleted file mode 100644
index 0f7e43a70482..
--- a/app-emulation/wine-vanilla/wine-vanilla-9.7.ebuild
+++ /dev/null
@@ -1,439 +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 optfeature
-inherit prefix toolchain-funcs wrapper
-
-WINE_GECKO=2.47.4
-WINE_MONO=9.0.0
-
-if [[ ${PV} == * ]]; then
-   inherit git-r3
-   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;
-   S="${WORKDIR}/wine-${PV}"
-   KEYWORDS="-* ~amd64 ~x86"
-fi
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, without external 
patchsets"
-HOMEPAGE="
-   https://www.winehq.org/
-   https://gitlab.winehq.org/wine/wine/
-"
-
-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 odbc 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}]
-

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

2024-06-27 Thread Ionen Wolkens

commit: c56b3fdb7f41d53d6cb0271751160818757e4890
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Jun 27 06:53:03 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Jun 27 06:53:06 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c56b3fdb

app-emulation/wine-mono: note Z: drive in USE=shared metadata

Some users do not like te idea of wine prefixes being able to
read everything through the rootfs Z:\ drive and opt to remove
it, but then this unexpectedly breaks mono and is not entirely
obvious as to why.

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

 app-emulation/wine-mono/metadata.xml | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app-emulation/wine-mono/metadata.xml 
b/app-emulation/wine-mono/metadata.xml
index 83c506abfee8..6569f10f81de 100644
--- a/app-emulation/wine-mono/metadata.xml
+++ b/app-emulation/wine-mono/metadata.xml
@@ -13,7 +13,12 @@
purpose.


-   Install pre-unpacked files which do not 
need to be copied into the Wine prefix
+   
+   Install pre-unpacked files which do not need to
+   be copied into the Wine prefix (note that this
+   requires the default top-level Z: drive to be
+   kept for out-of-prefix files to be readable)
+   


madewokherd/wine-mono

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

2024-06-27 Thread Ionen Wolkens

commit: 036331e8d08eabbee6b88c00dc87f1596ac98e8f
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Jun 27 06:48:36 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Jun 27 06:48:36 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=036331e8

app-emulation/wine-vanilla: update live

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

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

diff --git a/app-emulation/wine-vanilla/wine-vanilla-.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-.ebuild
index ea264050fc99..27cb53b52387 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-.ebuild
@@ -8,7 +8,7 @@ inherit autotools flag-o-matic multilib multilib-build 
optfeature
 inherit prefix toolchain-funcs wrapper
 
 WINE_GECKO=2.47.4
-WINE_MONO=9.1.0
+WINE_MONO=9.2.0
 
 if [[ ${PV} == * ]]; then
inherit git-r3

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

2024-06-27 Thread Ionen Wolkens

commit: 0413635493784aee2c8485f1ad159c2a4e96f75b
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Jun 27 06:48:16 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Jun 27 06:48:16 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04136354

app-emulation/wine-mono: add 9.2.0

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

 app-emulation/wine-mono/Manifest   |  2 ++
 app-emulation/wine-mono/wine-mono-9.2.0.ebuild | 26 ++
 2 files changed, 28 insertions(+)

diff --git a/app-emulation/wine-mono/Manifest b/app-emulation/wine-mono/Manifest
index dd0016c86352..69d60f92bee6 100644
--- a/app-emulation/wine-mono/Manifest
+++ b/app-emulation/wine-mono/Manifest
@@ -8,3 +8,5 @@ DIST wine-mono-9.0.0-x86.msi 84583424 BLAKE2B 
38f16049909f6464624c1c8f990a7873a3
 DIST wine-mono-9.0.0-x86.tar.xz 40970928 BLAKE2B 
253533706845cf8e4aa958cca61928e6ce3be7482bfcbba45a5dd6381ab144263ddf40df009121508288710ee0872382a6ce7cde06cf8dd6c75e932916de907e
 SHA512 
0117619a2b3f6e92ee513aeea79db977055098e6f629063fbd5d1a1b7d47e9d14451369b1d0a6a30e468ed051e60bba59aec75b90ea34fa9b4956d3ebdb32c06
 DIST wine-mono-9.1.0-x86.msi 84623872 BLAKE2B 
63e86a4f99a5300782017f0b1a2168ad49516e2b2a7e825d7f59b8e842874c7f84752058908e8f57ad1e650a68675c5ff81ad8ba973962ea075db590be0fa51b
 SHA512 
e51744eb0b07a58516fe3f5115fe45b4924e285fe4688649d04dec522203af6b3aa066e5db9b37cbbfe6ce4b5d8e871e9881842227cbb20c0613b911b5bfc383
 DIST wine-mono-9.1.0-x86.tar.xz 43820028 BLAKE2B 
6249e661239b71ca2607cf5fb3285bbef3e4c056c87e15352e40d2875028dbaa7f1c1a8b4d908f74de8447b4166c61c708314dc6422e9f69a6eea5f588e7c73b
 SHA512 
cede2b910e95fc43e658e6d4d8086ec5324407a32fff4852341178e1e56df240356c02f270e3be174f3ab82aa076e50d70be4da8e8c5f77e877fce8fe3217374
+DIST wine-mono-9.2.0-x86.msi 84566016 BLAKE2B 
08c106998536622cdda10065304416a338ba9fe0e5680949c66b2766116bfc93c41b0169e0beb614f741edccf5fae576de78d2b1c6bc9f2dfa89036bfd3b23ed
 SHA512 
3256358a49321173c17e8b907e0d8affed4fb735ca3da91749377501de1a924711f37971a9c8e05e687140d3d65399903e69bb5981d271f2b698a910d91e8b54
+DIST wine-mono-9.2.0-x86.tar.xz 43901320 BLAKE2B 
125d81049bca105e8967338659dd21c174388dfc8be9802a5984b8fc11b4da22b82512590481d45ebd7554f89c5e9cad9c59b4406ba04436ada5b52ea2aea0cc
 SHA512 
7d0039b7c77ed968c0e00eacd3bf716d3ec9dffc86f6cc2c2f9439320b889ae2e05cc4f9aade5e1a0122a86ee4b86cea4224e666aba0d0bb3f2fa6fb0d18f8ae

diff --git a/app-emulation/wine-mono/wine-mono-9.2.0.ebuild 
b/app-emulation/wine-mono/wine-mono-9.2.0.ebuild
new file mode 100644
index ..f756896e7c2e
--- /dev/null
+++ b/app-emulation/wine-mono/wine-mono-9.2.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Replacement for the .NET runtime and class libraries in Wine"
+HOMEPAGE="https://wiki.winehq.org/Mono;
+SRC_URI="
+   shared? ( 
https://github.com/madewokherd/wine-mono/releases/download/${P}/${P}-x86.tar.xz 
)
+   !shared? ( 
https://github.com/madewokherd/wine-mono/releases/download/${P}/${P}-x86.msi )"
+S="${WORKDIR}"
+
+LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+shared"
+
+src_install() {
+   insinto /usr/share/wine/mono
+
+   if use shared; then
+   doins -r ${P}
+   else
+   doins "${DISTDIR}"/${P}-x86.msi
+   fi
+}

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

2024-06-27 Thread Ionen Wolkens

commit: 54787671fa2ff3aa785d97461a7f263c666534b1
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Jun 27 06:48:54 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Jun 27 06:48:54 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54787671

app-emulation/wine-staging: update 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 087ec27eccec..70fc1d8d7acb 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.1.0
+WINE_MONO=9.2.0
 WINE_P=wine-$(ver_cut 1-2)
 
 if [[ ${PV} == * ]]; then

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

2024-06-14 Thread Ionen Wolkens

commit: 96d61db3f00cbf637a9ca7ec4b8934c79d051324
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Jun 15 00:39:05 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Jun 15 00:39:10 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96d61db3

app-emulation/wine-vanilla: add 9.11

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

 app-emulation/wine-vanilla/Manifest|   1 +
 .../wine-vanilla/wine-vanilla-9.11.ebuild  | 439 +
 2 files changed, 440 insertions(+)

diff --git a/app-emulation/wine-vanilla/Manifest 
b/app-emulation/wine-vanilla/Manifest
index 9e1e7a83a19a..34510424d7ed 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -2,6 +2,7 @@ DIST wine-7.0.2.tar.xz 27179980 BLAKE2B 
721ab574092638b32d3a483b6ae3def0c9d706cc
 DIST wine-8.0.2.tar.xz 29060452 BLAKE2B 
dcffaba6c90c4e02a7bc591a81e11aced06c006370c4c316c8a367b2f5814926063482959fabfe9d674ee1b5a560e59087e9b711e28360ced3aee2bbd6bb8fdb
 SHA512 
e86dd31247d757d48ffb2d24f20edab3fc6ef9c3e395567a7b363951bb681335ba3adb8b84639011b24b6eb274582d56880298d6d95fb100acc072383d4e973f
 DIST wine-9.0.tar.xz 30007216 BLAKE2B 
cf53177201a2f7eeb35d0d8ce220f80808d979099a928ad60652d1dee92620c433cc105dffab4e9309f41766087ad1544ef49d2922538bb420d62f6dd64117a1
 SHA512 
838daf2c4581f83f8573b988036f517d57b84894b090a2a17433255d6d044dfa880e6724cdb83082a36c333df9d2083ab68ae53927622a620edd59f33462ada4
 DIST wine-9.10.tar.xz 30289048 BLAKE2B 
8c9001f2edac31636a82f0bd0a02d69b7fc0a20560a568bbff5f46c111ec3b623652a3ec4b9df48a153cf346e580979196496d9c8416794c4be70e7705dbb411
 SHA512 
f76e62b40e72af241c6f88dbcdb767720c36496b9deb9cc1246cea967573bbafd46b7000117d3c64f499d175ac1c7299ebba3f476574bf9b18f6d9744ba7a3e2
+DIST wine-9.11.tar.xz 30301904 BLAKE2B 
745cab93268f51a3d31562af6d392fec5ed0d18aeca3684d0d3ef68ef144e20ec2c0879853f67538db833ec89321e1b1e09533882802eb68452ad3fed87193cf
 SHA512 
695170140372f169e78e90a66d938839c70f9647531ae8d782c58fb0450460174f2958f7656f8d516447a22ef6e792a8c89f2f18c25fac847adf46bc51184999
 DIST wine-9.7.tar.xz 30281616 BLAKE2B 
4d27f6f2dfd088a0590bfce7228c7eca25b66a9a04706ddecb25af6364e83100c15a78c8d46f3294a42dc7f3503756506f752a02d7058a72ce16716994b334bc
 SHA512 
0c15c3a0901162a386126f2dc987b276b379cc027fc72d9e31cf3122614742f876f30a5f24a495f546cd9c5bd5efce096bd9ca190d0f378fea3d42a298a06e80
 DIST wine-9.8.tar.xz 30297460 BLAKE2B 
689d1b4e55f7d66b8fad8432ad35a52e2fad303e8a9382b8893222c696697efa5de5b56cc2b933bed96d6382f9fdc919fa15e6517ffdb50105cdaea904a7d77f
 SHA512 
3d1b0e6b7b633a0b45ba6b23e741e808dec29355721baf4489c3ad34c67d714b40897ef510c4a84f31be390d7f8b86b93a725787d733eaf77df5c82b322d2662
 DIST wine-9.9.tar.xz 30265476 BLAKE2B 
a2557044b10252c1b1ae023e10863c601e9159d64eda2ce1d8aab4dbb9efffa1b4b15ed27a9edbf6f2bba148c2bb07e729bd706bac9fe17f91c826c74b5980e6
 SHA512 
df016411933b5447bef9b48f67c58e12d6d33ef0c24045ab03c92821dcccbf84335d1a2d765e6d6cf3a743598317010b8ae6f69de3661733e4fa43febec873dd

diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.11.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-9.11.ebuild
new file mode 100644
index ..ea264050fc99
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.11.ebuild
@@ -0,0 +1,439 @@
+# 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 optfeature
+inherit prefix toolchain-funcs wrapper
+
+WINE_GECKO=2.47.4
+WINE_MONO=9.1.0
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   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;
+   S="${WORKDIR}/wine-${PV}"
+   KEYWORDS="-* ~amd64 ~x86"
+fi
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, without external 
patchsets"
+HOMEPAGE="
+   https://www.winehq.org/
+   https://gitlab.winehq.org/wine/wine/
+"
+
+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 odbc 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"
+

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

2024-06-12 Thread Ionen Wolkens

commit: 59c8eae7592a4de4b1b06b3aec93d220d8cfa6cc
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Jun 12 23:19:25 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Jun 12 23:51:43 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59c8eae7

app-emulation/wine-proton: sync live

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

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

diff --git a/app-emulation/wine-proton/wine-proton-9.0..ebuild 
b/app-emulation/wine-proton/wine-proton-9.0..ebuild
index caa389a5712f..9c233aee5903 100644
--- a/app-emulation/wine-proton/wine-proton-9.0..ebuild
+++ b/app-emulation/wine-proton/wine-proton-9.0..ebuild
@@ -9,7 +9,7 @@ inherit autotools flag-o-matic multilib multilib-build prefix
 inherit python-any-r1 readme.gentoo-r1 toolchain-funcs wrapper
 
 WINE_GECKO=2.47.4
-WINE_MONO=9.0.0
+WINE_MONO=9.1.0
 WINE_PV=$(ver_rs 2 -)
 
 if [[ ${PV} == * ]]; then

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

2024-06-12 Thread Ionen Wolkens

commit: 2d6401a181645d5f7f55b012232cbb7ecbad7f8e
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Jun 12 23:19:17 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Jun 12 23:51:43 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d6401a1

app-emulation/wine-proton: add 9.0.2

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

 app-emulation/wine-proton/Manifest |   1 +
 app-emulation/wine-proton/wine-proton-9.0.2.ebuild | 429 +
 2 files changed, 430 insertions(+)

diff --git a/app-emulation/wine-proton/Manifest 
b/app-emulation/wine-proton/Manifest
index 4e84f540f297..a78cd9208436 100644
--- a/app-emulation/wine-proton/Manifest
+++ b/app-emulation/wine-proton/Manifest
@@ -1,3 +1,4 @@
 DIST proton-wine-7.0-6.tar.gz 45780326 BLAKE2B 
f140fcfdd1a47904c34a49d0795fa3326d7cf0d3fac8d6c2ef2a4926181a46223f43a2d1ca96c543e800c8c46b2a3cc51ae306a029d68a42608876e869e177d5
 SHA512 
793bbe2b23042301a1b518717d78cfff01eaffa033d010659a45779b9136d33cfac63f0c3fbb1e458953a954b423eb70ac4fa87633352267db890ceb2fef
 DIST proton-wine-8.0-5c.tar.gz 48710071 BLAKE2B 
99627baea6fb3d51231aa1e75a2734c3c1baba88326baf15b3d421d57a00472d25ba51c2140b51152c8aeae7dd240d3d77bb0d8835aa7eb3b745a51be120f8bb
 SHA512 
0cf98d4e67866e55cc8cd5ea8da0d76aee8e37b130b3cbca604083c913e98ddf9038ecd6f9761d2e11443e282b372977400e251456c6d40e1365210c7578234d
 DIST proton-wine-9.0-1.tar.gz 49048661 BLAKE2B 
cf237c314e8b222bb36f52f316baae2351a30d22995d610c7977accc9588c474d0e598702000aa81b34fc2f3daeccd09f54ef53b7a2250c0b012ca47d69628eb
 SHA512 
d7d3e4725a86ca120d059e5b8f9760bce45a5db0ae814cd76aa51dc361bb67af9c2834917ddad3858fc324a1d048acdd9942492c77d0f396aae7d537c70e3ca1
+DIST proton-wine-9.0-2.tar.gz 49125171 BLAKE2B 
ac1e4a63f94689bc4fcc6ab4e2d12cfc214f54181515434ab950d8975d131a5f6333b1e6cb9b67eda61cf3e652e57e27e60ba3cff6a6ac403b07178f382f7e25
 SHA512 
82efee3100da80f650229d1abf3df4896ab71af4a79c6e5cf03aa646c56f435daf07c6f084a3264067cf90ce509102e3d7ee6d4bf7d0650baf645b5ece08cc7c

diff --git a/app-emulation/wine-proton/wine-proton-9.0.2.ebuild 
b/app-emulation/wine-proton/wine-proton-9.0.2.ebuild
new file mode 100644
index ..5b65bf80cc44
--- /dev/null
+++ b/app-emulation/wine-proton/wine-proton-9.0.2.ebuild
@@ -0,0 +1,429 @@
+# 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..13} )
+inherit autotools flag-o-matic multilib multilib-build prefix
+inherit python-any-r1 readme.gentoo-r1 toolchain-funcs wrapper
+
+WINE_GECKO=2.47.4
+WINE_MONO=9.1.0
+WINE_PV=$(ver_rs 2 -)
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/ValveSoftware/wine.git;
+   EGIT_BRANCH="experimental_$(ver_cut 1-2)"
+else
+   
SRC_URI="https://github.com/ValveSoftware/wine/archive/refs/tags/proton-wine-${WINE_PV}.tar.gz;
+   S="${WORKDIR}/${PN}-wine-${WINE_PV}"
+   KEYWORDS="-* ~amd64 ~x86"
+fi
+
+DESCRIPTION="Valve Software's fork of Wine"
+HOMEPAGE="https://github.com/ValveSoftware/wine/;
+
+LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
+SLOT="${PV}"
+IUSE="
+   +abi_x86_32 +abi_x86_64 +alsa crossdev-mingw custom-cflags
+   +fontconfig +gecko +gstreamer llvm-libunwind +mono nls osmesa
+   perl pulseaudio +sdl selinux +ssl +strip udev udisks +unwind
+   usb v4l video_cards_amdgpu wow64 +xcomposite xinerama
+"
+REQUIRED_USE="wow64? ( abi_x86_64 !abi_x86_32 )"
+
+# 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="
+   dev-libs/libgcrypt:=[${MULTILIB_USEDEP}]
+   media-libs/freetype[${MULTILIB_USEDEP}]
+   media-libs/libglvnd[X,${MULTILIB_USEDEP}]
+   media-libs/vulkan-loader[X,${MULTILIB_USEDEP}]
+   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}]
+   fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
+   osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
+   sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] )
+   ssl? (
+   dev-libs/gmp:=[${MULTILIB_USEDEP}]
+   net-libs/gnutls:=[${MULTILIB_USEDEP}]
+   )
+   udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+   v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+   xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+   xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+"
+# gcc: for -latomic with clang
+WINE_COMMON_DEPEND="
+   ${WINE_DLOPEN_DEPEND}
+   sys-devel/gcc:*
+

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

2024-06-01 Thread Ionen Wolkens

commit: 593965e4bc4692323d330191d13bea191203d717
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sun Jun  2 02:57:10 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sun Jun  2 03:43:36 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=593965e4

app-emulation/wine-proton: fix build with -Os

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

 .../wine-proton/files/wine-proton-7.0.6-vulkan-libm.patch| 12 
 .../wine-proton/files/wine-proton-8.0.5c-vulkan-libm.patch   | 12 
 app-emulation/wine-proton/wine-proton-7.0.6.ebuild   |  1 +
 app-emulation/wine-proton/wine-proton-8.0.5c.ebuild  |  1 +
 app-emulation/wine-proton/wine-proton-9.0.1.ebuild   |  1 +
 app-emulation/wine-proton/wine-proton-9.0..ebuild|  1 +
 6 files changed, 28 insertions(+)

diff --git 
a/app-emulation/wine-proton/files/wine-proton-7.0.6-vulkan-libm.patch 
b/app-emulation/wine-proton/files/wine-proton-7.0.6-vulkan-libm.patch
new file mode 100644
index ..b81778fb957c
--- /dev/null
+++ b/app-emulation/wine-proton/files/wine-proton-7.0.6-vulkan-libm.patch
@@ -0,0 +1,12 @@
+Valve's patches add use of "ceil" without using libm, it works
+by accident with -O2 but fails with -Os.
+
+ld: dlls/winevulkan/vulkan.o: in function `fshack_vk_queue_present':
+vulkan.c:(.text+0x12f46): undefined reference to `ceil'
+--- a/dlls/winevulkan/Makefile.in
 b/dlls/winevulkan/Makefile.in
+@@ -4,3 +4,3 @@
+ IMPORTS   = user32 gdi32 advapi32 setupapi win32u
+-EXTRALIBS = $(PTHREAD_LIBS)
++EXTRALIBS = -lm $(PTHREAD_LIBS)
+ 

diff --git 
a/app-emulation/wine-proton/files/wine-proton-8.0.5c-vulkan-libm.patch 
b/app-emulation/wine-proton/files/wine-proton-8.0.5c-vulkan-libm.patch
new file mode 100644
index ..c3d9794fbbfe
--- /dev/null
+++ b/app-emulation/wine-proton/files/wine-proton-8.0.5c-vulkan-libm.patch
@@ -0,0 +1,12 @@
+Valve's patches add use of "ceil" without using libm, it works
+by accident with -O2 but fails with -Os.
+
+ld: dlls/winevulkan/vulkan.o: in function `fshack_vk_queue_present':
+vulkan.c:(.text+0x12f46): undefined reference to `ceil'
+--- a/dlls/winevulkan/Makefile.in
 b/dlls/winevulkan/Makefile.in
+@@ -4,3 +4,3 @@
+ IMPORTS   = user32 gdi32 advapi32 setupapi win32u
+-UNIX_LIBS = -lwin32u $(PTHREAD_LIBS)
++UNIX_LIBS = -lm -lwin32u $(PTHREAD_LIBS)
+ 

diff --git a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild 
b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
index cdab45831b77..29b0e02ef24a 100644
--- a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
+++ b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
@@ -124,6 +124,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-7.0.4-restore-menubuilder.patch
"${FILESDIR}"/${PN}-7.0.4-unwind.patch
"${FILESDIR}"/${PN}-7.0.6-mingw64-11.0.0.patch
+   "${FILESDIR}"/${PN}-7.0.6-vulkan-libm.patch
 )
 
 pkg_pretend() {

diff --git a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild 
b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
index 83417e7c34f7..cecd79a0c1f7 100644
--- a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
@@ -124,6 +124,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-7.0.4-noexecstack.patch
"${FILESDIR}"/${PN}-8.0.1c-unwind.patch
"${FILESDIR}"/${PN}-8.0.4-restore-menubuilder.patch
+   "${FILESDIR}"/${PN}-8.0.5c-vulkan-libm.patch
 )
 
 pkg_pretend() {

diff --git a/app-emulation/wine-proton/wine-proton-9.0.1.ebuild 
b/app-emulation/wine-proton/wine-proton-9.0.1.ebuild
index 1dd72b877060..227f0cf4916a 100644
--- a/app-emulation/wine-proton/wine-proton-9.0.1.ebuild
+++ b/app-emulation/wine-proton/wine-proton-9.0.1.ebuild
@@ -134,6 +134,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-7.0.4-noexecstack.patch
"${FILESDIR}"/${PN}-8.0.1c-unwind.patch
"${FILESDIR}"/${PN}-8.0.4-restore-menubuilder.patch
+   "${FILESDIR}"/${PN}-8.0.5c-vulkan-libm.patch
"${FILESDIR}"/${PN}-9.0-rpath.patch
 )
 

diff --git a/app-emulation/wine-proton/wine-proton-9.0..ebuild 
b/app-emulation/wine-proton/wine-proton-9.0..ebuild
index f43dad37ae8e..caa389a5712f 100644
--- a/app-emulation/wine-proton/wine-proton-9.0..ebuild
+++ b/app-emulation/wine-proton/wine-proton-9.0..ebuild
@@ -134,6 +134,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-7.0.4-noexecstack.patch
"${FILESDIR}"/${PN}-8.0.1c-unwind.patch
"${FILESDIR}"/${PN}-8.0.4-restore-menubuilder.patch
+   "${FILESDIR}"/${PN}-8.0.5c-vulkan-libm.patch
"${FILESDIR}"/${PN}-9.0-rpath.patch
 )

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

2024-05-31 Thread Ionen Wolkens

commit: 1b2a1e4265c89fbcd5eb07d4da0cfdd03a220ee3
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri May 31 23:45:10 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Jun  1 01:04:49 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b2a1e42

app-emulation/wine-vanilla: add 9.10

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

 app-emulation/wine-vanilla/Manifest|   1 +
 .../wine-vanilla/wine-vanilla-9.10.ebuild  | 439 +
 2 files changed, 440 insertions(+)

diff --git a/app-emulation/wine-vanilla/Manifest 
b/app-emulation/wine-vanilla/Manifest
index 7c21d57ec428..9e1e7a83a19a 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -1,6 +1,7 @@
 DIST wine-7.0.2.tar.xz 27179980 BLAKE2B 
721ab574092638b32d3a483b6ae3def0c9d706cc888662ca461ab8c7060b10077e83cede69663ea2a8b97729f3801209fbba5f8e8828ce20454700ffbbd76cb5
 SHA512 
330c71005a6a8054b5068ac4484e9015e9f8bf55d5a451aaf5f79b7f78a025732b454251c31473abf21504cce3b78e50cf7e3e0d0116bb755dc8396bd790289a
 DIST wine-8.0.2.tar.xz 29060452 BLAKE2B 
dcffaba6c90c4e02a7bc591a81e11aced06c006370c4c316c8a367b2f5814926063482959fabfe9d674ee1b5a560e59087e9b711e28360ced3aee2bbd6bb8fdb
 SHA512 
e86dd31247d757d48ffb2d24f20edab3fc6ef9c3e395567a7b363951bb681335ba3adb8b84639011b24b6eb274582d56880298d6d95fb100acc072383d4e973f
 DIST wine-9.0.tar.xz 30007216 BLAKE2B 
cf53177201a2f7eeb35d0d8ce220f80808d979099a928ad60652d1dee92620c433cc105dffab4e9309f41766087ad1544ef49d2922538bb420d62f6dd64117a1
 SHA512 
838daf2c4581f83f8573b988036f517d57b84894b090a2a17433255d6d044dfa880e6724cdb83082a36c333df9d2083ab68ae53927622a620edd59f33462ada4
+DIST wine-9.10.tar.xz 30289048 BLAKE2B 
8c9001f2edac31636a82f0bd0a02d69b7fc0a20560a568bbff5f46c111ec3b623652a3ec4b9df48a153cf346e580979196496d9c8416794c4be70e7705dbb411
 SHA512 
f76e62b40e72af241c6f88dbcdb767720c36496b9deb9cc1246cea967573bbafd46b7000117d3c64f499d175ac1c7299ebba3f476574bf9b18f6d9744ba7a3e2
 DIST wine-9.7.tar.xz 30281616 BLAKE2B 
4d27f6f2dfd088a0590bfce7228c7eca25b66a9a04706ddecb25af6364e83100c15a78c8d46f3294a42dc7f3503756506f752a02d7058a72ce16716994b334bc
 SHA512 
0c15c3a0901162a386126f2dc987b276b379cc027fc72d9e31cf3122614742f876f30a5f24a495f546cd9c5bd5efce096bd9ca190d0f378fea3d42a298a06e80
 DIST wine-9.8.tar.xz 30297460 BLAKE2B 
689d1b4e55f7d66b8fad8432ad35a52e2fad303e8a9382b8893222c696697efa5de5b56cc2b933bed96d6382f9fdc919fa15e6517ffdb50105cdaea904a7d77f
 SHA512 
3d1b0e6b7b633a0b45ba6b23e741e808dec29355721baf4489c3ad34c67d714b40897ef510c4a84f31be390d7f8b86b93a725787d733eaf77df5c82b322d2662
 DIST wine-9.9.tar.xz 30265476 BLAKE2B 
a2557044b10252c1b1ae023e10863c601e9159d64eda2ce1d8aab4dbb9efffa1b4b15ed27a9edbf6f2bba148c2bb07e729bd706bac9fe17f91c826c74b5980e6
 SHA512 
df016411933b5447bef9b48f67c58e12d6d33ef0c24045ab03c92821dcccbf84335d1a2d765e6d6cf3a743598317010b8ae6f69de3661733e4fa43febec873dd

diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.10.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-9.10.ebuild
new file mode 100644
index ..ea264050fc99
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.10.ebuild
@@ -0,0 +1,439 @@
+# 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 optfeature
+inherit prefix toolchain-funcs wrapper
+
+WINE_GECKO=2.47.4
+WINE_MONO=9.1.0
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   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;
+   S="${WORKDIR}/wine-${PV}"
+   KEYWORDS="-* ~amd64 ~x86"
+fi
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, without external 
patchsets"
+HOMEPAGE="
+   https://www.winehq.org/
+   https://gitlab.winehq.org/wine/wine/
+"
+
+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 odbc 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

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

2024-05-31 Thread Ionen Wolkens

commit: 3dac204259227f5b102cba399cc2306508ad74b3
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri May 31 06:03:03 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri May 31 06:19:47 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3dac2042

app-emulation/wine-vanilla: extend 32bit hwaccel warning for mesa

Hard to tell what's actually needed, nvidia users do not need
it on mesa (or need mesa at all), mesa users do not need it on
nvidia, and multi-card users likely need it on both.

If do this through dependencies, *could* always depend on
mesa[abi_x86_32] even if it may be wrong, and depend on nvidia's
if USE=video_cards_nvidia -- but for now sticking to a warning.

Ultimately it's also kind of an optfeature, only needed if
running 32bit hardware accelerated applications and not needed
at build time.

Non-issue for users doing abi_x86_32 globally.

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

 app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild | 20 ++--
 app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild | 20 ++--
 app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild   | 20 ++--
 app-emulation/wine-vanilla/wine-vanilla-9.7.ebuild   | 20 ++--
 app-emulation/wine-vanilla/wine-vanilla-9.8.ebuild   | 20 ++--
 app-emulation/wine-vanilla/wine-vanilla-9.9.ebuild   | 20 ++--
 app-emulation/wine-vanilla/wine-vanilla-.ebuild  | 20 ++--
 7 files changed, 98 insertions(+), 42 deletions(-)

diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
index 262638ea8d31..bb1d6d125649 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
@@ -367,12 +367,20 @@ 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."
+   if use abi_x86_32 && { use opengl || use vulkan; }; then
+   # difficult to tell what is needed from here, but try to warn
+   if has_version 'x11-drivers/nvidia-drivers'; then
+   if 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."
+   ewarn "Multi-card setups may need this on 
media-libs/mesa as well."
+   fi
+   elif has_version 'media-libs/mesa[-abi_x86_32]'; then
+   ewarn "media-libs/mesa seems to be in use 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
fi
 
eselect wine update --if-unset || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild
index 800c33d6ae95..3402577a7c2d 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild
@@ -373,12 +373,20 @@ 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."
+   if use abi_x86_32 && { use opengl || use vulkan; }; then
+   # difficult to tell what is needed from here, but try to warn
+   if has_version 'x11-drivers/nvidia-drivers'; then
+   if 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."
+   ewarn "Multi-card setups may need this on 
media-libs/mesa as well."
+   fi
+   elif has_version 'media-libs/mesa[-abi_x86_32]'; then
+

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

2024-05-31 Thread Ionen Wolkens

commit: 28ce3c60e87f00db74c1b08ec1f174deff9e39a9
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri May 31 06:09:20 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri May 31 06:19:48 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28ce3c60

app-emulation/wine-proton: extend 32bit hwaccel warning for mesa

Hard to tell what's actually needed, nvidia users do not need
it on mesa (or need mesa at all), mesa users do not need it on
nvidia, and multi-card users likely need it on both.

If do this through dependencies, *could* always depend on
mesa[abi_x86_32] even if it may be wrong, and depend on nvidia's
if USE=video_cards_nvidia -- but for now sticking to a warning.

Ultimately it's also kind of an optfeature, only needed if
running 32bit hardware accelerated applications and not needed
at build time.

Non-issue for users doing abi_x86_32 globally.

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

 app-emulation/wine-proton/wine-proton-7.0.6.ebuild| 19 ++-
 app-emulation/wine-proton/wine-proton-8.0.5c.ebuild   | 19 ++-
 app-emulation/wine-proton/wine-proton-9.0.1.ebuild| 19 ++-
 app-emulation/wine-proton/wine-proton-9.0..ebuild | 19 ++-
 4 files changed, 56 insertions(+), 20 deletions(-)

diff --git a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild 
b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
index 546bcaf60b4a..cdab45831b77 100644
--- a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
+++ b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
@@ -355,11 +355,20 @@ pkg_preinst() {
 pkg_postinst() {
[[ -v WINE_HAD_ANY_SLOT ]] || readme.gentoo_print_elog
 
-   if use abi_x86_32 && 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."
+   if use abi_x86_32; then
+   # difficult to tell what is needed from here, but try to warn
+   if has_version 'x11-drivers/nvidia-drivers'; then
+   if 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."
+   ewarn "Multi-card setups may need this on 
media-libs/mesa as well."
+   fi
+   elif has_version 'media-libs/mesa[-abi_x86_32]'; then
+   ewarn "media-libs/mesa seems to be in use 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
fi
 
eselect wine update --if-unset || die

diff --git a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild 
b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
index e5b25d63323f..83417e7c34f7 100644
--- a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
@@ -372,11 +372,20 @@ pkg_preinst() {
 pkg_postinst() {
[[ -v WINE_HAD_ANY_SLOT ]] || readme.gentoo_print_elog
 
-   if use abi_x86_32 && 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."
+   if use abi_x86_32; then
+   # difficult to tell what is needed from here, but try to warn
+   if has_version 'x11-drivers/nvidia-drivers'; then
+   if 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."
+   ewarn "Multi-card setups may need this on 
media-libs/mesa as well."
+   fi
+   elif has_version 'media-libs/mesa[-abi_x86_32]'; then
+   ewarn "media-libs/mesa seems to be in use 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
fi
 
eselect

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

2024-05-31 Thread Ionen Wolkens

commit: 8533c682bc1bff2969c65fe98db65376d249bb08
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri May 31 06:07:15 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri May 31 06:19:47 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8533c682

app-emulation/wine-staging: extend 32bit hwaccel warning for mesa

Hard to tell what's actually needed, nvidia users do not need
it on mesa (or need mesa at all), mesa users do not need it on
nvidia, and multi-card users likely need it on both.

If do this through dependencies, *could* always depend on
mesa[abi_x86_32] even if it may be wrong, and depend on nvidia's
if USE=video_cards_nvidia -- but for now sticking to a warning.

Ultimately it's also kind of an optfeature, only needed if
running 32bit hardware accelerated applications and not needed
at build time.

Non-issue for users doing abi_x86_32 globally.

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

 app-emulation/wine-staging/wine-staging-9.0.ebuild  | 20 ++--
 app-emulation/wine-staging/wine-staging-9.7.ebuild  | 20 ++--
 app-emulation/wine-staging/wine-staging-9.8.ebuild  | 20 ++--
 app-emulation/wine-staging/wine-staging-9.9.ebuild  | 20 ++--
 app-emulation/wine-staging/wine-staging-.ebuild | 20 ++--
 5 files changed, 70 insertions(+), 30 deletions(-)

diff --git a/app-emulation/wine-staging/wine-staging-9.0.ebuild 
b/app-emulation/wine-staging/wine-staging-9.0.ebuild
index c7ad9c55076f..f82e62bb333f 100644
--- a/app-emulation/wine-staging/wine-staging-9.0.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.0.ebuild
@@ -464,12 +464,20 @@ 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."
+   elif use abi_x86_32 && { use opengl || use vulkan; }; then
+   # difficult to tell what is needed from here, but try to warn
+   if has_version 'x11-drivers/nvidia-drivers'; then
+   if 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."
+   ewarn "Multi-card setups may need this on 
media-libs/mesa as well."
+   fi
+   elif has_version 'media-libs/mesa[-abi_x86_32]'; then
+   ewarn "media-libs/mesa seems to be in use 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
fi
 
eselect wine update --if-unset || die

diff --git a/app-emulation/wine-staging/wine-staging-9.7.ebuild 
b/app-emulation/wine-staging/wine-staging-9.7.ebuild
index 1a169317c27f..24424d0c615d 100644
--- a/app-emulation/wine-staging/wine-staging-9.7.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.7.ebuild
@@ -459,12 +459,20 @@ 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."
+   elif use abi_x86_32 && { use opengl || use vulkan; }; then
+   # difficult to tell what is needed from here, but try to warn
+   if has_version 'x11-drivers/nvidia-drivers'; then
+   if 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

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

2024-05-21 Thread Ionen Wolkens

commit: b71f0a787ca88c50bdfb85ba7ba5cc8c2de660bf
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed May 22 02:11:33 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed May 22 03:30:58 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b71f0a78

Revert "app-emulation/wine-vanilla: add workaround for gcc14 ICE w/ mingw"

This reverts commit b23fe7660928f72b2146770ae145a5f57012ef7c.

Fixing in mingw64-toolchain instead, *could* keep the workaround
longer for those that didn't update but likely doesn't affect many.

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

 app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild | 3 ---
 app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild | 3 ---
 app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild   | 3 ---
 app-emulation/wine-vanilla/wine-vanilla-9.7.ebuild   | 3 ---
 app-emulation/wine-vanilla/wine-vanilla-9.8.ebuild   | 3 ---
 app-emulation/wine-vanilla/wine-vanilla-9.9.ebuild   | 3 ---
 app-emulation/wine-vanilla/wine-vanilla-.ebuild  | 3 ---
 7 files changed, 21 deletions(-)

diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
index fd28a6382911..262638ea8d31 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
@@ -311,9 +311,6 @@ src_configure() {
# znver4: 
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273
append-cflags -mno-avx #912268
 
-   # gcc14 -fno-omit-frame-pointer ICE workaround 
(bug #932319)
-   append-flags -fomit-frame-pointer
-
CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
: "${CROSSLDFLAGS:=$(
filter-flags '-fuse-ld=*'

diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild
index 5d8230171771..800c33d6ae95 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild
@@ -313,9 +313,6 @@ src_configure() {
# znver4: 
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273
append-cflags -mno-avx #912268
 
-   # gcc14 -fno-omit-frame-pointer ICE workaround 
(bug #932319)
-   append-flags -fomit-frame-pointer
-
CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
: "${CROSSLDFLAGS:=$(
filter-flags '-fuse-ld=*'

diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild
index 9b87ea0342a0..0c9ff2f4151d 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild
@@ -313,9 +313,6 @@ src_configure() {
# (primarily done for 23.0 profiles' -z, not 
full coverage)
filter-flags '-Wl,-z,*'
 
-   # gcc14 -fno-omit-frame-pointer ICE workaround 
(bug #932319)
-   append-flags -fomit-frame-pointer
-
CC=${mingwcc} test-flags-CC ${CFLAGS:--O2}
)}"
 

diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.7.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-9.7.ebuild
index 90f930615642..868d1a000777 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9.7.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.7.ebuild
@@ -313,9 +313,6 @@ src_configure() {
# (primarily done for 23.0 profiles' -z, not 
full coverage)
filter-flags '-Wl,-z,*'
 
-   # gcc14 -fno-omit-frame-pointer ICE workaround 
(bug #932319)
-   append-flags -fomit-frame-pointer
-
CC=${mingwcc} test-flags-CC ${CFLAGS:--O2}
)}"
 

diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.8.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-9.8.ebuild
index 583feed94fe5..9b130d772adf 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9.8.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.8.ebuild
@@ -314,9 +314,6 @@ src_configure() {
# (primarily done for 23.0 profiles' -z, not 
full coverage)
filter-flags '-Wl,-z,*'
 
-   # gcc14 -fno-omit-frame-pointer ICE workaround 
(bug #932319)
-   append-flags -fomit-frame-pointer
-
CC=${mingwcc} test-flags-CC ${CFLAGS:--O2}
)}"
 

diff --git

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

2024-05-21 Thread Ionen Wolkens

commit: ae69510e5e450350a0173c5b1a9b5586e9e90bd9
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed May 22 02:11:29 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed May 22 03:30:58 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae69510e

Revert "app-emulation/wine-staging: add workaround for gcc14 ICE w/ mingw"

This reverts commit 5a908d66999ca80ddd00e5bb5f961cff5964de19.

Fixing in mingw64-toolchain instead, *could* keep the workaround
longer for those that didn't update but likely doesn't affect many.

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

 app-emulation/wine-staging/wine-staging-9.0.ebuild  | 3 ---
 app-emulation/wine-staging/wine-staging-9.7.ebuild  | 3 ---
 app-emulation/wine-staging/wine-staging-9.8.ebuild  | 3 ---
 app-emulation/wine-staging/wine-staging-9.9.ebuild  | 3 ---
 app-emulation/wine-staging/wine-staging-.ebuild | 3 ---
 5 files changed, 15 deletions(-)

diff --git a/app-emulation/wine-staging/wine-staging-9.0.ebuild 
b/app-emulation/wine-staging/wine-staging-9.0.ebuild
index d4c00080b6ba..c7ad9c55076f 100644
--- a/app-emulation/wine-staging/wine-staging-9.0.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.0.ebuild
@@ -365,9 +365,6 @@ src_configure() {
# (primarily done for 23.0 profiles' -z, not 
full coverage)
filter-flags '-Wl,-z,*'
 
-   # gcc14 -fno-omit-frame-pointer ICE workaround 
(bug #932319)
-   append-flags -fomit-frame-pointer
-
CC=${mingwcc} test-flags-CC ${CFLAGS:--O2}
)}"
 

diff --git a/app-emulation/wine-staging/wine-staging-9.7.ebuild 
b/app-emulation/wine-staging/wine-staging-9.7.ebuild
index dd84d3476255..1a169317c27f 100644
--- a/app-emulation/wine-staging/wine-staging-9.7.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.7.ebuild
@@ -360,9 +360,6 @@ src_configure() {
# (primarily done for 23.0 profiles' -z, not 
full coverage)
filter-flags '-Wl,-z,*'
 
-   # gcc14 -fno-omit-frame-pointer ICE workaround 
(bug #932319)
-   append-flags -fomit-frame-pointer
-
CC=${mingwcc} test-flags-CC ${CFLAGS:--O2}
)}"
 

diff --git a/app-emulation/wine-staging/wine-staging-9.8.ebuild 
b/app-emulation/wine-staging/wine-staging-9.8.ebuild
index 1e03bed0effd..dff82e982ed2 100644
--- a/app-emulation/wine-staging/wine-staging-9.8.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.8.ebuild
@@ -361,9 +361,6 @@ src_configure() {
# (primarily done for 23.0 profiles' -z, not 
full coverage)
filter-flags '-Wl,-z,*'
 
-   # gcc14 -fno-omit-frame-pointer ICE workaround 
(bug #932319)
-   append-flags -fomit-frame-pointer
-
CC=${mingwcc} test-flags-CC ${CFLAGS:--O2}
)}"
 

diff --git a/app-emulation/wine-staging/wine-staging-9.9.ebuild 
b/app-emulation/wine-staging/wine-staging-9.9.ebuild
index edf27c89a404..c8f8d0cdc861 100644
--- a/app-emulation/wine-staging/wine-staging-9.9.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.9.ebuild
@@ -360,9 +360,6 @@ src_configure() {
# (primarily done for 23.0 profiles' -z, not 
full coverage)
filter-flags '-Wl,-z,*'
 
-   # gcc14 -fno-omit-frame-pointer ICE workaround 
(bug #932319)
-   append-flags -fomit-frame-pointer
-
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 edf27c89a404..c8f8d0cdc861 100644
--- a/app-emulation/wine-staging/wine-staging-.ebuild
+++ b/app-emulation/wine-staging/wine-staging-.ebuild
@@ -360,9 +360,6 @@ src_configure() {
# (primarily done for 23.0 profiles' -z, not 
full coverage)
filter-flags '-Wl,-z,*'
 
-   # gcc14 -fno-omit-frame-pointer ICE workaround 
(bug #932319)
-   append-flags -fomit-frame-pointer
-
CC=${mingwcc} test-flags-CC ${CFLAGS:--O2}
)}"

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

2024-05-21 Thread Ionen Wolkens

commit: f148a5bd2cbd0b8094b11865d5b0f9884f551127
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed May 22 02:11:24 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed May 22 03:30:58 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f148a5bd

Revert "app-emulation/wine-proton: add workaround for gcc14 ICE w/ mingw"

This reverts commit b701bf35fd508f2bc15c42805e7ab2ad131ff5f6.

Fixing in mingw64-toolchain instead, *could* keep the workaround
longer for those that didn't update but likely doesn't affect many.

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

 app-emulation/wine-proton/wine-proton-7.0.6.ebuild| 3 ---
 app-emulation/wine-proton/wine-proton-8.0.5c.ebuild   | 3 ---
 app-emulation/wine-proton/wine-proton-9.0.1.ebuild| 3 ---
 app-emulation/wine-proton/wine-proton-9.0..ebuild | 3 ---
 4 files changed, 12 deletions(-)

diff --git a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild 
b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
index 81d3096abf6b..546bcaf60b4a 100644
--- a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
+++ b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
@@ -295,9 +295,6 @@ src_configure() {
# znver4: 
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273
append-cflags -mno-avx #912268
 
-   # gcc14 -fno-omit-frame-pointer ICE workaround (bug 
#932319)
-   append-flags -fomit-frame-pointer
-
CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
: "${CROSSLDFLAGS:=$(
filter-flags '-fuse-ld=*'

diff --git a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild 
b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
index c0e755952564..e5b25d63323f 100644
--- a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
@@ -308,9 +308,6 @@ src_configure() {
# znver4: 
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273
append-cflags -mno-avx #912268
 
-   # gcc14 -fno-omit-frame-pointer ICE workaround (bug 
#932319)
-   append-flags -fomit-frame-pointer
-
CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
: "${CROSSLDFLAGS:=$(
filter-flags '-fuse-ld=*'

diff --git a/app-emulation/wine-proton/wine-proton-9.0.1.ebuild 
b/app-emulation/wine-proton/wine-proton-9.0.1.ebuild
index f3d2a4dc29e1..4558c65461b2 100644
--- a/app-emulation/wine-proton/wine-proton-9.0.1.ebuild
+++ b/app-emulation/wine-proton/wine-proton-9.0.1.ebuild
@@ -301,9 +301,6 @@ src_configure() {
# (primarily done for 23.0 profiles' -z, not full 
coverage)
filter-flags '-Wl,-z,*'
 
-   # gcc14 -fno-omit-frame-pointer ICE workaround (bug 
#932319)
-   append-flags -fomit-frame-pointer
-
CC=${mingwcc} test-flags-CC ${CFLAGS:--O2}
)}"
 

diff --git a/app-emulation/wine-proton/wine-proton-9.0..ebuild 
b/app-emulation/wine-proton/wine-proton-9.0..ebuild
index 8a5138a724ad..ceddb4a00eec 100644
--- a/app-emulation/wine-proton/wine-proton-9.0..ebuild
+++ b/app-emulation/wine-proton/wine-proton-9.0..ebuild
@@ -303,9 +303,6 @@ src_configure() {
# (primarily done for 23.0 profiles' -z, not full 
coverage)
filter-flags '-Wl,-z,*'
 
-   # gcc14 -fno-omit-frame-pointer ICE workaround (bug 
#932319)
-   append-flags -fomit-frame-pointer
-
CC=${mingwcc} test-flags-CC ${CFLAGS:--O2}
)}"

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

2024-05-20 Thread Ionen Wolkens

commit: 5a908d66999ca80ddd00e5bb5f961cff5964de19
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue May 21 02:23:38 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue May 21 02:58:15 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a908d66

app-emulation/wine-staging: add workaround for gcc14 ICE w/ mingw

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

 app-emulation/wine-staging/wine-staging-9.0.ebuild  | 3 +++
 app-emulation/wine-staging/wine-staging-9.7.ebuild  | 3 +++
 app-emulation/wine-staging/wine-staging-9.8.ebuild  | 3 +++
 app-emulation/wine-staging/wine-staging-9.9.ebuild  | 3 +++
 app-emulation/wine-staging/wine-staging-.ebuild | 3 +++
 5 files changed, 15 insertions(+)

diff --git a/app-emulation/wine-staging/wine-staging-9.0.ebuild 
b/app-emulation/wine-staging/wine-staging-9.0.ebuild
index c7ad9c55076f..d4c00080b6ba 100644
--- a/app-emulation/wine-staging/wine-staging-9.0.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.0.ebuild
@@ -365,6 +365,9 @@ src_configure() {
# (primarily done for 23.0 profiles' -z, not 
full coverage)
filter-flags '-Wl,-z,*'
 
+   # gcc14 -fno-omit-frame-pointer ICE workaround 
(bug #932319)
+   append-flags -fomit-frame-pointer
+
CC=${mingwcc} test-flags-CC ${CFLAGS:--O2}
)}"
 

diff --git a/app-emulation/wine-staging/wine-staging-9.7.ebuild 
b/app-emulation/wine-staging/wine-staging-9.7.ebuild
index 1a169317c27f..dd84d3476255 100644
--- a/app-emulation/wine-staging/wine-staging-9.7.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.7.ebuild
@@ -360,6 +360,9 @@ src_configure() {
# (primarily done for 23.0 profiles' -z, not 
full coverage)
filter-flags '-Wl,-z,*'
 
+   # gcc14 -fno-omit-frame-pointer ICE workaround 
(bug #932319)
+   append-flags -fomit-frame-pointer
+
CC=${mingwcc} test-flags-CC ${CFLAGS:--O2}
)}"
 

diff --git a/app-emulation/wine-staging/wine-staging-9.8.ebuild 
b/app-emulation/wine-staging/wine-staging-9.8.ebuild
index dff82e982ed2..1e03bed0effd 100644
--- a/app-emulation/wine-staging/wine-staging-9.8.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.8.ebuild
@@ -361,6 +361,9 @@ src_configure() {
# (primarily done for 23.0 profiles' -z, not 
full coverage)
filter-flags '-Wl,-z,*'
 
+   # gcc14 -fno-omit-frame-pointer ICE workaround 
(bug #932319)
+   append-flags -fomit-frame-pointer
+
CC=${mingwcc} test-flags-CC ${CFLAGS:--O2}
)}"
 

diff --git a/app-emulation/wine-staging/wine-staging-9.9.ebuild 
b/app-emulation/wine-staging/wine-staging-9.9.ebuild
index c8f8d0cdc861..edf27c89a404 100644
--- a/app-emulation/wine-staging/wine-staging-9.9.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.9.ebuild
@@ -360,6 +360,9 @@ src_configure() {
# (primarily done for 23.0 profiles' -z, not 
full coverage)
filter-flags '-Wl,-z,*'
 
+   # gcc14 -fno-omit-frame-pointer ICE workaround 
(bug #932319)
+   append-flags -fomit-frame-pointer
+
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 c8f8d0cdc861..edf27c89a404 100644
--- a/app-emulation/wine-staging/wine-staging-.ebuild
+++ b/app-emulation/wine-staging/wine-staging-.ebuild
@@ -360,6 +360,9 @@ src_configure() {
# (primarily done for 23.0 profiles' -z, not 
full coverage)
filter-flags '-Wl,-z,*'
 
+   # gcc14 -fno-omit-frame-pointer ICE workaround 
(bug #932319)
+   append-flags -fomit-frame-pointer
+
CC=${mingwcc} test-flags-CC ${CFLAGS:--O2}
)}"

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

2024-05-20 Thread Ionen Wolkens

commit: b701bf35fd508f2bc15c42805e7ab2ad131ff5f6
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue May 21 02:23:48 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue May 21 02:58:15 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b701bf35

app-emulation/wine-proton: add workaround for gcc14 ICE w/ mingw

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

 app-emulation/wine-proton/wine-proton-7.0.6.ebuild| 3 +++
 app-emulation/wine-proton/wine-proton-8.0.5c.ebuild   | 3 +++
 app-emulation/wine-proton/wine-proton-9.0.1.ebuild| 3 +++
 app-emulation/wine-proton/wine-proton-9.0..ebuild | 3 +++
 4 files changed, 12 insertions(+)

diff --git a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild 
b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
index 546bcaf60b4a..81d3096abf6b 100644
--- a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
+++ b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
@@ -295,6 +295,9 @@ src_configure() {
# znver4: 
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273
append-cflags -mno-avx #912268
 
+   # gcc14 -fno-omit-frame-pointer ICE workaround (bug 
#932319)
+   append-flags -fomit-frame-pointer
+
CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
: "${CROSSLDFLAGS:=$(
filter-flags '-fuse-ld=*'

diff --git a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild 
b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
index e5b25d63323f..c0e755952564 100644
--- a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
@@ -308,6 +308,9 @@ src_configure() {
# znver4: 
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273
append-cflags -mno-avx #912268
 
+   # gcc14 -fno-omit-frame-pointer ICE workaround (bug 
#932319)
+   append-flags -fomit-frame-pointer
+
CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
: "${CROSSLDFLAGS:=$(
filter-flags '-fuse-ld=*'

diff --git a/app-emulation/wine-proton/wine-proton-9.0.1.ebuild 
b/app-emulation/wine-proton/wine-proton-9.0.1.ebuild
index 4558c65461b2..f3d2a4dc29e1 100644
--- a/app-emulation/wine-proton/wine-proton-9.0.1.ebuild
+++ b/app-emulation/wine-proton/wine-proton-9.0.1.ebuild
@@ -301,6 +301,9 @@ src_configure() {
# (primarily done for 23.0 profiles' -z, not full 
coverage)
filter-flags '-Wl,-z,*'
 
+   # gcc14 -fno-omit-frame-pointer ICE workaround (bug 
#932319)
+   append-flags -fomit-frame-pointer
+
CC=${mingwcc} test-flags-CC ${CFLAGS:--O2}
)}"
 

diff --git a/app-emulation/wine-proton/wine-proton-9.0..ebuild 
b/app-emulation/wine-proton/wine-proton-9.0..ebuild
index ceddb4a00eec..8a5138a724ad 100644
--- a/app-emulation/wine-proton/wine-proton-9.0..ebuild
+++ b/app-emulation/wine-proton/wine-proton-9.0..ebuild
@@ -303,6 +303,9 @@ src_configure() {
# (primarily done for 23.0 profiles' -z, not full 
coverage)
filter-flags '-Wl,-z,*'
 
+   # gcc14 -fno-omit-frame-pointer ICE workaround (bug 
#932319)
+   append-flags -fomit-frame-pointer
+
CC=${mingwcc} test-flags-CC ${CFLAGS:--O2}
)}"

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

2024-05-20 Thread Ionen Wolkens

commit: b23fe7660928f72b2146770ae145a5f57012ef7c
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue May 21 02:23:30 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue May 21 02:58:14 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b23fe766

app-emulation/wine-vanilla: add workaround for gcc14 ICE w/ mingw

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

 app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild | 3 +++
 app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild | 3 +++
 app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild   | 3 +++
 app-emulation/wine-vanilla/wine-vanilla-9.7.ebuild   | 3 +++
 app-emulation/wine-vanilla/wine-vanilla-9.8.ebuild   | 3 +++
 app-emulation/wine-vanilla/wine-vanilla-9.9.ebuild   | 3 +++
 app-emulation/wine-vanilla/wine-vanilla-.ebuild  | 3 +++
 7 files changed, 21 insertions(+)

diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
index 262638ea8d31..fd28a6382911 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
@@ -311,6 +311,9 @@ src_configure() {
# znver4: 
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273
append-cflags -mno-avx #912268
 
+   # gcc14 -fno-omit-frame-pointer ICE workaround 
(bug #932319)
+   append-flags -fomit-frame-pointer
+
CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
: "${CROSSLDFLAGS:=$(
filter-flags '-fuse-ld=*'

diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild
index 800c33d6ae95..5d8230171771 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild
@@ -313,6 +313,9 @@ src_configure() {
# znver4: 
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273
append-cflags -mno-avx #912268
 
+   # gcc14 -fno-omit-frame-pointer ICE workaround 
(bug #932319)
+   append-flags -fomit-frame-pointer
+
CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
: "${CROSSLDFLAGS:=$(
filter-flags '-fuse-ld=*'

diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild
index 0c9ff2f4151d..9b87ea0342a0 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild
@@ -313,6 +313,9 @@ src_configure() {
# (primarily done for 23.0 profiles' -z, not 
full coverage)
filter-flags '-Wl,-z,*'
 
+   # gcc14 -fno-omit-frame-pointer ICE workaround 
(bug #932319)
+   append-flags -fomit-frame-pointer
+
CC=${mingwcc} test-flags-CC ${CFLAGS:--O2}
)}"
 

diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.7.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-9.7.ebuild
index 868d1a000777..90f930615642 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9.7.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.7.ebuild
@@ -313,6 +313,9 @@ src_configure() {
# (primarily done for 23.0 profiles' -z, not 
full coverage)
filter-flags '-Wl,-z,*'
 
+   # gcc14 -fno-omit-frame-pointer ICE workaround 
(bug #932319)
+   append-flags -fomit-frame-pointer
+
CC=${mingwcc} test-flags-CC ${CFLAGS:--O2}
)}"
 

diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.8.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-9.8.ebuild
index 9b130d772adf..583feed94fe5 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9.8.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.8.ebuild
@@ -314,6 +314,9 @@ src_configure() {
# (primarily done for 23.0 profiles' -z, not 
full coverage)
filter-flags '-Wl,-z,*'
 
+   # gcc14 -fno-omit-frame-pointer ICE workaround 
(bug #932319)
+   append-flags -fomit-frame-pointer
+
CC=${mingwcc} test-flags-CC ${CFLAGS:--O2}
)}"
 

diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.9.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-9.9.ebuild
index 2685dfbc9d27..1fde6fe10c72 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9.9.ebuild
+++

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

2024-05-18 Thread Ionen Wolkens

commit: 9a76cc9cb8d45dbc60fa4e8bc62bf96fa8d6f519
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat May 18 12:11:20 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat May 18 12:28:04 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a76cc9c

app-emulation/wine-staging: add 9.9

configure.ac gains --with-odbc from the recent wine-vanilla changes
to link directly with it, but wine-staging is still applying its
(now slightly incomplete) remove odbc patch so it's not actually used.

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

 app-emulation/wine-staging/Manifest|   2 +
 app-emulation/wine-staging/wine-staging-9.9.ebuild | 478 +
 2 files changed, 480 insertions(+)

diff --git a/app-emulation/wine-staging/Manifest 
b/app-emulation/wine-staging/Manifest
index a0cba5cfe10f..ae3fbbcf4bcd 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.7.tar.xz 30281616 BLAKE2B 
4d27f6f2dfd088a0590bfce7228c7eca25b66a9a04706ddecb25af6364e83100c15a78c8d46f3294a42dc7f3503756506f752a02d7058a72ce16716994b334bc
 SHA512 
0c15c3a0901162a386126f2dc987b276b379cc027fc72d9e31cf3122614742f876f30a5f24a495f546cd9c5bd5efce096bd9ca190d0f378fea3d42a298a06e80
 DIST wine-9.8.tar.xz 30297460 BLAKE2B 
689d1b4e55f7d66b8fad8432ad35a52e2fad303e8a9382b8893222c696697efa5de5b56cc2b933bed96d6382f9fdc919fa15e6517ffdb50105cdaea904a7d77f
 SHA512 
3d1b0e6b7b633a0b45ba6b23e741e808dec29355721baf4489c3ad34c67d714b40897ef510c4a84f31be390d7f8b86b93a725787d733eaf77df5c82b322d2662
+DIST wine-9.9.tar.xz 30265476 BLAKE2B 
a2557044b10252c1b1ae023e10863c601e9159d64eda2ce1d8aab4dbb9efffa1b4b15ed27a9edbf6f2bba148c2bb07e729bd706bac9fe17f91c826c74b5980e6
 SHA512 
df016411933b5447bef9b48f67c58e12d6d33ef0c24045ab03c92821dcccbf84335d1a2d765e6d6cf3a743598317010b8ae6f69de3661733e4fa43febec873dd
 DIST wine-staging-9.0.tar.gz 9577631 BLAKE2B 
0012978f54c618e73d407dd49dccff02853912d0c015098889802518e8c51b280f5d60e11291335dafc68944ee01cbcb7fd6c5825ef10ae1520c7b82d9846718
 SHA512 
362209fcadcf029152b681c76beb231d0cc8de1609b994094f1dc88ab871fddda08b3d8c2fe36ceb38909a9d634c1ade864ca0f28a6a7715ec286a8b2884981f
 DIST wine-staging-9.7.tar.gz 9573710 BLAKE2B 
34eee97f51268c07d649f0ed498b5e92bbc8bb1d8cee860040ee660d968307a7d9d3b59305567c50338d2ce97b3071f615b8782ca74716b42904ae4514404316
 SHA512 
3c5f100f715c6b3399c356b304b8eca1e51706e03782f2f834965474a7efeca4174ae806dff85080cded93501e9cfcd097eca43230d9425c78ae73a6f4485c76
 DIST wine-staging-9.8.tar.gz 9580231 BLAKE2B 
74d0b7d4eb49b5cb16abf17a2aae52bad9db04d3e207762f1d37a9f18870683c0115ce41b29e24edad827557de4a07235980588115b61fa86eeaaa5573460535
 SHA512 
8132c1fd98b55ef04993e894e11063e43ac1cae059f80e0dc3b2a4c6bf08a6ab80f7bdd02b97f62733f31850b41e5d2d6c5085b22bf873fc03ab67b79bdd3c1d
+DIST wine-staging-9.9.tar.gz 9593672 BLAKE2B 
9f6fc7137bb447e52642caf7083ddd60a8d7a545f364dd1783b7adfbd2a80da8b89bc2199525b3c9d75f9f356f5548cf97ae1278361be1c6fb0f0e218c3cf336
 SHA512 
1b6b341a48a05f48587b7ecc0ead50058b2c1f8a47b6e52adbc7e4afff9bc633a6018e90b2e3ee6b720c59181095b793cd2bbfa7242aec6871f2f87f4db661c4

diff --git a/app-emulation/wine-staging/wine-staging-9.9.ebuild 
b/app-emulation/wine-staging/wine-staging-9.9.ebuild
new file mode 100644
index ..c8f8d0cdc861
--- /dev/null
+++ b/app-emulation/wine-staging/wine-staging-9.9.ebuild
@@ -0,0 +1,478 @@
+# 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..13} )
+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.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
+
+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

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

2024-05-18 Thread Ionen Wolkens

commit: 8915d5f7175952546e9fd00b34a7818464a44ef7
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat May 18 11:57:21 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat May 18 12:25:19 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8915d5f7

app-emulation/wine-staging: drop 9.5, 9.6

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

 app-emulation/wine-staging/Manifest|   4 -
 app-emulation/wine-staging/wine-staging-9.5.ebuild | 483 -
 app-emulation/wine-staging/wine-staging-9.6.ebuild | 478 
 3 files changed, 965 deletions(-)

diff --git a/app-emulation/wine-staging/Manifest 
b/app-emulation/wine-staging/Manifest
index fe42d750defe..a0cba5cfe10f 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,10 +1,6 @@
 DIST wine-9.0.tar.xz 30007216 BLAKE2B 
cf53177201a2f7eeb35d0d8ce220f80808d979099a928ad60652d1dee92620c433cc105dffab4e9309f41766087ad1544ef49d2922538bb420d62f6dd64117a1
 SHA512 
838daf2c4581f83f8573b988036f517d57b84894b090a2a17433255d6d044dfa880e6724cdb83082a36c333df9d2083ab68ae53927622a620edd59f33462ada4
-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-9.8.tar.xz 30297460 BLAKE2B 
689d1b4e55f7d66b8fad8432ad35a52e2fad303e8a9382b8893222c696697efa5de5b56cc2b933bed96d6382f9fdc919fa15e6517ffdb50105cdaea904a7d77f
 SHA512 
3d1b0e6b7b633a0b45ba6b23e741e808dec29355721baf4489c3ad34c67d714b40897ef510c4a84f31be390d7f8b86b93a725787d733eaf77df5c82b322d2662
 DIST wine-staging-9.0.tar.gz 9577631 BLAKE2B 
0012978f54c618e73d407dd49dccff02853912d0c015098889802518e8c51b280f5d60e11291335dafc68944ee01cbcb7fd6c5825ef10ae1520c7b82d9846718
 SHA512 
362209fcadcf029152b681c76beb231d0cc8de1609b994094f1dc88ab871fddda08b3d8c2fe36ceb38909a9d634c1ade864ca0f28a6a7715ec286a8b2884981f
-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
 DIST wine-staging-9.8.tar.gz 9580231 BLAKE2B 
74d0b7d4eb49b5cb16abf17a2aae52bad9db04d3e207762f1d37a9f18870683c0115ce41b29e24edad827557de4a07235980588115b61fa86eeaaa5573460535
 SHA512 
8132c1fd98b55ef04993e894e11063e43ac1cae059f80e0dc3b2a4c6bf08a6ab80f7bdd02b97f62733f31850b41e5d2d6c5085b22bf873fc03ab67b79bdd3c1d

diff --git a/app-emulation/wine-staging/wine-staging-9.5.ebuild 
b/app-emulation/wine-staging/wine-staging-9.5.ebuild
deleted file mode 100644
index e0290114c53b..
--- a/app-emulation/wine-staging/wine-staging-9.5.ebuild
+++ /dev/null
@@ -1,483 +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..13} )
-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-05-18 Thread Ionen Wolkens

commit: 9adc8ac022b11f2a2d94bddbf73b18cbeace6818
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat May 18 12:26:46 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat May 18 12:27:47 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9adc8ac0

app-emulation/wine-staging: sync live for py3.13

Was meant to be enabled alongside releases but overlooked.

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 1b010ac0cc44..c8f8d0cdc861 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..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 inherit autotools edo flag-o-matic multilib multilib-build optfeature
 inherit prefix python-any-r1 toolchain-funcs wrapper

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

2024-05-17 Thread Ionen Wolkens

commit: 56dcc8fb2475dc406099974ac9cc2e1c79794dd6
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat May 18 02:43:23 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat May 18 02:43:39 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56dcc8fb

app-emulation/wine-vanilla: add 9.9

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

 app-emulation/wine-vanilla/Manifest|   1 +
 app-emulation/wine-vanilla/wine-vanilla-9.9.ebuild | 431 +
 2 files changed, 432 insertions(+)

diff --git a/app-emulation/wine-vanilla/Manifest 
b/app-emulation/wine-vanilla/Manifest
index 73242bf3d40f..7c21d57ec428 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -3,3 +3,4 @@ DIST wine-8.0.2.tar.xz 29060452 BLAKE2B 
dcffaba6c90c4e02a7bc591a81e11aced06c0063
 DIST wine-9.0.tar.xz 30007216 BLAKE2B 
cf53177201a2f7eeb35d0d8ce220f80808d979099a928ad60652d1dee92620c433cc105dffab4e9309f41766087ad1544ef49d2922538bb420d62f6dd64117a1
 SHA512 
838daf2c4581f83f8573b988036f517d57b84894b090a2a17433255d6d044dfa880e6724cdb83082a36c333df9d2083ab68ae53927622a620edd59f33462ada4
 DIST wine-9.7.tar.xz 30281616 BLAKE2B 
4d27f6f2dfd088a0590bfce7228c7eca25b66a9a04706ddecb25af6364e83100c15a78c8d46f3294a42dc7f3503756506f752a02d7058a72ce16716994b334bc
 SHA512 
0c15c3a0901162a386126f2dc987b276b379cc027fc72d9e31cf3122614742f876f30a5f24a495f546cd9c5bd5efce096bd9ca190d0f378fea3d42a298a06e80
 DIST wine-9.8.tar.xz 30297460 BLAKE2B 
689d1b4e55f7d66b8fad8432ad35a52e2fad303e8a9382b8893222c696697efa5de5b56cc2b933bed96d6382f9fdc919fa15e6517ffdb50105cdaea904a7d77f
 SHA512 
3d1b0e6b7b633a0b45ba6b23e741e808dec29355721baf4489c3ad34c67d714b40897ef510c4a84f31be390d7f8b86b93a725787d733eaf77df5c82b322d2662
+DIST wine-9.9.tar.xz 30265476 BLAKE2B 
a2557044b10252c1b1ae023e10863c601e9159d64eda2ce1d8aab4dbb9efffa1b4b15ed27a9edbf6f2bba148c2bb07e729bd706bac9fe17f91c826c74b5980e6
 SHA512 
df016411933b5447bef9b48f67c58e12d6d33ef0c24045ab03c92821dcccbf84335d1a2d765e6d6cf3a743598317010b8ae6f69de3661733e4fa43febec873dd

diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.9.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-9.9.ebuild
new file mode 100644
index ..2685dfbc9d27
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.9.ebuild
@@ -0,0 +1,431 @@
+# 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 optfeature
+inherit prefix toolchain-funcs wrapper
+
+WINE_GECKO=2.47.4
+WINE_MONO=9.1.0
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   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;
+   S="${WORKDIR}/wine-${PV}"
+   KEYWORDS="-* ~amd64 ~x86"
+fi
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, without external 
patchsets"
+HOMEPAGE="
+   https://www.winehq.org/
+   https://gitlab.winehq.org/wine/wine/
+"
+
+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 odbc 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}] )
+   )
+   xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+   xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+   )
+   cups? ( net-print/cups[${MULTILIB_USEDEP}] )
+   fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
+   kerberos? (

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

2024-05-17 Thread Ionen Wolkens

commit: 018ff877381575ef6f8a3710bcb3bd1341ab3a88
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat May 18 01:47:37 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat May 18 02:43:39 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=018ff877

app-emulation/wine-vanilla: drop 9.5, 9.6

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

 app-emulation/wine-vanilla/Manifest|   2 -
 app-emulation/wine-vanilla/wine-vanilla-9.5.ebuild | 431 -
 app-emulation/wine-vanilla/wine-vanilla-9.6.ebuild | 431 -
 3 files changed, 864 deletions(-)

diff --git a/app-emulation/wine-vanilla/Manifest 
b/app-emulation/wine-vanilla/Manifest
index fd6dd151ecd7..73242bf3d40f 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -1,7 +1,5 @@
 DIST wine-7.0.2.tar.xz 27179980 BLAKE2B 
721ab574092638b32d3a483b6ae3def0c9d706cc888662ca461ab8c7060b10077e83cede69663ea2a8b97729f3801209fbba5f8e8828ce20454700ffbbd76cb5
 SHA512 
330c71005a6a8054b5068ac4484e9015e9f8bf55d5a451aaf5f79b7f78a025732b454251c31473abf21504cce3b78e50cf7e3e0d0116bb755dc8396bd790289a
 DIST wine-8.0.2.tar.xz 29060452 BLAKE2B 
dcffaba6c90c4e02a7bc591a81e11aced06c006370c4c316c8a367b2f5814926063482959fabfe9d674ee1b5a560e59087e9b711e28360ced3aee2bbd6bb8fdb
 SHA512 
e86dd31247d757d48ffb2d24f20edab3fc6ef9c3e395567a7b363951bb681335ba3adb8b84639011b24b6eb274582d56880298d6d95fb100acc072383d4e973f
 DIST wine-9.0.tar.xz 30007216 BLAKE2B 
cf53177201a2f7eeb35d0d8ce220f80808d979099a928ad60652d1dee92620c433cc105dffab4e9309f41766087ad1544ef49d2922538bb420d62f6dd64117a1
 SHA512 
838daf2c4581f83f8573b988036f517d57b84894b090a2a17433255d6d044dfa880e6724cdb83082a36c333df9d2083ab68ae53927622a620edd59f33462ada4
-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-9.8.tar.xz 30297460 BLAKE2B 
689d1b4e55f7d66b8fad8432ad35a52e2fad303e8a9382b8893222c696697efa5de5b56cc2b933bed96d6382f9fdc919fa15e6517ffdb50105cdaea904a7d77f
 SHA512 
3d1b0e6b7b633a0b45ba6b23e741e808dec29355721baf4489c3ad34c67d714b40897ef510c4a84f31be390d7f8b86b93a725787d733eaf77df5c82b322d2662

diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.5.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-9.5.ebuild
deleted file mode 100644
index 5c5dff913f13..
--- a/app-emulation/wine-vanilla/wine-vanilla-9.5.ebuild
+++ /dev/null
@@ -1,431 +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 optfeature
-inherit prefix toolchain-funcs wrapper
-
-WINE_GECKO=2.47.4
-WINE_MONO=9.0.0
-
-if [[ ${PV} == * ]]; then
-   inherit git-r3
-   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;
-   S="${WORKDIR}/wine-${PV}"
-   KEYWORDS="-* ~amd64 ~x86"
-fi
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, without external 
patchsets"
-HOMEPAGE="
-   https://www.winehq.org/
-   https://gitlab.winehq.org/wine/wine/
-"
-
-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 odbc 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"

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

2024-05-15 Thread Ionen Wolkens

commit: 01be2510d93f231f713fb4a9f455e371400c36c4
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu May 16 02:03:12 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu May 16 02:05:22 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01be2510

app-emulation/wine-staging: depend on vulkan-loader[X?]

Not worth a revbump, rather few people disable that.

Also do [wayland?] for 9.8 and , technically vulkan support
is pretty WIP so it's more or less a placeholder -- more correct
handling would be to require vulkan? ( X ) for now.

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

 app-emulation/wine-staging/wine-staging-9.0.ebuild  | 2 +-
 app-emulation/wine-staging/wine-staging-9.5.ebuild  | 2 +-
 app-emulation/wine-staging/wine-staging-9.6.ebuild  | 2 +-
 app-emulation/wine-staging/wine-staging-9.7.ebuild  | 2 +-
 app-emulation/wine-staging/wine-staging-9.8.ebuild  | 2 +-
 app-emulation/wine-staging/wine-staging-.ebuild | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app-emulation/wine-staging/wine-staging-9.0.ebuild 
b/app-emulation/wine-staging/wine-staging-9.0.ebuild
index acc21ca9b5e2..c7ad9c55076f 100644
--- a/app-emulation/wine-staging/wine-staging-9.0.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.0.ebuild
@@ -79,7 +79,7 @@ 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[X?,${MULTILIB_USEDEP}] )
 "
 WINE_COMMON_DEPEND="
${WINE_DLOPEN_DEPEND}

diff --git a/app-emulation/wine-staging/wine-staging-9.5.ebuild 
b/app-emulation/wine-staging/wine-staging-9.5.ebuild
index 81161556f611..e0290114c53b 100644
--- a/app-emulation/wine-staging/wine-staging-9.5.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.5.ebuild
@@ -79,7 +79,7 @@ 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[X?,${MULTILIB_USEDEP}] )
 "
 WINE_COMMON_DEPEND="
${WINE_DLOPEN_DEPEND}

diff --git a/app-emulation/wine-staging/wine-staging-9.6.ebuild 
b/app-emulation/wine-staging/wine-staging-9.6.ebuild
index 3a82f055fb75..1a169317c27f 100644
--- a/app-emulation/wine-staging/wine-staging-9.6.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.6.ebuild
@@ -79,7 +79,7 @@ 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[X?,${MULTILIB_USEDEP}] )
 "
 WINE_COMMON_DEPEND="
${WINE_DLOPEN_DEPEND}

diff --git a/app-emulation/wine-staging/wine-staging-9.7.ebuild 
b/app-emulation/wine-staging/wine-staging-9.7.ebuild
index 3a82f055fb75..1a169317c27f 100644
--- a/app-emulation/wine-staging/wine-staging-9.7.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.7.ebuild
@@ -79,7 +79,7 @@ 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[X?,${MULTILIB_USEDEP}] )
 "
 WINE_COMMON_DEPEND="
${WINE_DLOPEN_DEPEND}

diff --git a/app-emulation/wine-staging/wine-staging-9.8.ebuild 
b/app-emulation/wine-staging/wine-staging-9.8.ebuild
index 21d2022a896c..dff82e982ed2 100644
--- a/app-emulation/wine-staging/wine-staging-9.8.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.8.ebuild
@@ -79,7 +79,7 @@ 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[X?,wayland?,${MULTILIB_USEDEP}] )
 "
 WINE_COMMON_DEPEND="
${WINE_DLOPEN_DEPEND}

diff --git a/app-emulation/wine-staging/wine-staging-.ebuild 
b/app-emulation/wine-staging/wine-staging-.ebuild
index f0ed10e52b22..1b010ac0cc44 100644
--- a/app-emulation/wine-staging/wine-staging-.ebuild
+++ b/app-emulation/wine-staging/wine-staging-.ebuild
@@ -79,7 +79,7 @@ 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? (

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

2024-05-15 Thread Ionen Wolkens

commit: 23b55a43064d565cbed6e5d01941b72298c53522
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu May 16 02:00:22 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu May 16 02:05:22 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23b55a43

app-emulation/wine-vanilla: depend on vulkan-loader[X?]

Not worth a revbump, rather few people disable that.

Also do [wayland?] for 9.8 and , technically vulkan support
is pretty WIP so it's more or less a placeholder -- more correct
handling would be to require vulkan? ( X ) for now.

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

 app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild | 2 +-
 app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild | 2 +-
 app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild   | 2 +-
 app-emulation/wine-vanilla/wine-vanilla-9.5.ebuild   | 2 +-
 app-emulation/wine-vanilla/wine-vanilla-9.6.ebuild   | 2 +-
 app-emulation/wine-vanilla/wine-vanilla-9.7.ebuild   | 2 +-
 app-emulation/wine-vanilla/wine-vanilla-9.8.ebuild   | 2 +-
 app-emulation/wine-vanilla/wine-vanilla-.ebuild  | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
index 583683c9685c..262638ea8d31 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
@@ -72,7 +72,7 @@ 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[X?,${MULTILIB_USEDEP}] )
 "
 WINE_COMMON_DEPEND="
${WINE_DLOPEN_DEPEND}

diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild
index d9243957dadb..800c33d6ae95 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild
@@ -70,7 +70,7 @@ 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[X?,${MULTILIB_USEDEP}] )
 "
 WINE_COMMON_DEPEND="
${WINE_DLOPEN_DEPEND}

diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild
index d17683e5dff0..0c9ff2f4151d 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild
@@ -73,7 +73,7 @@ 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[X?,${MULTILIB_USEDEP}] )
 "
 WINE_COMMON_DEPEND="
${WINE_DLOPEN_DEPEND}

diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.5.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-9.5.ebuild
index bb8117b3b1b3..5c5dff913f13 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9.5.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.5.ebuild
@@ -73,7 +73,7 @@ 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[X?,wayland?,${MULTILIB_USEDEP}] )
 "
 WINE_COMMON_DEPEND="
${WINE_DLOPEN_DEPEND}

diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.6.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-9.6.ebuild
index bb8117b3b1b3..868d1a000777 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9.6.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.6.ebuild
@@ -73,7 +73,7 @@ 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[X?,${MULTILIB_USEDEP}] )
 "
 WINE_COMMON_DEPEND="
${WINE_DLOPEN_DEPEND}

diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.7.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-9.7.ebuild
index bb8117b3b1b3..868d1a000777 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9.7.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.7.ebuild
@@ -73,7 +73,7 @@ WINE_DLOPEN_DEPEND="
truetype? ( media-libs/freetype[${MULTILIB_USEDEP}] )
udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
v4l? (

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

2024-05-15 Thread Ionen Wolkens

commit: cde08ef0b18352b2c340b2fdb35d74c66c01a0b8
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu May 16 02:04:33 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu May 16 02:05:22 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cde08ef0

app-emulation/wine-proton: depend on vulkan-loader[X]

Not worth a revbump, rather few people disable that.

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

 app-emulation/wine-proton/wine-proton-7.0.6.ebuild| 2 +-
 app-emulation/wine-proton/wine-proton-8.0.5c.ebuild   | 2 +-
 app-emulation/wine-proton/wine-proton-9.0.1.ebuild| 2 +-
 app-emulation/wine-proton/wine-proton-9.0..ebuild | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild 
b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
index fe8d48046141..546bcaf60b4a 100644
--- a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
+++ b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
@@ -43,7 +43,7 @@ WINE_DLOPEN_DEPEND="
dev-libs/libgcrypt:=[${MULTILIB_USEDEP}]
media-libs/freetype[${MULTILIB_USEDEP}]
media-libs/libglvnd[X,${MULTILIB_USEDEP}]
-   media-libs/vulkan-loader[${MULTILIB_USEDEP}]
+   media-libs/vulkan-loader[X,${MULTILIB_USEDEP}]
x11-libs/libXcursor[${MULTILIB_USEDEP}]
x11-libs/libXfixes[${MULTILIB_USEDEP}]
x11-libs/libXi[${MULTILIB_USEDEP}]

diff --git a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild 
b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
index d241cf82281d..e5b25d63323f 100644
--- a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
@@ -43,7 +43,7 @@ WINE_DLOPEN_DEPEND="
dev-libs/libgcrypt:=[${MULTILIB_USEDEP}]
media-libs/freetype[${MULTILIB_USEDEP}]
media-libs/libglvnd[X,${MULTILIB_USEDEP}]
-   media-libs/vulkan-loader[${MULTILIB_USEDEP}]
+   media-libs/vulkan-loader[X,${MULTILIB_USEDEP}]
x11-libs/libXcursor[${MULTILIB_USEDEP}]
x11-libs/libXfixes[${MULTILIB_USEDEP}]
x11-libs/libXi[${MULTILIB_USEDEP}]

diff --git a/app-emulation/wine-proton/wine-proton-9.0.1.ebuild 
b/app-emulation/wine-proton/wine-proton-9.0.1.ebuild
index 024f4d039fc9..4558c65461b2 100644
--- a/app-emulation/wine-proton/wine-proton-9.0.1.ebuild
+++ b/app-emulation/wine-proton/wine-proton-9.0.1.ebuild
@@ -44,7 +44,7 @@ WINE_DLOPEN_DEPEND="
dev-libs/libgcrypt:=[${MULTILIB_USEDEP}]
media-libs/freetype[${MULTILIB_USEDEP}]
media-libs/libglvnd[X,${MULTILIB_USEDEP}]
-   media-libs/vulkan-loader[${MULTILIB_USEDEP}]
+   media-libs/vulkan-loader[X,${MULTILIB_USEDEP}]
x11-libs/libXcursor[${MULTILIB_USEDEP}]
x11-libs/libXfixes[${MULTILIB_USEDEP}]
x11-libs/libXi[${MULTILIB_USEDEP}]

diff --git a/app-emulation/wine-proton/wine-proton-9.0..ebuild 
b/app-emulation/wine-proton/wine-proton-9.0..ebuild
index 6a86d9f190b0..ceddb4a00eec 100644
--- a/app-emulation/wine-proton/wine-proton-9.0..ebuild
+++ b/app-emulation/wine-proton/wine-proton-9.0..ebuild
@@ -44,7 +44,7 @@ WINE_DLOPEN_DEPEND="
dev-libs/libgcrypt:=[${MULTILIB_USEDEP}]
media-libs/freetype[${MULTILIB_USEDEP}]
media-libs/libglvnd[X,${MULTILIB_USEDEP}]
-   media-libs/vulkan-loader[${MULTILIB_USEDEP}]
+   media-libs/vulkan-loader[X,${MULTILIB_USEDEP}]
x11-libs/libXcursor[${MULTILIB_USEDEP}]
x11-libs/libXfixes[${MULTILIB_USEDEP}]
x11-libs/libXi[${MULTILIB_USEDEP}]

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

2024-05-15 Thread Ionen Wolkens

commit: 3520173bef188ad6ee47b2140580dc4ce09a200d
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed May 15 07:16:56 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed May 15 08:37:28 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3520173b

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

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

 app-emulation/wine-staging/wine-staging-9.0.ebuild | 2 +-
 app-emulation/wine-staging/wine-staging-9.5.ebuild | 2 +-
 app-emulation/wine-staging/wine-staging-9.6.ebuild | 2 +-
 app-emulation/wine-staging/wine-staging-9.7.ebuild | 2 +-
 app-emulation/wine-staging/wine-staging-9.8.ebuild | 2 +-
 5 files changed, 5 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 d2133a1ead43..acc21ca9b5e2 100644
--- a/app-emulation/wine-staging/wine-staging-9.0.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 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-9.5.ebuild 
b/app-emulation/wine-staging/wine-staging-9.5.ebuild
index ca1f794f201c..81161556f611 100644
--- a/app-emulation/wine-staging/wine-staging-9.5.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.5.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 inherit autotools edo flag-o-matic multilib multilib-build optfeature
 inherit prefix python-any-r1 toolchain-funcs wrapper
 

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

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

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

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

2024-05-15 Thread Ionen Wolkens

commit: 7819066c64d35ed15747ef84a63f5b62cd74eb80
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed May 15 07:15:18 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed May 15 08:37:28 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7819066c

app-emulation/wine-vanilla: update live

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

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

diff --git a/app-emulation/wine-vanilla/wine-vanilla-.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-.ebuild
index 13bbfdc159ea..bf09a0f972d5 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-.ebuild
@@ -67,7 +67,6 @@ WINE_DLOPEN_DEPEND="
fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
netapi? ( net-fs/samba[${MULTILIB_USEDEP}] )
-   odbc? ( dev-db/unixODBC[${MULTILIB_USEDEP}] )
sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] )
ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
truetype? ( media-libs/freetype[${MULTILIB_USEDEP}] )
@@ -89,6 +88,7 @@ WINE_COMMON_DEPEND="
media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
)
+   odbc? ( dev-db/unixODBC[${MULTILIB_USEDEP}] )
opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
@@ -254,6 +254,7 @@ src_configure() {
$(use_with mingw)
$(use_with netapi)
$(use_with nls gettext)
+   $(use_with odbc)
$(use_with opencl)
$(use_with opengl)
$(use_with osmesa)
@@ -274,7 +275,6 @@ src_configure() {
$(use_with wayland)
$(use_with xcomposite)
$(use_with xinerama)
-   $(usev !odbc ac_cv_lib_soname_odbc=)
)
 
filter-lto # build failure

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

2024-05-09 Thread Ionen Wolkens

commit: 6665ace8a528cefef5e33a7966ca56ae432e1fb2
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri May 10 04:11:27 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri May 10 04:11:27 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6665ace8

app-emulation/wine-proton: enable py3.13

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

 app-emulation/wine-proton/wine-proton-7.0.6.ebuild| 2 +-
 app-emulation/wine-proton/wine-proton-8.0.5c.ebuild   | 2 +-
 app-emulation/wine-proton/wine-proton-9.0.1.ebuild| 2 +-
 app-emulation/wine-proton/wine-proton-9.0..ebuild | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild 
b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
index 4820984ae397..fe8d48046141 100644
--- a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
+++ b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 inherit autotools flag-o-matic multilib multilib-build prefix
 inherit python-any-r1 readme.gentoo-r1 toolchain-funcs wrapper
 

diff --git a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild 
b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
index a68574673402..d241cf82281d 100644
--- a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 inherit autotools flag-o-matic multilib multilib-build prefix
 inherit python-any-r1 readme.gentoo-r1 toolchain-funcs wrapper
 

diff --git a/app-emulation/wine-proton/wine-proton-9.0.1.ebuild 
b/app-emulation/wine-proton/wine-proton-9.0.1.ebuild
index 3826048c0fcc..024f4d039fc9 100644
--- a/app-emulation/wine-proton/wine-proton-9.0.1.ebuild
+++ b/app-emulation/wine-proton/wine-proton-9.0.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 inherit autotools flag-o-matic multilib multilib-build prefix
 inherit python-any-r1 readme.gentoo-r1 toolchain-funcs wrapper
 

diff --git a/app-emulation/wine-proton/wine-proton-9.0..ebuild 
b/app-emulation/wine-proton/wine-proton-9.0..ebuild
index 4cabfe3111be..6a86d9f190b0 100644
--- a/app-emulation/wine-proton/wine-proton-9.0..ebuild
+++ b/app-emulation/wine-proton/wine-proton-9.0..ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 inherit autotools flag-o-matic multilib multilib-build prefix
 inherit python-any-r1 readme.gentoo-r1 toolchain-funcs wrapper

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

2024-05-07 Thread Ionen Wolkens

commit: 664b7392058f7d0d747b6ef514b08d3bd3acc1fc
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue May  7 14:19:30 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue May  7 14:23:05 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=664b7392

app-emulation/wine-proton: remove unused option

Forgot to remove it when copied from , this is only
used in experimental and not in releases.

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

 app-emulation/wine-proton/wine-proton-9.0.1.ebuild | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app-emulation/wine-proton/wine-proton-9.0.1.ebuild 
b/app-emulation/wine-proton/wine-proton-9.0.1.ebuild
index 34ad2375a843..3826048c0fcc 100644
--- a/app-emulation/wine-proton/wine-proton-9.0.1.ebuild
+++ b/app-emulation/wine-proton/wine-proton-9.0.1.ebuild
@@ -264,8 +264,6 @@ src_configure() {
$(use_with v4l v4l2)
$(use_with xcomposite)
$(use_with xinerama)
-
-   --without-vosk # unpackaged, file a bug if you need this
)
 
filter-lto # build failure

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

2024-05-07 Thread Ionen Wolkens

commit: ac0d324647ccb3db9b1ee1f9595c913af6ae3d68
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue May  7 09:44:23 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue May  7 09:45:15 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac0d3246

app-emulation/wine-staging: fix build with musl

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

 .../wine-staging-9.8-musl-ioctls-header.patch  | 30 ++
 app-emulation/wine-staging/wine-staging-9.8.ebuild |  1 +
 2 files changed, 31 insertions(+)

diff --git 
a/app-emulation/wine-staging/files/wine-staging-9.8-musl-ioctls-header.patch 
b/app-emulation/wine-staging/files/wine-staging-9.8-musl-ioctls-header.patch
new file mode 100644
index ..7aa1a4c00587
--- /dev/null
+++ b/app-emulation/wine-staging/files/wine-staging-9.8-musl-ioctls-header.patch
@@ -0,0 +1,30 @@
+https://bugs.gentoo.org/931341
+https://gitlab.winehq.org/wine/wine/-/commit/24ca848c568d5a2786abd26f2e7314b2e3f509f3
+From: Fotios Valasiadis 
+Date: Sun, 5 May 2024 03:34:57 +0300
+Subject: [PATCH] ntdll/unix: Fix building on musl by explicitly including
+ asm/ioctls.h.
+
+After commit 898ab8dab19d498c17859f39a55e317ee7e367a5 wine would no longer
+build on musl.
+
+Issue is that apparently TCSETS2 isn't defined when including sys/ioctl.h.
+
+A little digging shows that glibc goes ahead and includes asm/ioctls.h in
+sys/ioctl.h, providing said macro.  Musl on the other hand doesn't and relies
+on bits/ioctl.h, which lacks said macro.
+
+Signed-off-by: Fotios Valasiadis 
+--- a/dlls/ntdll/unix/serial.c
 b/dlls/ntdll/unix/serial.c
+@@ -33,6 +33,7 @@
+ #include 
+ #ifdef HAVE_ASM_TERMBITS_H
+ # include 
++# include 
+ #else
+ # include 
+ #endif
+-- 
+GitLab
+

diff --git a/app-emulation/wine-staging/wine-staging-9.8.ebuild 
b/app-emulation/wine-staging/wine-staging-9.8.ebuild
index f0ed10e52b22..5bf74a8b36bc 100644
--- a/app-emulation/wine-staging/wine-staging-9.8.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.8.ebuild
@@ -177,6 +177,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-7.17-noexecstack.patch
"${FILESDIR}"/${PN}-7.20-unwind.patch
"${FILESDIR}"/${PN}-8.13-rpath.patch
+   "${FILESDIR}"/${P}-musl-ioctls-header.patch
 )
 
 pkg_pretend() {

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

2024-05-07 Thread Ionen Wolkens

commit: be7b8b731fca352feb69499b08fa3918bcb71309
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue May  7 09:44:31 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue May  7 09:45:15 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be7b8b73

app-emulation/wine-vanilla: fix build with musl

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

 .../wine-vanilla-9.8-musl-ioctls-header.patch  | 30 ++
 app-emulation/wine-vanilla/wine-vanilla-9.8.ebuild |  1 +
 2 files changed, 31 insertions(+)

diff --git 
a/app-emulation/wine-vanilla/files/wine-vanilla-9.8-musl-ioctls-header.patch 
b/app-emulation/wine-vanilla/files/wine-vanilla-9.8-musl-ioctls-header.patch
new file mode 100644
index ..7aa1a4c00587
--- /dev/null
+++ b/app-emulation/wine-vanilla/files/wine-vanilla-9.8-musl-ioctls-header.patch
@@ -0,0 +1,30 @@
+https://bugs.gentoo.org/931341
+https://gitlab.winehq.org/wine/wine/-/commit/24ca848c568d5a2786abd26f2e7314b2e3f509f3
+From: Fotios Valasiadis 
+Date: Sun, 5 May 2024 03:34:57 +0300
+Subject: [PATCH] ntdll/unix: Fix building on musl by explicitly including
+ asm/ioctls.h.
+
+After commit 898ab8dab19d498c17859f39a55e317ee7e367a5 wine would no longer
+build on musl.
+
+Issue is that apparently TCSETS2 isn't defined when including sys/ioctl.h.
+
+A little digging shows that glibc goes ahead and includes asm/ioctls.h in
+sys/ioctl.h, providing said macro.  Musl on the other hand doesn't and relies
+on bits/ioctl.h, which lacks said macro.
+
+Signed-off-by: Fotios Valasiadis 
+--- a/dlls/ntdll/unix/serial.c
 b/dlls/ntdll/unix/serial.c
+@@ -33,6 +33,7 @@
+ #include 
+ #ifdef HAVE_ASM_TERMBITS_H
+ # include 
++# include 
+ #else
+ # include 
+ #endif
+-- 
+GitLab
+

diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.8.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-9.8.ebuild
index 13bbfdc159ea..7a5546bbfd70 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9.8.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.8.ebuild
@@ -161,6 +161,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-7.0-noexecstack.patch
"${FILESDIR}"/${PN}-7.20-unwind.patch
"${FILESDIR}"/${PN}-8.13-rpath.patch
+   "${FILESDIR}"/${P}-musl-ioctls-header.patch
 )
 
 pkg_pretend() {

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

2024-05-07 Thread Ionen Wolkens

commit: 31461ff0a6ace8d613fb3c17ba8b9d4336930723
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue May  7 07:03:26 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue May  7 07:18:16 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31461ff0

app-emulation/wine-vanilla: filter -Wl,--gc-sections

Is an issue with both lld and bfd that I can see, likely due to
the linker tricks wine uses. Let's just filter it as it's fragile.

Skipping revbump given the option is rarely used and shouldn't
affect many.

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

 app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild | 1 +
 app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild | 1 +
 app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild   | 1 +
 app-emulation/wine-vanilla/wine-vanilla-9.5.ebuild   | 1 +
 app-emulation/wine-vanilla/wine-vanilla-9.6.ebuild   | 1 +
 app-emulation/wine-vanilla/wine-vanilla-9.7.ebuild   | 1 +
 app-emulation/wine-vanilla/wine-vanilla-9.8.ebuild   | 1 +
 app-emulation/wine-vanilla/wine-vanilla-.ebuild  | 1 +
 8 files changed, 8 insertions(+)

diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
index 88eaa6f3c226..583683c9685c 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
@@ -257,6 +257,7 @@ src_configure() {
 
tc-ld-force-bfd # builds with non-bfd but broken at runtime (bug 
#867097)
filter-lto # build failure
+   filter-flags -Wl,--gc-sections # runtime issues (bug #931329)
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-vanilla/wine-vanilla-8.0.2.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild
index f0641aa921fe..d9243957dadb 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild
@@ -251,6 +251,7 @@ src_configure() {
 
tc-ld-force-bfd # builds with non-bfd but broken at runtime (bug 
#867097)
filter-lto # build failure
+   filter-flags -Wl,--gc-sections # runtime issues (bug #931329)
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-vanilla/wine-vanilla-9.0.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild
index 7326ea74dd64..d17683e5dff0 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild
@@ -278,6 +278,7 @@ src_configure() {
)
 
filter-lto # build failure
+   filter-flags -Wl,--gc-sections # runtime issues (bug #931329)
use custom-cflags || strip-flags # can break in obscure ways at runtime
 
# wine uses linker tricks unlikely to work with non-bfd/lld (bug 
#867097)

diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.5.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-9.5.ebuild
index 162e8b9a993c..bb8117b3b1b3 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9.5.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.5.ebuild
@@ -278,6 +278,7 @@ src_configure() {
)
 
filter-lto # build failure
+   filter-flags -Wl,--gc-sections # runtime issues (bug #931329)
use custom-cflags || strip-flags # can break in obscure ways at runtime
 
# wine uses linker tricks unlikely to work with non-bfd/lld (bug 
#867097)

diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.6.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-9.6.ebuild
index 162e8b9a993c..bb8117b3b1b3 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9.6.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.6.ebuild
@@ -278,6 +278,7 @@ src_configure() {
)
 
filter-lto # build failure
+   filter-flags -Wl,--gc-sections # runtime issues (bug #931329)
use custom-cflags || strip-flags # can break in obscure ways at runtime
 
# wine uses linker tricks unlikely to work with non-bfd/lld (bug 
#867097)

diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.7.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-9.7.ebuild
index 162e8b9a993c..bb8117b3b1b3 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9.7.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.7.ebuild
@@ -278,6 +278,7 @@ src_configure() {
)
 
filter-lto # build failure
+   filter-flags -Wl,--gc-sections # runtime issues (bug #931329)
use custom-cflags || strip-flags # can break in obscure ways at runtime
 
# wine uses linker tricks unlikely to work with non-bfd/lld (bug 
#867097)

diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.8.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-9.8.ebuild
index

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

2024-05-07 Thread Ionen Wolkens

commit: 25857e5110b5e1de7ef2c41d6b5eedad0e6dcc8a
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue May  7 07:05:08 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue May  7 07:18:16 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25857e51

app-emulation/wine-staging: filter -Wl,--gc-sections

Is an issue with both lld and bfd that I can see, likely due to
the linker tricks wine uses. Let's just filter it as it's fragile.

Skipping revbump given the option is rarely used and shouldn't
affect many.

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

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

diff --git a/app-emulation/wine-staging/wine-staging-9.0.ebuild 
b/app-emulation/wine-staging/wine-staging-9.0.ebuild
index 537675f10ba0..d2133a1ead43 100644
--- a/app-emulation/wine-staging/wine-staging-9.0.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.0.ebuild
@@ -325,6 +325,7 @@ src_configure() {
)
 
filter-lto # build failure
+   filter-flags -Wl,--gc-sections # runtime issues (bug #931329)
use custom-cflags || strip-flags # can break in obscure ways at runtime
 
# wine uses linker tricks unlikely to work with non-bfd/lld (bug 
#867097)

diff --git a/app-emulation/wine-staging/wine-staging-9.5.ebuild 
b/app-emulation/wine-staging/wine-staging-9.5.ebuild
index 08b56968b3ac..ca1f794f201c 100644
--- a/app-emulation/wine-staging/wine-staging-9.5.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.5.ebuild
@@ -325,6 +325,7 @@ src_configure() {
)
 
filter-lto # build failure
+   filter-flags -Wl,--gc-sections # runtime issues (bug #931329)
use custom-cflags || strip-flags # can break in obscure ways at runtime
 
# wine uses linker tricks unlikely to work with non-bfd/lld (bug 
#867097)

diff --git a/app-emulation/wine-staging/wine-staging-9.6.ebuild 
b/app-emulation/wine-staging/wine-staging-9.6.ebuild
index 2c9f8fc4ef2a..3c4de14f4d45 100644
--- a/app-emulation/wine-staging/wine-staging-9.6.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.6.ebuild
@@ -320,6 +320,7 @@ src_configure() {
)
 
filter-lto # build failure
+   filter-flags -Wl,--gc-sections # runtime issues (bug #931329)
use custom-cflags || strip-flags # can break in obscure ways at runtime
 
# wine uses linker tricks unlikely to work with non-bfd/lld (bug 
#867097)

diff --git a/app-emulation/wine-staging/wine-staging-9.7.ebuild 
b/app-emulation/wine-staging/wine-staging-9.7.ebuild
index 2c9f8fc4ef2a..3c4de14f4d45 100644
--- a/app-emulation/wine-staging/wine-staging-9.7.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.7.ebuild
@@ -320,6 +320,7 @@ src_configure() {
)
 
filter-lto # build failure
+   filter-flags -Wl,--gc-sections # runtime issues (bug #931329)
use custom-cflags || strip-flags # can break in obscure ways at runtime
 
# wine uses linker tricks unlikely to work with non-bfd/lld (bug 
#867097)

diff --git a/app-emulation/wine-staging/wine-staging-9.8.ebuild 
b/app-emulation/wine-staging/wine-staging-9.8.ebuild
index f4a2a5ce7f73..f0ed10e52b22 100644
--- a/app-emulation/wine-staging/wine-staging-9.8.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.8.ebuild
@@ -320,6 +320,7 @@ src_configure() {
)
 
filter-lto # build failure
+   filter-flags -Wl,--gc-sections # runtime issues (bug #931329)
use custom-cflags || strip-flags # can break in obscure ways at runtime
 
# wine uses linker tricks unlikely to work with non-bfd/lld (bug 
#867097)

diff --git a/app-emulation/wine-staging/wine-staging-.ebuild 
b/app-emulation/wine-staging/wine-staging-.ebuild
index f4a2a5ce7f73..f0ed10e52b22 100644
--- a/app-emulation/wine-staging/wine-staging-.ebuild
+++ b/app-emulation/wine-staging/wine-staging-.ebuild
@@ -320,6 +320,7 @@ src_configure() {
)
 
filter-lto # build failure
+   filter-flags -Wl,--gc-sections # runtime issues (bug #931329)
use custom-cflags || strip-flags # can break in obscure ways at runtime
 
# wine uses linker tricks unlikely to work with non-bfd/lld (bug 
#867097)

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

2024-05-07 Thread Ionen Wolkens

commit: 14fedbed424316e0287e11054aac509376ac226b
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue May  7 07:04:30 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue May  7 07:18:16 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14fedbed

app-emulation/wine-proton: filter -Wl,--gc-sections

Is an issue with both lld and bfd that I can see, likely due to
the linker tricks wine uses. Let's just filter it as it's fragile.

Skipping revbump given the option is rarely used and shouldn't
affect many.

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

 app-emulation/wine-proton/wine-proton-7.0.6.ebuild| 1 +
 app-emulation/wine-proton/wine-proton-8.0.5c.ebuild   | 1 +
 app-emulation/wine-proton/wine-proton-9.0.1.ebuild| 1 +
 app-emulation/wine-proton/wine-proton-9.0..ebuild | 1 +
 4 files changed, 4 insertions(+)

diff --git a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild 
b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
index 25ee6175708f..4820984ae397 100644
--- a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
+++ b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
@@ -242,6 +242,7 @@ src_configure() {
 
tc-ld-force-bfd # builds with non-bfd but broken at runtime (bug 
#867097)
filter-lto # build failure
+   filter-flags -Wl,--gc-sections # runtime issues (bug #931329)
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-proton/wine-proton-8.0.5c.ebuild 
b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
index 9d8a60b340e9..a68574673402 100644
--- a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
@@ -246,6 +246,7 @@ src_configure() {
 
tc-ld-force-bfd # builds with non-bfd but broken at runtime (bug 
#867097)
filter-lto # build failure
+   filter-flags -Wl,--gc-sections # runtime issues (bug #931329)
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-proton/wine-proton-9.0.1.ebuild 
b/app-emulation/wine-proton/wine-proton-9.0.1.ebuild
index 5971fb4a6f56..34ad2375a843 100644
--- a/app-emulation/wine-proton/wine-proton-9.0.1.ebuild
+++ b/app-emulation/wine-proton/wine-proton-9.0.1.ebuild
@@ -269,6 +269,7 @@ src_configure() {
)
 
filter-lto # build failure
+   filter-flags -Wl,--gc-sections # runtime issues (bug #931329)
use custom-cflags || strip-flags # can break in obscure ways at runtime
 
# wine uses linker tricks unlikely to work with non-bfd/lld (bug 
#867097)

diff --git a/app-emulation/wine-proton/wine-proton-9.0..ebuild 
b/app-emulation/wine-proton/wine-proton-9.0..ebuild
index fda342d879f2..4cabfe3111be 100644
--- a/app-emulation/wine-proton/wine-proton-9.0..ebuild
+++ b/app-emulation/wine-proton/wine-proton-9.0..ebuild
@@ -269,6 +269,7 @@ src_configure() {
)
 
filter-lto # build failure
+   filter-flags -Wl,--gc-sections # runtime issues (bug #931329)
use custom-cflags || strip-flags # can break in obscure ways at runtime
 
# wine uses linker tricks unlikely to work with non-bfd/lld (bug 
#867097)

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

2024-05-03 Thread Ionen Wolkens

commit: a62211e07a728dce7d7f33f8d51039af1f2992d4
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri May  3 21:29:54 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri May  3 21:54:13 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a62211e0

app-emulation/wine-vanilla: add 9.8

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

 app-emulation/wine-vanilla/Manifest|   1 +
 app-emulation/wine-vanilla/wine-vanilla-9.8.ebuild | 430 +
 2 files changed, 431 insertions(+)

diff --git a/app-emulation/wine-vanilla/Manifest 
b/app-emulation/wine-vanilla/Manifest
index cac10378d68e..fd6dd151ecd7 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -4,3 +4,4 @@ DIST wine-9.0.tar.xz 30007216 BLAKE2B 
cf53177201a2f7eeb35d0d8ce220f80808d979099a
 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-9.8.tar.xz 30297460 BLAKE2B 
689d1b4e55f7d66b8fad8432ad35a52e2fad303e8a9382b8893222c696697efa5de5b56cc2b933bed96d6382f9fdc919fa15e6517ffdb50105cdaea904a7d77f
 SHA512 
3d1b0e6b7b633a0b45ba6b23e741e808dec29355721baf4489c3ad34c67d714b40897ef510c4a84f31be390d7f8b86b93a725787d733eaf77df5c82b322d2662

diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.8.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-9.8.ebuild
new file mode 100644
index ..61e41c9d9b98
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.8.ebuild
@@ -0,0 +1,430 @@
+# 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 optfeature
+inherit prefix toolchain-funcs wrapper
+
+WINE_GECKO=2.47.4
+WINE_MONO=9.1.0
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   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;
+   S="${WORKDIR}/wine-${PV}"
+   KEYWORDS="-* ~amd64 ~x86"
+fi
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, without external 
patchsets"
+HOMEPAGE="
+   https://www.winehq.org/
+   https://gitlab.winehq.org/wine/wine/
+"
+
+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 odbc 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}] )
+   )
+   xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+   xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+   )
+   cups? ( net-print/cups[${MULTILIB_USEDEP}] )
+   fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
+   kerberos? (

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

2024-05-02 Thread Ionen Wolkens

commit: a53143e095bca88a7c78a5c30435e13e7d5a7b30
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri May  3 00:17:58 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri May  3 00:18:03 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a53143e0

app-emulation/wine-proton: add 9.0.1

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

 app-emulation/wine-proton/Manifest |   1 +
 app-emulation/wine-proton/wine-proton-9.0.1.ebuild | 420 +
 2 files changed, 421 insertions(+)

diff --git a/app-emulation/wine-proton/Manifest 
b/app-emulation/wine-proton/Manifest
index 34b2254d80d2..4e84f540f297 100644
--- a/app-emulation/wine-proton/Manifest
+++ b/app-emulation/wine-proton/Manifest
@@ -1,2 +1,3 @@
 DIST proton-wine-7.0-6.tar.gz 45780326 BLAKE2B 
f140fcfdd1a47904c34a49d0795fa3326d7cf0d3fac8d6c2ef2a4926181a46223f43a2d1ca96c543e800c8c46b2a3cc51ae306a029d68a42608876e869e177d5
 SHA512 
793bbe2b23042301a1b518717d78cfff01eaffa033d010659a45779b9136d33cfac63f0c3fbb1e458953a954b423eb70ac4fa87633352267db890ceb2fef
 DIST proton-wine-8.0-5c.tar.gz 48710071 BLAKE2B 
99627baea6fb3d51231aa1e75a2734c3c1baba88326baf15b3d421d57a00472d25ba51c2140b51152c8aeae7dd240d3d77bb0d8835aa7eb3b745a51be120f8bb
 SHA512 
0cf98d4e67866e55cc8cd5ea8da0d76aee8e37b130b3cbca604083c913e98ddf9038ecd6f9761d2e11443e282b372977400e251456c6d40e1365210c7578234d
+DIST proton-wine-9.0-1.tar.gz 49048661 BLAKE2B 
cf237c314e8b222bb36f52f316baae2351a30d22995d610c7977accc9588c474d0e598702000aa81b34fc2f3daeccd09f54ef53b7a2250c0b012ca47d69628eb
 SHA512 
d7d3e4725a86ca120d059e5b8f9760bce45a5db0ae814cd76aa51dc361bb67af9c2834917ddad3858fc324a1d048acdd9942492c77d0f396aae7d537c70e3ca1

diff --git a/app-emulation/wine-proton/wine-proton-9.0.1.ebuild 
b/app-emulation/wine-proton/wine-proton-9.0.1.ebuild
new file mode 100644
index ..5971fb4a6f56
--- /dev/null
+++ b/app-emulation/wine-proton/wine-proton-9.0.1.ebuild
@@ -0,0 +1,420 @@
+# 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 flag-o-matic multilib multilib-build prefix
+inherit python-any-r1 readme.gentoo-r1 toolchain-funcs wrapper
+
+WINE_GECKO=2.47.4
+WINE_MONO=8.1.0
+WINE_PV=$(ver_rs 2 -)
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/ValveSoftware/wine.git;
+   EGIT_BRANCH="experimental_$(ver_cut 1-2)"
+else
+   
SRC_URI="https://github.com/ValveSoftware/wine/archive/refs/tags/proton-wine-${WINE_PV}.tar.gz;
+   S="${WORKDIR}/${PN}-wine-${WINE_PV}"
+   KEYWORDS="-* ~amd64 ~x86"
+fi
+
+DESCRIPTION="Valve Software's fork of Wine"
+HOMEPAGE="https://github.com/ValveSoftware/wine/;
+
+LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
+SLOT="${PV}"
+IUSE="
+   +abi_x86_32 +abi_x86_64 +alsa crossdev-mingw custom-cflags
+   +fontconfig +gecko +gstreamer llvm-libunwind +mono nls osmesa
+   perl pulseaudio +sdl selinux +ssl +strip udev udisks +unwind
+   usb v4l video_cards_amdgpu wow64 +xcomposite xinerama
+"
+REQUIRED_USE="wow64? ( abi_x86_64 !abi_x86_32 )"
+
+# 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="
+   dev-libs/libgcrypt:=[${MULTILIB_USEDEP}]
+   media-libs/freetype[${MULTILIB_USEDEP}]
+   media-libs/libglvnd[X,${MULTILIB_USEDEP}]
+   media-libs/vulkan-loader[${MULTILIB_USEDEP}]
+   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}]
+   fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
+   osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
+   sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] )
+   ssl? (
+   dev-libs/gmp:=[${MULTILIB_USEDEP}]
+   net-libs/gnutls:=[${MULTILIB_USEDEP}]
+   )
+   udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+   v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+   xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+   xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+"
+# gcc: for -latomic with clang
+WINE_COMMON_DEPEND="
+   ${WINE_DLOPEN_DEPEND}
+   sys-devel/gcc:*
+   x11-libs/libX11[${MULTILIB_USEDEP}]
+   x11-libs/libXext[${MULTILIB_USEDEP}]
+   x11-libs/libdrm[video_cards_amdgpu?,${MULTILIB_USEDEP}]
+   alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+   gstreamer? (
+   dev-libs/glib:2[${MULTILIB_USEDEP}]
+

[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-vanilla/

2024-04-23 Thread Ionen Wolkens

commit: c7d69ade2072b68a19ebbdd563cf12992baca7cd
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Apr 23 09:15:55 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Apr 23 09:32:05 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7d69ade

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

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

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

diff --git a/app-emulation/wine-vanilla/wine-vanilla-.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-.ebuild
index 162e8b9a993c..61e41c9d9b98 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-.ebuild
@@ -8,7 +8,7 @@ inherit autotools flag-o-matic multilib multilib-build 
optfeature
 inherit prefix toolchain-funcs wrapper
 
 WINE_GECKO=2.47.4
-WINE_MONO=9.0.0
+WINE_MONO=9.1.0
 
 if [[ ${PV} == * ]]; then
inherit git-r3

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

2024-04-23 Thread Ionen Wolkens

commit: 952cda85286c9294f721c0df4dd863bf809bbc62
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Apr 23 09:15:16 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Apr 23 09:32:05 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=952cda85

app-emulation/wine-mono: add 9.1.0

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

 app-emulation/wine-mono/Manifest   |  2 ++
 app-emulation/wine-mono/wine-mono-9.1.0.ebuild | 26 ++
 2 files changed, 28 insertions(+)

diff --git a/app-emulation/wine-mono/Manifest b/app-emulation/wine-mono/Manifest
index 05f3eea7cce9..dd0016c86352 100644
--- a/app-emulation/wine-mono/Manifest
+++ b/app-emulation/wine-mono/Manifest
@@ -6,3 +6,5 @@ DIST wine-mono-8.1.0-x86.msi 84905984 BLAKE2B 
948b014fc6fba94bc97642b8aae266b817
 DIST wine-mono-8.1.0-x86.tar.xz 40854944 BLAKE2B 
0e0dd83b92016da328547173d25dc396a895a7a161cd54796c9bda34ae958856f1bee342c1bb5fcffcf695b35adf66b2bf83cfa61e01790bf4b0f2d198f84feb
 SHA512 
ba87105a6527b9c392e9ad406e92fd90164e0abb3a348a1e343e63eff0ee8632399badb98f7fbc3581ce697ba09d98aafbf5033bf52fb14b7c7c280c64f25a84
 DIST wine-mono-9.0.0-x86.msi 84583424 BLAKE2B 
38f16049909f6464624c1c8f990a7873a3211bf02bef7593cae9da0201e8de0f535c841375eadf47bf0a4b10b08bc9d4c89d22d723e51f3f767c6e986ef01c7d
 SHA512 
fcbde718c237f102aab2e234a2f1c03aedd45ad9f97152112562b2119e542efd2f2979899afd3e9e03b1a06caec135d0f2cfcde084e372d1f74d594d52e6c833
 DIST wine-mono-9.0.0-x86.tar.xz 40970928 BLAKE2B 
253533706845cf8e4aa958cca61928e6ce3be7482bfcbba45a5dd6381ab144263ddf40df009121508288710ee0872382a6ce7cde06cf8dd6c75e932916de907e
 SHA512 
0117619a2b3f6e92ee513aeea79db977055098e6f629063fbd5d1a1b7d47e9d14451369b1d0a6a30e468ed051e60bba59aec75b90ea34fa9b4956d3ebdb32c06
+DIST wine-mono-9.1.0-x86.msi 84623872 BLAKE2B 
63e86a4f99a5300782017f0b1a2168ad49516e2b2a7e825d7f59b8e842874c7f84752058908e8f57ad1e650a68675c5ff81ad8ba973962ea075db590be0fa51b
 SHA512 
e51744eb0b07a58516fe3f5115fe45b4924e285fe4688649d04dec522203af6b3aa066e5db9b37cbbfe6ce4b5d8e871e9881842227cbb20c0613b911b5bfc383
+DIST wine-mono-9.1.0-x86.tar.xz 43820028 BLAKE2B 
6249e661239b71ca2607cf5fb3285bbef3e4c056c87e15352e40d2875028dbaa7f1c1a8b4d908f74de8447b4166c61c708314dc6422e9f69a6eea5f588e7c73b
 SHA512 
cede2b910e95fc43e658e6d4d8086ec5324407a32fff4852341178e1e56df240356c02f270e3be174f3ab82aa076e50d70be4da8e8c5f77e877fce8fe3217374

diff --git a/app-emulation/wine-mono/wine-mono-9.1.0.ebuild 
b/app-emulation/wine-mono/wine-mono-9.1.0.ebuild
new file mode 100644
index ..f756896e7c2e
--- /dev/null
+++ b/app-emulation/wine-mono/wine-mono-9.1.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Replacement for the .NET runtime and class libraries in Wine"
+HOMEPAGE="https://wiki.winehq.org/Mono;
+SRC_URI="
+   shared? ( 
https://github.com/madewokherd/wine-mono/releases/download/${P}/${P}-x86.tar.xz 
)
+   !shared? ( 
https://github.com/madewokherd/wine-mono/releases/download/${P}/${P}-x86.msi )"
+S="${WORKDIR}"
+
+LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+shared"
+
+src_install() {
+   insinto /usr/share/wine/mono
+
+   if use shared; then
+   doins -r ${P}
+   else
+   doins "${DISTDIR}"/${P}-x86.msi
+   fi
+}

[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-proton/

2024-04-22 Thread Ionen Wolkens

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

app-emulation/wine-proton: "fix" build with gcc-14 for old branches

No release yet but current 9.0. builds fine as-is, and
would rather not worry about backporting for old branches.

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

 app-emulation/wine-proton/wine-proton-7.0.6.ebuild  | 4 
 app-emulation/wine-proton/wine-proton-8.0.5c.ebuild | 4 
 2 files changed, 8 insertions(+)

diff --git a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild 
b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
index 50cc8ae8ca6c..25ee6175708f 100644
--- a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
+++ b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
@@ -250,6 +250,10 @@ src_configure() {
[[ $($(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) == mold* ]] &&
append-ldflags -fuse-ld=bfd
 
+   # >=wine-proton-9 has proper fixes and builds with gcc-14, but would
+   # rather not have to worry about fixing old branches (bug #924486)
+   append-cflags $(test-flags-CC -Wno-error=incompatible-pointer-types)
+
# build using upstream's way (--with-wine64)
# order matters: configure+compile 64->32, install 32->64
local -i bits

diff --git a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild 
b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
index bb1944292c4d..9d8a60b340e9 100644
--- a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
@@ -254,6 +254,10 @@ src_configure() {
[[ $($(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) == mold* ]] &&
append-ldflags -fuse-ld=bfd
 
+   # >=wine-proton-9 has proper fixes and builds with gcc-14, but would
+   # rather not have to worry about fixing old branches (bug #924486)
+   append-cflags $(test-flags-CC -Wno-error=incompatible-pointer-types)
+
# build using upstream's way (--with-wine64)
# order matters: configure+compile 64->32, install 32->64
local -i bits

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

2024-04-22 Thread Ionen Wolkens

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

app-emulation/wine-vanilla: drop 9.3, 9.4

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

 app-emulation/wine-vanilla/Manifest|   2 -
 .../files/wine-vanilla-9.4-wayland-egl.patch   |  16 -
 app-emulation/wine-vanilla/wine-vanilla-9.3.ebuild | 430 
 app-emulation/wine-vanilla/wine-vanilla-9.4.ebuild | 431 -
 4 files changed, 879 deletions(-)

diff --git a/app-emulation/wine-vanilla/Manifest 
b/app-emulation/wine-vanilla/Manifest
index ffcd3c5ace1e..cac10378d68e 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -1,8 +1,6 @@
 DIST wine-7.0.2.tar.xz 27179980 BLAKE2B 
721ab574092638b32d3a483b6ae3def0c9d706cc888662ca461ab8c7060b10077e83cede69663ea2a8b97729f3801209fbba5f8e8828ce20454700ffbbd76cb5
 SHA512 
330c71005a6a8054b5068ac4484e9015e9f8bf55d5a451aaf5f79b7f78a025732b454251c31473abf21504cce3b78e50cf7e3e0d0116bb755dc8396bd790289a
 DIST wine-8.0.2.tar.xz 29060452 BLAKE2B 
dcffaba6c90c4e02a7bc591a81e11aced06c006370c4c316c8a367b2f5814926063482959fabfe9d674ee1b5a560e59087e9b711e28360ced3aee2bbd6bb8fdb
 SHA512 
e86dd31247d757d48ffb2d24f20edab3fc6ef9c3e395567a7b363951bb681335ba3adb8b84639011b24b6eb274582d56880298d6d95fb100acc072383d4e973f
 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

diff --git 
a/app-emulation/wine-vanilla/files/wine-vanilla-9.4-wayland-egl.patch 
b/app-emulation/wine-vanilla/files/wine-vanilla-9.4-wayland-egl.patch
deleted file mode 100644
index 0c6f8084f480..
--- a/app-emulation/wine-vanilla/files/wine-vanilla-9.4-wayland-egl.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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-vanilla/wine-vanilla-9.3.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-9.3.ebuild
deleted file mode 100644
index 162e8b9a993c..
--- a/app-emulation/wine-vanilla/wine-vanilla-9.3.ebuild
+++ /dev/null
@@ -1,430 +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 optfeature
-inherit prefix toolchain-funcs wrapper
-

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

2024-04-22 Thread Ionen Wolkens

commit: 420196d3ea6c3610a6858ade463fd79a838941e6
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Apr 22 19:43:39 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Apr 22 20:31:12 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=420196d3

app-emulation/wine-vanilla: "fix" build with gcc-14 for old branches

Unsure how much is broken, but for wine-7+8 it doesn't seem worth
the effort to backport. No issues I can see with wine-9.

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

 app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild | 4 
 app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild | 4 
 2 files changed, 8 insertions(+)

diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
index ed678fefaa02..88eaa6f3c226 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
@@ -265,6 +265,10 @@ src_configure() {
[[ $($(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) == mold* ]] &&
append-ldflags -fuse-ld=bfd
 
+   # >=wine-vanilla-9 has proper fixes and builds with gcc-14, but
+   # would rather not have to worry about fixing old branches
+   append-cflags $(test-flags-CC -Wno-error=incompatible-pointer-types)
+
# build using upstream's way (--with-wine64)
# order matters: configure+compile 64->32, install 32->64
local -i bits

diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild
index 972a6b64c743..f0641aa921fe 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild
@@ -259,6 +259,10 @@ src_configure() {
[[ $($(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) == mold* ]] &&
append-ldflags -fuse-ld=bfd
 
+   # >=wine-vanilla-9 has proper fixes and builds with gcc-14, but
+   # would rather not have to worry about fixing old branches
+   append-cflags $(test-flags-CC -Wno-error=incompatible-pointer-types)
+
# build using upstream's way (--with-wine64)
# order matters: configure+compile 64->32, install 32->64
local -i bits

[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-proton/

2024-04-22 Thread Ionen Wolkens

commit: 4e91942e6f35771c9d48a436520353ec0301d185
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Apr 22 18:40:34 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Apr 22 20:31:13 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e91942e

app-emulation/wine-proton: drop 8.0.

Seem like a dead branch, use 9.0. instead.

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

 .../wine-proton/wine-proton-8.0..ebuild| 384 -
 1 file changed, 384 deletions(-)

diff --git a/app-emulation/wine-proton/wine-proton-8.0..ebuild 
b/app-emulation/wine-proton/wine-proton-8.0..ebuild
deleted file mode 100644
index 78b03242a34b..
--- a/app-emulation/wine-proton/wine-proton-8.0..ebuild
+++ /dev/null
@@ -1,384 +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 flag-o-matic multilib multilib-build prefix
-inherit python-any-r1 readme.gentoo-r1 toolchain-funcs wrapper
-
-WINE_GECKO=2.47.4
-WINE_MONO=8.1.0
-WINE_PV=$(ver_rs 2 -)
-
-if [[ ${PV} == * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/ValveSoftware/wine.git;
-   EGIT_BRANCH="experimental_$(ver_cut 1-2)"
-else
-   
SRC_URI="https://github.com/ValveSoftware/wine/archive/refs/tags/proton-wine-${WINE_PV}.tar.gz;
-   S="${WORKDIR}/${PN}-wine-${WINE_PV}"
-   KEYWORDS="-* ~amd64 ~x86"
-fi
-
-DESCRIPTION="Valve Software's fork of Wine"
-HOMEPAGE="https://github.com/ValveSoftware/wine/;
-
-LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
-SLOT="${PV}"
-IUSE="
-   +abi_x86_32 +abi_x86_64 +alsa crossdev-mingw custom-cflags
-   +fontconfig +gecko +gstreamer llvm-libunwind +mono nls osmesa
-   perl pulseaudio +sdl selinux +ssl +strip udev udisks +unwind
-   usb v4l video_cards_amdgpu +xcomposite xinerama
-"
-
-# 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="
-   dev-libs/libgcrypt:=[${MULTILIB_USEDEP}]
-   media-libs/freetype[${MULTILIB_USEDEP}]
-   media-libs/libglvnd[X,${MULTILIB_USEDEP}]
-   media-libs/vulkan-loader[${MULTILIB_USEDEP}]
-   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}]
-   fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
-   osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
-   sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] )
-   ssl? (
-   dev-libs/gmp:=[${MULTILIB_USEDEP}]
-   net-libs/gnutls:=[${MULTILIB_USEDEP}]
-   )
-   udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-   v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-   xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-   xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-"
-# gcc: for -latomic with clang
-WINE_COMMON_DEPEND="
-   ${WINE_DLOPEN_DEPEND}
-   sys-devel/gcc:*
-   x11-libs/libX11[${MULTILIB_USEDEP}]
-   x11-libs/libXext[${MULTILIB_USEDEP}]
-   x11-libs/libdrm[video_cards_amdgpu?,${MULTILIB_USEDEP}]
-   alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-   gstreamer? (
-   dev-libs/glib:2[${MULTILIB_USEDEP}]
-   media-libs/gst-plugins-base:1.0[opengl,${MULTILIB_USEDEP}]
-   media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-   )
-   pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
-   udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
-   unwind? (
-   llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
-   !llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
-   )
-   usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
-"
-RDEPEND="
-   ${WINE_COMMON_DEPEND}
-   app-emulation/wine-desktop-common
-   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} )
-   perl? (
-   dev-lang/perl
-   dev-perl/XML-LibXML
-   )
-   selinux? ( sec-policy/selinux-wine )
-   udisks? ( sys-fs/udisks:2 )
-"
-DEPEND="
-   ${WINE_COMMON_DEPEND}
-   sys-kernel/linux-headers
-   x11-base/xorg-proto
-"
-BDEPEND="
-   ${PYTHON_DEPS}
-   dev-lang/perl
-   sys-devel/binutils
-   sys-devel/bison
-   sys-devel/flex
-   virtual/pkgconfig
-   nls? ( sys-devel/gettext )
-

[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-vanilla/

2024-04-19 Thread Ionen Wolkens

commit: 7a6734e2706456d01e840fe26c8e341e4fc4ee37
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Apr 19 21:17:21 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Apr 19 21:17:26 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a6734e2

app-emulation/wine-vanilla: add 9.7

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

 app-emulation/wine-vanilla/Manifest|   1 +
 app-emulation/wine-vanilla/wine-vanilla-9.7.ebuild | 430 +
 2 files changed, 431 insertions(+)

diff --git a/app-emulation/wine-vanilla/Manifest 
b/app-emulation/wine-vanilla/Manifest
index 72ed2b15f62e..ffcd3c5ace1e 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -5,3 +5,4 @@ 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

diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.7.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-9.7.ebuild
new file mode 100644
index ..162e8b9a993c
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.7.ebuild
@@ -0,0 +1,430 @@
+# 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 optfeature
+inherit prefix toolchain-funcs wrapper
+
+WINE_GECKO=2.47.4
+WINE_MONO=9.0.0
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   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;
+   S="${WORKDIR}/wine-${PV}"
+   KEYWORDS="-* ~amd64 ~x86"
+fi
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, without external 
patchsets"
+HOMEPAGE="
+   https://www.winehq.org/
+   https://gitlab.winehq.org/wine/wine/
+"
+
+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 odbc 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}] )
+   )
+   xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+   xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+   )
+   cups? ( net-print/cups[${MULTILIB_USEDEP}] )
+   fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
+   kerberos? (

[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-vanilla/

2024-04-05 Thread Ionen Wolkens

commit: d74adc4f916ad6046c1e2288ed8eb8270895a6a9
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Apr  5 18:40:58 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Apr  5 18:41:03 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d74adc4f

app-emulation/wine-vanilla: add 9.6

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

 app-emulation/wine-vanilla/Manifest|   1 +
 app-emulation/wine-vanilla/wine-vanilla-9.6.ebuild | 430 +
 2 files changed, 431 insertions(+)

diff --git a/app-emulation/wine-vanilla/Manifest 
b/app-emulation/wine-vanilla/Manifest
index 33af859b65fa..72ed2b15f62e 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -4,3 +4,4 @@ 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

diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.6.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-9.6.ebuild
new file mode 100644
index ..162e8b9a993c
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.6.ebuild
@@ -0,0 +1,430 @@
+# 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 optfeature
+inherit prefix toolchain-funcs wrapper
+
+WINE_GECKO=2.47.4
+WINE_MONO=9.0.0
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   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;
+   S="${WORKDIR}/wine-${PV}"
+   KEYWORDS="-* ~amd64 ~x86"
+fi
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, without external 
patchsets"
+HOMEPAGE="
+   https://www.winehq.org/
+   https://gitlab.winehq.org/wine/wine/
+"
+
+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 odbc 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}] )
+   )
+   xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+   xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+   )
+   cups? ( net-print/cups[${MULTILIB_USEDEP}] )
+   fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
+   kerberos? (

[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-vanilla/

2024-03-24 Thread Ionen Wolkens

commit: f96312e128119688fc59d2f8b34f362c4546ff3d
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sun Mar 24 18:26:51 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sun Mar 24 18:37:35 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f96312e1

app-emulation/wine-vanilla: 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-vanilla/wine-vanilla-7.0.2.ebuild | 5 +
 app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild | 5 +
 app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild   | 6 ++
 app-emulation/wine-vanilla/wine-vanilla-9.3.ebuild   | 6 ++
 app-emulation/wine-vanilla/wine-vanilla-9.4.ebuild   | 6 ++
 app-emulation/wine-vanilla/wine-vanilla-9.5.ebuild   | 6 ++
 app-emulation/wine-vanilla/wine-vanilla-.ebuild  | 6 ++
 7 files changed, 40 insertions(+)

diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
index bc8a900aa368..ed678fefaa02 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
@@ -295,6 +295,11 @@ src_configure() {
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,*'
+
# -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

diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild
index 6ac6557b4934..972a6b64c743 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild
@@ -297,6 +297,11 @@ src_configure() {
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,*'
+
# -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

diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild
index f1ae8dd30d38..7326ea74dd64 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild
@@ -306,6 +306,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-vanilla/wine-vanilla-9.3.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-9.3.ebuild
index 593d2fed1eee..162e8b9a993c 100644
---

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

2024-03-24 Thread Ionen Wolkens

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

app-emulation/wine-proton: 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-proton/wine-proton-7.0.6.ebuild| 5 +
 app-emulation/wine-proton/wine-proton-8.0.5c.ebuild   | 5 +
 app-emulation/wine-proton/wine-proton-8.0..ebuild | 5 +
 app-emulation/wine-proton/wine-proton-9.0..ebuild | 6 ++
 4 files changed, 21 insertions(+)

diff --git a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild 
b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
index b04f298e473a..50cc8ae8ca6c 100644
--- a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
+++ b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
@@ -279,6 +279,11 @@ src_configure() {
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,*'
+
# -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

diff --git a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild 
b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
index 64e517a897ea..bb1944292c4d 100644
--- a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
@@ -292,6 +292,11 @@ src_configure() {
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,*'
+
# -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

diff --git a/app-emulation/wine-proton/wine-proton-8.0..ebuild 
b/app-emulation/wine-proton/wine-proton-8.0..ebuild
index a2711662b536..78b03242a34b 100644
--- a/app-emulation/wine-proton/wine-proton-8.0..ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0..ebuild
@@ -294,6 +294,11 @@ src_configure() {
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,*'
+
# -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

diff --git a/app-emulation/wine-proton/wine-proton-9.0..ebuild 
b/app-emulation/wine-proton/wine-proton-9.0..ebuild
index 42b55c99ed92..fda342d879f2 100644
--- a/app-emulation/wine-proton/wine-proton-9.0..ebuild
+++ b/app-emulation/wine-proton/wine-proton-9.0..ebuild
@@ -296,6 +296,12 @@ src_configure() {
CROSSCFLAGS="${CROSSCFLAGS:-$(
filter-flags '-fstack-protector*' #870136
filter-flags '-mfunction-return=thunk*'

[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-vanilla/

2024-03-22 Thread Ionen Wolkens

commit: e0b620e3eb0408e71fb7da3c2c296890b528
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Mar 23 04:32:13 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Mar 23 04:32:13 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0b6

app-emulation/wine-vanilla: drop 9.1, 9.2

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

 app-emulation/wine-vanilla/Manifest|   2 -
 app-emulation/wine-vanilla/wine-vanilla-9.1.ebuild | 424 -
 app-emulation/wine-vanilla/wine-vanilla-9.2.ebuild | 424 -
 3 files changed, 850 deletions(-)

diff --git a/app-emulation/wine-vanilla/Manifest 
b/app-emulation/wine-vanilla/Manifest
index ac2c1f505a24..b6d52c0f447f 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -1,7 +1,5 @@
 DIST wine-7.0.2.tar.xz 27179980 BLAKE2B 
721ab574092638b32d3a483b6ae3def0c9d706cc888662ca461ab8c7060b10077e83cede69663ea2a8b97729f3801209fbba5f8e8828ce20454700ffbbd76cb5
 SHA512 
330c71005a6a8054b5068ac4484e9015e9f8bf55d5a451aaf5f79b7f78a025732b454251c31473abf21504cce3b78e50cf7e3e0d0116bb755dc8396bd790289a
 DIST wine-8.0.2.tar.xz 29060452 BLAKE2B 
dcffaba6c90c4e02a7bc591a81e11aced06c006370c4c316c8a367b2f5814926063482959fabfe9d674ee1b5a560e59087e9b711e28360ced3aee2bbd6bb8fdb
 SHA512 
e86dd31247d757d48ffb2d24f20edab3fc6ef9c3e395567a7b363951bb681335ba3adb8b84639011b24b6eb274582d56880298d6d95fb100acc072383d4e973f
 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

diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.1.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-9.1.ebuild
deleted file mode 100644
index 3960ebc67c6b..
--- a/app-emulation/wine-vanilla/wine-vanilla-9.1.ebuild
+++ /dev/null
@@ -1,424 +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 optfeature
-inherit prefix toolchain-funcs wrapper
-
-WINE_GECKO=2.47.4
-WINE_MONO=8.1.0
-
-if [[ ${PV} == * ]]; then
-   inherit git-r3
-   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;
-   S="${WORKDIR}/wine-${PV}"
-   KEYWORDS="-* ~amd64 ~x86"
-fi
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, without external 
patchsets"
-HOMEPAGE="
-   https://www.winehq.org/
-   https://gitlab.winehq.org/wine/wine/
-"
-
-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 odbc 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"

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

2024-03-22 Thread Ionen Wolkens

commit: 66f4e2d73e85b65a8b3b4fd7ce454f53b607cc49
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Mar 23 05:04:17 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Mar 23 05:04:17 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66f4e2d7

app-emulation/wine-vanilla: add 9.5

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

 app-emulation/wine-vanilla/Manifest|   1 +
 app-emulation/wine-vanilla/wine-vanilla-9.5.ebuild | 424 +
 2 files changed, 425 insertions(+)

diff --git a/app-emulation/wine-vanilla/Manifest 
b/app-emulation/wine-vanilla/Manifest
index b6d52c0f447f..33af859b65fa 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -3,3 +3,4 @@ DIST wine-8.0.2.tar.xz 29060452 BLAKE2B 
dcffaba6c90c4e02a7bc591a81e11aced06c0063
 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

diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.5.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-9.5.ebuild
new file mode 100644
index ..593d2fed1eee
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.5.ebuild
@@ -0,0 +1,424 @@
+# 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 optfeature
+inherit prefix toolchain-funcs wrapper
+
+WINE_GECKO=2.47.4
+WINE_MONO=9.0.0
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   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;
+   S="${WORKDIR}/wine-${PV}"
+   KEYWORDS="-* ~amd64 ~x86"
+fi
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, without external 
patchsets"
+HOMEPAGE="
+   https://www.winehq.org/
+   https://gitlab.winehq.org/wine/wine/
+"
+
+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 odbc 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}] )
+   )
+   xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+   xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+   )
+   cups? ( net-print/cups[${MULTILIB_USEDEP}] )
+   fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
+   kerberos? (

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

2024-03-22 Thread Ionen Wolkens

commit: b24051d41b7f7f6a5785368f6c8e68ed790a4030
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Mar 22 12:23:28 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Mar 22 12:30:42 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b24051d4

app-emulation/wine-vanilla: 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-vanilla/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/wine-vanilla/metadata.xml 
b/app-emulation/wine-vanilla/metadata.xml
index c7b47d52f1a8..99ab7d2e9aab 100644
--- a/app-emulation/wine-vanilla/metadata.xml
+++ b/app-emulation/wine-vanilla/metadata.xml
@@ -32,7 +32,7 @@ This variant of the Wine packaging does not include external 
patchsets

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-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-proton/

2024-03-22 Thread Ionen Wolkens

commit: 5c81bf1b9b70d0099537771d25cd5f1ac2d5f113
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Mar 22 12:26:58 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Mar 22 12:30:43 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c81bf1b

app-emulation/wine-proton: 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-proton/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/wine-proton/metadata.xml 
b/app-emulation/wine-proton/metadata.xml
index 2e414ed41543..cc21bdb8ce89 100644
--- a/app-emulation/wine-proton/metadata.xml
+++ b/app-emulation/wine-proton/metadata.xml
@@ -23,7 +23,7 @@

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-proton/

2024-03-20 Thread Ionen Wolkens

commit: 278e265ca7998fe2dd1f329753f65b171edd6e2b
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Mar 20 05:09:04 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Mar 20 07:01:01 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=278e265c

app-emulation/wine-proton: drop 8.0.4

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

 app-emulation/wine-proton/Manifest |   1 -
 app-emulation/wine-proton/wine-proton-8.0.4.ebuild | 375 -
 2 files changed, 376 deletions(-)

diff --git a/app-emulation/wine-proton/Manifest 
b/app-emulation/wine-proton/Manifest
index a6b7dd2607b1..34b2254d80d2 100644
--- a/app-emulation/wine-proton/Manifest
+++ b/app-emulation/wine-proton/Manifest
@@ -1,3 +1,2 @@
 DIST proton-wine-7.0-6.tar.gz 45780326 BLAKE2B 
f140fcfdd1a47904c34a49d0795fa3326d7cf0d3fac8d6c2ef2a4926181a46223f43a2d1ca96c543e800c8c46b2a3cc51ae306a029d68a42608876e869e177d5
 SHA512 
793bbe2b23042301a1b518717d78cfff01eaffa033d010659a45779b9136d33cfac63f0c3fbb1e458953a954b423eb70ac4fa87633352267db890ceb2fef
-DIST proton-wine-8.0-4.tar.gz 48317622 BLAKE2B 
53047016897c8919cf3b51d7e51025806d267bb2f04fb3d464b8cf0f133c36b53d9c6c3e591aff4c71a95c6e167eed67b6ad84cc549e1aa1682175233da79835
 SHA512 
837772856aafb4d47c700997655c0d98f17cafdcc76008e04d064dd071e8d3163ed094bfc57441ef8ec4f2f7ea6303815351dc707ce5515f8c22f9aba8c5f83b
 DIST proton-wine-8.0-5c.tar.gz 48710071 BLAKE2B 
99627baea6fb3d51231aa1e75a2734c3c1baba88326baf15b3d421d57a00472d25ba51c2140b51152c8aeae7dd240d3d77bb0d8835aa7eb3b745a51be120f8bb
 SHA512 
0cf98d4e67866e55cc8cd5ea8da0d76aee8e37b130b3cbca604083c913e98ddf9038ecd6f9761d2e11443e282b372977400e251456c6d40e1365210c7578234d

diff --git a/app-emulation/wine-proton/wine-proton-8.0.4.ebuild 
b/app-emulation/wine-proton/wine-proton-8.0.4.ebuild
deleted file mode 100644
index 359ad7c9f4e1..
--- a/app-emulation/wine-proton/wine-proton-8.0.4.ebuild
+++ /dev/null
@@ -1,375 +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 flag-o-matic multilib multilib-build prefix
-inherit python-any-r1 readme.gentoo-r1 toolchain-funcs wrapper
-
-WINE_GECKO=2.47.3
-WINE_MONO=8.0.1
-WINE_PV=$(ver_rs 2 -)
-
-if [[ ${PV} == * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/ValveSoftware/wine.git;
-   EGIT_BRANCH="experimental_$(ver_cut 1-2)"
-else
-   
SRC_URI="https://github.com/ValveSoftware/wine/archive/refs/tags/proton-wine-${WINE_PV}.tar.gz;
-   S="${WORKDIR}/${PN}-wine-${WINE_PV}"
-   KEYWORDS="-* amd64 ~x86"
-fi
-
-DESCRIPTION="Valve Software's fork of Wine"
-HOMEPAGE="https://github.com/ValveSoftware/wine/;
-
-LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
-SLOT="${PV}"
-IUSE="
-   +abi_x86_32 +abi_x86_64 +alsa crossdev-mingw custom-cflags
-   +fontconfig +gecko +gstreamer llvm-libunwind +mono nls osmesa
-   perl pulseaudio +sdl selinux +ssl +strip udev udisks +unwind
-   usb v4l +xcomposite xinerama
-"
-
-# 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="
-   dev-libs/libgcrypt:=[${MULTILIB_USEDEP}]
-   media-libs/freetype[${MULTILIB_USEDEP}]
-   media-libs/libglvnd[X,${MULTILIB_USEDEP}]
-   media-libs/vulkan-loader[${MULTILIB_USEDEP}]
-   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}]
-   fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
-   osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
-   sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] )
-   ssl? (
-   dev-libs/gmp:=[${MULTILIB_USEDEP}]
-   net-libs/gnutls:=[${MULTILIB_USEDEP}]
-   )
-   udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-   v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-   xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-   xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-"
-# gcc: for -latomic with clang
-WINE_COMMON_DEPEND="
-   ${WINE_DLOPEN_DEPEND}
-   sys-devel/gcc:*
-   x11-libs/libX11[${MULTILIB_USEDEP}]
-   x11-libs/libXext[${MULTILIB_USEDEP}]
-   alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-   gstreamer? (
-   dev-libs/glib:2[${MULTILIB_USEDEP}]
-   media-libs/gst-plugins-base:1.0[opengl,${MULTILIB_USEDEP}]
-   media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-   )
-   pulseaudio? (

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

2024-03-20 Thread Ionen Wolkens

commit: c10b14e44c6b163771709a0fc14e17bca0e221bc
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Mar 20 05:10:00 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Mar 20 07:01:01 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c10b14e4

app-emulation/wine-mono: drop 8.0.1

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

 app-emulation/wine-mono/Manifest   |  2 --
 app-emulation/wine-mono/wine-mono-8.0.1.ebuild | 26 --
 2 files changed, 28 deletions(-)

diff --git a/app-emulation/wine-mono/Manifest b/app-emulation/wine-mono/Manifest
index 1f258ab638c5..05f3eea7cce9 100644
--- a/app-emulation/wine-mono/Manifest
+++ b/app-emulation/wine-mono/Manifest
@@ -2,8 +2,6 @@ DIST wine-mono-7.0.0-x86.msi 86433280 BLAKE2B 
9d164bf10f9c790a1f518624321a779658
 DIST wine-mono-7.0.0-x86.tar.xz 45085800 BLAKE2B 
504c57acce486c19a54bf33cdb4b9444c07a58a7f56ced0c93178886a91fa5d94a61f6e26aa885f3e3a2cceb2ff792f01006a4b16fa5bb88c3d25ddff02fefd7
 SHA512 
a3977563c5eb6418eaeda25e5b39bd2ef1faf305d514979211e049280c4577718ca48c8566e527b97a58fc465b310dd600093a616102573e12e8985794d828a6
 DIST wine-mono-7.4.0-x86.msi 87334912 BLAKE2B 
c0b778f9db59d1a2917631f1d6ca1a1798972a6a42e27975da78f3a35b77018a99228d7d95e5640c57618533a6b01bf2252859e3e978e2aa8dbdc8cd62afcc28
 SHA512 
cf35513b368324487c387d4339e5b05a90c4825b25ea603140524b79e69786ccc20dfb898213a9548c0313c0b0e4b160acb88364e4b280dd6712d185d9e5ae57
 DIST wine-mono-7.4.0-x86.tar.xz 45404344 BLAKE2B 
3a74106b9b3f21a88c2435f7988d66a54e08beea931a0ce0df6431c21add4ee2685bf9c9cb2404ee1a685736d61b1aee3cdd507130e5c5dddba7e506a2ff18bb
 SHA512 
108cb5d969e84deeda3d2b11dba7cd73853fc3b088ecf2bcdb9bc5c5bbaaff03e72cd4f485d1935eda43cdd95b927886441be1d2204edeaee1ff1fea75735d22
-DIST wine-mono-8.0.1-x86.msi 84579328 BLAKE2B 
946a0bf5a7e4fef8c6d40a9899a070fb4d6542ed6f4c632ded4edeab134e7fd6c17f1951cd3008b51c7f56eab95c0120bbf64212361a64653fb7bd4d54512a15
 SHA512 
06aed1bf24882987cd2eae99f9295faf450e0c1471381105ce794987cf37bb7feb7bc857e4dcd59a718b05b1676f227bf16abb472c1d1fc7f1902ec835de3156
-DIST wine-mono-8.0.1-x86.tar.xz 42365644 BLAKE2B 
53ae5cb57c4571aa7071d13b99af59b24b2275c559fd062a2621413b1e17a3d0a2bda23f143df6dd2b7685e65d62ab8e800fd3f082be02faac54450c8d71faf1
 SHA512 
bd174ce5031df1a13a6cb050b735d32330ccd0de43ea29888a91c49db49b02f9b377e78ef9531eaa1b30eed79c6706d84624b87d784f73224581763ca9e63945
 DIST wine-mono-8.1.0-x86.msi 84905984 BLAKE2B 
948b014fc6fba94bc97642b8aae266b8179b119ea3d8a0fdf47daee33eac65b8cc5dd1bc483ae4c66bdd1bdc10f4b73258bb6c83bca0911a30e86e358faafd20
 SHA512 
5c788dfa0c9b664242f3ce0ab24f3f9256dabf1e9fadc516140f267c763da1865b4536c707660acaf66e4a37d93198f5499971b4261e63d91252f6a7fc3eae4e
 DIST wine-mono-8.1.0-x86.tar.xz 40854944 BLAKE2B 
0e0dd83b92016da328547173d25dc396a895a7a161cd54796c9bda34ae958856f1bee342c1bb5fcffcf695b35adf66b2bf83cfa61e01790bf4b0f2d198f84feb
 SHA512 
ba87105a6527b9c392e9ad406e92fd90164e0abb3a348a1e343e63eff0ee8632399badb98f7fbc3581ce697ba09d98aafbf5033bf52fb14b7c7c280c64f25a84
 DIST wine-mono-9.0.0-x86.msi 84583424 BLAKE2B 
38f16049909f6464624c1c8f990a7873a3211bf02bef7593cae9da0201e8de0f535c841375eadf47bf0a4b10b08bc9d4c89d22d723e51f3f767c6e986ef01c7d
 SHA512 
fcbde718c237f102aab2e234a2f1c03aedd45ad9f97152112562b2119e542efd2f2979899afd3e9e03b1a06caec135d0f2cfcde084e372d1f74d594d52e6c833

diff --git a/app-emulation/wine-mono/wine-mono-8.0.1.ebuild 
b/app-emulation/wine-mono/wine-mono-8.0.1.ebuild
deleted file mode 100644
index 27069cdc43d3..
--- a/app-emulation/wine-mono/wine-mono-8.0.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Replacement for the .NET runtime and class libraries in Wine"
-HOMEPAGE="https://wiki.winehq.org/Mono;
-SRC_URI="
-   shared? ( 
https://github.com/madewokherd/wine-mono/releases/download/${P}/${P}-x86.tar.xz 
)
-   !shared? ( 
https://github.com/madewokherd/wine-mono/releases/download/${P}/${P}-x86.msi )"
-S="${WORKDIR}"
-
-LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1"
-SLOT="${PV}"
-KEYWORDS="amd64 x86"
-IUSE="+shared"
-
-src_install() {
-   insinto /usr/share/wine/mono
-
-   if use shared; then
-   doins -r ${P}
-   else
-   doins "${DISTDIR}"/${P}-x86.msi
-   fi
-}

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

2024-03-11 Thread Ionen Wolkens

commit: a8395ab333f5b5f1c384ccc48c93ea9a9682e2fb
Author: Matoro Mahri  matoro  tk>
AuthorDate: Tue Mar 12 04:02:29 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Mar 12 04:11:27 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8395ab3

app-emulation/wine-proton: Stabilize 8.0.5c amd64, #924198

Signed-off-by: Matoro Mahri  matoro.tk>
Signed-off-by: Ionen Wolkens  gentoo.org>

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

diff --git a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild 
b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
index 28ec733f1806..64e517a897ea 100644
--- a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == * ]]; then
 else

SRC_URI="https://github.com/ValveSoftware/wine/archive/refs/tags/proton-wine-${WINE_PV}.tar.gz;
S="${WORKDIR}/${PN}-wine-${WINE_PV}"
-   KEYWORDS="-* ~amd64 ~x86"
+   KEYWORDS="-* amd64 ~x86"
 fi
 
 DESCRIPTION="Valve Software's fork of Wine"

[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-vanilla/, app-emulation/wine-vanilla/files/

2024-03-08 Thread Ionen Wolkens

commit: ddfba238cc0b1ab4056f6d0412790667b57a4aa9
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Mar  9 03:36:30 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Mar  9 03:55:32 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddfba238

app-emulation/wine-vanilla: fix build with USE="opengl wayland"

Unsure if the new wayland opengl support actually works (runtime
untested), but it at least builds now. Very new/experimental anyway.

Sorry for missing this during the bump, should've tried USE=wayland.

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

 .../files/wine-vanilla-9.4-wayland-egl.patch | 16 
 app-emulation/wine-vanilla/wine-vanilla-9.4.ebuild   |  1 +
 2 files changed, 17 insertions(+)

diff --git 
a/app-emulation/wine-vanilla/files/wine-vanilla-9.4-wayland-egl.patch 
b/app-emulation/wine-vanilla/files/wine-vanilla-9.4-wayland-egl.patch
new file mode 100644
index ..0c6f8084f480
--- /dev/null
+++ b/app-emulation/wine-vanilla/files/wine-vanilla-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-vanilla/wine-vanilla-9.4.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-9.4.ebuild
index 593d2fed1eee..358e42dfad4e 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9.4.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.4.ebuild
@@ -161,6 +161,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-7.0-noexecstack.patch
"${FILESDIR}"/${PN}-7.20-unwind.patch
"${FILESDIR}"/${PN}-8.13-rpath.patch
+   "${FILESDIR}"/${P}-wayland-egl.patch
 )
 
 pkg_pretend() {

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

2024-03-08 Thread Ionen Wolkens

commit: 55928878393906f7bbff21563baf2156660a737a
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Mar  8 23:34:46 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Mar  8 23:35:06 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55928878

app-emulation/wine-vanilla: add 9.4

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

 app-emulation/wine-vanilla/Manifest|   1 +
 app-emulation/wine-vanilla/wine-vanilla-9.4.ebuild | 424 +
 2 files changed, 425 insertions(+)

diff --git a/app-emulation/wine-vanilla/Manifest 
b/app-emulation/wine-vanilla/Manifest
index 05b08c92c967..ac2c1f505a24 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -4,3 +4,4 @@ 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

diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.4.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-9.4.ebuild
new file mode 100644
index ..593d2fed1eee
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.4.ebuild
@@ -0,0 +1,424 @@
+# 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 optfeature
+inherit prefix toolchain-funcs wrapper
+
+WINE_GECKO=2.47.4
+WINE_MONO=9.0.0
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   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;
+   S="${WORKDIR}/wine-${PV}"
+   KEYWORDS="-* ~amd64 ~x86"
+fi
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, without external 
patchsets"
+HOMEPAGE="
+   https://www.winehq.org/
+   https://gitlab.winehq.org/wine/wine/
+"
+
+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 odbc 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}] )
+   )
+   xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+   xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+   )
+   cups? ( net-print/cups[${MULTILIB_USEDEP}] )
+   fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
+   kerberos? (

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

2024-03-04 Thread Ionen Wolkens

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

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

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

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

diff --git a/app-emulation/wine-proton/metadata.xml 
b/app-emulation/wine-proton/metadata.xml
index 16afd8a54c41..2e414ed41543 100644
--- a/app-emulation/wine-proton/metadata.xml
+++ b/app-emulation/wine-proton/metadata.xml
@@ -23,9 +23,10 @@

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: 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-vanilla/

2024-03-04 Thread Ionen Wolkens

commit: 73934e04770b9add6afe5ec3eae337eb1e520825
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Mar  5 05:53:05 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Mar  5 05:55:43 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73934e04

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

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

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

diff --git a/app-emulation/wine-vanilla/metadata.xml 
b/app-emulation/wine-vanilla/metadata.xml
index d8858da76906..c7b47d52f1a8 100644
--- a/app-emulation/wine-vanilla/metadata.xml
+++ b/app-emulation/wine-vanilla/metadata.xml
@@ -32,9 +32,10 @@ This variant of the Wine packaging does not include external 
patchsets

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: 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-vanilla/

2024-02-27 Thread Ionen Wolkens

commit: 974cdedb96f292357eb5461a4516297f106e2a9f
Author: Matoro Mahri  matoro  tk>
AuthorDate: Tue Feb 27 20:55:01 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Feb 28 02:32:47 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=974cdedb

app-emulation/wine-vanilla: Stabilize 9.0 amd64, #924197

Signed-off-by: Matoro Mahri  matoro.tk>
Signed-off-by: Ionen Wolkens  gentoo.org>

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

diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild
index c78034274b86..f1ae8dd30d38 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild
@@ -17,7 +17,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;
S="${WORKDIR}/wine-${PV}"
-   KEYWORDS="-* ~amd64 x86"
+   KEYWORDS="-* amd64 x86"
 fi
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, without external 
patchsets"

[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-proton/, app-emulation/wine-proton/files/

2024-02-26 Thread Ionen Wolkens

commit: 10c55e3ba49d15d2d191442a56f7601ea1b3739c
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Feb 26 23:39:03 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Feb 27 00:50:20 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10c55e3b

app-emulation/wine-proton: add 9.0. (experimental_9.0 branch)

No plans to add the 9.0 beta (will wait for a normal release),
but if really want to try 9.0 early then there is this.

May differ a bit given the releases are not fully based on the
experimental branches.

Not tested much yet, please report issues.

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

 .../wine-proton/files/wine-proton-9.0-rpath.patch  |  14 +
 app-emulation/wine-proton/metadata.xml |   7 +
 .../wine-proton/wine-proton-9.0..ebuild| 414 +
 3 files changed, 435 insertions(+)

diff --git a/app-emulation/wine-proton/files/wine-proton-9.0-rpath.patch 
b/app-emulation/wine-proton/files/wine-proton-9.0-rpath.patch
new file mode 100644
index ..78e4393d390d
--- /dev/null
+++ b/app-emulation/wine-proton/files/wine-proton-9.0-rpath.patch
@@ -0,0 +1,14 @@
+--- a/configure.ac
 b/configure.ac
+@@ -813,8 +813,11 @@
+ ;;
+ esac
+ ;;
+ 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
+ 
+ enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-no}

diff --git a/app-emulation/wine-proton/metadata.xml 
b/app-emulation/wine-proton/metadata.xml
index e0ea57df1f22..16afd8a54c41 100644
--- a/app-emulation/wine-proton/metadata.xml
+++ b/app-emulation/wine-proton/metadata.xml
@@ -20,6 +20,13 @@
Install helpers that require perl 
(winedump/winemaker)
Enable gamepad support using 
media-libs/libsdl2
Enable DirectX 12 support using 
app-emulation/vkd3d
+   
+   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
+   



https://github.com/ValveSoftware/Proton/wiki/Changelog

diff --git a/app-emulation/wine-proton/wine-proton-9.0..ebuild 
b/app-emulation/wine-proton/wine-proton-9.0..ebuild
new file mode 100644
index ..42b55c99ed92
--- /dev/null
+++ b/app-emulation/wine-proton/wine-proton-9.0..ebuild
@@ -0,0 +1,414 @@
+# 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 flag-o-matic multilib multilib-build prefix
+inherit python-any-r1 readme.gentoo-r1 toolchain-funcs wrapper
+
+WINE_GECKO=2.47.4
+WINE_MONO=9.0.0
+WINE_PV=$(ver_rs 2 -)
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/ValveSoftware/wine.git;
+   EGIT_BRANCH="experimental_$(ver_cut 1-2)"
+else
+   
SRC_URI="https://github.com/ValveSoftware/wine/archive/refs/tags/proton-wine-${WINE_PV}.tar.gz;
+   S="${WORKDIR}/${PN}-wine-${WINE_PV}"
+   KEYWORDS="-* ~amd64 ~x86"
+fi
+
+DESCRIPTION="Valve Software's fork of Wine"
+HOMEPAGE="https://github.com/ValveSoftware/wine/;
+
+LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
+SLOT="${PV}"
+IUSE="
+   +abi_x86_32 +abi_x86_64 +alsa crossdev-mingw custom-cflags
+   +fontconfig +gecko +gstreamer llvm-libunwind +mono nls osmesa
+   perl pulseaudio +sdl selinux +ssl +strip udev udisks +unwind
+   usb v4l video_cards_amdgpu wow64 +xcomposite xinerama
+"
+REQUIRED_USE="wow64? ( abi_x86_64 !abi_x86_32 )"
+
+# 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="
+   dev-libs/libgcrypt:=[${MULTILIB_USEDEP}]
+   media-libs/freetype[${MULTILIB_USEDEP}]
+   media-libs/libglvnd[X,${MULTILIB_USEDEP}]
+   media-libs/vulkan-loader[${MULTILIB_USEDEP}]
+   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}]
+   fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
+   osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
+   sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] )
+   ssl? (
+

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

2024-02-26 Thread Ionen Wolkens

commit: f8c2be6c7b07cd0fc9da513c9feebe3e502991ea
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Feb 26 23:19:05 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Feb 26 23:46:51 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8c2be6c

app-emulation/wine-vanilla: sort inherits

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

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

diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.1.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-9.1.ebuild
index 78095a8bc743..3960ebc67c6b 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9.1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
-inherit autotools flag-o-matic optfeature multilib multilib-build
+inherit autotools flag-o-matic multilib multilib-build optfeature
 inherit prefix toolchain-funcs wrapper
 
 WINE_GECKO=2.47.4

diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.2.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-9.2.ebuild
index b64d2dde5d10..593d2fed1eee 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
-inherit autotools flag-o-matic optfeature multilib multilib-build
+inherit autotools flag-o-matic multilib multilib-build optfeature
 inherit prefix toolchain-funcs wrapper
 
 WINE_GECKO=2.47.4

diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.3.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-9.3.ebuild
index b64d2dde5d10..593d2fed1eee 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9.3.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
-inherit autotools flag-o-matic optfeature multilib multilib-build
+inherit autotools flag-o-matic multilib multilib-build optfeature
 inherit prefix toolchain-funcs wrapper
 
 WINE_GECKO=2.47.4

diff --git a/app-emulation/wine-vanilla/wine-vanilla-.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-.ebuild
index b64d2dde5d10..593d2fed1eee 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
-inherit autotools flag-o-matic optfeature multilib multilib-build
+inherit autotools flag-o-matic multilib multilib-build optfeature
 inherit prefix 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-vanilla/

2024-02-26 Thread Ionen Wolkens

commit: 2449fe6f9d1721689de19a17a9be77f63e0c915a
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Feb 26 23:16:28 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Feb 26 23:46:50 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2449fe6f

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

Not that this means that it works.

Logic was inverted in 9.0+ 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-vanilla/wine-vanilla-7.0.2.ebuild | 1 -
 app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild | 1 -
 app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild   | 2 --
 app-emulation/wine-vanilla/wine-vanilla-9.1.ebuild   | 2 --
 app-emulation/wine-vanilla/wine-vanilla-9.2.ebuild   | 2 --
 app-emulation/wine-vanilla/wine-vanilla-9.3.ebuild   | 2 --
 app-emulation/wine-vanilla/wine-vanilla-.ebuild  | 2 --
 7 files changed, 12 deletions(-)

diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
index c0597ce761f0..bc8a900aa368 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
@@ -257,7 +257,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-vanilla/wine-vanilla-8.0.2.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild
index 7fb2fd5fd620..6ac6557b4934 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild
@@ -251,7 +251,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-vanilla/wine-vanilla-9.0.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild
index 10bb870877c1..c78034274b86 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild
@@ -293,8 +293,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-vanilla/wine-vanilla-9.1.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-9.1.ebuild
index 2b35c7b1d3f9..78095a8bc743 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9.1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.1.ebuild
@@ -293,8 +293,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-vanilla/wine-vanilla-9.2.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-9.2.ebuild
index f9fd23e3c79a..b64d2dde5d10 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.2.ebuild
@@ -293,8 +293,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-vanilla/wine-vanilla-9.3.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-9.3.ebuild
index f9fd23e3c79a..b64d2dde5d10 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9.3.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.3.ebuild
@@ -293,8 +293,6 @@ src_configure() {
if use mingw; then
use crossdev-mingw ||

[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-vanilla/

2024-02-23 Thread Ionen Wolkens

commit: 0716a1096582a53732f18785381470d64a9c66be
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Feb 24 04:48:46 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Feb 24 05:28:04 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0716a109

app-emulation/wine-vanilla: add 9.3

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

 app-emulation/wine-vanilla/Manifest|   1 +
 app-emulation/wine-vanilla/wine-vanilla-9.3.ebuild | 426 +
 2 files changed, 427 insertions(+)

diff --git a/app-emulation/wine-vanilla/Manifest 
b/app-emulation/wine-vanilla/Manifest
index 65113d1d0dba..05b08c92c967 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -3,3 +3,4 @@ DIST wine-8.0.2.tar.xz 29060452 BLAKE2B 
dcffaba6c90c4e02a7bc591a81e11aced06c0063
 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

diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.3.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-9.3.ebuild
new file mode 100644
index ..f9fd23e3c79a
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.3.ebuild
@@ -0,0 +1,426 @@
+# 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 optfeature multilib multilib-build
+inherit prefix toolchain-funcs wrapper
+
+WINE_GECKO=2.47.4
+WINE_MONO=9.0.0
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   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;
+   S="${WORKDIR}/wine-${PV}"
+   KEYWORDS="-* ~amd64 ~x86"
+fi
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, without external 
patchsets"
+HOMEPAGE="
+   https://www.winehq.org/
+   https://gitlab.winehq.org/wine/wine/
+"
+
+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 odbc 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}] )
+   )
+   xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+   xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+   )
+   cups? ( net-print/cups[${MULTILIB_USEDEP}] )
+   fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
+   kerberos? (

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

2024-02-16 Thread Ionen Wolkens

commit: cc304cc97db031a866c899634b40055f4116307b
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Feb 16 10:23:30 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Feb 16 10:50:44 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc304cc9

app-emulation/wine-vanilla: 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-vanilla/wine-vanilla-9.1.ebuild  | 5 -
 app-emulation/wine-vanilla/wine-vanilla-9.2.ebuild  | 5 -
 app-emulation/wine-vanilla/wine-vanilla-.ebuild | 5 -
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.1.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-9.1.ebuild
index c6109d4d3d6f..2b35c7b1d3f9 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9.1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
-inherit autotools flag-o-matic multilib multilib-build
+inherit autotools flag-o-matic optfeature multilib multilib-build
 inherit prefix toolchain-funcs wrapper
 
 WINE_GECKO=2.47.4
@@ -415,6 +415,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-vanilla/wine-vanilla-9.2.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-9.2.ebuild
index cf08e9f83489..f9fd23e3c79a 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
-inherit autotools flag-o-matic multilib multilib-build
+inherit autotools flag-o-matic optfeature multilib multilib-build
 inherit prefix toolchain-funcs wrapper
 
 WINE_GECKO=2.47.4
@@ -415,6 +415,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-vanilla/wine-vanilla-.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-.ebuild
index cf08e9f83489..f9fd23e3c79a 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
-inherit autotools flag-o-matic multilib multilib-build
+inherit autotools flag-o-matic optfeature multilib multilib-build
 inherit prefix toolchain-funcs wrapper
 
 WINE_GECKO=2.47.4
@@ -415,6 +415,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-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-vanilla/

2024-02-11 Thread Sam James

commit: f7a61bb50490fd9092178ae4b249128be3d5f911
Author: Sam James  gentoo  org>
AuthorDate: Sun Feb 11 11:10:05 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Feb 11 11:10:05 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7a61bb5

app-emulation/wine-vanilla: Stabilize 9.0 x86, #924197

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

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

diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild
index c6109d4d3d6f..10bb870877c1 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild
@@ -17,7 +17,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;
S="${WORKDIR}/wine-${PV}"
-   KEYWORDS="-* ~amd64 ~x86"
+   KEYWORDS="-* ~amd64 x86"
 fi
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, without external 
patchsets"

[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-gecko/

2024-02-10 Thread Sam James

commit: 9da1950962334ca936d6511028f9c3bd4d1e6794
Author: Sam James  gentoo  org>
AuthorDate: Sun Feb 11 03:39:03 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Feb 11 03:39:03 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9da19509

app-emulation/wine-gecko: Stabilize 2.47.4 x86, #924195

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

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

diff --git a/app-emulation/wine-gecko/wine-gecko-2.47.4.ebuild 
b/app-emulation/wine-gecko/wine-gecko-2.47.4.ebuild
index 4b658c28de78..ac08991f84be 100644
--- a/app-emulation/wine-gecko/wine-gecko-2.47.4.ebuild
+++ b/app-emulation/wine-gecko/wine-gecko-2.47.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,7 +20,7 @@ S="${WORKDIR}"
 
 LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="+abi_x86_32 abi_x86_64 +shared"
 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )"

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

2024-02-10 Thread Sam James

commit: 151bf09559f26f0cc3e6da820157e7ce76c5fa78
Author: Sam James  gentoo  org>
AuthorDate: Sun Feb 11 03:39:06 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Feb 11 03:39:06 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=151bf095

app-emulation/wine-mono: Stabilize 8.1.0 amd64, #924196

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

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

diff --git a/app-emulation/wine-mono/wine-mono-8.1.0.ebuild 
b/app-emulation/wine-mono/wine-mono-8.1.0.ebuild
index c6836b10..420d2e8387b2 100644
--- a/app-emulation/wine-mono/wine-mono-8.1.0.ebuild
+++ b/app-emulation/wine-mono/wine-mono-8.1.0.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1"
 SLOT="${PV}"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="+shared"
 
 src_install() {

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

2024-02-10 Thread Sam James

commit: fdb672c8a940f96c2d89f7cd160ac327566e46db
Author: Sam James  gentoo  org>
AuthorDate: Sun Feb 11 03:39:05 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Feb 11 03:39:05 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdb672c8

app-emulation/wine-mono: Stabilize 8.1.0 x86, #924196

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

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

diff --git a/app-emulation/wine-mono/wine-mono-8.1.0.ebuild 
b/app-emulation/wine-mono/wine-mono-8.1.0.ebuild
index 96896ce732cf..c6836b10 100644
--- a/app-emulation/wine-mono/wine-mono-8.1.0.ebuild
+++ b/app-emulation/wine-mono/wine-mono-8.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ S="${WORKDIR}"
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="+shared"
 
 src_install() {

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

2024-02-10 Thread Sam James

commit: acfdfb04851338e3df53045d8e91f17d625be055
Author: Sam James  gentoo  org>
AuthorDate: Sun Feb 11 03:39:04 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Feb 11 03:39:04 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acfdfb04

app-emulation/wine-gecko: Stabilize 2.47.4 amd64, #924195

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

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

diff --git a/app-emulation/wine-gecko/wine-gecko-2.47.4.ebuild 
b/app-emulation/wine-gecko/wine-gecko-2.47.4.ebuild
index ac08991f84be..ae25f7f2f8eb 100644
--- a/app-emulation/wine-gecko/wine-gecko-2.47.4.ebuild
+++ b/app-emulation/wine-gecko/wine-gecko-2.47.4.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}"
 
 LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0"
 SLOT="${PV}"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="+abi_x86_32 abi_x86_64 +shared"
 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )"

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

2024-02-09 Thread Ionen Wolkens

commit: 6f134ef918517d208d1b2b0f25b5dd5b272b057e
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Feb  9 22:13:43 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Feb  9 22:35:04 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f134ef9

app-emulation/wine-vanilla: drop 8.21

Last of the previous development cycle, there should
be no reason to need this over 9.0.

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

 app-emulation/wine-vanilla/Manifest|   1 -
 .../wine-vanilla/wine-vanilla-8.21.ebuild  | 423 -
 2 files changed, 424 deletions(-)

diff --git a/app-emulation/wine-vanilla/Manifest 
b/app-emulation/wine-vanilla/Manifest
index cadd0bbc0322..209b35e89b6a 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -1,5 +1,4 @@
 DIST wine-7.0.2.tar.xz 27179980 BLAKE2B 
721ab574092638b32d3a483b6ae3def0c9d706cc888662ca461ab8c7060b10077e83cede69663ea2a8b97729f3801209fbba5f8e8828ce20454700ffbbd76cb5
 SHA512 
330c71005a6a8054b5068ac4484e9015e9f8bf55d5a451aaf5f79b7f78a025732b454251c31473abf21504cce3b78e50cf7e3e0d0116bb755dc8396bd790289a
 DIST wine-8.0.2.tar.xz 29060452 BLAKE2B 
dcffaba6c90c4e02a7bc591a81e11aced06c006370c4c316c8a367b2f5814926063482959fabfe9d674ee1b5a560e59087e9b711e28360ced3aee2bbd6bb8fdb
 SHA512 
e86dd31247d757d48ffb2d24f20edab3fc6ef9c3e395567a7b363951bb681335ba3adb8b84639011b24b6eb274582d56880298d6d95fb100acc072383d4e973f
-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

diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.21.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-8.21.ebuild
deleted file mode 100644
index 9d99763348b0..
--- a/app-emulation/wine-vanilla/wine-vanilla-8.21.ebuild
+++ /dev/null
@@ -1,423 +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.4
-WINE_MONO=8.1.0
-
-if [[ ${PV} == * ]]; then
-   inherit git-r3
-   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;
-   S="${WORKDIR}/wine-${PV}"
-   KEYWORDS="-* ~amd64 ~x86"
-fi
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, without external 
patchsets"
-HOMEPAGE="
-   https://www.winehq.org/
-   https://gitlab.winehq.org/wine/wine/;
-
-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 odbc 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-vanilla/

2024-02-09 Thread Ionen Wolkens

commit: 349cb6a0bac7dddc0a20950dc0e8d71996597dd8
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Feb  9 22:15:11 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Feb  9 22:35:04 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=349cb6a0

app-emulation/wine-vanilla: add 9.2

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

 app-emulation/wine-vanilla/Manifest|   1 +
 app-emulation/wine-vanilla/wine-vanilla-9.2.ebuild | 423 +
 2 files changed, 424 insertions(+)

diff --git a/app-emulation/wine-vanilla/Manifest 
b/app-emulation/wine-vanilla/Manifest
index 209b35e89b6a..65113d1d0dba 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -2,3 +2,4 @@ DIST wine-7.0.2.tar.xz 27179980 BLAKE2B 
721ab574092638b32d3a483b6ae3def0c9d706cc
 DIST wine-8.0.2.tar.xz 29060452 BLAKE2B 
dcffaba6c90c4e02a7bc591a81e11aced06c006370c4c316c8a367b2f5814926063482959fabfe9d674ee1b5a560e59087e9b711e28360ced3aee2bbd6bb8fdb
 SHA512 
e86dd31247d757d48ffb2d24f20edab3fc6ef9c3e395567a7b363951bb681335ba3adb8b84639011b24b6eb274582d56880298d6d95fb100acc072383d4e973f
 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

diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.2.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-9.2.ebuild
new file mode 100644
index ..cf08e9f83489
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.2.ebuild
@@ -0,0 +1,423 @@
+# 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.4
+WINE_MONO=9.0.0
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   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;
+   S="${WORKDIR}/wine-${PV}"
+   KEYWORDS="-* ~amd64 ~x86"
+fi
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, without external 
patchsets"
+HOMEPAGE="
+   https://www.winehq.org/
+   https://gitlab.winehq.org/wine/wine/
+"
+
+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 odbc 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}] )
+   )
+   xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+   xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+   )
+   cups? ( net-print/cups[${MULTILIB_USEDEP}] )
+   fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
+   kerberos? (

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

2024-02-06 Thread Ionen Wolkens

commit: b25fa9f136372cf971b83f53c42785fa16561736
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Feb  6 13:29:56 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Feb  6 13:33:17 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b25fa9f1

app-emulation/wine-mono: fix copyright year in 9.0.0

It was formerly 2024 but did a bad wine-staging commit amend
that lowered this to 2023, oops.

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

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

diff --git a/app-emulation/wine-mono/wine-mono-9.0.0.ebuild 
b/app-emulation/wine-mono/wine-mono-9.0.0.ebuild
index 96896ce732cf..f756896e7c2e 100644
--- a/app-emulation/wine-mono/wine-mono-9.0.0.ebuild
+++ b/app-emulation/wine-mono/wine-mono-9.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8

1 2 3 4 5 6 7 8 9 10 >

1 - 100 of 1402 matches

Mail list logo