gentoo auto-resync : 26:10:2023 - 20:41:49

4 files changed, 2 insertions, 187 deletions

diff --git a/app-arch/brotli/Manifest b/app-arch/brotli/Manifest
index 148aac7a6c3c..3ea10954e149 100644
--- a/app-arch/brotli/Manifest
+++ b/app-arch/brotli/Manifest
@@ -2,9 +2,7 @@ AUX 1.0.9-linker.patch 1799 BLAKE2B b082af9af7eb8df80bf86717e9b9511952e77afd649d
 DIST brotli-1.0.9.tar.gz 486984 BLAKE2B 8b9939d5224396ef33b43e019250ba4bc8949903583615e8dc02c85340fc0a1e2d1632161e00b0ee7355d77f05529ac772f482e05d2089afd71a0bf71e803904 SHA512 b8e2df955e8796ac1f022eb4ebad29532cb7e3aa6a4b6aee91dbd2c7d637eee84d9a144d3e878895bb5e62800875c2c01c8f737a1261020c54feacf9f676b5f5
 DIST brotli-1.0.9.testdata.tar.xz 3771536 BLAKE2B e22a7e926a68b64cf3ddcf90d2381201d0bac6486f28c3a675c83a2a685108491011195faf48df9abd478a011e874df560ae81988348f7605197805cc3be20dd SHA512 d98c48dbc7772959a9cf276b638cf773a05a896c9daf4f6235f7d7fd625490b3f538e0690afcd6968ff81ad3745c7d78419850c2518048c44d73b470bcd08c97
 DIST brotli-1.1.0.tar.gz 511969 BLAKE2B 7ac767fd6dafaabfb4e3834d690f71abceb4d4e7f131849d6c328a04f3a16c54d0a9463a37f03663a4158c35e970a089512c8a5bc43eda79fb43c1f61223379e SHA512 6eb280d10d8e1b43d22d00fa535435923c22ce8448709419d676ff47d4a644102ea04f488fc65a179c6c09fee12380992e9335bad8dfebd5d1f20908d10849d9
-EBUILD brotli-1.0.9-r3.ebuild 1780 BLAKE2B e66fa84dbe7cd5baa3d4438484ca2c09bbd2cbdbd0a5b1f64ef30f2ed3e899f41f97d7651655057d4c0c7a152b045b16cee31197a26827173c447700657feffb SHA512 4dcd91910425916f594e0e3b99e7edfd401823dc43d836857ffe4c1dfd5f689b777d4faffc8ee1d491a5eb6f2c078f51d8cf53099baab2190745fc13f7f9718d
-EBUILD brotli-1.0.9-r5.ebuild 2079 BLAKE2B 4f8b2c3b1b69a5ca78f1a727fc150f6339413b865d07c0ad487e4ad597785fbcdfee12e849caef006690fc7e8a9a28e08f68379c84335824234357409b2337c6 SHA512 52a60700208ef0a3f560274a43a08d67aa98dce8dd5430264a86c6c5d82f4b9011863203ed5b9b3cd293ae18c6a42ab628e4efdbacf7bae66ce66fc56da3f9f5
 EBUILD brotli-1.0.9-r6.ebuild 2111 BLAKE2B f3fe3750c8034115a85745c1dbfc07813fffa14d047d92b6311cb6329e125034aaabfe36595f02c6fde949066bf86758b430d766dee73a5d387b8a175fb93bed SHA512 52497bb1830cdb278fcaa51cb6ad6a714393ecc7e142d1dc37b6bfa9276fb38dfd80a8fd05a9fada6e6e633567f45b5700e9b206420f991579776a5490350ff0
-EBUILD brotli-1.1.0.ebuild 1900 BLAKE2B 0be619ca198d1802cf78ed683c11868152f11b55264e768271d42b3dc5d7cfb05fa8221a1c2dba3941b93ea9576b6c94c8cb4d94ac476dff630a72bfece29a74 SHA512 542ddf660a726e5699978f38b03afb2dabc5cb6e82554bdc39a162ddec2c52b60f662d6228fa610a895052229a04a8dce8a674be05d5414adc154cc2921b3323
+EBUILD brotli-1.1.0.ebuild 1899 BLAKE2B 9647b936c41dda09e1ed5dd2475371da9aca430b1e03f6e9a38a4c16629bab22b3f0c81dce5d25aff8471da92d642e82e016392f8cd443761a163c39a847def0 SHA512 994f0d5c82e00543f8a1b8a846322bd7d4b686fc1e2b5a066a6555200e5fd42e390ac4a1a5c3081fe2355ab54d97abdfe958c1064466051940843fd0ea71055e
 EBUILD brotli-9999.ebuild 1913 BLAKE2B 0ce1d5cc6fbd3ac4ffe54862a7d4f9a1173c85749a05b23ec47b5dbe8720f721450bdd076f460fade5a331f2b97b4feac6b9533ab99407711a380305fc0bfa8b SHA512 0d1068868b900102d8864d8269bdf7f674825fb14019310b37ec10eedefeb6cced4e88cbd09d473f669b3304268121c266ee299fe1303d6a202212508bbafc1f
 MISC metadata.xml 829 BLAKE2B 31c7c9adc087001ef6feb8937752317fe46ab500de9c686cf450a9184574b6e4483214e12791b8a81f9dd591a6a5d1ab9fc6f3997831f1e7805d475ff54ac5ed SHA512 c49f2027ce150e20d76f50268940d0ed231419ad57904d1cfcfa76cd4dd281c89e1c16be907c3140026781ae74266b8f37b9a6455893f8e8d824e8e57281573d
diff --git a/app-arch/brotli/brotli-1.0.9-r3.ebuild b/app-arch/brotli/brotli-1.0.9-r3.ebuild
deleted file mode 100644
index cb9c987e248b..000000000000
--- a/app-arch/brotli/brotli-1.0.9-r3.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_OPTIONAL="1"
-PYTHON_COMPAT=( python3_{9..10} pypy3 )
-inherit cmake-multilib distutils-r1
-
-if [[ ${PV} == *9999* ]] ; then
-	EGIT_REPO_URI="https://github.com/google/${PN}.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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
-
-DESCRIPTION="Generic-purpose lossless compression algorithm"
-HOMEPAGE="https://github.com/google/brotli"
-
-LICENSE="MIT python? ( Apache-2.0 )"
-SLOT="0/$(ver_cut 1)"
-IUSE="python static-libs test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# tests are currently broken, see https://github.com/google/brotli/issues/850
-RESTRICT="test"
-
-DOCS=( README.md CONTRIBUTING.md )
-
-PATCHES=( "${FILESDIR}/${PV}-linker.patch" )
-
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	cmake_src_prepare
-	use python && distutils-r1_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-1.0.9-r5.ebuild b/app-arch/brotli/brotli-1.0.9-r5.ebuild
deleted file mode 100644
index 811396d7b326..000000000000
--- a/app-arch/brotli/brotli-1.0.9-r5.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_OPTIONAL="1"
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit cmake-multilib distutils-r1
-
-if [[ ${PV} == *9999* ]] ; then
-	EGIT_REPO_URI="https://github.com/google/${PN}.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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
-		test? (
-			https://dev.gentoo.org/~mgorny/dist/${P}.testdata.tar.xz
-		)
-	"
-fi
-
-DESCRIPTION="Generic-purpose lossless compression algorithm"
-HOMEPAGE="https://github.com/google/brotli/"
-
-LICENSE="MIT python? ( Apache-2.0 )"
-SLOT="0/$(ver_cut 1)"
-IUSE="python static-libs test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	python? (
-		${DISTUTILS_DEPS}
-		test? (
-			$(python_gen_cond_dep '
-				dev-python/unittest-or-fail[${PYTHON_USEDEP}]
-			' 3.{9..11})
-		)
-	)
-"
-
-DOCS=( README.md CONTRIBUTING.md )
-
-PATCHES=( "${FILESDIR}/${PV}-linker.patch" )
-
-src_prepare() {
-	cmake_src_prepare
-	use python && distutils-r1_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
-}
-
-src_compile() {
-	cmake-multilib_src_compile
-	use python && distutils-r1_src_compile
-}
-
-python_test() {
-	eunittest -s python -p "*_test.py"
-}
-
-src_test() {
-	cmake-multilib_src_test
-	use python && distutils-r1_src_test
-}
-
-multilib_src_install() {
-	cmake_src_install
-	if ! use static-libs; then
-		rm "${ED}"/usr/$(get_libdir)/*.a || die
-	fi
-}
-
-multilib_src_install_all() {
-	use python && distutils-r1_src_install
-
-	doman docs/brotli.1
-
-	local page
-	for page in constants decode encode types ; do
-		newman docs/${page}.h.3 ${PN}_${page}.h.3
-	done
-}
diff --git a/app-arch/brotli/brotli-1.1.0.ebuild b/app-arch/brotli/brotli-1.1.0.ebuild
index 5555ef1e1c00..af761fb90b3f 100644
--- a/app-arch/brotli/brotli-1.1.0.ebuild
+++ b/app-arch/brotli/brotli-1.1.0.ebuild
@@ -14,7 +14,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 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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