gentoo resync : 14.05.2020

3 files changed, 110 insertions, 6 deletions

diff --git a/games-util/pyfa/Manifest b/games-util/pyfa/Manifest
index 445d603e303c..aba03e49da66 100644
--- a/games-util/pyfa/Manifest
+++ b/games-util/pyfa/Manifest
@@ -5,9 +5,11 @@ DIST pyfa-2.17.0.tar.gz 12348275 BLAKE2B fd670a6d34760285561ed07e82c3c54eb9a74ca
 DIST pyfa-2.19.0.tar.gz 11822419 BLAKE2B 7aaa9d8fc7de7ab9fb246bdf1dd61aa4aac6035d37cc6ecf9e32b03e67baada7d3dc765d02a7d9ed75f5933ccd76f92c4ae79c822c0562f8658dd1b52dfdba4d SHA512 5083f125cfd7f5d32e76029a836089cb79c5c6c93397712d37054518ed9bd77092d0c610cecdb1d0afce40753276431cdec72699ffc04088162158b55c04bac8
 DIST pyfa-2.20.1.tar.gz 11834967 BLAKE2B 6caf4abb5ff543aa0dc4747a853775a03e20fe8fce5f174d791429ad021ecf955895e108127182f1872f23ccad862892a1afa2e22af27aafd198100604993d62 SHA512 6e6e04f9cd6e3dd127d51c666cf88eb700cc783b02d0b31220196925bc64bb1d88ea2c6a36bc45d71ba62cc53074bd509b46edd175f02e7b1fc736af13ce41ef
 DIST pyfa-2.20.2.tar.gz 11835308 BLAKE2B 3482ba068720ca735a5f794ede38dffda61ff571552c57a268263820b5b9085c6059be64c739d4ce67a9c95a1c4ba44136cb6aaa2ee7454514924e8c2de7e128 SHA512 14066b81ae77e600367255fa9ba079192f79a8d01d0194b894ba616d7a225e58141b9c2b980e99bfdf17403e665d1968e62a805f845c5065f8ed47de7950e44c
+DIST pyfa-2.20.3.tar.gz 11835182 BLAKE2B 0a298f565317a4a8894fda64dc01175080bf2d6b3d118168f0015dee5988742ddca4170faa72565e5b08bbb66752668e081b142e8d8d19b5fea019dc874e5306 SHA512 0971da1b3f6db6c8e4a0d5b24c5a7f267bbf10531ea0cf98263e779c86cbea419a783088f37a7f5d2b18b7f498f525d5c80724ebaf2cff1ae1e5290e2fac5704
 EBUILD pyfa-2.17.0.ebuild 2786 BLAKE2B 2504240e044dac7512c17b6f776a0f3aaf96c662e5a5927f12193e62ee6db614e66f8e7fcd592f1b91429ec77684f3c1770b825fe9c5e0121e33dc94e73bdff2 SHA512 25067ab2c303fc14640291184735387509f65f16a55f819d7f0270ad8ff039ab50d45044235330ee7c0652ec9154fadf19e9f7cd426c821987ceb49e38d3bda9
 EBUILD pyfa-2.19.0.ebuild 2781 BLAKE2B bb6b40555f93f98accc153b9be2c3eba2bcaab6b3f35629110e61f91f5f2475a3a217a69e3f976031410e2aa87f0efaf22807b69b065567bb791dfa2c94198d9 SHA512 96cf37416bf74db7dddaedb0e02d06aa471cb80a7fcd3329be8afdd9be79b709d9616c587d80c0951c8e584194df14bc0acfa4af94d063c4257dec2de861da10
 EBUILD pyfa-2.20.1.ebuild 2781 BLAKE2B bb6b40555f93f98accc153b9be2c3eba2bcaab6b3f35629110e61f91f5f2475a3a217a69e3f976031410e2aa87f0efaf22807b69b065567bb791dfa2c94198d9 SHA512 96cf37416bf74db7dddaedb0e02d06aa471cb80a7fcd3329be8afdd9be79b709d9616c587d80c0951c8e584194df14bc0acfa4af94d063c4257dec2de861da10
 EBUILD pyfa-2.20.2.ebuild 2781 BLAKE2B bb6b40555f93f98accc153b9be2c3eba2bcaab6b3f35629110e61f91f5f2475a3a217a69e3f976031410e2aa87f0efaf22807b69b065567bb791dfa2c94198d9 SHA512 96cf37416bf74db7dddaedb0e02d06aa471cb80a7fcd3329be8afdd9be79b709d9616c587d80c0951c8e584194df14bc0acfa4af94d063c4257dec2de861da10
-EBUILD pyfa-9999.ebuild 2786 BLAKE2B 2504240e044dac7512c17b6f776a0f3aaf96c662e5a5927f12193e62ee6db614e66f8e7fcd592f1b91429ec77684f3c1770b825fe9c5e0121e33dc94e73bdff2 SHA512 25067ab2c303fc14640291184735387509f65f16a55f819d7f0270ad8ff039ab50d45044235330ee7c0652ec9154fadf19e9f7cd426c821987ceb49e38d3bda9
+EBUILD pyfa-2.20.3.ebuild 2779 BLAKE2B 595cf7f51ce45295cbafef1c04a3723d0169559ec2ebbb859438cf37b748fecba045efcbd2100d3b25d91a183534cddbd2eeab842ab3a4044c0b482944426a84 SHA512 8f6f75ab154529c62947732a8d829d6a5d1210209f98e9e41683b23a8ec36a6461e5b339c0f6cdec2c198dc55b52e0c84aabe3b630c19a03db1e9b6785970eed
+EBUILD pyfa-9999.ebuild 2779 BLAKE2B 595cf7f51ce45295cbafef1c04a3723d0169559ec2ebbb859438cf37b748fecba045efcbd2100d3b25d91a183534cddbd2eeab842ab3a4044c0b482944426a84 SHA512 8f6f75ab154529c62947732a8d829d6a5d1210209f98e9e41683b23a8ec36a6461e5b339c0f6cdec2c198dc55b52e0c84aabe3b630c19a03db1e9b6785970eed
 MISC metadata.xml 744 BLAKE2B b87f7086163bc63184cbc2ccae8d5db50dd7133d70dd1c737b8c7c180c3069550eb0eb4e216133236d62edfa066fcb7eded8702e16b17360230434a366d5d8ea SHA512 d52dc69cc53d2c6a6fffa3c8c097c74f6d6657d0cbb135bdb5bd9fb9e13a56c7b13deed6eec55d7a88617392543ea2a3a2a29d7c35140765a0f8a04b84b919c6
diff --git a/games-util/pyfa/pyfa-2.20.3.ebuild b/games-util/pyfa/pyfa-2.20.3.ebuild
new file mode 100644
index 000000000000..254447e150c8
--- /dev/null
+++ b/games-util/pyfa/pyfa-2.20.3.ebuild
@@ -0,0 +1,101 @@
+# 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-9999.ebuild b/games-util/pyfa/pyfa-9999.ebuild
index 145ca005c0d1..254447e150c8 100644
--- a/games-util/pyfa/pyfa-9999.ebuild
+++ b/games-util/pyfa/pyfa-9999.ebuild
@@ -2,8 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="sqlite,threads"
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="sqlite"
 
 inherit desktop eutils python-single-r1 xdg-utils
 
@@ -18,9 +19,9 @@ if [[ ${PV} = 9999 ]]; then
 else
 	SRC_URI="https://github.com/pyfa-org/Pyfa/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
-	S=${WORKDIR}/Pyfa-${PV}
+	S="${WORKDIR}/Pyfa-${PV}"
 fi
-IUSE=""
+
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="mirror bindist"
 
@@ -49,7 +50,7 @@ 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