| 1 |
commit: 12ac8f645cfb7305ecbce7220cea73ea58acf1db |
| 2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue May 4 17:59:25 2021 +0000 |
| 4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 4 17:59:25 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/gs-elpa.git/commit/?id=12ac8f64 |
| 7 |
|
| 8 |
gs_elpa/ebuild.py: Generate ebuilds for EAPI 7 |
| 9 |
|
| 10 |
Instead of EAPI 5, which is no longer supported by elisp.eclass. |
| 11 |
|
| 12 |
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> |
| 13 |
|
| 14 |
gs_elpa/ebuild.py | 12 ++++++++---- |
| 15 |
1 file changed, 8 insertions(+), 4 deletions(-) |
| 16 |
|
| 17 |
diff --git a/gs_elpa/ebuild.py b/gs_elpa/ebuild.py |
| 18 |
index d1d63f2..cf1b2dd 100644 |
| 19 |
--- a/gs_elpa/ebuild.py |
| 20 |
+++ b/gs_elpa/ebuild.py |
| 21 |
@@ -16,7 +16,7 @@ import collections |
| 22 |
from g_sorcery.ebuild import DefaultEbuildGenerator |
| 23 |
|
| 24 |
Layout = collections.namedtuple("Layout", |
| 25 |
- ["vars_before_inherit", "inherit", |
| 26 |
+ ["eapi", "vars_before_inherit", "inherit", |
| 27 |
"vars_after_description", "vars_after_keywords"]) |
| 28 |
|
| 29 |
|
| 30 |
@@ -26,6 +26,8 @@ class ElpaEbuildWithDigestGenerator(DefaultEbuildGenerator): |
| 31 |
""" |
| 32 |
def __init__(self, package_db): |
| 33 |
|
| 34 |
+ eapi = "7" |
| 35 |
+ |
| 36 |
vars_before_inherit = \ |
| 37 |
["repo_uri", "source_type", "realname", {"name" : "digest_sources", "value" : "yes"}] |
| 38 |
|
| 39 |
@@ -37,8 +39,8 @@ class ElpaEbuildWithDigestGenerator(DefaultEbuildGenerator): |
| 40 |
vars_after_keywords = \ |
| 41 |
["depend", "rdepend"] |
| 42 |
|
| 43 |
- layout = Layout(vars_before_inherit, |
| 44 |
- inherit, vars_after_description, vars_after_keywords) |
| 45 |
+ layout = Layout(eapi, vars_before_inherit, inherit, |
| 46 |
+ vars_after_description, vars_after_keywords) |
| 47 |
|
| 48 |
super(ElpaEbuildWithDigestGenerator, self).__init__(package_db, layout) |
| 49 |
|
| 50 |
@@ -48,6 +50,8 @@ class ElpaEbuildWithoutDigestGenerator(DefaultEbuildGenerator): |
| 51 |
""" |
| 52 |
def __init__(self, package_db): |
| 53 |
|
| 54 |
+ eapi = "7" |
| 55 |
+ |
| 56 |
vars_before_inherit = \ |
| 57 |
["repo_uri", "source_type", "realname"] |
| 58 |
|
| 59 |
@@ -59,7 +63,7 @@ class ElpaEbuildWithoutDigestGenerator(DefaultEbuildGenerator): |
| 60 |
vars_after_keywords = \ |
| 61 |
["depend", "rdepend"] |
| 62 |
|
| 63 |
- layout = Layout(vars_before_inherit, inherit, |
| 64 |
+ layout = Layout(eapi, vars_before_inherit, inherit, |
| 65 |
vars_after_description, vars_after_keywords) |
| 66 |
|
| 67 |
super(ElpaEbuildWithoutDigestGenerator, self).__init__(package_db, layout) |
Archives