[gentoo-commits] repo/gentoo:master commit in: games-util/pyfa/, games-util/pyfa/files/

2017-12-18 Thread Aaron Swenson 
commit: 654682f3f883e1af6c5eed1325c68803930fa645
Author: Andreas  puzzle  ch>
AuthorDate: Tue Oct 31 20:52:38 2017 +
Commit: Aaron Swenson  gentoo  org>
CommitDate: Mon Dec 18 23:39:41 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=654682f3

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  gentoo.org>

 games-util/pyfa/Manifest   |  3 +-
 .../pyfa/files/pyfa-1.15.1-import-pyfa.patch   | 27 --
 games-util/pyfa/files/pyfa-1.15.1-staticdata.patch | 61 --
 .../pyfa/files/pyfa-1.20.2-html-export-path.patch  | 33 
 .../pyfa/files/pyfa-1.21.4-html-export-path.patch  | 33 
 .../pyfa/files/pyfa-1.33.1-import-pyfa.patch   | 28 ++
 games-util/pyfa/files/pyfa-1.33.1-staticdata.patch | 59 +
 games-util/pyfa/metadata.xml   |  8 ++-
 .../{pyfa-1.21.3.ebuild => pyfa-1.33.2.ebuild} | 21 
 .../{pyfa-1.21.3.ebuild => pyfa-1.34.0.ebuild} | 21 
 games-util/pyfa/pyfa-.ebuild   | 21 
 11 files changed, 122 insertions(+), 193 deletions(-)

diff --git a/games-util/pyfa/Manifest b/games-util/pyfa/Manifest
index d3cd0bd4607..89dbf388bec 100644
--- a/games-util/pyfa/Manifest
+++ b/games-util/pyfa/Manifest
@@ -1 +1,2 @@
-DIST pyfa-1.21.3.tar.gz 7793523 BLAKE2B 
d0e4500d9760bfda34210e35ac3fae2ec76b3ecc6c43ecd5295edd473d41abd4074b5b3c1dc20cd8c74c491a2d55f86fea13e898720e18d1e2f6a1f96e800060
 SHA512 
b5a691873421ef2d3b01d8bfd7121c63f07b96c75837fd3b93a5b77b8163943336dcd5bb85f8dcc056ce61b5103d5331afd5a81c09eb06a7050112b5d1a26681
+DIST pyfa-1.33.2.tar.gz 8596509 BLAKE2B 
a00729be066a417cc4702f056506c2e248bc9a9076cab50706fc46669c9b9611f35b96b3096979edf620bc5b9f8341765b2768c032a9046a2629e0b121a2dca3
 SHA512 
333951ef53d8088c7264297402e072124a960feb1832eda2ea2dec5df2ddc438fd72ceb3f90c5fdad0fe3f9f2e32bb712db1d30bb3f8ded921d2b621b40270f2
+DIST pyfa-1.34.0.tar.gz 8629709 BLAKE2B 
5b16296b675383a446bb21133c9e83726a92beb221babbf8fbe4b19f0f7e95bb19fd6050a5c2e3d5e602df4bbb83debfeefd6ec7efdbff35a47934ef9b29979f
 SHA512 
4642efd4de5be4add3c3f994d7be9dbeeb231fe86229f7944d52f265527c7a79698d3da5ccac3018e02c6000b0da888ad0e64382e12f74b7dd7b3398e7bb2d48

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 f29b75d7fea..000
--- 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 
-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 8b8fa913070..000
--- 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 
-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,

[gentoo-commits] repo/gentoo:master commit in: games-util/pyfa/, games-util/pyfa/files/

2016-06-05 Thread Alexandre Rostovtsev 
commit: 4ffb77e246b4c9c62fd18464589791fb27db4d36
Author: Alexandre Rostovtsev  gentoo  org>
AuthorDate: Sun Jun  5 22:17:29 2016 +
Commit: Alexandre Rostovtsev  gentoo  org>
CommitDate: Sun Jun  5 22:17:29 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ffb77e2

games-util/pyfa: updated patch for live ebuild (bug #584624)

Thanks to Martin McCourt.

Package-Manager: portage-2.3.0_rc1

 .../pyfa/files/pyfa-1.21.4-html-export-path.patch  | 33 ++
 games-util/pyfa/pyfa-.ebuild   |  2 +-
 2 files changed, 34 insertions(+), 1 deletion(-)

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
new file mode 100644
index 000..f35dfcb
--- /dev/null
+++ b/games-util/pyfa/files/pyfa-1.21.4-html-export-path.patch
@@ -0,0 +1,33 @@
+From a596f7f5398f613a607ecc91e06ea651806b8b63 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev 
+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/pyfa-.ebuild b/games-util/pyfa/pyfa-.ebuild
index 6f524e5..e8c4d8b 100644
--- a/games-util/pyfa/pyfa-.ebuild
+++ b/games-util/pyfa/pyfa-.ebuild
@@ -42,7 +42,7 @@ src_prepare() {
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.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"

[gentoo-commits] repo/gentoo:master commit in: games-util/pyfa/, games-util/pyfa/files/

2016-06-05 Thread Alexandre Rostovtsev 
commit: 27afc3d0c9914cf8d57f4760b0c4627c5ce0
Author: Alexandre Rostovtsev  gentoo  org>
AuthorDate: Sun Jun  5 22:06:24 2016 +
Commit: Alexandre Rostovtsev  gentoo  org>
CommitDate: Sun Jun  5 22:07:01 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27afc3d0

games-util/pyfa: belated bump to 1.21.3

Package-Manager: portage-2.3.0_rc1

 games-util/pyfa/Manifest   |  2 +-
 .../pyfa/files/pyfa-1.1.8-html-export-path.patch   | 33 --
 .../{pyfa-1.20.1.ebuild => pyfa-1.21.3.ebuild} |  2 +-
 3 files changed, 2 insertions(+), 35 deletions(-)

diff --git a/games-util/pyfa/Manifest b/games-util/pyfa/Manifest
index 984bd83..f5da086 100644
--- a/games-util/pyfa/Manifest
+++ b/games-util/pyfa/Manifest
@@ -1 +1 @@
-DIST pyfa-1.20.1.tar.gz 7415996 SHA256 
13e5f04590a8b9c15f72d6cde4a11af2465670c5ea78322fcfb14d3d7b00ed15 SHA512 
11a1e9619e604dc0c28463efa2d106b677dc3b9177ef6a442a5a26e24055776a1b26e330fc7b6e2589a60213d989e8539eab653792f5804cc76c584fadeee07c
 WHIRLPOOL 
a087143205417787d549a044ec4fd80890bb8223b626638bc4f9407cc5e712023163d4891518ee8d8f54a459f45eb0752eaa494c8740a33d751298371829ea9a
+DIST pyfa-1.21.3.tar.gz 7793523 SHA256 
4ac79598f2e605ba7d5cd29cfef7a94f426d4cd9e934d13cbb2071afd566de3c SHA512 
b5a691873421ef2d3b01d8bfd7121c63f07b96c75837fd3b93a5b77b8163943336dcd5bb85f8dcc056ce61b5103d5331afd5a81c09eb06a7050112b5d1a26681
 WHIRLPOOL 
65d6c9a52f4076d9be620aa3ac2ec5da23aaff32c547925b34480f7fc82ef9334fa737374419f0bf1bd827b3c6e0f34306c0d5de1dc6d441e88e096fd8aadc13

diff --git a/games-util/pyfa/files/pyfa-1.1.8-html-export-path.patch 
b/games-util/pyfa/files/pyfa-1.1.8-html-export-path.patch
deleted file mode 100644
index e7614d2..000
--- a/games-util/pyfa/files/pyfa-1.1.8-html-export-path.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 017938391c5b67327c489a5c3a6fc720d4204609 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev 
-Date: Mon, 16 Jul 2012 05:43:38 -0400
-Subject: [PATCH] Export fits to home directory, not python sitedir
-

- service/settings.py |3 ++-
- 1 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/service/settings.py b/service/settings.py
-index 8f6e3a8..5ac386d 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")
-@@ -199,7 +200,7 @@ class HTMLExportSettings():
- return cls._instance
- 
- def __init__(self):
--serviceHTMLExportDefaultSettings = {"enabled": False, "path": 
config.pyfaPath + os.sep + 'pyfaFits.html' }
-+serviceHTMLExportDefaultSettings = {"enabled": False, "path": 
unicode(os.path.expanduser(os.path.join('~', 'pyfaFits.html')), 
sys.getfilesystemencoding()) }
- self.serviceHTMLExportSettings = 
SettingsProvider.getInstance().getSettings("pyfaServiceHTMLExportSettings", 
serviceHTMLExportDefaultSettings)
- 
- def getEnabled(self):
--- 
-1.7.8.6
-

diff --git a/games-util/pyfa/pyfa-1.20.1.ebuild 
b/games-util/pyfa/pyfa-1.21.3.ebuild
similarity index 97%
rename from games-util/pyfa/pyfa-1.20.1.ebuild
rename to games-util/pyfa/pyfa-1.21.3.ebuild
index 0d2065a..6f524e5 100644
--- a/games-util/pyfa/pyfa-1.20.1.ebuild
+++ b/games-util/pyfa/pyfa-1.21.3.ebuild
@@ -42,7 +42,7 @@ src_prepare() {
eapply "${FILESDIR}/${PN}-1.15.1-staticdata.patch"
 
# do not try to save exported html to python sitedir
-   eapply "${FILESDIR}/${PN}-1.1.8-html-export-path.patch"
+   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"