gentoo auto-resync : 04:11:2024 - 03:03:54

author: V3n3RiX <venerix@koprulu.sector> 2024-11-04 03:03:54 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2024-11-04 03:03:54 +0000
commit: 3cc82055be7dba177f4aea15af9f5414b532da7e (patch)
tree: 1eed8bbe7a93b3a0a7d6091ead40e81519978a38 /app-office
parent: 212000bb5eabdfeb9a6e7a9b8f28e2740cae555a (diff)
18 files changed, 1099 insertions, 1035 deletions
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 2d2e0f0f3558..a70c8833c60a 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/gnucash/Manifest b/app-office/gnucash/Manifest
index 4900f6e1c6e5..fbc5eb99b003 100644
--- a/app-office/gnucash/Manifest
+++ b/app-office/gnucash/Manifest
@@ -1,19 +1,9 @@
 AUX gnucash-4.12-drop-broken-test.patch 1214 BLAKE2B 6e977f65cecee6b9102881529799f04ddd03b170f0e9cbe8959b3e356d2dfbef14d9cb11d3e37f0225991fe7bd08ef50163db1d007836cb1024b0c1a6e79b0fd SHA512 8f18214982537514cb0640a4fa52fe9707c6f3ea0db0eef1108fb7b36fb89d0dadc87d12796c60b94d9ed8224655c35a9954bfb463f9f6b56cb02eca4d9d4cda
 AUX gnucash-5.0-exclude-license.patch 790 BLAKE2B e3f251d47b965f0071efc36bf6a399d1f0269ff02506635195b61760f8a99b9599c4bdeadda3204a344ca0493290ca8a0bb3b726f425cd084b830e0f4328167b SHA512 97fd15413759447857a51fddfec4f52e716017d585882d56acec195672f999687f33eb8276091f2fa43060d129c6a8171e1678a7b511a31cf441aab28e083c33
 AUX gnucash-5.0-webkit2gtk-4.1.patch 484 BLAKE2B 075c06765edbd6f0d7e50c033813b587c145e882372efb2b10cd63fc0ec555ee7a4ec048d89e96208fb117a4b4cde22e7a6a2b36c5fa247e6bde1edc50ad59f7 SHA512 37df788a64c91ac30667d1d92f0a017883314968cd77aace7b43654232e140dd5e00a4044d9c63437df4d1d50ebbe665f6a65189734c02c0fa224dd7076364bf
-AUX gnucash-5.3-include-algorithm.patch 347 BLAKE2B 9a7e41ed320262477195a519dd19a1ca16f35370b117a69529402e2606a2f251538fddda208b4812fca945ee83e3fcad209514fe15d48edf7ca88ea4353aaf89 SHA512 f41470bbb1af231cf41b918dd01eca4adbbf8532483e6af292a8fdcc123b0265f6807ec58903eb69933d3a990dad965a36149f1cecf7049cedd77c5df3eb8f55
-AUX gnucash-5.3-no-werror.patch 1288 BLAKE2B 75fda4f8cd0906744417149381d3f0f32de2471c8afef0305292b53c162a35c4ff7cea875fc8087e70f1b94b6ad00107230e3e595ef94ba9cb84fe1d7ec14559 SHA512 74eb0d5e23fc01abaf61ae1295a1feda95fc0332415645adc75fa3badd921fa2642b6a2813adc68837025bf0eba9114588900b2cf9fea04fbb0b60b4a4591881
-AUX gnucash-5.4-fix-python-finding.patch 1727 BLAKE2B 2df2b3aad33f97b83425f01fa193e5d7d799f7c14d39cfebabee4995330ccee37c20064dad5d9f8425595f599f2b6e31f9c9533f57f081ee1b44932e6194a9de SHA512 26d7216ce583452aa19bf8301559a40888546deae2d93f868bdbb80fab8fdfee6cc2e30bc3180dec0a02b6880e06e98e4dc36b5d61f7216307b8daed4126d140
 AUX gnucash-5.6-no-werror.patch 1316 BLAKE2B 4e34795d4e1c3b995d7f8940a00664727e8b65b4c535bf4778058eb8c34edeff8c1e50e8afd5929d0f12487f363e706345adc6549aebc4ac32895e37a4f8b544 SHA512 10fbd97013cafd1563903087d9a1462c0b07ea30dd605b1e9efcb835c4d4ce5b6183a6cfde1fce4718d48798492f0c99bd8d5e1f420ce395390664fda4200e4f
-DIST gnucash-5.3.tar.bz2 14928584 BLAKE2B 9778efa9b77f16f784eaffe1f4338a20cc42e4e767e3dcb3b29e8dc011e538912d59c21e23d3d63e031a1b558c9faaa8bc5853141ae4d2764de4c9ae949668ff SHA512 f811ed66144f8689255970c6d925047eeb8d47dbefc862f42ab54ff3342e4710d822288a2d34ed1e7e873c7a7c5db0f95bdaa233787cd6828ff448af0eea325e
-DIST gnucash-5.4-1.tar.bz2 14928988 BLAKE2B 389996058e2d452f7e0a9ee088a56254c56546f363291d92c02db0ff06d21f6aa4c99f2fc3ee56a13cbb8ea122f57ba391992bb670496471bb3c0e2583be7ca9 SHA512 25e221c6926594ca86097f1d34a4b035fd6853b7b6324809a0e9927e9b0958fd896deefdc8b4346717e3068bb8895697a5e3cd65e6cc02f8bc2fb19d8a8bb103
-DIST gnucash-5.5.tar.bz2 14986561 BLAKE2B b5c4d8b0340d26e67c95d478f9f0aceb905688fe8024cf2664215e93c869046d727561d0efb64ebdc1e3bae2bc4e987cb6d919ff03e14c55482e9aa216d9780b SHA512 06ee099d5cb4c24ff0b53f5788db36599240c0b6392d6fcc548b8d6f5c3aebef26d13fae80083b7676e80e739e386eb197bfb1ecf204995c77f60493a7c8c735
-DIST gnucash-5.6.tar.bz2 15110621 BLAKE2B 9ee514ed158512ac6121a0e51457f68696e3eaf9fdfad7e8c8e7cf0523e8a900d2e3786146ad459bc8fc871eb5aec754e30d40130370c4e8d497e0496e3c793f SHA512 5ae0994a3f358bbf5ee6aeffc7a7237f6869e72c34cd551e5243e0c966dbbccfe8cdea65b7d31e016657b97175d6e5d94f5797b5adec5f94bc0b627c7a4dd435
+AUX gnucash-5.8-gcc15.patch 18468 BLAKE2B 4b7c9eeace4d5ad09b109b8abdd26450ef1413a36d16b475a7392bf8bbb0927f6fc07a974a5bd8a74658b55c4bd28b08578b58738b55a286b7f2106ae640bacb SHA512 33efd12b3229e7e3908e2483b1d4dfe449260b4c40c46fb23f3ebd37dad9130f12a8f83a14de670e868c97199bdbe7c7ece836cf4411dcc83dd9a8ac7eb241dc
 DIST gnucash-5.8.tar.bz2 14998331 BLAKE2B 3440eec0c6936b446febc385b4b397aa4a0d5a5b710012a59ca6f9d378ca676105f815d05ccabd76be28c7943a3ca155357c2172f1ce0a2f5070d718bac638fd SHA512 3eca261b8be218eb130a75877f2c8b31de55c6c422c1f2d9fadea648efc66a0e7d536117505c4b6f2da7c67d9a01f87db66a0198914d24dea87d00dcd68bfb0f
-EBUILD gnucash-5.3.ebuild 5431 BLAKE2B f762e50148e7f6167e35aaf94274d6f28350679169c3356391e54560ebe5321226a950c35276641daa8d37988de1a58b2bfee48bb8bc2cd2b41cb06f99784836 SHA512 532abdc35451ad349a3cd34ec8688ce183fd9f21bf8aab5f8668479101777fb1e2073545431d39221f539d54ea9088e81c9e1a1aa0602d88879cb22093219db7
-EBUILD gnucash-5.4-r1.ebuild 5679 BLAKE2B 8f021755c14e7c7a82bc1be744a1c9b45aded33a2f301192e7b47e44756801c9f231382a314413f2a01fb4445ac17c97429f5da13eaa82ab8f69be1caf427731 SHA512 ea7afbaa08801f67c32f7bc44b3e1ec04d7a6064621a0cce1dadbbec316445d88b130d42b448161b7a08074271b5c7cc615423e8aa877058775632a70895caba
-EBUILD gnucash-5.5.ebuild 5608 BLAKE2B 968aecfe928f5b6f6f85f4a8aa550ce62ac50d699a3cd4d5da3fe9593e361089d8c06c6c1c387a2d1ca49932219cd7c9b1e647e218ee46785c74b6ebfc10ff76 SHA512 9f4f5b5c058667f635d0b0cab462fb221c6432a61090a9c6fc0b3ce93cde881f3767806184ef01e15a7c230e0d3ed2ccef798396e477ad69a717fa1c51006af9
-EBUILD gnucash-5.6.ebuild 5606 BLAKE2B 4a3600b5af523d945efff216964990e58178b11dd26676c97e9edcfd91269a6941b57a81effaddc7b3f96b9bfceaa854a3833565a4f145472d52a43a1ecee03f SHA512 d0e5e44fff9569b8b70e4f574c1a1a408c2e94356467497cc26d1a4ab13fbec0385c06b065e41409fc7ad10b10c17d4a400f2df0a194c7b88be8a7e7088a121a
-EBUILD gnucash-5.8-r100.ebuild 5606 BLAKE2B ff8c6b6bf9ab52f5b7e125a2b1158f0749b0798d0790deb10c78af2380c14480807ae3922a5583a6131b87e4e2461f389e508d0ff3bc81cc748f893e726ace09 SHA512 3b284110115a52cdff77e480c9549186df675ba00f606f6f0829df6d066517fcf4aec03c7a04be7f2dfe1c171b053c165d1d05ef07d2d9c99d930d70b46124b4
+EBUILD gnucash-5.8-r100.ebuild 5663 BLAKE2B 7e2e02269810500b702934e9f4a0fea67ff1bf6d3eb4e8213c96ce297b9f0926d805a7f81313597a63df2cdc66380e06b0899c53cb976e98605ac02f2d203011 SHA512 f717552ea110dd354fbce27d395a3f8f2152b1a1729cea4a7fa2062e49864f5afcbedcc42ae27ccd7c1cf8df5e763d0a8166b062d46bf70f6c2f19794369d866
 EBUILD gnucash-5.8.ebuild 5607 BLAKE2B 82c0b85abf9dbd675030e5e30b434290fca869aedd4482e88a22f6175593d957630566a16d10486f60005e84602e4cd0006a2bd9aaa497c7f8e4650a485a9bb6 SHA512 3895a0811c7b3c55e9f15cb88198932b18ca1e4ffc7dcb85ecf499bd32fe40782b3b6461641de36b9b0471328ad566106267449a6835d9174f59be7129ba5e17
 MISC metadata.xml 1852 BLAKE2B 8868aba1d62997b136935fbdd5af21d66a632a0d00a0b44752f60aa30ccef98e51e7a95787ba7f7c1f9e40507523f4488c72e3673202760afaf2fd2c7829100a SHA512 c3a5ed7a36bfa39693d76735dce5b5e5889084bb9a15b3903a0621e48bf9aa9a24aff76ab998e2b2d6ee418f55d8606bdb70fe53aae5b05dce07ecaefe309432
diff --git a/app-office/gnucash/files/gnucash-5.3-include-algorithm.patch b/app-office/gnucash/files/gnucash-5.3-include-algorithm.patch
deleted file mode 100644
index d9998c8c66ed..000000000000
--- a/app-office/gnucash/files/gnucash-5.3-include-algorithm.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/libgnucash/engine/gnc-option-impl.hpp b/libgnucash/engine/gnc-option-impl.hpp
-index 4ebaa36..4d157d5 100644
---- a/libgnucash/engine/gnc-option-impl.hpp
-+++ b/libgnucash/engine/gnc-option-impl.hpp
-@@ -49,6 +49,7 @@
- #include <variant>
- #include <iostream>
- #include <limits>
-+#include <algorithm>
- 
- #include "gnc-option-uitype.hpp"
- 
diff --git a/app-office/gnucash/files/gnucash-5.3-no-werror.patch b/app-office/gnucash/files/gnucash-5.3-no-werror.patch
deleted file mode 100644
index 896a41f1284d..000000000000
--- a/app-office/gnucash/files/gnucash-5.3-no-werror.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -603,12 +603,12 @@
- set(CMAKE_C_EXTENSIONS ON)
- 
- if (UNIX)
--  set( CMAKE_C_FLAGS "-Werror -Wall -Wmissing-prototypes -Wmissing-declarations ${CMAKE_C_FLAGS}")
--  set( CMAKE_CXX_FLAGS "-Werror -Wall -Wmissing-declarations ${CMAKE_CXX_FLAGS}")
-+  set( CMAKE_C_FLAGS "-Wall -Wmissing-prototypes -Wmissing-declarations ${CMAKE_C_FLAGS}")
-+  set( CMAKE_CXX_FLAGS "-Wall -Wmissing-declarations ${CMAKE_CXX_FLAGS}")
-   set( CMAKE_C_FLAGS_RELEASE "-O3 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 ${CMAKE_C_FLAGS}")
- endif()
- if (MINGW)
--  set( CMAKE_C_FLAGS "-Werror -Wall -Wmissing-prototypes -Wmissing-declarations ${CMAKE_C_FLAGS}")
-+  set( CMAKE_C_FLAGS "-Wall -Wmissing-prototypes -Wmissing-declarations ${CMAKE_C_FLAGS}")
-   set( CMAKE_CXX_FLAGS "-DWINVER=0x0500 -D_EMULATE_GLIBC=0 ${CMAKE_CXX_FLAGS}") # Workaround for bug in gtest on mingw, see https://github.com/google/googletest/issues/893 and https://github.com/google/googletest/issues/920
- endif()
- 
---- a/common/cmake_modules/GncAddSwigCommand.cmake
-+++ b/common/cmake_modules/GncAddSwigCommand.cmake
-@@ -70,7 +70,7 @@
- 
-     set (DEFAULT_SWIG_PYTHON_FLAGS
-         -python -py3
--        -Wall -Werror
-+        -Wall
-         ${SWIG_ARGS}
-         )
-     set (DEFAULT_SWIG_PYTHON_C_INCLUDES
diff --git a/app-office/gnucash/files/gnucash-5.4-fix-python-finding.patch b/app-office/gnucash/files/gnucash-5.4-fix-python-finding.patch
deleted file mode 100644
index 26de7a7ad154..000000000000
--- a/app-office/gnucash/files/gnucash-5.4-fix-python-finding.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-https://bugs.gentoo.org/919859
-https://github.com/Gnucash/gnucash/commit/3782eed56785adaca02cf2bd4766d3825a6f6ca7
-
-From 3782eed56785adaca02cf2bd4766d3825a6f6ca7 Mon Sep 17 00:00:00 2001
-From: Simon Arlott <sa.me.uk>
-Date: Wed, 4 Oct 2023 21:15:11 +0100
-Subject: [PATCH] Use the default version of Python 3
-
-Python scripts that run with the default version of Python 3 by executing
-with /usr/bin/python3 that try to import gnucash can't find it if it has
-been built for a different version.
-
-Instead of using other installed versions of Python 3 that happen to be
-present, default to using the default "unversioned" version.
-
-It doesn't look like CMake are going to fix the default behaviour, so every
-project has to do this:
-https://gitlab.kitware.com/cmake/cmake/-/issues/24878
-https://gitlab.kitware.com/cmake/cmake/-/issues/24126
-https://gitlab.kitware.com/cmake/cmake/-/merge_requests/8287
-
-This is only supported on CMake 3.20 or newer, so users of older versions
-will still get the broken behaviour.
-
-Use the newer default Python3_FIND_STRATEGY=LOCATION (CMP0094).
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -2,6 +2,11 @@
- 
- cmake_minimum_required (VERSION 3.14.5)
- 
-+# CMake 3.15+ Python3_FIND_STRATEGY=LOCATION
-+if (POLICY CMP0094)
-+  cmake_policy(SET CMP0094 NEW)
-+endif()
-+
- project (gnucash
-     VERSION 5.4
- )
-@@ -492,6 +497,9 @@ endif()
- 
- if (WITH_PYTHON)
-   set (PYTHON_MIN_VERSION 3.6.0)
-+  if (NOT DEFINED Python3_FIND_UNVERSIONED_NAMES)
-+    set (Python3_FIND_UNVERSIONED_NAMES FIRST)
-+  endif()
-   find_package (Python3 ${PYTHON_MIN_VERSION} COMPONENTS Interpreter Development)
-   if (NOT Python3_FOUND)
-     message(SEND_ERROR "Python support enabled, but Python3 interpreter and/or libaries not found.")
diff --git a/app-office/gnucash/files/gnucash-5.8-gcc15.patch b/app-office/gnucash/files/gnucash-5.8-gcc15.patch
new file mode 100644
index 000000000000..00aa1c61d7dc
--- /dev/null
+++ b/app-office/gnucash/files/gnucash-5.8-gcc15.patch
@@ -0,0 +1,505 @@
+From c06bc18dc4da9832ad8aed8beac8904e0bdfee7e Mon Sep 17 00:00:00 2001
+From: David Seifert <soap@gentoo.org>
+Date: Sat, 2 Nov 2024 09:55:15 +0100
+Subject: [PATCH] Add missing `#include <cstdint>`
+
+* GCC 15 has reduced transitive dependencies between headers.
+
+Bug: https://bugs.gentoo.org/939856
+---
+ bindings/guile/gnc-kvp-guile.cpp                             | 1 +
+ gnucash/gnome-utils/gnc-option-gtk-ui.cpp                    | 1 +
+ gnucash/gnome-utils/test/test-autoclear.cpp                  | 1 +
+ gnucash/import-export/aqb/assistant-ab-initial.c             | 1 +
+ gnucash/import-export/aqb/gnc-gwen-gui.c                     | 1 +
+ gnucash/import-export/csv-imp/assistant-csv-price-import.cpp | 1 +
+ gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp | 1 +
+ gnucash/import-export/csv-imp/gnc-imp-settings-csv-price.cpp | 1 +
+ gnucash/import-export/csv-imp/gnc-imp-settings-csv-tx.cpp    | 1 +
+ gnucash/import-export/csv-imp/gnc-imp-settings-csv.hpp       | 1 +
+ gnucash/import-export/csv-imp/gnc-import-price.hpp           | 1 +
+ gnucash/import-export/csv-imp/gnc-import-tx.hpp              | 1 +
+ gnucash/import-export/csv-imp/gnc-tokenizer-fw.hpp           | 1 +
+ libgnucash/app-utils/test/test-print-parse-amount.cpp        | 1 +
+ libgnucash/backend/dbi/gnc-dbisqlresult.hpp                  | 1 +
+ libgnucash/backend/sql/gnc-slots-sql.cpp                     | 1 +
+ libgnucash/backend/sql/gnc-sql-column-table-entry.cpp        | 1 +
+ libgnucash/backend/sql/test/utest-gnc-backend-sql.cpp        | 1 +
+ libgnucash/backend/xml/io-gncxml-v2.cpp                      | 1 +
+ libgnucash/backend/xml/sixtp-dom-generators.cpp              | 1 +
+ libgnucash/engine/gnc-numeric.hpp                            | 1 +
+ libgnucash/engine/gnc-option-impl.hpp                        | 1 +
+ libgnucash/engine/gnc-option.hpp                             | 1 +
+ libgnucash/engine/gnc-optiondb.hpp                           | 1 +
+ libgnucash/engine/gnc-rational.cpp                           | 1 +
+ libgnucash/engine/gncInvoice.c                               | 1 -
+ libgnucash/engine/kvp-frame.cpp                              | 1 +
+ libgnucash/engine/kvp-value.hpp                              | 1 +
+ libgnucash/engine/qofinstance.cpp                            | 1 +
+ libgnucash/engine/test-core/test-engine-stuff.cpp            | 1 -
+ libgnucash/engine/test/gtest-gnc-int128.cpp                  | 1 +
+ libgnucash/engine/test/gtest-gnc-numeric.cpp                 | 1 +
+ libgnucash/engine/test/gtest-gnc-option.cpp                  | 1 +
+ libgnucash/engine/test/gtest-gnc-optiondb.cpp                | 1 +
+ libgnucash/engine/test/gtest-gnc-rational.cpp                | 1 +
+ libgnucash/engine/test/gtest-import-map.cpp                  | 1 +
+ libgnucash/engine/test/test-kvp-frame.cpp                    | 1 +
+ libgnucash/engine/test/test-kvp-value.cpp                    | 1 +
+ 38 files changed, 36 insertions(+), 2 deletions(-)
+
+diff --git a/bindings/guile/gnc-kvp-guile.cpp b/bindings/guile/gnc-kvp-guile.cpp
+index c199ac68d68..f3f96114f63 100644
+--- a/bindings/guile/gnc-kvp-guile.cpp
++++ b/bindings/guile/gnc-kvp-guile.cpp
+@@ -2,6 +2,7 @@
+ #include <kvp-frame.hpp>
+ #include <libguile.h>
+ #include <numeric>
++#include <cstdint>
+ 
+ #include <config.h>
+ 
+diff --git a/gnucash/gnome-utils/gnc-option-gtk-ui.cpp b/gnucash/gnome-utils/gnc-option-gtk-ui.cpp
+index 9dd5fe6ca50..3db1cb7c803 100644
+--- a/gnucash/gnome-utils/gnc-option-gtk-ui.cpp
++++ b/gnucash/gnome-utils/gnc-option-gtk-ui.cpp
+@@ -25,6 +25,7 @@
+ #include "gnc-option-gtk-ui.hpp"
+ #include <config.h>  // for scanf format string
+ #include <memory>
++#include <cstdint>
+ #include <qof.h>
+ #include <gnc-engine.h> // for GNC_MOD_GUI
+ #include <gnc-commodity.h> // for GNC_COMMODITY
+diff --git a/gnucash/gnome-utils/test/test-autoclear.cpp b/gnucash/gnome-utils/test/test-autoclear.cpp
+index a13d92512ed..4bf6c258905 100644
+--- a/gnucash/gnome-utils/test/test-autoclear.cpp
++++ b/gnucash/gnome-utils/test/test-autoclear.cpp
+@@ -26,6 +26,7 @@
+ // GoogleTest is written in C++, however, the function we test in C.
+ #include "../gnc-autoclear.h"
+ #include <memory>
++#include <cstdint>
+ #include <Account.h>
+ #include <Split.h>
+ #include <gtest/gtest.h>
+diff --git a/gnucash/import-export/aqb/assistant-ab-initial.c b/gnucash/import-export/aqb/assistant-ab-initial.c
+index 57e76d83cbf..c65acb956ba 100644
+--- a/gnucash/import-export/aqb/assistant-ab-initial.c
++++ b/gnucash/import-export/aqb/assistant-ab-initial.c
+@@ -51,6 +51,7 @@
+ #endif
+ #include <fcntl.h>
+ #include <unistd.h>
++#include <stdint.h>
+ 
+ #include "dialog-utils.h"
+ #include "assistant-ab-initial.h"
+diff --git a/gnucash/import-export/aqb/gnc-gwen-gui.c b/gnucash/import-export/aqb/gnc-gwen-gui.c
+index 47055afef1d..aaa20f8abae 100644
+--- a/gnucash/import-export/aqb/gnc-gwen-gui.c
++++ b/gnucash/import-export/aqb/gnc-gwen-gui.c
+@@ -31,6 +31,7 @@
+ #include <config.h>
+ 
+ #include <ctype.h>
++#include <stdint.h>
+ #include <glib/gi18n.h>
+ #include <gwenhywfar/gui_be.h>
+ #include <gwenhywfar/inherit.h>
+diff --git a/gnucash/import-export/csv-imp/assistant-csv-price-import.cpp b/gnucash/import-export/csv-imp/assistant-csv-price-import.cpp
+index ddb0a2a1e40..6f1a8644dd2 100644
+--- a/gnucash/import-export/csv-imp/assistant-csv-price-import.cpp
++++ b/gnucash/import-export/csv-imp/assistant-csv-price-import.cpp
+@@ -34,6 +34,7 @@
+ #include <gtk/gtk.h>
+ #include <glib/gi18n.h>
+ #include <stdlib.h>
++#include <cstdint>
+ 
+ #include "gnc-ui.h"
+ #include "gnc-uri-utils.h"
+diff --git a/gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp b/gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp
+index d1cb2480eaa..a096d1c3f31 100644
+--- a/gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp
++++ b/gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp
+@@ -36,6 +36,7 @@
+ #include <glib/gi18n.h>
+ #include <stdexcept>
+ #include <stdlib.h>
++#include <cstdint>
+ 
+ #include "gnc-path.h"
+ #include "gnc-ui.h"
+diff --git a/gnucash/import-export/csv-imp/gnc-imp-settings-csv-price.cpp b/gnucash/import-export/csv-imp/gnc-imp-settings-csv-price.cpp
+index c2bcd290041..ec5998751d2 100644
+--- a/gnucash/import-export/csv-imp/gnc-imp-settings-csv-price.cpp
++++ b/gnucash/import-export/csv-imp/gnc-imp-settings-csv-price.cpp
+@@ -33,6 +33,7 @@
+ #include <sstream>
+ #include <string>
+ #include <vector>
++#include <cstdint>
+ 
+ #include <config.h>
+ 
+diff --git a/gnucash/import-export/csv-imp/gnc-imp-settings-csv-tx.cpp b/gnucash/import-export/csv-imp/gnc-imp-settings-csv-tx.cpp
+index a4904e808b6..c42d8d49f29 100644
+--- a/gnucash/import-export/csv-imp/gnc-imp-settings-csv-tx.cpp
++++ b/gnucash/import-export/csv-imp/gnc-imp-settings-csv-tx.cpp
+@@ -33,6 +33,7 @@
+ #include <sstream>
+ #include <string>
+ #include <vector>
++#include <cstdint>
+ 
+ #include <config.h>
+ 
+diff --git a/gnucash/import-export/csv-imp/gnc-imp-settings-csv.hpp b/gnucash/import-export/csv-imp/gnc-imp-settings-csv.hpp
+index 39b48e65ff8..40d8c7009e0 100644
+--- a/gnucash/import-export/csv-imp/gnc-imp-settings-csv.hpp
++++ b/gnucash/import-export/csv-imp/gnc-imp-settings-csv.hpp
+@@ -35,6 +35,7 @@
+ #include <string>
+ #include <vector>
+ #include <optional>
++#include <cstdint>
+ #include <gnc-datetime.hpp>
+ #include "gnc-tokenizer.hpp"
+ 
+diff --git a/gnucash/import-export/csv-imp/gnc-import-price.hpp b/gnucash/import-export/csv-imp/gnc-import-price.hpp
+index 4ada98ca9b0..f0ffa89458e 100644
+--- a/gnucash/import-export/csv-imp/gnc-import-price.hpp
++++ b/gnucash/import-export/csv-imp/gnc-import-price.hpp
+@@ -38,6 +38,7 @@
+ #include <map>
+ #include <memory>
+ #include <optional>
++#include <cstdint>
+ 
+ #include "gnc-tokenizer.hpp"
+ #include "gnc-imp-props-price.hpp"
+diff --git a/gnucash/import-export/csv-imp/gnc-import-tx.hpp b/gnucash/import-export/csv-imp/gnc-import-tx.hpp
+index f2bb4e2765e..e3f7016c5d0 100644
+--- a/gnucash/import-export/csv-imp/gnc-import-tx.hpp
++++ b/gnucash/import-export/csv-imp/gnc-import-tx.hpp
+@@ -39,6 +39,7 @@
+ #include <map>
+ #include <memory>
+ #include <optional>
++#include <cstdint>
+ 
+ #include "gnc-tokenizer.hpp"
+ #include "gnc-imp-props-tx.hpp"
+diff --git a/gnucash/import-export/csv-imp/gnc-tokenizer-fw.hpp b/gnucash/import-export/csv-imp/gnc-tokenizer-fw.hpp
+index e34c55de131..b669eb0af14 100644
+--- a/gnucash/import-export/csv-imp/gnc-tokenizer-fw.hpp
++++ b/gnucash/import-export/csv-imp/gnc-tokenizer-fw.hpp
+@@ -43,6 +43,7 @@
+ #include <fstream>      // fstream
+ #include <vector>
+ #include <string>
++#include <cstdint>
+ #include "gnc-tokenizer.hpp"
+ 
+ class GncFwTokenizer : public GncTokenizer
+diff --git a/libgnucash/app-utils/test/test-print-parse-amount.cpp b/libgnucash/app-utils/test/test-print-parse-amount.cpp
+index 1a71d6e729a..842f46594e1 100644
+--- a/libgnucash/app-utils/test/test-print-parse-amount.cpp
++++ b/libgnucash/app-utils/test/test-print-parse-amount.cpp
+@@ -23,6 +23,7 @@
+ 
+ #include <config.h>
+ #include <stdlib.h>
++#include <cstdint>
+ 
+ #include "gnc-ui-util.h"
+ #include "gnc-numeric.h"
+diff --git a/libgnucash/backend/dbi/gnc-dbisqlresult.hpp b/libgnucash/backend/dbi/gnc-dbisqlresult.hpp
+index 8b6aa84188b..34606012689 100644
+--- a/libgnucash/backend/dbi/gnc-dbisqlresult.hpp
++++ b/libgnucash/backend/dbi/gnc-dbisqlresult.hpp
+@@ -26,6 +26,7 @@
+ #define __GNC_DBISQLBACKEND_HPP__
+ 
+ #include <optional>
++#include <cstdint>
+ 
+ #include "gnc-backend-dbi.h"
+ #include <gnc-sql-result.hpp>
+diff --git a/libgnucash/backend/sql/gnc-slots-sql.cpp b/libgnucash/backend/sql/gnc-slots-sql.cpp
+index fd4078c127e..7ab4537c739 100644
+--- a/libgnucash/backend/sql/gnc-slots-sql.cpp
++++ b/libgnucash/backend/sql/gnc-slots-sql.cpp
+@@ -39,6 +39,7 @@
+ 
+ #include <string>
+ #include <sstream>
++#include <cstdint>
+ 
+ #include "gnc-sql-connection.hpp"
+ #include "gnc-sql-backend.hpp"
+diff --git a/libgnucash/backend/sql/gnc-sql-column-table-entry.cpp b/libgnucash/backend/sql/gnc-sql-column-table-entry.cpp
+index 979d54d5c70..4d3ad948500 100644
+--- a/libgnucash/backend/sql/gnc-sql-column-table-entry.cpp
++++ b/libgnucash/backend/sql/gnc-sql-column-table-entry.cpp
+@@ -25,6 +25,7 @@
+ #include <qof.h>
+ #include <sstream>
+ #include <iomanip>
++#include <cstdint>
+ #include <gnc-datetime.hpp>
+ #include "gnc-sql-backend.hpp"
+ #include "gnc-sql-object-backend.hpp"
+diff --git a/libgnucash/backend/sql/test/utest-gnc-backend-sql.cpp b/libgnucash/backend/sql/test/utest-gnc-backend-sql.cpp
+index 19f24595f66..9965025044e 100644
+--- a/libgnucash/backend/sql/test/utest-gnc-backend-sql.cpp
++++ b/libgnucash/backend/sql/test/utest-gnc-backend-sql.cpp
+@@ -23,6 +23,7 @@
+ #include <glib.h>
+ 
+ #include <config.h>
++#include <cstdint>
+ #include <string.h>
+ #include <unittest-support.h>
+ /* Add specific headers for this class */
+diff --git a/libgnucash/backend/xml/io-gncxml-v2.cpp b/libgnucash/backend/xml/io-gncxml-v2.cpp
+index 76c562c6165..562d685cfdb 100644
+--- a/libgnucash/backend/xml/io-gncxml-v2.cpp
++++ b/libgnucash/backend/xml/io-gncxml-v2.cpp
+@@ -44,6 +44,7 @@
+ #endif
+ #include <zlib.h>
+ #include <errno.h>
++#include <cstdint>
+ 
+ #include "gnc-engine.h"
+ #include "gnc-pricedb-p.h"
+diff --git a/libgnucash/backend/xml/sixtp-dom-generators.cpp b/libgnucash/backend/xml/sixtp-dom-generators.cpp
+index f8de8d29c5f..a949b65a52c 100644
+--- a/libgnucash/backend/xml/sixtp-dom-generators.cpp
++++ b/libgnucash/backend/xml/sixtp-dom-generators.cpp
+@@ -27,6 +27,7 @@
+ #include <config.h>
+ 
+ #include <gnc-date.h>
++#include <cstdint>
+ 
+ #include "gnc-xml-helper.h"
+ #include "sixtp-dom-generators.h"
+diff --git a/libgnucash/engine/gnc-numeric.hpp b/libgnucash/engine/gnc-numeric.hpp
+index b00c36f345d..fb532f263d8 100644
+--- a/libgnucash/engine/gnc-numeric.hpp
++++ b/libgnucash/engine/gnc-numeric.hpp
+@@ -27,6 +27,7 @@
+ #include <iostream>
+ #include <locale>
+ #include <typeinfo> // For std::bad_cast exception
++#include <cstdint>
+ #include "gnc-rational-rounding.hpp"
+ 
+ class GncRational;
+diff --git a/libgnucash/engine/gnc-option-impl.hpp b/libgnucash/engine/gnc-option-impl.hpp
+index 53d010fb3b7..0f144fef1b7 100644
+--- a/libgnucash/engine/gnc-option-impl.hpp
++++ b/libgnucash/engine/gnc-option-impl.hpp
+@@ -50,6 +50,7 @@
+ #include <variant>
+ #include <iostream>
+ #include <limits>
++#include <cstdint>
+ 
+ #include "gnc-option-uitype.hpp"
+ 
+diff --git a/libgnucash/engine/gnc-option.hpp b/libgnucash/engine/gnc-option.hpp
+index a15641a4585..01f58fa0efe 100644
+--- a/libgnucash/engine/gnc-option.hpp
++++ b/libgnucash/engine/gnc-option.hpp
+@@ -42,6 +42,7 @@
+ #include <variant>
+ #include <memory>
+ #include <tuple>
++#include <cstdint>
+ #include "gnc-option-ui.hpp"
+ #include "gnc-option-date.hpp"
+ #include "guid.hpp"
+diff --git a/libgnucash/engine/gnc-optiondb.hpp b/libgnucash/engine/gnc-optiondb.hpp
+index 9bdefed3138..db038a97731 100644
+--- a/libgnucash/engine/gnc-optiondb.hpp
++++ b/libgnucash/engine/gnc-optiondb.hpp
+@@ -38,6 +38,7 @@
+ #include <exception>
+ #include <optional>
+ #include <iostream>
++#include <cstdint>
+ 
+ #include <config.h>
+ #include "Account.h"
+diff --git a/libgnucash/engine/gnc-rational.cpp b/libgnucash/engine/gnc-rational.cpp
+index 33f2741d677..81c44bbdec3 100644
+--- a/libgnucash/engine/gnc-rational.cpp
++++ b/libgnucash/engine/gnc-rational.cpp
+@@ -21,6 +21,7 @@
+  *******************************************************************/
+ 
+ #include <sstream>
++#include <cstdint>
+ #include "gnc-rational.hpp"
+ #include "gnc-numeric.hpp"
+ 
+diff --git a/libgnucash/engine/gncInvoice.c b/libgnucash/engine/gncInvoice.c
+index eb4ab1db8da..15c1cf6959e 100644
+--- a/libgnucash/engine/gncInvoice.c
++++ b/libgnucash/engine/gncInvoice.c
+@@ -29,7 +29,6 @@
+ 
+ #include <config.h>
+ 
+-#include <stdint.h>
+ #include <inttypes.h>
+ #include <glib.h>
+ #include <glib/gi18n.h>
+diff --git a/libgnucash/engine/kvp-frame.cpp b/libgnucash/engine/kvp-frame.cpp
+index 48f80376602..eb390fb0bbf 100644
+--- a/libgnucash/engine/kvp-frame.cpp
++++ b/libgnucash/engine/kvp-frame.cpp
+@@ -27,6 +27,7 @@
+ #include <stdarg.h>
+ #include <stdio.h>
+ #include <string.h>
++#include <cstdint>
+ 
+ #include "kvp-value.hpp"
+ #include "kvp-frame.hpp"
+diff --git a/libgnucash/engine/kvp-value.hpp b/libgnucash/engine/kvp-value.hpp
+index 6518dc4e808..0ea80560a0d 100644
+--- a/libgnucash/engine/kvp-value.hpp
++++ b/libgnucash/engine/kvp-value.hpp
+@@ -27,6 +27,7 @@
+ #include <config.h>
+ #include "qof.h"
+ 
++#include <cstdint>
+ #include <boost/variant.hpp>
+ 
+ //Must be a struct because it's exposed to C so that it can in turn be
+diff --git a/libgnucash/engine/qofinstance.cpp b/libgnucash/engine/qofinstance.cpp
+index 1fbe371deec..e2c63d636a9 100644
+--- a/libgnucash/engine/qofinstance.cpp
++++ b/libgnucash/engine/qofinstance.cpp
+@@ -33,6 +33,7 @@
+ #include <config.h>
+ #include <glib.h>
+ 
++#include <cstdint>
+ #include <utility>
+ #include "qof.h"
+ #include "qofbook-p.h"
+diff --git a/libgnucash/engine/test-core/test-engine-stuff.cpp b/libgnucash/engine/test-core/test-engine-stuff.cpp
+index 8dbb440ecec..3baf38f78d8 100644
+--- a/libgnucash/engine/test-core/test-engine-stuff.cpp
++++ b/libgnucash/engine/test-core/test-engine-stuff.cpp
+@@ -47,7 +47,6 @@
+ #include <fcntl.h>
+ #include <glib.h>
+ #include <stdio.h>
+-#include <stdint.h>
+ #include <inttypes.h>
+ #include <stdlib.h>
+ #include <string.h>
+diff --git a/libgnucash/engine/test/gtest-gnc-int128.cpp b/libgnucash/engine/test/gtest-gnc-int128.cpp
+index 4f28bdd262d..34a7200b696 100644
+--- a/libgnucash/engine/test/gtest-gnc-int128.cpp
++++ b/libgnucash/engine/test/gtest-gnc-int128.cpp
+@@ -22,6 +22,7 @@
+  *******************************************************************/
+ 
+ #include <gtest/gtest.h>
++#include <cstdint>
+ #include "../gnc-int128.hpp"
+ 
+ TEST(GncInt128_constructors, test_default_constructor)
+diff --git a/libgnucash/engine/test/gtest-gnc-numeric.cpp b/libgnucash/engine/test/gtest-gnc-numeric.cpp
+index 20079e17c87..a38d4b4f258 100644
+--- a/libgnucash/engine/test/gtest-gnc-numeric.cpp
++++ b/libgnucash/engine/test/gtest-gnc-numeric.cpp
+@@ -21,6 +21,7 @@
+ \********************************************************************/
+ 
+ #include <gtest/gtest.h>
++#include <cstdint>
+ #include "../gnc-numeric.hpp"
+ #include "../gnc-rational.hpp"
+ 
+diff --git a/libgnucash/engine/test/gtest-gnc-option.cpp b/libgnucash/engine/test/gtest-gnc-option.cpp
+index 81700ea7019..7894f7c02aa 100644
+--- a/libgnucash/engine/test/gtest-gnc-option.cpp
++++ b/libgnucash/engine/test/gtest-gnc-option.cpp
+@@ -33,6 +33,7 @@
+ #include "gnc-commodity.h"
+ #include "gnc-date.h"
+ #include <time.h>
++#include <cstdint>
+ #include "gnc-session.h"
+ 
+ TEST(GncOption, test_string_ctor)
+diff --git a/libgnucash/engine/test/gtest-gnc-optiondb.cpp b/libgnucash/engine/test/gtest-gnc-optiondb.cpp
+index 1b92ed63c3e..7ee6957de80 100644
+--- a/libgnucash/engine/test/gtest-gnc-optiondb.cpp
++++ b/libgnucash/engine/test/gtest-gnc-optiondb.cpp
+@@ -27,6 +27,7 @@
+ #include "gnc-option-ui.hpp"
+ #include "kvp-value.hpp"
+ #include <glib-2.0/glib.h>
++#include <cstdint>
+ 
+ #include "gnc-session.h"
+ 
+diff --git a/libgnucash/engine/test/gtest-gnc-rational.cpp b/libgnucash/engine/test/gtest-gnc-rational.cpp
+index fa6c2d9224c..c3200ce1e1e 100644
+--- a/libgnucash/engine/test/gtest-gnc-rational.cpp
++++ b/libgnucash/engine/test/gtest-gnc-rational.cpp
+@@ -23,6 +23,7 @@
+ 
+ #include <gtest/gtest.h>
+ #include <random>
++#include <cstdint>
+ #include "../gnc-rational.hpp"
+ #include "../gnc-numeric.hpp" //for RoundType
+ 
+diff --git a/libgnucash/engine/test/gtest-import-map.cpp b/libgnucash/engine/test/gtest-import-map.cpp
+index 8ba2cffe0fb..c5bc31699e7 100644
+--- a/libgnucash/engine/test/gtest-import-map.cpp
++++ b/libgnucash/engine/test/gtest-import-map.cpp
+@@ -28,6 +28,7 @@
+ #include <kvp-frame.hpp>
+ #include <gtest/gtest.h>
+ #include <string>
++#include <cstdint>
+ 
+ class ImapTest : public testing::Test
+ {
+diff --git a/libgnucash/engine/test/test-kvp-frame.cpp b/libgnucash/engine/test/test-kvp-frame.cpp
+index 9746f1482ff..7ef40db9afd 100644
+--- a/libgnucash/engine/test/test-kvp-frame.cpp
++++ b/libgnucash/engine/test/test-kvp-frame.cpp
+@@ -27,6 +27,7 @@
+ #include "../kvp-frame.hpp"
+ #include <gtest/gtest.h>
+ #include <algorithm>
++#include <cstdint>
+ 
+ class KvpFrameTest : public ::testing::Test
+ {
+diff --git a/libgnucash/engine/test/test-kvp-value.cpp b/libgnucash/engine/test/test-kvp-value.cpp
+index 8f719d7a7ae..4d9d6c0d18c 100644
+--- a/libgnucash/engine/test/test-kvp-value.cpp
++++ b/libgnucash/engine/test/test-kvp-value.cpp
+@@ -28,6 +28,7 @@
+ #include "../kvp-frame.hpp"
+ #include "../gnc-date.h"
+ #include <memory>
++#include <cstdint>
+ #include <gtest/gtest.h>
+ 
+ TEST (KvpValueTest, Equality)
diff --git a/app-office/gnucash/gnucash-5.3.ebuild b/app-office/gnucash/gnucash-5.3.ebuild
deleted file mode 100644
index e8c2e7d7026e..000000000000
--- a/app-office/gnucash/gnucash-5.3.ebuild
+++ /dev/null
@@ -1,226 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Please bump with app-doc/gnucash-docs
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit cmake gnome2-utils python-single-r1
-
-DESCRIPTION="A personal finance manager"
-HOMEPAGE="https://www.gnucash.org/"
-SRC_URI="https://github.com/Gnucash/gnucash/releases/download/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-
-IUSE="aqbanking debug doc examples gnome-keyring +gui mysql nls ofx postgres python quotes smartcard sqlite test"
-RESTRICT="!test? ( test )"
-
-# Examples doesn't build unless GUI is also built
-REQUIRED_USE="
-	examples? ( gui )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	smartcard? ( aqbanking )
-"
-
-# dev-libs/boost must always be built with nls enabled.
-# net-libs/aqbanking dropped gtk with v6. So, to simplify the
-# dependency, we just rely on that.
-RDEPEND="
-	>=dev-libs/glib-2.56.1:2
-	>=dev-scheme/guile-2.2.0:=[regex]
-	>=sys-libs/zlib-1.1.4
-	dev-libs/boost:=[icu,nls]
-	dev-libs/icu:=
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	aqbanking? (
-		>=net-libs/aqbanking-6[ofx?]
-		>=sys-libs/gwenhywfar-5.6.0:=
-		smartcard? ( sys-libs/libchipcard )
-	)
-	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
-	gui? (
-		>=x11-libs/gtk+-3.22.30:3
-		gnome-base/dconf
-		net-libs/webkit-gtk:4.1=
-		aqbanking? ( sys-libs/gwenhywfar:=[gtk] )
-	)
-	mysql? (
-		dev-db/libdbi
-		dev-db/libdbi-drivers[mysql]
-	)
-	ofx? ( >=dev-libs/libofx-0.9.12:= )
-	postgres? (
-		dev-db/libdbi
-		dev-db/libdbi-drivers[postgres]
-	)
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/pygobject:3[${PYTHON_USEDEP}]
-		')
-	)
-	quotes? (
-		>=dev-perl/Finance-Quote-1.11
-		dev-perl/JSON-Parse
-		dev-perl/HTML-TableExtract
-	)
-	sqlite? (
-		dev-db/libdbi
-		dev-db/libdbi-drivers[sqlite]
-	)
-"
-
-# gtest is a required dep
-# see https://bugs.gnucash.org/show_bug.cgi?id=795250
-DEPEND="
-	${RDEPEND}
-	>=sys-devel/gettext-0.20
-	dev-lang/perl
-	dev-perl/XML-Parser
-	dev-build/libtool
-	>=dev-cpp/gtest-1.8.0
-"
-BDEPEND="
-	dev-lang/swig
-	>=dev-build/cmake-3.10
-	virtual/pkgconfig
-"
-
-#~app-doc/gnucash-docs-${PV}
-PDEPEND="
-	doc? (
-		~app-doc/gnucash-docs-5.2
-		gnome-extra/yelp
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.0-exclude-license.patch"
-	"${FILESDIR}/${PN}-4.12-drop-broken-test.patch"
-	"${FILESDIR}/${PN}-5.3-no-werror.patch"
-
-	# This is only to prevent webkit2gtk-4 from being selected.
-	# https://bugs.gentoo.org/893676
-	"${FILESDIR}/${PN}-5.0-webkit2gtk-4.1.patch"
-
-	# GCC 14 no longer includes <algorithm> by default, this is fixed in 5.5
-	"${FILESDIR}/${PN}-5.3-include-algorithm.patch"
-)
-
-# guile generates ELF files without use of C or machine code
-# It's a portage false positive, bug #677600
-QA_PREBUILT='*[.]go'
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=38112
-	find "${S}" -name "*.scm" -exec touch {} + || die
-
-	# Fix tests writing to /tmp
-	local fixtestfiles=(
-		gnucash/report/test/test-report-html.scm
-		gnucash/report/reports/standard/test/test-invoice.scm
-		gnucash/report/reports/standard/test/test-new-owner-report.scm
-		gnucash/report/reports/standard/test/test-owner-report.scm
-		gnucash/report/reports/standard/test/test-transaction.scm
-		gnucash/report/reports/standard/test/test-portfolios.scm
-		gnucash/report/reports/standard/test/test-charts.scm
-		gnucash/report/test/test-report.scm
-		gnucash/report/test/test-commodity-utils.scm
-		gnucash/report/test/test-report-extras.scm
-		libgnucash/backend/dbi/test/test-backend-dbi-basic.cpp
-		libgnucash/backend/xml/test/test-xml-pricedb.cpp
-	)
-	for x in "${fixtestfiles[@]}"; do
-		sed -i -e "s|\"/tmp/|\"${T}/|g" "${S}/${x}" || die "sed of ${S}/${x} failed"
-	done
-}
-
-src_configure() {
-	export GUILE_AUTO_COMPILE=0
-
-	local sql_on_off="OFF"
-	if use mysql || use postgres || use sqlite ; then
-		sql_on_off="ON"
-	fi
-
-	local mycmakeargs=(
-		-DCOMPILE_GSCHEMAS=OFF
-		-DDISABLE_NLS=$(usex !nls)
-		-DWITH_AQBANKING=$(usex aqbanking)
-		-DWITH_GNUCASH=$(usex gui)
-		-DWITH_OFX=$(usex ofx)
-		-DWITH_PYTHON=$(usex python)
-		-DWITH_SQL=${sql_on_off}
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	LOCALE_TESTS=
-	if type locale >/dev/null 2>&1; then
-		MY_LOCALES="$(locale -a)"
-		if [[ "${MY_LOCALES}" != *en_US* ||
-				"${MY_LOCALES}" != *en_GB* ||
-				"${MY_LOCALES}" != *fr_FR* ]] ; then
-			ewarn "Missing one or more of en_US, en_GB, or fr_FR locales."
-		else
-			LOCALE_TESTS=true
-		fi
-	else
-		ewarn "'locale' not found."
-	fi
-
-	if [[ ! "${LOCALE_TESTS}" ]]; then
-		ewarn "Disabling test-qof and test-gnc-numeric."
-		echo 'set(CTEST_CUSTOM_TESTS_IGNORE test-qof test-gnc-numeric)' \
-			> "${BUILD_DIR}"/CTestCustom.cmake || die "Failed to disable test-qof and test-gnc-numeric!"
-	fi
-
-	cd "${BUILD_DIR}" || die "Failed to enter ${BUILD_DIR}"
-	XDG_DATA_HOME="${T}/$(whoami)" eninja check
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	dostrip -x /usr/$(get_libdir)/guile/2.2/site-ccache/gnucash/
-
-	use examples && docompress -x /usr/share/doc/${PF}/examples
-
-	if use python ; then
-		python_optimize
-		python_optimize "${ED}"/usr/share/gnucash/python
-	fi
-}
-
-pkg_postinst() {
-	if use gui ; then
-		xdg_icon_cache_update
-		gnome2_schemas_update
-	fi
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	if use gui ; then
-		xdg_icon_cache_update
-		gnome2_schemas_update
-	fi
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-office/gnucash/gnucash-5.4-r1.ebuild b/app-office/gnucash/gnucash-5.4-r1.ebuild
deleted file mode 100644
index 409e3509aa22..000000000000
--- a/app-office/gnucash/gnucash-5.4-r1.ebuild
+++ /dev/null
@@ -1,235 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit cmake gnome2-utils python-single-r1
-
-# Please bump with app-doc/gnucash-docs
-DESCRIPTION="A personal finance manager"
-HOMEPAGE="https://www.gnucash.org/"
-SRC_URI="https://github.com/Gnucash/gnucash/releases/download/${PV}/${P}-1.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-
-IUSE="aqbanking debug doc examples gnome-keyring +gui mysql nls ofx postgres python quotes smartcard sqlite test"
-
-# Currently restricting due to the following:
-# https://bugs.gnucash.org/show_bug.cgi?id=799159#c1
-#
-# Tests can be run but must first unmerge any existing GnuCash installation.
-RESTRICT="test"
-
-# Examples doesn't build unless GUI is also built
-REQUIRED_USE="
-	examples? ( gui )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	smartcard? ( aqbanking )
-"
-
-# dev-libs/boost must always be built with nls enabled.
-# net-libs/aqbanking dropped gtk with v6. So, to simplify the
-# dependency, we just rely on that.
-RDEPEND="
-	>=dev-libs/glib-2.56.1:2
-	>=dev-scheme/guile-2.2.0:=[regex]
-	>=sys-libs/zlib-1.1.4
-	dev-libs/boost:=[icu,nls]
-	dev-libs/icu:=
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	aqbanking? (
-		>=net-libs/aqbanking-6[ofx?]
-		>=sys-libs/gwenhywfar-5.6.0:=
-		smartcard? ( sys-libs/libchipcard )
-	)
-	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
-	gui? (
-		>=x11-libs/gtk+-3.22.30:3
-		gnome-base/dconf
-		net-libs/webkit-gtk:4.1=
-		aqbanking? ( sys-libs/gwenhywfar:=[gtk] )
-	)
-	mysql? (
-		dev-db/libdbi
-		dev-db/libdbi-drivers[mysql]
-	)
-	ofx? ( >=dev-libs/libofx-0.9.12:= )
-	postgres? (
-		dev-db/libdbi
-		dev-db/libdbi-drivers[postgres]
-	)
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/pygobject:3[${PYTHON_USEDEP}]
-		')
-	)
-	quotes? (
-		>=dev-perl/Finance-Quote-1.11
-		dev-perl/JSON-Parse
-		dev-perl/HTML-TableExtract
-	)
-	sqlite? (
-		dev-db/libdbi
-		dev-db/libdbi-drivers[sqlite]
-	)
-"
-
-# gtest is a required dep
-# see https://bugs.gnucash.org/show_bug.cgi?id=795250
-DEPEND="
-	${RDEPEND}
-	>=sys-devel/gettext-0.20
-	dev-lang/perl
-	dev-perl/XML-Parser
-	dev-build/libtool
-	>=dev-cpp/gtest-1.8.0
-"
-# distutils is not available in python3.12, but it is still in setuptools
-BDEPEND="
-	dev-lang/swig
-	>=dev-build/cmake-3.10
-	virtual/pkgconfig
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/setuptools[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-PDEPEND="
-	doc? (
-		~app-doc/gnucash-docs-${PV}
-		gnome-extra/yelp
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.0-exclude-license.patch"
-	# "${FILESDIR}/${PN}-4.12-drop-broken-test.patch"
-	"${FILESDIR}/${PN}-5.3-no-werror.patch"
-
-	# This is only to prevent webkit2gtk-4 from being selected.
-	# https://bugs.gentoo.org/893676
-	"${FILESDIR}/${PN}-5.0-webkit2gtk-4.1.patch"
-
-	# bug #919859
-	"${FILESDIR}/${PN}-5.4-fix-python-finding.patch"
-)
-
-# guile generates ELF files without use of C or machine code
-# It's a portage false positive, bug #677600
-QA_PREBUILT='*[.]go'
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=38112
-	find "${S}" -name "*.scm" -exec touch {} + || die
-
-	# Fix tests writing to /tmp
-	local fixtestfiles=(
-		gnucash/report/test/test-report-html.scm
-		gnucash/report/reports/standard/test/test-invoice.scm
-		gnucash/report/reports/standard/test/test-new-owner-report.scm
-		gnucash/report/reports/standard/test/test-owner-report.scm
-		gnucash/report/reports/standard/test/test-transaction.scm
-		gnucash/report/reports/standard/test/test-portfolios.scm
-		gnucash/report/reports/standard/test/test-charts.scm
-		gnucash/report/test/test-report.scm
-		gnucash/report/test/test-commodity-utils.scm
-		gnucash/report/test/test-report-extras.scm
-		libgnucash/backend/dbi/test/test-backend-dbi-basic.cpp
-		libgnucash/backend/xml/test/test-xml-pricedb.cpp
-	)
-	for x in "${fixtestfiles[@]}"; do
-		sed -i -e "s|\"/tmp/|\"${T}/|g" "${S}/${x}" || die "sed of ${S}/${x} failed"
-	done
-}
-
-src_configure() {
-	export GUILE_AUTO_COMPILE=0
-
-	local sql_on_off="OFF"
-	if use mysql || use postgres || use sqlite ; then
-		sql_on_off="ON"
-	fi
-
-	local mycmakeargs=(
-		-DCOMPILE_GSCHEMAS=OFF
-		-DDISABLE_NLS=$(usex !nls)
-		-DWITH_AQBANKING=$(usex aqbanking)
-		-DWITH_GNUCASH=$(usex gui)
-		-DWITH_OFX=$(usex ofx)
-		-DWITH_PYTHON=$(usex python)
-		-DWITH_SQL=${sql_on_off}
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	LOCALE_TESTS=
-	if type locale >/dev/null 2>&1; then
-		MY_LOCALES="$(locale -a)"
-		if [[ "${MY_LOCALES}" != *en_US* ||
-				"${MY_LOCALES}" != *en_GB* ||
-				"${MY_LOCALES}" != *fr_FR* ]] ; then
-			ewarn "Missing one or more of en_US, en_GB, or fr_FR locales."
-		else
-			LOCALE_TESTS=true
-		fi
-	else
-		ewarn "'locale' not found."
-	fi
-
-	if [[ ! "${LOCALE_TESTS}" ]]; then
-		ewarn "Disabling test-qof and test-gnc-numeric."
-		echo 'set(CTEST_CUSTOM_TESTS_IGNORE test-qof test-gnc-numeric)' \
-			> "${BUILD_DIR}"/CTestCustom.cmake || die "Failed to disable test-qof and test-gnc-numeric!"
-	fi
-
-	cd "${BUILD_DIR}" || die "Failed to enter ${BUILD_DIR}"
-	XDG_DATA_HOME="${T}/$(whoami)" eninja check
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	dostrip -x /usr/$(get_libdir)/guile/2.2/site-ccache/gnucash/
-
-	use examples && docompress -x /usr/share/doc/${PF}/examples
-
-	if use python ; then
-		python_optimize
-		python_optimize "${ED}"/usr/share/gnucash/python
-	fi
-}
-
-pkg_postinst() {
-	if use gui ; then
-		xdg_icon_cache_update
-		gnome2_schemas_update
-	fi
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	if use gui ; then
-		xdg_icon_cache_update
-		gnome2_schemas_update
-	fi
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-office/gnucash/gnucash-5.5.ebuild b/app-office/gnucash/gnucash-5.5.ebuild
deleted file mode 100644
index 60b9ed8bc1d9..000000000000
--- a/app-office/gnucash/gnucash-5.5.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..12} )
-
-inherit cmake gnome2-utils python-single-r1
-
-# Please bump with app-doc/gnucash-docs
-DESCRIPTION="A personal finance manager"
-HOMEPAGE="https://www.gnucash.org/"
-SRC_URI="https://github.com/Gnucash/gnucash/releases/download/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-
-IUSE="aqbanking debug doc examples gnome-keyring +gui mysql nls ofx postgres python quotes smartcard sqlite test"
-
-# Currently restricting due to the following:
-# https://bugs.gnucash.org/show_bug.cgi?id=799159#c1
-#
-# Tests can be run but must first unmerge any existing GnuCash installation.
-RESTRICT="test"
-
-# Examples doesn't build unless GUI is also built
-REQUIRED_USE="
-	examples? ( gui )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	smartcard? ( aqbanking )
-"
-
-# dev-libs/boost must always be built with nls enabled.
-# net-libs/aqbanking dropped gtk with v6. So, to simplify the
-# dependency, we just rely on that.
-RDEPEND="
-	>=dev-libs/glib-2.56.1:2
-	>=dev-scheme/guile-2.2.0:=[regex]
-	>=sys-libs/zlib-1.1.4
-	dev-libs/boost:=[icu,nls]
-	dev-libs/icu:=
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	aqbanking? (
-		>=net-libs/aqbanking-6[ofx?]
-		>=sys-libs/gwenhywfar-5.6.0:=
-		smartcard? ( sys-libs/libchipcard )
-	)
-	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
-	gui? (
-		>=x11-libs/gtk+-3.22.30:3
-		gnome-base/dconf
-		net-libs/webkit-gtk:4.1=
-		aqbanking? ( sys-libs/gwenhywfar:=[gtk] )
-	)
-	mysql? (
-		dev-db/libdbi
-		dev-db/libdbi-drivers[mysql]
-	)
-	ofx? ( >=dev-libs/libofx-0.9.12:= )
-	postgres? (
-		dev-db/libdbi
-		dev-db/libdbi-drivers[postgres]
-	)
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/pygobject:3[${PYTHON_USEDEP}]
-		')
-	)
-	quotes? (
-		>=dev-perl/Finance-Quote-1.11
-		dev-perl/JSON-Parse
-		dev-perl/HTML-TableExtract
-	)
-	sqlite? (
-		dev-db/libdbi
-		dev-db/libdbi-drivers[sqlite]
-	)
-"
-
-# gtest is a required dep
-# see https://bugs.gnucash.org/show_bug.cgi?id=795250
-DEPEND="
-	${RDEPEND}
-	>=sys-devel/gettext-0.20
-	dev-lang/perl
-	dev-perl/XML-Parser
-	dev-build/libtool
-	>=dev-cpp/gtest-1.8.0
-"
-# distutils is not available in python3.12, but it is still in setuptools
-BDEPEND="
-	dev-lang/swig
-	>=dev-build/cmake-3.10
-	virtual/pkgconfig
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/setuptools[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-PDEPEND="
-	doc? (
-		~app-doc/gnucash-docs-${PV}
-		gnome-extra/yelp
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.0-exclude-license.patch"
-	"${FILESDIR}/${PN}-4.12-drop-broken-test.patch"
-	"${FILESDIR}/${PN}-5.3-no-werror.patch"
-
-	# This is only to prevent webkit2gtk-4 from being selected.
-	# https://bugs.gentoo.org/893676
-	"${FILESDIR}/${PN}-5.0-webkit2gtk-4.1.patch"
-)
-
-# guile generates ELF files without use of C or machine code
-# It's a portage false positive, bug #677600
-QA_PREBUILT='*[.]go'
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=38112
-	find "${S}" -name "*.scm" -exec touch {} + || die
-
-	# Fix tests writing to /tmp
-	local fixtestfiles=(
-		gnucash/report/test/test-report-html.scm
-		gnucash/report/reports/standard/test/test-invoice.scm
-		gnucash/report/reports/standard/test/test-new-owner-report.scm
-		gnucash/report/reports/standard/test/test-owner-report.scm
-		gnucash/report/reports/standard/test/test-transaction.scm
-		gnucash/report/reports/standard/test/test-portfolios.scm
-		gnucash/report/reports/standard/test/test-charts.scm
-		gnucash/report/test/test-report.scm
-		gnucash/report/test/test-commodity-utils.scm
-		gnucash/report/test/test-report-extras.scm
-		libgnucash/backend/dbi/test/test-backend-dbi-basic.cpp
-		libgnucash/backend/xml/test/test-xml-pricedb.cpp
-	)
-	for x in "${fixtestfiles[@]}"; do
-		sed -i -e "s|\"/tmp/|\"${T}/|g" "${S}/${x}" || die "sed of ${S}/${x} failed"
-	done
-}
-
-src_configure() {
-	export GUILE_AUTO_COMPILE=0
-
-	local sql_on_off="OFF"
-	if use mysql || use postgres || use sqlite ; then
-		sql_on_off="ON"
-	fi
-
-	local mycmakeargs=(
-		-DCOMPILE_GSCHEMAS=OFF
-		-DDISABLE_NLS=$(usex !nls)
-		-DWITH_AQBANKING=$(usex aqbanking)
-		-DWITH_GNUCASH=$(usex gui)
-		-DWITH_OFX=$(usex ofx)
-		-DWITH_PYTHON=$(usex python)
-		-DWITH_SQL=${sql_on_off}
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	LOCALE_TESTS=
-	if type locale >/dev/null 2>&1; then
-		MY_LOCALES="$(locale -a)"
-		if [[ "${MY_LOCALES}" != *en_US* ||
-				"${MY_LOCALES}" != *en_GB* ||
-				"${MY_LOCALES}" != *fr_FR* ]] ; then
-			ewarn "Missing one or more of en_US, en_GB, or fr_FR locales."
-		else
-			LOCALE_TESTS=true
-		fi
-	else
-		ewarn "'locale' not found."
-	fi
-
-	if [[ ! "${LOCALE_TESTS}" ]]; then
-		ewarn "Disabling test-qof and test-gnc-numeric."
-		echo 'set(CTEST_CUSTOM_TESTS_IGNORE test-qof test-gnc-numeric)' \
-			> "${BUILD_DIR}"/CTestCustom.cmake || die "Failed to disable test-qof and test-gnc-numeric!"
-	fi
-
-	cd "${BUILD_DIR}" || die "Failed to enter ${BUILD_DIR}"
-	XDG_DATA_HOME="${T}/$(whoami)" eninja check
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	dostrip -x /usr/$(get_libdir)/guile/2.2/site-ccache/gnucash/
-
-	use examples && docompress -x /usr/share/doc/${PF}/examples
-
-	if use python ; then
-		python_optimize
-		python_optimize "${ED}"/usr/share/gnucash/python
-	fi
-}
-
-pkg_postinst() {
-	if use gui ; then
-		xdg_icon_cache_update
-		gnome2_schemas_update
-	fi
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	if use gui ; then
-		xdg_icon_cache_update
-		gnome2_schemas_update
-	fi
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-office/gnucash/gnucash-5.6.ebuild b/app-office/gnucash/gnucash-5.6.ebuild
deleted file mode 100644
index ba216f490d8f..000000000000
--- a/app-office/gnucash/gnucash-5.6.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..12} )
-
-inherit cmake gnome2-utils python-single-r1
-
-# Please bump with app-doc/gnucash-docs
-DESCRIPTION="A personal finance manager"
-HOMEPAGE="https://www.gnucash.org/"
-SRC_URI="https://github.com/Gnucash/gnucash/releases/download/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~riscv x86"
-
-IUSE="aqbanking debug doc examples gnome-keyring +gui mysql nls ofx postgres python quotes smartcard sqlite test"
-
-# Currently restricting due to the following:
-# https://bugs.gnucash.org/show_bug.cgi?id=799159#c1
-#
-# Tests can be run but must first unmerge any existing GnuCash installation.
-RESTRICT="test"
-
-# Examples doesn't build unless GUI is also built
-REQUIRED_USE="
-	examples? ( gui )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	smartcard? ( aqbanking )
-"
-
-# dev-libs/boost must always be built with nls enabled.
-# net-libs/aqbanking dropped gtk with v6. So, to simplify the
-# dependency, we just rely on that.
-RDEPEND="
-	>=dev-libs/glib-2.56.1:2
-	>=dev-scheme/guile-2.2.0:=[regex]
-	>=sys-libs/zlib-1.1.4
-	dev-libs/boost:=[icu,nls]
-	dev-libs/icu:=
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	aqbanking? (
-		>=net-libs/aqbanking-6[ofx?]
-		>=sys-libs/gwenhywfar-5.6.0:=
-		smartcard? ( sys-libs/libchipcard )
-	)
-	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
-	gui? (
-		>=x11-libs/gtk+-3.22.30:3
-		gnome-base/dconf
-		net-libs/webkit-gtk:4.1=
-		aqbanking? ( sys-libs/gwenhywfar:=[gtk] )
-	)
-	mysql? (
-		dev-db/libdbi
-		dev-db/libdbi-drivers[mysql]
-	)
-	ofx? ( >=dev-libs/libofx-0.9.12:= )
-	postgres? (
-		dev-db/libdbi
-		dev-db/libdbi-drivers[postgres]
-	)
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/pygobject:3[${PYTHON_USEDEP}]
-		')
-	)
-	quotes? (
-		>=dev-perl/Finance-Quote-1.11
-		dev-perl/JSON-Parse
-		dev-perl/HTML-TableExtract
-	)
-	sqlite? (
-		dev-db/libdbi
-		dev-db/libdbi-drivers[sqlite]
-	)
-"
-
-# gtest is a required dep
-# see https://bugs.gnucash.org/show_bug.cgi?id=795250
-DEPEND="
-	${RDEPEND}
-	>=sys-devel/gettext-0.20
-	dev-lang/perl
-	dev-perl/XML-Parser
-	dev-build/libtool
-	>=dev-cpp/gtest-1.8.0
-"
-# distutils is not available in python3.12, but it is still in setuptools
-BDEPEND="
-	dev-lang/swig
-	>=dev-build/cmake-3.10
-	virtual/pkgconfig
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/setuptools[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-PDEPEND="
-	doc? (
-		~app-doc/gnucash-docs-${PV}
-		gnome-extra/yelp
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.0-exclude-license.patch"
-	"${FILESDIR}/${PN}-4.12-drop-broken-test.patch"
-	"${FILESDIR}/${PN}-5.6-no-werror.patch"
-
-	# This is only to prevent webkit2gtk-4 from being selected.
-	# https://bugs.gentoo.org/893676
-	"${FILESDIR}/${PN}-5.0-webkit2gtk-4.1.patch"
-)
-
-# guile generates ELF files without use of C or machine code
-# It's a portage false positive, bug #677600
-QA_PREBUILT='*[.]go'
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=38112
-	find "${S}" -name "*.scm" -exec touch {} + || die
-
-	# Fix tests writing to /tmp
-	local fixtestfiles=(
-		gnucash/report/test/test-report-html.scm
-		gnucash/report/reports/standard/test/test-invoice.scm
-		gnucash/report/reports/standard/test/test-new-owner-report.scm
-		gnucash/report/reports/standard/test/test-owner-report.scm
-		gnucash/report/reports/standard/test/test-transaction.scm
-		gnucash/report/reports/standard/test/test-portfolios.scm
-		gnucash/report/reports/standard/test/test-charts.scm
-		gnucash/report/test/test-report.scm
-		gnucash/report/test/test-commodity-utils.scm
-		gnucash/report/test/test-report-extras.scm
-		libgnucash/backend/dbi/test/test-backend-dbi-basic.cpp
-		libgnucash/backend/xml/test/test-xml-pricedb.cpp
-	)
-	for x in "${fixtestfiles[@]}"; do
-		sed -i -e "s|\"/tmp/|\"${T}/|g" "${S}/${x}" || die "sed of ${S}/${x} failed"
-	done
-}
-
-src_configure() {
-	export GUILE_AUTO_COMPILE=0
-
-	local sql_on_off="OFF"
-	if use mysql || use postgres || use sqlite ; then
-		sql_on_off="ON"
-	fi
-
-	local mycmakeargs=(
-		-DCOMPILE_GSCHEMAS=OFF
-		-DDISABLE_NLS=$(usex !nls)
-		-DWITH_AQBANKING=$(usex aqbanking)
-		-DWITH_GNUCASH=$(usex gui)
-		-DWITH_OFX=$(usex ofx)
-		-DWITH_PYTHON=$(usex python)
-		-DWITH_SQL=${sql_on_off}
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	LOCALE_TESTS=
-	if type locale >/dev/null 2>&1; then
-		MY_LOCALES="$(locale -a)"
-		if [[ "${MY_LOCALES}" != *en_US* ||
-				"${MY_LOCALES}" != *en_GB* ||
-				"${MY_LOCALES}" != *fr_FR* ]] ; then
-			ewarn "Missing one or more of en_US, en_GB, or fr_FR locales."
-		else
-			LOCALE_TESTS=true
-		fi
-	else
-		ewarn "'locale' not found."
-	fi
-
-	if [[ ! "${LOCALE_TESTS}" ]]; then
-		ewarn "Disabling test-qof and test-gnc-numeric."
-		echo 'set(CTEST_CUSTOM_TESTS_IGNORE test-qof test-gnc-numeric)' \
-			> "${BUILD_DIR}"/CTestCustom.cmake || die "Failed to disable test-qof and test-gnc-numeric!"
-	fi
-
-	cd "${BUILD_DIR}" || die "Failed to enter ${BUILD_DIR}"
-	XDG_DATA_HOME="${T}/$(whoami)" eninja check
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	dostrip -x /usr/$(get_libdir)/guile/2.2/site-ccache/gnucash/
-
-	use examples && docompress -x /usr/share/doc/${PF}/examples
-
-	if use python ; then
-		python_optimize
-		python_optimize "${ED}"/usr/share/gnucash/python
-	fi
-}
-
-pkg_postinst() {
-	if use gui ; then
-		xdg_icon_cache_update
-		gnome2_schemas_update
-	fi
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	if use gui ; then
-		xdg_icon_cache_update
-		gnome2_schemas_update
-	fi
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-office/gnucash/gnucash-5.8-r100.ebuild b/app-office/gnucash/gnucash-5.8-r100.ebuild
index 23341e458966..7c4cbe6ee0c6 100644
--- a/app-office/gnucash/gnucash-5.8-r100.ebuild
+++ b/app-office/gnucash/gnucash-5.8-r100.ebuild
@@ -120,6 +120,9 @@ PATCHES=(
 	# This is only to prevent webkit2gtk-4 from being selected.
 	# https://bugs.gentoo.org/893676
 	"${FILESDIR}/${PN}-5.0-webkit2gtk-4.1.patch"
+
+	# GCC 15 backport
+	"${FILESDIR}/${PN}-5.8-gcc15.patch"
 )
 
 pkg_setup() {
diff --git a/app-office/ledger/Manifest b/app-office/ledger/Manifest
index 0910a0df0582..36c3dcf9de87 100644
--- a/app-office/ledger/Manifest
+++ b/app-office/ledger/Manifest
@@ -1,5 +1,6 @@
 AUX convenience.patch 425 BLAKE2B 681557bc92a8006109abc3317a2e2d729e998f2ed9d3478b028cc38ebbb0d3f13fef21a6ad928b2c8fe0de1551342c33908e52e0043ba27c296eb1956267be96 SHA512 99782978e3877a4a896ea07d01dd40a0a7001becc422dc183a51bc39baf950f391da0d79d98249db9b103472deebdbc82428ca91f9c2f42010afc1ead42b5acc
+AUX sha1sum.patch 3438 BLAKE2B 28309d9f7377825abbdaf115f284cc9186bf0248d58b57c4f4a61ce9dd4ed15feab330c03fd879539847601b1a28351a7c7000ea2154492c06ab700930dbc28b SHA512 0818f243634b181f854efc18a539dd5030e673d3fa7910b581eac3656aba4b74562baeafe790af536b91f538fad724673e369d30026c67418ec18a0d4103b725
 DIST ledger-3.3.2.tar.gz 825274 BLAKE2B ee0901eaba234688cc36e399bd86118269d8691162feacf25e70ffaf28e8d572f47a62fb014126f5dce65c73135f21ad4364a642637a80d2577bf20b657fc9a4 SHA512 d5d7058f0e9a02ad1d46e6780675d446070824b321f0f4c1ea6ac0c3dd4f11f259113bc36cbc796e4bb6d0a7898d6a68a25cce639e27a2b2434eec11a612ecb0
 EBUILD ledger-3.3.2-r1.ebuild 2447 BLAKE2B 8bb037421eb51cfd8113528275d10e0d1c97bebad13a42ae54ae855ef852d504afa4cc1695f54577468a6480e0fe7e4d06ac78eb5261be9ef6c11bbe982e2f4d SHA512 794adfadabfae5c14ee7b6b792852b0e5002fdd50daf7cd376cb3512800ca40f2f44363dc47b642caa43fb8ac9e847a7f9b18a3b2aab96c4b12c86bc84e6c3f9
-EBUILD ledger-3.3.2.ebuild 2392 BLAKE2B 0ca2fb25ab9bc07ad8da27d6800115c0791aa8d9c658f75fbe74a5743c2d9dd07f6d058cdd9fe23659a4fcdf72d1bd1ef44d44bc379b97d0d8f59c286a85492f SHA512 1bfff76995e6c3fbb6146d836e0399612baade304bd8b800575b880567e7dc0560fd17339537e7a55df30c336b098df564e165ef483015a8ef6be3f0fd95f957
+EBUILD ledger-3.3.2-r2.ebuild 2781 BLAKE2B ea998e31cf762fd5b95f46d619c25ba050b78bbc48bdcd2fac656703542db5a9501ee68fbb734b2ee2b2284d1af9ede06b428a87655386aa1e331d4975a1127e SHA512 715de9587dfa17e13a64b39c6d9573368b3516ca3e99870cc3a60255f2867711ece36aa76df5284b29c3f14e4fbed3feae09cfb6b780be71b7deba56b3482f91
 MISC metadata.xml 307 BLAKE2B f3dac05e0bf7b2902ba20eb344829c1b835ff3847c71aaf1c53d28c5045b350fbf140e2f6b3cdb80f3be99b9fa3afffdd2c52d5081c6500c42233a402ce25a54 SHA512 db8c5c551a20e1e19151f31188fb1e61642591dbb01ad4e52b4542dabde3fd374ed234b7de6c9fdd11cf57477acc8dda07e26bc5ae8f251ab306309bf3772668
diff --git a/app-office/ledger/files/sha1sum.patch b/app-office/ledger/files/sha1sum.patch
new file mode 100644
index 000000000000..2de66a672e68
--- /dev/null
+++ b/app-office/ledger/files/sha1sum.patch
@@ -0,0 +1,110 @@
+diff --git a/src/filters.cc b/src/filters.cc
+index f725c247..030a5fb4 100644
+--- a/src/filters.cc
++++ b/src/filters.cc
+@@ -237,8 +237,6 @@ void anonymize_posts::render_commodity(amount_t& amt)
+ 
+ void anonymize_posts::operator()(post_t& post)
+ {
+-	boost::uuids::detail::sha1  sha;
+-  unsigned int message_digest[5];
+   bool         copy_xact_details = false;
+ 
+   if (last_xact != post.xact) {
+@@ -255,12 +253,7 @@ void anonymize_posts::operator()(post_t& post)
+     std::ostringstream buf;
+     buf << reinterpret_cast<boost::uintmax_t>(post.xact->payee.c_str())
+         << integer_gen() << post.xact->payee.c_str();
+-
+-		sha.reset();
+-    sha.process_bytes(buf.str().c_str(), buf.str().length());
+-    sha.get_digest(message_digest);
+-
+-    xact.payee = to_hex(message_digest);
++    xact.payee = sha1sum(buf.str(), 8);
+     xact.note  = none;
+   } else {
+     xact.journal = post.xact->journal;
+@@ -273,12 +266,7 @@ void anonymize_posts::operator()(post_t& post)
+        acct = acct->parent) {
+     std::ostringstream buf;
+     buf << integer_gen() << acct << acct->fullname();
+-
+-    sha.reset();
+-    sha.process_bytes(buf.str().c_str(), buf.str().length());
+-    sha.get_digest(message_digest);
+-
+-    account_names.push_front(to_hex(message_digest));
++    account_names.push_front(sha1sum(buf.str(), 8));
+   }
+ 
+   account_t * new_account =
+@@ -1268,7 +1256,7 @@ void budget_posts::report_budget_items(const date_t& date)
+     foreach (pending_posts_list::iterator& i, posts_to_erase)
+       pending_posts.erase(i);
+   }
+-  
++
+   if (pending_posts.size() == 0)
+     return;
+ 
+diff --git a/src/utils.h b/src/utils.h
+index b09377b8..510686fd 100644
+--- a/src/utils.h
++++ b/src/utils.h
+@@ -607,29 +607,39 @@ inline int peek_next_nonws(std::istream& in) {
+     *_p = '\0';                                         \
+   }
+ 
+-inline string to_hex(unsigned int * message_digest, const int len = 1)
+-{
++inline string digest_to_hex(
++  const boost::uuids::detail::sha1::digest_type& message_digest,
++  size_t len = sizeof(boost::uuids::detail::sha1::digest_type) * 2
++) {
+   std::ostringstream buf;
+-
+-  for(int i = 0; i < 5 ; i++) {
+-    buf.width(8);
+-    buf.fill('0');
+-    buf << std::hex << message_digest[i];
+-    if (i + 1 >= len)
+-      break;                    // only output the first LEN dwords
++  buf.setf(std::ios_base::hex, std::ios_base::basefield);
++  buf.fill('0');
++
++  // sha1::digest_type is an array type and may change between Boost versions
++  const size_t count = std::min(
++    sizeof(message_digest) / sizeof(message_digest[0]),
++    (len - 1) / (sizeof(message_digest[0]) * 2) + 1
++  );
++  for(size_t i = 0; i < count; i++) {
++    buf.width(sizeof(message_digest[i]) * 2);
++    buf << (unsigned int)message_digest[i];
+   }
+-  return buf.str();
++  string hex = buf.str();
++  hex.resize(len, '0'); // in case a partial element is requested
++  return hex;
+ }
+ 
+-inline string sha1sum(const string& str)
+-{
+-	boost::uuids::detail::sha1 sha;
++inline string sha1sum(
++  const string& str,
++  size_t len = sizeof(boost::uuids::detail::sha1::digest_type) * 2
++) {
++	static boost::uuids::detail::sha1 sha;
++  boost::uuids::detail::sha1::digest_type message_digest;
+ 
++	sha.reset();
+   sha.process_bytes(str.c_str(), str.length());
+-
+-  unsigned int message_digest[5];
+   sha.get_digest(message_digest);
+-  return to_hex(message_digest, 5);
++  return digest_to_hex(message_digest, len);
+ }
+ 
+ extern const string version;
diff --git a/app-office/ledger/ledger-3.3.2.ebuild b/app-office/ledger/ledger-3.3.2-r2.ebuild
index c9108199104d..4d99599fedda 100644
--- a/app-office/ledger/ledger-3.3.2.ebuild
+++ b/app-office/ledger/ledger-3.3.2-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9,10,11} )
+PYTHON_COMPAT=( python3_{10,11,12,13} )
 CMAKE_REMOVE_MODULES_LIST=( FindPython Support )
-inherit bash-completion-r1 check-reqs cmake python-single-r1
+inherit bash-completion-r1 check-reqs cmake optfeature python-single-r1
 
 DESCRIPTION="Double-entry accounting system with a command-line reporting interface"
 HOMEPAGE="https://www.ledger-cli.org/"
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="debug doc python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -67,6 +67,10 @@ src_prepare() {
 	mv doc/ledger{3,}.texi || die "Failed to rename info file name"
 
 	rm -r lib/utfcpp || die
+
+	eapply "${FILESDIR}/convenience.patch"
+	eapply "${FILESDIR}/sha1sum.patch"
+	eapply_user
 }
 
 src_configure() {
@@ -98,6 +102,10 @@ src_compile() {
 src_install() {
 	cmake_src_install
 
+	# Requires gnuplot
+	exeinto /usr/bin
+	doexe contrib/report
+
 	newbashcomp contrib/${PN}-completion.bash ${PN}
 }
 
@@ -105,9 +113,13 @@ pkg_postinst() {
 	elog
 	elog "Since version 3, vim support is released separately."
 	elog "See https://github.com/ledger/vim-ledger"
-	elog
-	elog "For Emacs mode, emerge app-emacs/ledger-mode"
+	optfeature_header \
+		"Install the following packages for additional features:"
+	optfeature "Emacs support" "app-emacs/ledger-mode"
+	optfeature "Plot visualization" "sci-visualization/gnuplot"
+	optfeature "Graph visualization" "media-gfx/graphviz"
 }
 
 # rainy day TODO:
 # - IUSE test
+# - create vim-ledger ebuild
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 401265b1ef93..92df0219c66e 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,11 +1,13 @@
 AUX scribus-1.5.3-fpic.patch 376 BLAKE2B 102f6ca21c96d0b05354bf65c551efde01291c1b878db27e24ee8680eca6bebc9e402b19d62fe2001ed5dfc46ca11c3b3450816a017c942ba848bd43476628fc SHA512 531c3697983adbdeef4959c44a89ccf5e3802f2b1e64a65a63747a659cb808a08095d7592e6f8974e3e0e16ad913ba05bd3f3fe9c9fbd0a50463fd8df6f47d34
 AUX scribus-1.5.8-cmake.patch 951 BLAKE2B 7f64fbb7d92974b44946eeee359a87ea3c1564a804765169f0271d5cbdef488b142eec3d057d0367415b665c09ef82ef4da2934b3343e6bf0f0a91abe949bb23 SHA512 340185ac6ae1a0dbb6138ff2d714ba330ce4957864788a5f7786d7f5149abddcda222e5b902bc67c6ed61bf01dd4225eb66ce6abc5e3a672ef2c0586701384e7
 AUX scribus-1.6.1-findhyphen.patch 1787 BLAKE2B 28faaa033a876516333ce10f89cc741c56090c53e98b0b9dee44cd05153533b0fd088e178f087f1125365b199385463ae1e07add1a92976e32a8b500d6e2979c SHA512 772ded373a356a679416dcd4f87abaf4b2a47bcf48738a8d40103cadff6eb332381e07bd277c5013c5e112f5b2997b2e9667052b83324960990ce96fa7ec4542
+AUX scribus-1.6.2-poppler-24.10.0.patch 5944 BLAKE2B 90c8cce46f3993e2102d2a14d65f932dbde979dd1fa55c40bee6dad5f1f94cdf2de5f6976b6ac3f4e24b34b3b1012152abe597b959a1f3f9030a28d8f4a7bf66 SHA512 5443a35b586ed2f6552bb07ff6bfc1a6fc4177f3bbdc94e3bb09b5977d799b6357cd62ca8f773a6757469eefce6cc3cf38880e4baa47f9f8a858f5dedf4aac51
+AUX scribus-1.6.2-poppler-24.11.0.patch 10980 BLAKE2B fce503d3a018dac6747f7462febe82a2201935e371ec890191692964ecc667800d60c775f9f69941abf3449f0ab23dc3c5084c2ab20e26834b00f44321a7913f SHA512 cff7998296b83123d7ef31844244553774998b5c94bbbfb592ac3495ac0f4fb6588296e6322b68383c06e31c5f6c22386ce309dbf9f3b930c9cae1965386b9ca
 AUX scribus-1.7.0-dont-install-thirdparty-license.patch 517 BLAKE2B cba2d9ad7e3b4a028f75dddb8296d8d5fd8f38c6eb91f673db4fda779375ed7f29e266874a66c9ea7d40c6e54908a2c98397072805cfb6c640c6a0a58b1cfd2a SHA512 8a38b5a1254f089f94f0fc8ca8f646e1c1d76a1193b232bb4420639a725f10cc2204d83c42a6a7535347dc7e2486048311e8221cfb445542b32511cedb07142e
 AUX scribus-1.7.0-findhyphen.patch 1900 BLAKE2B 6d5ef69a889afefa8449e35cdb4348d9cdf3ebe1b110b4de86a35e72e5faae97ae2fbadfe9ae2672a144d7ccea33ea95e0e25f2894f444c3a58a6e1b713aa357 SHA512 cde9231dd4783832340d9dd3df1522d3f5f7a3ab4f26d18ca5825d634d8102e3ca1bae483f0bd111e7e4fff31e5c9154923a9d79eae735a0445b6829e74b5c5f
 AUX scribus-1.7.0-fix-icon-version.patch 410 BLAKE2B 65d077457d8c85a8830345d7299b054806c16285e75ed4055f14ba4d844a9b0fd4972f0f1eba6ec889af4f460f50522d88722bfa34b123b80f280f2f0e029462 SHA512 230085c17081a33fb900e686e7469b878965c659e10845c39d2c7dc68a11e1f6a01bd614a21a555539c437a567ac8231490da739bfe5c17ef13fed9bd61352e2
 DIST scribus-1.6.2.tar.xz 73129400 BLAKE2B 2da98dc322319db18a157f66aef024b7392dbbfaf22adba14f719b48c644d1cc1546cc4d0cccf6dfe479571cf84de6f5645e5d452154f96ddc886e390702d547 SHA512 2f691c1f6b7beada89be410a2936b23641913bf26bd2152974bbaa747aeafb05aa797356a85bd55c14f60f0031ce1addedc9a3ce3e92546ebbb45f96a5ff3e62
-EBUILD scribus-1.6.2.ebuild 4098 BLAKE2B 00da5a091ba9a730846d9be6dbaa714992c453ac6fec9f50a2f98ae3d643db748e4c76a197dfa1ecfd52b75ba693cf30bdd25b35b57300268f907a6e1de0b76d SHA512 92172501c4807a70ac4d83792240f68fca088bd3f335c06fc2cceffbaa099aa40b2a1e10c72b2fc52ba9157c465ac51ccdc4f7f1eb38092bae3a13da46539cf1
+EBUILD scribus-1.6.2.ebuild 4158 BLAKE2B 04ab98dd2165578a38a5e1c6cba1d965dcc5c9e1aaa90d3458f4734a077da06085ad2e951f7cb3f79a75748cd72008e98f6c65eb58a2637b579f6ff2898291d8 SHA512 def82103c8890d80cf8db84884c7e764f1fa5f44493eaaf02ea56c7bcb1fccb821ffc6ca20e2446d4cc79815e87d13aadd392ed769c307eab4a3131c3b8dd9ce
 EBUILD scribus-1.6.9999.ebuild 4102 BLAKE2B 5e2a0cd07aae3d44d0439fc55343aede839ef7391e72c9e9dcfb92246f127f58faa1a597c2ff9a3564bc77522f709ceb9e424aa3a61540ce6e569f633104f028 SHA512 85b061e3e87e6d9dcf0c5e025ecc7e2acb533c2e7420bda14d3be53b91e5daa7b6b74f4d5061e74cf9fc22d89eeb7e03be956c2c3aaed5e997a7c6ad090b652f
 EBUILD scribus-9999.ebuild 3989 BLAKE2B 20bbc3996092f2e2afd085b749fb9d043ce01b4571447edca5498970f2879aa3a3284f282276fc60d0642ea55f0b8609445d8f6e387abe420ebabf768856ae40 SHA512 882a57ab93f56ee6afc81dda58d79b41e9d2035b4a24cc8c70edfc7aeed6b7beba6bb392cd0d751747d58cc66b5ce7dc625b627e172b6335ecbf060383d7b326
 MISC metadata.xml 883 BLAKE2B 7dc92ce97a3337f9397b52c647c00313790a8a674c88ba3491ef55b056941d6dcdfe1eac9009c4a5f2c4ebe70d81f9fa27439efad544bf8415ffb2235440402e SHA512 3348ea8be21835e88182c23e21dfaef4f52928aee1f4af1c88707cc3bd3f016d56986f197eec9b26279f4df72f20559fe7f4cad7439e67a66ab2c1b4f585ad91
diff --git a/app-office/scribus/files/scribus-1.6.2-poppler-24.10.0.patch b/app-office/scribus/files/scribus-1.6.2-poppler-24.10.0.patch
new file mode 100644
index 000000000000..230af10ea007
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.6.2-poppler-24.10.0.patch
@@ -0,0 +1,178 @@
+From 09e6d8cd005fd36811998bbc8c9de3a019c7b8fb Mon Sep 17 00:00:00 2001
+From: Jean Ghali <jghali@libertysurf.fr>
+Date: Tue, 15 Oct 2024 21:09:31 +0000
+Subject: [PATCH 1/2] Fix build with poppler 24.10.0
+
+git-svn-id: svn://scribus.net/branches/Version16x/Scribus@26324 11d20701-8431-0410-a711-e3c959e3b870
+---
+ scribus/plugins/import/pdf/slaoutput.cpp | 34 ++++++++++++++++++++++++
+ scribus/plugins/import/pdf/slaoutput.h   |  6 ++++-
+ 2 files changed, 39 insertions(+), 1 deletion(-)
+
+diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
+index c002a886a..dfabf7039 100644
+--- a/scribus/plugins/import/pdf/slaoutput.cpp
++++ b/scribus/plugins/import/pdf/slaoutput.cpp
+@@ -81,6 +81,8 @@ namespace
+ 	}
+ }
+ 
++#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(24, 10, 0)
++
+ LinkSubmitForm::LinkSubmitForm(Object *actionObj)
+ {
+ 	if (!actionObj->isDict())
+@@ -111,6 +113,8 @@ LinkSubmitForm::~LinkSubmitForm()
+ 	delete fileName;
+ }
+ 
++#endif
++
+ LinkImportData::LinkImportData(Object *actionObj)
+ {
+ 	if (!actionObj->isDict())
+@@ -1078,6 +1082,32 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
+ 				}
+ 			}
+ 		}
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 89, 0)
++		else if (Lact->getKind() == actionResetForm)
++		{
++			ite->annotation().setActionType(4);
++		}
++#endif
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 10, 0)
++		else if (Lact->getKind() == actionSubmitForm)
++		{
++			const auto* impo = (LinkSubmitForm*) Lact;
++			if (impo->isOk())
++			{
++				ite->annotation().setActionType(3);
++				ite->annotation().setAction(UnicodeParsedString(impo->getUrl()));
++				int fl = impo->getFlags();
++				if (fl == 0)
++					ite->annotation().setHTML(0);
++				else if (fl == 4)
++					ite->annotation().setHTML(1);
++				else if (fl == 64)
++					ite->annotation().setHTML(2);
++				else if (fl == 512)
++					ite->annotation().setHTML(3);
++			}
++		}
++#endif
+ 		else if (Lact->getKind() == actionUnknown)
+ 		{
+ 			auto *uno = (LinkUnknown*) Lact;
+@@ -1106,7 +1136,11 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
+ 						if (impo->isOk())
+ 						{
+ 							ite->annotation().setActionType(3);
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 10, 0)
++							ite->annotation().setAction(UnicodeParsedString(impo->getUrl()));
++#else
+ 							ite->annotation().setAction(UnicodeParsedString(impo->getFileName()));
++#endif
+ 							int fl = impo->getFlags();
+ 							if (fl == 0)
+ 								ite->annotation().setHTML(0);
+diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h
+index 35de565b0..90a745972 100644
+--- a/scribus/plugins/import/pdf/slaoutput.h
++++ b/scribus/plugins/import/pdf/slaoutput.h
+@@ -56,9 +56,11 @@ for which a new license (GPL+exception) is in place.
+ #include <poppler/splash/SplashGlyphBitmap.h>
+ 
+ //------------------------------------------------------------------------
+-// LinkSubmitData
++// LinkSubmitForm
+ //------------------------------------------------------------------------
+ 
++#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(24, 10, 0)
++
+ class LinkSubmitForm: public LinkAction
+ {
+ public:
+@@ -79,6 +81,8 @@ private:
+ 	int m_flags {0};
+ };
+ 
++#endif
++
+ //------------------------------------------------------------------------
+ // LinkImportData
+ //------------------------------------------------------------------------
+-- 
+2.47.0
+
+
+From 6b80de8425a5b6b3e8c170b4a99cb4c5e0d85789 Mon Sep 17 00:00:00 2001
+From: Jean Ghali <jghali@libertysurf.fr>
+Date: Tue, 15 Oct 2024 21:15:36 +0000
+Subject: [PATCH 2/2] Simplify build fix for poppler 24.10.0
+
+git-svn-id: svn://scribus.net/branches/Version16x/Scribus@26326 11d20701-8431-0410-a711-e3c959e3b870
+---
+ scribus/plugins/import/pdf/slaoutput.cpp | 8 ++------
+ scribus/plugins/import/pdf/slaoutput.h   | 6 +++---
+ 2 files changed, 5 insertions(+), 9 deletions(-)
+
+diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
+index dfabf7039..69022014b 100644
+--- a/scribus/plugins/import/pdf/slaoutput.cpp
++++ b/scribus/plugins/import/pdf/slaoutput.cpp
+@@ -99,7 +99,7 @@ LinkSubmitForm::LinkSubmitForm(Object *actionObj)
+ 			{
+ 				Object obj2 = obj1.dictLookup("F");
+ 				if (!obj2.isNull())
+-					fileName = obj2.getString()->copy();
++					m_url = obj2.getString()->copy();
+ 			}
+ 		}
+ 	}
+@@ -110,7 +110,7 @@ LinkSubmitForm::LinkSubmitForm(Object *actionObj)
+ 
+ LinkSubmitForm::~LinkSubmitForm()
+ {
+-	delete fileName;
++	delete m_url;
+ }
+ 
+ #endif
+@@ -1136,11 +1136,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
+ 						if (impo->isOk())
+ 						{
+ 							ite->annotation().setActionType(3);
+-#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 10, 0)
+ 							ite->annotation().setAction(UnicodeParsedString(impo->getUrl()));
+-#else
+-							ite->annotation().setAction(UnicodeParsedString(impo->getFileName()));
+-#endif
+ 							int fl = impo->getFlags();
+ 							if (fl == 0)
+ 								ite->annotation().setHTML(0);
+diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h
+index 90a745972..0482a5855 100644
+--- a/scribus/plugins/import/pdf/slaoutput.h
++++ b/scribus/plugins/import/pdf/slaoutput.h
+@@ -70,14 +70,14 @@ public:
+ 	virtual ~LinkSubmitForm();
+ 
+ 	// Was the LinkImportData created successfully?
+-	GBool isOk() POPPLER_CONST override { return fileName != nullptr; }
++	GBool isOk() POPPLER_CONST override { return m_url != nullptr; }
+ 	// Accessors.
+ 	LinkActionKind getKind() POPPLER_CONST override { return actionUnknown; }
+-	GooString *getFileName() { return fileName; }
++	GooString *getUrl() { return m_url; }
+ 	int getFlags() { return m_flags; }
+ 
+ private:
+-	GooString *fileName {nullptr};		// file name
++	GooString *m_url {nullptr};		// URL
+ 	int m_flags {0};
+ };
+ 
+-- 
+2.47.0
+
diff --git a/app-office/scribus/files/scribus-1.6.2-poppler-24.11.0.patch b/app-office/scribus/files/scribus-1.6.2-poppler-24.11.0.patch
new file mode 100644
index 000000000000..c6ad46df633a
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.6.2-poppler-24.11.0.patch
@@ -0,0 +1,277 @@
+From 46f78fd4d22f17257ef18fb6c41267ad1185aaa6 Mon Sep 17 00:00:00 2001
+From: Jean Ghali <jghali@libertysurf.fr>
+Date: Sun, 3 Nov 2024 02:07:56 +0000
+Subject: [PATCH 1/3] Fix build with poppler 24.11.0
+
+git-svn-id: svn://scribus.net/branches/Version16x/Scribus@26390 11d20701-8431-0410-a711-e3c959e3b870
+---
+ scribus/plugins/import/pdf/slaoutput.cpp | 77 +++++++++++++++++++++++-
+ scribus/plugins/import/pdf/slaoutput.h   |  7 +++
+ 2 files changed, 82 insertions(+), 2 deletions(-)
+
+diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
+index 69022014b..a49ef2263 100644
+--- a/scribus/plugins/import/pdf/slaoutput.cpp
++++ b/scribus/plugins/import/pdf/slaoutput.cpp
+@@ -3079,7 +3079,11 @@ void SlaOutputDev::updateFont(GfxState *state)
+ 	char* tmpBuf = nullptr;
+ #endif
+ 	GfxFontType fontType;
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0)
++	std::unique_ptr<SlaOutFontFileID> id;
++#else
+ 	SlaOutFontFileID *id;
++#endif
+ 	SplashFontFile *fontFile;
+ 	SplashFontSrc *fontsrc = nullptr;
+ 	Object refObj, strObj;
+@@ -3109,9 +3113,15 @@ void SlaOutputDev::updateFont(GfxState *state)
+ 		goto err1;
+ 
+ 	// check the font file cache
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0)
++	id.reset(new SlaOutFontFileID(gfxFont->getID()));
++	if ((fontFile = m_fontEngine->getFontFile(*id)))
++		id.reset();
++#else
+ 	id = new SlaOutFontFileID(gfxFont->getID());
+ 	if ((fontFile = m_fontEngine->getFontFile(id)))
+ 		delete id;
++#endif
+ 	else
+ 	{
+ 		fontLoc = gfxFont->locateFont(m_xref ? m_xref : m_pdfDoc->getXRef(), nullptr);
+@@ -3165,29 +3175,58 @@ void SlaOutputDev::updateFont(GfxState *state)
+ 		// load the font file
+ 		switch (fontType) {
+ 		case fontType1:
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0)
++			if (!(fontFile = m_fontEngine->loadType1Font(std::move(id), fontsrc, (const char**) ((Gfx8BitFont*) gfxFont)->getEncoding(), fontLoc->fontNum)))
++			{
++				error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)");
++				goto err2;
++			}
++#else
+ 			if (!(fontFile = m_fontEngine->loadType1Font(id, fontsrc, (const char **)((Gfx8BitFont *) gfxFont)->getEncoding())))
+ 			{
+ 				error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
+ 				goto err2;
+ 			}
++#endif
+ 			break;
+ 		case fontType1C:
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0)
++			if (!(fontFile = m_fontEngine->loadType1CFont(std::move(id), fontsrc, (const char**) ((Gfx8BitFont*) gfxFont)->getEncoding(), fontLoc->fontNum)))
++			{
++				error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)");
++				goto err2;
++			}
++#else
+ 			if (!(fontFile = m_fontEngine->loadType1CFont(id, fontsrc, (const char **)((Gfx8BitFont *) gfxFont)->getEncoding())))
+ 			{
+ 				error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
+ 				goto err2;
+ 			}
++#endif
+ 			break;
+ 		case fontType1COT:
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0)
++			if (!(fontFile = m_fontEngine->loadOpenTypeT1CFont(std::move(id), fontsrc, (const char **)((Gfx8BitFont *) gfxFont)->getEncoding(), fontLoc->fontNum)))
++			{
++				error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)");
++				goto err2;
++			}
++#else
+ 			if (!(fontFile = m_fontEngine->loadOpenTypeT1CFont(id, fontsrc, (const char **)((Gfx8BitFont *) gfxFont)->getEncoding())))
+ 			{
+ 				error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
+ 				goto err2;
+ 			}
++#endif
+ 			break;
+ 		case fontTrueType:
+ 		case fontTrueTypeOT:
+-#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0)
++			if (!fileName.empty())
++				ff = FoFiTrueType::load(fileName.c_str(), fontLoc->fontNum);
++			else
++				ff = FoFiTrueType::make(fontsrc->buf.data(), fontsrc->buf.size(), fontLoc->fontNum);
++#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)
+ 			if (!fileName.empty())
+ 				ff = FoFiTrueType::load(fileName.c_str());
+ 			else
+@@ -3214,19 +3253,35 @@ void SlaOutputDev::updateFont(GfxState *state)
+ 				codeToGID = nullptr;
+ 				n = 0;
+ 			}
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0)
++			if (!(fontFile = m_fontEngine->loadTrueTypeFont(std::move(id), fontsrc, codeToGID, n, fontLoc->fontNum)))
++			{
++				error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)");
++				goto err2;
++			}
++#else
+ 			if (!(fontFile = m_fontEngine->loadTrueTypeFont(id, fontsrc, codeToGID, n)))
+ 			{
+ 				error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
+ 				goto err2;
+ 			}
++#endif
+ 			break;
+ 		case fontCIDType0:
+ 		case fontCIDType0C:
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0)
++			if (!(fontFile = m_fontEngine->loadCIDFont(std::move(id), fontsrc, fontLoc->fontNum)))
++			{
++				error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)");
++				goto err2;
++			}
++#else
+ 			if (!(fontFile = m_fontEngine->loadCIDFont(id, fontsrc)))
+ 			{
+ 				error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
+ 				goto err2;
+ 			}
++#endif
+ 			break;
+ 		case fontCIDType0COT:
+ 			if (((GfxCIDFont *) gfxFont)->getCIDToGID())
+@@ -3240,12 +3295,21 @@ void SlaOutputDev::updateFont(GfxState *state)
+ 				codeToGID = nullptr;
+ 				n = 0;
+ 			}
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0)
++			if (!(fontFile = m_fontEngine->loadOpenTypeCFFFont(std::move(id), fontsrc, codeToGID, n, fontLoc->fontNum)))
++			{
++				error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
++					gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)");
++				goto err2;
++			}
++#else
+ 			if (!(fontFile = m_fontEngine->loadOpenTypeCFFFont(id, fontsrc, codeToGID, n)))
+ 			{
+ 				error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
+ 				gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
+ 				goto err2;
+ 			}
++#endif
+ 			break;
+ 		case fontCIDType2:
+ 		case fontCIDType2OT:
+@@ -3262,7 +3326,12 @@ void SlaOutputDev::updateFont(GfxState *state)
+ 			}
+ 			else
+ 			{
+-#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0)
++				if (!fileName.empty())
++					ff = FoFiTrueType::load(fileName.c_str(), fontLoc->fontNum);
++				else
++					ff = FoFiTrueType::make(fontsrc->buf.data(), fontsrc->buf.size(), fontLoc->fontNum);
++#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)
+ 				if (!fileName.empty())
+ 					ff = FoFiTrueType::load(fileName.c_str());
+ 				else
+@@ -3322,7 +3391,11 @@ void SlaOutputDev::updateFont(GfxState *state)
+ 	return;
+ 
+ err2:
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0)
++	id.reset();
++#else
+ 	delete id;
++#endif
+ #if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(22, 2, 0)
+ 	delete fontLoc;
+ #endif
+diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h
+index 0482a5855..69bebbf5f 100644
+--- a/scribus/plugins/import/pdf/slaoutput.h
++++ b/scribus/plugins/import/pdf/slaoutput.h
+@@ -115,10 +115,17 @@ public:
+ 	SlaOutFontFileID(const Ref *rA) { r = *rA; }
+ 	~SlaOutFontFileID() {}
+ 
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0)
++	bool matches(const SplashFontFileID& id) const override
++	{
++		return ((const SlaOutFontFileID&) id).r.num == r.num && ((const SlaOutFontFileID&) id).r.gen == r.gen;
++	}
++#else
+ 	GBool matches(SplashFontFileID *id) override
+ 	{
+ 		return ((SlaOutFontFileID*) id)->r.num == r.num && ((SlaOutFontFileID *) id)->r.gen == r.gen;
+ 	}
++#endif
+ 
+ private:
+ 	Ref r;
+-- 
+2.47.0
+
+
+From 0a02f661959d62492695dee6b3538ab2bdf01c91 Mon Sep 17 00:00:00 2001
+From: Jean Ghali <jghali@libertysurf.fr>
+Date: Sun, 3 Nov 2024 02:12:49 +0000
+Subject: [PATCH 2/3] Fix build with poppler 24.11.0 (2)
+
+git-svn-id: svn://scribus.net/branches/Version16x/Scribus@26391 11d20701-8431-0410-a711-e3c959e3b870
+---
+ scribus/plugins/import/pdf/slaoutput.cpp | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
+index a49ef2263..41eaba921 100644
+--- a/scribus/plugins/import/pdf/slaoutput.cpp
++++ b/scribus/plugins/import/pdf/slaoutput.cpp
+@@ -3352,11 +3352,19 @@ void SlaOutputDev::updateFont(GfxState *state)
+ 				delete ff;
+ #endif
+ 			}
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0)
++			if (!(fontFile = m_fontEngine->loadTrueTypeFont(std::move(id), fontsrc, codeToGID, n, faceIndex)))
++			{
++				error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)");
++				goto err2;
++			}
++#else
+ 			if (!(fontFile = m_fontEngine->loadTrueTypeFont(id, fontsrc, codeToGID, n, faceIndex)))
+ 			{
+ 				error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
+ 				goto err2;
+ 			}
++#endif
+ 			break;
+ 		default:
+ 			// this shouldn't happen
+-- 
+2.47.0
+
+
+From 93db266048e90ca31a9c50ee4696956a93b816ab Mon Sep 17 00:00:00 2001
+From: Jean Ghali <jghali@libertysurf.fr>
+Date: Sun, 3 Nov 2024 02:17:33 +0000
+Subject: [PATCH 3/3] Fix from poppler 24.11.0 SplashOutputDev
+
+git-svn-id: svn://scribus.net/branches/Version16x/Scribus@26393 11d20701-8431-0410-a711-e3c959e3b870
+---
+ scribus/plugins/import/pdf/slaoutput.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
+index 41eaba921..9724ff72b 100644
+--- a/scribus/plugins/import/pdf/slaoutput.cpp
++++ b/scribus/plugins/import/pdf/slaoutput.cpp
+@@ -3353,7 +3353,7 @@ void SlaOutputDev::updateFont(GfxState *state)
+ #endif
+ 			}
+ #if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0)
+-			if (!(fontFile = m_fontEngine->loadTrueTypeFont(std::move(id), fontsrc, codeToGID, n, faceIndex)))
++			if (!(fontFile = m_fontEngine->loadTrueTypeFont(std::move(id), fontsrc, codeToGID, n, fontLoc->fontNum)))
+ 			{
+ 				error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)");
+ 				goto err2;
+-- 
+2.47.0
+
diff --git a/app-office/scribus/scribus-1.6.2.ebuild b/app-office/scribus/scribus-1.6.2.ebuild
index 764455f39f70..753044e56f3c 100644
--- a/app-office/scribus/scribus-1.6.2.ebuild
+++ b/app-office/scribus/scribus-1.6.2.ebuild
@@ -83,6 +83,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.5.3-fpic.patch
 	"${FILESDIR}"/${PN}-1.6.1-findhyphen.patch
 	"${FILESDIR}"/${PN}-1.7.0-fix-icon-version.patch
+	"${FILESDIR}"/${P}-poppler-24.{10,11}.0.patch # bug 941932
 )
 
 src_prepare() {
author	V3n3RiX <venerix@koprulu.sector>	2024-11-04 03:03:54 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2024-11-04 03:03:54 +0000
commit	3cc82055be7dba177f4aea15af9f5414b532da7e (patch)
tree	1eed8bbe7a93b3a0a7d6091ead40e81519978a38 /app-office
parent	212000bb5eabdfeb9a6e7a9b8f28e2740cae555a (diff)