From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7EA571582EF for ; Sat, 01 Mar 2025 07:08:55 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 635F53430E3 for ; Sat, 01 Mar 2025 07:08:55 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 5CFAB1102B7; Sat, 01 Mar 2025 07:08:54 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 50E371102B7 for ; Sat, 01 Mar 2025 07:08:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 02A61343008 for ; Sat, 01 Mar 2025 07:08:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 92C121CE4 for ; Sat, 01 Mar 2025 07:08:52 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1740812888.fbd7f2ebe12742578db020bc93a32e3ed78b31f7.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice-bin/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/libreoffice-bin/libreoffice-bin-24.8.4-r1.ebuild app-office/libreoffice-bin/libreoffice-bin-24.8.4.ebuild app-office/libreoffice-bin/libreoffice-bin-25.2.0-r1.ebuild app-office/libreoffice-bin/libreoffice-bin-25.2.0.ebuild X-VCS-Directories: app-office/libreoffice-bin/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: fbd7f2ebe12742578db020bc93a32e3ed78b31f7 X-VCS-Branch: master Date: Sat, 01 Mar 2025 07:08:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0d786eb6-ee83-4f3e-9e60-acbe128b7982 X-Archives-Hash: a6d9b875fb3518c0441496025673213b commit: fbd7f2ebe12742578db020bc93a32e3ed78b31f7 Author: Sam James gentoo org> AuthorDate: Sat Mar 1 07:08:08 2025 +0000 Commit: Sam James gentoo 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 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