gentoo auto-resync : 11:08:2024 - 11:06:01

6 files changed, 89 insertions, 3 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 5c0f8d205851..89fb4135cbdc 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index c9bd344a99fa..33ddcd4638be 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -23,7 +23,7 @@ EBUILD emacs-28.2-r12.ebuild 17669 BLAKE2B 48a6250876577f34dcaee56fc5466aa003922
 EBUILD emacs-28.2-r13.ebuild 17674 BLAKE2B e22990bcbbd7b7e6fdde76c0ce8d7e304c2a8db47ef683ab34b273a61d976f460dac857f18c105712a2359e94fcccf6de3576de5fbfaa79b51f29cbd6cebd81b SHA512 693a075a986568a68faf3212c3a081461653faad246cd771f60a5151c6be61d82ecf3209338602525d16a138a84bebf3d10ce97ebfbfffb38bb4c34b8fddf83d
 EBUILD emacs-29.3-r2.ebuild 20499 BLAKE2B 519b8f3e80403f98e2d633ecc00ed876328bfa8544d1b13da0b456d2a1928c4b8d7aca315d18daa9c86d4e98ff9d411a9a77bd30bcb69c27cfb0fb7007fe558f SHA512 7e467e8d4e3256e5e47ad630583d815e78f0ba927ec0396cd5f2aa58219bc8443a81cb2f7e625054f0ec7b84077d0222111e8ad1b88be12618d7c7a8a8cbab36
 EBUILD emacs-29.3-r3.ebuild 20504 BLAKE2B d3639fa8673a73ae89ca07db3fd21cfccc99a95209b960e675ec557e7271a1014ef2e76810e2820a64489757d149fa717150579efac44f8df2ff2e84f9c29449 SHA512 eda6127b6a1a9fc0f97f3e31ac86a083a4432627ebf13b957cea8cc509f69b3e13a4f631fa5d26c5bb2e180db2903fe79f4f917b215c60f2621a56d26fe67789
-EBUILD emacs-29.4.ebuild 20504 BLAKE2B 4d911d15a601abf27d715e5fe28da20b865b26cbb568f3d85929c887cfa7ebdaf64521b6923e028b409b2d99ef760c9987dfd4f811fc08571e06d15c392163c1 SHA512 315657cb95a25236ed8e79caab5bb57cbdd55cfffb5a8a592ec90d1abd6597d92c8c7ff4e5ad7405eeac59ab81dd3c1cd1e9a897563c26c444fb30f758b83b52
+EBUILD emacs-29.4.ebuild 20503 BLAKE2B 0fd782ecfc0ebfc567c85b61de2d497565a8a55012b8f701d1a755bf197c9ffb11df1a9612d0dd3698767d1bf5e1df8588647a972ca4d064c0b326f18645761d SHA512 5784b82caf4af3da063bb59db50b06bb61c68c9d17cb97ef72f669cd424dbb4b019979a558f64eab3b38cd13e3a58d43e39ddd36455a77307beef5362b32c1c7
 EBUILD emacs-30.0.9999-r1.ebuild 20098 BLAKE2B db4eb644a65425ae4a294b22add23014f7d094b7df83788116f248cf083f68b5a03c3b8c630c597e48043e33219f77c15c1e9563a6ee39567fbc85098211f2f6 SHA512 b32bb9841c99dc24cb60b7658eb4e094a08b4ec59fba4f8744f6058628678807c6a480cfd9fe6377e5e421ad065c31713888f9e9caf5752b9bace632df453a63
 EBUILD emacs-31.0.9999.ebuild 20096 BLAKE2B ca5045e7ccca98917d8f264dfe960c18ef6f13417379c60498961220662f0b7e46eb8d09cac92d4f9b46e43b0cd89b4af735ddd76b0e0bac16a1557f97500f79 SHA512 4e2f1379919b2ba36020e1672c1f324966e658711c6dcc58b593b2ac6e8d1c739ee78f414ba4b80ef77aa717f9e80a69c12f35ade2c99fa082bdd8ffca893dff
 MISC metadata.xml 3265 BLAKE2B e4f61b7e8859672fe9798ebaae20d8fb490d4677db7be8a856f313f4dfd5f02b38623250ddc45cdab1f0d0b64b941b4874b95252c796e893d5a28e5a318277bc SHA512 4b79a448076ddee7de95dc2f1a999fb86295d04a20d016a9bb2fe8a038ee5424517ca8f1991a884a08ca52847191c83becb06fb7cb8d4bb2a609cf4b2e25d020
diff --git a/app-editors/emacs/emacs-29.4.ebuild b/app-editors/emacs/emacs-29.4.ebuild
index 7ae74f7054e1..b76b407e0fbb 100644
--- a/app-editors/emacs/emacs-29.4.ebuild
+++ b/app-editors/emacs/emacs-29.4.ebuild
@@ -36,7 +36,7 @@ else
 	PATCHES=("${WORKDIR}/patch")
 	SLOT="${PV%%.*}"
 	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
diff --git a/app-editors/ghostwriter/Manifest b/app-editors/ghostwriter/Manifest
index f8ad4090874c..7785814d0cb6 100644
--- a/app-editors/ghostwriter/Manifest
+++ b/app-editors/ghostwriter/Manifest
@@ -1,5 +1,6 @@
+AUX ghostwriter-24.05.2-bogusdep.patch 2424 BLAKE2B 3eab745fa57599a15cabd044aade883b017099ff748d20f64fb56385715b018fe68ce8459c59a61a8b41beba7bb13cb9fcc891fa126f3382fc6a729c5993994e SHA512 9a22fdb40742fb8500e2522bb5b1d3af9c3bdeab9f68e05a29ab3c3505044d5f7247101d7352eba5a6668b8a432f5fec3c3a1dc0040b9c190528679faa636b46
 DIST ghostwriter-24.02.2.tar.xz 3629096 BLAKE2B f167301849348ee59d45fea07286d3e0c1cacd4eeb84769d4bb6182fc508aaa0f8b749f2553054a6054ffc48706ec53f05ec164b1a913b0f926395134e72ac7a SHA512 ebe605f82710ced4fecf4effd5c257e5d6bc274bbbc6cb36138423ef05b14504dd5d39d698eb23640838df53bc55f9ba3523280731482b1eb1b1ad6d46178381
 DIST ghostwriter-24.05.2.tar.xz 3634856 BLAKE2B 3a57c5487c09fc4e425f39826eeef343e71c2e064518c4c5ea71526aa30ad753a87a744c7c55aff109e03a8df86a1c941bd3877c1655ad1047382656e17effeb SHA512 0769bf857c7ab8a67eedaf48029ee0586e8d4394fc77c7bfe21a4d39b58579938371178bbe32c743e0b38305ca1602d824ce5cda18b5be49a28c258f52f10ce3
 EBUILD ghostwriter-24.02.2.ebuild 918 BLAKE2B d4ab59bb3cee9f10d35a06270352bb9784a587ab2611f817800eb9e2bb2c804a37be328ab89a12df42670b06ac56a54c1a1f92b9e71a4eab0d808f9dfa8b7526 SHA512 69dbc038aa2a29608f8098f68947c9144c70d386e1c0d4865d83e8e7186149e2b4dd063d5f02a9f3da8bb1326b72b65e0741677121f035bb8162695499c44ec3
-EBUILD ghostwriter-24.05.2.ebuild 894 BLAKE2B b39fe5ae03a5dd283b2bdf045939e96b3d1c9b32a9bac7fcc2dffd54127aa56d6edc38ab310e0bce02a850f903aab52b89cea4f6df213ea4b7cd1aa18aae12f5 SHA512 39f14c459783889be66f829411a7c914540962d59e14609daadb0c92aabd701d41740d0b2f7bf9b5dd708200a586f416e77990d49b1c5090ff671835c9ba5c11
+EBUILD ghostwriter-24.05.2.ebuild 976 BLAKE2B c6abf0584605b81ce3c1a40255a29f472a529c7afdc3a810092b91cd7ec42d72dcbc138d47a45a4118aa87427c196a93f8ca5a0436931be4d2d1de0e5cb35c44 SHA512 24457d15f74041f18b4842c8dca79e0148b1c3164a8fb9b04dcc0434363fbbb5976e3286346cfb51ae14d9a5e012e6e5fa3f10cc6335ccac81c913a7ffc931f9
 MISC metadata.xml 380 BLAKE2B 8c20dfd3208e20d12c1c1fc2f6b75ac80c88175865f269859f5fd903dacec1371af3b6e77ebb905271ad58dc4a266dd7679ded9117c02767676bb7644e3ce060 SHA512 4af810107c31548de0663061ef865b124a7a0828e7955ee31bbb71c1e0cabf0420d494dca2e7c7ee2dd4adbb87c203a62b57e843757a3534ac6f97fb2a4b3d65
diff --git a/app-editors/ghostwriter/files/ghostwriter-24.05.2-bogusdep.patch b/app-editors/ghostwriter/files/ghostwriter-24.05.2-bogusdep.patch
new file mode 100644
index 000000000000..00bda3a8b701
--- /dev/null
+++ b/app-editors/ghostwriter/files/ghostwriter-24.05.2-bogusdep.patch
@@ -0,0 +1,83 @@
+From 37381a0a793873b1a9b77f2ddc550f791531e4e9 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 10 Aug 2024 12:41:33 +0200
+Subject: [PATCH] Drop unused qt5compat dependency
+
+(cherry picked from commit 72850a2dcc220be175ecb581fc9d44b781bb4d9a)
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ src/CMakeLists.txt                   | 10 ----------
+ src/editor/markdownhighlighter.cpp   |  1 -
+ src/markdown/memoryarena.cpp         |  2 --
+ src/spelling/spellcheckdecorator.cpp |  1 -
+ 4 files changed, 14 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 33ce58f..da55382 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -90,10 +90,6 @@ find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED COMPONENTS
+     WebEngineWidgets
+ )
+ 
+-if (QT_MAJOR_VERSION STREQUAL "6")
+-    find_package(Qt6 REQUIRED COMPONENTS Core5Compat)
+-endif()
+-
+ find_package(
+     KF${KF_MAJOR_VERSION} ${KF_MIN_VERSION}
+     REQUIRED
+@@ -135,12 +131,6 @@ target_link_libraries(ghostwriter PRIVATE
+     ${CMARK_LIBS}
+ )
+ 
+-if (QT_MAJOR_VERSION STREQUAL "6")
+-    target_link_libraries(ghostwriter PRIVATE
+-        Qt::Core5Compat
+-    )
+-endif()
+-
+ set_target_properties(ghostwriter PROPERTIES
+     WIN32_EXECUTABLE ON
+     MACOSX_BUNDLE ON
+diff --git a/src/editor/markdownhighlighter.cpp b/src/editor/markdownhighlighter.cpp
+index b463d29..12fae09 100644
+--- a/src/editor/markdownhighlighter.cpp
++++ b/src/editor/markdownhighlighter.cpp
+@@ -13,7 +13,6 @@
+ #include <QRegularExpression>
+ #include <QStaticText>
+ #include <QString>
+-#include <QStringRef>
+ #include <QSyntaxHighlighter>
+ #include <QTextCharFormat>
+ #include <QTextDocument>
+diff --git a/src/markdown/memoryarena.cpp b/src/markdown/memoryarena.cpp
+index 8e1db78..72b09c1 100644
+--- a/src/markdown/memoryarena.cpp
++++ b/src/markdown/memoryarena.cpp
+@@ -7,8 +7,6 @@
+ #ifndef MEMORY_ARENA_CPP
+ #define MEMORY_ARENA_CPP
+ 
+-#include <QLinkedListIterator>
+-
+ #include "memoryarena.h"
+ 
+ namespace ghostwriter
+diff --git a/src/spelling/spellcheckdecorator.cpp b/src/spelling/spellcheckdecorator.cpp
+index efdb688..14792d7 100644
+--- a/src/spelling/spellcheckdecorator.cpp
++++ b/src/spelling/spellcheckdecorator.cpp
+@@ -11,7 +11,6 @@
+ #include <QList>
+ #include <QMenu>
+ #include <QStringList>
+-#include <QStringRef>
+ #include <QTextBlock>
+ #include <QTextBoundaryFinder> 
+ #include <QTextCharFormat>
+-- 
+2.45.2
+
diff --git a/app-editors/ghostwriter/ghostwriter-24.05.2.ebuild b/app-editors/ghostwriter/ghostwriter-24.05.2.ebuild
index fa7b4c9c4634..d19e37530fd0 100644
--- a/app-editors/ghostwriter/ghostwriter-24.05.2.ebuild
+++ b/app-editors/ghostwriter/ghostwriter-24.05.2.ebuild
@@ -38,3 +38,5 @@ BDEPEND="
 "
 
 DOCS=( CHANGELOG.md README.md )
+
+PATCHES=( "${FILESDIR}/${P}-bogusdep.patch" ) # in 24.08, bugs 936578 and 937708