gentoo resync : 15.01.2020

3 files changed, 104 insertions, 7 deletions

diff --git a/games-util/pyfa/Manifest b/games-util/pyfa/Manifest
index c1ae3ebcda38..fc0fcce16c34 100644
--- a/games-util/pyfa/Manifest
+++ b/games-util/pyfa/Manifest
@@ -8,10 +8,12 @@ DIST pyfa-1.35.0.tar.gz 8743938 BLAKE2B 623a70ea8d28c41f94b5c54c3b8b57ddc6b6604f
 DIST pyfa-1.35.1.tar.gz 8746324 BLAKE2B f224f78c97f15d37e2276512541985bfd2ae80c031233261837cd142eddc16a853688a4f1f1f8684736f757d60fd57c41fb14987f336274b2284bd1de26239b3 SHA512 6da5e2d3351157f35c32c7b210d8bfb86a9dc2ea3a3df02449950c498ffabecff3a48fe38086dce75ec5a2cc2549dd28b474015edc0ea01c56a2ff58d1ba3f69
 DIST pyfa-1.37.0.tar.gz 8795428 BLAKE2B 33aa0159b41fe2f228be13788f4e91933205a1883af229ffa97af0816dbce307fa8ce9ebc53b335a99decb84f9a28e83b977daf3c600df1cdd0336ba2c413ba3 SHA512 21094a1c374a60447e38261762ee13cd212f6af5f8d757c8b626774fb5a10d10e99267da1311d3164664b62169edd2772519a7b4ebd7414db2493f5121df5c8c
 DIST pyfa-2.14.1.tar.gz 14452477 BLAKE2B e4c688cff14eecaa71f86fb9e22f6a585a3136a4bd7df65c8dd65ed82c2aa9e530210134daaba25251df92dc55a7e538474b39c1d54e4bcb1817eac17791d517 SHA512 d3d3219fa37f44c81d85165c7e780261e149b47db147417ea26edaff448484ce565607aded714a4f44ca23b8c1586c8597ace856020c4c319cea6d39f353b140
+DIST pyfa-2.15.1.tar.gz 14516568 BLAKE2B ba3b1170f35681ab33bece447b4bdf563c8f964037dc6b35cbd23360f7e36c61dd9074e34b5648c7a04b59ad192f5babd75ce2a935940a52e62de8cc174f7e5b SHA512 2d8fcb8608e31c135b8dac7239afe0a5acb0d32fba1291ce6ebafe093ef232c08f0aa42d172ebac5beefb7dba47aad9eb3833c679e3d02edc9cc056739c7538b
 EBUILD pyfa-1.34.0.ebuild 2727 BLAKE2B 854eea8248bcabaf285147ea2bff9a145c77669af83831e5f6dd868322c39dbd85499720475c56d4ec112bf422df67e6f36af0653e6fe47f31821b5b3f3b45f1 SHA512 96433c264f4fed3142e95588fd857d633ad5b8af45aa5c3ddbc209fdec557b9c91136f988e46156ba8e9e0b9ccb1f452a532d56dce4d3dd46227bfde16c4d2bb
 EBUILD pyfa-1.35.0.ebuild 2723 BLAKE2B 44f075f5f64e66b64d1321bc2f2c8c8c9449d3aef4d341eee193aa143e67d63cf63cf4921f36b62e5b2514a02f4ea6d28dbc5107a1a8badac060db6f5bb7ca18 SHA512 3bf1f7c0a706832f78c06e6f2547240e23e2ad38a3aa67ee40f4fa70cc17a191b09e3cf3b5d7eac142ffc0f231d3fdec7ed36c6c5842f681b7c99b49fed8d07f
 EBUILD pyfa-1.35.1.ebuild 2723 BLAKE2B 44f075f5f64e66b64d1321bc2f2c8c8c9449d3aef4d341eee193aa143e67d63cf63cf4921f36b62e5b2514a02f4ea6d28dbc5107a1a8badac060db6f5bb7ca18 SHA512 3bf1f7c0a706832f78c06e6f2547240e23e2ad38a3aa67ee40f4fa70cc17a191b09e3cf3b5d7eac142ffc0f231d3fdec7ed36c6c5842f681b7c99b49fed8d07f
 EBUILD pyfa-1.37.0.ebuild 2620 BLAKE2B 12c41fc600479dc183b8aa4475189d88490ac31c5f83c7fb1e513697608431fc6a669440b73050b4b1df9c971c7d1ba62580f0ffab9c87fa8c933174a59bec06 SHA512 8fd1ffa6c88ae81d524de60c156ef13bec4103b6965ff5034ef639b3be8463f1ecca23ca223427a489146fde5a3df924bfa6c298a478ef8818a941e27e219da2
 EBUILD pyfa-2.14.1.ebuild 2657 BLAKE2B a5df3021d46db87e386fd609bbc31de973d724995a8aa0493ed8960670a6b3e92704d9a5a7b1691cf95228d062bdd6638385fb2295c3b8e224a95574c1356599 SHA512 74a1637f9c86bacda4713e1ed1cced990f05a6d7aa0d34d62ee153ce197490d6f73c936a551ca68bc19ce4fe9b25fd32e4f7cc3239deaa734179190e96f707b2
-EBUILD pyfa-9999.ebuild 2657 BLAKE2B a5df3021d46db87e386fd609bbc31de973d724995a8aa0493ed8960670a6b3e92704d9a5a7b1691cf95228d062bdd6638385fb2295c3b8e224a95574c1356599 SHA512 74a1637f9c86bacda4713e1ed1cced990f05a6d7aa0d34d62ee153ce197490d6f73c936a551ca68bc19ce4fe9b25fd32e4f7cc3239deaa734179190e96f707b2
+EBUILD pyfa-2.15.1.ebuild 2637 BLAKE2B 15f7df9668597799c55c7d11d4537e0e2a46cceae8e75fc0a4db84148f3119c277a72e13437ffb6cffde95aa6fb3568de40339e54826e4b1650ba891fb76f0ee SHA512 d2c37266541e982b2398797b4e09b1864c4ec3abfc1756e56a90eab6a9c6e3ce841d7fb6da2373f67e8b4d354f4c79b723a60062fcd9ac83c9077df65d567d9a
+EBUILD pyfa-9999.ebuild 2637 BLAKE2B 15f7df9668597799c55c7d11d4537e0e2a46cceae8e75fc0a4db84148f3119c277a72e13437ffb6cffde95aa6fb3568de40339e54826e4b1650ba891fb76f0ee SHA512 d2c37266541e982b2398797b4e09b1864c4ec3abfc1756e56a90eab6a9c6e3ce841d7fb6da2373f67e8b4d354f4c79b723a60062fcd9ac83c9077df65d567d9a
 MISC metadata.xml 817 BLAKE2B 3756e4c4cd95064bfdfb74ffccbc1162b457e620cd4b99f1c4c04943443a83cec1a5642056f219dfc090c37a230dfadc07dacd0e6f2d7a9380804e951c1d8c86 SHA512 3323fe99b3a0768fddc07ae1ca23e099e8097717c382ec9a9cd2f63b293f6caf8d9164140548f2a4b2754e925d1e1302ba1a56c0320eb343f5a7ff0206d88811
diff --git a/games-util/pyfa/pyfa-2.15.1.ebuild b/games-util/pyfa/pyfa-2.15.1.ebuild
new file mode 100644
index 000000000000..68be8d9f02ce
--- /dev/null
+++ b/games-util/pyfa/pyfa-2.15.1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_6 )
+PYTHON_REQ_USE="sqlite,threads"
+
+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
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="mirror bindist"
+
+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/wxpython-4.0.4[webkit,${PYTHON_USEDEP}]
+	${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	>=dev-python/beautifulsoup-4.6.0[${PYTHON_USEDEP}]
+	>=dev-python/markdown2-2.3.0[${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-2.0.0[wxwidgets,${PYTHON_USEDEP}]
+	dev-python/numpy[${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 ..."
+	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 e3c4bc186500..68be8d9f02ce 100644
--- a/games-util/pyfa/pyfa-9999.ebuild
+++ b/games-util/pyfa/pyfa-9999.ebuild
@@ -20,7 +20,7 @@ else
 	KEYWORDS="~amd64 ~x86"
 	S=${WORKDIR}/Pyfa-${PV}
 fi
-IUSE="+graph"
+IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="mirror bindist"
 
@@ -29,7 +29,8 @@ DEPEND="
 	>=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.4[webkit,${PYTHON_USEDEP}]"
+	>=dev-python/wxpython-4.0.4[webkit,${PYTHON_USEDEP}]
+	${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
 	>=dev-python/beautifulsoup-4.6.0[${PYTHON_USEDEP}]
 	>=dev-python/markdown2-2.3.0[${PYTHON_USEDEP}]
@@ -37,10 +38,8 @@ RDEPEND="${DEPEND}
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
 	>=dev-python/roman-2.0.0[${PYTHON_USEDEP}]
-	graph? (
-		>=dev-python/matplotlib-2.0.0[wxwidgets,${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}] )
-	${PYTHON_DEPS}"
+	>=dev-python/matplotlib-2.0.0[wxwidgets,${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]"
 BDEPEND="app-arch/zip"
 
 PATCHES=(