gentoo auto-resync : 14:07:2022 - 19:40:39

4 files changed, 29 insertions, 80 deletions

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index cc48515d5a55..f1d6ac77a044 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -34,7 +34,7 @@ DIST libreoffice-help-7.3.4.2.tar.xz 112208564 BLAKE2B a47b428d69c62ba38d74ee5ec
 DIST skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz 11079112 BLAKE2B d3eb44a64187ddd3097bc7473eaa6b631b4043b9679861426ae83956de7907a03b51cc472cbb9169c52e92cbc4ebe681181c675ae938324c6d3a10eff9a7084a SHA512 1234ff6e787947fb6442b7279c7ef07d48d7036b15591782ea197c827c60fba77bbe83029bf7d8dfa7dc126535a9a780f6b927fbf7339f0825061616a9c53436
 DIST skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz 11826600 BLAKE2B 2985ba0318fd72ac216fda33c6961eaa8ee649d2a850eb736accbd91fbc9cee7dc4e5752b2696a35204770a188412e2ecd0cc128cec324c682f9bc35e68358b3 SHA512 fbf5cfef66991565dbad928091a4e795a5b5b79a1e062a98ab9135b9972827de703c449507957294e7471c422c2e2ed239d6df61ffb9b9581a9ca3d848687a76
 EBUILD libreoffice-7.3.3.2-r3.ebuild 20107 BLAKE2B f01ed187adb245332958ee530aa7c3a8d081c68df8a6e63a0969a5a0654611ea6e503d6d32551f560dfc36b06d3744ae3c13d909b0c7368f1158d4cd7e1e6c61 SHA512 fb4243c9018ff1764a54f1935bac1b18c4a6a5fae8c9b064f072fe27b042e1cff614546d876b660553b2d15609bc43c306792c543f54ec6f902f3892b870fc99
-EBUILD libreoffice-7.3.4.2.ebuild 20278 BLAKE2B e4389705e64299aad8bebb7029a023f07bd11898904508590fd02594a35952b96e282c0d8abcbe1c81f9f67779493431fc2e5a0e23368380626b3aa333e26fdd SHA512 3109f958d924d57392543d9f20f7b1fd1b4cbb02e3df7b4f254607a437c58d17aa22db88104f35a1896836b29b96a7ee1f5e4ff942ba50ea1617a7df1c362036
-EBUILD libreoffice-7.3.9999.ebuild 20001 BLAKE2B ca66a0dedda343d85dbadcaa25cd3938c41e2daff2b9dbf25a397eff51b3e1914bc5ec95fe9da36a650b30969236cacdcd5ef0c123b2d716bae20614e42db28d SHA512 1e9b27cc43d95b34730442a8ab3a1b9bafc5a05ca99b8ea0e81e7c6c2ba241d4f7e794cb615806764fe3b3085081744b58fc5b9a75040a22a714e220f82d857d
-EBUILD libreoffice-9999.ebuild 20004 BLAKE2B c6d988634d81b540cc7e6cbae6334438eb39dfd927183ba184aee35d3c7320f915721cbbe96ba3d0d1e91ab03008f3f4cad0d8c569536954d263ab5960c9507a SHA512 f1881490b3eb93a4296acb45bccc6c0f4c25abd82691999bd8af9ed3204123da3793bf413f37c93a5b2758ce5ad425fc75527cee8cecf311ef82b970baad7c1b
+EBUILD libreoffice-7.3.4.2-r1.ebuild 19726 BLAKE2B 42529270afd4b6ea3b0ce4d08e9eebc49d231f9f5f7b94da350fbb6a9771bafdfce7cffaa0991d885bd293ad1771a1bd7341bfd7fed20c584aeda23bcdfb56f5 SHA512 7e05d914a613cf18828d58e036221bb053de0442e19049865e76788f1bf9161dd6a6ab6d00dadc7351dada4602731849ac544ce7a020d12e76a0dc3cb827ec0b
+EBUILD libreoffice-7.3.9999.ebuild 19441 BLAKE2B 6898da68ce80888663ee1ede0e6f476bf20848f7d741707a0226f1e5ff92a55fb7abbae89067119b587de297db7a81bd96bd5c2cf813f67b0b8e933d61572a68 SHA512 d733cddd2b3c8dc351677aba014ccc57b9f770bce61679e4865964ada7e4c57a8a2fa758c20536214475360b65ad48c604156f43bc0b348c015fbf7fb62d444c
+EBUILD libreoffice-9999.ebuild 19444 BLAKE2B 7a554b6389af43f50e4a8cc6feac0fa855fa0b5e295349e680a2482bd7b572cb27fa1c00d02ef0ee3e1c3db18449e969f4c40b2bb250d02601848ce605a27e49 SHA512 3b36becb71a4614be3e84182a13c6239bda652bbeeda1e661cceb0f847864ddbbffc43e9825844812613409e24d6a02c3dfb152290134bea3a79c2bd2839808f
 MISC metadata.xml 1222 BLAKE2B 02bb2d5bae26c3a97d77a36d90a2ffa0cac1eb2a0aabfac7d7f11d6b685264b7daad1a860598940af0fe9411068830d7eaf8553cbe4f69afedb092669b719cf1 SHA512 4ad197bb97eab3e860ba163b4c63839949fc9280a2ab53abc81ebb6c351d633e65ef3335a2d3af718d0e4a64e3312dfaff58f6cbab55507c57a6663c2850c3fd
diff --git a/app-office/libreoffice/libreoffice-7.3.4.2.ebuild b/app-office/libreoffice/libreoffice-7.3.4.2-r1.ebuild
index 99329d166bc3..779d228b8167 100644
--- a/app-office/libreoffice/libreoffice-7.3.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.4.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE="threads(+),xml(+)"
 
 MY_PV="${PV/_alpha/.alpha}"
@@ -163,7 +163,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=media-libs/libvisio-0.1.0
 	media-libs/libzmf
 	media-libs/openjpeg:=
-	media-libs/zxing-cpp
+	media-libs/zxing-cpp:=
 	>=net-libs/neon-0.31.1:=
 	net-misc/curl
 	sci-mathematics/lpsolve
@@ -217,7 +217,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	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] )
+	pdfimport? ( >=app-text/poppler-22.06:=[cxx] )
 	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
 "
 # FIXME: cppunit should be moved to test conditional
@@ -237,10 +237,7 @@ DEPEND="${COMMON_DEPEND}
 	x11-libs/libXtst
 	java? (
 		dev-java/ant-core
-		|| (
-			dev-java/openjdk:11
-			dev-java/openjdk-bin:11
-		)
+		>=virtual/jdk-11
 	)
 	test? (
 		app-crypt/gnupg
@@ -256,11 +253,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-office/libreoffice-bin-debug
 	media-fonts/liberation-fonts
 	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
-	java? ( || (
-		dev-java/openjdk:11
-		dev-java/openjdk-jre-bin:11
-		>=virtual/jre-1.8
-	) )
+	java? ( >=virtual/jre-11 )
 	kde? ( kde-frameworks/breeze-icons:* )
 "
 BDEPEND="
@@ -320,16 +313,10 @@ _check_reqs() {
 }
 
 pkg_pretend() {
-	if use x86; then
-		elog "Unfortunately for packaging reasons on x86, various Java-based wizards,"
-		elog "most notably Report Builder in LibreOffice Base, will not be available."
-		elog "See also: https://bugs.gentoo.org/785640"
-	else
-		use base ||
-			ewarn "If you plan to use Base application you must enable USE base."
-		use java ||
-			ewarn "Without USE java, several wizards are not going to be available."
-	fi
+	use base ||
+		ewarn "If you plan to use Base application you must enable USE base."
+	use java ||
+		ewarn "Without USE java, several wizards are not going to be available."
 
 	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
 }
@@ -573,12 +560,8 @@ src_configure() {
 			--without-junit
 			--without-system-hsqldb
 			--with-ant-home="${ANT_HOME}"
+			--with-jdk-home="${JAVA_HOME}"
 		)
-		if has_version "dev-java/openjdk:11"; then
-			myeconfargs+=( --with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
-		elif has_version "dev-java/openjdk-bin:11"; then
-			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) )
diff --git a/app-office/libreoffice/libreoffice-7.3.9999.ebuild b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
index 86e77b20eb76..9a3813a2b48b 100644
--- a/app-office/libreoffice/libreoffice-7.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
@@ -163,7 +163,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=media-libs/libvisio-0.1.0
 	media-libs/libzmf
 	media-libs/openjpeg:=
-	media-libs/zxing-cpp
+	media-libs/zxing-cpp:=
 	>=net-libs/neon-0.31.1:=
 	net-misc/curl
 	sci-mathematics/lpsolve
@@ -237,10 +237,7 @@ DEPEND="${COMMON_DEPEND}
 	x11-libs/libXtst
 	java? (
 		dev-java/ant-core
-		|| (
-			dev-java/openjdk:11
-			dev-java/openjdk-bin:11
-		)
+		>=virtual/jdk-11
 	)
 	test? (
 		app-crypt/gnupg
@@ -256,11 +253,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-office/libreoffice-bin-debug
 	media-fonts/liberation-fonts
 	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
-	java? ( || (
-		dev-java/openjdk:11
-		dev-java/openjdk-jre-bin:11
-		>=virtual/jre-1.8
-	) )
+	java? ( >=virtual/jre-11 )
 	kde? ( kde-frameworks/breeze-icons:* )
 "
 BDEPEND="
@@ -315,16 +308,10 @@ _check_reqs() {
 }
 
 pkg_pretend() {
-	if use x86; then
-		elog "Unfortunately for packaging reasons on x86, various Java-based wizards,"
-		elog "most notably Report Builder in LibreOffice Base, will not be available."
-		elog "See also: https://bugs.gentoo.org/785640"
-	else
-		use base ||
-			ewarn "If you plan to use Base application you must enable USE base."
-		use java ||
-			ewarn "Without USE java, several wizards are not going to be available."
-	fi
+	use base ||
+		ewarn "If you plan to use Base application you must enable USE base."
+	use java ||
+		ewarn "Without USE java, several wizards are not going to be available."
 
 	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
 }
@@ -568,12 +555,8 @@ src_configure() {
 			--without-junit
 			--without-system-hsqldb
 			--with-ant-home="${ANT_HOME}"
+			--with-jdk-home="${JAVA_HOME}"
 		)
-		if has_version "dev-java/openjdk:11"; then
-			myeconfargs+=( --with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
-		elif has_version "dev-java/openjdk-bin:11"; then
-			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) )
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index cb77e652cea2..b334b35d33ee 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -163,7 +163,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=media-libs/libvisio-0.1.0
 	media-libs/libzmf
 	media-libs/openjpeg:=
-	media-libs/zxing-cpp
+	media-libs/zxing-cpp:=
 	>=net-libs/neon-0.31.1:=
 	net-misc/curl
 	sci-mathematics/lpsolve
@@ -237,10 +237,7 @@ DEPEND="${COMMON_DEPEND}
 	x11-libs/libXtst
 	java? (
 		dev-java/ant-core
-		|| (
-			dev-java/openjdk:11
-			dev-java/openjdk-bin:11
-		)
+		>=virtual/jdk-11
 	)
 	test? (
 		app-crypt/gnupg
@@ -256,11 +253,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-office/libreoffice-bin-debug
 	media-fonts/liberation-fonts
 	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
-	java? ( || (
-		dev-java/openjdk:11
-		dev-java/openjdk-jre-bin:11
-		>=virtual/jre-1.8
-	) )
+	java? ( >=virtual/jre-11 )
 	kde? ( kde-frameworks/breeze-icons:* )
 "
 BDEPEND="
@@ -315,16 +308,10 @@ _check_reqs() {
 }
 
 pkg_pretend() {
-	if use x86; then
-		elog "Unfortunately for packaging reasons on x86, various Java-based wizards,"
-		elog "most notably Report Builder in LibreOffice Base, will not be available."
-		elog "See also: https://bugs.gentoo.org/785640"
-	else
-		use base ||
-			ewarn "If you plan to use Base application you must enable USE base."
-		use java ||
-			ewarn "Without USE java, several wizards are not going to be available."
-	fi
+	use base ||
+		ewarn "If you plan to use Base application you must enable USE base."
+	use java ||
+		ewarn "Without USE java, several wizards are not going to be available."
 
 	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
 }
@@ -568,12 +555,8 @@ src_configure() {
 			--without-junit
 			--without-system-hsqldb
 			--with-ant-home="${ANT_HOME}"
+			--with-jdk-home="${JAVA_HOME}"
 		)
-		if has_version "dev-java/openjdk:11"; then
-			myeconfargs+=( --with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
-		elif has_version "dev-java/openjdk-bin:11"; then
-			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) )