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

[Michał Górny]

Dnia 29 listopada 2015 13:24:43 CET, Justin Lecher <jlec@g.o> napisał(a):
>Signed-off-by: Justin Lecher <jlec@g.o>
>---
> 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.