commit: 94edeb1703cfdd6e8b923fba667a04f15dc4fad9 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Jan 23 16:11:16 2021 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <keshia.bonaventure <AT> 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 <asturm <AT> 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
