gentoo resync : 25.08.2020

14 files changed, 168 insertions, 119 deletions

diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index 3a91c10a8204..82d8164c528b 100644
--- a/games-util/Manifest.gz
+++ b/games-util/Manifest.gz
diff --git a/games-util/atlas/Manifest b/games-util/atlas/Manifest
index fa8e46e4cffb..45da21f48b9b 100644
--- a/games-util/atlas/Manifest
+++ b/games-util/atlas/Manifest
@@ -1,5 +1,5 @@
 AUX atlas-0.5.1_beta_pre20160907-jpeg-9.patch 746 BLAKE2B 686bf154fd43d68f42c97d65ce0c0207cf65a206e9f931f0b5280149768d07a589248209e8286e9b80387c1af6e9d0a8d86d0f2213d640c828daba0ed58243d1 SHA512 0291dd266d23f6a5963a5095dac79cd001e16449fbbb5f5b3113253f3d252932be915f7afc0e4efa52f0e65f9117c446dabe9850ca9d8550219657916c3efd7a
 AUX atlas-0.5.1_beta_pre20160907-simgear-compilation.patch 8125 BLAKE2B f5b0b2e27e191ff32a6006b4d2d4f200d4a1a6f387adace607a9e421cf16c55a15d2182691d3bbb5994de9870176da80b520d8de70d2532a11b9febb9a10245a SHA512 871e576cb95565b658379d76c285067c820f591f97bd1826a11f396742651aa7e783f85b9278039ab4bd2c8e6f9f0268323185a8219408c8f01fa67db65f856f
 DIST atlas-hgcode-e183e3b3a0412b504edcb3664445b3e04fd484a2.zip 530005 BLAKE2B 3069f743ee83a1892283eebe27698c6360a90f67a05999f3f5cab8b786d976a4cd15151cbe8c7c1165b43cfb9e3265868a5b55b9364a82c5f78b1fe5f69dffcc SHA512 5f4453c81b01451ce69f4f1340a7c34736be3a9ecf638aa340455d0bb0af7a5d1a7e05d0b51e8b75f5c3acef4787d208ace75d4c686e8be7eafb8f81c71df360
-EBUILD atlas-0.5.1_beta_pre20160907.ebuild 1428 BLAKE2B 69a8ba0ea8f52eed8ec772f6c9b814cf1723d130a7c379bd52a651a9acce94214219fb85b2fd6ae455023034adc220bcd9af545744e34dd6c8d1232df6815083 SHA512 b9b3d336c011fdade103dbdf978a74bd9b280750bd51d5b24aa377c00f60bc6f06277497d8f91a9615d87b63e5fb9c3a03867bb4981170fe1ade0e5c5d626fd1
+EBUILD atlas-0.5.1_beta_pre20160907.ebuild 1443 BLAKE2B 8034a33614806f445fc145f2624beb89ff51be79e5184a116a9d56d5f4c4814fb03cdf617ef2021d370b1e0b62f34546573c0dc4018dc18906c1f3c9b357dc39 SHA512 eac7b8e723e26ae10d0bc624ed7c48929864e1ba9814b62bcc3a9a1303658902da5540a39c6dc43c2fc944a557c3c5f039ba76a481d66ab7c4d56b5fd82eb094
 MISC metadata.xml 440 BLAKE2B b07c76b0e7d3866e8a6f6e7ef2d73ea39a29e81c57cab9e77945124bf3817182434b504e9ec5022c40a764ce8d63e034b59eb92829e982c28db4d849f006d912 SHA512 761058431181d1ca1367ef68e464e7ee1a19a69576b46768a652be280ce7d161bcdf8f5d8b993a7d8a7ababe4a8e436f11ff3ee4ad1661b50e8a8c6edbf62158
diff --git a/games-util/atlas/atlas-0.5.1_beta_pre20160907.ebuild b/games-util/atlas/atlas-0.5.1_beta_pre20160907.ebuild
index 4fed6a08e4a1..6ddeb4506b56 100644
--- a/games-util/atlas/atlas-0.5.1_beta_pre20160907.ebuild
+++ b/games-util/atlas/atlas-0.5.1_beta_pre20160907.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools
 
@@ -13,10 +13,9 @@ DESCRIPTION="Chart Program to use with Flightgear Flight Simulator"
 HOMEPAGE="http://atlas.sourceforge.net/"
 SRC_URI="https://dev.gentoo.org/~reavertm/${MY_P}.zip"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 COMMON_DEPEND="
 	media-libs/freeglut
@@ -35,6 +34,7 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	>=games-simulation/flightgear-3.0.0
 "
+BDEPEND="app-arch/unzip"
 
 S=${WORKDIR}/${MY_P}
 
@@ -47,7 +47,7 @@ src_prepare() {
 	default
 
 	# -Wnarrowing failure, #612986
-	sed -i -e 's:0x:(char)0x:g' src/tiles.h || die
+	sed -i -e 's|0x|(char)0x|g' src/tiles.h || die
 
 	eautoreconf
 }
diff --git a/games-util/lutris/Manifest b/games-util/lutris/Manifest
index f939b60e985d..913445c59d8c 100644
--- a/games-util/lutris/Manifest
+++ b/games-util/lutris/Manifest
@@ -1,7 +1,9 @@
 AUX lutris-0.5.4-gtk.patch 1259 BLAKE2B 32556fbb9ce674f783508c740f9cb9f06a0165286f42e5e080d668864d9a840c74765c8602c47e8b7a90d33374cb04d85d9f2498a0919171d146abb82ef7f31b SHA512 7028157b550c9d13a98e843d75c27bdb8c2cb2bf9591df5f102b412ebfefe693e95b847b0ba43c032ef9d84881b4143f2d2ecc32fd61e164bd49e5da5c5cd5a9
 DIST lutris_0.5.4.tar.xz 1843880 BLAKE2B f286d62df3bf5a5eadd634d2d177a5b69b5fa5d897e70f58a19be4148609e56ba33c29ce4218ae833dbdf9dded1e9be869f9ed4d84ba2b435a09981219d74438 SHA512 81669f2021063229bad78ebc49b54075058266716279695c53c43a5a06a8c1d4e5a9dcbcb20a1becfe0d243aa6e812f5a30b4d90f418d4cffcff18daefb09c50
 DIST lutris_0.5.6.tar.xz 1747440 BLAKE2B e39206d8245d99a0424537cd9d9ed860c4e0d9fd373afe61d7e19eb2672bee621d541060af74f1197242e49a846e70fe16eb28e0c57370d2e11634d7035ab1fe SHA512 3ac9f7095c30044990e42f671d6e1e5cac6cd921cdf93e175400335cb6e9ae5b1bf8101dc0805838f3c5bf9713b891c62960c80a1a20aef1e4f896a74af97a01
+DIST lutris_0.5.7.tar.xz 2133524 BLAKE2B d27191668f582a5cd50941ca227d6121f1bfdb4824c490dd54cc513fda523712af9480451b0e5503404aba8d083c94ce91b928ed3faf4e94ea9f0bbf28b764c1 SHA512 f751be82dd5550dc882932980a3a04a62f183e5f0dddc9939154025408da081392917834324875a80ae8b354906e04835c2df56c23f1d6d29cd9fbdc514e1c57
 EBUILD lutris-0.5.4-r1.ebuild 1733 BLAKE2B 422b817e46728f91d3f29d174805ab1f9b67507f01b212f4cd718693233442916b14601674a0a810198664dbb38b576a92d301aaadf5efdc595b0a51a6e7cdd8 SHA512 9ab2a5639c616eed52fcc6b4f4c44b21d636ee69f26b513bf5d8c00b1e76ca2ea5893fddfe0c52bdcc014e2c55e27807ef803fdee9264920fbdbd44da64de099
 EBUILD lutris-0.5.6.ebuild 1733 BLAKE2B e0f31609f27985611319f20a17e9682ad9d8e8a459a1ed8931c05d9b06edc0670c744495b466ad3ebbf30079714133145f19e565a5080ad89ee869d6663debc7 SHA512 0d680960e81565d3e4fe3a4117d236b0e528834fa3c9b21c596a66067bce7122fc9b7a1880b2a68b689abd4943ab0f9aaa87d0a1d7ede1dcfd0f2707f0308390
-EBUILD lutris-9999.ebuild 1733 BLAKE2B e0f31609f27985611319f20a17e9682ad9d8e8a459a1ed8931c05d9b06edc0670c744495b466ad3ebbf30079714133145f19e565a5080ad89ee869d6663debc7 SHA512 0d680960e81565d3e4fe3a4117d236b0e528834fa3c9b21c596a66067bce7122fc9b7a1880b2a68b689abd4943ab0f9aaa87d0a1d7ede1dcfd0f2707f0308390
+EBUILD lutris-0.5.7.ebuild 1735 BLAKE2B 5143d74bf601ca931d6e0e10c58d3f17899d85d60507c31495d768d1c940672f2f33136a808d1576370665a27da1ade4a8bab3b7b297191309631ae568eb960e SHA512 28644fd969ec62347a1c61c8583911e3d1e30ef14f6306c8b336eeb0e6b00011e850c9a68290ef8cb9259a4c154109068e162bbfaa4afab6807a4bfea00cbe0e
+EBUILD lutris-9999.ebuild 1735 BLAKE2B 5143d74bf601ca931d6e0e10c58d3f17899d85d60507c31495d768d1c940672f2f33136a808d1576370665a27da1ade4a8bab3b7b297191309631ae568eb960e SHA512 28644fd969ec62347a1c61c8583911e3d1e30ef14f6306c8b336eeb0e6b00011e850c9a68290ef8cb9259a4c154109068e162bbfaa4afab6807a4bfea00cbe0e
 MISC metadata.xml 661 BLAKE2B 8b05694fe3755a3b2b1546c1392bccb408d99f430c361e6058702107d665b13e0d36834d37c2a31ab7065290363e6af7712fcf4b36542222b59e47b508b7d1ef SHA512 e5d7a7023e9aa025d8d526457ba61ec9d9ceadf472d3f04f6b799cb3c130543e4300a56ce1830c163650f0554e2a87d705152b3771bb4f7fd9edeba3db16b9a7
diff --git a/games-util/lutris/lutris-0.5.7.ebuild b/games-util/lutris/lutris-0.5.7.ebuild
new file mode 100644
index 000000000000..11cbc20a4482
--- /dev/null
+++ b/games-util/lutris/lutris-0.5.7.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="sqlite,threads(+)"
+
+inherit distutils-r1 virtualx xdg
+
+DESCRIPTION="An open source gaming platform for GNU/Linux"
+HOMEPAGE="https://lutris.net/"
+
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="https://github.com/lutris/lutris.git"
+	inherit git-r3
+else
+	SRC_URI="https://lutris.net/releases/${P/-/_}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PN}"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+RDEPEND="
+	app-arch/cabextract
+	app-arch/p7zip
+	app-arch/unrar
+	app-arch/unzip
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/python-evdev[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	gnome-base/gnome-desktop:3[introspection]
+	media-sound/fluid-soundfont
+	net-libs/libsoup
+	net-libs/webkit-gtk:4[introspection]
+	x11-apps/mesa-progs
+	x11-apps/xgamma
+	x11-apps/xrandr
+	x11-libs/gtk+:3[introspection]
+	x11-libs/libnotify
+"
+
+python_install_all() {
+	local DOCS=( AUTHORS README.rst docs/installers.rst )
+	distutils-r1_python_install_all
+}
+
+python_test() {
+	virtx nosetests -v
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	# Quote README.rst
+	elog "Lutris installations are fully automated through scripts, which can"
+	elog "be written in either JSON or YAML. The scripting syntax is described"
+	elog "in ${EROOT}/usr/share/doc/${PF}/installers.rst.bz2, and is also"
+	elog "available online at lutris.net."
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+}
diff --git a/games-util/lutris/lutris-9999.ebuild b/games-util/lutris/lutris-9999.ebuild
index ba12e0718246..11cbc20a4482 100644
--- a/games-util/lutris/lutris-9999.ebuild
+++ b/games-util/lutris/lutris-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="sqlite,threads(+)"
 
 inherit distutils-r1 virtualx xdg
diff --git a/games-util/nml/Manifest b/games-util/nml/Manifest
index 95cf881bd23f..98a063f12a66 100644
--- a/games-util/nml/Manifest
+++ b/games-util/nml/Manifest
@@ -1,6 +1,9 @@
 AUX nml-0.4.4-pillow3.patch 288 BLAKE2B 5d1446821d75432002a36439c6e39fa7f644f9a63be0da178c33287893fe65637d6ce66aa55df916227636cb8e0228a08e363a0b682b02dc63823a671b50849c SHA512 cdb6113102fadbf3b3d9cab930b15cfd88d609c9bb09048a3fb247051169933a0796c10d0c29b9d6bf9320ddcf73a4681255d8e1465a7a98268029d3433ba524
 AUX nml-0.4.5-pillow6.patch 981 BLAKE2B 56e1f6ed41a6978a021db50880092fed7199d104cd006962a54fb09bcba365a320cac878041b4fe6ee6a6801a2c7e666154105a4dd2b349f030b62da9669d1fe SHA512 de304562bb2ef90b9068a1975a3cb5fd83a9b5e473371f87620fe5a02866b805adba37b46c8c1b40a7a6d304d5c8339ee78ee4a87d683c540126e5fc3ea49303
 AUX nml-0.4.5-pillow7.patch 1381 BLAKE2B 8099d451f7bf93fb5b996335852103751b024a47b5b24c054cf77708d6deea6002a053bf92aa245d63ea52bca710620598e6d6544739c0c01d64bf9c0f7938dd SHA512 7dd7a60391a4e316273243468c18d30b7b674c241e3c0fb2a24c3559b0dfbc7a2f3d67baf8b5cda9ec419a7dc1f2a1c0942cdd9d1beedebaeafef76111c4fd19
+AUX nml-0.4.5-python38.patch 1275 BLAKE2B 07fd6888dbc77fe9f0005b524381e35cd80ee108da84b6bcff3f610237e8a72e6c08e5ddc21690edbf5dde3bfeb4357ed013dfcd62cada98c6c8bdbb663c7957 SHA512 0946fa8ce28ed803a85e85f78dd2f25103500147c5fc90d23fcb4bf13bdbe4ff8742d2771cf896772c635ea38309d6e65ee49f98f7fb57f22addda9f7725881d
 DIST nml-0.4.5.tar.gz 378578 BLAKE2B 1283cdcabd4cbaf12dda926b89c88a3942e9e4469879812abe372facd2c41ff20af0df792bbdadf71d9d3ad8d72e98e293fd903c880e77d3e4ee8a1b73e36ca9 SHA512 64b2f46a1c2e37fce8f51231094e30334f368b0db39c6a3977a144a798d8034d1abbe7c14af3921eb81f4b7caa193e7e53ccb9e27acd113e0407926b109ca952
-EBUILD nml-0.4.5-r2.ebuild 798 BLAKE2B cd95acb191dba0e912fccfb6b6a9847c1c9c80c3e071fdb3654b4593ff486429861fff51765aca9d7784b56f828d9af567ca6940934cebbf0e61277f5b406461 SHA512 f53d919219266fa156cfa0f58ae278115cefa231c1aa83cd8b94ee1d60d5946671c6c61f305bebcb109a68f9be1bddb60a77d555c0d877e6b9cfe6c4c2e9c4d8
+DIST nml-0.5.2.tar.gz 531460 BLAKE2B 02f4e4a190bca0e46380c9075b769ea1925f3eaf655a2f09b8367890d4b9d0494dda9246f144bb735ef27906fcf22a198530fecc5c92e77f1b72f8a73832625e SHA512 edcada26ad011533065f3096b708b343ed6af742968606d187f01298e09f945904e2eba96fc8b37d88e243e7fd4bc6efdc8be614acbec199b06778ee32b5fc3b
+EBUILD nml-0.4.5-r3.ebuild 840 BLAKE2B f69aa3c9135726184e3aa5e1142c431fe13e70e3f4b86510a092f35770e597ce794710aac3d9f712eb33cd63df5820dbc90ba256d6f70d8ec51fe9a988c819fb SHA512 87801e6d5dd7a0e1986a007f00794a2e99db6b1257ab9cfabc056572b4578cf66d856e4d58672085a24f6e0c25b250a0ce859cac4e7e004e2dc4bedb3a394fa3
+EBUILD nml-0.5.2.ebuild 654 BLAKE2B 49381ca954c092faebd4331c620aef547d4479d80e88f2ba05280c39b9e1582dfd93a56ddbb2f216cd4a9267ce513827136203b5d469392928f8c9d7c01742dc SHA512 bc3b177bda53e1d0c85ac97511f7c401908af4791989ca655759c1e5946ae3d128385245ec7fa95b1a70f2bde03d116192b2d3e72656623c52129a28fc201656
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-util/nml/files/nml-0.4.5-python38.patch b/games-util/nml/files/nml-0.4.5-python38.patch
new file mode 100644
index 000000000000..526a2e19f262
--- /dev/null
+++ b/games-util/nml/files/nml-0.4.5-python38.patch
@@ -0,0 +1,37 @@
+From 5b8764c3c4079941fab7be8d9086c38a88ae09ba Mon Sep 17 00:00:00 2001
+From: glx22 <glx22@users.noreply.github.com>
+Date: Sun, 20 Oct 2019 11:05:25 +0200
+Subject: [PATCH] Fix #52: time.clock() has been removed in python 3.8 (#53)
+
+---
+ nml/generic.py | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/nml/generic.py b/nml/generic.py
+index ce064b6c..8ee602f1 100644
+--- a/nml/generic.py
++++ b/nml/generic.py
+@@ -295,7 +295,7 @@ def clear_progress():
+     hide_progress()
+ 
+     if (progress_message is not None) and (verbosity_level >= VERBOSITY_TIMING):
+-        print("{} {:.1f} s".format(progress_message, time.clock() - progress_start_time))
++        print("{} {:.1f} s".format(progress_message, time.process_time() - progress_start_time))
+ 
+     progress_message = None
+     progress_start_time = None
+@@ -324,12 +324,12 @@ def print_progress(msg, incremental = False):
+     progress_message = msg
+ 
+     if incremental:
+-        t = time.clock()
++        t = time.process_time()
+         if (progress_update_time is not None) and (t - progress_update_time < 1):
+             return
+         progress_update_time = t
+     else:
+-        progress_start_time = time.clock()
++        progress_start_time = time.process_time()
+ 
+     print_eol(msg)
+ 
diff --git a/games-util/nml/nml-0.4.5-r2.ebuild b/games-util/nml/nml-0.4.5-r3.ebuild
index 7627ddc1e890..3588cfc60e87 100644
--- a/games-util/nml/nml-0.4.5-r2.ebuild
+++ b/games-util/nml/nml-0.4.5-r3.ebuild
@@ -31,6 +31,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-0.4.4-pillow3.patch
 	"${FILESDIR}"/${PN}-0.4.5-pillow6.patch
 	"${FILESDIR}"/${PN}-0.4.5-pillow7.patch
+	"${FILESDIR}"/${PN}-0.4.5-python38.patch
 )
 
 src_install() {
diff --git a/games-util/nml/nml-0.5.2.ebuild b/games-util/nml/nml-0.5.2.ebuild
new file mode 100644
index 000000000000..e7fcb7a0ff99
--- /dev/null
+++ b/games-util/nml/nml-0.5.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Compiler of NML files into GRF/NFO files"
+HOMEPAGE="https://github.com/OpenTTD/nml"
+SRC_URI="https://github.com/OpenTTD/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND="
+	dev-python/pillow[zlib,${PYTHON_USEDEP}]
+	dev-python/ply[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}"
+
+DOCS=( "README.md" "docs/changelog.txt" )
+
+src_install() {
+	distutils-r1_src_install
+
+	doman docs/nmlc.1
+}
diff --git a/games-util/pyfa/Manifest b/games-util/pyfa/Manifest
index e84f9e2a23c5..48d7b4715110 100644
--- a/games-util/pyfa/Manifest
+++ b/games-util/pyfa/Manifest
@@ -1,11 +1,9 @@
 AUX configforced-1.15.1.py 153 BLAKE2B 135edf54e69c985693bcdde747eba5e46f7ed1390a77e1a1d40c0a624f3605c3ec8dad2f3526cbd8f406ed39fc67d3b027b7e7e462bbfa48c5649c71f0692da6 SHA512 632576b9fbff3e93c26b6c2d4be74298aa8657affe82d2c5d571a645d733a7b96d5db6b89b819d3aec9ca68e4bef11e368f7c1cbac416e9bfed88a1025a46bfe
 AUX pyfa-2.9.3-import-pyfa.patch 666 BLAKE2B 13b67511a64be93335453b617e1fad56768c9c582da4ebbef36b4848aca225220e2057c0fab088a060cc2149aed961f2063a1a34326b71f0cf3bb411105a77a7 SHA512 a0174726777d82229dcd167b005e176012a9c4398f066f183bf0b8d59bd1854411e74bca1c3848396a8c50be327c8ec4e21dde6d56d045b2af4cd13a68e0cc99
 AUX pyfa.desktop 155 BLAKE2B bccfc81c4bc7dd9099ac4bd11fdb0d5f8d72b53b5dc8a700147e7e5996b14aac9e4b46e2884a473ecc8d8b1f49305e66c46cbc7e6c5e43e93e5a3fa71c5efa08 SHA512 d62a44e4e724057581a360cc1eb10aa4c7a0c50cb1d95137e58ba14db17644c852da2582be8d508c50b7359e7f99dc893d78d15cb11c46967a9b7896ff667781
-DIST pyfa-2.20.3.tar.gz 11835182 BLAKE2B 0a298f565317a4a8894fda64dc01175080bf2d6b3d118168f0015dee5988742ddca4170faa72565e5b08bbb66752668e081b142e8d8d19b5fea019dc874e5306 SHA512 0971da1b3f6db6c8e4a0d5b24c5a7f267bbf10531ea0cf98263e779c86cbea419a783088f37a7f5d2b18b7f498f525d5c80724ebaf2cff1ae1e5290e2fac5704
-DIST pyfa-2.21.0.tar.gz 11876753 BLAKE2B 104dd1da117f014ff28f745cb5c89a77b7f6fdf850ba70fcbfef9d9f5d49ad053939baf356b12962dec9e32b746cd1a2b617937522dddabcaf06bc3a9c18d3bc SHA512 11ccbd1e89429176a5da24bd8bb5c896e43d78ac92b49c5374f8449cd9ade0fdb3c7370c5abe5860d7be92b7bf24b9557720f2c0c55073adc74eb517de512a4b
-DIST pyfa-2.22.0.tar.gz 12627989 BLAKE2B 4070354dfbfee2a49fb1b4580c22d16320fd98f911bb2f69342d61bfdbf41e3b94d90ca3559f9e44ebdd1c784322d1bc6d9b14248cd05948a9e932bfcda3c585 SHA512 dc2ee166cdf385f322faee43252ebb09afc2c4ba4d9cbd9438bef0aeba0cf33d425bab887165992d1597bed9dfa8e40fcc776821d4075b91001bec4385db0563
-EBUILD pyfa-2.20.3.ebuild 2779 BLAKE2B 595cf7f51ce45295cbafef1c04a3723d0169559ec2ebbb859438cf37b748fecba045efcbd2100d3b25d91a183534cddbd2eeab842ab3a4044c0b482944426a84 SHA512 8f6f75ab154529c62947732a8d829d6a5d1210209f98e9e41683b23a8ec36a6461e5b339c0f6cdec2c198dc55b52e0c84aabe3b630c19a03db1e9b6785970eed
-EBUILD pyfa-2.21.0.ebuild 2779 BLAKE2B 595cf7f51ce45295cbafef1c04a3723d0169559ec2ebbb859438cf37b748fecba045efcbd2100d3b25d91a183534cddbd2eeab842ab3a4044c0b482944426a84 SHA512 8f6f75ab154529c62947732a8d829d6a5d1210209f98e9e41683b23a8ec36a6461e5b339c0f6cdec2c198dc55b52e0c84aabe3b630c19a03db1e9b6785970eed
-EBUILD pyfa-2.22.0.ebuild 2736 BLAKE2B 07514287b38574103cd7a544746ed6239200c5d87fb6a4bb01c54924d905e83d73845db97b9abbde2645d7624f74c79c4f059196f98074e01fc8ae6fdcf77e83 SHA512 52d49bc2495ace6ac45d1fd19950b196dd04f63376f3b02e4abec3a983bd7dc32e55192abc25d8ff8f6dcb645d214ee5faa81e858d3851e06aeda25bfd4d9270
+DIST pyfa-2.22.1.tar.gz 12629381 BLAKE2B acec4f0f495a7abd78a663435b0a049f8be37320abea0d916c6a8f38b75c1f07683b60c9e20b8feb0533fdcfc881ac3069c87e8360be52f05afce63334ff1baa SHA512 98c84c3806d8ff632ebe9c1386f8b407f310ff58b0963406093dc9297faaf690a90b34387013f59c76fdd87055ecf8736b449f99131aaf9eb497970a4ee003b2
+DIST pyfa-2.24.1.tar.gz 12648921 BLAKE2B 5715d81144df32cad83eb21d7f8800eb9773139e9305402a5096c585362fcabd0d705529a8887a8c8092637b8348d2a7e8a77e1f6eb362fd83ea39a86203ccb4 SHA512 ffe8a6e9c9c9b593516d9ba76ccb9e69788124132de642f45f5527468645d46f75e4c2388bb5f01788eb85f3e535ade110cfffc92c2943d96f477b5652528328
+EBUILD pyfa-2.22.1.ebuild 2736 BLAKE2B 07514287b38574103cd7a544746ed6239200c5d87fb6a4bb01c54924d905e83d73845db97b9abbde2645d7624f74c79c4f059196f98074e01fc8ae6fdcf77e83 SHA512 52d49bc2495ace6ac45d1fd19950b196dd04f63376f3b02e4abec3a983bd7dc32e55192abc25d8ff8f6dcb645d214ee5faa81e858d3851e06aeda25bfd4d9270
+EBUILD pyfa-2.24.1.ebuild 2736 BLAKE2B 07514287b38574103cd7a544746ed6239200c5d87fb6a4bb01c54924d905e83d73845db97b9abbde2645d7624f74c79c4f059196f98074e01fc8ae6fdcf77e83 SHA512 52d49bc2495ace6ac45d1fd19950b196dd04f63376f3b02e4abec3a983bd7dc32e55192abc25d8ff8f6dcb645d214ee5faa81e858d3851e06aeda25bfd4d9270
 EBUILD pyfa-9999.ebuild 2736 BLAKE2B 07514287b38574103cd7a544746ed6239200c5d87fb6a4bb01c54924d905e83d73845db97b9abbde2645d7624f74c79c4f059196f98074e01fc8ae6fdcf77e83 SHA512 52d49bc2495ace6ac45d1fd19950b196dd04f63376f3b02e4abec3a983bd7dc32e55192abc25d8ff8f6dcb645d214ee5faa81e858d3851e06aeda25bfd4d9270
 MISC metadata.xml 744 BLAKE2B b87f7086163bc63184cbc2ccae8d5db50dd7133d70dd1c737b8c7c180c3069550eb0eb4e216133236d62edfa066fcb7eded8702e16b17360230434a366d5d8ea SHA512 d52dc69cc53d2c6a6fffa3c8c097c74f6d6657d0cbb135bdb5bd9fb9e13a56c7b13deed6eec55d7a88617392543ea2a3a2a29d7c35140765a0f8a04b84b919c6
diff --git a/games-util/pyfa/pyfa-2.21.0.ebuild b/games-util/pyfa/pyfa-2.21.0.ebuild
deleted file mode 100644
index 254447e150c8..000000000000
--- a/games-util/pyfa/pyfa-2.21.0.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="sqlite"
-
-inherit desktop eutils python-single-r1 xdg-utils
-
-DESCRIPTION="Python Fitting Assistant - a ship fitting application for EVE Online"
-HOMEPAGE="https://github.com/pyfa-org/Pyfa"
-
-LICENSE="GPL-3+ all-rights-reserved"
-SLOT="0"
-if [[ ${PV} = 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/pyfa-org/Pyfa.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/pyfa-org/Pyfa/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/Pyfa-${PV}"
-fi
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="mirror bindist"
-
-DEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/cryptography-2.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/logbook-1.0.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pyyaml-5.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/sqlalchemy-1.3.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/wxpython-4.0.4[webkit,${PYTHON_MULTI_USEDEP}]
-	')
-	${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep '
-		>=dev-python/beautifulsoup-4.6.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/markdown2-2.3.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/packaging-16.8[${PYTHON_MULTI_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/requests-2.0.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/roman-2.0.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/matplotlib-3.1.2[wxwidgets,${PYTHON_MULTI_USEDEP}]
-		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-	')"
-BDEPEND="app-arch/zip"
-
-PATCHES=(
-	# fix import path in the main script for systemwide installation
-	"${FILESDIR}/${PN}-2.9.3-import-pyfa.patch"
-)
-
-src_prepare() {
-	# get rid of CRLF line endings introduced in 1.1.10 so patches work
-	edos2unix config.py pyfa.py gui/bitmap_loader.py service/settings.py
-
-	default
-
-	# make python recognize pyfa as a package
-	touch __init__.py || die
-
-	sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
-		-e "s:%%EPREFIX%%:${EPREFIX}:" \
-		"${FILESDIR}/configforced-1.15.1.py" > configforced.py || die
-	sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
-		pyfa.py > pyfa || die
-}
-
-src_install() {
-	python_moduleinto ${PN}
-	python_domodule eos gui service utils graphs
-	python_domodule config*.py __init__.py version.yml configforced.py db_update.py
-	python_doscript pyfa
-
-	insinto /usr/share/${PN}
-
-	einfo "Creating database ..."
-	python ./db_update.py || die
-	doins eve.db
-
-	einfo "Compressing images ..."
-	pushd imgs > /dev/null || die
-	zip -r imgs.zip * || die "zip failed"
-	doins imgs.zip
-	popd > /dev/null || die
-
-	dodoc README.md
-	doicon -s 32 imgs/gui/pyfa.png
-	newicon -s 64 imgs/gui/pyfa64.png pyfa.png
-	domenu "${FILESDIR}/${PN}.desktop"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/games-util/pyfa/pyfa-2.22.0.ebuild b/games-util/pyfa/pyfa-2.22.1.ebuild
index 00faae6993c0..00faae6993c0 100644
--- a/games-util/pyfa/pyfa-2.22.0.ebuild
+++ b/games-util/pyfa/pyfa-2.22.1.ebuild
diff --git a/games-util/pyfa/pyfa-2.20.3.ebuild b/games-util/pyfa/pyfa-2.24.1.ebuild
index 254447e150c8..00faae6993c0 100644
--- a/games-util/pyfa/pyfa-2.20.3.ebuild
+++ b/games-util/pyfa/pyfa-2.24.1.ebuild
@@ -31,19 +31,18 @@ DEPEND="
 		>=dev-python/logbook-1.0.0[${PYTHON_MULTI_USEDEP}]
 		>=dev-python/pyyaml-5.1[${PYTHON_MULTI_USEDEP}]
 		>=dev-python/sqlalchemy-1.3.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/wxpython-4.0.4[webkit,${PYTHON_MULTI_USEDEP}]
+		>=dev-python/wxpython-4.0.6[webkit,${PYTHON_MULTI_USEDEP}]
 	')
 	${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
 	$(python_gen_cond_dep '
 		>=dev-python/beautifulsoup-4.6.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/markdown2-2.3.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/markdown2-2.3.5[${PYTHON_MULTI_USEDEP}]
 		>=dev-python/packaging-16.8[${PYTHON_MULTI_USEDEP}]
 		dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
 		>=dev-python/requests-2.0.0[${PYTHON_MULTI_USEDEP}]
 		>=dev-python/roman-2.0.0[${PYTHON_MULTI_USEDEP}]
 		>=dev-python/matplotlib-3.1.2[wxwidgets,${PYTHON_MULTI_USEDEP}]
-		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
 	')"
 BDEPEND="app-arch/zip"