[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/

Tue, 04 Mar 2025 16:54:08 -0800 

commit:     ac401c854fc7c7b1e9aa94b814c94d82f77f78a0
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  5 00:02:50 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Mar  5 00:03:14 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac401c85

app-office/libreoffice: don't block newer libreoffice-bin

As I remarked in c457c9dd713c383e1bcea3d2c1b443f961266fd8, newer libreoffice-bin
can be safely co-installed with libreoffice as we now use upstream binaries
for libreoffice-bin.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-office/libreoffice/libreoffice-24.2.7.2-r1.ebuild | 2 +-
 app-office/libreoffice/libreoffice-24.2.7.2-r2.ebuild | 2 +-
 app-office/libreoffice/libreoffice-25.2.1.2-r1.ebuild | 2 +-
 app-office/libreoffice/libreoffice-25.2.1.2.ebuild    | 2 +-
 app-office/libreoffice/libreoffice-25.2.9999.ebuild   | 2 +-
 app-office/libreoffice/libreoffice-9999.ebuild        | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app-office/libreoffice/libreoffice-24.2.7.2-r1.ebuild 
b/app-office/libreoffice/libreoffice-24.2.7.2-r1.ebuild
index 6f36ebc6d425..f79329251657 100644
--- a/app-office/libreoffice/libreoffice-24.2.7.2-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-24.2.7.2-r1.ebuild
@@ -252,7 +252,7 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
        acct-group/libreoffice
        acct-user/libreoffice
-       !app-office/libreoffice-bin
+       !<app-office/libreoffice-bin-24.8.4-r2
        !app-office/libreoffice-bin-debug
        media-fonts/liberation-fonts
        || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools:* )

diff --git a/app-office/libreoffice/libreoffice-24.2.7.2-r2.ebuild 
b/app-office/libreoffice/libreoffice-24.2.7.2-r2.ebuild
index 755e3c07c18c..8f3e1a05e6cb 100644
--- a/app-office/libreoffice/libreoffice-24.2.7.2-r2.ebuild
+++ b/app-office/libreoffice/libreoffice-24.2.7.2-r2.ebuild
@@ -252,7 +252,7 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
        acct-group/libreoffice
        acct-user/libreoffice
-       !app-office/libreoffice-bin
+       !<app-office/libreoffice-bin-24.8.4-r2
        !app-office/libreoffice-bin-debug
        media-fonts/liberation-fonts
        || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools:* )

diff --git a/app-office/libreoffice/libreoffice-25.2.1.2-r1.ebuild 
b/app-office/libreoffice/libreoffice-25.2.1.2-r1.ebuild
index 775e15050127..694caf03b809 100644
--- a/app-office/libreoffice/libreoffice-25.2.1.2-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-25.2.1.2-r1.ebuild
@@ -255,7 +255,7 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
        acct-group/libreoffice
        acct-user/libreoffice
-       !app-office/libreoffice-bin
+       !<app-office/libreoffice-bin-24.8.4-r2
        !app-office/libreoffice-bin-debug
        media-fonts/liberation-fonts
        || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools:* )

diff --git a/app-office/libreoffice/libreoffice-25.2.1.2.ebuild 
b/app-office/libreoffice/libreoffice-25.2.1.2.ebuild
index df30da1a810c..7f33b5747077 100644
--- a/app-office/libreoffice/libreoffice-25.2.1.2.ebuild
+++ b/app-office/libreoffice/libreoffice-25.2.1.2.ebuild
@@ -255,7 +255,7 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
        acct-group/libreoffice
        acct-user/libreoffice
-       !app-office/libreoffice-bin
+       !<app-office/libreoffice-bin-24.8.4-r2
        !app-office/libreoffice-bin-debug
        media-fonts/liberation-fonts
        || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools:* )

diff --git a/app-office/libreoffice/libreoffice-25.2.9999.ebuild 
b/app-office/libreoffice/libreoffice-25.2.9999.ebuild
index df30da1a810c..7f33b5747077 100644
--- a/app-office/libreoffice/libreoffice-25.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-25.2.9999.ebuild
@@ -255,7 +255,7 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
        acct-group/libreoffice
        acct-user/libreoffice
-       !app-office/libreoffice-bin
+       !<app-office/libreoffice-bin-24.8.4-r2
        !app-office/libreoffice-bin-debug
        media-fonts/liberation-fonts
        || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools:* )

diff --git a/app-office/libreoffice/libreoffice-9999.ebuild 
b/app-office/libreoffice/libreoffice-9999.ebuild
index d9033de909f3..665fd6272d4b 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -247,7 +247,7 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
        acct-group/libreoffice
        acct-user/libreoffice
-       !app-office/libreoffice-bin
+       !<app-office/libreoffice-bin-24.8.4-r2
        !app-office/libreoffice-bin-debug
        media-fonts/liberation-fonts
        || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools:* )

Reply via email to