diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2021-11-04 15:08:07 +0100 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2021-11-04 15:08:07 +0100 |
| commit | 111b15fbfe02f49c2450f8c6f90c6efad2e8e09a (patch) | |
| tree | d17089657e10d97685c165e1f0ed1e4eb9950bad | |
| parent | 0.2.1 release (diff) | |
| download | gs-elpa-111b15fbfe02f49c2450f8c6f90c6efad2e8e09a.tar.gz gs-elpa-111b15fbfe02f49c2450f8c6f90c6efad2e8e09a.tar.bz2 gs-elpa-111b15fbfe02f49c2450f8c6f90c6efad2e8e09a.zip | |
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@gentoo.org>
| -rw-r--r-- | gs_elpa/ebuild.py | 12 |
1 files 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) |