4 files changed, 2 insertions, 173 deletions
diff --git a/app-arch/brotli/Manifest b/app-arch/brotli/Manifest
index bd28d9a036d0..9b499910c9d4 100644
--- a/app-arch/brotli/Manifest
+++ b/app-arch/brotli/Manifest
@@ -1,7 +1,5 @@
 AUX 1.0.9-linker.patch 1799 BLAKE2B b082af9af7eb8df80bf86717e9b9511952e77afd649de9bfe9cbf445216d4e9d6a6e34dc065008d0129892240c98bcb6e7beb5443d4c459a1bb77eff664f7245 SHA512 04d5505074e042eca46a8dfd9d9a3a2c9af901d9bf7d98c219e8e1f8c9b9071bccbddfa3e17e86800de2606a10b26dc05d69948cd84ddd3075d6c1c51991bcc2
 DIST brotli-1.0.9.tar.gz 486984 BLAKE2B 8b9939d5224396ef33b43e019250ba4bc8949903583615e8dc02c85340fc0a1e2d1632161e00b0ee7355d77f05529ac772f482e05d2089afd71a0bf71e803904 SHA512 b8e2df955e8796ac1f022eb4ebad29532cb7e3aa6a4b6aee91dbd2c7d637eee84d9a144d3e878895bb5e62800875c2c01c8f737a1261020c54feacf9f676b5f5
-EBUILD brotli-1.0.9-r1.ebuild 1770 BLAKE2B 3e1589455d366aacf95ac7cf48c7fb76c844460b726ec041102335205b25097284b4ce4c204aefdaaadeaef57bb6e9fe6063338e31a5dbaedb13273a40e13ea1 SHA512 cd9d7cb565277e28c162856eeed8a2ab014cb195843e4ae29ceec8831a13fab8648f7042343bca9a5373677ebe81596243688da56464981e1a68c78be964bd08
-EBUILD brotli-1.0.9-r2.ebuild 1856 BLAKE2B 56f37ad8638ef04d7f2bd28cc757801a534eafa2bcf4aa5d8b5ac54767c302d1455871c1348899fa81108ab61cb2ae39155f08a948d63c9dadfabb67fa182238 SHA512 72ecc2a919d1b7f2ceb4be62981b8a0df5acc9a90b5e43b7e0b309f48ade958059ae110d4bdff94dbf07751e46aa3bae2e6e6f8fad9fccc4a3b7ef93339bcdfb
-EBUILD brotli-1.0.9-r3.ebuild 1781 BLAKE2B a87c935f8845fc9718c1add34902ba3bc3b2aaf9b7ea42a92265c602110156c305fa78a3bdcc706bbde61cafb32e603665c63b960f36e2fdf5f25738ade8985f SHA512 e10224e5e7504a92f7b7f86ef7ebcd48b99174c95bbc9cd1720709dbee74dbb0ae13603fbc718725402e3e600d80e028d2bb95e9b09c4f5a88fc0e920d28bac3
+EBUILD brotli-1.0.9-r3.ebuild 1773 BLAKE2B 868b591fe739315e4335470d237596ae81f759db9e903334a22897366c1bceaa56878e30a2493b2f23c8ab7c756a0ef9190a057d7f98545875ce70f803a75cc4 SHA512 0eec5e45e5834416121302611cf603b55db9e989b92b1445e9eeaad7555dfc6904c74c6e9e99857492a89e701b999db7e969a229556f63bc900b3d823ba4a6f1
 EBUILD brotli-9999.ebuild 1668 BLAKE2B 8488813fa150cf4b671b3f28417f557dfdf1c76bd5f903d50b01efa00f3b847032ba306626943b275420e4ec8e097a09f27a2c99fde9c1f2f1a78f4f98b95bb9 SHA512 e51d138cde35e1170376687bcde5334ab9aa5305c91119cbcacf140c84c1afaedae829b13503c7b184c80b2fa5cbb593cd42172d1ef52541b804a5b4812e25f8
 MISC metadata.xml 687 BLAKE2B 938125e16f4cd24075ce4c1bd57205def9244b21e1a07c90401af301bd00b4468190060acddccd02367dfb2e70f9ee9a1503794704172d6851554b550febb9c1 SHA512 930cacd9d5ea0665cfe93948a1b651a3974938c1513acb76fd0c4bd651c4aa26b1157ffae7257499235c4f4ef835ba5118f3986423b5c7905d3c32886ec31540
diff --git a/app-arch/brotli/brotli-1.0.9-r1.ebuild b/app-arch/brotli/brotli-1.0.9-r1.ebuild
deleted file mode 100644
index d03b1d78ade1..000000000000
--- a/app-arch/brotli/brotli-1.0.9-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-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 ~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-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-r2.ebuild b/app-arch/brotli/brotli-1.0.9-r2.ebuild
deleted file mode 100644
index 73fbca2867f7..000000000000
--- a/app-arch/brotli/brotli-1.0.9-r2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-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 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 ~m68k ~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-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
-	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-1.0.9-r3.ebuild b/app-arch/brotli/brotli-1.0.9-r3.ebuild
index 2b3a1620cf76..71cd23501c5a 100644
--- a/app-arch/brotli/brotli-1.0.9-r3.ebuild
+++ b/app-arch/brotli/brotli-1.0.9-r3.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/google/${PN}.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~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