gentoo resync : 07.05.2021

3 files changed, 94 insertions, 6 deletions

diff --git a/app-arch/brotli/Manifest b/app-arch/brotli/Manifest
index 2c57330099af..ea62b4543462 100644
--- a/app-arch/brotli/Manifest
+++ b/app-arch/brotli/Manifest
@@ -2,5 +2,6 @@ AUX 1.0.9-linker.patch 1799 BLAKE2B b082af9af7eb8df80bf86717e9b9511952e77afd649d
 DIST brotli-1.0.9.tar.gz 486984 BLAKE2B 8b9939d5224396ef33b43e019250ba4bc8949903583615e8dc02c85340fc0a1e2d1632161e00b0ee7355d77f05529ac772f482e05d2089afd71a0bf71e803904 SHA512 b8e2df955e8796ac1f022eb4ebad29532cb7e3aa6a4b6aee91dbd2c7d637eee84d9a144d3e878895bb5e62800875c2c01c8f737a1261020c54feacf9f676b5f5
 EBUILD brotli-1.0.9-r1.ebuild 1764 BLAKE2B 8b90b73dacd0a643ed34441378026d5e20a5c50797e8dcac32f9627db5b7aebaa65cff74cf30ab6cb4c6cd6c1a5fc529c73fb0d7d2859e486e9a1406b274a0fd SHA512 6becec9055b96298bd5ce44c5af713901febe38db8160a2499bb63e41adb9386dd3b16160f5852e4df4d36bb26aa014dfb59fcc9d0ad37f85c5ac0a77def0c9f
 EBUILD brotli-1.0.9-r2.ebuild 1844 BLAKE2B 9ab0224a88f895446a0237d083fb85931436c5aac47c26001e9556eed631d15ad166d094e05bb44b73ea00acd38a105469a9e8017a89a48f3aafa7e1d7d14a78 SHA512 0043e2af0bde7cb003cdbdf3e07da80164097c7220ace7666888dacc7a54f8ab8f649758e9a140cbeb354600643b198d1fa4b406331cca419b8eeaecfb487225
-EBUILD brotli-9999.ebuild 1730 BLAKE2B ff641ac49dd29a27469afda38b84dff17a623aa7863e310b03b88723d35483bbdb622d2f9b7a6fb8b363bfacdacb275c8e9cbd29a1bf1d1c051a01c220a5e2c3 SHA512 258cc7962e09c5fe2e4f05b5fe82213f5ba607535b64579178af0661b85a768974061fc4a020920018f8ce1268251820f86277177d5d4cec195454e4eb8dc0f7
+EBUILD brotli-1.0.9-r3.ebuild 1833 BLAKE2B c4ff2490a81188445fc942911cd4dc0a3785a48c1f45393ebfcf14f22660f21794cbe5457d20cfaf00a1fe8e8a3810a5ebccf4d9899f15b709b28ab210a71861 SHA512 2bac326de36b35001984a866cfc6446caefebd1466c29187a3cf5ff5e7b349eaee834c227191c4f358123cdd541e6a91a42ffef4ff0f48f0b53a86c4466a3408
+EBUILD brotli-9999.ebuild 1719 BLAKE2B 6c394bca6ca053f958dc09df4b6dae3def33cf47c047c6b0a363ae556f00a6e2cb1413c29e5dca0a46ea66331d2e97b52ad272e83b5675928666cb01b63974a8 SHA512 eaec29d6e0221fd20464eea80173c47b21c75d2638111420a4dc1d004cf3a9ff01fbfdb6862cddeddf3ec686aa35d3582782d0c54fb8d9b1428a0b414c79b4f5
 MISC metadata.xml 686 BLAKE2B 192c9019f79840dfcc409e8244eac99f3bd793ea91bb8f5f26fcf1a9dbb6ba34273ea2221e0e18322dccec1674929cdf1bfd7ca19628a3e69fc4bdd6f60ba932 SHA512 4057d0834db13baf716500e6d8fa80b9d6ee854f7e9620462ed1162d2bc6ff88d2bb2f81902c6730df337afc38c8eb378fa5b85debd2a5a57597c0faf58132dc
diff --git a/app-arch/brotli/brotli-1.0.9-r3.ebuild b/app-arch/brotli/brotli-1.0.9-r3.ebuild
new file mode 100644
index 000000000000..9a372fb31664
--- /dev/null
+++ b/app-arch/brotli/brotli-1.0.9-r3.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_OPTIONAL="1"
+DISTUTILS_IN_SOURCE_BUILD="1"
+CMAKE_ECLASS=cmake
+
+inherit cmake-multilib distutils-r1
+
+DESCRIPTION="Generic-purpose lossless compression algorithm"
+HOMEPAGE="https://github.com/google/brotli"
+
+SLOT="0/$(ver_cut 1)"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+
+IUSE="python static-libs test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+LICENSE="MIT python? ( Apache-2.0 )"
+
+DOCS=( README.md CONTRIBUTING.md )
+
+if [[ ${PV} == "9999" ]] ; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/google/${PN}.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+# 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_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING="$(usex test)"
+	)
+	cmake_src_configure
+}
+src_configure() {
+	cmake-multilib_src_configure
+	use python && distutils-r1_src_configure
+}
+
+multilib_src_compile() {
+	cmake_src_compile
+}
+src_compile() {
+	cmake-multilib_src_compile
+	use python && distutils-r1_src_compile
+}
+
+python_test() {
+	esetup.py test || die
+}
+
+multilib_src_test() {
+	cmake_src_test
+}
+src_test() {
+	cmake-multilib_src_test
+	use python && distutils-r1_src_test
+}
+
+multilib_src_install() {
+	cmake_src_install
+	use static-libs || rm "${ED}"/usr/$(get_libdir)/*.a || die
+}
+multilib_src_install_all() {
+	use python && distutils-r1_src_install
+}
diff --git a/app-arch/brotli/brotli-9999.ebuild b/app-arch/brotli/brotli-9999.ebuild
index 87affbe108c9..7dacb49548c2 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() {