commit: fbd7f2ebe12742578db020bc93a32e3ed78b31f7 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Mar 1 07:08:08 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Mar 1 07:08:08 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbd7f2eb
app-office/libreoffice-bin: fix USE=java -> USE=gnome typo ... and add a comment wrt unknown state of Java. Bug: https://bugs.gentoo.org/950393 Signed-off-by: Sam James <sam <AT> gentoo.org> ...libreoffice-bin-24.8.4.ebuild => libreoffice-bin-24.8.4-r1.ebuild} | 4 +++- ...libreoffice-bin-25.2.0.ebuild => libreoffice-bin-25.2.0-r1.ebuild} | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app-office/libreoffice-bin/libreoffice-bin-24.8.4.ebuild b/app-office/libreoffice-bin/libreoffice-bin-24.8.4-r1.ebuild similarity index 95% rename from app-office/libreoffice-bin/libreoffice-bin-24.8.4.ebuild rename to app-office/libreoffice-bin/libreoffice-bin-24.8.4-r1.ebuild index c00524f9eb95..61903e5b025c 100644 --- a/app-office/libreoffice-bin/libreoffice-bin-24.8.4.ebuild +++ b/app-office/libreoffice-bin/libreoffice-bin-24.8.4-r1.ebuild @@ -3,6 +3,8 @@ EAPI=8 +# TODO: USE=java isn't really doing anything here right now. It also +# uses jre:11 which may be unnecessary. inherit java-pkg-opt-2 prefix unpacker xdg DESCRIPTION="A full office productivity suite. Binary package" @@ -82,7 +84,7 @@ src_unpack() { # We don't package Firebird anymore rm "${WORKDIR}"/${BINPKG_BASE}/DEBS/libobasis${PV%*.*}-firebird*_amd64.deb || die - if ! use java ; then + if ! use gnome ; then rm "${WORKDIR}"/${BINPKG_BASE}/DEBS/libobasis${PV%*.*}-gnome-integration*_amd64.deb || die fi diff --git a/app-office/libreoffice-bin/libreoffice-bin-25.2.0.ebuild b/app-office/libreoffice-bin/libreoffice-bin-25.2.0-r1.ebuild similarity index 95% rename from app-office/libreoffice-bin/libreoffice-bin-25.2.0.ebuild rename to app-office/libreoffice-bin/libreoffice-bin-25.2.0-r1.ebuild index 2062dcebf6ff..9a415e0207c1 100644 --- a/app-office/libreoffice-bin/libreoffice-bin-25.2.0.ebuild +++ b/app-office/libreoffice-bin/libreoffice-bin-25.2.0-r1.ebuild @@ -3,6 +3,8 @@ EAPI=8 +# TODO: USE=java isn't really doing anything here right now. It also +# uses jre:11 which may be unnecessary. inherit java-pkg-opt-2 prefix unpacker xdg DESCRIPTION="A full office productivity suite. Binary package" @@ -82,7 +84,7 @@ src_unpack() { # We don't package Firebird anymore rm "${WORKDIR}"/${BINPKG_BASE}/DEBS/libobasis${PV%*.*}-firebird*_amd64.deb || die - if ! use java ; then + if ! use gnome ; then rm "${WORKDIR}"/${BINPKG_BASE}/DEBS/libobasis${PV%*.*}-gnome-integration*_amd64.deb || die fi
