From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1278692-garchives=archives.gentoo.org@lists.gentoo.org>
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 A977D1382C5
for <garchives@archives.gentoo.org>; Wed, 5 May 2021 13:58:34 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 043C6E086A;
Wed, 5 May 2021 13:58:34 +0000 (UTC)
Received: from smtp.gentoo.org (dev.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 D2C83E086A
for <gentoo-commits@lists.gentoo.org>; Wed, 5 May 2021 13:58:33 +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 85856340D54
for <gentoo-commits@lists.gentoo.org>; Wed, 5 May 2021 13:58:32 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 999D14C3
for <gentoo-commits@lists.gentoo.org>; Wed, 5 May 2021 13:58:30 +0000 (UTC)
From: "Craig Andrews" <candrews@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Craig Andrews" <candrews@gentoo.org>
Message-ID: <1620223102.a7166b7b1066616e78e15d161b8539466e368081.candrews@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-arch/brotli/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-arch/brotli/brotli-1.0.9-r3.ebuild app-arch/brotli/brotli-9999.ebuild
X-VCS-Directories: app-arch/brotli/
X-VCS-Committer: candrews
X-VCS-Committer-Name: Craig Andrews
X-VCS-Revision: a7166b7b1066616e78e15d161b8539466e368081
X-VCS-Branch: master
Date: Wed, 5 May 2021 13:58:30 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 29b1083f-cca3-4767-8477-05d165de7a8e
X-Archives-Hash: 30a8b103c59c5391527765be55cc36d4
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() {