gentoo auto-resync : 15:03:2024 - 18:47:52

4 files changed, 80 insertions, 1 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 9781c59c5d73..38467b67f05f 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/kile/Manifest b/app-editors/kile/Manifest
index 1af5620574e5..00a16162cebc 100644
--- a/app-editors/kile/Manifest
+++ b/app-editors/kile/Manifest
@@ -1,4 +1,5 @@
 AUX kile-2.9.93_p20221123-cmake.patch 747 BLAKE2B 51be48cd5f78a9385daa2ddd50a7f1b2e6c6ebd42e11d355e9b0e874260c41b00762e62aa50fca5290c48a5ee97f2a4e59b598ef8669964c92b522ecca380219 SHA512 a496ace8de21c4fc208a243ededf61f6931096dba58320f6b3cd60def52b929e57d53b5aee1781951420bbb5e097059b6bb7413e11f151f04aa9f909cb2e7bf4
+AUX kile-2.9.93_p20221123-okularpart.patch 1975 BLAKE2B fe97bf884139ac0446251dbde36de4c57692cec22ff1c2e3db8adc0527fed5f5dad661a8444076b9f29b21877c83bba08fa03fdd7bb19bfc016c931e7e66c6fc SHA512 5514af938dbaace32fe314dd14a1f725082dce549e2417087a9f8e83309236733d8f828231dac3b7dc91e540ee9eb3676710ce3ba121418a7476ee1b43a2cfcd
 DIST kile-2.9.93_p20221123-1ca67389.tar.gz 9507069 BLAKE2B 61770aeafe6604b8a45ae9e49fc79a375815fce5e11a189aef962172f60d0182984f6908a626cb95b493f1fe894958ec0816420096a12efbd03233114e0a5dcc SHA512 ed16cfb7cee3d08ad21fabecd5536981c68431261c02f66cc979f5f01229fa33c192c33f5d1ef78d61c37e643ab313eb432fd580aea61f5a918d3de76d2dcadc
-EBUILD kile-2.9.93_p20221123-r1.ebuild 1639 BLAKE2B 638ed3d86d379389c4b3066802e24546e69bdd2ec13afc694571766b21e8aa37b2bd5866dfd160eac8c3d28f54d3536f91f2db28a3b36d637f082745d1f89d7e SHA512 08738f4c554b936c9462b475548ed173d6e975369f54ca4c73dd4ad82309b22efb404304eb9d64a378ff95b5a6c03db867a1909bbb023c59626a53fd200ebd6f
+EBUILD kile-2.9.93_p20221123-r1.ebuild 1772 BLAKE2B 8519ba58dc5082515c4bb8e934e9f7ea64bdf918c16fc4e513e71e802890abf9316c909b13dc6d1ea108742240de1d8b9932931ae9d15d2507cea91e97e12c9c SHA512 faebd0de543f88d7f64cbda4d17a62f4458934fa1405716e12403863b67889761bf5d220b61dc95ee4a7b0759e2a0f0b0385316e0ecdec44ccd72158bb0fa8d0
 MISC metadata.xml 532 BLAKE2B 5d7e0d1e146f7815818d50b603fab35f5a675c61f6843f6331ce3aaae00d0e88edde34054ade0ecdaa8affd75c1145f0c59e209b949d6add3cc373c72f85282a SHA512 00e3807ff59a3333cad3cdaefe8c9504ca4a09d7065c81f9e08e685edc27395e5c06e6620ec447cbe5d1a7b71dae7bbb25b6ec2dd5c33fc48d0627e3423f4c7f
diff --git a/app-editors/kile/files/kile-2.9.93_p20221123-okularpart.patch b/app-editors/kile/files/kile-2.9.93_p20221123-okularpart.patch
new file mode 100644
index 000000000000..7a66dfcc4f80
--- /dev/null
+++ b/app-editors/kile/files/kile-2.9.93_p20221123-okularpart.patch
@@ -0,0 +1,70 @@
+From 6cf4549217e95659c8dfd14f9166fb8b80bad333 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Fri, 15 Mar 2024 12:45:51 +0100
+Subject: [PATCH] Switch okular headers to okular5
+
+Otherwise it will be using okular6's.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ src/configtester.cpp    | 2 +-
+ src/kileviewmanager.cpp | 2 +-
+ src/kileviewmanager.h   | 2 +-
+ src/livepreview.cpp     | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/configtester.cpp b/src/configtester.cpp
+index 35ce3e71..cd7ed588 100644
+--- a/src/configtester.cpp
++++ b/src/configtester.cpp
+@@ -14,7 +14,7 @@
+ 
+ #include "configtester.h"
+ 
+-#include <okular/interfaces/viewerinterface.h>
++#include <okular5/interfaces/viewerinterface.h>
+ 
+ #include <QTimer>
+ 
+diff --git a/src/kileviewmanager.cpp b/src/kileviewmanager.cpp
+index 34f84397..f5ac0cdc 100644
+--- a/src/kileviewmanager.cpp
++++ b/src/kileviewmanager.cpp
+@@ -15,7 +15,7 @@
+ #include "kileviewmanager.h"
+ #include <config.h>
+ 
+-#include <okular/interfaces/viewerinterface.h>
++#include <okular5/interfaces/viewerinterface.h>
+ 
+ #include <KAcceleratorManager>
+ #include <KActionCollection>
+diff --git a/src/kileviewmanager.h b/src/kileviewmanager.h
+index 42367291..e0b3ca09 100644
+--- a/src/kileviewmanager.h
++++ b/src/kileviewmanager.h
+@@ -15,7 +15,7 @@
+ #ifndef KILEVIEWKILEVIEWMANAGER_H
+ #define KILEVIEWKILEVIEWMANAGER_H
+ 
+-#include <okular/interfaces/viewerinterface.h>
++#include <okular5/interfaces/viewerinterface.h>
+ 
+ #include <KTextEditor/Cursor>
+ #include <KTextEditor/ModificationInterface>
+diff --git a/src/livepreview.cpp b/src/livepreview.cpp
+index dbd7ff13..fcfa2a6d 100644
+--- a/src/livepreview.cpp
++++ b/src/livepreview.cpp
+@@ -40,7 +40,7 @@
+ #include <KParts/MainWindow>
+ #include <KXMLGUIFactory>
+ 
+-#include <okular/interfaces/viewerinterface.h>
++#include <okular5/interfaces/viewerinterface.h>
+ 
+ #include "errorhandler.h"
+ #include "kiledebug.h"
+-- 
+2.44.0
+
diff --git a/app-editors/kile/kile-2.9.93_p20221123-r1.ebuild b/app-editors/kile/kile-2.9.93_p20221123-r1.ebuild
index 4da14337a591..3c11cf77aae7 100644
--- a/app-editors/kile/kile-2.9.93_p20221123-r1.ebuild
+++ b/app-editors/kile/kile-2.9.93_p20221123-r1.ebuild
@@ -63,6 +63,14 @@ DOCS=( kile-remote-control.txt )
 
 PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
 
+src_prepare() {
+	if has_version "media-gfx/okularpart:5"; then
+		eapply "${FILESDIR}/${P}-okularpart.patch"
+	fi
+
+	ecm_src_prepare
+}
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package pdf Poppler)