--- gs-elpa-0.1.3/gs_elpa/ebuild.py +++ gs-elpa-0.1.3/gs_elpa/ebuild.py @@ -16,7 +16,7 @@ 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 @@ """ def __init__(self, package_db): + eapi = "7" + vars_before_inherit = \ ["repo_uri", "source_type", "realname", {"name" : "digest_sources", "value" : "yes"}] @@ -37,7 +39,7 @@ vars_after_keywords = \ ["depend", "rdepend"] - layout = Layout(vars_before_inherit, + layout = Layout(eapi, vars_before_inherit, inherit, vars_after_description, vars_after_keywords) super(ElpaEbuildWithDigestGenerator, self).__init__(package_db, layout) @@ -48,6 +50,8 @@ """ def __init__(self, package_db): + eapi = "7" + vars_before_inherit = \ ["repo_uri", "source_type", "realname"] @@ -59,7 +63,7 @@ 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)