1 |
On 2018-02-15 13:07, Mart Raudsepp wrote: |
2 |
> On Thu, 2018-02-15 at 08:46 +0100, Guilherme Amadio wrote: |
3 |
>> Most of the above only use usex, and terminus-font uses einstalldocs |
4 |
>> as well. |
5 |
>> I think these should be pretty easy to fix to not use eutils, or |
6 |
>> simply |
7 |
>> add 'inherit eutils' for these ebuilds, then remove from the eclass. |
8 |
>> |
9 |
>> I can help with testing by reading ebuilds more carefully and |
10 |
>> emerging |
11 |
>> them after the change in font.eclass. |
12 |
> |
13 |
> einstalldocs is part of EAPI-6 and inherit eutils isn't needed for that |
14 |
> if it's EAPI-6. In fact, eutils doesn't define it for EAPI-6, only 0-5. |
15 |
> |
16 |
> Same with usex, except that's builtin already in EAPI-5. |
17 |
|
18 |
Thank you all for your ideas and contributions. |
19 |
|
20 |
I have looked at all ebuilds which are EAPI=6 and depend on eutils, |
21 |
and do not inherit it directly but rely on the eutils via fonts.eclass. |
22 |
They are all fixed now. |
23 |
|
24 |
All ebuilds, which inherit fonts.eclass and EAPI=6 will still work fine |
25 |
now, if we drop inherit eutils from font.eclass for EAPI=6 |
26 |
|
27 |
My suggesion is: |
28 |
|
29 |
diff --git a/eclass/font.eclass b/eclass/font.eclass |
30 |
index 7214c99854a..e212004bc44 100644 |
31 |
--- a/eclass/font.eclass |
32 |
+++ b/eclass/font.eclass |
33 |
@@ -1,12 +1,11 @@ |
34 |
-# Copyright 1999-2015 Gentoo Foundation |
35 |
+# Copyright 1999-2018 Gentoo Foundation |
36 |
# Distributed under the terms of the GNU General Public License v2 |
37 |
|
38 |
# @ECLASS: font.eclass |
39 |
-# @MAINTAINER: |
40 |
-# fonts@g.o |
41 |
+# @MAINTAINER: fonts@g.o |
42 |
# @BLURB: Eclass to make font installation uniform |
43 |
|
44 |
-inherit eutils |
45 |
+[[ ${EAPI} == [012345] ]] && inherit eutils |
46 |
|
47 |
EXPORT_FUNCTIONS pkg_setup src_install pkg_postinst pkg_postrm |
48 |
|
49 |
-- |
50 |
Best, |
51 |
Jonas |