From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 2353D1384B4 for ; Sun, 29 Nov 2015 12:27:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 70B1921C14A; Sun, 29 Nov 2015 12:24:56 +0000 (UTC) Received: from hetzner3.not-your-server.de (hetzner3.not-your-server.de [144.76.31.203]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6457321C061 for ; Sun, 29 Nov 2015 12:24:53 +0000 (UTC) Received: from localhost (localhost [IPv6:::1]) by hetzner3.not-your-server.de (Postfix) with ESMTP id 734831057C4; Sun, 29 Nov 2015 13:24:51 +0100 (CET) X-Virus-Scanned: amavisd-new at not-your-server.de Received: from hetzner3.not-your-server.de ([127.0.0.1]) by localhost (hetzner3.not-your-server.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id e_MEaYFMFzn5; Sun, 29 Nov 2015 13:24:50 +0100 (CET) Received: from leo.ics.kfa-juelich.de (static-2-1006.not-your-server.de [IPv6:2a01:4f8:191:22ca::2:1006]) by hetzner3.not-your-server.de (Postfix) with ESMTP id 2476F1057C8; Sun, 29 Nov 2015 13:24:50 +0100 (CET) From: Justin Lecher To: gentoo-dev@lists.gentoo.org Cc: Justin Lecher Subject: [gentoo-dev] [PATCH 7/8] virtualx.eclass: Ban deprecated functionality in EAPI > 5 Date: Sun, 29 Nov 2015 13:24:43 +0100 Message-Id: <1448799884-29158-8-git-send-email-jlec@gentoo.org> X-Mailer: git-send-email 2.6.3 In-Reply-To: <1448799884-29158-1-git-send-email-jlec@gentoo.org> References: <565AE956.5060602@gentoo.org> <1448799884-29158-1-git-send-email-jlec@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Archives-Salt: 8339d658-eef2-4f51-8364-0817fb6088f3 X-Archives-Hash: b8337252f08869f33809f02a9c57bd3b Signed-off-by: Justin Lecher --- eclass/virtualx.eclass | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass index bdecda6..344cd63 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 VIRTUALX_COMMAND=${maketype} instead." eqawarn "Setting VIRTUALX_COMMAND to \$maketype conveniently for now." @@ -204,6 +210,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 "$@" @@ -215,6 +224,9 @@ Xmake() { Xemake() { debug-print-function ${FUNCNAME} "$@" + [[ ${EAPI} == [2345] ]] \ + || die "${FUNCNAME} is unsupported in EAPI > 5, please use 'virtx emake ....'" + VIRTUALX_COMMAND="emake" virtualmake "$@" } @@ -224,6 +236,9 @@ Xemake() { Xeconf() { debug-print-function ${FUNCNAME} "$@" + [[ ${EAPI} == [2345] ]] \ + || die "${FUNCNAME} is unsupported in EAPI > 5, please use 'virtx econf ....'" + VIRTUALX_COMMAND="econf" virtualmake "$@" } -- 2.6.3