commit:     6f134ef918517d208d1b2b0f25b5dd5b272b057e
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  9 22:13:43 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Feb  9 22:35:04 2024 +0000
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 <ionen <AT> 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 
2e1c135d1c247f4b268c0323538748944b01fe65c82dee27d81f70613aa2fe632c1b4d696f05838a6ab801579a4d13a191de0f4c1a2e2222d40ca767499a98c3
 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..000000000000
--- 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} == *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 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? ( 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}]
-               x11-libs/libxkbcommon[${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}]
-               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? (
-               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="
-       || (
-               sys-devel/binutils
-               sys-devel/lld
-       )
-       dev-lang/perl
-       sys-devel/bison
-       sys-devel/flex
-       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 )"
-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
-       "${FILESDIR}"/${PN}-8.13-rpath.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}) \
-                       $(use abi_x86_32 || use wow64 && echo 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
-
-       if tc-is-clang; then
-               if use mingw; then
-                       # -mabi=ms was ignored by <clang:16 then turned error 
in :17
-                       # if used without --target *-windows, then gets used in 
install
-                       # phase despite USE=mingw, drop as a quick fix for now
-                       sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die
-               else
-                       # fails in ./configure unless --enable-archs is passed, 
allow to
-                       # bypass with EXTRA_ECONF but is currently considered 
unsupported
-                       # (by Gentoo) as additional work is needed for (proper) 
support
-                       # note: also fails w/ :17, but unsure if safe to drop 
w/o mingw
-                       [[ ${EXTRA_ECONF} == *--enable-archs* ]] ||
-                               die "building ${PN} with clang is only 
supported with USE=mingw"
-               fi
-       fi
-
-       # 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
-       # 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() {
-       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
-
-               $(usev wow64 --enable-archs=x86_64,i386)
-
-               $(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=)
-       )
-
-       filter-lto # build failure
-       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)
-       # (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}
-
-               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}}
-               local 
mingwcc_x86=${CROSSCC:-${CROSSCC_x86:-i686-w64-mingw32-gcc}}
-               local -n mingwcc=mingwcc_$(usex abi_x86_64 amd64 x86)
-
-               conf+=(
-                       ac_cv_prog_x86_64_CC="${mingwcc_amd64}"
-                       ac_cv_prog_i386_CC="${mingwcc_x86}"
-
-                       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}
-                       )}"
-
-                       CROSSLDFLAGS="${CROSSLDFLAGS:-$(
-                               filter-flags '-fuse-ld=*'
-
-                               CC=${mingwcc} test-flags-CCLD ${LDFLAGS}
-                       )}"
-               )
-       fi
-
-       # order matters with multilib: 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
-
-               if (( bits == 64 )); then
-                       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
-
-               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
-
-       # 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 \
-               "${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() {
-       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 the experimental/WIP USE=wow64 can allow 32bit 
without multilib."
-       elif 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
-}
-
-pkg_postrm() {
-       eselect wine update --if-unset || die
-}

Reply via email to