gentoo auto-resync : 07:03:2024 - 01:06:26

4 files changed, 2 insertions, 159 deletions

diff --git a/kde-apps/kwrite/Manifest b/kde-apps/kwrite/Manifest
index 1a6427713dd0..49bd4df6d686 100644
--- a/kde-apps/kwrite/Manifest
+++ b/kde-apps/kwrite/Manifest
@@ -1,8 +1,5 @@
-AUX kate-23.08.4-no-pch.patch 2142 BLAKE2B 6a9047e1b858a7673ba16ef4bda0553e982c737d1cfd3c14c055772dfda321f943254ba54a83cdad4acc567bd3087097e2e3ce35e11456226c1f34e9762e40a1 SHA512 457bb8bb5c57c3602648ff672344948685ce53c098fe0ceef26a3b3fe819d457065b30668ae87516f8b1505266aaf4ebebcec3783ff1c73aec00bd9b70c4210d
-DIST kate-23.08.4.tar.xz 8043840 BLAKE2B 0aa8f983612b5873489aa23da3024c793d57b7d7c1f5b6fa35a45c34c53584e06490db4ba5bff77a8917476d72e78bb081af42205a51e58329a12790eb96e872 SHA512 99b147940809149c93a9a79bcf5263db650f3afa1fbef5158d20ed88608e3794dc8d1357d7c0119369b690dbfcd63e369a009171c3b4a99559246f876bafe28a
 DIST kate-23.08.5.tar.xz 8043480 BLAKE2B 68b27c125a1e7f144ecc1d7b6d3348337b2f14f7fd61307e4ec64b74bb388378314d6575801bbc22c49bf4470133d8f91dede5f9b384a2f2356ec1e111da01f8 SHA512 d3647d7c6af74fdfdf3bf9eb9da906195215800025b43558bd6c9811bd2f457a52555c84997801e0b0badddcd99b0dd6e384bf9ec82790fb14cb20ff026a5a5b
 DIST kate-24.02.0.tar.xz 8396652 BLAKE2B f6fa99ce30b2e04597161d54f83287e88342e171437b5393153ed4b3be7ca6bf74f636b7910e571b9db416685c8742a46b4ad7f061842acdccfc21ddeb4fc77a SHA512 53344928f204f1900998800c23064ee388f34590698337b56a11bd1fdf194665d959b584a6b603b7c7a523bdf5a98dfaa7651f6d9777e6dd38ed459706b7998d
-EBUILD kwrite-23.08.4.ebuild 1365 BLAKE2B 7e7f19372646252e59943829f26813bdf0954418b59e3d19eeb30122296ea6f65cf97c1ce8375829cfe231af48f53b5b2cd468a5c4151a03da777e6f3a562e1b SHA512 4f2e23c040ce90479d73b082b6fdf920d8119e0cc5d48e1bbbc41cb163f6f212e645e26eff49c43d227f3bbbb05a302b00581ce6604a8427078c3a115bd48bc6
-EBUILD kwrite-23.08.5.ebuild 1312 BLAKE2B 7b568981e17eb10c5841de2ee9417c60dcfd48d9b6d067ac2454a22bcbfc9c27a67c33d99113a0eaa0ec0f8c9c3ced8c39aa45fc87f57dc0ffbe26fa8f4b54a1 SHA512 3f2ee6c49a75d88772d99c5db72fbaf4e4bd2a3ce95442260bde417d90cc31ea4043f3f8a56e47ac816fd1386ec62f8c7262327605de8cc6890f77d1e591cb3f
+EBUILD kwrite-23.08.5.ebuild 1311 BLAKE2B 26c88686e736e2c5caf794e606c7ced682fc1b862821fe964ba6686ecf1724f4554b9d592cf3cd93b57063360c70d52c1be83ed8efd4da9b9f261983972d5aab SHA512 c87f96113a8b7f4879bff2cbfced779b1e2269430bbde9f579b83e8c95e30f95d352aa24006849fc12afe53f60a04b6b35faefae046ccf6f80a4b55ed168f851
 EBUILD kwrite-24.02.0.ebuild 1259 BLAKE2B 6aeb619954c72281eddfbb403bb7b1e371206c8db928886dd8993d349b8815e3775efe0fb0d71a7f56279b77116157a52e7e83f466bdf96b7f85729d972b1297 SHA512 de055f4864390a5f1b0db3e91b02be0b613cb8a1a19650f2d690caead717f592f8c1202f872b944e2c4a18a5b9a3ef1fe27b59b424d8c883fa350e574b3e3898
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kwrite/files/kate-23.08.4-no-pch.patch b/kde-apps/kwrite/files/kate-23.08.4-no-pch.patch
deleted file mode 100644
index 7a9591c06c5b..000000000000
--- a/kde-apps/kwrite/files/kate-23.08.4-no-pch.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-https://bugs.gentoo.org/921720
-https://invent.kde.org/utilities/kate/-/issues/116
-https://invent.kde.org/utilities/kate/-/merge_requests/1387
-https://invent.kde.org/utilities/kate/-/merge_requests/1388
-
-From 83fcf7b4e7cc7bc54828192e9b89cfb286d864fd Mon Sep 17 00:00:00 2001
-From: Aleix Pol <aleixpol@kde.org>
-Date: Tue, 19 Sep 2023 16:34:49 +0200
-Subject: [PATCH] Fix build
-
-Ever since I last updated, I've started to get errors about includes
-missing, so I've added them.
-
-(cherry picked from commit 73d090f7f7cb7cc013f31c7b572ca78a7fbeb5b8)
---- a/addons/git-blame/kategitblameplugin.h
-+++ b/addons/git-blame/kategitblameplugin.h
-@@ -20,6 +20,7 @@
- #include <QLocale>
- #include <QPointer>
- #include <QTimer>
-+#include <QUrl>
- #include <QVariant>
- #include <QVector>
- 
---- a/addons/project/git/gitstatus.h
-+++ b/addons/project/git/gitstatus.h
-@@ -5,6 +5,7 @@
- */
- #pragma once
- 
-+#include <QSet>
- #include <QString>
- #include <QVector>
- 
---- a/apps/lib/ktexteditor_utils.h
-+++ b/apps/lib/ktexteditor_utils.h
-@@ -7,6 +7,8 @@
- #include "kateprivate_export.h"
- 
- #include <QString>
-+#include <QUrl>
-+#include <QWidgetList>
- 
- QT_BEGIN_NAMESPACE
- class QScrollBar;
--- 
-GitLab
-
-From bd8403ba1771d92586518868d0bfd42087b0db4d Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Fri, 12 Jan 2024 16:53:56 +0000
-Subject: [PATCH] Add further missing includes
-
-Bug: https://bugs.gentoo.org/921935
-Bug: https://invent.kde.org/utilities/kate/-/issues/116
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/addons/project/gitstatusmodel.h
-+++ b/addons/project/gitstatusmodel.h
-@@ -5,6 +5,7 @@
- */
- #pragma once
- 
-+#include <QSet>
- #include <QAbstractItemModel>
- 
- #include "git/gitstatus.h"
---- a/addons/project/kateproject.h
-+++ b/addons/project/kateproject.h
-@@ -7,6 +7,8 @@
- 
- #pragma once
- 
-+#include <QtGlobal>
-+
- #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
- #include <KTextEditor/ModificationInterface>
- #endif
---- a/addons/project/kateprojectitem.h
-+++ b/addons/project/kateprojectitem.h
-@@ -7,6 +7,8 @@
- 
- #pragma once
- 
-+#include <QtGlobal>
-+
- #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
- #include <KTextEditor/Document>
- #else
--- 
-GitLab
diff --git a/kde-apps/kwrite/kwrite-23.08.4.ebuild b/kde-apps/kwrite/kwrite-23.08.4.ebuild
deleted file mode 100644
index 293ee80d2170..000000000000
--- a/kde-apps/kwrite/kwrite-23.08.4.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_NAME="kate"
-ECM_HANDBOOK="optional"
-KFMIN=5.106.0
-QTMIN=5.15.9
-inherit ecm flag-o-matic gear.kde.org
-
-DESCRIPTION="Simple text editor based on KDE Frameworks"
-HOMEPAGE="https://apps.kde.org/kwrite/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	~kde-apps/kate-lib-${PV}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	virtual/libintl
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/kate-23.08.4-no-pch.patch
-)
-
-src_prepare() {
-	ecm_src_prepare
-
-	# these tests are run in kde-apps/kate-lib
-	cmake_run_in apps/lib cmake_comment_add_subdirectory autotests
-
-	# delete colliding kate translations
-	find po -type f -name "*po" -and -not -name "kwrite*" -delete || die
-	rm -rf po/*/docs/kate* || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_addons=FALSE
-		-DBUILD_kate=FALSE
-	)
-	use handbook && mycmakeargs+=( -DBUILD_katepart=FALSE )
-
-	# provided by kde-apps/kate-lib
-	append-libs -lkateprivate
-
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-
-	# provided by kde-apps/kate-lib
-	rm -v "${ED}"/usr/$(get_libdir)/libkateprivate.so.* || die
-}
diff --git a/kde-apps/kwrite/kwrite-23.08.5.ebuild b/kde-apps/kwrite/kwrite-23.08.5.ebuild
index 20cf9bfb9a93..3b86e6b4e7ad 100644
--- a/kde-apps/kwrite/kwrite-23.08.5.ebuild
+++ b/kde-apps/kwrite/kwrite-23.08.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kwrite/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86"
 IUSE=""
 
 RDEPEND="