summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Szuba <marecki@gentoo.org>2021-12-09 13:13:05 +0000
committerMarek Szuba <marecki@gentoo.org>2021-12-13 10:05:55 +0000
commit89b0b1ea5948f4e818826e5cbaca3c116dd35c8c (patch)
tree8c52e213ed3eda5d579fac0bddae591b9e6539b6 /eclass/gnome2.eclass
parentgnome2-utils.eclass: support EAPI 8 (diff)
downloadgentoo-89b0b1ea5948f4e818826e5cbaca3c116dd35c8c.tar.gz
gentoo-89b0b1ea5948f4e818826e5cbaca3c116dd35c8c.tar.bz2
gentoo-89b0b1ea5948f4e818826e5cbaca3c116dd35c8c.zip
gnome2.eclass: do not call xdg_src_prepare
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>
Diffstat (limited to 'eclass/gnome2.eclass')
-rw-r--r--eclass/gnome2.eclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index 6fab55785be5..4b7c3acac06d 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