From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2D2FE1382C5 for ; Tue, 4 May 2021 18:25:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 707F5E0801; Tue, 4 May 2021 18:25:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 58CC5E0801 for ; Tue, 4 May 2021 18:25:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BC60E335C8E for ; Tue, 4 May 2021 18:25:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 28DD9729 for ; Tue, 4 May 2021 18:25:08 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1620152616.d42fc8be1ccede451a61a77bed83bc61d144a7cd.ulm@gentoo> Subject: [gentoo-commits] proj/gs-elpa:master commit in: gs_elpa/ X-VCS-Repository: proj/gs-elpa X-VCS-Files: gs_elpa/ebuild.py X-VCS-Directories: gs_elpa/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: d42fc8be1ccede451a61a77bed83bc61d144a7cd X-VCS-Branch: master Date: Tue, 4 May 2021 18:25:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5b780ead-4365-4bc7-9d23-82083ad1d342 X-Archives-Hash: 290ed3f5331c1b9660267543d4c7ecb7 commit: d42fc8be1ccede451a61a77bed83bc61d144a7cd Author: Ulrich Müller gentoo org> AuthorDate: Tue May 4 18:23:36 2021 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Tue May 4 18:23:36 2021 +0000 URL: https://gitweb.gentoo.org/proj/gs-elpa.git/commit/?id=d42fc8be 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 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)