gentoo resync : 06.04.2022

2 files changed, 8 insertions, 8 deletions

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 3a62bd0d56e9..77b2b87878ad 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -26,16 +26,16 @@ DIST libcmis-0.5.2.tar.xz 484404 BLAKE2B 7de242393c28fc8289bb598b34e704eb2affaaa
 DIST libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz 5005888 BLAKE2B 836ec268c19c27ac079ea1084587c3e999f39ad2188be1a5cf8337ad0473ffda6c32d0695254d3797d1607707329befa88da6043f424544487238e550eda8590 SHA512 4159dfb4d08e359feb23127e12db590260913e70774161ac9513abb5183ad6ed6d2bdfbe56fc8aa68e2fc57ee29eae67aa0180e1a7d955016884ecba2ca60ff8
 DIST libreoffice-7.2.5.2.tar.xz 252977224 BLAKE2B c8221824ed4747ad7fd9534c6c3d612fa711f78b382587345c5a5604a263b7697fb03c77c1927343052ebcd0aa8db2d693208599137bc8884eeb1bf408951463 SHA512 a84682597e10fabb8c1605b785510fa5fe861f3056f61bd01513e1de6ebdb8a343d254af063cd977e4379348ad28d8a457989b3d42014f1c18d5d85626f6dfe8
 DIST libreoffice-7.2.6.2.tar.xz 252995284 BLAKE2B b807e666d39b4302b0a33f84f7e8797bc41ec9e1814bfe57f0e06c8bbbf3b8bf89a70a25caa65401f402a593acce04cb1118bd13bbd961d7feeac295511e36e4 SHA512 2b1a92d98595d4a40bf699ebf5ee3cbf4daeb765a8d37ae035f459f2a74c2ce27e53747307d9875aaec7d1d5a2693266ea81b7fe1281c33653c9fa4bbd727242
-DIST libreoffice-7.3.1.3.tar.xz 255329180 BLAKE2B 37e16f2946e17bb8707d529197836c8401c97c80a746e274367b5666ae5634af2ba5737f8024ad226432095df181bd824a70b179e0e8066ab5e2cf82a21231a7 SHA512 d0daaee058e2cd7f1af02101b68d33c3df50b3eaae951b40c557c4e74c6f0929162fec0759fa4688cd7da41a5fa7ab4dbf867f31cad428487da2393dcb40a3d8
+DIST libreoffice-7.3.2.2.tar.xz 255657596 BLAKE2B ef362c6e53ab8668309f1f9b10a8cbb87e8027aaf56a3d1185494757376b89bdf126fe08ef3e416d0330bb96df4ac046b8c60d535eeef8430c60485313e80b5f SHA512 c9f0deaf812425cfc08649f5a9f88c56a9f9221a6b117f9fece56ed17984fec25446ccad52ff2f22ebdfa1db495289edb22a8b7b1fec7a0e42d4b3cd2e81363b
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
 DIST libreoffice-help-7.2.5.2.tar.xz 112080572 BLAKE2B 9c07cec6cd6c639335c38af65f3dccf331200422f670fa225e355117062f5ad2a8173c5f59ee63137aa480e8db307b0671e4a7a0ff503ea3a034e126e0464120 SHA512 70ffcb1a96637dabd9a658151d2b88a92dd8a89cd396609339ec5470b93fbc2ae589a434b4f09d22fc8ad515369a646dd8040c33e6a91977dd7158f57cd48e00
 DIST libreoffice-help-7.2.6.2.tar.xz 112079748 BLAKE2B f9d96d6d72e70f28f12dcf656cf8fd22bc8e563ec53c840cf7cd668e3de677ee73a3f3099e7c62c6034cd4d23915b9e7a94012340c6a7db7f8822e4c8c6d0887 SHA512 05f02eb1afaa90547ca388008e02c4a48c191984e77d4022adf02089f69a3b4792cdc065e160f59fbf2f5554b062ff0d6853b12aa9abb9b180dd7c4c855e4d8b
-DIST libreoffice-help-7.3.1.3.tar.xz 112208156 BLAKE2B 1e13d9b57f8806cb5aeb34b816b7003a843d7bf6efd4f86eb391456deac85cae9f69046f13427835e131541e05c84fa754ebf039f4bb4c9ce07b2f1a08a5f0f9 SHA512 cb41afc6b4c35a97a62d4263395210b3309c8a68822cecfc245217d9f93697a0bd9043801622923ed81a14d346161d56f6443ccb6e082d3ba8ddcf737653da0f
+DIST libreoffice-help-7.3.2.2.tar.xz 112209056 BLAKE2B 320aa76bdce62b94707cd3b6fafd72ce0322e22f28fbb6059b8e1b5b4ef5e99796aee01592a84bf19527bffc0553b937f2d13451e75f105338beb6c1ac1ca077 SHA512 a1f5b1763841b159c623008075ad48ed916c78a856b557553c498590a7c9cd52e23487652c4ab4e4201fc829e7bf4a489ab467e4f412b5538252d893bd74341d
 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.2.5.2-r1.ebuild 19589 BLAKE2B 6bb1e37e1a1d9f32ba6b3e021a4ef795144da6bd7b2d32526486e864f1c14501ff84666f3edaf4354ceec60b0fad7067c40cd39b945c07e96a31867120991c1e SHA512 4197850f5f8b310f4a136dd6ce187297249fb6de4eea1dbfdcb789afbe53b3ed758b875d63250665873f4e86e0d1f9b6c9c8accda801462f62d5e9b92dcb819a
 EBUILD libreoffice-7.2.6.2.ebuild 19606 BLAKE2B b093e75f2e282e777b3ac33ab7fcdd7db55cd5712278621dd98fd3084429134a510db5933006070f8a218f30e2a29b958af33881a4995e9c7afa3caa571f3edd SHA512 43710c8cdcbbfb8b322ddb51392fada5a88e24b3ec7b641c96cfcfece8dd15fa750b25f097978901df2e62bbac3aed950c1ceecb47ab49567d9883edb19c281c
-EBUILD libreoffice-7.3.1.3-r1.ebuild 19718 BLAKE2B b768e67ab83119d411eb0a9f5ce1b7e685cf1bb4b0d586b3d4011ceb3d1d94203b0a69efd0791e1f13d8bb487e2f299bbd14607b4fc933458fd894b871dab01f SHA512 c9b8ee3768c026986511c6bc6b77e11bab1a9b8e809d7d0b970446bb75f3a91f889d277a5cffe25f79feaa184ead21152a7d1515a628cd386c506f1c3545b52f
+EBUILD libreoffice-7.3.2.2.ebuild 19700 BLAKE2B 8b58fcfb80bbfa558cd3ea4ada8ff6ca9766cc27f0649e5e6861c1dcdabb0ac1e459e72a0e24a137df33d5a5da1d509cb6af721a3de3d75f134e3b608c13ce83 SHA512 45ff1e5757f6148b45922faf18cf7722bce2ccf76ba4b263e08d852cde1eae3aedc0f8eddc0968e46aae55353e548ad88ce10b2b082d320bf92f023608621b29
 EBUILD libreoffice-7.3.9999.ebuild 19632 BLAKE2B 351aa3d37a8fec3fa6b1e88f951763b7e70fbbdca453bde1e5b1ad92cb347c278d3806473d09e90f8a5dc08f6c64fee6ccc5fac1913f0d0a60a267d04012d6ec SHA512 ddc649aaf5c6f03ed19a154042d487ac254b9a0345ed072580183531d145b241734138e1ba39d8229ebd609e5915b60b10ed33a7dd0714afb0c3abb7e2424d72
 EBUILD libreoffice-9999.ebuild 19634 BLAKE2B 72fa96adc91ada27e3eb0cbd715bdca12a65fd003f6420a594cd48b577073074d83e705590c230c629c7a8c7c785b5339e559b14476b77634bc5ad02818ff1d6 SHA512 485333231700b1263bb70dca0b92a15f6948ee8f69dc5eb274ae1931b4dbb28a3852070303dcef35382b0bf488b3cb2cbf258f90209e537357f886445d2e3ec1
 MISC metadata.xml 1222 BLAKE2B 02bb2d5bae26c3a97d77a36d90a2ffa0cac1eb2a0aabfac7d7f11d6b685264b7daad1a860598940af0fe9411068830d7eaf8553cbe4f69afedb092669b719cf1 SHA512 4ad197bb97eab3e860ba163b4c63839949fc9280a2ab53abc81ebb6c351d633e65ef3335a2d3af718d0e4a64e3312dfaff58f6cbab55507c57a6663c2850c3fd
diff --git a/app-office/libreoffice/libreoffice-7.3.1.3-r1.ebuild b/app-office/libreoffice/libreoffice-7.3.2.2.ebuild
index b5d0ca50a424..9b774db180ef 100644
--- a/app-office/libreoffice/libreoffice-7.3.1.3-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.2.2.ebuild
@@ -212,11 +212,11 @@ COMMON_DEPEND="${PYTHON_DEPS}
 		kde-frameworks/kio:5
 		kde-frameworks/kwindowsystem:5
 	)
-	ldap? ( net-nds/openldap:= )
+	ldap? ( net-nds/openldap )
 	libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
-	libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
-	mariadb? ( dev-db/mariadb-connector-c:= )
-	!mariadb? ( dev-db/mysql-connector-c:= )
+	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+	mariadb? ( dev-db/mariadb-connector-c )
+	!mariadb? ( dev-db/mysql-connector-c )
 	pdfimport? ( app-text/poppler:=[cxx] )
 	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
 "
@@ -575,7 +575,7 @@ src_configure() {
 			myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
 
 		use libreoffice_extensions_scripting-javascript && \
-			myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
+			myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
 	fi
 
 	is-flagq "-flto*" && myeconfargs+=( --enable-lto )