[gentoo-commits] repo/gentoo:master commit in: dev-util/cmake/

[Fabian Groffen]

commit:     918ca338cb2853bb8c94b6d8122631c4553ee93e
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 14 13:39:14 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Jan 14 13:40:18 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=918ca338

dev-util/cmake-3.19.3: disable Xcode hooks more drastically

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 dev-util/cmake/cmake-3.19.3.ebuild | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/dev-util/cmake/cmake-3.19.3.ebuild 
b/dev-util/cmake/cmake-3.19.3.ebuild
index 3dbd001d537..93041717129 100644
--- a/dev-util/cmake/cmake-3.19.3.ebuild
+++ b/dev-util/cmake/cmake-3.19.3.ebuild
@@ -131,8 +131,11 @@ src_prepare() {
 
        if [[ ${CHOST} == *-darwin* ]] ; then
                # disable Xcode hooks, bug #652134
-               sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \
-                       Source/cmGlobalXCodeGenerator.cxx || die
+               sed -i -e 's/cm\(\|Global\|Local\)XCode[^.]\+\.\(cxx\|h\)//' \
+                       Source/CMakeLists.txt || die
+               sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \
+                       -e '/cmGlobalXCodeGenerator.h/d' \
+                       Source/cmake.cxx || die
                # disable isysroot usage with GCC, we've properly instructed
                # where things are via GCC configuration and ldwrapper
                sed -i -e '/cmake_gnu_set_sysroot_flag/d' \