[gentoo-dev] [PATCH 0/2] Update libtool and autotools with EAPI7 dependencies

[gentoo-dev] [PATCH 0/2] Update libtool and autotools with EAPI7 dependencies

[Brian Evans]

Since these tools are run on a build host, they should be in BDEPENDS
for new EAPIs.

I've also taken the liberty of declaring what EAPIs are supported as
the lists will need to be adjusted in the future.

Comments welcome.

Brian

[gentoo-dev] [PATCH 1/2] eclass: libtool - Mark compatible EAPIs and introduce BDEPEND

[Brian Evans]

The eltpatch command is run on the build host.
As such, it needs to be in BDEPEND for EAPI 7.

Also taking this opportunity to list compatible EAPIs to consider
future adjustments.
---
 eclass/libtool.eclass | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/eclass/libtool.eclass b/eclass/libtool.eclass
index 2e0f608d342..942bf34aa27 100644
--- a/eclass/libtool.eclass
+++ b/eclass/libtool.eclass
@@ -1,9 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: libtool.eclass
 # @MAINTAINER:
 # base-system@gentoo.org
+# @SUPPORTED_EAPIS: 0 1 2 3 4 5 6 7
 # @BLURB: quickly update bundled libtool code
 # @DESCRIPTION:
 # This eclass patches ltmain.sh distributed with libtoolized packages with the
@@ -16,7 +17,11 @@
 if [[ -z ${_LIBTOOL_ECLASS} ]]; then
 _LIBTOOL_ECLASS=1
 
-DEPEND=">=app-portage/elt-patches-20170422"
+case ${EAPI:-0} in
+	0|1|2|3|4|5|6) DEPEND=">=app-portage/elt-patches-20170422" ;;
+	7) BDEPEND=">=app-portage/elt-patches-20170422" ;;
+	*) die "${ECLASS}: EAPI ${EAPI} not supported" ;;
+esac
 
 inherit toolchain-funcs
 
-- 
2.18.0

[gentoo-dev] [PATCH 2/2] eclass: autotools - Mark compatible EAPIs and introduce BDEPEND

[Brian Evans]

The autotools commands are run on the build host.
As such, their packages needs to be in BDEPEND for EAPI 7.

Also taking this opportunity to list compatible EAPIs to consider
future adjustments.

Signed-off-by: Brian Evans <grknight@gentoo.org>
---
 eclass/autotools.eclass | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass
index 2bc70f7b3c0..9143aa454d0 100644
--- a/eclass/autotools.eclass
+++ b/eclass/autotools.eclass
@@ -4,6 +4,7 @@
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
 # base-system@gentoo.org
+# @SUPPORTED_EAPIS: 0 1 2 3 4 5 6 7
 # @BLURB: Regenerates auto* build scripts
 # @DESCRIPTION:
 # This eclass is for safely handling autotooled software packages that need to
@@ -25,6 +26,11 @@ fi
 if [[ -z ${_AUTOTOOLS_ECLASS} ]]; then
 _AUTOTOOLS_ECLASS=1
 
+case ${EAPI:-0} in
+	0|1|2|3|4|5|6|7) ;;
+	*) die "${ECLASS}: EAPI ${EAPI} not supported" ;;
+esac
+
 inherit libtool
 
 # @ECLASS-VARIABLE: WANT_AUTOCONF
@@ -118,7 +124,10 @@ RDEPEND=""
 # their own DEPEND string.
 : ${AUTOTOOLS_AUTO_DEPEND:=yes}
 if [[ ${AUTOTOOLS_AUTO_DEPEND} != "no" ]] ; then
-	DEPEND=${AUTOTOOLS_DEPEND}
+	case ${EAPI:-0} in
+		0|1|2|3|4|5|6) DEPEND=${AUTOTOOLS_DEPEND} ;;
+		7) BDEPEND=${AUTOTOOLS_DEPEND} ;;
+	esac
 fi
 __AUTOTOOLS_AUTO_DEPEND=${AUTOTOOLS_AUTO_DEPEND} # See top of eclass
 
-- 
2.18.0

Re: [gentoo-dev] [PATCH 1/2] eclass: libtool - Mark compatible EAPIs and introduce BDEPEND

[James Le Cuirot]

On Fri,  7 Sep 2018 09:47:00 -0400
Brian Evans <grknight@gentoo.org> wrote:

> The eltpatch command is run on the build host.
> As such, it needs to be in BDEPEND for EAPI 7.
> 
> Also taking this opportunity to list compatible EAPIs to consider
> future adjustments.
> ---
>  eclass/libtool.eclass | 9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git a/eclass/libtool.eclass b/eclass/libtool.eclass
> index 2e0f608d342..942bf34aa27 100644
> --- a/eclass/libtool.eclass
> +++ b/eclass/libtool.eclass
> @@ -16,7 +17,11 @@
>  if [[ -z ${_LIBTOOL_ECLASS} ]]; then
>  _LIBTOOL_ECLASS=1
>  
> -DEPEND=">=app-portage/elt-patches-20170422"  
> +case ${EAPI:-0} in
> +	0|1|2|3|4|5|6) DEPEND=">=app-portage/elt-patches-20170422" ;;
> +	7) BDEPEND=">=app-portage/elt-patches-20170422" ;;
> +	*) die "${ECLASS}: EAPI ${EAPI} not supported" ;;
> +esac
>  
>  inherit toolchain-funcs
>  

Why not take the opportunity to bump elt-patches to 20170815?

-- 
James Le Cuirot (chewi)
Gentoo Linux Developer

Re: [gentoo-dev] [PATCH 0/2] Update libtool and autotools with EAPI7 dependencies

[Brian Evans]

[-- Attachment #1.1: Type: text/plain, Size: 1524 bytes --]

On 9/7/2018 9:46 AM, Brian Evans wrote:
> Since these tools are run on a build host, they should be in BDEPENDS
> for new EAPIs.
> 
> I've also taken the liberty of declaring what EAPIs are supported as
> the lists will need to be adjusted in the future.
> 
> Comments welcome.
> 
> Brian
> 
> 
> 
Now committed..

commit 4a0b5227a8b85cc97fee1647587964e6576123ff
Author: Brian Evans <grknight@gentoo.org>
Date:   Mon Sep 10 13:09:05 2018 -0400

    eclass: libtool - Update to the latest stable elt-patches

    As suggested by Chewi on the gentoo-dev ML

    Signed-off-by: Brian Evans <grknight@gentoo.org>

commit fda978185cde8189cfe7acf81079a163dcb78a40
Author: Brian Evans <grknight@gentoo.org>
Date:   Fri Sep 7 09:37:17 2018 -0400

    eclass: autotools - Mark compatible EAPIs and introduce BDEPEND

    The autotools commands are run on the build host.
    As such, their packages needs to be in BDEPEND for EAPI 7.

    Also taking this opportunity to list compatible EAPIs to consider
    future adjustments.

    Signed-off-by: Brian Evans <grknight@gentoo.org>

commit 5b58f83e6a23b001f6bdd5393e82cc6ab36072d2
Author: Brian Evans <grknight@gentoo.org>
Date:   Fri Sep 7 09:33:55 2018 -0400

    eclass: libtool - Mark compatible EAPIs and introduce BDEPEND

    The eltpatch command is run on the build host.
    As such, it needs to be in BDEPEND for EAPI 7.

    Also taking this opportunity to list compatible EAPIs to consider
    future adjustments.




[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 834 bytes --]