gentoo auto-resync : 19:04:2024 - 12:05:02

13 files changed, 7 insertions, 454 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 0fdd8574c981..808e8a96c878 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/accounts-qt/Manifest b/net-libs/accounts-qt/Manifest
index a2383a0adc44..5319a8344117 100644
--- a/net-libs/accounts-qt/Manifest
+++ b/net-libs/accounts-qt/Manifest
@@ -1,8 +1,3 @@
-AUX 0001-Port-away-from-deprecated-QList-toSet.patch 3641 BLAKE2B 25a036baf7ff4864d205d0eded66ef7651ed51a3608fa7f0a72e40eefa3331e3741718b0161fe5a882a6c08f382362c494ffa5f8546f57f2365d5f77fcf22d88 SHA512 26c84e920c772f346f82f8886a6d0ce05117ed1bfbafcba843486e0f22f4c49f806c475a3a73b3c76173e9409a3b17d1ce89a0148877bccf9e8808eda35b1796
-AUX 0002-Add-Qt6-CI.patch 5085 BLAKE2B 2dec34a0b6726a780e593fbb74745951041f3e6cbe6b95c15229bb6aefc8ecc5f6ecb6c6a8f3d81f84939bca45c45ad0edc8370f4c1ac2f35a8840ba72cf28ed SHA512 82c9fe0e377180b1f9014376f6cdba67985f003f7ed5bf967f6ad03b52e38169cf62cdc50f3306a7d9862b33dd62ca412bd871a4d465184a5c4fb6d1b751d631
-AUX 0003-Use-undeprecated-Account-value.patch 914 BLAKE2B 42b2483989abea47e96c6b450ab395ff8ad81c56932f422f7f3b378cf16af62eef1c5f1ac93ae6174cf2d25ba8724332714a44b3eb3919f2c3c8368467807e3e SHA512 6f5b5189246cf6ae3cb15a48878d95fff91563127c0888da784cc4fc126ba576214ae801bb24912e6d147d99b300629971c2a874a1087e7d0c3d20b0118b28e4
-AUX 0004-Don-t-access-a-QString-out-of-bounds.patch 1414 BLAKE2B 611ee017ba8db1440c9954bd6c58c724f8b790374a126658826157a61e4e5c5fe5493ee49371fbbb1e5abd638dbe1e8f26574d5266d80ca6a581870bd6f32c82 SHA512 5ccff28c1ab3951f093d4dcc0dad782b60118e7abc978564b60c1463efb683f9f495f6cf7e100d96fc28e60980ffd2a79ab6f1b471ff5fa15823c113003c0a7e
-AUX 0005-Adjust-buildsystem-to-include-correct-Qt-Major-versi.patch 4128 BLAKE2B 86f3a68616ee7919d8d0123ff3373583d5c6f52dd0a77d3fd480e8556d78a09643f0007d343a143c1c79005147a59febe80d23a0417446c4f62fb040ea0f2701 SHA512 5bb20f5086c10d68aae819314137b221c34fc8a57a7eed1c44b0e96e64e1cf973df82c19698487297c452f704769cb26ffeb799b8ec3e30c3d4741fb313b63fc
 AUX accounts-qt-1.16-libdir.patch 4809 BLAKE2B 50c73a04be62a4748278f7cf46a8c06286363b9929324863af079e4da2c487d36194231a06d15ccb159d0a1f668fcf1a1ad80330730bebc08f53d29bbaa499f0 SHA512 dde1e34655952e8ae0ade756d8ff8559b4049eed0d273c078043eafe24751edf57e66b6300ee875c28b56978ed502bef79186605b3bc73b752fb226ae2bda90d
 DIST accounts-qt-1.16a.tar.gz 64376 BLAKE2B 39abe10249efff2edeae1a8ce210be3ce06656311ed5a3a3fbcb847194ebbd8ec6e111ef070fb29a2a847591304cf22a7cb60e9d1178a201b886313c4c8aaadb SHA512 a2a65899a258ac41c67fe496ba14468a95615fe8cfc518b7aaf7d3e72e0088304c61f5d76d50bd26a95b5f56dea4d0191bf08ecead508286504161aa05b7a05b
 DIST accounts-qt-1.17.tar.bz2 55907 BLAKE2B e13debd3f7bc9a17cf73c55777b62e904a6bf7791fe3ad0e1af25a72622a8c21cb56bf033afb50d17a1dd703be0af88de9e557d0947d9b7c12e1ac241b45b743 SHA512 ceab67d5db1acb68e391be0557e5fd4b9675f1401b1fe81ff431d5d1eb1d7124cd5170fde44658d7db8b46f721e9d3f7db719c5b727aa681a9e35ea026a71908
diff --git a/net-libs/accounts-qt/files/0001-Port-away-from-deprecated-QList-toSet.patch b/net-libs/accounts-qt/files/0001-Port-away-from-deprecated-QList-toSet.patch
deleted file mode 100644
index 190178cc3030..000000000000
--- a/net-libs/accounts-qt/files/0001-Port-away-from-deprecated-QList-toSet.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-https://gitlab.com/accounts-sso/libaccounts-qt/-/merge_requests/21
-
-From 3107822e036300684c2bdf587838a110eea8ba30 Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Mon, 1 Aug 2022 20:35:03 +0200
-Subject: [PATCH 1/5] Port away from deprecated QList::toSet
-
----
- tests/tst_libaccounts.cpp | 44 +++++++++++++++++++++++++++++----------
- 1 file changed, 33 insertions(+), 11 deletions(-)
-
-diff --git a/tests/tst_libaccounts.cpp b/tests/tst_libaccounts.cpp
-index 471e3d5..efede91 100644
---- a/tests/tst_libaccounts.cpp
-+++ b/tests/tst_libaccounts.cpp
-@@ -326,11 +326,11 @@ void AccountsTest::testService()
-     QCOMPARE(service.description(), QStringLiteral("Test description"));
-     QCOMPARE(service.iconName(), QString("general_myservice"));
-     QCOMPARE(service.trCatalog(), QString("accounts"));
--    QStringList tags;
-+    QSet<QString> tags;
-     tags << "email" << "e-mail";
--    QCOMPARE(service.tags(), tags.toSet());
-+    QCOMPARE(service.tags(), tags);
-     // Called twice, because the second time it returns a cached result
--    QCOMPARE(service.tags(), tags.toSet());
-+    QCOMPARE(service.tags(), tags);
-     QVERIFY(service.hasTag("email"));
-     QVERIFY(!service.hasTag("chat"));
- 
-@@ -687,10 +687,15 @@ void AccountsTest::testAccountService()
-     spyChanged.clear();
-     spyEnabled.clear();
- 
--    QStringList expectedChanges;
-+    QSet<QString> expectedChanges;
-     expectedChanges << "parameters/server";
-     expectedChanges << "enabled";
--    QCOMPARE(m_accountServiceChangedFields.toSet(), expectedChanges.toSet());
-+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-+    QSet<QString> changedFields(m_accountServiceChangedFields.begin(), m_accountServiceChangedFields.end());
-+#else
-+    QSet<QString> changedFields = m_accountServiceChangedFields.toSet();
-+#endif
-+    QCOMPARE(changedFields, expectedChanges);
- 
-     QCOMPARE(accountService->value("server").toString(),
-              UTF8("www.example.com"));
-@@ -727,17 +732,34 @@ void AccountsTest::testAccountService()
- 
- 
-     /* test some more APIs */
--    QStringList expectedList;
-+    QSet<QString> expectedList;
-     expectedList << "server" << "fallback-conference-server" <<
-         "port" << "old-ssl";
--    QCOMPARE(accountService->childKeys().toSet(), expectedList.toSet());
--    QCOMPARE(accountService->childGroups().toSet(), QSet<QString>());
-+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-+    QStringList childKeysList = accountService->childKeys();
-+    QSet<QString> childKeys(childKeysList.begin(), childKeysList.end());
-+
-+    QStringList childGroupsList = accountService->childGroups();
-+    QSet<QString> childGroups(childGroupsList.begin(), childGroupsList.end());
-+#else
-+    QSet<QString> childKeys = accountService->childKeys().toSet();
-+    QSet<QString> childGroups = accountService->childGroups().toSet();
-+#endif
-+
-+    QCOMPARE(childKeys, expectedList);
-+    QCOMPARE(childGroups, QSet<QString>());
-     QCOMPARE(accountService->contains("port"), true);
-     accountService->endGroup();
- 
--    expectedList.clear();
--    expectedList << "parameters";
--    QCOMPARE(accountService->childGroups().toSet(), expectedList.toSet());
-+    QSet<QString> expectedList2;
-+    expectedList2 << "parameters";
-+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-+    QStringList childGroupsList2 = accountService->childGroups();
-+    QSet<QString> childGroups2(childGroupsList2.begin(), childGroupsList2.end());
-+#else
-+    QSet<QString> childGroups2 = accountService->childGroups().toSet();
-+#endif
-+    QCOMPARE(childGroups2, expectedList2);
- 
-     /* Remove one key */
-     accountService->remove("parameters/port");
--- 
-2.43.0
-
diff --git a/net-libs/accounts-qt/files/0002-Add-Qt6-CI.patch b/net-libs/accounts-qt/files/0002-Add-Qt6-CI.patch
deleted file mode 100644
index f8383b5f8a43..000000000000
--- a/net-libs/accounts-qt/files/0002-Add-Qt6-CI.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-https://gitlab.com/accounts-sso/libaccounts-qt/-/merge_requests/21
-
-From d00f7346b091b885ba0ea3f6055e74a173fd0034 Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Mon, 17 Oct 2022 23:33:16 +0200
-Subject: [PATCH 2/5] Add Qt6 CI
-
----
- .gitlab-ci.yml | 80 +++++++++++++++++++++++++++++++++++++++++---------
- 1 file changed, 66 insertions(+), 14 deletions(-)
-
-diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
-index 95d5a92..f8b5bf6 100644
---- a/.gitlab-ci.yml
-+++ b/.gitlab-ci.yml
-@@ -1,5 +1,3 @@
--image: ubuntu:bionic
--
- cache:
-   key: apt-cache
-   paths:
-@@ -13,23 +11,19 @@ stages:
-   - test
-   - deploy
- 
--before_script:
--  - export APT_CACHE_DIR=`pwd`/apt-cache && mkdir -pv $APT_CACHE_DIR
--  - PACKAGES+=" wget" # for downloading dependencies
--  - PACKAGES+=" libglib2.0-dev libsqlite3-dev libxml2-dev gtk-doc-tools libgirepository1.0-dev gobject-introspection libxml2-utils python3-gi python-gi-dev valac check python3-pip" # for libaccounts-glib
--  - |
--      apt-get update -yq && apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y \
--          qt5-qmake qttools5-dev-tools qtbase5-dev qtchooser pkg-config doxygen \
--          $PACKAGES
--  - apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y dbus-test-runner lcov gcovr
--  - pip3 install meson ninja
--
--
- build_dependencies:
-+  image: ubuntu:bionic
-   stage: deps
-   artifacts:
-     paths:
-       - staging
-+  before_script:
-+    - export APT_CACHE_DIR=`pwd`/apt-cache && mkdir -pv $APT_CACHE_DIR
-+    - PACKAGES+=" wget" # for downloading dependencies
-+    - PACKAGES+=" libglib2.0-dev libsqlite3-dev libxml2-dev gtk-doc-tools libgirepository1.0-dev gobject-introspection libxml2-utils python3-gi python-gi-dev valac check python3-pip" # for libaccounts-glib
-+    - apt-get update -yq && apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y $PACKAGES
-+    - pip3 install meson ninja
-+
-   script:
-     - STAGING="$PWD/staging"
- 
-@@ -52,7 +46,15 @@ build_dependencies:
- 
- 
- build_amd64:
-+  image: ubuntu:bionic
-   stage: build
-+  before_script:
-+    - export APT_CACHE_DIR=`pwd`/apt-cache && mkdir -pv $APT_CACHE_DIR
-+    - |
-+        apt-get update -yq && apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y \
-+            qt5-qmake qttools5-dev-tools qtbase5-dev qtchooser pkg-config doxygen wget libglib2.0-dev libsqlite3-dev libxml2-dev gtk-doc-tools libgirepository1.0-dev gobject-introspection libxml2-utils python3-gi python-gi-dev valac check python3-pip
-+    - apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y dbus-test-runner lcov gcovr
-+
-   script:
-     - STAGING="$PWD/staging"
-     - export PKG_CONFIG_PATH="$STAGING/lib/pkgconfig:$PKG_CONFIG_PATH"
-@@ -69,7 +71,16 @@ build_amd64:
-       - build/
- 
- test_amd64:
-+  image: ubuntu:bionic
-   stage: test
-+  before_script:
-+    - export APT_CACHE_DIR=`pwd`/apt-cache && mkdir -pv $APT_CACHE_DIR
-+    - PACKAGES+=" wget" # for downloading dependencies
-+    - |
-+        apt-get update -yq && apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y \
-+            qt5-qmake qttools5-dev-tools qtbase5-dev qtchooser pkg-config doxygen \
-+            $PACKAGES
-+    - apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y dbus-test-runner lcov gcovr
-   script:
-     - STAGING="$PWD/staging"
-     - export LD_LIBRARY_PATH="$STAGING/lib:$LD_LIBRARY_PATH"
-@@ -83,6 +94,47 @@ test_amd64:
-     paths:
-       - build/
- 
-+build_amd64_qt6:
-+  stage: build
-+  image: ubuntu:jammy
-+  before_script:
-+    - export APT_CACHE_DIR=`pwd`/apt-cache && mkdir -pv $APT_CACHE_DIR
-+    - apt-get update -yq && apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y qmake6 qt6-base-dev pkg-config libqt6sql6-sqlite doxygen libdbus-1-dev g++ make libglib2.0-dev gtk-doc-tools libgirepository1.0-dev gobject-introspection libxml2-utils python3-gi python-gi-dev valac check python3-pip libsqlite3-dev libxml2-dev
-+  script:
-+    - STAGING="$PWD/staging"
-+    - find $STAGING
-+    - export PKG_CONFIG_PATH="$STAGING/lib/pkgconfig:$PKG_CONFIG_PATH"
-+    - export LD_LIBRARY_PATH="$STAGING/lib:$LD_LIBRARY_PATH"
-+    - mkdir build
-+    - cd build
-+    - qmake6 CONFIG+=debug CONFIG+=coverage ..
-+    - make -j 4
-+  dependencies:
-+    - build_dependencies
-+  artifacts:
-+    paths:
-+      - build/
-+
-+test_amd64_qt6:
-+  stage: test
-+  image: ubuntu:jammy
-+  before_script:
-+    - export APT_CACHE_DIR=`pwd`/apt-cache && mkdir -pv $APT_CACHE_DIR
-+    - export DEBIAN_FRONTEND=noninteractive
-+    - apt-get update -yq && apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y dbus-test-runner libqtdbusmock1-dev libqtdbustest1-dev lcov gcovr make qmake6 qt6-base-dev pkg-config libqt6sql6-sqlite doxygen libdbus-1-dev g++ make libsqlite3-dev libxml2-dev libglib2.0-dev
-+  script:
-+    - STAGING="$PWD/staging"
-+    - export LD_LIBRARY_PATH="$STAGING/lib:$LD_LIBRARY_PATH"
-+    - find build | xargs touch # Avoid rebuilding
-+    - cd build
-+    - make coverage-html
-+  dependencies:
-+    - build_dependencies
-+    - build_amd64_qt6
-+  artifacts:
-+    paths:
-+      - ./
-+
- pages:
-   stage: deploy
-   script:
--- 
-2.43.0
-
diff --git a/net-libs/accounts-qt/files/0003-Use-undeprecated-Account-value.patch b/net-libs/accounts-qt/files/0003-Use-undeprecated-Account-value.patch
deleted file mode 100644
index 7a8cb85b009e..000000000000
--- a/net-libs/accounts-qt/files/0003-Use-undeprecated-Account-value.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://gitlab.com/accounts-sso/libaccounts-qt/-/merge_requests/21
-
-From 102cf562f9d143de2f93ba40f8448c1d531c2c7b Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Tue, 18 Oct 2022 01:40:05 +0200
-Subject: [PATCH 3/5] Use undeprecated Account::value
-
----
- tests/tst_libaccounts.cpp | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/tests/tst_libaccounts.cpp b/tests/tst_libaccounts.cpp
-index efede91..d12091c 100644
---- a/tests/tst_libaccounts.cpp
-+++ b/tests/tst_libaccounts.cpp
-@@ -516,8 +516,7 @@ void AccountsTest::testAccountValue()
-     QTRY_COMPARE(synced.count(), 1);
- 
-     /* check that the values we wrote are retrieved successfully */
--    QVariant val = QVariant::String;
--    account->value(QString("test"), val);
-+    QVariant val = account->value(QString("test"));
-     QCOMPARE(val.toString(), QString("value"));
- 
-     SettingSource source;
--- 
-2.43.0
-
diff --git a/net-libs/accounts-qt/files/0004-Don-t-access-a-QString-out-of-bounds.patch b/net-libs/accounts-qt/files/0004-Don-t-access-a-QString-out-of-bounds.patch
deleted file mode 100644
index e342139cbb5d..000000000000
--- a/net-libs/accounts-qt/files/0004-Don-t-access-a-QString-out-of-bounds.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-https://gitlab.com/accounts-sso/libaccounts-qt/-/merge_requests/21
-
-From 3c4d5fa1f53cd66c9870b799e8518980176547b2 Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Tue, 18 Oct 2022 02:03:59 +0200
-Subject: [PATCH 4/5] Don't access a QString out-of-bounds
-
-This asserts in Qt6
----
- Accounts/account-service.cpp | 2 +-
- Accounts/account.cpp         | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Accounts/account-service.cpp b/Accounts/account-service.cpp
-index e6c04f2..d8d4304 100644
---- a/Accounts/account-service.cpp
-+++ b/Accounts/account-service.cpp
-@@ -335,7 +335,7 @@ void AccountService::endGroup()
-     Q_D(AccountService);
-     d->prefix = d->prefix.section(slash, 0, -3,
-                                   QString::SectionIncludeTrailingSep);
--    if (d->prefix[0] == slash) d->prefix.remove(0, 1);
-+    if (!d->prefix.isEmpty() && d->prefix[0] == slash) d->prefix.remove(0, 1);
- }
- 
- /*!
-diff --git a/Accounts/account.cpp b/Accounts/account.cpp
-index 2e40c60..104611a 100644
---- a/Accounts/account.cpp
-+++ b/Accounts/account.cpp
-@@ -548,7 +548,7 @@ void Account::endGroup()
- {
-     d->prefix = d->prefix.section(slash, 0, -3,
-                                   QString::SectionIncludeTrailingSep);
--    if (d->prefix[0] == slash) d->prefix.remove(0, 1);
-+    if (!d->prefix.isEmpty() && d->prefix[0] == slash) d->prefix.remove(0, 1);
- }
- 
- /*!
--- 
-2.43.0
-
diff --git a/net-libs/accounts-qt/files/0005-Adjust-buildsystem-to-include-correct-Qt-Major-versi.patch b/net-libs/accounts-qt/files/0005-Adjust-buildsystem-to-include-correct-Qt-Major-versi.patch
deleted file mode 100644
index 904e7d5aa1ad..000000000000
--- a/net-libs/accounts-qt/files/0005-Adjust-buildsystem-to-include-correct-Qt-Major-versi.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-https://gitlab.com/accounts-sso/libaccounts-qt/-/merge_requests/21
-
-From 18557f7def9af8f4a9e0e93e9f575ae11e5066aa Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Fri, 7 Apr 2023 15:49:22 +0200
-Subject: [PATCH 5/5] Adjust buildsystem to include correct Qt Major version
- number
-
----
- Accounts/Accounts.pro                      |  4 ++--
- Accounts/AccountsQt5Config.cmake.in        |  2 +-
- Accounts/AccountsQt6Config.cmake.in        |  5 +++++
- Accounts/AccountsQt6ConfigVersion.cmake.in | 10 ++++++++++
- Accounts/accounts-qt6.pc.in                | 15 +++++++++++++++
- tests/tst_libaccounts.pro                  |  2 +-
- 6 files changed, 34 insertions(+), 4 deletions(-)
- create mode 100644 Accounts/AccountsQt6Config.cmake.in
- create mode 100644 Accounts/AccountsQt6ConfigVersion.cmake.in
- create mode 100644 Accounts/accounts-qt6.pc.in
-
-diff --git a/Accounts/Accounts.pro b/Accounts/Accounts.pro
-index 13804ee..da62da7 100644
---- a/Accounts/Accounts.pro
-+++ b/Accounts/Accounts.pro
-@@ -3,7 +3,7 @@ include( ../common-project-config.pri )
- include( ../common-vars.pri )
- 
- TEMPLATE = lib
--TARGET = accounts-qt5
-+TARGET = accounts-qt$${QT_MAJOR_VERSION}
- 
- # Input
- public_headers = \
-@@ -45,7 +45,7 @@ QT -= gui
- 
- INCLUDEPATH += $${TOP_SRC_DIR}
- 
--CMAKE_BASENAME = AccountsQt5
-+CMAKE_BASENAME = AccountsQt$${QT_MAJOR_VERSION}
- 
- PKGCONFIG += \
- 	glib-2.0 \
-diff --git a/Accounts/AccountsQt5Config.cmake.in b/Accounts/AccountsQt5Config.cmake.in
-index 55a8964..746f689 100644
---- a/Accounts/AccountsQt5Config.cmake.in
-+++ b/Accounts/AccountsQt5Config.cmake.in
-@@ -2,4 +2,4 @@
- #  ACCOUNTSQT_LIBRARIES - The libraries needed to use libaccounts-qt
- 
- set(ACCOUNTSQT_LIBRARIES $${INSTALL_LIBDIR}/lib$${TARGET}.so)
--set(ACCOUNTSQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET}/)
-\ No newline at end of file
-+set(ACCOUNTSQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET}/)
-diff --git a/Accounts/AccountsQt6Config.cmake.in b/Accounts/AccountsQt6Config.cmake.in
-new file mode 100644
-index 0000000..55a8964
---- /dev/null
-+++ b/Accounts/AccountsQt6Config.cmake.in
-@@ -0,0 +1,5 @@
-+#  ACCOUNTSQT_INCLUDE_DIRS - The libaccounts-qt include directories
-+#  ACCOUNTSQT_LIBRARIES - The libraries needed to use libaccounts-qt
-+
-+set(ACCOUNTSQT_LIBRARIES $${INSTALL_LIBDIR}/lib$${TARGET}.so)
-+set(ACCOUNTSQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET}/)
-\ No newline at end of file
-diff --git a/Accounts/AccountsQt6ConfigVersion.cmake.in b/Accounts/AccountsQt6ConfigVersion.cmake.in
-new file mode 100644
-index 0000000..616cd60
---- /dev/null
-+++ b/Accounts/AccountsQt6ConfigVersion.cmake.in
-@@ -0,0 +1,10 @@
-+set(PACKAGE_VERSION $${PROJECT_VERSION})
-+
-+if(\"${PACKAGE_VERSION}\" VERSION_LESS \"${PACKAGE_FIND_VERSION}\" )
-+   set(PACKAGE_VERSION_COMPATIBLE FALSE)
-+else(\"${PACKAGE_VERSION}\" VERSION_LESS \"${PACKAGE_FIND_VERSION}\" )
-+   set(PACKAGE_VERSION_COMPATIBLE TRUE)
-+   if( \"${PACKAGE_FIND_VERSION}\" STREQUAL \"${PACKAGE_VERSION}\")
-+      set(PACKAGE_VERSION_EXACT TRUE)
-+   endif( \"${PACKAGE_FIND_VERSION}\" STREQUAL \"${PACKAGE_VERSION}\")
-+endif(\"${PACKAGE_VERSION}\" VERSION_LESS \"${PACKAGE_FIND_VERSION}\" )
-diff --git a/Accounts/accounts-qt6.pc.in b/Accounts/accounts-qt6.pc.in
-new file mode 100644
-index 0000000..c625b2e
---- /dev/null
-+++ b/Accounts/accounts-qt6.pc.in
-@@ -0,0 +1,15 @@
-+prefix=$$INSTALL_PREFIX
-+exec_prefix=${prefix}
-+libdir=$$INSTALL_LIBDIR
-+includedir=${prefix}/include/accounts-qt6
-+servicefilesdir=${prefix}/share/accounts/services
-+servicetypefilesdir=${prefix}/share/accounts/service-types
-+providerfilesdir=${prefix}/share/accounts/providers
-+
-+Name: libaccounts-qt6
-+Description: Accounts Library
-+Version: $$PROJECT_VERSION
-+Libs: -L${libdir} -laccounts-qt6
-+Requires: Qt6Core Qt6Xml
-+Cflags:  -I${includedir}
-+
-diff --git a/tests/tst_libaccounts.pro b/tests/tst_libaccounts.pro
-index a5b91fe..9992c0b 100644
---- a/tests/tst_libaccounts.pro
-+++ b/tests/tst_libaccounts.pro
-@@ -9,7 +9,7 @@ QT = \
-     testlib \
-     xml
- 
--LIBS += -laccounts-qt5
-+LIBS += -laccounts-qt$${QT_MAJOR_VERSION}
- 
- INCLUDEPATH += $${TOP_SRC_DIR}
- QMAKE_LIBDIR += \
--- 
-2.43.0
-
diff --git a/net-libs/libomemo/Manifest b/net-libs/libomemo/Manifest
index 6f7638960583..2bbde898540a 100644
--- a/net-libs/libomemo/Manifest
+++ b/net-libs/libomemo/Manifest
@@ -1,3 +1,3 @@
 DIST libomemo-0.8.1.tar.gz 28648 BLAKE2B b75ad298946dff680705ba0927293ea30cb8bf616a417c6584cef9f84e0894c5581462782a4b1003bf9e530695eea10bba9f37ae94e957a0008a35c862f17f62 SHA512 452c7ff9eb809de37df24bd0857c30c1e1ed1d4638c8338bb101f6d5a31be700f174f4fe65fb8ccd5358a674f8397a0eb54d8e03abfdce57cea60bcd4959f40a
-EBUILD libomemo-0.8.1.ebuild 673 BLAKE2B 3db16d877f9c91ebeb297d4de50fae599e1f07cd8e74ca877efa6656eff27a2b678b95d63c6ea4e247ad1d232b7852aa9ff797a2efc6e7e71aca73beb5d135f1 SHA512 5bc140f0acc38d66024b42ad29ca4dd61eafd3ebff363579968fec4342541b41f57ae5473eddd567538abb52e9e270e3dc8a77b3af14da1b2fed7be0ff7b0766
+EBUILD libomemo-0.8.1-r1.ebuild 675 BLAKE2B 32f08ffedfc117e00e63911ce8787e2b3e15348bc9d849d5ecaef906a3bc0c6cbf960239e9cf5a6ff22822af1da3e83f8cddc2295b061aff7efefbfd01d8165d SHA512 afe04cab4390b8e2be2499f1ddeccffd5352ea5a091ce4a42c42a4d5e67769eaa1872816180960f4cb419de7a4dc8620c711846812cd2426ab3cc8e008675d5d
 MISC metadata.xml 328 BLAKE2B b3ce945e525d09f5758e7f02ec7bd3fab1f2efe88c13978c39a35849878a024e06e6d241246e7f4b366a99e18db043eb3e9384e708549438f08a9f00fd463c93 SHA512 aec0c078f974d9048c6a7eb0d3af2f59bc77a3c1fc5da4b672b849729c11c282ea15e7fb5a3f15a6c84207bdca491cafd4fe4d044d60267b1e85eb3d8da16120
diff --git a/net-libs/libomemo/libomemo-0.8.1.ebuild b/net-libs/libomemo/libomemo-0.8.1-r1.ebuild
index 18729549f129..e53dabe9e607 100644
--- a/net-libs/libomemo/libomemo-0.8.1.ebuild
+++ b/net-libs/libomemo/libomemo-0.8.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ RDEPEND="
 	dev-db/sqlite
 	dev-libs/glib
 	dev-libs/libgcrypt
-	dev-libs/mxml
+	dev-libs/mxml:0
 	"
 DEPEND="
 	${RDEPEND}
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index f501abb68157..3e047e7643dd 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -2,7 +2,6 @@ AUX nodejs-18.16.0-paxmarking.patch 3470 BLAKE2B 4de01a4b3267d24c7c899a9caf8dae3
 AUX nodejs-20.11.0-riscv.patch 7660 BLAKE2B 8af657b4c87f892a7e8ab4e0b0f6c8927841585cf71971cb3a0e9b508c182222ace7178fd76f12000432df8a1b51c1a553616a3797a16b35f9499edce1e84638 SHA512 29b42307e017de0ef54c2e80e5e56d771a04f282ca858bcd3300c68ef4d72bb2fb5f2841a85a9845ee17f1909a33a64c798da9ed624feb34fcb11661dbe9fe69
 AUX nodejs-20.3.0-gcc14.patch 1119 BLAKE2B 6be4d981ce94f618aa4a07766e8fa1c99e3825cee7374cae5c76264c961083604ce408a7847de54ae6c72d36c6b0cbe34921e69a800ebebc5553cdaead2cbaa5 SHA512 8137b7ac6b5920c7f16b6409923092f3eb3c4f81887035e1840ae61deb61090d88d6184c36db4bcf7249fa6d7a21687788616b2aee51cb6bdc08cb78ed656e5d
 AUX nodejs-20.6.0-paxmarking.patch 3143 BLAKE2B 34b93f63481177f1b70d26bdbdb27674533016dd5cefe4161cfa49c3defc6316cbbf22df024d28e9d42687be78fb0a6ce6e95334cad386d6371ff1f7fd9063ee SHA512 6604a1c8041e28bea0ea8c4dd168d44fb4ae7d25b15db4e20c220bcf3697d08de5205dde502dda4d061ace36e3f8f3511f646b00acc0382c2c8dff64cf1bf8b8
-AUX nodejs-20.8.1-gcc14.patch 797 BLAKE2B a9b6bc3eddf5473d5263f4f87e76f43ed236a995b3a9c486871be2bbf9b487973faa8764ec3283af279e23b06619dae9fd7d1284be6724cf7c2015ca111ad49f SHA512 6f1b6219c65c343907d691603ed762986c0302d30c9fb9f285bc03016c0c65885a9a4ffcc253f683fb566b33b3d5160b9400af16852550069fb6d59961688089
 DIST node-v18.17.1.tar.xz 40788836 BLAKE2B 50e0dc0eecd68620ffa7457319e71124bbba302f6acff79286a30cf97442fb09a96cf8781456bafd5c2e497ba88cf392c141f0e221683da421b87f653b1ad7ca SHA512 fd6f586447ecd44ac6738da1cf7d54e74bd33ffd1ee1acc2e0e1bdaf0031bcaef85751d3dd590bb278eb502daf9c77f0763b5a181a30ee4cf537aef254629622
 DIST node-v18.19.0.tar.xz 41248748 BLAKE2B 24f9c99737a6d455ad83a7c55d0c668190570b5947bb3a6b2f321a25ff1e30b2913a4e144821ddf794a975cd9765582426252933235ce033623ccf3ecce816a4 SHA512 db2f1342f028e5cd2ab0a3719b4c822e22439aa097b59df768fb7f6aa581394f81af6f51f7764b99d119ea2c849b55c02897af8caafab7c0f9d0112608a8867f
 DIST node-v18.20.1.tar.xz 40434200 BLAKE2B 560e04d5da8c2f3f4ef82e67b483f2c5d9a59b0646108a1dfc0bd80b410b60b15ee517be7d720834232fc49ed5d94785ebd64282c9abd3c10bdcb883a6960a38 SHA512 08864a164cfde08e369653abd17f6fe549db014697bd36abd07233d5ae746417ef18ea80e3d3f3630503a21110bb5e0ebd0073b4f2885b00c2d46e6f31c386a3
@@ -11,9 +10,9 @@ DIST node-v20.12.1.tar.xz 41743360 BLAKE2B 1e2819724051720321a429bb18967a12608e8
 DIST node-v20.6.1.tar.xz 41791920 BLAKE2B c131aa9dd2a155eb24dda80e4997895aab7d935e46d1f21e9e176aa15021aa68be41f49cc43557f0b2c962baf3b2da4ea0ba044efd5016ea58bf2dc0b76c4edd SHA512 8a6d998ae9b52872ff8cdcd44261f644161f31bcb565329ae05e68945c8da939eabcb76d2e0f628c8eb634de37d7b16334823f64122e4483c390117d8aa511bf
 EBUILD nodejs-18.17.1.ebuild 7482 BLAKE2B 9ac4dc8d50e1f26df146f4159e34a1cc636eef2375daa10919e5ccb5b7c505f285872f8427c51c7640fd049b9f1a5ffe29c68b3bf7b07f6677f68565e7a61164 SHA512 6cef7adedd4a409c322abf44b0e1c0f53ea32ff9f3206b8d71e1626196860744c5fa7a4fca08815ec40af2de891027d7fad591bb2a725556c59c5152fe12313e
 EBUILD nodejs-18.19.0.ebuild 7555 BLAKE2B 5ed5167442f3ba68281f5e2634604f4108bab34931e2967ca37da66dac9917b125f4069bd85ce7426a50d7d6d9ae57f43409c412eeee52890e753d0a44591a70 SHA512 cb2aa8ad51c7fb4d01d747681df3a39435127aa227504c4d6570e9bb1b35438743b87afa3ef96dc0a1d13f06884149fd0ff151f746ebd19bd185764c0007d49a
-EBUILD nodejs-18.20.1.ebuild 7438 BLAKE2B 156d9ca41a4c966d641cd6ba0b4a1d56634dc0a55c1797917a67d078f3c6e9a54eca3a89fb19b36f6200a9a7006628ba76b56ea7df7c499bf570a577c6db458b SHA512 02d95f400c38efdee04993d10be04ec0e3cd88f42f5fbf8852db5591a49fdbf1ae652eb057d17cce86fcc6d4f48142a01c1691e33119f1fdd3263a5ee8bf6af3
+EBUILD nodejs-18.20.1.ebuild 7436 BLAKE2B f10d8d49dbd54c9509aea2053cb7c57c979e98bdf57707f2d4cff23c0eab8f81e04d08c4eef82a84f57c7000334439e65e928c653419da0aabd27f22ea964e65 SHA512 c89a83582483608eb3f6209ad752df96ef9f0734058f43b55e069ff806d2b83d9e8583e9aee46fac0200d7f917efa64526cd27619756c27824bd0b1b90513847
 EBUILD nodejs-20.11.0.ebuild 7545 BLAKE2B c8279df6be74f1d4b57870b2385932ad9a4d738845f84276bb152d8ecfcc96df2a330b645a2ca40c6803ddb97b65512739c4468e17b57956b8695b9c7e6bd9fb SHA512 a680797d1d59eef6ab1a285877bb5e52739ffdc43f5e43f1c78b124343aaf60cb2c5d5ff78f91f50e10db04e068f4e73937947e8f44b7db70f7444a984699b5b
-EBUILD nodejs-20.12.1.ebuild 7604 BLAKE2B 1ae2e6d76c9c9f07671005cfbd902ee4370454711787ef0ee38807c15e773445fd8ff02bb0c63d3638d7fd7fa923da97f5297345fd95aa9e49be66fbb517ab87 SHA512 c58c31fe143f8b82e72539109e58eb95d164f30d882966013100cb032c12d612aabc6eb89ebb9e6bf3d0a647a0cf6a7cd3aad617615e4f11370181dc468bf9ca
+EBUILD nodejs-20.12.1.ebuild 7602 BLAKE2B b55f06868f43de48161629e4c682bbec28f1102c4dc4747254494980778436ce373b487c06e1366054e800e39182932088b075eca4bd4c630d3404f02cbfc92d SHA512 c0c48f4bab877c86ed006f5e298d2a440ef15a98af7d2a363a4e37e65b92caa97cf8cecbe38618e6d811ee4f5f3957df8ef7354bc7deb3576fa6671ce10f097f
 EBUILD nodejs-20.6.1.ebuild 7495 BLAKE2B 83f47c14b57b63d72cd940388adbda2c3c4e70e63b2123d2bc4651585cbe2ed8f07851805a78edaae0bb6959e2bf15eb378f9a95aecdbc4956a3377e07255130 SHA512 6d83a4e45aa952dcae536493fd7f13d4ea2c5f101355f574490a112663437bf6a95152dc6297b1359ba7f3a2a4583ccbcefe29d4abff41cccb9cb3069f07008b
 EBUILD nodejs-99999999.ebuild 7406 BLAKE2B 71b0f9acf3a3cdf3181c7f1dc3ca2a290c5fefce6be6ab017483750a31f7bf3c996984b91f03e1144b2b6bf3cb852529b9f620974ab0484928d6a390890cf2dc SHA512 bc0b7c5171f11b9b2d29915e03614272653baba609d505885e4aaf5d51ed40291e82c5970bb7e914e41604dcb3788ecb85a0d5e8a9770aea73f77136f6915d1e
 MISC metadata.xml 983 BLAKE2B 7e455047a955185d1e53797b2b0592c5242b7eb849617cf39366acbab41e4fd066d36d723dbc32760f591c933f068e643475fc1b58a2873a2f1221e1c5d44b71 SHA512 5e08a76e2704000aa83a2c63f6e821e83c302939c1a729c4ac73774cc85189da4eccc1a19b700babfe87c8f07327865171526550ddf16a4fc25fed834f4bf7a6
diff --git a/net-libs/nodejs/files/nodejs-20.8.1-gcc14.patch b/net-libs/nodejs/files/nodejs-20.8.1-gcc14.patch
deleted file mode 100644
index ee34d4ed2e7f..000000000000
--- a/net-libs/nodejs/files/nodejs-20.8.1-gcc14.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://chromium-review.googlesource.com/c/v8/v8/+/4583222
-
-From 6100b929273cffbd1377e21cce2cd0f83e99e459 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sun, 04 Jun 2023 04:15:16 +0100
-Subject: [PATCH] heap: Add missing <algorithm> include for std::remove
-
-GCC 14 changes some internal includes within libstdc++ so this transient
-include gets lost. Include <algorithm> explicitly for std::remove.
-
-Change-Id: Iab8a2c751a0f9c9dc6a770d6296ad6de724ef3bb
----
-
-diff --git a/src/heap/cppgc/stats-collector.h b/src/heap/cppgc/stats-collector.h
-index 2cf7284..d8414ae 100644
---- a/deps/v8/src/heap/cppgc/stats-collector.h
-+++ b/deps/v8/src/heap/cppgc/stats-collector.h
-@@ -8,6 +8,7 @@
- #include <stddef.h>
- #include <stdint.h>
-
-+#include <algorithm>
- #include <atomic>
- #include <vector>
diff --git a/net-libs/nodejs/nodejs-18.20.1.ebuild b/net-libs/nodejs/nodejs-18.20.1.ebuild
index 00566b9e3f4c..fde604acf123 100644
--- a/net-libs/nodejs/nodejs-18.20.1.ebuild
+++ b/net-libs/nodejs/nodejs-18.20.1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
 	SLOT="0/$(ver_cut 1)"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
 	S="${WORKDIR}/node-v${PV}"
 fi
 
diff --git a/net-libs/nodejs/nodejs-20.12.1.ebuild b/net-libs/nodejs/nodejs-20.12.1.ebuild
index f3934ba03efe..ee96e0b379e1 100644
--- a/net-libs/nodejs/nodejs-20.12.1.ebuild
+++ b/net-libs/nodejs/nodejs-20.12.1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
 	SLOT="0/$(ver_cut 1)"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
 	S="${WORKDIR}/node-v${PV}"
 fi