From 7bf9e3db263e64d6cbc306440a7f3c44e551bb13 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 6 Dec 2022 03:08:16 +0000 Subject: gentoo auto-resync : 06:12:2022 - 03:08:16 --- app-emulation/wine-vanilla/Manifest | 14 +- .../wine-vanilla/wine-vanilla-7.0-r3.ebuild | 332 --------------------- .../wine-vanilla/wine-vanilla-7.0.1.ebuild | 6 +- .../wine-vanilla/wine-vanilla-7.19.ebuild | 6 +- .../wine-vanilla/wine-vanilla-7.20.ebuild | 6 +- .../wine-vanilla/wine-vanilla-7.21-r1.ebuild | 6 +- .../wine-vanilla/wine-vanilla-7.22.ebuild | 6 +- .../wine-vanilla/wine-vanilla-9999.ebuild | 6 +- 8 files changed, 30 insertions(+), 352 deletions(-) delete mode 100644 app-emulation/wine-vanilla/wine-vanilla-7.0-r3.ebuild (limited to 'app-emulation/wine-vanilla') diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest index fd44a66245c4..3dea3593a0a8 100644 --- a/app-emulation/wine-vanilla/Manifest +++ b/app-emulation/wine-vanilla/Manifest @@ -4,16 +4,14 @@ AUX wine-vanilla-7.20-unwind.patch 1450 BLAKE2B 3f90cc131104ad72a11ae30c582b79b3 AUX wine-vanilla-7.21-crossflags.patch 876 BLAKE2B fa0bfd1f5fba242a8a99bf94e5ebb2c9cc07bb452d84d542f64a7f73795646af91283ac98dc2a78199ad6d0652544d7768a602539bd7c083ac5b9cf9fd4472ae SHA512 fe5160233246ac2335bb7f38daa761978544a935238d7b99cccf36fe09efa171bc4addbdeedbb457c28ea3a85377f4615ba68d04544ff887c94ff8341e3a8178 AUX wine-vanilla-7.21-opengl32.patch 2741 BLAKE2B 8bf1a5f55172b3f8310e8c9e1b3a0329281ed32632376d4db4a225ab7f5032215d891d9adbbab0ef9bc6f4b1a1acee162910b1abfe02fb45f201b3697624d513 SHA512 a3727cdefee70060fb08eae246c3fe5f9c7179c3cf471ebc7f414559eed717151216c843adc0145e4cd3781191d2863a71ce2902ca14f46b872be83c48ba5c1c DIST wine-7.0.1.tar.xz 27167768 BLAKE2B 9bf74e7077fe4b77611f8195feeb53fc6475bdaeac97dab5221942115d6108d8786f93d4a96745bad72afb074b15129fec9b0b2f10261d91c9a9b57bd2240ded SHA512 5a5258132fe30bfb5313454598b85e7d97a74d1e0c7ca7af16aa8c486e316ad34ab74a25fd9a403c98ad1f3280385232f7d159bb824f713e920a4a0dae62c944 -DIST wine-7.0.tar.xz 27120912 BLAKE2B 84bfeb28d56f0f40bb93b1b5bf8954c8be2fd90fde5a61608e7c35f48addcce7a4d660e63c3caa3ca2c365d1e83b55a1c3485872b2d6bfa8941e2bce44c4aca6 SHA512 eec17b046ed5447eb540f421c9b2748d9419ce087496c2743a9914fd27bbe5ff9da0cfe47d3cd76fa97323bd1188a1d82b1eef4968d86ed1957dc1a95e28529c DIST wine-7.19.tar.xz 28502612 BLAKE2B b7b270656955c7a1e1d84e8bbc7e3e8abff5aedadb5e8a458f0b1109d746875a359f3d2f53b1c9c6caae65d17fd1d205466cd3a884034a8bad6afe9456f13b5d SHA512 f76dbda97cccad4c0f249b5dd4e8d48afa832134f1704ae228650bb73ee82823e628b23bd53a3f8729e06a8933597ff2fffa5551f156fc9c9181b67c066747d5 DIST wine-7.20.tar.xz 28534920 BLAKE2B 2e0cd49a7820f0c885a2a6dbcded6ebbdb5e1ea5576b03dedb7ee066f74f8c675193450cdd45bf5e0224bd588a890138e47a15f513edbfde1eabf1b65c9abe31 SHA512 6e2e65fba2336985df93165050f0f46b752d6aa94fc1581451c58969e2003748378be4b9e16b647ca2922fbdff77920311b12a17bda630a7bccfc7ee8f03b453 DIST wine-7.21.tar.xz 28703308 BLAKE2B 8902ded32b9e635f8ccf659ca4055e9ad45d3659f3ad48d0c218dc5a7a334df456ea0e9441dcaff58e8cac0bbd65140b20e61180acaa06230bc70e28a8382c7e SHA512 15c0c9efda972b84890886fd4b1fb18dd462373ba490f5e607004a5436caba9823f643369ceb5abbc2d2d0e26d7ce002e00136299d9984c0a27f729f3ac129c1 DIST wine-7.22.tar.xz 28974052 BLAKE2B c86466964817b916ee8f7b687f193eda8bdd3fb17152ab1565971e36f43b12b540033ac1c5fa5d15576041febd32cf1ea2955732c5386debcbda46fb3acca0f1 SHA512 bf58a5b98bef5b291aff1eca3f94c28da95990e4c8da9af5e9e28b9480d57163d088b501b0c1bca5b568bf586dd9933cdc1ea1f371b78d95c94e2d25d0a65efc -EBUILD wine-vanilla-7.0-r3.ebuild 10596 BLAKE2B 9e62fe7db88a8e8e8232b4cd2cea88bdbaffcf3c95d023b280f50094f32fbbb95cf118be16470054e0560cef7db6a21ae780ac3dcdf205bce2e4e91059651f8d SHA512 ac951ccd3c00b52ad174c52f5b82b3295e5a1fe025865148d9b6a286f3af3181c43a6f8f2d37e211c45ef94b21b286ad2aed64f4c7faedfec7c78ceb6c284e90 -EBUILD wine-vanilla-7.0.1.ebuild 10270 BLAKE2B c4f0e913e525149e043e14597ef78ea26fb060cb5eafaa6d6678f6e493e50594134780bd472c8c66152c472461891380f776301cb067d552edd8c5737c5ccd35 SHA512 edfd32b54ec5ac60e6a8edf1d6c1a002fc270dd24d21775819ec325757de7892b098d0a463c6f98bf6fd44092798d2cf2335b0d4303adaf57eee0dc275b79b62 -EBUILD wine-vanilla-7.19.ebuild 10187 BLAKE2B 9008395c2c412674f26b5273ae83cdaad211eadfa70de7d75a7a336b0c3ed189ae0d2c60cd957c8c10f1bcdb22fe9c59a48f034b9e597ccf36c55540a374301c SHA512 9d0ae015c3a171768d01d769df742f66741e2d5fa14cfcbcd458e7ccabb7f7b98cabdcf1eff55b88a8b927c85e14aea7319e0edeac1ca57e60335144768f752e -EBUILD wine-vanilla-7.20.ebuild 10188 BLAKE2B 77c7365ec9c58166b07a13e4204bb0a0e2251816c502dbea050877cc19b7864b16e7c4513cac8ad2225137f70137808d58eec17469af09f1278263a87f5aba10 SHA512 db487e83f4bfded1b71a0d4b3ba1608cc46a9f5a767a78d2efb9bbd545038fba041c92234f851156fee5e637c13b3e76286a88139d250131320b45af4106fc8f -EBUILD wine-vanilla-7.21-r1.ebuild 10318 BLAKE2B 0b6c50edab0c79d522c20d2f59e062f9b01b51fe3aafd21f2adc4150156ba060029020c09f7d6a1c59b1ea0d22725beab85bdb908b447f9630d8951a3ef39025 SHA512 16fc2e67425af712f00bb8b952a03a717bff142461c29c6fde4df79e6ff97e9b6cf44a81521568e666638382efdaac53e0067b8fde8b867d92f69a256e0dcc83 -EBUILD wine-vanilla-7.22.ebuild 10290 BLAKE2B 5520ca47cd05a6ce11837819857cee2fc4d718ee8d7a2c14273f64d8d2f5280b4d063bf12b2462e8b38ba3010dc51859fbf0193e34a8bc6194759e0186bf36fd SHA512 ac5154d780d37c350f7078704efe4914bc733a6a1f72aa9ad74106e73b32c7580fbe54687e30f70754eca05f96eeed2b21083db10692bb67f799e2f64fdc9cd8 -EBUILD wine-vanilla-9999.ebuild 10290 BLAKE2B 5520ca47cd05a6ce11837819857cee2fc4d718ee8d7a2c14273f64d8d2f5280b4d063bf12b2462e8b38ba3010dc51859fbf0193e34a8bc6194759e0186bf36fd SHA512 ac5154d780d37c350f7078704efe4914bc733a6a1f72aa9ad74106e73b32c7580fbe54687e30f70754eca05f96eeed2b21083db10692bb67f799e2f64fdc9cd8 +EBUILD wine-vanilla-7.0.1.ebuild 10398 BLAKE2B 2325de4a59845efc0f10c7844f8a75494ed8d8cce7044bd1ac8047e0d84f72ff996cdac6f704e9b8b4577bd9d08c21da98a6a52cc13868ff80d833a0f8d2ed03 SHA512 256b737f5feffb260c625c4f06997576b38963f2e2a9ced73173a2973937cb097811556e42c7efcbbe58dd7b7244716193ca36fc9e13f1fe65846446691579e4 +EBUILD wine-vanilla-7.19.ebuild 10315 BLAKE2B 247a6f527c4751f59405dbc16a2d1da00c15d714ce730e2f05226f860867da63915a8d6b09b5dfddbec2b1cb5559eb406d9630a3941eba968307e2d1c7e08584 SHA512 f94993a24382d5e9263459fd2f35944b0d0ec0f8ccfdb18ac961b2a51bfe70d87c9d2542bb5db9339d3d3dcda308a29fba4a6cb8b9feb43083fcb12b3d04dbc5 +EBUILD wine-vanilla-7.20.ebuild 10316 BLAKE2B 7e8919a834ff05aeeb5f5e4543544113444c0cd7d158a6c98c8c4e3318ba280ae0ab46051d603087d9692ce03ffedca0c4a30d476d32e1398ff27835ad9314c4 SHA512 85159f62a306c34b41988bf3b738036758128060e3e21aca2b9c31a14d265ab69982a371c2c860ba8eabc443a94f305afc9109b1baf2a650a3455dac5b000582 +EBUILD wine-vanilla-7.21-r1.ebuild 10446 BLAKE2B 92aa8c07719e01d2ed4f8d0c94e702c684489ad8a24cd9035143e392e13fa551bd1f61979018ac46798e59724c80e48d9f00e8864c02b18ebb6c919d926a649c SHA512 1eeca0cf07cc202216a1846266cae31a562c9e0811dd29db739a8c05354a5f920d14e62094c54eb73da5b8301d7ce37a0f5a0857063e6f9576cfdb9c88a05ba6 +EBUILD wine-vanilla-7.22.ebuild 10418 BLAKE2B 67a75c5abd4d286f925993f3ff39dbb0eaabb80bb9ac4a5f8ac2f3264bd09e6461e8ae22cdceb7b0a338b0785dc36acc2f635328fea1ed554bf9d184265854c8 SHA512 8fabf1e573c35dbfc2766e78f5f012c659528e75188c680b55e73b90a44aedb366285f632e332d1d48c0788584c882663a00f3663273ac784d5b3f4292a02391 +EBUILD wine-vanilla-9999.ebuild 10418 BLAKE2B 67a75c5abd4d286f925993f3ff39dbb0eaabb80bb9ac4a5f8ac2f3264bd09e6461e8ae22cdceb7b0a338b0785dc36acc2f635328fea1ed554bf9d184265854c8 SHA512 8fabf1e573c35dbfc2766e78f5f012c659528e75188c680b55e73b90a44aedb366285f632e332d1d48c0788584c882663a00f3663273ac784d5b3f4292a02391 MISC metadata.xml 2376 BLAKE2B c37d5b769ce6ea0fd6ac0cde1084a332e34c13d31633d5c60970f89a932f621c0332b97b0667bbc42098a01c979919ac9d8d30487f2ad6691259270641b85485 SHA512 2968f0df88d5d95c0c649ae15cbc9088061c915046b2014448dad782a4abfa8cb173b6ec8ac15575329e5ce882342dfd1f5076a0ea8a2e89800fdc9628dc05f9 diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.0-r3.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.0-r3.ebuild deleted file mode 100644 index 653e8809117b..000000000000 --- a/app-emulation/wine-vanilla/wine-vanilla-7.0-r3.ebuild +++ /dev/null @@ -1,332 +0,0 @@ -# Copyright 2022 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.2 -WINE_MONO=7.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 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 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" -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}] - ) - ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] ) - openal? ( media-libs/openal[${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}] ) - 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}] ) - vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] )" -RDEPEND=" - ${WINE_COMMON_DEPEND} - app-emulation/wine-desktop-common - dos? ( games-emulation/dosbox ) - 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[${MULTILIB_USEDEP}] ) ) - nls? ( sys-devel/gettext )" -IDEPEND="app-eselect/eselect-wine" - -QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext - -PATCHES=( - "${FILESDIR}"/${PN}-7.0-noexecstack.patch - "${FILESDIR}"/${PN}-7.0-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 ldap) - $(use_with mingw) - $(use_with netapi) - $(use_with nls gettext) - $(use_with openal) - $(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 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 vkd3d) - $(use_with vulkan) - $(use_with xcomposite) - $(use_with xinerama) - $(usev !odbc ac_cv_lib_soname_odbc=) - ) - - tc-ld-force-bfd #867097 - use custom-cflags || strip-flags # can break in obscure ways, also no lto - 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 - - # CROSSCC_amd64/x86 are unused by Wine, but recognized here for users - if (( bits == 64 )); then - : "${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}}" - - # use *FLAGS for mingw, but strip unsupported (e.g. --hash-style=gnu) - if use mingw; then - : "${CROSSCFLAGS:=$( - filter-flags '-fstack-clash-protection' #758914 - 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{CC,{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* -} - -wine-eselect() { - ebegin "${1^}ing ${P} using eselect-wine" - eselect wine ${1} ${P} && - eselect wine ${1} --${PN#wine-} ${P} && - eselect wine update --if-unset && - eselect wine update --${PN#wine-} --if-unset - eend ${?} || die -n "eselect failed, may need to manually handle ${P}" -} - -pkg_postinst() { - wine-eselect register -} - -pkg_prerm() { - if [[ ${REPLACED_BY_VERSION%-r*} != ${PV} ]]; then #881035 - nonfatal wine-eselect deregister - fi -} diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.0.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.0.1.ebuild index c0992e01230c..e17d6a292d1b 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-7.0.1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-7.0.1.ebuild @@ -218,8 +218,10 @@ src_configure() { $(usev !odbc ac_cv_lib_soname_odbc=) ) - tc-ld-force-bfd #867097 - use custom-cflags || strip-flags # can break in obscure ways, also no lto + 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 diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.19.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.19.ebuild index 69628d775f7e..5619b8ebd018 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-7.19.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-7.19.ebuild @@ -216,8 +216,10 @@ src_configure() { $(usev !odbc ac_cv_lib_soname_odbc=) ) - tc-ld-force-bfd #867097 - use custom-cflags || strip-flags # can break in obscure ways, also no lto + 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 diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.20.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.20.ebuild index e1d2da19d47b..883a0f427034 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-7.20.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-7.20.ebuild @@ -216,8 +216,10 @@ src_configure() { $(usev !odbc ac_cv_lib_soname_odbc=) ) - tc-ld-force-bfd #867097 - use custom-cflags || strip-flags # can break in obscure ways, also no lto + 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 diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.21-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.21-r1.ebuild index 38fe963828ae..ed18a224f6b5 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-7.21-r1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-7.21-r1.ebuild @@ -218,8 +218,10 @@ src_configure() { $(usev !odbc ac_cv_lib_soname_odbc=) ) - tc-ld-force-bfd #867097 - use custom-cflags || strip-flags # can break in obscure ways, also no lto + 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 diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.22.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.22.ebuild index b73eb356b435..02df0a4439ca 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-7.22.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-7.22.ebuild @@ -213,8 +213,10 @@ src_configure() { $(usev !odbc ac_cv_lib_soname_odbc=) ) - tc-ld-force-bfd #867097 - use custom-cflags || strip-flags # can break in obscure ways, also no lto + 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 diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild index b73eb356b435..02df0a4439ca 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild @@ -213,8 +213,10 @@ src_configure() { $(usev !odbc ac_cv_lib_soname_odbc=) ) - tc-ld-force-bfd #867097 - use custom-cflags || strip-flags # can break in obscure ways, also no lto + 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 -- cgit v1.2.3