1 |
commit: ec0981a2772f9677cdf81eb8dd918354e429dcca |
2 |
Author: Andreas Zuber <a.zuber <AT> gmx <DOT> ch> |
3 |
AuthorDate: Sat May 25 00:33:38 2019 +0000 |
4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Nov 1 06:06:15 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec0981a2 |
7 |
|
8 |
games-util/pyfa: fix live ebuild |
9 |
|
10 |
Closes: https://bugs.gentoo.org/673820 |
11 |
Package-Manager: Portage-2.3.66, Repoman-2.3.11 |
12 |
Signed-off-by: Andreas Zuber <a.zuber <AT> gmx.ch> |
13 |
Closes: https://github.com/gentoo/gentoo/pull/12102 |
14 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
15 |
|
16 |
games-util/pyfa/pyfa-9999.ebuild | 76 ++++++++++++++++++++-------------------- |
17 |
1 file changed, 38 insertions(+), 38 deletions(-) |
18 |
|
19 |
diff --git a/games-util/pyfa/pyfa-9999.ebuild b/games-util/pyfa/pyfa-9999.ebuild |
20 |
index 32200ccbee1..2f7b3917e18 100644 |
21 |
--- a/games-util/pyfa/pyfa-9999.ebuild |
22 |
+++ b/games-util/pyfa/pyfa-9999.ebuild |
23 |
@@ -1,11 +1,11 @@ |
24 |
-# Copyright 1999-2018 Gentoo Foundation |
25 |
+# Copyright 1999-2019 Gentoo Authors |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
|
28 |
-EAPI="6" |
29 |
-PYTHON_COMPAT=( python2_7 ) |
30 |
+EAPI="7" |
31 |
+PYTHON_COMPAT=( python3_6 ) |
32 |
PYTHON_REQ_USE="sqlite,threads" |
33 |
|
34 |
-inherit desktop eutils gnome2-utils python-r1 |
35 |
+inherit desktop eutils python-single-r1 xdg-utils |
36 |
|
37 |
DESCRIPTION="Python Fitting Assistant - a ship fitting application for EVE Online" |
38 |
HOMEPAGE="https://github.com/pyfa-org/Pyfa" |
39 |
@@ -16,64 +16,64 @@ SLOT="0" |
40 |
if [[ ${PV} = 9999 ]]; then |
41 |
EGIT_REPO_URI="https://github.com/pyfa-org/Pyfa.git" |
42 |
inherit git-r3 |
43 |
- KEYWORDS="" |
44 |
else |
45 |
SRC_URI="https://github.com/pyfa-org/Pyfa/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
46 |
KEYWORDS="~amd64 ~x86" |
47 |
+ S=${WORKDIR}/Pyfa-${PV} |
48 |
fi |
49 |
IUSE="+graph" |
50 |
REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
51 |
|
52 |
-RDEPEND=" |
53 |
+DEPEND=" |
54 |
+ >=dev-python/cryptography-2.3[${PYTHON_USEDEP}] |
55 |
>=dev-python/logbook-1.0.0[${PYTHON_USEDEP}] |
56 |
+ >=dev-python/pyyaml-5.1[${PYTHON_USEDEP}] |
57 |
+ >=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}] |
58 |
+ >=dev-python/wxpython-4.0.4[webkit,${PYTHON_USEDEP}]" |
59 |
+RDEPEND="${DEPEND} |
60 |
+ >=dev-python/beautifulsoup-4.6.0[${PYTHON_USEDEP}] |
61 |
+ >=dev-python/markdown2-2.3.0[${PYTHON_USEDEP}] |
62 |
+ >=dev-python/packaging-16.8[${PYTHON_USEDEP}] |
63 |
dev-python/python-dateutil[${PYTHON_USEDEP}] |
64 |
- dev-python/requests[${PYTHON_USEDEP}] |
65 |
- >=dev-python/sqlalchemy-1.0.5[${PYTHON_USEDEP}] |
66 |
- dev-python/wxpython:3.0[${PYTHON_USEDEP}] |
67 |
+ >=dev-python/requests-2.0.0[${PYTHON_USEDEP}] |
68 |
+ >=dev-python/roman-2.0.0[${PYTHON_USEDEP}] |
69 |
graph? ( |
70 |
- dev-python/matplotlib[wxwidgets,${PYTHON_USEDEP}] |
71 |
+ >=dev-python/matplotlib-2.0.0[wxwidgets,${PYTHON_USEDEP}] |
72 |
dev-python/numpy[${PYTHON_USEDEP}] ) |
73 |
${PYTHON_DEPS}" |
74 |
-DEPEND="app-arch/zip" |
75 |
+BDEPEND="app-arch/zip" |
76 |
|
77 |
-[[ ${PV} = 9999 ]] || S=${WORKDIR}/Pyfa-${PV} |
78 |
+PATCHES=( |
79 |
+ # fix import path in the main script for systemwide installation |
80 |
+ "${FILESDIR}/${PN}-2.9.3-import-pyfa.patch" |
81 |
+ ) |
82 |
|
83 |
src_prepare() { |
84 |
# get rid of CRLF line endings introduced in 1.1.10 so patches work |
85 |
- edos2unix config.py pyfa.py gui/bitmapLoader.py service/settings.py |
86 |
- |
87 |
- # load gameDB and images from separate staticdata directory |
88 |
- eapply "${FILESDIR}/${PN}-1.33.1-staticdata.patch" |
89 |
+ edos2unix config.py pyfa.py gui/bitmap_loader.py service/settings.py |
90 |
|
91 |
- # fix import path in the main script for systemwide installation |
92 |
- eapply "${FILESDIR}/${PN}-1.33.1-import-pyfa.patch" |
93 |
- |
94 |
- eapply_user |
95 |
+ default |
96 |
|
97 |
# make python recognize pyfa as a package |
98 |
touch __init__.py || die |
99 |
|
100 |
- pyfa_make_configforced() { |
101 |
- mkdir -p "${BUILD_DIR}" || die |
102 |
- sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \ |
103 |
- -e "s:%%EPREFIX%%:${EPREFIX}:" \ |
104 |
- "${FILESDIR}/configforced-1.15.1.py" > "${BUILD_DIR}/configforced.py" || die |
105 |
- sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \ |
106 |
- pyfa.py > "${BUILD_DIR}/pyfa" || die |
107 |
- } |
108 |
- python_foreach_impl pyfa_make_configforced |
109 |
+ sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \ |
110 |
+ -e "s:%%EPREFIX%%:${EPREFIX}:" \ |
111 |
+ "${FILESDIR}/configforced-1.15.1.py" > configforced.py || die |
112 |
+ sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \ |
113 |
+ pyfa.py > pyfa || die |
114 |
} |
115 |
|
116 |
src_install() { |
117 |
- pyfa_py_install() { |
118 |
- python_moduleinto ${PN} |
119 |
- python_domodule eos gui service utils config*.py __init__.py |
120 |
- python_domodule "${BUILD_DIR}/configforced.py" |
121 |
- python_doscript "${BUILD_DIR}/pyfa" |
122 |
- } |
123 |
- python_foreach_impl pyfa_py_install |
124 |
+ python_moduleinto ${PN} |
125 |
+ python_domodule eos gui service utils graphs |
126 |
+ python_domodule config*.py __init__.py version.yml configforced.py db_update.py |
127 |
+ python_doscript pyfa |
128 |
|
129 |
insinto /usr/share/${PN} |
130 |
+ |
131 |
+ einfo "Creating database ..." |
132 |
+ python ./db_update.py || die |
133 |
doins eve.db |
134 |
|
135 |
einfo "Compressing images ..." |
136 |
@@ -89,9 +89,9 @@ src_install() { |
137 |
} |
138 |
|
139 |
pkg_postinst() { |
140 |
- gnome2_icon_cache_update |
141 |
+ xdg_icon_cache_update |
142 |
} |
143 |
|
144 |
pkg_postrm() { |
145 |
- gnome2_icon_cache_update |
146 |
+ xdg_icon_cache_update |
147 |
} |