gentoo resync : 29.12.2022

3 files changed, 7 insertions, 100 deletions

diff --git a/games-util/pyfa/Manifest b/games-util/pyfa/Manifest
index f798bec58257..ed30b0029a22 100644
--- a/games-util/pyfa/Manifest
+++ b/games-util/pyfa/Manifest
@@ -1,9 +1,7 @@
 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.33.0.tar.gz 28872031 BLAKE2B fe7fad57e43a8efc78f828d0ff81788147fa64ef02a20a71d6fef8ab0130d39b5ebffc18d58a774a61d805b8d0e570cbedb0b8fa536c8c71e61102fb6d093998 SHA512 bfa4e41b387e9f23aeae41a4884a0492316cc6e51841243ef56dc733edab10e6c9609ca7918d4de9fcd052b4da8f8048ce7578d164ad98237b53cb05f7c168d8
-DIST pyfa-2.37.0.tar.gz 29991827 BLAKE2B d2dd51becc037176ef0e4394799d6d35ea5025b4b9aba7a1e2a12d908b1d8d9a436d2e2b2e9d06b3592ea2276b3dfe24c639d02cd77fe25a6ea673d9f048a238 SHA512 e3ccee3ee3b74644f208afdf719bf1e3dc29335041e3cdd19b5742f51e1fbb0fcab2376c26fc789e7992d1f35215c128bf6480860a0eea75eeb69c9b466ba1cf
-EBUILD pyfa-2.33.0.ebuild 2627 BLAKE2B 67af875c3c233f08b4b70e2597fd44f07d256672610ad9925603ea6f04d857317c2880b85d1827b72ae7c04a175723361692aa0547064db232a7af5d6ad80caa SHA512 301908cd18992a20c324266921eb45c7932b7cfa869d6c9466bb4cf77c5abe6f2860044c3145ae214689b274d3d96d6d8a37e4cf0ddbef07cca9fc1dc3ea32f8
-EBUILD pyfa-2.37.0.ebuild 2627 BLAKE2B e2814731753c6c468916830993c6a1937aff33ab1f374c45511e37af7fd613fe7c47d22b538574aa1f5958eefa856c4af7fe8f67ac1b9be57674a0f08785896b SHA512 c1a47119da6bdd57fe2ce5c87f089da24fe87b898d9eb9406956982d45c2199061ea572e4dc4ed33a0ef414893fc338f4f37127b3fd926d35b69bfa13eafb631
+DIST pyfa-2.43.0.tar.gz 31776698 BLAKE2B 819596e670b62dad4a10edbb49f5b93e5b0d53b1976b6c1f3272731f5769897ec6f12ae681f6503966de2d91d31dc0ee5d5c8ce0cd34354279dc71a6ae20996f SHA512 847ed7b9590103b2d49fa1e60d5162c800c58a94be20bd67bb10aa0b9e2957db987464bec9941feed27b61fd49d38e6c4171d932a5450e317427a8ea54b4e890
+EBUILD pyfa-2.43.0.ebuild 2733 BLAKE2B 742fb98ce9aea88bd097bb5ccfd8d7fa9f2815d3ed7277aafc06384710380d65eb0a437173b8db5030681b006fd9e715d8cf3b22ef9ea94a13f07d95f58b398e SHA512 d671f922d7ca3f9b7d558e1276c1894619766e847f5d4f88efe728dbec41aa339b3511d86d1f87bc63f3ea92b0771dda8c232cb3e128bfad87f1c1c995610e22
 EBUILD pyfa-9999.ebuild 2627 BLAKE2B 67af875c3c233f08b4b70e2597fd44f07d256672610ad9925603ea6f04d857317c2880b85d1827b72ae7c04a175723361692aa0547064db232a7af5d6ad80caa SHA512 301908cd18992a20c324266921eb45c7932b7cfa869d6c9466bb4cf77c5abe6f2860044c3145ae214689b274d3d96d6d8a37e4cf0ddbef07cca9fc1dc3ea32f8
 MISC metadata.xml 775 BLAKE2B 263cdaa1ca901b306a3efd828ed9ff7abf06dc97f00e03355ae2df3bb1979e87e33ff0050e0681d74056d1ff4e5fb8b268393e28401d3d5a798b34756545a079 SHA512 9eec729a2954ec206f385853b1d00871fd18addaed0b386888bb6509497441d29f38474e0a1db9a22fd9ccf37408cc75084f66a07b2b0646ef76c28e42dcacdb
diff --git a/games-util/pyfa/pyfa-2.33.0.ebuild b/games-util/pyfa/pyfa-2.33.0.ebuild
deleted file mode 100644
index 1bf3c9464b03..000000000000
--- a/games-util/pyfa/pyfa-2.33.0.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE="sqlite"
-
-inherit desktop edos2unix python-single-r1 xdg
-
-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_USEDEP}]
-		>=dev-python/logbook-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/wxpython-4.0.6[webkit,${PYTHON_USEDEP}]
-	')
-	${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep '
-		>=dev-python/beautifulsoup4-4.6.0[${PYTHON_USEDEP}]
-		>=dev-python/markdown2-2.3.5[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.19.2[${PYTHON_USEDEP}]
-		>=dev-python/packaging-16.8[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/roman-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/matplotlib-3.1.2[wxwidgets,${PYTHON_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 ..."
-	${EPYTHON} ./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"
-}
diff --git a/games-util/pyfa/pyfa-2.37.0.ebuild b/games-util/pyfa/pyfa-2.43.0.ebuild
index b053388c505f..0487cf9afef8 100644
--- a/games-util/pyfa/pyfa-2.37.0.ebuild
+++ b/games-util/pyfa/pyfa-2.43.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 
 PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="sqlite"
@@ -30,7 +30,7 @@ DEPEND="
 		>=dev-python/cryptography-2.3[${PYTHON_USEDEP}]
 		>=dev-python/logbook-1.0.0[${PYTHON_USEDEP}]
 		>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.3.23[${PYTHON_USEDEP}]
 		>=dev-python/wxpython-4.0.6[webkit,${PYTHON_USEDEP}]
 	')
 	${PYTHON_DEPS}"
@@ -41,7 +41,9 @@ RDEPEND="${DEPEND}
 		>=dev-python/numpy-1.19.2[${PYTHON_USEDEP}]
 		>=dev-python/packaging-16.8[${PYTHON_USEDEP}]
 		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		>=dev-python/python-jose-3.0.1[${PYTHON_USEDEP}]
 		>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-cache-0.8.1[${PYTHON_USEDEP}]
 		>=dev-python/roman-2.0.0[${PYTHON_USEDEP}]
 		>=dev-python/matplotlib-3.2.2[wxwidgets,${PYTHON_USEDEP}]
 	')"