commit: a7166b7b1066616e78e15d161b8539466e368081 Author: Craig Andrews <candrews <AT> gentoo <DOT> org> AuthorDate: Wed May 5 13:58:22 2021 +0000 Commit: Craig Andrews <candrews <AT> gentoo <DOT> org> CommitDate: Wed May 5 13:58:22 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7166b7b
app-arch/brotli: Switch to CMAKE_ECLASS=cmake Closes: https://bugs.gentoo.org/770565 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Craig Andrews <candrews <AT> gentoo.org> .../{brotli-9999.ebuild => brotli-1.0.9-r3.ebuild} | 18 ++++++++++++------ app-arch/brotli/brotli-9999.ebuild | 11 ++++++----- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/app-arch/brotli/brotli-9999.ebuild b/app-arch/brotli/brotli-1.0.9-r3.ebuild similarity index 86% copy from app-arch/brotli/brotli-9999.ebuild copy to app-arch/brotli/brotli-1.0.9-r3.ebuild index 87affbe108c..9a372fb3166 100644 --- a/app-arch/brotli/brotli-9999.ebuild +++ b/app-arch/brotli/brotli-1.0.9-r3.ebuild @@ -6,6 +6,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{7,8,9} ) DISTUTILS_OPTIONAL="1" DISTUTILS_IN_SOURCE_BUILD="1" +CMAKE_ECLASS=cmake inherit cmake-multilib distutils-r1 @@ -33,18 +34,23 @@ else SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" fi -RESTRICT="!test? ( test )" +# tests are currently broken, see https://github.com/google/brotli/issues/850 +RESTRICT="test" + +PATCHES=( + "${FILESDIR}/${PV}-linker.patch" +) src_prepare() { use python && distutils-r1_src_prepare - cmake-utils_src_prepare + cmake_src_prepare } multilib_src_configure() { local mycmakeargs=( -DBUILD_TESTING="$(usex test)" ) - cmake-utils_src_configure + cmake_src_configure } src_configure() { cmake-multilib_src_configure @@ -52,7 +58,7 @@ src_configure() { } multilib_src_compile() { - cmake-utils_src_compile + cmake_src_compile } src_compile() { cmake-multilib_src_compile @@ -64,7 +70,7 @@ python_test() { } multilib_src_test() { - cmake-utils_src_test + cmake_src_test } src_test() { cmake-multilib_src_test @@ -72,7 +78,7 @@ src_test() { } multilib_src_install() { - cmake-utils_src_install + cmake_src_install use static-libs || rm "${ED}"/usr/$(get_libdir)/*.a || die } multilib_src_install_all() { diff --git a/app-arch/brotli/brotli-9999.ebuild b/app-arch/brotli/brotli-9999.ebuild index 87affbe108c..7dacb49548c 100644 --- a/app-arch/brotli/brotli-9999.ebuild +++ b/app-arch/brotli/brotli-9999.ebuild @@ -6,6 +6,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{7,8,9} ) DISTUTILS_OPTIONAL="1" DISTUTILS_IN_SOURCE_BUILD="1" +CMAKE_ECLASS=cmake inherit cmake-multilib distutils-r1 @@ -37,14 +38,14 @@ RESTRICT="!test? ( test )" src_prepare() { use python && distutils-r1_src_prepare - cmake-utils_src_prepare + cmake_src_prepare } multilib_src_configure() { local mycmakeargs=( -DBUILD_TESTING="$(usex test)" ) - cmake-utils_src_configure + cmake_src_configure } src_configure() { cmake-multilib_src_configure @@ -52,7 +53,7 @@ src_configure() { } multilib_src_compile() { - cmake-utils_src_compile + cmake_src_compile } src_compile() { cmake-multilib_src_compile @@ -64,7 +65,7 @@ python_test() { } multilib_src_test() { - cmake-utils_src_test + cmake_src_test } src_test() { cmake-multilib_src_test @@ -72,7 +73,7 @@ src_test() { } multilib_src_install() { - cmake-utils_src_install + cmake_src_install use static-libs || rm "${ED}"/usr/$(get_libdir)/*.a || die } multilib_src_install_all() {
