From f648cf512a33babd0e2de9d78abf4a7279b876f8 Mon Sep 17 00:00:00 2001 From: Andrey Utkin Date: Thu, 3 Oct 2019 23:24:12 +0100 Subject: [PATCH] profiles: don't use wildcard in accept_keywords for packages keyworded for arm64 Most of entries in profiles/targets/rpi3/package.accept_keywords/* specify value "* ~*", which means "package is visible if it is in stable or testing status on any architecture". This means, once any affected package gets a new ebuild having *any* keyword, e.g. ~amd64, it becomes "visible" as a pending update for the system. This is not a bad trick per se, especially for a deliberate "bleeding edge" system, and especially in earlier times when arm64 didn't maintain a stable keyword. But this means potentially dealing with more cases of breakage, because Gentoo staff hasn't yet assured that the new version works on arm64 architecture. This commit turns such lines, for packages which are keyworded for arm64 (at least in unstable status, ~arm64), into lines with just the package name, which means "package is visible if it is in stable or testing status on *host* architecture". This means arm64 in this case. It might lead to some confusion for people who are trying to use the overlay for arm (32-bit) systems, but they don't seem to be the target audience anyway. I am open to changing this commit to list arm64 explicitly. The script used to produce the change: REPO=/usr/portage cat profiles/targets/rpi3/package.accept_keywords/* \ | grep -v -E '^$|^#|^=' \ | awk '{ print $1 }' \ | sort -u \ | while read CATPN; do if grep -q 'KEYWORDS=.*arm64' $REPO/$CATPN/*.ebuild &>/dev/null; then # Keyworded, stable or unstable # Replace '$CAT/$PN * ~*' which is 'accept stable or testing on any arch' # with '$CAT/$PN' which is 'accept testing on host arch' sed -i -e "s:^${CATPN}[ ]\+[*] [~][*]$:${CATPN}:" profiles/targets/rpi3/package.accept_keywords/* fi done --- .../targets/rpi3/package.accept_keywords/claws-mail | 2 +- profiles/targets/rpi3/package.accept_keywords/dav1d | 2 +- profiles/targets/rpi3/package.accept_keywords/eudev | 2 +- profiles/targets/rpi3/package.accept_keywords/euses | 2 +- .../targets/rpi3/package.accept_keywords/f2fs-tools | 2 +- .../targets/rpi3/package.accept_keywords/firefox | 10 +++++----- profiles/targets/rpi3/package.accept_keywords/gimp | 12 ++++++------ profiles/targets/rpi3/package.accept_keywords/gtk | 2 +- profiles/targets/rpi3/package.accept_keywords/iw | 2 +- profiles/targets/rpi3/package.accept_keywords/kodi | 2 +- .../targets/rpi3/package.accept_keywords/libreoffice | 4 ++-- profiles/targets/rpi3/package.accept_keywords/mc | 2 +- .../rpi3/package.accept_keywords/mirrorselect | 4 ++-- profiles/targets/rpi3/package.accept_keywords/mupdf | 4 ++-- profiles/targets/rpi3/package.accept_keywords/nasm | 2 +- .../targets/rpi3/package.accept_keywords/rng-tools | 2 +- .../package.accept_keywords/thunar-archive-plugin | 6 +++--- .../targets/rpi3/package.accept_keywords/thunderbird | 2 +- .../targets/rpi3/package.accept_keywords/v4l-utils | 2 +- .../rpi3/package.accept_keywords/virt-manager | 8 ++++---- .../rpi3/package.accept_keywords/virtual-cron | 2 +- profiles/targets/rpi3/package.accept_keywords/vlc | 6 +++--- .../package.accept_keywords/xf86-input-synaptics | 2 +- .../targets/rpi3/package.accept_keywords/xorg-server | 2 +- 24 files changed, 43 insertions(+), 43 deletions(-) diff --git a/profiles/targets/rpi3/package.accept_keywords/claws-mail b/profiles/targets/rpi3/package.accept_keywords/claws-mail index c7312d1e..d336a1c0 100644 --- a/profiles/targets/rpi3/package.accept_keywords/claws-mail +++ b/profiles/targets/rpi3/package.accept_keywords/claws-mail @@ -4,5 +4,5 @@ dev-libs/libdbusmenu * ~* net-libs/libetpan * ~* dev-libs/libindicate * ~* x11-themes/sound-theme-freedesktop * ~* -net-mail/ytnef * ~* +net-mail/ytnef diff --git a/profiles/targets/rpi3/package.accept_keywords/dav1d b/profiles/targets/rpi3/package.accept_keywords/dav1d index 8bdcc4f4..3873bae2 100644 --- a/profiles/targets/rpi3/package.accept_keywords/dav1d +++ b/profiles/targets/rpi3/package.accept_keywords/dav1d @@ -1 +1 @@ -media-libs/dav1d * ~* +media-libs/dav1d diff --git a/profiles/targets/rpi3/package.accept_keywords/eudev b/profiles/targets/rpi3/package.accept_keywords/eudev index 6cb9f26a..c7a1de21 100644 --- a/profiles/targets/rpi3/package.accept_keywords/eudev +++ b/profiles/targets/rpi3/package.accept_keywords/eudev @@ -1 +1 @@ -sys-fs/eudev * ~* +sys-fs/eudev diff --git a/profiles/targets/rpi3/package.accept_keywords/euses b/profiles/targets/rpi3/package.accept_keywords/euses index d39effb2..183b1790 100644 --- a/profiles/targets/rpi3/package.accept_keywords/euses +++ b/profiles/targets/rpi3/package.accept_keywords/euses @@ -1 +1 @@ -app-portage/euses * ~* +app-portage/euses diff --git a/profiles/targets/rpi3/package.accept_keywords/f2fs-tools b/profiles/targets/rpi3/package.accept_keywords/f2fs-tools index 36425096..5d171d16 100644 --- a/profiles/targets/rpi3/package.accept_keywords/f2fs-tools +++ b/profiles/targets/rpi3/package.accept_keywords/f2fs-tools @@ -1 +1 @@ -sys-fs/f2fs-tools * ~* +sys-fs/f2fs-tools diff --git a/profiles/targets/rpi3/package.accept_keywords/firefox b/profiles/targets/rpi3/package.accept_keywords/firefox index ac27d54b..116dcf5f 100644 --- a/profiles/targets/rpi3/package.accept_keywords/firefox +++ b/profiles/targets/rpi3/package.accept_keywords/firefox @@ -1,7 +1,7 @@ -www-client/firefox * ~* +www-client/firefox # required by firefox -virtual/rust * ~* +virtual/rust dev-util/cargo * ~* -app-eselect/eselect-rust * ~* -dev-lang/rust * ~* -dev-util/cbindgen * ~* +app-eselect/eselect-rust +dev-lang/rust +dev-util/cbindgen diff --git a/profiles/targets/rpi3/package.accept_keywords/gimp b/profiles/targets/rpi3/package.accept_keywords/gimp index 20ed0734..98cfc8a7 100644 --- a/profiles/targets/rpi3/package.accept_keywords/gimp +++ b/profiles/targets/rpi3/package.accept_keywords/gimp @@ -1,8 +1,8 @@ -media-gfx/gimp * ~* +media-gfx/gimp # requirements of gimp -media-libs/libmypaint * ~* -media-libs/gexiv2 * ~* -media-libs/babl * ~* -media-libs/gegl * ~* -media-gfx/mypaint-brushes * ~* +media-libs/libmypaint +media-libs/gexiv2 +media-libs/babl +media-libs/gegl +media-gfx/mypaint-brushes diff --git a/profiles/targets/rpi3/package.accept_keywords/gtk b/profiles/targets/rpi3/package.accept_keywords/gtk index 12eaed93..bf6d37fa 100644 --- a/profiles/targets/rpi3/package.accept_keywords/gtk +++ b/profiles/targets/rpi3/package.accept_keywords/gtk @@ -1,2 +1,2 @@ # required by gtk+ / gtk USE flag on certain packages (e.g. git) -dev-lang/mujs * ~* +dev-lang/mujs diff --git a/profiles/targets/rpi3/package.accept_keywords/iw b/profiles/targets/rpi3/package.accept_keywords/iw index f6930533..1547570d 100644 --- a/profiles/targets/rpi3/package.accept_keywords/iw +++ b/profiles/targets/rpi3/package.accept_keywords/iw @@ -1 +1 @@ -net-wireless/iw * ~* +net-wireless/iw diff --git a/profiles/targets/rpi3/package.accept_keywords/kodi b/profiles/targets/rpi3/package.accept_keywords/kodi index e4845e3c..06c6e228 100644 --- a/profiles/targets/rpi3/package.accept_keywords/kodi +++ b/profiles/targets/rpi3/package.accept_keywords/kodi @@ -1,7 +1,7 @@ =media-tv/kodi-18.0* * ~* ~media-tv/kodi-18.4 * ~* # requirements of media-tv/kodi -sys-fs/udisks * ~* +sys-fs/udisks dev-libs/crossguid * ~* dev-libs/libfstrcmp * ~* dev-libs/libfmt * ~* diff --git a/profiles/targets/rpi3/package.accept_keywords/libreoffice b/profiles/targets/rpi3/package.accept_keywords/libreoffice index d76d17d3..b7018341 100644 --- a/profiles/targets/rpi3/package.accept_keywords/libreoffice +++ b/profiles/targets/rpi3/package.accept_keywords/libreoffice @@ -36,6 +36,6 @@ dev-libs/libixion * ~* app-text/liblangtag * ~* dev-libs/xmlsec * ~* dev-perl/X11-Protocol * ~* -app-text/libepubgen * ~* -app-text/libqxp * ~* +app-text/libepubgen +app-text/libqxp diff --git a/profiles/targets/rpi3/package.accept_keywords/mc b/profiles/targets/rpi3/package.accept_keywords/mc index fea1fd29..2c57db37 100644 --- a/profiles/targets/rpi3/package.accept_keywords/mc +++ b/profiles/targets/rpi3/package.accept_keywords/mc @@ -1 +1 @@ -app-misc/mc * ~* +app-misc/mc diff --git a/profiles/targets/rpi3/package.accept_keywords/mirrorselect b/profiles/targets/rpi3/package.accept_keywords/mirrorselect index 19caece7..0d165262 100644 --- a/profiles/targets/rpi3/package.accept_keywords/mirrorselect +++ b/profiles/targets/rpi3/package.accept_keywords/mirrorselect @@ -1,3 +1,3 @@ -app-portage/mirrorselect * ~* +app-portage/mirrorselect # requirements of mirrorselect -net-analyzer/netselect * ~* +net-analyzer/netselect diff --git a/profiles/targets/rpi3/package.accept_keywords/mupdf b/profiles/targets/rpi3/package.accept_keywords/mupdf index 478311be..5ddf07cd 100644 --- a/profiles/targets/rpi3/package.accept_keywords/mupdf +++ b/profiles/targets/rpi3/package.accept_keywords/mupdf @@ -1,4 +1,4 @@ -app-text/mupdf * ~* +app-text/mupdf # required by mupdf -media-libs/glfw * ~* +media-libs/glfw diff --git a/profiles/targets/rpi3/package.accept_keywords/nasm b/profiles/targets/rpi3/package.accept_keywords/nasm index 7ec91381..72104bea 100644 --- a/profiles/targets/rpi3/package.accept_keywords/nasm +++ b/profiles/targets/rpi3/package.accept_keywords/nasm @@ -1 +1 @@ -dev-lang/nasm * ~* +dev-lang/nasm diff --git a/profiles/targets/rpi3/package.accept_keywords/rng-tools b/profiles/targets/rpi3/package.accept_keywords/rng-tools index 6095ebff..d7c29971 100644 --- a/profiles/targets/rpi3/package.accept_keywords/rng-tools +++ b/profiles/targets/rpi3/package.accept_keywords/rng-tools @@ -1 +1 @@ -sys-apps/rng-tools * ~* +sys-apps/rng-tools diff --git a/profiles/targets/rpi3/package.accept_keywords/thunar-archive-plugin b/profiles/targets/rpi3/package.accept_keywords/thunar-archive-plugin index 546c4d1d..b6087947 100644 --- a/profiles/targets/rpi3/package.accept_keywords/thunar-archive-plugin +++ b/profiles/targets/rpi3/package.accept_keywords/thunar-archive-plugin @@ -1,5 +1,5 @@ xfce-extra/thunar-archive-plugin * ~* # requirements of xfce-extra/thunar-archive-plugin -dev-libs/volume_key * ~* -dev-libs/libbytesize * ~* -sys-libs/libblockdev * ~* +dev-libs/volume_key +dev-libs/libbytesize +sys-libs/libblockdev diff --git a/profiles/targets/rpi3/package.accept_keywords/thunderbird b/profiles/targets/rpi3/package.accept_keywords/thunderbird index d2242e08..b5ef4459 100644 --- a/profiles/targets/rpi3/package.accept_keywords/thunderbird +++ b/profiles/targets/rpi3/package.accept_keywords/thunderbird @@ -1,3 +1,3 @@ mail-client/thunderbird * ~* # dependencies of thunderbird -media-plugins/gst-plugins-libav * ~* +media-plugins/gst-plugins-libav diff --git a/profiles/targets/rpi3/package.accept_keywords/v4l-utils b/profiles/targets/rpi3/package.accept_keywords/v4l-utils index 122f0e38..26c009c7 100644 --- a/profiles/targets/rpi3/package.accept_keywords/v4l-utils +++ b/profiles/targets/rpi3/package.accept_keywords/v4l-utils @@ -1 +1 @@ -media-tv/v4l-utils * ~* +media-tv/v4l-utils diff --git a/profiles/targets/rpi3/package.accept_keywords/virt-manager b/profiles/targets/rpi3/package.accept_keywords/virt-manager index 22ed0cbe..632264a1 100644 --- a/profiles/targets/rpi3/package.accept_keywords/virt-manager +++ b/profiles/targets/rpi3/package.accept_keywords/virt-manager @@ -1,9 +1,9 @@ app-emulation/virt-manager * ~* # dependencies of virt-manager -app-emulation/spice-protocol * ~* -net-libs/gtk-vnc * ~* -dev-perl/Text-CSV * ~* +app-emulation/spice-protocol +net-libs/gtk-vnc +dev-perl/Text-CSV net-misc/x11-ssh-askpass * ~* -net-misc/spice-gtk * ~* +net-misc/spice-gtk app-emulation/libvirt-glib * ~* diff --git a/profiles/targets/rpi3/package.accept_keywords/virtual-cron b/profiles/targets/rpi3/package.accept_keywords/virtual-cron index 98a48e9b..ac5cc8b8 100644 --- a/profiles/targets/rpi3/package.accept_keywords/virtual-cron +++ b/profiles/targets/rpi3/package.accept_keywords/virtual-cron @@ -1,2 +1,2 @@ -virtual/cron * ~* +virtual/cron diff --git a/profiles/targets/rpi3/package.accept_keywords/vlc b/profiles/targets/rpi3/package.accept_keywords/vlc index 75d35c4e..97971408 100644 --- a/profiles/targets/rpi3/package.accept_keywords/vlc +++ b/profiles/targets/rpi3/package.accept_keywords/vlc @@ -1,5 +1,5 @@ -media-video/vlc * ~* +media-video/vlc # required by vlc -media-video/ffmpeg * ~* -media-libs/xvid * ~* +media-video/ffmpeg +media-libs/xvid media-libs/x264 * ~* diff --git a/profiles/targets/rpi3/package.accept_keywords/xf86-input-synaptics b/profiles/targets/rpi3/package.accept_keywords/xf86-input-synaptics index b63b219f..49bfcf85 100644 --- a/profiles/targets/rpi3/package.accept_keywords/xf86-input-synaptics +++ b/profiles/targets/rpi3/package.accept_keywords/xf86-input-synaptics @@ -1 +1 @@ -x11-drivers/xf86-input-synaptics * ~* +x11-drivers/xf86-input-synaptics diff --git a/profiles/targets/rpi3/package.accept_keywords/xorg-server b/profiles/targets/rpi3/package.accept_keywords/xorg-server index 5a99e0bc..20ea8fff 100644 --- a/profiles/targets/rpi3/package.accept_keywords/xorg-server +++ b/profiles/targets/rpi3/package.accept_keywords/xorg-server @@ -1,2 +1,2 @@ # get most modern version -x11-base/xorg-server * ~* +x11-base/xorg-server