gentoo resync : 25.11.2020

4 files changed, 4 insertions, 166 deletions

diff --git a/app-arch/brotli/Manifest b/app-arch/brotli/Manifest
index cbf994dba5ee..5373a91dad31 100644
--- a/app-arch/brotli/Manifest
+++ b/app-arch/brotli/Manifest
@@ -1,9 +1,5 @@
 AUX 1.0.9-linker.patch 1799 BLAKE2B b082af9af7eb8df80bf86717e9b9511952e77afd649de9bfe9cbf445216d4e9d6a6e34dc065008d0129892240c98bcb6e7beb5443d4c459a1bb77eff664f7245 SHA512 04d5505074e042eca46a8dfd9d9a3a2c9af901d9bf7d98c219e8e1f8c9b9071bccbddfa3e17e86800de2606a10b26dc05d69948cd84ddd3075d6c1c51991bcc2
-DIST brotli-1.0.6.tar.gz 23827656 BLAKE2B 8d31eb1c4119de44702f2239fba9db72f1ae81801d06e51716432ff2f8aa78259c52cbd57b8fcd005c1bc14ada81b6e47a35c5d3864bb10bb02d113e30bd321b SHA512 b9847375471de3ae815ef4bb45a29653c343fad0a891a79d5132fcdee34c85caafd82289c8b413c3ef609049f2e8c4af9f9abd1736a2408ba44544c5fefc0010
-DIST brotli-1.0.7.tar.gz 23827908 BLAKE2B b9fc554cd23c8387b648638b6f9bb2d29fa87035856d03cf284662f9281984f3bf8e40109e61155ece18673f4391bc0fff704f8ab800a2041d3ce1824478d2ae SHA512 a82362aa36d2f2094bca0b2808d9de0d57291fb3a4c29d7c0ca0a37e73087ec5ac4df299c8c363e61106fccf2fe7f58b5cf76eb97729e2696058ef43b1d3930a
 DIST brotli-1.0.9.tar.gz 486984 BLAKE2B 8b9939d5224396ef33b43e019250ba4bc8949903583615e8dc02c85340fc0a1e2d1632161e00b0ee7355d77f05529ac772f482e05d2089afd71a0bf71e803904 SHA512 b8e2df955e8796ac1f022eb4ebad29532cb7e3aa6a4b6aee91dbd2c7d637eee84d9a144d3e878895bb5e62800875c2c01c8f737a1261020c54feacf9f676b5f5
-EBUILD brotli-1.0.6-r1.ebuild 1688 BLAKE2B a5ba00d724c413a364167e80954354396c82697704bb7515af35ce1d0f39a06e19a676009483dcef65a6065eeb44bc681aaebaabdf808e07c40d780ac654dcca SHA512 4888fa16c494b1b27698268fd6c01a0736c1feb9b374fe5ab8f12321881205b5e3d78a2e8c24e9f438b9a51d5eadc1126720f79e7114785465f39cbd5f777b85
-EBUILD brotli-1.0.7.ebuild 1650 BLAKE2B 5b7f5b52c2d3e44d794de6f4861ed4c590b3be805b46dfbdcd5bd9e617810afbe54996382d2ff79080f7d2d190a0e490597d3c4ada382be831f2fbd24cbcafa3 SHA512 12cc523630b741a34ad72b7f4c5a3c5a04de84055e73252cd5129a3b9f1ec77f7bfea9a6610464c3c80b18587f1bc131d6b1c4272753015be992c52ae351aef1
-EBUILD brotli-1.0.9-r1.ebuild 1705 BLAKE2B 8b0ba70498301bb0147f4b23587ebe6e404a7c853f32a95eae2eb04296f679a4049dcc463a7f58e718bca2e0beafb46fb815f53b4412fef9f1359be56e477835 SHA512 796e677e6bedeb757ddf9254926b7137bac6ffa24553d7c34f69343cd16eebe7caaee3ba45fdfab0a930e677704d4c3442d1503bf99785692f907fa0ea13b5fe
+EBUILD brotli-1.0.9-r1.ebuild 1764 BLAKE2B 4d10d4e1b1fb06fa9d6c5ae7dc2d7ba3c608514babf7ea0e723d044dce08acc85bbadb333e6302dcba4244650cf672d818ff11a2a4ff55392d3166b338029578 SHA512 c14b4bd8c30f3b1a1650be6be973be5badafd1335b9f034a88ef3b16f83e9d78e20f63e90280714168a98a20cf7b2e209ec379937af2078b9813ed9bfa9997d3
 EBUILD brotli-9999.ebuild 1656 BLAKE2B f9f9e46750995bc450b3be52e71571bc76d4d5b02157f1cc50f028c8c68659583cd84e0cdaeef395a9d84e0cd1e474e728ccab522a6a196b3d4cc98ab59c39e0 SHA512 0f54e7839f789f8b89a6fc66a1fe8e4dd845b2e8393ed8990a79d3fd67281ef121fbece382d8f21d4a629404625741763c9cfcb008f55b5a3eccb1bf0914e7cd
 MISC metadata.xml 686 BLAKE2B 192c9019f79840dfcc409e8244eac99f3bd793ea91bb8f5f26fcf1a9dbb6ba34273ea2221e0e18322dccec1674929cdf1bfd7ca19628a3e69fc4bdd6f60ba932 SHA512 4057d0834db13baf716500e6d8fa80b9d6ee854f7e9620462ed1162d2bc6ff88d2bb2f81902c6730df337afc38c8eb378fa5b85debd2a5a57597c0faf58132dc
diff --git a/app-arch/brotli/brotli-1.0.6-r1.ebuild b/app-arch/brotli/brotli-1.0.6-r1.ebuild
deleted file mode 100644
index 012faf0a92fb..000000000000
--- a/app-arch/brotli/brotli-1.0.6-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-DISTUTILS_OPTIONAL="1"
-DISTUTILS_IN_SOURCE_BUILD="1"
-
-inherit cmake-multilib distutils-r1 eapi7-ver
-
-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 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 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
-	SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-RESTRICT="!test? ( test )"
-
-src_prepare() {
-	use python && distutils-r1_src_prepare
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_TESTING="$(usex test)"
-	)
-	cmake-utils_src_configure
-}
-src_configure() {
-	cmake-multilib_src_configure
-	use python && distutils-r1_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-}
-src_compile() {
-	cmake-multilib_src_compile
-	use python && distutils-r1_src_compile
-}
-
-python_test() {
-	esetup.py test || die
-}
-
-multilib_src_test() {
-	cmake-utils_src_test
-}
-src_test() {
-	cmake-multilib_src_test
-	use python && distutils-r1_src_test
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-}
-multilib_src_install_all() {
-	use python && distutils-r1_src_install
-}
diff --git a/app-arch/brotli/brotli-1.0.7.ebuild b/app-arch/brotli/brotli-1.0.7.ebuild
deleted file mode 100644
index 4d8bb62d40e4..000000000000
--- a/app-arch/brotli/brotli-1.0.7.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-DISTUTILS_OPTIONAL="1"
-DISTUTILS_IN_SOURCE_BUILD="1"
-
-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 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 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
-	SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-RESTRICT="!test? ( test )"
-
-src_prepare() {
-	use python && distutils-r1_src_prepare
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING="$(usex test)"
-	)
-	cmake-utils_src_configure
-}
-src_configure() {
-	cmake-multilib_src_configure
-	use python && distutils-r1_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-}
-src_compile() {
-	cmake-multilib_src_compile
-	use python && distutils-r1_src_compile
-}
-
-python_test() {
-	esetup.py test || die
-}
-
-multilib_src_test() {
-	cmake-utils_src_test
-}
-src_test() {
-	cmake-multilib_src_test
-	use python && distutils-r1_src_test
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-}
-multilib_src_install_all() {
-	use python && distutils-r1_src_install
-}
diff --git a/app-arch/brotli/brotli-1.0.9-r1.ebuild b/app-arch/brotli/brotli-1.0.9-r1.ebuild
index 41f9c0f5016a..eeeb0e284d4c 100644
--- a/app-arch/brotli/brotli-1.0.9-r1.ebuild
+++ b/app-arch/brotli/brotli-1.0.9-r1.ebuild
@@ -29,11 +29,12 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/google/${PN}.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 	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"