Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 704524 - cmake.eclass: Use current working directory instead of ${S} when initializing ${CMAKE_USE_DIR} and ${BUILD_DIR}
Summary: cmake.eclass: Use current working directory instead of ${S} when initializing...
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Eclasses (show other bugs)
Hardware: All All
: Normal normal
Assignee: Gentoo KDE team
URL:
Whiteboard: fixed in EAPI-8
Keywords: InOverlay, PullRequest
: 704570 (view as bug list)
Depends on:
Blocks: 802786
  Show dependency tree
 
Reported: 2020-01-02 04:16 UTC by Harris Landgarten
Modified: 2021-09-02 18:19 UTC (History)
3 users (show)

See Also:
Package list:
Runtime testing required: ---


Attachments
media-gfx:gmic-2.7.2:20200102-145021.log (media-gfx:gmic-2.7.2:20200102-145021.log,4.00 KB, text/x-log)
2020-01-02 14:51 UTC, Jeroen Roovers (RETIRED)
Details
Patch (cmake.eclass.patch,4.17 KB, patch)
2020-01-04 03:59 UTC, Arfrever Frehtes Taifersar Arahesis
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Harris Landgarten 2020-01-02 04:16:45 UTC
Output from installing media-gfx/gmic-2.7.2:0::gentoo to ::installed replacing 2.7.2:0::installed:

Checking 'gmic_2.7.2.tar.gz'... ok
>>> Running ebuild phase killold as root:root...
>>> Starting builtin_killold
>>> Done builtin_killold
>>> Completed ebuild phase killold
>>> Running ebuild phases init saveenv as paludisbuild:paludisbuild...
>>> Starting builtin_init
>>> Done builtin_init
>>> Starting builtin_saveenv
>>> Done builtin_saveenv
>>> Completed ebuild phases init saveenv
>>> Running ebuild phases loadenv setup saveenv as root:root...
>>> Starting builtin_loadenv
>>> Done builtin_loadenv
>>> Starting pkg_setup
>>> Done pkg_setup
>>> Starting builtin_saveenv
>>> Done builtin_saveenv
>>> Completed ebuild phases loadenv setup saveenv
>>> Running ebuild phases loadenv unpack saveenv as paludisbuild:paludisbuild...
>>> Starting builtin_loadenv
>>> Done builtin_loadenv
>>> Starting src_unpack
>>> Unpacking gmic_2.7.2.tar.gz to /var/tmp/paludis/media-gfx-gmic-2.7.2/work
tar zxf /usr/portage/distfiles/gmic_2.7.2.tar.gz --no-same-owner
>>> Done src_unpack
>>> Starting builtin_saveenv
>>> Done builtin_saveenv
>>> Completed ebuild phases loadenv unpack saveenv
>>> Running ebuild phases loadenv prepare saveenv as paludisbuild:paludisbuild...
>>> Starting builtin_loadenv
>>> Done builtin_loadenv
>>> Starting src_prepare
patching file CMakeLists.txt
Hunk #1 succeeded at 82 (offset -1 lines).
Hunk #2 succeeded at 136 (offset -1 lines).
Hunk #3 succeeded at 298 (offset -1 lines).
Hunk #4 succeeded at 327 (offset -1 lines).
Hunk #5 succeeded at 357 (offset -1 lines).
patching file gmic-qt/CMakeLists.txt
Hunk #1 succeeded at 30 with fuzz 1.
Hunk #2 succeeded at 153 (offset 3 lines).
Hunk #3 succeeded at 193 (offset 3 lines).
patch -p1 -f -g0 --no-backup-if-mismatch < /usr/portage/media-gfx/gmic/files/gmic-2.4.3-curl.patch
 * Working in BUILD_DIR: "/var/tmp/paludis/media-gfx-gmic-2.7.2/work/gmic-2.7.2_build"
 * Hardcoded definition(s) removed in gmic-qt/CMakeLists.txt:
 *      set(CMAKE_BUILD_TYPE "Release")
 * Hardcoded definition(s) removed in CMakeLists.txt:
 *    set(CMAKE_BUILD_TYPE Release)

Error:
  * In program cave perform install --hooks --managed-output --output-exclusivity with-others =media-gfx/gmic-2.7.2:0::gentoo --destination installed --replacing =media-gfx/gmic-2.7.2:0::installed --x-of-y 1 of 1:
  * When installing 'media-gfx/gmic-2.7.2:0::gentoo' replacing { 'media-gfx/gmic-2.7.2:0::installed' }:
  * When running an ebuild command on 'media-gfx/gmic-2.7.2:0::gentoo':
  * Install failed for 'media-gfx/gmic-2.7.2:0::gentoo' (paludis::ActionFailedError)

patching file CMakeLists.txt
Hunk #1 FAILED at 13.
Hunk #2 FAILED at 145.
Hunk #3 FAILED at 187.
3 out of 3 hunks FAILED -- saving rejects to file CMakeLists.txt.rej
patch -p1 -f -g0 --no-backup-if-mismatch < /usr/portage/media-gfx/gmic/files/gmic-2.7.1-qt-cmake.patch

!!! ERROR in media-gfx/gmic-2.7.2::gentoo:
!!! In _ebuild_need_extglob_eapply at line 580
!!! applying patch /usr/portage/media-gfx/gmic/files/gmic-2.7.1-qt-cmake.patch failed

!!! Call stack:
!!!    * paludis_die_unless_nonfatal_func (/var/tmp/paludis/media-gfx-gmic-2.7.2/temp/loadsaveenv:3186)
!!!    * _ebuild_need_extglob_eapply (/var/tmp/paludis/media-gfx-gmic-2.7.2/temp/loadsaveenv:580)
!!!    * eapply (/var/tmp/paludis/media-gfx-gmic-2.7.2/temp/loadsaveenv:1530)
!!!    * default_src_prepare (/usr/libexec/paludis/6/src_prepare.bash:29)
!!!    * cmake_src_prepare (/var/tmp/paludis/media-gfx-gmic-2.7.2/temp/loadsaveenv:1316)
!!!    * src_prepare (/var/tmp/paludis/media-gfx-gmic-2.7.2/temp/loadsaveenv:3517)
!!!    * ebuild_f_prepare (/usr/libexec/paludis/6/src_prepare.bash:61)
!!!    * ebuild_main (/usr/libexec/paludis/ebuild.bash:675)
!!!    * main (/usr/libexec/paludis/ebuild.bash:698)

diefunc: making ebuild PID 3263697 exit with error
die trap: exiting with error.

Failed install to / for media-gfx/gmic-2.7.2:0::gentoo replacing 2.7.2:0::installed
Comment 1 Tim Harder gentoo-dev 2020-01-02 08:28:54 UTC
As far as I know upstream paludis doesn't support EAPI 7 and thus I don't think Gentoo supports it anymore either so I'm not entirely sure why you're using the gentoo repo with a custom-patched paludis.

That aside, I'm unable to reproduce this. Please reopen if you can using portage or something that officially supports EAPI 7.
Comment 2 Jeroen Roovers (RETIRED) gentoo-dev 2020-01-02 14:48:58 UTC
*** Bug 704570 has been marked as a duplicate of this bug. ***
Comment 3 Jeroen Roovers (RETIRED) gentoo-dev 2020-01-02 14:51:15 UTC
Created attachment 602312 [details]
media-gfx:gmic-2.7.2:20200102-145021.log

sys-apps/portage user here.
Comment 4 Jeroen Roovers (RETIRED) gentoo-dev 2020-01-02 14:51:39 UTC
Thu  2 Jan 15:51:02 CET 2020
emerge --info 
Portage 2.3.84 (python 3.6.9-final-0, default/linux/amd64/17.0, gcc-9.2.0, glibc-2.29-r7, 5.4.6-gentoo-JeR x86_64)
=================================================================
System uname: Linux-5.4.6-gentoo-JeR-x86_64-AMD_Athlon-tm-_II_X3_455_Processor-with-gentoo-2.6
KiB Mem:    16398932 total,   4904516 free
KiB Swap:    2097148 total,   2093052 free
Head commit of repository gentoo: b5dba65b9334dfb0306973e0c723a10c50e2243f
sh bash 4.4_p23-r1
ld GNU ld (Gentoo 2.32 p2) 2.32.0
distcc 3.3.3 x86_64-pc-linux-gnu [disabled]
ccache version 3.7.4 [disabled]
app-shells/bash:          4.4_p23-r1::gentoo
dev-java/java-config:     2.2.0-r4::gentoo
dev-lang/perl:            5.30.1::gentoo
dev-lang/python:          2.7.17::gentoo, 3.5.7::gentoo, 3.6.9::gentoo, 3.7.6::gentoo, 3.8.1::gentoo
dev-util/ccache:          3.7.4::gentoo
dev-util/cmake:           3.14.6::gentoo
dev-util/pkgconfig:       0.29.2::gentoo
sys-apps/baselayout:      2.6-r1::gentoo
sys-apps/openrc:          0.41.2::gentoo
sys-apps/sandbox:         2.18::gentoo
sys-devel/autoconf:       2.13-r1::gentoo, 2.69-r4::gentoo
sys-devel/automake:       1.11.6-r3::gentoo, 1.13.4-r2::gentoo, 1.15.1-r2::gentoo, 1.16.1-r1::gentoo
sys-devel/binutils:       2.23.2::gentoo, 2.26.1::gentoo, 2.28.1::gentoo, 2.29.1-r1::gentoo, 2.30-r4::gentoo, 2.32-r1::gentoo, 2.33.1::gentoo
sys-devel/gcc:            4.9.4-r1::gentoo, 5.4.0-r6::gentoo, 6.4.0-r5::gentoo, 7.3.0-r6::gentoo, 8.3.0-r3::gentoo, 9.2.0-r3::gentoo
sys-devel/gcc-config:     2.1::gentoo
sys-devel/libtool:        2.4.6-r3::gentoo
sys-devel/make:           4.2.1-r4::gentoo
sys-kernel/linux-headers: 5.4::gentoo (virtual/os-headers)
sys-libs/glibc:           2.29-r7::gentoo
Repositories:

gentoo
    location: /aches/gentoo/portage
    sync-type: rsync
    sync-uri: rsync://rsync.nl.gentoo.org/gentoo-portage
    priority: 0
    sync-rsync-verify-metamanifest: yes
    sync-rsync-verify-jobs: 1
    sync-rsync-verify-max-age: 24
    sync-rsync-extra-opts: 

qt
    location: /aches/gentoo/layman/qt
    masters: gentoo
    priority: 50

steam-overlay
    location: /aches/gentoo/layman/steam
    masters: gentoo
    priority: 50

JeR
    location: /aches/gentoo/local
    masters: gentoo
    priority: 10000

ACCEPT_KEYWORDS="amd64"
ACCEPT_LICENSE="*"
CBUILD="x86_64-pc-linux-gnu"
CFLAGS="-frecord-gcc-switches -g -pipe -O2 -Wall -march=amdfam10 -mtune=amdfam10 -Wno-comment"
CHOST="x86_64-pc-linux-gnu"
CONFIG_PROTECT="/etc /etc/stunnel/stunnel.conf /usr/lib/ccache/bin /usr/lib/distcc/bin /usr/share/config /usr/share/gnupg/qualified.txt"
CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/dconf /etc/env.d /etc/fonts/fonts.conf /etc/gconf /etc/gentoo-release /etc/php/apache2-php7.1/ext-active/ /etc/php/apache2-php7.2/ext-active/ /etc/php/apache2-php7.3/ext-active/ /etc/php/cgi-php7.1/ext-active/ /etc/php/cgi-php7.2/ext-active/ /etc/php/cgi-php7.3/ext-active/ /etc/php/cli-php7.1/ext-active/ /etc/php/cli-php7.2/ext-active/ /etc/php/cli-php7.3/ext-active/ /etc/revdep-rebuild /etc/sandbox.d /etc/splash /etc/terminfo /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d /etc/texmf/web2c"
CXXFLAGS="-frecord-gcc-switches -g -pipe -O2 -Wall -march=amdfam10 -mtune=amdfam10"
DISTDIR="/aches/gentoo/distfiles"
EMERGE_DEFAULT_OPTS="--autounmask=n --keep-going --verbose-conflicts"
ENV_UNSET="DBUS_SESSION_BUS_ADDRESS DISPLAY GOBIN PERL5LIB PERL5OPT PERLPREFIX PERL_CORE PERL_MB_OPT PERL_MM_OPT XAUTHORITY XDG_CACHE_HOME XDG_CONFIG_HOME XDG_DATA_HOME XDG_RUNTIME_DIR"
FCFLAGS="-O2 -pipe"
FEATURES="assume-digests binpkg-docompress binpkg-dostrip binpkg-logs buildpkg cgroup compressdebug config-protect-if-modified distlocks fakeroot fixlafiles ipc-sandbox merge-sync metadata-transfer multilib-strict network-sandbox news parallel-fetch preserve-libs protect-owned sandbox sfperms sign splitdebug strict test-fail-continue unknown-features-warn unmerge-logs unmerge-orphans userfetch userpriv usersandbox usersync xattr"
FFLAGS="-frecord-gcc-switches -g -pipe -O2 -Wall -march=amdfam10 -mtune=amdfam10"
GENTOO_MIRRORS=" https://mirror.netcologne.de/gentoo/ https://ftp.snt.utwente.nl/pub/os/linux/gentoo https://mirror.leaseweb.com/gentoo/ "
LANG="en_GB.utf8"
LDFLAGS="-Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed"
LINGUAS="en_GB en nl"
MAKEOPTS="-j1"
PKGDIR="/aches/gentoo/packages/wim"
PORTAGE_CONFIGROOT="/"
PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --omit-dir-times --compress --force --whole-file --delete --stats --human-readable --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages --exclude=/.git"
PORTAGE_TMPDIR="/home"
USE="256-color X a52 aac acl acpi alsa amd64 apng bash-completion berkdb bluetooth bzip2 cairo caps cli consolekit cracklib crypt cups cxx dbus distinct-l dri drm egl ffmpeg flac fortran gdbm geoip gif glamor graphite gtk gudev hwdb i3 iconv idn introspection ipv6 ithreads jack jpeg kmod lame libtirpc lm-sensors lm_sensors lzma minizip mmx mmxext mng mtp multilib multislot multitarget musepack ncat ncurses netlink nfs nls nonblockdialogs nptl offensive ogg opencv opengl openmp openrc opus pam pcap pcre perl pie plasma png policykit python qml qt3support qt5 quesoglc readline savedconfig sbc seccomp sensord sloppy smp socks5 split-usr sse sse2 sse3 sse4 sse4_1 ssl system-libCg tcpd theora threads tiff tinfo truetype tty-helpers unicode unwind upower uvm vdpau vim-syntax vorbis wavpack wayland webkit2 x264 xa xattr xcb xft xinerama zlib" ABI_X86="64 32" ADA_TARGET="gnat_2018" ALSA_CARDS="ali5451 als4000 atiixp atiixp-modem bt87x ca0106 cmipci emu10k1x ens1370 ens1371 es1938 es1968 fm801 hda-intel intel8x0 intel8x0m maestro3 trident usb-audio via82xx via82xx-modem ymfpci" APACHE2_MODULES="authn_core authz_core socache_shmcb unixd actions alias auth_basic authn_alias authn_anon authn_dbm authn_default authn_file authz_dbm authz_default authz_groupfile authz_host authz_owner authz_user autoindex cache cgi cgid dav dav_fs dav_lock deflate dir disk_cache env expires ext_filter file_cache filter headers include info log_config logio mem_cache mime mime_magic negotiation rewrite setenvif speling status unique_id userdir usertrack vhost_alias" CALLIGRA_FEATURES="karbon sheets words" COLLECTD_PLUGINS="rrdtool rrdcached" CPU_FLAGS_X86="3dnow 3dnowext mmx mmxext popcnt sse sse2 sse3 sse4a" CURL_SSL="openssl" ELIBC="glibc" GPSD_PROTOCOLS="aivdm nmea nmea2000 nmea0183" INPUT_DEVICES="evdev libinput" KERNEL="linux" L10N="en-GB en nl" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer" LLVM_TARGETS="X86 NVPTX" NETBEANS_MODULES="apisupport cnd groovy gsf harness ide identity j2ee java mobility nb php profiler soa visualweb webcommon websvccommon xml" OFFICE_IMPLEMENTATION="libreoffice" PHP_TARGETS="php7-2" POSTGRES_TARGETS="postgres10 postgres11" PYTHON_SINGLE_TARGET="python3_6" PYTHON_TARGETS="python2_7 python3_6" QEMU_SOFTMMU_TARGETS="i386" QEMU_USER_TARGETS="i386" RUBY_TARGETS="ruby24 ruby25" USERLAND="GNU" VIDEO_CARDS="nvidia" XTABLES_ADDONS="quota2 psd pknock lscan length2 ipv4options ipset ipp2p iface geoip fuzzy condition tee tarpit sysrq steal rawnat logmark ipmark dhcpmac delude chaos account"
Unset:  CC, CPPFLAGS, CTARGET, CXX, INSTALL_MASK, LC_ALL, PORTAGE_BINHOST, PORTAGE_BUNZIP2_COMMAND, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS
Comment 5 Ben Kohler gentoo-dev 2020-01-02 15:18:08 UTC
(In reply to Tim Harder from comment #1)
> As far as I know upstream paludis doesn't support EAPI 7 and thus I don't
> think Gentoo supports it anymore either so I'm not entirely sure why you're
> using the gentoo repo with a custom-patched paludis.
> 
> That aside, I'm unable to reproduce this. Please reopen if you can using
> portage or something that officially supports EAPI 7.

Enable USE=qt5 to reproduce this bug
Comment 6 Harris Landgarten 2020-01-02 20:22:11 UTC
I verified the bug is portage before reporting. paludis for gentoo is being maintained in a fork which support EAPI7

https://github.com/MageSlayer/paludis-gentoo-patches/tree/eapi7
Comment 7 Tim Harder gentoo-dev 2020-01-02 22:02:58 UTC
(In reply to Ben Kohler from comment #5)
> (In reply to Tim Harder from comment #1)
> > As far as I know upstream paludis doesn't support EAPI 7 and thus I don't
> > think Gentoo supports it anymore either so I'm not entirely sure why you're
> > using the gentoo repo with a custom-patched paludis.
> > 
> > That aside, I'm unable to reproduce this. Please reopen if you can using
> > portage or something that officially supports EAPI 7.
> 
> Enable USE=qt5 to reproduce this bug

Yeah, I did that previously. It's my fault I didn't notice a newer tree pulled the cmake eclass instead of cmake-utils which causes the issue and honestly probably should have been tested a bit more before switching if it causes this kind of issue.
Comment 8 Tim Harder gentoo-dev 2020-01-02 22:04:56 UTC
(In reply to Harris Landgarten from comment #6)
> I verified the bug is portage before reporting. paludis for gentoo is being
> maintained in a fork which support EAPI7
> 
> https://github.com/MageSlayer/paludis-gentoo-patches/tree/eapi7

I'd highly suggest reporting using portage outputs in the future.
Comment 9 Larry the Git Cow gentoo-dev 2020-01-02 22:36:51 UTC
The bug has been referenced in the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=088d47495b72cf9d001f170887ad1e574b01da97

commit 088d47495b72cf9d001f170887ad1e574b01da97
Author:     Andreas Sturmlechner <asturm@gentoo.org>
AuthorDate: 2020-01-02 22:35:56 +0000
Commit:     Andreas Sturmlechner <asturm@gentoo.org>
CommitDate: 2020-01-02 22:36:38 +0000

    media-gfx/gmic: Revert back to cmake-utils.eclass
    
    Sorry for breaking. It is weird, but not for me to figure out.
    
    Bug: https://bugs.gentoo.org/704524
    Package-Manager: Portage-2.3.84, Repoman-2.3.20
    Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

 media-gfx/gmic/gmic-2.7.0.ebuild | 28 +++++++++++++++-------------
 media-gfx/gmic/gmic-2.7.1.ebuild | 28 +++++++++++++++-------------
 media-gfx/gmic/gmic-2.7.2.ebuild | 28 +++++++++++++++-------------
 3 files changed, 45 insertions(+), 39 deletions(-)
Comment 10 Arfrever Frehtes Taifersar Arahesis 2020-01-03 02:46:44 UTC
cmake-utils.eclass:cmake-utils_src_prepare() contains:

    ...
>>  pushd "${S}" > /dev/null || die

    if [[ ${EAPI} != 5 ]]; then
        default_src_prepare
        _cmake_cleanup_cmake
    else
        debug-print "$FUNCNAME: PATCHES=$PATCHES"
        [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"

        debug-print "$FUNCNAME: applying user patches"
        epatch_user
    fi

>>  popd > /dev/null || die
    ...


cmake.eclass:cmake_src_prepare() does not contain these calls to pushd / popd.


media-gfx/gmic ebuilds contain:

src_prepare() {
    local PATCHES=( "${FILESDIR}"/${PN}-2.4.3-curl.patch )
>>  cmake-utils_src_prepare
    ...
    if use gimp || use krita || use qt5; then
        sed -i '/CMAKE_CXX_FLAGS_RELEASE/d' gmic-qt/CMakeLists.txt || die
>>      local S="${S}/gmic-qt"
        PATCHES=( "${FILESDIR}"/${PN}-2.7.1-qt-cmake.patch )
>>      cmake-utils_src_prepare
    fi

This local change of ${S} variable would not have full effect on cmake_src_prepare().

cmake_src_prepare() uses ${S} as argument of find and chmod, so changing ${S} has effect only on second part of cmake_src_prepare().

I think that ${S} should have effect either on whole cmake_src_prepare() or on nothing (in this case, current working directory would be used, and ebuilds would be expected to call pushd / popd directly instead of changing ${S}).
Comment 11 Tim Harder gentoo-dev 2020-01-03 06:34:19 UTC
Closing since this was fixed by reverting and the latest 2.8.1 now in the tree has properly ported to cmake.eclass.
Comment 12 Larry the Git Cow gentoo-dev 2020-01-03 21:30:10 UTC
The bug has been referenced in the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3aad02d9011648f04788acfd9672bb8a101b104

commit d3aad02d9011648f04788acfd9672bb8a101b104
Author:     Andreas Sturmlechner <asturm@gentoo.org>
AuthorDate: 2020-01-03 21:23:18 +0000
Commit:     Andreas Sturmlechner <asturm@gentoo.org>
CommitDate: 2020-01-03 21:29:52 +0000

    cmake.eclass: src_prepare: Revert to cmake-utils.eclass behaviour
    
    Re-adding pushd/popd until we figure out how to make it consistent
    across the eclass.
    
    Bug: https://bugs.gentoo.org/704524
    Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

 eclass/cmake.eclass | 4 ++++
 1 file changed, 4 insertions(+)
Comment 13 Arfrever Frehtes Taifersar Arahesis 2020-01-04 03:59:49 UTC
Created attachment 602470 [details, diff]
Patch
Comment 14 Larry the Git Cow gentoo-dev 2020-01-04 13:02:24 UTC
The bug has been referenced in the following commit(s):

https://gitweb.gentoo.org/proj/kde.git/commit/?id=49a24b22df3641af3d87c5b546ae14b099ed9ae2

commit 49a24b22df3641af3d87c5b546ae14b099ed9ae2
Author:     Andreas Sturmlechner <asturm@gentoo.org>
AuthorDate: 2020-01-03 21:23:18 +0000
Commit:     Andreas Sturmlechner <asturm@gentoo.org>
CommitDate: 2020-01-04 12:19:17 +0000

    cmake.eclass: src_prepare: Revert to cmake-utils.eclass behaviour
    
    Re-adding pushd/popd until we figure out how to make it consistent
    across the eclass.
    
    Bug: https://bugs.gentoo.org/704524
    Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

 eclass/cmake.eclass | 4 ++++
 1 file changed, 4 insertions(+)
Comment 15 Larry the Git Cow gentoo-dev 2021-08-21 13:11:29 UTC
The bug has been referenced in the following commit(s):

https://gitweb.gentoo.org/proj/kde.git/commit/?id=ca79336c00701b0f0981adf57e2e0f6e614c3a0e

commit ca79336c00701b0f0981adf57e2e0f6e614c3a0e
Author:     Andreas Sturmlechner <asturm@gentoo.org>
AuthorDate: 2021-07-18 11:25:20 +0000
Commit:     Andreas Sturmlechner <asturm@gentoo.org>
CommitDate: 2021-08-21 13:10:11 +0000

    cmake.eclass: Support EAPI-8
    
    Switch to using current working directory instead of ${S}
    when initializing ${CMAKE_USE_DIR} and ${BUILD_DIR}.
    
    Raise baseline cmake version to 3.20.
    
    Bug: https://bugs.gentoo.org/704524
    Thanks-to: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
    Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

 eclass/cmake.eclass | 81 ++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 55 insertions(+), 26 deletions(-)
Comment 16 Larry the Git Cow gentoo-dev 2021-09-02 16:53:11 UTC
The bug has been referenced in the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48ac50b0e59489db7ea9f20ddc905a814fbe07b7

commit 48ac50b0e59489db7ea9f20ddc905a814fbe07b7
Author:     Andreas Sturmlechner <asturm@gentoo.org>
AuthorDate: 2021-07-18 10:40:16 +0000
Commit:     Andreas Sturmlechner <asturm@gentoo.org>
CommitDate: 2021-09-02 16:46:16 +0000

    cmake.eclass: Support EAPI-8
    
    Move supported EAPI check on top, EXPORT_FUNCTIONS below guard.
    
    Switch to using current working directory instead of ${S}
    when initializing ${CMAKE_USE_DIR} and ${BUILD_DIR}.
    
    Sort inherits.
    
    Raise baseline cmake version to 3.20.5.
    
    Bug: https://bugs.gentoo.org/704524
    Thanks-to: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
    Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

 eclass/cmake.eclass | 95 ++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 62 insertions(+), 33 deletions(-)