Merge updates from master

2 files changed, 63 insertions, 17 deletions

diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 9d76d50d39b4..9f4aa29cc757 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -7,10 +7,18 @@
 # mask everywhere, unmask on arch/*) use arch/base.
 
 # Michał Górny <mgorny@gentoo.org> (2020-09-09)
-# app-misc/g15daemon is masked for removal.
-app-misc/lcdproc lcd_devices_g15
-media-sound/mangler g15
-media-sound/mumble g15
+# The respective dependencies are masked for removal.
+media-plugins/mythplugins mythnetvision
+sci-physics/thepeg rivet
+sys-apps/dstat wifi
+sys-cluster/drbd-utils heartbeat
+sys-cluster/pacemaker heartbeat
+
+# Michał Górny <mgorny@gentoo.org> (2020-09-09)
+# The respective dependencies are masked for removal.
+app-metrics/collectd collectd_plugins_gmond
+app-metrics/collectd collectd_plugins_onewire
+sci-libs/dealii gmsh
 
 # Stephan Hartmann <sultan@gentoo.org> (2020-09-06)
 # Causes seccomp sandbox violation or chromium might hang on startup.
diff --git a/profiles/package.mask b/profiles/package.mask
index 4d5909484a8b..da83d5a3c710 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,6 +32,57 @@
 
 #--- END OF EXAMPLES ---
 
+# These packages (or package versions) still require Python 2.7.
+# They are either dead upstream, their Python 3 porting efforts are
+# not progressing or their maintainers are simply unresponsive.
+# Please do not remove any packages from this list unless you actually
+# port them to Python 3.
+# Removal in 30 days.  Please find relevant bugs on tracker bug #694800.
+app-misc/mswinurl_launcher
+app-misc/mtail
+app-text/silvercity
+dev-libs/qrosspython
+dev-python/SchemaObject
+dev-python/oauth
+dev-ruby/pygments_rb
+dev-util/doxy-coverage
+dev-util/mpatch
+dev-vcs/cvs2svn
+dev-vcs/gitstats
+games-rpg/adonthell
+games-rpg/wastesedge
+games-strategy/0ad
+media-sound/codecgraph
+net-misc/pssh
+net-misc/ris-linux
+net-wireless/mousejack
+net-wireless/python-wifi
+sci-biology/amos
+sci-biology/embassy-meme
+sci-biology/meme
+sci-biology/shrimp
+sci-misc/gato
+sci-physics/rivet
+sys-cluster/heartbeat
+x11-misc/dsx
+
+# Michał Górny <mgorny@gentoo.org> (2020-09-09)
+# These packages are stuck on Python 2.7.  While the Python dependency
+# is optional, I can't test removing it because the packages fail
+# to build anyway.
+#
+# net-analyzer/mk-livestatus: py3 bug #735394, build failure bug #705430
+# sci-biology/vienna-rna: py3 bug #735438, build failure bug #707158
+# sci-libs/gmsh: py3 bug #735478, build failure bug #708386
+# sys-cluster/ganglia: py3 bug #735496, build failure bug #631270
+# sys-fs/owfs: py3 bug #735502, build failure bug #707438
+net-analyzer/mk-livestatus
+sci-biology/vienna-rna
+sci-libs/gmsh
+sys-cluster/ganglia
+sys-cluster/ganglia-web
+sys-fs/owfs
+
 # Louis Sautier <sbraz@gentoo.org> (2020-09-09)
 # Masked for removal in 30 days, no revdeps.
 # Backport of a module included in Python >= 3.3.
@@ -45,19 +96,6 @@ dev-python/backports-unittest-mock
 # Removal in 30 days.  Bug #715204.
 www-servers/cherokee
 
-# Michał Górny <mgorny@gentoo.org> (2020-09-09)
-# Last release in 2008.  Fails to build with gcc-10 (bug #706712).
-# Not ported to Python 3 (bug #735226).  The current revision
-# is misconfigured by default (bug #481454), and the newer revision
-# is masked for since 2012 (bug #587008).
-# Removal in 30 days.  Bug #741382.
-app-misc/g15daemon
-app-misc/g15composer
-app-misc/g15macro
-app-misc/g15message
-app-misc/g15mpd
-app-misc/g15stats
-
 # Joonas Niilola <juippis@gentoo.org> (2020-09-07)
 # Nothing in the tree uses this lib anymore. Removing as redundant.
 # Removal in ~30 days. Bug #740868.