[gentoo-dev] [PATCH] darcs.eclass: use BDEPEND with EAPI >= 7

[gentoo-dev] [PATCH] darcs.eclass: use BDEPEND with EAPI >= 7

[Michael Haubenwallner]

---
 eclass/darcs.eclass | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/eclass/darcs.eclass b/eclass/darcs.eclass
index 489008a87f1..81003651680 100644
--- a/eclass/darcs.eclass
+++ b/eclass/darcs.eclass
@@ -85,8 +85,16 @@ SRC_URI=""
 
 # --- end ebuild-configurable settings ---
 
-DEPEND="dev-vcs/darcs
-	net-misc/rsync"
+case ${EAPI:-0} in
+	[0-6]*)
+		DEPEND="dev-vcs/darcs
+			net-misc/rsync"
+		;;
+	*)
+		BDEPEND="dev-vcs/darcs
+			net-misc/rsync"
+		;;
+esac
 
 # @FUNCTION: darcs_patchcount
 # @DESCRIPTION:
-- 
2.19.2

Re: [gentoo-dev] [PATCH] darcs.eclass: use BDEPEND with EAPI >= 7

[David Seifert]

On Wed, 2019-05-29 at 11:00 +0200, Michael Haubenwallner wrote:
> ---
>  eclass/darcs.eclass | 12 ++++++++++--
>  1 file changed, 10 insertions(+), 2 deletions(-)
> 
> diff --git a/eclass/darcs.eclass b/eclass/darcs.eclass
> index 489008a87f1..81003651680 100644
> --- a/eclass/darcs.eclass
> +++ b/eclass/darcs.eclass
> @@ -85,8 +85,16 @@ SRC_URI=""
>  
>  # --- end ebuild-configurable settings ---
>  
> -DEPEND="dev-vcs/darcs
> -	net-misc/rsync"
> +case ${EAPI:-0} in
> +	[0-6]*)

Why the *? Do we really care about EAPI="5-HDEPEND" and others?

> +		DEPEND="dev-vcs/darcs
> +			net-misc/rsync"
> +		;;
> +	*)
> +		BDEPEND="dev-vcs/darcs
> +			net-misc/rsync"
> +		;;
> +esac
>  
>  # @FUNCTION: darcs_patchcount
>  # @DESCRIPTION:

Might be worth thinking about adding an EAPI whitelist like we do for
other eclasses. Just an idea, not required.

Re: [gentoo-dev] [PATCH] darcs.eclass: use BDEPEND with EAPI >= 7

[Ulrich Mueller]

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

>>>>> On Wed, 29 May 2019, David Seifert wrote:

> On Wed, 2019-05-29 at 11:00 +0200, Michael Haubenwallner wrote:
>> +case ${EAPI:-0} in
>> +	[0-6]*)

> Why the *? Do we really care about EAPI="5-HDEPEND" and others?

Worse, this will match EAPI 10. :)

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

Re: [gentoo-dev] [PATCH] darcs.eclass: use BDEPEND with EAPI >= 7

[David Seifert]

On Wed, 2019-05-29 at 11:31 +0200, Ulrich Mueller wrote:
> > > > > > On Wed, 29 May 2019, David Seifert wrote:
> > On Wed, 2019-05-29 at 11:00 +0200, Michael Haubenwallner wrote:
> > > +case ${EAPI:-0} in
> > > +	[0-6]*)
> > Why the *? Do we really care about EAPI="5-HDEPEND" and others?
> 
> Worse, this will match EAPI 10. :)

To be honest, I already have nightmares about the EAPI specifier
becoming a two-digit number, so many globs will fail...

[gentoo-dev] [PATCH-r1] darcs.eclass: use BDEPEND with EAPI >= 7

[Michael Haubenwallner]

---
 eclass/darcs.eclass | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/eclass/darcs.eclass b/eclass/darcs.eclass
index 489008a87f1..09b71882367 100644
--- a/eclass/darcs.eclass
+++ b/eclass/darcs.eclass
@@ -85,8 +85,16 @@ SRC_URI=""
 
 # --- end ebuild-configurable settings ---
 
-DEPEND="dev-vcs/darcs
-	net-misc/rsync"
+case ${EAPI:-0} in
+	[0-6]) # no need to care about 5-HDEPEND and similar
+		DEPEND="dev-vcs/darcs
+			net-misc/rsync"
+		;;
+	*)
+		BDEPEND="dev-vcs/darcs
+			net-misc/rsync"
+		;;
+esac
 
 # @FUNCTION: darcs_patchcount
 # @DESCRIPTION:
-- 
2.19.2

Re: [gentoo-dev] [PATCH] darcs.eclass: use BDEPEND with EAPI >= 7

[Michał Górny]

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

On Wed, 2019-05-29 at 11:33 +0200, David Seifert wrote:
> On Wed, 2019-05-29 at 11:31 +0200, Ulrich Mueller wrote:
> > > > > > > On Wed, 29 May 2019, David Seifert wrote:
> > > On Wed, 2019-05-29 at 11:00 +0200, Michael Haubenwallner wrote:
> > > > +case ${EAPI:-0} in
> > > > +	[0-6]*)
> > > Why the *? Do we really care about EAPI="5-HDEPEND" and others?
> > 
> > Worse, this will match EAPI 10. :)
> 
> To be honest, I already have nightmares about the EAPI specifier
> becoming a two-digit number, so many globs will fail...
> 

We'll go for '9a' instead, and then '9za' when we run out of letters.

-- 
Best regards,
Michał Górny


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

[gentoo-dev] Re: [PATCH-r1] darcs.eclass: use BDEPEND with EAPI >= 7

[Sergei Trofimovich]

On Wed, 29 May 2019 12:01:20 +0200
Michael Haubenwallner <haubi@gentoo.org> wrote:

> ---
>  eclass/darcs.eclass | 12 ++++++++++--
>  1 file changed, 10 insertions(+), 2 deletions(-)
> 
> diff --git a/eclass/darcs.eclass b/eclass/darcs.eclass
> index 489008a87f1..09b71882367 100644
> --- a/eclass/darcs.eclass
> +++ b/eclass/darcs.eclass
> @@ -85,8 +85,16 @@ SRC_URI=""
>  
>  # --- end ebuild-configurable settings ---
>  
> -DEPEND="dev-vcs/darcs
> -	net-misc/rsync"
> +case ${EAPI:-0} in
> +	[0-6]) # no need to care about 5-HDEPEND and similar
> +		DEPEND="dev-vcs/darcs
> +			net-misc/rsync"
> +		;;
> +	*)
> +		BDEPEND="dev-vcs/darcs
> +			net-misc/rsync"
> +		;;
> +esac
>  
>  # @FUNCTION: darcs_patchcount
>  # @DESCRIPTION:
> -- 
> 2.19.2
> 

Looks good!

-- 

  Sergei

[gentoo-dev] Re: [PATCH-r1] darcs.eclass: use BDEPEND with EAPI >= 7

[Michael Haubenwallner]

pushed, thanks!
/haubi/

On 5/29/19 8:51 PM, Sergei Trofimovich wrote:
> On Wed, 29 May 2019 12:01:20 +0200
> Michael Haubenwallner <haubi@gentoo.org> wrote:
> 
>> ---
>>  eclass/darcs.eclass | 12 ++++++++++--
>>  1 file changed, 10 insertions(+), 2 deletions(-)
>>
>> diff --git a/eclass/darcs.eclass b/eclass/darcs.eclass
>> index 489008a87f1..09b71882367 100644
>> --- a/eclass/darcs.eclass
>> +++ b/eclass/darcs.eclass
>> @@ -85,8 +85,16 @@ SRC_URI=""
>>  
>>  # --- end ebuild-configurable settings ---
>>  
>> -DEPEND="dev-vcs/darcs
>> -	net-misc/rsync"
>> +case ${EAPI:-0} in
>> +	[0-6]) # no need to care about 5-HDEPEND and similar
>> +		DEPEND="dev-vcs/darcs
>> +			net-misc/rsync"
>> +		;;
>> +	*)
>> +		BDEPEND="dev-vcs/darcs
>> +			net-misc/rsync"
>> +		;;
>> +esac
>>  
>>  # @FUNCTION: darcs_patchcount
>>  # @DESCRIPTION:
>> -- 
>> 2.19.2
>>
> 
> Looks good!
>