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

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

2024-09-20 Thread Ionen Wolkens

commit: 315bdc263351d320da5abf547840caeedb8adc30
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Sep 20 22:27:43 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Sep 20 22:39:37 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=315bdc26

app-emulation/wine-vanilla: add 9.18

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

 app-emulation/wine-vanilla/Manifest|   1 +
 .../wine-vanilla/wine-vanilla-9.18.ebuild  | 442 +
 2 files changed, 443 insertions(+)

diff --git a/app-emulation/wine-vanilla/Manifest 
b/app-emulation/wine-vanilla/Manifest
index 27f42fedd669..ddf89146b5bd 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.15.tar.xz 30580680 BLAKE2B 
70a3dd1d566ce2022a197735bfbc6a879f99608d3b44dcb170dde68762b86cd880581bdc857090dad2733468f5aca3bb2613ef884fa35e361fce19e6e15dcef6
 SHA512 
4d19b7c0fbdf6ee5dc90c0aef800df47f5bda7e3506e5a3c065dcd29b33cc62840ae4eeb5c20c48e9400c0d1252b897d8bbc60fd5a58da1ad6e76ba677997cb3
 DIST wine-9.16.tar.xz 30638928 BLAKE2B 
65665d674842980345d4f3730a75a1734fd5b9c3f08a2700624e4cc18b3d496a1db790e6098c404e05ea9544e671e2cf3f5d10f7fdc0863c6cf0714a9b597af9
 SHA512 
5f2994d20b8c7635125b38b6a4d89db4b71791f096276fa93e36dc6951c47c25b8a3354f0be0931799ac83c54f048e34693b56512cc446b93c74344b1a458187
 DIST wine-9.17.tar.xz 30684564 BLAKE2B 
36049b7ed096865a647cea9ac1def6cf2a35984a72ae192d402a40f34c8a97e967cee31724d84d422f835f272fcba9ba818e1e787f7940b18d835aa234b0c6b7
 SHA512 
06ee82fc0f0c8c02f1f646f674e8e3c5d4b9ca9cf64a910b01eb9c6d5dbe0471a6b232875e099c2e5cfd8e1c183ee72850820f24fc026b11523b56872a2efec5
+DIST wine-9.18.tar.xz 30760808 BLAKE2B 
2ac93d28c76358be47615d6a1f053fc61ff023193bd000cacded262ceafb39072778461c72fc797657df6ae71c7fc072d0bfe69da04660cd14e4b6ddec36a0b5
 SHA512 
d6e049374d1e654937a0c767215076e5f12c7ff69aac930881292c075d0eee1a1af4c38937271c515875db12b98adebe8553d356b30e32d78d9ac8b1c7914509

diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.18.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-9.18.ebuild
new file mode 100644
index ..838210bfb98a
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.18.ebuild
@@ -0,0 +1,442 @@
+# 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.3.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 ffmpeg +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-09-10 Thread Ionen Wolkens

commit: f849e91a0ef01fab67cd31d39c29dcd1e304a1ff
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Sep 11 04:14:13 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Sep 11 04:51:59 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f849e91a

app-emulation/wine-vanilla: update live (ffmpeg)

Haven't looked in-depth at how it's used and if it can currently serve
as a gstreamer replacement but, if so, may make sense to swap the
default eventually (both can be enabled too, but may just be wasteful).

Leaving default-off for now either way given it's new, and users that
weren't using multilib gst-plugins-libav already will need extra
multilib libraries.

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

 app-emulation/wine-vanilla/wine-vanilla-.ebuild | 13 -
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/app-emulation/wine-vanilla/wine-vanilla-.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-.ebuild
index 22b468368b77..838210bfb98a 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-.ebuild
@@ -30,11 +30,12 @@ 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"
+   llvm-libunwind custom-cflags ffmpeg +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="
@@ -83,6 +84,7 @@ WINE_COMMON_DEPEND="
)
alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
capi? ( net-libs/libcapi:=[${MULTILIB_USEDEP}] )
+   ffmpeg? ( media-video/ffmpeg:=[${MULTILIB_USEDEP}] )
gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
gstreamer? (
dev-libs/glib:2[${MULTILIB_USEDEP}]
@@ -246,6 +248,7 @@ src_configure() {
$(use_with alsa)
$(use_with capi)
$(use_with cups)
+   $(use_with ffmpeg)
$(use_with fontconfig)
$(use_with gphoto2 gphoto)
$(use_with gstreamer)

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

2024-09-06 Thread Ionen Wolkens

commit: c8c928f5ceaba05864a6e1f22b3eed00bd3795d8
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Sep  7 01:35:26 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Sep  7 03:23:05 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8c928f5

app-emulation/wine-vanilla: add 9.17

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

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

diff --git a/app-emulation/wine-vanilla/Manifest 
b/app-emulation/wine-vanilla/Manifest
index dfb8eb1ce946..27f42fedd669 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.15.tar.xz 30580680 BLAKE2B 
70a3dd1d566ce2022a197735bfbc6a879f99608d3b44dcb170dde68762b86cd880581bdc857090dad2733468f5aca3bb2613ef884fa35e361fce19e6e15dcef6
 SHA512 
4d19b7c0fbdf6ee5dc90c0aef800df47f5bda7e3506e5a3c065dcd29b33cc62840ae4eeb5c20c48e9400c0d1252b897d8bbc60fd5a58da1ad6e76ba677997cb3
 DIST wine-9.16.tar.xz 30638928 BLAKE2B 
65665d674842980345d4f3730a75a1734fd5b9c3f08a2700624e4cc18b3d496a1db790e6098c404e05ea9544e671e2cf3f5d10f7fdc0863c6cf0714a9b597af9
 SHA512 
5f2994d20b8c7635125b38b6a4d89db4b71791f096276fa93e36dc6951c47c25b8a3354f0be0931799ac83c54f048e34693b56512cc446b93c74344b1a458187
+DIST wine-9.17.tar.xz 30684564 BLAKE2B 
36049b7ed096865a647cea9ac1def6cf2a35984a72ae192d402a40f34c8a97e967cee31724d84d422f835f272fcba9ba818e1e787f7940b18d835aa234b0c6b7
 SHA512 
06ee82fc0f0c8c02f1f646f674e8e3c5d4b9ca9cf64a910b01eb9c6d5dbe0471a6b232875e099c2e5cfd8e1c183ee72850820f24fc026b11523b56872a2efec5

diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.17.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-9.17.ebuild
new file mode 100644
index ..22b468368b77
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.17.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.3.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? ( virtual/

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

2024-09-06 Thread Ionen Wolkens

commit: faa04b1dfdacc7a834ef492b1e9b7028160b8431
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Sep  7 01:09:26 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Sep  7 03:23:04 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=faa04b1d

app-emulation/wine-vanilla: drop 9.13, 9.14

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

 app-emulation/wine-vanilla/Manifest|   2 -
 .../wine-vanilla/wine-vanilla-9.13.ebuild  | 439 -
 .../wine-vanilla/wine-vanilla-9.14.ebuild  | 439 -
 3 files changed, 880 deletions(-)

diff --git a/app-emulation/wine-vanilla/Manifest 
b/app-emulation/wine-vanilla/Manifest
index d559f0c347e9..dfb8eb1ce946 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.13.tar.xz 30542188 BLAKE2B 
a832468142d68a21696d45d01ed8b9e464dc5f95e5a5205a08573024a2b0e7ccc4415388de4cef9581976b10a7e5723d9058e22cc56eed897b25b2a7fa369608
 SHA512 
f9c74beae87a02c4ae6176676bbc9de203224651ed4eeafbe6cfc05b8a455a9ce790d3211135fbeb6425719e4c0423e345dfee5ed2cefdb80706784f464f7225
-DIST wine-9.14.tar.xz 30561796 BLAKE2B 
8055d311cd3d3d2c5f19e5f065066166afa41d8c95f946dea31931f2780953f2902b8bd36f5438ebc582cbe3c51fd4c221b429b9b9a6b59c0b8f9012a52b9bf4
 SHA512 
f242d4fa55db2d68813a8516c16f5404000e0da941c5e4796fea837625a67df16d31a60b7a4f5769662f0709086dc1d952e8d63cb16c493c805eff9a4264b117
 DIST wine-9.15.tar.xz 30580680 BLAKE2B 
70a3dd1d566ce2022a197735bfbc6a879f99608d3b44dcb170dde68762b86cd880581bdc857090dad2733468f5aca3bb2613ef884fa35e361fce19e6e15dcef6
 SHA512 
4d19b7c0fbdf6ee5dc90c0aef800df47f5bda7e3506e5a3c065dcd29b33cc62840ae4eeb5c20c48e9400c0d1252b897d8bbc60fd5a58da1ad6e76ba677997cb3
 DIST wine-9.16.tar.xz 30638928 BLAKE2B 
65665d674842980345d4f3730a75a1734fd5b9c3f08a2700624e4cc18b3d496a1db790e6098c404e05ea9544e671e2cf3f5d10f7fdc0863c6cf0714a9b597af9
 SHA512 
5f2994d20b8c7635125b38b6a4d89db4b71791f096276fa93e36dc6951c47c25b8a3354f0be0931799ac83c54f048e34693b56512cc446b93c74344b1a458187

diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.13.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-9.13.ebuild
deleted file mode 100644
index 27cb53b52387..
--- a/app-emulation/wine-vanilla/wine-vanilla-9.13.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.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
-RESTRI

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

2024-09-06 Thread Ionen Wolkens

commit: b3be9046a73f5e5ba63a7ff4dd4981a0f4e87203
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Sep  7 01:12:55 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Sep  7 03:23:04 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3be9046

app-emulation/wine-vanilla: update live

odbc seems to have reverted to the old dlopen+soname check method

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

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

diff --git a/app-emulation/wine-vanilla/wine-vanilla-.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-.ebuild
index 27cb53b52387..22b468368b77 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.2.0
+WINE_MONO=9.3.0
 
 if [[ ${PV} == * ]]; then
inherit git-r3
@@ -67,6 +67,7 @@ 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}] )
@@ -88,7 +89,6 @@ 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,7 +254,6 @@ src_configure() {
$(use_with mingw)
$(use_with netapi)
$(use_with nls gettext)
-   $(use_with odbc)
$(use_with opencl)
$(use_with opengl)
$(use_with osmesa)
@@ -275,6 +274,7 @@ 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-vanilla/

2024-08-23 Thread Ionen Wolkens

commit: 2fdf50b7cda69af96fc8f285c23a7c3c7c4e2db3
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Aug 24 00:32:48 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Aug 24 06:58:00 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fdf50b7

app-emulation/wine-vanilla: drop 9.11, 9.12

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

 app-emulation/wine-vanilla/Manifest|   2 -
 .../wine-vanilla/wine-vanilla-9.11.ebuild  | 439 -
 .../wine-vanilla/wine-vanilla-9.12.ebuild  | 439 -
 3 files changed, 880 deletions(-)

diff --git a/app-emulation/wine-vanilla/Manifest 
b/app-emulation/wine-vanilla/Manifest
index 8ec1b3afebef..486e9c21b311 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.11.tar.xz 30301904 BLAKE2B 
745cab93268f51a3d31562af6d392fec5ed0d18aeca3684d0d3ef68ef144e20ec2c0879853f67538db833ec89321e1b1e09533882802eb68452ad3fed87193cf
 SHA512 
695170140372f169e78e90a66d938839c70f9647531ae8d782c58fb0450460174f2958f7656f8d516447a22ef6e792a8c89f2f18c25fac847adf46bc51184999
-DIST wine-9.12.tar.xz 30339552 BLAKE2B 
e114b3a1db237345b9f86cb3a9f1e0040067275eb6c840e480f5fe6f4fa67ba9d4603b2006552ba2ef0ed45e53de9a25b67d4a50e24fad6a9b0e06d1e95763c7
 SHA512 
00c25cb11feed3625ebd8dc76fa35930d07d51182be4537c488ac4e713d6f9c61b974b19eafb57f54630376346dc1749c4d36a18d0f72748b34052cc7322df19
 DIST wine-9.13.tar.xz 30542188 BLAKE2B 
a832468142d68a21696d45d01ed8b9e464dc5f95e5a5205a08573024a2b0e7ccc4415388de4cef9581976b10a7e5723d9058e22cc56eed897b25b2a7fa369608
 SHA512 
f9c74beae87a02c4ae6176676bbc9de203224651ed4eeafbe6cfc05b8a455a9ce790d3211135fbeb6425719e4c0423e345dfee5ed2cefdb80706784f464f7225
 DIST wine-9.14.tar.xz 30561796 BLAKE2B 
8055d311cd3d3d2c5f19e5f065066166afa41d8c95f946dea31931f2780953f2902b8bd36f5438ebc582cbe3c51fd4c221b429b9b9a6b59c0b8f9012a52b9bf4
 SHA512 
f242d4fa55db2d68813a8516c16f5404000e0da941c5e4796fea837625a67df16d31a60b7a4f5769662f0709086dc1d952e8d63cb16c493c805eff9a4264b117
 DIST wine-9.15.tar.xz 30580680 BLAKE2B 
70a3dd1d566ce2022a197735bfbc6a879f99608d3b44dcb170dde68762b86cd880581bdc857090dad2733468f5aca3bb2613ef884fa35e361fce19e6e15dcef6
 SHA512 
4d19b7c0fbdf6ee5dc90c0aef800df47f5bda7e3506e5a3c065dcd29b33cc62840ae4eeb5c20c48e9400c0d1252b897d8bbc60fd5a58da1ad6e76ba677997cb3

diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.11.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-9.11.ebuild
deleted file mode 100644
index ea264050fc99..
--- a/app-emulation/wine-vanilla/wine-vanilla-9.11.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.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 ming

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

2024-08-23 Thread Ionen Wolkens

commit: b5d63ba99524a6b45efa86c34925d914b372f08d
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Aug 24 00:38:06 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Aug 24 06:58:00 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5d63ba9

app-emulation/wine-vanilla: add 9.16

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

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

diff --git a/app-emulation/wine-vanilla/Manifest 
b/app-emulation/wine-vanilla/Manifest
index 486e9c21b311..d559f0c347e9 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.13.tar.xz 30542188 BLAKE2B 
a832468142d68a21696d45d01ed8b9e464dc5f95e5a5205a08573024a2b0e7ccc4415388de4cef9581976b10a7e5723d9058e22cc56eed897b25b2a7fa369608
 SHA512 
f9c74beae87a02c4ae6176676bbc9de203224651ed4eeafbe6cfc05b8a455a9ce790d3211135fbeb6425719e4c0423e345dfee5ed2cefdb80706784f464f7225
 DIST wine-9.14.tar.xz 30561796 BLAKE2B 
8055d311cd3d3d2c5f19e5f065066166afa41d8c95f946dea31931f2780953f2902b8bd36f5438ebc582cbe3c51fd4c221b429b9b9a6b59c0b8f9012a52b9bf4
 SHA512 
f242d4fa55db2d68813a8516c16f5404000e0da941c5e4796fea837625a67df16d31a60b7a4f5769662f0709086dc1d952e8d63cb16c493c805eff9a4264b117
 DIST wine-9.15.tar.xz 30580680 BLAKE2B 
70a3dd1d566ce2022a197735bfbc6a879f99608d3b44dcb170dde68762b86cd880581bdc857090dad2733468f5aca3bb2613ef884fa35e361fce19e6e15dcef6
 SHA512 
4d19b7c0fbdf6ee5dc90c0aef800df47f5bda7e3506e5a3c065dcd29b33cc62840ae4eeb5c20c48e9400c0d1252b897d8bbc60fd5a58da1ad6e76ba677997cb3
+DIST wine-9.16.tar.xz 30638928 BLAKE2B 
65665d674842980345d4f3730a75a1734fd5b9c3f08a2700624e4cc18b3d496a1db790e6098c404e05ea9544e671e2cf3f5d10f7fdc0863c6cf0714a9b597af9
 SHA512 
5f2994d20b8c7635125b38b6a4d89db4b71791f096276fa93e36dc6951c47c25b8a3354f0be0931799ac83c54f048e34693b56512cc446b93c74344b1a458187

diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.16.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-9.16.ebuild
new file mode 100644
index ..27cb53b52387
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.16.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}] )
+   )
+   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? ( virtual

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

2024-08-10 Thread Ionen Wolkens

commit: 048dc662f316829cbc020a4633c5a9c64535b477
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Aug 10 16:59:48 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Aug 10 19:38:58 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=048dc662

app-emulation/wine-vanilla: add 9.15

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

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

diff --git a/app-emulation/wine-vanilla/Manifest 
b/app-emulation/wine-vanilla/Manifest
index 4e0e815f926f..8ec1b3afebef 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -5,3 +5,4 @@ DIST wine-9.11.tar.xz 30301904 BLAKE2B 
745cab93268f51a3d31562af6d392fec5ed0d18ae
 DIST wine-9.12.tar.xz 30339552 BLAKE2B 
e114b3a1db237345b9f86cb3a9f1e0040067275eb6c840e480f5fe6f4fa67ba9d4603b2006552ba2ef0ed45e53de9a25b67d4a50e24fad6a9b0e06d1e95763c7
 SHA512 
00c25cb11feed3625ebd8dc76fa35930d07d51182be4537c488ac4e713d6f9c61b974b19eafb57f54630376346dc1749c4d36a18d0f72748b34052cc7322df19
 DIST wine-9.13.tar.xz 30542188 BLAKE2B 
a832468142d68a21696d45d01ed8b9e464dc5f95e5a5205a08573024a2b0e7ccc4415388de4cef9581976b10a7e5723d9058e22cc56eed897b25b2a7fa369608
 SHA512 
f9c74beae87a02c4ae6176676bbc9de203224651ed4eeafbe6cfc05b8a455a9ce790d3211135fbeb6425719e4c0423e345dfee5ed2cefdb80706784f464f7225
 DIST wine-9.14.tar.xz 30561796 BLAKE2B 
8055d311cd3d3d2c5f19e5f065066166afa41d8c95f946dea31931f2780953f2902b8bd36f5438ebc582cbe3c51fd4c221b429b9b9a6b59c0b8f9012a52b9bf4
 SHA512 
f242d4fa55db2d68813a8516c16f5404000e0da941c5e4796fea837625a67df16d31a60b7a4f5769662f0709086dc1d952e8d63cb16c493c805eff9a4264b117
+DIST wine-9.15.tar.xz 30580680 BLAKE2B 
70a3dd1d566ce2022a197735bfbc6a879f99608d3b44dcb170dde68762b86cd880581bdc857090dad2733468f5aca3bb2613ef884fa35e361fce19e6e15dcef6
 SHA512 
4d19b7c0fbdf6ee5dc90c0aef800df47f5bda7e3506e5a3c065dcd29b33cc62840ae4eeb5c20c48e9400c0d1252b897d8bbc60fd5a58da1ad6e76ba677997cb3

diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.15.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-9.15.ebuild
new file mode 100644
index ..27cb53b52387
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.15.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}] )
+   )
+   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? ( virtual

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

2024-07-28 Thread Ionen Wolkens

commit: bcb20193c0546e7cddfd37a046561e6ec8877e02
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Jul 29 03:01:00 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Jul 29 03:55:20 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcb20193

app-emulation/wine-vanilla: add 9.14

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

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

diff --git a/app-emulation/wine-vanilla/Manifest 
b/app-emulation/wine-vanilla/Manifest
index 08b3ed9a148e..4e0e815f926f 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.11.tar.xz 30301904 BLAKE2B 
745cab93268f51a3d31562af6d392fec5ed0d18aeca3684d0d3ef68ef144e20ec2c0879853f67538db833ec89321e1b1e09533882802eb68452ad3fed87193cf
 SHA512 
695170140372f169e78e90a66d938839c70f9647531ae8d782c58fb0450460174f2958f7656f8d516447a22ef6e792a8c89f2f18c25fac847adf46bc51184999
 DIST wine-9.12.tar.xz 30339552 BLAKE2B 
e114b3a1db237345b9f86cb3a9f1e0040067275eb6c840e480f5fe6f4fa67ba9d4603b2006552ba2ef0ed45e53de9a25b67d4a50e24fad6a9b0e06d1e95763c7
 SHA512 
00c25cb11feed3625ebd8dc76fa35930d07d51182be4537c488ac4e713d6f9c61b974b19eafb57f54630376346dc1749c4d36a18d0f72748b34052cc7322df19
 DIST wine-9.13.tar.xz 30542188 BLAKE2B 
a832468142d68a21696d45d01ed8b9e464dc5f95e5a5205a08573024a2b0e7ccc4415388de4cef9581976b10a7e5723d9058e22cc56eed897b25b2a7fa369608
 SHA512 
f9c74beae87a02c4ae6176676bbc9de203224651ed4eeafbe6cfc05b8a455a9ce790d3211135fbeb6425719e4c0423e345dfee5ed2cefdb80706784f464f7225
+DIST wine-9.14.tar.xz 30561796 BLAKE2B 
8055d311cd3d3d2c5f19e5f065066166afa41d8c95f946dea31931f2780953f2902b8bd36f5438ebc582cbe3c51fd4c221b429b9b9a6b59c0b8f9012a52b9bf4
 SHA512 
f242d4fa55db2d68813a8516c16f5404000e0da941c5e4796fea837625a67df16d31a60b7a4f5769662f0709086dc1d952e8d63cb16c493c805eff9a4264b117

diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.14.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-9.14.ebuild
new file mode 100644
index ..27cb53b52387
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.14.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}] )
+   )
+   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? ( virtual

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

2024-07-28 Thread Ionen Wolkens

commit: 38b2e585952d3ba4e784ecb03c8c9874435a4a2f
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Jul 29 03:00:26 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Jul 29 03:55:19 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38b2e585

app-emulation/wine-vanilla: drop 9.9, 9.10

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

 app-emulation/wine-vanilla/Manifest|   2 -
 .../wine-vanilla/wine-vanilla-9.10.ebuild  | 439 -
 app-emulation/wine-vanilla/wine-vanilla-9.9.ebuild | 439 -
 3 files changed, 880 deletions(-)

diff --git a/app-emulation/wine-vanilla/Manifest 
b/app-emulation/wine-vanilla/Manifest
index 4b4b0d881eb1..08b3ed9a148e 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.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.13.tar.xz 30542188 BLAKE2B 
a832468142d68a21696d45d01ed8b9e464dc5f95e5a5205a08573024a2b0e7ccc4415388de4cef9581976b10a7e5723d9058e22cc56eed897b25b2a7fa369608
 SHA512 
f9c74beae87a02c4ae6176676bbc9de203224651ed4eeafbe6cfc05b8a455a9ce790d3211135fbeb6425719e4c0423e345dfee5ed2cefdb80706784f464f7225
-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
deleted file mode 100644
index ea264050fc99..
--- a/app-emulation/wine-vanilla/wine-vanilla-9.10.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.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

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

2024-07-14 Thread Ionen Wolkens

commit: 5da7caa001e9100848184da35490cdbb779befc8
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Jul 15 01:33:31 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Jul 15 05:45:00 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5da7caa0

app-emulation/wine-vanilla: add 9.13

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

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

diff --git a/app-emulation/wine-vanilla/Manifest 
b/app-emulation/wine-vanilla/Manifest
index 4e57f389800a..4b4b0d881eb1 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -4,4 +4,5 @@ DIST wine-9.0.tar.xz 30007216 BLAKE2B 
cf53177201a2f7eeb35d0d8ce220f80808d979099a
 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.13.tar.xz 30542188 BLAKE2B 
a832468142d68a21696d45d01ed8b9e464dc5f95e5a5205a08573024a2b0e7ccc4415388de4cef9581976b10a7e5723d9058e22cc56eed897b25b2a7fa369608
 SHA512 
f9c74beae87a02c4ae6176676bbc9de203224651ed4eeafbe6cfc05b8a455a9ce790d3211135fbeb6425719e4c0423e345dfee5ed2cefdb80706784f464f7225
 DIST wine-9.9.tar.xz 30265476 BLAKE2B 
a2557044b10252c1b1ae023e10863c601e9159d64eda2ce1d8aab4dbb9efffa1b4b15ed27a9edbf6f2bba148c2bb07e729bd706bac9fe17f91c826c74b5980e6
 SHA512 
df016411933b5447bef9b48f67c58e12d6d33ef0c24045ab03c92821dcccbf84335d1a2d765e6d6cf3a743598317010b8ae6f69de3661733e4fa43febec873dd

diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.13.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-9.13.ebuild
new file mode 100644
index ..27cb53b52387
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.13.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/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-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-vanilla/

2024-06-26 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-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-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
+WINE_DLOPEN_DE

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

2024-05-30 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
+   e

[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 a/app-emulation/wine-vanilla/wine-vanill

[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
+++ b/app-emulation/wine-vanilla/wine-van

[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? ( virtual/krb5[${

[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-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? ( media-li

[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-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 61e4

[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? ( virtual/krb5[${

[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-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
-
-WINE_GECKO=2.47.4

[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-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? ( virtual/krb5[${

[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? ( virtual/krb5[${

[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
--- a/app-emulation/wine-vanilla/wine-vanilla-9.3.ebuil

[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? ( virtual/krb5[${

[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-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? ( virtual/krb5[${

[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-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-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-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 || 
PATH=${BROOT}

[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? ( virtual/krb5[${

[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-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-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? ( virtual/krb5[${MULTILIB_

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

2024-02-05 Thread Ionen Wolkens

commit: f517efe8f565f5f4a352c733b2244c746d34e1fb
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Feb  6 05:24:37 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Feb  6 05:26:43 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f517efe8

app-emulation/wine-vanilla: bump WINE_MONO to 9.0.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 c6109d4d3d6f..cf08e9f83489 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
 inherit prefix toolchain-funcs wrapper
 
 WINE_GECKO=2.47.4
-WINE_MONO=8.1.0
+WINE_MONO=9.0.0
 
 if [[ ${PV} == * ]]; then
inherit git-r3

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

2024-01-26 Thread Ionen Wolkens

commit: a818b166819bc5569b37f072e9b378b02223e8c3
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Jan 27 00:28:22 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Jan 27 00:59:49 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a818b166

app-emulation/wine-vanilla: add 9.1

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

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

diff --git a/app-emulation/wine-vanilla/Manifest 
b/app-emulation/wine-vanilla/Manifest
index eecc05f9703e..cadd0bbc0322 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-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-9.1.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-9.1.ebuild
new file mode 100644
index ..c6109d4d3d6f
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.1.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=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}] )
+   )
+   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? ( virtual/krb5[${MULTILIB

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

2024-01-17 Thread Ionen Wolkens

commit: 5471bfb11e4bf7522dce968f7f77819cca0106c5
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Jan 17 18:22:18 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Jan 17 18:47:11 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5471bfb1

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

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

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

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

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

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

diff --git a/app-emulation/wine-vanilla/metadata.xml 
b/app-emulation/wine-vanilla/metadata.xml
index 0ebc0262285e..d8858da76906 100644
--- a/app-emulation/wine-vanilla/metadata.xml
+++ b/app-emulation/wine-vanilla/metadata.xml
@@ -33,7 +33,8 @@ 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)
+   compared to USE=abi_x86_32) -- still requires (just)
+   dev-util/mingw64-toolchain with abi_x86_32

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

2024-01-17 Thread Ionen Wolkens

commit: 6bca48af517e9164194d2934a809b56483a60299
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Jan 17 15:49:56 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Jan 17 16:04:43 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bca48af

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

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-8.21.ebuild  | 5 -
 app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild   | 3 +++
 app-emulation/wine-vanilla/wine-vanilla-.ebuild  | 3 +++
 5 files changed, 16 insertions(+), 1 deletion(-)

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 c0595c8ef846..c0597ce761f0 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
@@ -201,6 +201,9 @@ src_prepare() {
# always update for patches (including user's wrt #432348)
eautoreconf
tools/make_requests || die # perl
+   # tip: if need more for user patches, with portage can e.g. do
+   # echo "post_src_prepare() { tools/make_specfiles || die; }" \
+   # > /etc/portage/env/app-emulation/wine-vanilla
 }
 
 src_configure() {

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 73082cc5aa7b..7fb2fd5fd620 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild
@@ -198,6 +198,9 @@ src_prepare() {
# always update for patches (including user's wrt #432348)
eautoreconf
tools/make_requests || die # perl
+   # tip: if need more for user patches, with portage can e.g. do
+   # echo "post_src_prepare() { tools/make_specfiles || die; }" \
+   # > /etc/portage/env/app-emulation/wine-vanilla
 }
 
 src_configure() {

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

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

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

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

2024-01-16 Thread Ionen Wolkens

commit: c4cb8237940cac57f7e30dae7f0c215a3d910dcc
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Jan 16 21:36:55 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Jan 16 22:20:23 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4cb8237

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

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

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

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

diff --git a/app-emulation/wine-vanilla/metadata.xml 
b/app-emulation/wine-vanilla/metadata.xml
index 2759332a8b82..0ebc0262285e 100644
--- a/app-emulation/wine-vanilla/metadata.xml
+++ b/app-emulation/wine-vanilla/metadata.xml
@@ -31,8 +31,9 @@ This variant of the Wine packaging does not include external 
patchsets
Enable DirectX 12 support using 
app-emulation/vkd3d

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

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

2024-01-16 Thread Ionen Wolkens

commit: ce4a998d325ad3676fcfc88259f262fd7454dedf
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Jan 16 21:36:43 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Jan 16 22:20:23 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce4a998d

app-emulation/wine-vanilla: add 9.0

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

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

diff --git a/app-emulation/wine-vanilla/Manifest 
b/app-emulation/wine-vanilla/Manifest
index c8ac356e9166..eecc05f9703e 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -1,3 +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

diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild
new file mode 100644
index ..7109f7104bbe
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.0.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} )
+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}] )
+   )
+   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? ( virtual/krb5[${MULTILIB_USEDEP}] )
+   netapi? ( net-fs/samba[${MULTILIB_USEDEP}] )
+   odbc? (

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

2024-01-16 Thread Ionen Wolkens

commit: 50d05d1f507d5a1e057a7fbe37c319b787e2570d
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Jan 16 21:05:55 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Jan 16 22:03:29 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50d05d1f

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

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

 app-emulation/wine-vanilla/Manifest|   2 -
 .../wine-vanilla/wine-vanilla-8.19.ebuild  | 417 -
 .../wine-vanilla/wine-vanilla-8.20.ebuild  | 417 -
 3 files changed, 836 deletions(-)

diff --git a/app-emulation/wine-vanilla/Manifest 
b/app-emulation/wine-vanilla/Manifest
index 0e6c25b4ea6c..c8ac356e9166 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -1,5 +1,3 @@
 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.19.tar.xz 29858012 BLAKE2B 
21a7ab99df8acba6a4de0bbd58ccc2ea3186e99e8caac0d3cae130ba5cfed632fd47218d2029688df789f6930073ba1cfde8fbd7f764db44a55d49547e374f50
 SHA512 
ad4178c5e9f336eb968f0c378e3819794507447728acd10d642c1d66e0745837e47a70579bc9c7d9bec4510ca47e230bf4ab05ddf39323669ed24a6fce9f8c02
-DIST wine-8.20.tar.xz 29879412 BLAKE2B 
207c247bfba3cce7b378eb1a70188fe67aa669b09474ca1689447fa4f2edaa368ab6c81c16c1a6cc06b69216b44521f15d588563c715e5738c1e148874862c9f
 SHA512 
86dffc3c9e01506ff2ff75663f48bb3b18a6afaf6381fc3c43c476481cb5c0570129550d2047059f528855e454a629c63e8beb85d5c591d1fdb7a066fbca2623
 DIST wine-8.21.tar.xz 29919212 BLAKE2B 
2e1c135d1c247f4b268c0323538748944b01fe65c82dee27d81f70613aa2fe632c1b4d696f05838a6ab801579a4d13a191de0f4c1a2ed40ca767499a98c3
 SHA512 
4d04d40141d2ea5e548b76aed870ac28d8a03241ffd4e761979c795310baa19136e54a8e518c6ea9bf563c3b23d3c4eb1baefc9906d7eeca469e9942ff99dc40

diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.19.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-8.19.ebuild
deleted file mode 100644
index 42964a47518d..
--- a/app-emulation/wine-vanilla/wine-vanilla-8.19.ebuild
+++ /dev/null
@@ -1,417 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-inherit autotools flag-o-matic multilib multilib-build
-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-01-13 Thread Ionen Wolkens

commit: 9c1d344f958aa76fc55537ce46834f5aa7434c65
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Jan 13 12:06:13 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Jan 13 13:10:22 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c1d344f

app-emulation/wine-vanilla: adjust style

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

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

 .../wine-vanilla/wine-vanilla-7.0.2.ebuild | 27 ++
 .../wine-vanilla/wine-vanilla-8.0.2.ebuild | 24 ---
 .../wine-vanilla/wine-vanilla-.ebuild  | 23 +++---
 3 files changed, 49 insertions(+), 25 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 a4d883c1152c..c0595c8ef846 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -23,7 +23,8 @@ fi
 DESCRIPTION="Free implementation of Windows(tm) on Unix, without external 
patchsets"
 HOMEPAGE="
https://www.winehq.org/
-   https://gitlab.winehq.org/wine/wine/";
+   https://gitlab.winehq.org/wine/wine/
+"
 
 LICENSE="LGPL-2.1+ BSD-2 IJG MIT ZLIB gsm libpng2 libtiff"
 SLOT="${PV}"
@@ -33,10 +34,13 @@ IUSE="
+gstreamer kerberos ldap +mingw +mono netapi nls odbc openal
opencl +opengl osmesa pcap perl pulseaudio samba scanner +sdl
selinux +ssl +truetype udev udisks +unwind usb v4l +vkd3d +vulkan
-   +xcomposite xinerama"
+   +xcomposite xinerama
+"
+# bug #551124 for truetype
 REQUIRED_USE="
X? ( truetype )
-   crossdev-mingw? ( mingw )" # bug #551124 for truetype
+   crossdev-mingw? ( 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
@@ -68,7 +72,8 @@ WINE_DLOPEN_DEPEND="
truetype? ( media-libs/freetype[${MULTILIB_USEDEP}] )
udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-   vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )"
+   vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
+"
 WINE_COMMON_DEPEND="
${WINE_DLOPEN_DEPEND}
X? (
@@ -95,7 +100,8 @@ WINE_COMMON_DEPEND="
!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
)
usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
-   vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] )"
+   vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] )
+"
 RDEPEND="
${WINE_COMMON_DEPEND}
app-emulation/wine-desktop-common
@@ -114,11 +120,13 @@ RDEPEND="
)
samba? ( net-fs/samba[winbind] )
selinux? ( sec-policy/selinux-wine )
-   udisks? ( sys-fs/udisks:2 )"
+   udisks? ( sys-fs/udisks:2 )
+"
 DEPEND="
${WINE_COMMON_DEPEND}
sys-kernel/linux-headers
-   X? ( x11-base/xorg-proto )"
+   X? ( x11-base/xorg-proto )
+"
 BDEPEND="
dev-lang/perl
sys-devel/binutils
@@ -126,7 +134,8 @@ BDEPEND="
sys-devel/flex
virtual/pkgconfig
mingw? ( !crossdev-mingw? ( 
dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] ) )
-   nls? ( sys-devel/gettext )"
+   nls? ( sys-devel/gettext )
+"
 IDEPEND=">=app-eselect/eselect-wine-2"
 
 QA_CONFIG_IMPL_DECL_SKIP=(

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 d669f1bf277a..73082cc5aa7b 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -32,10 +32,13 @@ IUSE="
llvm-libunwind custom-cflags +fontconfig +gecko gphoto2 +gstreamer
kerberos +mingw +mono netapi nls odbc opencl +opengl osmesa pcap
perl pulseaudio samba scanner +sdl selinux +ssl +strip +truetype
-   udev udisks +unwind usb v4l +vulkan +xcomposite xinerama"
+   udev udisks +unwind usb v4l +vulkan +xcomposite xinerama
+"
+# bug #551124 for truetype
 REQUIRED_USE="
X? ( truetype )
-   crossdev-mingw? ( mingw )" # bug #551124 for truetype
+   crossdev-mingw? ( 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
@@ -67,7 +70,8 @@ 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-vanilla/

2024-01-08 Thread Ionen Wolkens

commit: bee0a2df6f34c74883e661cf11c00f9366de95b6
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Jan  8 12:43:37 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Jan  8 12:57:51 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bee0a2df

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

This reverts commit f2a99318b859e9365e51f1ba5c7553d6e05d590a.

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

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

 app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild | 4 ++--
 app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild | 4 ++--
 app-emulation/wine-vanilla/wine-vanilla-8.19.ebuild  | 4 ++--
 app-emulation/wine-vanilla/wine-vanilla-8.20.ebuild  | 4 ++--
 app-emulation/wine-vanilla/wine-vanilla-8.21.ebuild  | 4 ++--
 app-emulation/wine-vanilla/wine-vanilla-.ebuild  | 2 +-
 6 files changed, 11 insertions(+), 11 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 1850038a2202..a4d883c1152c 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -123,7 +123,7 @@ BDEPEND="
dev-lang/perl
sys-devel/binutils
sys-devel/bison
-   app-alternatives/lex
+   sys-devel/flex
virtual/pkgconfig
mingw? ( !crossdev-mingw? ( 
dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] ) )
nls? ( sys-devel/gettext )"

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 13582305fe18..d669f1bf277a 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -119,7 +119,7 @@ BDEPEND="
dev-lang/perl
sys-devel/binutils
sys-devel/bison
-   app-alternatives/lex
+   sys-devel/flex
virtual/pkgconfig
mingw? ( !crossdev-mingw? (
>=dev-util/mingw64-toolchain-10.0.0_p1-r2[${MULTILIB_USEDEP}]

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

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

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

diff --git a/app-emulation/wine-vanilla/wine-vanilla-.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-.ebuild
index a320176ecc6b..82e4101c491a 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-.ebuild
@@ -134,7 +134

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

2024-01-04 Thread Ionen Wolkens

commit: f15a78fc943550289ad20d3f6b250450167c83fe
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Jan  4 13:59:59 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Jan  4 14:07:55 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f15a78fc

app-emulation/wine-vanilla: update live

File adds a .md extension, and fwiw use a wildcard so that
it can work with bit older commits too.

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 47f6052f5882..82e4101c491a 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -388,7 +388,7 @@ src_install() {
fi
fi
 
-   dodoc ANNOUNCE AUTHORS README* documentation/README*
+   dodoc ANNOUNCE* AUTHORS README* documentation/README*
 }
 
 pkg_postinst() {

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

2023-12-08 Thread Ionen Wolkens

commit: 2f246098219709c1ddab02c6cac4bb273d8740b1
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Dec  8 07:36:58 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Dec  8 08:48:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f246098

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

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

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

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

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

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

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

2023-11-24 Thread Ionen Wolkens

commit: de60dadb5e8775cf57b9d11a711c89f5bef6dea3
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Nov 25 00:07:16 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Nov 25 00:46:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de60dadb

app-emulation/wine-vanilla: add 8.21

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

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

diff --git a/app-emulation/wine-vanilla/Manifest 
b/app-emulation/wine-vanilla/Manifest
index 41aff79158d5..0e6c25b4ea6c 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-8.19.tar.xz 29858012 BLAKE2B 
21a7ab99df8acba6a4de0bbd58ccc2ea3186e99e8caac0d3cae130ba5cfed632fd47218d2029688df789f6930073ba1cfde8fbd7f764db44a55d49547e374f50
 SHA512 
ad4178c5e9f336eb968f0c378e3819794507447728acd10d642c1d66e0745837e47a70579bc9c7d9bec4510ca47e230bf4ab05ddf39323669ed24a6fce9f8c02
 DIST wine-8.20.tar.xz 29879412 BLAKE2B 
207c247bfba3cce7b378eb1a70188fe67aa669b09474ca1689447fa4f2edaa368ab6c81c16c1a6cc06b69216b44521f15d588563c715e5738c1e148874862c9f
 SHA512 
86dffc3c9e01506ff2ff75663f48bb3b18a6afaf6381fc3c43c476481cb5c0570129550d2047059f528855e454a629c63e8beb85d5c591d1fdb7a066fbca2623
+DIST wine-8.21.tar.xz 29919212 BLAKE2B 
2e1c135d1c247f4b268c0323538748944b01fe65c82dee27d81f70613aa2fe632c1b4d696f05838a6ab801579a4d13a191de0f4c1a2ed40ca767499a98c3
 SHA512 
4d04d40141d2ea5e548b76aed870ac28d8a03241ffd4e761979c795310baa19136e54a8e518c6ea9bf563c3b23d3c4eb1baefc9906d7eeca469e9942ff99dc40

diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.21.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-8.21.ebuild
new file mode 100644
index ..fd8f2e5d9eba
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.21.ebuild
@@ -0,0 +1,420 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+inherit autotools flag-o-matic multilib multilib-build
+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}] )
+   )
+   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? ( virtual/krb5[${MULTIL

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

2023-11-24 Thread Ionen Wolkens

commit: 133c5db3c2fd3746b9ad32a8de16c93895445e7a
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Nov 25 00:06:59 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Nov 25 00:46:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=133c5db3

app-emulation/wine-vanilla: drop 8.17, 8.18

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

 app-emulation/wine-vanilla/Manifest|   2 -
 .../wine-vanilla/wine-vanilla-8.17.ebuild  | 417 -
 .../wine-vanilla/wine-vanilla-8.18.ebuild  | 417 -
 3 files changed, 836 deletions(-)

diff --git a/app-emulation/wine-vanilla/Manifest 
b/app-emulation/wine-vanilla/Manifest
index 696f3cc1e329..41aff79158d5 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -1,6 +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.17.tar.xz 29559704 BLAKE2B 
dea71eaecf0ce3abff2ff9fd3ac65a8df0d606b718c176548976ae4c34228b269b3637efd23ef3ea5035df6b4df34b1e74a1f0b236a3b2864a914d6fc688d44e
 SHA512 
3826e20494a919ef1972d91c9391a3ae916d52b55e62e8fb7fc2c9c3ae6a7b363b40d8388cb4b9b3e45bae134a2de46e8158f8eaec7948216d9cd8ef32ab627f
-DIST wine-8.18.tar.xz 29844232 BLAKE2B 
0d3062bba451bbf0b7dec4a48a5fc658c6d281db5c57c2b9ad416ac2e7dcb947336bdd42b5b2062fc614b691b6419b7795decd24a7b0474bec7aaff1027b3632
 SHA512 
0f8e6b5c6709930bc7f774d92cd025976f6442c3785a224b5988a37152f3a875150b228f12442e9b9c0d9e7884568aca26159df86d48f2550a630625fef3c8b9
 DIST wine-8.19.tar.xz 29858012 BLAKE2B 
21a7ab99df8acba6a4de0bbd58ccc2ea3186e99e8caac0d3cae130ba5cfed632fd47218d2029688df789f6930073ba1cfde8fbd7f764db44a55d49547e374f50
 SHA512 
ad4178c5e9f336eb968f0c378e3819794507447728acd10d642c1d66e0745837e47a70579bc9c7d9bec4510ca47e230bf4ab05ddf39323669ed24a6fce9f8c02
 DIST wine-8.20.tar.xz 29879412 BLAKE2B 
207c247bfba3cce7b378eb1a70188fe67aa669b09474ca1689447fa4f2edaa368ab6c81c16c1a6cc06b69216b44521f15d588563c715e5738c1e148874862c9f
 SHA512 
86dffc3c9e01506ff2ff75663f48bb3b18a6afaf6381fc3c43c476481cb5c0570129550d2047059f528855e454a629c63e8beb85d5c591d1fdb7a066fbca2623

diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.17.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-8.17.ebuild
deleted file mode 100644
index fb89e272b6ea..
--- a/app-emulation/wine-vanilla/wine-vanilla-8.17.ebuild
+++ /dev/null
@@ -1,417 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-inherit autotools flag-o-matic multilib multilib-build
-inherit prefix toolchain-funcs wrapper
-
-WINE_GECKO=2.47.4
-WINE_MONO=8.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_U

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

2023-11-14 Thread Ionen Wolkens

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

app-emulation/wine-vanilla: update live

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

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

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

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

2023-11-10 Thread Ionen Wolkens

commit: 0f2077ca1f499928d64eab1946e44f31b11cbb12
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Nov 11 01:01:28 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Nov 11 01:18:27 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f2077ca

app-emulation/wine-vanilla: add 8.20

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

 app-emulation/wine-vanilla/Manifest|   1 +
 .../wine-vanilla/wine-vanilla-8.20.ebuild  | 417 +
 2 files changed, 418 insertions(+)

diff --git a/app-emulation/wine-vanilla/Manifest 
b/app-emulation/wine-vanilla/Manifest
index 4522eaea7958..696f3cc1e329 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-8.17.tar.xz 29559704 BLAKE2B 
dea71eaecf0ce3abff2ff9fd3ac65a8df0d606b718c176548976ae4c34228b269b3637efd23ef3ea5035df6b4df34b1e74a1f0b236a3b2864a914d6fc688d44e
 SHA512 
3826e20494a919ef1972d91c9391a3ae916d52b55e62e8fb7fc2c9c3ae6a7b363b40d8388cb4b9b3e45bae134a2de46e8158f8eaec7948216d9cd8ef32ab627f
 DIST wine-8.18.tar.xz 29844232 BLAKE2B 
0d3062bba451bbf0b7dec4a48a5fc658c6d281db5c57c2b9ad416ac2e7dcb947336bdd42b5b2062fc614b691b6419b7795decd24a7b0474bec7aaff1027b3632
 SHA512 
0f8e6b5c6709930bc7f774d92cd025976f6442c3785a224b5988a37152f3a875150b228f12442e9b9c0d9e7884568aca26159df86d48f2550a630625fef3c8b9
 DIST wine-8.19.tar.xz 29858012 BLAKE2B 
21a7ab99df8acba6a4de0bbd58ccc2ea3186e99e8caac0d3cae130ba5cfed632fd47218d2029688df789f6930073ba1cfde8fbd7f764db44a55d49547e374f50
 SHA512 
ad4178c5e9f336eb968f0c378e3819794507447728acd10d642c1d66e0745837e47a70579bc9c7d9bec4510ca47e230bf4ab05ddf39323669ed24a6fce9f8c02
+DIST wine-8.20.tar.xz 29879412 BLAKE2B 
207c247bfba3cce7b378eb1a70188fe67aa669b09474ca1689447fa4f2edaa368ab6c81c16c1a6cc06b69216b44521f15d588563c715e5738c1e148874862c9f
 SHA512 
86dffc3c9e01506ff2ff75663f48bb3b18a6afaf6381fc3c43c476481cb5c0570129550d2047059f528855e454a629c63e8beb85d5c591d1fdb7a066fbca2623

diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.20.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-8.20.ebuild
new file mode 100644
index ..42964a47518d
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.20.ebuild
@@ -0,0 +1,417 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+inherit autotools flag-o-matic multilib multilib-build
+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}] )
+   )
+   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? ( virtual/krb5[${MULTILI

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

2023-10-29 Thread Ionen Wolkens

commit: 726deffbf3f9883342da71bd4f64c3a195226de1
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Oct 30 05:47:42 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Oct 30 05:47:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=726deffb

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

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

 app-emulation/wine-vanilla/Manifest|   2 -
 .../wine-vanilla/wine-vanilla-8.15.ebuild  | 417 -
 .../wine-vanilla/wine-vanilla-8.16.ebuild  | 417 -
 3 files changed, 836 deletions(-)

diff --git a/app-emulation/wine-vanilla/Manifest 
b/app-emulation/wine-vanilla/Manifest
index 39e98ec58852..758a3855c909 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -1,6 +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.15.tar.xz 29427600 BLAKE2B 
9a1bb0de4048e32f78e3630e9e33dc99a117d4fcb4e61285e3fb298de9f1742a7d9c52f0d02dd407ce5c62768d7fecf51947165fbc8e62cf076519caea13a2db
 SHA512 
d450dfe868ac7c7cb26ccc5e6d492c1311395c5f8b150610f5b1e78451d303b63b67c7e0ad48d6a66ae5265c5bc16da970544cf12195d8635cc3fc96c4a26cad
-DIST wine-8.16.tar.xz 29457688 BLAKE2B 
497cefed7990b2c6ae28022276d83e4fb7265cfa99a3c3b88eab56566f125d631cf9310d149a9d4fa05934fa1f26ac2138ec366b16c6d2585f199e3be8ce3beb
 SHA512 
0ba83beacd842e53173c07c30fa4ee57424af0d00b9f168b8bd310c40ea06e26dfc09f4a1991b788a8c4bd2b6eeb439e60b0deff6249424a00fa2940c95662b6
 DIST wine-8.17.tar.xz 29559704 BLAKE2B 
dea71eaecf0ce3abff2ff9fd3ac65a8df0d606b718c176548976ae4c34228b269b3637efd23ef3ea5035df6b4df34b1e74a1f0b236a3b2864a914d6fc688d44e
 SHA512 
3826e20494a919ef1972d91c9391a3ae916d52b55e62e8fb7fc2c9c3ae6a7b363b40d8388cb4b9b3e45bae134a2de46e8158f8eaec7948216d9cd8ef32ab627f
 DIST wine-8.18.tar.xz 29844232 BLAKE2B 
0d3062bba451bbf0b7dec4a48a5fc658c6d281db5c57c2b9ad416ac2e7dcb947336bdd42b5b2062fc614b691b6419b7795decd24a7b0474bec7aaff1027b3632
 SHA512 
0f8e6b5c6709930bc7f774d92cd025976f6442c3785a224b5988a37152f3a875150b228f12442e9b9c0d9e7884568aca26159df86d48f2550a630625fef3c8b9

diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.15.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-8.15.ebuild
deleted file mode 100644
index fb89e272b6ea..
--- a/app-emulation/wine-vanilla/wine-vanilla-8.15.ebuild
+++ /dev/null
@@ -1,417 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-inherit autotools flag-o-matic multilib multilib-build
-inherit prefix toolchain-funcs wrapper
-
-WINE_GECKO=2.47.4
-WINE_MONO=8.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_U

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

2023-10-29 Thread Ionen Wolkens

commit: 339394e5471949d831e8c70844819db1b0967e1a
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Oct 30 05:47:57 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Oct 30 05:47:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=339394e5

app-emulation/wine-vanilla: add 8.19

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

 app-emulation/wine-vanilla/Manifest|   1 +
 .../wine-vanilla/wine-vanilla-8.19.ebuild  | 417 +
 2 files changed, 418 insertions(+)

diff --git a/app-emulation/wine-vanilla/Manifest 
b/app-emulation/wine-vanilla/Manifest
index 758a3855c909..4522eaea7958 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-8.17.tar.xz 29559704 BLAKE2B 
dea71eaecf0ce3abff2ff9fd3ac65a8df0d606b718c176548976ae4c34228b269b3637efd23ef3ea5035df6b4df34b1e74a1f0b236a3b2864a914d6fc688d44e
 SHA512 
3826e20494a919ef1972d91c9391a3ae916d52b55e62e8fb7fc2c9c3ae6a7b363b40d8388cb4b9b3e45bae134a2de46e8158f8eaec7948216d9cd8ef32ab627f
 DIST wine-8.18.tar.xz 29844232 BLAKE2B 
0d3062bba451bbf0b7dec4a48a5fc658c6d281db5c57c2b9ad416ac2e7dcb947336bdd42b5b2062fc614b691b6419b7795decd24a7b0474bec7aaff1027b3632
 SHA512 
0f8e6b5c6709930bc7f774d92cd025976f6442c3785a224b5988a37152f3a875150b228f12442e9b9c0d9e7884568aca26159df86d48f2550a630625fef3c8b9
+DIST wine-8.19.tar.xz 29858012 BLAKE2B 
21a7ab99df8acba6a4de0bbd58ccc2ea3186e99e8caac0d3cae130ba5cfed632fd47218d2029688df789f6930073ba1cfde8fbd7f764db44a55d49547e374f50
 SHA512 
ad4178c5e9f336eb968f0c378e3819794507447728acd10d642c1d66e0745837e47a70579bc9c7d9bec4510ca47e230bf4ab05ddf39323669ed24a6fce9f8c02

diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.19.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-8.19.ebuild
new file mode 100644
index ..42964a47518d
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.19.ebuild
@@ -0,0 +1,417 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+inherit autotools flag-o-matic multilib multilib-build
+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}] )
+   )
+   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? ( virtual/krb5[${MULTIL

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

2023-10-24 Thread Ionen Wolkens

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

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

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 fb89e272b6ea..42964a47518d 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
 inherit prefix toolchain-funcs wrapper
 
 WINE_GECKO=2.47.4
-WINE_MONO=8.0.0
+WINE_MONO=8.1.0
 
 if [[ ${PV} == * ]]; then
inherit git-r3

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

2023-10-13 Thread Ionen Wolkens

commit: e621eb2bafd34a45d15f81e60ca16cd9acc067bb
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Oct 14 01:19:25 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Oct 14 03:30:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e621eb2b

app-emulation/wine-vanilla: add 8.18

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

 app-emulation/wine-vanilla/Manifest|   1 +
 .../wine-vanilla/wine-vanilla-8.18.ebuild  | 417 +
 2 files changed, 418 insertions(+)

diff --git a/app-emulation/wine-vanilla/Manifest 
b/app-emulation/wine-vanilla/Manifest
index 153104ef2dfc..39e98ec58852 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-8.15.tar.xz 29427600 BLAKE2B 
9a1bb0de4048e32f78e3630e9e33dc99a117d4fcb4e61285e3fb298de9f1742a7d9c52f0d02dd407ce5c62768d7fecf51947165fbc8e62cf076519caea13a2db
 SHA512 
d450dfe868ac7c7cb26ccc5e6d492c1311395c5f8b150610f5b1e78451d303b63b67c7e0ad48d6a66ae5265c5bc16da970544cf12195d8635cc3fc96c4a26cad
 DIST wine-8.16.tar.xz 29457688 BLAKE2B 
497cefed7990b2c6ae28022276d83e4fb7265cfa99a3c3b88eab56566f125d631cf9310d149a9d4fa05934fa1f26ac2138ec366b16c6d2585f199e3be8ce3beb
 SHA512 
0ba83beacd842e53173c07c30fa4ee57424af0d00b9f168b8bd310c40ea06e26dfc09f4a1991b788a8c4bd2b6eeb439e60b0deff6249424a00fa2940c95662b6
 DIST wine-8.17.tar.xz 29559704 BLAKE2B 
dea71eaecf0ce3abff2ff9fd3ac65a8df0d606b718c176548976ae4c34228b269b3637efd23ef3ea5035df6b4df34b1e74a1f0b236a3b2864a914d6fc688d44e
 SHA512 
3826e20494a919ef1972d91c9391a3ae916d52b55e62e8fb7fc2c9c3ae6a7b363b40d8388cb4b9b3e45bae134a2de46e8158f8eaec7948216d9cd8ef32ab627f
+DIST wine-8.18.tar.xz 29844232 BLAKE2B 
0d3062bba451bbf0b7dec4a48a5fc658c6d281db5c57c2b9ad416ac2e7dcb947336bdd42b5b2062fc614b691b6419b7795decd24a7b0474bec7aaff1027b3632
 SHA512 
0f8e6b5c6709930bc7f774d92cd025976f6442c3785a224b5988a37152f3a875150b228f12442e9b9c0d9e7884568aca26159df86d48f2550a630625fef3c8b9

diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.18.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-8.18.ebuild
new file mode 100644
index ..fb89e272b6ea
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.18.ebuild
@@ -0,0 +1,417 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+inherit autotools flag-o-matic multilib multilib-build
+inherit prefix toolchain-funcs wrapper
+
+WINE_GECKO=2.47.4
+WINE_MONO=8.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? ( virtual/krb5[${MULTILI

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

2023-10-10 Thread Ionen Wolkens

commit: 180a81a88bca1a74fd6a3713f9274db984e841af
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Oct 10 18:56:44 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Oct 10 20:18:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=180a81a8

app-emulation/wine-vanilla: drop 8.0.1, 8.13, 8.14

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

 app-emulation/wine-vanilla/Manifest|   3 -
 .../wine-vanilla/wine-vanilla-8.0.1.ebuild | 365 --
 .../wine-vanilla/wine-vanilla-8.13.ebuild  | 417 -
 .../wine-vanilla/wine-vanilla-8.14.ebuild  | 417 -
 4 files changed, 1202 deletions(-)

diff --git a/app-emulation/wine-vanilla/Manifest 
b/app-emulation/wine-vanilla/Manifest
index bba021a4b646..153104ef2dfc 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -1,8 +1,5 @@
 DIST wine-7.0.2.tar.xz 27179980 BLAKE2B 
721ab574092638b32d3a483b6ae3def0c9d706cc888662ca461ab8c7060b10077e83cede69663ea2a8b97729f3801209fbba5f8e8828ce20454700ffbbd76cb5
 SHA512 
330c71005a6a8054b5068ac4484e9015e9f8bf55d5a451aaf5f79b7f78a025732b454251c31473abf21504cce3b78e50cf7e3e0d0116bb755dc8396bd790289a
-DIST wine-8.0.1.tar.xz 29057128 BLAKE2B 
f1e04ddc7531704b4229d1bdb6e742ff20886dfff181b8b44e01e9921574e8c433553aaddb2453532902e89252244080d1cf9f904aa7d14d76709d830116e4b4
 SHA512 
9264a3dbe8b0168aa94b8266d5686b1da39352baefa4e72a63b0ed5aa2daca8811633dc89da3bb2aff497fb2b3b917f5cd021d0baae390490f1ca5ffd5ac4b3a
 DIST wine-8.0.2.tar.xz 29060452 BLAKE2B 
dcffaba6c90c4e02a7bc591a81e11aced06c006370c4c316c8a367b2f5814926063482959fabfe9d674ee1b5a560e59087e9b711e28360ced3aee2bbd6bb8fdb
 SHA512 
e86dd31247d757d48ffb2d24f20edab3fc6ef9c3e395567a7b363951bb681335ba3adb8b84639011b24b6eb274582d56880298d6d95fb100acc072383d4e973f
-DIST wine-8.13.tar.xz 29379824 BLAKE2B 
fa07edba8e45ef17813e63f793ca18cd05fd421b803d416421ec0fb7aeb4223ae44376a7e75a195e91c30259f27b48c3ed4ab0b613cbb9464b824f51e85ea240
 SHA512 
952c670635f91879cf6908343a04c0f41ae54e213123242e24fc282f9705fbe3b800dc1de454b6cfb1ebb89431b0e6eb3df3b094c1d9f4e69835d0f1b8f4fcb5
-DIST wine-8.14.tar.xz 29412976 BLAKE2B 
239f90dd9c40bbca719231d2a0240e75f803ead314ab7fb8cb90e375a52696700af87ac2cdeff9a2ecb1d1cce271142cf16ce200024c98fb8bd543779aa2423e
 SHA512 
cf293546c29379237e8c2b7526b16faa0df6a255aa1718097be4382604da4f84f7fad8486a931f39020fe63548625641cf68a822c975f56c30aaa2aa8a024176
 DIST wine-8.15.tar.xz 29427600 BLAKE2B 
9a1bb0de4048e32f78e3630e9e33dc99a117d4fcb4e61285e3fb298de9f1742a7d9c52f0d02dd407ce5c62768d7fecf51947165fbc8e62cf076519caea13a2db
 SHA512 
d450dfe868ac7c7cb26ccc5e6d492c1311395c5f8b150610f5b1e78451d303b63b67c7e0ad48d6a66ae5265c5bc16da970544cf12195d8635cc3fc96c4a26cad
 DIST wine-8.16.tar.xz 29457688 BLAKE2B 
497cefed7990b2c6ae28022276d83e4fb7265cfa99a3c3b88eab56566f125d631cf9310d149a9d4fa05934fa1f26ac2138ec366b16c6d2585f199e3be8ce3beb
 SHA512 
0ba83beacd842e53173c07c30fa4ee57424af0d00b9f168b8bd310c40ea06e26dfc09f4a1991b788a8c4bd2b6eeb439e60b0deff6249424a00fa2940c95662b6
 DIST wine-8.17.tar.xz 29559704 BLAKE2B 
dea71eaecf0ce3abff2ff9fd3ac65a8df0d606b718c176548976ae4c34228b269b3637efd23ef3ea5035df6b4df34b1e74a1f0b236a3b2864a914d6fc688d44e
 SHA512 
3826e20494a919ef1972d91c9391a3ae916d52b55e62e8fb7fc2c9c3ae6a7b363b40d8388cb4b9b3e45bae134a2de46e8158f8eaec7948216d9cd8ef32ab627f

diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.0.1.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-8.0.1.ebuild
deleted file mode 100644
index 34e3dca8b9ab..
--- a/app-emulation/wine-vanilla/wine-vanilla-8.0.1.ebuild
+++ /dev/null
@@ -1,365 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-inherit autotools flag-o-matic multilib multilib-build
-inherit prefix toolchain-funcs wrapper
-
-WINE_GECKO=2.47.3
-WINE_MONO=7.4.0
-
-if [[ ${PV} == * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.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 debug custom-cflags +fontconfig +gecko gphoto2
-   +gstreamer kerberos +mingw +mono netapi nls odbc opencl +opengl
-   osmesa pcap perl pulseaudio samba scanner +sdl selinux +ssl
-   +truetype udev udisks +unwind usb v4l +vulkan +xcomposite xinerama"
-REQUIRED_USE="
-   X

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

2023-10-06 Thread Arthur Zamarin

commit: 04f90ce89b20591d26d5c86df4f8e8949b88b5d2
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Oct  6 08:28:00 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Oct  6 08:28:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04f90ce8

app-emulation/wine-vanilla: Stabilize 8.0.2 amd64, #912027

Signed-off-by: Arthur Zamarin  gentoo.org>

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

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 2a0d7605ca0a..d669f1bf277a 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.0.2.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-vanilla/

2023-10-02 Thread Ionen Wolkens

commit: 49692ed0a72f01a052d949d360cab3b8fbbf2225
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Oct  2 13:08:22 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Oct  2 13:09:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49692ed0

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

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

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

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

diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.13.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-8.13.ebuild
index a3fad03a1c4d..fb89e272b6ea 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-8.13.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.13.ebuild
@@ -4,7 +4,6 @@
 EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
-# note: multilib+wrapper are not unused, currently a pkgcheck false positive
 inherit autotools flag-o-matic multilib multilib-build
 inherit prefix toolchain-funcs wrapper
 

diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.14.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-8.14.ebuild
index a3fad03a1c4d..fb89e272b6ea 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-8.14.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.14.ebuild
@@ -4,7 +4,6 @@
 EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
-# note: multilib+wrapper are not unused, currently a pkgcheck false positive
 inherit autotools flag-o-matic multilib multilib-build
 inherit prefix toolchain-funcs wrapper
 

diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.15.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-8.15.ebuild
index a3fad03a1c4d..fb89e272b6ea 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-8.15.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.15.ebuild
@@ -4,7 +4,6 @@
 EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
-# note: multilib+wrapper are not unused, currently a pkgcheck false positive
 inherit autotools flag-o-matic multilib multilib-build
 inherit prefix toolchain-funcs wrapper
 

diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.16.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-8.16.ebuild
index a3fad03a1c4d..fb89e272b6ea 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-8.16.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.16.ebuild
@@ -4,7 +4,6 @@
 EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
-# note: multilib+wrapper are not unused, currently a pkgcheck false positive
 inherit autotools flag-o-matic multilib multilib-build
 inherit prefix toolchain-funcs wrapper
 

diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.17.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-8.17.ebuild
index a3fad03a1c4d..fb89e272b6ea 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-8.17.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.17.ebuild
@@ -4,7 +4,6 @@
 EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
-# note: multilib+wrapper are not unused, currently a pkgcheck false positive
 inherit autotools flag-o-matic multilib multilib-build
 inherit prefix toolchain-funcs wrapper
 

diff --git a/app-emulation/wine-vanilla/wine-vanilla-.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-.ebuild
index a3fad03a1c4d..fb89e272b6ea 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-.ebuild
@@ -4,7 +4,6 @@
 EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
-# note: multilib+wrapper are not unused, currently a pkgcheck false positive
 inherit autotools flag-o-matic multilib multilib-build
 inherit prefix toolchain-funcs wrapper

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

2023-09-29 Thread Ionen Wolkens

commit: 35aab458ae9d0fbef60cd29e0d9e82f6f29f18eb
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Sep 29 22:50:39 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Sep 29 22:50:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35aab458

app-emulation/wine-vanilla: add 8.17

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

 app-emulation/wine-vanilla/Manifest|   1 +
 .../wine-vanilla/wine-vanilla-8.17.ebuild  | 418 +
 2 files changed, 419 insertions(+)

diff --git a/app-emulation/wine-vanilla/Manifest 
b/app-emulation/wine-vanilla/Manifest
index bb753deeac65..bba021a4b646 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -5,3 +5,4 @@ DIST wine-8.13.tar.xz 29379824 BLAKE2B 
fa07edba8e45ef17813e63f793ca18cd05fd421b8
 DIST wine-8.14.tar.xz 29412976 BLAKE2B 
239f90dd9c40bbca719231d2a0240e75f803ead314ab7fb8cb90e375a52696700af87ac2cdeff9a2ecb1d1cce271142cf16ce200024c98fb8bd543779aa2423e
 SHA512 
cf293546c29379237e8c2b7526b16faa0df6a255aa1718097be4382604da4f84f7fad8486a931f39020fe63548625641cf68a822c975f56c30aaa2aa8a024176
 DIST wine-8.15.tar.xz 29427600 BLAKE2B 
9a1bb0de4048e32f78e3630e9e33dc99a117d4fcb4e61285e3fb298de9f1742a7d9c52f0d02dd407ce5c62768d7fecf51947165fbc8e62cf076519caea13a2db
 SHA512 
d450dfe868ac7c7cb26ccc5e6d492c1311395c5f8b150610f5b1e78451d303b63b67c7e0ad48d6a66ae5265c5bc16da970544cf12195d8635cc3fc96c4a26cad
 DIST wine-8.16.tar.xz 29457688 BLAKE2B 
497cefed7990b2c6ae28022276d83e4fb7265cfa99a3c3b88eab56566f125d631cf9310d149a9d4fa05934fa1f26ac2138ec366b16c6d2585f199e3be8ce3beb
 SHA512 
0ba83beacd842e53173c07c30fa4ee57424af0d00b9f168b8bd310c40ea06e26dfc09f4a1991b788a8c4bd2b6eeb439e60b0deff6249424a00fa2940c95662b6
+DIST wine-8.17.tar.xz 29559704 BLAKE2B 
dea71eaecf0ce3abff2ff9fd3ac65a8df0d606b718c176548976ae4c34228b269b3637efd23ef3ea5035df6b4df34b1e74a1f0b236a3b2864a914d6fc688d44e
 SHA512 
3826e20494a919ef1972d91c9391a3ae916d52b55e62e8fb7fc2c9c3ae6a7b363b40d8388cb4b9b3e45bae134a2de46e8158f8eaec7948216d9cd8ef32ab627f

diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.17.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-8.17.ebuild
new file mode 100644
index ..a3fad03a1c4d
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.17.ebuild
@@ -0,0 +1,418 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+# note: multilib+wrapper are not unused, currently a pkgcheck false positive
+inherit autotools flag-o-matic multilib multilib-build
+inherit prefix toolchain-funcs wrapper
+
+WINE_GECKO=2.47.4
+WINE_MONO=8.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-li

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

2023-09-15 Thread Ionen Wolkens

commit: 3e82eae3ce3f71f62584612986eb6c7da3062eed
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Sep 15 23:59:15 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Sep 16 01:14:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e82eae3

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

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

 app-emulation/wine-vanilla/Manifest|   2 -
 .../wine-vanilla/wine-vanilla-8.11-r1.ebuild   | 372 -
 .../wine-vanilla/wine-vanilla-8.12.ebuild  | 372 -
 3 files changed, 746 deletions(-)

diff --git a/app-emulation/wine-vanilla/Manifest 
b/app-emulation/wine-vanilla/Manifest
index d9d6cf50f426..3a78f8e0ef0b 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.1.tar.xz 29057128 BLAKE2B 
f1e04ddc7531704b4229d1bdb6e742ff20886dfff181b8b44e01e9921574e8c433553aaddb2453532902e89252244080d1cf9f904aa7d14d76709d830116e4b4
 SHA512 
9264a3dbe8b0168aa94b8266d5686b1da39352baefa4e72a63b0ed5aa2daca8811633dc89da3bb2aff497fb2b3b917f5cd021d0baae390490f1ca5ffd5ac4b3a
 DIST wine-8.0.2.tar.xz 29060452 BLAKE2B 
dcffaba6c90c4e02a7bc591a81e11aced06c006370c4c316c8a367b2f5814926063482959fabfe9d674ee1b5a560e59087e9b711e28360ced3aee2bbd6bb8fdb
 SHA512 
e86dd31247d757d48ffb2d24f20edab3fc6ef9c3e395567a7b363951bb681335ba3adb8b84639011b24b6eb274582d56880298d6d95fb100acc072383d4e973f
-DIST wine-8.11.tar.xz 29236492 BLAKE2B 
db97b9abde6e1f4c854b449d27bdbafbc91bd75b835d84da401777c6ae2f4f623f2130f470d2e9a3aaf7e737f75d143a07191d38b409c06596373bece3df23c5
 SHA512 
f3e37f51f0a13aacbd41b017fc3d35e197614b03c00f5b9959c0fabc4e89975b5c3f411b38329e45ce6f9d2a2d82952b95e0907fbe2d6ae35cc4bec293825769
-DIST wine-8.12.tar.xz 29276732 BLAKE2B 
c1bf0d32eaf17f06b47dd7ffc495db4874f72ffec7cfca9edd9b2b9def8ab16db2583349950c3af447d85d476aa013914554f990d5f42d5bc8243b9effbaf869
 SHA512 
6b9eab7ca1ed5a13202b1250d8d95f6bd8ee5176f0c39b5358aedaf28f7f23543f4a73bf0782c3b4e50936813fc2a459582b5d294569c976ace784fbd9e0af1b
 DIST wine-8.13.tar.xz 29379824 BLAKE2B 
fa07edba8e45ef17813e63f793ca18cd05fd421b803d416421ec0fb7aeb4223ae44376a7e75a195e91c30259f27b48c3ed4ab0b613cbb9464b824f51e85ea240
 SHA512 
952c670635f91879cf6908343a04c0f41ae54e213123242e24fc282f9705fbe3b800dc1de454b6cfb1ebb89431b0e6eb3df3b094c1d9f4e69835d0f1b8f4fcb5
 DIST wine-8.14.tar.xz 29412976 BLAKE2B 
239f90dd9c40bbca719231d2a0240e75f803ead314ab7fb8cb90e375a52696700af87ac2cdeff9a2ecb1d1cce271142cf16ce200024c98fb8bd543779aa2423e
 SHA512 
cf293546c29379237e8c2b7526b16faa0df6a255aa1718097be4382604da4f84f7fad8486a931f39020fe63548625641cf68a822c975f56c30aaa2aa8a024176
 DIST wine-8.15.tar.xz 29427600 BLAKE2B 
9a1bb0de4048e32f78e3630e9e33dc99a117d4fcb4e61285e3fb298de9f1742a7d9c52f0d02dd407ce5c62768d7fecf51947165fbc8e62cf076519caea13a2db
 SHA512 
d450dfe868ac7c7cb26ccc5e6d492c1311395c5f8b150610f5b1e78451d303b63b67c7e0ad48d6a66ae5265c5bc16da970544cf12195d8635cc3fc96c4a26cad

diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.11-r1.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-8.11-r1.ebuild
deleted file mode 100644
index f503ac709925..
--- a/app-emulation/wine-vanilla/wine-vanilla-8.11-r1.ebuild
+++ /dev/null
@@ -1,372 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-inherit autotools flag-o-matic multilib multilib-build
-inherit prefix toolchain-funcs wrapper
-
-WINE_GECKO=2.47.4
-WINE_MONO=8.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 +xcomposite
-   xinerama"
-REQUIRED_USE="
-   X? ( truetype )
-   crossdev-mingw? ( mingw

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

2023-09-15 Thread Ionen Wolkens

commit: 4210c8974a8ee6fd9cb1acf34fa79aff45e454a2
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Sep 16 00:56:08 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Sep 16 01:14:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4210c897

app-emulation/wine-vanilla: add 8.16

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

 app-emulation/wine-vanilla/Manifest|   1 +
 .../wine-vanilla/wine-vanilla-8.16.ebuild  | 418 +
 2 files changed, 419 insertions(+)

diff --git a/app-emulation/wine-vanilla/Manifest 
b/app-emulation/wine-vanilla/Manifest
index 3a78f8e0ef0b..bb753deeac65 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -4,3 +4,4 @@ DIST wine-8.0.2.tar.xz 29060452 BLAKE2B 
dcffaba6c90c4e02a7bc591a81e11aced06c0063
 DIST wine-8.13.tar.xz 29379824 BLAKE2B 
fa07edba8e45ef17813e63f793ca18cd05fd421b803d416421ec0fb7aeb4223ae44376a7e75a195e91c30259f27b48c3ed4ab0b613cbb9464b824f51e85ea240
 SHA512 
952c670635f91879cf6908343a04c0f41ae54e213123242e24fc282f9705fbe3b800dc1de454b6cfb1ebb89431b0e6eb3df3b094c1d9f4e69835d0f1b8f4fcb5
 DIST wine-8.14.tar.xz 29412976 BLAKE2B 
239f90dd9c40bbca719231d2a0240e75f803ead314ab7fb8cb90e375a52696700af87ac2cdeff9a2ecb1d1cce271142cf16ce200024c98fb8bd543779aa2423e
 SHA512 
cf293546c29379237e8c2b7526b16faa0df6a255aa1718097be4382604da4f84f7fad8486a931f39020fe63548625641cf68a822c975f56c30aaa2aa8a024176
 DIST wine-8.15.tar.xz 29427600 BLAKE2B 
9a1bb0de4048e32f78e3630e9e33dc99a117d4fcb4e61285e3fb298de9f1742a7d9c52f0d02dd407ce5c62768d7fecf51947165fbc8e62cf076519caea13a2db
 SHA512 
d450dfe868ac7c7cb26ccc5e6d492c1311395c5f8b150610f5b1e78451d303b63b67c7e0ad48d6a66ae5265c5bc16da970544cf12195d8635cc3fc96c4a26cad
+DIST wine-8.16.tar.xz 29457688 BLAKE2B 
497cefed7990b2c6ae28022276d83e4fb7265cfa99a3c3b88eab56566f125d631cf9310d149a9d4fa05934fa1f26ac2138ec366b16c6d2585f199e3be8ce3beb
 SHA512 
0ba83beacd842e53173c07c30fa4ee57424af0d00b9f168b8bd310c40ea06e26dfc09f4a1991b788a8c4bd2b6eeb439e60b0deff6249424a00fa2940c95662b6

diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.16.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-8.16.ebuild
new file mode 100644
index ..a3fad03a1c4d
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.16.ebuild
@@ -0,0 +1,418 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+# note: multilib+wrapper are not unused, currently a pkgcheck false positive
+inherit autotools flag-o-matic multilib multilib-build
+inherit prefix toolchain-funcs wrapper
+
+WINE_GECKO=2.47.4
+WINE_MONO=8.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-li

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

2023-09-01 Thread Ionen Wolkens

commit: 41b3f8e34c243bae44c346ce73cf0a879bbb3f5c
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Sep  1 21:13:22 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Sep  1 21:13:27 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41b3f8e3

app-emulation/wine-vanilla: add 8.15

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

 app-emulation/wine-vanilla/Manifest|   1 +
 .../wine-vanilla/wine-vanilla-8.15.ebuild  | 418 +
 2 files changed, 419 insertions(+)

diff --git a/app-emulation/wine-vanilla/Manifest 
b/app-emulation/wine-vanilla/Manifest
index 79a45b49747f..d9d6cf50f426 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -5,3 +5,4 @@ DIST wine-8.11.tar.xz 29236492 BLAKE2B 
db97b9abde6e1f4c854b449d27bdbafbc91bd75b8
 DIST wine-8.12.tar.xz 29276732 BLAKE2B 
c1bf0d32eaf17f06b47dd7ffc495db4874f72ffec7cfca9edd9b2b9def8ab16db2583349950c3af447d85d476aa013914554f990d5f42d5bc8243b9effbaf869
 SHA512 
6b9eab7ca1ed5a13202b1250d8d95f6bd8ee5176f0c39b5358aedaf28f7f23543f4a73bf0782c3b4e50936813fc2a459582b5d294569c976ace784fbd9e0af1b
 DIST wine-8.13.tar.xz 29379824 BLAKE2B 
fa07edba8e45ef17813e63f793ca18cd05fd421b803d416421ec0fb7aeb4223ae44376a7e75a195e91c30259f27b48c3ed4ab0b613cbb9464b824f51e85ea240
 SHA512 
952c670635f91879cf6908343a04c0f41ae54e213123242e24fc282f9705fbe3b800dc1de454b6cfb1ebb89431b0e6eb3df3b094c1d9f4e69835d0f1b8f4fcb5
 DIST wine-8.14.tar.xz 29412976 BLAKE2B 
239f90dd9c40bbca719231d2a0240e75f803ead314ab7fb8cb90e375a52696700af87ac2cdeff9a2ecb1d1cce271142cf16ce200024c98fb8bd543779aa2423e
 SHA512 
cf293546c29379237e8c2b7526b16faa0df6a255aa1718097be4382604da4f84f7fad8486a931f39020fe63548625641cf68a822c975f56c30aaa2aa8a024176
+DIST wine-8.15.tar.xz 29427600 BLAKE2B 
9a1bb0de4048e32f78e3630e9e33dc99a117d4fcb4e61285e3fb298de9f1742a7d9c52f0d02dd407ce5c62768d7fecf51947165fbc8e62cf076519caea13a2db
 SHA512 
d450dfe868ac7c7cb26ccc5e6d492c1311395c5f8b150610f5b1e78451d303b63b67c7e0ad48d6a66ae5265c5bc16da970544cf12195d8635cc3fc96c4a26cad

diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.15.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-8.15.ebuild
new file mode 100644
index ..a3fad03a1c4d
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.15.ebuild
@@ -0,0 +1,418 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+# note: multilib+wrapper are not unused, currently a pkgcheck false positive
+inherit autotools flag-o-matic multilib multilib-build
+inherit prefix toolchain-funcs wrapper
+
+WINE_GECKO=2.47.4
+WINE_MONO=8.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-li

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

2023-08-28 Thread Ionen Wolkens

commit: 4a9e7bad40eaf1a83fa14d1918971ebd841da786
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Aug 28 11:56:46 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Aug 28 12:13:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a9e7bad

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

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

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

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

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

 app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild   | 8 
 app-emulation/wine-vanilla/wine-vanilla-8.0.1.ebuild   | 8 
 app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild   | 8 
 app-emulation/wine-vanilla/wine-vanilla-8.11-r1.ebuild | 8 
 app-emulation/wine-vanilla/wine-vanilla-8.12.ebuild| 8 
 app-emulation/wine-vanilla/wine-vanilla-8.13.ebuild| 6 ++
 app-emulation/wine-vanilla/wine-vanilla-8.14.ebuild| 6 ++
 app-emulation/wine-vanilla/wine-vanilla-.ebuild| 6 ++
 8 files changed, 58 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 d8a883dc6e14..a4d883c1152c 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
@@ -346,6 +346,14 @@ src_install() {
 }
 
 pkg_postinst() {
+   if use abi_x86_32 && { use opengl || use vulkan; } &&
+   has_version 'x11-drivers/nvidia-drivers[-abi_x86_32]'
+   then
+   ewarn "x11-drivers/nvidia-drivers is installed but is built 
without"
+   ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 
32bit"
+   ewarn "applications under ${PN} will likely not be usable."
+   fi
+
eselect wine update --if-unset || die
 }
 

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

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

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

diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.12.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-8.12.ebuild
index 51ab700e53b0..f503ac709925 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-8.12.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.12.ebuild
@@ -356,6 +356,14 @@ src_install() {
 }
 
 pkg_postinst() {
+   if use abi_x86_32 && { use opengl || use vulkan; } &&
+   has_version 'x11-drive

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

2023-08-18 Thread Ionen Wolkens

commit: 980580d1433dac8c7fce5792976786ba002c4ed1
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Aug 18 22:06:19 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Aug 18 22:06:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=980580d1

app-emulation/wine-vanilla: add 8.14

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

 app-emulation/wine-vanilla/Manifest|   1 +
 .../wine-vanilla/wine-vanilla-8.14.ebuild  | 412 +
 2 files changed, 413 insertions(+)

diff --git a/app-emulation/wine-vanilla/Manifest 
b/app-emulation/wine-vanilla/Manifest
index 90957b08ea7b..79a45b49747f 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -4,3 +4,4 @@ DIST wine-8.0.2.tar.xz 29060452 BLAKE2B 
dcffaba6c90c4e02a7bc591a81e11aced06c0063
 DIST wine-8.11.tar.xz 29236492 BLAKE2B 
db97b9abde6e1f4c854b449d27bdbafbc91bd75b835d84da401777c6ae2f4f623f2130f470d2e9a3aaf7e737f75d143a07191d38b409c06596373bece3df23c5
 SHA512 
f3e37f51f0a13aacbd41b017fc3d35e197614b03c00f5b9959c0fabc4e89975b5c3f411b38329e45ce6f9d2a2d82952b95e0907fbe2d6ae35cc4bec293825769
 DIST wine-8.12.tar.xz 29276732 BLAKE2B 
c1bf0d32eaf17f06b47dd7ffc495db4874f72ffec7cfca9edd9b2b9def8ab16db2583349950c3af447d85d476aa013914554f990d5f42d5bc8243b9effbaf869
 SHA512 
6b9eab7ca1ed5a13202b1250d8d95f6bd8ee5176f0c39b5358aedaf28f7f23543f4a73bf0782c3b4e50936813fc2a459582b5d294569c976ace784fbd9e0af1b
 DIST wine-8.13.tar.xz 29379824 BLAKE2B 
fa07edba8e45ef17813e63f793ca18cd05fd421b803d416421ec0fb7aeb4223ae44376a7e75a195e91c30259f27b48c3ed4ab0b613cbb9464b824f51e85ea240
 SHA512 
952c670635f91879cf6908343a04c0f41ae54e213123242e24fc282f9705fbe3b800dc1de454b6cfb1ebb89431b0e6eb3df3b094c1d9f4e69835d0f1b8f4fcb5
+DIST wine-8.14.tar.xz 29412976 BLAKE2B 
239f90dd9c40bbca719231d2a0240e75f803ead314ab7fb8cb90e375a52696700af87ac2cdeff9a2ecb1d1cce271142cf16ce200024c98fb8bd543779aa2423e
 SHA512 
cf293546c29379237e8c2b7526b16faa0df6a255aa1718097be4382604da4f84f7fad8486a931f39020fe63548625641cf68a822c975f56c30aaa2aa8a024176

diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.14.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-8.14.ebuild
new file mode 100644
index ..1aaebe5aa269
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.14.ebuild
@@ -0,0 +1,412 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+# note: multilib+wrapper are not unused, currently a pkgcheck false positive
+inherit autotools flag-o-matic multilib multilib-build
+inherit prefix toolchain-funcs wrapper
+
+WINE_GECKO=2.47.4
+WINE_MONO=8.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-li

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

2023-08-14 Thread Ionen Wolkens

commit: ccf773f720d02c436a47ec81f8669c439971a5c9
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Aug 14 12:17:27 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Aug 14 16:39:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccf773f7

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

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

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

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

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

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

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

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

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

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

2023-08-14 Thread Ionen Wolkens

commit: 3fcaa1a69c6b133af087eee7d40a77484d035f31
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Aug 14 13:50:12 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Aug 14 16:39:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fcaa1a6

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

Quotes given that is only if EXTRA_ECONF is used.

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

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

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

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

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

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

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

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

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

 app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild   |  8 
 app-emulation/wine-vanilla/wine-vanilla-8.0.1.ebuild   |  8 
 app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild   |  8 
 app-emulation/wine-vanilla/wine-vanilla-8.11-r1.ebuild |  8 
 app-emulation/wine-vanilla/wine-vanilla-8.12.ebuild|  8 
 app-emulation/wine-vanilla/wine-vanilla-8.13.ebuild| 12 
 app-emulation/wine-vanilla/wine-vanilla-.ebuild| 12 
 7 files changed, 36 insertions(+), 28 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 3ce352533b56..d8a883dc6e14 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
@@ -174,12 +174,12 @@ src_prepare() {
if tc-is-clang; then
if use mingw; then
# -mabi=ms was ignored by

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

2023-08-14 Thread Ionen Wolkens

commit: d01071c8fd157a5d26cec16cd618a906e158cbad
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Aug 14 10:17:51 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Aug 14 10:25:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d01071c8

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

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

So revert plus tidy and add this bugref.

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

 app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild   | 4 +++-
 app-emulation/wine-vanilla/wine-vanilla-8.0.1.ebuild   | 7 +--
 app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild   | 7 +--
 app-emulation/wine-vanilla/wine-vanilla-8.11-r1.ebuild | 4 +++-
 app-emulation/wine-vanilla/wine-vanilla-8.12.ebuild| 4 +++-
 app-emulation/wine-vanilla/wine-vanilla-8.13.ebuild| 2 +-
 app-emulation/wine-vanilla/wine-vanilla-.ebuild| 2 +-
 7 files changed, 21 insertions(+), 9 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 ddff00b2ea43..3ce352533b56 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
@@ -283,11 +283,13 @@ src_configure() {
: "${CROSSCFLAGS:=$(
filter-flags '-fstack-protector*' #870136
filter-flags '-mfunction-return=thunk*' #878849
+
# -mavx with mingw-gcc has a history of obscure 
issues and
# disabling is seen as safer, e.g. 
`WINEARCH=win32 winecfg`
# crashes with -march=skylake >=wine-8.10, 
similar issues with
# znver4: 
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273
-   use custom-cflags || append-cflags -mno-avx
+   append-cflags -mno-avx #912268
+
CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
: "${CROSSLDFLAGS:=$(
filter-flags '-fuse-ld=*'

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

diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild
index fb1ab81d78d7..b95ead30f8be 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild
@@ -282,14 +282,17 @@ src_configure() {
# use *FLAGS for mingw, but strip unsupported
: "${CROSSCFLAGS:=$(
# >=wine-7.21 configure.ac no longer adds 
-fno-strict by mistake
-   append-cflags '-fno-strict-aliasing'
+   append-cflags -fno-strict-aliasing
+
filter-flags '-fstack-protector*' #870136
filter-flags '-mfunction-return=thunk*' #878849
+
# -mavx with mingw-gcc has a history of obscure 
issues and
# disabling is seen as safer, e.g. 
`WINEARCH=win32 winecfg`

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

2023-08-13 Thread Ionen Wolkens

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

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

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.1.ebuild   | 2 +-
 app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild   | 2 +-
 app-emulation/wine-vanilla/wine-vanilla-8.11-r1.ebuild | 2 +-
 app-emulation/wine-vanilla/wine-vanilla-8.12.ebuild| 2 +-
 app-emulation/wine-vanilla/wine-vanilla-8.13.ebuild| 3 ++-
 app-emulation/wine-vanilla/wine-vanilla-.ebuild| 3 ++-
 7 files changed, 9 insertions(+), 7 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 eee523c84dde..ddff00b2ea43 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
@@ -178,7 +178,7 @@ src_prepare() {
# drop as a quick fix for now which hopefully should be 
safe
sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die
else
-   # ./configure will abort looking for -mabi=ms, so do it 
early
+   # known broken due to bug #912237, require mingw for now
die "building ${PN} with clang requires USE=mingw to be 
enabled"
fi
fi

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

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

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

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

diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.13.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-8.13.ebuild
index 8eec4853243e.

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

2023-08-11 Thread Ionen Wolkens

commit: d97b72fa0524fe8ba4a50880e7b341ead60f496a
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Aug 11 10:45:55 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Aug 11 10:48:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d97b72fa

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

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

Keep a comment so not removed on a whim.

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

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

diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.13.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-8.13.ebuild
index 1f7ab3b864a8..8eec4853243e 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-8.13.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.13.ebuild
@@ -4,6 +4,7 @@
 EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
+# note: multilib+wrapper are not unused, currently a pkgcheck false positive
 inherit autotools flag-o-matic multilib multilib-build
 inherit prefix toolchain-funcs wrapper
 

diff --git a/app-emulation/wine-vanilla/wine-vanilla-.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-.ebuild
index 1f7ab3b864a8..8eec4853243e 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-.ebuild
@@ -4,6 +4,7 @@
 EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
+# note: multilib+wrapper are not unused, currently a pkgcheck false positive
 inherit autotools flag-o-matic multilib multilib-build
 inherit prefix toolchain-funcs wrapper

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

2023-08-11 Thread Ionen Wolkens

commit: 3d53cd8f1e240085d7e6831caf5be0c076d28cd5
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Aug 11 09:36:21 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Aug 11 10:33:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d53cd8f

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

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

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

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

Leaving alone for older versions as a precaution.

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

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

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

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

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

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

2023-08-11 Thread Ionen Wolkens

commit: 9ce91430dd2d8e4f57c8b6366d0aa810c0d90cb8
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Aug 11 06:23:49 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Aug 11 10:00:06 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ce91430

app-emulation/wine-vanilla: fix build with clang:17

Was silently ignored with  gentoo.org>

 app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild   | 12 
 app-emulation/wine-vanilla/wine-vanilla-8.0.1.ebuild   | 12 
 app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild   | 12 
 app-emulation/wine-vanilla/wine-vanilla-8.11-r1.ebuild | 12 
 app-emulation/wine-vanilla/wine-vanilla-8.12.ebuild| 12 
 app-emulation/wine-vanilla/wine-vanilla-8.13.ebuild| 12 
 app-emulation/wine-vanilla/wine-vanilla-.ebuild| 12 
 7 files changed, 84 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 31bb2a4e7fdf..eee523c84dde 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
@@ -171,6 +171,18 @@ src_prepare() {
 
default
 
+   if tc-is-clang; then
+   if use mingw; then
+   # -mabi=ms was ignored by

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

2023-08-10 Thread Sam James

commit: 0cfa8a5189ea48cf7906f1a24189bf3bddbb625c
Author: Sam James  gentoo  org>
AuthorDate: Fri Aug 11 03:25:50 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Aug 11 03:25:50 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cfa8a51

app-emulation/wine-vanilla: Stabilize 8.0.2 x86, #912027

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

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

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 155c0a95a312..b8679687d7f1 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.0.2.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-vanilla/

2023-08-10 Thread Ionen Wolkens

commit: 7b87530c103ed4bb4240c32a8bb988e0c229b264
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Aug 10 22:07:52 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Aug 10 22:14:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b87530c

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

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

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

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

diff --git a/app-emulation/wine-vanilla/metadata.xml 
b/app-emulation/wine-vanilla/metadata.xml
index 08f1c1fa3035..f035ae003809 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 DirectX 12 support using 
app-emulation/vkd3d

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



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

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

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

2023-08-10 Thread Ionen Wolkens

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

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

Signed-off-by: Violet Purcell  inventati.org>
Signed-off-by: Ionen Wolkens  gentoo.org>

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

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

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

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

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

2023-08-10 Thread Ionen Wolkens

commit: 554556537f7bb5ded6558156a87cbd72b8b3e1ec
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Aug 10 19:16:10 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Aug 10 19:27:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55455653

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

Oops, overlooked while changing this around.

Now with more syntax highlighting confusion for vim.

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

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

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

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

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

2023-08-10 Thread Ionen Wolkens

commit: c67e0c228454dc3fbe645328bc2d27d2d83e6ede
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Aug 10 12:41:23 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Aug 10 12:42:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c67e0c22

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

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

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

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

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

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

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

2023-08-10 Thread Ionen Wolkens

commit: 665f0c67478eb89940e1e7745a66fd3eb72dfe9c
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Aug 10 05:59:44 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Aug 10 10:14:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=665f0c67

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

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

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

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

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

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

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

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

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

diff --git a/app-emulation/wine-vanilla/metadata.xml 
b/app-emulation/wine-vanilla/metadata.xml
index c9f0e02fc1eb..08f1c1fa3035 100644
--- a/app-emulation/wine-vanilla/metadata.xml
+++ b/app-emulation/wine-vanilla/metadata.xml
@@ -30,6 +30,11 @@ This variant of the Wine packaging does not include external 
patchsets
Pull in net-fs/samba with winbind 
for NTLM auth support
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,
+   USE=abi_x86_32 is recommended for complete support)
+   



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

diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.13.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-8.13.ebuild
index 11ed198a2f98..9ee3560f4437 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-8.13.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.13.ebuild
@@ -31,11 +31,13 @@ IUSE="
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 +xcomposite
-   xinerama"
+   +truetype udev udisks +unwind usb v4l +vulkan wayland wow64
+   +xcomposite xinerama"
+# bug #551124 for truetype
 REQUIRED_USE="
X? ( truetype )
-   crossdev-mingw? ( mingw )" # bug #551124 for truetype
+   crossdev-mingw? ( mingw )
+   wow64? ( abi_x86_64 !abi_x86_32 mingw )"
 
 # tests are non-trivial to run, can hang easily, don't play well with
 # sandbox, and several need real opengl/vulkan or network access
@@ -103,7 +105,10 @@ RDEPEND="
games-emulation/dosbox-staging
)
)
-   gecko? ( app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}] )
+   gecko? (
+   app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}]
+   wow64? ( app-emulation/wine-gecko[abi_x86_32] )
+   )
gstreamer? ( media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] )
mono? ( app-emulation/wine-mono:${WINE_MONO} )
perl? (
@@ -125,6 +130,7 @@ BDEPEND="
virtual/pkgconfig
mingw? ( !crossdev-mingw? (
>=dev-util/mingw64-toolchain-10.0.0_p1-r2[${MULTILIB_USEDEP}]
+   wow64? ( dev-util/mingw64-toolchain[abi_x86_32] )
) )
nls? ( sys-devel/gettext )
wayland? ( dev-util/wayland-scanner )"
@@ -146,7 +152,8 @@ pkg_pretend() {
 
if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then
local mingw=-w64-mingw32
-   for mingw in $(usev abi_x86_64 x86_64${mingw}) $(usev 
abi_x86_32 i686${mingw})

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

2023-08-10 Thread Ionen Wolkens

commit: c9906f02e80c2a2c1063554181bfded2e2305a9b
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Aug 10 10:08:24 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Aug 10 10:35:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9906f02

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

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

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

 app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild   | 6 +-
 app-emulation/wine-vanilla/wine-vanilla-8.0.1.ebuild   | 6 +-
 app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild   | 6 +-
 app-emulation/wine-vanilla/wine-vanilla-8.11-r1.ebuild | 6 +-
 app-emulation/wine-vanilla/wine-vanilla-8.12.ebuild| 6 +-
 app-emulation/wine-vanilla/wine-vanilla-8.13.ebuild| 6 +-
 app-emulation/wine-vanilla/wine-vanilla-.ebuild| 6 +-
 7 files changed, 35 insertions(+), 7 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 4d829d97e488..31bb2a4e7fdf 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
@@ -4,7 +4,8 @@
 EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
-inherit autotools flag-o-matic multilib multilib-build toolchain-funcs wrapper
+inherit autotools flag-o-matic multilib multilib-build
+inherit prefix toolchain-funcs wrapper
 
 WINE_GECKO=2.47.2
 WINE_MONO=7.0.0
@@ -173,6 +174,9 @@ src_prepare() {
# ensure .desktop calls this variant + slot
sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || die
 
+   # datadir is not where wine-mono is installed, so prefixy alternate 
paths
+   hprefixify -w /get_mono_path/ dlls/mscoree/metahost.c
+
# always update for patches (including user's wrt #432348)
eautoreconf
tools/make_requests || die # perl

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

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

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

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

2023-08-10 Thread Ionen Wolkens

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

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

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

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

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

 app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild   | 2 +-
 app-emulation/wine-vanilla/wine-vanilla-8.0.1.ebuild   | 2 +-
 app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild   | 2 +-
 app-emulation/wine-vanilla/wine-vanilla-8.11-r1.ebuild | 2 +-
 app-emulation/wine-vanilla/wine-vanilla-8.12.ebuild| 2 +-
 app-emulation/wine-vanilla/wine-vanilla-8.13.ebuild| 2 +-
 app-emulation/wine-vanilla/wine-vanilla-.ebuild| 2 +-
 7 files changed, 7 insertions(+), 7 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 fe54aab83894..4d829d97e488 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
@@ -271,7 +271,7 @@ src_configure() {
# disabling is seen as safer, e.g. 
`WINEARCH=win32 winecfg`
# crashes with -march=skylake >=wine-8.10, 
similar issues with
# znver4: 
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273
-   append-cflags -mno-avx
+   use custom-cflags || append-cflags -mno-avx
CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
: "${CROSSLDFLAGS:=$(
filter-flags '-fuse-ld=*'

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

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

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

diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.12.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-8.12.ebuild
index 11ed198a2f98..fa39aa0fc4f2 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-8.12

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

2023-08-10 Thread Ionen Wolkens

commit: 1b2bfec883591a7aebba98662a6a7331a2a10245
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Aug 10 08:58:26 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Aug 10 10:35:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b2bfec8

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

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

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

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

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

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

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

2023-08-05 Thread Ionen Wolkens

commit: d37390e68250403a2fc6b7dce4b158c6f6e7dde1
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sun Aug  6 01:05:55 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sun Aug  6 04:27:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d37390e6

app-emulation/wine-vanilla: drop 8.9, 8.10-r1

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

 app-emulation/wine-vanilla/Manifest|   2 -
 .../wine-vanilla/wine-vanilla-8.10-r1.ebuild   | 346 -
 app-emulation/wine-vanilla/wine-vanilla-8.9.ebuild | 344 
 3 files changed, 692 deletions(-)

diff --git a/app-emulation/wine-vanilla/Manifest 
b/app-emulation/wine-vanilla/Manifest
index 7ead6da5a82d..90957b08ea7b 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.1.tar.xz 29057128 BLAKE2B 
f1e04ddc7531704b4229d1bdb6e742ff20886dfff181b8b44e01e9921574e8c433553aaddb2453532902e89252244080d1cf9f904aa7d14d76709d830116e4b4
 SHA512 
9264a3dbe8b0168aa94b8266d5686b1da39352baefa4e72a63b0ed5aa2daca8811633dc89da3bb2aff497fb2b3b917f5cd021d0baae390490f1ca5ffd5ac4b3a
 DIST wine-8.0.2.tar.xz 29060452 BLAKE2B 
dcffaba6c90c4e02a7bc591a81e11aced06c006370c4c316c8a367b2f5814926063482959fabfe9d674ee1b5a560e59087e9b711e28360ced3aee2bbd6bb8fdb
 SHA512 
e86dd31247d757d48ffb2d24f20edab3fc6ef9c3e395567a7b363951bb681335ba3adb8b84639011b24b6eb274582d56880298d6d95fb100acc072383d4e973f
-DIST wine-8.10.tar.xz 29225368 BLAKE2B 
78058ccb707ddd63052ab3114e27435f94957b7badbe3001f8123fd536f5b937006b26e2133390ea5d995e9cb8c54940c907dacf910160c085e2bf3f29772caf
 SHA512 
5f141fb63a598482f512ebefef83500c2fa17a5dea87cb25e600e5167820a5990e12aeaec4a18c1467d64f7c122bf54705aa6fa6a2e6b2b4a463fe182f9b0e6e
 DIST wine-8.11.tar.xz 29236492 BLAKE2B 
db97b9abde6e1f4c854b449d27bdbafbc91bd75b835d84da401777c6ae2f4f623f2130f470d2e9a3aaf7e737f75d143a07191d38b409c06596373bece3df23c5
 SHA512 
f3e37f51f0a13aacbd41b017fc3d35e197614b03c00f5b9959c0fabc4e89975b5c3f411b38329e45ce6f9d2a2d82952b95e0907fbe2d6ae35cc4bec293825769
 DIST wine-8.12.tar.xz 29276732 BLAKE2B 
c1bf0d32eaf17f06b47dd7ffc495db4874f72ffec7cfca9edd9b2b9def8ab16db2583349950c3af447d85d476aa013914554f990d5f42d5bc8243b9effbaf869
 SHA512 
6b9eab7ca1ed5a13202b1250d8d95f6bd8ee5176f0c39b5358aedaf28f7f23543f4a73bf0782c3b4e50936813fc2a459582b5d294569c976ace784fbd9e0af1b
 DIST wine-8.13.tar.xz 29379824 BLAKE2B 
fa07edba8e45ef17813e63f793ca18cd05fd421b803d416421ec0fb7aeb4223ae44376a7e75a195e91c30259f27b48c3ed4ab0b613cbb9464b824f51e85ea240
 SHA512 
952c670635f91879cf6908343a04c0f41ae54e213123242e24fc282f9705fbe3b800dc1de454b6cfb1ebb89431b0e6eb3df3b094c1d9f4e69835d0f1b8f4fcb5
-DIST wine-8.9.tar.xz 29198080 BLAKE2B 
dfad284f554c164ac8f95d7c36d8b999217c6375f7720ed05e512e3f16cbc5a08325dad4e56dd59a17b27e53ab3a8331d54dd17b24e459b34d9e408ba93a52f3
 SHA512 
4de85654d2d5c9d48fa2a748eb9bee4477f0ba7fbd2c5dd40ea69662d8f6dfbb6432d1ec9109233d24608dc9554bad525c1e1ecdc86a5d00d133772810b12261

diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.10-r1.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-8.10-r1.ebuild
deleted file mode 100644
index 11ed198a2f98..
--- a/app-emulation/wine-vanilla/wine-vanilla-8.10-r1.ebuild
+++ /dev/null
@@ -1,346 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-inherit autotools flag-o-matic multilib multilib-build toolchain-funcs wrapper
-
-WINE_GECKO=2.47.4
-WINE_MONO=8.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 +xcomposite
-   xinerama"
-REQUIRED_USE="
-   X? ( truetype )
-   crossdev-mingw? ( mingw )" # bug #551124 fo

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

2023-07-21 Thread Ionen Wolkens

commit: 0b0f69b88d398261134ba385048db3f6d382e391
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Jul 22 01:57:28 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Jul 22 01:57:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b0f69b8

app-emulation/wine-vanilla: add 8.13

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

 app-emulation/wine-vanilla/Manifest|   1 +
 .../wine-vanilla/wine-vanilla-8.13.ebuild  | 346 +
 2 files changed, 347 insertions(+)

diff --git a/app-emulation/wine-vanilla/Manifest 
b/app-emulation/wine-vanilla/Manifest
index 1c600d3fabe4..7ead6da5a82d 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -4,4 +4,5 @@ DIST wine-8.0.2.tar.xz 29060452 BLAKE2B 
dcffaba6c90c4e02a7bc591a81e11aced06c0063
 DIST wine-8.10.tar.xz 29225368 BLAKE2B 
78058ccb707ddd63052ab3114e27435f94957b7badbe3001f8123fd536f5b937006b26e2133390ea5d995e9cb8c54940c907dacf910160c085e2bf3f29772caf
 SHA512 
5f141fb63a598482f512ebefef83500c2fa17a5dea87cb25e600e5167820a5990e12aeaec4a18c1467d64f7c122bf54705aa6fa6a2e6b2b4a463fe182f9b0e6e
 DIST wine-8.11.tar.xz 29236492 BLAKE2B 
db97b9abde6e1f4c854b449d27bdbafbc91bd75b835d84da401777c6ae2f4f623f2130f470d2e9a3aaf7e737f75d143a07191d38b409c06596373bece3df23c5
 SHA512 
f3e37f51f0a13aacbd41b017fc3d35e197614b03c00f5b9959c0fabc4e89975b5c3f411b38329e45ce6f9d2a2d82952b95e0907fbe2d6ae35cc4bec293825769
 DIST wine-8.12.tar.xz 29276732 BLAKE2B 
c1bf0d32eaf17f06b47dd7ffc495db4874f72ffec7cfca9edd9b2b9def8ab16db2583349950c3af447d85d476aa013914554f990d5f42d5bc8243b9effbaf869
 SHA512 
6b9eab7ca1ed5a13202b1250d8d95f6bd8ee5176f0c39b5358aedaf28f7f23543f4a73bf0782c3b4e50936813fc2a459582b5d294569c976ace784fbd9e0af1b
+DIST wine-8.13.tar.xz 29379824 BLAKE2B 
fa07edba8e45ef17813e63f793ca18cd05fd421b803d416421ec0fb7aeb4223ae44376a7e75a195e91c30259f27b48c3ed4ab0b613cbb9464b824f51e85ea240
 SHA512 
952c670635f91879cf6908343a04c0f41ae54e213123242e24fc282f9705fbe3b800dc1de454b6cfb1ebb89431b0e6eb3df3b094c1d9f4e69835d0f1b8f4fcb5
 DIST wine-8.9.tar.xz 29198080 BLAKE2B 
dfad284f554c164ac8f95d7c36d8b999217c6375f7720ed05e512e3f16cbc5a08325dad4e56dd59a17b27e53ab3a8331d54dd17b24e459b34d9e408ba93a52f3
 SHA512 
4de85654d2d5c9d48fa2a748eb9bee4477f0ba7fbd2c5dd40ea69662d8f6dfbb6432d1ec9109233d24608dc9554bad525c1e1ecdc86a5d00d133772810b12261

diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.13.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-8.13.ebuild
new file mode 100644
index ..11ed198a2f98
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.13.ebuild
@@ -0,0 +1,346 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+inherit autotools flag-o-matic multilib multilib-build toolchain-funcs wrapper
+
+WINE_GECKO=2.47.4
+WINE_MONO=8.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 +xcomposite
+   xinerama"
+REQUIRED_USE="
+   X? ( truetype )
+   crossdev-mingw? ( mingw )" # bug #551124 for truetype
+
+# 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}] )
+   )
+

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

2023-07-20 Thread Ionen Wolkens

commit: 906f2be01fd2528e18ee0371a28ec4f0e44263e8
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Jul 20 09:57:50 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Jul 20 11:52:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=906f2be0

app-emulation/wine-vanilla: add 8.0.2

Also migrate use debug -> use strip, will likely cleanup in the
remaining ebuilds after this is stable (again to avoid unnecessary
rebuilds).

Note the fix to ensure -fno-strict-aliasing is passed has not been
backported, so keeping the append-cflags.

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

 app-emulation/wine-vanilla/Manifest|   1 +
 .../wine-vanilla/wine-vanilla-8.0.2.ebuild | 342 +
 2 files changed, 343 insertions(+)

diff --git a/app-emulation/wine-vanilla/Manifest 
b/app-emulation/wine-vanilla/Manifest
index 46a5440c59cc..1c600d3fabe4 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -1,5 +1,6 @@
 DIST wine-7.0.2.tar.xz 27179980 BLAKE2B 
721ab574092638b32d3a483b6ae3def0c9d706cc888662ca461ab8c7060b10077e83cede69663ea2a8b97729f3801209fbba5f8e8828ce20454700ffbbd76cb5
 SHA512 
330c71005a6a8054b5068ac4484e9015e9f8bf55d5a451aaf5f79b7f78a025732b454251c31473abf21504cce3b78e50cf7e3e0d0116bb755dc8396bd790289a
 DIST wine-8.0.1.tar.xz 29057128 BLAKE2B 
f1e04ddc7531704b4229d1bdb6e742ff20886dfff181b8b44e01e9921574e8c433553aaddb2453532902e89252244080d1cf9f904aa7d14d76709d830116e4b4
 SHA512 
9264a3dbe8b0168aa94b8266d5686b1da39352baefa4e72a63b0ed5aa2daca8811633dc89da3bb2aff497fb2b3b917f5cd021d0baae390490f1ca5ffd5ac4b3a
+DIST wine-8.0.2.tar.xz 29060452 BLAKE2B 
dcffaba6c90c4e02a7bc591a81e11aced06c006370c4c316c8a367b2f5814926063482959fabfe9d674ee1b5a560e59087e9b711e28360ced3aee2bbd6bb8fdb
 SHA512 
e86dd31247d757d48ffb2d24f20edab3fc6ef9c3e395567a7b363951bb681335ba3adb8b84639011b24b6eb274582d56880298d6d95fb100acc072383d4e973f
 DIST wine-8.10.tar.xz 29225368 BLAKE2B 
78058ccb707ddd63052ab3114e27435f94957b7badbe3001f8123fd536f5b937006b26e2133390ea5d995e9cb8c54940c907dacf910160c085e2bf3f29772caf
 SHA512 
5f141fb63a598482f512ebefef83500c2fa17a5dea87cb25e600e5167820a5990e12aeaec4a18c1467d64f7c122bf54705aa6fa6a2e6b2b4a463fe182f9b0e6e
 DIST wine-8.11.tar.xz 29236492 BLAKE2B 
db97b9abde6e1f4c854b449d27bdbafbc91bd75b835d84da401777c6ae2f4f623f2130f470d2e9a3aaf7e737f75d143a07191d38b409c06596373bece3df23c5
 SHA512 
f3e37f51f0a13aacbd41b017fc3d35e197614b03c00f5b9959c0fabc4e89975b5c3f411b38329e45ce6f9d2a2d82952b95e0907fbe2d6ae35cc4bec293825769
 DIST wine-8.12.tar.xz 29276732 BLAKE2B 
c1bf0d32eaf17f06b47dd7ffc495db4874f72ffec7cfca9edd9b2b9def8ab16db2583349950c3af447d85d476aa013914554f990d5f42d5bc8243b9effbaf869
 SHA512 
6b9eab7ca1ed5a13202b1250d8d95f6bd8ee5176f0c39b5358aedaf28f7f23543f4a73bf0782c3b4e50936813fc2a459582b5d294569c976ace784fbd9e0af1b

diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild
new file mode 100644
index ..4603de37abfd
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild
@@ -0,0 +1,342 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+inherit autotools flag-o-matic multilib multilib-build toolchain-funcs wrapper
+
+WINE_GECKO=2.47.3
+WINE_MONO=7.4.0
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://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 +ssl +strip +truetype
+   udev udisks +unwind usb v4l +vulkan +xcomposite xinerama"
+REQUIRED_USE="
+   X? ( truetype )
+   crossdev-mingw? ( mingw )" # bug #551124 for truetype
+
+# 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

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

2023-07-07 Thread Ionen Wolkens

commit: 164443185381f475c7e94f486b1be6a82c4e214b
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Jul  7 22:03:59 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Jul  7 22:26:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16444318

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

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

 app-emulation/wine-vanilla/Manifest|   2 -
 app-emulation/wine-vanilla/wine-vanilla-8.7.ebuild | 344 -
 app-emulation/wine-vanilla/wine-vanilla-8.8.ebuild | 344 -
 3 files changed, 690 deletions(-)

diff --git a/app-emulation/wine-vanilla/Manifest 
b/app-emulation/wine-vanilla/Manifest
index 864961b82ace..c711dac25ae5 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -2,6 +2,4 @@ DIST wine-7.0.2.tar.xz 27179980 BLAKE2B 
721ab574092638b32d3a483b6ae3def0c9d706cc
 DIST wine-8.0.1.tar.xz 29057128 BLAKE2B 
f1e04ddc7531704b4229d1bdb6e742ff20886dfff181b8b44e01e9921574e8c433553aaddb2453532902e89252244080d1cf9f904aa7d14d76709d830116e4b4
 SHA512 
9264a3dbe8b0168aa94b8266d5686b1da39352baefa4e72a63b0ed5aa2daca8811633dc89da3bb2aff497fb2b3b917f5cd021d0baae390490f1ca5ffd5ac4b3a
 DIST wine-8.10.tar.xz 29225368 BLAKE2B 
78058ccb707ddd63052ab3114e27435f94957b7badbe3001f8123fd536f5b937006b26e2133390ea5d995e9cb8c54940c907dacf910160c085e2bf3f29772caf
 SHA512 
5f141fb63a598482f512ebefef83500c2fa17a5dea87cb25e600e5167820a5990e12aeaec4a18c1467d64f7c122bf54705aa6fa6a2e6b2b4a463fe182f9b0e6e
 DIST wine-8.11.tar.xz 29236492 BLAKE2B 
db97b9abde6e1f4c854b449d27bdbafbc91bd75b835d84da401777c6ae2f4f623f2130f470d2e9a3aaf7e737f75d143a07191d38b409c06596373bece3df23c5
 SHA512 
f3e37f51f0a13aacbd41b017fc3d35e197614b03c00f5b9959c0fabc4e89975b5c3f411b38329e45ce6f9d2a2d82952b95e0907fbe2d6ae35cc4bec293825769
-DIST wine-8.7.tar.xz 29158096 BLAKE2B 
73bd0b5a6eec8a2e37301d8b0f8e9be1ad757f07df3471b0cea17aac6716d456eea1d36fa22bd2451e6cc7662b2b36e4ca628d65216c60d5950f5b439fd2052c
 SHA512 
0a7fe9ad86cf931527c2149207473bf4671d1098af7c21f1b740dfaa84486a8e235fea99b1cad035ff9c3eb20810caab53d51051d63efe626514b79309904d93
-DIST wine-8.8.tar.xz 29181484 BLAKE2B 
43a79fb34f86382cbd8dd3b3aa16f104d02a8e86fd8d47afb157865b707b71674199c4ae748f8b3e3de4ae1e63d70a18fca0d09d7716c178a4c9c21d21c092ac
 SHA512 
e56427680c940970153b1996841c70d540a0a2572ab980c4d77cf7225efd7c26c91ef9b0548b73d51e78afa55a7e324d5d93f6211f5eb5d5698ab9ff421e26de
 DIST wine-8.9.tar.xz 29198080 BLAKE2B 
dfad284f554c164ac8f95d7c36d8b999217c6375f7720ed05e512e3f16cbc5a08325dad4e56dd59a17b27e53ab3a8331d54dd17b24e459b34d9e408ba93a52f3
 SHA512 
4de85654d2d5c9d48fa2a748eb9bee4477f0ba7fbd2c5dd40ea69662d8f6dfbb6432d1ec9109233d24608dc9554bad525c1e1ecdc86a5d00d133772810b12261

diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.7.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-8.7.ebuild
deleted file mode 100644
index 5389f45538a8..
--- a/app-emulation/wine-vanilla/wine-vanilla-8.7.ebuild
+++ /dev/null
@@ -1,344 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-inherit autotools flag-o-matic multilib multilib-build toolchain-funcs wrapper
-
-WINE_GECKO=2.47.4
-WINE_MONO=7.4.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 debug custom-cflags +fontconfig +gecko gphoto2
-   +gstreamer kerberos +mingw +mono netapi nls odbc opencl +opengl
-   osmesa pcap perl pulseaudio samba scanner +sdl selinux smartcard
-   +ssl +truetype udev udisks +unwind usb v4l +vulkan wayland
-   +xcomposite xinerama"
-REQUIRED_USE="
-   X? ( truetype )
-   crossdev-mingw? ( mingw )" # bug #551124 for truetype
-
-# 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}]
-

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

2023-07-07 Thread Ionen Wolkens

commit: 93e25423411b8ce6a77a593c08cddccb26bbd630
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Jul  7 22:25:39 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Jul  7 22:26:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93e25423

app-emulation/wine-vanilla: add 8.12

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

 app-emulation/wine-vanilla/Manifest|   1 +
 .../wine-vanilla/wine-vanilla-8.12.ebuild  | 346 +
 2 files changed, 347 insertions(+)

diff --git a/app-emulation/wine-vanilla/Manifest 
b/app-emulation/wine-vanilla/Manifest
index c711dac25ae5..46a5440c59cc 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -2,4 +2,5 @@ DIST wine-7.0.2.tar.xz 27179980 BLAKE2B 
721ab574092638b32d3a483b6ae3def0c9d706cc
 DIST wine-8.0.1.tar.xz 29057128 BLAKE2B 
f1e04ddc7531704b4229d1bdb6e742ff20886dfff181b8b44e01e9921574e8c433553aaddb2453532902e89252244080d1cf9f904aa7d14d76709d830116e4b4
 SHA512 
9264a3dbe8b0168aa94b8266d5686b1da39352baefa4e72a63b0ed5aa2daca8811633dc89da3bb2aff497fb2b3b917f5cd021d0baae390490f1ca5ffd5ac4b3a
 DIST wine-8.10.tar.xz 29225368 BLAKE2B 
78058ccb707ddd63052ab3114e27435f94957b7badbe3001f8123fd536f5b937006b26e2133390ea5d995e9cb8c54940c907dacf910160c085e2bf3f29772caf
 SHA512 
5f141fb63a598482f512ebefef83500c2fa17a5dea87cb25e600e5167820a5990e12aeaec4a18c1467d64f7c122bf54705aa6fa6a2e6b2b4a463fe182f9b0e6e
 DIST wine-8.11.tar.xz 29236492 BLAKE2B 
db97b9abde6e1f4c854b449d27bdbafbc91bd75b835d84da401777c6ae2f4f623f2130f470d2e9a3aaf7e737f75d143a07191d38b409c06596373bece3df23c5
 SHA512 
f3e37f51f0a13aacbd41b017fc3d35e197614b03c00f5b9959c0fabc4e89975b5c3f411b38329e45ce6f9d2a2d82952b95e0907fbe2d6ae35cc4bec293825769
+DIST wine-8.12.tar.xz 29276732 BLAKE2B 
c1bf0d32eaf17f06b47dd7ffc495db4874f72ffec7cfca9edd9b2b9def8ab16db2583349950c3af447d85d476aa013914554f990d5f42d5bc8243b9effbaf869
 SHA512 
6b9eab7ca1ed5a13202b1250d8d95f6bd8ee5176f0c39b5358aedaf28f7f23543f4a73bf0782c3b4e50936813fc2a459582b5d294569c976ace784fbd9e0af1b
 DIST wine-8.9.tar.xz 29198080 BLAKE2B 
dfad284f554c164ac8f95d7c36d8b999217c6375f7720ed05e512e3f16cbc5a08325dad4e56dd59a17b27e53ab3a8331d54dd17b24e459b34d9e408ba93a52f3
 SHA512 
4de85654d2d5c9d48fa2a748eb9bee4477f0ba7fbd2c5dd40ea69662d8f6dfbb6432d1ec9109233d24608dc9554bad525c1e1ecdc86a5d00d133772810b12261

diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.12.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-8.12.ebuild
new file mode 100644
index ..11ed198a2f98
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.12.ebuild
@@ -0,0 +1,346 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+inherit autotools flag-o-matic multilib multilib-build toolchain-funcs wrapper
+
+WINE_GECKO=2.47.4
+WINE_MONO=8.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 +xcomposite
+   xinerama"
+REQUIRED_USE="
+   X? ( truetype )
+   crossdev-mingw? ( mingw )" # bug #551124 for truetype
+
+# 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}] )
+   )

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

2023-06-26 Thread Ionen Wolkens

commit: d0ea0771a059b3d85149c7731e27659b52ea8952
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Jun 26 09:02:34 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Jun 26 10:10:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0ea0771

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

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

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

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

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

 app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild | 5 +
 app-emulation/wine-vanilla/wine-vanilla-8.0.1.ebuild | 5 +
 .../{wine-vanilla-8.10.ebuild => wine-vanilla-8.10-r1.ebuild}| 5 +
 .../{wine-vanilla-8.11.ebuild => wine-vanilla-8.11-r1.ebuild}| 5 +
 app-emulation/wine-vanilla/wine-vanilla-8.7.ebuild   | 5 +
 app-emulation/wine-vanilla/wine-vanilla-8.8.ebuild   | 5 +
 app-emulation/wine-vanilla/wine-vanilla-8.9.ebuild   | 5 +
 app-emulation/wine-vanilla/wine-vanilla-.ebuild  | 5 +
 8 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 36c592c40934..fe54aab83894 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
@@ -267,6 +267,11 @@ src_configure() {
: "${CROSSCFLAGS:=$(
filter-flags '-fstack-protector*' #870136
filter-flags '-mfunction-return=thunk*' #878849
+   # -mavx with mingw-gcc has a history of obscure 
issues and
+   # disabling is seen as safer, e.g. 
`WINEARCH=win32 winecfg`
+   # crashes with -march=skylake >=wine-8.10, 
similar issues with
+   # znver4: 
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273
+   append-cflags -mno-avx
CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
: "${CROSSLDFLAGS:=$(
filter-flags '-fuse-ld=*'

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

diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.10.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-8.10-r1.ebuild
similarity index 97%
rename from app-emulation/wine-vanilla/wine-vanilla-8.10.ebuild
rename to app-emulation/wine-vanilla/wine-vanilla-8.10-r1.ebuild
index f2da3a5c1b7b..11ed198a2f98 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-8.10.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.10-r1.ebuild
@@ -273,6 +273,11 @@ src_configure() {
: "${CROSSCFLAGS:=$(
filter-flags '-fstack-protector*' #870136
filter-flags '-mfunction-return=thunk*' #878849
+   # -mavx with mingw-gcc has a history of obscure 
issues and
+   # disabling is seen as safer, e.g. 
`WINEARCH=win32 winecfg`
+   # crashes with -march=skylake >=wine-8.10, 
similar issues with
+   # znver4: 
https://gcc.gnu.org/bugzilla/show_bug.cgi?i

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

2023-06-23 Thread Ionen Wolkens

commit: cff1c1a851bde315cc5e86174908b48018ac9b12
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Jun 24 04:35:31 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Jun 24 04:54:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cff1c1a8

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

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

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

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

 app-emulation/wine-vanilla/wine-vanilla-8.10.ebuild | 2 --
 app-emulation/wine-vanilla/wine-vanilla-8.11.ebuild | 2 --
 app-emulation/wine-vanilla/wine-vanilla-.ebuild | 2 --
 3 files changed, 6 deletions(-)

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

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

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

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

2023-06-23 Thread Ionen Wolkens

commit: 74c899dbae70c72890e15bb0c0392ff9c6bf6690
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Jun 24 04:25:20 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Jun 24 04:54:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74c899db

app-emulation/wine-vanilla: add 8.11

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

 app-emulation/wine-vanilla/Manifest|   1 +
 .../wine-vanilla/wine-vanilla-8.11.ebuild  | 343 +
 2 files changed, 344 insertions(+)

diff --git a/app-emulation/wine-vanilla/Manifest 
b/app-emulation/wine-vanilla/Manifest
index fd4fc4d61b39..864961b82ace 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.1.tar.xz 29057128 BLAKE2B 
f1e04ddc7531704b4229d1bdb6e742ff20886dfff181b8b44e01e9921574e8c433553aaddb2453532902e89252244080d1cf9f904aa7d14d76709d830116e4b4
 SHA512 
9264a3dbe8b0168aa94b8266d5686b1da39352baefa4e72a63b0ed5aa2daca8811633dc89da3bb2aff497fb2b3b917f5cd021d0baae390490f1ca5ffd5ac4b3a
 DIST wine-8.10.tar.xz 29225368 BLAKE2B 
78058ccb707ddd63052ab3114e27435f94957b7badbe3001f8123fd536f5b937006b26e2133390ea5d995e9cb8c54940c907dacf910160c085e2bf3f29772caf
 SHA512 
5f141fb63a598482f512ebefef83500c2fa17a5dea87cb25e600e5167820a5990e12aeaec4a18c1467d64f7c122bf54705aa6fa6a2e6b2b4a463fe182f9b0e6e
+DIST wine-8.11.tar.xz 29236492 BLAKE2B 
db97b9abde6e1f4c854b449d27bdbafbc91bd75b835d84da401777c6ae2f4f623f2130f470d2e9a3aaf7e737f75d143a07191d38b409c06596373bece3df23c5
 SHA512 
f3e37f51f0a13aacbd41b017fc3d35e197614b03c00f5b9959c0fabc4e89975b5c3f411b38329e45ce6f9d2a2d82952b95e0907fbe2d6ae35cc4bec293825769
 DIST wine-8.7.tar.xz 29158096 BLAKE2B 
73bd0b5a6eec8a2e37301d8b0f8e9be1ad757f07df3471b0cea17aac6716d456eea1d36fa22bd2451e6cc7662b2b36e4ca628d65216c60d5950f5b439fd2052c
 SHA512 
0a7fe9ad86cf931527c2149207473bf4671d1098af7c21f1b740dfaa84486a8e235fea99b1cad035ff9c3eb20810caab53d51051d63efe626514b79309904d93
 DIST wine-8.8.tar.xz 29181484 BLAKE2B 
43a79fb34f86382cbd8dd3b3aa16f104d02a8e86fd8d47afb157865b707b71674199c4ae748f8b3e3de4ae1e63d70a18fca0d09d7716c178a4c9c21d21c092ac
 SHA512 
e56427680c940970153b1996841c70d540a0a2572ab980c4d77cf7225efd7c26c91ef9b0548b73d51e78afa55a7e324d5d93f6211f5eb5d5698ab9ff421e26de
 DIST wine-8.9.tar.xz 29198080 BLAKE2B 
dfad284f554c164ac8f95d7c36d8b999217c6375f7720ed05e512e3f16cbc5a08325dad4e56dd59a17b27e53ab3a8331d54dd17b24e459b34d9e408ba93a52f3
 SHA512 
4de85654d2d5c9d48fa2a748eb9bee4477f0ba7fbd2c5dd40ea69662d8f6dfbb6432d1ec9109233d24608dc9554bad525c1e1ecdc86a5d00d133772810b12261

diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.11.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-8.11.ebuild
new file mode 100644
index ..fa578d8607db
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.11.ebuild
@@ -0,0 +1,343 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+inherit autotools flag-o-matic multilib multilib-build toolchain-funcs wrapper
+
+WINE_GECKO=2.47.4
+WINE_MONO=8.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 +xcomposite
+   xinerama"
+REQUIRED_USE="
+   X? ( truetype )
+   crossdev-mingw? ( mingw )" # bug #551124 for truetype
+
+# 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

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

2023-06-09 Thread Ionen Wolkens

commit: 1bc5fb47cb24e01bd1fe79b3158323721f9a36a4
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Jun  9 22:27:29 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Jun  9 23:50:29 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bc5fb47

app-emulation/wine-vanilla: add 8.10

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

 app-emulation/wine-vanilla/Manifest|   1 +
 .../wine-vanilla/wine-vanilla-8.10.ebuild  | 343 +
 2 files changed, 344 insertions(+)

diff --git a/app-emulation/wine-vanilla/Manifest 
b/app-emulation/wine-vanilla/Manifest
index a510f932132c..fd4fc4d61b39 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -1,5 +1,6 @@
 DIST wine-7.0.2.tar.xz 27179980 BLAKE2B 
721ab574092638b32d3a483b6ae3def0c9d706cc888662ca461ab8c7060b10077e83cede69663ea2a8b97729f3801209fbba5f8e8828ce20454700ffbbd76cb5
 SHA512 
330c71005a6a8054b5068ac4484e9015e9f8bf55d5a451aaf5f79b7f78a025732b454251c31473abf21504cce3b78e50cf7e3e0d0116bb755dc8396bd790289a
 DIST wine-8.0.1.tar.xz 29057128 BLAKE2B 
f1e04ddc7531704b4229d1bdb6e742ff20886dfff181b8b44e01e9921574e8c433553aaddb2453532902e89252244080d1cf9f904aa7d14d76709d830116e4b4
 SHA512 
9264a3dbe8b0168aa94b8266d5686b1da39352baefa4e72a63b0ed5aa2daca8811633dc89da3bb2aff497fb2b3b917f5cd021d0baae390490f1ca5ffd5ac4b3a
+DIST wine-8.10.tar.xz 29225368 BLAKE2B 
78058ccb707ddd63052ab3114e27435f94957b7badbe3001f8123fd536f5b937006b26e2133390ea5d995e9cb8c54940c907dacf910160c085e2bf3f29772caf
 SHA512 
5f141fb63a598482f512ebefef83500c2fa17a5dea87cb25e600e5167820a5990e12aeaec4a18c1467d64f7c122bf54705aa6fa6a2e6b2b4a463fe182f9b0e6e
 DIST wine-8.7.tar.xz 29158096 BLAKE2B 
73bd0b5a6eec8a2e37301d8b0f8e9be1ad757f07df3471b0cea17aac6716d456eea1d36fa22bd2451e6cc7662b2b36e4ca628d65216c60d5950f5b439fd2052c
 SHA512 
0a7fe9ad86cf931527c2149207473bf4671d1098af7c21f1b740dfaa84486a8e235fea99b1cad035ff9c3eb20810caab53d51051d63efe626514b79309904d93
 DIST wine-8.8.tar.xz 29181484 BLAKE2B 
43a79fb34f86382cbd8dd3b3aa16f104d02a8e86fd8d47afb157865b707b71674199c4ae748f8b3e3de4ae1e63d70a18fca0d09d7716c178a4c9c21d21c092ac
 SHA512 
e56427680c940970153b1996841c70d540a0a2572ab980c4d77cf7225efd7c26c91ef9b0548b73d51e78afa55a7e324d5d93f6211f5eb5d5698ab9ff421e26de
 DIST wine-8.9.tar.xz 29198080 BLAKE2B 
dfad284f554c164ac8f95d7c36d8b999217c6375f7720ed05e512e3f16cbc5a08325dad4e56dd59a17b27e53ab3a8331d54dd17b24e459b34d9e408ba93a52f3
 SHA512 
4de85654d2d5c9d48fa2a748eb9bee4477f0ba7fbd2c5dd40ea69662d8f6dfbb6432d1ec9109233d24608dc9554bad525c1e1ecdc86a5d00d133772810b12261

diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.10.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-8.10.ebuild
new file mode 100644
index ..fa578d8607db
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.10.ebuild
@@ -0,0 +1,343 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+inherit autotools flag-o-matic multilib multilib-build toolchain-funcs wrapper
+
+WINE_GECKO=2.47.4
+WINE_MONO=8.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 +xcomposite
+   xinerama"
+REQUIRED_USE="
+   X? ( truetype )
+   crossdev-mingw? ( mingw )" # bug #551124 for truetype
+
+# 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}]
+   osme

1 2 3 4 5 6 >

1 - 100 of 513 matches

Mail list logo