diff options
author | Michał Górny <mgorny@gentoo.org> | 2020-01-28 21:20:18 +0100 |
---|---|---|
committer | Michał Górny <mgorny@gentoo.org> | 2020-01-28 21:40:22 +0100 |
commit | 7571a51110b17a1b72731b69a9462005543c2e78 (patch) | |
tree | 9225fdf62a20ae6653b3dd79846d9127e62930a8 /games-util/pyfa/files | |
parent | dev-python/basemap: Permit matplotlib-python2 (diff) | |
download | gentoo-7571a51110b17a1b72731b69a9462005543c2e78.tar.gz gentoo-7571a51110b17a1b72731b69a9462005543c2e78.tar.bz2 gentoo-7571a51110b17a1b72731b69a9462005543c2e78.zip |
games-util/pyfa: Remove old (drop to ~arch)
Bug: https://bugs.gentoo.org/705524
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'games-util/pyfa/files')
-rw-r--r-- | games-util/pyfa/files/pyfa-1.33.1-import-pyfa.patch | 28 | ||||
-rw-r--r-- | games-util/pyfa/files/pyfa-1.33.1-staticdata.patch | 59 |
2 files changed, 0 insertions, 87 deletions
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 deleted file mode 100644 index 0c71ce69f720..000000000000 --- a/games-util/pyfa/files/pyfa-1.33.1-import-pyfa.patch +++ /dev/null @@ -1,28 +0,0 @@ -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 deleted file mode 100644 index 76a705e2c832..000000000000 --- a/games-util/pyfa/files/pyfa-1.33.1-staticdata.patch +++ /dev/null @@ -1,59 +0,0 @@ -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 - |