From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1053599-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id D3D02138335
	for <garchives@archives.gentoo.org>; Sun, 21 Oct 2018 19:58:12 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id E00F4E0843;
	Sun, 21 Oct 2018 19:58:11 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id A1B48E0843
	for <gentoo-commits@lists.gentoo.org>; Sun, 21 Oct 2018 19:58:11 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 717F1335CFD
	for <gentoo-commits@lists.gentoo.org>; Sun, 21 Oct 2018 19:58:10 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 195BF441
	for <gentoo-commits@lists.gentoo.org>; Sun, 21 Oct 2018 19:58:09 +0000 (UTC)
From: "Nick Sarnie" <sarnex@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Nick Sarnie" <sarnex@gentoo.org>
Message-ID: <1540151527.0d436fc96fc5d3ca33c147d22a02a702634cb1bd.sarnex@gentoo>
Subject: [gentoo-commits] repo/proj/wine:master commit in: app-emulation/wine-vanilla/
X-VCS-Repository: repo/proj/wine
X-VCS-Files: app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild app-emulation/wine-vanilla/wine-vanilla-2.0.1-r1.ebuild app-emulation/wine-vanilla/wine-vanilla-2.0.2-r1.ebuild app-emulation/wine-vanilla/wine-vanilla-2.0.3.ebuild app-emulation/wine-vanilla/wine-vanilla-2.0.4.ebuild app-emulation/wine-vanilla/wine-vanilla-2.1-r1.ebuild app-emulation/wine-vanilla/wine-vanilla-2.10-r1.ebuild app-emulation/wine-vanilla/wine-vanilla-2.11-r1.ebuild app-emulation/wine-vanilla/wine-vanilla-2.12-r1.ebuild app-emulation/wine-vanilla/wine-vanilla-2.13-r1.ebuild app-emulation/wine-vanilla/wine-vanilla-2.14-r1.ebuild app-emulation/wine-vanilla/wine-vanilla-2.15-r1.ebuild app-emulation/wine-vanilla/wine-vanilla-2.16-r1.ebuild app-emulation/wine-vanilla/wine-vanilla-2.17-r1.ebuild app-emulation/wine-vanilla/wine-vanilla-2.18-r2.ebuild app-emulation/wine-vanilla/wine-vanilla-2.19-r1.ebuild app-emulation/wine-vanilla/wine-vanilla-2.2-r1.ebuild app-emulation/wine-vanilla/wine-vanilla-2.20.ebuild app
 -emulation/wine-vanilla/wine-vanilla-2.21.ebuild app-emulation/wine-vanilla/wine-vanilla-2.22.ebuild app-emulation/wine-vanilla/wine-vanilla-2.3-r1.ebuild app-emulation/wine-vanilla/wine-vanilla-2.4-r1.ebuild app-emulation/wine-vanilla/wine-vanilla-2.5-r1.ebuild app-emulation/wine-vanilla/wine-vanilla-2.6-r1.ebuild app-emulation/wine-vanilla/wine-vanilla-2.7-r1.ebuild app-emulation/wine-vanilla/wine-vanilla-2.8-r1.ebuild app-emulation/wine-vanilla/wine-vanilla-2.9-r1.ebuild app-emulation/wine-vanilla/wine-vanilla-3.0.1.ebuild app-emulation/wine-vanilla/wine-vanilla-3.0.2.ebuild app-emulation/wine-vanilla/wine-vanilla-3.0.3.ebuild app-emulation/wine-vanilla/wine-vanilla-3.0.ebuild app-emulation/wine-vanilla/wine-vanilla-3.1.ebuild app-emulation/wine-vanilla/wine-vanilla-3.10.ebuild app-emulation/wine-vanilla/wine-vanilla-3.11.ebuild app-emulation/wine-vanilla/wine-vanilla-3.12.ebuild app-emulation/wine-vanilla/wine-vanilla-3.13-r1.ebuild app-emulation/wine-vanilla/wine-vanilla-3.13.e
 build app-emulation/wine-vanilla/wine-vanilla-3.14.ebuild app-emulation/wine-vanilla/wine-vanilla-3.15.ebuild app-emulation/wine-vanilla/wine-vanilla-3.16.ebuild app-emulation/wine-vanilla/wine-vanilla-3.17.ebuild app-emulation/wine-vanilla/wine-vanilla-3.18.ebuild app-emulation/wine-vanilla/wine-vanilla-3.2.ebuild app-emulation/wine-vanilla/wine-vanilla-3.3.ebuild app-emulation/wine-vanilla/wine-vanilla-3.4.ebuild app-emulation/wine-vanilla/wine-vanilla-3.5.ebuild app-emulation/wine-vanilla/wine-vanilla-3.6.ebuild app-emulation/wine-vanilla/wine-vanilla-3.7.ebuild app-emulation/wine-vanilla/wine-vanilla-3.8.ebuild app-emulation/wine-vanilla/wine-vanilla-3.9.ebuild app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
X-VCS-Directories: app-emulation/wine-vanilla/
X-VCS-Committer: sarnex
X-VCS-Committer-Name: Nick Sarnie
X-VCS-Revision: 0d436fc96fc5d3ca33c147d22a02a702634cb1bd
X-VCS-Branch: master
Date: Sun, 21 Oct 2018 19:58:09 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 7ff9f920-9c6b-4e41-ba2e-9214e176d58f
X-Archives-Hash: c1cb0cff3d2b7c7605b7f024a8d1f7b2

commit:     0d436fc96fc5d3ca33c147d22a02a702634cb1bd
Author:     Rob Walker <bob.mt.wya <AT> gmail <DOT> com>
AuthorDate: Sat Oct 20 23:28:52 2018 +0000
Commit:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Sun Oct 21 19:52:07 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=0d436fc9

app-emulation/wine-vanilla: migrate to git-r3.eclass EGIT_OVERRIDE* APIs

See: https://xxoo.ws/gentoo/portage/commit/17d7a4564177b1985e4b7e8f23a8efbc4d5c32ae

Signed-off-by: Rob Walker <bob.mt.wya <AT> gmail.com>

 app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild   | 4 ++--
 app-emulation/wine-vanilla/wine-vanilla-2.0.1-r1.ebuild | 4 ++--
 app-emulation/wine-vanilla/wine-vanilla-2.0.2-r1.ebuild | 4 ++--
 app-emulation/wine-vanilla/wine-vanilla-2.0.3.ebuild    | 4 ++--
 app-emulation/wine-vanilla/wine-vanilla-2.0.4.ebuild    | 4 ++--
 app-emulation/wine-vanilla/wine-vanilla-2.1-r1.ebuild   | 4 ++--
 app-emulation/wine-vanilla/wine-vanilla-2.10-r1.ebuild  | 4 ++--
 app-emulation/wine-vanilla/wine-vanilla-2.11-r1.ebuild  | 4 ++--
 app-emulation/wine-vanilla/wine-vanilla-2.12-r1.ebuild  | 4 ++--
 app-emulation/wine-vanilla/wine-vanilla-2.13-r1.ebuild  | 4 ++--
 app-emulation/wine-vanilla/wine-vanilla-2.14-r1.ebuild  | 4 ++--
 app-emulation/wine-vanilla/wine-vanilla-2.15-r1.ebuild  | 4 ++--
 app-emulation/wine-vanilla/wine-vanilla-2.16-r1.ebuild  | 4 ++--
 app-emulation/wine-vanilla/wine-vanilla-2.17-r1.ebuild  | 4 ++--
 app-emulation/wine-vanilla/wine-vanilla-2.18-r2.ebuild  | 4 ++--
 app-emulation/wine-vanilla/wine-vanilla-2.19-r1.ebuild  | 4 ++--
 app-emulation/wine-vanilla/wine-vanilla-2.2-r1.ebuild   | 4 ++--
 app-emulation/wine-vanilla/wine-vanilla-2.20.ebuild     | 4 ++--
 app-emulation/wine-vanilla/wine-vanilla-2.21.ebuild     | 4 ++--
 app-emulation/wine-vanilla/wine-vanilla-2.22.ebuild     | 4 ++--
 app-emulation/wine-vanilla/wine-vanilla-2.3-r1.ebuild   | 4 ++--
 app-emulation/wine-vanilla/wine-vanilla-2.4-r1.ebuild   | 4 ++--
 app-emulation/wine-vanilla/wine-vanilla-2.5-r1.ebuild   | 4 ++--
 app-emulation/wine-vanilla/wine-vanilla-2.6-r1.ebuild   | 4 ++--
 app-emulation/wine-vanilla/wine-vanilla-2.7-r1.ebuild   | 4 ++--
 app-emulation/wine-vanilla/wine-vanilla-2.8-r1.ebuild   | 4 ++--
 app-emulation/wine-vanilla/wine-vanilla-2.9-r1.ebuild   | 4 ++--
 app-emulation/wine-vanilla/wine-vanilla-3.0.1.ebuild    | 4 ++--
 app-emulation/wine-vanilla/wine-vanilla-3.0.2.ebuild    | 4 ++--
 app-emulation/wine-vanilla/wine-vanilla-3.0.3.ebuild    | 4 ++--
 app-emulation/wine-vanilla/wine-vanilla-3.0.ebuild      | 4 ++--
 app-emulation/wine-vanilla/wine-vanilla-3.1.ebuild      | 4 ++--
 app-emulation/wine-vanilla/wine-vanilla-3.10.ebuild     | 4 ++--
 app-emulation/wine-vanilla/wine-vanilla-3.11.ebuild     | 4 ++--
 app-emulation/wine-vanilla/wine-vanilla-3.12.ebuild     | 4 ++--
 app-emulation/wine-vanilla/wine-vanilla-3.13-r1.ebuild  | 4 ++--
 app-emulation/wine-vanilla/wine-vanilla-3.13.ebuild     | 4 ++--
 app-emulation/wine-vanilla/wine-vanilla-3.14.ebuild     | 4 ++--
 app-emulation/wine-vanilla/wine-vanilla-3.15.ebuild     | 4 ++--
 app-emulation/wine-vanilla/wine-vanilla-3.16.ebuild     | 4 ++--
 app-emulation/wine-vanilla/wine-vanilla-3.17.ebuild     | 4 ++--
 app-emulation/wine-vanilla/wine-vanilla-3.18.ebuild     | 4 ++--
 app-emulation/wine-vanilla/wine-vanilla-3.2.ebuild      | 4 ++--
 app-emulation/wine-vanilla/wine-vanilla-3.3.ebuild      | 4 ++--
 app-emulation/wine-vanilla/wine-vanilla-3.4.ebuild      | 4 ++--
 app-emulation/wine-vanilla/wine-vanilla-3.5.ebuild      | 4 ++--
 app-emulation/wine-vanilla/wine-vanilla-3.6.ebuild      | 4 ++--
 app-emulation/wine-vanilla/wine-vanilla-3.7.ebuild      | 4 ++--
 app-emulation/wine-vanilla/wine-vanilla-3.8.ebuild      | 4 ++--
 app-emulation/wine-vanilla/wine-vanilla-3.9.ebuild      | 4 ++--
 app-emulation/wine-vanilla/wine-vanilla-9999.ebuild     | 4 ++--
 51 files changed, 102 insertions(+), 102 deletions(-)

diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild
index 75313a8..a73addc 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild
@@ -239,7 +239,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
@@ -278,7 +278,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-2.0.1-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0.1-r1.ebuild
index 1b82284..6a15075 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-2.0.1-r1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.0.1-r1.ebuild
@@ -239,7 +239,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
@@ -278,7 +278,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-2.0.2-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0.2-r1.ebuild
index 1b82284..6a15075 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-2.0.2-r1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.0.2-r1.ebuild
@@ -239,7 +239,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
@@ -278,7 +278,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-2.0.3.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0.3.ebuild
index b74b79f..4880f03 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-2.0.3.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.0.3.ebuild
@@ -235,7 +235,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
@@ -274,7 +274,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-2.0.4.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0.4.ebuild
index 151e7a7..d3ac702 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-2.0.4.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.0.4.ebuild
@@ -235,7 +235,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
@@ -274,7 +274,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-2.1-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.1-r1.ebuild
index 9b9aaf7..aa47b91 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-2.1-r1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.1-r1.ebuild
@@ -239,7 +239,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
@@ -278,7 +278,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-2.10-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.10-r1.ebuild
index 84bb2fb..ab84545 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-2.10-r1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.10-r1.ebuild
@@ -240,7 +240,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
@@ -279,7 +279,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-2.11-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.11-r1.ebuild
index 84bb2fb..ab84545 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-2.11-r1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.11-r1.ebuild
@@ -240,7 +240,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
@@ -279,7 +279,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-2.12-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.12-r1.ebuild
index 84bb2fb..ab84545 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-2.12-r1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.12-r1.ebuild
@@ -240,7 +240,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
@@ -279,7 +279,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-2.13-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.13-r1.ebuild
index 84bb2fb..ab84545 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-2.13-r1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.13-r1.ebuild
@@ -240,7 +240,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
@@ -279,7 +279,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-2.14-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.14-r1.ebuild
index c18de2a..2b86b37 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-2.14-r1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.14-r1.ebuild
@@ -240,7 +240,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
@@ -279,7 +279,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-2.15-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.15-r1.ebuild
index c18de2a..2b86b37 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-2.15-r1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.15-r1.ebuild
@@ -240,7 +240,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
@@ -279,7 +279,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-2.16-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.16-r1.ebuild
index c18de2a..2b86b37 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-2.16-r1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.16-r1.ebuild
@@ -240,7 +240,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
@@ -279,7 +279,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-2.17-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.17-r1.ebuild
index c18de2a..2b86b37 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-2.17-r1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.17-r1.ebuild
@@ -240,7 +240,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
@@ -279,7 +279,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-2.18-r2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.18-r2.ebuild
index 72a94fa..9a7aeeb 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-2.18-r2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.18-r2.ebuild
@@ -236,7 +236,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
@@ -275,7 +275,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-2.19-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.19-r1.ebuild
index 72a94fa..9a7aeeb 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-2.19-r1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.19-r1.ebuild
@@ -236,7 +236,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
@@ -275,7 +275,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-2.2-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.2-r1.ebuild
index 9b9aaf7..aa47b91 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-2.2-r1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.2-r1.ebuild
@@ -239,7 +239,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
@@ -278,7 +278,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-2.20.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.20.ebuild
index b5f8da0..256b4de 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-2.20.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.20.ebuild
@@ -237,7 +237,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
@@ -276,7 +276,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-2.21.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.21.ebuild
index b5f8da0..256b4de 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-2.21.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.21.ebuild
@@ -237,7 +237,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
@@ -276,7 +276,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-2.22.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.22.ebuild
index b5f8da0..256b4de 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-2.22.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.22.ebuild
@@ -237,7 +237,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
@@ -276,7 +276,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-2.3-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.3-r1.ebuild
index 9b9aaf7..aa47b91 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-2.3-r1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.3-r1.ebuild
@@ -239,7 +239,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
@@ -278,7 +278,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-2.4-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.4-r1.ebuild
index 5f7b03d..461d2fe 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-2.4-r1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.4-r1.ebuild
@@ -239,7 +239,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
@@ -278,7 +278,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-2.5-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.5-r1.ebuild
index 5f7b03d..461d2fe 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-2.5-r1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.5-r1.ebuild
@@ -239,7 +239,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
@@ -278,7 +278,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-2.6-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.6-r1.ebuild
index 5f7b03d..461d2fe 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-2.6-r1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.6-r1.ebuild
@@ -239,7 +239,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
@@ -278,7 +278,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-2.7-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.7-r1.ebuild
index 5f7b03d..461d2fe 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-2.7-r1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.7-r1.ebuild
@@ -239,7 +239,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
@@ -278,7 +278,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-2.8-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.8-r1.ebuild
index 5f7b03d..461d2fe 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-2.8-r1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.8-r1.ebuild
@@ -239,7 +239,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
@@ -278,7 +278,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-2.9-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.9-r1.ebuild
index 84bb2fb..ab84545 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-2.9-r1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.9-r1.ebuild
@@ -240,7 +240,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
@@ -279,7 +279,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.0.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.0.1.ebuild
index 3dba3e2..fdc92cf 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-3.0.1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.0.1.ebuild
@@ -237,7 +237,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
@@ -276,7 +276,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.0.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.0.2.ebuild
index 8daec82..666c113 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-3.0.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.0.2.ebuild
@@ -237,7 +237,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
@@ -276,7 +276,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.0.3.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.0.3.ebuild
index 8daec82..666c113 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-3.0.3.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.0.3.ebuild
@@ -237,7 +237,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
@@ -276,7 +276,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.0.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.0.ebuild
index 8daec82..666c113 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-3.0.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.0.ebuild
@@ -237,7 +237,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
@@ -276,7 +276,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.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.1.ebuild
index 1ee046f..da4d092 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-3.1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.1.ebuild
@@ -238,7 +238,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
@@ -277,7 +277,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.10.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.10.ebuild
index 674daee..49079cc 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-3.10.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.10.ebuild
@@ -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.11.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.11.ebuild
index 674daee..49079cc 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-3.11.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.11.ebuild
@@ -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.12.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.12.ebuild
index 674daee..49079cc 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-3.12.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.12.ebuild
@@ -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.13-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.13-r1.ebuild
index 8dd876a..ffbae03 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-3.13-r1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.13-r1.ebuild
@@ -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.13.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.13.ebuild
index 8dd876a..ffbae03 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-3.13.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.13.ebuild
@@ -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.14.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.14.ebuild
index 8dd876a..ffbae03 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-3.14.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.14.ebuild
@@ -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.15.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.15.ebuild
index 8dd876a..ffbae03 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-3.15.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.15.ebuild
@@ -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.16.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.16.ebuild
index 8dd876a..ffbae03 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-3.16.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.16.ebuild
@@ -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 17e45b2..04acfab 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-3.17.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.17.ebuild
@@ -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 17e45b2..04acfab 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-3.18.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.18.ebuild
@@ -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.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.2.ebuild
index 1ee046f..da4d092 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-3.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.2.ebuild
@@ -238,7 +238,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
@@ -277,7 +277,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.3.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.3.ebuild
index c085769..af3f138 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-3.3.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.3.ebuild
@@ -239,7 +239,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
@@ -278,7 +278,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.4.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.4.ebuild
index c085769..af3f138 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-3.4.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.4.ebuild
@@ -239,7 +239,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
@@ -278,7 +278,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.5.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.5.ebuild
index c085769..af3f138 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-3.5.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.5.ebuild
@@ -239,7 +239,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
@@ -278,7 +278,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.6.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.6.ebuild
index c085769..af3f138 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-3.6.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.6.ebuild
@@ -239,7 +239,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
@@ -278,7 +278,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.7.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.7.ebuild
index c085769..af3f138 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-3.7.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.7.ebuild
@@ -239,7 +239,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
@@ -278,7 +278,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.8.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.8.ebuild
index c085769..af3f138 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-3.8.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.8.ebuild
@@ -239,7 +239,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
@@ -278,7 +278,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.9.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.9.ebuild
index 674daee..49079cc 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-3.9.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.9.ebuild
@@ -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 8dd876a..ffbae03 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
@@ -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