gentoo resync : 03.11.2019

3 files changed, 2 insertions, 32 deletions

diff --git a/profiles/base/package.use b/profiles/base/package.use
index 6122e7297a58..8f3e278bef43 100644
--- a/profiles/base/package.use
+++ b/profiles/base/package.use
@@ -5,7 +5,6 @@
 # These py2-only packages also support pypy, enable
 # Python 2.7 as the default implementation, preparing
 # for the eventual switch to py3 in PYTHON_SINGLE_TARGET
-app-text/asciidoc python_single_target_python2_7 python_targets_python2_7
 app-text/wklej python_single_target_python2_7 python_targets_python2_7
 dev-vcs/git-bz python_single_target_python2_7 python_targets_python2_7
 gnome-base/libglade python_single_target_python2_7 python_targets_python2_7
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 040b6ea8fd55..b17eaed09f7d 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -34,6 +34,7 @@ app-i18n/xcin unicode
 # OpenSSL (as of version 1.1.1) doesn't have APIs for QUIC support
 # see https://github.com/openssl/openssl/pull/8797
 net-libs/ngtcp2 ssl
+net-misc/curl nghttp3
 
 # Michał Górny <mgorny@gentoo.org> (2019-09-08)
 # LLVM 5 is being removed.
@@ -103,11 +104,6 @@ dev-python/pandas doc
 # solution is found, e.g., transition to a free font package.
 app-text/ghostscript-gpl l10n_ja
 
-# Georgy Yakovlev <gyakovlev@gentoo.org> (2019-04-17)
-# Mask jre useflags for use as system java-vm until it's proven to work
-dev-java/openjdk-jre-bin:8 gentoo-vm
-dev-java/openjdk-jre-bin:11 gentoo-vm
-
 # Michał Górny <mgorny@gentoo.org> (2019-04-10)
 # media-sound/aacplusenc is slated for removal.
 media-video/h264enc aac
@@ -134,11 +130,6 @@ dev-db/mariadb-connector-c mysqlcompat
 # Not keyworded on non-x86 arches
 app-admin/conserver freeipmi
 
-# Georgy Yakovlev <gyakovlev@gentoo.org> (2019-01-17)
-# Mask openjdk:8 for use as system java-vm until it's proven to work
-dev-java/openjdk:8 gentoo-vm
-dev-java/openjdk-bin:8 gentoo-vm
-
 # William Hubbs <williamh@gentoo.org> (2019-01-13)
 # For memtest86+ mask the floppy use flag since it requires grub:0 which
 # is being removed
@@ -229,7 +220,6 @@ app-emulation/fuse backend-svga
 # Brian Evans <grknight@gentoo.org> (2018-03-05)
 # Mask embedded USE on virtual/mysql and friends to transition it to be obsolete
 virtual/mysql embedded
-dev-perl/DBD-mysql embedded
 
 # Brian Evans <grknight@gentoo.org> (2018-02-28)
 # Mask client-libs USE to force users to install alternative standard pacakges
@@ -255,6 +245,7 @@ media-video/ffmpeg appkit
 # gentoo-vm flag allows us to provide it without it breaking Gentoo
 # packages. Those who wish to experiment with it as a fully recognised
 # Gentoo JVM can unmask the flag.
+dev-java/openjdk-jre-bin:11 gentoo-vm
 dev-java/oracle-jdk-bin:11 gentoo-vm
 dev-java/openjdk-bin:11 gentoo-vm
 dev-java/openjdk:11 gentoo-vm
@@ -296,11 +287,6 @@ sys-boot/refind custom-cflags
 # depenencies.
 >=app-arch/snappy-1.1.5 static-libs
 
-# Ilya Tumaykin <itumaykin+gentoo@gmail.com> (2017-06-18)
-# Libav is basically unsupported by mpv, see upstream issues 3923, 3925.
-# Needs patch to even build, subs are broken and not supported anymore.
-media-video/mpv libav
-
 # Andreas K. Hüttel <dilfridge@gentoo.org> (2017-05-29)
 # Does not build
 sci-libs/linux-gpib php
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index 2ce5b0ecd480..c35e3a17bb1b 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -49,11 +49,6 @@ media-gfx/alembic arnold maya
 # masking this for now, will readjust as situation changes
 >=dev-lang/rust-1.34 system-llvm
 
-# Virgil Dupras <vdupras@gentoo.org> (2019-05-10)
-# Needs openssl 1.1 which isn't going stable for a while and blocks
-# bug #684972. See bug #685584
->=app-text/mupdf-1.14.0-r3 ssl
-
 # Mart Raudsepp <leio@gentoo.org> (2019-04-14)
 # Needs media-plugins/gst-plugins-chromaprint, which is not stable
 # anywhere yet.
@@ -103,11 +98,6 @@ app-emulation/qemu capstone
 # Bugs #649408, #641108, #640724
 dev-perl/DBD-SQLite system-sqlite
 
-# Ilya Tumaykin <itumaykin+gentoo@gmail.com> (2018-02-13)
-# Requires >=dev-lang/mujs-1.0.0 stabilized. mpv-0.27.2 is stabilized
-# due to a security bug, so we won't bother with javascript this time.
-~media-video/mpv-0.27.2 javascript
-
 # Andrey Grozin <grozin@gentoo.org> (2018-01-24)
 # Depends on unstable dev-python/sphinx-gallery.
 # Bug #643840.
@@ -202,11 +192,6 @@ app-emulation/vice ffmpeg
 # yet (bug #542210)
 net-analyzer/pmacct mongodb
 
-# Pacho Ramos <pacho@gentoo.org>
-# sci-visualization/paraview is not ready for stabilization yet
-# See bug #541012
-sci-libs/openfoam paraview
-
 # Ben de Groot <yngwin@gentoo.org>
 # Mask experimental feature on stable. This also needs not yet stable mupdf.
 app-text/qpdfview fitz