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

app-emulation/wine-staging: add 8.9.1

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

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

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

diff --git a/app-emulation/wine-staging/wine-staging-8.9.1.ebuild 
b/app-emulation/wine-staging/wine-staging-8.9.1.ebuild
new file mode 100644
index 000000000000..91fff75c3a4c
--- /dev/null
+++ b/app-emulation/wine-staging/wine-staging-8.9.1.ebuild
@@ -0,0 +1,377 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+PYTHON_COMPAT=( python3_{10..12} )
+inherit autotools edo flag-o-matic multilib multilib-build
+inherit python-any-r1 toolchain-funcs wrapper
+
+WINE_GECKO=2.47.4
+WINE_MONO=8.0.0
+WINE_P=wine-$(ver_cut 1-2)
+
+if [[ ${PV} == *9999 ]]; then
+       inherit git-r3
+       EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine-staging.git";
+       WINE_EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git";
+else
+       (( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 
1).0
+       SRC_URI="
+               https://dl.winehq.org/wine/source/${WINE_SDIR}/${WINE_P}.tar.xz
+               
https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+       KEYWORDS="-* ~amd64 ~x86"
+fi
+S="${WORKDIR}/${WINE_P}"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging 
patchset"
+HOMEPAGE="
+       https://wiki.winehq.org/Wine-Staging
+       https://gitlab.winehq.org/wine/wine-staging/";
+
+LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
+SLOT="${PV}"
+IUSE="
+       +X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos
+       llvm-libunwind debug custom-cflags +fontconfig +gecko gphoto2
+       +gstreamer kerberos +mingw +mono netapi nls opencl +opengl osmesa
+       pcap perl pulseaudio samba scanner +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}]
+               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}] )
+       sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] )
+       ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+       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}] )"
+WINE_COMMON_DEPEND="
+       ${WINE_DLOPEN_DEPEND}
+       X? (
+               x11-libs/libX11[${MULTILIB_USEDEP}]
+               x11-libs/libXext[${MULTILIB_USEDEP}]
+       )
+       alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+       capi? ( net-libs/libcapi:=[${MULTILIB_USEDEP}] )
+       gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+       gstreamer? (
+               dev-libs/glib:2[${MULTILIB_USEDEP}]
+               media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
+               media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+       )
+       opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+       pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+       pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
+       scanner? ( media-gfx/sane-backends[${MULTILIB_USEDEP}] )
+       smartcard? ( sys-apps/pcsc-lite[${MULTILIB_USEDEP}] )
+       udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
+       unwind? (
+               llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
+               !llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
+       )
+       usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
+       wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )"
+RDEPEND="
+       ${WINE_COMMON_DEPEND}
+       app-emulation/wine-desktop-common
+       dos? (
+               || (
+                       games-emulation/dosbox
+                       games-emulation/dosbox-staging
+               )
+       )
+       gecko? ( app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}] )
+       gstreamer? ( media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] )
+       mono? ( app-emulation/wine-mono:${WINE_MONO} )
+       perl? (
+               dev-lang/perl
+               dev-perl/XML-LibXML
+       )
+       samba? ( net-fs/samba[winbind] )
+       selinux? ( sec-policy/selinux-wine )
+       udisks? ( sys-fs/udisks:2 )"
+DEPEND="
+       ${WINE_COMMON_DEPEND}
+       sys-kernel/linux-headers
+       X? ( x11-base/xorg-proto )"
+# gitapply.sh prefers git but can fallback to patch+extras
+BDEPEND="
+       ${PYTHON_DEPS}
+       || (
+               dev-vcs/git
+               (
+                       sys-apps/gawk
+                       sys-apps/util-linux
+               )
+       )
+       dev-lang/perl
+       sys-devel/binutils
+       sys-devel/bison
+       sys-devel/flex
+       virtual/pkgconfig
+       mingw? ( !crossdev-mingw? (
+               >=dev-util/mingw64-toolchain-10.0.0_p1-r2[${MULTILIB_USEDEP}]
+       ) )
+       nls? ( sys-devel/gettext )
+       wayland? ( dev-util/wayland-scanner )"
+IDEPEND=">=app-eselect/eselect-wine-2"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+       __clear_cache # unused on amd64+x86 (bug #900334)
+       res_getservers # false positive
+)
+QA_FLAGS_IGNORED="usr/lib/.*/wine/.*-unix/odbc32.so" # has no compiled objects
+QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
+
+PATCHES=(
+       "${FILESDIR}"/${PN}-7.17-noexecstack.patch
+       "${FILESDIR}"/${PN}-7.20-unwind.patch
+)
+
+pkg_pretend() {
+       [[ ${MERGE_TYPE} == binary ]] && return
+
+       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}); do
+                       if ! type -P ${mingw}-gcc >/dev/null; then
+                               eerror "With USE=crossdev-mingw, you must 
prepare the MinGW toolchain"
+                               eerror "yourself by installing 
sys-devel/crossdev then running:"
+                               eerror
+                               eerror "    crossdev --target ${mingw}"
+                               eerror
+                               eerror "For more information, please see: 
https://wiki.gentoo.org/wiki/Mingw";
+                               die "USE=crossdev-mingw is enabled, but 
${mingw}-gcc was not found"
+                       fi
+               done
+       fi
+}
+
+src_unpack() {
+       if [[ ${PV} == *9999 ]]; then
+               EGIT_CHECKOUT_DIR=${WORKDIR}/${P}
+               git-r3_src_unpack
+
+               EGIT_COMMIT=$(<"${EGIT_CHECKOUT_DIR}"/staging/upstream-commit) 
|| die
+               EGIT_REPO_URI=${WINE_EGIT_REPO_URI}
+               EGIT_CHECKOUT_DIR=${S}
+               einfo "Fetching Wine commit matching the current patchset by 
default (${EGIT_COMMIT})"
+               git-r3_src_unpack
+       else
+               default
+       fi
+}
+
+src_prepare() {
+       local patchinstallargs=(
+               --all
+               --no-autoconf
+               -W winemenubuilder-Desktop_Icon_Path #652176
+               ${MY_WINE_STAGING_CONF}
+       )
+
+       edo "${PYTHON}" ../${P}/staging/patchinstall.py "${patchinstallargs[@]}"
+
+       # sanity check, bumping these has a history of oversights
+       local geckomono=$(sed -En '/^#define (GECKO|MONO)_VER/{s/[^0-9.]//gp}' \
+               dlls/appwiz.cpl/addons.c || die)
+       if [[ ${WINE_GECKO}$'\n'${WINE_MONO} != "${geckomono}" ]]; then
+               local gmfatal=
+               [[ ${PV} == *9999 ]] && gmfatal=nonfatal
+               ${gmfatal} die -n "gecko/mono mismatch in ebuild, has: " 
${geckomono} " (please file a bug)"
+       fi
+
+       default
+
+       # ensure .desktop calls this variant + slot
+       sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || die
+
+       # always update for patches (including user's wrt #432348)
+       eautoreconf
+       tools/make_requests || die # perl
+}
+
+src_configure() {
+       WINE_PREFIX=/usr/lib/${P}
+       WINE_DATADIR=/usr/share/${P}
+
+       local conf=(
+               --prefix="${EPREFIX}"${WINE_PREFIX}
+               --datadir="${EPREFIX}"${WINE_DATADIR}
+               --includedir="${EPREFIX}"/usr/include/${P}
+               --libdir="${EPREFIX}"${WINE_PREFIX}
+               --mandir="${EPREFIX}"${WINE_DATADIR}/man
+               $(use_enable gecko mshtml)
+               $(use_enable mono mscoree)
+               --disable-tests
+               $(use_with X x)
+               $(use_with alsa)
+               $(use_with capi)
+               $(use_with cups)
+               $(use_with fontconfig)
+               $(use_with gphoto2 gphoto)
+               $(use_with gstreamer)
+               $(use_with kerberos gssapi)
+               $(use_with kerberos krb5)
+               $(use_with mingw)
+               $(use_with netapi)
+               $(use_with nls gettext)
+               $(use_with opencl)
+               $(use_with opengl)
+               $(use_with osmesa)
+               --without-oss # media-sound/oss is not packaged (OSSv4)
+               $(use_with pcap)
+               $(use_with pulseaudio pulse)
+               $(use_with scanner sane)
+               $(use_with sdl)
+               $(use_with smartcard pcsclite)
+               $(use_with ssl gnutls)
+               $(use_with truetype freetype)
+               $(use_with udev)
+               $(use_with udisks dbus) # dbus is only used for udisks
+               $(use_with unwind)
+               $(use_with usb)
+               $(use_with v4l v4l2)
+               $(use_with vulkan)
+               $(use_with wayland)
+               $(use_with xcomposite)
+               $(use_with xinerama)
+       )
+
+       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}
+
+       # 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
+
+       # build using upstream's way (--with-wine64)
+       # order matters: configure+compile 64->32, install 32->64
+       local -i bits
+       for bits in $(usev abi_x86_64 64) $(usev abi_x86_32 32); do
+       (
+               einfo "Configuring ${PN} for ${bits}bits in 
${WORKDIR}/build${bits} ..."
+
+               mkdir ../build${bits} || die
+               cd ../build${bits} || die
+
+               pe_arch=i386
+               if (( bits == 64 )); then
+                       pe_arch=x86_64
+                       : "${CROSSCC:=${CROSSCC_amd64:-x86_64-w64-mingw32-gcc}}"
+                       conf+=( --enable-win64 )
+               elif use amd64; then
+                       conf+=(
+                               $(usev abi_x86_64 --with-wine64=../build64)
+                               TARGETFLAGS=-m32 # for widl
+                       )
+                       # _setup is optional, but use over Wine's auto-detect 
(+#472038)
+                       multilib_toolchain_setup x86
+               fi
+               : "${CROSSCC:=${CROSSCC_x86:-i686-w64-mingw32-gcc}}"
+
+               if use mingw; then
+                       # CROSSCC is no longer recognized by Wine, but still 
use for now
+                       # (future handling for CROSS* variables is subject to 
changes)
+                       conf+=( ac_cv_prog_${pe_arch}_CC="${CROSSCC}" )
+
+                       # 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})}"
+                       : "${CROSSLDFLAGS:=$(
+                               filter-flags '-fuse-ld=*'
+                               CC=${CROSSCC} test-flags-CCLD ${LDFLAGS})}"
+                       export CROSS{C,LD}FLAGS
+               fi
+
+               ECONF_SOURCE=${S} econf "${conf[@]}"
+       )
+       done
+}
+
+src_compile() {
+       use abi_x86_64 && emake -C ../build64 # do first
+       use abi_x86_32 && emake -C ../build32
+}
+
+src_install() {
+       use abi_x86_32 && emake DESTDIR="${D}" -C ../build32 install
+       use abi_x86_64 && emake DESTDIR="${D}" -C ../build64 install # do last
+
+       # symlink for plain 'wine' and install its man pages if 64bit-only 
#404331
+       if use abi_x86_64 && use !abi_x86_32; then
+               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
+       fi
+
+       use perl || rm "${ED}"${WINE_DATADIR}/man/man1/wine{dump,maker}.1 \
+               "${ED}"${WINE_PREFIX}/bin/{function_grep.pl,wine{dump,maker}} 
|| die
+
+       # create variant wrappers for eselect-wine
+       local bin
+       for bin in "${ED}"${WINE_PREFIX}/bin/*; do
+               make_wrapper "${bin##*/}-${P#wine-}" "${bin#"${ED}"}"
+       done
+
+       # don't let portage try to strip PE files with the wrong
+       # strip executable and instead handle it here (saves ~120MB)
+       if use mingw; then
+               dostrip -x ${WINE_PREFIX}/wine/{i386,x86_64}-windows
+               use debug ||
+                       find "${ED}"${WINE_PREFIX}/wine/*-windows -regex 
'.*\.\(a\|dll\|exe\)' \
+                               -exec $(usex abi_x86_64 x86_64 
i686)-w64-mingw32-strip --strip-unneeded {} + || die
+       fi
+
+       dodoc ANNOUNCE AUTHORS README* documentation/README*
+}
+
+pkg_postinst() {
+       eselect wine update --if-unset || die
+}
+
+pkg_postrm() {
+       eselect wine update --if-unset || die
+}

Reply via email to