gentoo resync : 05.02.2020

2 files changed, 41 insertions, 13 deletions

diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index b4b872168f11..ff1f29d296bc 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -13,7 +13,7 @@ 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 MONKEYD_PLUGINS NETBEANS_MODULES 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_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 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.
@@ -96,10 +96,6 @@ XTABLES_ADDONS="quota2 psd pknock lscan length2 ipv4options ipset ipp2p iface ge
 # Some common lcd devices
 LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text"
 
-# Miroslav Šulc <fordfrog@gentoo.org> (2008-11-19)
-# Netbeans modules/clusters
-NETBEANS_MODULES="apisupport cnd groovy gsf harness ide identity j2ee java mobility nb php profiler soa visualweb webcommon websvccommon xml"
-
 # Manuel Rüger <mrueg@gentoo.org> (2015-09-09)
 # Default Ruby build target(s)
 # Updated to include ruby24 on 2018-11-12
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index d99d579cb68d..63e97021e23e 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -6,9 +6,46 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2020-01-19)
-# media-libs/pulseaudio-qt is not keyworded
-kde-misc/kdeconnect pulseaudio
+# Michał Górny <mgorny@gentoo.org> (2020-02-05)
+# Requires google-api-python-client with Python 2 which is no longer
+# supported by its dependencies.
+www-client/weboob X
+
+# Michał Górny <mgorny@gentoo.org> (2020-02-04)
+# Unsatisfiable dep due to missing impls.
+dev-python/zeep tornado
+
+# Michał Górny <mgorny@gentoo.org> (2020-01-29)
+# Require Python 2 support in numpydoc.
+<dev-python/matplotlib-3 doc
+<=dev-python/pywavelets-0.5.2-r1 doc
+
+# Michał Górny <mgorny@gentoo.org> (2020-01-29)
+# Require dev-python/epydoc which is being removed.
+<=app-admin/system-config-printer-1.5.12 doc
+<=dev-python/cosmolopy-0.1.104-r2 doc
+<=dev-python/dbus-python-1.2.4 doc
+<=dev-python/pycrypto-2.6.1-r2 doc
+<=dev-python/pycups-1.9.73-r1 doc
+<=dev-python/pycups-1.9.73-r2 doc
+<=dev-python/pygene-0.2.1-r1 doc
+<=dev-python/python-musicbrainz-0.7.4-r1 doc
+<=dev-python/python-nss-0.16.0 doc
+<=dev-python/qpid-python-0.20 doc
+<=dev-python/restkit-4.2.2 doc
+<=dev-python/suds-0.6-r1 doc
+<=sci-libs/pymmlib-1.2.1-r1 doc
+<=sys-apps/portage-2.3.86 epydoc
+
+# Michał Górny <mgorny@gentoo.org> (2020-01-27)
+# Requires old split dev-python/twisted-*.
+net-irc/telepathy-idle test
+net-voip/telepathy-rakia test
+
+# Michał Górny <mgorny@gentoo.org> (2020-01-27)
+# dev-python/zsi is being removed.
+media-sound/sonata lyrics
+sci-chemistry/pdb2pqr opal
 
 # Michał Górny <mgorny@gentoo.org> (2020-01-12)
 # libcxxrt is unmaintained and it's going to be removed.
@@ -59,14 +96,9 @@ dev-python/statsmodels doc
 # Requires dev-python/astropy that's being removed.
 sci-visualization/veusz fits
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2019-11-28)
-# sci-visualization/visit was last-rited, bug #657952
-sci-libs/libgeodecomp visit
-
 # Michał Górny <mgorny@gentoo.org> (2019-11-25)
 # Requires old version of dev-python/sphinx that's being removed.
 ~dev-python/fabric-2.3.1 doc
-<dev-python/hacking-1.1.0 doc
 
 # Michał Górny <mgorny@gentoo.org> (2019-11-09)
 # eMovix is being removed.