commit: 32754728eb778607c6fd3447289a7bb314ffde43
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 13 16:23:44 2021 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Jun 13 16:24:05 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32754728
www-client/vivaldi: Apply SRC_URI fix to all versions
Portage tries to fetch and manifest SRC_URI entries for arches that
haven't been keyworded.
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
www-client/vivaldi/Manifest | 1 -
www-client/vivaldi/vivaldi-3.7.2218.58.ebuild | 13 ++++++-------
www-client/vivaldi/vivaldi-3.8.2259.42.ebuild | 13 ++++++-------
3 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index 44ec41663fd..f6e8413fd20 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -5,7 +5,6 @@ DIST vivaldi-stable_3.7.2218.58-1_i386.deb 76040556 BLAKE2B
4710993024a401a8b9e2
DIST vivaldi-stable_3.8.2259.42-1_amd64.deb 82450108 BLAKE2B
c5de31fc2b87b8dbe52ac196b32fdff5403cc0c4f82b907cebea93ba5afe4e355efd9c1b10ddf806db44648616957dbdcfe4f2ff54f30c20ccb2f1b75e33332f
SHA512
2f0b3056937ccf5ef7b418c43de4fbbf913c492c09dc8b8e9382359f63aad848f04171895a212691d6ce06b886d8f622a023b305cf075e4890310dd3fe976774
DIST vivaldi-stable_3.8.2259.42-1_arm64.deb 74055056 BLAKE2B
40a26f034f238284e98432e89eb5bcc828d8321ea14c17e0a2257248df830f8852a9f29b017ba68a6336177dd0eb12bda39942f1c8d52660382f147a0211d33d
SHA512
3c3736edcd38c42dd6c1cfda19ace0d6c1595f4899dfb48b43106880688d69f8c8a535c8362b1ad71052d3038f44eb025641abacb9226748b5a56a3dbe233719
DIST vivaldi-stable_3.8.2259.42-1_armhf.deb 72659844 BLAKE2B
faf0d951fa249ab17c98269ea754300ae91880139aa0fb6a8fdfb5c241e7b70a3bf6ae726a2fc9dc36927fda8e9ff7dbc10300dfd1b282624c261b615f05ea28
SHA512
90551f20dd9af42ccc5453ba037bcd17350747ef83bdfa55b0e73fc749831f7dbbe1d9c2f6ba4f80aaea118c37124341fe49a5274b7ed905a2e5c0ff2c776973
-DIST vivaldi-stable_3.8.2259.42-1_i386.deb 79514812 BLAKE2B
465711e5f40ef3b17ff785ec2fc7c6c6ee95f909ac81a075a79ecdd2934fda2c816aa1b90f3a4888f7976cad65c28553b32727d884724dfbca722eeb1cec0261
SHA512
912a787734530f20e8e82ac254f02b90f4bb208beb093b542c6ecd8ea7b71ccaa9d549c36bcba9910ab4dce1bdc72475586296f7bb1b765fbd5f33c8a93d2bfe
DIST vivaldi-stable_4.0.2312.27-1_amd64.deb 84282184 BLAKE2B
f3d4a75ce7cfac096e2e6fa5b76afd1ada7d35299aa128b7977affa85a1690b402efae586c465ebf5ff00f253643620538ca27b8532e6af42da7bc4eb20b0757
SHA512
24d338396c834d28ba5fa9d6a0b39a4c6d7b149abc5f5774760c3327c147718dfb72ee4709a2ea9b5516f8db20b9610ddbbbd6528fd7fd5b7f047017bd174495
DIST vivaldi-stable_4.0.2312.27-1_arm64.deb 79750920 BLAKE2B
02c80f783548639f9514f8c0b3c2979b3e1752d6d4ff5363b148173ba4023ca83acf5492307b3ea55cea8dddf0f8a241ceb51f1474aa083824007edc6853439c
SHA512
2bd374762ad03db2bab670bf58bc43d71d0148ada25a763a5fe5966b7f7eab0ed30c8a2b6798f12a5d84cff45963d046cab892631988263ff5f645b18a48d21f
DIST vivaldi-stable_4.0.2312.27-1_armhf.deb 75851284 BLAKE2B
7d77d47ea4b25df635f85f7a0407ad106e605f5bfbc02605d80deccb0af3cb65f68ebd499e85be85bc4835ab788665b4a5791a6a4e457359b079d9a3706015e1
SHA512
50aec87f3ea4813859464006a5266c599bdda92a53dd870084efd7209f07cca313602d3770ae8a64af9296ce0e8feb06f809c838f1bc835da8c158fc29bdaabb
diff --git a/www-client/vivaldi/vivaldi-3.7.2218.58.ebuild
b/www-client/vivaldi/vivaldi-3.7.2218.58.ebuild
index 538ae5a7c6c..d639ad78dc8 100644
--- a/www-client/vivaldi/vivaldi-3.7.2218.58.ebuild
+++ b/www-client/vivaldi/vivaldi-3.7.2218.58.ebuild
@@ -95,17 +95,16 @@ else
DEB_REV=1
fi
+KEYWORDS="-* amd64 ~arm ~arm64 x86"
VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_PN#vivaldi-}/${VIVALDI_PN}_${PV%_p*}-${DEB_REV}_";
-SRC_URI="
- amd64? ( ${VIVALDI_BASE_URI}amd64.deb )
- arm64? ( ${VIVALDI_BASE_URI}arm64.deb )
- arm? ( ${VIVALDI_BASE_URI}armhf.deb )
- x86? ( ${VIVALDI_BASE_URI}i386.deb )
-"
+
+RE="\bamd64\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" amd64? (
${VIVALDI_BASE_URI}amd64.deb )"
+RE="\barm\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" arm? (
${VIVALDI_BASE_URI}armhf.deb )"
+RE="\barm64\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" arm64? (
${VIVALDI_BASE_URI}arm64.deb )"
+RE="\bx86\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" x86? (
${VIVALDI_BASE_URI}i386.deb )"
LICENSE="Vivaldi"
SLOT="0"
-KEYWORDS="-* amd64 ~arm ~arm64 x86"
IUSE="proprietary-codecs widevine"
RESTRICT="bindist mirror"
diff --git a/www-client/vivaldi/vivaldi-3.8.2259.42.ebuild
b/www-client/vivaldi/vivaldi-3.8.2259.42.ebuild
index 1d5d4a6aeec..ba5f6dc05f7 100644
--- a/www-client/vivaldi/vivaldi-3.8.2259.42.ebuild
+++ b/www-client/vivaldi/vivaldi-3.8.2259.42.ebuild
@@ -95,17 +95,16 @@ else
DEB_REV=1
fi
+KEYWORDS="-* amd64 ~arm ~arm64"
VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_PN#vivaldi-}/${VIVALDI_PN}_${PV%_p*}-${DEB_REV}_";
-SRC_URI="
- amd64? ( ${VIVALDI_BASE_URI}amd64.deb )
- arm64? ( ${VIVALDI_BASE_URI}arm64.deb )
- arm? ( ${VIVALDI_BASE_URI}armhf.deb )
- x86? ( ${VIVALDI_BASE_URI}i386.deb )
-"
+
+RE="\bamd64\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" amd64? (
${VIVALDI_BASE_URI}amd64.deb )"
+RE="\barm\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" arm? (
${VIVALDI_BASE_URI}armhf.deb )"
+RE="\barm64\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" arm64? (
${VIVALDI_BASE_URI}arm64.deb )"
+RE="\bx86\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" x86? (
${VIVALDI_BASE_URI}i386.deb )"
LICENSE="Vivaldi"
SLOT="0"
-KEYWORDS="-* amd64 ~arm ~arm64"
IUSE="proprietary-codecs widevine"
RESTRICT="bindist mirror"
