Re: [gentoo-dev] [PATCH 4/8] virtualx.eclass: Ban deprecated functionality in EAPI > 5

[Michał Górny]

On Sat, 28 Nov 2015 17:21:00 +0100
Justin Lecher <jlec@g.o> wrote:

> Signed-off-by: Justin Lecher <jlec@g.o>
> ---
>  eclass/virtualx.eclass | 5 +++++
>  1 file changed, 5 insertions(+)
>
> diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass
> index 230897b..a5e5457 100644
> --- a/eclass/virtualx.eclass
> +++ b/eclass/virtualx.eclass
> @@ -59,6 +59,8 @@ case ${VIRTUALX_REQUIRED} in
>  		RDEPEND=""
>  		;;
>  	optional|tests)
> +		[[ ${EAPI} == [2345] ]] \
> +			|| die 'Values "optional" and "tests" are unsupported for VIRTUALX_REQUIRED'

You don't mention EAPI here, which can get confusing.

>  		# deprecated section YAY.
>  		eqawarn "VIRTUALX_REQUIRED=optional and VIRTUALX_REQUIRED=tests are deprecated."
>  		eqawarn "You can drop the variable definition completely from ebuild,"
> @@ -177,6 +179,9 @@ virtualmake() {
>  Xmake() {
>  	debug-print-function ${FUNCNAME} "$@"
>
> +	[[ ${EAPI} == [2345] ]] \
> +		|| die "${FUNCNAME} is removed in EAPI > 5; use Xemake -j1 instead"
> +
>  	eqawarn "you should not execute make directly"
>  	eqawarn "rather execute Xemake -j1 if you have issues with parallel make"
>  	VIRTUALX_COMMAND="emake -j1" virtualmake "$@"

Still, if you introduced virtx earlier, you wouldn't have to change
this die message later on ;-).

-- 
Best regards,
Michał Górny
<http://dev.gentoo.org/~mgorny/>