From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3D4BD158451 for ; Sun, 7 Jan 2024 09:41:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 411D92BC027; Sun, 7 Jan 2024 09:40:39 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 208E62BC027 for ; Sun, 7 Jan 2024 09:40:39 +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 5930A343185 for ; Sun, 7 Jan 2024 09:40:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B3612979 for ; Sun, 7 Jan 2024 09:40:35 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1704620428.7e3ebb777f5912beb44dee794f2e53224a5e25f6.asturm@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-7.5.6.2-r1.ebuild X-VCS-Directories: app-office/libreoffice-bin/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 7e3ebb777f5912beb44dee794f2e53224a5e25f6 X-VCS-Branch: master Date: Sun, 7 Jan 2024 09:40:35 +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: 06b958bb-c653-427d-b3d8-254987f5bbef X-Archives-Hash: 3061f445934ad6b3717b4ad84753bc97 commit: 7e3ebb777f5912beb44dee794f2e53224a5e25f6 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jan 7 09:38:06 2024 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jan 7 09:40:28 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e3ebb77 app-office/libreoffice-bin: update SRC_URI (PVR -> PV for 7.5.6.2-r1) Signed-off-by: Andreas Sturmlechner gentoo.org> .../libreoffice-bin-7.5.6.2-r1.ebuild | 40 +++++++++++----------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/app-office/libreoffice-bin/libreoffice-bin-7.5.6.2-r1.ebuild b/app-office/libreoffice-bin/libreoffice-bin-7.5.6.2-r1.ebuild index 3452085f9c0f..8f94561efcbb 100644 --- a/app-office/libreoffice-bin/libreoffice-bin-7.5.6.2-r1.ebuild +++ b/app-office/libreoffice-bin/libreoffice-bin-7.5.6.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,31 +15,31 @@ inherit java-pkg-opt-2 python-single-r1 prefix toolchain-funcs xdg-utils DESCRIPTION="A full office productivity suite. Binary package" HOMEPAGE="https://www.libreoffice.org" SRC_URI_AMD64=" - ${BASE_AMD64_URI}libreoffice-${PVR}.tar.xz + ${BASE_AMD64_URI}libreoffice-${PV}.tar.xz kde? ( - !java? ( ${BASE_AMD64_URI}libreoffice-kde-${PVR}.xd3 ) - java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PVR}.xd3 ) + !java? ( ${BASE_AMD64_URI}libreoffice-kde-${PV}.xd3 ) + java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PV}.xd3 ) ) gnome? ( - !java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PVR}.xd3 ) - java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PVR}.xd3 ) + !java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PV}.xd3 ) + java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PV}.xd3 ) ) !kde? ( !gnome? ( - java? ( ${BASE_AMD64_URI}libreoffice-java-${PVR}.xd3 ) + java? ( ${BASE_AMD64_URI}libreoffice-java-${PV}.xd3 ) ) ) " SRC_URI_X86=" - ${BASE_X86_URI}libreoffice-${PVR}.tar.xz + ${BASE_X86_URI}libreoffice-${PV}.tar.xz kde? ( - !java? ( ${BASE_X86_URI}libreoffice-kde-${PVR}.xd3 ) - java? ( ${BASE_X86_URI}libreoffice-kde-java-${PVR}.xd3 ) + !java? ( ${BASE_X86_URI}libreoffice-kde-${PV}.xd3 ) + java? ( ${BASE_X86_URI}libreoffice-kde-java-${PV}.xd3 ) ) gnome? ( - !java? ( ${BASE_X86_URI}libreoffice-gnome-${PVR}.xd3 ) - java? ( ${BASE_X86_URI}libreoffice-gnome-java-${PVR}.xd3 ) + !java? ( ${BASE_X86_URI}libreoffice-gnome-${PV}.xd3 ) + java? ( ${BASE_X86_URI}libreoffice-gnome-java-${PV}.xd3 ) ) !kde? ( !gnome? ( - java? ( ${BASE_X86_URI}libreoffice-java-${PVR}.xd3 ) + java? ( ${BASE_X86_URI}libreoffice-java-${PV}.xd3 ) ) ) " @@ -211,8 +211,8 @@ pkg_setup() { } src_unpack() { - einfo "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz" - xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die + einfo "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar.xz" + xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" || die local patchname use kde && patchname="-kde" @@ -220,13 +220,13 @@ src_unpack() { use java && patchname="${patchname}-java" if [[ -n "${patchname}" ]]; then - einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3" - xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3" "${WORKDIR}/tmpdist.tar" || die - mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die + einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PV}.xd3" + xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PV}.xd3" "${WORKDIR}/tmpdist.tar" || die + mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" || die fi - einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" - unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" + einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" + unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" } src_prepare() {