[gentoo-commits] proj/gs-elpa:master commit in: gs_elpa/

[Ulrich Müller]

commit:     d42fc8be1ccede451a61a77bed83bc61d144a7cd
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue May  4 18:23:36 2021 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue May  4 18:23:36 2021 +0000
URL:        https://gitweb.gentoo.org/proj/gs-elpa.git/commit/?id=d42fc8be

gs_elpa/ebuild.py: Generate ebuilds for EAPI 7

Instead of EAPI 5, which is no longer supported by elisp.eclass.

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 gs_elpa/ebuild.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/gs_elpa/ebuild.py b/gs_elpa/ebuild.py
index d1d63f2..cf1b2dd 100644
--- a/gs_elpa/ebuild.py
+++ b/gs_elpa/ebuild.py
@@ -16,7 +16,7 @@ import collections
 from g_sorcery.ebuild import DefaultEbuildGenerator
 
 Layout = collections.namedtuple("Layout",
-    ["vars_before_inherit", "inherit",
+    ["eapi", "vars_before_inherit", "inherit",
      "vars_after_description", "vars_after_keywords"])
   
 
@@ -26,6 +26,8 @@ class ElpaEbuildWithDigestGenerator(DefaultEbuildGenerator):
     """
     def __init__(self, package_db):
 
+        eapi = "7"
+
         vars_before_inherit = \
           ["repo_uri", "source_type", "realname", {"name" : "digest_sources", 
"value" : "yes"}]
 
@@ -37,8 +39,8 @@ class ElpaEbuildWithDigestGenerator(DefaultEbuildGenerator):
         vars_after_keywords = \
           ["depend", "rdepend"]
 
-        layout = Layout(vars_before_inherit,
-                    inherit, vars_after_description, vars_after_keywords)
+        layout = Layout(eapi, vars_before_inherit, inherit,
+                    vars_after_description, vars_after_keywords)
 
         super(ElpaEbuildWithDigestGenerator, self).__init__(package_db, layout)
 
@@ -48,6 +50,8 @@ class 
ElpaEbuildWithoutDigestGenerator(DefaultEbuildGenerator):
     """
     def __init__(self, package_db):
 
+        eapi = "7"
+
         vars_before_inherit = \
           ["repo_uri", "source_type", "realname"]
 
@@ -59,7 +63,7 @@ class 
ElpaEbuildWithoutDigestGenerator(DefaultEbuildGenerator):
         vars_after_keywords = \
           ["depend", "rdepend"]
 
-        layout = Layout(vars_before_inherit, inherit,
+        layout = Layout(eapi, vars_before_inherit, inherit,
                     vars_after_description, vars_after_keywords)
 
         super(ElpaEbuildWithoutDigestGenerator, self).__init__(package_db, 
layout)