Merge updates from master

20 files changed, 796 insertions, 168 deletions

diff --git a/dev-libs/rocm-comgr/Manifest b/dev-libs/rocm-comgr/Manifest
index 176f3311ab68..eb602155f7aa 100644
--- a/dev-libs/rocm-comgr/Manifest
+++ b/dev-libs/rocm-comgr/Manifest
@@ -2,3 +2,4 @@ DIST rocm-comgr-3.0.0.tar.gz 88594 BLAKE2B d3fb356962ba6a9ffc7aa295f1582f6587d55
 DIST rocm-comgr-3.1.0.tar.gz 88654 BLAKE2B 2b74fcde11a9fdd815526cb6fae81c1844aed5d73e961c437c9d3585b8cbd538983a9b06a5130eb75e5ac272d0a833f459053436f48116eb430c742de532ce65 SHA512 be148e92c84aacfc11724b0bfb54fab0e8cec2474eb943b1df4841517d47a3995b179afafcaa0730ddb9fadf891ca4797ce6613afac1f6f018dcc5b030a32e98
 DIST rocm-comgr-3.3.0.tar.gz 88792 BLAKE2B e84d63c0462bd64a7f10a6092d736811e834c6541aea2ee6363b60e7ab5652dc3efee16ae353dbc7ddeca343f7ce2d41b381cdd722dc98d7c9e9f2c43d4ff25f SHA512 681656f87639c1a1893e073738c253d5a0a63c23d8555e59950828c0a3d7ed997b0a70d827aae6e0af6a465a433acd0e82dd921bd12b9df31628f53ea83754a9
 DIST rocm-comgr-3.5.0.tar.gz 89330 BLAKE2B 463b5a7fed9588a87308ef7b8ad52a25000baf53556022b68c666dfd41d9d89877bb392aaf58de947b35bfae74b13ca06ae6f3770ef689c612e31318ebb9d981 SHA512 8f4b702976f31e2221ed0a545ffe028fecb268b3939b8e13b8f321786dc63398e5715ecb1910c0ca671454702dcc3671d518cc458c5a02e8cc63a90d029ca569
+DIST rocm-comgr-3.7.0.tar.gz 94875 BLAKE2B 0d6b01360cbdb4a40aab9dadcc56389a3edc11380fe1c39a29a9f3c0356708ae95ce8918bf9d4d4fa46c1a077a2daf99c5bad65906d24ea4948de93e1d4d0280 SHA512 62a08b286313234c4c3226872a410afe9818c829fb3424f4c2a464f759d8d3c6a701de4a89ea21fe6ac2b9620cec0a44c04dd5a793ba30a0537ed3ddf86fff46
diff --git a/dev-libs/rocm-comgr/rocm-comgr-3.7.0.ebuild b/dev-libs/rocm-comgr/rocm-comgr-3.7.0.ebuild
new file mode 100644
index 000000000000..097011983ea2
--- /dev/null
+++ b/dev-libs/rocm-comgr/rocm-comgr-3.7.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/"
+	inherit git-r3
+	S="${WORKDIR}/${P}/lib/comgr"
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/ROCm-CompilerSupport-rocm-${PV}/lib/comgr"
+	KEYWORDS="~amd64"
+fi
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.1.0-dependencies.patch"
+)
+
+DESCRIPTION="Radeon Open Compute Code Object Manager"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport"
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND=">=dev-libs/rocm-device-libs-${PV}
+	>=sys-devel/llvm-roc-${PV}:="
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/llvm"
+		-DClang_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/clang"
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/zziplib/zziplib-0.13.71.ebuild b/dev-libs/zziplib/zziplib-0.13.71.ebuild
deleted file mode 100644
index 22c3746bb9e0..000000000000
--- a/dev-libs/zziplib/zziplib-0.13.71.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit cmake flag-o-matic python-any-r1
-
-DESCRIPTION="Lightweight library for extracting data from files archived in a single zip file"
-HOMEPAGE="http://zziplib.sourceforge.net/"
-SRC_URI="https://github.com/gdraheim/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc sdl static-libs test"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	doc? (
-		${PYTHON_DEPS}
-	)
-	test? (
-		${PYTHON_DEPS}
-		app-arch/zip
-	)
-"
-DEPEND="
-	sys-libs/zlib
-	sdl? ( >=media-libs/libsdl-1.2.6 )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.13.69-009-perror.patch
-	"${FILESDIR}"/${PN}-0.13.71-join-paths-pc-zzipsdldir.patch
-	"${FILESDIR}"/${PN}-0.13.71-find-bash.patch
-	"${FILESDIR}"/${PN}-0.13.71-testbuilds-opensuse15-ninja-sdl2.patch
-	"${FILESDIR}"/${PN}-0.13.71-shell-DESTDIR.patch
-)
-
-pkg_setup() {
-	(use test || use doc) && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	(use test || use doc) && python_fix_shebang .
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing # bug reported upstream
-
-	append-cppflags -D_ZZIP_LARGEFILE
-	local mycmakeargs=(
-		-DZZIPCOMPAT=OFF
-		-DZZIPSDL="$(usex sdl ON OFF)"
-		-DBUILD_STATIC_LIBS="$(usex static-libs ON OFF)"
-		-DBUILD_TESTS="$(usex test ON OFF)"
-		-DZZIPTEST="$(usex test ON OFF)"
-		-DZZIPDOCS="$(usex doc ON OFF)"
-		-DZZIPWRAP=OFF
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-python/nbdime/Manifest b/dev-python/nbdime/Manifest
index 4eb4ff203327..5518da014d1b 100644
--- a/dev-python/nbdime/Manifest
+++ b/dev-python/nbdime/Manifest
@@ -1 +1 @@
-DIST nbdime-0.2.0.tar.gz 4139079 BLAKE2B 1e6994009c8ac291272a297fe583f79123906c9e05ca2afd345c6e230e3c476259c4919e2161a049e46fa28f4490122c53d0a2bc94661683652d226a78fb39be SHA512 c156b706e1d6cc7885f987d746e91d7f0c2fa48885339fd79e778643382ab45e2e52565f45cc73b9a305c6f5177339e875f53ae46d73578443880a4c7522976d
+DIST nbdime-2.0.0.tar.gz 7768807 BLAKE2B a92ed166ae863185d06e4b3e667df4323b4cd9af9211999109186c1b559522f39ab235b710c7993515aa3c44a55ac3c4b90c424cdc28d04cc013a58add7d61cd SHA512 e68e69e37f6ece701ba8d6e59d8ee321ddaca78d9338e0c52f92b6942bfd3fbf0ec2407e9ae98cb820eb4c26509644a1770f249b815c53265dfdbffbe2b55142
diff --git a/dev-python/nbdime/files/nbdime-2.0.0-remove-bdist_egg-hack.patch b/dev-python/nbdime/files/nbdime-2.0.0-remove-bdist_egg-hack.patch
new file mode 100644
index 000000000000..ff450f2ce447
--- /dev/null
+++ b/dev-python/nbdime/files/nbdime-2.0.0-remove-bdist_egg-hack.patch
@@ -0,0 +1,36 @@
+--- a/setupbase.py
++++ b/setupbase.py
+@@ -129,17 +129,6 @@
+     build_py.finalize_options()

+ 

+ 

+-class bdist_egg_disabled(bdist_egg):

+-    """Disabled version of bdist_egg

+-

+-    Prevents setup.py install performing setuptools' default easy_install,

+-    which it should never ever do.

+-    """

+-    def run(self):

+-        sys.exit("Aborting implicit building of eggs. Use `pip install .` "

+-                 " to install from source.")

+-

+-

+ def create_cmdclass(prerelease_cmd=None, package_data_spec=None,

+                     data_files_spec=None):

+     """Create a command class with the given optional prerelease class.

+@@ -179,14 +168,9 @@
+     wrapper = functools.partial(_wrap_command, wrapped)

+     handle_files = _get_file_handler(package_data_spec, data_files_spec)

+ 

+-    if 'bdist_egg' in sys.argv:

+-        egg = wrapper(bdist_egg, strict=True)

+-    else:

+-        egg = bdist_egg_disabled

+-

+     cmdclass = dict(

+         build_py=wrapper(build_py, strict=is_repo),

+-        bdist_egg=egg,

++        bdist_egg=wrapper(bdist_egg, strict=True),

+         sdist=wrapper(sdist, strict=True),

+         handle_files=handle_files,

+     )

diff --git a/dev-python/nbdime/nbdime-0.2.0.ebuild b/dev-python/nbdime/nbdime-2.0.0.ebuild
index 63b92348ff58..29db8fbcd28d 100644
--- a/dev-python/nbdime/nbdime-0.2.0.ebuild
+++ b/dev-python/nbdime/nbdime-2.0.0.ebuild
@@ -1,67 +1,56 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
 DESCRIPTION="Diff and merge of Jupyter Notebooks"
 HOMEPAGE="https://jupyter.org"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64"
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="doc test webtools"
-RESTRICT="!test? ( test )"
+KEYWORDS="~amd64"
+IUSE="webtools"
 
 RDEPEND="
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/GitPython[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	dev-python/notebook[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
 	www-servers/tornado[${PYTHON_USEDEP}]
-	webtools? ( net-libs/nodejs[npm] )
-	"
-DEPEND="${RDEPEND}
-	doc? (
-		dev-python/recommonmark[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
+	webtools? ( net-libs/nodejs[npm] )"
+BDEPEND="
 	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
 		dev-python/jsonschema[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-	)
-	"
-# The package recommonmark is required to build the docs, not in portage yet.
-# Furthermore, backports.shutil_which is required for python2_7.
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/tabulate[${PYTHON_USEDEP}]
+	)"
 
-python_configure_all() {
-	if ! use webtools; then
-		mydistutilsargs=( --skip-npm )
-	fi
-}
+distutils_enable_sphinx docs/source \
+	dev-python/recommonmark dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
 
-python_compile_all() {
-	if use doc; then
-		emake -C docs html
-		HTML_DOCS=( docs/build/html/. )
-	fi
+PATCHES=( "${FILESDIR}"/${PN}-2.0.0-remove-bdist_egg-hack.patch )
+
+python_configure_all() {
+	use webtools || mydistutilsargs=( --skip-npm )
 }
 
 python_test() {
-	# user.email and user.name are not configured in the sandbox.
+	# user.email and user.name are not configured in the sandbox
 	git config --global user.email "you@example.com" || die
 	git config --global user.name "Your Name" || die
 
 	distutils_install_for_testing
-
-	py.test -l || die
+	pytest -vv || die "Tests fail with ${EPYTHON}"
 }
diff --git a/dev-python/watchdog/Manifest b/dev-python/watchdog/Manifest
index 8424afdf095e..5e0bb5bb29a4 100644
--- a/dev-python/watchdog/Manifest
+++ b/dev-python/watchdog/Manifest
@@ -1 +1,2 @@
 DIST watchdog-0.10.3.tar.gz 89215 BLAKE2B bbe8a2ab3f84b7eff60d4ebd38ac928db85998910fc5b107dcd645c9b91388a9e45d317777f08288ce3bc2befcf9310bb7c8aef4f8e3309481919dc87e84b2a1 SHA512 6061b1393cd07038ee22271101bd6d5c847ee9732b14f63bbb5d94fba9f8273ca728cdc58b6f53a95d8213d0ed35bc71e8bb9c54960bf3aea2f64da066a864f5
+DIST watchdog-0.8.3.tar.gz 83154 BLAKE2B d5d0635e83bbcd31544d5ea5811c2f202b0da76bd7a4086e8fc61e3293640e701b04599f95decaa82bee3705dbd6b91ad24b9dbd20edcfc329913600c8a3c932 SHA512 61f1db886e8e9a6d78b569329f4d5944c296778a5a34f94fbf115a748fb4c3be422bf4d3cc828e22fcdcd380fdf9009f5bd91a8a5edc87089afc58297a0b946f
diff --git a/dev-python/watchdog/watchdog-0.8.3-r2.ebuild b/dev-python/watchdog/watchdog-0.8.3-r2.ebuild
new file mode 100644
index 000000000000..7b2615c34eee
--- /dev/null
+++ b/dev-python/watchdog/watchdog-0.8.3-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python3_6)
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Python API and shell utilities to monitor file system events"
+HOMEPAGE="https://github.com/gorakhargosh/watchdog"
+SRC_URI="mirror://pypi/w/watchdog/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+	dev-python/argh[${PYTHON_USEDEP}]
+	dev-python/pathtools[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-0.3[${PYTHON_USEDEP}]
+		)"
+
+python_test() {
+	esetup.py test
+}
+
+pkg_postinst() {
+	optfeature "Bash completion" dev-python/argcomplete
+}
diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.14.2.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.14.2-r1.ebuild
index 941ace0c4084..e9b3e7f2f77b 100644
--- a/dev-qt/qtbluetooth/qtbluetooth-5.14.2.ebuild
+++ b/dev-qt/qtbluetooth/qtbluetooth-5.14.2-r1.ebuild
@@ -15,7 +15,7 @@ IUSE="qml"
 
 RDEPEND="
 	~dev-qt/qtconcurrent-${PV}
-	~dev-qt/qtcore-${PV}
+	~dev-qt/qtcore-${PV}:5=
 	~dev-qt/qtdbus-${PV}
 	>=net-wireless/bluez-5:=
 	qml? ( ~dev-qt/qtdeclarative-${PV} )
diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.15.0.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.15.0-r1.ebuild
index 7ded615ebf54..5b53f7c84d84 100644
--- a/dev-qt/qtbluetooth/qtbluetooth-5.15.0.ebuild
+++ b/dev-qt/qtbluetooth/qtbluetooth-5.15.0-r1.ebuild
@@ -15,7 +15,7 @@ IUSE="qml"
 
 RDEPEND="
 	~dev-qt/qtconcurrent-${PV}
-	~dev-qt/qtcore-${PV}
+	~dev-qt/qtcore-${PV}:5=
 	~dev-qt/qtdbus-${PV}
 	>=net-wireless/bluez-5:=
 	qml? ( ~dev-qt/qtdeclarative-${PV} )
diff --git a/dev-qt/qtgui/files/qtgui-5.14.2-CVE-2020-17507.patch b/dev-qt/qtgui/files/qtgui-5.14.2-CVE-2020-17507.patch
new file mode 100644
index 000000000000..cad9aa4b682c
--- /dev/null
+++ b/dev-qt/qtgui/files/qtgui-5.14.2-CVE-2020-17507.patch
@@ -0,0 +1,39 @@
+From 1616c71921b73b227f56ccb3f2c49a994ec23440 Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen <allan.jensen@qt.io>
+Date: Thu, 23 Jul 2020 11:48:48 +0200
+Subject: Fix buffer overflow in XBM parser
+
+Avoid parsing over the buffer limit, or interpreting non-hex
+as hex.
+
+This still leaves parsing of lines longer than 300 chars
+unreliable
+
+Change-Id: I1c57a7e530c4380f6f9040b2ec729ccd7dc7a5fb
+Reviewed-by: Robert Loehning <robert.loehning@qt.io>
+Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
+(cherry picked from commit c562c1fc19629fb505acd0f6380604840b634211)
+Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
+---
+ src/gui/image/qxbmhandler.cpp                      |  4 ++-
+ .../gui/image/qimagereader/tst_qimagereader.cpp    | 38 ++++++++++++++++++++++
+ 2 files changed, 41 insertions(+), 1 deletion(-)
+
+diff --git a/src/gui/image/qxbmhandler.cpp b/src/gui/image/qxbmhandler.cpp
+index f06561690c..72ce7f7ecd 100644
+--- a/src/gui/image/qxbmhandler.cpp
++++ b/src/gui/image/qxbmhandler.cpp
+@@ -159,7 +159,9 @@ static bool read_xbm_body(QIODevice *device, int w, int h, QImage *outImage)
+     w = (w+7)/8;                                // byte width
+ 
+     while (y < h) {                                // for all encoded bytes...
+-        if (p) {                                // p = "0x.."
++        if (p && p < (buf + readBytes - 3)) {      // p = "0x.."
++            if (!isxdigit(p[2]) || !isxdigit(p[3]))
++                return false;
+             *b++ = hex2byte(p+2);
+             p += 2;
+             if (++x == w && ++y < h) {
+-- 
+cgit v1.2.1
+
diff --git a/dev-qt/qtgui/qtgui-5.14.2-r1.ebuild b/dev-qt/qtgui/qtgui-5.14.2-r1.ebuild
new file mode 100644
index 000000000000..a676219df351
--- /dev/null
+++ b/dev-qt/qtgui/qtgui-5.14.2-r1.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
+SLOT=5/$(ver_cut 1-3) # bug 707658
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+# TODO: linuxfb
+
+IUSE="accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg
+	+libinput +png tslib tuio +udev vnc vulkan wayland +X"
+REQUIRED_USE="
+	|| ( eglfs X )
+	accessibility? ( dbus X )
+	eglfs? ( egl )
+	ibus? ( dbus )
+	libinput? ( udev )
+	X? ( gles2-only? ( egl ) )
+"
+
+RDEPEND="
+	dev-libs/glib:2
+	~dev-qt/qtcore-${PV}:5=
+	dev-util/gtk-update-icon-cache
+	media-libs/fontconfig
+	>=media-libs/freetype-2.6.1:2
+	>=media-libs/harfbuzz-1.6.0:=
+	sys-libs/zlib:=
+	virtual/opengl
+	dbus? ( ~dev-qt/qtdbus-${PV} )
+	egl? ( media-libs/mesa[egl] )
+	eglfs? (
+		media-libs/mesa[gbm]
+		x11-libs/libdrm
+	)
+	evdev? ( sys-libs/mtdev )
+	gles2-only? ( media-libs/mesa[gles2] )
+	jpeg? ( virtual/jpeg:0 )
+	libinput? (
+		dev-libs/libinput:=
+		>=x11-libs/libxkbcommon-0.5.0
+	)
+	png? ( media-libs/libpng:0= )
+	tslib? ( >=x11-libs/tslib-1.21 )
+	tuio? ( ~dev-qt/qtnetwork-${PV} )
+	udev? ( virtual/libudev:= )
+	vnc? ( ~dev-qt/qtnetwork-${PV} )
+	vulkan? ( dev-util/vulkan-headers )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		>=x11-libs/libxcb-1.12:=[xkb]
+		>=x11-libs/libxkbcommon-0.5.0[X]
+		x11-libs/xcb-util-image
+		x11-libs/xcb-util-keysyms
+		x11-libs/xcb-util-renderutil
+		x11-libs/xcb-util-wm
+	)
+"
+DEPEND="${RDEPEND}
+	evdev? ( sys-kernel/linux-headers )
+	udev? ( sys-kernel/linux-headers )
+"
+PDEPEND="
+	ibus? ( app-i18n/ibus )
+	wayland? ( ~dev-qt/qtwayland-${PV} )
+"
+
+QT5_TARGET_SUBDIRS=(
+	src/tools/qvkgen
+	src/gui
+	src/openglextensions
+	src/platformheaders
+	src/platformsupport
+	src/plugins/generic
+	src/plugins/imageformats
+	src/plugins/platforms
+	src/plugins/platforminputcontexts
+)
+
+QT5_GENTOO_CONFIG=(
+	accessibility:accessibility-atspi-bridge
+	egl:egl:
+	eglfs:eglfs:
+	eglfs:eglfs_egldevice:
+	eglfs:eglfs_gbm:
+	evdev:evdev:
+	evdev:mtdev:
+	:fontconfig:
+	:system-freetype:FREETYPE
+	!:no-freetype:
+	!gif:no-gif:
+	gles2-only::OPENGL_ES
+	gles2-only:opengles2:OPENGL_ES_2
+	!:no-gui:
+	:system-harfbuzz:
+	!:no-harfbuzz:
+	jpeg:system-jpeg:IMAGEFORMAT_JPEG
+	!jpeg:no-jpeg:
+	libinput
+	libinput:xkbcommon:
+	:opengl
+	png:png:
+	png:system-png:IMAGEFORMAT_PNG
+	!png:no-png:
+	tslib:tslib:
+	udev:libudev:
+	vulkan:vulkan:
+	X:xcb:
+	X:xcb-glx:
+	X:xcb-plugin:
+	X:xcb-render:
+	X:xcb-sm:
+	X:xcb-xlib:
+	X:xcb-xinput:
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:gui
+)
+
+PATCHES=(
+	"${FILESDIR}/qt-5.12-gcc-avx2.patch" # bug 672946
+	"${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" # bug 703306
+	"${FILESDIR}/${PN}-5.14.2-CVE-2020-17507.patch" # bug 736924
+)
+
+src_prepare() {
+	# don't add -O3 to CXXFLAGS, bug 549140
+	sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/gui/gui.pro || die
+
+	# egl_x11 is activated when both egl and X are enabled
+	use egl && QT5_GENTOO_CONFIG+=(X:egl_x11:) || QT5_GENTOO_CONFIG+=(egl:egl_x11:)
+
+	qt_use_disable_config dbus dbus \
+		src/platformsupport/themes/genericunix/genericunix.pri
+
+	qt_use_disable_config tuio tuiotouch src/plugins/generic/generic.pro
+
+	qt_use_disable_mod ibus dbus \
+		src/plugins/platforminputcontexts/platforminputcontexts.pro
+
+	use vnc || sed -i -e '/SUBDIRS += vnc/d' \
+		src/plugins/platforms/platforms.pro || die
+
+	qt5-build_src_prepare
+}
+
+src_configure() {
+	local myconf=(
+		$(usex dbus -dbus-linked '')
+		$(qt_use egl)
+		$(qt_use eglfs)
+		$(usex eglfs '-gbm -kms' '')
+		$(qt_use evdev)
+		$(qt_use evdev mtdev)
+		-fontconfig
+		-system-freetype
+		$(usex gif '' -no-gif)
+		-gui
+		-system-harfbuzz
+		$(qt_use jpeg libjpeg system)
+		$(qt_use libinput)
+		-opengl $(usex gles2-only es2 desktop)
+		$(qt_use png libpng system)
+		$(qt_use tslib)
+		$(qt_use udev libudev)
+		$(qt_use vulkan)
+		$(qt_use X xcb system)
+		$(usex X '-xcb-xlib -xcb-xinput -xkb' '')
+	)
+	if use libinput || use X; then
+		myconf+=( -xkbcommon )
+	fi
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtgui/qtgui-5.15.0.ebuild b/dev-qt/qtgui/qtgui-5.15.0-r1.ebuild
index 23bc34eb7c46..c32c33860d00 100644
--- a/dev-qt/qtgui/qtgui-5.15.0.ebuild
+++ b/dev-qt/qtgui/qtgui-5.15.0-r1.ebuild
@@ -34,7 +34,6 @@ RDEPEND="
 	>=media-libs/freetype-2.6.1:2
 	>=media-libs/harfbuzz-1.6.0:=
 	sys-libs/zlib:=
-	virtual/opengl
 	dbus? ( ~dev-qt/qtdbus-${PV} )
 	egl? ( media-libs/mesa[egl] )
 	eglfs? (
@@ -43,6 +42,7 @@ RDEPEND="
 	)
 	evdev? ( sys-libs/mtdev )
 	gles2-only? ( media-libs/mesa[gles2] )
+	!gles2-only? ( virtual/opengl )
 	jpeg? ( virtual/jpeg:0 )
 	libinput? (
 		dev-libs/libinput:=
@@ -131,6 +131,7 @@ QT5_GENTOO_PRIVATE_CONFIG=(
 PATCHES=(
 	"${FILESDIR}/qt-5.12-gcc-avx2.patch" # bug 672946
 	"${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" # bug 703306
+	"${FILESDIR}/${PN}-5.14.2-CVE-2020-17507.patch" # bug 736924
 )
 
 src_prepare() {
diff --git a/dev-qt/qtopengl/qtopengl-5.14.2.ebuild b/dev-qt/qtopengl/qtopengl-5.14.2-r1.ebuild
index a2f5822ec72f..a2f5822ec72f 100644
--- a/dev-qt/qtopengl/qtopengl-5.14.2.ebuild
+++ b/dev-qt/qtopengl/qtopengl-5.14.2-r1.ebuild
diff --git a/dev-qt/qtopengl/qtopengl-5.15.0.ebuild b/dev-qt/qtopengl/qtopengl-5.15.0-r1.ebuild
index a2891c533fb6..3aaab692c82d 100644
--- a/dev-qt/qtopengl/qtopengl-5.15.0.ebuild
+++ b/dev-qt/qtopengl/qtopengl-5.15.0-r1.ebuild
@@ -18,7 +18,7 @@ DEPEND="
 	~dev-qt/qtcore-${PV}:5=
 	~dev-qt/qtgui-${PV}[gles2-only=]
 	~dev-qt/qtwidgets-${PV}[gles2-only=]
-	virtual/opengl
+	!gles2-only? ( virtual/opengl )
 "
 RDEPEND="${DEPEND}"
 
diff --git a/games-arcade/opentyrian/files/2.1.20130907-gcc10.patch b/games-arcade/opentyrian/files/2.1.20130907-gcc10.patch
new file mode 100644
index 000000000000..5b0c911a2ac2
--- /dev/null
+++ b/games-arcade/opentyrian/files/2.1.20130907-gcc10.patch
@@ -0,0 +1,362 @@
+From 962ee8fc46ca51691bde1c8c1022dacbe8a037ed Mon Sep 17 00:00:00 2001
+From: Carl Reinke <carlreinke@users.noreply.github.com>
+Date: Sun, 14 Jun 2020 14:11:00 -0600
+Subject: [PATCH] Move definitions that don't need to be exposed from opl.h to
+ opl.c
+
+---
+ src/opl.c | 153 +++++++++++++++++++++++++++++++++++++++++++++++++++-
+ src/opl.h | 157 ++----------------------------------------------------
+ 2 files changed, 154 insertions(+), 156 deletions(-)
+
+diff --git a/src/opl.c b/src/opl.c
+index a4071c5..f15474c 100644
+--- a/src/opl.c
++++ b/src/opl.c
+@@ -23,12 +23,161 @@
+  * Copyright (C) 1998-2001 Ken Silverman
+  * Ken Silverman's official web site: "http://www.advsys.net/ken"
+  */
+-
++#include "opl.h"
+ 
+ #include <math.h>
++#include <stdbool.h>
+ #include <stdlib.h> // rand()
+ #include <string.h> // memset()
+-#include "opl.h"
++
++#define fltype double
++
++ /*
++ define attribution that inlines/forces inlining of a function (optional)
++ */
++#define OPL_INLINE inline
++
++
++#undef NUM_CHANNELS
++#if defined(OPLTYPE_IS_OPL3)
++#define NUM_CHANNELS	18
++#else
++#define NUM_CHANNELS	9
++#endif
++
++#define MAXOPERATORS	(NUM_CHANNELS*2)
++
++
++#define FL05	((fltype)0.5)
++#define FL2		((fltype)2.0)
++#define PI		((fltype)3.1415926535897932384626433832795)
++
++
++#define FIXEDPT			0x10000		// fixed-point calculations using 16+16
++#define FIXEDPT_LFO		0x1000000	// fixed-point calculations using 8+24
++
++#define WAVEPREC		1024		// waveform precision (10 bits)
++
++#define INTFREQU		((fltype)(14318180.0 / 288.0))		// clocking of the chip
++
++
++#define OF_TYPE_ATT			0
++#define OF_TYPE_DEC			1
++#define OF_TYPE_REL			2
++#define OF_TYPE_SUS			3
++#define OF_TYPE_SUS_NOKEEP	4
++#define OF_TYPE_OFF			5
++
++#define ARC_CONTROL			0x00
++#define ARC_TVS_KSR_MUL		0x20
++#define ARC_KSL_OUTLEV		0x40
++#define ARC_ATTR_DECR		0x60
++#define ARC_SUSL_RELR		0x80
++#define ARC_FREQ_NUM		0xa0
++#define ARC_KON_BNUM		0xb0
++#define ARC_PERC_MODE		0xbd
++#define ARC_FEEDBACK		0xc0
++#define ARC_WAVE_SEL		0xe0
++
++#define ARC_SECONDSET		0x100	// second operator set for OPL3
++
++
++#define OP_ACT_OFF			0x00
++#define OP_ACT_NORMAL		0x01	// regular channel activated (bitmasked)
++#define OP_ACT_PERC			0x02	// percussion channel activated (bitmasked)
++
++#define BLOCKBUF_SIZE		512
++
++
++ // vibrato constants
++#define VIBTAB_SIZE			8
++#define VIBFAC				70/50000		// no braces, integer mul/div
++
++ // tremolo constants and table
++#define TREMTAB_SIZE		53
++#define TREM_FREQ			((fltype)(3.7))			// tremolo at 3.7hz
++
++
++ /* operator struct definition
++ For OPL2 all 9 channels consist of two operators each, carrier and modulator.
++ Channel x has operators x as modulator and operators (9+x) as carrier.
++ For OPL3 all 18 channels consist either of two operators (2op mode) or four
++ operators (4op mode) which is determined through register4 of the second
++ adlib register set.
++ Only the channels 0,1,2 (first set) and 9,10,11 (second set) can act as
++ 4op channels. The two additional operators for a channel y come from the
++ 2op channel y+3 so the operatorss y, (9+y), y+3, (9+y)+3 make up a 4op
++ channel.
++ */
++typedef struct operator_struct {
++	Bit32s cval, lastcval;			// current output/last output (used for feedback)
++	Bit32u tcount, wfpos, tinc;		// time (position in waveform) and time increment
++	fltype amp, step_amp;			// and amplification (envelope)
++	fltype vol;						// volume
++	fltype sustain_level;			// sustain level
++	Bit32s mfbi;					// feedback amount
++	fltype a0, a1, a2, a3;			// attack rate function coefficients
++	fltype decaymul, releasemul;	// decay/release rate functions
++	Bit32u op_state;				// current state of operator (attack/decay/sustain/release/off)
++	Bit32u toff;
++	Bit32s freq_high;				// highest three bits of the frequency, used for vibrato calculations
++	Bit16s* cur_wform;				// start of selected waveform
++	Bit32u cur_wmask;				// mask for selected waveform
++	Bit32u act_state;				// activity state (regular, percussion)
++	bool sus_keep;					// keep sustain level when decay finished
++	bool vibrato,tremolo;			// vibrato/tremolo enable bits
++
++									// variables used to provide non-continuous envelopes
++	Bit32u generator_pos;			// for non-standard sample rates we need to determine how many samples have passed
++	Bits cur_env_step;				// current (standardized) sample position
++	Bits env_step_a,env_step_d,env_step_r;	// number of std samples of one step (for attack/decay/release mode)
++	Bit8u step_skip_pos_a;			// position of 8-cyclic step skipping (always 2^x to check against mask)
++	Bits env_step_skip_a;			// bitmask that determines if a step is skipped (respective bit is zero then)
++
++#if defined(OPLTYPE_IS_OPL3)
++	bool is_4op,is_4op_attached;	// base of a 4op channel/part of a 4op channel
++	Bit32s left_pan,right_pan;		// opl3 stereo panning amount
++#endif
++} op_type;
++
++// per-chip variables
++static op_type op[MAXOPERATORS];
++
++static Bits int_samplerate;
++
++static Bit8u status;
++static Bit32u opl_index;
++#if defined(OPLTYPE_IS_OPL3)
++static Bit8u adlibreg[512];	// adlib register set (including second set)
++static Bit8u wave_sel[44];		// waveform selection
++#else
++static Bit8u adlibreg[256];	// adlib register set
++static Bit8u wave_sel[22];		// waveform selection
++#endif
++
++
++						// vibrato/tremolo increment/counter
++static Bit32u vibtab_pos;
++static Bit32u vibtab_add;
++static Bit32u tremtab_pos;
++static Bit32u tremtab_add;
++
++
++// enable an operator
++void enable_operator(Bitu regbase, op_type* op_pt, Bit32u act_type);
++
++// functions to change parameters of an operator
++void change_frequency(Bitu chanbase, Bitu regbase, op_type* op_pt);
++
++void change_attackrate(Bitu regbase, op_type* op_pt);
++void change_decayrate(Bitu regbase, op_type* op_pt);
++void change_releaserate(Bitu regbase, op_type* op_pt);
++void change_sustainlevel(Bitu regbase, op_type* op_pt);
++void change_waveform(Bitu regbase, op_type* op_pt);
++void change_keepsustain(Bitu regbase, op_type* op_pt);
++void change_vibrato(Bitu regbase, op_type* op_pt);
++void change_feedback(Bitu chanbase, op_type* op_pt);
++
+ 
+ static Bit32u generator_add;	// should be a chip parameter
+ 
+diff --git a/src/opl.h b/src/opl.h
+index c8e643b..cbb56ad 100644
+--- a/src/opl.h
++++ b/src/opl.h
+@@ -25,11 +25,8 @@
+  * Ken Silverman's official web site: "http://www.advsys.net/ken"
+  */
+ 
+-
+-#define fltype double
+-
+-#include <stdbool.h>
+ #include <stdint.h>
++
+ typedef uintptr_t	Bitu;
+ typedef intptr_t	Bits;
+ typedef uint32_t	Bit32u;
+@@ -39,154 +36,6 @@ typedef int16_t		Bit16s;
+ typedef uint8_t		Bit8u;
+ typedef int8_t		Bit8s;
+ 
+-
+-/*
+-	define attribution that inlines/forces inlining of a function (optional)
+-*/
+-#define OPL_INLINE inline
+-
+-
+-#undef NUM_CHANNELS
+-#if defined(OPLTYPE_IS_OPL3)
+-#define NUM_CHANNELS	18
+-#else
+-#define NUM_CHANNELS	9
+-#endif
+-
+-#define MAXOPERATORS	(NUM_CHANNELS*2)
+-
+-
+-#define FL05	((fltype)0.5)
+-#define FL2		((fltype)2.0)
+-#define PI		((fltype)3.1415926535897932384626433832795)
+-
+-
+-#define FIXEDPT			0x10000		// fixed-point calculations using 16+16
+-#define FIXEDPT_LFO		0x1000000	// fixed-point calculations using 8+24
+-
+-#define WAVEPREC		1024		// waveform precision (10 bits)
+-
+-#define INTFREQU		((fltype)(14318180.0 / 288.0))		// clocking of the chip
+-
+-
+-#define OF_TYPE_ATT			0
+-#define OF_TYPE_DEC			1
+-#define OF_TYPE_REL			2
+-#define OF_TYPE_SUS			3
+-#define OF_TYPE_SUS_NOKEEP	4
+-#define OF_TYPE_OFF			5
+-
+-#define ARC_CONTROL			0x00
+-#define ARC_TVS_KSR_MUL		0x20
+-#define ARC_KSL_OUTLEV		0x40
+-#define ARC_ATTR_DECR		0x60
+-#define ARC_SUSL_RELR		0x80
+-#define ARC_FREQ_NUM		0xa0
+-#define ARC_KON_BNUM		0xb0
+-#define ARC_PERC_MODE		0xbd
+-#define ARC_FEEDBACK		0xc0
+-#define ARC_WAVE_SEL		0xe0
+-
+-#define ARC_SECONDSET		0x100	// second operator set for OPL3
+-
+-
+-#define OP_ACT_OFF			0x00
+-#define OP_ACT_NORMAL		0x01	// regular channel activated (bitmasked)
+-#define OP_ACT_PERC			0x02	// percussion channel activated (bitmasked)
+-
+-#define BLOCKBUF_SIZE		512
+-
+-
+-// vibrato constants
+-#define VIBTAB_SIZE			8
+-#define VIBFAC				70/50000		// no braces, integer mul/div
+-
+-// tremolo constants and table
+-#define TREMTAB_SIZE		53
+-#define TREM_FREQ			((fltype)(3.7))			// tremolo at 3.7hz
+-
+-
+-/* operator struct definition
+-     For OPL2 all 9 channels consist of two operators each, carrier and modulator.
+-     Channel x has operators x as modulator and operators (9+x) as carrier.
+-     For OPL3 all 18 channels consist either of two operators (2op mode) or four
+-     operators (4op mode) which is determined through register4 of the second
+-     adlib register set.
+-     Only the channels 0,1,2 (first set) and 9,10,11 (second set) can act as
+-     4op channels. The two additional operators for a channel y come from the
+-     2op channel y+3 so the operatorss y, (9+y), y+3, (9+y)+3 make up a 4op
+-     channel.
+-*/
+-typedef struct operator_struct {
+-	Bit32s cval, lastcval;			// current output/last output (used for feedback)
+-	Bit32u tcount, wfpos, tinc;		// time (position in waveform) and time increment
+-	fltype amp, step_amp;			// and amplification (envelope)
+-	fltype vol;						// volume
+-	fltype sustain_level;			// sustain level
+-	Bit32s mfbi;					// feedback amount
+-	fltype a0, a1, a2, a3;			// attack rate function coefficients
+-	fltype decaymul, releasemul;	// decay/release rate functions
+-	Bit32u op_state;				// current state of operator (attack/decay/sustain/release/off)
+-	Bit32u toff;
+-	Bit32s freq_high;				// highest three bits of the frequency, used for vibrato calculations
+-	Bit16s* cur_wform;				// start of selected waveform
+-	Bit32u cur_wmask;				// mask for selected waveform
+-	Bit32u act_state;				// activity state (regular, percussion)
+-	bool sus_keep;					// keep sustain level when decay finished
+-	bool vibrato,tremolo;			// vibrato/tremolo enable bits
+-	
+-	// variables used to provide non-continuous envelopes
+-	Bit32u generator_pos;			// for non-standard sample rates we need to determine how many samples have passed
+-	Bits cur_env_step;				// current (standardized) sample position
+-	Bits env_step_a,env_step_d,env_step_r;	// number of std samples of one step (for attack/decay/release mode)
+-	Bit8u step_skip_pos_a;			// position of 8-cyclic step skipping (always 2^x to check against mask)
+-	Bits env_step_skip_a;			// bitmask that determines if a step is skipped (respective bit is zero then)
+-
+-#if defined(OPLTYPE_IS_OPL3)
+-	bool is_4op,is_4op_attached;	// base of a 4op channel/part of a 4op channel
+-	Bit32s left_pan,right_pan;		// opl3 stereo panning amount
+-#endif
+-} op_type;
+-
+-// per-chip variables
+-Bitu chip_num;
+-op_type op[MAXOPERATORS];
+-
+-Bits int_samplerate;
+-	
+-Bit8u status;
+-Bit32u opl_index;
+-#if defined(OPLTYPE_IS_OPL3)
+-Bit8u adlibreg[512];	// adlib register set (including second set)
+-Bit8u wave_sel[44];		// waveform selection
+-#else
+-Bit8u adlibreg[256];	// adlib register set
+-Bit8u wave_sel[22];		// waveform selection
+-#endif
+-
+-
+-// vibrato/tremolo increment/counter
+-Bit32u vibtab_pos;
+-Bit32u vibtab_add;
+-Bit32u tremtab_pos;
+-Bit32u tremtab_add;
+-
+-
+-// enable an operator
+-void enable_operator(Bitu regbase, op_type* op_pt, Bit32u act_type);
+-
+-// functions to change parameters of an operator
+-void change_frequency(Bitu chanbase, Bitu regbase, op_type* op_pt);
+-
+-void change_attackrate(Bitu regbase, op_type* op_pt);
+-void change_decayrate(Bitu regbase, op_type* op_pt);
+-void change_releaserate(Bitu regbase, op_type* op_pt);
+-void change_sustainlevel(Bitu regbase, op_type* op_pt);
+-void change_waveform(Bitu regbase, op_type* op_pt);
+-void change_keepsustain(Bitu regbase, op_type* op_pt);
+-void change_vibrato(Bitu regbase, op_type* op_pt);
+-void change_feedback(Bitu chanbase, op_type* op_pt);
+-
+ // general functions
+ void adlib_init(Bit32u samplerate);
+ void adlib_write(Bitu idx, Bit8u val);
+@@ -195,8 +44,8 @@ void adlib_getsample(Bit16s* sndptr, Bits numsamples);
+ Bitu adlib_reg_read(Bitu port);
+ void adlib_write_index(Bitu port, Bit8u val);
+ 
+-#endif /* OPL_H */
+-
+ #define opl_init() adlib_init(OUTPUT_QUALITY * 11025)
+ #define opl_write(reg, val) adlib_write(reg, val)
+ #define opl_update(buf, num) adlib_getsample(buf, num)
++
++#endif /* OPL_H */
diff --git a/games-arcade/opentyrian/metadata.xml b/games-arcade/opentyrian/metadata.xml
index 161bc1494dc2..33834cfebd8d 100644
--- a/games-arcade/opentyrian/metadata.xml
+++ b/games-arcade/opentyrian/metadata.xml
@@ -10,6 +10,6 @@
     <name>Gentoo Games Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="bitbucket">opentyrian/opentyrian</remote-id>
+    <remote-id type="github">opentyrian/opentyrian</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/games-arcade/opentyrian/opentyrian-2.1.20130907-r1.ebuild b/games-arcade/opentyrian/opentyrian-2.1.20130907-r1.ebuild
deleted file mode 100644
index d6898a9647ff..000000000000
--- a/games-arcade/opentyrian/opentyrian-2.1.20130907-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop gnome2-utils
-
-DESCRIPTION="Open-source port of the DOS game Tyrian, vertical scrolling shooter"
-HOMEPAGE="https://bitbucket.org/opentyrian/opentyrian/wiki/Home"
-SRC_URI="http://darklomax.org/tyrian/tyrian21.zip
-	 http://www.camanis.net/${PN}/releases/${P}-src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="media-libs/libsdl
-	media-libs/sdl-net"
-
-# Yes, mercurial is needed to set the build version stamp.
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-vcs/mercurial"
-
-PATCHES=(
-	"${FILESDIR}/${PV}-datapath.diff"
-	"${FILESDIR}/${PV}-cflag-idiocy.diff"
-)
-
-src_compile() {
-	emake DATA_PATH="/usr/share/${PN}"
-}
-
-src_install() {
-	dobin opentyrian
-	dosym ../../usr/bin/opentyrian /usr/bin/tyrian
-	dodoc CREDITS NEWS README
-	domenu linux/opentyrian.desktop || die "Failed to install desktop file"
-	for i in linux/icons/*.png ; do
-		local size=`echo ${i} | sed -e 's:.*-\([0-9]\+\).png:\1:'`
-		insinto /usr/share/icons/hicolor/${size}x${size}/apps
-		newins ${i} opentyrian.png
-	done
-	insinto "/usr/share/${PN}"
-	cd "${WORKDIR}/tyrian21"
-	rm *.exe dpmi16bi.ovl loudness.awe || die "Failed to remove win32 binaries"
-	doins *
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-arcade/opentyrian/opentyrian-2.1.20130907-r2.ebuild b/games-arcade/opentyrian/opentyrian-2.1.20130907-r2.ebuild
new file mode 100644
index 000000000000..74fce946ff85
--- /dev/null
+++ b/games-arcade/opentyrian/opentyrian-2.1.20130907-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop toolchain-funcs xdg-utils
+
+DESCRIPTION="Open-source port of the DOS game Tyrian, vertical scrolling shooter"
+HOMEPAGE="https://github.com/opentyrian/opentyrian"
+SRC_URI="http://darklomax.org/tyrian/tyrian21.zip
+	http://www.camanis.net/${PN}/releases/${P}-src.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="media-libs/libsdl[video]
+	media-libs/sdl-net"
+RDEPEND="${DEPEND}"
+BDEPEND="app-arch/unzip"
+
+PATCHES=(
+	"${FILESDIR}/${PV}-datapath.diff"
+	"${FILESDIR}/${PV}-cflag-idiocy.diff"
+	"${FILESDIR}/${PV}-gcc10.patch"
+)
+
+src_prepare() {
+	default
+	rm "${WORKDIR}"/tyrian21/{*.exe,dpmi16bi.ovl,loudness.awe} || die "Failed to remove win32 binaries"
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		DATA_PATH="${EPREFIX}/usr/share/${PN}"
+}
+
+src_install() {
+	dobin opentyrian
+	dosym opentyrian /usr/bin/tyrian
+	dodoc CREDITS NEWS README
+	domenu linux/opentyrian.desktop
+
+	local size
+	for i in linux/icons/*.png ; do
+		size=${i%.png}
+		size=${size##*-}
+		newicon -s "${size}" "${i}" opentyrian.png
+	done
+
+	insinto /usr/share/"${PN}"
+	doins "${WORKDIR}"/tyrian21/*
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/profiles/package.mask b/profiles/package.mask
index 087d894e95fe..f7e6a31af73c 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -59,7 +59,6 @@ dev-python/ipynb
 dev-python/jira
 dev-python/jplephem
 dev-python/natgrid
-dev-python/nbdime
 dev-python/pcapy
 dev-python/promises
 dev-python/pycuda