Gentoo Archives: gentoo-dev

From: Marek Szuba <marecki@g.o>
To: gentoo-dev@l.g.o
Subject: [gentoo-dev] [PATCH 3/5] gnome2.eclass: do not call xdg_src_prepare
Date: Thu, 09 Dec 2021 13:25:07
Message-Id: 20211209132325.297913-4-marecki@gentoo.org
In Reply to: [gentoo-dev] [PATCH 0/5] EAPI-8 support in gnome2{,-utils}.eclass by Marek Szuba
1 No longer available for EAPI-8+, and gnome2_src_prepare already calls
2 xdg_environment_reset via gnome2_environment_reset. All that function
3 did otherwise was call default src_prepare for EAPI-6+ so do just that
4 directly.
5
6 Signed-off-by: Marek Szuba <marecki@g.o>
7 ---
8 eclass/gnome2.eclass | 4 ++--
9 1 file changed, 2 insertions(+), 2 deletions(-)
10
11 diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
12 index 6fab55785be..4b7c3acac06 100644
13 --- a/eclass/gnome2.eclass
14 +++ b/eclass/gnome2.eclass
15 @@ -1,4 +1,4 @@
16 -# Copyright 1999-2020 Gentoo Authors
17 +# Copyright 1999-2021 Gentoo Authors
18 # Distributed under the terms of the GNU General Public License v2
19
20 # @ECLASS: gnome2.eclass
21 @@ -96,7 +96,7 @@ gnome2_src_unpack() {
22 # Prepare environment for build, fix build of scrollkeeper documentation,
23 # run elibtoolize.
24 gnome2_src_prepare() {
25 - xdg_src_prepare
26 + [[ ${EAPI} != 5 ]] && default
27
28 # Prevent assorted access violations and test failures
29 gnome2_environment_reset
30 --
31 2.32.0