gentoo resync : 28.04.2021

5 files changed, 35 insertions, 67 deletions

diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index eafddac4f75d..04c72b0d582f 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 #
 # System-wide defaults for the Portage system
@@ -13,11 +13,11 @@ USE_EXPAND_VALUES_USERLAND="BSD GNU"
 
 # Env vars to expand into USE vars.  Modifying this requires prior
 # discussion on gentoo-dev@lists.gentoo.org.
-USE_EXPAND="ABI_MIPS ABI_PPC ABI_RISCV ABI_S390 ABI_X86 ADA_TARGET ALSA_CARDS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_ARM CPU_FLAGS_PPC CPU_FLAGS_X86 CURL_SSL ELIBC ENLIGHTENMENT_MODULES FFTOOLS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL L10N LCD_DEVICES LIBREOFFICE_EXTENSIONS LIRC_DEVICES LLVM_TARGETS LUA_SINGLE_TARGET LUA_TARGETS MONKEYD_PLUGINS NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFED_DRIVERS OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM PHP_TARGETS POSTGRES_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS ROS_MESSAGES RUBY_TARGETS SANE_BACKENDS USERLAND UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XFCE_PLUGINS XTABLES_ADDONS"
+USE_EXPAND="ABI_MIPS ABI_PPC ABI_S390 ABI_X86 ADA_TARGET ALSA_CARDS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_ARM CPU_FLAGS_PPC CPU_FLAGS_X86 CURL_SSL ELIBC ENLIGHTENMENT_MODULES FFTOOLS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL L10N LCD_DEVICES LIBREOFFICE_EXTENSIONS LIRC_DEVICES LLVM_TARGETS LUA_SINGLE_TARGET LUA_TARGETS MONKEYD_PLUGINS NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFED_DRIVERS OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM PHP_TARGETS POSTGRES_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS ROS_MESSAGES RUBY_TARGETS SANE_BACKENDS USERLAND UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XFCE_PLUGINS XTABLES_ADDONS"
 
 # USE_EXPAND variables whose contents are not shown in package manager
 # output. Changes need discussion on gentoo-dev.
-USE_EXPAND_HIDDEN="USERLAND KERNEL ELIBC ABI_MIPS ABI_PPC ABI_RISCV ABI_S390 ABI_X86 CPU_FLAGS_ARM CPU_FLAGS_PPC CPU_FLAGS_X86"
+USE_EXPAND_HIDDEN="USERLAND KERNEL ELIBC ABI_MIPS ABI_PPC ABI_S390 ABI_X86 CPU_FLAGS_ARM CPU_FLAGS_PPC CPU_FLAGS_X86"
 
 CONFIG_PROTECT="/etc"
 CONFIG_PROTECT_MASK="/etc/env.d /etc/gconf"
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index 6a32eb452f27..1216929e842d 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -129,7 +129,6 @@ sys-firmware/seabios binary
 # Andreas K. Hüttel <dilfridge@gentoo.org> (2018-09-11)
 # All glibc versions that include RPC code are masked now.
 dev-perl/Lab-VXI11 libtirpc
-net-analyzer/argus libtirpc
 net-analyzer/snort libtirpc
 net-firewall/conntrack-tools libtirpc
 net-fs/autofs libtirpc
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 0c539a71eaa2..8189fb7dfcf9 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -6,19 +6,36 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Matt Turner <mattst88@gentoo.org> (2021-04-14)
+# Was masked since 2014. Unmasked starting with 0.3.13.
+<media-plugins/grilo-plugins-0.3.13 lua
+
+# Joonas Niilola <juippis@gentoo.org> (2021-04-12)
+# Creates +130 GB worth of bindings, possibly Gentoo-related.
+# Upstream issue: https://phab.enlightenment.org/T8924
+dev-libs/efl mono
+
+# Sam James <sam@gentoo.org> (2021-04-09)
+# Crashes at runtime.
+# Mask LTO for now until issue with Qt
+# (to be resolved in Wireshark?) is resolved
+# bug #754021
+net-analyzer/wireshark lto
+
+# Sam James <sam@gentoo.org> (2021-04-09)
+# Fails to build right now
+# bug #651740
+net-misc/openssh debug
+
 # Stephan Hartmann <sultan@gentoo.org> (2021-03-21)
 # Requires unreleased sys-devel/icu-69.1
 >=www-client/chromium-91 system-icu
 
 # Michał Górny <mgorny@gentoo.org> (2021-03-06)
 # LLVM 9 has been removed.
-dev-lang/julia system-llvm
+<dev-lang/julia-1.6.0 system-llvm
 dev-util/perf clang
 
-# Sam James <sam@gentoo.org> (2021-02-27)
-# Needs last-rited sci-mathematics/ggnfs
-sci-mathematics/yafu sieve
-
 # Thomas Deutschmann <whissi@gentoo.org> (2021-02-17)
 # PCRE JIT support via dev-libs/libpcre2[jit] is only available for certain architectures
 dev-lang/php jit
@@ -62,19 +79,10 @@ dev-php/symfony-finder test
 # bug #723438
 app-i18n/enca doc
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2021-01-01)
-# media-video/pipewire:0/0.2 cleanup
-<dev-libs/weston-9 pipewire
-
 # Marek Szuba <marecki@gentoo.org> (2020-12-26)
 # User manual is only available for releases
 =media-gfx/darktable-9999 doc
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2020-12-26)
-# Depends on masked media-libs/qt-gstreamer and kde-apps/ktp-call-ui
-kde-apps/artikulate gstreamer
-kde-apps/plasma-telepathy-meta gstreamer
-
 # Rick Farina <zerochaos@gentoo.org> (2020-12-21)
 # This use flag enables code which appears to be broken
 net-wireless/gr-osmosdr xtrx
@@ -116,17 +124,6 @@ mail-mta/protonmail-bridge gui
 # libclangformat-ide is masked for removal.
 dev-qt/qt-creator clang
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2020-11-25)
-# Depends on masked net-libs/libkvkontakte
-kde-apps/kipi-plugins vkontakte
-
-# Georgy Yakovlev <gyakovlev@gentoo.org> (2020-10-08)
-# USE=doc broken on 1.47.0 and later
-# error: unresolved link to `crate::os::unix::ffi::OsStrExt`
-# miri seems to be not working on 1.48.0 and later
->=dev-lang/rust-1.47.0 doc
->=dev-lang/rust-1.48.0 doc miri
-
 # Michał Górny <mgorny@gentoo.org> (2020-09-27)
 # The respective dependencies are masked for removal.
 net-im/telepathy-connection-managers gadu icq meanwhile steam yahoo
@@ -143,7 +140,6 @@ net-nntp/pan gnome-keyring
 # Michał Górny <mgorny@gentoo.org> (2020-09-09)
 # The respective dependencies are masked for removal.
 media-plugins/mythplugins mythnetvision
-sys-cluster/drbd-utils heartbeat
 
 # Michał Górny <mgorny@gentoo.org> (2020-09-09)
 # The respective dependencies are masked for removal.
@@ -208,11 +204,6 @@ dev-util/meson test
 # Ada support is not yet ready for sys-devel/gcc
 sys-devel/gcc ada
 
-# Joshua Kinard <kumba@gentoo.org> (2020-03-28)
-# NCP support is masked pending removal of net-fs/ncpfs
-# Bug #681820
-net-analyzer/hydra ncp
-
 # Michał Górny <mgorny@gentoo.org> (2020-03-28)
 # Requires masked dev-vcs/bzr.  Remove the mask if breezy is packaged
 # and the package is confirmed to work with it.
@@ -241,10 +232,6 @@ dev-python/pyzmq doc
 # Unsatisfiable dep due to missing impls.
 dev-python/zeep tornado
 
-# Michał Górny <mgorny@gentoo.org> (2020-01-27)
-# Requires old split dev-python/twisted-*.
-net-irc/telepathy-idle test
-
 # Alexey Shvetsov <alexxy@gentoo.org> (2019-12-24)
 # Gromacs python module install br0ken
 sci-chemistry/gromacs python
@@ -297,10 +284,6 @@ app-i18n/xcin unicode
 net-libs/ngtcp2 ssl
 net-misc/curl nghttp3
 
-# Michał Górny <mgorny@gentoo.org> (2019-09-07)
-# media-libs/libnut is slated for removal.
-media-video/mplayer nut
-
 # Thomas Deutschmann <whissi88@gentoo.org> (2019-09-02)
 # PGO not yet supported for comm-central, #693160
 >=mail-client/thunderbird-68 pgo
@@ -458,7 +441,7 @@ app-emulation/libvirt openvz
 # rather sensitive when it comes to compiler flags, resulting in
 # black screens, hangs or crashes. The average joe should have no
 # need or even advantage to set custom compiler flags at all.
-# Example: https://bugs.gentoo.org/619628
+# Example: bug #619628
 sys-boot/gnu-efi custom-cflags
 sys-boot/refind custom-cflags
 
@@ -530,7 +513,7 @@ dev-java/icedtea cacao jamvm
 
 # Justin Lecher <jlec@gentoo.org> (2015-09-22)
 # Downloads files during installation
-# https://bugs.gentoo.org/show_bug.cgi?id=533876
+# bug #533876
 >=sci-libs/vtk-6.1.0 examples
 
 # James Le Cuirot <chewi@gentoo.org> (2015-08-18)
@@ -571,10 +554,6 @@ sys-devel/gcc sanitize
 # mirisdr does not seem to like making releases
 <net-wireless/gr-osmosdr-9999 mirisdr
 
-# Pacho Ramos <pacho@gentoo.org> (2014-06-01)
-# Needs hardmasked lua-5.2
->=media-plugins/grilo-plugins-0.2.12 lua
-
 # Tom Wijsman <TomWij@gentoo.org> (2014-05-14)
 # Documentation generation needs APIviz which is not in the Portage tree yet.
 # Tracked in Gentoo bug #509602.
@@ -676,3 +655,8 @@ media-video/vlc directx
 # Since >=dev-games/ogre-1.11.2 is masked, mask contribovis USE to
 # make repoman happy
 media-libs/opencv contribovis
+
+# Tobias Klausmann <klausman@gentoo.org> (2021-04-16)
+# Newer (>=4.4.0) versions of Quodlibet have a different library structure, so
+# puddletag needs to be updated to handle that.
+media-sound/puddletag quodlibet
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index b5e03cb88b20..26e7049939a8 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -31,12 +31,6 @@ sci-libs/openblas relapack
 # temporarily block tests so that bugs can be resolved
 dev-php/theseer-Autoload test
 
-# Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (2020-12-25)
-# Packages needing stable slotted Lua.
->=app-i18n/fcitx-4.2.9.8:4 lua
->=app-i18n/ibus-libpinyin-1.11.92 lua
-app-i18n/ibus-pinyin lua
-
 # James Le Cuirot <sam@gentoo.org> (2020-11-23)
 # Cinnamon is not stable on any architecture.
 x11-themes/arc-theme cinnamon
@@ -92,7 +86,6 @@ dev-perl/DBD-mysql mariadb
 app-misc/gcstar stats
 app-misc/g15daemon perl
 dev-lang/php coverage
-dev-util/lcov png
 dev-perl/Business-ISBN barcode
 dev-perl/Template-Toolkit gd
 media-fonts/unifont utils fontforge
@@ -110,8 +103,8 @@ media-video/vdrsync dvdr
 media-plugins/grilo-plugins chromaprint
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2019-02-16)
-# net-libs/libmediawiki, net-libs/libkvkontakte not stable anywhere.
-kde-apps/kipi-plugins mediawiki vkontakte
+# net-libs/libmediawiki not stable anywhere.
+kde-apps/kipi-plugins mediawiki
 
 # Mikle Kolyada <zlogene@gentoo.org> (2018-11-07)
 # sssd is only stable for amd64 and x86
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index 9f45878b13b1..232b2f1281a2 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -19,7 +19,7 @@ php7-2
 # Nothing depends on those ROS messages. dev-ros/geneus
 # is half broken in our setup where it looks for packages
 # on the filesystem and causes build failures.
-# See e.g. https://bugs.gentoo.org/741076
+# See e.g. bug #741076
 ros_messages_eus
 
 # Hans de Graaff <graaff@gentoo.org> (2020-06-13)
@@ -120,11 +120,3 @@ prelude
 # Diego Elio Pettenò <flameeyes@gentoo.org> (2012-08-27)
 # netlink is a Linux-specific interface
 netlink
-
-# Andreas K. Hüttel <dilfridge@gentoo.org> (2019-09-18)
-# mask removed ABI_RISCV flags so they do not trigger rebuild
-# in emerge
-abi_riscv_lp64
-abi_riscv_lp64d
-abi_riscv_ilp32
-abi_riscv_ilp32d