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 550F21384B4 for ; Sun, 29 Nov 2015 13:22:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 156FF21C061; Sun, 29 Nov 2015 13:22:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2A14F21C01B for ; Sun, 29 Nov 2015 13:22:01 +0000 (UTC) Received: from [192.168.1.4] (d202-251.icpnet.pl [109.173.202.251]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: mgorny) by smtp.gentoo.org (Postfix) with ESMTPSA id 0020E33FDBF; Sun, 29 Nov 2015 13:21:57 +0000 (UTC) User-Agent: K-9 Mail for Android In-Reply-To: <1448799884-29158-8-git-send-email-jlec@gentoo.org> References: <565AE956.5060602@gentoo.org> <1448799884-29158-1-git-send-email-jlec@gentoo.org> <1448799884-29158-8-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 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Subject: Re: [gentoo-dev] [PATCH 7/8] virtualx.eclass: Ban deprecated functionality in EAPI > 5 From: =?UTF-8?Q?Micha=C5=82_G=C3=B3rny?= Date: Sun, 29 Nov 2015 14:21:49 +0100 To: gentoo-dev@lists.gentoo.org,Justin Lecher CC: Justin Lecher Message-ID: <35C35A10-064B-4709-9313-2C4DB09BA10F@gentoo.org> X-Archives-Salt: 27a04278-0868-416a-90c7-5c99bcfc496d X-Archives-Hash: 265ac853237c72e15f45a88d571a351d Dnia 29 listopada 2015 13:24:43 CET, Justin Lecher napisał(a): >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." Here's one more reference to deprecated API. > 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 "$@" > } > -- Sent from my Android device with K-9 Mail. Please excuse my brevity.