From 0fbcd6feec6a04a6fed514d2d5346870b2345a3d Mon Sep 17 00:00:00 2001
From: Takuya Wakazono <pastalian46@gmail.com>
Date: Wed, 19 Jun 2024 23:03:24 +0900
Subject: [PATCH 01/25] dev-python/jsonpath-rw-ext: treeclean

Bug: https://bugs.gentoo.org/932269
Signed-off-by: Takuya Wakazono <pastalian46@gmail.com>
---
 dev-python/jsonpath-rw-ext/Manifest           |  1 -
 .../jsonpath-rw-ext-1.2.2-r1.ebuild           | 40 -------------------
 dev-python/jsonpath-rw-ext/metadata.xml       | 10 -----
 profiles/package.mask                         |  1 -
 4 files changed, 52 deletions(-)
 delete mode 100644 dev-python/jsonpath-rw-ext/Manifest
 delete mode 100644 dev-python/jsonpath-rw-ext/jsonpath-rw-ext-1.2.2-r1.ebuild
 delete mode 100644 dev-python/jsonpath-rw-ext/metadata.xml

diff --git a/dev-python/jsonpath-rw-ext/Manifest b/dev-python/jsonpath-rw-ext/Manifest
deleted file mode 100644
index e8a03f93b9..0000000000
--- a/dev-python/jsonpath-rw-ext/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jsonpath-rw-ext-1.2.2.tar.gz 20581 BLAKE2B eec62ee71fd234d5f7b8d2e091bdbf8b4bb2ec2780730b8ef77a466111b2fb3cbfc89b84c9e7905b53315150a28d4d84e7f251970d3a9b9002a5dbadf08b45b0 SHA512 28ca708023a942665c946d3e0ec618488f7d30d832e4ad0748d6c7019849f2ad19e3629c4452ab461b9c14d71f3360a4590357637f95ea44f8bc3b4544d5e0af
diff --git a/dev-python/jsonpath-rw-ext/jsonpath-rw-ext-1.2.2-r1.ebuild b/dev-python/jsonpath-rw-ext/jsonpath-rw-ext-1.2.2-r1.ebuild
deleted file mode 100644
index d7754b7901..0000000000
--- a/dev-python/jsonpath-rw-ext/jsonpath-rw-ext-1.2.2-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2024 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_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Extensions for JSONPath RW"
-HOMEPAGE="
-	https://pypi.org/project/jsonpath-rw-ext/
-	https://github.com/sileht/python-jsonpath-rw-ext
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/pbr-1.8[${PYTHON_USEDEP}]
-	>=dev-python/jsonpath-rw-1.2.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	test? (
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_DESELECT=(
-	jsonpath_rw_ext/tests/test_jsonpath_rw_ext.py::TestJsonpath_rw_ext::test_fields_value
-	jsonpath_rw_ext/tests/test_jsonpath_rw_ext.py::TestJsonpath_rw_ext::test_shortcut_functions
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/jsonpath-rw-ext/metadata.xml b/dev-python/jsonpath-rw-ext/metadata.xml
deleted file mode 100644
index 9281771223..0000000000
--- a/dev-python/jsonpath-rw-ext/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <bugs-to>https://github.com/sileht/python-jsonpath-rw-ext/issues</bugs-to>
-    <remote-id type="pypi">jsonpath-rw-ext</remote-id>
-    <remote-id type="github">sileht/python-jsonpath-rw-ext</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/profiles/package.mask b/profiles/package.mask
index bd8ebce852..e8826bf06e 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -58,7 +58,6 @@ net-p2p/ipfs-cluster
 # Inactive upstream. No revdeps.
 # Removal on 2024/06/19
 dev-python/jsonpath-rw
-dev-python/jsonpath-rw-ext
 
 # Julien Roy <julien@jroy.ca> (2024-03-21)
 # sys-libs/libucontext is masked in ::gentoo

From b50b705d0a1d747fdb4111175549a72ac622dc2b Mon Sep 17 00:00:00 2001
From: Takuya Wakazono <pastalian46@gmail.com>
Date: Wed, 19 Jun 2024 23:03:48 +0900
Subject: [PATCH 02/25] dev-python/jsonpath-rw: treeclean

Signed-off-by: Takuya Wakazono <pastalian46@gmail.com>
---
 dev-python/jsonpath-rw/Manifest               |  1 -
 .../jsonpath-rw/jsonpath-rw-1.4.0-r1.ebuild   | 30 -------------------
 dev-python/jsonpath-rw/metadata.xml           | 14 ---------
 profiles/package.mask                         |  5 ----
 4 files changed, 50 deletions(-)
 delete mode 100644 dev-python/jsonpath-rw/Manifest
 delete mode 100644 dev-python/jsonpath-rw/jsonpath-rw-1.4.0-r1.ebuild
 delete mode 100644 dev-python/jsonpath-rw/metadata.xml

diff --git a/dev-python/jsonpath-rw/Manifest b/dev-python/jsonpath-rw/Manifest
deleted file mode 100644
index 41d2fa2411..0000000000
--- a/dev-python/jsonpath-rw/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jsonpath-rw-1.4.0.gh.tar.gz 19813 BLAKE2B 2ee89864f38a6671ad593b5f056a19a794fcf6dd8dd56af1fbc709e50336ee5613c1144ec7f557d7380bed4eedd4ee7cc39f99ccb61dbc3a34c2e36641b183dc SHA512 8308e950f8b397e3ddd4120aa7794ab198d9f1a233c5fe16c2f393f1ba7e7e3bf289063a8b28f2425bfe0906be028f9bc1830779d09a56c306f2f102d26e6259
diff --git a/dev-python/jsonpath-rw/jsonpath-rw-1.4.0-r1.ebuild b/dev-python/jsonpath-rw/jsonpath-rw-1.4.0-r1.ebuild
deleted file mode 100644
index ba5376a1c3..0000000000
--- a/dev-python/jsonpath-rw/jsonpath-rw-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A robust and significantly extended implementation of JSONPath for Python"
-HOMEPAGE="
-	https://github.com/kennknowles/python-jsonpath-rw
-	https://pypi.org/project/jsonpath-rw/
-"
-SRC_URI="https://github.com/kennknowles/python-jsonpath-rw/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
-S="${WORKDIR}/python-${P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/ply[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests unittest
diff --git a/dev-python/jsonpath-rw/metadata.xml b/dev-python/jsonpath-rw/metadata.xml
deleted file mode 100644
index 870607e0ac..0000000000
--- a/dev-python/jsonpath-rw/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <bugs-to>https://github.com/kennknowles/python-jsonpath-rw/issues</bugs-to>
-    <remote-id type="pypi">jsonpath-rw</remote-id>
-    <remote-id type="github">kennknowles/python-jsonpath-rw</remote-id>
-    <maintainer status="unknown">
-      <email>kenn.knowles@gmail.com</email>
-      <name>Kenneth Knowles</name>
-    </maintainer>
-  </upstream>
-</pkgmetadata>
diff --git a/profiles/package.mask b/profiles/package.mask
index e8826bf06e..1b9e37e272 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -54,11 +54,6 @@ www-client/woob
 # Bug #884915, Removal on 2024/06/23
 net-p2p/ipfs-cluster
 
-# Takuya Wakazono <pastalian46@gmai.com> (2024-05-20)
-# Inactive upstream. No revdeps.
-# Removal on 2024/06/19
-dev-python/jsonpath-rw
-
 # Julien Roy <julien@jroy.ca> (2024-03-21)
 # sys-libs/libucontext is masked in ::gentoo
 sys-libs/gcompat

From 393e07c6b8b7eeda26b3960cfd355bfda631f6e1 Mon Sep 17 00:00:00 2001
From: Vitaly Zdanevich <zdanevich.vitaly@ya.ru>
Date: Thu, 20 Jun 2024 01:12:05 +0400
Subject: [PATCH 03/25] dev-cpp/mustache: new package

Copy from https://data.gpo.zugaina.org/stefantalpalaru/dev-cpp/mustache

Signed-off-by: Vitaly Zdanevich <zdanevich.vitaly@ya.ru>
---
 dev-cpp/mustache/Manifest            |  1 +
 dev-cpp/mustache/metadata.xml        | 11 +++++++++++
 dev-cpp/mustache/mustache-4.1.ebuild | 22 ++++++++++++++++++++++
 3 files changed, 34 insertions(+)
 create mode 100644 dev-cpp/mustache/Manifest
 create mode 100644 dev-cpp/mustache/metadata.xml
 create mode 100644 dev-cpp/mustache/mustache-4.1.ebuild

diff --git a/dev-cpp/mustache/Manifest b/dev-cpp/mustache/Manifest
new file mode 100644
index 0000000000..5302e8881c
--- /dev/null
+++ b/dev-cpp/mustache/Manifest
@@ -0,0 +1 @@
+DIST mustache-4.1.tar.gz 98905 BLAKE2B 1acf265ebc83881ac86c0db0a43c8a0984f2fc0bf70b4c946528e97a49feab7d1945272f3ed8e67087998db2594227776950319d5923cbd2aabafe672ed65ea3 SHA512 609c876fc085d1331355ec1f0396e588edf1fb3ea6765abcd06043cc5f7288f015d6bb7fdeb560df78aab54ae8d97e934375de577b944a09c9ae93f9915e7aff
diff --git a/dev-cpp/mustache/metadata.xml b/dev-cpp/mustache/metadata.xml
new file mode 100644
index 0000000000..518822031a
--- /dev/null
+++ b/dev-cpp/mustache/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>zdanevich.vitaly@ya.ru</email>
+		<name>Vitaly Zdanevich</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">nulloy/nulloy</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-cpp/mustache/mustache-4.1.ebuild b/dev-cpp/mustache/mustache-4.1.ebuild
new file mode 100644
index 0000000000..0f3d3ed2ac
--- /dev/null
+++ b/dev-cpp/mustache/mustache-4.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Mustache implementation for modern C++"
+HOMEPAGE="https://github.com/kainjow/Mustache"
+SRC_URI="https://github.com/kainjow/$PN/archive/v$PV.tar.gz -> $P.tar.gz"
+
+S="${WORKDIR}/Mustache-${PV}"
+LICENSE="Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+src_compile() {
+	:
+}
+
+src_install() {
+	insinto /usr/include
+	doins mustache.hpp
+}

From 818fbb349e767e0b56a63163ab0973c2691a4d30 Mon Sep 17 00:00:00 2001
From: Vitaly Zdanevich <zdanevich.vitaly@ya.ru>
Date: Thu, 20 Jun 2024 01:16:23 +0400
Subject: [PATCH 04/25] www-misc/libkiwix: new package

copy from https://data.gpo.zugaina.org/stefantalpalaru/www-misc/kiwix-lib

Signed-off-by: Vitaly Zdanevich <zdanevich.vitaly@ya.ru>
---
 www-misc/libkiwix/Manifest                  |  2 +
 www-misc/libkiwix/libkiwix-12.1.0-r1.ebuild | 46 ++++++++++++++++++++
 www-misc/libkiwix/libkiwix-13.1.0.ebuild    | 47 +++++++++++++++++++++
 www-misc/libkiwix/metadata.xml              | 11 +++++
 4 files changed, 106 insertions(+)
 create mode 100644 www-misc/libkiwix/Manifest
 create mode 100644 www-misc/libkiwix/libkiwix-12.1.0-r1.ebuild
 create mode 100644 www-misc/libkiwix/libkiwix-13.1.0.ebuild
 create mode 100644 www-misc/libkiwix/metadata.xml

diff --git a/www-misc/libkiwix/Manifest b/www-misc/libkiwix/Manifest
new file mode 100644
index 0000000000..d515fe8e68
--- /dev/null
+++ b/www-misc/libkiwix/Manifest
@@ -0,0 +1,2 @@
+DIST libkiwix-12.1.0.tar.gz 1098820 BLAKE2B 4dc0fa936daa1693bb398d18588d65bb22e9c60c7246eaa77c0fc198fa4d818c0a3e821e629134601aca9104d131a824677ec4f0ec785f1298cfc760c458c7f8 SHA512 9d4df7e46693a5aec545087ce37a2e83dfa3173a98e9d64cbbf364e1fd31143c30e856973cf12b0a2f608661d78a9453d8b748680c01f48e1df375c7b2b909d5
+DIST libkiwix-13.1.0.tar.gz 1136812 BLAKE2B 59d6cb91a61f89904b96ea3e8de531dd5dc44937233df86d4d8e834b8576d3fab39e514eab86a128b714537f58d46c21d2c2c228fc57d4ba4e5dbc43117a474a SHA512 f1ecd14117e6805011dbcc3ec682ea330194433587224f2cc0874d6c9534d948fa1514d9c6c311c022372ab43456e3f5f1bdbf0fb0ef562fcfcfe20696048ade
diff --git a/www-misc/libkiwix/libkiwix-12.1.0-r1.ebuild b/www-misc/libkiwix/libkiwix-12.1.0-r1.ebuild
new file mode 100644
index 0000000000..4a247f3fce
--- /dev/null
+++ b/www-misc/libkiwix/libkiwix-12.1.0-r1.ebuild
@@ -0,0 +1,46 @@
+# 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
new file mode 100644
index 0000000000..1322ee5194
--- /dev/null
+++ b/www-misc/libkiwix/libkiwix-13.1.0.ebuild
@@ -0,0 +1,47 @@
+# 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/metadata.xml b/www-misc/libkiwix/metadata.xml
new file mode 100644
index 0000000000..518822031a
--- /dev/null
+++ b/www-misc/libkiwix/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>zdanevich.vitaly@ya.ru</email>
+		<name>Vitaly Zdanevich</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">nulloy/nulloy</remote-id>
+	</upstream>
+</pkgmetadata>

From 159501c109f7100feb83457c6f23865ac31a71fc Mon Sep 17 00:00:00 2001
From: Vitaly Zdanevich <zdanevich.vitaly@ya.ru>
Date: Thu, 20 Jun 2024 01:19:53 +0400
Subject: [PATCH 05/25] www-misc/kiwix-desktop: new package

Copy from https://data.gpo.zugaina.org/salfter/www-misc/kiwix-desktop

Signed-off-by: Vitaly Zdanevich <zdanevich.vitaly@ya.ru>
---
 www-misc/kiwix-desktop/Manifest               |  1 +
 .../kiwix-desktop-2.3.1-shared_ptr.patch      | 32 ++++++++++++++++
 .../kiwix-desktop/kiwix-desktop-2.3.1.ebuild  | 38 +++++++++++++++++++
 www-misc/kiwix-desktop/metadata.xml           | 11 ++++++
 4 files changed, 82 insertions(+)
 create mode 100644 www-misc/kiwix-desktop/Manifest
 create mode 100644 www-misc/kiwix-desktop/files/kiwix-desktop-2.3.1-shared_ptr.patch
 create mode 100644 www-misc/kiwix-desktop/kiwix-desktop-2.3.1.ebuild
 create mode 100644 www-misc/kiwix-desktop/metadata.xml

diff --git a/www-misc/kiwix-desktop/Manifest b/www-misc/kiwix-desktop/Manifest
new file mode 100644
index 0000000000..a3276a0595
--- /dev/null
+++ b/www-misc/kiwix-desktop/Manifest
@@ -0,0 +1 @@
+DIST kiwix-desktop-2.3.1.tar.gz 525090 BLAKE2B 3f2bc6d49f383e754438dfee260b3aa1a09040b9b543b1abc8acc0aa4531e84c350e014f98951409b292ed7e9fa2285733d98237b0ff3b4175de8e8f269cac1f SHA512 09d4c2293fc36ac0b03c815474f5f60881093552fd7d1d0940858254c16d7b6021bd05f4f985b32401328705082f07fbd72e92f79bb1365650f5dd75d455f0b8
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
new file mode 100644
index 0000000000..668e38ca83
--- /dev/null
+++ b/www-misc/kiwix-desktop/files/kiwix-desktop-2.3.1-shared_ptr.patch
@@ -0,0 +1,32 @@
+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
new file mode 100644
index 0000000000..b3b4f168ef
--- /dev/null
+++ b/www-misc/kiwix-desktop/kiwix-desktop-2.3.1.ebuild
@@ -0,0 +1,38 @@
+# 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/metadata.xml b/www-misc/kiwix-desktop/metadata.xml
new file mode 100644
index 0000000000..c5bf8d8985
--- /dev/null
+++ b/www-misc/kiwix-desktop/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>zdanevich.vitaly@ya.ru</email>
+		<name>Vitaly Zdanevich</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">kiwix/kiwix-desktop</remote-id>
+	</upstream>
+</pkgmetadata>

From b4bd1ce5faf5fb40800100ad65fb11151168772f Mon Sep 17 00:00:00 2001
From: Eli Burch <eli.burch@burchbytes.com>
Date: Wed, 19 Jun 2024 16:31:56 -0700
Subject: [PATCH 06/25] profiles: Mask www-client/yandex-browser for now

Signed-off-by: Eli Burch <eli.burch@burchbytes.com>
---
 profiles/package.mask | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/profiles/package.mask b/profiles/package.mask
index 1b9e37e272..6ec652e328 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -18,6 +18,11 @@
 
 # New entries go on top.
 
+# Eli Burch <eli.burch@burchbytes.com> (2024-06-19)
+# Dependency media-video/ffmpeg-chromium:120 was dropped from ::gentoo,
+# causing pkgcheck to fail. Masking for now
+www-client/yandex-browser
+
 # Eli Burch <eli.burch@burchbytes.com> (2024-06-16)
 # Removal on 2024-07-16
 # Upstream is dead, and there is no replacement

From 456ac8caf516b42d7868470b67651098f03712c9 Mon Sep 17 00:00:00 2001
From: Lucio Sauer <watermanpaint@posteo.net>
Date: Thu, 13 Jun 2024 02:22:26 +0200
Subject: [PATCH 07/25] app-misc/anki-bin: add 24.06.2

Signed-off-by: Lucio Sauer <watermanpaint@posteo.net>
---
 app-misc/anki-bin/Manifest                |   7 ++
 app-misc/anki-bin/anki-bin-24.06.2.ebuild | 132 ++++++++++++++++++++++
 2 files changed, 139 insertions(+)
 create mode 100644 app-misc/anki-bin/anki-bin-24.06.2.ebuild

diff --git a/app-misc/anki-bin/Manifest b/app-misc/anki-bin/Manifest
index 82ca30cc30..8999f354be 100644
--- a/app-misc/anki-bin/Manifest
+++ b/app-misc/anki-bin/Manifest
@@ -1,7 +1,14 @@
 DIST anki-24.04.1-cp39-abi3-manylinux_2_28_x86_64.whl.zip 11236407 BLAKE2B fc69cc25645cc29c7d1b08f3d0496bcf31e5fbd487a2e5d3a836471e875292006f83091ee2ca317ef8072a179c059d90edcd71542e1ae28a5f6fa4d9962b76c3 SHA512 6e6c7f4bab8120364ee84fb445b0f289cc44693d3c13cd17b555f108e7fb4bfa1d08f5be41aef7e2ffd2372048d60a0cc94a5ec8eb8a1ef4254e83b0768a909c
+DIST anki-24.06.2-cp39-abi3-manylinux_2_28_x86_64.whl.zip 11280840 BLAKE2B 141ed3c5b5528d62f737bb5c8c1d3348be78030203b7c8bd86933bc55f99e3413ee71582b34105d1d4d0a089432128e1f24920117411a21c3f7a81a550f3496f SHA512 4dae14dbf6f7cf50c70ba5eebab3ad84c4f08c2571d2404d717a051c9e984c492a95f9fe7f11937c3714e3b33e65b17dd0482316c3bffd8af558ef63cf31f110
 DIST anki-bin-2.1.50.1 2212 BLAKE2B 18dba4d3f7210b1fa765490617c4290b7a0f37abd75df6fdb395ea758fa2557789f595e0c0470c918ee988dfa5270df48dda095e8f6dce2aad597b0bba23db50 SHA512 50ee6633758b028c54b899d70cf582c54d4fdbb7e13f10921303db3a84d325ac689b48dbf4a5f03584748e89ad7820e14cd4646d7a3fa97919496f48a99cdb05
 DIST anki-bin-2.1.50.desktop 458 BLAKE2B 7311e2ea71b40bd586a547a14316ca5447d582c046c3850ec5f63637640401fa53e8cdb8799ca8d6b169e38dae3e507946f4fbe5057c0d48e92729033fc6514b SHA512 4666f855e488c0f3cdf2d071aeb373cf8eff96eefe71eb7bb67344fed66150b821d83bed4d4ec2966f63d2a6ede1701f1b19236a6a72e3002e70d2f404d55220
 DIST anki-bin-2.1.50.png 34595 BLAKE2B 7b8adeece0d666f819d2e579d04f00102d6a28fe5915b2d13ae0bbf72671f95610d2bb47235509756684d38e4be495b41b6b5814fa0ee2b303adc1c78ed54b88 SHA512 c5051738be8c766629a0ec4cbf95c5f554e7bbca2fb5103b3545f2c34a6fcfd87c1384bbd5239199a8491fa46889b299f5f6e1f23988e271402239cdc2a0a9e7
 DIST anki-bin-2.1.50.xml 528 BLAKE2B 237497a01901ead3a48e0282a4a270c1eee2e121998aafb41740010ec36da4886fa01f471855aae841d27b492e31864878e4475fa3e6096d87a9270adf00ed7e SHA512 67f2f8679acbece2c3abbb9dacb3d6f6c7428388297d9354991aa099b2d0331d028fd0de50c83d48ae0591b0b4bb2f9076edfe7fea77fd5d7429a2b83bd0f2ce
 DIST anki-bin-2.1.50.xpm 6324 BLAKE2B 7dc61bb7a86323828f52f53194d36493f1c9355b1384a8b611829f7f2d97d844cf9d7358f8c352272440ace146593f417df261338cff4565fc3b4c0ca44e06bc SHA512 7e2821141522fe2afb07d2eca4013a0f170119856ba46bed0894c09d289133cdd64559df7e0cbcb56b73c5ee5a64215279101722865dede7982c8e6002da9d41
+DIST anki-bin-24.06.1 2212 BLAKE2B 18dba4d3f7210b1fa765490617c4290b7a0f37abd75df6fdb395ea758fa2557789f595e0c0470c918ee988dfa5270df48dda095e8f6dce2aad597b0bba23db50 SHA512 50ee6633758b028c54b899d70cf582c54d4fdbb7e13f10921303db3a84d325ac689b48dbf4a5f03584748e89ad7820e14cd4646d7a3fa97919496f48a99cdb05
+DIST anki-bin-24.06.desktop 478 BLAKE2B a42c1186a11cb5a6f9bc41be99e8fb62236148d69c467b174cd34fc865f7955bb71794258bedf6175d1ccd89a8439db721082e145731688f17d097f32be0c93d SHA512 0742596284a0198bdd51b281b4018cca517b89b276352f21d586bd4f3ec78c2991ce93081f46112ab9130378195050b2fc8b636d89d4bdf0872a1f9f369ee326
+DIST anki-bin-24.06.png 34595 BLAKE2B 7b8adeece0d666f819d2e579d04f00102d6a28fe5915b2d13ae0bbf72671f95610d2bb47235509756684d38e4be495b41b6b5814fa0ee2b303adc1c78ed54b88 SHA512 c5051738be8c766629a0ec4cbf95c5f554e7bbca2fb5103b3545f2c34a6fcfd87c1384bbd5239199a8491fa46889b299f5f6e1f23988e271402239cdc2a0a9e7
+DIST anki-bin-24.06.xml 528 BLAKE2B 237497a01901ead3a48e0282a4a270c1eee2e121998aafb41740010ec36da4886fa01f471855aae841d27b492e31864878e4475fa3e6096d87a9270adf00ed7e SHA512 67f2f8679acbece2c3abbb9dacb3d6f6c7428388297d9354991aa099b2d0331d028fd0de50c83d48ae0591b0b4bb2f9076edfe7fea77fd5d7429a2b83bd0f2ce
+DIST anki-bin-24.06.xpm 6324 BLAKE2B 7dc61bb7a86323828f52f53194d36493f1c9355b1384a8b611829f7f2d97d844cf9d7358f8c352272440ace146593f417df261338cff4565fc3b4c0ca44e06bc SHA512 7e2821141522fe2afb07d2eca4013a0f170119856ba46bed0894c09d289133cdd64559df7e0cbcb56b73c5ee5a64215279101722865dede7982c8e6002da9d41
 DIST aqt-24.04.1-py3-none-any.whl.zip 4644843 BLAKE2B bd26772de68e67a13ebba2fded6e0d8b2679ba1a50771b44ce16840fb5094bf168c6dc878aa5aadfd4836a6f697acbaeb63b7e5b6c1b0a0ad1ca0c5d541fd662 SHA512 de2eeb2d442786e1443971f83770401d383af80c10da3114b3cb9f9103e1c3a323def0a2998e3466440564dbad88b3c776555dae7224420d50a45de9706e6342
+DIST aqt-24.06.2-py3-none-any.whl.zip 13452151 BLAKE2B 72d0fc6ccd53bd73181afdc08bc8012737e56234c03f0a5c03c766adcbae46082d7a5aa498187b04dbc8266254aa89aa7e742f9923b7b561341c2f12574b2f59 SHA512 50be6d724e71531d12c9cf60634ad118effd09276c97642135dbdd2ca7793d3a98fc89458491538d6ca1dd4bc489a1f7f6c586c1c8f68044339078553bb7575a
diff --git a/app-misc/anki-bin/anki-bin-24.06.2.ebuild b/app-misc/anki-bin/anki-bin-24.06.2.ebuild
new file mode 100644
index 0000000000..31964206d1
--- /dev/null
+++ b/app-misc/anki-bin/anki-bin-24.06.2.ebuild
@@ -0,0 +1,132 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+### A NOTE REGARDING PYTHON COMPATABILITY ###
+# Anki-bin downloads a python 3.9 wheel. However the wheel used has only one native library _rsbridge.so
+# that is not linked against libpython.
+# The configuration with Python 3.{10..12} was tested on a limited number of machines and is not guaranteed to work.
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit desktop optfeature python-single-r1 pypi readme.gentoo-r1 xdg
+
+# bump to latest PV, where any of the miscellaneous files changed
+MY_PV=24.06
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="A spaced-repetition memory training program (flash cards)"
+HOMEPAGE="https://apps.ankiweb.net/"
+SRC_URI="
+	$(pypi_wheel_url --unpack anki ${PV} cp39 abi3-manylinux_2_28_x86_64)
+	$(pypi_wheel_url --unpack aqt ${PV})
+	https://raw.githubusercontent.com/ankitects/anki/${MY_PV}/qt/bundle/lin/anki.1 -> ${MY_P}.1
+	https://raw.githubusercontent.com/ankitects/anki/${MY_PV}/qt/bundle/lin/anki.desktop -> ${MY_P}.desktop
+	https://raw.githubusercontent.com/ankitects/anki/${MY_PV}/qt/bundle/lin/anki.png -> ${MY_P}.png
+	https://raw.githubusercontent.com/ankitects/anki/${MY_PV}/qt/bundle/lin/anki.xml -> ${MY_P}.xml
+	https://raw.githubusercontent.com/ankitects/anki/${MY_PV}/qt/bundle/lin/anki.xpm -> ${MY_P}.xpm
+"
+
+S="${WORKDIR}"
+
+# How to get an up-to-date summary of runtime JS libs' licenses:
+# ./node_modules/.bin/license-checker-rseidelsohn --production --excludePackages anki --summary
+LICENSE="0BSD AGPL-3+ BSD CC-BY-4.0 GPL-3+ Unlicense public-domain"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 CC0-1.0 ISC MIT
+	MPL-2.0 Unicode-DFS-2016 ZLIB
+"
+# Manually added crate licenses
+LICENSE+=" Unicode-3.0 openssl"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="qt6"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	app-misc/ca-certificates
+	$(python_gen_cond_dep '
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+		dev-python/distro[${PYTHON_USEDEP}]
+		dev-python/decorator[${PYTHON_USEDEP}]
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/flask-cors[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/markdown[${PYTHON_USEDEP}]
+		dev-python/protobuf-python[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/send2trash[${PYTHON_USEDEP}]
+		dev-python/waitress[${PYTHON_USEDEP}]')
+	qt6? (
+		dev-qt/qtsvg:6
+		$(python_gen_cond_dep '
+			>=dev-python/PyQt6-6.6.1[gui,network,opengl,quick,webchannel,widgets,${PYTHON_USEDEP}]
+			>=dev-python/PyQt6-sip-13.6.0[${PYTHON_USEDEP}]
+			>=dev-python/PyQt6-WebEngine-6.6.0[widgets,${PYTHON_USEDEP}]')
+	)
+	!qt6? (
+		dev-qt/qtgui:5[jpeg,png]
+		dev-qt/qtsvg:5
+		$(python_gen_cond_dep '
+			>=dev-python/PyQt5-5.15.5[gui,network,webchannel,widgets,${PYTHON_USEDEP}]
+			>=dev-python/PyQt5-sip-12.9.0[${PYTHON_USEDEP}]
+			>=dev-python/PyQtWebEngine-5.15.5[${PYTHON_USEDEP}]')
+	)
+	${PYTHON_DEPS}
+	!app-misc/anki
+"
+BDEPEND="app-arch/unzip"
+
+PATCHES="${FILESDIR}"/${PN}-24.04.1-revert-cert-store-hack.patch
+
+QA_PREBUILT="usr/lib/*"
+
+src_prepare() {
+	default
+	# Anki's Qt detection mechanism falls back to Qt5 Python bindings, if Qt6
+	# Python bindings don't get imported successfully.
+	if ! use qt6; then
+		sed -i 's/import PyQt6/raise ImportError/' aqt/qt/__init__.py || die
+	fi
+}
+
+src_install() {
+	python_domodule anki {,_}aqt *.dist-info
+	printf "#!/usr/bin/python3\nimport sys;from aqt import run;sys.exit(run())" > runanki
+	python_newscript runanki anki
+	newicon "${DISTDIR}"/${MY_P}.png anki.png
+	newicon "${DISTDIR}"/${MY_P}.xpm anki.xpm
+	newmenu "${DISTDIR}"/${MY_P}.desktop anki.desktop
+	newman "${DISTDIR}"/${MY_P}.1 anki.1
+	insinto /usr/share/mime/packages
+	newins "${DISTDIR}"/${MY_P}.xml anki.xml
+
+	local DOC_CONTENTS="Users with add-ons that still rely on Anki's Qt5 GUI can either switch
+	to ${CATEGORY}/${PN}[-qt6], or temporarily set an environment variable
+	ENABLE_QT5_COMPAT to 1 to have Anki install the previous compatibility code.
+	The latter option has additional runtime dependencies. Please take a look
+	at this package's 'optional runtime features' for a complete listing.
+	\n\nIn an early 2024 update, ENABLE_QT5_COMPAT will be removed, so this is not a
+	long-term solution.
+	\n\nAnki's user manual is located online at https://docs.ankiweb.net/
+	\nAnki's add-on developer manual is located online at
+	https://addon-docs.ankiweb.net/"
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+	xdg_pkg_postinst
+	optfeature "LaTeX in cards" "app-text/texlive[extra] app-text/dvipng"
+	optfeature "sound support" media-video/mpv media-video/mplayer
+	optfeature "recording support" "media-sound/lame[frontend] dev-python/PyQt$(usex qt6 6 5)[multimedia]"
+	optfeature "faster database operations" dev-python/orjson
+	use qt6 && optfeature "compatibility with Qt5-dependent add-ons" dev-python/PyQt6[dbus,printsupport]
+	use qt6 && optfeature "Vulkan driver" "media-libs/vulkan-loader dev-qt/qtbase[vulkan]
+		dev-qt/qtdeclarative:6[vulkan] dev-qt/qtwebengine:6[vulkan]"
+
+	einfo "You can customize the LaTeX header for your cards to fit your needs:"
+	einfo "Notes > Manage Note Types > [select a note type] > Options"
+}

From d21398ca9b847f62f0de614459b291fd82fa52cd Mon Sep 17 00:00:00 2001
From: Viorel Munteanu <ceamac@gentoo.org>
Date: Thu, 20 Jun 2024 07:28:49 +0300
Subject: [PATCH 08/25] dev-python/survey: add 5.4.0

Signed-off-by: Viorel Munteanu <ceamac@gentoo.org>
---
 dev-python/survey/Manifest            |  1 +
 dev-python/survey/survey-5.4.0.ebuild | 35 +++++++++++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 dev-python/survey/survey-5.4.0.ebuild

diff --git a/dev-python/survey/Manifest b/dev-python/survey/Manifest
index 8311de32f9..b3e278ff91 100644
--- a/dev-python/survey/Manifest
+++ b/dev-python/survey/Manifest
@@ -1,2 +1,3 @@
 DIST survey-4.5.4.tar.gz 831109 BLAKE2B 00065211437f4c6c820aca5c511395625da7be9415218d6261005aff946b19a3e65cc31189a6aef755ed88ce81f309ac2eabe23ea7f1e2f359007b4fe9172f96 SHA512 045989ca95e3fa9a840ad8d37a040f46bf3f22a858dd7b826fecf88d4e53b6b14e285ef3bf266add496da2d5ffd58971c2456b4375362e24c1a071fc910a03f4
 DIST survey-5.3.1.gh.tar.gz 1564902 BLAKE2B de8bafd2fc5a683ca0364f9e1540e177bf2f10344406563ff3ef6723abd2c415517e72ffacccae51e1d69912b966bf678c2abc62b22545f1c5871d4f3459d121 SHA512 383d7339e93760294095881b6ebf3fd00d687210865303aa2c17a51a390f8087b8666364e0ba7b7657e009803665cf02e64f280c8a09a535ce1fa1ebeaafe963
+DIST survey-5.4.0.gh.tar.gz 1565353 BLAKE2B f020637b23274314539ee1e81c86ba49b98b226bc2f3ebf4ff6373229785d5ba5a9681656ef0165e6ea1801f183b59f3ad6b58667d2e5d263fdbe5ee501ba90a SHA512 7821e96d4f01b275f3f8fdb396167205f04200c0331b9ccdc9970da2ffb239431ef2b1f24fa1714f9b902402abf3c5258aa0d4758335623e71200b5929440609
diff --git a/dev-python/survey/survey-5.4.0.ebuild b/dev-python/survey/survey-5.4.0.ebuild
new file mode 100644
index 0000000000..5d68e2cb2b
--- /dev/null
+++ b/dev-python/survey/survey-5.4.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+inherit distutils-r1
+
+DESCRIPTION="A simple library for creating beautiful interactive prompts"
+HOMEPAGE="
+	https://github.com/Exahilosys/survey
+	https://pypi.org/project/survey/
+"
+MY_PV=${PV/_/-}
+SRC_URI="https://github.com/Exahilosys/survey/archive/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}"/${PN}-${MY_PV}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx-autodoc-typehints \
+	dev-python/sphinx-paramlinks \
+	dev-python/sphinx-rtd-theme
+
+src_configure() {
+	distutils-r1_src_configure
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}

From e01ec265ba305c1123b54bf1a23d337f5390704c Mon Sep 17 00:00:00 2001
From: Viorel Munteanu <ceamac@gentoo.org>
Date: Thu, 20 Jun 2024 07:30:11 +0300
Subject: [PATCH 09/25] dev-python/survey: drop 4.5.4

Signed-off-by: Viorel Munteanu <ceamac@gentoo.org>
---
 dev-python/survey/Manifest            |  1 -
 dev-python/survey/survey-4.5.4.ebuild | 23 -----------------------
 2 files changed, 24 deletions(-)
 delete mode 100644 dev-python/survey/survey-4.5.4.ebuild

diff --git a/dev-python/survey/Manifest b/dev-python/survey/Manifest
index b3e278ff91..d55f377835 100644
--- a/dev-python/survey/Manifest
+++ b/dev-python/survey/Manifest
@@ -1,3 +1,2 @@
-DIST survey-4.5.4.tar.gz 831109 BLAKE2B 00065211437f4c6c820aca5c511395625da7be9415218d6261005aff946b19a3e65cc31189a6aef755ed88ce81f309ac2eabe23ea7f1e2f359007b4fe9172f96 SHA512 045989ca95e3fa9a840ad8d37a040f46bf3f22a858dd7b826fecf88d4e53b6b14e285ef3bf266add496da2d5ffd58971c2456b4375362e24c1a071fc910a03f4
 DIST survey-5.3.1.gh.tar.gz 1564902 BLAKE2B de8bafd2fc5a683ca0364f9e1540e177bf2f10344406563ff3ef6723abd2c415517e72ffacccae51e1d69912b966bf678c2abc62b22545f1c5871d4f3459d121 SHA512 383d7339e93760294095881b6ebf3fd00d687210865303aa2c17a51a390f8087b8666364e0ba7b7657e009803665cf02e64f280c8a09a535ce1fa1ebeaafe963
 DIST survey-5.4.0.gh.tar.gz 1565353 BLAKE2B f020637b23274314539ee1e81c86ba49b98b226bc2f3ebf4ff6373229785d5ba5a9681656ef0165e6ea1801f183b59f3ad6b58667d2e5d263fdbe5ee501ba90a SHA512 7821e96d4f01b275f3f8fdb396167205f04200c0331b9ccdc9970da2ffb239431ef2b1f24fa1714f9b902402abf3c5258aa0d4758335623e71200b5929440609
diff --git a/dev-python/survey/survey-4.5.4.ebuild b/dev-python/survey/survey-4.5.4.ebuild
deleted file mode 100644
index 5394b397dc..0000000000
--- a/dev-python/survey/survey-4.5.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-inherit distutils-r1 pypi
-
-DESCRIPTION="A simple library for creating beautiful interactive prompts"
-HOMEPAGE="
-	https://github.com/Exahilosys/survey
-	https://pypi.org/project/survey/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx-autodoc-typehints \
-	dev-python/sphinx-paramlinks \
-	dev-python/sphinx-rtd-theme

From c304271b0f6addd9d4bd7256379f1df9a311237c Mon Sep 17 00:00:00 2001
From: Ferenc Erki <erkiferenc@gmail.com>
Date: Thu, 20 Jun 2024 14:06:51 +0200
Subject: [PATCH 10/25] app-text/vale: add 3.6.0

Signed-off-by: Ferenc Erki <erkiferenc@gmail.com>
---
 app-text/vale/Manifest          |  2 ++
 app-text/vale/vale-3.6.0.ebuild | 45 +++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+)
 create mode 100644 app-text/vale/vale-3.6.0.ebuild

diff --git a/app-text/vale/Manifest b/app-text/vale/Manifest
index c4d9bf23dd..f4dbcbab9e 100644
--- a/app-text/vale/Manifest
+++ b/app-text/vale/Manifest
@@ -6,3 +6,5 @@ DIST vale-3.4.2-gentoo-deps.tar.xz 146710436 BLAKE2B 62b1f122f6f29c9037762675e6e
 DIST vale-3.4.2.tar.gz 10528649 BLAKE2B ddad91adc3a132d583df305501f0b80af7267ce249c17f54abe57c013e03463bd3a143a789148637a393cc479da257aabf06597fb9f70a1e961f8854d21cb9f3 SHA512 e6d6ec06d968ac35abf7f08eb5938b46f2e0162c511acef89f0307ba8a917cd7b9b9c3e0ddee50b720e845252991a88a5fa52f9cc3f9415130147db7c2256dac
 DIST vale-3.5.0-deps.tar.xz 163145008 BLAKE2B 03c657708096bccfb3fe478f70a46dd8ee7d75193f3422641c74b34f44b790f6f809514b0d4fe3e2b1a02719f620d747104ac8b4165592490b288e348bea586e SHA512 ed1c66fbf879abded56d18b1d6ec87ecd8eee6bbf5a048eb7fde3a2ae5e42b99f1ca4acb56cc791dfb0f0ebc2f925cebdd3a6080fc30999fd0cba403d8332241
 DIST vale-3.5.0.tar.gz 10535020 BLAKE2B 35808c41569a75bdcc32c6339e56adbdf44bfbcf9a52f8447f10d706c91ee097948a12264406891701911d7ce5a910f5fc7bdce3e486a6103eeb2f093735a544 SHA512 131f102033090e81afabf883068f96d30c81b4dd24fac51e86fa71ce76a81b9da23063837e3cee2464394f6af5f5ef2153ef1effceb3ca1554b04639b8aad109
+DIST vale-3.6.0-gentoo-deps.tar.xz 162279280 BLAKE2B 4d18fbfc6d5d1aac0790c7ca70791780030f93bb77ae09863ef2ad4f304c19b683a48e6f9d59031e3342d796c62c60bfac427fc6339ad59bdab24818ebdb8629 SHA512 05ecd719d796bd9c912e2d50fbc510f7460a721c65d64f535880be585cf49c197a5bdc2f305e9ccd583ac7e342d4223ebf18fc0cd67657feec8ba3bdf91fed88
+DIST vale-3.6.0.tar.gz 10535190 BLAKE2B 4d8baf8c10e8cf7a261caff85e82858d938790487ad8e57cc38af33a0f7ee4f10eb5e1a8de9b9e971be28e58068b04804b9d0578527c646bd3debff4b47f687a SHA512 deaaf76bc829b34ca343fc78890c650bcdfe894d46460e61c8cc7d6aba2bc935ebcc2993b1f91d33c53ec861831d79471d2a11481dd707746da2afb24fa2c16f
diff --git a/app-text/vale/vale-3.6.0.ebuild b/app-text/vale/vale-3.6.0.ebuild
new file mode 100644
index 0000000000..47410dd3e7
--- /dev/null
+++ b/app-text/vale/vale-3.6.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module optfeature
+
+DESCRIPTION="A syntax-aware linter for prose built with speed and extensibility in mind"
+HOMEPAGE="https://vale.sh/docs/"
+
+SRC_URI="
+	https://github.com/errata-ai/vale/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/ferki/${PN}/releases/download/v${PV}-gentoo-deps/${P}-gentoo-deps.tar.xz
+"
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT public-domain"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# tests require:
+# - various ruby gems: see testdata/Gemfile
+# - packaged optional runtime dependencies: asciidoctor, rst2html, xsltproc
+# - unpackaged optional runtime dependency: dita (may be removed in a patch)
+# - network access: sync subcommand tests (may be removed in a patch)
+RESTRICT="test"
+
+src_prepare() {
+	sed -i "s/\$(LAST_TAG)/v${PV}/" Makefile || die 'sed failed'
+	default
+}
+
+src_compile() {
+	emake build os=linux
+}
+
+src_install() {
+	dobin bin/vale
+	default_src_install
+}
+
+pkg_postinst() {
+	optfeature "AsciiDoc support" dev-ruby/asciidoctor
+	optfeature "reStructuredText support" dev-python/docutils
+	optfeature "XML support" dev-libs/libxslt
+}

From 813d39805b02a5a8bb656d6412ae3b3294e473e1 Mon Sep 17 00:00:00 2001
From: Eli Burch <eli.burch@burchbytes.com>
Date: Thu, 20 Jun 2024 06:17:12 -0700
Subject: [PATCH 11/25] net-news/newsraft: Fix hardcoded CC, CFLAGS, LDFLAGS

Closes: https://bugs.gentoo.org/show_bug.cgi?id=934555
Closes: https://bugs.gentoo.org/show_bug.cgi?id=934557
Closes: https://bugs.gentoo.org/show_bug.cgi?id=934558
Signed-off-by: Eli Burch <eli.burch@burchbytes.com>
---
 ...ewsraft-0.25-hardcoded-CFLAGS-LDFLAGS.patch | 18 ++++++++++++++++++
 net-news/newsraft/newsraft-0.25.ebuild         |  4 ++++
 2 files changed, 22 insertions(+)
 create mode 100644 net-news/newsraft/files/newsraft-0.25-hardcoded-CFLAGS-LDFLAGS.patch

diff --git a/net-news/newsraft/files/newsraft-0.25-hardcoded-CFLAGS-LDFLAGS.patch b/net-news/newsraft/files/newsraft-0.25-hardcoded-CFLAGS-LDFLAGS.patch
new file mode 100644
index 0000000000..e71ae62e5d
--- /dev/null
+++ b/net-news/newsraft/files/newsraft-0.25-hardcoded-CFLAGS-LDFLAGS.patch
@@ -0,0 +1,18 @@
+# Fix hardcoded CC, CFLAGS and LDFLAGS
+# Bug: https://bugs.gentoo.org/show_bug.cgi?id=934555
+# Bug: https://bugs.gentoo.org/show_bug.cgi?id=934557
+# Bug: https://bugs.gentoo.org/show_bug.cgi?id=934558
+--- a/makefile
++++ b/makefile
+@@ -1,9 +1,8 @@
+ .POSIX:
+ .PHONY: all install install-newsraft install-man install-examples man html clean check cppcheck clang-tidy
+ 
+-CC            = cc
+-CFLAGS        = -O3
+-LDFLAGS       =
++CC            ?= cc
++CFLAGS        ?= -O3
+ CURL_CFLAGS   = `pkg-config --cflags libcurl  2>/dev/null`
+ CURL_LIBS     = `pkg-config --libs   libcurl  2>/dev/null || echo '-lcurl'`
+ CURSES_CFLAGS = `pkg-config --cflags ncursesw 2>/dev/null`
diff --git a/net-news/newsraft/newsraft-0.25.ebuild b/net-news/newsraft/newsraft-0.25.ebuild
index 9118c6cefc..48c8f80e04 100644
--- a/net-news/newsraft/newsraft-0.25.ebuild
+++ b/net-news/newsraft/newsraft-0.25.ebuild
@@ -32,6 +32,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}/newsraft-0.25-hardcoded-CFLAGS-LDFLAGS.patch"
+)
+
 src_install() {
 	emake PREFIX="/usr" DESTDIR="${D}" install
 	einstalldocs

From d322806ea3932c05a03b1b9b25304ac12f92833d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Efe=20=C4=B0zbudak?= <efe.izbudak@metu.edu.tr>
Date: Thu, 20 Jun 2024 22:25:22 -0400
Subject: [PATCH 12/25] app-misc/lf: add 32
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Efe İzbudak <efe.izbudak@metu.edu.tr>
---
 app-misc/lf/Manifest     |  2 ++
 app-misc/lf/lf-32.ebuild | 53 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+)
 create mode 100644 app-misc/lf/lf-32.ebuild

diff --git a/app-misc/lf/Manifest b/app-misc/lf/Manifest
index af949b0d2c..3394c9dcad 100644
--- a/app-misc/lf/Manifest
+++ b/app-misc/lf/Manifest
@@ -8,3 +8,5 @@ DIST lf-30-deps.tar.xz 1141300 BLAKE2B fe668d052e6ace68d4c6a0cfdb838a16bee62215a
 DIST lf-30.tar.gz 125152 BLAKE2B 082ddfc2438dd7133a72ed951c093bbf9514cea2b9aa58ed8263d7d759d6112dc14ca811287543bc61f0b79570ed15f69fd561bda34652ec53c8735baa95082d SHA512 2318b8b1ebb92cec5247b3f8819492182085776bc437b223a92377f731f26a85a7b9bf3c475b31ee28ba204cc2e9abf8330e7a64b7d57631da9cb285aa80326d
 DIST lf-31-deps.tar.xz 17010484 BLAKE2B 3e92a87c1ce48565512456db504cddbb195499c7e02565d35b8d1bb462c19b5e442032ec8bb90191a6f039e9075148e5afb8e4d726a4b800f2c8ca2851a4f6c5 SHA512 7cbc7806b89e9fd5d225622ecb974f48971ff7a07b7099d401489b0f0a43604ecaf0454e1a7f4c37130271c943c2966f18187bbe56bcb3afe00bea5096f281df
 DIST lf-31.tar.gz 138687 BLAKE2B 757d785e24c7f1ad664f81210ab33f8aedca62c5acfe3d8bad140a13c2321155d8c8b9f90da948666315ac1bd2755d92c1b6f01276e078d4b23949da1faade45 SHA512 8029c5310d94be853d82b9fe6359853db37340231bd291dddc675d053d020a7a98f17931734bb65022278ccf3ab94513a6fdc0e37986388572fc4afff28e0380
+DIST lf-32-vendor.tar.xz 1158528 BLAKE2B 40913397dd3dbebcc8782c5a4d3620725e31deeb85127f8a59ed08dd6e882bf340aef45742b6033833d2c3b0ae47965daac9e4b5d5d1fc25d29d09db53da7cb7 SHA512 f536a7ddb0e0137cbccbff05673629a2bddfe4fcee163358cad5387f8a8c8c79110d17cc36bf5beb57fab5594b9652449d8d03b6332d82812c7254562c1ec4d9
+DIST lf-32.tar.gz 141885 BLAKE2B 34aeff4c08dfe07e2c8b24c233899061e037752a05ae6c00e9beabf0497b0a361612a9ad68f6c1b873f2add3d56a65a369bd41e1db848ce32be48b68f3c8d9f2 SHA512 ee042b897403f21bb94b87ab835400e865b9d057d2c951e1adacbd2f3e27761304afc2431ae881de61da7265f30a14c69257b7e29c95ac365515790f47f9528a
diff --git a/app-misc/lf/lf-32.ebuild b/app-misc/lf/lf-32.ebuild
new file mode 100644
index 0000000000..0051856710
--- /dev/null
+++ b/app-misc/lf/lf-32.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module shell-completion desktop xdg
+
+DESCRIPTION="Terminal file manager"
+HOMEPAGE="https://github.com/gokcehan/lf"
+SRC_URI="https://github.com/gokcehan/lf/archive/r${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://github.com/ephemer4l/gentoo-lf/raw/main/${P}-vendor.tar.xz"
+S="${WORKDIR}/${PN}-r${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+static"
+
+src_compile() {
+	local ldflags="-s -w -X main.gVersion=r${PV}"
+	use static && {
+		export CGO_ENABLED=0
+		ldflags+=' -extldflags "-static"'
+	}
+
+	go build -ldflags="${ldflags}" || die 'go build failed'
+}
+
+src_install() {
+	local DOCS=( README.md etc/lfrc.example )
+
+	dobin "${PN}"
+
+	einstalldocs
+
+	doman "${PN}.1"
+
+	# bash & zsh cd script
+	insinto "/usr/share/${PN}"
+	doins "etc/${PN}cd.sh"
+
+	# bash-completion
+	newbashcomp "etc/${PN}.bash" "${PN}"
+
+	# zsh-completion
+	newzshcomp "etc/${PN}.zsh" "_${PN}"
+
+	# fish-completion
+	dofishcomp "etc/${PN}.fish"
+	dofishcomp "etc/${PN}cd.fish"
+
+	domenu "${PN}.desktop"
+}

From ca617d90a1cf7f9373fb95afe39b8bbb0212c828 Mon Sep 17 00:00:00 2001
From: Vitaly Zdanevich <zdanevich.vitaly@ya.ru>
Date: Fri, 21 Jun 2024 05:01:59 +0400
Subject: [PATCH 13/25] app-doc/geeknote: Python 3.12 is not working - set max
 to 3.11

Because of Apache Thrift problem, see https://github.com/apache/thrift/commit/6f8c99e98170dcd4f311e755b79f7013868c64c5#r143063857

Signed-off-by: Vitaly Zdanevich <zdanevich.vitaly@ya.ru>
---
 app-doc/geeknote/geeknote-3.0.5.ebuild | 2 +-
 app-doc/geeknote/geeknote-9999.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-doc/geeknote/geeknote-3.0.5.ebuild b/app-doc/geeknote/geeknote-3.0.5.ebuild
index 17e814e84e..48b4b939af 100644
--- a/app-doc/geeknote/geeknote-3.0.5.ebuild
+++ b/app-doc/geeknote/geeknote-3.0.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{11..12} )
+PYTHON_COMPAT=( python3_{10..11} )
 DISTUTILS_USE_PEP517=setuptools
 
 inherit distutils-r1
diff --git a/app-doc/geeknote/geeknote-9999.ebuild b/app-doc/geeknote/geeknote-9999.ebuild
index ce78f8a520..86a17bd622 100644
--- a/app-doc/geeknote/geeknote-9999.ebuild
+++ b/app-doc/geeknote/geeknote-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{11..12} )
+PYTHON_COMPAT=( python3_{10..11} )
 DISTUTILS_USE_PEP517=setuptools
 
 inherit bash-completion-r1 distutils-r1 git-r3

From 6845ac5af39d4ba01bc776354ed829ab91bb1405 Mon Sep 17 00:00:00 2001
From: Ivan Lloro <ivan.lloro.boada@gmail.com>
Date: Fri, 21 Jun 2024 09:42:16 +0200
Subject: [PATCH 14/25] media-gfx/mayo: new package, add 0.8.0

Signed-off-by: Ivan Lloro <ivan.lloro.boada@gmail.com>
---
 media-gfx/mayo/Manifest                     |  2 +
 media-gfx/mayo/files/mayo-0.8.0-nogit.patch | 17 ++++++++
 media-gfx/mayo/mayo-0.8.0.ebuild            | 43 +++++++++++++++++++++
 media-gfx/mayo/metadata.xml                 | 11 ++++++
 4 files changed, 73 insertions(+)
 create mode 100644 media-gfx/mayo/Manifest
 create mode 100644 media-gfx/mayo/files/mayo-0.8.0-nogit.patch
 create mode 100644 media-gfx/mayo/mayo-0.8.0.ebuild
 create mode 100644 media-gfx/mayo/metadata.xml

diff --git a/media-gfx/mayo/Manifest b/media-gfx/mayo/Manifest
new file mode 100644
index 0000000000..a6e25bdd60
--- /dev/null
+++ b/media-gfx/mayo/Manifest
@@ -0,0 +1,2 @@
+AUX mayo-0.8.0-nogit.patch 487 BLAKE2B 40f2df604ec7c542b76e0f83eb848eb32dd741ec9b2308f300de3e919f856c347ded63759b8a12b1014f8a343f1b1d932980cb50e495b66d6686007f8911d808 SHA512 be8926163191cd13768c3b048cd972d92b5cf8078f364c920f5b6b7070f8ce9063de8fc041080a2d6aadaa13058c9d8a7448052f3e36a527ee55e9043a7d7861
+DIST mayo-0.8.0.tar.gz 9792039 BLAKE2B 9f6c6173996f9731445363ad756ffc51d478ef4a9c0710056941e3f3634ee320987eec99e7d56237ba1f11f6adaca7be2a47816af2b8f7f7c78ba74a1fa8d296 SHA512 4363a41c0ed1dd555302c7b5f61eee136d9ae6999f6a66c92c117cf2a9a74eb5ece991a22ffa29f095b7ec8a2c5426375628c8213ed94b6295c64019141539d7
diff --git a/media-gfx/mayo/files/mayo-0.8.0-nogit.patch b/media-gfx/mayo/files/mayo-0.8.0-nogit.patch
new file mode 100644
index 0000000000..d14b50672f
--- /dev/null
+++ b/media-gfx/mayo/files/mayo-0.8.0-nogit.patch
@@ -0,0 +1,17 @@
+--- a/version.pri
++++ b/version.pri
+@@ -1,12 +1,5 @@
+-system(git --version):HAVE_GIT=1
+-defined(HAVE_GIT, var) {
+-    MAYO_VERSION_COMMIT = $$system(git rev-parse --short HEAD)
+-    MAYO_VERSION_REVNUM = $$system(git rev-list --count HEAD)
+-} else {
+-    MAYO_VERSION_COMMIT = ??
+-    MAYO_VERSION_REVNUM = 0
+-    warning("Git is not in PATH, cannot find commit ID nor revision number")
+-}
++MAYO_VERSION_COMMIT = ??
++MAYO_VERSION_REVNUM = 0
+ 
+ MAYO_VERSION_MAJ = 0
+ MAYO_VERSION_MIN = 8
diff --git a/media-gfx/mayo/mayo-0.8.0.ebuild b/media-gfx/mayo/mayo-0.8.0.ebuild
new file mode 100644
index 0000000000..8c22ccc0ac
--- /dev/null
+++ b/media-gfx/mayo/mayo-0.8.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qmake-utils
+
+DESCRIPTION="Opensource 3D CAD viewer and converter"
+HOMEPAGE="https://github.com/fougue/mayo"
+SRC_URI="https://github.com/fougue/mayo/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=sci-libs/opencascade-7.7.0-r2
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	>=media-libs/assimp-5.3.1
+"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-nogit.patch
+)
+
+src_configure() {
+
+	eqmake5 "CASCADE_INC_DIR=/usr/include/opencascade" "CASCADE_LIB_DIR=/usr/lib64/opencascade" "ASSIMP_INC_DIR=/usr/include/assimp" "ASSIMP_LIB_DIR=/usr/lib64" mayo.pro
+
+}
+
+src_install() {
+	emake install INSTALL_ROOT="${D}"
+
+	install -d "${D}"/usr/bin/
+	install "${S}"/mayo "${D}"/usr/bin/ || die "failed to move locales"
+
+	einstalldocs
+}
diff --git a/media-gfx/mayo/metadata.xml b/media-gfx/mayo/metadata.xml
new file mode 100644
index 0000000000..d92641e878
--- /dev/null
+++ b/media-gfx/mayo/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+        <maintainer type="person">
+                <email>ivan.lloro.boada@gmail.com</email>
+                <name>Ivan Lloro</name>
+        </maintainer>
+        <upstream>
+                <remote-id type="github">fougue/mayo</remote-id>
+        </upstream>
+</pkgmetadata>

From 819cd1364f2d259273d73b0aab7d8cc7bf6c609e Mon Sep 17 00:00:00 2001
From: Ivan Lloro <ivan.lloro.boada@gmail.com>
Date: Fri, 21 Jun 2024 09:42:32 +0200
Subject: [PATCH 15/25] media-gfx/timg: new package, add 1.6.0

Signed-off-by: Ivan Lloro <ivan.lloro.boada@gmail.com>
---
 media-gfx/timg/Manifest          |  1 +
 media-gfx/timg/metadata.xml      | 11 +++++++++++
 media-gfx/timg/timg-1.6.0.ebuild | 31 +++++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+)
 create mode 100644 media-gfx/timg/Manifest
 create mode 100644 media-gfx/timg/metadata.xml
 create mode 100644 media-gfx/timg/timg-1.6.0.ebuild

diff --git a/media-gfx/timg/Manifest b/media-gfx/timg/Manifest
new file mode 100644
index 0000000000..60b2200658
--- /dev/null
+++ b/media-gfx/timg/Manifest
@@ -0,0 +1 @@
+DIST timg-1.6.0.tar.gz 1166246 BLAKE2B 9cf2424bf2a3a87692ee23ec70fab82a391a1bf5fec3495d57535886dbae571d35c307fc9f3bee3189fb5ad0391fd80f82b0d84875aca9373ef7f0f669cb80cd SHA512 6b1f68f9dc38f1b9f1738a9e85f14b86576b241fa6f8a204018e293a286a7f9c7c1f2425afbe2c9b7f682f1cd35eed0e53f9df3bccc4e4ba9d41fc36d00dabc6
diff --git a/media-gfx/timg/metadata.xml b/media-gfx/timg/metadata.xml
new file mode 100644
index 0000000000..4158a14779
--- /dev/null
+++ b/media-gfx/timg/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+     <maintainer type="person">
+             <email>ivan.lloro.boada@gmail.com</email>
+             <name>Ivan Lloro</name>
+     </maintainer>
+     <upstream>
+             <remote-id type="github">hzeller/timg</remote-id>
+     </upstream>
+</pkgmetadata>
diff --git a/media-gfx/timg/timg-1.6.0.ebuild b/media-gfx/timg/timg-1.6.0.ebuild
new file mode 100644
index 0000000000..10ff44e609
--- /dev/null
+++ b/media-gfx/timg/timg-1.6.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Terminal image and video viewer"
+
+HOMEPAGE="https://timg.sh/"
+
+SRC_URI="https://github.com/hzeller/timg/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=app-arch/libdeflate-1.19
+	>=dev-util/pkgconf-2.2.0
+	>=dev-vcs/git-2.44.2
+	>=media-libs/libsixel-1.10.3-r1
+	>=media-libs/libjpeg-turbo-3.0.0
+	>=media-libs/libexif-0.6.24
+	>=media-video/ffmpeg-4.4.4-r9
+	>=media-gfx/graphicsmagick-1.3.42
+	>=gnome-base/librsvg-2.57.3
+	>=x11-libs/cairo-1.18.0
+	>=app-text/poppler-24.04.0
+"
+
+DEPEND="${RDEPEND}"

From 1b7718fea7413b2820bbf11a3ea81059b9f0f4d3 Mon Sep 17 00:00:00 2001
From: Ivan Lloro <ivan.lloro.boada@gmail.com>
Date: Fri, 21 Jun 2024 10:00:16 +0200
Subject: [PATCH 16/25] media-gfx/mayo-0.8.0: Removed unneeded file from
 Manifest

Signed-off-by: Ivan Lloro <ivan.lloro.boada@gmail.com>
---
 media-gfx/mayo/Manifest | 1 -
 1 file changed, 1 deletion(-)

diff --git a/media-gfx/mayo/Manifest b/media-gfx/mayo/Manifest
index a6e25bdd60..fe86bbcb75 100644
--- a/media-gfx/mayo/Manifest
+++ b/media-gfx/mayo/Manifest
@@ -1,2 +1 @@
-AUX mayo-0.8.0-nogit.patch 487 BLAKE2B 40f2df604ec7c542b76e0f83eb848eb32dd741ec9b2308f300de3e919f856c347ded63759b8a12b1014f8a343f1b1d932980cb50e495b66d6686007f8911d808 SHA512 be8926163191cd13768c3b048cd972d92b5cf8078f364c920f5b6b7070f8ce9063de8fc041080a2d6aadaa13058c9d8a7448052f3e36a527ee55e9043a7d7861
 DIST mayo-0.8.0.tar.gz 9792039 BLAKE2B 9f6c6173996f9731445363ad756ffc51d478ef4a9c0710056941e3f3634ee320987eec99e7d56237ba1f11f6adaca7be2a47816af2b8f7f7c78ba74a1fa8d296 SHA512 4363a41c0ed1dd555302c7b5f61eee136d9ae6999f6a66c92c117cf2a9a74eb5ece991a22ffa29f095b7ec8a2c5426375628c8213ed94b6295c64019141539d7

From 79f607c937ac285a4ffe0a43f9df1001253920d8 Mon Sep 17 00:00:00 2001
From: Takuya Wakazono <pastalian46@gmail.com>
Date: Fri, 21 Jun 2024 19:50:03 +0900
Subject: [PATCH 17/25] net-im/teams-for-linux: update LICENSE

OFL-1.1 instead of OFL.

Signed-off-by: Takuya Wakazono <pastalian46@gmail.com>
---
 net-im/teams-for-linux/teams-for-linux-1.4.12.ebuild | 2 +-
 net-im/teams-for-linux/teams-for-linux-1.4.13.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-im/teams-for-linux/teams-for-linux-1.4.12.ebuild b/net-im/teams-for-linux/teams-for-linux-1.4.12.ebuild
index 26a74f3d87..ea2cfa03ce 100644
--- a/net-im/teams-for-linux/teams-for-linux-1.4.12.ebuild
+++ b/net-im/teams-for-linux/teams-for-linux-1.4.12.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}"
 # Electron bundles a bunch of things
 LICENSE="
 	MIT BSD BSD-2 BSD-4 AFL-2.1 Apache-2.0 Ms-PL GPL-2 LGPL-2.1 APSL-2
-	unRAR OFL CC-BY-SA-3.0 MPL-2.0 android public-domain all-rights-reserved
+	unRAR OFL-1.1 CC-BY-SA-3.0 MPL-2.0 android public-domain all-rights-reserved
 "
 SLOT="0"
 KEYWORDS="-* ~amd64 ~arm ~arm64"
diff --git a/net-im/teams-for-linux/teams-for-linux-1.4.13.ebuild b/net-im/teams-for-linux/teams-for-linux-1.4.13.ebuild
index 26a74f3d87..ea2cfa03ce 100644
--- a/net-im/teams-for-linux/teams-for-linux-1.4.13.ebuild
+++ b/net-im/teams-for-linux/teams-for-linux-1.4.13.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}"
 # Electron bundles a bunch of things
 LICENSE="
 	MIT BSD BSD-2 BSD-4 AFL-2.1 Apache-2.0 Ms-PL GPL-2 LGPL-2.1 APSL-2
-	unRAR OFL CC-BY-SA-3.0 MPL-2.0 android public-domain all-rights-reserved
+	unRAR OFL-1.1 CC-BY-SA-3.0 MPL-2.0 android public-domain all-rights-reserved
 "
 SLOT="0"
 KEYWORDS="-* ~amd64 ~arm ~arm64"

From b7ce3d7092791bd8f4fd108c7068d8028cd6212a Mon Sep 17 00:00:00 2001
From: Takuya Wakazono <pastalian46@gmail.com>
Date: Fri, 21 Jun 2024 19:51:04 +0900
Subject: [PATCH 18/25] app-misc/github-desktop-bin: update LICENSE

OFL-1.1 instead of OFL.

Signed-off-by: Takuya Wakazono <pastalian46@gmail.com>
---
 .../github-desktop-bin/github-desktop-bin-3.3.1_rc1.ebuild    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-misc/github-desktop-bin/github-desktop-bin-3.3.1_rc1.ebuild b/app-misc/github-desktop-bin/github-desktop-bin-3.3.1_rc1.ebuild
index 573ce939e7..191306f509 100644
--- a/app-misc/github-desktop-bin/github-desktop-bin-3.3.1_rc1.ebuild
+++ b/app-misc/github-desktop-bin/github-desktop-bin-3.3.1_rc1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2023 Gentoo Authors
+# Copyright 2019-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,7 +19,7 @@ S="${WORKDIR}"
 # Electron bundles a bunch of things
 LICENSE="
 	MIT BSD BSD-2 BSD-4 AFL-2.1 Apache-2.0 Ms-PL GPL-2 LGPL-2.1 APSL-2
-	unRAR OFL CC-BY-SA-3.0 MPL-2.0 android public-domain all-rights-reserved
+	unRAR OFL-1.1 CC-BY-SA-3.0 MPL-2.0 android public-domain all-rights-reserved
 "
 SLOT="0"
 KEYWORDS="-* ~amd64"

From 150b592e9dff20479bff53dea9fdcba00cd06642 Mon Sep 17 00:00:00 2001
From: Takuya Wakazono <pastalian46@gmail.com>
Date: Fri, 21 Jun 2024 19:51:13 +0900
Subject: [PATCH 19/25] games-fps/openspades: update LICENSE

OFL-1.1 instead of OFL.

Signed-off-by: Takuya Wakazono <pastalian46@gmail.com>
---
 games-fps/openspades/openspades-0.1.3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-fps/openspades/openspades-0.1.3.ebuild b/games-fps/openspades/openspades-0.1.3.ebuild
index 26a4e767b9..a084bf379a 100644
--- a/games-fps/openspades/openspades-0.1.3.ebuild
+++ b/games-fps/openspades/openspades-0.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ https://github.com/yvt/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
 https://github.com/yvt/${PN}-paks/releases/download/r${PAK_REV}/OpenSpadesDevPackage-r${PAK_REV}.zip
 "
 # GPL-2 refers to the bundled Unifont.
-LICENSE="GPL-3 GPL-2-with-font-exception OFL openspades-pak"
+LICENSE="GPL-3 GPL-2-with-font-exception OFL-1.1 openspades-pak"
 SLOT="0"
 KEYWORDS="~amd64"
 RESTRICT="mirror"

From 54c3e7f8a1dbd5bfb329b9c9c9618fe751ea893b Mon Sep 17 00:00:00 2001
From: Takuya Wakazono <pastalian46@gmail.com>
Date: Fri, 21 Jun 2024 19:58:03 +0900
Subject: [PATCH 20/25] net-im/mautrix-signal: unkeyword 0.6.2

Signed-off-by: Takuya Wakazono <pastalian46@gmail.com>
---
 net-im/mautrix-signal/mautrix-signal-0.6.2.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/net-im/mautrix-signal/mautrix-signal-0.6.2.ebuild b/net-im/mautrix-signal/mautrix-signal-0.6.2.ebuild
index e8f902726c..c3c5d90c0f 100644
--- a/net-im/mautrix-signal/mautrix-signal-0.6.2.ebuild
+++ b/net-im/mautrix-signal/mautrix-signal-0.6.2.ebuild
@@ -14,7 +14,8 @@ S="${WORKDIR}/signal-${PV}"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="**"
+# https://github.com/mautrix/signal/issues/519
+# KEYWORDS="~amd64"
 
 RDEPEND="
 	acct-user/${PN}

From afbad6a0e7a239fb0e1a81b5724aad80ff9127fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Efe=20=C4=B0zbudak?= <efe.izbudak@metu.edu.tr>
Date: Fri, 21 Jun 2024 09:25:40 -0400
Subject: [PATCH 21/25] app-misc/lf: fix copyright year
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Efe İzbudak <efe.izbudak@metu.edu.tr>
---
 app-misc/lf/lf-32.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/lf/lf-32.ebuild b/app-misc/lf/lf-32.ebuild
index 0051856710..b57fe4c2ac 100644
--- a/app-misc/lf/lf-32.ebuild
+++ b/app-misc/lf/lf-32.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8

From 3ba250dcc58ea3ca739d9ba984e4fb8b62501cdb Mon Sep 17 00:00:00 2001
From: Ivan Lloro <ivan.lloro.boada@gmail.com>
Date: Fri, 21 Jun 2024 16:14:44 +0200
Subject: [PATCH 22/25] media-gfx/mayo-0.8.0: included reviewer's QA comments

Signed-off-by: Ivan Lloro <ivan.lloro.boada@gmail.com>
---
 media-gfx/mayo/mayo-0.8.0.ebuild | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/media-gfx/mayo/mayo-0.8.0.ebuild b/media-gfx/mayo/mayo-0.8.0.ebuild
index 8c22ccc0ac..f860f2e43f 100644
--- a/media-gfx/mayo/mayo-0.8.0.ebuild
+++ b/media-gfx/mayo/mayo-0.8.0.ebuild
@@ -29,15 +29,12 @@ PATCHES=(
 
 src_configure() {
 
-	eqmake5 "CASCADE_INC_DIR=/usr/include/opencascade" "CASCADE_LIB_DIR=/usr/lib64/opencascade" "ASSIMP_INC_DIR=/usr/include/assimp" "ASSIMP_LIB_DIR=/usr/lib64" mayo.pro
+	eqmake5 "CASCADE_INC_DIR=/usr/include/opencascade" "CASCADE_LIB_DIR=/usr/$(get_libdir)/opencascade" "ASSIMP_INC_DIR=/usr/include/assimp" "ASSIMP_LIB_DIR=/usr/$(get_libdir)" mayo.pro
 
 }
 
 src_install() {
 	emake install INSTALL_ROOT="${D}"
-
-	install -d "${D}"/usr/bin/
-	install "${S}"/mayo "${D}"/usr/bin/ || die "failed to move locales"
-
+	dobin mayo
 	einstalldocs
 }

From 5e54c1173c49c7503d8d82ff593b58aca9f9b16c Mon Sep 17 00:00:00 2001
From: Ivan Lloro <ivan.lloro.boada@gmail.com>
Date: Fri, 21 Jun 2024 16:35:33 +0200
Subject: [PATCH 23/25] media-gfx/mayo-0.8.0: INSTALL_ROOT="${ED}" (instead of
 "${D}")

Signed-off-by: Ivan Lloro <ivan.lloro.boada@gmail.com>
---
 media-gfx/mayo/mayo-0.8.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/mayo/mayo-0.8.0.ebuild b/media-gfx/mayo/mayo-0.8.0.ebuild
index f860f2e43f..2b0a412152 100644
--- a/media-gfx/mayo/mayo-0.8.0.ebuild
+++ b/media-gfx/mayo/mayo-0.8.0.ebuild
@@ -34,7 +34,7 @@ src_configure() {
 }
 
 src_install() {
-	emake install INSTALL_ROOT="${D}"
+	emake install INSTALL_ROOT="${ED}"
 	dobin mayo
 	einstalldocs
 }

From 0e177080c6ffeb90123880c00ee06d93d2fe7f4f Mon Sep 17 00:00:00 2001
From: Sergey Torokhov <torokhov-s-a@yandex.ru>
Date: Sat, 22 Jun 2024 01:55:01 +0300
Subject: [PATCH 24/25] dev-util/fortls: 3.1.2 version bump

Signed-off-by: Sergey Torokhov <torokhov-s-a@yandex.ru>
---
 dev-util/fortls/Manifest            |  1 +
 dev-util/fortls/fortls-3.1.2.ebuild | 36 +++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 dev-util/fortls/fortls-3.1.2.ebuild

diff --git a/dev-util/fortls/Manifest b/dev-util/fortls/Manifest
index ac710856b1..6516c1c5b3 100644
--- a/dev-util/fortls/Manifest
+++ b/dev-util/fortls/Manifest
@@ -1,3 +1,4 @@
 DIST fortls-2.13.0.tar.gz 6897238 BLAKE2B 000bf8d68394c1ce2d4bca044ba3c395b22da9a8e026d9f8e74890ec2fbb894c4097f634f83352fcb21ff6e7e6f4af78bf9f8abdf00ab068d270fb93b9a6574d SHA512 dc5d51fea92d1b00722ee4a33901939fe38fd379260e1edc7a97939cd5c9204e5c27a7f4c57122a0bdf7a36f2f59d0d8f71a50448b6cdc98b1bb2d349511580e
 DIST fortls-3.0.0.tar.gz 7064397 BLAKE2B 9448821cad90ad9117d1304634c5ce38dc21e3172d51d598b77eb64ecff31f170a51bbb4763026ab797eba853ca89beb962c8c2fc397fd3b1bd371d82b4418da SHA512 9454298de9d4edb366a55a9282e05ff4318fdc4284f7c6fea3dcf519f883873e2479bf2f7a2cdfc34cc865698876180a9ed04dc5b94509665bad33096b057385
 DIST fortls-3.1.1.tar.gz 7066646 BLAKE2B c44058949b3d5680da0cb138d8175defde84e939a53afd93a6672ef93eb800a86fee208035caf60e18058875ad294bd8e48edb096fea6c8f2a89e684f5035120 SHA512 fa9f8aface751ac5aaf79fa5947dafd06e2ae797e7cc8b7585865588db85468f81f56979fdfdcb73ca754716dc85a2a2f9158119bb123ee09646d17e62966d50
+DIST fortls-3.1.2.tar.gz 7066708 BLAKE2B 073ce34353b85b2aa6ea2b5a54e9aa84e65aaba8f302e086ec9e03894de39ba14988f616d6b2f1958ab2387d0aaecf3efd5ae679e71fd99b86333bfb73f07cb6 SHA512 c6f639c8d52c9b1b53a01d79a77d1e80132f4a1ef66df57139011b1c01c5e571bbff12832e708db6fe5946ac3f641124799fec4e841d01a04962ab9356a558ab
diff --git a/dev-util/fortls/fortls-3.1.2.ebuild b/dev-util/fortls/fortls-3.1.2.ebuild
new file mode 100644
index 0000000000..f816b7f71c
--- /dev/null
+++ b/dev-util/fortls/fortls-3.1.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Fortran Language Server (fortls)"
+HOMEPAGE="https://fortls.fortran-lang.org"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/json5[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+# Disable test that requires pypi.org connection
+EPYTEST_DESELECT=(
+	test/test_interface.py::test_version_update_pypi
+)
+
+src_prepare() {
+	# Drop some additional coverage tests
+	sed -i -e 's/ --cov=fortls --cov-report=html --cov-report=xml --cov-context=test//' pyproject.toml || die
+	# Disable autoupdate check during tests run
+	sed -i -e 's/"--incremental_sync",/"--incremental_sync", "--disable_autoupdate",/' test/setup_tests.py || die
+
+	distutils-r1_src_prepare
+}

From d6caaa5b2b32e8ffab78d961631c01c7a8232007 Mon Sep 17 00:00:00 2001
From: Sergey Torokhov <torokhov-s-a@yandex.ru>
Date: Sat, 22 Jun 2024 02:07:16 +0300
Subject: [PATCH 25/25] dev-libs/jonquil: fix RDEPEND

Closes: https://bugs.gentoo.org/932368

Signed-off-by: Sergey Torokhov <torokhov-s-a@yandex.ru>
---
 dev-libs/jonquil/jonquil-0.2.0.ebuild | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/dev-libs/jonquil/jonquil-0.2.0.ebuild b/dev-libs/jonquil/jonquil-0.2.0.ebuild
index b917eb0ace..1824ec26bf 100644
--- a/dev-libs/jonquil/jonquil-0.2.0.ebuild
+++ b/dev-libs/jonquil/jonquil-0.2.0.ebuild
@@ -8,7 +8,7 @@ FORTRAN_STANDARD="2003"
 inherit cmake fortran-2
 
 DESCRIPTION="Jonquil: Bringing TOML blooms to JSON land"
-HOMEPAGE="https://toml-f.readthedocs.io/en/latest/how-to/jonquil/"
+HOMEPAGE="https://toml-f.readthedocs.io/en/latest/how-to/jonquil.html"
 SRC_URI="https://github.com/toml-f/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0 MIT"
@@ -18,8 +18,12 @@ IUSE="test"
 
 RESTRICT="!test? ( test )"
 
-DEPEND="
+RDEPEND="
 	dev-libs/toml-f:0/4
+"
+
+DEPEND="
+	${RDEPEND}
 	test? ( dev-util/fortran-test-drive )
 "