commit:     e12d576125edea8a37999939d36e1de550dd2c15
Author:     Matt Jolly <kangie <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  9 11:18:22 2024 +0000
Commit:     Matt Jolly <kangie <AT> gentoo <DOT> org>
CommitDate: Sat Nov  9 11:21:07 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e12d5761

www-client/chromium: fix src_unpack

To avoid Gentoo-generated tarballs colliding with (e.g.)
downstream tarballs of ungoogled-chromium we rename the Gentoo
tarballs.

Unfortunately the corresponding change to src_unpack
did not make it into the ebuild as published.

Closes: https://bugs.gentoo.org/943115
Signed-off-by: Matt Jolly <kangie <AT> gentoo.org>

 www-client/chromium/chromium-130.0.6723.116-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www-client/chromium/chromium-130.0.6723.116-r1.ebuild 
b/www-client/chromium/chromium-130.0.6723.116-r1.ebuild
index 1ffd8810c364..9b7032b7c9aa 100644
--- a/www-client/chromium/chromium-130.0.6723.116-r1.ebuild
+++ b/www-client/chromium/chromium-130.0.6723.116-r1.ebuild
@@ -341,7 +341,7 @@ pkg_setup() {
 }
 
 src_unpack() {
-       unpack ${P}.tar.xz
+       unpack ${P}-gentoo.tar.xz
        unpack chromium-patches-${PATCH_V}.tar.bz2
 
        use pgo && unpack chromium-profiler-0.2.tar
@@ -350,7 +350,7 @@ src_unpack() {
                # A new testdata tarball is available for each release; but 
testfonts tend to remain stable
                # for the duration of a release.
                # This unpacks directly into/over ${WORKDIR}/${P} so we can 
just use `unpack`.
-               unpack ${P}-testdata.tar.xz
+               unpack ${P}-testdata-gentoo.tar.xz
                # This just contains a bunch of font files that need to be 
unpacked (or moved) to the correct location.
                local testfonts_dir="${WORKDIR}/${P}/third_party/test_fonts"
                tar xf "${DISTDIR}/${P%%\.*}-testfonts.tar.gz" -C 
"${testfonts_dir}" || die "Failed to unpack testfonts"

Reply via email to