diff --git a/app-text/komikku/Manifest b/app-text/komikku/Manifest
index 032ab8bfbb..d845e1cc5d 100644
--- a/app-text/komikku/Manifest
+++ b/app-text/komikku/Manifest
@@ -1,3 +1,2 @@
-DIST komikku-0.30.0.tar.gz 1676088 BLAKE2B 998dcf327c902f96594d9025dd91628fc7480cfd5068c67a221693cc24bdf4f13955e5c630695e00b0d1d6b2f14925a7e8236019d8cc99f9fbb1405fcb27b211 SHA512 503d32e20ee54f53882e056623e2bba3992397d1703f5796fa0cabe6792cbb8bb9fa50ac19722200cd37976f3a8780e6afff94e7f751d4f5a19b57574c54d50b
-DIST komikku-0.35.1.tar.gz 3352609 BLAKE2B 4231771bb0f4cfd58fc90a0090deec97ac0ecb4ef1158f334755cbd417ae88911734b6906bf4907662d1ee121f7fbc6b8c8da601119d211ff9be5d34ebac2de8 SHA512 2360ae0797ddc47ac06303668a802ddaa77c7fe6007c08623d789002fa85276884fc929a00b50395c00d4500e3911ff7bf366452f151257d53890de849dd9ff3
+DIST Komikku-v0.36.0.tar.gz 4341823 BLAKE2B a284616f718910fc71dd22f7b00aa0fcf0cde62f0376a2ae3ce8bd636f57e5116ae7587cd64b7673be9686cd72cc6bcae4ec9526a3fd98370f5e2cdca6ab953a SHA512 a0fb1260f71a2bf8bbbc681a9f1c1a26b9512c3ec78b55257a9c36452d485967f548e5b175595d076b4baf5615bead50a9280eff9b2587bc1ce524876bdbcdbc
DIST komikku-0.35.2.tar.gz 4335169 BLAKE2B 93254ea42612f7e5daffc176db6bd4bdff97ac0be35a489fdf3d7b655160fee2df9b2a0274838edd0c2ac6609ec42ebcab3b8aa6c90203e2a4d86bf0e37828bb SHA512 c834362f54c4d7ce3cc55ac825a24b7026ea14b991f0c862c983da2f15573492296b6799a394296a5a0247c815dc609505807504534a82d49e96411c266af98d
diff --git a/app-text/komikku/komikku-0.35.1-r1.ebuild b/app-text/komikku/komikku-0.35.1-r1.ebuild
deleted file mode 100644
index 650925d8a5..0000000000
--- a/app-text/komikku/komikku-0.35.1-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="${PN^}"
-MY_P="${MY_PN}-v${PV}"
-
-PYTHON_COMPAT=( python3_{8,9} )
-
-inherit python-single-r1 meson gnome2-utils xdg
-
-DESCRIPTION="An online/offline manga reader for GNOME"
-HOMEPAGE="https://gitlab.com/valos/Komikku"
-SRC_URI="https://gitlab.com/valos/${MY_PN}/-/archive/v${PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-RESTRICT="test"
-KEYWORDS="~amd64"
-LICENSE="GPL-3"
-SLOT="0"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
- >=gui-libs/libhandy-1.2.0
- >=x11-libs/gtk+-3.24.10:3
- $(python_gen_cond_dep '
- dev-python/beautifulsoup4[${PYTHON_USEDEP}]
- dev-python/cloudscraper[${PYTHON_USEDEP}]
- dev-python/dateparser[${PYTHON_USEDEP}]
- dev-python/keyring[${PYTHON_USEDEP}]
- dev-python/lxml[${PYTHON_USEDEP}]
- dev-python/natsort[${PYTHON_USEDEP}]
- dev-python/pillow[${PYTHON_USEDEP}]
- dev-python/pure-protobuf[${PYTHON_USEDEP}]
- dev-python/pygobject[${PYTHON_USEDEP}]
- dev-python/python-magic[${PYTHON_USEDEP}]
- dev-python/unidecode[${PYTHON_USEDEP}]
- ')
-"
-RDEPEND="
- ${PYTHON_DEPS}
- ${DEPEND}
- net-libs/webkit-gtk
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-src_install() {
- meson_src_install
- python_optimize
-
- sed -i "s|#!.*|#!/usr/bin/${EPYTHON}|" "${D}/usr/bin/${PN}" ||
- die "Failed to fix ${D}/usr/bin/${PN} interpreter"
-}
-
-pkg_preinst() {
- gnome2_schemas_savelist
- xdg_pkg_preinst
-}
-
-pkg_postinst() {
- gnome2_gconf_install
- gnome2_schemas_update
- xdg_pkg_postinst
-}
-
-pkg_postrm() {
- gnome2_gconf_uninstall
- gnome2_schemas_update
- xdg_pkg_postrm
-}
diff --git a/app-text/komikku/komikku-0.30.0-r2.ebuild b/app-text/komikku/komikku-0.36.0.ebuild
similarity index 69%
rename from app-text/komikku/komikku-0.30.0-r2.ebuild
rename to app-text/komikku/komikku-0.36.0.ebuild
index 650925d8a5..4129f456d7 100644
--- a/app-text/komikku/komikku-0.30.0-r2.ebuild
+++ b/app-text/komikku/komikku-0.36.0.ebuild
@@ -1,29 +1,39 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-MY_PN="${PN^}"
-MY_P="${MY_PN}-v${PV}"
-
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit python-single-r1 meson gnome2-utils xdg
+MY_PN="${PN^}"
+MY_P="${MY_PN}-v${PV}"
DESCRIPTION="An online/offline manga reader for GNOME"
HOMEPAGE="https://gitlab.com/valos/Komikku"
-SRC_URI="https://gitlab.com/valos/${MY_PN}/-/archive/v${PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://gitlab.com/valos/${MY_PN}/-/archive/v${PV}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+KEYWORDS="~amd64"
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="test"
RESTRICT="test"
-KEYWORDS="~amd64"
-LICENSE="GPL-3"
-SLOT="0"
+PROPERTIES="test_network"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
DEPEND="
- >=gui-libs/libhandy-1.2.0
- >=x11-libs/gtk+-3.24.10:3
+ dev-libs/glib:2
+ dev-libs/gobject-introspection[${PYTHON_SINGLE_USEDEP}]
+ >=gui-libs/libhandy-1.5.0
+ net-libs/webkit-gtk
+ x11-libs/gtk+:3
+"
+RDEPEND="
+ ${PYTHON_DEPS}
+ ${DEPEND}
$(python_gen_cond_dep '
dev-python/beautifulsoup4[${PYTHON_USEDEP}]
dev-python/cloudscraper[${PYTHON_USEDEP}]
@@ -38,24 +48,24 @@ DEPEND="
dev-python/unidecode[${PYTHON_USEDEP}]
')
"
-RDEPEND="
- ${PYTHON_DEPS}
- ${DEPEND}
- net-libs/webkit-gtk
-"
+BDEPEND="test? (
+ ${RDEPEND}
+ $(python_gen_cond_dep '
+ dev-python/pytest[${PYTHON_USEDEP}]
+ dev-python/pytest-steps[${PYTHON_USEDEP}]
+ ')
+)"
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- python-single-r1_pkg_setup
+src_test() {
+ epytest
}
src_install() {
meson_src_install
python_optimize
- sed -i "s|#!.*|#!/usr/bin/${EPYTHON}|" "${D}/usr/bin/${PN}" ||
- die "Failed to fix ${D}/usr/bin/${PN} interpreter"
+ sed -i "s|#!.*|#!/usr/bin/${EPYTHON}|" "${ED}"/usr/bin/${PN} ||
+ die "Failed to fix ${ED}/usr/bin/${PN} interpreter"
}
pkg_preinst() {
@@ -64,13 +74,11 @@ pkg_preinst() {
}
pkg_postinst() {
- gnome2_gconf_install
gnome2_schemas_update
xdg_pkg_postinst
}
pkg_postrm() {
- gnome2_gconf_uninstall
gnome2_schemas_update
xdg_pkg_postrm
}
diff --git a/app-text/komikku/metadata.xml b/app-text/komikku/metadata.xml
index dd245d28e7..f267a16e3f 100644
--- a/app-text/komikku/metadata.xml
+++ b/app-text/komikku/metadata.xml
@@ -1,8 +1,11 @@
-
-
- valos/Komikku
-
+
+ cyber+gentoo@sysrq.in
+ Anna
+
+
+ valos/Komikku
+
diff --git a/profiles/package.mask b/profiles/package.mask
index c86cb4887a..0f3639a2ba 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -13,3 +13,7 @@
# sfeed_curses has been merged to sfeed and is available via ncurses USEFLAG.
# removal in 30 days.
net-news/sfeed_curses
+
+# Anna (cybertailor) Vyalkova (2022-01-09)
+# Depends on masked libhandy 1.5.0
+>=app-text/komikku-0.36.0