diff options
| author |   Sam James <sam@gentoo.org> | 2025-02-13 10:08:37 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2025-02-13 10:08:37 +0000 |
| commit | 6587eb9a46f86a1a0fabcd002d89522b531c9746 (patch) | |
| tree | 68c5d713a94e1898168e96ce478aacc667f9d68d /app-office | |
| parent | app-office/libreoffice-bin: drop L10N TODO (diff) | |
| download | gentoo-6587eb9a46f86a1a0fabcd002d89522b531c9746.tar.gz gentoo-6587eb9a46f86a1a0fabcd002d89522b531c9746.tar.bz2 gentoo-6587eb9a46f86a1a0fabcd002d89522b531c9746.zip | |
app-office/libreoffice-bin: sync with 24.8.4
Fixes version handling for non-trailing .0.
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/libreoffice-bin/libreoffice-bin-25.2.0.ebuild | 10 |
1 files 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} } |