public inbox for gentoo-dev@lists.gentoo.org
 help / color / mirror / Atom feed
From: Marek Szuba <marecki@gentoo.org>
To: gentoo-dev@lists.gentoo.org
Subject: [gentoo-dev] [PATCH 3/5] gnome2.eclass: do not call xdg_src_prepare
Date: Thu,  9 Dec 2021 13:23:23 +0000	[thread overview]
Message-ID: <20211209132325.297913-4-marecki@gentoo.org> (raw)
In-Reply-To: <20211209132325.297913-1-marecki@gentoo.org>

No longer available for EAPI-8+, and gnome2_src_prepare already calls
xdg_environment_reset via gnome2_environment_reset. All that function
did otherwise was call default src_prepare for EAPI-6+ so do just that
directly.

Signed-off-by: Marek Szuba <marecki@gentoo.org>
---
 eclass/gnome2.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index 6fab55785be..4b7c3acac06 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: gnome2.eclass
@@ -96,7 +96,7 @@ gnome2_src_unpack() {
 # Prepare environment for build, fix build of scrollkeeper documentation,
 # run elibtoolize.
 gnome2_src_prepare() {
-	xdg_src_prepare
+	[[ ${EAPI} != 5 ]] && default
 
 	# Prevent assorted access violations and test failures
 	gnome2_environment_reset
-- 
2.32.0



  parent reply	other threads:[~2021-12-09 13:25 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-09 13:23 [gentoo-dev] [PATCH 0/5] EAPI-8 support in gnome2{,-utils}.eclass Marek Szuba
2021-12-09 13:23 ` [gentoo-dev] [PATCH 1/5] gnome2-utils.eclass: phase out emktemp Marek Szuba
2021-12-09 15:04   ` Michał Górny
2021-12-13 10:19     ` Marek Szuba
2021-12-13 17:24       ` Mart Raudsepp
2021-12-26  9:44         ` Marek Szuba
2021-12-26  9:50           ` Michał Górny
2021-12-26 10:17             ` Mart Raudsepp
2021-12-09 13:23 ` [gentoo-dev] [PATCH 2/5] gnome2-utils.eclass: support EAPI 8 Marek Szuba
2021-12-09 13:23 ` Marek Szuba [this message]
2021-12-09 13:23 ` [gentoo-dev] [PATCH 4/5] gnome2.eclass: standardise the EAPI guard Marek Szuba
2021-12-09 13:23 ` [gentoo-dev] [PATCH 5/5] gnome2.eclass: support EAPI 8 Marek Szuba

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211209132325.297913-4-marecki@gentoo.org \
    --to=marecki@gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox