From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1717511-garchives=archives.gentoo.org@lists.gentoo.org>
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 E33421582EF
for <garchives@archives.gentoo.org>; Thu, 13 Feb 2025 10:11:01 +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 ADD233430A4
for <garchives@archives.gentoo.org>; Thu, 13 Feb 2025 10:11:01 +0000 (UTC)
Received: from bobolink.gentoo.org (localhost [127.0.0.1])
by bobolink.gentoo.org (Postfix) with ESMTP id A7D47110471;
Thu, 13 Feb 2025 10:10:57 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(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 9CEF3110471
for <gentoo-commits@lists.gentoo.org>; Thu, 13 Feb 2025 10:10:57 +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) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 4AE8234309B
for <gentoo-commits@lists.gentoo.org>; Thu, 13 Feb 2025 10:10:57 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id A22F527FB
for <gentoo-commits@lists.gentoo.org>; Thu, 13 Feb 2025 10:10:55 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
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" <sam@gentoo.org>
Message-ID: <1739441317.6587eb9a46f86a1a0fabcd002d89522b531c9746.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-25.2.0.ebuild
X-VCS-Directories: app-office/libreoffice-bin/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 6587eb9a46f86a1a0fabcd002d89522b531c9746
X-VCS-Branch: master
Date: Thu, 13 Feb 2025 10:10:55 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: d0bb196c-286d-4909-bb00-97e2a6eb29e8
X-Archives-Hash: 0d157f66aaad993f5638a6f700f559fc
commit: 6587eb9a46f86a1a0fabcd002d89522b531c9746
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 13 10:08:37 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Feb 13 10:08:37 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6587eb9a
app-office/libreoffice-bin: sync with 24.8.4
Fixes version handling for non-trailing .0.
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-office/libreoffice-bin/libreoffice-bin-25.2.0.ebuild | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/app-office/libreoffice-bin/libreoffice-bin-25.2.0.ebuild b/app-office/libreoffice-bin/libreoffice-bin-25.2.0.ebuild
index 2aec01adb60c..7ce382d2382c 100644
--- a/app-office/libreoffice-bin/libreoffice-bin-25.2.0.ebuild
+++ b/app-office/libreoffice-bin/libreoffice-bin-25.2.0.ebuild
@@ -79,18 +79,18 @@ src_unpack() {
[[ -z ${BINPKG_BASE} ]] && die "Failed to detect binary package directory!"
# We don't package Firebird anymore
- rm "${WORKDIR}"/${BINPKG_BASE}/DEBS/libobasis${PV%%.0*}-firebird*_amd64.deb || die
+ rm "${WORKDIR}"/${BINPKG_BASE}/DEBS/libobasis${PV%*.*}-firebird*_amd64.deb || die
if ! use java ; then
- rm "${WORKDIR}"/${BINPKG_BASE}/DEBS/libobasis${PV%%.0*}-gnome-integration*_amd64.deb || die
+ rm "${WORKDIR}"/${BINPKG_BASE}/DEBS/libobasis${PV%*.*}-gnome-integration*_amd64.deb || die
fi
# Requires KF5 as of 25.2.0, so we choose not to use it.
- rm "${WORKDIR}"/${BINPKG_BASE}/DEBS/libobasis${PV%%.0*}-kde-integration*_amd64.deb || die
+ rm "${WORKDIR}"/${BINPKG_BASE}/DEBS/libobasis${PV%*.*}-kde-integration*_amd64.deb || die
# Bundled Python is used (3.10 as of 25.2.0), so no need for system dependency.
if ! use python ; then
- rm "${WORKDIR}"/${BINPKG_BASE}/DEBS/libobasis${PV%%.0*}-python-script-provider*_amd64.deb || die
+ rm "${WORKDIR}"/${BINPKG_BASE}/DEBS/libobasis${PV%*.*}-python-script-provider*_amd64.deb || die
fi
# The downloaded .deb has a DEBS/ directory with e.g. libreoffice25.2_25.2.0.3-3_amd64.deb
@@ -107,7 +107,7 @@ src_prepare() {
default
cat <<-EOF > "${T}"/50-${PN} || die
- SEARCH_DIRS_MASK="@GENTOO_PORTAGE_EPREFIX@/opt/libreoffice${PV%%.0*}"
+ SEARCH_DIRS_MASK="@GENTOO_PORTAGE_EPREFIX@/opt/libreoffice${PV%*.*}"
EOF
eprefixify "${T}"/50-${PN}
}