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

app-emulation/wine-vanilla: add 8.13

Signed-off-by: Ionen Wolkens <ionen <AT> 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 000000000000..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} == *9999 ]]; 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}] )
+       )
+       cups? ( net-print/cups[${MULTILIB_USEDEP}] )
+       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}] )
+       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 )"
+BDEPEND="
+       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 #900338)
+       res_getservers # false positive
+)
+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
+)
+
+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_prepare() {
+       # 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)
+               $(usev !odbc ac_cv_lib_soname_odbc=)
+       )
+
+       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:=$(
+                               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=*'
+                               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
+
+       if use mingw; then
+               # don't let portage try to strip PE files with the wrong
+               # strip executable and instead handle it here (saves ~120MB)
+               dostrip -x ${WINE_PREFIX}/wine/{i386,x86_64}-windows
+
+               if use strip; then
+                       ebegin "Stripping Windows (PE) binaries"
+                       find "${ED}"${WINE_PREFIX}/wine/*-windows -regex 
'.*\.\(a\|dll\|exe\)' \
+                               -exec $(usex abi_x86_64 x86_64 
i686)-w64-mingw32-strip --strip-unneeded {} +
+                       eend ${?} || die
+               fi
+       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