commit:     1286bd4111e59dd0a9b0929384180b27f9b78370
Author:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
AuthorDate: Tue Nov  5 02:23:27 2024 +0000
Commit:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Tue Nov  5 02:27:28 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1286bd41

www-client/chromium: fix duplicate KEYWORDS and revert #942590 stabilization

Having double KEYWORDS= in an ebuild makes tooling such as ekeyword barf
and violates
https://projects.gentoo.org/qa/policy-guide/ebuild-format.html#pg0105

Instead, we negate the comparison and simply define KEYWORDS= only when
it should have meaningful values.

The stabilization needs to be rolled back as it fails checks once
actually applied -- due to ffmpeg-chromium.

Bug: https://bugs.gentoo.org/942590
Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>

 www-client/chromium/chromium-130.0.6723.91.ebuild | 4 +---
 www-client/chromium/chromium-131.0.6778.24.ebuild | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/www-client/chromium/chromium-130.0.6723.91.ebuild 
b/www-client/chromium/chromium-130.0.6723.91.ebuild
index a7c6ea136a83..ed4c82004d6a 100644
--- a/www-client/chromium/chromium-130.0.6723.91.ebuild
+++ b/www-client/chromium/chromium-130.0.6723.91.ebuild
@@ -49,9 +49,7 @@ LICENSE="BSD"
 SLOT="0/stable"
 # Dev exists mostly to give devs some breathing room for beta/stable releases;
 # it shouldn't be keyworded but adventurous users can select it.
-if [[ ${SLOT} == "0/dev" ]]; then
-       KEYWORDS="amd64 arm64"
-else
+if [[ ${SLOT} != "0/dev" ]]; then
        KEYWORDS="~amd64 ~arm64 ~ppc64"
 fi
 

diff --git a/www-client/chromium/chromium-131.0.6778.24.ebuild 
b/www-client/chromium/chromium-131.0.6778.24.ebuild
index 86113d88e17a..3a1fa9fc3807 100644
--- a/www-client/chromium/chromium-131.0.6778.24.ebuild
+++ b/www-client/chromium/chromium-131.0.6778.24.ebuild
@@ -49,9 +49,7 @@ LICENSE="BSD"
 SLOT="0/beta"
 # Dev exists mostly to give devs some breathing room for beta/stable releases;
 # it shouldn't be keyworded but adventurous users can select it.
-if [[ ${SLOT} == "0/dev" ]]; then
-       KEYWORDS=""
-else
+if [[ ${SLOT} != "0/dev" ]]; then
        KEYWORDS="~amd64 ~arm64"
 fi
 

Reply via email to