gentoo auto-resync : 09:03:2025 - 01:48:35

15 files changed, 196 insertions, 729 deletions

diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 8d7316410152..a2aa3688052c 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 41c5f12e58f2..8489c5f04969 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -41,7 +41,7 @@ DIST skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz 10868024 BLAKE2B
 DIST skia-m130-3c64459d5df2fa9794b277f0959ed8a92552bf4c.tar.xz 14368844 BLAKE2B 2ed86c0e418474e496e340007f827c14f4340c08fcf4ae6bed299e0550489ada1c1b644a18163fe08b9ddc5d9eaa9e042db20ae7898fb036609df693c8bdebac SHA512 8739b2e8b578accae14928473fb479d7014e9181dc7f363230282d4282f950f1006b2bcd746c12028fb86aeffdfd7d837435d09480cfe94714e81f8365dcf954
 DIST zxcvbn-c-2.5.tar.gz 1404434 BLAKE2B f0f22fc8643f785e8f9ed42033d6654c2e67aa4e258bbc4fecf533efcf8b86b6d7e67f9042326247c311c42a4e2b24b844e0bae65cdb2e46ea043a2974ffd857 SHA512 d7199b3cc36cd0e401bd8f857132425908307aefcdb1bb635ee81c34cf71ccbcdf0fe36a336a55da1281692b508881b54773afa41379a448863095f4abd5c0e8
 EBUILD libreoffice-24.2.7.2-r1.ebuild 19829 BLAKE2B 5e795fb1b69c5a0b577768a9d3ed75d3b0aef18027e348844aa7989e9734f47b24aa797149b02e360d606516acbbacbf0bab318ac5deabcdf6a805d1476102f8 SHA512 38cc52598760317f3a03fc8e156f56d3b143560c42b598ffdfccf67b5774c17afeaaa87ee039074eaa7ab9d68225d862a4380da37d13f23c14674e05665ce397
-EBUILD libreoffice-24.2.7.2-r2.ebuild 19909 BLAKE2B 3546f9f24fd2ce23e34573e0972f619aeb3f312e2f0a4dcbf1561fc1117565b429db3f107efd46cd27a101d095391af9c825294bbd5949fd147cb32747d8f1de SHA512 baee1edd317c8a667878560e95ccfdc27b8610326f0f1b2eae9388a7b1355e803104079aaf25db4e240b1073884a1c623c02076e65d5368da27001ca732d23af
+EBUILD libreoffice-24.2.7.2-r2.ebuild 19908 BLAKE2B 639779875cebf59aa677566ff761de7e2806a7bec191b28cd8c648ffcfb8cd4372f2d6fb6d0953f4826c5ed4838dbf9f3fd6a5ed430937318ba604fc4435c96a SHA512 b8c435b3d1e6176fbd8311e5b46f159b843350007b8492d1c2bcc0ffa861975501aeb690e86edd359b6e36531c87e28f644942fdbd57104aa83069c3b9c843a3
 EBUILD libreoffice-25.2.1.2-r1.ebuild 21977 BLAKE2B 11ee7a41db03cb71173a3c339230f5bc0aafe51450594153259a7195beb411d16f3450996f53aa04c398f3f7ce99587e6eba353e45cc7c4a654d3debf4931900 SHA512 5e82752415740e5f8afcaca98b535d8c2892c3d4d2374e87fc50ad71db67f11dc657307021f7c89198eb0878fed22abfdd0282d6387f572439dd4514108ce14a
 EBUILD libreoffice-25.2.1.2.ebuild 21921 BLAKE2B a09b8724fe5f61634d693b0e0f8d849b4a391bd2db4ee739a8e2d7822af6f3a33b1869fb94d8d1afed151dc7688e49edf19bb88ce20d3f3712d159192364db34 SHA512 17d0d54d110592bcb36d58cd5c7e611838f5cbd664b3f2ca1c37ea64297deab3cba0c3d360a16aa94369c831b6ff000b1cd53abf903df4ef3aae5c1190ef2c0f
 EBUILD libreoffice-25.2.9999.ebuild 21921 BLAKE2B a09b8724fe5f61634d693b0e0f8d849b4a391bd2db4ee739a8e2d7822af6f3a33b1869fb94d8d1afed151dc7688e49edf19bb88ce20d3f3712d159192364db34 SHA512 17d0d54d110592bcb36d58cd5c7e611838f5cbd664b3f2ca1c37ea64297deab3cba0c3d360a16aa94369c831b6ff000b1cd53abf903df4ef3aae5c1190ef2c0f
diff --git a/app-office/libreoffice/libreoffice-24.2.7.2-r2.ebuild b/app-office/libreoffice/libreoffice-24.2.7.2-r2.ebuild
index 8f3e1a05e6cb..651b309e5ce7 100644
--- a/app-office/libreoffice/libreoffice-24.2.7.2-r2.ebuild
+++ b/app-office/libreoffice/libreoffice-24.2.7.2-r2.ebuild
@@ -91,7 +91,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
 
 [[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
 
 # Extensions that need extra work:
 LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
diff --git a/app-office/mdbtools/Manifest b/app-office/mdbtools/Manifest
index 4f2f483fad7f..e14ebbaa2848 100644
--- a/app-office/mdbtools/Manifest
+++ b/app-office/mdbtools/Manifest
@@ -1,5 +1,3 @@
-DIST mdbtools-1.0.0.tar.gz 220553 BLAKE2B 55cf3120f16ded1374c0b5535c45a0d15e4d2ec62d4029856bea570282e6099565698c00b27295b01b455eca10d9271e743e60086b427647dfe51c25d65c531d SHA512 3844bde9df3a5beafa40914fef3db25a9b3bc0e66cbd012fd6ad0fcf89e66f48afa922be61972b4d6a7a3d0ba0bf1881f7d8fdebce7f52f19254133dd1d3fc5f
 DIST mdbtools-1.0.1.tar.gz 672774 BLAKE2B c95c4cf343f7261e08eecf5f65be8302cd6491fc6b5d810054a9a2e614e67e8848a157734a41dd200f1ee8c299d5d52d24402574f9f039da537f47f3c2618888 SHA512 3f033db4c036f53f800982b5499a64756d3a859d9284ef5202a7062dc7a2d1ef1a657d43b8ea3f76aa999f5adcc4b3799eaaa8b8084adf6f60d55ba9ccc78b72
-EBUILD mdbtools-1.0.0.ebuild 1144 BLAKE2B 27c7b5efc2ffdd0f01834a1f85da4e039192f23e4a98f4a5305a216b782b0dc020b73e6148f13e5a93e21671cdb943e680b5ded58aada8e935b702d0cd68f445 SHA512 7a6db48c659528305ff722bd90d100d287236857465fe37d909399d8118bc4b297ba70f5cf8b79d38fb70a95b142e096fd84eeff9a669889312a28596b837b10
-EBUILD mdbtools-1.0.1.ebuild 1011 BLAKE2B 239001c8429caa754c341e4e148532f2a84084c47187c770119d37cdebf492515a4c15054b62bd6ba1249e1673e8c3285aa4ba7b773fa80df61b1ebe70c12abd SHA512 71d9173176ef9375e023674049e6e5e4f73b95072329ee9e55ce3dcc88e19c5354017d9b4970a23ef12fb6a9294fc1180c874910770bdc5e2b69cdf7d7a587af
+EBUILD mdbtools-1.0.1.ebuild 1006 BLAKE2B 8f4b3bd282cb10c775eb9a9a4cb3c703b0804c2875f25962a103a64442b55d67bfe0eb583bf79d362af0cbe4896861eda917b607cb3865cea2160fb028ca9ec9 SHA512 00a4bd165b1e71a43102d9f186db0428a9f626974831c638cdd92ce9f4f01c9b48e3e6597041f37522a5916e5ed09cebe6e778011b52174c1ac1d72cdbcfdf98
 MISC metadata.xml 357 BLAKE2B 3c1784fd2c40e530ec162e14d3cc9bac4824c0cecc0e15866f45937ed27f6aca9136640e0345b10bdf7e748be89455d4223532b2c4c28751c9d3fc57f1ce5f1b SHA512 0ae8b8f0ebce22a546c0dd083dd95f48833a648d4c6d28016ae0c96073e9943d82a2a6ce295d7b411c1a63c548467102e5e2c562b4da9c2395d3c0d3bbfa8be9
diff --git a/app-office/mdbtools/mdbtools-1.0.0.ebuild b/app-office/mdbtools/mdbtools-1.0.0.ebuild
deleted file mode 100644
index cc7ee2629e3e..000000000000
--- a/app-office/mdbtools/mdbtools-1.0.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Set of libraries and utilities for reading Microsoft Access database (MDB) files"
-HOMEPAGE="https://github.com/mdbtools/mdbtools"
-SRC_URI="https://github.com/mdbtools/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/3"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 ~riscv sparc x86"
-IUSE="glib iconv odbc"
-
-BDEPEND="
-	app-text/txt2man
-	app-alternatives/lex
-	virtual/pkgconfig
-	app-alternatives/yacc
-"
-RDEPEND="
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	glib? ( dev-libs/glib:2 )
-	iconv? ( virtual/libiconv )
-	odbc? ( >=dev-db/unixODBC-2.0 )
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS HACKING NEWS README.md )
-
-src_prepare() {
-	default
-
-	# bug #770019
-	sed -i -e 's/-Werror//' configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-static
-		$(use_enable glib)
-		$(use_enable iconv)
-		$(use odbc && echo "--with-unixodbc=${EPREFIX}/usr")
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/app-office/mdbtools/mdbtools-1.0.1.ebuild b/app-office/mdbtools/mdbtools-1.0.1.ebuild
index e41a119ce886..7a88de377b36 100644
--- a/app-office/mdbtools/mdbtools-1.0.1.ebuild
+++ b/app-office/mdbtools/mdbtools-1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mdbtools/mdbtools/releases/download/v${PV}/${P}.tar.
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 ~riscv sparc x86"
 IUSE="glib iconv odbc"
 
 BDEPEND="
diff --git a/app-office/merkuro/Manifest b/app-office/merkuro/Manifest
index a26cfd617756..3a6c981d43fe 100644
--- a/app-office/merkuro/Manifest
+++ b/app-office/merkuro/Manifest
@@ -2,6 +2,6 @@ DIST merkuro-24.08.3.tar.xz 774932 BLAKE2B 9e8a302762c4e777c85e7c511233f0b8f6db4
 DIST merkuro-24.12.2.tar.xz 793332 BLAKE2B ff4d6814325f7e8c244a85bdcfb2f7d87a8a7aecb70a3fef2a42242dd83c4bb9163133921db319c3bce0e5d627a87b4925e69ef8783bf892f6de5bc2c81edc62 SHA512 5b453cbb1e857b60358791eb39567d263ccf9974a694c47bf774f02e49933e0076fa39c558ee61f1311c26bf418a6d820a0f9a2871d7ac952ce1807dd746884f
 DIST merkuro-24.12.3.tar.xz 793568 BLAKE2B 1ec55d04bddf378e7207c2fc47de175dec409ba2bff1d506d24437b5fdec5cf32963aea60b69ca59e774dce8c86c94e4341ac6f78f9f1d3d6a3d74784fdce5b5 SHA512 b461b2690a6da8b3b432a391f7b8b2d68fde51b602149d2aaff0f6653631b24326fa0f2fa14deb4d4ca0de1297461b4d03bbd0060ed278c1d63a9e38f0452cc8
 EBUILD merkuro-24.08.3.ebuild 1967 BLAKE2B fc53261876c654762e32e2b22365cfa2e84e960fa614a75dfc64b113b32e337e9d18fe90fba0adf925d82a5c73050c9949b8f641fb9cfe9d7762b9c36552a9d7 SHA512 a6b75e0abba25063aef6b61b32ca6df2bf38171017d6f98e1ae1111226adde86d04d312372aa1eaf005d4293dad9732224d9bfcb1b0b8602cd92c131cb0715a8
-EBUILD merkuro-24.12.2.ebuild 2067 BLAKE2B cfccdd6f676fe7ca4d8312fb6877b1e27535290ad39f75a82c330906896e4d1b91cb44ea3d684e97a87416d74d1555faab08040d9d8a2d26bed19f9fa36ccc42 SHA512 edf5e9ece4b0ee90af2729d1d3658adc8caf5f412e38dfeec71d1d45324636c5eae2663029119cd230d3fa7294200452812fd220f9ee0c7d8f4e3d6a53746de7
+EBUILD merkuro-24.12.2.ebuild 2066 BLAKE2B 9d40cb3f9960cbc16323dc45bea478f6cd8eebf19e5aab74dc8bc87b389d98f9c6a752f5c093afd5b91c58322bc0ca2ecd6f9ff2fa9a65030c7e155ed977ebb8 SHA512 2f73d5b04cd349e252e432177b261d6459b3ebe3fe160eeb174a54f5d3abe6b8f86862db6527c191ec4e2d3d0b0b152ffe44951eb43bbe9dfbb7345808013fa3
 EBUILD merkuro-24.12.3.ebuild 2068 BLAKE2B 45ad5d81fb813ce9696887da36ed9d279a05a31590b413cb605e9b4bfc52676c327877817b44cea2d0f2afc2f7d92e8220f41647569a70b9aec07b94cceaa03b SHA512 647d6e4cf9afaf1c245b1bd5da69feb7ea9e449edf9baa1a6b8fcb97395af0a4ebaf3fbabfe1f383117d18cc2887054bbd4d37722df3258c015503f2f54a0e1e
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/app-office/merkuro/merkuro-24.12.2.ebuild b/app-office/merkuro/merkuro-24.12.2.ebuild
index 66e69d114214..89e2fb4a4b40 100644
--- a/app-office/merkuro/merkuro-24.12.2.ebuild
+++ b/app-office/merkuro/merkuro-24.12.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/merkuro.calendar/"
 
 LICENSE="|| ( GPL-2 GPL-3 ) CC0-1.0"
 SLOT="6"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE=""
 
 # All of the tests involve interacting with akonadi right now (as of 22.04)
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 36a0b9ddcae4..eb2cb44af53e 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,18 +1,14 @@
 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.2-poppler-24.10.0.patch 5944 BLAKE2B 90c8cce46f3993e2102d2a14d65f932dbde979dd1fa55c40bee6dad5f1f94cdf2de5f6976b6ac3f4e24b34b3b1012152abe597b959a1f3f9030a28d8f4a7bf66 SHA512 5443a35b586ed2f6552bb07ff6bfc1a6fc4177f3bbdc94e3bb09b5977d799b6357cd62ca8f773a6757469eefce6cc3cf38880e4baa47f9f8a858f5dedf4aac51
-AUX scribus-1.6.2-poppler-24.11.0-1.patch 10980 BLAKE2B fce503d3a018dac6747f7462febe82a2201935e371ec890191692964ecc667800d60c775f9f69941abf3449f0ab23dc3c5084c2ab20e26834b00f44321a7913f SHA512 cff7998296b83123d7ef31844244553774998b5c94bbbfb592ac3495ac0f4fb6588296e6322b68383c06e31c5f6c22386ce309dbf9f3b930c9cae1965386b9ca
-AUX scribus-1.6.2-poppler-24.11.0-2.patch 1573 BLAKE2B c1f00b8fe437f921aec7e96a7f530445ac39d000c600ca3203c98a98bf2081b19dc4e28b77f3f2dad36d934532f2977931ab4f9a3732889179533a1083cabcea SHA512 716fd00c292051734603bff501d6148411f8efeea87ed3f837cf0b257ead2964261c67ebd00c8837c502f58f809213a2becdcc1c40654fa7262908ae9fd9ad52
+AUX scribus-1.6.3-poppler-25.02.0.patch 6832 BLAKE2B 8ebc8a8b3287adc09feefe1eea0f3e5d1e5ba140ba24809f943a107537cd9f8197e09138eb3a489f71a3e5b4dd77827384027a085d21e84563cd158b6257b663 SHA512 b608ee1be194268a200a00bfec9fb241dad43fda64b062daa5838699cdf361bb0f94f04c4d23379cf5d06b997e08bbd87a900b75c6ba2f261c7d58d75fe28efd
 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
 AUX scribus-1.7.0-poppler-25.02.0.patch 6118 BLAKE2B d248d0289374310e560553aa3c40fdee92e53168e148bc87450005d394a54dcfe5a25b64fe759a3d4cbcb2fb76096c198fad21d94a13465ec4d82423834839d4 SHA512 2e955b92303294af6d73314d1c8f2793618c51898ccf6ced54af6d022c98dfc0994250a2cb3657d385650f5883d5d0ee178817918c0b96e0a2c052cdd9e96a22
-DIST scribus-1.6.2.tar.xz 73129400 BLAKE2B 2da98dc322319db18a157f66aef024b7392dbbfaf22adba14f719b48c644d1cc1546cc4d0cccf6dfe479571cf84de6f5645e5d452154f96ddc886e390702d547 SHA512 2f691c1f6b7beada89be410a2936b23641913bf26bd2152974bbaa747aeafb05aa797356a85bd55c14f60f0031ce1addedc9a3ce3e92546ebbb45f96a5ff3e62
 DIST scribus-1.6.3.tar.xz 74909384 BLAKE2B b208270fce3e013692e90ec354849f99440efc97bda0e15c0baea16a5fd039b7435498c4d2669bd5c3caaca9c7d1125f78ea6fde483bf81449a451f9f54bf26d SHA512 b408ed862285d06d0f79a646ac2b43b0eb0b241c23dc276544e94a72e4fc3a0bf4efd500c5893c295886b11490115cdbe5f34ce7de51da30d31099831ba25d87
 DIST scribus-1.7.0.tar.xz 97163704 BLAKE2B 02c57ce21d0f48d2e6906d8056fa766ddbdae88d6ac4c758996ba59776243d308ffd34d6c1e5dc5b3f2e2042f6760f0188efa9ef3b16f2b38ff54dc4bc7e2bef SHA512 c3a392d69e109165a9c28c2396e0e2e18df2d232099a6836f6a472fc3f899f50316e2b9227be40c3226dffc9f84e9db94dc2f353052fa06b35c776cd4f664448
-EBUILD scribus-1.6.2.ebuild 4201 BLAKE2B 1e28eb40199277d68579f85d47468acb34b0b5575f11e628ff5edb6a45fca4056f1d8ee9f7f3933cb81e389903498db0d450628443643cc3358116f8e47aa0e6 SHA512 bd3be20c40fd83e5d22154b8c4ceb95cbb212403941f5bbe28eae80191d346e2d512db3fbdf87cac5e932fe0e2a194c8f61b2896ce573e6ef67b385b588386b9
-EBUILD scribus-1.6.3.ebuild 4098 BLAKE2B 9a08e08b76b89785381ba9f515051262dbce6d84541ca39acf88ed1d98163afd14bc249ce8701a5e34b3636822dd571a2d6f43dc74c362c19ecb9a9a58a07d80 SHA512 90d3df4bfd282537cf54265446c0660c7ca5eac422e02a01f2b561194f9beef278cd0e3dcdc0a19d2c22b0dcf760d5a2fe201736519274ba184dbc381e70ee3b
+EBUILD scribus-1.6.3.ebuild 4160 BLAKE2B 6f2ed4c5dcfc1d8660e056bbeff6d6a92a99d3adac55654e80b5bc15dab7a42593f0530f71153d4a2c163fad4ee8af7b411594554bca41f7d5b4b445d6f80f0f SHA512 c8d0fbd02a890ca393e39856e47109f791a7d706862cbbd5c90e92fbe75dd2503459405b5a8e194d95e8ad5e0cbe3bb915639abef7b5b7cfce05886072ce7416
 EBUILD scribus-1.6.9999.ebuild 4102 BLAKE2B 5e2a0cd07aae3d44d0439fc55343aede839ef7391e72c9e9dcfb92246f127f58faa1a597c2ff9a3564bc77522f709ceb9e424aa3a61540ce6e569f633104f028 SHA512 85b061e3e87e6d9dcf0c5e025ecc7e2acb533c2e7420bda14d3be53b91e5daa7b6b74f4d5061e74cf9fc22d89eeb7e03be956c2c3aaed5e997a7c6ad090b652f
 EBUILD scribus-1.7.0.ebuild 4046 BLAKE2B f84af247a00894738e6be56c8a1214dc8454c869c26ea99f2b8d7b4023421daece931fa7b2ba2b3f3cb40ff1b0059dfa4c06715e8aef63dc35fa31dfb78aa26f SHA512 b787001c4dae67b255a05495a4cc0492ae222f952b63957dfd0707e27702fe941a7f1da6ce5e6407a821e6c7253a54e88e1b8a0c93c7c7a89fa2e52dadf8376a
 EBUILD scribus-9999.ebuild 3985 BLAKE2B d6c2f8345dc29f66095b498d64f322ac4026c30cd08dd5ff1d4a1ed2d55b3f9f031385efdf0d6c8dbce76cfa1a0422e5858317da895665b40348959168e09bbe SHA512 8a0e3811591b383f9efea782cdad96bf83f739cc951e80c296025b9bfea8220c839802644b476bb7de011263946edb06ccba559ac93663920c7181df626b9f6a
diff --git a/app-office/scribus/files/scribus-1.6.2-poppler-24.10.0.patch b/app-office/scribus/files/scribus-1.6.2-poppler-24.10.0.patch
deleted file mode 100644
index 230af10ea007..000000000000
--- a/app-office/scribus/files/scribus-1.6.2-poppler-24.10.0.patch
+++ /dev/null
@@ -1,178 +0,0 @@
-From 09e6d8cd005fd36811998bbc8c9de3a019c7b8fb Mon Sep 17 00:00:00 2001
-From: Jean Ghali <jghali@libertysurf.fr>
-Date: Tue, 15 Oct 2024 21:09:31 +0000
-Subject: [PATCH 1/2] Fix build with poppler 24.10.0
-
-git-svn-id: svn://scribus.net/branches/Version16x/Scribus@26324 11d20701-8431-0410-a711-e3c959e3b870
----
- scribus/plugins/import/pdf/slaoutput.cpp | 34 ++++++++++++++++++++++++
- scribus/plugins/import/pdf/slaoutput.h   |  6 ++++-
- 2 files changed, 39 insertions(+), 1 deletion(-)
-
-diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
-index c002a886a..dfabf7039 100644
---- a/scribus/plugins/import/pdf/slaoutput.cpp
-+++ b/scribus/plugins/import/pdf/slaoutput.cpp
-@@ -81,6 +81,8 @@ namespace
- 	}

- }

- 

-+#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(24, 10, 0)

-+

- LinkSubmitForm::LinkSubmitForm(Object *actionObj)

- {

- 	if (!actionObj->isDict())

-@@ -111,6 +113,8 @@ LinkSubmitForm::~LinkSubmitForm()
- 	delete fileName;

- }

- 

-+#endif

-+

- LinkImportData::LinkImportData(Object *actionObj)

- {

- 	if (!actionObj->isDict())

-@@ -1078,6 +1082,32 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
- 				}

- 			}

- 		}

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 89, 0)

-+		else if (Lact->getKind() == actionResetForm)

-+		{

-+			ite->annotation().setActionType(4);

-+		}

-+#endif

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 10, 0)

-+		else if (Lact->getKind() == actionSubmitForm)

-+		{

-+			const auto* impo = (LinkSubmitForm*) Lact;

-+			if (impo->isOk())

-+			{

-+				ite->annotation().setActionType(3);

-+				ite->annotation().setAction(UnicodeParsedString(impo->getUrl()));

-+				int fl = impo->getFlags();

-+				if (fl == 0)

-+					ite->annotation().setHTML(0);

-+				else if (fl == 4)

-+					ite->annotation().setHTML(1);

-+				else if (fl == 64)

-+					ite->annotation().setHTML(2);

-+				else if (fl == 512)

-+					ite->annotation().setHTML(3);

-+			}

-+		}

-+#endif

- 		else if (Lact->getKind() == actionUnknown)

- 		{

- 			auto *uno = (LinkUnknown*) Lact;

-@@ -1106,7 +1136,11 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
- 						if (impo->isOk())

- 						{

- 							ite->annotation().setActionType(3);

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 10, 0)

-+							ite->annotation().setAction(UnicodeParsedString(impo->getUrl()));

-+#else

- 							ite->annotation().setAction(UnicodeParsedString(impo->getFileName()));

-+#endif

- 							int fl = impo->getFlags();

- 							if (fl == 0)

- 								ite->annotation().setHTML(0);

-diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h
-index 35de565b0..90a745972 100644
---- a/scribus/plugins/import/pdf/slaoutput.h
-+++ b/scribus/plugins/import/pdf/slaoutput.h
-@@ -56,9 +56,11 @@ for which a new license (GPL+exception) is in place.
- #include <poppler/splash/SplashGlyphBitmap.h>

- 

- //------------------------------------------------------------------------

--// LinkSubmitData

-+// LinkSubmitForm

- //------------------------------------------------------------------------

- 

-+#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(24, 10, 0)

-+

- class LinkSubmitForm: public LinkAction

- {

- public:

-@@ -79,6 +81,8 @@ private:
- 	int m_flags {0};

- };

- 

-+#endif

-+

- //------------------------------------------------------------------------

- // LinkImportData

- //------------------------------------------------------------------------

--- 
-2.47.0
-
-
-From 6b80de8425a5b6b3e8c170b4a99cb4c5e0d85789 Mon Sep 17 00:00:00 2001
-From: Jean Ghali <jghali@libertysurf.fr>
-Date: Tue, 15 Oct 2024 21:15:36 +0000
-Subject: [PATCH 2/2] Simplify build fix for poppler 24.10.0
-
-git-svn-id: svn://scribus.net/branches/Version16x/Scribus@26326 11d20701-8431-0410-a711-e3c959e3b870
----
- scribus/plugins/import/pdf/slaoutput.cpp | 8 ++------
- scribus/plugins/import/pdf/slaoutput.h   | 6 +++---
- 2 files changed, 5 insertions(+), 9 deletions(-)
-
-diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
-index dfabf7039..69022014b 100644
---- a/scribus/plugins/import/pdf/slaoutput.cpp
-+++ b/scribus/plugins/import/pdf/slaoutput.cpp
-@@ -99,7 +99,7 @@ LinkSubmitForm::LinkSubmitForm(Object *actionObj)
- 			{

- 				Object obj2 = obj1.dictLookup("F");

- 				if (!obj2.isNull())

--					fileName = obj2.getString()->copy();

-+					m_url = obj2.getString()->copy();

- 			}

- 		}

- 	}

-@@ -110,7 +110,7 @@ LinkSubmitForm::LinkSubmitForm(Object *actionObj)
- 

- LinkSubmitForm::~LinkSubmitForm()

- {

--	delete fileName;

-+	delete m_url;

- }

- 

- #endif

-@@ -1136,11 +1136,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
- 						if (impo->isOk())

- 						{

- 							ite->annotation().setActionType(3);

--#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 10, 0)

- 							ite->annotation().setAction(UnicodeParsedString(impo->getUrl()));

--#else

--							ite->annotation().setAction(UnicodeParsedString(impo->getFileName()));

--#endif

- 							int fl = impo->getFlags();

- 							if (fl == 0)

- 								ite->annotation().setHTML(0);

-diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h
-index 90a745972..0482a5855 100644
---- a/scribus/plugins/import/pdf/slaoutput.h
-+++ b/scribus/plugins/import/pdf/slaoutput.h
-@@ -70,14 +70,14 @@ public:
- 	virtual ~LinkSubmitForm();

- 

- 	// Was the LinkImportData created successfully?

--	GBool isOk() POPPLER_CONST override { return fileName != nullptr; }

-+	GBool isOk() POPPLER_CONST override { return m_url != nullptr; }

- 	// Accessors.

- 	LinkActionKind getKind() POPPLER_CONST override { return actionUnknown; }

--	GooString *getFileName() { return fileName; }

-+	GooString *getUrl() { return m_url; }

- 	int getFlags() { return m_flags; }

- 

- private:

--	GooString *fileName {nullptr};		// file name

-+	GooString *m_url {nullptr};		// URL

- 	int m_flags {0};

- };

- 

--- 
-2.47.0
-
diff --git a/app-office/scribus/files/scribus-1.6.2-poppler-24.11.0-1.patch b/app-office/scribus/files/scribus-1.6.2-poppler-24.11.0-1.patch
deleted file mode 100644
index c6ad46df633a..000000000000
--- a/app-office/scribus/files/scribus-1.6.2-poppler-24.11.0-1.patch
+++ /dev/null
@@ -1,277 +0,0 @@
-From 46f78fd4d22f17257ef18fb6c41267ad1185aaa6 Mon Sep 17 00:00:00 2001
-From: Jean Ghali <jghali@libertysurf.fr>
-Date: Sun, 3 Nov 2024 02:07:56 +0000
-Subject: [PATCH 1/3] Fix build with poppler 24.11.0
-
-git-svn-id: svn://scribus.net/branches/Version16x/Scribus@26390 11d20701-8431-0410-a711-e3c959e3b870
----
- scribus/plugins/import/pdf/slaoutput.cpp | 77 +++++++++++++++++++++++-
- scribus/plugins/import/pdf/slaoutput.h   |  7 +++
- 2 files changed, 82 insertions(+), 2 deletions(-)
-
-diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
-index 69022014b..a49ef2263 100644
---- a/scribus/plugins/import/pdf/slaoutput.cpp
-+++ b/scribus/plugins/import/pdf/slaoutput.cpp
-@@ -3079,7 +3079,11 @@ void SlaOutputDev::updateFont(GfxState *state)
- 	char* tmpBuf = nullptr;

- #endif

- 	GfxFontType fontType;

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0)

-+	std::unique_ptr<SlaOutFontFileID> id;

-+#else

- 	SlaOutFontFileID *id;

-+#endif

- 	SplashFontFile *fontFile;

- 	SplashFontSrc *fontsrc = nullptr;

- 	Object refObj, strObj;

-@@ -3109,9 +3113,15 @@ void SlaOutputDev::updateFont(GfxState *state)
- 		goto err1;

- 

- 	// check the font file cache

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0)

-+	id.reset(new SlaOutFontFileID(gfxFont->getID()));

-+	if ((fontFile = m_fontEngine->getFontFile(*id)))

-+		id.reset();

-+#else

- 	id = new SlaOutFontFileID(gfxFont->getID());

- 	if ((fontFile = m_fontEngine->getFontFile(id)))

- 		delete id;

-+#endif

- 	else

- 	{

- 		fontLoc = gfxFont->locateFont(m_xref ? m_xref : m_pdfDoc->getXRef(), nullptr);

-@@ -3165,29 +3175,58 @@ void SlaOutputDev::updateFont(GfxState *state)
- 		// load the font file

- 		switch (fontType) {

- 		case fontType1:

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0)

-+			if (!(fontFile = m_fontEngine->loadType1Font(std::move(id), fontsrc, (const char**) ((Gfx8BitFont*) gfxFont)->getEncoding(), fontLoc->fontNum)))

-+			{

-+				error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)");

-+				goto err2;

-+			}

-+#else

- 			if (!(fontFile = m_fontEngine->loadType1Font(id, fontsrc, (const char **)((Gfx8BitFont *) gfxFont)->getEncoding())))

- 			{

- 				error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");

- 				goto err2;

- 			}

-+#endif

- 			break;

- 		case fontType1C:

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0)

-+			if (!(fontFile = m_fontEngine->loadType1CFont(std::move(id), fontsrc, (const char**) ((Gfx8BitFont*) gfxFont)->getEncoding(), fontLoc->fontNum)))

-+			{

-+				error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)");

-+				goto err2;

-+			}

-+#else

- 			if (!(fontFile = m_fontEngine->loadType1CFont(id, fontsrc, (const char **)((Gfx8BitFont *) gfxFont)->getEncoding())))

- 			{

- 				error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");

- 				goto err2;

- 			}

-+#endif

- 			break;

- 		case fontType1COT:

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0)

-+			if (!(fontFile = m_fontEngine->loadOpenTypeT1CFont(std::move(id), fontsrc, (const char **)((Gfx8BitFont *) gfxFont)->getEncoding(), fontLoc->fontNum)))

-+			{

-+				error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)");

-+				goto err2;

-+			}

-+#else

- 			if (!(fontFile = m_fontEngine->loadOpenTypeT1CFont(id, fontsrc, (const char **)((Gfx8BitFont *) gfxFont)->getEncoding())))

- 			{

- 				error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");

- 				goto err2;

- 			}

-+#endif

- 			break;

- 		case fontTrueType:

- 		case fontTrueTypeOT:

--#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0)

-+			if (!fileName.empty())

-+				ff = FoFiTrueType::load(fileName.c_str(), fontLoc->fontNum);

-+			else

-+				ff = FoFiTrueType::make(fontsrc->buf.data(), fontsrc->buf.size(), fontLoc->fontNum);

-+#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)

- 			if (!fileName.empty())

- 				ff = FoFiTrueType::load(fileName.c_str());

- 			else

-@@ -3214,19 +3253,35 @@ void SlaOutputDev::updateFont(GfxState *state)
- 				codeToGID = nullptr;

- 				n = 0;

- 			}

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0)

-+			if (!(fontFile = m_fontEngine->loadTrueTypeFont(std::move(id), fontsrc, codeToGID, n, fontLoc->fontNum)))

-+			{

-+				error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)");

-+				goto err2;

-+			}

-+#else

- 			if (!(fontFile = m_fontEngine->loadTrueTypeFont(id, fontsrc, codeToGID, n)))

- 			{

- 				error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");

- 				goto err2;

- 			}

-+#endif

- 			break;

- 		case fontCIDType0:

- 		case fontCIDType0C:

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0)

-+			if (!(fontFile = m_fontEngine->loadCIDFont(std::move(id), fontsrc, fontLoc->fontNum)))

-+			{

-+				error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)");

-+				goto err2;

-+			}

-+#else

- 			if (!(fontFile = m_fontEngine->loadCIDFont(id, fontsrc)))

- 			{

- 				error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");

- 				goto err2;

- 			}

-+#endif

- 			break;

- 		case fontCIDType0COT:

- 			if (((GfxCIDFont *) gfxFont)->getCIDToGID())

-@@ -3240,12 +3295,21 @@ void SlaOutputDev::updateFont(GfxState *state)
- 				codeToGID = nullptr;

- 				n = 0;

- 			}

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0)

-+			if (!(fontFile = m_fontEngine->loadOpenTypeCFFFont(std::move(id), fontsrc, codeToGID, n, fontLoc->fontNum)))

-+			{

-+				error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",

-+					gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)");

-+				goto err2;

-+			}

-+#else

- 			if (!(fontFile = m_fontEngine->loadOpenTypeCFFFont(id, fontsrc, codeToGID, n)))

- 			{

- 				error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",

- 				gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");

- 				goto err2;

- 			}

-+#endif

- 			break;

- 		case fontCIDType2:

- 		case fontCIDType2OT:

-@@ -3262,7 +3326,12 @@ void SlaOutputDev::updateFont(GfxState *state)
- 			}

- 			else

- 			{

--#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0)

-+				if (!fileName.empty())

-+					ff = FoFiTrueType::load(fileName.c_str(), fontLoc->fontNum);

-+				else

-+					ff = FoFiTrueType::make(fontsrc->buf.data(), fontsrc->buf.size(), fontLoc->fontNum);

-+#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)

- 				if (!fileName.empty())

- 					ff = FoFiTrueType::load(fileName.c_str());

- 				else

-@@ -3322,7 +3391,11 @@ void SlaOutputDev::updateFont(GfxState *state)
- 	return;

- 

- err2:

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0)

-+	id.reset();

-+#else

- 	delete id;

-+#endif

- #if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(22, 2, 0)

- 	delete fontLoc;

- #endif

-diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h
-index 0482a5855..69bebbf5f 100644
---- a/scribus/plugins/import/pdf/slaoutput.h
-+++ b/scribus/plugins/import/pdf/slaoutput.h
-@@ -115,10 +115,17 @@ public:
- 	SlaOutFontFileID(const Ref *rA) { r = *rA; }

- 	~SlaOutFontFileID() {}

- 

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0)

-+	bool matches(const SplashFontFileID& id) const override

-+	{

-+		return ((const SlaOutFontFileID&) id).r.num == r.num && ((const SlaOutFontFileID&) id).r.gen == r.gen;

-+	}

-+#else

- 	GBool matches(SplashFontFileID *id) override

- 	{

- 		return ((SlaOutFontFileID*) id)->r.num == r.num && ((SlaOutFontFileID *) id)->r.gen == r.gen;

- 	}

-+#endif

- 

- private:

- 	Ref r;

--- 
-2.47.0
-
-
-From 0a02f661959d62492695dee6b3538ab2bdf01c91 Mon Sep 17 00:00:00 2001
-From: Jean Ghali <jghali@libertysurf.fr>
-Date: Sun, 3 Nov 2024 02:12:49 +0000
-Subject: [PATCH 2/3] Fix build with poppler 24.11.0 (2)
-
-git-svn-id: svn://scribus.net/branches/Version16x/Scribus@26391 11d20701-8431-0410-a711-e3c959e3b870
----
- scribus/plugins/import/pdf/slaoutput.cpp | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
-index a49ef2263..41eaba921 100644
---- a/scribus/plugins/import/pdf/slaoutput.cpp
-+++ b/scribus/plugins/import/pdf/slaoutput.cpp
-@@ -3352,11 +3352,19 @@ void SlaOutputDev::updateFont(GfxState *state)
- 				delete ff;

- #endif

- 			}

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0)

-+			if (!(fontFile = m_fontEngine->loadTrueTypeFont(std::move(id), fontsrc, codeToGID, n, faceIndex)))

-+			{

-+				error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)");

-+				goto err2;

-+			}

-+#else

- 			if (!(fontFile = m_fontEngine->loadTrueTypeFont(id, fontsrc, codeToGID, n, faceIndex)))

- 			{

- 				error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");

- 				goto err2;

- 			}

-+#endif

- 			break;

- 		default:

- 			// this shouldn't happen

--- 
-2.47.0
-
-
-From 93db266048e90ca31a9c50ee4696956a93b816ab Mon Sep 17 00:00:00 2001
-From: Jean Ghali <jghali@libertysurf.fr>
-Date: Sun, 3 Nov 2024 02:17:33 +0000
-Subject: [PATCH 3/3] Fix from poppler 24.11.0 SplashOutputDev
-
-git-svn-id: svn://scribus.net/branches/Version16x/Scribus@26393 11d20701-8431-0410-a711-e3c959e3b870
----
- scribus/plugins/import/pdf/slaoutput.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
-index 41eaba921..9724ff72b 100644
---- a/scribus/plugins/import/pdf/slaoutput.cpp
-+++ b/scribus/plugins/import/pdf/slaoutput.cpp
-@@ -3353,7 +3353,7 @@ void SlaOutputDev::updateFont(GfxState *state)
- #endif

- 			}

- #if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0)

--			if (!(fontFile = m_fontEngine->loadTrueTypeFont(std::move(id), fontsrc, codeToGID, n, faceIndex)))

-+			if (!(fontFile = m_fontEngine->loadTrueTypeFont(std::move(id), fontsrc, codeToGID, n, fontLoc->fontNum)))

- 			{

- 				error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)");

- 				goto err2;

--- 
-2.47.0
-
diff --git a/app-office/scribus/files/scribus-1.6.2-poppler-24.11.0-2.patch b/app-office/scribus/files/scribus-1.6.2-poppler-24.11.0-2.patch
deleted file mode 100644
index 1402ebd8d26e..000000000000
--- a/app-office/scribus/files/scribus-1.6.2-poppler-24.11.0-2.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 874e1c13995223b1433026bc26e13911a74f3880 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Wed, 13 Nov 2024 23:19:51 +0100
-Subject: [PATCH] Drop unused headers to fix build w/ poppler-24.11
-
-Fix still pending upstream:
-https://bugs.scribus.net/view.php?id=17308
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- scribus/plugins/import/pdf/pdftextrecognition.h | 1 -
- scribus/plugins/import/pdf/slaoutput.h          | 2 --
- 2 files changed, 3 deletions(-)
-
-diff --git a/scribus/plugins/import/pdf/pdftextrecognition.h b/scribus/plugins/import/pdf/pdftextrecognition.h
-index a04b45358..6edac9906 100644
---- a/scribus/plugins/import/pdf/pdftextrecognition.h
-+++ b/scribus/plugins/import/pdf/pdftextrecognition.h
-@@ -16,7 +16,6 @@ for which a new license (GPL+exception) is in place.
- #include "slaoutput.h"

- 

- #include <poppler/GfxState.h>

--#include <poppler/CharCodeToUnicode.h>

- 

- /* PDF TextBox Framework */

- /*

-diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h
-index 69bebbf5f..ae7630d29 100644
---- a/scribus/plugins/import/pdf/slaoutput.h
-+++ b/scribus/plugins/import/pdf/slaoutput.h
-@@ -45,8 +45,6 @@ for which a new license (GPL+exception) is in place.
- #include <poppler/Form.h>

- #include <poppler/Page.h>

- #include <poppler/Catalog.h>

--#include <poppler/CharCodeToUnicode.h>

--#include <poppler/FontEncodingTables.h>

- #include <poppler/splash/SplashFontFileID.h>

- #include <poppler/splash/SplashFontFile.h>

- #include <poppler/splash/SplashFontEngine.h>

--- 
-2.47.0
-
diff --git a/app-office/scribus/files/scribus-1.6.3-poppler-25.02.0.patch b/app-office/scribus/files/scribus-1.6.3-poppler-25.02.0.patch
new file mode 100644
index 000000000000..d933e5bbde0a
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.6.3-poppler-25.02.0.patch
@@ -0,0 +1,186 @@
+Index: Scribus/scribus/plugins/import/pdf/importpdf.cpp
+===================================================================
+--- Scribus/scribus/plugins/import/pdf/importpdf.cpp	(revision 26663)
++++ Scribus/scribus/plugins/import/pdf/importpdf.cpp	(revision 26668)
+@@ -462,11 +462,11 @@
+ 

+ 			if (dev->isOk())

+ 			{

+-				OCGs* ocg = pdfDoc->getOptContentConfig();

++				POPPLER_CONST_25_02 OCGs* ocg = pdfDoc->getOptContentConfig();

+ 				if (ocg && ocg->hasOCGs())

+ 				{

+ 					QStringList ocgNames;

+-					Array *order = ocg->getOrderArray();

++					POPPLER_CONST_25_02 Array *order = ocg->getOrderArray();

+ 					if (order)

+ 					{

+ 						for (int i = 0; i < order->getLength (); ++i)

+Index: Scribus/scribus/plugins/import/pdf/importpdfconfig.h
+===================================================================
+--- Scribus/scribus/plugins/import/pdf/importpdfconfig.h	(revision 26663)
++++ Scribus/scribus/plugins/import/pdf/importpdfconfig.h	(revision 26668)
+@@ -27,4 +27,10 @@
+ #define POPPLER_CONST_083

+ #endif

+ 

++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 2, 0)

++#define POPPLER_CONST_25_02 const

++#else

++#define POPPLER_CONST_25_02

+ #endif

++

++#endif

+Index: Scribus/scribus/plugins/import/pdf/slaoutput.cpp
+===================================================================
+--- Scribus/scribus/plugins/import/pdf/slaoutput.cpp	(revision 26663)
++++ Scribus/scribus/plugins/import/pdf/slaoutput.cpp	(revision 26668)
+@@ -1685,7 +1685,7 @@
+ 

+ 	auto& graphicState = m_graphicStack.top();

+ 	graphicState.strokeColor = getColor(state->getStrokeColorSpace(), state->getStrokeColor(), &graphicState.strokeShade);

+-	

++

+ 	QString output = convertPath(state->getPath());

+ 	if ((m_Elements->count() != 0) && (output == m_coords))			// Path is the same as in last fill

+ 	{

+@@ -2393,8 +2393,9 @@
+ #endif

+ 	m_graphicStack.top().clipPath = savedClip;

+ 	m_inPattern--;

++	m_doc->m_Selection->clear();

++

+ 	gElements = m_groupStack.pop();

+-	m_doc->m_Selection->clear();

+ 	if (gElements.Items.count() > 0)

+ 	{

+ 		for (int dre = 0; dre < gElements.Items.count(); ++dre)

+@@ -2932,7 +2933,7 @@
+ 	{

+ 		if (dictRef->isNull())

+ 			return;

+-		OCGs *contentConfig = m_catalog->getOptContentConfig();

++		POPPLER_CONST_25_02 OCGs *contentConfig = m_catalog->getOptContentConfig();

+ 		OptionalContentGroup *oc;

+ 		if (dictRef->isRef())

+ 		{

+@@ -3084,7 +3085,11 @@
+ #if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(22, 4, 0)

+ 	int tmpBufLen = 0;

+ #endif

++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 2, 0)

++	std::vector<int> codeToGID;

++#else

+ 	int *codeToGID = nullptr;

++#endif

+ 	const double *textMat = nullptr;

+ 	double m11, m12, m21, m22, fontSize;

+ 	SplashCoord mat[4] = { 1.0, 0.0, 0.0, 1.0 };

+@@ -3244,10 +3249,20 @@
+ 			}

+ 			else

+ 			{

++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 2, 0)

++				codeToGID.clear();

++#else

+ 				codeToGID = nullptr;

++#endif

+ 				n = 0;

+ 			}

+-#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0)

++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 2, 0)

++			if (!(fontFile = m_fontEngine->loadTrueTypeFont(std::move(id), fontsrc, std::move(codeToGID), fontLoc->fontNum)))

++			{

++				error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)");

++				goto err2;

++			}

++#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0)

+ 			if (!(fontFile = m_fontEngine->loadTrueTypeFont(std::move(id), fontsrc, codeToGID, n, fontLoc->fontNum)))

+ 			{

+ 				error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)");

+@@ -3278,6 +3293,18 @@
+ #endif

+ 			break;

+ 		case fontCIDType0COT:

++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 2, 0)

++			if (((GfxCIDFont*) gfxFont)->getCIDToGIDLen() > 0)

++			{

++				codeToGID = ((GfxCIDFont*) gfxFont)->getCIDToGID();

++				n = codeToGID.size();

++			}

++			else

++			{

++				codeToGID.clear();

++				n = 0;

++			}

++#else

+ 			if (((GfxCIDFont *) gfxFont)->getCIDToGID())

+ 			{

+ 				n = ((GfxCIDFont *) gfxFont)->getCIDToGIDLen();

+@@ -3289,7 +3316,15 @@
+ 				codeToGID = nullptr;

+ 				n = 0;

+ 			}

+-#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0)

++#endif

++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 2, 0)

++			if (!(fontFile = m_fontEngine->loadOpenTypeCFFFont(std::move(id), fontsrc, std::move(codeToGID), fontLoc->fontNum)))

++			{

++				error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",

++					gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)");

++				goto err2;

++			}

++#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0)

+ 			if (!(fontFile = m_fontEngine->loadOpenTypeCFFFont(std::move(id), fontsrc, codeToGID, n, fontLoc->fontNum)))

+ 			{

+ 				error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",

+@@ -3307,6 +3342,15 @@
+ 			break;

+ 		case fontCIDType2:

+ 		case fontCIDType2OT:

++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 2, 0)

++			codeToGID.clear();

++			n = 0;

++			if (((GfxCIDFont*) gfxFont)->getCIDToGIDLen() > 0)

++			{

++				codeToGID = ((GfxCIDFont*) gfxFont)->getCIDToGID();

++				n = codeToGID.size();

++			}

++#else

+ 			codeToGID = nullptr;

+ 			n = 0;

+ 			if (((GfxCIDFont *) gfxFont)->getCIDToGID())

+@@ -3318,6 +3362,7 @@
+ 					memcpy(codeToGID, ((GfxCIDFont *)gfxFont)->getCIDToGID(), n * sizeof(*codeToGID));

+ 				}

+ 			}

++#endif

+ 			else

+ 			{

+ #if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0)

+@@ -3338,7 +3383,9 @@
+ #endif

+ 				if (! ff)

+ 					goto err2;

+-#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)

++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 2, 0)

++				codeToGID = ((GfxCIDFont*) gfxFont)->getCodeToGIDMap(ff.get());

++#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)

+ 				codeToGID = ((GfxCIDFont*) gfxFont)->getCodeToGIDMap(ff.get(), &n);

+ 				ff.reset();

+ #else

+@@ -3346,7 +3393,13 @@
+ 				delete ff;

+ #endif

+ 			}

+-#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0)

++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 2, 0)

++			if (!(fontFile = m_fontEngine->loadTrueTypeFont(std::move(id), fontsrc, std::move(codeToGID), fontLoc->fontNum)))

++			{

++				error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)");

++				goto err2;

++			}

++#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0)

+ 			if (!(fontFile = m_fontEngine->loadTrueTypeFont(std::move(id), fontsrc, codeToGID, n, fontLoc->fontNum)))

+ 			{

+ 				error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)");

diff --git a/app-office/scribus/scribus-1.6.2.ebuild b/app-office/scribus/scribus-1.6.2.ebuild
deleted file mode 100644
index 71b32025e6fc..000000000000
--- a/app-office/scribus/scribus-1.6.2.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-PYTHON_REQ_USE="tk?"
-inherit cmake desktop flag-o-matic optfeature python-single-r1 xdg
-
-DESCRIPTION="Desktop publishing (DTP) and layout program"
-HOMEPAGE="https://www.scribus.net/"
-
-if [[ "${PV}" == *9999* ]] ; then
-	EGIT_REPO_URI="https://github.com/scribusproject/scribus"
-	EGIT_BRANCH="Version16x"
-	inherit git-r3
-else
-	SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.xz"
-	S="${WORKDIR}/${P}"
-	KEYWORDS="amd64 ppc ppc64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="$(ver_cut 1-2)"
-IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	tk? ( scripts )"
-
-# osg
-# couple of third_party libs bundled
-DEPEND="${PYTHON_DEPS}
-	app-text/libmspub
-	app-text/libqxp
-	app-text/poppler:=
-	dev-libs/hyphen
-	dev-libs/icu:0=
-	dev-libs/librevenge
-	dev-libs/libxml2
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5[-gles2-only,X]
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/harfbuzz:0=[icu]
-	media-libs/lcms:2
-	media-libs/libcdr
-	media-libs/libfreehand
-	media-libs/libjpeg-turbo:=
-	media-libs/libpagemaker
-	media-libs/libpng:0=
-	media-libs/libvisio
-	media-libs/libzmf
-	media-libs/tiff:=
-	net-print/cups
-	sys-libs/zlib[minizip]
-	x11-libs/cairo[X,svg(+)]
-	boost? ( dev-libs/boost:= )
-	graphicsmagick? ( media-gfx/graphicsmagick:= )
-	hunspell? ( app-text/hunspell:= )
-	osg? ( dev-games/openscenegraph:= )
-	pdf? ( app-text/podofo:0= )
-	scripts? (
-		$(python_gen_cond_dep '
-			dev-python/pillow[tk?,${PYTHON_USEDEP}]
-		')
-	)
-"
-RDEPEND="${DEPEND}
-	app-text/ghostscript-gpl
-"
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.8-cmake.patch # bug 886251
-	"${FILESDIR}"/${PN}-1.5.3-fpic.patch
-	"${FILESDIR}"/${PN}-1.6.1-findhyphen.patch
-	"${FILESDIR}"/${PN}-1.7.0-fix-icon-version.patch
-	"${FILESDIR}"/${P}-poppler-24.10.0.patch # bug 941932
-	"${FILESDIR}"/${P}-poppler-24.11.0-{1,2}.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-	cmake_run_in scribus cmake_comment_add_subdirectory ui/qml
-
-	# for safety remove files that we patched out
-	rm -r scribus/third_party/hyphen || die
-}
-
-src_configure() {
-	# bug #550818
-	append-cppflags -DHAVE_MEMRCHR
-
-	local mycmakeargs=(
-		-DTAG_VERSION="-${SLOT}"
-		-DHAVE_PYTHON=ON
-		-DWANT_DISTROBUILD=ON
-		-DWANT_CPP17=ON
-		-DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}/
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DWITH_BOOST=$(usex boost)
-		-DWANT_DEBUG=$(usex debug)
-		-DWANT_NOEXAMPLES=$(usex !examples)
-		-DWANT_GRAPHICSMAGICK=$(usex graphicsmagick)
-		-DWANT_HUNSPELL=$(usex hunspell)
-		-DWANT_HEADERINSTALL=$(usex !minimal)
-		-DWANT_NOOSG=$(usex !osg)
-		-DWITH_PODOFO=$(usex pdf)
-		-DWANT_NOTEMPLATES=$(usex !templates)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if ! use tk; then
-		rm "${ED}"/usr/share/scribus-${SLOT}/scripts/{FontSample,CalendarWizard}.py || die
-	fi
-	if use scripts; then
-		python_fix_shebang "${ED}"/usr/share/scribus-${SLOT}/scripts
-		python_optimize "${ED}"/usr/share/scribus-${SLOT}/scripts
-	else
-		rm "${ED}"/usr/share/scribus-${SLOT}/scripts/*.py || die
-	fi
-
-	mv "${ED}"/usr/share/doc/${PF}/{en,html} || die
-	ln -sf html "${ED}"/usr/share/doc/${PF}/en || die
-
-	# These files are parsed to populate the help/about window.
-	cat >> "${T}"/COPYING <<- EOF || die
-	${PN} is licensed under the "${LICENSE}".
-	Please visit https://www.gnu.org/licenses/gpl-2.0.html for the complete license text.
-	EOF
-	dodoc "${T}"/COPYING
-	docompress -x /usr/share/doc/${PF}/en /usr/share/doc/${PF}/{AUTHORS,TRANSLATION,LINKS,COPYING}
-
-	local size
-	for size in 16 32 128 256 512; do
-		newicon -s $size resources/iconsets/artwork/icon_${size}x${size}.png scribus-${SLOT}.png
-	done
-	newicon -s 64 resources/iconsets/artwork/icon_32x32@2x.png scribus-${SLOT}.png
-	newicon resources/iconsets/1_5_1/scribus.png scribus-${SLOT}.png
-	newmenu scribus.desktop scribus-${SLOT}.desktop
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "MS Word .doc file import filter support" app-text/antiword
-}
diff --git a/app-office/scribus/scribus-1.6.3.ebuild b/app-office/scribus/scribus-1.6.3.ebuild
index 641ff2870f37..01029511526a 100644
--- a/app-office/scribus/scribus-1.6.3.ebuild
+++ b/app-office/scribus/scribus-1.6.3.ebuild
@@ -83,6 +83,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.5.3-fpic.patch
 	"${FILESDIR}"/${PN}-1.6.1-findhyphen.patch
 	"${FILESDIR}"/${PN}-1.7.0-fix-icon-version.patch
+	"${FILESDIR}"/${P}-poppler-25.02.0.patch # Version16x branch
 )
 
 src_prepare() {