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 F3F6B158451 for ; Sun, 7 Jan 2024 10:25:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 415D2E29CE; Sun, 7 Jan 2024 10:25:09 +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 1C710E29CE for ; Sun, 7 Jan 2024 10:25:09 +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 08CD6343195 for ; Sun, 7 Jan 2024 10:25:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5C57FAE5 for ; Sun, 7 Jan 2024 10:25:06 +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: <1704623100.e56cdacd4cf600ac4d2501aaf4fadcddb45b1b31.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice-bin-debug/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.5.6.2-r1.ebuild X-VCS-Directories: app-office/libreoffice-bin-debug/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: e56cdacd4cf600ac4d2501aaf4fadcddb45b1b31 X-VCS-Branch: master Date: Sun, 7 Jan 2024 10:25:06 +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: c0d3130a-ff4f-44f0-b335-a0ea41ef826d X-Archives-Hash: 941bfe6204383c4f30ebc5c41aea4117 commit: e56cdacd4cf600ac4d2501aaf4fadcddb45b1b31 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jan 7 10:24:37 2024 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jan 7 10:25:00 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e56cdacd app-office/libreoffice-bin-debug: Fix src_unpack phase (PVR -> PV) Signed-off-by: Andreas Sturmlechner gentoo.org> .../libreoffice-bin-debug-7.5.6.2-r1.ebuild | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.5.6.2-r1.ebuild b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.5.6.2-r1.ebuild index 5c1844501b9f..e66fb47d045e 100644 --- a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.5.6.2-r1.ebuild +++ b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.5.6.2-r1.ebuild @@ -60,8 +60,8 @@ S="${WORKDIR}" QA_PREBUILT="/usr/*" 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" @@ -69,13 +69,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_configure() { :; }