commit: 293cc7291594848a49365fe6d1a74d9911f90e0c Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Jul 14 10:57:51 2022 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Jul 14 11:45:04 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=293cc729
app-office/libreoffice: media-libs/zxing-cpp slot op, update JDK handling Drop x86 pkg_setup message about non-existing features, virtual/jdk:11 was keyworded at last. Also raise minimum JRE to 11. Bug: https://bugs.gentoo.org/785640 Closes: https://bugs.gentoo.org/857204 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> ...3.9999.ebuild => libreoffice-7.3.4.2-r1.ebuild} | 33 ++++++---------------- app-office/libreoffice/libreoffice-7.3.9999.ebuild | 33 ++++++---------------- app-office/libreoffice/libreoffice-9999.ebuild | 33 ++++++---------------- 3 files changed, 24 insertions(+), 75 deletions(-) diff --git a/app-office/libreoffice/libreoffice-7.3.9999.ebuild b/app-office/libreoffice/libreoffice-7.3.4.2-r1.ebuild similarity index 95% copy from app-office/libreoffice/libreoffice-7.3.9999.ebuild copy to app-office/libreoffice/libreoffice-7.3.4.2-r1.ebuild index 86e77b20eb76..9a3813a2b48b 100644 --- a/app-office/libreoffice/libreoffice-7.3.9999.ebuild +++ b/app-office/libreoffice/libreoffice-7.3.4.2-r1.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-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) )
