games-util/pyfa: Version bump, remove old versions

games-util/pyfa/Manifest

@@ -1,12 +1,8 @@
-AUX configforced-1.15.1.py 153 SHA256 07ae0cfb8272f94146c4df113538574ced6920697d14243cf3a89801ed7788f6 SHA512 632576b9fbff3e93c26b6c2d4be74298aa8657affe82d2c5d571a645d733a7b96d5db6b89b819d3aec9ca68e4bef11e368f7c1cbac416e9bfed88a1025a46bfe WHIRLPOOL 0a6c91e5f093285ac9e3f2b8a7344e6c8603ac13f9845cb5523216ebd9a46b0b4948ff62ba74238dd1736e003a98bd78ffc5a802ed7f83774f1abb93cc6cd491
+AUX configforced-1.33.1.py 153 SHA256 07ae0cfb8272f94146c4df113538574ced6920697d14243cf3a89801ed7788f6 SHA512 632576b9fbff3e93c26b6c2d4be74298aa8657affe82d2c5d571a645d733a7b96d5db6b89b819d3aec9ca68e4bef11e368f7c1cbac416e9bfed88a1025a46bfe WHIRLPOOL 0a6c91e5f093285ac9e3f2b8a7344e6c8603ac13f9845cb5523216ebd9a46b0b4948ff62ba74238dd1736e003a98bd78ffc5a802ed7f83774f1abb93cc6cd491
-AUX pyfa-1.15.1-import-pyfa.patch 590 SHA256 1bc8160c42ead9c4e8610ce858d3e584bdb479643dc9aaa52725e2702196c15f SHA512 2e0088a4a82fadb399f58faa5d7fec8a6a2f0471fad91a103cc486c249fde019dad4fc955b19ae8b19b239a864cf1e09574a4f6af965faa78efb0abe9b46ecf3 WHIRLPOOL 34160870583dd3d435c2dcd1b751b73978ab5fdef0a96280f66c498d6d48bd1894b9158c0f14ee1021d2e8ab7470cb689ca4f6f2c7048055951f117006b926eb
+AUX pyfa-1.33.1-import-pyfa.patch 456 SHA256 f77c3673510b35ff2e58c1b0fe8ff28c6f1e8591f9bf91bf3dd8f920d5e2a714 SHA512 429c654f6ed361b350be62eae8c84e66fcc10245c7d38cc6b0bde66247b829f5d89c57e9e6cec228db7fb49fce25e9b3d4637c2a33674af8ac2f6ea36245c5ba WHIRLPOOL 85c248b6b0197b00967c55e5118323b43bd8808a6b4cbc495cd17b2a239ca6a0515e27bae0926f4d119c701ef7e3fa8c2d15d58a13a2b2b952bd8dc581e573d5
-AUX pyfa-1.15.1-staticdata.patch 1740 SHA256 5316688fe931f83f1b924fd1fcb463ae8f527cbe7f0b85e26f267c07d1281463 SHA512 be6fffc663f0b8fd12ad9414244cd1f411b47535065fd8209ccf37b8cbb4422bef9c51606a1d2442a1ef97f0218ddc0f472527eb2a40952497c4ab3a76aa2134 WHIRLPOOL a5601d3653db81aff0cb47effc01f72e7ecdd69935592e9d3d1314a5d9c812d4a8b104cc61a47ea6fe7aaa8b87be1b6f9b17448e7b59aca830d4625da82e9e16
+AUX pyfa-1.33.1-staticdata.patch 1205 SHA256 a5538d8267e25181f5e49d4424af34a43788b36e668a2314ac434d33e769635d SHA512 1bb56b452e425f0fc3bf389b81927fc914040c0441722e86da0a539970cd9c53a600904078ce7019efbbdc950e84fe8791b4a344f69cb4ee1e06b5f5ab6282c9 WHIRLPOOL f91623212797a578e014f49ffb641bcc39e1d55e08dd661d076796e185f76a4d825ddc22d8d985b88a6c48d7dd7b40e89e895e0b3d5a0b4b0d636e4910a983b9
-AUX pyfa-1.20.2-html-export-path.patch 1259 SHA256 f9093158596ec411337107f8da1f7e646fd98e1aa940d6b1ebd656499ac15c31 SHA512 b294ed71d3be9533f182a43e99a1019e3b9a32f33ffdac9accae98f74345483504549567259472a8a082a2f540bd5264294ea604af1221f30821127d5b0771e0 WHIRLPOOL e80a42493ef3bc07b945134f6a3948b6f36ad5c2569e1ce6510e69d7faba81f73f4d836650ed939d9f591dd8bec4c7c6ddbafc2b9e06ab73a7b96ab5ea46c9f2
-AUX pyfa-1.21.4-html-export-path.patch 1295 SHA256 05e08bb447f03bbfef79091cf5da0dcca63d14f7ec46e3806417e3bb7403e472 SHA512 c67f8a276d13eb39d722d28640a3e17cc8aa971f088256674f925b4b403cfec7a7857cb7150c4b04fa2dbc66318bea5b722c6185c0c9e02671e6af7515642ecf WHIRLPOOL db37aa2746b1b3faaf1dbf9e81eaf62d4178c6b4697c3089bc6f208fe58ea20ab92f1184b1c23c5ede506c90e121c0a07d43b720f1440ceeb61fca74039b2c94
 AUX pyfa.desktop 155 SHA256 c395891d87eaaac64e3ba7954d623efaf161d906527099ed4b0c680c63a041eb SHA512 d62a44e4e724057581a360cc1eb10aa4c7a0c50cb1d95137e58ba14db17644c852da2582be8d508c50b7359e7f99dc893d78d15cb11c46967a9b7896ff667781 WHIRLPOOL 3f68f0cd6942380fc040a3578b054ea7cdb86fbd751ed17aa1fe1e1eda3c7ee6c35645c28c6529605856d5e74765ccd7037abe96c3efe2a5a54cc7fcb6c53793
-DIST pyfa-1.21.3.tar.gz 7793523 SHA256 4ac79598f2e605ba7d5cd29cfef7a94f426d4cd9e934d13cbb2071afd566de3c SHA512 b5a691873421ef2d3b01d8bfd7121c63f07b96c75837fd3b93a5b77b8163943336dcd5bb85f8dcc056ce61b5103d5331afd5a81c09eb06a7050112b5d1a26681 WHIRLPOOL 65d6c9a52f4076d9be620aa3ac2ec5da23aaff32c547925b34480f7fc82ef9334fa737374419f0bf1bd827b3c6e0f34306c0d5de1dc6d441e88e096fd8aadc13
+DIST pyfa-1.33.1.tar.gz 8597143 SHA256 6b624ea4e5a87399bfb1e02bf6c3772628c86ff144f3c2e987435c1519e2e0d6 SHA512 74390c898ffe6d41d9e64460be0ac9797074f1231d81f3d9d3cb8608345648e9057ff31893e5bd6c1305a26dd6728cacfc8436b414a52ac61cfe2e290e77d70d WHIRLPOOL 41d5b57873f90003f98d379104c479e67e4de233fb1fa6f1ec4ca0da4247c5c36e36fc02c65c6186c2514178cc2bf087debd7b172375f8aadfcbd4dab67e9380
-DIST pyfa-1.24.0.tar.gz 7469816 SHA256 95eb4e2e31e17775ffbe728fe8b8571f4a64a44516e519ca28c1c53f400315c0 SHA512 1082c8d3882d2ed934fa8abd14403010d3765a666c1b64b2a0b5e0d4062eea8b45fe73dac697942080a3c18ec0987f7af53a20aecec3630ceb0609d347f125a5 WHIRLPOOL bd255287a4fbcd459d0e953648373f5a0e7e9b0d415093d654c7a04122574cace4df9a662b104a0bcd8fc3b0739efe6b8c5ff75d15da2f1a8d23e53e77d45c63
+EBUILD pyfa-1.33.1.ebuild 2692 SHA256 06c7bd00458f2d7f2f0a9ec504b8af0f041658c984dc548698a96091b003b1a7 SHA512 e28f3b231e248f4e2b7f2c1c7e21d1756fe54bd35f8b343e4ce6f92a0d40c9b694ed0e1a62264d97d1f7c14d66f35a40091734574f8134f72f28d96ca0abe81a WHIRLPOOL de4134c18a78f874dbdc21d9663a334bcbec5cdef080ad0c3fe785f97ebf8c0cd8c4c184bdce9b3dcbfa71b6e2c033bbd19dc59cddb8b4ddfbe7de035ceb5996
-EBUILD pyfa-1.21.3.ebuild 2740 SHA256 677331738f673aa808c77c0b449e5e8cc889d7acb34a5c3cd671809261b5d454 SHA512 cc84bd777a1e7fff532bb2ce61384f2da9b405659723fd22802ae00e262ed72a970b0fabd07bf7a77c56fc5359a32a5bad9a6be09758e4ba756cebcd9af46a09 WHIRLPOOL 4c1c9b3e63514ed849ec1d345fd328d5f6d5b0d10aa7e08263a6bd93dbaf252d2ad0bdca4cf23ce72945632ed26cb10d79e7634665fd6527c938b60552b65492
-EBUILD pyfa-1.24.0.ebuild 2740 SHA256 5517172231a7e8060056c815007f551abdd956a97e54cbd93209503b6a171108 SHA512 efe8d84f6e90565f64383dd6f7f6729b6483a35348d99f281853b02f64a87d8e2307f78c827abed9bd203c23e18185e0cb1dd7110b55edb1558734e915fe2c2d WHIRLPOOL 88e97c32e8ed822d5cfb327181c79f0adc4f7c2f82e9494a48965475ef31cf2ed1ec0f22d66dac7ef180c8397b4e4505ef1ad704d70d22cbeef406bb9bbd9b46
 EBUILD pyfa-9999.ebuild 2740 SHA256 5517172231a7e8060056c815007f551abdd956a97e54cbd93209503b6a171108 SHA512 efe8d84f6e90565f64383dd6f7f6729b6483a35348d99f281853b02f64a87d8e2307f78c827abed9bd203c23e18185e0cb1dd7110b55edb1558734e915fe2c2d WHIRLPOOL 88e97c32e8ed822d5cfb327181c79f0adc4f7c2f82e9494a48965475ef31cf2ed1ec0f22d66dac7ef180c8397b4e4505ef1ad704d70d22cbeef406bb9bbd9b46
 MISC metadata.xml 707 SHA256 ad9e71bfafb16b320bbebe6f7bd05fbd9e6c887ff4d8f64a6860f09efd6ac4d9 SHA512 73271ded60ce9b02d625f15b19ff7d8737ade6986eb8ea207d3c4d9720789660f65f7c494de8b37af9d59e6c753b2ef9b3c36ccfa96443825326842a89439863 WHIRLPOOL fffe65d3b087750ab3dd52b15cc21068d8c37e8ac57a55abc2d416140474cbc68947d676bd0b0a6225711ee05ce117a8996e48d29c94096effc07b730290ca9c

games-util/pyfa/files/pyfa-1.15.1-import-pyfa.patch

@@ -1,27 +0,0 @@
-From 6c7b6ab7d1aae47d3a3f72a7951c7de294be2917 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Tue, 6 Oct 2015 22:16:38 -0400
-Subject: [PATCH] Append $(python_get_sitedir)/pyfa to import path
-
-Ensures that pyfa's import statements continue to work for systemwide
-installation.
----
- pyfa.py | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/pyfa.py b/pyfa.py
-index 8189918..7b81f10 100755
---- a/pyfa.py
-+++ b/pyfa.py
-@@ -20,6 +20,8 @@
- 
- import sys
- import re
-+import os
-+sys.path.append(os.path.join("%%SITEDIR%%", "pyfa"))
- import config
- 
- 
--- 
-2.6.0
-

games-util/pyfa/files/pyfa-1.15.1-staticdata.patch

@@ -1,61 +0,0 @@
-From c7bb5210ce9feebb753734b5c581acca9f5c9d06 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Tue, 6 Oct 2015 21:37:44 -0400
-Subject: [PATCH] make gameDB and imgs.zip paths settable from configforced
-
----
- config.py           | 10 +++++++++-
- gui/bitmapLoader.py |  2 +-
- 2 files changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/config.py b/config.py
-index 4072236..a9e71ee 100644
---- a/config.py
-+++ b/config.py
-@@ -28,6 +28,7 @@ pyfaPath = None
- savePath = None
- saveDB = None
- gameDB = None
-+imgsZIP = None
- 
- 
- class StreamToLogger(object):
-@@ -66,6 +67,7 @@ def defPaths():
-     global savePath
-     global saveDB
-     global gameDB
-+    global imgsZIP
-     global saveInRoot
- 
-     if debug:
-@@ -117,7 +119,13 @@ def defPaths():
-     # The database where the static EVE data from the datadump is kept.
-     # This is not the standard sqlite datadump but a modified version created by eos
-     # maintenance script
--    gameDB = os.path.join(pyfaPath, "eve.db")
-+    gameDB = getattr(configforced, "gameDB", None)
-+    if gameDB is None:
-+        gameDB = os.path.join(pyfaPath, "eve.db")
-+
-+    imgsZIP = getattr(configforced, "imgsZIP", None)
-+    if imgsZIP is None:
-+        imgsZIP = os.path.join(pyfaPath, "imgs.zip")
- 
-     ## DON'T MODIFY ANYTHING BELOW ##
-     import eos.config
-diff --git a/gui/bitmapLoader.py b/gui/bitmapLoader.py
-index 45026be..02985c1 100644
---- a/gui/bitmapLoader.py
-+++ b/gui/bitmapLoader.py
-@@ -31,7 +31,7 @@ except ImportError:
- class BitmapLoader():
- 
-     try:
--        archive = zipfile.ZipFile(os.path.join(config.pyfaPath, 'imgs.zip'), 'r')
-+        archive = zipfile.ZipFile(config.imgsZIP, 'r')
-     except IOError:
-         archive = None
- 
--- 
-2.6.0
-

games-util/pyfa/files/pyfa-1.20.2-html-export-path.patch

@@ -1,33 +0,0 @@
-From dc07b64245459ff75c638dedc14ac86bdf9bc176 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Mon, 16 Jul 2012 05:43:38 -0400
-Subject: [PATCH] Export fits to home directory, not python sitedir
-
----
- service/settings.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/service/settings.py b/service/settings.py
-index 60627e6..7087e5c 100644
---- a/service/settings.py
-+++ b/service/settings.py
-@@ -21,6 +21,7 @@ import cPickle
- import os.path
- import config
- import urllib2
-+import sys
- 
- class SettingsProvider():
-     BASE_PATH = os.path.join(config.savePath, "settings")
-@@ -221,7 +222,7 @@ class HTMLExportSettings():
-         return cls._instance
- 
-     def __init__(self):
--        serviceHTMLExportDefaultSettings = {"enabled": False, "path": config.pyfaPath + os.sep + 'pyfaFits.html', "website": "null-sec.com" }
-+        serviceHTMLExportDefaultSettings = {"enabled": False, "path": unicode(os.path.expanduser(os.path.join('~', 'pyfaFits.html')), sys.getfilesystemencoding()), "website": "null-sec.com" }
-         self.serviceHTMLExportSettings = SettingsProvider.getInstance().getSettings("pyfaServiceHTMLExportSettings", serviceHTMLExportDefaultSettings)
- 
-     def getEnabled(self):
--- 
-2.8.1
-

games-util/pyfa/files/pyfa-1.21.4-html-export-path.patch

@@ -1,33 +0,0 @@
-From a596f7f5398f613a607ecc91e06ea651806b8b63 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Mon, 16 Jul 2012 05:43:38 -0400
-Subject: [PATCH] Export fits to home directory, not python sitedir
-
----
- service/settings.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/service/settings.py b/service/settings.py
-index cd1b33b..a883ca1 100644
---- a/service/settings.py
-+++ b/service/settings.py
-@@ -21,6 +21,7 @@ import cPickle
- import os.path
- import config
- import urllib2
-+import sys
- 
- class SettingsProvider():
-     BASE_PATH = os.path.join(config.savePath, "settings")
-@@ -221,7 +222,7 @@ class HTMLExportSettings():
-         return cls._instance
- 
-     def __init__(self):
--        serviceHTMLExportDefaultSettings = {"enabled": False, "path": config.pyfaPath + os.sep + 'pyfaFits.html', "website": "null-sec.com", "minimal": False }
-+        serviceHTMLExportDefaultSettings = {"enabled": False, "path": unicode(os.path.expanduser(os.path.join('~', 'pyfaFits.html')), sys.getfilesystemencoding()), "website": "null-sec.com", "minimal": False }
-         self.serviceHTMLExportSettings = SettingsProvider.getInstance().getSettings("pyfaServiceHTMLExportSettings", serviceHTMLExportDefaultSettings)
- 
-     def getEnabled(self):
--- 
-2.8.3
-

games-util/pyfa/files/pyfa-1.33.1-import-pyfa.patch

@@ -0,0 +1,12 @@
+diff --git a/pyfa.py b/pyfa.py
+index 4faa1edd..e764da42 100755
+--- a/pyfa.py
++++ b/pyfa.py
+@@ -29,6 +29,7 @@ from optparse import AmbiguousOptionError, BadOptionError, OptionParser
+ from logbook import CRITICAL, DEBUG, ERROR, FingersCrossedHandler, INFO, Logger, NestedSetup, NullHandler, StreamHandler, TimedRotatingFileHandler, WARNING, \
+     __version__ as logbook_version
+ 
++sys.path.append(os.path.join("%%SITEDIR%%", "pyfa"))
+ import config
+ 
+ try:

games-util/pyfa/files/pyfa-1.33.1-staticdata.patch

@@ -0,0 +1,44 @@
+diff --git a/config.py b/config.py
+index b15c30a3..7d39ec7a 100644
+--- a/config.py
++++ b/config.py
+@@ -29,6 +29,7 @@ pyfaPath = None
+ savePath = None
+ saveDB = None
+ gameDB = None
++imgsZIP = None
+ logPath = None
+ 
+ 
+@@ -61,6 +62,7 @@ def defPaths(customSavePath):
+     global savePath
+     global saveDB
+     global gameDB
++    global imgsZIP
+     global saveInRoot
+ 
+     pyfalog.debug("Configuring Pyfa")
+@@ -100,6 +102,10 @@ def defPaths(customSavePath):
+     if not gameDB:
+         gameDB = os.path.join(pyfaPath, "eve.db")
+ 
++    imgsZIP = getattr(configforced, "imgsZIP", None)
++    if imgsZIP is None:
++        imgsZIP = os.path.join(pyfaPath, "imgs.zip")
++
+     # DON'T MODIFY ANYTHING BELOW
+     import eos.config
+ 
+diff --git a/gui/bitmapLoader.py b/gui/bitmapLoader.py
+index eb53b1f1..86036001 100644
+--- a/gui/bitmapLoader.py
++++ b/gui/bitmapLoader.py
+@@ -37,7 +37,7 @@ except ImportError:
+ 
+ class BitmapLoader(object):
+     try:
+-        archive = zipfile.ZipFile(os.path.join(config.pyfaPath, 'imgs.zip'), 'r')
++        archive = zipfile.ZipFile(config.imgsZIP, 'r')
+         logging.info("Using zipped image files.")
+     except IOError:
+         logging.info("Using local image files.")

games-util/pyfa/pyfa-1.24.0.ebuild

@@ -1,104 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,threads"
-
-inherit eutils gnome2-utils python-r1
-
-DESCRIPTION="Python Fitting Assistant - a ship fitting application for EVE Online"
-HOMEPAGE="https://github.com/pyfa-org/Pyfa"
-
-LICENSE="GPL-3+ LGPL-2.1+ CC-BY-2.5 free-noncomm"
-SLOT="0"
-if [[ ${PV} = 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/pyfa-org/Pyfa.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/pyfa-org/Pyfa/archive/v${PV}.tar.gz -> pyfa-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-IUSE="+graph"
-
-RDEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/sqlalchemy[${PYTHON_USEDEP}]
-	dev-python/wxpython:3.0[${PYTHON_USEDEP}]
-	graph? (
-		dev-python/matplotlib[wxwidgets,${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}] )
-	${PYTHON_DEPS}"
-DEPEND="app-arch/zip"
-
-[[ ${PV} = 9999 ]] || S=${WORKDIR}/Pyfa-${PV}
-
-src_prepare() {
-	# get rid of CRLF line endings introduced in 1.1.10 so patches work
-	edos2unix config.py pyfa.py service/settings.py
-
-	# load gameDB and images from separate staticdata directory
-	eapply "${FILESDIR}/${PN}-1.15.1-staticdata.patch"
-
-	# do not try to save exported html to python sitedir
-	eapply "${FILESDIR}/${PN}-1.21.4-html-export-path.patch"
-
-	# fix import path in the main script for systemwide installation
-	eapply "${FILESDIR}/${PN}-1.15.1-import-pyfa.patch"
-
-	eapply_user
-
-	touch __init__.py
-
-	pyfa_make_configforced() {
-		mkdir -p "${BUILD_DIR}" || die
-		sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
-			-e "s:%%EPREFIX%%:${EPREFIX}:" \
-			"${FILESDIR}/configforced-1.15.1.py" > "${BUILD_DIR}/configforced.py"
-		sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
-			pyfa.py > "${BUILD_DIR}/pyfa"
-	}
-	python_foreach_impl pyfa_make_configforced
-}
-
-src_install() {
-	pyfa_py_install() {
-		local packagedir=$(python_get_sitedir)/${PN}
-		insinto "${packagedir}"
-		doins -r eos gui service utils config*.py __init__.py
-		[[ -e info.py ]] && doins info.py # only in zip releases
-		doins "${BUILD_DIR}/configforced.py"
-		python_doscript "${BUILD_DIR}/pyfa"
-		python_optimize
-	}
-	python_foreach_impl pyfa_py_install
-
-	insinto /usr/share/${PN}
-	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
-	insinto /usr/share/icons/hicolor/32x32/apps
-	doins imgs/gui/pyfa.png
-	insinto /usr/share/icons/hicolor/64x64/apps
-	newins imgs/gui/pyfa64.png pyfa.png
-	domenu "${FILESDIR}/${PN}.desktop"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}

games-util/pyfa/pyfa-1.33.1.ebuild

@@ -26,9 +26,9 @@ IUSE="+graph"
 RDEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}]
 	dev-python/sqlalchemy[${PYTHON_USEDEP}]
 	dev-python/wxpython:3.0[${PYTHON_USEDEP}]
-	graph? (
+	dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/matplotlib[wxwidgets,${PYTHON_USEDEP}]
+	>=dev-python/logbook-0.10[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}] )
+	graph? ( dev-python/matplotlib[wxwidgets,${PYTHON_USEDEP}] )
 	${PYTHON_DEPS}"
 DEPEND="app-arch/zip"
 
@@ -36,16 +36,13 @@ DEPEND="app-arch/zip"
 
 src_prepare() {
 	# get rid of CRLF line endings introduced in 1.1.10 so patches work
-	edos2unix config.py pyfa.py service/settings.py
+	edos2unix config.py pyfa.py service/settings.py gui/bitmapLoader.py
 
 	# load gameDB and images from separate staticdata directory
-	eapply "${FILESDIR}/${PN}-1.15.1-staticdata.patch"
+	eapply "${FILESDIR}/${PN}-1.33.1-staticdata.patch"
-
-	# do not try to save exported html to python sitedir
-	eapply "${FILESDIR}/${PN}-1.20.2-html-export-path.patch"
 
 	# fix import path in the main script for systemwide installation
-	eapply "${FILESDIR}/${PN}-1.15.1-import-pyfa.patch"
+	eapply "${FILESDIR}/${PN}-1.33.1-import-pyfa.patch"
 
 	eapply_user
 
@@ -55,7 +52,7 @@ src_prepare() {
 		mkdir -p "${BUILD_DIR}" || die
 		sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
 			-e "s:%%EPREFIX%%:${EPREFIX}:" \
-			"${FILESDIR}/configforced-1.15.1.py" > "${BUILD_DIR}/configforced.py"
+			"${FILESDIR}/configforced-1.33.1.py" > "${BUILD_DIR}/configforced.py"
 		sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
 			pyfa.py > "${BUILD_DIR}/pyfa"
 	}

games-util/pyfa/pyfa-9999.ebuild

@@ -26,9 +26,9 @@ IUSE="+graph"
 RDEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}]
 	dev-python/sqlalchemy[${PYTHON_USEDEP}]
 	dev-python/wxpython:3.0[${PYTHON_USEDEP}]
-	graph? (
+	dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/matplotlib[wxwidgets,${PYTHON_USEDEP}]
+	>=dev-python/logbook-0.10[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}] )
+	graph? ( dev-python/matplotlib[wxwidgets,${PYTHON_USEDEP}] )
 	${PYTHON_DEPS}"
 DEPEND="app-arch/zip"
 
@@ -36,16 +36,13 @@ DEPEND="app-arch/zip"
 
 src_prepare() {
 	# get rid of CRLF line endings introduced in 1.1.10 so patches work
-	edos2unix config.py pyfa.py service/settings.py
+	edos2unix config.py pyfa.py service/settings.py gui/bitmapLoader.py
 
 	# load gameDB and images from separate staticdata directory
-	eapply "${FILESDIR}/${PN}-1.15.1-staticdata.patch"
+	eapply "${FILESDIR}/${PN}-1.33.1-staticdata.patch"
-
-	# do not try to save exported html to python sitedir
-	eapply "${FILESDIR}/${PN}-1.21.4-html-export-path.patch"
 
 	# fix import path in the main script for systemwide installation
-	eapply "${FILESDIR}/${PN}-1.15.1-import-pyfa.patch"
+	eapply "${FILESDIR}/${PN}-1.33.1-import-pyfa.patch"
 
 	eapply_user
 
@@ -55,7 +52,7 @@ src_prepare() {
 		mkdir -p "${BUILD_DIR}" || die
 		sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
 			-e "s:%%EPREFIX%%:${EPREFIX}:" \
-			"${FILESDIR}/configforced-1.15.1.py" > "${BUILD_DIR}/configforced.py"
+			"${FILESDIR}/configforced-1.33.1.py" > "${BUILD_DIR}/configforced.py"
 		sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
 			pyfa.py > "${BUILD_DIR}/pyfa"
 	}