app-emulation/wine-staging: Sync with ::wine
authorNick Sarnie <sarnex@gentoo.org>
Sun, 4 Nov 2018 21:04:07 +0000 (16:04 -0500)
committerNick Sarnie <sarnex@gentoo.org>
Sun, 4 Nov 2018 21:04:07 +0000 (16:04 -0500)
Bump to 3.19
Merge PR to ::gentoo

Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Nick Sarnie <sarnex@gentoo.org>
app-emulation/wine-staging/Manifest
app-emulation/wine-staging/metadata.xml
app-emulation/wine-staging/wine-staging-3.16.ebuild
app-emulation/wine-staging/wine-staging-3.17.ebuild
app-emulation/wine-staging/wine-staging-3.18.ebuild
app-emulation/wine-staging/wine-staging-3.19.ebuild [new file with mode: 0644]
app-emulation/wine-staging/wine-staging-9999.ebuild

index a0c5fd3dc72b84b8d02217daf8a33b7d16bdfff4..ad2aa6cf444f0c3b7efc6f6bf917f1eabb775a00 100644 (file)
@@ -3,7 +3,9 @@ DIST wine-3.15.tar.xz 21402964 BLAKE2B fb74ae33b89612b894463b6381184737ddda7b8a2
 DIST wine-3.16.tar.xz 21432308 BLAKE2B 7c1bca001fed1472ceaf0331e8e17ebf5aa9c0ec025c46c785d2530fd70ebafdff95b581e28ba1e0167f19bac80dd05c4c5c291180c5a3784c44c1dcd4424edb SHA512 f0c566f70ede01e5896b7611dfe58cd6748b92d55d22a71ccc9add575e9aa5062bbbffa14f0a30ee3df5cf79e9ea4dcf02a7d62db64b94d5b56927e256a978c2
 DIST wine-3.17.tar.xz 21457736 BLAKE2B 34c2390bd1180f81a15e7db4c712bddd3436033f209870d31f7f286d7dba8c8a65f5dd5cb13cf4c0719cef6a53c168d104e3c78a5ca1777ecf401d8d74e7927a SHA512 ea50c9e09d3fd7f41ff96a1219d43896946ac79c8cdef31ae56e10664fc3b0b6dd1f9d8cd72db874d08c431eba9c8033ea72182499666a5aa62c1056876b0a66
 DIST wine-3.18.tar.xz 21479964 BLAKE2B 226ec5df6fb5bd94ea4b994f9142ff725b04c4d92da45360f811533880aa3865715a5fe5bb11ce29a55ed2881974013d58479add90b6ba655b035e61eec149c1 SHA512 2137662ea69964a69d77ff5c05f271783bda49af65d605909074d465ed8087d84065156e5c509eae31b4c3a20e83a838fc71bd077b2267640b163acfa5f7366e
+DIST wine-3.19.tar.xz 21503304 BLAKE2B 0844970cd1f39daf51baf5aba537483d24ee5f5e6d188a1502367a7e2b121fea695cd6584cc87d50dfa32fb1f716387adb513b1645406dbcaed1731e1fd7d50f SHA512 84a1811b01024191959fd16a86bd532c96f16344feb4241954d0b5819ba1db8073dc7adcf1589b67169fb6089d2d501846f6fcbdc396c804f26c794cc4a1edd1
 DIST wine-staging-3.15.tar.gz 9941091 BLAKE2B 5a0e37ce52ff3e6130434aa56953e70fafb0c83dc33fa1ad7562a9244821ae75c30b9c858c7506462348b6d13016c236a14bde0297bc43d2d282d60c6c012470 SHA512 f0ed9d4a099b03c04a126927919b7eddbdaff7a08a0b97cdf387c64318826d6454183cf03997425b349540d13b1ccf6262aa2c5af0af682939584e3de71b7541
 DIST wine-staging-3.16.tar.gz 9928264 BLAKE2B 61882e36da7026b078e753de7a3a089fc64578fc2cf4ceb27146125003e86cc386ada2fa55d48e40279665218ae630bf63fce12b72acddfd8e4a6ea1730a9fca SHA512 25f06b06a0880b3926d9d3dfb35fd1aeb1f168426917dee32dcf906970474862021416f4e9db1917d8320962bc0bc17d1f3dad21b634a60b8e0da87a4b54067e
 DIST wine-staging-3.17.tar.gz 9928657 BLAKE2B 549c44cb07423405b95351a8b7c2675ea8dafc015d457b87235d36c7b115778336bd52d6fa97b10dd9d439c8938f05fc81b6b73082680d906db93c8e401f29c8 SHA512 2fe9e8f801b53fa9b71fd908f5403956251522851383bfdde6828c6a8545d6f50ac8c41df54d89c2f92d74dc3bb563cd6a7d8ad394002c981197b71adc1a5e13
 DIST wine-staging-3.18.tar.gz 9927742 BLAKE2B efd581555feacaac263e550c3a854b4a3ad92c72d7f81bb7cfc846a94d57decde1e82f38de4586eb824b2fe3574581621f0251cc1a126796f466e99e85e8e609 SHA512 d7c353b2302616b8ffe9f41090bc36c8869238410eda16072aed0b70e54c8a09b4a48d439fc9e4f211804945d55dc4a00a5d70efd2ca4a50f72db7607e6ef10e
+DIST wine-staging-3.19.tar.gz 9957279 BLAKE2B 323ce53df248b7ecc761332537590abcd63f3de9a834b752ca62a472c077d71278907a9758dcda879f50f9044620894e51dbca8702b39fe1a8938b983c568418 SHA512 c3e66c88b4baad4c854b8729ef58aabff587f16f0a13fe89396dd5d99c9b928c6e23ff15938dd40376ec76a40538bba950dd0e2b5b25ce1260de023bb1d17198
index f6936a49915c843d6255a9085ac83d7dcd261f5b..0d9c4260e813b0d30ac4687138bae2dfe021d0b2 100644 (file)
@@ -32,12 +32,13 @@ This variant of the Wine packaging includes the Wine-Staging patchset.
                <flag name="perl">Install helpers written in perl (winedump/winemaker)</flag>
                <flag name="pipelight">Apply Wine-Staging patches for Pipelight/Silverlight support</flag>
                <flag name="prelink">Run prelink on DLLs during build;
-                       For versions before wine-1.7.55 or hardened, do not disable if you do not know what this means as it can break things at runtime</flag>
+                       For Gentoo hardened, do not disable if you do not know what this means as it can break things at runtime</flag>
                <flag name="realtime">Pull in <pkg>sys-auth/rtkit</pkg> for low-latency pulseaudio support</flag>
                <flag name="run-exes">Use Wine to open and run .EXE and .MSI files</flag>
-               <flag name="samba">Add support for NTLM auth. see
-               http://wiki.winehq.org/NtlmAuthSetupGuide and
-               http://wiki.winehq.org/NtlmSigningAndSealing</flag>
+               <flag name="samba">Add support for NTLM auth. See:
+                                               https://web.archive.org/web/20160108123008/http://wiki.winehq.org:80/NtlmAuthSetupGuide and
+                                               https://web.archive.org/web/20150906013746/http://wiki.winehq.org/NtlmSigningAndSealing
+                                               (these pages are not currently in the updated WineHQ Wiki).</flag>
                <flag name="sdl">Add support for gamepad detection using SDL</flag>
                <flag name="staging">Apply Wine-Staging patches for advanced feature support that haven't made it into upstream Wine yet</flag>
                <flag name="themes">Support GTK+:3 window theming through Wine-Staging</flag>
index 2977288b1ee9c70f9d4e989aec2900e72fad8350..17d7b7dd2b8a24fef11d8e85054e41f3945f78ff 100644 (file)
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ 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
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
        SRC_URI=""
        #KEYWORDS=""
 else
-       MAJOR_V=$(get_version_component_range 1)
+       MAJOR_V=$(ver_cut 1)
        SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
        KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi
@@ -268,14 +268,17 @@ wine_env_vcs_vars() {
                if use staging; then
                        eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}"
                        eerror "cannot be used to set the commit. Instead, you may use the"
-                       eerror "environmental variables WINE_COMMIT, and STAGING_COMMIT."
+                       eerror "environment variables:"
+                       eerror "  EGIT_OVERRIDE_COMMIT_WINE"
+                       eerror "  EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING"
                        eerror
                        return 1
                fi
        fi
        if [[ ! -z ${EGIT_COMMIT} ]]; then
-               eerror "Commits must now be specified using the environmental variables"
-               eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT"
+               eerror "Commits must now be specified using the environment variables:"
+               eerror "  EGIT_OVERRIDE_COMMIT_WINE"
+               eerror "  EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING"
                eerror
                return 1
        fi
@@ -314,19 +317,18 @@ pkg_setup() {
 
 src_unpack() {
        if [[ ${PV} == "9999" ]] ; then
-               EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
+               EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
                if use staging; then
                        local CURRENT_WINE_COMMIT=${EGIT_VERSION}
 
-                       git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}"
-                       git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}"
+                       EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack
 
                        local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
 
                        if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then
                                einfo "The current Staging patchset is not guaranteed to apply on this WINE commit."
                                einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT."
-                               einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine"
+                               einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine"
                        fi
                fi
        fi
index fcac5949b93ab6eefc56ac1fcf1b914081ab2a6a..17d7b7dd2b8a24fef11d8e85054e41f3945f78ff 100644 (file)
@@ -6,7 +6,7 @@ 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
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
        SRC_URI=""
        #KEYWORDS=""
 else
-       MAJOR_V=$(get_version_component_range 1)
+       MAJOR_V=$(ver_cut 1)
        SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
        KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi
@@ -268,14 +268,17 @@ wine_env_vcs_vars() {
                if use staging; then
                        eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}"
                        eerror "cannot be used to set the commit. Instead, you may use the"
-                       eerror "environmental variables WINE_COMMIT, and STAGING_COMMIT."
+                       eerror "environment variables:"
+                       eerror "  EGIT_OVERRIDE_COMMIT_WINE"
+                       eerror "  EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING"
                        eerror
                        return 1
                fi
        fi
        if [[ ! -z ${EGIT_COMMIT} ]]; then
-               eerror "Commits must now be specified using the environmental variables"
-               eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT"
+               eerror "Commits must now be specified using the environment variables:"
+               eerror "  EGIT_OVERRIDE_COMMIT_WINE"
+               eerror "  EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING"
                eerror
                return 1
        fi
@@ -314,19 +317,18 @@ pkg_setup() {
 
 src_unpack() {
        if [[ ${PV} == "9999" ]] ; then
-               EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
+               EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
                if use staging; then
                        local CURRENT_WINE_COMMIT=${EGIT_VERSION}
 
-                       git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}"
-                       git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}"
+                       EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack
 
                        local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
 
                        if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then
                                einfo "The current Staging patchset is not guaranteed to apply on this WINE commit."
                                einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT."
-                               einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine"
+                               einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine"
                        fi
                fi
        fi
index fcac5949b93ab6eefc56ac1fcf1b914081ab2a6a..17d7b7dd2b8a24fef11d8e85054e41f3945f78ff 100644 (file)
@@ -6,7 +6,7 @@ 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
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
        SRC_URI=""
        #KEYWORDS=""
 else
-       MAJOR_V=$(get_version_component_range 1)
+       MAJOR_V=$(ver_cut 1)
        SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
        KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi
@@ -268,14 +268,17 @@ wine_env_vcs_vars() {
                if use staging; then
                        eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}"
                        eerror "cannot be used to set the commit. Instead, you may use the"
-                       eerror "environmental variables WINE_COMMIT, and STAGING_COMMIT."
+                       eerror "environment variables:"
+                       eerror "  EGIT_OVERRIDE_COMMIT_WINE"
+                       eerror "  EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING"
                        eerror
                        return 1
                fi
        fi
        if [[ ! -z ${EGIT_COMMIT} ]]; then
-               eerror "Commits must now be specified using the environmental variables"
-               eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT"
+               eerror "Commits must now be specified using the environment variables:"
+               eerror "  EGIT_OVERRIDE_COMMIT_WINE"
+               eerror "  EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING"
                eerror
                return 1
        fi
@@ -314,19 +317,18 @@ pkg_setup() {
 
 src_unpack() {
        if [[ ${PV} == "9999" ]] ; then
-               EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
+               EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
                if use staging; then
                        local CURRENT_WINE_COMMIT=${EGIT_VERSION}
 
-                       git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}"
-                       git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}"
+                       EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack
 
                        local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
 
                        if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then
                                einfo "The current Staging patchset is not guaranteed to apply on this WINE commit."
                                einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT."
-                               einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine"
+                               einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine"
                        fi
                fi
        fi
diff --git a/app-emulation/wine-staging/wine-staging-3.19.ebuild b/app-emulation/wine-staging/wine-staging-3.19.ebuild
new file mode 100644 (file)
index 0000000..17d7b7d
--- /dev/null
@@ -0,0 +1,614 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx 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=$(ver_cut 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}"
+
+STAGING_P="wine-staging-${PV}"
+STAGING_DIR="${WORKDIR}/${STAGING_P}"
+GWP_V="20180120"
+PATCHDIR="${WORKDIR}/gentoo-wine-patches"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
+HOMEPAGE="https://www.winehq.org/"
+SRC_URI="${SRC_URI}
+       https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
+"
+
+if [[ ${PV} == "9999" ]] ; then
+       STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git"
+else
+       SRC_URI="${SRC_URI}
+       staging? ( https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="${PV}"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc ffmpeg +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 pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+       X? ( truetype )
+       elibc_glibc? ( threads )
+       ffmpeg? ( staging )
+       osmesa? ( opengl )
+       pipelight? ( staging )
+       test? ( abi_x86_32 )
+       themes? ( staging )
+       vaapi? ( staging )
+       vkd3d? ( vulkan )" # 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}] )
+       ffmpeg? ( >=media-video/ffmpeg-4:=[${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:0=[${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}] )
+       sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
+       ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+       staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+       themes? (
+               dev-libs/glib:2[${MULTILIB_USEDEP}]
+               x11-libs/cairo[${MULTILIB_USEDEP}]
+               x11-libs/gtk+:3[${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}] )
+       vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
+       vkd3d? ( app-emulation/vkd3d[${MULTILIB_USEDEP}] )
+       vulkan? ( media-libs/vulkan-loader[${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.3 )
+       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 )
+       staging? (
+               dev-lang/perl
+               dev-perl/XML-Simple
+       )
+       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
+)
+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 ${pn_live_val} ]]; then
+               if use staging; then
+                       eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}"
+                       eerror "cannot be used to set the commit. Instead, you may use the"
+                       eerror "environment variables:"
+                       eerror "  EGIT_OVERRIDE_COMMIT_WINE"
+                       eerror "  EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING"
+                       eerror
+                       return 1
+               fi
+       fi
+       if [[ ! -z ${EGIT_COMMIT} ]]; then
+               eerror "Commits must now be specified using the environment variables:"
+               eerror "  EGIT_OVERRIDE_COMMIT_WINE"
+               eerror "  EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING"
+               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}" git-r3_src_unpack
+               if use staging; then
+                       local CURRENT_WINE_COMMIT=${EGIT_VERSION}
+
+                       EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack
+
+                       local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
+
+                       if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then
+                               einfo "The current Staging patchset is not guaranteed to apply on this WINE commit."
+                               einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT."
+                               einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine"
+                       fi
+               fi
+       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)"
+
+       if use staging; then
+               ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
+               ewarn "Wine bugzilla should explicitly state that staging was used."
+
+               local STAGING_EXCLUDE=""
+               use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
+
+               # Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches
+               ebegin "Running Wine-Staging patch installer"
+               (
+                       set -- DESTDIR="${S}" --backend=eapply --no-autoconf --all ${STAGING_EXCLUDE}
+                       cd "${STAGING_DIR}/patches"
+                       source "${STAGING_DIR}/patches/patchinstall.sh"
+               )
+               eend $? || die "Failed to apply Wine-Staging patches"
+       fi
+
+       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
+
+       # 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 ffmpeg)
+               $(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_with sdl)
+               $(use_enable test tests)
+               $(use_with truetype freetype)
+               $(use_with udev)
+               $(use_with v4l)
+               $(use_with vkd3d)
+               $(use_with vulkan)
+               $(use_with X x)
+               $(use_with X xfixes)
+               $(use_with xcomposite)
+               $(use_with xinerama)
+               $(use_with xml)
+               $(use_with xml xslt)
+       )
+
+       use staging && myconf+=(
+               --with-xattr
+               $(use_with themes gtk3)
+               $(use_with vaapi va)
+       )
+
+       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
+       else
+               if use staging; then
+                       eselect wine register --staging ${P} || die
+               fi
+       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
+       else
+               if use staging; then
+                       eselect wine deregister --staging ${P} || die
+               fi
+       fi
+
+       eselect wine update --all --if-unset || die
+}
+
+pkg_postrm() {
+       xdg_desktop_database_update
+}
index 2977288b1ee9c70f9d4e989aec2900e72fad8350..17d7b7dd2b8a24fef11d8e85054e41f3945f78ff 100644 (file)
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ 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
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
        SRC_URI=""
        #KEYWORDS=""
 else
-       MAJOR_V=$(get_version_component_range 1)
+       MAJOR_V=$(ver_cut 1)
        SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
        KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi
@@ -268,14 +268,17 @@ wine_env_vcs_vars() {
                if use staging; then
                        eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}"
                        eerror "cannot be used to set the commit. Instead, you may use the"
-                       eerror "environmental variables WINE_COMMIT, and STAGING_COMMIT."
+                       eerror "environment variables:"
+                       eerror "  EGIT_OVERRIDE_COMMIT_WINE"
+                       eerror "  EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING"
                        eerror
                        return 1
                fi
        fi
        if [[ ! -z ${EGIT_COMMIT} ]]; then
-               eerror "Commits must now be specified using the environmental variables"
-               eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT"
+               eerror "Commits must now be specified using the environment variables:"
+               eerror "  EGIT_OVERRIDE_COMMIT_WINE"
+               eerror "  EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING"
                eerror
                return 1
        fi
@@ -314,19 +317,18 @@ pkg_setup() {
 
 src_unpack() {
        if [[ ${PV} == "9999" ]] ; then
-               EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
+               EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
                if use staging; then
                        local CURRENT_WINE_COMMIT=${EGIT_VERSION}
 
-                       git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}"
-                       git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}"
+                       EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack
 
                        local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
 
                        if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then
                                einfo "The current Staging patchset is not guaranteed to apply on this WINE commit."
                                einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT."
-                               einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine"
+                               einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine"
                        fi
                fi
        fi