games-util/pyfa: Version bump

Version bump to 1.34.0, rebase and fixing of all the patches

Cleanup old version and patches.

Remove html-export-path patch. This issue was fixed upstream:
https://github.com/pyfa-org/Pyfa/pull/1124

New proxy maintainer.

Closes: https://bugs.gentoo.org/596490
Closes: https://bugs.gentoo.org/613568
Closes: https://github.com/gentoo/gentoo/pull/6097

Signed-off-by: Aaron W. Swenson <titanofold@gentoo.org>

6 files changed, 87 insertions, 154 deletions

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
+