1 |
commit: e7b90b7077529185a753f81d0441a0043d085d22 |
2 |
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Feb 29 04:08:30 2016 +0000 |
4 |
Commit: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Feb 29 04:19:39 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7b90b70 |
7 |
|
8 |
games-util/pyfa: bump to 1.19.1 for bug #569944 |
9 |
|
10 |
Thanks to Stefan Reimer & Captain Crutches in bug #569944 |
11 |
Package-Manager: portage-2.2.27 |
12 |
|
13 |
games-util/pyfa/Manifest | 2 +- |
14 |
games-util/pyfa/files/configforced.py | 4 --- |
15 |
.../pyfa/files/pyfa-1.1.11-import-pyfa.patch | 28 --------------------- |
16 |
games-util/pyfa/files/pyfa-1.1.20-staticPath.patch | 27 -------------------- |
17 |
.../{pyfa-1.15.0.ebuild => pyfa-1.19.1.ebuild} | 29 ++++++++++++++-------- |
18 |
5 files changed, 19 insertions(+), 71 deletions(-) |
19 |
|
20 |
diff --git a/games-util/pyfa/Manifest b/games-util/pyfa/Manifest |
21 |
index 5d7d734..5ddc1dd 100644 |
22 |
--- a/games-util/pyfa/Manifest |
23 |
+++ b/games-util/pyfa/Manifest |
24 |
@@ -1 +1 @@ |
25 |
-DIST pyfa-1.15.0.tar.gz 6243527 SHA256 27ec6748b5f1083050d47a364a8699e521a614c5c643a639441c82168017123c SHA512 c966e3fd7627ef575247b00eacee7392f7f2d32b14485c2a7e5aa0c6f3fe6ad99c1a536bfcbfcc6de29fa4bdc177b6a12e0a571926c1b7b755ef9fc6f76f3bad WHIRLPOOL f6ba22d7f3899c4a3fd702a5d0145b39e06e70793da2682c6bb0df0b3772c02f250b59d05a4fee23f72d87010f02d916a944c0499852dc0be845e1ae56b61904 |
26 |
+DIST pyfa-1.19.1.tar.gz 6688136 SHA256 f597019117b335971287fd47c1faa5be049f8a6879d4144b6c8a0039f35cea98 SHA512 b5f09ca0dde528636c5e6bc0b6987b6203dfc70ad9aa0c9238150e83de76ac138e302b5db7f40d885d6702c4c1eabae184d49af0a84e6bf3402036df24d296f6 WHIRLPOOL 8f5e42065d9945c96c7cca13301ab6ed0a286db7dc3041926af920dddf5605910ea9c259d00db1e937f2329f6156d0b4ed36330ea6d89f14bd0db9abccfca0ff |
27 |
|
28 |
diff --git a/games-util/pyfa/files/configforced.py b/games-util/pyfa/files/configforced.py |
29 |
deleted file mode 100644 |
30 |
index a8008c2..0000000 |
31 |
--- a/games-util/pyfa/files/configforced.py |
32 |
+++ /dev/null |
33 |
@@ -1,4 +0,0 @@ |
34 |
-# Gentoo-specific settings |
35 |
-pyfaPath = u'%%SITEDIR%%/pyfa' |
36 |
-staticPath = u'%%EPREFIX%%/usr/share/pyfa/staticdata' |
37 |
-gameDB = staticPath + "/eve.db" |
38 |
|
39 |
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 |
40 |
deleted file mode 100644 |
41 |
index 8269080..0000000 |
42 |
--- a/games-util/pyfa/files/pyfa-1.1.11-import-pyfa.patch |
43 |
+++ /dev/null |
44 |
@@ -1,28 +0,0 @@ |
45 |
-From f301dcd0df741514e889fc234811cd4770dca6c7 Mon Sep 17 00:00:00 2001 |
46 |
-From: Alexandre Rostovtsev <tetromino@g.o> |
47 |
-Date: Wed, 5 Dec 2012 00:48:12 -0500 |
48 |
-Subject: [PATCH] Append $(python_get_sitedir)/pyfa to import path |
49 |
- |
50 |
-Ensures that pyfa's import statements continue to work for systemwide |
51 |
-installation. |
52 |
---- |
53 |
- pyfa.py | 3 +++ |
54 |
- 1 file changed, 3 insertions(+) |
55 |
- |
56 |
-diff --git a/pyfa.py b/pyfa.py |
57 |
-index 6992aaf..d66cb70 100755 |
58 |
---- a/pyfa.py |
59 |
-+++ b/pyfa.py |
60 |
-@@ -63,6 +63,9 @@ if __name__ == "__main__": |
61 |
- 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) |
62 |
- (options, args) = parser.parse_args() |
63 |
- |
64 |
-+ import os |
65 |
-+ sys.path.append(os.path.join("%%SITEDIR%%", "pyfa")) |
66 |
-+ |
67 |
- import config |
68 |
- # Configure paths |
69 |
- if options.rootsavedata is True: |
70 |
--- |
71 |
-1.8.0 |
72 |
- |
73 |
|
74 |
diff --git a/games-util/pyfa/files/pyfa-1.1.20-staticPath.patch b/games-util/pyfa/files/pyfa-1.1.20-staticPath.patch |
75 |
deleted file mode 100644 |
76 |
index cdcc9f9..0000000 |
77 |
--- a/games-util/pyfa/files/pyfa-1.1.20-staticPath.patch |
78 |
+++ /dev/null |
79 |
@@ -1,27 +0,0 @@ |
80 |
-From 69660180a59d0d100097dedbc507d4af73267e8d Mon Sep 17 00:00:00 2001 |
81 |
-From: Alexandre Rostovtsev <tetromino@g.o> |
82 |
-Date: Wed, 30 Nov 2011 12:50:53 -0500 |
83 |
-Subject: [PATCH] Make staticPath settable from configforced |
84 |
- |
85 |
---- |
86 |
- config.py | 4 +++- |
87 |
- 1 file changed, 3 insertions(+), 1 deletion(-) |
88 |
- |
89 |
-diff --git a/config.py b/config.py |
90 |
-index e39e0d3..e028c36 100644 |
91 |
---- a/config.py |
92 |
-+++ b/config.py |
93 |
-@@ -66,7 +66,9 @@ def defPaths(): |
94 |
- |
95 |
- # Static EVE Data from the staticdata repository, should be in the staticdata |
96 |
- # directory in our pyfa directory |
97 |
-- staticPath = os.path.join(pyfaPath, "staticdata") |
98 |
-+ staticPath = getattr(configforced, "staticPath", None) |
99 |
-+ if staticPath is None: |
100 |
-+ staticPath = os.path.join(pyfaPath, "staticdata") |
101 |
- |
102 |
- # The database where we store all the fits etc |
103 |
- saveDB = os.path.join(savePath, "saveddata.db") |
104 |
--- |
105 |
-1.8.5.3 |
106 |
- |
107 |
|
108 |
diff --git a/games-util/pyfa/pyfa-1.15.0.ebuild b/games-util/pyfa/pyfa-1.19.1.ebuild |
109 |
similarity index 76% |
110 |
rename from games-util/pyfa/pyfa-1.15.0.ebuild |
111 |
rename to games-util/pyfa/pyfa-1.19.1.ebuild |
112 |
index 3ba98b7..bf7db2e 100644 |
113 |
--- a/games-util/pyfa/pyfa-1.15.0.ebuild |
114 |
+++ b/games-util/pyfa/pyfa-1.19.1.ebuild |
115 |
@@ -25,34 +25,34 @@ IUSE="+graph" |
116 |
|
117 |
RDEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}] |
118 |
dev-python/sqlalchemy[${PYTHON_USEDEP}] |
119 |
- dev-python/wxpython:2.8[${PYTHON_USEDEP}] |
120 |
+ dev-python/wxpython:3.0[${PYTHON_USEDEP}] |
121 |
graph? ( |
122 |
dev-python/matplotlib[wxwidgets,${PYTHON_USEDEP}] |
123 |
dev-python/numpy[${PYTHON_USEDEP}] ) |
124 |
${PYTHON_DEPS}" |
125 |
-DEPEND="app-arch/unzip" |
126 |
+DEPEND="app-arch/zip" |
127 |
|
128 |
-S=${WORKDIR}/Pyfa-${PV} |
129 |
+[[ ${PV} = 9999 ]] || S=${WORKDIR}/Pyfa-${PV} |
130 |
|
131 |
src_prepare() { |
132 |
# get rid of CRLF line endings introduced in 1.1.10 so patches work |
133 |
edos2unix config.py pyfa.py service/settings.py |
134 |
|
135 |
- # make staticPath settable from configforced again |
136 |
- epatch "${FILESDIR}/${PN}-1.1.20-staticPath.patch" |
137 |
+ # load gameDB and images from separate staticdata directory |
138 |
+ epatch "${FILESDIR}/${PN}-1.15.1-staticdata.patch" |
139 |
|
140 |
# do not try to save exported html to python sitedir |
141 |
epatch "${FILESDIR}/${PN}-1.1.8-html-export-path.patch" |
142 |
|
143 |
# fix import path in the main script for systemwide installation |
144 |
- epatch "${FILESDIR}/${PN}-1.1.11-import-pyfa.patch" |
145 |
+ epatch "${FILESDIR}/${PN}-1.15.1-import-pyfa.patch" |
146 |
touch __init__.py |
147 |
|
148 |
pyfa_make_configforced() { |
149 |
mkdir -p "${BUILD_DIR}" || die |
150 |
sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \ |
151 |
-e "s:%%EPREFIX%%:${EPREFIX}:" \ |
152 |
- "${FILESDIR}/configforced.py" > "${BUILD_DIR}/configforced.py" |
153 |
+ "${FILESDIR}/configforced-1.15.1.py" > "${BUILD_DIR}/configforced.py" |
154 |
sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \ |
155 |
pyfa.py > "${BUILD_DIR}/pyfa" |
156 |
} |
157 |
@@ -63,7 +63,7 @@ src_install() { |
158 |
pyfa_py_install() { |
159 |
local packagedir=$(python_get_sitedir)/${PN} |
160 |
insinto "${packagedir}" |
161 |
- doins -r eos gui icons service utils config*.py __init__.py gpl.txt |
162 |
+ doins -r eos gui service utils config*.py __init__.py |
163 |
[[ -e info.py ]] && doins info.py # only in zip releases |
164 |
doins "${BUILD_DIR}/configforced.py" |
165 |
python_doscript "${BUILD_DIR}/pyfa" |
166 |
@@ -72,12 +72,19 @@ src_install() { |
167 |
python_foreach_impl pyfa_py_install |
168 |
|
169 |
insinto /usr/share/${PN} |
170 |
- doins -r staticdata |
171 |
+ doins eve.db |
172 |
+ |
173 |
+ einfo "Compressing images ..." |
174 |
+ pushd imgs > /dev/null || die |
175 |
+ zip -r imgs.zip * || die "zip failed" |
176 |
+ doins imgs.zip |
177 |
+ popd > /dev/null || die |
178 |
+ |
179 |
dodoc README.md |
180 |
insinto /usr/share/icons/hicolor/32x32/apps |
181 |
- doins icons/pyfa.png |
182 |
+ doins imgs/gui/pyfa.png |
183 |
insinto /usr/share/icons/hicolor/64x64/apps |
184 |
- newins icons/pyfa64.png pyfa.png |
185 |
+ newins imgs/gui/pyfa64.png pyfa.png |
186 |
domenu "${FILESDIR}/${PN}.desktop" |
187 |
} |