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

2020-01-28 Thread Michał Górny 
commit: 7571a51110b17a1b72731b69a9462005543c2e78
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Jan 28 20:20:18 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jan 28 20:40:22 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7571a511

games-util/pyfa: Remove old (drop to ~arch)

Bug: https://bugs.gentoo.org/705524
Signed-off-by: Michał Górny  gentoo.org>

 games-util/pyfa/Manifest   |   4 -
 .../pyfa/files/pyfa-1.33.1-import-pyfa.patch   |  28 --
 games-util/pyfa/files/pyfa-1.33.1-staticdata.patch |  59 
 games-util/pyfa/pyfa-1.34.0.ebuild | 102 -
 games-util/pyfa/pyfa-1.35.0.ebuild | 102 -
 games-util/pyfa/pyfa-1.35.1.ebuild | 102 -
 games-util/pyfa/pyfa-1.37.0.ebuild |  97 
 7 files changed, 494 deletions(-)

diff --git a/games-util/pyfa/Manifest b/games-util/pyfa/Manifest
index c7565866dbb..ad67c82a82c 100644
--- a/games-util/pyfa/Manifest
+++ b/games-util/pyfa/Manifest
@@ -1,6 +1,2 @@
-DIST pyfa-1.34.0.tar.gz 8629709 BLAKE2B 
5b16296b675383a446bb21133c9e83726a92beb221babbf8fbe4b19f0f7e95bb19fd6050a5c2e3d5e602df4bbb83debfeefd6ec7efdbff35a47934ef9b29979f
 SHA512 
4642efd4de5be4add3c3f994d7be9dbeeb231fe86229f7944d52f265527c7a79698d3da5ccac3018e02c6000b0da888ad0e64382e12f74b7dd7b3398e7bb2d48
-DIST pyfa-1.35.0.tar.gz 8743938 BLAKE2B 
623a70ea8d28c41f94b5c54c3b8b57ddc6b6604f0eccaa1d9716f8b47295bfca12e2db068d3283448b2a6719a3ef73c74d42a98550a1b062e93e6d1091a45797
 SHA512 
28b3294e8c1d611402d4123d184d6ddf57886a51264fc25529ca3e0cd8af6d41dbe28b15c4714e591f940427651249761db8d2353006b169d358974bc691f121
-DIST pyfa-1.35.1.tar.gz 8746324 BLAKE2B 
f224f78c97f15d37e2276512541985bfd2ae80c031233261837cd142eddc16a853688a4f1f1f8684736f757d60fd57c41fb14987f336274b2284bd1de26239b3
 SHA512 
6da5e2d3351157f35c32c7b210d8bfb86a9dc2ea3a3df02449950c498ffabecff3a48fe38086dce75ec5a2cc2549dd28b474015edc0ea01c56a2ff58d1ba3f69
-DIST pyfa-1.37.0.tar.gz 8795428 BLAKE2B 
33aa0159b41fe2f228be13788f4e91933205a1883af229ffa97af0816dbce307fa8ce9ebc53b335a99decb84f9a28e83b977daf3c600df1cdd0336ba2c413ba3
 SHA512 
21094a1c374a60447e38261762ee13cd212f6af5f8d757c8b626774fb5a10d10e99267da1311d3164664b62169edd2772519a7b4ebd7414db2493f5121df5c8c
 DIST pyfa-2.14.1.tar.gz 14452477 BLAKE2B 
e4c688cff14eecaa71f86fb9e22f6a585a3136a4bd7df65c8dd65ed82c2aa9e530210134daaba25251df92dc55a7e538474b39c1d54e4bcb1817eac17791d517
 SHA512 
d3d3219fa37f44c81d85165c7e780261e149b47db147417ea26edaff448484ce565607aded714a4f44ca23b8c1586c8597ace856020c4c319cea6d39f353b140
 DIST pyfa-2.15.1.tar.gz 14516568 BLAKE2B 
ba3b1170f35681ab33bece447b4bdf563c8f964037dc6b35cbd23360f7e36c61dd9074e34b5648c7a04b59ad192f5babd75ce2a935940a52e62de8cc174f7e5b
 SHA512 
2d8fcb8608e31c135b8dac7239afe0a5acb0d32fba1291ce6ebafe093ef232c08f0aa42d172ebac5beefb7dba47aad9eb3833c679e3d02edc9cc056739c7538b

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 0c71ce69f72..000
--- 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 
-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 76a705e2c83..000
--- 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 
-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

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

2019-11-01 Thread Joonas Niilola 
commit: 08ea3720ffa492c3e364190798fc51fc7b6bb10b
Author: Andreas Zuber  gmx  ch>
AuthorDate: Sat May 25 00:26:30 2019 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Nov  1 06:06:11 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08ea3720

games-util/pyfa: version bump to 2.14.1

Closes: https://bugs.gentoo.org/671470
Package-Manager: Portage-2.3.66, Repoman-2.3.11
Signed-off-by: Andreas Zuber  gmx.ch>
Signed-off-by: Joonas Niilola  gentoo.org>

 games-util/pyfa/Manifest   |  1 +
 games-util/pyfa/files/pyfa-2.9.3-import-pyfa.patch | 28 +++
 games-util/pyfa/pyfa-2.14.1.ebuild | 97 ++
 3 files changed, 126 insertions(+)

diff --git a/games-util/pyfa/Manifest b/games-util/pyfa/Manifest
index f6708d6328a..4757d2f9302 100644
--- a/games-util/pyfa/Manifest
+++ b/games-util/pyfa/Manifest
@@ -2,3 +2,4 @@ DIST pyfa-1.34.0.tar.gz 8629709 BLAKE2B 
5b16296b675383a446bb21133c9e83726a92beb2
 DIST pyfa-1.35.0.tar.gz 8743938 BLAKE2B 
623a70ea8d28c41f94b5c54c3b8b57ddc6b6604f0eccaa1d9716f8b47295bfca12e2db068d3283448b2a6719a3ef73c74d42a98550a1b062e93e6d1091a45797
 SHA512 
28b3294e8c1d611402d4123d184d6ddf57886a51264fc25529ca3e0cd8af6d41dbe28b15c4714e591f940427651249761db8d2353006b169d358974bc691f121
 DIST pyfa-1.35.1.tar.gz 8746324 BLAKE2B 
f224f78c97f15d37e2276512541985bfd2ae80c031233261837cd142eddc16a853688a4f1f1f8684736f757d60fd57c41fb14987f336274b2284bd1de26239b3
 SHA512 
6da5e2d3351157f35c32c7b210d8bfb86a9dc2ea3a3df02449950c498ffabecff3a48fe38086dce75ec5a2cc2549dd28b474015edc0ea01c56a2ff58d1ba3f69
 DIST pyfa-1.37.0.tar.gz 8795428 BLAKE2B 
33aa0159b41fe2f228be13788f4e91933205a1883af229ffa97af0816dbce307fa8ce9ebc53b335a99decb84f9a28e83b977daf3c600df1cdd0336ba2c413ba3
 SHA512 
21094a1c374a60447e38261762ee13cd212f6af5f8d757c8b626774fb5a10d10e99267da1311d3164664b62169edd2772519a7b4ebd7414db2493f5121df5c8c
+DIST pyfa-2.14.1.tar.gz 14452477 BLAKE2B 
e4c688cff14eecaa71f86fb9e22f6a585a3136a4bd7df65c8dd65ed82c2aa9e530210134daaba25251df92dc55a7e538474b39c1d54e4bcb1817eac17791d517
 SHA512 
d3d3219fa37f44c81d85165c7e780261e149b47db147417ea26edaff448484ce565607aded714a4f44ca23b8c1586c8597ace856020c4c319cea6d39f353b140

diff --git a/games-util/pyfa/files/pyfa-2.9.3-import-pyfa.patch 
b/games-util/pyfa/files/pyfa-2.9.3-import-pyfa.patch
new file mode 100644
index 000..fc691d48bb4
--- /dev/null
+++ b/games-util/pyfa/files/pyfa-2.9.3-import-pyfa.patch
@@ -0,0 +1,28 @@
+From c12e4c1358025940aa1fbdf0e17f85e3821e7230 Mon Sep 17 00:00:00 2001
+From: Andreas Zuber 
+Date: Mon, 30 Oct 2017 09:52:32 +0100
+Subject: [PATCH] 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 d73ef097..dbf73db2 100755
+--- a/pyfa.py
 b/pyfa.py
+@@ -22,6 +22,7 @@
+ import datetime
+ import os
+ import sys
++sys.path.append(os.path.join("%%SITEDIR%%", "pyfa"))
+ from optparse import AmbiguousOptionError, BadOptionError, OptionParser
+
+ import config
+--
+2.21.0
+

diff --git a/games-util/pyfa/pyfa-2.14.1.ebuild 
b/games-util/pyfa/pyfa-2.14.1.ebuild
new file mode 100644
index 000..2f7b3917e18
--- /dev/null
+++ b/games-util/pyfa/pyfa-2.14.1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_6 )
+PYTHON_REQ_USE="sqlite,threads"
+
+inherit desktop eutils python-single-r1 xdg-utils
+
+DESCRIPTION="Python Fitting Assistant - a ship fitting application for EVE 
Online"
+HOMEPAGE="https://github.com/pyfa-org/Pyfa;
+
+RESTRICT="mirror bindist"
+LICENSE="GPL-3+ all-rights-reserved"
+SLOT="0"
+if [[ ${PV} =  ]]; then
+   EGIT_REPO_URI="https://github.com/pyfa-org/Pyfa.git;
+   inherit git-r3
+else
+   SRC_URI="https://github.com/pyfa-org/Pyfa/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~x86"
+   S=${WORKDIR}/Pyfa-${PV}
+fi
+IUSE="+graph"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+   >=dev-python/cryptography-2.3[${PYTHON_USEDEP}]
+   >=dev-python/logbook-1.0.0[${PYTHON_USEDEP}]
+   >=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+   >=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}]
+   >=dev-python/wxpython-4.0.4[webkit,${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+   >=dev-python/beautifulsoup-4.6.0[${PYTHON_USEDEP}]
+   >=dev-python/markdown2-2.3.0[${PYTHON_USEDEP}]
+   >=dev-python/packaging-16.8[${PYTHON_USEDEP}]
+   dev-python/python-dateutil[${PYTHON_USEDEP}]
+   >=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
+   >=dev-python/roman-2.0.0[${PYTHON_USEDEP}]
+   graph? (
+   >=dev-python/matplotlib-2.0.0[wxwidgets,${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}] )
+   ${PYTHON_DEPS}"
+BDEPEND="app-arch/zip"
+

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

2016-04-28 Thread Alexandre Rostovtsev 
commit: f84cc674529981c0872915aad316a525b4f9f2c7
Author: Alexandre Rostovtsev  gentoo  org>
AuthorDate: Fri Apr 29 03:24:52 2016 +
Commit: Alexandre Rostovtsev  gentoo  org>
CommitDate: Fri Apr 29 03:25:26 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f84cc674

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

Thanks to Martin McCourt.

Package-Manager: portage-2.2.28

 .../pyfa/files/pyfa-1.20.2-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.20.2-html-export-path.patch 
b/games-util/pyfa/files/pyfa-1.20.2-html-export-path.patch
new file mode 100644
index 000..b06906a
--- /dev/null
+++ b/games-util/pyfa/files/pyfa-1.20.2-html-export-path.patch
@@ -0,0 +1,33 @@
+From dc07b64245459ff75c638dedc14ac86bdf9bc176 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 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/pyfa-.ebuild b/games-util/pyfa/pyfa-.ebuild
index 0d2065a..6f524e5 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.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"

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

2016-02-28 Thread Alexandre Rostovtsev 
commit: e7b90b7077529185a753f81d0441a0043d085d22
Author: Alexandre Rostovtsev  gentoo  org>
AuthorDate: Mon Feb 29 04:08:30 2016 +
Commit: Alexandre Rostovtsev  gentoo  org>
CommitDate: Mon Feb 29 04:19:39 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7b90b70

games-util/pyfa: bump to 1.19.1 for bug #569944

Thanks to Stefan Reimer & Captain Crutches in bug #569944
Package-Manager: portage-2.2.27

 games-util/pyfa/Manifest   |  2 +-
 games-util/pyfa/files/configforced.py  |  4 ---
 .../pyfa/files/pyfa-1.1.11-import-pyfa.patch   | 28 -
 games-util/pyfa/files/pyfa-1.1.20-staticPath.patch | 27 
 .../{pyfa-1.15.0.ebuild => pyfa-1.19.1.ebuild} | 29 ++
 5 files changed, 19 insertions(+), 71 deletions(-)

diff --git a/games-util/pyfa/Manifest b/games-util/pyfa/Manifest
index 5d7d734..5ddc1dd 100644
--- a/games-util/pyfa/Manifest
+++ b/games-util/pyfa/Manifest
@@ -1 +1 @@
-DIST pyfa-1.15.0.tar.gz 6243527 SHA256 
27ec6748b5f1083050d47a364a8699e521a614c5c643a639441c82168017123c SHA512 
c966e3fd7627ef575247b00eacee7392f7f2d32b14485c2a7e5aa0c6f3fe6ad99c1a536bfcbfcc6de29fa4bdc177b6a12e0a571926c1b7b755ef9fc6f76f3bad
 WHIRLPOOL 
f6ba22d7f3899c4a3fd702a5d0145b39e06e70793da2682c6bb0df0b3772c02f250b59d05a4fee23f72d87010f02d916a944c0499852dc0be845e1ae56b61904
+DIST pyfa-1.19.1.tar.gz 6688136 SHA256 
f597019117b335971287fd47c1faa5be049f8a6879d4144b6c8a0039f35cea98 SHA512 
b5f09ca0dde528636c5e6bc0b6987b6203dfc70ad9aa0c9238150e83de76ac138e302b5db7f40d885d6702c4c1eabae184d49af0a84e6bf3402036df24d296f6
 WHIRLPOOL 
8f5e42065d9945c96c7cca13301ab6ed0a286db7dc3041926af920dddf5605910ea9c259d00db1e937f2329f6156d0b4ed36330ea6d89f14bd0db9abccfca0ff

diff --git a/games-util/pyfa/files/configforced.py 
b/games-util/pyfa/files/configforced.py
deleted file mode 100644
index a8008c2..000
--- a/games-util/pyfa/files/configforced.py
+++ /dev/null
@@ -1,4 +0,0 @@
-# Gentoo-specific settings
-pyfaPath = u'%%SITEDIR%%/pyfa'
-staticPath = u'%%EPREFIX%%/usr/share/pyfa/staticdata'
-gameDB = staticPath + "/eve.db"

diff --git a/games-util/pyfa/files/pyfa-1.1.11-import-pyfa.patch 
b/games-util/pyfa/files/pyfa-1.1.11-import-pyfa.patch
deleted file mode 100644
index 8269080..000
--- a/games-util/pyfa/files/pyfa-1.1.11-import-pyfa.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From f301dcd0df741514e889fc234811cd4770dca6c7 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev 
-Date: Wed, 5 Dec 2012 00:48:12 -0500
-Subject: [PATCH] Append $(python_get_sitedir)/pyfa to import path
-
-Ensures that pyfa's import statements continue to work for systemwide
-installation.

- pyfa.py | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/pyfa.py b/pyfa.py
-index 6992aaf..d66cb70 100755
 a/pyfa.py
-+++ b/pyfa.py
-@@ -63,6 +63,9 @@ if __name__ == "__main__":
- parser.add_option("-r", "--root", action="store_true", 
dest="rootsavedata", help="if you want pyfa to store its data in root folder, 
use this option", default=False)
- (options, args) = parser.parse_args()
- 
-+import os
-+sys.path.append(os.path.join("%%SITEDIR%%", "pyfa"))
-+
- import config
- # Configure paths
- if options.rootsavedata is True:
--- 
-1.8.0
-

diff --git a/games-util/pyfa/files/pyfa-1.1.20-staticPath.patch 
b/games-util/pyfa/files/pyfa-1.1.20-staticPath.patch
deleted file mode 100644
index cdcc9f9..000
--- a/games-util/pyfa/files/pyfa-1.1.20-staticPath.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 69660180a59d0d100097dedbc507d4af73267e8d Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev 
-Date: Wed, 30 Nov 2011 12:50:53 -0500
-Subject: [PATCH] Make staticPath settable from configforced
-

- config.py | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/config.py b/config.py
-index e39e0d3..e028c36 100644
 a/config.py
-+++ b/config.py
-@@ -66,7 +66,9 @@ def defPaths():
- 
- # Static EVE Data from the staticdata repository, should be in the 
staticdata
- # directory in our pyfa directory
--staticPath = os.path.join(pyfaPath, "staticdata")
-+staticPath = getattr(configforced, "staticPath", None)
-+if staticPath is None:
-+staticPath = os.path.join(pyfaPath, "staticdata")
- 
- # The database where we store all the fits etc
- saveDB = os.path.join(savePath, "saveddata.db")
--- 
-1.8.5.3
-

diff --git a/games-util/pyfa/pyfa-1.15.0.ebuild 
b/games-util/pyfa/pyfa-1.19.1.ebuild
similarity index 76%
rename from games-util/pyfa/pyfa-1.15.0.ebuild
rename to games-util/pyfa/pyfa-1.19.1.ebuild
index 3ba98b7..bf7db2e 100644
--- a/games-util/pyfa/pyfa-1.15.0.ebuild
+++ b/games-util/pyfa/pyfa-1.19.1.ebuild
@@ -25,34 +25,34 @@ IUSE="+graph"
 
 RDEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}]
dev-python/sqlalchemy[${PYTHON_USEDEP}]
-   dev-python/wxpython:2.8[${PYTHON_USEDEP}]
+

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

2015-10-06 Thread Alexandre Rostovtsev 
commit: 9f9517df68bb4bbfaa308342630fc67f054af7ea
Author: Alexandre Rostovtsev  gentoo  org>
AuthorDate: Wed Oct  7 02:38:40 2015 +
Commit: Alexandre Rostovtsev  gentoo  org>
CommitDate: Wed Oct  7 02:42:49 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f9517df

games-util/pyfa: update live ebuild

Update patches for upstream code changes, update dependencies, install
images in a compressed zip since upstream code now allows it, and switch
to git-r3.eclass.

Gentoo-Bug: 562080
Reported-by: Captain Crutches
Package-Manager: portage-2.2.22

 games-util/pyfa/files/configforced-1.15.1.py   |  4 ++
 .../pyfa/files/pyfa-1.15.1-import-pyfa.patch   | 27 ++
 games-util/pyfa/files/pyfa-1.15.1-staticdata.patch | 61 ++
 games-util/pyfa/pyfa-.ebuild   | 31 ++-
 4 files changed, 111 insertions(+), 12 deletions(-)

diff --git a/games-util/pyfa/files/configforced-1.15.1.py 
b/games-util/pyfa/files/configforced-1.15.1.py
new file mode 100644
index 000..51fcb95
--- /dev/null
+++ b/games-util/pyfa/files/configforced-1.15.1.py
@@ -0,0 +1,4 @@
+# Gentoo-specific settings
+pyfaPath = u'%%SITEDIR%%/pyfa'
+gameDB = u'%%EPREFIX%%/usr/share/pyfa/eve.db'
+imgsZIP = u'%%EPREFIX%%/usr/share/pyfa/imgs.zip'

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
new file mode 100644
index 000..f29b75d
--- /dev/null
+++ b/games-util/pyfa/files/pyfa-1.15.1-import-pyfa.patch
@@ -0,0 +1,27 @@
+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
new file mode 100644
index 000..8b8fa91
--- /dev/null
+++ b/games-util/pyfa/files/pyfa-1.15.1-staticdata.patch
@@ -0,0 +1,61 @@
+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, "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/pyfa-.ebuild b/games-util/pyfa/pyfa-.ebuild
index 76dac88..5e11d00 100644
--- a/games-util/pyfa/pyfa-.ebuild
+++ b/games-util/pyfa/pyfa-.ebuild
@@ -15,7 +15,7 @@ LICENSE="GPL-3+ LGPL-2.1+ CC-BY-2.5 free-noncomm"
 SLOT="0"
 if [[ ${PV} =  ]]; then
EGIT_REPO_URI="https://github.com/DarkFenX/Pyfa.git;
-   inherit git-2
+   inherit git-r3
KEYWORDS=""
 else
SRC_URI="https://github.com/DarkFenX/Pyfa/archive/v${PV}.tar.gz -> 
pyfa-${PV}.tar.gz"
@@ -25,34 +25,34 @@ IUSE="+graph"
 
 RDEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}]
dev-python/sqlalchemy[${PYTHON_USEDEP}]
-   dev-python/wxpython:2.8[${PYTHON_USEDEP}]
+   dev-python/wxpython:3.0[${PYTHON_USEDEP}]