public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Ulrich Müller" <ulm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gs-elpa:master commit in: gs_elpa/
Date: Tue,  4 May 2021 18:04:51 +0000 (UTC)	[thread overview]
Message-ID: <1620151165.12ac8f645cfb7305ecbce7220cea73ea58acf1db.ulm@gentoo> (raw)

commit:     12ac8f645cfb7305ecbce7220cea73ea58acf1db
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue May  4 17:59:25 2021 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue May  4 17:59:25 2021 +0000
URL:        https://gitweb.gentoo.org/proj/gs-elpa.git/commit/?id=12ac8f64

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)


             reply	other threads:[~2021-05-04 18:04 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-04 18:04 Ulrich Müller [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-05-04 18:25 [gentoo-commits] proj/gs-elpa:master commit in: gs_elpa/ Ulrich Müller
2021-05-05 16:47 Ulrich Müller
2021-11-04 14:09 Ulrich Müller
2023-02-19 14:50 Ulrich Müller
2023-05-20  9:35 Ulrich Müller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1620151165.12ac8f645cfb7305ecbce7220cea73ea58acf1db.ulm@gentoo \
    --to=ulm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox