On 2018-02-15 13:07, Mart Raudsepp wrote: > On Thu, 2018-02-15 at 08:46 +0100, Guilherme Amadio wrote: >> Most of the above only use usex, and terminus-font uses einstalldocs >> as well. >> I think these should be pretty easy to fix to not use eutils, or >> simply >> add 'inherit eutils' for these ebuilds, then remove from the eclass. >> >> I can help with testing by reading ebuilds more carefully and >> emerging >> them after the change in font.eclass. > > einstalldocs is part of EAPI-6 and inherit eutils isn't needed for that > if it's EAPI-6. In fact, eutils doesn't define it for EAPI-6, only 0-5. > > Same with usex, except that's builtin already in EAPI-5.
Thank you all for your ideas and contributions.
I have looked at all ebuilds which are EAPI=6 and depend on eutils,
and do not inherit it directly but rely on the eutils via fonts.eclass.
They are all fixed now.
All ebuilds, which inherit fonts.eclass and EAPI=6 will still work fine
now, if we drop inherit eutils from font.eclass for EAPI=6
My suggesion is:
diff --git a/eclass/font.eclass b/eclass/font.eclass
index 7214c99854a..e212004bc44 100644
--- a/eclass/font.eclass
+++ b/eclass/font.eclass
@@ -1,12 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# @ECLASS: font.eclass
-# @MAINTAINER:
-# fo...@gentoo.org
+# @MAINTAINER: fo...@gentoo.org
# @BLURB: Eclass to make font installation uniform
-inherit eutils
+[[ ${EAPI} == [012345] ]] && inherit eutils
EXPORT_FUNCTIONS pkg_setup src_install pkg_postinst pkg_postrm
--
Best,
Jonas
signature.asc
Description: OpenPGP digital signature
