gentoo resync : 22.12.2021

3 files changed, 10 insertions, 6 deletions

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 86df2b56d6eb..f7c0fe6cfeb3 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -26,15 +26,15 @@ DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 2c7
 DIST libcmis-0.5.2.tar.xz 484404 BLAKE2B 7de242393c28fc8289bb598b34e704eb2affaaa8b9e470e10044dbfd3812391f29e1421df8d7ac3869955698ddbc9575feebcfbac27bb074a60ccc0527dca1c3 SHA512 295ab15115e75b1f6074f17d3538afe0de9b2b77ab454f5c63cb05e8df11886d82942fbf21ba01486052e3f6c75b0636b99d8e660cd3472dc4b87c31d3cd557b
 DIST libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz 5005888 BLAKE2B 836ec268c19c27ac079ea1084587c3e999f39ad2188be1a5cf8337ad0473ffda6c32d0695254d3797d1607707329befa88da6043f424544487238e550eda8590 SHA512 4159dfb4d08e359feb23127e12db590260913e70774161ac9513abb5183ad6ed6d2bdfbe56fc8aa68e2fc57ee29eae67aa0180e1a7d955016884ecba2ca60ff8
 DIST libreoffice-7.1.7.2.tar.xz 244585600 BLAKE2B 65cb8f5ddbae5aa8fb37a54cc0fab8d541a030f6f94141f4e4355f1dfb24a927ffb713e5213e382152fe444e115f27b41f297ca37e320193c5e0289a01ee5430 SHA512 fa55bea912b4efa73cd1ad8bcc611a71146ab42534a348a7c695916d74f1912ad13a2d9ccb4f3f4ee4d604a0747619b75bbcc5e2b14bc306d53b3a1f27525093
-DIST libreoffice-7.2.3.2.tar.xz 252752188 BLAKE2B aa3118e1b719078e1a0963edf9829bcbc8b6e8ea6752ca69b407a95307c8cd2f8b068eb707fbc176bd5bb4c5c9382a990863a44fd676a60b09204782993fe544 SHA512 b59e679025115cf176faf8a153833ed5ebac374372ba46bef46da22657dda399b88b3d503bfaf9964184d2dde4b19d3852d53c27cf6ceb0dd4967077b45eb5f6
+DIST libreoffice-7.2.4.1.tar.xz 252734952 BLAKE2B 27dfffd291095553dfb4ca60944a4782f8fc7fc675a08a8b3bdcc55d38d744824c4651f6d10c376424528de2ea591bb7596856c46232b24a578fb6500be93885 SHA512 3193edbd9d162fc0b2f69e072719e4c9fb8242f6851caf101fe973e33db8440e80722bc11da410eb155de4550ed42552645f7c1a3361584a0c1cc816e4a04aaa
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
 DIST libreoffice-help-7.1.7.2.tar.xz 111785664 BLAKE2B 947860ebbcdf8bd0ee96ebad688057d776d049ccad066951bf0361bcc1f9a1f8187eed266061ad161f479a3691263dc4f179f4b81aa666fdc1a4a380d28425a4 SHA512 20c464ff9cea68b37f6988faea84e9d72ba174706e75d91bbcac514011c65ab55d4f3a9f21fbb8f04f02908237b16d7a6983624c5ab8f27ee4f83aa7eb621268
-DIST libreoffice-help-7.2.3.2.tar.xz 111989408 BLAKE2B 862af98e7fddcf8ed30c16e111aba1e13c7e143398c55cb07c0612648e0fd8b73cdd1a1303efce6050fda49737eca6c645aae9e75fd4f3add6928326624c5db1 SHA512 64ab9d676cc86116ec8aac1157aee33551932f2047f1c47cde865e50e39438f497b7b08073c3f058fae4870325950bad1a5063a55b8897ecb09c046c98bf7264
+DIST libreoffice-help-7.2.4.1.tar.xz 111989824 BLAKE2B 11efe907c4df6e3f5b840d2bb52db88959d0f01d479f9578ad44ec17f5225c54ac19dc63d8c1145a518cd379487d6d82489c37f3b868660af03f89f8a978f315 SHA512 132554fc3ec6c5699ed47355e993630006c48b093fe5affe505ae8292edca8764a28e5d9806658d3227d6f13226a27d8dfb38b6aa5041f92f078ba6de04b199d
 DIST skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz 10420480 BLAKE2B 83bcc9ff3a3a916ccb92f49ef69f99386e89b636d37679ab17735625c56c4bb31ca89a7034d9282c905b405e0b31215de5fd3734061d323d48db440e4ad52643 SHA512 8e5c37b895d7f5fe15f491005ac46b39efe3bfb3af5dc805bf1226b2112496bdb9e433cc3b313f8fc185fe1f898d126b8a557d23485615cdbe917f0b76855f3d
 DIST skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz 10630696 BLAKE2B a3d42d08a0622de591d177184b6225cf62e3048d02d8f2012b6b02aae186b644c899c4e73b528b3528a4acec6cec07e3576dd6d97b130fedf3b2ec5b2ddf4ed7 SHA512 625ed461d85ce5c5c73ffd20bc3f2c9b5fe6ba557693b793b387ffb434d4f0d9056bd9befe6760c55e9e47f09c02373a49b8ac106162a40d940ea351e8c873c0
 DIST skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz 11826600 BLAKE2B 2985ba0318fd72ac216fda33c6961eaa8ee649d2a850eb736accbd91fbc9cee7dc4e5752b2696a35204770a188412e2ecd0cc128cec324c682f9bc35e68358b3 SHA512 fbf5cfef66991565dbad928091a4e795a5b5b79a1e062a98ab9135b9972827de703c449507957294e7471c422c2e2ed239d6df61ffb9b9581a9ca3d848687a76
 EBUILD libreoffice-7.1.7.2.ebuild 19837 BLAKE2B e3fcb74f8db67cdc7ab818fae31606c39fa7472e7f20ac195de3ac4a2a4e4bf562b06b6a00ff28c75888701e5d5ce2131cbed44e7532c85a76ed1fa2ac6fe13c SHA512 c5eca9d4ea111a5074b18d7f7adcd4adfe32d646c9ee9b5527f2c2107b7d13e9680bf98e506bbad0ffeb74d4982e7259ab3f3d32a3b4d8f6860a1c22cc0ee72c
-EBUILD libreoffice-7.2.3.2.ebuild 19523 BLAKE2B a5b343e0f17a8928ef94307534a6dc715d5d28cb73171c9315d6777a778abfe92698951add966f17c6b8fb76dc45dc68fa01f2d8d153f00e7b4343f68669143c SHA512 cb19004d5fc70a4a25a0f9c2c6881973290dad2628e6595354687ec93b8ccad2c260847d6a89307c5f1e186c27317afec776c92a8a83db3c5417ac35458e3b76
-EBUILD libreoffice-7.2.9999.ebuild 19459 BLAKE2B 8fba7b47f95c56ea4fa8c0cbf696a5fd3201fc995dc3cd04fc30927f962811b96fb33a28f2eb31c439ce4db621d989bb207ce16ce6c5db20acd9d32f27d00d4d SHA512 aa0813bcef2a1cb94bc988ad6f40062be22e4aea1e888deccb3fcb52828b8be99a8d5c0c60ae37d5d77d95e6723929fb7fbe66935ae94a5ad55610b29a3d7b23
+EBUILD libreoffice-7.2.4.1.ebuild 19525 BLAKE2B f575fe45335984c969cc36452421a12f08a58de393e780b2f7f78012b4c179031c027715e1e3f5d64251f4bca7fe5d5f1cd9ed2d20d8446db873ef12013ede0a SHA512 61ef51c2f02178998e2139f3b5d3cb4611e83500dd1d4752d9b40e98ac33cd175c9bde85d74c30fb0e8dd8a67facccb0710a05bf371404a9a1755680fb60e918
+EBUILD libreoffice-7.2.9999.ebuild 19525 BLAKE2B f575fe45335984c969cc36452421a12f08a58de393e780b2f7f78012b4c179031c027715e1e3f5d64251f4bca7fe5d5f1cd9ed2d20d8446db873ef12013ede0a SHA512 61ef51c2f02178998e2139f3b5d3cb4611e83500dd1d4752d9b40e98ac33cd175c9bde85d74c30fb0e8dd8a67facccb0710a05bf371404a9a1755680fb60e918
 EBUILD libreoffice-9999.ebuild 19627 BLAKE2B fa3fa1b51cf981627e67b1646ba058d9060a34de13d0ff8333cdc90ac7bbf1e3ccbfd08362351a9ae073e03580c8d59e3904f52877e00d66638d0975a014b6be SHA512 1cd611363d90ca9487da88cfcbeb471ef33099c6e9e84982e417ca0006a04fff79b32e2aa693ba09b4eb6f72c87974b735ef715e1ebc5058a8719d42114fa439
 MISC metadata.xml 1222 BLAKE2B 02bb2d5bae26c3a97d77a36d90a2ffa0cac1eb2a0aabfac7d7f11d6b685264b7daad1a860598940af0fe9411068830d7eaf8553cbe4f69afedb092669b719cf1 SHA512 4ad197bb97eab3e860ba163b4c63839949fc9280a2ab53abc81ebb6c351d633e65ef3335a2d3af718d0e4a64e3312dfaff58f6cbab55507c57a6663c2850c3fd
diff --git a/app-office/libreoffice/libreoffice-7.2.3.2.ebuild b/app-office/libreoffice/libreoffice-7.2.4.1.ebuild
index 3b60b78183c0..b819e767c27d 100644
--- a/app-office/libreoffice/libreoffice-7.2.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.2.4.1.ebuild
@@ -102,7 +102,8 @@ RESTRICT="!test? ( test )"
 LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
 
-# [[ ${MY_PV} == *9999* ]] || KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
 
 COMMON_DEPEND="${PYTHON_DEPS}
 	app-arch/unzip
@@ -293,7 +294,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-6.1-nomancompress.patch"
 	"${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
 
-	# Upstream
+	# 7.3 branch
 	"${FILESDIR}/${PN}-7.2.2.2-makefile-gengal.patch"
 )
 
diff --git a/app-office/libreoffice/libreoffice-7.2.9999.ebuild b/app-office/libreoffice/libreoffice-7.2.9999.ebuild
index 42698197f1cd..b819e767c27d 100644
--- a/app-office/libreoffice/libreoffice-7.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.2.9999.ebuild
@@ -293,6 +293,9 @@ PATCHES=(
 	"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
 	"${FILESDIR}/${PN}-6.1-nomancompress.patch"
 	"${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
+
+	# 7.3 branch
+	"${FILESDIR}/${PN}-7.2.2.2-makefile-gengal.patch"
 )
 
 S="${WORKDIR}/${PN}-${MY_PV}"