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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0852B158086 for ; Thu, 4 Nov 2021 14:09:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4F193E0928; Thu, 4 Nov 2021 14:09:19 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C1F96E0928 for ; Thu, 4 Nov 2021 14:09:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BD2D9342FDE for ; Thu, 4 Nov 2021 14:09:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7A6D6186 for ; Thu, 4 Nov 2021 14:09:16 +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: <1636034887.111b15fbfe02f49c2450f8c6f90c6efad2e8e09a.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: 111b15fbfe02f49c2450f8c6f90c6efad2e8e09a X-VCS-Branch: master Date: Thu, 4 Nov 2021 14:09:16 +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: ded932b6-6e2e-4dac-90cf-73961a2814b9 X-Archives-Hash: 61f6137c6eacc98a661b05cedd3ad12b commit: 111b15fbfe02f49c2450f8c6f90c6efad2e8e09a Author: Ulrich Müller gentoo org> AuthorDate: Thu Nov 4 14:08:07 2021 +0000 Commit: Ulrich Müller gentoo 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 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)