[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-vanilla/

[Nick Sarnie]

commit:     14fe4eb770f4d48af6ef49d42ae173b863608f22
Author:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Sun Nov  4 20:59:30 2018 +0000
Commit:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Sun Nov  4 20:59:30 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14fe4eb7

app-emulation/wine-vanilla: Sync with ::wine

Bump to 3.19
Merge PR to ::gentoo

Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>

 app-emulation/wine-vanilla/Manifest                            |  1 +
 app-emulation/wine-vanilla/metadata.xml                        | 10 +++++-----
 app-emulation/wine-vanilla/wine-vanilla-3.16.ebuild            | 10 +++++-----
 app-emulation/wine-vanilla/wine-vanilla-3.17.ebuild            |  8 ++++----
 app-emulation/wine-vanilla/wine-vanilla-3.18.ebuild            |  8 ++++----
 .../{wine-vanilla-3.18.ebuild => wine-vanilla-3.19.ebuild}     |  8 ++++----
 app-emulation/wine-vanilla/wine-vanilla-9999.ebuild            | 10 +++++-----
 7 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index 80009f23df9..7bc6fa476fe 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -5,3 +5,4 @@ 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

diff --git a/app-emulation/wine-vanilla/metadata.xml b/app-emulation/wine-vanilla/metadata.xml
index 4fe74117553..c601705c294 100644
--- a/app-emulation/wine-vanilla/metadata.xml
+++ b/app-emulation/wine-vanilla/metadata.xml
@@ -30,19 +30,19 @@ This variant of the Wine packaging does not include external patchsets
 		<flag name="pcap">Support packet capture software (e.g. wireshark)</flag>
 		<flag name="perl">Install helpers written in perl (winedump/winemaker)</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="udev">Use <pkg>virtual/libudev</pkg> to provide plug and play support</flag>
 		<flag name="vkd3d">Use <pkg>app-emulation/vkd3d</pkg> to provide Direct3D 12 support</flag>
 		<flag name="vulkan">Enable Vulkan drivers</flag>
 	</use>
 	<upstream>
-		<remote-id type="github">wine-compholio/wine-staging</remote-id>
 		<remote-id type="sourceforge">wine</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/app-emulation/wine-vanilla/wine-vanilla-3.16.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.16.ebuild
index 9a0d8ea7f20..04acfab0072 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-3.16.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.16.ebuild
@@ -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
@@ -241,7 +241,7 @@ wine_env_vcs_vars() {
 	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 "EGIT_OVERRIDE_COMMIT_WINE"
 		eerror
 		return 1
 	fi
@@ -280,7 +280,7 @@ 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
 	fi
 
 	default

diff --git a/app-emulation/wine-vanilla/wine-vanilla-3.17.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.17.ebuild
index 72a38a225bc..04acfab0072 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-3.17.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.17.ebuild
@@ -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
@@ -241,7 +241,7 @@ wine_env_vcs_vars() {
 	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 "EGIT_OVERRIDE_COMMIT_WINE"
 		eerror
 		return 1
 	fi
@@ -280,7 +280,7 @@ 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
 	fi
 
 	default

diff --git a/app-emulation/wine-vanilla/wine-vanilla-3.18.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.18.ebuild
index 72a38a225bc..04acfab0072 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-3.18.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.18.ebuild
@@ -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
@@ -241,7 +241,7 @@ wine_env_vcs_vars() {
 	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 "EGIT_OVERRIDE_COMMIT_WINE"
 		eerror
 		return 1
 	fi
@@ -280,7 +280,7 @@ 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
 	fi
 
 	default

diff --git a/app-emulation/wine-vanilla/wine-vanilla-3.18.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.19.ebuild
similarity index 98%
copy from app-emulation/wine-vanilla/wine-vanilla-3.18.ebuild
copy to app-emulation/wine-vanilla/wine-vanilla-3.19.ebuild
index 72a38a225bc..04acfab0072 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-3.18.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.19.ebuild
@@ -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
@@ -241,7 +241,7 @@ wine_env_vcs_vars() {
 	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 "EGIT_OVERRIDE_COMMIT_WINE"
 		eerror
 		return 1
 	fi
@@ -280,7 +280,7 @@ 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
 	fi
 
 	default

diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
index 9a0d8ea7f20..04acfab0072 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
@@ -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
@@ -241,7 +241,7 @@ wine_env_vcs_vars() {
 	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 "EGIT_OVERRIDE_COMMIT_WINE"
 		eerror
 		return 1
 	fi
@@ -280,7 +280,7 @@ 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
 	fi
 
 	default