From e33383d972aad8129fd4c1ee2b87f529f6efa8e9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 24 Nov 2022 01:09:44 +0000 Subject: gentoo auto-resync : 24:11:2022 - 01:09:44 --- .../wine-proton/wine-proton-7.0.9999.ebuild | 27 +++++++++------------- 1 file changed, 11 insertions(+), 16 deletions(-) (limited to 'app-emulation/wine-proton/wine-proton-7.0.9999.ebuild') diff --git a/app-emulation/wine-proton/wine-proton-7.0.9999.ebuild b/app-emulation/wine-proton/wine-proton-7.0.9999.ebuild index 6206f63f753b..7906e159577b 100644 --- a/app-emulation/wine-proton/wine-proton-7.0.9999.ebuild +++ b/app-emulation/wine-proton/wine-proton-7.0.9999.ebuild @@ -96,12 +96,13 @@ DEPEND=" BDEPEND=" ${PYTHON_DEPS} dev-lang/perl + sys-devel/binutils sys-devel/bison sys-devel/flex virtual/pkgconfig nls? ( sys-devel/gettext ) !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )" -IDEPEND=">=app-eselect/eselect-wine-1.2.2-r1" +IDEPEND=">=app-eselect/eselect-wine-2" QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext @@ -217,6 +218,11 @@ src_configure() { 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 @@ -299,27 +305,16 @@ src_install() { readme.gentoo_create_doc } -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_preinst() { has_version ${CATEGORY}/${PN} && WINE_HAD_ANY_SLOT= } pkg_postinst() { - wine-eselect register - [[ -v WINE_HAD_ANY_SLOT ]] || readme.gentoo_print_elog + + eselect wine update --if-unset || die } -pkg_prerm() { - if [[ ${REPLACED_BY_VERSION%-r*} != ${PV} ]]; then #881035 - nonfatal wine-eselect deregister - fi +pkg_postrm() { + eselect wine update --if-unset || die } -- cgit v1.2.3