gentoo auto-resync : 18:07:2024 - 12:29:01

10 files changed, 4 insertions, 318 deletions

diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index c76474f86ead..053bb2d9038f 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/calcurse/Manifest b/app-office/calcurse/Manifest
index e2839f4af6e6..b80f5a5a9926 100644
--- a/app-office/calcurse/Manifest
+++ b/app-office/calcurse/Manifest
@@ -1,6 +1,6 @@
 DIST calcurse-4.8.0.tar.gz 716234 BLAKE2B 3fc703626d5e17b78ff42c0ef4f554585efd8223c2bd9d8c2f7add681602dc585cf066ed7c55a040b2585ad07513b26a5297b3b41f4c94a043f61ad2ad9094c2 SHA512 ea156c4320abf97fdb5abc29ff1f9bc659a3cab0e571295ed04b42dd742c4c45a7d5958dc2d386fc0ee7bd733969a6275405d5cf10cd645c75cb97b6b9e571d6
 DIST calcurse-4.8.1.tar.gz 730787 BLAKE2B 0c34b85313c3414dffc08635f6f37feb0a1e0f6c03bcf3b71a6cc95ed8fb4430ab1339abce72850364251884d707acb6cbbed0143d930f8bb76310ca5951b779 SHA512 a0a0bcfceb28a4e363168711a3c2de8f6e94d7f12aa78ff40f157c247ea6a41646bd218a1defba2d128b131ed0ab71c4d417820a0af0adbaa215011b11f0a040
 EBUILD calcurse-4.8.0-r1.ebuild 1061 BLAKE2B b004d683f1e131fc8dda1956bde6b6821dd1a0312476b7aa46bbd773797dc500f25e94a62ab120386d3536bf3b0d86e85728e8927d041700fd55c95b27d4acb9 SHA512 d3c088aa8ed0dc78ea08e24f307b8c744a72d8daf62b37493737865831668fb356b519d0175c3c84a6b00c27ee018b79d27946981c4c4ae8b7cc00bb7c3f11fb
-EBUILD calcurse-4.8.1-r1.ebuild 1052 BLAKE2B 3c6f4c28c36a0598482ed2fc025551240e663ba2e442bc3331ab13e531953c5dfcc0833d1e7759c30463ebb25a8685507708eedfdeb2ddf2171b79c593fc8348 SHA512 97e855dbabfa7199d38fd059315966b075368d48dc5486a42dd10eb637db46be3e40a1cfe07cd2876d063a2a3c2b99d8d67c86f2ecf390b2030aa310dfcf262f
+EBUILD calcurse-4.8.1-r1.ebuild 1051 BLAKE2B ae57091a09cc76069cca552fd8b7b1822c44bb1147ccf662ead23e01ec33437933a37c5a8a890464b5f40eb7df586a058fcb717f312a25c2eb598495524b2b9c SHA512 c97ee99d964255846173ecc4e042f7fb26d3b668a2f9b8efd1523b920e1a9866a1a75ad793ce9fcce54ac7cef77ab679fd5bf87555c4df885c668f22eebed625
 EBUILD calcurse-4.8.1.ebuild 1063 BLAKE2B feca2d1e872f50d0e042a51970bde37eab337a3de960a6c58331876fc47d34506b2dcc14be41ef0ad6c113dd729cc411de3473ae8e2f61eef204022ac88235aa SHA512 27718c221d554853ec5831967c030bfcb209f1e1fda419777987835a43561d9250baa0f21bd4273528040a17cc205e16457034c3d0e8c9d3d2bd5b0d1aa3ddb1
 MISC metadata.xml 876 BLAKE2B b99953f6a4226dddb885201957911e1df6105e5bcbb2f69bbf20d35ef275d4c2a59388534ff1fc960285b9df8e96a4c9ce49a1aba945eab275fb418ee764d98c SHA512 c02a99a6f9ceeb94eee3f58d285f97e3d31d1bfaab82c410b9b48d0c9462190e834df8e3a8d634f8474a3ff519f2189d01ab02d6c2383fad54a8f4e6bd19c229
diff --git a/app-office/calcurse/calcurse-4.8.1-r1.ebuild b/app-office/calcurse/calcurse-4.8.1-r1.ebuild
index 632595c7f0b2..220cae348ddd 100644
--- a/app-office/calcurse/calcurse-4.8.1-r1.ebuild
+++ b/app-office/calcurse/calcurse-4.8.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://calcurse.org/files/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 IUSE="caldav doc"
 
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 41965b9a139a..401265b1ef93 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,17 +1,11 @@
 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-boost-1.85-2.patch 942 BLAKE2B 127bcc04259e6d70697c3ee2cc6588e6ec34c80a69a0d8978cfd41605dd4532f85718202132edc391b6e372a2718c7f0e9f4168f7d25b03bdd360095af4eaf59 SHA512 460bd65f8584d94c43580d110544cfbb44c9858ef25bb19b86cd19cde9641e1e62e1acdcc360d241306e25e5c801a9ba40c77644a109f4e513169493097747f2
-AUX scribus-1.6.1-boost-1.85.patch 1458 BLAKE2B 34fc90aa2c4f3e0d95f3b1726a496c407dbbf1acd337c594afcfc30d7dec85fe290e7411667d238870179008aba193ccc88bcdeb4b7e66c8573d9c4be3bd4386 SHA512 4afae51c247df799cfd9d4f936d0af7dcfd09b9dd21d974d4f830840f3e8170466a7e56340251070936f2640aa092cf7ea44e484fa05391454314779b6324760
 AUX scribus-1.6.1-findhyphen.patch 1787 BLAKE2B 28faaa033a876516333ce10f89cc741c56090c53e98b0b9dee44cd05153533b0fd088e178f087f1125365b199385463ae1e07add1a92976e32a8b500d6e2979c SHA512 772ded373a356a679416dcd4f87abaf4b2a47bcf48738a8d40103cadff6eb332381e07bd277c5013c5e112f5b2997b2e9667052b83324960990ce96fa7ec4542
-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
 DIST scribus-1.6.2.tar.xz 73129400 BLAKE2B 2da98dc322319db18a157f66aef024b7392dbbfaf22adba14f719b48c644d1cc1546cc4d0cccf6dfe479571cf84de6f5645e5d452154f96ddc886e390702d547 SHA512 2f691c1f6b7beada89be410a2936b23641913bf26bd2152974bbaa747aeafb05aa797356a85bd55c14f60f0031ce1addedc9a3ce3e92546ebbb45f96a5ff3e62
-EBUILD scribus-1.6.1-r1.ebuild 4135 BLAKE2B 024f5d049e6fc0ec798092fd1127b996d463ac4d17bfedc5b12cbf7ba967b9665d2ba3965aae529e7060ad51377f9b9b9f2335c65ccd4612654002f627d1109f SHA512 c51aa4048aed27376d48e682164bf62496e98d30af4e2c717f0d9dc3f65c03b2410b34e70c9356c09dc4701fc79d261130592973895a4b2e2bfb515e4ccec809
-EBUILD scribus-1.6.2.ebuild 4102 BLAKE2B 5e2a0cd07aae3d44d0439fc55343aede839ef7391e72c9e9dcfb92246f127f58faa1a597c2ff9a3564bc77522f709ceb9e424aa3a61540ce6e569f633104f028 SHA512 85b061e3e87e6d9dcf0c5e025ecc7e2acb533c2e7420bda14d3be53b91e5daa7b6b74f4d5061e74cf9fc22d89eeb7e03be956c2c3aaed5e997a7c6ad090b652f
+EBUILD scribus-1.6.2.ebuild 4098 BLAKE2B 00da5a091ba9a730846d9be6dbaa714992c453ac6fec9f50a2f98ae3d643db748e4c76a197dfa1ecfd52b75ba693cf30bdd25b35b57300268f907a6e1de0b76d SHA512 92172501c4807a70ac4d83792240f68fca088bd3f335c06fc2cceffbaa099aa40b2a1e10c72b2fc52ba9157c465ac51ccdc4f7f1eb38092bae3a13da46539cf1
 EBUILD scribus-1.6.9999.ebuild 4102 BLAKE2B 5e2a0cd07aae3d44d0439fc55343aede839ef7391e72c9e9dcfb92246f127f58faa1a597c2ff9a3564bc77522f709ceb9e424aa3a61540ce6e569f633104f028 SHA512 85b061e3e87e6d9dcf0c5e025ecc7e2acb533c2e7420bda14d3be53b91e5daa7b6b74f4d5061e74cf9fc22d89eeb7e03be956c2c3aaed5e997a7c6ad090b652f
 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-boost-1.85-2.patch b/app-office/scribus/files/scribus-1.6.1-boost-1.85-2.patch
deleted file mode 100644
index 55bc9934964b..000000000000
--- a/app-office/scribus/files/scribus-1.6.1-boost-1.85-2.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 3116328e804c7366ec64c4224cbf20b0f14e52c8 Mon Sep 17 00:00:00 2001
-From: Jean Ghali <jghali@libertysurf.fr>
-Date: Sun, 31 Mar 2024 21:40:42 +0000
-Subject: [PATCH] Fix C++20 related warning "template-id is not allowed for
- constructor in C++20"
-
-git-svn-id: svn://scribus.net/trunk/Scribus@26079 11d20701-8431-0410-a711-e3c959e3b870
---- a/scribus/third_party/lib2geom/rect.h
-+++ b/scribus/third_party/lib2geom/rect.h
-@@ -56,14 +56,14 @@ class D2<Interval> {
-   private:
-     Interval f[2];
-   public:
--    D2<Interval>() { f[X] = f[Y] = Interval(0, 0); }
-+    D2() { f[X] = f[Y] = Interval(0, 0); }
-     
--    D2<Interval>(Interval const &a, Interval const &b) {
-+    D2(Interval const &a, Interval const &b) {
-         f[X] = a;
-         f[Y] = b;
-     }
- 
--    D2<Interval>(Point const & a, Point const & b) {
-+    D2(Point const & a, Point const & b) {
-         f[X] = Interval(a[X], b[X]);
-         f[Y] = Interval(a[Y], b[Y]);
-     }
diff --git a/app-office/scribus/files/scribus-1.6.1-boost-1.85.patch b/app-office/scribus/files/scribus-1.6.1-boost-1.85.patch
deleted file mode 100644
index 9d5dc0868843..000000000000
--- a/app-office/scribus/files/scribus-1.6.1-boost-1.85.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 3e80b387a226f1abac2bcce6e4300467c189d264 Mon Sep 17 00:00:00 2001
-From: Jean Ghali <jghali@libertysurf.fr>
-Date: Sat, 1 Jun 2024 22:04:13 +0000
-Subject: [PATCH] #17229: scribus fails to compile with boost 1.85.0
-
-git-svn-id: svn://scribus.net/branches/Version16x/Scribus@26170 11d20701-8431-0410-a711-e3c959e3b870
---- a/scribus/third_party/lib2geom/point.h
-+++ b/scribus/third_party/lib2geom/point.h
-@@ -121,10 +121,14 @@ class Point {
- 
-     Point &operator*=(Matrix const &m);
- 
--    inline int operator == (const Point &in_pnt) {
-+    inline bool operator==(const Point &in_pnt) const {
-         return ((_pt[X] == in_pnt[X]) && (_pt[Y] == in_pnt[Y]));
-     }
- 
-+    inline bool operator!=(const Point &in_pnt) const {
-+        return ((_pt[X] != in_pnt[X]) || (_pt[Y] != in_pnt[Y]));
-+    }
-+
-     friend inline std::ostream &operator<< (std::ostream &out_file, const Geom::Point &in_pnt);
- };
- 
-@@ -144,14 +148,6 @@ inline Point operator^(Point const &a, Point const &b) {
-     return ret;
- }
- 
--//IMPL: boost::EqualityComparableConcept
--inline bool operator==(Point const &a, Point const &b) {
--    return (a[X] == b[X]) && (a[Y] == b[Y]);
--}
--inline bool operator!=(Point const &a, Point const &b) {
--    return (a[X] != b[X]) || (a[Y] != b[Y]);
--}
--
- /** This is a lexicographical ordering for points.  It is remarkably useful for sweepline algorithms*/
- inline bool operator<=(Point const &a, Point const &b) {
-     return ( ( a[Y] < b[Y] ) ||
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
deleted file mode 100644
index 0a8d317b6109..000000000000
--- a/app-office/scribus/files/scribus-1.6.1-poppler-24.03.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From dc2470990ab73c87fdd60068c99518ced01a3edd Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Mon, 4 Mar 2024 17:35:11 +0100
-Subject: [PATCH] Fix build with >=poppler-24.03.0
-
-Fixes build errors caused by:
-
-"Use an enum for Function getType"
-Upstream commit 6e3824d45d42cb806a28a2df84e4ab6bb3587083
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
---- 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
- 	VGradient FillGradient = VGradient(VGradient::linear);

- 	FillGradient.clearStops();

- 	GfxColorSpace *color_space = shading->getColorSpace();

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

-+	if (func->getType() == Function::Type::Stitching)

-+#else

- 	if (func->getType() == 3)

-+#endif

- 	{

- 		StitchingFunction *stitchingFunc = (StitchingFunction*)func;

- 		const double *bounds = stitchingFunc->getBounds();

-@@ -1753,7 +1757,11 @@ bool SlaOutputDev::axialShadedFill(GfxState *state, GfxAxialShading *shading, do
- 			FillGradient.addStop( ScColorEngine::getShadeColor(m_doc->PageColors[stopColor], m_doc, shade), stopPoint, 0.5, 1.0, stopColor, shade );

- 		}

- 	}

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

-+	else if ((func->getType() == Function::Type::Exponential) || (func->getType() == Function::Type::Sampled))

-+#else

- 	else if ((func->getType() == 2) || (func->getType() == 0))

-+#endif

- 	{

- 		GfxColor stop1;

- 		shading->getColor(0.0, &stop1);

-@@ -1865,7 +1873,11 @@ bool SlaOutputDev::radialShadedFill(GfxState *state, GfxRadialShading *shading,
- 	VGradient FillGradient = VGradient(VGradient::linear);

- 	FillGradient.clearStops();

- 	GfxColorSpace *color_space = shading->getColorSpace();

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

-+	if (func->getType() == Function::Type::Stitching)

-+#else

- 	if (func->getType() == 3)

-+#endif

- 	{

- 		StitchingFunction *stitchingFunc = (StitchingFunction*)func;

- 		const double *bounds = stitchingFunc->getBounds();

-@@ -1887,7 +1899,11 @@ bool SlaOutputDev::radialShadedFill(GfxState *state, GfxRadialShading *shading,
- 			FillGradient.addStop( ScColorEngine::getShadeColor(m_doc->PageColors[stopColor], m_doc, shade), stopPoint, 0.5, 1.0, stopColor, shade );

- 		}

- 	}

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

-+	else if ((func->getType() == Function::Type::Exponential) || (func->getType() == Function::Type::Sampled))

-+#else

- 	else if ((func->getType() == 2) || (func->getType() == 0))

-+#endif

- 	{

- 		GfxColor stop1;

- 		shading->getColor(0.0, &stop1);

--- 
-2.44.0
-
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
deleted file mode 100644
index 9d2ae918768c..000000000000
--- a/app-office/scribus/files/scribus-1.6.1-poppler-24.05.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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
deleted file mode 100644
index 3b20f7808237..000000000000
--- a/app-office/scribus/scribus-1.6.1-r1.ebuild
+++ /dev/null
@@ -1,154 +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/"
-SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.xz"
-S="${WORKDIR}/${P}"
-
-LICENSE="GPL-2"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="amd64 ppc ppc64 x86"
-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}"/${PN}-1.6.1-poppler-24.03.patch
-	"${FILESDIR}"/${PN}-1.6.1-poppler-24.05.patch
-	"${FILESDIR}"/${PN}-1.6.1-boost-1.85.patch
-	"${FILESDIR}"/${PN}-1.6.1-boost-1.85-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.2.ebuild b/app-office/scribus/scribus-1.6.2.ebuild
index 13ccc1b48d25..764455f39f70 100644
--- a/app-office/scribus/scribus-1.6.2.ebuild
+++ b/app-office/scribus/scribus-1.6.2.ebuild
@@ -17,7 +17,7 @@ if [[ "${PV}" == *9999* ]] ; then
 else
 	SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.xz"
 	S="${WORKDIR}/${P}"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ppc ppc64 x86"
 fi
 
 LICENSE="GPL-2"