gentoo resync : 29.12.2022

4 files changed, 120 insertions, 17 deletions

diff --git a/app-arch/brotli/Manifest b/app-arch/brotli/Manifest
index d8d9c902a1d3..6facc2a343fb 100644
--- a/app-arch/brotli/Manifest
+++ b/app-arch/brotli/Manifest
@@ -1,5 +1,7 @@
 AUX 1.0.9-linker.patch 1799 BLAKE2B b082af9af7eb8df80bf86717e9b9511952e77afd649de9bfe9cbf445216d4e9d6a6e34dc065008d0129892240c98bcb6e7beb5443d4c459a1bb77eff664f7245 SHA512 04d5505074e042eca46a8dfd9d9a3a2c9af901d9bf7d98c219e8e1f8c9b9071bccbddfa3e17e86800de2606a10b26dc05d69948cd84ddd3075d6c1c51991bcc2
 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
 EBUILD brotli-1.0.9-r3.ebuild 1780 BLAKE2B 571c95c541b3def87351a232b69bd291dc0d50b9676a08a7a2a0a757d5fc993bad72efab1dc29c37302b2126370b5356d1571b232c9b520c43ea176247bbfc9b SHA512 e159729140a4e9046ec5a850dd7fb1d3f22c32adfc6b54748512abcf7aac0a266852a769814aea9a0219b2076c35cfa7b3b0dd33c6dfc1a0b05dbbb315f69ef9
-EBUILD brotli-9999.ebuild 1675 BLAKE2B b635a6584c6e65a0cb16cf1be81c1ee37ec4b2c8329472c70e647c0deb4fdae2118aec6d7d18a34f9d0bd3899dd9a1c316367787fd2f6f94506ad0bab3c08a4e SHA512 54198a4b847cbc1c71e6205201061dc3ab54dda00d9cd64d39cf36db8db31a56d520809a65813a791c210df8686213cce2f8207687a76028489990842ffee24c
-MISC metadata.xml 687 BLAKE2B 938125e16f4cd24075ce4c1bd57205def9244b21e1a07c90401af301bd00b4468190060acddccd02367dfb2e70f9ee9a1503794704172d6851554b550febb9c1 SHA512 930cacd9d5ea0665cfe93948a1b651a3974938c1513acb76fd0c4bd651c4aa26b1157ffae7257499235c4f4ef835ba5118f3986423b5c7905d3c32886ec31540
+EBUILD brotli-1.0.9-r4.ebuild 1824 BLAKE2B f7d32683b5a0eb543e70ee63635b8bf23193b83cae6c0817676e26d2602236b2df523640dd64b1a6281cd139819bfc7c2fb8a64703077289d450487a0f322e26 SHA512 d09035c96481d6011e659af2ad5536223f4dd5056c060b335f7dd555cd110b08e31d1a95f6c0d9ee0d5eaf76ce50d60d68e8ae7fe9f91771a9e033e432aced71
+EBUILD brotli-9999.ebuild 1824 BLAKE2B f7d32683b5a0eb543e70ee63635b8bf23193b83cae6c0817676e26d2602236b2df523640dd64b1a6281cd139819bfc7c2fb8a64703077289d450487a0f322e26 SHA512 d09035c96481d6011e659af2ad5536223f4dd5056c060b335f7dd555cd110b08e31d1a95f6c0d9ee0d5eaf76ce50d60d68e8ae7fe9f91771a9e033e432aced71
+MISC metadata.xml 770 BLAKE2B 6e73f34b47e5edbb8007e253191dbc0dd399d1d3f9f1817df851fa6f56bb6e71c90ffed925e5251041a479d0ff6e8084734c45a0d8c56a914a890992c121fedc SHA512 5b43dbaadb8a7c53ec111335ffc57682ade5f30beba4e98cb53a64244fb835baaf3394ffa210763ed36b0abe6c444263117499d4046c4138d644e924683d931a
diff --git a/app-arch/brotli/brotli-1.0.9-r4.ebuild b/app-arch/brotli/brotli-1.0.9-r4.ebuild
new file mode 100644
index 000000000000..c61d17cd14ae
--- /dev/null
+++ b/app-arch/brotli/brotli-1.0.9-r4.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_OPTIONAL="1"
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} 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} )"
+
+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
+}
diff --git a/app-arch/brotli/brotli-9999.ebuild b/app-arch/brotli/brotli-9999.ebuild
index 68bd7f1fb826..c61d17cd14ae 100644
--- a/app-arch/brotli/brotli-9999.ebuild
+++ b/app-arch/brotli/brotli-9999.ebuild
@@ -4,7 +4,9 @@
 EAPI=8
 
 DISTUTILS_OPTIONAL="1"
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
 inherit cmake-multilib distutils-r1
 
 if [[ ${PV} == *9999* ]] ; then
@@ -12,24 +14,35 @@ if [[ ${PV} == *9999* ]] ; then
 	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"
+	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"
+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} )"
+
 DOCS=( README.md CONTRIBUTING.md )
 
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/${PV}-linker.patch" )
 
 src_prepare() {
 	cmake_src_prepare
@@ -42,26 +55,21 @@ multilib_src_configure() {
 	)
 	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
+	eunittest -s python -p "*_test.py"
 }
 
-multilib_src_test() {
-	cmake_src_test
-}
 src_test() {
 	cmake-multilib_src_test
 	use python && distutils-r1_src_test
@@ -69,8 +77,11 @@ src_test() {
 
 multilib_src_install() {
 	cmake_src_install
-	use static-libs || rm "${ED}"/usr/$(get_libdir)/*.a || die
+	if ! use static-libs; then
+		rm "${ED}"/usr/$(get_libdir)/*.a || die
+	fi
 }
+
 multilib_src_install_all() {
 	use python && distutils-r1_src_install
 }
diff --git a/app-arch/brotli/metadata.xml b/app-arch/brotli/metadata.xml
index 98d133815abb..f2f000701cc0 100644
--- a/app-arch/brotli/metadata.xml
+++ b/app-arch/brotli/metadata.xml
@@ -5,6 +5,9 @@
     <email>candrews@gentoo.org</email>
     <name>Craig Andrews</name>
   </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+  </maintainer>
   <longdescription>
     Brotli is a generic-purpose lossless compression algorithm that
     compresses data using a combination of a modern variant of the