• [gentoo-dev] [PATCH 3/5] gnome2.eclass: do not call xdg_src_prepare

    From Marek Szuba@21:1/5 to All on Thu Dec 9 14:30:01 2021
    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

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Usenet Gateway (21:1/5)