[gentoo-dev] [PATCH] eutils.eclass: Kill multilib inherit for EAPI 7

[gentoo-dev] [PATCH] eutils.eclass: Kill multilib inherit for EAPI 7

[Michał Górny]

The multilib.eclass seems not to be used by any eutils function.
Therefore, disable the inherit for EAPI 7. It is being preserved for
older EAPIs not to break ebuilds inheriting this eclass and using
multilib.eclass functions implicitly.
---
 eclass/eutils.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass
index 724a310b3000..e036001dc5e1 100644
--- a/eclass/eutils.eclass
+++ b/eclass/eutils.eclass
@@ -17,12 +17,12 @@
 if [[ -z ${_EUTILS_ECLASS} ]]; then
 _EUTILS_ECLASS=1
 
-inherit multilib toolchain-funcs
+inherit toolchain-funcs
 
 # implicitly inherited (now split) eclasses
 case ${EAPI:-0} in
 0|1|2|3|4|5|6)
-	inherit epatch estack
+	inherit epatch estack multilib
 	;;
 esac
 
-- 
2.12.0

Re: [gentoo-dev] [PATCH] eutils.eclass: Kill multilib inherit for EAPI 7

[Michał Górny]

[-- Attachment #1: Type: text/plain, Size: 951 bytes --]

On sob, 2017-03-11 at 16:07 +0100, Michał Górny wrote:
> The multilib.eclass seems not to be used by any eutils function.
> Therefore, disable the inherit for EAPI 7. It is being preserved for
> older EAPIs not to break ebuilds inheriting this eclass and using
> multilib.eclass functions implicitly.
> ---
>  eclass/eutils.eclass | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass
> index 724a310b3000..e036001dc5e1 100644
> --- a/eclass/eutils.eclass
> +++ b/eclass/eutils.eclass
> @@ -17,12 +17,12 @@
>  if [[ -z ${_EUTILS_ECLASS} ]]; then
>  _EUTILS_ECLASS=1
>  
> -inherit multilib toolchain-funcs
> +inherit toolchain-funcs
>  
>  # implicitly inherited (now split) eclasses
>  case ${EAPI:-0} in
>  0|1|2|3|4|5|6)
> -	inherit epatch estack
> +	inherit epatch estack multilib
>  	;;
>  esac
>  

Merged.

-- 
Best regards,
Michał Górny

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 963 bytes --]