From d2fc4ef864ac27839ca653e91c2b535855271e13 Mon Sep 17 00:00:00 2001
From: Justin Lecher <jlec@gentoo.org>
Date: Fri, 27 Nov 2015 08:46:18 +0100
Subject: [PATCH] virtualx.eclass: Ban deprecated functionality in EAPI > 5

Signed-off-by: Justin Lecher <jlec@gentoo.org>
---
 eclass/virtualx.eclass | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass
index 7e78205e09c4d..9edf5d96e1397 100644
--- a/eclass/virtualx.eclass
+++ b/eclass/virtualx.eclass
@@ -22,7 +22,7 @@ case "${EAPI:-0}" in
 		;;
 esac
 
-inherit eutils
+[[ ${EAPI} == [2345] ]] && inherit eutils
 
 # @ECLASS-VARIABLE: VIRTUALX_REQUIRED
 # @DESCRIPTION:
@@ -58,6 +58,8 @@ case ${VIRTUALX_REQUIRED} in
 		RDEPEND=""
 		;;
 	optional|tests)
+		[[ ${EAPI} == [2345] ]] \
+			|| die 'Values "optional" and "tests" for VIRTUALX_REQUIRED are banned in EAPI > 5'
 		# deprecated section YAY.
 		eqawarn "VIRTUALX_REQUIRED=optional and VIRTUALX_REQUIRED=tests are deprecated."
 		eqawarn "You can drop the variable definition completely from ebuild,"
@@ -89,8 +91,12 @@ esac
 virtualmake() {
 	debug-print-function ${FUNCNAME} "$@"
 
+	[[ ${EAPI} == [2345] ]] \
+		|| die "${FUNCNAME} is unsupported in EAPI > 5, please use virtx"
+
 	# backcompat for maketype
 	if [[ -n ${maketype} ]]; then
+		[[ ${EAPI} == [2345] ]] || die "maketype is banned in EAPI > 5"
 		eqawarn "ebuild is exporting \$maketype=${maketype}"
 		eqawarn "Ebuild should be migrated to use 'virtx command' instead."
 		VIRTUALX_COMMAND=${maketype}
@@ -203,6 +209,9 @@ virtx() {
 Xmake() {
 	debug-print-function ${FUNCNAME} "$@"
 
+	[[ ${EAPI} == [2345] ]] \
+		|| die "${FUNCNAME} is unsupported in EAPI > 5, please use 'virtx emake -j1 ....'"
+
 	eqawarn "you should not execute make directly"
 	eqawarn "rather execute Xemake -j1 if you have issues with parallel make"
 	VIRTUALX_COMMAND="emake -j1" virtualmake "$@"
@@ -214,6 +223,9 @@ Xmake() {
 Xemake() {
 	debug-print-function ${FUNCNAME} "$@"
 
+	[[ ${EAPI} == [2345] ]] \
+		|| die "${FUNCNAME} is unsupported in EAPI > 5, please use 'virtx emake ....'"
+
 	VIRTUALX_COMMAND="emake" virtualmake "$@"
 }
 
@@ -223,6 +235,9 @@ Xemake() {
 Xeconf() {
 	debug-print-function ${FUNCNAME} "$@"
 
+	[[ ${EAPI} == [2345] ]] \
+		|| die "${FUNCNAME} is unsupported in EAPI > 5, please use 'virtx econf ....'"
+
 	VIRTUALX_COMMAND="econf" virtualmake "$@"
 }