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 7825213835A for ; Sat, 23 Jan 2021 17:03:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B36BDE0A7F; Sat, 23 Jan 2021 17:03:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 99B27E0A7F for ; Sat, 23 Jan 2021 17:03:19 +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 1C6FD340F29 for ; Sat, 23 Jan 2021 17:03:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7BC6632B for ; Sat, 23 Jan 2021 17:03:16 +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: <1611421382.94edeb1703cfdd6e8b923fba667a04f15dc4fad9.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.5.ebuild dev-util/cmake/cmake-3.19.3.ebuild X-VCS-Directories: dev-util/cmake/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 94edeb1703cfdd6e8b923fba667a04f15dc4fad9 X-VCS-Branch: master Date: Sat, 23 Jan 2021 17:03:16 +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: 6a6080b4-008b-499e-954c-9d167ec00927 X-Archives-Hash: 90ea103f1cc97b9653b4547d491682bb commit: 94edeb1703cfdd6e8b923fba667a04f15dc4fad9 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jan 23 16:11:16 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jan 23 17:03:02 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94edeb17 dev-util/cmake: Re-enable CommandLineTar test w/ app-arch/libarchive[zstd] Thanks-to: Keshia Bonaventure you-spam.com> Bug: https://bugs.gentoo.org/690186 Closes: https://bugs.gentoo.org/743772 Closes: https://bugs.gentoo.org/766363 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-util/cmake/cmake-3.18.5.ebuild | 6 +++--- dev-util/cmake/cmake-3.19.3.ebuild | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dev-util/cmake/cmake-3.18.5.ebuild b/dev-util/cmake/cmake-3.18.5.ebuild index 4c000631090..4cd2e415b0d 100644 --- a/dev-util/cmake/cmake-3.18.5.ebuild +++ b/dev-util/cmake/cmake-3.18.5.ebuild @@ -3,7 +3,7 @@ EAPI=7 -CMAKE_MAKEFILE_GENERATOR="emake" # TODO: Re-check with 3.19, see commit 491dddfb; bug #596460 +CMAKE_MAKEFILE_GENERATOR="emake" # Fixed in 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 @@ -44,6 +44,7 @@ BDEPEND=" dev-python/requests dev-python/sphinx ) + test? ( app-arch/libarchive[zstd] ) " S="${WORKDIR}/${MY_P}" @@ -108,7 +109,6 @@ cmake_src_test() { # CMakeOnly.AllFindModules: pthread issues # CTest.updatecvs: fails to commit as root # Fortran: requires fortran - # RunCMake.CommandLineTar: whatever... # RunCMake.CompilerLauncher: also requires fortran # RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because # debugedit binary is not in the expected location @@ -120,7 +120,7 @@ cmake_src_test() { -j "$(makeopts_jobs)" \ --test-load "$(makeopts_loadavg)" \ ${ctestargs} \ - -E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CommandLineTar|RunCMake.CompilerLauncher|RunCMake.IncompatibleQt|RunCMake.ObsoleteQtMacros|RunCMake.PrecompileHeaders|RunCMake.CPack_(DEB|RPM)|TestUpload)" \ + -E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.IncompatibleQt|RunCMake.ObsoleteQtMacros|RunCMake.PrecompileHeaders|RunCMake.CPack_(DEB|RPM)|TestUpload)" \ || die "Tests failed" popd > /dev/null diff --git a/dev-util/cmake/cmake-3.19.3.ebuild b/dev-util/cmake/cmake-3.19.3.ebuild index 93041717129..b8777ecdb8d 100644 --- a/dev-util/cmake/cmake-3.19.3.ebuild +++ b/dev-util/cmake/cmake-3.19.3.ebuild @@ -44,6 +44,7 @@ BDEPEND=" dev-python/requests dev-python/sphinx ) + test? ( app-arch/libarchive[zstd] ) " S="${WORKDIR}/${MY_P}" @@ -108,7 +109,6 @@ cmake_src_test() { # CMakeOnly.AllFindModules: pthread issues # CTest.updatecvs: fails to commit as root # Fortran: requires fortran - # RunCMake.CommandLineTar: whatever... # RunCMake.CompilerLauncher: also requires fortran # RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because # debugedit binary is not in the expected location @@ -120,7 +120,7 @@ cmake_src_test() { -j "$(makeopts_jobs)" \ --test-load "$(makeopts_loadavg)" \ ${ctestargs} \ - -E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|DependencyGraph|Fortran|RunCMake.CommandLineTar|RunCMake.CompilerLauncher|RunCMake.IncompatibleQt|RunCMake.ObsoleteQtMacros|RunCMake.PrecompileHeaders|RunCMake.CPack_(DEB|RPM)|TestUpload)" \ + -E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|DependencyGraph|Fortran|RunCMake.CompilerLauncher|RunCMake.IncompatibleQt|RunCMake.ObsoleteQtMacros|RunCMake.PrecompileHeaders|RunCMake.CPack_(DEB|RPM)|TestUpload)" \ || die "Tests failed" popd > /dev/null