Merge updates from master

13 files changed, 49 insertions, 40 deletions

diff --git a/app-admin/glance/glance-2019.1.9999.ebuild b/app-admin/glance/glance-2019.1.9999.ebuild
index 2647706b8889..3c7b073c2f82 100644
--- a/app-admin/glance/glance-2019.1.9999.ebuild
+++ b/app-admin/glance/glance-2019.1.9999.ebuild
@@ -121,7 +121,9 @@ python_prepare_all() {
 }
 
 python_compile_all() {
-	use doc && "${PYTHON}" setup.py build_sphinx
+	if [ ! -z ${EGIT_BRANCH+x} ]; then
+		use doc && "${PYTHON}" setup.py build_sphinx
+	fi
 }
 
 python_install_all() {
diff --git a/dev-python/rfc3986/Manifest b/dev-python/rfc3986/Manifest
index 56dc4597b99b..ec5305e2a83b 100644
--- a/dev-python/rfc3986/Manifest
+++ b/dev-python/rfc3986/Manifest
@@ -2,3 +2,4 @@ DIST rfc3986-0.3.1.tar.gz 21591 BLAKE2B b24500baf27e4f17d22dbeb839262edb11b1c8c5
 DIST rfc3986-0.4.1.tar.gz 22354 BLAKE2B db2a7edefa89fd3780721904c5e1b623d34dea5e8913c606336771d22f03c258f0a3cd3b71f42db6a6f2065bb055cf6938c10f166730953fe78cdc50dd0f148a SHA512 a4731206a4179d3970fcf9c21405f7e9686268ef3610ab5ca2413a867d83b83188c0efd5958b0b4ba8fc4076da9bc0cf18aef774213a1b58fc42bfc8a6d5dd92
 DIST rfc3986-1.1.0.tar.gz 39381 BLAKE2B cb890ae46c1428ddca1aed4a49660e2620659e7af64dbdb22c2514323ede374c28bbbd8401a5b4db257ba47e617ad7e8ae486f751fd4a7580808c68ff289ec13 SHA512 5e43ca7df586011900d2f01edfb20388598f77218e5a63904557bec0f1d0cb0a35f4980014de9c943ecc43a5a7ab3f7b815fbcfc9318e494c24a14fed2d1fac6
 DIST rfc3986-1.2.0.tar.gz 40162 BLAKE2B d51db37285366fdc7a6d25632afe440bbcdf4fbca46488082286824f046cfd81129b8f0e0695f986120276cf446dde5751dc52ebeb5f2f61f60c5acb92f2da1a SHA512 b88bdc47fa2daa6a9ffc339b1b997a85d0c8b3bf3ab271554e2a1a684c0394370e9cba07a82a542f39533a4c8cae69414234545db6caa2508e0ee7e7f8bdff3d
+DIST rfc3986-1.3.2.tar.gz 44225 BLAKE2B f4cc72ed3c2dcc7132527cd33fd6b9f0136f789fdb229cc33b02bf2dd596b2f762e3e4cf8af63f239408b55cdf056cf54315a0a9cdf734a4203fad24b00ce594 SHA512 c086c55295d80ccf33dbfeff06059303119e7a407bfc405b7f75ec30413221ec58d3061d75fd3ca696b7acf9b1be1dfcc785e01280bf659a53be43ab1f300b15
diff --git a/dev-python/rfc3986/metadata.xml b/dev-python/rfc3986/metadata.xml
index 6bf17e96bd2c..19731ab4c6ed 100644
--- a/dev-python/rfc3986/metadata.xml
+++ b/dev-python/rfc3986/metadata.xml
@@ -12,8 +12,11 @@
   <longdescription lang="en">
   Validating URI References per RFC 3986
   </longdescription>
+  <use>
+    <flag name="idna">enable support for the IDNA specification (RFC 5891)</flag>
+  </use>
   <upstream>
     <remote-id type="pypi">rfc3986</remote-id>
-    <remote-id type="github">sigmavirus24/rfc3986</remote-id>
+    <remote-id type="github">python-hyper/rfc3986</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/rfc3986/rfc3986-1.3.2.ebuild b/dev-python/rfc3986/rfc3986-1.3.2.ebuild
new file mode 100644
index 000000000000..bd688f4924c2
--- /dev/null
+++ b/dev-python/rfc3986/rfc3986-1.3.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3)
+
+inherit distutils-r1
+
+DESCRIPTION="Validating URI References per RFC 3986"
+HOMEPAGE="https://tools.ietf.org/html/rfc3986
+	https://github.com/python-hyper/rfc3986
+	https://rfc3986.rtfd.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="idna test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	idna? ( dev-python/idna[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+RDEPEND=""
+
+python_test() {
+	py.test -vv || die
+}
diff --git a/profiles/arch/amd64-fbsd/package.use.mask b/profiles/arch/amd64-fbsd/package.use.mask
index 40a090f42d34..5ae7b61414e8 100644
--- a/profiles/arch/amd64-fbsd/package.use.mask
+++ b/profiles/arch/amd64-fbsd/package.use.mask
@@ -81,7 +81,7 @@ dev-python/pycurl test
 
 # Michał Górny <mgorny@gentoo.org> (2018-02-21)
 # More unkeyworded dependencies.
-media-video/ffmpeg frei0r sofalizer
+media-video/ffmpeg frei0r
 
 # Michał Górny <mgorny@gentoo.org> (2018-02-19)
 # Unkeyworded dependencies.
@@ -91,7 +91,7 @@ media-libs/libcanberra gnome
 media-libs/mesa vaapi
 media-libs/openal sdl
 media-sound/pulseaudio equalizer qt5 realtime
-media-video/ffmpeg ebur128 kvazaar libilbc openh264
+media-video/ffmpeg kvazaar libilbc openh264
 media-video/ffmpeg rubberband sdl ssh x265 zeromq zimg
 net-libs/gnutls idn
 net-print/cups-filters pdf
diff --git a/profiles/arch/arm/package.use.stable.mask b/profiles/arch/arm/package.use.stable.mask
index 2f3ff24cd5eb..f140c5fde0fa 100644
--- a/profiles/arch/arm/package.use.stable.mask
+++ b/profiles/arch/arm/package.use.stable.mask
@@ -65,7 +65,7 @@ media-sound/mpd fluidsynth
 # Alexis Ballier <aballier@gentoo.org> (2017-05-29)
 # frei0r-plugins is not stable yet, mask it on stable versions
 <media-video/libav-13 frei0r
-<=media-video/ffmpeg-4.1.3 frei0r sofalizer
+<=media-video/ffmpeg-4.1.3 frei0r
 
 # Michael Weber <xmw@gentoo.org> (2017-04-01)
 # no stable jdk
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 93e0543dfb8b..2fb0da2d39e0 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -198,10 +198,6 @@ dev-python/networkx scipy
 sys-libs/libblockdev dmraid
 
 # Mart Raudsepp <leio@gentoo.org> (2018-02-13)
-# USE=sofalizer requires sci-libs/netcdf that is not keyworded yet.
-media-video/ffmpeg sofalizer
-
-# Mart Raudsepp <leio@gentoo.org> (2018-02-13)
 # USE=upnp-av requires net-misc/dleyna-server that is not keyworded yet.
 >=media-plugins/grilo-plugins-0.3.5 upnp-av
 
@@ -261,7 +257,7 @@ media-gfx/pstoedit emf
 
 # Alexis Ballier <aballier@gentoo.org> (2017-07-14)
 # Appends -mfpu=neon and asm seems arm32
-net-misc/freerdp neon
+net-misc/freerdp cpu_flags_arm_neon
 
 # Alexis Ballier <aballier@gentoo.org> (2017-07-14)
 # zfs does not build on arm64 (yet?)
diff --git a/profiles/arch/arm64/package.use.stable.mask b/profiles/arch/arm64/package.use.stable.mask
index a4b1a650640a..429fb27f23b6 100644
--- a/profiles/arch/arm64/package.use.stable.mask
+++ b/profiles/arch/arm64/package.use.stable.mask
@@ -66,10 +66,6 @@ app-doc/doxygen clang doxysearch doc
 # virtual/opengl and media-libs/freeglut not stable yet
 media-libs/libwebp opengl
 
-# Mart Raudsepp <leio@gentoo.org> (2018-05-06)
-# No media-libs/freeglut and co stable yet
-media-libs/jasper opengl
-
 # Mart Raudsepp <leio@gentoo.org> (2018-05-04)
 # sci-libs/mpir fails tests, bug 640424
 dev-python/gmpy mpir
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index 3fee37659d26..6347b32ab73b 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -85,8 +85,7 @@ app-shells/bash-completion test
 # Jeroen Roovers <jer@gentoo.org> (2017-02-04)
 # media-libs/libilbc has not been ported to HPPA
 # media-libs/zimg triggers a toolchain issue (bug #597152)
-# sofalizer needs sci-libs/netcdf and sci-libs/hdf5 (bug #615510)
-media-video/ffmpeg libilbc sofalizer zimg
+media-video/ffmpeg libilbc zimg
 
 # Jeroen Roovers <jer@gentoo.org> (2017-02-03)
 # net-mail/notmuch is not keyworded
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index 067e5858560a..0e5a58065908 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -321,7 +321,7 @@ x11-misc/xscreensaver new-login
 
 # Pacho Ramos <pacho@gentoo.org> (2012-05-07)
 # libhid is not keyworded
-app-misc/lcdproc hid lcd_devices_mdm166a
+app-misc/lcdproc lcd_devices_mdm166a
 
 # Anthony G. Basile <blueness@gentoo.org> (2011-12-21)
 # Mask the vde flag on tinc because net-misc/vde is not
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 6e47590a46bd..b16275bd071c 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -59,27 +59,6 @@ sys-kernel/linux-firmware initramfs
 # Requires dev-libs/gumbo which is only keyworded for amd64 and x86
 mail-client/claws-mail litehtml
 
-# David Seifert <soap@gentoo.org> (2019-07-14)
-# media-libs/jasper will be removed in 30 days, bug #689784
-dev-games/openscenegraph jpeg2k
-dev-python/weasyprint jpeg2k
-dev-qt/qtimageformats jpeg2k
-media-gfx/dcraw jpeg2k
-media-gfx/digikam jpeg2k
-media-gfx/exact-image jpeg2k
-media-gfx/fim jpeg2k
-<media-gfx/gimp-2.10 jpeg2k
-media-gfx/graphicsmagick jpeg2k
-media-gfx/ufraw jpeg2k
-media-libs/devil jpeg2k
-media-libs/gegl jpeg2k
-media-libs/libraw jpeg2k
-media-libs/netpbm jpeg2k
-media-libs/opencv jpeg2k
-media-libs/simage jpeg2k
-net-proxy/ziproxy jpeg2k
-x11-libs/gdk-pixbuf jpeg2k
-
 # James Le Cuirot <chewi@gentoo.org> (2019-05-21)
 # Doesn't support ffmpeg-4. Portage takes a long time to report the
 # conflict and the feature is half broken anyway. See
diff --git a/profiles/package.mask b/profiles/package.mask
index 134af914c639..a1134f828450 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Matt Turner <mattst88@gentoo.org> (2019-09-28)
+# Merged into Mesa. No reverse dependencies. Bug #654464
+# Removal in 30 days
+media-libs/libtxc_dxtn
+
 # Sergei Trofimovich <slyfox@gentoo.org> (2019-09-28)
 # ppc64/ia64 binary-only package was needed to workaround
 # gcc-3.3 bugs. Should not be needed anymore. To be removed
@@ -1363,7 +1368,6 @@ x11-drivers/xf86-video-voodoo
 # users, so let's keep them masked until somebody figures out what's
 # wrong.  Bug #647964.
 ~app-portage/gemato-14.1m
-~app-portage/gemato-14.0m
 ~app-portage/gemato-9999m
 
 # Kent Fredric <kentnl@gentoo.org> (2018-05-27)
diff --git a/profiles/targets/desktop/gnome/package.use b/profiles/targets/desktop/gnome/package.use
index 107ab38ec871..b745538a606a 100644
--- a/profiles/targets/desktop/gnome/package.use
+++ b/profiles/targets/desktop/gnome/package.use
@@ -5,7 +5,7 @@
 dev-libs/efl sound
 
 # Needed by gnome-photos
-media-libs/gegl jpeg2k raw
+media-libs/gegl raw
 
 # Needed by a global USE=wayland right now; some REQUIRED_USE may be outdated and need review
 >=media-libs/cogl-1.18.2-r1 gles2