[PATCH] fixheadtails.eclass: move sed to BDEPEND for EAPI 7

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

[PATCH] fixheadtails.eclass: move sed to BDEPEND for EAPI 7

David Michael
It executes sed at build time, so it should be installed in /.

Signed-off-by: David Michael <[hidden email]>
---

Hi,

Here is another simple dependency move to put a required program in the
correct ROOT so it can be executed during the build.  It's basically the
same as 814ab1294edf3565fc02fe63d15d6fa7ca886429.

Thanks.

David

 eclass/fixheadtails.eclass | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/eclass/fixheadtails.eclass b/eclass/fixheadtails.eclass
index c19d33924aa..5d221ca678c 100644
--- a/eclass/fixheadtails.eclass
+++ b/eclass/fixheadtails.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: fixheadtails.eclass
@@ -8,7 +8,10 @@
 # Original author John Mylchreest <[hidden email]>
 # @BLURB: functions to replace obsolete head/tail with POSIX compliant ones
 
-DEPEND=">=sys-apps/sed-4"
+case "${EAPI:-0}" in
+ [0-6]) DEPEND=">=sys-apps/sed-4" ;;
+ *) BDEPEND=">=sys-apps/sed-4" ;;
+esac
 
 _do_sed_fix() {
  einfo " - fixed $1"
--
2.21.1


Reply | Threaded
Open this post in threaded view
|

Re: [PATCH] fixheadtails.eclass: move sed to BDEPEND for EAPI 7

David Seifert
On Fri, 2020-03-20 at 14:19 -0400, David Michael wrote:

> It executes sed at build time, so it should be installed in /.
>
> Signed-off-by: David Michael <[hidden email]>
> ---
>
> Hi,
>
> Here is another simple dependency move to put a required program in the
> correct ROOT so it can be executed during the build.  It's basically the
> same as 814ab1294edf3565fc02fe63d15d6fa7ca886429.
>
> Thanks.
>
> David
>
>  eclass/fixheadtails.eclass | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/eclass/fixheadtails.eclass b/eclass/fixheadtails.eclass
> index c19d33924aa..5d221ca678c 100644
> --- a/eclass/fixheadtails.eclass
> +++ b/eclass/fixheadtails.eclass
> @@ -1,4 +1,4 @@
> -# Copyright 1999-2014 Gentoo Foundation
> +# Copyright 1999-2020 Gentoo Authors
>  # Distributed under the terms of the GNU General Public License v2
>  
>  # @ECLASS: fixheadtails.eclass
> @@ -8,7 +8,10 @@
>  # Original author John Mylchreest <[hidden email]>
>  # @BLURB: functions to replace obsolete head/tail with POSIX compliant ones
>  
> -DEPEND=">=sys-apps/sed-4"
> +case "${EAPI:-0}" in
> + [0-6]) DEPEND=">=sys-apps/sed-4" ;;
> + *) BDEPEND=">=sys-apps/sed-4" ;;
> +esac
>  
>  _do_sed_fix() {
>   einfo " - fixed $1"

This is an ancient dependency, just kill it altogether.