gentoo resync : 20.12.2017

11 files changed, 117 insertions, 188 deletions

diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index fba1cf8905d4..1caa99f515f4 100644
--- a/games-util/Manifest.gz
+++ b/games-util/Manifest.gz
diff --git a/games-util/pyfa/Manifest b/games-util/pyfa/Manifest
index a5f075c5134b..c720882e1af8 100644
--- a/games-util/pyfa/Manifest
+++ b/games-util/pyfa/Manifest
@@ -1,10 +1,8 @@
 AUX configforced-1.15.1.py 153 BLAKE2B 135edf54e69c985693bcdde747eba5e46f7ed1390a77e1a1d40c0a624f3605c3ec8dad2f3526cbd8f406ed39fc67d3b027b7e7e462bbfa48c5649c71f0692da6 SHA512 632576b9fbff3e93c26b6c2d4be74298aa8657affe82d2c5d571a645d733a7b96d5db6b89b819d3aec9ca68e4bef11e368f7c1cbac416e9bfed88a1025a46bfe
-AUX pyfa-1.15.1-import-pyfa.patch 590 BLAKE2B 07a097a58effe6f24f794941244f6fe95d39f04c3aaab3f9d6eaff4231a46afe1ac85cf1aa895144a153f61a7999f297485cebcf7dd6669588323693aae15d1d SHA512 2e0088a4a82fadb399f58faa5d7fec8a6a2f0471fad91a103cc486c249fde019dad4fc955b19ae8b19b239a864cf1e09574a4f6af965faa78efb0abe9b46ecf3
-AUX pyfa-1.15.1-staticdata.patch 1740 BLAKE2B b8b2e34f8bc6a63852910dc4b4514114cabe195dc38101666d18bf8246e49e71b7b48cd0e60f48c1ec83f1c2325faefe6b4c45c4d4110b9162fa6e4d499177a4 SHA512 be6fffc663f0b8fd12ad9414244cd1f411b47535065fd8209ccf37b8cbb4422bef9c51606a1d2442a1ef97f0218ddc0f472527eb2a40952497c4ab3a76aa2134
-AUX pyfa-1.20.2-html-export-path.patch 1259 BLAKE2B ce513e1a37e263b7fe195b9b03c40769d53d01e85645d75355141ca082fa843194988ee1a3bc08368b04ea3586ea58538383bac4108c664a2e7a63b3a4819199 SHA512 b294ed71d3be9533f182a43e99a1019e3b9a32f33ffdac9accae98f74345483504549567259472a8a082a2f540bd5264294ea604af1221f30821127d5b0771e0
-AUX pyfa-1.21.4-html-export-path.patch 1295 BLAKE2B 63130074966dc702fd2353e0697b8efdf3951324be58b0f7a6421b70e17f4ae6f2ecde0399335fcf16762abfd367f9ed253614a09cfe309aa41846aec7c47b78 SHA512 c67f8a276d13eb39d722d28640a3e17cc8aa971f088256674f925b4b403cfec7a7857cb7150c4b04fa2dbc66318bea5b722c6185c0c9e02671e6af7515642ecf
+AUX pyfa-1.33.1-import-pyfa.patch 685 BLAKE2B a3d45d5438203233993ca3d8edd5061ccced36e550ef47ca8c9dfae9343c2cb7c4c952a961d5f7847c21bda27aefe30d6fd38b0875c3ccc1bda8313e519c471d SHA512 a7a6d18183c3494aa4e0436c7f527312be36a298f8fc31cfac7df3d60157c1ef501f725c0c79f1ade9b053d711e14ede9a2892b824530e1cf431590c6b56395e
+AUX pyfa-1.33.1-staticdata.patch 1571 BLAKE2B ffa07ba329d3cbb5f198755fe814f431144fb30667fcfbc1102a0456c49601af37bc9ce141d80db8b961b018726acb78f38339793dee4ed654b70fd411a66bd8 SHA512 cd2c56f3805af70cc3fe294c21af5b32eea614292b8eeb856d2f36f2d7e46ce7a2f33f24115ac8af1cc2d77d39b2f7f397b495734f0ace954c61efb63b609128
 AUX pyfa.desktop 155 BLAKE2B bccfc81c4bc7dd9099ac4bd11fdb0d5f8d72b53b5dc8a700147e7e5996b14aac9e4b46e2884a473ecc8d8b1f49305e66c46cbc7e6c5e43e93e5a3fa71c5efa08 SHA512 d62a44e4e724057581a360cc1eb10aa4c7a0c50cb1d95137e58ba14db17644c852da2582be8d508c50b7359e7f99dc893d78d15cb11c46967a9b7896ff667781
-DIST pyfa-1.21.3.tar.gz 7793523 BLAKE2B d0e4500d9760bfda34210e35ac3fae2ec76b3ecc6c43ecd5295edd473d41abd4074b5b3c1dc20cd8c74c491a2d55f86fea13e898720e18d1e2f6a1f96e800060 SHA512 b5a691873421ef2d3b01d8bfd7121c63f07b96c75837fd3b93a5b77b8163943336dcd5bb85f8dcc056ce61b5103d5331afd5a81c09eb06a7050112b5d1a26681
-EBUILD pyfa-1.21.3.ebuild 2771 BLAKE2B 03abf85ede5182f8f6663ee06d6c4188a8d32ce45a7383371fed8d3c9b0dcd006a2f2445e3324368a73054b5d718be361f74fbb8f95b8f6bb8263c1ae7ae7a17 SHA512 666063dc166c96c82101e6a2d2b1de73882528784a9a82f6c16ea770facbdff763ea7364f54004d595f5c6fb1511d1dceb5da16b7ead76febce076f4a5d38233
-EBUILD pyfa-9999.ebuild 2771 BLAKE2B c72cb500c3574cd3ec1eb026a10fdb37f3b6cfb35b45d3f67fcdf8d74802d46b95521ca2aba12563f9f6edf43816476782f89b19047abdc05f91423558243442 SHA512 0aef3545089deafbdc52a1ceed41602949a5a30bcd6e6d0512cd0bfc7bb8b564a6b262c3b3bbea6ec6ec02926d65e57e2f730f3eb1052ff44a9bedaf60610af0
-MISC metadata.xml 707 BLAKE2B 636de14566781f9da53b3b49eae2e7920c489f437cc4b385fb5ac3732fff482dd966f6c71c506b5dbd77c865e4cbaecc43a6d3e437d65a8c22819daefb8db637 SHA512 73271ded60ce9b02d625f15b19ff7d8737ade6986eb8ea207d3c4d9720789660f65f7c494de8b37af9d59e6c753b2ef9b3c36ccfa96443825326842a89439863
+DIST pyfa-1.34.0.tar.gz 8629709 BLAKE2B 5b16296b675383a446bb21133c9e83726a92beb221babbf8fbe4b19f0f7e95bb19fd6050a5c2e3d5e602df4bbb83debfeefd6ec7efdbff35a47934ef9b29979f SHA512 4642efd4de5be4add3c3f994d7be9dbeeb231fe86229f7944d52f265527c7a79698d3da5ccac3018e02c6000b0da888ad0e64382e12f74b7dd7b3398e7bb2d48
+EBUILD pyfa-1.34.0.ebuild 2690 BLAKE2B 75617e4742feba8338064811a6ce993df0e1fdf1f1dde52777c7417ec9b7f349af8c6f70223522a285737a06e869aa241bae43781f34339ddaa8013b9f592f29 SHA512 5e9ca6acc8a7b53f327c7190ef98473a377f030dc33497117479a93cda83b2ea9e6bf3ff5bed3cf1e2ca7097059365b91a868aaf72dcd1835884575cdef9bde3
+EBUILD pyfa-9999.ebuild 2690 BLAKE2B 75617e4742feba8338064811a6ce993df0e1fdf1f1dde52777c7417ec9b7f349af8c6f70223522a285737a06e869aa241bae43781f34339ddaa8013b9f592f29 SHA512 5e9ca6acc8a7b53f327c7190ef98473a377f030dc33497117479a93cda83b2ea9e6bf3ff5bed3cf1e2ca7097059365b91a868aaf72dcd1835884575cdef9bde3
+MISC metadata.xml 817 BLAKE2B 3756e4c4cd95064bfdfb74ffccbc1162b457e620cd4b99f1c4c04943443a83cec1a5642056f219dfc090c37a230dfadc07dacd0e6f2d7a9380804e951c1d8c86 SHA512 3323fe99b3a0768fddc07ae1ca23e099e8097717c382ec9a9cd2f63b293f6caf8d9164140548f2a4b2754e925d1e1302ba1a56c0320eb343f5a7ff0206d88811
diff --git a/games-util/pyfa/files/pyfa-1.15.1-import-pyfa.patch b/games-util/pyfa/files/pyfa-1.15.1-import-pyfa.patch
deleted file mode 100644
index f29b75d7fea0..000000000000
--- a/games-util/pyfa/files/pyfa-1.15.1-import-pyfa.patch
+++ /dev/null
@@ -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
-
diff --git a/games-util/pyfa/files/pyfa-1.15.1-staticdata.patch b/games-util/pyfa/files/pyfa-1.15.1-staticdata.patch
deleted file mode 100644
index 8b8fa913070a..000000000000
--- a/games-util/pyfa/files/pyfa-1.15.1-staticdata.patch
+++ /dev/null
@@ -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
-
diff --git a/games-util/pyfa/files/pyfa-1.20.2-html-export-path.patch b/games-util/pyfa/files/pyfa-1.20.2-html-export-path.patch
deleted file mode 100644
index b06906a83b58..000000000000
--- a/games-util/pyfa/files/pyfa-1.20.2-html-export-path.patch
+++ /dev/null
@@ -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
-
diff --git a/games-util/pyfa/files/pyfa-1.21.4-html-export-path.patch b/games-util/pyfa/files/pyfa-1.21.4-html-export-path.patch
deleted file mode 100644
index f35dfcbd2d98..000000000000
--- a/games-util/pyfa/files/pyfa-1.21.4-html-export-path.patch
+++ /dev/null
@@ -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
-
diff --git a/games-util/pyfa/files/pyfa-1.33.1-import-pyfa.patch b/games-util/pyfa/files/pyfa-1.33.1-import-pyfa.patch
new file mode 100644
index 000000000000..0c71ce69f720
--- /dev/null
+++ b/games-util/pyfa/files/pyfa-1.33.1-import-pyfa.patch
@@ -0,0 +1,28 @@
+From c35467378232b1b21cca304f5dba37c687e51bca Mon Sep 17 00:00:00 2001
+From: Andreas Zuber <zuber@puzzle.ch>
+Date: Mon, 30 Oct 2017 09:52:32 +0100
+Subject: [PATCH 2/3] import pyfa
+
+Append $(python_get_sitedir)/pyfa to import path
+
+Ensures that pyfa's import statements continue to work for systemwide
+installation.
+---
+ pyfa.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/pyfa.py b/pyfa.py
+index 4faa1edd..9cfa5e23 100755
+--- a/pyfa.py
++++ b/pyfa.py
+@@ -23,6 +23,7 @@ import os
+ import platform
+ import re
+ import sys
++sys.path.append(os.path.join("%%SITEDIR%%", "pyfa"))
+ import traceback
+ from optparse import AmbiguousOptionError, BadOptionError, OptionParser
+ 
+-- 
+2.14.3
+
diff --git a/games-util/pyfa/files/pyfa-1.33.1-staticdata.patch b/games-util/pyfa/files/pyfa-1.33.1-staticdata.patch
new file mode 100644
index 000000000000..76a705e2c832
--- /dev/null
+++ b/games-util/pyfa/files/pyfa-1.33.1-staticdata.patch
@@ -0,0 +1,59 @@
+From 54f0cd42c6f022e010c63ba7b1f123f78001b490 Mon Sep 17 00:00:00 2001
+From: Andreas Zuber <zuber@puzzle.ch>
+Date: Mon, 30 Oct 2017 09:53:31 +0100
+Subject: [PATCH 3/3] staticdata
+
+make gameDB and imgs.zip paths settable from configforced
+---
+ config.py           | 7 +++++++
+ gui/bitmapLoader.py | 2 +-
+ 2 files changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/config.py b/config.py
+index b15c30a3..a5a07acb 100644
+--- a/config.py
++++ b/config.py
+@@ -30,6 +30,7 @@ savePath = None
+ saveDB = None
+ gameDB = None
+ logPath = None
++imgsZIP = None
+ 
+ 
+ def isFrozen():
+@@ -61,6 +62,7 @@ def defPaths(customSavePath):
+     global savePath
+     global saveDB
+     global gameDB
++    global imgsZIP
+     global saveInRoot
+ 
+     pyfalog.debug("Configuring Pyfa")
+@@ -100,6 +102,11 @@ def defPaths(customSavePath):
+     if not gameDB:
+         gameDB = os.path.join(pyfaPath, "eve.db")
+ 
++    imgsZIP = getattr(configforced, "imgsZIP", imgsZIP)
++    if not imgsZIP:
++        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.")
+-- 
+2.14.3
+
diff --git a/games-util/pyfa/metadata.xml b/games-util/pyfa/metadata.xml
index 2c0b85a4e6ef..c556f4ff0717 100644
--- a/games-util/pyfa/metadata.xml
+++ b/games-util/pyfa/metadata.xml
@@ -2,8 +2,12 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>tetromino@gentoo.org</email>
-    <name>Alexandre Rostovtsev</name>
+    <email>a.zuber@gmx.ch</email>
+    <name>Andreas Zuber</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
   </maintainer>
   <longdescription lang="en">
 Pyfa is the Python Fitting Assistant, a standalone application for creating
diff --git a/games-util/pyfa/pyfa-1.21.3.ebuild b/games-util/pyfa/pyfa-1.34.0.ebuild
index ea133f7beb13..dbd5180ef370 100644
--- a/games-util/pyfa/pyfa-1.21.3.ebuild
+++ b/games-util/pyfa/pyfa-1.34.0.ebuild
@@ -18,14 +18,16 @@ if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
 	SRC_URI="https://github.com/pyfa-org/Pyfa/archive/v${PV}.tar.gz -> pyfa-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~x86"
 fi
 IUSE="+graph"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/sqlalchemy[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-1.0.5[${PYTHON_USEDEP}]
 	dev-python/wxpython:3.0[${PYTHON_USEDEP}]
+	>=dev-python/logbook-1.0.0[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
 	graph? (
 		dev-python/matplotlib[wxwidgets,${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}] )
@@ -36,16 +38,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 gui/bitmapLoader.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.20.2-html-export-path.patch"
+	eapply "${FILESDIR}/${PN}-1.33.1-staticdata.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
 
@@ -84,10 +83,8 @@ src_install() {
 	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
+	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-9999.ebuild b/games-util/pyfa/pyfa-9999.ebuild
index 2fa0e26c3620..dbd5180ef370 100644
--- a/games-util/pyfa/pyfa-9999.ebuild
+++ b/games-util/pyfa/pyfa-9999.ebuild
@@ -18,14 +18,16 @@ if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
 	SRC_URI="https://github.com/pyfa-org/Pyfa/archive/v${PV}.tar.gz -> pyfa-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~x86"
 fi
 IUSE="+graph"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/sqlalchemy[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-1.0.5[${PYTHON_USEDEP}]
 	dev-python/wxpython:3.0[${PYTHON_USEDEP}]
+	>=dev-python/logbook-1.0.0[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
 	graph? (
 		dev-python/matplotlib[wxwidgets,${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}] )
@@ -36,16 +38,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 gui/bitmapLoader.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"
+	eapply "${FILESDIR}/${PN}-1.33.1-staticdata.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
 
@@ -84,10 +83,8 @@ src_install() {
 	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
+	doicon -s 32 imgs/gui/pyfa.png
+	newicon -s 64 imgs/gui/pyfa64.png pyfa.png
 	domenu "${FILESDIR}/${PN}.desktop"
 }