[gentoo-dev] [PATCH] eclass: freedict: require EAPI=6

[gentoo-dev] [PATCH] eclass: freedict: require EAPI=6

[Marty E. Plummer]

As a pretty simple eclass, which only inherited multilib in
order to get $(get_libdir) and eutils for who knows why, and
all its consumers bumped to EAPI=6, it makes sense to require
EAPI 6 for this eclass

Package-Manager: Portage-2.3.24, Repoman-2.3.6
---
 eclass/freedict.eclass | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/eclass/freedict.eclass b/eclass/freedict.eclass
index 06419626d34..f2518f3cdcd 100644
--- a/eclass/freedict.eclass
+++ b/eclass/freedict.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: freedict.eclass
@@ -21,7 +21,10 @@
 # @DESCRIPTION:
 # Please see above for a description.
 
-inherit eutils multilib
+case ${EAPI:-0} in
+	6) ;;
+	*) die "${ECLASS}.eclass is banned in EAPI=${EAPI}" ;;
+esac
 
 IUSE=""
 
-- 
2.16.2

Re: [gentoo-dev] [PATCH] eclass: freedict: require EAPI=6

[Michał Górny]

W dniu pon, 26.03.2018 o godzinie 16∶33 -0500, użytkownik Marty E.
Plummer napisał:
> As a pretty simple eclass, which only inherited multilib in
> order to get $(get_libdir) and eutils for who knows why, and
> all its consumers bumped to EAPI=6, it makes sense to require
> EAPI 6 for this eclass
> 

It's trivial, used by 6 ebuilds... why do we even have this eclass?

If I wrote mgorny.eclass it would have more consumers ;-P.

-- 
Best regards,
Michał Górny

Re: [gentoo-dev] [PATCH] eclass: freedict: require EAPI=6

[Marty E. Plummer]

On Mon, Mar 26, 2018 at 11:58:00PM +0200, Michał Górny wrote:
> W dniu pon, 26.03.2018 o godzinie 16∶33 -0500, użytkownik Marty E.
> Plummer napisał:
> > As a pretty simple eclass, which only inherited multilib in
> > order to get $(get_libdir) and eutils for who knows why, and
> > all its consumers bumped to EAPI=6, it makes sense to require
> > EAPI 6 for this eclass
> > 
> 
> It's trivial, used by 6 ebuilds... why do we even have this eclass?
> 
> If I wrote mgorny.eclass it would have more consumers ;-P.
>
Possibly, but it does allow for pretty quick additions of freedict
packages, but since everything that uses it is EAPI 6 now it makes
sense to go ahead and ban lesser EAPIs in order to prevent their
reintroduction in that category. Honestly if you could set EAPI in
an eclass I'd set it there, then every ebuild using it would be at
EAPI 6 to begin with :)

Re: [gentoo-dev] [PATCH] eclass: freedict: require EAPI=6

[Ulrich Mueller]

>>>>> On Mon, 26 Mar 2018, Marty E Plummer wrote:

> As a pretty simple eclass, which only inherited multilib in
> order to get $(get_libdir) and eutils for who knows why, and
> all its consumers bumped to EAPI=6, it makes sense to require
> EAPI 6 for this eclass

While at it:
- Drop the IUSE="" assignment, it is useless (pun intended :)
- Update HOMEPAGE, freedict.de is dead
- LICENSE should be "GPL-2+" (sources say "GNU General Public License
  ver. 2.0 and any later version")
- DEPEND is not needed (should be RDEPEND instead, I guess)
- Use canonical ordering of variables (DESCRIPTION, HOMEPAGE, SRC_URI
  in first block; LICENSE, SLOT in second; then dependencies; then S)

Ulrich

Re: [gentoo-dev] [PATCH] eclass: freedict: require EAPI=6

[Marty E. Plummer]

On Tue, Mar 27, 2018 at 11:20:08AM +0200, Ulrich Mueller wrote:
> While at it:
> - Drop the IUSE="" assignment, it is useless (pun intended :)
> - Update HOMEPAGE, freedict.de is dead
> - LICENSE should be "GPL-2+" (sources say "GNU General Public License
>   ver. 2.0 and any later version")
> - DEPEND is not needed (should be RDEPEND instead, I guess)
> - Use canonical ordering of variables (DESCRIPTION, HOMEPAGE, SRC_URI
>   in first block; LICENSE, SLOT in second; then dependencies; then S)
> 
> Ulrich
>
How's this:

---
 eclass/freedict.eclass | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/eclass/freedict.eclass b/eclass/freedict.eclass
index 06419626d34..7c598aa6eaf 100644
--- a/eclass/freedict.eclass
+++ b/eclass/freedict.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: freedict.eclass
@@ -21,21 +21,23 @@
 # @DESCRIPTION:
 # Please see above for a description.
 
-inherit eutils multilib
-
-IUSE=""
+case ${EAPI:-0} in
+	6) ;;
+	*) die "${ECLASS}.eclass is banned in EAPI=${EAPI}" ;;
+esac
 
 MY_P=${PN/freedict-/}
 
-S="${WORKDIR}"
 DESCRIPTION="Freedict for language translation from ${FORLANG} to ${TOLANG}"
-HOMEPAGE="http://www.freedict.de"
+HOMEPAGE="http://freedict.sourceforge.net"
 SRC_URI="http://freedict.sourceforge.net/download/linux/${MY_P}.tar.gz"
 
+LICENSE="GPL-2+"
 SLOT="0"
-LICENSE="GPL-2"
 
-DEPEND="app-text/dictd"
+RDEPEND="app-text/dictd"
+
+S="${WORKDIR}"
 
 # @FUNCTION: freedict_src_install
 # @DESCRIPTION:
-- 
2.16.3

Re: [gentoo-dev] [PATCH] eclass: freedict: require EAPI=6

[Ulrich Mueller]

>>>>> On Wed, 28 Mar 2018, Marty E Plummer wrote:

> How's this:

Looks good to me.

> ---
>  eclass/freedict.eclass | 18 ++++++++++--------
>  1 file changed, 10 insertions(+), 8 deletions(-)

> diff --git a/eclass/freedict.eclass b/eclass/freedict.eclass
> index 06419626d34..7c598aa6eaf 100644
> --- a/eclass/freedict.eclass
> +++ b/eclass/freedict.eclass
> @@ -1,4 +1,4 @@
> -# Copyright 1999-2014 Gentoo Foundation
> +# Copyright 1999-2018 Gentoo Foundation
>  # Distributed under the terms of the GNU General Public License v2
 
>  # @ECLASS: freedict.eclass
> @@ -21,21 +21,23 @@
>  # @DESCRIPTION:
>  # Please see above for a description.
 
> -inherit eutils multilib
> -
> -IUSE=""
> +case ${EAPI:-0} in
> +	6) ;;
> +	*) die "${ECLASS}.eclass is banned in EAPI=${EAPI}" ;;
> +esac
 
>  MY_P=${PN/freedict-/}
 
> -S="${WORKDIR}"
>  DESCRIPTION="Freedict for language translation from ${FORLANG} to ${TOLANG}"
> -HOMEPAGE="http://www.freedict.de"
> +HOMEPAGE="http://freedict.sourceforge.net"
>  SRC_URI="http://freedict.sourceforge.net/download/linux/${MY_P}.tar.gz"
 
> +LICENSE="GPL-2+"
>  SLOT="0"
> -LICENSE="GPL-2"
 
> -DEPEND="app-text/dictd"
> +RDEPEND="app-text/dictd"
> +
> +S="${WORKDIR}"
 
>  # @FUNCTION: freedict_src_install
>  # @DESCRIPTION:
> -- 
> 2.16.3

Re: [gentoo-dev] [PATCH] eclass: freedict: require EAPI=6

[Marty E. Plummer]

Any action on this?

On Wed, Mar 28, 2018 at 10:52:40AM +0200, Ulrich Mueller wrote:
> >>>>> On Wed, 28 Mar 2018, Marty E Plummer wrote:
> 
> > How's this:
> 
> Looks good to me.
> 
> > ---
> >  eclass/freedict.eclass | 18 ++++++++++--------
> >  1 file changed, 10 insertions(+), 8 deletions(-)
> 
> > diff --git a/eclass/freedict.eclass b/eclass/freedict.eclass
> > index 06419626d34..7c598aa6eaf 100644
> > --- a/eclass/freedict.eclass
> > +++ b/eclass/freedict.eclass
> > @@ -1,4 +1,4 @@
> > -# Copyright 1999-2014 Gentoo Foundation
> > +# Copyright 1999-2018 Gentoo Foundation
> >  # Distributed under the terms of the GNU General Public License v2
>  
> >  # @ECLASS: freedict.eclass
> > @@ -21,21 +21,23 @@
> >  # @DESCRIPTION:
> >  # Please see above for a description.
>  
> > -inherit eutils multilib
> > -
> > -IUSE=""
> > +case ${EAPI:-0} in
> > +	6) ;;
> > +	*) die "${ECLASS}.eclass is banned in EAPI=${EAPI}" ;;
> > +esac
>  
> >  MY_P=${PN/freedict-/}
>  
> > -S="${WORKDIR}"
> >  DESCRIPTION="Freedict for language translation from ${FORLANG} to ${TOLANG}"
> > -HOMEPAGE="http://www.freedict.de"
> > +HOMEPAGE="http://freedict.sourceforge.net"
> >  SRC_URI="http://freedict.sourceforge.net/download/linux/${MY_P}.tar.gz"
>  
> > +LICENSE="GPL-2+"
> >  SLOT="0"
> > -LICENSE="GPL-2"
>  
> > -DEPEND="app-text/dictd"
> > +RDEPEND="app-text/dictd"
> > +
> > +S="${WORKDIR}"
>  
> >  # @FUNCTION: freedict_src_install
> >  # @DESCRIPTION:
> > -- 
> > 2.16.3
> 
> 
> 

Re: [gentoo-dev] [PATCH] eclass: freedict: require EAPI=6

[Aaron Bauman]

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

Marty, I will get this merged today. I apologize for the delay.

On April 4, 2018 4:04:21 AM EDT, "Marty E. Plummer" <hanetzer@startmail.com> wrote:
>Any action on this?
>
>On Wed, Mar 28, 2018 at 10:52:40AM +0200, Ulrich Mueller wrote:
>> >>>>> On Wed, 28 Mar 2018, Marty E Plummer wrote:
>> 
>> > How's this:
>> 
>> Looks good to me.
>> 
>> > ---
>> >  eclass/freedict.eclass | 18 ++++++++++--------
>> >  1 file changed, 10 insertions(+), 8 deletions(-)
>> 
>> > diff --git a/eclass/freedict.eclass b/eclass/freedict.eclass
>> > index 06419626d34..7c598aa6eaf 100644
>> > --- a/eclass/freedict.eclass
>> > +++ b/eclass/freedict.eclass
>> > @@ -1,4 +1,4 @@
>> > -# Copyright 1999-2014 Gentoo Foundation
>> > +# Copyright 1999-2018 Gentoo Foundation
>> >  # Distributed under the terms of the GNU General Public License v2
>>  
>> >  # @ECLASS: freedict.eclass
>> > @@ -21,21 +21,23 @@
>> >  # @DESCRIPTION:
>> >  # Please see above for a description.
>>  
>> > -inherit eutils multilib
>> > -
>> > -IUSE=""
>> > +case ${EAPI:-0} in
>> > +	6) ;;
>> > +	*) die "${ECLASS}.eclass is banned in EAPI=${EAPI}" ;;
>> > +esac
>>  
>> >  MY_P=${PN/freedict-/}
>>  
>> > -S="${WORKDIR}"
>> >  DESCRIPTION="Freedict for language translation from ${FORLANG} to
>${TOLANG}"
>> > -HOMEPAGE="http://www.freedict.de"
>> > +HOMEPAGE="http://freedict.sourceforge.net"
>> > 
>SRC_URI="http://freedict.sourceforge.net/download/linux/${MY_P}.tar.gz"
>>  
>> > +LICENSE="GPL-2+"
>> >  SLOT="0"
>> > -LICENSE="GPL-2"
>>  
>> > -DEPEND="app-text/dictd"
>> > +RDEPEND="app-text/dictd"
>> > +
>> > +S="${WORKDIR}"
>>  
>> >  # @FUNCTION: freedict_src_install
>> >  # @DESCRIPTION:
>> > -- 
>> > 2.16.3
>> 
>> 
>> 

-- 
Sent from my Android device with K-9 Mail. Please excuse my brevity.

[-- Attachment #2: Type: text/html, Size: 4105 bytes --]

Re: [gentoo-dev] [PATCH] eclass: freedict: require EAPI=6

[Ulrich Mueller]

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

>>>>> On Wed, 04 Apr 2018, Aaron Bauman wrote:

> Marty, I will get this merged today. I apologize for the delay.

Already done. :) One tiny change, namely I've added a trailing slash
to the URL of the homepage.

Thanks,
Ulrich

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

Re: [gentoo-dev] [PATCH] eclass: freedict: require EAPI=6

[Marty E. Plummer]

On Wed, Apr 04, 2018 at 02:20:13PM +0200, Ulrich Mueller wrote:
> >>>>> On Wed, 04 Apr 2018, Aaron Bauman wrote:
> 
> > Marty, I will get this merged today. I apologize for the delay.
> 
> Already done. :) One tiny change, namely I've added a trailing slash
> to the URL of the homepage.
> 
> Thanks,
> Ulrich

Many thanks, now to continue my war against deprecated code!