gentoo auto-resync : 12:03:2025 - 01:49:51next

16 files changed, 105 insertions, 371 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 8fa7bd9d13de..319c2271b268 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/cherrytree/Manifest b/app-text/cherrytree/Manifest
index 30ff713c0c3c..141de44bbe2e 100644
--- a/app-text/cherrytree/Manifest
+++ b/app-text/cherrytree/Manifest
@@ -1,5 +1,5 @@
 DIST cherrytree_1.1.4.tar.xz 4714968 BLAKE2B 98cb6c20f5f957420b01352f3b1ba86768010e64583d94130e878eca747350c5eab11107ef3719c65f3a6126127b31e4d0e5807f90548f9f8819cd16f0f299f1 SHA512 053871386b4fd5e9964082421c63a10f332942fb1b29e5145b18858a1219ad55e108235dda279bdbf9b3516fd17502c55357e196a327232a6d82aaa1e06598d9
 DIST cherrytree_1.2.0.tar.xz 4735884 BLAKE2B 47f2aef52bb1fea23be8f5db3d2ec9f4c6a596bb6136350098f870688e34e5662241f188f1c94331af2119b59546c95fbe8254bdbb187990b514f9d21fd76214 SHA512 729e8227eb1f0616e110153ac2139cc7019ed5e1a949c8be40fd2235ee5d2e0f0b1925c57d72c9b443852e5b80a50793e4e903b7df41da8e95a172210f7ec035
 EBUILD cherrytree-1.1.4-r2.ebuild 1657 BLAKE2B 893c2c23d9d3346d7888124f8dd05a4afd1d1c1e069cf369958bcba4913a5000475749a60d73b0568a07587856a21718774ede97856d2d30ca17be8503aa5e8d SHA512 e214bd9137cf08741a4b66b97625a3ceebf494b0485cbaf10363de2c76ad03c04efc57ca3b7595b386afbd2ee3f1e4679c1d4c9bddd8f9f3b5a892ccd4b09b0b
-EBUILD cherrytree-1.2.0.ebuild 1832 BLAKE2B ab7f6c4b9575777b7fa4279b743c585190174200dd94d90d5f161e04738827ec7d027183a822b6d0b6d68d031d7f3bd4967130e207b429ceb3839aa4dca8d5dc SHA512 680629f7215503e77fb304d8a586c94bc227961fe1330aea79b1c5e2e2f41004f059e683406a203df20a729d866c38cab8ede5b4e326b121c743800e1feac8d2
+EBUILD cherrytree-1.2.0.ebuild 1878 BLAKE2B 9462cf2f125334c117ddd367860a8c23bcfbaee114a78087398ab312d6c4852c483d8a2a29726e9422cbe29ac317ea9d2a604cc2f01e640736ff7a2fa0979a2a SHA512 d0123c79d87fafb00cc28dc8718446f1a1adcfe6105df88eb2f839921057e247909b95f94b5302794055dbac79ff092b63ba3601fd7a5f96d8bf3d382ea66d6e
 MISC metadata.xml 482 BLAKE2B 713d79e5a3073dc38016d007e1a102331915d7fc43836cab0008e91e42d292bd49d0138fd323beb987b146a3544d9bce089327799f7d54a44fcd22b38e82a371 SHA512 a2c6293f00f971c760dc2554ab289f532927a1e6b9deadff72fd9e537ee338d8804820defd58d7dec1b18db0b5b8541dba2a8aeec54607f6b8c72ed1e86835a0
diff --git a/app-text/cherrytree/cherrytree-1.2.0.ebuild b/app-text/cherrytree/cherrytree-1.2.0.ebuild
index 9c67de85be38..d2e8464e00c5 100644
--- a/app-text/cherrytree/cherrytree-1.2.0.ebuild
+++ b/app-text/cherrytree/cherrytree-1.2.0.ebuild
@@ -68,10 +68,15 @@ src_configure() {
 		-DUSE_NLS=$(usex nls)
 		-DBUILD_TESTING=$(usex test)
 		-DUSE_SHARED_FMT_SPDLOG=ON
-		-DAUTO_RUN_TESTING=OFF
 		-DUSE_SHARED_GTEST_GMOCK=$(usex test)
 	)
 
+	if use test; then
+		mycmakeargs+=(
+			-DAUTO_RUN_TESTING=OFF
+		)
+	fi
+
 	cmake_src_configure
 }
 
diff --git a/app-text/doxygen/Manifest b/app-text/doxygen/Manifest
index d1811570d589..0f69dc7aef59 100644
--- a/app-text/doxygen/Manifest
+++ b/app-text/doxygen/Manifest
@@ -1,10 +1,5 @@
-AUX doxygen-1.12.0-clang-19.patch 2328 BLAKE2B c71996986679ddfab17c7de019a572f6e85f13dcb3c6d21b7f8a4e510cd978fe5e1ad6661c2f9661035c246ae5df6eb8b55fdb0bca235d7272a4433109a794a3 SHA512 86839ba8c5ef39729c5379a8397240b76ce065eefa3c9a9a168a572c5e796698547befb2b22a222188e68b8b42c7f26fcbf1b4ed46e17af29f937e45cc86edfc
-AUX doxygen-1.12.0-libfmt-11.patch 4820 BLAKE2B 548dd1c74b2c81551409053d7196ea07d0300efe5b7e42aa7a9c18f6313543478f5a6a9fa0c503797b5fb1129c462241ba9663939c044036d321f0d0cd2355a4 SHA512 32f6952390e08ec5d5bb7c35aa0010c6027c9a6bffc6de1d6e3e45255b62dd563bfc12ad94efd656207c161ee81b81f156ffec49be5160c3acd49a8949aeaecd
 AUX doxygen-1.9.4-link_with_pthread.patch 1116 BLAKE2B 864adde5d9c0c852dba8fdaee9021f16e7e119a660d5d8657f320686c0d86c29b5695f367c2af2846e9861bca5a70889b6dd56a9734485527ae504a134e30594 SHA512 f9a1089585f83a09b89c813f51bbb7914fb27be2b3e554148387fd322c88153c2aca1af4215d90b6f2fc9eae25814085fb468f0ef2dacfa092662a4609d52929
-AUX doxygen-1.9.7-musl-1.2.4.patch 1126 BLAKE2B 050fa56a7786c557ce03c9275e152f2b2d2285209f8ea9aed5019c96c2e545ce46208f783092addfcd8ae00b0ed257d4f588ae4036b65752087901d616cc4979 SHA512 eb89ca38cee0431528240c9b354adeef5e2c3ed89db762e7e12e12fa17ca596752b9da0cb75fb9d09dcfbecc302a7e63f811b8fb2f43baf3b4d2230f259ad96f
-AUX doxygen-1.9.8-spdlog-link.patch 1571 BLAKE2B 954d701bdcbabf8b9ebb52d4be6a947189661a55cbab72b7651fb956b53778a968c6c88fb2b3967a8bfa5f0951e9fe046e69a8567938a8243558af807d657714 SHA512 7d3d4363313ace1823b4570c94fcd2f8099f6f7ec42d45f4fd341df9071fb9807e03fe5094a12c8fcf86ca8da06aa681ac0b8e1e0bec70fe2555f70cf39c5b8f
 AUX doxygen-1.9.8-suppress-unused-option-libcxx.patch 828 BLAKE2B db41297d3ad3fca9dc5097871185f98c965ccda7e22f8c31e0b9a69fc83c90dfd32125371cb3e42ebb6b0867cc9746b03ef656861aea14dc8d17e1e7ea09780f SHA512 6c6599ddf35720abb3872fed3a82e8796edc4e6623f9e5b3930e600772c6346bab776074fc8edb20d6d9ac7c21d6c0cb86b12295c9b7649322b876bc6737065d
-AUX doxygen-1.9.8-unbundle-sqlite.patch 4510 BLAKE2B afd24516a20c4378a611c836bc51276528a3983ef21db7a036d53e910b8627f5800b871d2cd13c14fc36e04eebee8bca31c40819c9b4051b1007a3ad799351d0 SHA512 548a3e550bc552007116a9bf500e1cf953b23488e825ac2ee55ef90ae001c189e5a85f84b9957c5670be7d83166a5e8df266c6a96f8b195199d45c264b67e846
 DIST doxygen-1.13.0.src.tar.gz 8502031 BLAKE2B 8a12ed632772b48d07ea4edf16032f491e05b4718d38160ebc1f3d8de1cdf96bca827da28048907cf538a286757ddf56c503fbe08dcfc5a17cc72fea7233a466 SHA512 f6cae74bd8df9c6c2ba3fa21fc33926e6d5eba65101776f84c1fa056d9231d69e232a30d7702b53a284543fc4765edadb10f4d4b4a46314fa08580963d9226fb
 EBUILD doxygen-1.13.0-r1.ebuild 3842 BLAKE2B 06a0c38ea6d50b597afb3ddd24d17d728692e977bc488b02ec8b7c77368c7336f228de67b98a25d9ff69921d99d68b9b61355c70b2108fe32796cd5028e7349d SHA512 f192eee35b46ff6733c205b6a968a237399af68b48371de4b72f223bea1572629ee355b0059fc657a9d1e4eabd1b6f6d73ad3b266ac3c06ee8e4aa7b3f3ceb61
 EBUILD doxygen-9999.ebuild 3864 BLAKE2B 32c06fca3d8b363a86e4e865de58d8c9e140f08a026acb0c4cd0b640d67a0c7e5a905231f85bb870e63bf90450ea5298737bb6034a8e118ff1cfd5b3d975dcb7 SHA512 0f6c1862a8854e48661dbe1aeab12ace71f00390b1c59c60372424a3bcf6d3e9ba76e73d8b966027de2f42d3d21b9ce13e820cf09678fdb93439352c53e80863
diff --git a/app-text/doxygen/files/doxygen-1.12.0-clang-19.patch b/app-text/doxygen/files/doxygen-1.12.0-clang-19.patch
deleted file mode 100644
index acca39a18d51..000000000000
--- a/app-text/doxygen/files/doxygen-1.12.0-clang-19.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-https://github.com/doxygen/doxygen/commit/cff64a87dea7596fd506a85521d4df4616dc845f
-https://github.com/doxygen/doxygen/pull/11064
-https://github.com/bisqwit/TinyDeflate/commit/68ced8bd5c819264e628d4f063500753b77f613d
-https://github.com/bisqwit/TinyDeflate/pull/9
-
-From cff64a87dea7596fd506a85521d4df4616dc845f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Bernhard=20Rosenkr=C3=A4nzer?= <bero@lindev.ch>
-Date: Fri, 9 Aug 2024 14:13:34 +0200
-Subject: [PATCH] Fix build with clang >= 19.0
-
-Clang >= 19.0 requires a template argument list after the template
-keyword for CWG96 compliance, see
-https://github.com/llvm/llvm-project/pull/80801
-
-This patch has also been submitted to upstream TinyDeflate as
-https://github.com/bisqwit/TinyDeflate/pull/9
---- a/deps/TinyDeflate/gunzip.hh
-+++ b/deps/TinyDeflate/gunzip.hh
-@@ -1141,21 +1141,21 @@ namespace gunzip_ns
-             //fprintf(stderr, "both track flag\n");
-             SizeTracker<DeflateTrackBothSize> tracker;
-             return tracker(Gunzip<code & Flag_NoTrackFlagMask>
--                (tracker.template ForwardInput(i), tracker.template ForwardOutput(o), tracker.template ForwardWindow(c), std::forward<B>(b)));
-+                (tracker.template ForwardInput<I>(i), tracker.template ForwardOutput<O>(o), tracker.template ForwardWindow<C>(c), std::forward<B>(b)));
-         }
-         else if constexpr(code & Flag_TrackIn)
-         {
-             //fprintf(stderr, "in track flag\n");
-             SizeTracker<DeflateTrackInSize> tracker;
-             return tracker(Gunzip<code & Flag_NoTrackFlagMask>
--                (tracker.template ForwardInput(i),std::forward<O>(o),std::forward<C>(c),std::forward<B>(b)));
-+                (tracker.template ForwardInput<I>(i),std::forward<O>(o),std::forward<C>(c),std::forward<B>(b)));
-         }
-         else if constexpr(code & Flag_TrackOut)
-         {
-             //fprintf(stderr, "out track flag\n");
-             SizeTracker<DeflateTrackOutSize> tracker;
-             return tracker(Gunzip<code & Flag_NoTrackFlagMask>
--                (std::forward<I>(i), tracker.template ForwardOutput(o), tracker.template ForwardWindow(c), std::forward<B>(b)));
-+                (std::forward<I>(i), tracker.template ForwardOutput<O>(o), tracker.template ForwardWindow<C>(c), std::forward<B>(b)));
-         }
-         else
-         {
diff --git a/app-text/doxygen/files/doxygen-1.12.0-libfmt-11.patch b/app-text/doxygen/files/doxygen-1.12.0-libfmt-11.patch
deleted file mode 100644
index a73f6ad58514..000000000000
--- a/app-text/doxygen/files/doxygen-1.12.0-libfmt-11.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-https://bugs.gentoo.org/937599
-https://github.com/doxygen/doxygen/pull/11083
-
-From 567aca983f70b01103271e431bc71a13ac79213c Mon Sep 17 00:00:00 2001
-From: Alfred Wingate <parona@protonmail.com>
-Date: Fri, 9 Aug 2024 03:00:05 +0300
-Subject: [PATCH] Adjust to libfmt-11 changes
-
-Bug: https://bugs.gentoo.org/937599
-See-Also: https://github.com/fmtlib/fmt/commit/d70729215fba1d54862e407b626abf86ddf409bf
-Signed-off-by: Alfred Wingate <parona@protonmail.com>
---- a/src/trace.h
-+++ b/src/trace.h
-@@ -156,7 +156,7 @@ namespace fmt { template<typename T> struct formatter {}; }
- //! adds support for formatting QCString
- template<> struct fmt::formatter<QCString> : formatter<std::string>
- {
--  auto format(const QCString &c, format_context& ctx) {
-+  auto format(const QCString &c, format_context& ctx) const {
-     return formatter<std::string>::format(c.str(), ctx);
-   }
- };
-@@ -164,7 +164,7 @@ template<> struct fmt::formatter<QCString> : formatter<std::string>
- //! adds support for formatting Protected
- template<> struct fmt::formatter<Protection> : formatter<std::string>
- {
--  auto format(Protection prot, format_context& ctx) {
-+  auto format(Protection prot, format_context& ctx) const {
-     std::string result="Unknown";
-     switch (prot)
-     {
-@@ -180,7 +180,7 @@ template<> struct fmt::formatter<Protection> : formatter<std::string>
- //! adds support for formatting Specifier
- template<> struct fmt::formatter<Specifier> : formatter<std::string>
- {
--  auto format(Specifier spec, format_context& ctx) {
-+  auto format(Specifier spec, format_context& ctx) const {
-     std::string result="Unknown";
-     switch (spec)
-     {
-@@ -195,7 +195,7 @@ template<> struct fmt::formatter<Specifier> : formatter<std::string>
- //! adds support for formatting MethodTypes
- template<> struct fmt::formatter<MethodTypes> : formatter<std::string>
- {
--  auto format(MethodTypes mtype, format_context& ctx) {
-+  auto format(MethodTypes mtype, format_context& ctx) const {
-     std::string result="Unknown";
-     switch (mtype)
-     {
-@@ -213,7 +213,7 @@ template<> struct fmt::formatter<MethodTypes> : formatter<std::string>
- //! adds support for formatting RelatesType
- template<> struct fmt::formatter<RelatesType> : formatter<std::string>
- {
--  auto format(RelatesType type, format_context& ctx) {
-+  auto format(RelatesType type, format_context& ctx) const {
-     std::string result="Unknown";
-     switch (type)
-     {
-@@ -228,7 +228,7 @@ template<> struct fmt::formatter<RelatesType> : formatter<std::string>
- //! adds support for formatting RelationShip
- template<> struct fmt::formatter<Relationship> : formatter<std::string>
- {
--  auto format(Relationship relation, format_context& ctx) {
-+  auto format(Relationship relation, format_context& ctx) const {
-     std::string result="Unknown";
-     switch (relation)
-     {
-@@ -243,7 +243,7 @@ template<> struct fmt::formatter<Relationship> : formatter<std::string>
- //! adds support for formatting SrcLangExt
- template<> struct fmt::formatter<SrcLangExt> : formatter<std::string>
- {
--  auto format(SrcLangExt lang, format_context& ctx) {
-+  auto format(SrcLangExt lang, format_context& ctx) const {
-     std::string result="Unknown";
-     switch (lang)
-     {
-@@ -273,7 +273,7 @@ template<> struct fmt::formatter<SrcLangExt> : formatter<std::string>
- //! adds support for formatting MemberType
- template<> struct fmt::formatter<MemberType> : formatter<std::string>
- {
--  auto format(MemberType mtype, format_context& ctx) {
-+  auto format(MemberType mtype, format_context& ctx) const {
-     std::string result="Unknown";
-     switch (mtype)
-     {
-@@ -301,7 +301,7 @@ template<> struct fmt::formatter<MemberType> : formatter<std::string>
- //! adds support for formatting TypeSpecifier
- template<> struct fmt::formatter<TypeSpecifier> : formatter<std::string>
- {
--  auto format(TypeSpecifier type, format_context& ctx) {
-+  auto format(TypeSpecifier type, format_context& ctx) const {
-     return formatter<std::string>::format(type.to_string(),ctx);
-   }
- };
-@@ -309,7 +309,7 @@ template<> struct fmt::formatter<TypeSpecifier> : formatter<std::string>
- //! adds support for formatting EntryType
- template<> struct fmt::formatter<EntryType> : formatter<std::string>
- {
--  auto format(EntryType type, format_context& ctx) {
-+  auto format(EntryType type, format_context& ctx) const {
-     return formatter<std::string>::format(type.to_string(),ctx);
-   }
- };
-@@ -317,7 +317,7 @@ template<> struct fmt::formatter<EntryType> : formatter<std::string>
- //! adds support for formatting MemberListType
- template<> struct fmt::formatter<MemberListType> : formatter<std::string>
- {
--  auto format(MemberListType type, format_context& ctx) {
-+  auto format(MemberListType type, format_context& ctx) const {
-     return formatter<std::string>::format(type.to_string(),ctx);
-   }
- };
diff --git a/app-text/doxygen/files/doxygen-1.9.7-musl-1.2.4.patch b/app-text/doxygen/files/doxygen-1.9.7-musl-1.2.4.patch
deleted file mode 100644
index 2c71a0af9ae8..000000000000
--- a/app-text/doxygen/files/doxygen-1.9.7-musl-1.2.4.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://bugs.gentoo.org/906920
-https://gitlab.exherbo.org/exherbo/arbor/-/commit/7b517ba0068adc471fe7b2ed8cfbb191a197ca17
-
-From 6d713aa98b36ee8219294515142c0225fbd09dfc Mon Sep 17 00:00:00 2001
-From: Heiko Becker <heirecka@exherbo.org>
-Date: Thu, 25 May 2023 10:52:29 +0200
-Subject: [PATCH] Apply upstream fix for spdlog
-
-Fixes the build with musl >= 1.2.4, see
-https://github.com/gabime/spdlog/commit/287a00d364990edbb621fe5e392aeb550135fb96
-for details.
---- a/deps/spdlog/include/spdlog/details/os-inl.h
-+++ b/deps/spdlog/include/spdlog/details/os-inl.h
-@@ -236,8 +236,8 @@ SPDLOG_INLINE size_t filesize(FILE *f)
- #    else
-     int fd = ::fileno(f);
- #    endif
--// 64 bits(but not in osx or cygwin, where fstat64 is deprecated)
--#    if (defined(__linux__) || defined(__sun) || defined(_AIX)) && (defined(__LP64__) || defined(_LP64))
-+// 64 bits(but not in osx, linux/musl or cygwin, where fstat64 is deprecated)
-+#    if ((defined(__linux__) && defined(__GLIBC__)) || defined(__sun) || defined(_AIX)) && (defined(__LP64__) || defined(_LP64))
-     struct stat64 st;
-     if (::fstat64(fd, &st) == 0)
-     {
--- 
-2.41.0.rc2
diff --git a/app-text/doxygen/files/doxygen-1.9.8-spdlog-link.patch b/app-text/doxygen/files/doxygen-1.9.8-spdlog-link.patch
deleted file mode 100644
index e73385dec3b2..000000000000
--- a/app-text/doxygen/files/doxygen-1.9.8-spdlog-link.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-https://github.com/doxygen/doxygen/issues/10265
-https://github.com/doxygen/doxygen/pull/10284
-
-From 70bb112352ae7f3130647dcc009d8de5d4134e6d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=D9=85=D9=87=D8=AF=D9=8A=20=D8=B4=D9=8A=D9=86=D9=88=D9=86?=
- =?UTF-8?q?=20=28Mehdi=20Chinoune=29?= <mehdi.chinoune@hotmail.com>
-Date: Mon, 4 Sep 2023 18:49:27 +0100
-Subject: [PATCH 1/2] doxyapp: Fix linking to spdlog
-
----
- addon/doxyapp/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/addon/doxyapp/CMakeLists.txt b/addon/doxyapp/CMakeLists.txt
-index 4f3c31feacd..6097a3cca69 100644
---- a/addon/doxyapp/CMakeLists.txt
-+++ b/addon/doxyapp/CMakeLists.txt
-@@ -46,7 +46,7 @@ mscgen
- doxygen_version
- doxycfg
- vhdlparser
--spdlog
-+spdlog::spdlog
- ${ICONV_LIBRARIES}
- ${CMAKE_THREAD_LIBS_INIT}
- ${SQLITE3_LIBRARIES}
-
-From 71f2ed171a6d14a67f1905802714add974c31789 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=D9=85=D9=87=D8=AF=D9=8A=20=D8=B4=D9=8A=D9=86=D9=88=D9=86?=
- =?UTF-8?q?=20=28Mehdi=20Chinoune=29?= <mehdi.chinoune@hotmail.com>
-Date: Mon, 4 Sep 2023 18:50:25 +0100
-Subject: [PATCH 2/2] doxyparse: Fix linking to spdlog
-
----
- addon/doxyparse/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/addon/doxyparse/CMakeLists.txt b/addon/doxyparse/CMakeLists.txt
-index 24881e3ef12..0157afb45e2 100644
---- a/addon/doxyparse/CMakeLists.txt
-+++ b/addon/doxyparse/CMakeLists.txt
-@@ -35,7 +35,7 @@ mscgen
- doxygen_version
- doxycfg
- vhdlparser
--spdlog
-+spdlog::spdlog
- ${ICONV_LIBRARIES}
- ${CMAKE_THREAD_LIBS_INIT}
- ${SQLITE3_LIBRARIES}
-
diff --git a/app-text/doxygen/files/doxygen-1.9.8-unbundle-sqlite.patch b/app-text/doxygen/files/doxygen-1.9.8-unbundle-sqlite.patch
deleted file mode 100644
index 04d1d69b7b86..000000000000
--- a/app-text/doxygen/files/doxygen-1.9.8-unbundle-sqlite.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-https://github.com/doxygen/doxygen/issues/10263
-https://github.com/doxygen/doxygen/commit/28609fecd41d885e54fa170e499a0e5b55def2c2
-
-From 28609fecd41d885e54fa170e499a0e5b55def2c2 Mon Sep 17 00:00:00 2001
-From: Dimitri van Heesch <doxygen@gmail.com>
-Date: Mon, 28 Aug 2023 20:19:16 +0200
-Subject: [PATCH] issue #10263 please add a use_sys_sqlite3 config option
-
----
- CMakeLists.txt          |  6 +++++-
- cmake/FindSQLite3.cmake | 38 ++++++++++++++++++++++++++++++++++++++
- deps/CMakeLists.txt     |  4 +++-
- src/CMakeLists.txt      |  4 +++-
- 4 files changed, 49 insertions(+), 3 deletions(-)
- create mode 100644 cmake/FindSQLite3.cmake
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4957c34c24d..31e53cc8440 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -25,7 +25,8 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-     option(use_libc++  "Use libc++ as C++ standard library." ON)
- endif()
- option(use_libclang    "Add support for libclang parsing." OFF)
--option(use_sys_spdlog  "Use system spdlog instead of bundled." OFF)
-+option(use_sys_spdlog  "Use system spdlog library instead of the one bundled." OFF)
-+option(use_sys_sqlite3 "Use system sqlite3 library instead of the one bundled." OFF)
- option(static_libclang "Link to a statically compiled version of LLVM/libclang." OFF)
- option(win_static      "Link with /MT in stead of /MD on windows" OFF)
- option(enable_console  "Enable that executables on Windows get the CONSOLE bit set for the doxywizard executable [development]"  OFF)
-@@ -67,6 +68,9 @@ endif()
- if (use_sys_spdlog)
-         find_package(spdlog CONFIG REQUIRED)
- endif()
-+if (use_sys_sqlite3)
-+        find_package(SQLite3 REQUIRED)
-+endif()
- if (build_wizard)
-     if (force_qt STREQUAL "Qt6")
-         if (CMAKE_SYSTEM MATCHES "Darwin")
-diff --git a/cmake/FindSQLite3.cmake b/cmake/FindSQLite3.cmake
-new file mode 100644
-index 00000000000..7c21de223a7
---- /dev/null
-+++ b/cmake/FindSQLite3.cmake
-@@ -0,0 +1,38 @@
-+# Copyright (C) 2007-2009 LuaDist.
-+# Created by Peter Kapec <kapecp@gmail.com>
-+# Redistribution and use of this file is allowed according to the terms of the MIT license.
-+# For details see the COPYRIGHT file distributed with LuaDist.
-+#	Note:
-+#		Searching headers and libraries is very simple and is NOT as powerful as scripts
-+#		distributed with CMake, because LuaDist defines directories to search for.
-+#		Everyone is encouraged to contact the author with improvements. Maybe this file
-+#		becomes part of CMake distribution sometimes.
-+
-+# - Find sqlite3
-+# Find the native SQLite3 headers and libraries.
-+#
-+# SQLite3_INCLUDE_DIRS	- where to find sqlite3.h, etc.
-+# SQLite3_LIBRARIES	- List of libraries when using sqlite.
-+# SQLite3_FOUND	- True if sqlite found.
-+
-+# Look for the header file.
-+FIND_PATH(SQLite3_INCLUDE_DIR NAMES sqlite3.h)
-+
-+# Look for the library.
-+FIND_LIBRARY(SQLite3_LIBRARY NAMES sqlite3)
-+
-+# Handle the QUIETLY and REQUIRED arguments and set SQLITE3_FOUND to TRUE if all listed variables are TRUE.
-+INCLUDE(FindPackageHandleStandardArgs)
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(SQLite3 DEFAULT_MSG SQLite3_LIBRARY SQLite3_INCLUDE_DIR)
-+
-+# Copy the results to the output variables.
-+IF(SQLite3_FOUND)
-+	SET(SQLite3_LIBRARIES ${SQLite3_LIBRARY})
-+	SET(SQLite3_INCLUDE_DIRS ${SQLite3_INCLUDE_DIR})
-+ELSE(SQLite3_FOUND)
-+	SET(SQLite3_LIBRARIES)
-+	SET(SQLite3_INCLUDE_DIRS)
-+ENDIF(SQLite3_FOUND)
-+
-+MARK_AS_ADVANCED(SQLite3_INCLUDE_DIRS SQLite3_LIBRARIES)
-+
-diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt
-index a689b4a7018..eb716417f22 100644
---- a/deps/CMakeLists.txt
-+++ b/deps/CMakeLists.txt
-@@ -4,4 +4,6 @@ add_subdirectory(libmscgen)
- if (NOT use_sys_spdlog)
- 	add_subdirectory(spdlog)
- endif()
--add_subdirectory(sqlite3)
-+if (NOT use_sys_sqlite3)
-+        add_subdirectory(sqlite3)
-+endif()
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 78a55c3f2bf..02c52240e5b 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -6,7 +6,6 @@ include_directories(
-     ${PROJECT_SOURCE_DIR}/deps/libmd5
-     ${PROJECT_SOURCE_DIR}/deps/liblodepng
-     ${PROJECT_SOURCE_DIR}/deps/libmscgen
--    ${PROJECT_SOURCE_DIR}/deps/sqlite3
-     ${PROJECT_SOURCE_DIR}/libversion
-     ${PROJECT_SOURCE_DIR}/libxml
-     ${PROJECT_SOURCE_DIR}/vhdlparser
-@@ -18,6 +17,9 @@ include_directories(
- if (NOT use_sys_spdlog)
-     include_directories(${PROJECT_SOURCE_DIR}/deps/spdlog/include)
- endif()
-+if (NOT use_sys_sqlite)
-+    include_directories(${PROJECT_SOURCE_DIR}/deps/sqlite3)
-+endif()
- 
- 
- file(MAKE_DIRECTORY ${GENERATED_SRC})
-
diff --git a/app-text/multitail/Manifest b/app-text/multitail/Manifest
index a13b6ae3fa76..5ae199ab84d4 100644
--- a/app-text/multitail/Manifest
+++ b/app-text/multitail/Manifest
@@ -1,10 +1,12 @@
 AUX multitail-7.0.0-fix-clang16-build.patch 884 BLAKE2B a4f1f2bb1f064ed6df54b3a0d3a0339bb9fd2d07624f31e16d2dbd30300d55ba7a25844ac6fa82a44fcb68ce4a7617548ebbf894caf654d352e831c0178de3c4 SHA512 e47f87e62f8ef710924464879c40520be555133f0ea0755d0e427d894e27dc884eecfab2d90a6fbe800d0eadedf50bc2393217f4b70359efaf576f2cd150e75b
 AUX multitail-7.0.0-fix-lto-type-mismatch.patch 1016 BLAKE2B f9154926741dd63018f43c2c1e20b63761c71fd43268955055ae3e63530c257b19bf190fdddd895de582e43a6ae49e8cde91184e7ced168d414bdb84a436fead SHA512 8a2a5bc238beccfdf9f2234adbbc4cae1ba0002110a431412ec539b2d077037e7b796e989781e60e2258334c80086c32f6bd42aada4cf12a14b092fb0639b9e7
 AUX multitail-7.0.0-gentoo.patch 1029 BLAKE2B 7aa35008a0dc58f82bdde4c2972b7028e60dea86c47d86ac221d5546fd38fdc7b311c8006ea5aaf4f73f63435058a12eb485ce2c07940c0c3e94ba18fc8e1c09 SHA512 ff56f33c780b401a9ae5dcdd9598438bc22bbb3946408140e3165ba8a613c55b84b4d0ee210eaffae21d49dd396fd6f795fe54c4a0db5c0ba9f46befc7f4287c
+AUX multitail-7.1.5-cmake-gnuinstalldirs.patch 1587 BLAKE2B 71e55754e4e8107fa19ec7c5fcbd80459d3a4d02d278221c907c79d679bc95f07bced4ee9cb9e9846431607f733b5af82f71cbd11a097c0848345d799d8ee972 SHA512 519f173fd27adbda4db985de67783bc2b9f52e50062ca67cc8c96839da34aea6d1c2bcafb93973a578effa46fdcb524e7f3caf7d918cb3ed34c82f050d8cc1eb
+AUX multitail-7.1.5-ncurses.patch 1465 BLAKE2B b15ef48f0341621dce6a449a4697c9a31c80d547d00d57afcbe7abb309d6ddb0e1f38f8cbda5dca905de8bc647bc591e18467f19ea10479431dae5333698546c SHA512 6097fd14788e89800a077690e4d3b5066783a863f85609decde527457700d0cfe135ace358bb7bd8898b4c2a4f37edaa51b43f1a0735cc371c9a40252b6b3d27
 DIST multitail-7.0.0.tar.gz 152425 BLAKE2B 1afbee9501926b860bd063768e6d20b7e6fe97b7ca8eaeb279639f3ef4f32d3c694650e2471abab067add04fbd1ce7b94dfc2f709baca460e9a36a34cb0746d2 SHA512 325abc2ec3e55f274b8f080c54e878ee301af1df5761def95b5fee0abe65cc999a2db0184e1d7a7378c048b1766e03f9553262d3bba88c8fad87c4952d1d59ae
 DIST multitail-7.1.2.tar.gz 153409 BLAKE2B 852f7a0f22581b043c65f24bc1a19ffb0e7fa8c91d8152b58a1127a51b1833cded0b22c5430f96417af277927daefeb73d5acef38bdbc54898cc48ec0a4e9436 SHA512 6f006d68a6c0fcfec9f6aada4a1ad0a031b61ea46c60231faa6fd7ea934f6f74ca30f12f8983658c9ae6ae2e08bade9159e3426ed47cd9171d0b190ec9f3e5b5
 DIST multitail-7.1.5.tar.gz 152590 BLAKE2B 40bb8123aa091aecc64e603d40120d97b118185b8c461e46c087e9491cc32ce8779530881eb1fe27aae0cbb17f08ce679ad4a8c045e2506e9f3705596f2f4301 SHA512 7b52eaa9c99e8747f841b23ad3f7154d8cb65c5f4bd2f89fc80d37b6a2fecdacfd7657c5ba37356e67fd03f7992556af648b7d26bb730f7e8966d0230182a8a6
 EBUILD multitail-7.0.0.ebuild 1505 BLAKE2B 0d91356fd7fbca2563e7a0b06ca404c8417a0fc4b4522bca3bef202808180e009e6d207514dbe70988ce786bf32209a2c8fd90dc5532097c9eee60ee0e4211b3 SHA512 0e7e750b661b1a8ef42652fde8dc8d7e7487b703d286ece197951e057c87bb3600e6866128587d7442a6cbf601052a7cd05be36a612b6626b80d4e5598dfeb83
 EBUILD multitail-7.1.2.ebuild 1440 BLAKE2B 78f723f49077f6111c0f75a2af24e21f240f6d9960e3611d8acba8004d8c53dd85f776375c8ae08e66e8df5ce73d3d002173d5d9434cce618ec70589c6c041bc SHA512 934f2b5bac397a8e3ada7c72a5b6c1f7835e0f1cfff557f3994c36ce984c3425143eb48c2d102b163b39b855b45dd02111e972a534a4d2d534c3ea6d0bc153ff
-EBUILD multitail-7.1.5.ebuild 1437 BLAKE2B 5e4d98c4d95a26f1fba935c2433b27b4bdb9e29726b3052e6bc67f86eb6593d49ee6c43b8489fa5127c29df538cb3e2ca2227db7cf30343fbfd7d6732406ff90 SHA512 c184fc78a0463c37d5941cbc442623184957f98db9dc96921aa3cfcabe96f8bbbba52d0a9d99fc7dca3027811905839268024b2d62fffcff81a57a5b4c23b30b
+EBUILD multitail-7.1.5-r1.ebuild 1559 BLAKE2B 46772db546a862327d2003635ec4e00ab94b0aeb07af2b960d80a45fdecff062ebcf040d8c54b72586d62d9baffa4369b9bdcef1ed5825e2deab4cab1c82c3d6 SHA512 5409c891a0482944cf2f1fa1171b253a7ef740f83620aad419a5371109a47c8e6557a598efe71c489a19ea9ab61c4456ce9f85ee071c211790f7e97ec5575932
 MISC metadata.xml 358 BLAKE2B febc299cf49a8c7bb3a55c83a95fbce0ceb46a9297f91a8d34e6275fb66f7847b08d0facfdcaacc2d88b97af8cf64244712f424a1bfcd11fa866fab7f4d28702 SHA512 834755fd8e98223a18d1487ad8e182bbdd02094b3b52603f7945099dfb0f525a5f08f1d2162b2a5785ce01fd252e4a6b2f4ad9b7ae775e7922ac560a332ea42c
diff --git a/app-text/multitail/files/multitail-7.1.5-cmake-gnuinstalldirs.patch b/app-text/multitail/files/multitail-7.1.5-cmake-gnuinstalldirs.patch
new file mode 100644
index 000000000000..936ad9eaec04
--- /dev/null
+++ b/app-text/multitail/files/multitail-7.1.5-cmake-gnuinstalldirs.patch
@@ -0,0 +1,37 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 22d41c1..ee50976 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,4 +1,5 @@
+ cmake_minimum_required(VERSION 3.6)
++include(GNUInstallDirs)
+ 
+ ## use ccache if found
+ find_program(CCACHE_EXECUTABLE "ccache" HINTS /usr/local/bin /opt/local/bin)
+@@ -183,18 +183,18 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
+ 
+ 
+ # install the bin
+-install(TARGETS multitail DESTINATION bin)
++install(TARGETS multitail DESTINATION ${CMAKE_INSTALL_BINDIR})
+ # install the config file
+-install(FILES multitail.conf DESTINATION etc RENAME multitail.conf.new)
++install(FILES multitail.conf DESTINATION ${CMAKE_INSTALL_SYSCONFDIR})
+ # install the manual files
+-install(FILES multitail.1 DESTINATION share/man/man1)
++install(FILES multitail.1 DESTINATION ${CMAKE_INSTALL_MANDIR})
+ # install doc files
+-install(FILES manual.html DESTINATION share/doc/multitail-${VERSION})
+-install(FILES LICENSE DESTINATION share/doc/multitail-${VERSION})
+-install(FILES README.md DESTINATION share/doc/multitail-${VERSION})
+-install(FILES thanks.txt DESTINATION share/doc/multitail-${VERSION})
++install(FILES manual.html DESTINATION ${CMAKE_INSTALL_DOCDIR})
++install(FILES LICENSE DESTINATION ${CMAKE_INSTALL_DOCDIR})
++install(FILES README.md DESTINATION ${CMAKE_INSTALL_DOCDIR})
++install(FILES thanks.txt DESTINATION ${CMAKE_INSTALL_DOCDIR})
+ # cp conversion-scripts/* etc/multitail/
+-install(DIRECTORY conversion-scripts DESTINATION etc/multitail)
++install(DIRECTORY conversion-scripts DESTINATION ${CMAKE_INSTALL_SYSCONFDIR})
+ 
+ 
+ if(USE_CPPCHECK)
diff --git a/app-text/multitail/files/multitail-7.1.5-ncurses.patch b/app-text/multitail/files/multitail-7.1.5-ncurses.patch
new file mode 100644
index 000000000000..ae4f7f150592
--- /dev/null
+++ b/app-text/multitail/files/multitail-7.1.5-ncurses.patch
@@ -0,0 +1,44 @@
+https://bugs.gentoo.org/945647
+https://github.com/folkertvanheusden/multitail/pull/44
+
+From 4ebc884f2276a63c81532deb2e4a068b330d71aa Mon Sep 17 00:00:00 2001
+From: madjic <madjic@madjic.de>
+Date: Thu, 12 Dec 2024 23:31:09 +0100
+Subject: [PATCH] fix implicit function declaration for waddnwstr in linux
+
+---
+ mt.c | 2 --
+ mt.h | 4 ++--
+ 2 files changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/mt.c b/mt.c
+index 39a5c17..a97acad 100644
+--- a/mt.c
++++ b/mt.c
+@@ -707,8 +707,6 @@ void do_color_print(proginfo *cur, char *use_string, int prt_start, int prt_end,
+ 		if (!is_control_or_extended_ascii)
+ 		{
+ #if defined(UTF8_SUPPORT) && defined(NCURSES_WIDECHAR)
+-// FIXME warning: implicit declaration of function ‘waddnwstr’ is invalid in C99  [-Wimplicit-function-declaration]
+-// see /usr/include/ncurses.h
+ 			waddnwstr(win -> win, &wcur, 1);
+ #else
+ 			wprintw(win -> win, "%c", wcur);
+diff --git a/mt.h b/mt.h
+index f6c37a0..2f401eb 100644
+--- a/mt.h
++++ b/mt.h
+@@ -60,10 +60,10 @@ typedef enum { SCHEME_TYPE_EDIT = 0, SCHEME_TYPE_FILTER } filter_edit_scheme_t;
+ #endif
+ 
+ #if defined(UTF8_SUPPORT) && !defined(__APPLE__)
+-        #if defined(__FreeBSD__) || defined (__linux__)
++        #if defined(__FreeBSD__)
+                 #include <panel.h>
+                 #include <curses.h>
+-        #else
++        #else /* if defined (__linux__) */
+                 #include <ncursesw/panel.h>
+                 #include <ncursesw/ncurses.h>
+         #endif
+
diff --git a/app-text/multitail/multitail-7.1.5.ebuild b/app-text/multitail/multitail-7.1.5-r1.ebuild
index be9322af7832..00ac29ba15f9 100644
--- a/app-text/multitail/multitail-7.1.5.ebuild
+++ b/app-text/multitail/multitail-7.1.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,16 +20,24 @@ BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-7.0.0-gentoo.patch
+	"${FILESDIR}"/${PN}-7.1.5-ncurses.patch
+	"${FILESDIR}"/${PN}-7.1.5-cmake-gnuinstalldirs.patch
 )
 
 src_prepare() {
+	# Don't clobber toolchain defaults
+	sed -i -e '/-D_FORTIFY_SOURCE=2/d' CMakeLists.txt || die
+
 	cmake_src_prepare
+
 	# cmake looks for licence.txt to install it, which does not exist in the package
 	cp LICENSE license.txt || die
 }
 
 src_configure() {
 	local mycmakeargs=(
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+		-DUSE_CPPCHECK=OFF
 		-DUTF8_SUPPORT=$(usex unicode)
 	)
 	CMAKE_BUILD_TYPE=$(usex debug Debug)
@@ -40,12 +48,6 @@ src_configure() {
 src_install() {
 	cmake_src_install
 
-	insinto /etc
-	doins multitail.conf
-
-	rm -rf "${ED}"/usr/{ect,etc} || die
-	rm -rf "${ED}"/usr/share/doc/multitail-VERSION=${PV} || die
-
 	local DOCS=( README.md thanks.txt )
 	local HTML_DOCS=( manual.html )
 	einstalldocs
diff --git a/app-text/unpaper/Manifest b/app-text/unpaper/Manifest
index 317d01ee34a5..6a7fc041f05e 100644
--- a/app-text/unpaper/Manifest
+++ b/app-text/unpaper/Manifest
@@ -1,4 +1,4 @@
 DIST unpaper-7.0.0.tar.xz 4430572 BLAKE2B 4ab27df9f859b9238ce866c65b7e2d4214a96883be35259494db0115594804a8bc76dc0c60324f147d76865c2cedaaffa70f7a2785fdad2e5c103ca66fa49ea3 SHA512 58da969e773bf16ffee98b96f903ac5347f66d9a93c63bdb9131f5d45f4d7973c09f364ac2f27f8cb61f75de0421c6b01aa248fa9619fbdbde30fcebc76aa484
-EBUILD unpaper-7.0.0.ebuild 689 BLAKE2B de77766978f3f382d03c41a6973321b06c44a660ca068d36b3f85ce54263084b3a34629e118d6dd1ca3795371cdeacdf7ebb508c7b0a36692fbef3c6b66280e1 SHA512 e0beb15184160ea678b66367f98581af8f7996c1eae231080f34dfd4b361f1d4aafb05b648b8d39e3a71e6d936ec26756e9c5258a39427d4f1017be268f36133
-EBUILD unpaper-9999.ebuild 692 BLAKE2B 04e6815d89126048c6b41bb98eb31260b827932311261d2c6992f7362c648d0a581c0487c0d37da4c722f174b989c548ac86ef0b2c4d98891be3332e128fca3e SHA512 a270959652502c83502a5c4aa004b78017378c1d5d2f93d4d14b46016dac4a50c44978c495d09750f1ca4072e5842f37d12fb2c2daf248c460f462f046079604
+EBUILD unpaper-7.0.0-r1.ebuild 687 BLAKE2B ac25eb0849a08501968cec66c073a5ff4b1b589b0b6feffc813c6f8e3e77174e9c3b08a2bd7abeb5b17f532ad9a28f4cbd2b268a7d739009da2514f24f49891e SHA512 6c28c0b64b7461ae0812a84e168211f2b66a4ac75ee626aaae332890e57e87bf49a4f8bf03d94e724af92496c98a4c3972aa3d1ff0651bf04f6eed603c237a85
+EBUILD unpaper-9999.ebuild 690 BLAKE2B 7c62f7190004777b04d65fbe939106f6a0af5991184c4682bb177eef8d08c2fc58c808888a2f6be59c40733c809d0df51c9f8fbb6d2dd5b4f496a59b892dd9bb SHA512 186fc1c0764848800e7a6a531fe024747262efce19127bceded2e102688fec614d5f8b089b60ddb4868650b3cf7b6403de039df71dd47e165565186528ce6267
 MISC metadata.xml 309 BLAKE2B 56e5f343e13cbb687775cfafea22f6f9bcd783aa8a1f6291f61a640ef9cfbf9940d888769e86d7be39e420c3eab54a8e2c90cc705357bf7761adad620f1dda7b SHA512 cad7f3c104c6b07142c90c0f61d72ca1eb20063e63927850ee4519b245bf2239a5f1c2e24a979d4b66f65f061b4f3a8750e9c367387677d51bff70bc067eb58b
diff --git a/app-text/unpaper/unpaper-7.0.0.ebuild b/app-text/unpaper/unpaper-7.0.0-r1.ebuild
index 3e63806bd223..3292db5b04db 100644
--- a/app-text/unpaper/unpaper-7.0.0.ebuild
+++ b/app-text/unpaper/unpaper-7.0.0-r1.ebuild
@@ -21,7 +21,7 @@ SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-RDEPEND=">=media-video/ffmpeg-2:0=[encode]"
+RDEPEND="media-video/ffmpeg:=[encode(+)]"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	app-text/docbook-xsl-ns-stylesheets
diff --git a/app-text/unpaper/unpaper-9999.ebuild b/app-text/unpaper/unpaper-9999.ebuild
index a26b83763386..51976000645b 100644
--- a/app-text/unpaper/unpaper-9999.ebuild
+++ b/app-text/unpaper/unpaper-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,7 +21,7 @@ SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-RDEPEND=">=media-video/ffmpeg-2:0=[encode]"
+RDEPEND="media-video/ffmpeg:=[encode(+)]"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	app-text/docbook-xsl-ns-stylesheets