gentoo auto-resync : 23:05:2024 - 00:06:39

9 files changed, 48 insertions, 14 deletions

diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index b04822364c36..2b5e432fc995 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/ledger/Manifest b/app-office/ledger/Manifest
index aff777e6fad3..654d4b0c8daa 100644
--- a/app-office/ledger/Manifest
+++ b/app-office/ledger/Manifest
@@ -1,4 +1,5 @@
+AUX convenience.patch 425 BLAKE2B 681557bc92a8006109abc3317a2e2d729e998f2ed9d3478b028cc38ebbb0d3f13fef21a6ad928b2c8fe0de1551342c33908e52e0043ba27c296eb1956267be96 SHA512 99782978e3877a4a896ea07d01dd40a0a7001becc422dc183a51bc39baf950f391da0d79d98249db9b103472deebdbc82428ca91f9c2f42010afc1ead42b5acc
 DIST ledger-3.3.2.tar.gz 825274 BLAKE2B ee0901eaba234688cc36e399bd86118269d8691162feacf25e70ffaf28e8d572f47a62fb014126f5dce65c73135f21ad4364a642637a80d2577bf20b657fc9a4 SHA512 d5d7058f0e9a02ad1d46e6780675d446070824b321f0f4c1ea6ac0c3dd4f11f259113bc36cbc796e4bb6d0a7898d6a68a25cce639e27a2b2434eec11a612ecb0
-EBUILD ledger-3.3.2-r1.ebuild 2397 BLAKE2B d08b719f9d07c20e212bca7affc5bb669df64409611ffd78fcde4de59ed9cf1c2c2cdb8684076b9c5d38685edf3c65abb2a6a4453a59847cf0a76a9157a91313 SHA512 db427d56e19d0d5f0952b4dee018e29af1439885a293f44f98f837ffa34fd9de781a1c6ab2e5aa37cfeb488b548237f26b6c3258d414ff4949f82b6c24eddcaf
+EBUILD ledger-3.3.2-r1.ebuild 2451 BLAKE2B 531125c382140872ca6e807ea6a1e21be56bdb49e3ffe38112ee3dce0ebff2e3d9756ecb356a9d5823594006f0d220a2c5997d393836e4f7b44164ba225ccf13 SHA512 9dddf9483c8a6d711b427a282cec3034aa0a10028b854ffb756d984636ca5040ab4463b5981871e5439d858d7523594e05098a83fa7f558b12097c48c199b9c4
 EBUILD ledger-3.3.2.ebuild 2392 BLAKE2B 0ca2fb25ab9bc07ad8da27d6800115c0791aa8d9c658f75fbe74a5743c2d9dd07f6d058cdd9fe23659a4fcdf72d1bd1ef44d44bc379b97d0d8f59c286a85492f SHA512 1bfff76995e6c3fbb6146d836e0399612baade304bd8b800575b880567e7dc0560fd17339537e7a55df30c336b098df564e165ef483015a8ef6be3f0fd95f957
 MISC metadata.xml 307 BLAKE2B f3dac05e0bf7b2902ba20eb344829c1b835ff3847c71aaf1c53d28c5045b350fbf140e2f6b3cdb80f3be99b9fa3afffdd2c52d5081c6500c42233a402ce25a54 SHA512 db8c5c551a20e1e19151f31188fb1e61642591dbb01ad4e52b4542dabde3fd374ed234b7de6c9fdd11cf57477acc8dda07e26bc5ae8f251ab306309bf3772668
diff --git a/app-office/ledger/files/convenience.patch b/app-office/ledger/files/convenience.patch
new file mode 100644
index 000000000000..998d248c0932
--- /dev/null
+++ b/app-office/ledger/files/convenience.patch
@@ -0,0 +1,10 @@
+--- a/src/system.hh.in	2024-05-21 22:50:15.026661018 -0500
++++ b/src/system.hh.in	2024-05-21 22:50:43.466824215 -0500
+@@ -144,7 +144,6 @@
+ #include <boost/date_time/posix_time/posix_time_io.hpp>
+ #include <boost/date_time/gregorian/gregorian_io.hpp>
+ 
+-#include <boost/filesystem/convenience.hpp>
+ #include <boost/filesystem/exception.hpp>
+ #include <boost/filesystem/fstream.hpp>
+ #include <boost/filesystem/operations.hpp>
diff --git a/app-office/ledger/ledger-3.3.2-r1.ebuild b/app-office/ledger/ledger-3.3.2-r1.ebuild
index 3f77c0eb287b..709f0d908539 100644
--- a/app-office/ledger/ledger-3.3.2-r1.ebuild
+++ b/app-office/ledger/ledger-3.3.2-r1.ebuild
@@ -67,6 +67,9 @@ src_prepare() {
 	mv doc/ledger{3,}.texi || die "Failed to rename info file name"
 
 	rm -r lib/utfcpp || die
+
+	eapply "${FILESDIR}/convenience.patch"
+	eapply_user
 }
 
 src_configure() {
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index a339fafbd8b0..312f39f25420 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,11 +1,12 @@
 AUX scribus-1.5.3-fpic.patch 376 BLAKE2B 102f6ca21c96d0b05354bf65c551efde01291c1b878db27e24ee8680eca6bebc9e402b19d62fe2001ed5dfc46ca11c3b3450816a017c942ba848bd43476628fc SHA512 531c3697983adbdeef4959c44a89ccf5e3802f2b1e64a65a63747a659cb808a08095d7592e6f8974e3e0e16ad913ba05bd3f3fe9c9fbd0a50463fd8df6f47d34
 AUX scribus-1.5.8-cmake.patch 951 BLAKE2B 7f64fbb7d92974b44946eeee359a87ea3c1564a804765169f0271d5cbdef488b142eec3d057d0367415b665c09ef82ef4da2934b3343e6bf0f0a91abe949bb23 SHA512 340185ac6ae1a0dbb6138ff2d714ba330ce4957864788a5f7786d7f5149abddcda222e5b902bc67c6ed61bf01dd4225eb66ce6abc5e3a672ef2c0586701384e7
 AUX scribus-1.6.1-findhyphen.patch 1787 BLAKE2B 28faaa033a876516333ce10f89cc741c56090c53e98b0b9dee44cd05153533b0fd088e178f087f1125365b199385463ae1e07add1a92976e32a8b500d6e2979c SHA512 772ded373a356a679416dcd4f87abaf4b2a47bcf48738a8d40103cadff6eb332381e07bd277c5013c5e112f5b2997b2e9667052b83324960990ce96fa7ec4542
-AUX scribus-1.6.1-poppler-24.03.patch 2950 BLAKE2B f2f6b32bf918b4aa935468eb60908afd5f982853e4c5aede0948c6abc22b8f7211c9c8806ddf35c7e9ff13d7ea4eaa7ca9a48105efaee8ed253a38cdb3fba8e1 SHA512 30b062fa811b8e5aaaafa47ecc8b8582d87889cea62cf1e5debd3ec8a2a5337ede3d30edd93320e3b6703c924284a793b137fa8252dfe091cca2cad00a594be3
+AUX scribus-1.6.1-poppler-24.03.patch 2716 BLAKE2B b10db99ac5814fcfb30640c9de407d59ee7d0580b49975e261de6ca7f5fd04e71b7ecedba5e800ad91bc39d7c2e94ae718041bcf8e82703edaa5f1eaafd5565a SHA512 33d0951876a267c87b40beec435a0c4d1ab4ae646970131ccf2109f1b1385b8419e59a977b7c534cc207ef00d80e67de9c2c17f3dabcbc0f39f059f4c4b19e42
+AUX scribus-1.6.1-poppler-24.05.patch 1176 BLAKE2B 29974e0dc3f4363fe616e7a0f44dbeabe2893fa8c6a4c279607cc3d3669896a2eb3fa4a865d2468f691741993f0f27a7be22861d17193b479f259e529ee269e4 SHA512 1dca11c9d49055636b27cbcc5e2c9ea85605284dacf0583c778cb259d01d3b364dd8caca45b7052178c3c5548057238a1ab4b9f2ddf66ae9d42fe577f6426424
 AUX scribus-1.7.0-dont-install-thirdparty-license.patch 517 BLAKE2B cba2d9ad7e3b4a028f75dddb8296d8d5fd8f38c6eb91f673db4fda779375ed7f29e266874a66c9ea7d40c6e54908a2c98397072805cfb6c640c6a0a58b1cfd2a SHA512 8a38b5a1254f089f94f0fc8ca8f646e1c1d76a1193b232bb4420639a725f10cc2204d83c42a6a7535347dc7e2486048311e8221cfb445542b32511cedb07142e
 AUX scribus-1.7.0-findhyphen.patch 1900 BLAKE2B 6d5ef69a889afefa8449e35cdb4348d9cdf3ebe1b110b4de86a35e72e5faae97ae2fbadfe9ae2672a144d7ccea33ea95e0e25f2894f444c3a58a6e1b713aa357 SHA512 cde9231dd4783832340d9dd3df1522d3f5f7a3ab4f26d18ca5825d634d8102e3ca1bae483f0bd111e7e4fff31e5c9154923a9d79eae735a0445b6829e74b5c5f
 AUX scribus-1.7.0-fix-icon-version.patch 410 BLAKE2B 65d077457d8c85a8830345d7299b054806c16285e75ed4055f14ba4d844a9b0fd4972f0f1eba6ec889af4f460f50522d88722bfa34b123b80f280f2f0e029462 SHA512 230085c17081a33fb900e686e7469b878965c659e10845c39d2c7dc68a11e1f6a01bd614a21a555539c437a567ac8231490da739bfe5c17ef13fed9bd61352e2
 DIST scribus-1.6.1.tar.xz 73266900 BLAKE2B b8120823cf98201ed197748cffe3f12019acfbd4831b497585ad7d04fa6d6e470bf4bc85dac15700483dfc977c56136cb49bcee20106f482cd9b0022d75d28d5 SHA512 ffde5628ea314dab8f212f78e7dd96cd258ceaebccc5b8de2c21e338a433f82d7fbbb047d05882abb07b4dceac031141b77fef933c9a3ed0e26f29bb94377e7e
-EBUILD scribus-1.6.1-r1.ebuild 3996 BLAKE2B 9b753183e462da251e994d5a212075703268e35f33f054c484c2cdefb8637a740b4ea8b1ce1f3d90e7cca673f64b03e2612057b223288ecb95d32141b20776c6 SHA512 bae820ecb217dadb52cbf3399037f8b4312c05664dbc155ebbab0080c97575487aa8ec561c1bd054516818cd6793faff0ca311a842a984af292c050cef462242
-EBUILD scribus-9999.ebuild 3987 BLAKE2B 43aeb0200b28fd99bba9b23b717f32230f7908310ed6783ed43eb3051d9c401d556bb7fa4d6ec0f7687ce19fe173e0e6b34ab4a8017db5e05037f26ddaa0e9ed SHA512 50d9389f84838a8f2f031754167594c2b7dd728d0ccf4867d45c516bec077bcd7c5db1863aaf63ce05de8294ab6379f063cd445539d5f336d0d3d3ddf215400a
+EBUILD scribus-1.6.1-r1.ebuild 4045 BLAKE2B 54528123095de7a188ca2a1b51a9642521e31eea7363474ada3ec3bf909d6f2c0087b633bbc3dcb25eb07f2b3cd873be3edb2760da8155df1595bfaef86de6ad SHA512 9eed2fa75a89d38cc8418578b0b1feccf93922dd49fe096a01b1594a5358ffe8dd4568f4a8585a9ebf1c70c62dee1a2ec45df025eec9a41aafac896862ca3c67
+EBUILD scribus-9999.ebuild 3989 BLAKE2B 20bbc3996092f2e2afd085b749fb9d043ce01b4571447edca5498970f2879aa3a3284f282276fc60d0642ea55f0b8609445d8f6e387abe420ebabf768856ae40 SHA512 882a57ab93f56ee6afc81dda58d79b41e9d2035b4a24cc8c70edfc7aeed6b7beba6bb392cd0d751747d58cc66b5ce7dc625b627e172b6335ecbf060383d7b326
 MISC metadata.xml 883 BLAKE2B 7dc92ce97a3337f9397b52c647c00313790a8a674c88ba3491ef55b056941d6dcdfe1eac9009c4a5f2c4ebe70d81f9fa27439efad544bf8415ffb2235440402e SHA512 3348ea8be21835e88182c23e21dfaef4f52928aee1f4af1c88707cc3bd3f016d56986f197eec9b26279f4df72f20559fe7f4cad7439e67a66ab2c1b4f585ad91
diff --git a/app-office/scribus/files/scribus-1.6.1-poppler-24.03.patch b/app-office/scribus/files/scribus-1.6.1-poppler-24.03.patch
index 076e48e14fd9..0a8d317b6109 100644
--- a/app-office/scribus/files/scribus-1.6.1-poppler-24.03.patch
+++ b/app-office/scribus/files/scribus-1.6.1-poppler-24.03.patch
@@ -9,12 +9,6 @@ Fixes build errors caused by:
 Upstream commit 6e3824d45d42cb806a28a2df84e4ab6bb3587083
 
 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- scribus/plugins/import/pdf/slaoutput.cpp | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
-
-diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
-index 4e31e4b6c..3e4a768ec 100644
 --- a/scribus/plugins/import/pdf/slaoutput.cpp
 +++ b/scribus/plugins/import/pdf/slaoutput.cpp
 @@ -1731,7 +1731,11 @@ bool SlaOutputDev::axialShadedFill(GfxState *state, GfxAxialShading *shading, do
diff --git a/app-office/scribus/files/scribus-1.6.1-poppler-24.05.patch b/app-office/scribus/files/scribus-1.6.1-poppler-24.05.patch
new file mode 100644
index 000000000000..9d2ae918768c
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.6.1-poppler-24.05.patch
@@ -0,0 +1,24 @@
+From 985b7944e50b23f4558ba4ca539659f37b4b7ba4 Mon Sep 17 00:00:00 2001
+From: Jean Ghali <jghali@libertysurf.fr>
+Date: Thu, 2 May 2024 22:26:03 +0000
+Subject: [PATCH] Enforce C++20 when building with poppler >= 24.05.0
+
+git-svn-id: svn://scribus.net/trunk/Scribus@26125 11d20701-8431-0410-a711-e3c959e3b870
+--- a/CMakeLists_Dependencies.cmake
++++ b/CMakeLists_Dependencies.cmake
+@@ -28,7 +28,14 @@ if (poppler_FOUND)
+ 	message(STATUS "Found poppler")
+ 	message(STATUS "Found poppler libs: ${poppler_LIBRARY}")
+ 	message(STATUS "Found poppler includes: ${poppler_INCLUDE_DIR}")
+-	if (poppler_VERSION VERSION_GREATER_EQUAL 22.01.0)
++	if (poppler_VERSION VERSION_GREATER_EQUAL 24.05.0)
++		message(STATUS "Poppler Version:" ${poppler_VERSION})
++		if (CMAKE_CXX_STANDARD LESS 20)
++			message(STATUS "C++20 is the minimum C++ standard since poppler 24.05.0")
++			message(STATUS "Enabling C++20 compiler features")
++			set(CMAKE_CXX_STANDARD 20)
++		endif()
++	elseif (poppler_VERSION VERSION_GREATER_EQUAL 22.01.0)
+ 		message(STATUS "Poppler Version:" ${poppler_VERSION})
+ 		if (CMAKE_CXX_STANDARD LESS 17)
+ 			message(STATUS "C++17 is the minimum C++ standard since poppler 22.01.0")
diff --git a/app-office/scribus/scribus-1.6.1-r1.ebuild b/app-office/scribus/scribus-1.6.1-r1.ebuild
index 6943d0b9a6bc..bf38de284c12 100644
--- a/app-office/scribus/scribus-1.6.1-r1.ebuild
+++ b/app-office/scribus/scribus-1.6.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 PYTHON_REQ_USE="tk?"
 inherit cmake desktop flag-o-matic optfeature python-single-r1 xdg
 
@@ -31,7 +31,7 @@ DEPEND="${PYTHON_DEPS}
 	dev-libs/librevenge
 	dev-libs/libxml2
 	dev-qt/qtcore:5
-	dev-qt/qtgui:5[-gles2-only]
+	dev-qt/qtgui:5[-gles2-only,X]
 	dev-qt/qtnetwork:5
 	dev-qt/qtopengl:5
 	dev-qt/qtprintsupport:5
@@ -77,6 +77,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.6.1-findhyphen.patch
 	"${FILESDIR}"/${PN}-1.7.0-fix-icon-version.patch
 	"${FILESDIR}"/${PN}-1.6.1-poppler-24.03.patch
+	"${FILESDIR}"/${PN}-1.6.1-poppler-24.05.patch
 )
 
 src_prepare() {
diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild
index d7e694a35803..1d53740101ee 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 PYTHON_REQ_USE="tk?"
 inherit cmake desktop flag-o-matic optfeature python-single-r1 xdg
 
@@ -38,7 +38,7 @@ DEPEND="${PYTHON_DEPS}
 	dev-libs/librevenge
 	dev-libs/libxml2
 	dev-qt/qt5compat:6
-	dev-qt/qtbase:6[cups,gui,network,opengl,xml,widgets]
+	dev-qt/qtbase:6[cups,gui,network,opengl,X,xml,widgets]
 	dev-qt/qtsvg:6
 	media-libs/fontconfig
 	media-libs/freetype:2