app-emulation/wine-vanilla: Drop old
authorNick Sarnie <sarnex@gentoo.org>
Mon, 30 Apr 2018 01:55:58 +0000 (21:55 -0400)
committerNick Sarnie <sarnex@gentoo.org>
Mon, 30 Apr 2018 01:56:58 +0000 (21:56 -0400)
Package-Manager: Portage-2.3.31, Repoman-2.3.9

app-emulation/wine-vanilla/Manifest
app-emulation/wine-vanilla/wine-vanilla-2.20.ebuild [deleted file]
app-emulation/wine-vanilla/wine-vanilla-2.21.ebuild [deleted file]
app-emulation/wine-vanilla/wine-vanilla-2.22.ebuild [deleted file]
app-emulation/wine-vanilla/wine-vanilla-3.1.ebuild [deleted file]
app-emulation/wine-vanilla/wine-vanilla-3.2.ebuild [deleted file]

index 5e0453c1e0fb244ebd21c1c4d3edc303043bdb54..fdc29151759937e422d216801271694e8bada218 100644 (file)
@@ -4,12 +4,7 @@ DIST wine-2.0.2.tar.xz 18854952 BLAKE2B ae55b6a31e4d36b367a84e0e5fa7bea8c39a61ec
 DIST wine-2.0.3.tar.xz 18864648 BLAKE2B 0503a11e7545d5af805bfc3c2f614b6e35e39b7b532ee45dd9947e1a9a53eb788a304e744c683e42bf84f0e67e2c046ea5f839b6bbad1cf73b9996eaae5c30c1 SHA512 e20dbcb3a48ecb3526eba075d4baebab2529dfc50b7a6d5e18294704470f61db386013f457118c270274b911f9643d203110f46558d23e84e6a6c2d78e237dbb
 DIST wine-2.0.4.tar.xz 18898148 BLAKE2B a21c920e1cf15e064bc6b37067a11a5568f8d1906783c200236456b73947bbd24212208ab1bcc2ca526ed40d8b2e80a2dc5d95db1a8d356a484213afb6897f59 SHA512 8fccb93e5ebe482ed81e948e3b7f87d4fe5b1f838a10f9cdcafa9561de4ef54b7d5acdc292bf28ad3aaf44be34c5ad8452ebbfc39f49f95fcbe9f9d0fcfc862c
 DIST wine-2.0.tar.bz2 23662707 BLAKE2B 1d485c1359ce8a0395a9f6378c1f8be33ea2836b80390d1eb1095057a0acedd21708daab16e1851a315391b9f9b0a360879b9d98c73bcc8371c5023e9a8037f5 SHA512 b0a57ba8202d9fc396e5bfb7a7718d6bababbed8f3351e7fdc36afa37f35a871e04903757618f73427aeb71a52b2d323977d79e48f8b38d636f23fd404441186
-DIST wine-2.20.tar.xz 19597556 BLAKE2B 80a9886fa77e5788b143521288f7d83c92754610c9426e58c759d2c33767bd23f7d2a44a17ceeec0bfe9065264393e0aa1087a0827ea7d438ffd938ba2eb2fb5 SHA512 d8d374d1e690ce9d3964fc81054fb7f4cd56cbae6bc44ebbf80b7dc7f04524baa2bd831e0be8f00de4cb0e14c1cb71780d424f5dcb9851fcaed9fb22f5ce5d23
-DIST wine-2.21.tar.xz 19620888 BLAKE2B 26d19c5805db58b53530b80eda3ab229f7961542d398cb0e74155e5341de8b484d301c263653ae50e953588538f6782a9b2200b822ba66f091e65d259e07db8e SHA512 4e33c463debe637827ed65f1118e692832bb5374491f706f9d251b8a2956e20d2df5d90ceba218b9bc9e946de91b8ba1d96b460453f59cdd9d82f070d07e0c43
-DIST wine-2.22.tar.xz 19635032 BLAKE2B 30534fb37ee0fe7b9f20309797240e461f14bc09ef1927e2c03e16cb136b83031ff186d29cc1092600ac53ede9533d0ddad6d4312e501e97201b0c632fedaae5 SHA512 14ecc25c3012c4eb9b1d3207372d0a4187f62593f986caca3196811b8aac0a7b898ae9acd94c707e0d63b6702019cf5051a964ada606b1ff8fb034bb353116bb
 DIST wine-3.0.tar.xz 19712932 BLAKE2B 4478c6781bb171ecca426d1fdc85e0d0bbe13b62b6c983933de55e2abdd0bda7a01cbf251c021824b00129ea6230d1d4e718a64b7d919bb5c07a106b8771adb6 SHA512 a51f41b66f4805e09b223528eff6670e94b9c0c0c947be647507baf9d8d9afe7c3fdc88684c2c8d3573b4739d9a086ab929a744a8594d3c8f6ceb52070f43f0a
-DIST wine-3.1.tar.xz 19730700 BLAKE2B 287cc42474a9cc57eb7f4b5db2ba79ac5ec8742dffb5367c189f19465cc69bcf78b10fe62ffe6f84ae1360f639a899a7f19128e30e1d9a5b8bbd63deb85e7650 SHA512 49c30d820b8f4028935b4d90dd6251c881cb8cd41bde8833db2782f04111a3d111e24605a87b2d70e419d54cfb6bb42d941f4593f9b381812e3602bf1307c545
-DIST wine-3.2.tar.xz 19793180 BLAKE2B 014256734f4c1d70c81115ba6c470f8264746b57be663d81f7e54593fb328a548da00c5e52438af75d923a3c6c5d3997097bd76cf1856b99f0f921f36e5151da SHA512 94b4903d628bf7aacd712a2bf566b53161880bf28311611106776df222222f592edb212d491f02e4c1b0c60d88e4b4a126981d445d1e18018238ff993c6c3092
 DIST wine-3.5.tar.xz 19963436 BLAKE2B 83d7c0719a088f8c705f7a9d8a6df6b9ee5e0a5ffa57c0a921875097be29298bebb9025222039432c65da32359e187a93413e04a5bb73171f0033911595baf9f SHA512 c1e36f3db862fdedd00c3ac20c84c6eb799b53fe32e959b481a6168baf7d9725ed9bd0a97e7f9b651e3ccfba4f8fb623445369be03fde5010ed0fcb0a53e7d3f
 DIST wine-3.6.tar.xz 20005240 BLAKE2B 6dd48180b9aed8a3b69c40b3ed7b2ff5adbebfb591860dda6603d2219f9059bc069df000cd2614c80d34911c451388f0124af3dd8a11b806b227ca8e16659d71 SHA512 31d24cc78734bdb743afcec7df05b641ab0625568361401eaf8cd5e217719c8c51a0ef7ed737a560fe42cb9ecd88f10d35e62a98d9df69b966502a5b0dab5a22
 DIST wine-3.7.tar.xz 20454036 BLAKE2B 04ac94d5679377c5d0bb37a6d3e8e3ec7c09faa300f8422a09a22b14ef4244d2bb14c80a47cfca5e11526506a8064f0cfa4e28868d7f04669f85ab743dbbb36d SHA512 a699418574dd8f407c064421cf6cdfe3923562c8adf9a7749e716f3853291eab05358ea64f0217c303c26c0f8f59d2116024b7b6978f9a52a055147e689a8694
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.20.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.20.ebuild
deleted file mode 100644 (file)
index 40d354c..0000000
+++ /dev/null
@@ -1,525 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-       EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
-       EGIT_BRANCH="master"
-       inherit git-r3
-       SRC_URI=""
-       #KEYWORDS=""
-else
-       MAJOR_V=$(get_version_component_range 1)
-       SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
-       KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-fi
-S="${WORKDIR}/${MY_P}"
-
-GWP_V="20180120"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
-       https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-       X? ( truetype )
-       elibc_glibc? ( threads )
-       osmesa? ( opengl )
-       test? ( abi_x86_32 )" # osmesa-opengl #286560 # X-truetype #551124
-
-# FIXME: the test suite is unsuitable for us; many tests require net access
-# or fail due to Xvfb's opengl limitations.
-RESTRICT="test"
-
-COMMON_DEPEND="
-       X? (
-               x11-libs/libXcursor[${MULTILIB_USEDEP}]
-               x11-libs/libXext[${MULTILIB_USEDEP}]
-               x11-libs/libXfixes[${MULTILIB_USEDEP}]
-               x11-libs/libXrandr[${MULTILIB_USEDEP}]
-               x11-libs/libXi[${MULTILIB_USEDEP}]
-               x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-       )
-       alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-       capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
-       cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
-       fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
-       gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-       gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
-       gstreamer? (
-               media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-               media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
-       )
-       jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
-       kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
-       lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
-       ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
-       mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
-       ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
-       netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
-       nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
-       odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
-       openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
-       opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-       opengl? (
-               virtual/glu[${MULTILIB_USEDEP}]
-               virtual/opengl[${MULTILIB_USEDEP}]
-       )
-       osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
-       pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-       png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
-       pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-       scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
-       ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
-       truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
-       udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
-       udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-       v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-       xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-       xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-       xml? (
-               dev-libs/libxml2[${MULTILIB_USEDEP}]
-               dev-libs/libxslt[${MULTILIB_USEDEP}]
-       )"
-
-RDEPEND="${COMMON_DEPEND}
-       app-emulation/wine-desktop-common
-       >app-eselect/eselect-wine-0.3
-       !app-emulation/wine:0
-       dos? ( >=games-emulation/dosbox-0.74_p20160629 )
-       gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
-       mono? ( app-emulation/wine-mono:4.7.1 )
-       perl? (
-               dev-lang/perl
-               dev-perl/XML-Simple
-       )
-       pulseaudio? (
-               realtime? ( sys-auth/rtkit )
-       )
-       samba? ( >=net-fs/samba-3.0.25[winbind] )
-       selinux? ( sec-policy/selinux-wine )
-       udisks? ( sys-fs/udisks:2 )"
-
-# tools/make_requests requires perl
-DEPEND="${COMMON_DEPEND}
-       sys-devel/flex
-       >=sys-kernel/linux-headers-2.6
-       virtual/pkgconfig
-       virtual/yacc
-       X? ( x11-base/xorg-proto )
-       prelink? ( sys-devel/prelink )
-       xinerama? ( x11-base/xorg-proto )"
-
-# These use a non-standard "Wine" category, which is provided by
-# /etc/xdg/applications-merged/wine.menu
-QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
-usr/share/applications/wine-notepad.desktop
-usr/share/applications/wine-uninstaller.desktop
-usr/share/applications/wine-winecfg.desktop"
-
-PATCHES=(
-       "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
-       "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
-       "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
-       "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-       "${PATCHDIR}/patches/${MY_PN}-2.0-rearrange-manpages.patch" #469418 #617864
-)
-PATCHES_BIN=()
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
-       DEPEND+=" dev-util/patchbin"
-fi
-
-wine_compiler_check() {
-       [[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-       # GCC-specific bugs
-       if tc-is-gcc; then
-               # bug #549768
-               if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
-                       ebegin "Checking for gcc-5 ms_abi compiler bug"
-                       $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
-                       # Run in subshell to prevent "Aborted" message
-                       ( "${T}"/pr66838 || false ) >/dev/null 2>&1
-                       if ! eend $?; then
-                               eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
-                               eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
-                               eerror "or use gcc-config to select a different compiler version."
-                               eerror "See https://bugs.gentoo.org/549768"
-                               eerror
-                               return 1
-                       fi
-               fi
-               # bug #574044
-               if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
-                       ebegin "Checking for gcc-5-3 stack realignment compiler bug"
-                       # Compile in subshell to prevent "Aborted" message
-                       ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
-                       if ! eend $?; then
-                               eerror "Wine cannot be built with this version of gcc-5.3"
-                               eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
-                               eerror "or use gcc-config to select a different compiler version."
-                               eerror "See https://bugs.gentoo.org/574044"
-                               eerror
-                               return 1
-                       fi
-               fi
-       fi
-
-       # Ensure compiler support
-       if use abi_x86_64; then
-               ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
-               # Compile in subshell to prevent "Aborted" message
-               ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
-               if ! eend $?; then
-                       eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
-                       eerror
-                       eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
-                       eerror
-                       return 1
-               fi
-       fi
-}
-
-wine_build_environment_check() {
-       [[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-       if use abi_x86_64; then
-               if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
-                       eerror "You need gcc-4.4+ to compile 64-bit wine"
-                       die
-               elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
-                       eerror "You need clang-3.8+ to compile 64-bit wine"
-                       die
-               fi
-       fi
-       if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
-               ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
-               ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
-               ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
-       fi
-       if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
-               if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
-                       ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
-                       ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
-                       ewarn "See package.env in man 5 portage for more information on how to do this."
-                       ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
-               fi
-       fi
-
-       if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
-               eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
-               eerror "See https://bugs.gentoo.org/487864 for more details."
-               eerror
-               return 1
-       fi
-}
-
-wine_env_vcs_vars() {
-       local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
-       local pn_live_val="${pn_live_var}"
-       eval pn_live_val='$'${pn_live_val}
-       if [[ ! -z ${EGIT_COMMIT} ]]; then
-               eerror "Commits must now be specified using the environmental variables"
-               eerror "WINE_COMMIT"
-               eerror
-               return 1
-       fi
-}
-
-pkg_pretend() {
-       wine_build_environment_check || die
-
-       # Verify OSS support
-       if use oss && ! use kernel_FreeBSD; then
-               if ! has_version ">=media-sound/oss-4"; then
-                       eerror "You cannot build wine with USE=oss without having support from a"
-                       eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
-                       eerror
-                       die
-               fi
-       fi
-}
-
-pkg_setup() {
-       wine_build_environment_check || die
-       wine_env_vcs_vars || die
-
-       WINE_VARIANT="${PN#wine}-${PV}"
-       WINE_VARIANT="${WINE_VARIANT#-}"
-
-       MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
-       MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
-       MY_DATADIR="${MY_DATAROOTDIR}"
-       MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-       MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
-       MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
-       MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
-       MY_MANDIR="${MY_DATADIR}/man"
-}
-
-src_unpack() {
-       if [[ ${PV} == "9999" ]] ; then
-               EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
-       fi
-
-       default
-
-       l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
-       eapply_bin(){
-               local patch
-               for patch in ${PATCHES_BIN[@]}; do
-                       patchbin --nogit < "${patch}" || die
-               done
-       }
-
-       local md5="$(md5sum server/protocol.def)"
-
-       default
-       eapply_bin
-       eautoreconf
-
-       # Modification of the server protocol requires regenerating the server requests
-       if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
-               einfo "server/protocol.def was patched; running tools/make_requests"
-               tools/make_requests || die #432348
-       fi
-       sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
-       if ! use run-exes; then
-               sed -i '/^MimeType/d' loader/wine.desktop || die #117785
-       fi
-
-       # Edit wine.desktop to work for specific variant
-       sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
-
-       # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
-       cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
-
-       l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
-
-       # Fix manpage generation for locales #469418 and abi_x86_64 #617864
-       # Requires wine-2.0-rearrange-manpages.patch
-
-       # Duplicate manpages input files for wine64
-       local f
-       for f in loader/*.man.in; do
-               cp ${f} ${f/wine/wine64} || die
-       done
-       # Add wine64 manpages to Makefile
-       if use abi_x86_64; then
-               sed -i "/wine.man.in/i \
-                       \\\twine64.man.in \\\\" loader/Makefile.in || die
-               sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
-\164\2/' loader/Makefile.in || die
-       fi
-
-       rm_man_file(){
-               local file="${1}"
-               loc=${2}
-               sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
-       }
-
-       while read f; do
-               l10n_for_each_disabled_locale_do rm_man_file "${f}"
-       done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
-}
-
-src_configure() {
-       wine_compiler_check || die
-
-       export LDCONFIG=/bin/true
-       use custom-cflags || strip-flags
-
-       multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-       local myconf=(
-               --prefix="${MY_PREFIX}"
-               --datarootdir="${MY_DATAROOTDIR}"
-               --datadir="${MY_DATADIR}"
-               --docdir="${MY_DOCDIR}"
-               --includedir="${MY_INCLUDEDIR}"
-               --libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
-               --libexecdir="${MY_LIBEXECDIR}"
-               --localstatedir="${MY_LOCALSTATEDIR}"
-               --mandir="${MY_MANDIR}"
-               --sysconfdir=/etc/wine
-               $(use_with alsa)
-               $(use_with capi)
-               $(use_with lcms cms)
-               $(use_with cups)
-               $(use_with ncurses curses)
-               $(use_with udisks dbus)
-               $(use_with fontconfig)
-               $(use_with ssl gnutls)
-               $(use_enable gecko mshtml)
-               $(use_with gphoto2 gphoto)
-               $(use_with gsm)
-               $(use_with gstreamer)
-               --without-hal
-               $(use_with jpeg)
-               $(use_with kerberos krb5)
-               $(use_with ldap)
-               $(use_enable mono mscoree)
-               $(use_with mp3 mpg123)
-               $(use_with netapi)
-               $(use_with nls gettext)
-               $(use_with openal)
-               $(use_with opencl)
-               $(use_with opengl)
-               $(use_with osmesa)
-               $(use_with oss)
-               $(use_with pcap)
-               $(use_with png)
-               $(use_with pulseaudio pulse)
-               $(use_with threads pthread)
-               $(use_with scanner sane)
-               $(use_enable test tests)
-               $(use_with truetype freetype)
-               $(use_with udev)
-               $(use_with v4l)
-               $(use_with X x)
-               $(use_with X xfixes)
-               $(use_with xcomposite)
-               $(use_with xinerama)
-               $(use_with xml)
-               $(use_with xml xslt)
-       )
-
-       local PKG_CONFIG AR RANLIB
-       # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
-       # set AR and RANLIB to make QA scripts happy; #483342
-       tc-export PKG_CONFIG AR RANLIB
-
-       if use amd64; then
-               if [[ ${ABI} == amd64 ]]; then
-                       myconf+=( --enable-win64 )
-               else
-                       myconf+=( --disable-win64 )
-               fi
-
-               # Note: using --with-wine64 results in problems with multilib.eclass
-               # CC/LD hackery. We're using separate tools instead.
-       fi
-
-       ECONF_SOURCE=${S} \
-       econf "${myconf[@]}"
-       emake depend
-}
-
-multilib_src_test() {
-       # FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
-       if [[ ${ABI} == x86 ]]; then
-               if [[ $(id -u) == 0 ]]; then
-                       ewarn "Skipping tests since they cannot be run under the root user."
-                       ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
-                       return
-               fi
-
-               WINEPREFIX="${T}/.wine-${ABI}" \
-               Xemake test
-       fi
-}
-
-multilib_src_install_all() {
-       local DOCS=( ANNOUNCE AUTHORS README )
-       add_locale_docs() {
-               local locale_doc="documentation/README.$1"
-               [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
-       }
-       l10n_for_each_locale_do add_locale_docs
-
-       einstalldocs
-       prune_libtool_files --all
-
-       if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
-               rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
-                       "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
-       fi
-
-       # Remove wineconsole if neither backend is installed #551124
-       if ! use X && ! use ncurses; then
-               rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
-               rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
-               rm_wineconsole() {
-                       rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
-               }
-               multilib_foreach_abi rm_wineconsole
-       fi
-
-       use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
-       use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
-
-       if use abi_x86_64 && ! use abi_x86_32; then
-               dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
-               dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
-       fi
-
-       # Failglob for binloops, shouldn't be necessary, but including to stay safe
-       eshopts_push -s failglob #615218
-       # Make wrappers for binaries for handling multiple variants
-       # Note: wrappers instead of symlinks because some are shell which use basename
-       local b
-       for b in "${D%/}${MY_PREFIX}"/bin/*; do
-               make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
-       done
-       eshopts_pop
-}
-
-pkg_postinst() {
-       eselect wine register ${P}
-       if [[ ${PN} == "wine-vanilla" ]]; then
-               eselect wine register --vanilla ${P} || die
-       fi
-
-       eselect wine update --all --if-unset || die
-
-       xdg_desktop_database_update
-
-       if ! use gecko; then
-               ewarn "Without Wine Gecko, wine prefixes will not have a default"
-               ewarn "implementation of iexplore.  Many older windows applications"
-               ewarn "rely upon the existence of an iexplore implementation, so"
-               ewarn "you will likely need to install an external one, like via winetricks"
-       fi
-       if ! use mono; then
-               ewarn "Without Wine Mono, wine prefixes will not have a default"
-               ewarn "implementation of .NET.  Many windows applications rely upon"
-               ewarn "the existence of a .NET implementation, so you will likely need"
-               ewarn "to install an external one, like via winetricks"
-       fi
-}
-
-pkg_prerm() {
-       eselect wine deregister ${P}
-       if [[ ${PN} == "wine-vanilla" ]]; then
-               eselect wine deregister --vanilla ${P} || die
-       fi
-
-       eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
-       xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.21.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.21.ebuild
deleted file mode 100644 (file)
index 40d354c..0000000
+++ /dev/null
@@ -1,525 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-       EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
-       EGIT_BRANCH="master"
-       inherit git-r3
-       SRC_URI=""
-       #KEYWORDS=""
-else
-       MAJOR_V=$(get_version_component_range 1)
-       SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
-       KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-fi
-S="${WORKDIR}/${MY_P}"
-
-GWP_V="20180120"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
-       https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-       X? ( truetype )
-       elibc_glibc? ( threads )
-       osmesa? ( opengl )
-       test? ( abi_x86_32 )" # osmesa-opengl #286560 # X-truetype #551124
-
-# FIXME: the test suite is unsuitable for us; many tests require net access
-# or fail due to Xvfb's opengl limitations.
-RESTRICT="test"
-
-COMMON_DEPEND="
-       X? (
-               x11-libs/libXcursor[${MULTILIB_USEDEP}]
-               x11-libs/libXext[${MULTILIB_USEDEP}]
-               x11-libs/libXfixes[${MULTILIB_USEDEP}]
-               x11-libs/libXrandr[${MULTILIB_USEDEP}]
-               x11-libs/libXi[${MULTILIB_USEDEP}]
-               x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-       )
-       alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-       capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
-       cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
-       fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
-       gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-       gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
-       gstreamer? (
-               media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-               media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
-       )
-       jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
-       kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
-       lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
-       ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
-       mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
-       ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
-       netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
-       nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
-       odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
-       openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
-       opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-       opengl? (
-               virtual/glu[${MULTILIB_USEDEP}]
-               virtual/opengl[${MULTILIB_USEDEP}]
-       )
-       osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
-       pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-       png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
-       pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-       scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
-       ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
-       truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
-       udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
-       udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-       v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-       xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-       xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-       xml? (
-               dev-libs/libxml2[${MULTILIB_USEDEP}]
-               dev-libs/libxslt[${MULTILIB_USEDEP}]
-       )"
-
-RDEPEND="${COMMON_DEPEND}
-       app-emulation/wine-desktop-common
-       >app-eselect/eselect-wine-0.3
-       !app-emulation/wine:0
-       dos? ( >=games-emulation/dosbox-0.74_p20160629 )
-       gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
-       mono? ( app-emulation/wine-mono:4.7.1 )
-       perl? (
-               dev-lang/perl
-               dev-perl/XML-Simple
-       )
-       pulseaudio? (
-               realtime? ( sys-auth/rtkit )
-       )
-       samba? ( >=net-fs/samba-3.0.25[winbind] )
-       selinux? ( sec-policy/selinux-wine )
-       udisks? ( sys-fs/udisks:2 )"
-
-# tools/make_requests requires perl
-DEPEND="${COMMON_DEPEND}
-       sys-devel/flex
-       >=sys-kernel/linux-headers-2.6
-       virtual/pkgconfig
-       virtual/yacc
-       X? ( x11-base/xorg-proto )
-       prelink? ( sys-devel/prelink )
-       xinerama? ( x11-base/xorg-proto )"
-
-# These use a non-standard "Wine" category, which is provided by
-# /etc/xdg/applications-merged/wine.menu
-QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
-usr/share/applications/wine-notepad.desktop
-usr/share/applications/wine-uninstaller.desktop
-usr/share/applications/wine-winecfg.desktop"
-
-PATCHES=(
-       "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
-       "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
-       "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
-       "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-       "${PATCHDIR}/patches/${MY_PN}-2.0-rearrange-manpages.patch" #469418 #617864
-)
-PATCHES_BIN=()
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
-       DEPEND+=" dev-util/patchbin"
-fi
-
-wine_compiler_check() {
-       [[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-       # GCC-specific bugs
-       if tc-is-gcc; then
-               # bug #549768
-               if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
-                       ebegin "Checking for gcc-5 ms_abi compiler bug"
-                       $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
-                       # Run in subshell to prevent "Aborted" message
-                       ( "${T}"/pr66838 || false ) >/dev/null 2>&1
-                       if ! eend $?; then
-                               eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
-                               eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
-                               eerror "or use gcc-config to select a different compiler version."
-                               eerror "See https://bugs.gentoo.org/549768"
-                               eerror
-                               return 1
-                       fi
-               fi
-               # bug #574044
-               if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
-                       ebegin "Checking for gcc-5-3 stack realignment compiler bug"
-                       # Compile in subshell to prevent "Aborted" message
-                       ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
-                       if ! eend $?; then
-                               eerror "Wine cannot be built with this version of gcc-5.3"
-                               eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
-                               eerror "or use gcc-config to select a different compiler version."
-                               eerror "See https://bugs.gentoo.org/574044"
-                               eerror
-                               return 1
-                       fi
-               fi
-       fi
-
-       # Ensure compiler support
-       if use abi_x86_64; then
-               ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
-               # Compile in subshell to prevent "Aborted" message
-               ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
-               if ! eend $?; then
-                       eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
-                       eerror
-                       eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
-                       eerror
-                       return 1
-               fi
-       fi
-}
-
-wine_build_environment_check() {
-       [[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-       if use abi_x86_64; then
-               if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
-                       eerror "You need gcc-4.4+ to compile 64-bit wine"
-                       die
-               elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
-                       eerror "You need clang-3.8+ to compile 64-bit wine"
-                       die
-               fi
-       fi
-       if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
-               ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
-               ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
-               ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
-       fi
-       if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
-               if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
-                       ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
-                       ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
-                       ewarn "See package.env in man 5 portage for more information on how to do this."
-                       ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
-               fi
-       fi
-
-       if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
-               eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
-               eerror "See https://bugs.gentoo.org/487864 for more details."
-               eerror
-               return 1
-       fi
-}
-
-wine_env_vcs_vars() {
-       local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
-       local pn_live_val="${pn_live_var}"
-       eval pn_live_val='$'${pn_live_val}
-       if [[ ! -z ${EGIT_COMMIT} ]]; then
-               eerror "Commits must now be specified using the environmental variables"
-               eerror "WINE_COMMIT"
-               eerror
-               return 1
-       fi
-}
-
-pkg_pretend() {
-       wine_build_environment_check || die
-
-       # Verify OSS support
-       if use oss && ! use kernel_FreeBSD; then
-               if ! has_version ">=media-sound/oss-4"; then
-                       eerror "You cannot build wine with USE=oss without having support from a"
-                       eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
-                       eerror
-                       die
-               fi
-       fi
-}
-
-pkg_setup() {
-       wine_build_environment_check || die
-       wine_env_vcs_vars || die
-
-       WINE_VARIANT="${PN#wine}-${PV}"
-       WINE_VARIANT="${WINE_VARIANT#-}"
-
-       MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
-       MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
-       MY_DATADIR="${MY_DATAROOTDIR}"
-       MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-       MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
-       MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
-       MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
-       MY_MANDIR="${MY_DATADIR}/man"
-}
-
-src_unpack() {
-       if [[ ${PV} == "9999" ]] ; then
-               EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
-       fi
-
-       default
-
-       l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
-       eapply_bin(){
-               local patch
-               for patch in ${PATCHES_BIN[@]}; do
-                       patchbin --nogit < "${patch}" || die
-               done
-       }
-
-       local md5="$(md5sum server/protocol.def)"
-
-       default
-       eapply_bin
-       eautoreconf
-
-       # Modification of the server protocol requires regenerating the server requests
-       if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
-               einfo "server/protocol.def was patched; running tools/make_requests"
-               tools/make_requests || die #432348
-       fi
-       sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
-       if ! use run-exes; then
-               sed -i '/^MimeType/d' loader/wine.desktop || die #117785
-       fi
-
-       # Edit wine.desktop to work for specific variant
-       sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
-
-       # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
-       cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
-
-       l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
-
-       # Fix manpage generation for locales #469418 and abi_x86_64 #617864
-       # Requires wine-2.0-rearrange-manpages.patch
-
-       # Duplicate manpages input files for wine64
-       local f
-       for f in loader/*.man.in; do
-               cp ${f} ${f/wine/wine64} || die
-       done
-       # Add wine64 manpages to Makefile
-       if use abi_x86_64; then
-               sed -i "/wine.man.in/i \
-                       \\\twine64.man.in \\\\" loader/Makefile.in || die
-               sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
-\164\2/' loader/Makefile.in || die
-       fi
-
-       rm_man_file(){
-               local file="${1}"
-               loc=${2}
-               sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
-       }
-
-       while read f; do
-               l10n_for_each_disabled_locale_do rm_man_file "${f}"
-       done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
-}
-
-src_configure() {
-       wine_compiler_check || die
-
-       export LDCONFIG=/bin/true
-       use custom-cflags || strip-flags
-
-       multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-       local myconf=(
-               --prefix="${MY_PREFIX}"
-               --datarootdir="${MY_DATAROOTDIR}"
-               --datadir="${MY_DATADIR}"
-               --docdir="${MY_DOCDIR}"
-               --includedir="${MY_INCLUDEDIR}"
-               --libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
-               --libexecdir="${MY_LIBEXECDIR}"
-               --localstatedir="${MY_LOCALSTATEDIR}"
-               --mandir="${MY_MANDIR}"
-               --sysconfdir=/etc/wine
-               $(use_with alsa)
-               $(use_with capi)
-               $(use_with lcms cms)
-               $(use_with cups)
-               $(use_with ncurses curses)
-               $(use_with udisks dbus)
-               $(use_with fontconfig)
-               $(use_with ssl gnutls)
-               $(use_enable gecko mshtml)
-               $(use_with gphoto2 gphoto)
-               $(use_with gsm)
-               $(use_with gstreamer)
-               --without-hal
-               $(use_with jpeg)
-               $(use_with kerberos krb5)
-               $(use_with ldap)
-               $(use_enable mono mscoree)
-               $(use_with mp3 mpg123)
-               $(use_with netapi)
-               $(use_with nls gettext)
-               $(use_with openal)
-               $(use_with opencl)
-               $(use_with opengl)
-               $(use_with osmesa)
-               $(use_with oss)
-               $(use_with pcap)
-               $(use_with png)
-               $(use_with pulseaudio pulse)
-               $(use_with threads pthread)
-               $(use_with scanner sane)
-               $(use_enable test tests)
-               $(use_with truetype freetype)
-               $(use_with udev)
-               $(use_with v4l)
-               $(use_with X x)
-               $(use_with X xfixes)
-               $(use_with xcomposite)
-               $(use_with xinerama)
-               $(use_with xml)
-               $(use_with xml xslt)
-       )
-
-       local PKG_CONFIG AR RANLIB
-       # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
-       # set AR and RANLIB to make QA scripts happy; #483342
-       tc-export PKG_CONFIG AR RANLIB
-
-       if use amd64; then
-               if [[ ${ABI} == amd64 ]]; then
-                       myconf+=( --enable-win64 )
-               else
-                       myconf+=( --disable-win64 )
-               fi
-
-               # Note: using --with-wine64 results in problems with multilib.eclass
-               # CC/LD hackery. We're using separate tools instead.
-       fi
-
-       ECONF_SOURCE=${S} \
-       econf "${myconf[@]}"
-       emake depend
-}
-
-multilib_src_test() {
-       # FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
-       if [[ ${ABI} == x86 ]]; then
-               if [[ $(id -u) == 0 ]]; then
-                       ewarn "Skipping tests since they cannot be run under the root user."
-                       ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
-                       return
-               fi
-
-               WINEPREFIX="${T}/.wine-${ABI}" \
-               Xemake test
-       fi
-}
-
-multilib_src_install_all() {
-       local DOCS=( ANNOUNCE AUTHORS README )
-       add_locale_docs() {
-               local locale_doc="documentation/README.$1"
-               [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
-       }
-       l10n_for_each_locale_do add_locale_docs
-
-       einstalldocs
-       prune_libtool_files --all
-
-       if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
-               rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
-                       "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
-       fi
-
-       # Remove wineconsole if neither backend is installed #551124
-       if ! use X && ! use ncurses; then
-               rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
-               rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
-               rm_wineconsole() {
-                       rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
-               }
-               multilib_foreach_abi rm_wineconsole
-       fi
-
-       use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
-       use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
-
-       if use abi_x86_64 && ! use abi_x86_32; then
-               dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
-               dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
-       fi
-
-       # Failglob for binloops, shouldn't be necessary, but including to stay safe
-       eshopts_push -s failglob #615218
-       # Make wrappers for binaries for handling multiple variants
-       # Note: wrappers instead of symlinks because some are shell which use basename
-       local b
-       for b in "${D%/}${MY_PREFIX}"/bin/*; do
-               make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
-       done
-       eshopts_pop
-}
-
-pkg_postinst() {
-       eselect wine register ${P}
-       if [[ ${PN} == "wine-vanilla" ]]; then
-               eselect wine register --vanilla ${P} || die
-       fi
-
-       eselect wine update --all --if-unset || die
-
-       xdg_desktop_database_update
-
-       if ! use gecko; then
-               ewarn "Without Wine Gecko, wine prefixes will not have a default"
-               ewarn "implementation of iexplore.  Many older windows applications"
-               ewarn "rely upon the existence of an iexplore implementation, so"
-               ewarn "you will likely need to install an external one, like via winetricks"
-       fi
-       if ! use mono; then
-               ewarn "Without Wine Mono, wine prefixes will not have a default"
-               ewarn "implementation of .NET.  Many windows applications rely upon"
-               ewarn "the existence of a .NET implementation, so you will likely need"
-               ewarn "to install an external one, like via winetricks"
-       fi
-}
-
-pkg_prerm() {
-       eselect wine deregister ${P}
-       if [[ ${PN} == "wine-vanilla" ]]; then
-               eselect wine deregister --vanilla ${P} || die
-       fi
-
-       eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
-       xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.22.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.22.ebuild
deleted file mode 100644 (file)
index 40d354c..0000000
+++ /dev/null
@@ -1,525 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-       EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
-       EGIT_BRANCH="master"
-       inherit git-r3
-       SRC_URI=""
-       #KEYWORDS=""
-else
-       MAJOR_V=$(get_version_component_range 1)
-       SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
-       KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-fi
-S="${WORKDIR}/${MY_P}"
-
-GWP_V="20180120"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
-       https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-       X? ( truetype )
-       elibc_glibc? ( threads )
-       osmesa? ( opengl )
-       test? ( abi_x86_32 )" # osmesa-opengl #286560 # X-truetype #551124
-
-# FIXME: the test suite is unsuitable for us; many tests require net access
-# or fail due to Xvfb's opengl limitations.
-RESTRICT="test"
-
-COMMON_DEPEND="
-       X? (
-               x11-libs/libXcursor[${MULTILIB_USEDEP}]
-               x11-libs/libXext[${MULTILIB_USEDEP}]
-               x11-libs/libXfixes[${MULTILIB_USEDEP}]
-               x11-libs/libXrandr[${MULTILIB_USEDEP}]
-               x11-libs/libXi[${MULTILIB_USEDEP}]
-               x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-       )
-       alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-       capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
-       cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
-       fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
-       gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-       gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
-       gstreamer? (
-               media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-               media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
-       )
-       jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
-       kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
-       lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
-       ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
-       mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
-       ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
-       netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
-       nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
-       odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
-       openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
-       opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-       opengl? (
-               virtual/glu[${MULTILIB_USEDEP}]
-               virtual/opengl[${MULTILIB_USEDEP}]
-       )
-       osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
-       pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-       png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
-       pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-       scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
-       ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
-       truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
-       udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
-       udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-       v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-       xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-       xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-       xml? (
-               dev-libs/libxml2[${MULTILIB_USEDEP}]
-               dev-libs/libxslt[${MULTILIB_USEDEP}]
-       )"
-
-RDEPEND="${COMMON_DEPEND}
-       app-emulation/wine-desktop-common
-       >app-eselect/eselect-wine-0.3
-       !app-emulation/wine:0
-       dos? ( >=games-emulation/dosbox-0.74_p20160629 )
-       gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
-       mono? ( app-emulation/wine-mono:4.7.1 )
-       perl? (
-               dev-lang/perl
-               dev-perl/XML-Simple
-       )
-       pulseaudio? (
-               realtime? ( sys-auth/rtkit )
-       )
-       samba? ( >=net-fs/samba-3.0.25[winbind] )
-       selinux? ( sec-policy/selinux-wine )
-       udisks? ( sys-fs/udisks:2 )"
-
-# tools/make_requests requires perl
-DEPEND="${COMMON_DEPEND}
-       sys-devel/flex
-       >=sys-kernel/linux-headers-2.6
-       virtual/pkgconfig
-       virtual/yacc
-       X? ( x11-base/xorg-proto )
-       prelink? ( sys-devel/prelink )
-       xinerama? ( x11-base/xorg-proto )"
-
-# These use a non-standard "Wine" category, which is provided by
-# /etc/xdg/applications-merged/wine.menu
-QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
-usr/share/applications/wine-notepad.desktop
-usr/share/applications/wine-uninstaller.desktop
-usr/share/applications/wine-winecfg.desktop"
-
-PATCHES=(
-       "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
-       "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
-       "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
-       "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-       "${PATCHDIR}/patches/${MY_PN}-2.0-rearrange-manpages.patch" #469418 #617864
-)
-PATCHES_BIN=()
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
-       DEPEND+=" dev-util/patchbin"
-fi
-
-wine_compiler_check() {
-       [[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-       # GCC-specific bugs
-       if tc-is-gcc; then
-               # bug #549768
-               if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
-                       ebegin "Checking for gcc-5 ms_abi compiler bug"
-                       $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
-                       # Run in subshell to prevent "Aborted" message
-                       ( "${T}"/pr66838 || false ) >/dev/null 2>&1
-                       if ! eend $?; then
-                               eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
-                               eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
-                               eerror "or use gcc-config to select a different compiler version."
-                               eerror "See https://bugs.gentoo.org/549768"
-                               eerror
-                               return 1
-                       fi
-               fi
-               # bug #574044
-               if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
-                       ebegin "Checking for gcc-5-3 stack realignment compiler bug"
-                       # Compile in subshell to prevent "Aborted" message
-                       ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
-                       if ! eend $?; then
-                               eerror "Wine cannot be built with this version of gcc-5.3"
-                               eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
-                               eerror "or use gcc-config to select a different compiler version."
-                               eerror "See https://bugs.gentoo.org/574044"
-                               eerror
-                               return 1
-                       fi
-               fi
-       fi
-
-       # Ensure compiler support
-       if use abi_x86_64; then
-               ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
-               # Compile in subshell to prevent "Aborted" message
-               ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
-               if ! eend $?; then
-                       eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
-                       eerror
-                       eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
-                       eerror
-                       return 1
-               fi
-       fi
-}
-
-wine_build_environment_check() {
-       [[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-       if use abi_x86_64; then
-               if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
-                       eerror "You need gcc-4.4+ to compile 64-bit wine"
-                       die
-               elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
-                       eerror "You need clang-3.8+ to compile 64-bit wine"
-                       die
-               fi
-       fi
-       if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
-               ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
-               ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
-               ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
-       fi
-       if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
-               if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
-                       ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
-                       ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
-                       ewarn "See package.env in man 5 portage for more information on how to do this."
-                       ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
-               fi
-       fi
-
-       if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
-               eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
-               eerror "See https://bugs.gentoo.org/487864 for more details."
-               eerror
-               return 1
-       fi
-}
-
-wine_env_vcs_vars() {
-       local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
-       local pn_live_val="${pn_live_var}"
-       eval pn_live_val='$'${pn_live_val}
-       if [[ ! -z ${EGIT_COMMIT} ]]; then
-               eerror "Commits must now be specified using the environmental variables"
-               eerror "WINE_COMMIT"
-               eerror
-               return 1
-       fi
-}
-
-pkg_pretend() {
-       wine_build_environment_check || die
-
-       # Verify OSS support
-       if use oss && ! use kernel_FreeBSD; then
-               if ! has_version ">=media-sound/oss-4"; then
-                       eerror "You cannot build wine with USE=oss without having support from a"
-                       eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
-                       eerror
-                       die
-               fi
-       fi
-}
-
-pkg_setup() {
-       wine_build_environment_check || die
-       wine_env_vcs_vars || die
-
-       WINE_VARIANT="${PN#wine}-${PV}"
-       WINE_VARIANT="${WINE_VARIANT#-}"
-
-       MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
-       MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
-       MY_DATADIR="${MY_DATAROOTDIR}"
-       MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-       MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
-       MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
-       MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
-       MY_MANDIR="${MY_DATADIR}/man"
-}
-
-src_unpack() {
-       if [[ ${PV} == "9999" ]] ; then
-               EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
-       fi
-
-       default
-
-       l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
-       eapply_bin(){
-               local patch
-               for patch in ${PATCHES_BIN[@]}; do
-                       patchbin --nogit < "${patch}" || die
-               done
-       }
-
-       local md5="$(md5sum server/protocol.def)"
-
-       default
-       eapply_bin
-       eautoreconf
-
-       # Modification of the server protocol requires regenerating the server requests
-       if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
-               einfo "server/protocol.def was patched; running tools/make_requests"
-               tools/make_requests || die #432348
-       fi
-       sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
-       if ! use run-exes; then
-               sed -i '/^MimeType/d' loader/wine.desktop || die #117785
-       fi
-
-       # Edit wine.desktop to work for specific variant
-       sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
-
-       # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
-       cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
-
-       l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
-
-       # Fix manpage generation for locales #469418 and abi_x86_64 #617864
-       # Requires wine-2.0-rearrange-manpages.patch
-
-       # Duplicate manpages input files for wine64
-       local f
-       for f in loader/*.man.in; do
-               cp ${f} ${f/wine/wine64} || die
-       done
-       # Add wine64 manpages to Makefile
-       if use abi_x86_64; then
-               sed -i "/wine.man.in/i \
-                       \\\twine64.man.in \\\\" loader/Makefile.in || die
-               sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
-\164\2/' loader/Makefile.in || die
-       fi
-
-       rm_man_file(){
-               local file="${1}"
-               loc=${2}
-               sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
-       }
-
-       while read f; do
-               l10n_for_each_disabled_locale_do rm_man_file "${f}"
-       done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
-}
-
-src_configure() {
-       wine_compiler_check || die
-
-       export LDCONFIG=/bin/true
-       use custom-cflags || strip-flags
-
-       multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-       local myconf=(
-               --prefix="${MY_PREFIX}"
-               --datarootdir="${MY_DATAROOTDIR}"
-               --datadir="${MY_DATADIR}"
-               --docdir="${MY_DOCDIR}"
-               --includedir="${MY_INCLUDEDIR}"
-               --libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
-               --libexecdir="${MY_LIBEXECDIR}"
-               --localstatedir="${MY_LOCALSTATEDIR}"
-               --mandir="${MY_MANDIR}"
-               --sysconfdir=/etc/wine
-               $(use_with alsa)
-               $(use_with capi)
-               $(use_with lcms cms)
-               $(use_with cups)
-               $(use_with ncurses curses)
-               $(use_with udisks dbus)
-               $(use_with fontconfig)
-               $(use_with ssl gnutls)
-               $(use_enable gecko mshtml)
-               $(use_with gphoto2 gphoto)
-               $(use_with gsm)
-               $(use_with gstreamer)
-               --without-hal
-               $(use_with jpeg)
-               $(use_with kerberos krb5)
-               $(use_with ldap)
-               $(use_enable mono mscoree)
-               $(use_with mp3 mpg123)
-               $(use_with netapi)
-               $(use_with nls gettext)
-               $(use_with openal)
-               $(use_with opencl)
-               $(use_with opengl)
-               $(use_with osmesa)
-               $(use_with oss)
-               $(use_with pcap)
-               $(use_with png)
-               $(use_with pulseaudio pulse)
-               $(use_with threads pthread)
-               $(use_with scanner sane)
-               $(use_enable test tests)
-               $(use_with truetype freetype)
-               $(use_with udev)
-               $(use_with v4l)
-               $(use_with X x)
-               $(use_with X xfixes)
-               $(use_with xcomposite)
-               $(use_with xinerama)
-               $(use_with xml)
-               $(use_with xml xslt)
-       )
-
-       local PKG_CONFIG AR RANLIB
-       # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
-       # set AR and RANLIB to make QA scripts happy; #483342
-       tc-export PKG_CONFIG AR RANLIB
-
-       if use amd64; then
-               if [[ ${ABI} == amd64 ]]; then
-                       myconf+=( --enable-win64 )
-               else
-                       myconf+=( --disable-win64 )
-               fi
-
-               # Note: using --with-wine64 results in problems with multilib.eclass
-               # CC/LD hackery. We're using separate tools instead.
-       fi
-
-       ECONF_SOURCE=${S} \
-       econf "${myconf[@]}"
-       emake depend
-}
-
-multilib_src_test() {
-       # FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
-       if [[ ${ABI} == x86 ]]; then
-               if [[ $(id -u) == 0 ]]; then
-                       ewarn "Skipping tests since they cannot be run under the root user."
-                       ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
-                       return
-               fi
-
-               WINEPREFIX="${T}/.wine-${ABI}" \
-               Xemake test
-       fi
-}
-
-multilib_src_install_all() {
-       local DOCS=( ANNOUNCE AUTHORS README )
-       add_locale_docs() {
-               local locale_doc="documentation/README.$1"
-               [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
-       }
-       l10n_for_each_locale_do add_locale_docs
-
-       einstalldocs
-       prune_libtool_files --all
-
-       if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
-               rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
-                       "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
-       fi
-
-       # Remove wineconsole if neither backend is installed #551124
-       if ! use X && ! use ncurses; then
-               rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
-               rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
-               rm_wineconsole() {
-                       rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
-               }
-               multilib_foreach_abi rm_wineconsole
-       fi
-
-       use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
-       use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
-
-       if use abi_x86_64 && ! use abi_x86_32; then
-               dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
-               dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
-       fi
-
-       # Failglob for binloops, shouldn't be necessary, but including to stay safe
-       eshopts_push -s failglob #615218
-       # Make wrappers for binaries for handling multiple variants
-       # Note: wrappers instead of symlinks because some are shell which use basename
-       local b
-       for b in "${D%/}${MY_PREFIX}"/bin/*; do
-               make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
-       done
-       eshopts_pop
-}
-
-pkg_postinst() {
-       eselect wine register ${P}
-       if [[ ${PN} == "wine-vanilla" ]]; then
-               eselect wine register --vanilla ${P} || die
-       fi
-
-       eselect wine update --all --if-unset || die
-
-       xdg_desktop_database_update
-
-       if ! use gecko; then
-               ewarn "Without Wine Gecko, wine prefixes will not have a default"
-               ewarn "implementation of iexplore.  Many older windows applications"
-               ewarn "rely upon the existence of an iexplore implementation, so"
-               ewarn "you will likely need to install an external one, like via winetricks"
-       fi
-       if ! use mono; then
-               ewarn "Without Wine Mono, wine prefixes will not have a default"
-               ewarn "implementation of .NET.  Many windows applications rely upon"
-               ewarn "the existence of a .NET implementation, so you will likely need"
-               ewarn "to install an external one, like via winetricks"
-       fi
-}
-
-pkg_prerm() {
-       eselect wine deregister ${P}
-       if [[ ${PN} == "wine-vanilla" ]]; then
-               eselect wine deregister --vanilla ${P} || die
-       fi
-
-       eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
-       xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-3.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.1.ebuild
deleted file mode 100644 (file)
index a7cee77..0000000
+++ /dev/null
@@ -1,527 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-       EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
-       EGIT_BRANCH="master"
-       inherit git-r3
-       SRC_URI=""
-       #KEYWORDS=""
-else
-       MAJOR_V=$(get_version_component_range 1)
-       SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
-       KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-fi
-S="${WORKDIR}/${MY_P}"
-
-GWP_V="20180120"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
-       https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-       X? ( truetype )
-       elibc_glibc? ( threads )
-       osmesa? ( opengl )
-       test? ( abi_x86_32 )" # osmesa-opengl #286560 # X-truetype #551124
-
-# FIXME: the test suite is unsuitable for us; many tests require net access
-# or fail due to Xvfb's opengl limitations.
-RESTRICT="test"
-
-COMMON_DEPEND="
-       X? (
-               x11-libs/libXcursor[${MULTILIB_USEDEP}]
-               x11-libs/libXext[${MULTILIB_USEDEP}]
-               x11-libs/libXfixes[${MULTILIB_USEDEP}]
-               x11-libs/libXrandr[${MULTILIB_USEDEP}]
-               x11-libs/libXi[${MULTILIB_USEDEP}]
-               x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-       )
-       alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-       capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
-       cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
-       fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
-       gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-       gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
-       gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
-       gstreamer? (
-               media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-               media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
-       )
-       jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
-       kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
-       lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
-       ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
-       mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
-       ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
-       netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
-       nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
-       odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
-       openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
-       opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-       opengl? (
-               virtual/glu[${MULTILIB_USEDEP}]
-               virtual/opengl[${MULTILIB_USEDEP}]
-       )
-       osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
-       pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-       png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
-       pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-       scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
-       ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
-       truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
-       udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
-       udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-       v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-       xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-       xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-       xml? (
-               dev-libs/libxml2[${MULTILIB_USEDEP}]
-               dev-libs/libxslt[${MULTILIB_USEDEP}]
-       )"
-
-RDEPEND="${COMMON_DEPEND}
-       app-emulation/wine-desktop-common
-       >app-eselect/eselect-wine-0.3
-       !app-emulation/wine:0
-       dos? ( >=games-emulation/dosbox-0.74_p20160629 )
-       gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
-       mono? ( app-emulation/wine-mono:4.7.1 )
-       perl? (
-               dev-lang/perl
-               dev-perl/XML-Simple
-       )
-       pulseaudio? (
-               realtime? ( sys-auth/rtkit )
-       )
-       samba? ( >=net-fs/samba-3.0.25[winbind] )
-       selinux? ( sec-policy/selinux-wine )
-       udisks? ( sys-fs/udisks:2 )"
-
-# tools/make_requests requires perl
-DEPEND="${COMMON_DEPEND}
-       sys-devel/flex
-       >=sys-kernel/linux-headers-2.6
-       virtual/pkgconfig
-       virtual/yacc
-       X? ( x11-base/xorg-proto )
-       prelink? ( sys-devel/prelink )
-       xinerama? ( x11-base/xorg-proto )"
-
-# These use a non-standard "Wine" category, which is provided by
-# /etc/xdg/applications-merged/wine.menu
-QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
-usr/share/applications/wine-notepad.desktop
-usr/share/applications/wine-uninstaller.desktop
-usr/share/applications/wine-winecfg.desktop"
-
-PATCHES=(
-       "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
-       "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
-       "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
-       "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-       "${PATCHDIR}/patches/${MY_PN}-2.0-rearrange-manpages.patch" #469418 #617864
-)
-PATCHES_BIN=()
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
-       DEPEND+=" dev-util/patchbin"
-fi
-
-wine_compiler_check() {
-       [[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-       # GCC-specific bugs
-       if tc-is-gcc; then
-               # bug #549768
-               if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
-                       ebegin "Checking for gcc-5 ms_abi compiler bug"
-                       $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
-                       # Run in subshell to prevent "Aborted" message
-                       ( "${T}"/pr66838 || false ) >/dev/null 2>&1
-                       if ! eend $?; then
-                               eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
-                               eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
-                               eerror "or use gcc-config to select a different compiler version."
-                               eerror "See https://bugs.gentoo.org/549768"
-                               eerror
-                               return 1
-                       fi
-               fi
-               # bug #574044
-               if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
-                       ebegin "Checking for gcc-5-3 stack realignment compiler bug"
-                       # Compile in subshell to prevent "Aborted" message
-                       ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
-                       if ! eend $?; then
-                               eerror "Wine cannot be built with this version of gcc-5.3"
-                               eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
-                               eerror "or use gcc-config to select a different compiler version."
-                               eerror "See https://bugs.gentoo.org/574044"
-                               eerror
-                               return 1
-                       fi
-               fi
-       fi
-
-       # Ensure compiler support
-       if use abi_x86_64; then
-               ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
-               # Compile in subshell to prevent "Aborted" message
-               ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
-               if ! eend $?; then
-                       eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
-                       eerror
-                       eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
-                       eerror
-                       return 1
-               fi
-       fi
-}
-
-wine_build_environment_check() {
-       [[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-       if use abi_x86_64; then
-               if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
-                       eerror "You need gcc-4.4+ to compile 64-bit wine"
-                       die
-               elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
-                       eerror "You need clang-3.8+ to compile 64-bit wine"
-                       die
-               fi
-       fi
-       if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
-               ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
-               ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
-               ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
-       fi
-       if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
-               if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
-                       ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
-                       ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
-                       ewarn "See package.env in man 5 portage for more information on how to do this."
-                       ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
-               fi
-       fi
-
-       if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
-               eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
-               eerror "See https://bugs.gentoo.org/487864 for more details."
-               eerror
-               return 1
-       fi
-}
-
-wine_env_vcs_vars() {
-       local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
-       local pn_live_val="${pn_live_var}"
-       eval pn_live_val='$'${pn_live_val}
-       if [[ ! -z ${EGIT_COMMIT} ]]; then
-               eerror "Commits must now be specified using the environmental variables"
-               eerror "WINE_COMMIT"
-               eerror
-               return 1
-       fi
-}
-
-pkg_pretend() {
-       wine_build_environment_check || die
-
-       # Verify OSS support
-       if use oss && ! use kernel_FreeBSD; then
-               if ! has_version ">=media-sound/oss-4"; then
-                       eerror "You cannot build wine with USE=oss without having support from a"
-                       eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
-                       eerror
-                       die
-               fi
-       fi
-}
-
-pkg_setup() {
-       wine_build_environment_check || die
-       wine_env_vcs_vars || die
-
-       WINE_VARIANT="${PN#wine}-${PV}"
-       WINE_VARIANT="${WINE_VARIANT#-}"
-
-       MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
-       MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
-       MY_DATADIR="${MY_DATAROOTDIR}"
-       MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-       MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
-       MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
-       MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
-       MY_MANDIR="${MY_DATADIR}/man"
-}
-
-src_unpack() {
-       if [[ ${PV} == "9999" ]] ; then
-               EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
-       fi
-
-       default
-
-       l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
-       eapply_bin(){
-               local patch
-               for patch in ${PATCHES_BIN[@]}; do
-                       patchbin --nogit < "${patch}" || die
-               done
-       }
-
-       local md5="$(md5sum server/protocol.def)"
-
-       default
-       eapply_bin
-       eautoreconf
-
-       # Modification of the server protocol requires regenerating the server requests
-       if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
-               einfo "server/protocol.def was patched; running tools/make_requests"
-               tools/make_requests || die #432348
-       fi
-       sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
-       if ! use run-exes; then
-               sed -i '/^MimeType/d' loader/wine.desktop || die #117785
-       fi
-
-       # Edit wine.desktop to work for specific variant
-       sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
-
-       # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
-       cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
-
-       l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
-
-       # Fix manpage generation for locales #469418 and abi_x86_64 #617864
-       # Requires wine-2.0-rearrange-manpages.patch
-
-       # Duplicate manpages input files for wine64
-       local f
-       for f in loader/*.man.in; do
-               cp ${f} ${f/wine/wine64} || die
-       done
-       # Add wine64 manpages to Makefile
-       if use abi_x86_64; then
-               sed -i "/wine.man.in/i \
-                       \\\twine64.man.in \\\\" loader/Makefile.in || die
-               sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
-\164\2/' loader/Makefile.in || die
-       fi
-
-       rm_man_file(){
-               local file="${1}"
-               loc=${2}
-               sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
-       }
-
-       while read f; do
-               l10n_for_each_disabled_locale_do rm_man_file "${f}"
-       done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
-}
-
-src_configure() {
-       wine_compiler_check || die
-
-       export LDCONFIG=/bin/true
-       use custom-cflags || strip-flags
-
-       multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-       local myconf=(
-               --prefix="${MY_PREFIX}"
-               --datarootdir="${MY_DATAROOTDIR}"
-               --datadir="${MY_DATADIR}"
-               --docdir="${MY_DOCDIR}"
-               --includedir="${MY_INCLUDEDIR}"
-               --libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
-               --libexecdir="${MY_LIBEXECDIR}"
-               --localstatedir="${MY_LOCALSTATEDIR}"
-               --mandir="${MY_MANDIR}"
-               --sysconfdir=/etc/wine
-               $(use_with alsa)
-               $(use_with capi)
-               $(use_with lcms cms)
-               $(use_with cups)
-               $(use_with ncurses curses)
-               $(use_with udisks dbus)
-               $(use_with fontconfig)
-               $(use_with ssl gnutls)
-               $(use_enable gecko mshtml)
-               $(use_with gphoto2 gphoto)
-               $(use_with gsm)
-               $(use_with gssapi)
-               $(use_with gstreamer)
-               --without-hal
-               $(use_with jpeg)
-               $(use_with kerberos krb5)
-               $(use_with ldap)
-               $(use_enable mono mscoree)
-               $(use_with mp3 mpg123)
-               $(use_with netapi)
-               $(use_with nls gettext)
-               $(use_with openal)
-               $(use_with opencl)
-               $(use_with opengl)
-               $(use_with osmesa)
-               $(use_with oss)
-               $(use_with pcap)
-               $(use_with png)
-               $(use_with pulseaudio pulse)
-               $(use_with threads pthread)
-               $(use_with scanner sane)
-               $(use_enable test tests)
-               $(use_with truetype freetype)
-               $(use_with udev)
-               $(use_with v4l)
-               $(use_with X x)
-               $(use_with X xfixes)
-               $(use_with xcomposite)
-               $(use_with xinerama)
-               $(use_with xml)
-               $(use_with xml xslt)
-       )
-
-       local PKG_CONFIG AR RANLIB
-       # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
-       # set AR and RANLIB to make QA scripts happy; #483342
-       tc-export PKG_CONFIG AR RANLIB
-
-       if use amd64; then
-               if [[ ${ABI} == amd64 ]]; then
-                       myconf+=( --enable-win64 )
-               else
-                       myconf+=( --disable-win64 )
-               fi
-
-               # Note: using --with-wine64 results in problems with multilib.eclass
-               # CC/LD hackery. We're using separate tools instead.
-       fi
-
-       ECONF_SOURCE=${S} \
-       econf "${myconf[@]}"
-       emake depend
-}
-
-multilib_src_test() {
-       # FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
-       if [[ ${ABI} == x86 ]]; then
-               if [[ $(id -u) == 0 ]]; then
-                       ewarn "Skipping tests since they cannot be run under the root user."
-                       ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
-                       return
-               fi
-
-               WINEPREFIX="${T}/.wine-${ABI}" \
-               Xemake test
-       fi
-}
-
-multilib_src_install_all() {
-       local DOCS=( ANNOUNCE AUTHORS README )
-       add_locale_docs() {
-               local locale_doc="documentation/README.$1"
-               [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
-       }
-       l10n_for_each_locale_do add_locale_docs
-
-       einstalldocs
-       prune_libtool_files --all
-
-       if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
-               rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
-                       "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
-       fi
-
-       # Remove wineconsole if neither backend is installed #551124
-       if ! use X && ! use ncurses; then
-               rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
-               rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
-               rm_wineconsole() {
-                       rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
-               }
-               multilib_foreach_abi rm_wineconsole
-       fi
-
-       use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
-       use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
-
-       if use abi_x86_64 && ! use abi_x86_32; then
-               dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
-               dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
-       fi
-
-       # Failglob for binloops, shouldn't be necessary, but including to stay safe
-       eshopts_push -s failglob #615218
-       # Make wrappers for binaries for handling multiple variants
-       # Note: wrappers instead of symlinks because some are shell which use basename
-       local b
-       for b in "${D%/}${MY_PREFIX}"/bin/*; do
-               make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
-       done
-       eshopts_pop
-}
-
-pkg_postinst() {
-       eselect wine register ${P}
-       if [[ ${PN} == "wine-vanilla" ]]; then
-               eselect wine register --vanilla ${P} || die
-       fi
-
-       eselect wine update --all --if-unset || die
-
-       xdg_desktop_database_update
-
-       if ! use gecko; then
-               ewarn "Without Wine Gecko, wine prefixes will not have a default"
-               ewarn "implementation of iexplore.  Many older windows applications"
-               ewarn "rely upon the existence of an iexplore implementation, so"
-               ewarn "you will likely need to install an external one, like via winetricks"
-       fi
-       if ! use mono; then
-               ewarn "Without Wine Mono, wine prefixes will not have a default"
-               ewarn "implementation of .NET.  Many windows applications rely upon"
-               ewarn "the existence of a .NET implementation, so you will likely need"
-               ewarn "to install an external one, like via winetricks"
-       fi
-}
-
-pkg_prerm() {
-       eselect wine deregister ${P}
-       if [[ ${PN} == "wine-vanilla" ]]; then
-               eselect wine deregister --vanilla ${P} || die
-       fi
-
-       eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
-       xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-3.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.2.ebuild
deleted file mode 100644 (file)
index a7cee77..0000000
+++ /dev/null
@@ -1,527 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-       EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
-       EGIT_BRANCH="master"
-       inherit git-r3
-       SRC_URI=""
-       #KEYWORDS=""
-else
-       MAJOR_V=$(get_version_component_range 1)
-       SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
-       KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-fi
-S="${WORKDIR}/${MY_P}"
-
-GWP_V="20180120"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
-       https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-       X? ( truetype )
-       elibc_glibc? ( threads )
-       osmesa? ( opengl )
-       test? ( abi_x86_32 )" # osmesa-opengl #286560 # X-truetype #551124
-
-# FIXME: the test suite is unsuitable for us; many tests require net access
-# or fail due to Xvfb's opengl limitations.
-RESTRICT="test"
-
-COMMON_DEPEND="
-       X? (
-               x11-libs/libXcursor[${MULTILIB_USEDEP}]
-               x11-libs/libXext[${MULTILIB_USEDEP}]
-               x11-libs/libXfixes[${MULTILIB_USEDEP}]
-               x11-libs/libXrandr[${MULTILIB_USEDEP}]
-               x11-libs/libXi[${MULTILIB_USEDEP}]
-               x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-       )
-       alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-       capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
-       cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
-       fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
-       gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-       gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
-       gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
-       gstreamer? (
-               media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-               media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
-       )
-       jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
-       kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
-       lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
-       ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
-       mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
-       ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
-       netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
-       nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
-       odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
-       openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
-       opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-       opengl? (
-               virtual/glu[${MULTILIB_USEDEP}]
-               virtual/opengl[${MULTILIB_USEDEP}]
-       )
-       osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
-       pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-       png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
-       pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-       scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
-       ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
-       truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
-       udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
-       udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-       v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-       xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-       xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-       xml? (
-               dev-libs/libxml2[${MULTILIB_USEDEP}]
-               dev-libs/libxslt[${MULTILIB_USEDEP}]
-       )"
-
-RDEPEND="${COMMON_DEPEND}
-       app-emulation/wine-desktop-common
-       >app-eselect/eselect-wine-0.3
-       !app-emulation/wine:0
-       dos? ( >=games-emulation/dosbox-0.74_p20160629 )
-       gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
-       mono? ( app-emulation/wine-mono:4.7.1 )
-       perl? (
-               dev-lang/perl
-               dev-perl/XML-Simple
-       )
-       pulseaudio? (
-               realtime? ( sys-auth/rtkit )
-       )
-       samba? ( >=net-fs/samba-3.0.25[winbind] )
-       selinux? ( sec-policy/selinux-wine )
-       udisks? ( sys-fs/udisks:2 )"
-
-# tools/make_requests requires perl
-DEPEND="${COMMON_DEPEND}
-       sys-devel/flex
-       >=sys-kernel/linux-headers-2.6
-       virtual/pkgconfig
-       virtual/yacc
-       X? ( x11-base/xorg-proto )
-       prelink? ( sys-devel/prelink )
-       xinerama? ( x11-base/xorg-proto )"
-
-# These use a non-standard "Wine" category, which is provided by
-# /etc/xdg/applications-merged/wine.menu
-QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
-usr/share/applications/wine-notepad.desktop
-usr/share/applications/wine-uninstaller.desktop
-usr/share/applications/wine-winecfg.desktop"
-
-PATCHES=(
-       "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
-       "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
-       "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
-       "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-       "${PATCHDIR}/patches/${MY_PN}-2.0-rearrange-manpages.patch" #469418 #617864
-)
-PATCHES_BIN=()
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
-       DEPEND+=" dev-util/patchbin"
-fi
-
-wine_compiler_check() {
-       [[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-       # GCC-specific bugs
-       if tc-is-gcc; then
-               # bug #549768
-               if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
-                       ebegin "Checking for gcc-5 ms_abi compiler bug"
-                       $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
-                       # Run in subshell to prevent "Aborted" message
-                       ( "${T}"/pr66838 || false ) >/dev/null 2>&1
-                       if ! eend $?; then
-                               eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
-                               eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
-                               eerror "or use gcc-config to select a different compiler version."
-                               eerror "See https://bugs.gentoo.org/549768"
-                               eerror
-                               return 1
-                       fi
-               fi
-               # bug #574044
-               if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
-                       ebegin "Checking for gcc-5-3 stack realignment compiler bug"
-                       # Compile in subshell to prevent "Aborted" message
-                       ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
-                       if ! eend $?; then
-                               eerror "Wine cannot be built with this version of gcc-5.3"
-                               eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
-                               eerror "or use gcc-config to select a different compiler version."
-                               eerror "See https://bugs.gentoo.org/574044"
-                               eerror
-                               return 1
-                       fi
-               fi
-       fi
-
-       # Ensure compiler support
-       if use abi_x86_64; then
-               ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
-               # Compile in subshell to prevent "Aborted" message
-               ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
-               if ! eend $?; then
-                       eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
-                       eerror
-                       eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
-                       eerror
-                       return 1
-               fi
-       fi
-}
-
-wine_build_environment_check() {
-       [[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-       if use abi_x86_64; then
-               if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
-                       eerror "You need gcc-4.4+ to compile 64-bit wine"
-                       die
-               elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
-                       eerror "You need clang-3.8+ to compile 64-bit wine"
-                       die
-               fi
-       fi
-       if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
-               ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
-               ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
-               ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
-       fi
-       if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
-               if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
-                       ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
-                       ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
-                       ewarn "See package.env in man 5 portage for more information on how to do this."
-                       ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
-               fi
-       fi
-
-       if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
-               eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
-               eerror "See https://bugs.gentoo.org/487864 for more details."
-               eerror
-               return 1
-       fi
-}
-
-wine_env_vcs_vars() {
-       local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
-       local pn_live_val="${pn_live_var}"
-       eval pn_live_val='$'${pn_live_val}
-       if [[ ! -z ${EGIT_COMMIT} ]]; then
-               eerror "Commits must now be specified using the environmental variables"
-               eerror "WINE_COMMIT"
-               eerror
-               return 1
-       fi
-}
-
-pkg_pretend() {
-       wine_build_environment_check || die
-
-       # Verify OSS support
-       if use oss && ! use kernel_FreeBSD; then
-               if ! has_version ">=media-sound/oss-4"; then
-                       eerror "You cannot build wine with USE=oss without having support from a"
-                       eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
-                       eerror
-                       die
-               fi
-       fi
-}
-
-pkg_setup() {
-       wine_build_environment_check || die
-       wine_env_vcs_vars || die
-
-       WINE_VARIANT="${PN#wine}-${PV}"
-       WINE_VARIANT="${WINE_VARIANT#-}"
-
-       MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
-       MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
-       MY_DATADIR="${MY_DATAROOTDIR}"
-       MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-       MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
-       MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
-       MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
-       MY_MANDIR="${MY_DATADIR}/man"
-}
-
-src_unpack() {
-       if [[ ${PV} == "9999" ]] ; then
-               EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
-       fi
-
-       default
-
-       l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
-       eapply_bin(){
-               local patch
-               for patch in ${PATCHES_BIN[@]}; do
-                       patchbin --nogit < "${patch}" || die
-               done
-       }
-
-       local md5="$(md5sum server/protocol.def)"
-
-       default
-       eapply_bin
-       eautoreconf
-
-       # Modification of the server protocol requires regenerating the server requests
-       if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
-               einfo "server/protocol.def was patched; running tools/make_requests"
-               tools/make_requests || die #432348
-       fi
-       sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
-       if ! use run-exes; then
-               sed -i '/^MimeType/d' loader/wine.desktop || die #117785
-       fi
-
-       # Edit wine.desktop to work for specific variant
-       sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
-
-       # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
-       cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
-
-       l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
-
-       # Fix manpage generation for locales #469418 and abi_x86_64 #617864
-       # Requires wine-2.0-rearrange-manpages.patch
-
-       # Duplicate manpages input files for wine64
-       local f
-       for f in loader/*.man.in; do
-               cp ${f} ${f/wine/wine64} || die
-       done
-       # Add wine64 manpages to Makefile
-       if use abi_x86_64; then
-               sed -i "/wine.man.in/i \
-                       \\\twine64.man.in \\\\" loader/Makefile.in || die
-               sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
-\164\2/' loader/Makefile.in || die
-       fi
-
-       rm_man_file(){
-               local file="${1}"
-               loc=${2}
-               sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
-       }
-
-       while read f; do
-               l10n_for_each_disabled_locale_do rm_man_file "${f}"
-       done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
-}
-
-src_configure() {
-       wine_compiler_check || die
-
-       export LDCONFIG=/bin/true
-       use custom-cflags || strip-flags
-
-       multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-       local myconf=(
-               --prefix="${MY_PREFIX}"
-               --datarootdir="${MY_DATAROOTDIR}"
-               --datadir="${MY_DATADIR}"
-               --docdir="${MY_DOCDIR}"
-               --includedir="${MY_INCLUDEDIR}"
-               --libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
-               --libexecdir="${MY_LIBEXECDIR}"
-               --localstatedir="${MY_LOCALSTATEDIR}"
-               --mandir="${MY_MANDIR}"
-               --sysconfdir=/etc/wine
-               $(use_with alsa)
-               $(use_with capi)
-               $(use_with lcms cms)
-               $(use_with cups)
-               $(use_with ncurses curses)
-               $(use_with udisks dbus)
-               $(use_with fontconfig)
-               $(use_with ssl gnutls)
-               $(use_enable gecko mshtml)
-               $(use_with gphoto2 gphoto)
-               $(use_with gsm)
-               $(use_with gssapi)
-               $(use_with gstreamer)
-               --without-hal
-               $(use_with jpeg)
-               $(use_with kerberos krb5)
-               $(use_with ldap)
-               $(use_enable mono mscoree)
-               $(use_with mp3 mpg123)
-               $(use_with netapi)
-               $(use_with nls gettext)
-               $(use_with openal)
-               $(use_with opencl)
-               $(use_with opengl)
-               $(use_with osmesa)
-               $(use_with oss)
-               $(use_with pcap)
-               $(use_with png)
-               $(use_with pulseaudio pulse)
-               $(use_with threads pthread)
-               $(use_with scanner sane)
-               $(use_enable test tests)
-               $(use_with truetype freetype)
-               $(use_with udev)
-               $(use_with v4l)
-               $(use_with X x)
-               $(use_with X xfixes)
-               $(use_with xcomposite)
-               $(use_with xinerama)
-               $(use_with xml)
-               $(use_with xml xslt)
-       )
-
-       local PKG_CONFIG AR RANLIB
-       # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
-       # set AR and RANLIB to make QA scripts happy; #483342
-       tc-export PKG_CONFIG AR RANLIB
-
-       if use amd64; then
-               if [[ ${ABI} == amd64 ]]; then
-                       myconf+=( --enable-win64 )
-               else
-                       myconf+=( --disable-win64 )
-               fi
-
-               # Note: using --with-wine64 results in problems with multilib.eclass
-               # CC/LD hackery. We're using separate tools instead.
-       fi
-
-       ECONF_SOURCE=${S} \
-       econf "${myconf[@]}"
-       emake depend
-}
-
-multilib_src_test() {
-       # FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
-       if [[ ${ABI} == x86 ]]; then
-               if [[ $(id -u) == 0 ]]; then
-                       ewarn "Skipping tests since they cannot be run under the root user."
-                       ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
-                       return
-               fi
-
-               WINEPREFIX="${T}/.wine-${ABI}" \
-               Xemake test
-       fi
-}
-
-multilib_src_install_all() {
-       local DOCS=( ANNOUNCE AUTHORS README )
-       add_locale_docs() {
-               local locale_doc="documentation/README.$1"
-               [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
-       }
-       l10n_for_each_locale_do add_locale_docs
-
-       einstalldocs
-       prune_libtool_files --all
-
-       if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
-               rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
-                       "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
-       fi
-
-       # Remove wineconsole if neither backend is installed #551124
-       if ! use X && ! use ncurses; then
-               rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
-               rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
-               rm_wineconsole() {
-                       rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
-               }
-               multilib_foreach_abi rm_wineconsole
-       fi
-
-       use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
-       use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
-
-       if use abi_x86_64 && ! use abi_x86_32; then
-               dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
-               dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
-       fi
-
-       # Failglob for binloops, shouldn't be necessary, but including to stay safe
-       eshopts_push -s failglob #615218
-       # Make wrappers for binaries for handling multiple variants
-       # Note: wrappers instead of symlinks because some are shell which use basename
-       local b
-       for b in "${D%/}${MY_PREFIX}"/bin/*; do
-               make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
-       done
-       eshopts_pop
-}
-
-pkg_postinst() {
-       eselect wine register ${P}
-       if [[ ${PN} == "wine-vanilla" ]]; then
-               eselect wine register --vanilla ${P} || die
-       fi
-
-       eselect wine update --all --if-unset || die
-
-       xdg_desktop_database_update
-
-       if ! use gecko; then
-               ewarn "Without Wine Gecko, wine prefixes will not have a default"
-               ewarn "implementation of iexplore.  Many older windows applications"
-               ewarn "rely upon the existence of an iexplore implementation, so"
-               ewarn "you will likely need to install an external one, like via winetricks"
-       fi
-       if ! use mono; then
-               ewarn "Without Wine Mono, wine prefixes will not have a default"
-               ewarn "implementation of .NET.  Many windows applications rely upon"
-               ewarn "the existence of a .NET implementation, so you will likely need"
-               ewarn "to install an external one, like via winetricks"
-       fi
-}
-
-pkg_prerm() {
-       eselect wine deregister ${P}
-       if [[ ${PN} == "wine-vanilla" ]]; then
-               eselect wine deregister --vanilla ${P} || die
-       fi
-
-       eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
-       xdg_desktop_database_update
-}