From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 44F43138359 for ; Sun, 6 Sep 2020 16:46:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 813CCE09DE; Sun, 6 Sep 2020 16:46:22 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6C0FAE09DD for ; Sun, 6 Sep 2020 16:46:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8FC5733FD24 for ; Sun, 6 Sep 2020 16:46:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3303634A for ; Sun, 6 Sep 2020 16:46:18 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1599410736.4bed21a599971df272b38dbcd10748c75584b366.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/cmake/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/cmake/cmake-3.18.2.ebuild X-VCS-Directories: dev-util/cmake/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 4bed21a599971df272b38dbcd10748c75584b366 X-VCS-Branch: master Date: Sun, 6 Sep 2020 16:46:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 038f24a4-9dbe-4e8c-8b6d-aaad38a8bfe1 X-Archives-Hash: 51e02593e7a22a67c711cefdbbc0b66a commit: 4bed21a599971df272b38dbcd10748c75584b366 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Sep 5 18:37:05 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Sep 6 16:45:36 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bed21a5 dev-util/cmake: Sort DEPENDs, fix typos, add TODO Drop superfluous cmake_use_find_package call Package-Manager: Portage-3.0.5, Repoman-3.0.1 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-util/cmake/cmake-3.18.2.ebuild | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/dev-util/cmake/cmake-3.18.2.ebuild b/dev-util/cmake/cmake-3.18.2.ebuild index 3e9f38a6689..ab16a6de18f 100644 --- a/dev-util/cmake/cmake-3.18.2.ebuild +++ b/dev-util/cmake/cmake-3.18.2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -CMAKE_MAKEFILE_GENERATOR="emake" +CMAKE_MAKEFILE_GENERATOR="emake" # TODO: Re-check with 3.19, see commit 491dddfb; bug #596460 CMAKE_REMOVE_MODULES_LIST=( none ) inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \ toolchain-funcs virtualx xdg-utils @@ -22,8 +22,8 @@ IUSE="doc emacs ncurses qt5 test" RESTRICT="!test? ( test )" RDEPEND=" - app-crypt/rhash >=app-arch/libarchive-3.3.3:= + app-crypt/rhash >=dev-libs/expat-2.0.1 >=dev-libs/jsoncpp-1.9.2-r2:0= >=dev-libs/libuv-1.10.0:= @@ -66,13 +66,13 @@ PATCHES=( "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch "${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch - "${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch #691544 + "${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch # bug 691544 # upstream fixes (can usually be removed with a version bump) ) cmake_src_bootstrap() { - # disable running of cmake in boostrap command + # disable running of cmake in bootstrap command sed -i \ -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \ bootstrap || die "sed failed" @@ -103,17 +103,17 @@ cmake_src_test() { [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure" # Excluded tests: - # BootstrapTest: we actualy bootstrap it every time so why test it. + # BootstrapTest: we actually bootstrap it every time so why test it. # BundleUtilities: bundle creation broken # CMakeOnly.AllFindModules: pthread issues - # CTest.updatecvs: which fails to commit as root + # CTest.updatecvs: fails to commit as root # Fortran: requires fortran # RunCMake.CompilerLauncher: also requires fortran # RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because # debugedit binary is not in the expected location # RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because # it can't find a deb package that owns libc - # TestUpload, which requires network access + # TestUpload: requires network access "${BUILD_DIR}"/bin/ctest \ -j "$(makeopts_jobs)" \ --test-load "$(makeopts_loadavg)" \ @@ -159,13 +159,7 @@ src_configure() { -DBUILD_CursesDialog="$(usex ncurses)" -DBUILD_TESTING=$(usex test) ) - - if use qt5 ; then - mycmakeargs+=( - -DBUILD_QtDialog=ON - $(cmake_use_find_package qt5 Qt5Widgets) - ) - fi + use qt5 && mycmakeargs+=( -DBUILD_QtDialog=ON ) cmake_src_configure }