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: Thu, 4 Nov 2021 14:09:16 +0000 (UTC) [thread overview]
Message-ID: <1636034887.111b15fbfe02f49c2450f8c6f90c6efad2e8e09a.ulm@gentoo> (raw)
commit: 111b15fbfe02f49c2450f8c6f90c6efad2e8e09a
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 4 14:08:07 2021 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Nov 4 14:08:07 2021 +0000
URL: https://gitweb.gentoo.org/proj/gs-elpa.git/commit/?id=111b15fb
Revert "gs_elpa/ebuild.py: Generate ebuilds for EAPI 7"
Keep the default in one central place in g-sorcery, otherwise it would
have to be maintained in two places.
This reverts commit d42fc8be1ccede451a61a77bed83bc61d144a7cd.
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
gs_elpa/ebuild.py | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/gs_elpa/ebuild.py b/gs_elpa/ebuild.py
index 834d3a6..d0353d3 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",
- ["eapi", "vars_before_inherit", "inherit",
+ ["vars_before_inherit", "inherit",
"vars_after_description", "vars_after_keywords"])
@@ -26,8 +26,6 @@ class ElpaEbuildWithDigestGenerator(DefaultEbuildGenerator):
"""
def __init__(self, package_db):
- eapi = "7"
-
vars_before_inherit = \
["repo_uri", "source_type", "realname", {"name" : "digest_sources", "value" : "yes"}]
@@ -39,8 +37,8 @@ class ElpaEbuildWithDigestGenerator(DefaultEbuildGenerator):
vars_after_keywords = \
["depend", "rdepend"]
- layout = Layout(eapi, vars_before_inherit, inherit,
- vars_after_description, vars_after_keywords)
+ layout = Layout(vars_before_inherit,
+ inherit, vars_after_description, vars_after_keywords)
super(ElpaEbuildWithDigestGenerator, self).__init__(package_db, layout)
@@ -50,8 +48,6 @@ class ElpaEbuildWithoutDigestGenerator(DefaultEbuildGenerator):
"""
def __init__(self, package_db):
- eapi = "7"
-
vars_before_inherit = \
["repo_uri", "source_type", "realname"]
@@ -63,7 +59,7 @@ class ElpaEbuildWithoutDigestGenerator(DefaultEbuildGenerator):
vars_after_keywords = \
["depend", "rdepend"]
- layout = Layout(eapi, vars_before_inherit, inherit,
+ layout = Layout(vars_before_inherit, inherit,
vars_after_description, vars_after_keywords)
super(ElpaEbuildWithoutDigestGenerator, self).__init__(package_db, layout)
next reply other threads:[~2021-11-04 14:09 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-04 14:09 Ulrich Müller [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-05-20 9:35 [gentoo-commits] proj/gs-elpa:master commit in: gs_elpa/ Ulrich Müller
2023-02-19 14:50 Ulrich Müller
2021-05-05 16:47 Ulrich Müller
2021-05-04 18:25 Ulrich Müller
2021-05-04 18:04 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=1636034887.111b15fbfe02f49c2450f8c6f90c6efad2e8e09a.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