gentoo resync : 16.04.2022

5 files changed, 36 insertions, 24 deletions

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 77b2b87878ad..04a228610099 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -34,8 +34,8 @@ DIST libreoffice-help-7.3.2.2.tar.xz 112209056 BLAKE2B 320aa76bdce62b94707cd3b6f
 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.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
+EBUILD libreoffice-7.2.6.2-r1.ebuild 19613 BLAKE2B 4bf35d3df838b2f6ba8cfd842a693a4d8a6f98a0271d1d752c63d1b9ab3e3515ee9bc98e584767e145bb6cdb921faa4eb454b3f52e87e1217d59f1d59e4d76cc SHA512 93dba8899724a7a22b8e76cf6baf0283a4738450cfd3f0b9deadd95732e06114a16fc8a26b6dc0b61f635ee4f644ccc457c26d73b0f0a3b92791e0f7a74e3704
+EBUILD libreoffice-7.3.2.2-r1.ebuild 19804 BLAKE2B 46be04c1904c79870dd783ee35f20e9ba8076d2620d1903cedf9955b47a3255c128cb654fd39a3fe9e5b699f57846df43b73271a1db05e1d5df6f9e6536f6997 SHA512 75802c61344f218c02067ce1bbd9ddba07d829aeb6a4fd749e3cebf9f710c461eec52ef93f6f9dd6c94a55c59d645c6afa377c77b0155c375cfa19056366683e
+EBUILD libreoffice-7.3.9999.ebuild 19725 BLAKE2B 8d8c3a7d4f69b6d9cfb40f075bef6a70c4f133d307f6ab04df19fb696e615a49418412dd480b48df8082ba0812a2dd118bfcec5a4ff116d0e9c730703be1c1c2 SHA512 21c1599770337abbcbc0b3be2e0ff1a6ffc162bbb6da8fc9095ba4edc96b4ec01cc6b04fc790cc4dcdca83cee4f34bc37ebe481fe61503e857744bf00da2a297
+EBUILD libreoffice-9999.ebuild 19727 BLAKE2B 8f3e1819904ac26dd845af5ccbc68499325199b2d8a1f770a8d2b97c4818dcc90dafa236bc0c8f2a7c47a9bb1a843540355d5c0c27b52b27366fc39b9de991eb SHA512 cddd2bb7a8c6eae4a40d9ff92dfc18e2646c62a93b04599c9dc3e628ffc2de2706519f24edd2176a1d368e597e2cb75703873d108c36313cb9648551c71c3d77
 MISC metadata.xml 1222 BLAKE2B 02bb2d5bae26c3a97d77a36d90a2ffa0cac1eb2a0aabfac7d7f11d6b685264b7daad1a860598940af0fe9411068830d7eaf8553cbe4f69afedb092669b719cf1 SHA512 4ad197bb97eab3e860ba163b4c63839949fc9280a2ab53abc81ebb6c351d633e65ef3335a2d3af718d0e4a64e3312dfaff58f6cbab55507c57a6663c2850c3fd
diff --git a/app-office/libreoffice/libreoffice-7.2.6.2.ebuild b/app-office/libreoffice/libreoffice-7.2.6.2-r1.ebuild
index e62667b537b0..82b0fcb88f40 100644
--- a/app-office/libreoffice/libreoffice-7.2.6.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.2.6.2-r1.ebuild
@@ -503,7 +503,7 @@ src_configure() {
 		--with-system-ucpp
 		--with-tls=nss
 		--with-vendor="Gentoo Foundation"
-		--with-webdav
+		--with-webdav="neon"
 		--with-x
 		--without-fonts
 		--without-myspell-dicts
diff --git a/app-office/libreoffice/libreoffice-7.3.2.2.ebuild b/app-office/libreoffice/libreoffice-7.3.2.2-r1.ebuild
index 9b774db180ef..52d4e539465a 100644
--- a/app-office/libreoffice/libreoffice-7.3.2.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.2.2-r1.ebuild
@@ -104,8 +104,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 ~arm64 ~ppc64 ~x86 ~amd64-linux"
 
 COMMON_DEPEND="${PYTHON_DEPS}
 	app-arch/unzip
@@ -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.6 )
-	mariadb? ( dev-db/mariadb-connector-c )
-	!mariadb? ( dev-db/mysql-connector-c )
+	libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14: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] )
 "
@@ -269,6 +269,10 @@ BDEPEND="
 	virtual/pkgconfig
 	clang? (
 		|| (
+			(
+				sys-devel/clang:14
+				sys-devel/llvm:14
+				=sys-devel/lld-14*	)
 			(	sys-devel/clang:13
 				sys-devel/llvm:13
 				=sys-devel/lld-13*	)
@@ -507,7 +511,7 @@ src_configure() {
 		--with-system-ucpp
 		--with-tls=nss
 		--with-vendor="Gentoo Foundation"
-		--with-webdav
+		--with-webdav="neon"
 		--with-x
 		--without-fonts
 		--without-myspell-dicts
@@ -566,16 +570,16 @@ src_configure() {
 			--with-ant-home="${ANT_HOME}"
 		)
 		if has_version "dev-java/openjdk:11"; then
-			myeconfargs+=( -with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
+			myeconfargs+=( --with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
 		elif has_version "dev-java/openjdk-bin:11"; then
-			myeconfargs+=( --with-jdk-home="/opt/openjdk-bin-11" )
+			myeconfargs+=( --with-jdk-home="${EPREFIX}/opt/openjdk-bin-11" )
 		fi
 
 		use libreoffice_extensions_scripting-beanshell && \
 			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 js.jar) )
+			myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
 	fi
 
 	is-flagq "-flto*" && myeconfargs+=( --enable-lto )
diff --git a/app-office/libreoffice/libreoffice-7.3.9999.ebuild b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
index 41fa7859c3a7..d21640a76c4a 100644
--- a/app-office/libreoffice/libreoffice-7.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
@@ -104,13 +104,13 @@ 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
 	app-arch/zip
-	app-crypt/gpgme[cxx]
+	app-crypt/gpgme:=[cxx]
 	app-text/hunspell:=
 	>=app-text/libabw-0.1.0
 	>=app-text/libebook-0.1
@@ -269,6 +269,10 @@ BDEPEND="
 	virtual/pkgconfig
 	clang? (
 		|| (
+			(
+				sys-devel/clang:14
+				sys-devel/llvm:14
+				=sys-devel/lld-14*	)
 			(	sys-devel/clang:13
 				sys-devel/llvm:13
 				=sys-devel/lld-13*	)
@@ -504,7 +508,7 @@ src_configure() {
 		--with-system-ucpp
 		--with-tls=nss
 		--with-vendor="Gentoo Foundation"
-		--with-webdav
+		--with-webdav="neon"
 		--with-x
 		--without-fonts
 		--without-myspell-dicts
@@ -563,9 +567,9 @@ src_configure() {
 			--with-ant-home="${ANT_HOME}"
 		)
 		if has_version "dev-java/openjdk:11"; then
-			myeconfargs+=( -with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
+			myeconfargs+=( --with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
 		elif has_version "dev-java/openjdk-bin:11"; then
-			myeconfargs+=( --with-jdk-home="/opt/openjdk-bin-11" )
+			myeconfargs+=( --with-jdk-home="${EPREFIX}/opt/openjdk-bin-11" )
 		fi
 
 		use libreoffice_extensions_scripting-beanshell && \
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index db53409b551c..60baac70da26 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -269,6 +269,10 @@ BDEPEND="
 	virtual/pkgconfig
 	clang? (
 		|| (
+			(
+				sys-devel/clang:14
+				sys-devel/llvm:14
+				=sys-devel/lld-14*	)
 			(	sys-devel/clang:13
 				sys-devel/llvm:13
 				=sys-devel/lld-13*	)
@@ -504,7 +508,7 @@ src_configure() {
 		--with-system-ucpp
 		--with-tls=nss
 		--with-vendor="Gentoo Foundation"
-		--with-webdav
+		--with-webdav="neon"
 		--with-x
 		--without-fonts
 		--without-myspell-dicts
@@ -563,9 +567,9 @@ src_configure() {
 			--with-ant-home="${ANT_HOME}"
 		)
 		if has_version "dev-java/openjdk:11"; then
-			myeconfargs+=( -with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
+			myeconfargs+=( --with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
 		elif has_version "dev-java/openjdk-bin:11"; then
-			myeconfargs+=( --with-jdk-home="/opt/openjdk-bin-11" )
+			myeconfargs+=( --with-jdk-home="${EPREFIX}/opt/openjdk-bin-11" )
 		fi
 
 		use libreoffice_extensions_scripting-beanshell && \