diff --git a/dev-cpp/wt/wt-4.11.1.ebuild b/dev-cpp/wt/wt-4.11.1.ebuild
index f9e0dc151e..ce1453eaaa 100644
--- a/dev-cpp/wt/wt-4.11.1.ebuild
+++ b/dev-cpp/wt/wt-4.11.1.ebuild
@@ -21,7 +21,7 @@ DEPEND="
pango? ( x11-libs/pango )
postgres? ( dev-db/postgresql )
ssl? ( dev-libs/openssl )
- dev-libs/boost:=
+ <=dev-libs/boost-1.86.0:=
media-libs/libharu
media-gfx/graphicsmagick[jpeg,png]
sys-libs/zlib
diff --git a/dev-python/betamax-serializers/Manifest b/dev-python/betamax-serializers/Manifest
deleted file mode 100644
index e93e9eec88..0000000000
--- a/dev-python/betamax-serializers/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST betamax-serializers-0.2.1.tar.gz 3261 BLAKE2B 802a797c480ce0db4f1c84a9579c004699edddf1659e49a191835474a9fa500718a79b371ee0b510387fdf009935e761616cd6c17c427ae091897e6ffd681a52 SHA512 0297b91a0a5af17e02ec663151458df5721d5c773febc891985191dccea36ba349e81d39a5884e662c3b7b8899d1fd252a890970b6099d98bfa0aaab8f2b909f
diff --git a/dev-python/betamax-serializers/betamax-serializers-0.2.1.ebuild b/dev-python/betamax-serializers/betamax-serializers-0.2.1.ebuild
deleted file mode 100644
index 2cf15548dd..0000000000
--- a/dev-python/betamax-serializers/betamax-serializers-0.2.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-inherit distutils-r1 optfeature pypi
-
-DESCRIPTION="A set of third-party serializers for Betamax"
-HOMEPAGE="https://pypi.org/project/betamax-serializers/ https://gitlab.com/betamax/serializers"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-python/betamax[${PYTHON_USEDEP}]"
-
-DOCS=( {AUTHORS,HISTORY,README}.rst )
-
-pkg_postinst() {
- optfeature "YAML serializer support" dev-python/pyyaml
-}
diff --git a/dev-python/betamax-serializers/metadata.xml b/dev-python/betamax-serializers/metadata.xml
deleted file mode 100644
index df2a59bc23..0000000000
--- a/dev-python/betamax-serializers/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
- graffatcolmingov@gmail.com
- Ian Cordasco
-
- betamax-serializers
- betamax/serializers
- https://pypi.org/rss/project/betamax-serializers/releases.xml
-
-
diff --git a/dev-python/praw/Manifest b/dev-python/praw/Manifest
deleted file mode 100644
index 76b176036a..0000000000
--- a/dev-python/praw/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST praw-7.6.1.gh.tar.gz 25083372 BLAKE2B eab92be89585bbe485b4d51c1c3c15def597b3a5cdb1326cf166931e4be22bea2975c76c48c8b673b30945ec5b559efba84d0310eebbdaa2881a37e30351af31 SHA512 91fa6efe0ea56d53ea49df8c1046ff620571d9dc80e6fdc5a5da3651cd24d7553455b62d02db8e37531a7bf34be0fbbc8c9555281b4887b73e9b8758966db55a
-DIST praw-7.7.0.gh.tar.gz 25092955 BLAKE2B e50a20b6d8fc58214480b9edb91a332a9e50626aeb67155298f1746b2615852bc89d3e338d120d2910c93f1713302f41754f5f87259388c9fedd1c358e65dd63 SHA512 40a8882cdcaa10f538f9cf9552414184050b16008eed4c4e31fc52dfc0d337daad6bd1041d462d26476c692ae8997f675cf5ce2630d8d8be091023b7deb98181
diff --git a/dev-python/praw/metadata.xml b/dev-python/praw/metadata.xml
deleted file mode 100644
index 7944f4d94e..0000000000
--- a/dev-python/praw/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
- bbzbryce@gmail.com
- Bryce Boe
-
- praw
- praw-dev/praw
- https://pypi.org/rss/project/praw/releases.xml
- https://praw.readthedocs.io
-
-
diff --git a/dev-python/praw/praw-7.6.1.ebuild b/dev-python/praw/praw-7.6.1.ebuild
deleted file mode 100644
index b775ae5365..0000000000
--- a/dev-python/praw/praw-7.6.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="Python Reddit API Wrapper"
-HOMEPAGE="
- https://pypi.org/project/praw/
- https://github.com/praw-dev/praw
-"
-SRC_URI="https://github.com/praw-dev/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DOCS=( {AUTHORS,CHANGES,README}.rst SECURITY.md )
-
-RDEPEND="
- ${P}.gh.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DOCS=( {AUTHORS,CHANGES,README}.rst SECURITY.md )
-
-RDEPEND="
-
-
-
-
-
-
- bbzbryce@gmail.com
- Bryce Boe
-
- prawcore
- praw-dev/prawcore
- https://pypi.org/rss/project/prawcore/releases.xml
-
-
diff --git a/dev-python/prawcore/prawcore-2.3.0.ebuild b/dev-python/prawcore/prawcore-2.3.0.ebuild
deleted file mode 100644
index 59d24eedee..0000000000
--- a/dev-python/prawcore/prawcore-2.3.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1 pypi
-
-DESCRIPTION="Low-level communication layer for PRAW"
-HOMEPAGE="
- https://pypi.org/project/prawcore/
- https://github.com/praw-dev/prawcore
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# Tests require
-
-
-
- davidroman96@gmail.com
- David Roman
-
-
- pytest-flask
-
-
diff --git a/dev-python/pytest-flask/pytest-flask-1.3.0.ebuild b/dev-python/pytest-flask/pytest-flask-1.3.0.ebuild
deleted file mode 100644
index 09aa38167a..0000000000
--- a/dev-python/pytest-flask/pytest-flask-1.3.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{11,12} pypy3 )
-inherit distutils-r1 pypi
-
-DESCRIPTION="A set of pytest fixtures to test Flask applications "
-HOMEPAGE="http://pytest-flask.readthedocs.org"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-RDEPEND="
- dev-python/flask[${PYTHON_USEDEP}]
- dev-python/werkzeug[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
- test? (
- dev-python/mock[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/sphinx-rtd-dark-mode/Manifest b/dev-python/sphinx-rtd-dark-mode/Manifest
deleted file mode 100644
index 96deecacb4..0000000000
--- a/dev-python/sphinx-rtd-dark-mode/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST sphinx-rtd-dark-mode-1.2.4.gh.tar.gz 9964 BLAKE2B 7aa68205af0578b841d35e7d7ccc8278060eafa13a598889dde6e75c3b27f606ffd7eac0c4bcc946b7e83bd2099e83c5b212768f230cabfcc6a8a0248b8f8ebc SHA512 729fa42c813bdcde8f10633aef54ac55b7ae0c20d67d376141236c3bc96731de3d42c9b890f1314527a2f0faf7de30101d769235b97b53456b6291f4137f9e75
diff --git a/dev-python/sphinx-rtd-dark-mode/metadata.xml b/dev-python/sphinx-rtd-dark-mode/metadata.xml
deleted file mode 100644
index f3192a85dc..0000000000
--- a/dev-python/sphinx-rtd-dark-mode/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
- sphinx-rtd-dark-mode
- MrDogeBro/sphinx_rtd_dark_mode
-
-
diff --git a/dev-python/sphinx-rtd-dark-mode/sphinx-rtd-dark-mode-1.2.4.ebuild b/dev-python/sphinx-rtd-dark-mode/sphinx-rtd-dark-mode-1.2.4.ebuild
deleted file mode 100644
index f6a045dbea..0000000000
--- a/dev-python/sphinx-rtd-dark-mode/sphinx-rtd-dark-mode-1.2.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-MY_PN="sphinx_rtd_dark_mode"
-DESCRIPTION="Dark mode for the Sphinx Read the Docs theme"
-HOMEPAGE="
- https://pypi.org/project/sphinx-rtd-dark-mode/
- https://github.com/MrDogeBro/sphinx_rtd_dark_mode
-"
-SRC_URI="https://github.com/MrDogeBro/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]"
-BDEPEND="
- test? (
- dev-python/sphinx[${PYTHON_USEDEP}]
- )
-"
-
-DOCS=( {CONTRIBUTING,README}.md )
-
-distutils_enable_tests pytest
-
-python_test() {
- epytest tests/build.py
-}
diff --git a/net-misc/giara/Manifest b/net-misc/giara/Manifest
deleted file mode 100644
index e6720c8594..0000000000
--- a/net-misc/giara/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST giara-1.0.1.tar.bz2 152103 BLAKE2B 615724317b29b1ba0743edbd9bc0190ec1647ef61aff02aa833d6fe19c375afda3bcc8293f38cb067d31d71b8e269ffca510320f275ebca9b803d9096f470608 SHA512 75cc9ce9fb2baea5919c8da4f1a18d73602a753ee92e9ad660814b5c97f879b04474f338f2b4c91336fae9b1469e78bfc68ccb78ddd17af459276bd13042c6ac
-DIST giara-1.1.0.tar.bz2 160995 BLAKE2B bbaaeccd05ca51236447faec1839c87adbd4acf0ef24cf5f644aaa8e8d254b916ee948c96bd469ed0fd0214f416c09bf63384b41ed78694ae63b840f8f6df97d SHA512 60dee316f5fdd93787cac05844436aa53649f7304528f086dbdfa7f486b2adbcaf1f3d4440bd6bc9bdfea33acf2504ffc567200110b4f90df29758b146559fa6
diff --git a/net-misc/giara/giara-1.0.1.ebuild b/net-misc/giara/giara-1.0.1.ebuild
deleted file mode 100644
index 272088fed0..0000000000
--- a/net-misc/giara/giara-1.0.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-inherit gnome2-utils meson python-single-r1 xdg
-
-DESCRIPTION="An app for Reddit"
-HOMEPAGE="https://giara.gabmus.org https://gitlab.gnome.org/World/giara"
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://gitlab.gnome.org/World/${PN}.git"
-else
- SRC_URI="https://gitlab.gnome.org/World/${PN}/-/archive/${PV}/${P}.tar.bz2"
- KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
- ${PYTHON_DEPS}
- dev-libs/glib:2
- dev-libs/gobject-introspection[${PYTHON_SINGLE_USEDEP}]
- gui-libs/gtk:4[introspection(+)]
- gui-libs/gtksourceview:5[introspection(+)]
- gui-libs/libadwaita:1[introspection(+)]
- $(python_gen_cond_dep '
- dev-python/beautifulsoup4[${PYTHON_USEDEP}]
- dev-python/mistune[${PYTHON_USEDEP}]
- dev-python/pillow[${PYTHON_USEDEP}]
- dev-python/praw[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- ')
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-util/blueprint-compiler
- sys-devel/gettext
-"
-
-src_prepare() {
- default
-
- # fix broken shebang
- sed "s|py_installation.full_path()|'${PYTHON}'|" -i bin/meson.build || die
-}
-
-# skip AppStream test
-src_test() {
-:
-}
-
-src_install() {
- meson_src_install
- python_optimize
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
-}
diff --git a/net-misc/giara/giara-1.1.0.ebuild b/net-misc/giara/giara-1.1.0.ebuild
deleted file mode 100644
index 28b3874086..0000000000
--- a/net-misc/giara/giara-1.1.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-inherit gnome2-utils meson python-single-r1 xdg
-
-DESCRIPTION="An app for Reddit"
-HOMEPAGE="https://giara.gabmus.org https://gitlab.gnome.org/World/giara"
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://gitlab.gnome.org/World/${PN}.git"
-else
- SRC_URI="https://gitlab.gnome.org/World/${PN}/-/archive/${PV}/${P}.tar.bz2"
- KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
- ${PYTHON_DEPS}
- dev-libs/glib:2
- dev-libs/gobject-introspection
- >=gui-libs/gtk-4.10:4[introspection]
- gui-libs/gtksourceview:5[introspection]
- >=gui-libs/libadwaita-1.3:1[introspection]
- $(python_gen_cond_dep '
- dev-python/beautifulsoup4[${PYTHON_USEDEP}]
- dev-python/mistune[${PYTHON_USEDEP}]
- dev-python/pillow[${PYTHON_USEDEP}]
- dev-python/praw[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- ')
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-util/blueprint-compiler
- sys-devel/gettext
-"
-
-src_prepare() {
- default
-
- # fix broken shebang
- sed "s|py_installation.full_path()|'${PYTHON}'|" -i bin/meson.build || die
-}
-
-# skip AppStream test
-src_test() {
-:
-}
-
-src_install() {
- meson_src_install
- python_optimize
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
-}
diff --git a/net-misc/giara/metadata.xml b/net-misc/giara/metadata.xml
deleted file mode 100644
index 4df6a30973..0000000000
--- a/net-misc/giara/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
- Gabriele Musco
- gabmus@disroot.org
-
- World/giara
-
-
diff --git a/net-wireless/easyroam-desktop/easyroam-desktop-1.3.5.ebuild b/net-wireless/easyroam-desktop/easyroam-desktop-1.3.5-r1.ebuild
similarity index 82%
rename from net-wireless/easyroam-desktop/easyroam-desktop-1.3.5.ebuild
rename to net-wireless/easyroam-desktop/easyroam-desktop-1.3.5-r1.ebuild
index 6dffff5896..8dbdad4906 100644
--- a/net-wireless/easyroam-desktop/easyroam-desktop-1.3.5.ebuild
+++ b/net-wireless/easyroam-desktop/easyroam-desktop-1.3.5-r1.ebuild
@@ -3,18 +3,24 @@
EAPI=8
-inherit unpacker
+inherit unpacker xdg-utils
DESCRIPTION="Easily connect your device to eduroamĀ®."
HOMEPAGE="https://www.easyroam.de/"
SRC_URI="https://packages.easyroam.de/repos/easyroam-desktop/pool/main/e/easyroam-desktop/easyroam_connect_desktop-${PV}+${PV}-linux.deb"
+QA_FLAGS_IGNORED=".*"
+
S="${WORKDIR}"
LICENSE="all-rights-reserved"
SLOT="0"
KEYWORDS="-* amd64"
+PATCHES=(
+ "${FILESDIR}"/0001-fix-desktop-file.patch
+)
+
RDEPEND="
dev-libs/glib
x11-libs/gtk+
@@ -39,3 +45,11 @@ src_prepare() {
src_install() {
mv "${S}/usr" "${D}/"
}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+}
diff --git a/net-wireless/easyroam-desktop/files/0001-fix-desktop-file.patch b/net-wireless/easyroam-desktop/files/0001-fix-desktop-file.patch
new file mode 100644
index 0000000000..ba8a138804
--- /dev/null
+++ b/net-wireless/easyroam-desktop/files/0001-fix-desktop-file.patch
@@ -0,0 +1,18 @@
+diff --git a/usr/share/applications/easyroam_connect_desktop.desktop b/usr/share/applications/easyroam_connect_desktop.desktop
+index af29159..58ff457 100644
+--- a/usr/share/applications/easyroam_connect_desktop.desktop
++++ b/usr/share/applications/easyroam_connect_desktop.desktop
+@@ -1,10 +1,10 @@
+ [Desktop Entry]
+ Type=Application
+-Version=1.3.5
++Version=1.0
+ Name=Easyroam
+ GenericName=wifi profile installer
+ Icon=easyroam_connect_desktop
+ Exec=/usr/share/easyroam_connect_desktop/easyroam_connect_desktop %U
+ Categories=Utility;
+ Keywords=easyroam;eduroam;Easyroam;Eduroam;
+-StartupNotify=true
+\ No newline at end of file
++StartupNotify=true
diff --git a/profiles/package.mask b/profiles/package.mask
index 093ec284da..b5fbcc33ca 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -76,17 +76,6 @@ media-fonts/symbola
# Removal on 2024-12-20
dev-python/kurbopy
-# Takuya Wakazono (2024-11-18)
-# Upstream is dead because of the Reddit API changes.
-# Official Flathub page is gone as well.
-# https://gitlab.gnome.org/World/giara/-/issues/130
-# Removal on 2024-12-18. Bug #922029.
-net-misc/giara
-dev-python/praw
-dev-python/prawcore
-dev-python/sphinx-rtd-dark-mode
-dev-python/betamax-serializers
-
# Julien Roy (2024-11-15)
# >=x11-themes/adw-gtk3-5.4 requires >=gui-libs/gtk-4.16
# which is not packaged in ::gentoo
diff --git a/www-misc/kiwix-desktop/Manifest b/www-misc/kiwix-desktop/Manifest
index a3276a0595..b9ce03d558 100644
--- a/www-misc/kiwix-desktop/Manifest
+++ b/www-misc/kiwix-desktop/Manifest
@@ -1 +1 @@
-DIST kiwix-desktop-2.3.1.tar.gz 525090 BLAKE2B 3f2bc6d49f383e754438dfee260b3aa1a09040b9b543b1abc8acc0aa4531e84c350e014f98951409b292ed7e9fa2285733d98237b0ff3b4175de8e8f269cac1f SHA512 09d4c2293fc36ac0b03c815474f5f60881093552fd7d1d0940858254c16d7b6021bd05f4f985b32401328705082f07fbd72e92f79bb1365650f5dd75d455f0b8
+DIST kiwix-desktop-2.4.0.tar.gz 671550 BLAKE2B 30374c6836a2144dbeae724ff6a21602529fbeb285b47aeccdc4e2d2950a0048aa5691ce8534502fce80e4fc789743c1c786c0dc57cd06ce9a44f0adf8e0deef SHA512 e59957ba34a2d04c0fb63651ec30c9acc585755859aa53b8f96a84c62172b4dbf52d4ace7690ff2c5e478fc661c7014164985a6767847b8d11bcef00ab025d8f
diff --git a/www-misc/kiwix-desktop/files/kiwix-desktop-2.3.1-shared_ptr.patch b/www-misc/kiwix-desktop/files/kiwix-desktop-2.3.1-shared_ptr.patch
deleted file mode 100644
index 668e38ca83..0000000000
--- a/www-misc/kiwix-desktop/files/kiwix-desktop-2.3.1-shared_ptr.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 1b322d8f01c787846546a6473f153cf1daa41e65 Mon Sep 17 00:00:00 2001
-From: Matthieu Gautier
-Date: Thu, 9 Feb 2023 09:47:47 +0100
-Subject: [PATCH] With last version of libkiwix, Downloader now return
- shared_ptr.
-
----
- src/contentmanager.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/contentmanager.cpp b/src/contentmanager.cpp
-index c2f4ff98..d4db50a0 100644
---- a/src/contentmanager.cpp
-+++ b/src/contentmanager.cpp
-@@ -173,7 +173,7 @@ QStringList ContentManager::updateDownloadInfos(QString id, const QStringList &k
- return values;
- }
- auto& b = mp_library->getBookById(id);
-- kiwix::Download* d;
-+ std::shared_ptr d;
- try {
- d = mp_downloader->getDownload(b.getDownloadId());
- } catch(...) {
-@@ -270,7 +270,7 @@ QString ContentManager::downloadBook(const QString &id)
- for (auto b : booksList)
- if (b.toStdString() == book.getId())
- return "";
-- kiwix::Download *download;
-+ std::shared_ptr download;
- try {
- std::pair downloadDir("dir", downloadPath.toStdString());
- const std::vector> options = { downloadDir };
diff --git a/www-misc/kiwix-desktop/kiwix-desktop-2.3.1.ebuild b/www-misc/kiwix-desktop/kiwix-desktop-2.3.1.ebuild
deleted file mode 100644
index b3b4f168ef..0000000000
--- a/www-misc/kiwix-desktop/kiwix-desktop-2.3.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qmake-utils
-
-DESCRIPTION="cross-platform viewer/manager for ZIM archives"
-HOMEPAGE="https://kiwix.org/"
-SRC_URI="https://github.com/kiwix/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtimageformats:5
- dev-qt/qtsvg:5
- dev-qt/qtwebengine:5
- =www-misc/libkiwix-12.1.0*:=
-
-"
-BDEPEND="app-arch/unzip"
-
-PATCHES=(
- "${FILESDIR}/kiwix-desktop-2.3.1-shared_ptr.patch"
-)
-
-src_compile() {
- eqmake5 PREFIX=/usr .
- emake
-}
-
-src_install() {
- emake install INSTALL_ROOT="${ED}"
-}
diff --git a/www-misc/kiwix-desktop/kiwix-desktop-2.4.0.ebuild b/www-misc/kiwix-desktop/kiwix-desktop-2.4.0.ebuild
new file mode 100644
index 0000000000..e719bebe89
--- /dev/null
+++ b/www-misc/kiwix-desktop/kiwix-desktop-2.4.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qmake-utils xdg
+
+DESCRIPTION="cross-platform viewer/manager for ZIM archives"
+HOMEPAGE="https://kiwix.org/"
+SRC_URI="https://github.com/kiwix/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+ app-arch/libzim
+ dev-qt/qtbase:6[gui,network,widgets]
+ dev-qt/qtimageformats:6
+ dev-qt/qtsvg:6
+ dev-qt/qtwebchannel:6
+ dev-qt/qtwebengine:6[widgets]
+ >=www-misc/libkiwix-14.0.0:=
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ default
+ sed -i '/-Werror/d' kiwix-desktop.pro || die
+}
+src_configure() {
+ eqmake6 PREFIX="${EPREFIX}/usr"
+}
+
+src_install() {
+ emake install INSTALL_ROOT="${ED}"
+}
diff --git a/www-misc/libkiwix/Manifest b/www-misc/libkiwix/Manifest
index d515fe8e68..81d53a2be2 100644
--- a/www-misc/libkiwix/Manifest
+++ b/www-misc/libkiwix/Manifest
@@ -1,2 +1 @@
-DIST libkiwix-12.1.0.tar.gz 1098820 BLAKE2B 4dc0fa936daa1693bb398d18588d65bb22e9c60c7246eaa77c0fc198fa4d818c0a3e821e629134601aca9104d131a824677ec4f0ec785f1298cfc760c458c7f8 SHA512 9d4df7e46693a5aec545087ce37a2e83dfa3173a98e9d64cbbf364e1fd31143c30e856973cf12b0a2f608661d78a9453d8b748680c01f48e1df375c7b2b909d5
-DIST libkiwix-13.1.0.tar.gz 1136812 BLAKE2B 59d6cb91a61f89904b96ea3e8de531dd5dc44937233df86d4d8e834b8576d3fab39e514eab86a128b714537f58d46c21d2c2c228fc57d4ba4e5dbc43117a474a SHA512 f1ecd14117e6805011dbcc3ec682ea330194433587224f2cc0874d6c9534d948fa1514d9c6c311c022372ab43456e3f5f1bdbf0fb0ef562fcfcfe20696048ade
+DIST libkiwix-14.0.0.tar.gz 1149884 BLAKE2B f7a7a263dbbccacd4f3d922d4dfb0c347015ef9fb098c168e96c73b39175b381fe4eef9d0226820397aca37aa75f479a42bddff9d4e9ea59803532949e2e1bd5 SHA512 c0a6675e5add7221b812cdc91bd6212169922be6aea9cdcce34ec10328ae72ce5bc4eb218533172e6e926e58e9c683151b8ef13a489af0712f4c4c067d806e63
diff --git a/www-misc/libkiwix/libkiwix-12.1.0-r1.ebuild b/www-misc/libkiwix/libkiwix-12.1.0-r1.ebuild
deleted file mode 100644
index 801529f5e7..0000000000
--- a/www-misc/libkiwix/libkiwix-12.1.0-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson
-
-DESCRIPTION="Kiwix software suite core: code shared by all Kiwix ports"
-HOMEPAGE="https://kiwix.org/"
-SRC_URI="https://github.com/kiwix/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/libkiwix-${PV}"
-
-LICENSE="GPL-3"
-SLOT="0/12"
-KEYWORDS="~amd64"
-
-RDEPEND="
- net-misc/aria2[bittorrent,metalink,xmlrpc]
-"
-
-DEPEND="
- >=app-arch/libzim-8.1.0:=
- >=dev-cpp/mustache-4.1
- dev-libs/icu
- dev-libs/pugixml
- net-libs/libmicrohttpd
- net-misc/curl
- sys-libs/zlib
-"
-
-src_prepare() {
- default
-
- # disable tests
- sed -i \
- -e "/subdir('test')/d" \
- meson.build || die
-}
-
-src_configure() {
- local emesonargs=(
- -Dwerror=false
- )
-
- meson_src_configure
-}
diff --git a/www-misc/libkiwix/libkiwix-13.1.0.ebuild b/www-misc/libkiwix/libkiwix-13.1.0.ebuild
deleted file mode 100644
index 88cb5351a9..0000000000
--- a/www-misc/libkiwix/libkiwix-13.1.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson
-
-DESCRIPTION="Kiwix software suite core: code shared by all Kiwix ports"
-HOMEPAGE="https://kiwix.org/"
-SRC_URI="https://github.com/kiwix/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/libkiwix-${PV}"
-
-LICENSE="GPL-3"
-SLOT="0/12"
-
-KEYWORDS="~amd64"
-
-RDEPEND="
- net-misc/aria2[bittorrent,metalink,xmlrpc]
-"
-
-DEPEND="
- >=app-arch/libzim-8.1.0:=
- >=dev-cpp/mustache-4.1
- dev-libs/icu
- dev-libs/pugixml
- net-libs/libmicrohttpd
- net-misc/curl
- sys-libs/zlib
-"
-
-src_prepare() {
- default
-
- # disable tests
- sed -i \
- -e "/subdir('test')/d" \
- meson.build || die
-}
-
-src_configure() {
- local emesonargs=(
- -Dwerror=false
- )
-
- meson_src_configure
-}
diff --git a/www-misc/libkiwix/libkiwix-14.0.0.ebuild b/www-misc/libkiwix/libkiwix-14.0.0.ebuild
new file mode 100644
index 0000000000..5008e9d5c1
--- /dev/null
+++ b/www-misc/libkiwix/libkiwix-14.0.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..13} )
+
+inherit meson python-any-r1
+
+DESCRIPTION="Kiwix software suite core: code shared by all Kiwix ports"
+HOMEPAGE="https://kiwix.org/"
+SRC_URI="https://github.com/kiwix/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0/14"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ >=app-arch/libzim-9.0.0
+ dev-libs/icu:=
+ dev-libs/pugixml
+ dev-libs/xapian:=
+ net-libs/libmicrohttpd:=
+ net-misc/curl
+ sys-libs/zlib
+"
+RDEPEND="
+ ${COMMON_DEPEND}
+ net-misc/aria2[bittorrent,metalink,xmlrpc]
+"
+DEPEND="
+ ${COMMON_DEPEND}
+ >=dev-cpp/mustache-4.1
+"
+BDEPEND="
+ ${PYTHON_DEPS}
+ test? ( dev-cpp/gtest )
+"
+
+src_prepare() {
+ default
+
+ # requires PROPERTIES="test_network"
+ sed -i '/^if build_machine.system/,/endif/d' test/meson.build || die
+
+ if ! use test; then
+ sed -i "/subdir('test')/d" meson.build || die
+ fi
+}