1 |
commit: 41633ac7233221bf279bebf16a06a8b46896e1f2 |
2 |
Author: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in> |
3 |
AuthorDate: Sat Jan 8 22:02:16 2022 +0000 |
4 |
Commit: Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in> |
5 |
CommitDate: Sun Jan 9 00:01:13 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=41633ac7 |
7 |
|
8 |
app-text/komikku: add 0.36.0, drop 0.35.1 |
9 |
|
10 |
Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in> |
11 |
|
12 |
app-text/komikku/Manifest | 3 +- |
13 |
app-text/komikku/komikku-0.35.1-r1.ebuild | 76 ---------------------- |
14 |
...ikku-0.30.0-r2.ebuild => komikku-0.36.0.ebuild} | 56 +++++++++------- |
15 |
app-text/komikku/metadata.xml | 11 ++-- |
16 |
profiles/package.mask | 4 ++ |
17 |
5 files changed, 44 insertions(+), 106 deletions(-) |
18 |
|
19 |
diff --git a/app-text/komikku/Manifest b/app-text/komikku/Manifest |
20 |
index 032ab8bfb..d845e1cc5 100644 |
21 |
--- a/app-text/komikku/Manifest |
22 |
+++ b/app-text/komikku/Manifest |
23 |
@@ -1,3 +1,2 @@ |
24 |
-DIST komikku-0.30.0.tar.gz 1676088 BLAKE2B 998dcf327c902f96594d9025dd91628fc7480cfd5068c67a221693cc24bdf4f13955e5c630695e00b0d1d6b2f14925a7e8236019d8cc99f9fbb1405fcb27b211 SHA512 503d32e20ee54f53882e056623e2bba3992397d1703f5796fa0cabe6792cbb8bb9fa50ac19722200cd37976f3a8780e6afff94e7f751d4f5a19b57574c54d50b |
25 |
-DIST komikku-0.35.1.tar.gz 3352609 BLAKE2B 4231771bb0f4cfd58fc90a0090deec97ac0ecb4ef1158f334755cbd417ae88911734b6906bf4907662d1ee121f7fbc6b8c8da601119d211ff9be5d34ebac2de8 SHA512 2360ae0797ddc47ac06303668a802ddaa77c7fe6007c08623d789002fa85276884fc929a00b50395c00d4500e3911ff7bf366452f151257d53890de849dd9ff3 |
26 |
+DIST Komikku-v0.36.0.tar.gz 4341823 BLAKE2B a284616f718910fc71dd22f7b00aa0fcf0cde62f0376a2ae3ce8bd636f57e5116ae7587cd64b7673be9686cd72cc6bcae4ec9526a3fd98370f5e2cdca6ab953a SHA512 a0fb1260f71a2bf8bbbc681a9f1c1a26b9512c3ec78b55257a9c36452d485967f548e5b175595d076b4baf5615bead50a9280eff9b2587bc1ce524876bdbcdbc |
27 |
DIST komikku-0.35.2.tar.gz 4335169 BLAKE2B 93254ea42612f7e5daffc176db6bd4bdff97ac0be35a489fdf3d7b655160fee2df9b2a0274838edd0c2ac6609ec42ebcab3b8aa6c90203e2a4d86bf0e37828bb SHA512 c834362f54c4d7ce3cc55ac825a24b7026ea14b991f0c862c983da2f15573492296b6799a394296a5a0247c815dc609505807504534a82d49e96411c266af98d |
28 |
|
29 |
diff --git a/app-text/komikku/komikku-0.35.1-r1.ebuild b/app-text/komikku/komikku-0.35.1-r1.ebuild |
30 |
deleted file mode 100644 |
31 |
index 650925d8a..000000000 |
32 |
--- a/app-text/komikku/komikku-0.35.1-r1.ebuild |
33 |
+++ /dev/null |
34 |
@@ -1,76 +0,0 @@ |
35 |
-# Copyright 1999-2021 Gentoo Authors |
36 |
-# Distributed under the terms of the GNU General Public License v2 |
37 |
- |
38 |
-EAPI=7 |
39 |
- |
40 |
-MY_PN="${PN^}" |
41 |
-MY_P="${MY_PN}-v${PV}" |
42 |
- |
43 |
-PYTHON_COMPAT=( python3_{8,9} ) |
44 |
- |
45 |
-inherit python-single-r1 meson gnome2-utils xdg |
46 |
- |
47 |
-DESCRIPTION="An online/offline manga reader for GNOME" |
48 |
-HOMEPAGE="https://gitlab.com/valos/Komikku" |
49 |
-SRC_URI="https://gitlab.com/valos/${MY_PN}/-/archive/v${PV}/${MY_P}.tar.gz -> ${P}.tar.gz" |
50 |
- |
51 |
-RESTRICT="test" |
52 |
-KEYWORDS="~amd64" |
53 |
-LICENSE="GPL-3" |
54 |
-SLOT="0" |
55 |
- |
56 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
57 |
- |
58 |
-DEPEND=" |
59 |
- >=gui-libs/libhandy-1.2.0 |
60 |
- >=x11-libs/gtk+-3.24.10:3 |
61 |
- $(python_gen_cond_dep ' |
62 |
- dev-python/beautifulsoup4[${PYTHON_USEDEP}] |
63 |
- dev-python/cloudscraper[${PYTHON_USEDEP}] |
64 |
- dev-python/dateparser[${PYTHON_USEDEP}] |
65 |
- dev-python/keyring[${PYTHON_USEDEP}] |
66 |
- dev-python/lxml[${PYTHON_USEDEP}] |
67 |
- dev-python/natsort[${PYTHON_USEDEP}] |
68 |
- dev-python/pillow[${PYTHON_USEDEP}] |
69 |
- dev-python/pure-protobuf[${PYTHON_USEDEP}] |
70 |
- dev-python/pygobject[${PYTHON_USEDEP}] |
71 |
- dev-python/python-magic[${PYTHON_USEDEP}] |
72 |
- dev-python/unidecode[${PYTHON_USEDEP}] |
73 |
- ') |
74 |
-" |
75 |
-RDEPEND=" |
76 |
- ${PYTHON_DEPS} |
77 |
- ${DEPEND} |
78 |
- net-libs/webkit-gtk |
79 |
-" |
80 |
- |
81 |
-S="${WORKDIR}/${MY_P}" |
82 |
- |
83 |
-pkg_setup() { |
84 |
- python-single-r1_pkg_setup |
85 |
-} |
86 |
- |
87 |
-src_install() { |
88 |
- meson_src_install |
89 |
- python_optimize |
90 |
- |
91 |
- sed -i "s|#!.*|#!/usr/bin/${EPYTHON}|" "${D}/usr/bin/${PN}" || |
92 |
- die "Failed to fix ${D}/usr/bin/${PN} interpreter" |
93 |
-} |
94 |
- |
95 |
-pkg_preinst() { |
96 |
- gnome2_schemas_savelist |
97 |
- xdg_pkg_preinst |
98 |
-} |
99 |
- |
100 |
-pkg_postinst() { |
101 |
- gnome2_gconf_install |
102 |
- gnome2_schemas_update |
103 |
- xdg_pkg_postinst |
104 |
-} |
105 |
- |
106 |
-pkg_postrm() { |
107 |
- gnome2_gconf_uninstall |
108 |
- gnome2_schemas_update |
109 |
- xdg_pkg_postrm |
110 |
-} |
111 |
|
112 |
diff --git a/app-text/komikku/komikku-0.30.0-r2.ebuild b/app-text/komikku/komikku-0.36.0.ebuild |
113 |
similarity index 69% |
114 |
rename from app-text/komikku/komikku-0.30.0-r2.ebuild |
115 |
rename to app-text/komikku/komikku-0.36.0.ebuild |
116 |
index 650925d8a..4129f456d 100644 |
117 |
--- a/app-text/komikku/komikku-0.30.0-r2.ebuild |
118 |
+++ b/app-text/komikku/komikku-0.36.0.ebuild |
119 |
@@ -1,29 +1,39 @@ |
120 |
-# Copyright 1999-2021 Gentoo Authors |
121 |
+# Copyright 1999-2022 Gentoo Authors |
122 |
# Distributed under the terms of the GNU General Public License v2 |
123 |
|
124 |
-EAPI=7 |
125 |
+EAPI=8 |
126 |
|
127 |
-MY_PN="${PN^}" |
128 |
-MY_P="${MY_PN}-v${PV}" |
129 |
- |
130 |
-PYTHON_COMPAT=( python3_{8,9} ) |
131 |
+PYTHON_COMPAT=( python3_{8..10} ) |
132 |
|
133 |
inherit python-single-r1 meson gnome2-utils xdg |
134 |
|
135 |
+MY_PN="${PN^}" |
136 |
+MY_P="${MY_PN}-v${PV}" |
137 |
DESCRIPTION="An online/offline manga reader for GNOME" |
138 |
HOMEPAGE="https://gitlab.com/valos/Komikku" |
139 |
-SRC_URI="https://gitlab.com/valos/${MY_PN}/-/archive/v${PV}/${MY_P}.tar.gz -> ${P}.tar.gz" |
140 |
+SRC_URI="https://gitlab.com/valos/${MY_PN}/-/archive/v${PV}/${MY_P}.tar.gz" |
141 |
+S="${WORKDIR}/${MY_P}" |
142 |
|
143 |
-RESTRICT="test" |
144 |
KEYWORDS="~amd64" |
145 |
-LICENSE="GPL-3" |
146 |
+LICENSE="GPL-3+" |
147 |
SLOT="0" |
148 |
+IUSE="test" |
149 |
+ |
150 |
+RESTRICT="test" |
151 |
+PROPERTIES="test_network" |
152 |
|
153 |
REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
154 |
|
155 |
DEPEND=" |
156 |
- >=gui-libs/libhandy-1.2.0 |
157 |
- >=x11-libs/gtk+-3.24.10:3 |
158 |
+ dev-libs/glib:2 |
159 |
+ dev-libs/gobject-introspection[${PYTHON_SINGLE_USEDEP}] |
160 |
+ >=gui-libs/libhandy-1.5.0 |
161 |
+ net-libs/webkit-gtk |
162 |
+ x11-libs/gtk+:3 |
163 |
+" |
164 |
+RDEPEND=" |
165 |
+ ${PYTHON_DEPS} |
166 |
+ ${DEPEND} |
167 |
$(python_gen_cond_dep ' |
168 |
dev-python/beautifulsoup4[${PYTHON_USEDEP}] |
169 |
dev-python/cloudscraper[${PYTHON_USEDEP}] |
170 |
@@ -38,24 +48,24 @@ DEPEND=" |
171 |
dev-python/unidecode[${PYTHON_USEDEP}] |
172 |
') |
173 |
" |
174 |
-RDEPEND=" |
175 |
- ${PYTHON_DEPS} |
176 |
- ${DEPEND} |
177 |
- net-libs/webkit-gtk |
178 |
-" |
179 |
- |
180 |
-S="${WORKDIR}/${MY_P}" |
181 |
+BDEPEND="test? ( |
182 |
+ ${RDEPEND} |
183 |
+ $(python_gen_cond_dep ' |
184 |
+ dev-python/pytest[${PYTHON_USEDEP}] |
185 |
+ dev-python/pytest-steps[${PYTHON_USEDEP}] |
186 |
+ ') |
187 |
+)" |
188 |
|
189 |
-pkg_setup() { |
190 |
- python-single-r1_pkg_setup |
191 |
+src_test() { |
192 |
+ epytest |
193 |
} |
194 |
|
195 |
src_install() { |
196 |
meson_src_install |
197 |
python_optimize |
198 |
|
199 |
- sed -i "s|#!.*|#!/usr/bin/${EPYTHON}|" "${D}/usr/bin/${PN}" || |
200 |
- die "Failed to fix ${D}/usr/bin/${PN} interpreter" |
201 |
+ sed -i "s|#!.*|#!/usr/bin/${EPYTHON}|" "${ED}"/usr/bin/${PN} || |
202 |
+ die "Failed to fix ${ED}/usr/bin/${PN} interpreter" |
203 |
} |
204 |
|
205 |
pkg_preinst() { |
206 |
@@ -64,13 +74,11 @@ pkg_preinst() { |
207 |
} |
208 |
|
209 |
pkg_postinst() { |
210 |
- gnome2_gconf_install |
211 |
gnome2_schemas_update |
212 |
xdg_pkg_postinst |
213 |
} |
214 |
|
215 |
pkg_postrm() { |
216 |
- gnome2_gconf_uninstall |
217 |
gnome2_schemas_update |
218 |
xdg_pkg_postrm |
219 |
} |
220 |
|
221 |
diff --git a/app-text/komikku/metadata.xml b/app-text/komikku/metadata.xml |
222 |
index dd245d28e..f267a16e3 100644 |
223 |
--- a/app-text/komikku/metadata.xml |
224 |
+++ b/app-text/komikku/metadata.xml |
225 |
@@ -1,8 +1,11 @@ |
226 |
<?xml version="1.0" encoding="UTF-8"?> |
227 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
228 |
<pkgmetadata> |
229 |
- <!-- maintainer-needed --> |
230 |
- <upstream> |
231 |
- <remote-id type="gitlab">valos/Komikku</remote-id> |
232 |
- </upstream> |
233 |
+ <maintainer type="person"> |
234 |
+ <email>cyber+gentoo@×××××.in</email> |
235 |
+ <name>Anna</name> |
236 |
+ </maintainer> |
237 |
+ <upstream> |
238 |
+ <remote-id type="gitlab">valos/Komikku</remote-id> |
239 |
+ </upstream> |
240 |
</pkgmetadata> |
241 |
|
242 |
diff --git a/profiles/package.mask b/profiles/package.mask |
243 |
index c86cb4887..0f3639a2b 100644 |
244 |
--- a/profiles/package.mask |
245 |
+++ b/profiles/package.mask |
246 |
@@ -13,3 +13,7 @@ |
247 |
# sfeed_curses has been merged to sfeed and is available via ncurses USEFLAG. |
248 |
# removal in 30 days. |
249 |
net-news/sfeed_curses |
250 |
+ |
251 |
+# Anna (cybertailor) Vyalkova <cyber+gentoo@×××××.in> (2022-01-09) |
252 |
+# Depends on masked libhandy 1.5.0 |
253 |
+>=app-text/komikku-0.36.0 |