commit:     642292ccf44114fcf7a078514d5658368c769d5f
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 23 22:15:28 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Sep 24 00:22:49 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=642292cc

app-emulation/wine-vanilla: add 7.18

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

 app-emulation/wine-vanilla/Manifest                |   1 +
 .../wine-vanilla/wine-vanilla-7.18.ebuild          | 318 +++++++++++++++++++++
 2 files changed, 319 insertions(+)

diff --git a/app-emulation/wine-vanilla/Manifest 
b/app-emulation/wine-vanilla/Manifest
index adcfb5397382..841ce6b8852e 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -2,3 +2,4 @@ DIST gentoo-wine-patches-20211122.tar.xz 59796 BLAKE2B 
21460e6adf4934a52f8841f76
 DIST wine-7.0.tar.xz 27120912 BLAKE2B 
84bfeb28d56f0f40bb93b1b5bf8954c8be2fd90fde5a61608e7c35f48addcce7a4d660e63c3caa3ca2c365d1e83b55a1c3485872b2d6bfa8941e2bce44c4aca6
 SHA512 
eec17b046ed5447eb540f421c9b2748d9419ce087496c2743a9914fd27bbe5ff9da0cfe47d3cd76fa97323bd1188a1d82b1eef4968d86ed1957dc1a95e28529c
 DIST wine-7.16.tar.xz 28345428 BLAKE2B 
6540dd196639c5b3e01af801439e4ca8d3d17ce6b9832c3ab7d0263909e0a963a5901b8baad00537242c32599af92d04ad58c9f51660583e28693b4ec1bdd803
 SHA512 
5085c7c1b0e762c508f33775f7f0aa41e94cb75805bb649093addad25f90f7f57d5101ba96227f58a6f18b3ae228bd004df11ec1c033692ad130e9b5279ea19e
 DIST wine-7.17.tar.xz 28379876 BLAKE2B 
536af8f1ac9c4dd8bae2d16cba226c99c45cd64f0a9a2569022baefee61556801d3ee15f480fd18445baecb6c78dd7950f98542dc88a3282ee5d457d0e4ddfb1
 SHA512 
fd8017e6174db0047a3957db3045b2ad9024e07b1e2f81800521f0b7e7f7660add6a08e09bc60e3d140816cec70aae8324fe15643bd05e541f22f66ffda52508
+DIST wine-7.18.tar.xz 28412876 BLAKE2B 
1f25c8669a2afbead142923a39913b3f21df641e446a6136e7ecd282f6c31bc70578036e83f3dd28d22516d987ddca179198f76effb5c9aca089f4755ffa873e
 SHA512 
e651b18cef73b4619e953b746d0c207c0220279003560aaf195c2569a22308af129e1460651a246e6a87dcfbcfcff08f52f970734035eb55ab45d8970fd56a02

diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.18.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-7.18.ebuild
new file mode 100644
index 000000000000..ac4a2a6be890
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.18.ebuild
@@ -0,0 +1,318 @@
+# 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.3
+WINE_MONO=7.3.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/";
+
+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 +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}] )"
+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/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 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}
+
+       # 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-protector*' #870136
+                               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() {
+       nonfatal wine-eselect deregister
+}

Reply via email to