8 files changed, 90 insertions, 166 deletions
diff --git a/www-misc/kiwix-desktop/Manifest b/www-misc/kiwix-desktop/Manifest
index a3276a059..b9ce03d55 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 668e38ca8..000000000
--- 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 <mgautier@kymeria.fr>
-Date: Thu, 9 Feb 2023 09:47:47 +0100
-Subject: [PATCH] With last version of libkiwix, Downloader now return
- shared_ptr<Download>.
-
----
- 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<kiwix::Download> 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<kiwix::Download> download;
-     try {
-         std::pair<std::string, std::string> downloadDir("dir", downloadPath.toStdString());
-         const std::vector<std::pair<std::string, std::string>> 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 b3b4f168e..000000000
--- 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 000000000..e719bebe8
--- /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 d515fe8e6..81d53a2be 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 801529f5e..000000000
--- 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 88cb5351a..000000000
--- 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 000000000..5008e9d5c
--- /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
+}