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

6 files changed, 84 insertions, 39 deletions

diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 32af5e7d5cf6..1f5e33ae4086 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index c27dd9adc542..ea4198d57a40 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -1,6 +1,7 @@
 AUX calligra-3.2.1-clang-16-configure.patch 642 BLAKE2B b22130de9e56abbac5a7a146ac3296293f1f612846e61fb19b9a1df626ecfe9ee350291cf2e35b4441335297adeb0257c3b93cccac1019a504fd63e94de265a2 SHA512 65053589a8ef5c269fb96b6493141c448189dc45e3f765955731f9cd64be85d86303c949ca494afca1b303952728a2ca6a4d8cffb798c766037cd4e514697c4f
+AUX calligra-3.2.1-okularpart.patch 2641 BLAKE2B 50018ab2b855dc88226b2a23b2eeac858882cbfeb9feca0d50202d951e23c315c4d4a2e225efc697584655dfb6421aeda4c7c48b3c279d7a4b60986acf2e8bdf SHA512 5c7de9bb020d750cb1565c49b9aabf41b622563823a7d3b3c923d00de495fc19357bd53d3a6fb87baf16c3a7cc41a05ccaab2cc6e425e53940aa5f2617dfc0f4
 AUX calligra-3.2.1-use-cmake-FindGSL-module.patch 975 BLAKE2B 8d9750be1f74d0ad099a9d2f258eb8b1fb73f3a891b7cf2e2822c9f50126aa0aaf21188845b95e37c1fdfa00efb33ec49a8b3b824b148d9df29f1e30e299cebd SHA512 e346c71767a07686d18f64849822f54efd5f70f72e871d8537e46b22a646c2d225800632d01b6cde6afa86bae57b1e329991a1d906648c9328f58f4e3ec3c7ea
 DIST calligra-3.2.1-patchset-1.tar.xz 11924 BLAKE2B 5a71a7960a6d2a4d5e55129f4812fb13a2fb56613283d4582266e1836f107b711be43cb158e29c440fbda6992c03a3f4907f0600d21522fd9ab07c66354234a9 SHA512 26ec818f2415c43b116b716557710361621e1e4446087fe123e29107f82400ec82f19ab3a76dde9b749ed4b9f15da9c05c3fa6137fc814241c48ffc12f5628fc
 DIST calligra-3.2.1.tar.xz 55207684 BLAKE2B 332629f18adbee649e8d25a1eedf4ee48af7d8cbb79382c70678bacfa89d9a10797eb0ff42cb5aad51ef2c28aa7071e687bd34053cadcc40ac1936bb9a40dc20 SHA512 e53a939aa1b277c2291cfd626868c77085fc9cc7774df160b5b1afceb33314b4381fa8ffe03636cbde6e35cc2abd170a51e7f9c1a99191339313b9c9c3b1526f
-EBUILD calligra-3.2.1-r9.ebuild 5990 BLAKE2B 7dd5864184a3246c72da06b964358846700f31bf42f7c3abedaf5976ba53e0859a2de906c639dfe6d3af88e31671b8e29f950e0c686423d18fa135ab15bc90ca SHA512 3b8792f4c1ab4e71ac4c2ea49e177a292928bb57ab95a54fecce3a96c7a6ad7c0b375c6b6140b75ef4b2cf8e81a9a29731ebe93a26772cb73058fe198c3df9f9
+EBUILD calligra-3.2.1-r9.ebuild 6087 BLAKE2B d8347ce9db6d6e105946476f8b7e05430ca19e33932481d5cbaf9e28e84256dabec52d388347880d9b76699b42cb64237fda17bc5962893823ede7565ce83f32 SHA512 8e7bfc3b2958357df3d69f4b98dd082d2f808d570c745e711011c9986901c17eebfd8ebc93a33702a0fe8b92124c400866874fa70e801aad2de1c94be4fddca0
 MISC metadata.xml 1279 BLAKE2B a815b1fb41dea6bd2da248722708606b3bb56b4e3df2036e141f0f53bc432a3a40f26cc0edff1425965f72f3b9d4cd8bf3397b538598d248145fd195481a282b SHA512 b59cd1b0469cdc8aa4354bb918152fe66535ca1ed9c3b83178b1753f04128f8ce5fc64a0daab36b8b1aa92568ef5ae9d298539b40a82fa8a974536a55150f5e8
diff --git a/app-office/calligra/calligra-3.2.1-r9.ebuild b/app-office/calligra/calligra-3.2.1-r9.ebuild
index fb8f5a53b31b..32314e5d0f86 100644
--- a/app-office/calligra/calligra-3.2.1-r9.ebuild
+++ b/app-office/calligra/calligra-3.2.1-r9.ebuild
@@ -142,6 +142,10 @@ pkg_setup() {
 }
 
 src_prepare() {
+	if has_version "media-gfx/okularpart:5"; then
+		eapply "${FILESDIR}/${P}-okularpart.patch"
+	fi
+
 	ecm_src_prepare
 
 	# Unconditionally disable deprecated deps (required by QtQuick1)
diff --git a/app-office/calligra/files/calligra-3.2.1-okularpart.patch b/app-office/calligra/files/calligra-3.2.1-okularpart.patch
new file mode 100644
index 000000000000..75a3b0d05416
--- /dev/null
+++ b/app-office/calligra/files/calligra-3.2.1-okularpart.patch
@@ -0,0 +1,78 @@
+From e3b1fe06a2593edcaf33f106b2f77679cd1ea9c8 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Fri, 15 Mar 2024 12:39:45 +0100
+Subject: [PATCH] Switch okular headers to okular5
+
+Otherwise it will be using okular6's.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ extras/okularodpgenerator/OkularOdpGenerator.cpp | 2 +-
+ extras/okularodpgenerator/OkularOdpGenerator.h   | 6 +++---
+ extras/okularodtgenerator/OkularOdtGenerator.cpp | 2 +-
+ extras/okularodtgenerator/OkularOdtGenerator.h   | 6 +++---
+ 4 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/extras/okularodpgenerator/OkularOdpGenerator.cpp b/extras/okularodpgenerator/OkularOdpGenerator.cpp
+index 823d039b3b0..a4614f38f6b 100644
+--- a/extras/okularodpgenerator/OkularOdpGenerator.cpp
++++ b/extras/okularodpgenerator/OkularOdpGenerator.cpp
+@@ -33,7 +33,7 @@
+ #include <KoDocumentInfo.h>
+ #include <KoGlobal.h>
+ 
+-#include <okular/core/page.h>
++#include <okular5/core/page.h>
+ 
+ #include <KLocalizedString>
+ 
+diff --git a/extras/okularodpgenerator/OkularOdpGenerator.h b/extras/okularodpgenerator/OkularOdpGenerator.h
+index 9107c52c52b..5564ec7f881 100644
+--- a/extras/okularodpgenerator/OkularOdpGenerator.h
++++ b/extras/okularodpgenerator/OkularOdpGenerator.h
+@@ -22,9 +22,9 @@
+ 
+ #include "kookulargenerator_odp_export.h"
+ 
+-#include <okular/core/generator.h>
+-#include <okular/core/document.h>
+-#include <okular/core/version.h>
++#include <okular5/core/generator.h>
++#include <okular5/core/document.h>
++#include <okular5/core/version.h>
+ 
+ class KoPADocument;
+ 
+diff --git a/extras/okularodtgenerator/OkularOdtGenerator.cpp b/extras/okularodtgenerator/OkularOdtGenerator.cpp
+index 9ba114d6080..bccfb11a068 100644
+--- a/extras/okularodtgenerator/OkularOdtGenerator.cpp
++++ b/extras/okularodtgenerator/OkularOdtGenerator.cpp
+@@ -41,7 +41,7 @@
+ #include <KoTextLayoutRootArea.h>
+ #include <KoCharAreaInfo.h>
+ 
+-#include <okular/core/page.h>
++#include <okular5/core/page.h>
+ 
+ 
+ OkularOdtGenerator::OkularOdtGenerator( QObject *parent, const QVariantList &args )
+diff --git a/extras/okularodtgenerator/OkularOdtGenerator.h b/extras/okularodtgenerator/OkularOdtGenerator.h
+index d3e9692b385..994a81aae2c 100644
+--- a/extras/okularodtgenerator/OkularOdtGenerator.h
++++ b/extras/okularodtgenerator/OkularOdtGenerator.h
+@@ -22,9 +22,9 @@
+ 
+ #include "kookulargenerator_odt_export.h"
+ 
+-#include <okular/core/generator.h>
+-#include <okular/core/document.h>
+-#include <okular/core/version.h>
++#include <okular5/core/generator.h>
++#include <okular5/core/document.h>
++#include <okular5/core/version.h>
+ 
+ class KWDocument;
+ 
+-- 
+2.44.0
+
diff --git a/app-office/homebank/Manifest b/app-office/homebank/Manifest
index b61201d495fe..fe94eee58b3c 100644
--- a/app-office/homebank/Manifest
+++ b/app-office/homebank/Manifest
@@ -1,5 +1,3 @@
-DIST homebank-5.7.3.tar.gz 3663021 BLAKE2B c290e8fb7776975b0cdb63fdba5f1272d36b62e295723d4b129ed39933fb5fd7987de08536abb5ac2ab3ce3f70e66be3a8d159bc0258834fe3be79ad0ba41788 SHA512 516809ae95873f70d44995093ebe981e70cf2111490db19dbac1d4f4df95fec9bd21c56eea3d91bf4c81e58de4277da035297e9eb6a0d1fd4450dbff764c0ba1
 DIST homebank-5.7.4.tar.gz 3670067 BLAKE2B 3be94dc9e1ec11fc67fb7dab1655c9e2ab8529887cba200331e938b02a97abf810d94823443de0f5faf1b6beda85f9208e26909a876c3828ae2a1aab38890db0 SHA512 d65127b49a7566f5ad88feb8c614883c43e322ea50d915e49691b169771fac222573da4988ab1c54d9f39b9dfdf2d724cba07269e093c67a04900828d0b87093
-EBUILD homebank-5.7.3.ebuild 772 BLAKE2B c5cac19df34bd611deb359a3ee865c5863afaaa687ebaea9af448561790fe41de63cab5ae19dafbf5d1e9cb1dcdaf24a087be02c5de35a52559e28451d2b5dd0 SHA512 b812100091bf56fdc06d8108a2db553e371822294fd99fc977df36c78f5c96727ffc63aa4a5be4c7bb267f3eb409e08c6a25726521751ef663f4f387bff6b00f
 EBUILD homebank-5.7.4.ebuild 814 BLAKE2B 0f131af50cca25e3dbd57482e534511e9e6c1b2943700479ce9593f95422d4555196a11301a4238fe12b9f4fb69d7a43ec4d197ccb9969963a7c2e4110b6fe00 SHA512 401467a50015625c37b037545f888a50748784d96a2eeffb34e3b5a0c1b51ce7b4aff0e12f119f03c370da4487a490e43ddda19dbdb2e4e440df1d1e84be0568
 MISC metadata.xml 244 BLAKE2B 39c374b3b40c30a49f2ac1206e2ebedbc17895997225764b72cfa0496c66c3f52ba17c12edf788a96bb83d07372ee517d2444db18399c2321e9c1cea55382966 SHA512 125b08a8b50354d1a58c656385743742bd2da7946479fd738aa5e0ba3b62df983920c737436f34f56ff873969cde5a748271051e3f2a5be57de023114f25ebe3
diff --git a/app-office/homebank/homebank-5.7.3.ebuild b/app-office/homebank/homebank-5.7.3.ebuild
deleted file mode 100644
index cdb9cf1bf497..000000000000
--- a/app-office/homebank/homebank-5.7.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit xdg
-
-DESCRIPTION="Free, easy, personal accounting for everyone"
-HOMEPAGE="https://www.gethomebank.org/"
-SRC_URI="https://www.gethomebank.org/public/sources/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+ofx"
-KEYWORDS="amd64 ppc ~ppc64 x86"
-
-RDEPEND=">=dev-libs/glib-2.39:2
-	net-libs/libsoup:3.0
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/pango
-	ofx? ( >=dev-libs/libofx-0.8.3:= )"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-BDEPEND=">=dev-lang/perl-5.8.1
-	dev-perl/XML-Parser
-	>=dev-util/intltool-0.40.5
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog README )
-
-src_configure() {
-	econf $(use_with ofx)
-}