From 21435953e16cda318a82334ddbadb3b5c36d9ea7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 15 Jan 2020 15:51:32 +0000 Subject: gentoo resync : 15.01.2020 --- dev-util/cmake/cmake-3.13.5.ebuild | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'dev-util/cmake/cmake-3.13.5.ebuild') diff --git a/dev-util/cmake/cmake-3.13.5.ebuild b/dev-util/cmake/cmake-3.13.5.ebuild index fdf53e57156e..529cc0a350ef 100644 --- a/dev-util/cmake/cmake-3.13.5.ebuild +++ b/dev-util/cmake/cmake-3.13.5.ebuild @@ -4,8 +4,8 @@ EAPI=7 CMAKE_MAKEFILE_GENERATOR="emake" -CMAKE_REMOVE_MODULES="no" -inherit bash-completion-r1 elisp-common flag-o-matic toolchain-funcs virtualx xdg cmake-utils +CMAKE_REMOVE_MODULES_LIST=( none ) +inherit bash-completion-r1 elisp-common flag-o-matic toolchain-funcs virtualx xdg cmake MY_P="${P/_/-}" @@ -27,7 +27,7 @@ RDEPEND=" >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig - emacs? ( virtual/emacs ) + emacs? ( >=app-editors/emacs-23.1:* ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 @@ -135,7 +135,7 @@ cmake_src_test() { } src_prepare() { - cmake-utils_src_prepare + cmake_src_prepare # disable Xcode hooks, bug #652134 if [[ ${CHOST} == *-darwin* ]] ; then @@ -174,15 +174,15 @@ src_configure() { if use qt5 ; then mycmakeargs+=( -DBUILD_QtDialog=ON - $(cmake-utils_use_find_package qt5 Qt5Widgets) + $(cmake_use_find_package qt5 Qt5Widgets) ) fi - cmake-utils_src_configure + cmake_src_configure } src_compile() { - cmake-utils_src_compile + cmake_src_compile use emacs && elisp-compile Auxiliary/cmake-mode.el } @@ -191,7 +191,7 @@ src_test() { } src_install() { - cmake-utils_src_install + cmake_src_install if use emacs; then elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc -- cgit v1.2.3