gentoo auto-resync : 31:08:2023 - 22:12:06

3 files changed, 101 insertions, 4 deletions

diff --git a/app-arch/brotli/Manifest b/app-arch/brotli/Manifest
index e90ffd27a9f7..805e636d0de9 100644
--- a/app-arch/brotli/Manifest
+++ b/app-arch/brotli/Manifest
@@ -1,8 +1,10 @@
 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
+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-9999.ebuild 1987 BLAKE2B 8ba86aab185c8b25adf8a39dbd983d3fba980841cecd1a37ad191efece0ba82666c1fd6b378f934a49c833fb62c370c9641259a980566a74c91eba20cd1f6f80 SHA512 7f41b0a2e2c2a18292e0b04e63849c7a6f024fcd8ad8fa31830c07a573a75ab25fc3d12d93109bf996e3802ebd3dd035cfacba20b85e263555091ba43f4506d1
+EBUILD brotli-1.1.0.ebuild 1913 BLAKE2B 0ce1d5cc6fbd3ac4ffe54862a7d4f9a1173c85749a05b23ec47b5dbe8720f721450bdd076f460fade5a331f2b97b4feac6b9533ab99407711a380305fc0bfa8b SHA512 0d1068868b900102d8864d8269bdf7f674825fb14019310b37ec10eedefeb6cced4e88cbd09d473f669b3304268121c266ee299fe1303d6a202212508bbafc1f
+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.1.0.ebuild b/app-arch/brotli/brotli-1.1.0.ebuild
new file mode 100644
index 000000000000..53768510bba9
--- /dev/null
+++ b/app-arch/brotli/brotli-1.1.0.ebuild
@@ -0,0 +1,98 @@
+# 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 flag-o-matic
+
+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 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 )
+
+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() {
+	append-lfs-flags
+
+	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
+}
+
+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-9999.ebuild b/app-arch/brotli/brotli-9999.ebuild
index c68641aaa66c..53768510bba9 100644
--- a/app-arch/brotli/brotli-9999.ebuild
+++ b/app-arch/brotli/brotli-9999.ebuild
@@ -18,9 +18,6 @@ else
 	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