gentoo auto-resync : 14:01:2025 - 06:41:37

13 files changed, 137 insertions, 517 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index def0df95a4b4..719d624728ff 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 2974b881556a..c6017b9a63ec 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,7 +1,8 @@
 AUX inkscape-1.4-gcc15.patch 1088 BLAKE2B 56e9e4e14d87d20d7a03e388105ccdaa219fc26146c771c2c6942ca82abee54fb43d0807ce0ddf59cc77ec6e5184db5e628980209f5eda651ac6ee09af96f74e SHA512 b6f18c645c9946a7052c2d93df1475f1d9db626f200754b767f4372c17e056389c93fc129385d1c9ed3f0e329866696adfb8a61f6e4bc4058c23f20324287072
 AUX inkscape-1.4-poppler-24.10-fix-backport.patch 19196 BLAKE2B 02f58958180e2362f1e11a1cbacd72611b37cdaa41abd922df6106ef5485f243ef105286a92727b5731a4d0f607846a3e0a48fa53e3b9542d3667f136fd07f9b SHA512 6283ccd63157bc8ccdcf6127afa72cb50a72a9f09ec2327a5f180f0eb2d212e5600ed0f3d31df845cf6d20c2fe84d01f1edb126f39456a27de36cca616495fb9
 AUX inkscape-1.4-poppler-24.11.0.patch 2860 BLAKE2B e22bdc2ba2b394e3a3b5dcaa47297034b3bf0ef5198ad52d858f473ddb3f07b9b74c6ebc440705c0ca5c143dd5a2712cf70a46d0211a197afd909e177a55799f SHA512 e5a21326bc1191a5c037698a89d3022613a840736f0199954a4685027786126cc65f889241cd813d98807168dd3ddd9156b2cb927d62e29087d2cd51d5fd41f3
+AUX inkscape-1.4-poppler-24.12.0.patch 2049 BLAKE2B 23db3612e7c1527394c23de92a4ae25d5120012bfb3f61ddb2d99c282b49f14bee82f25873a8be3e21eff5da55cccfa694317b73726663f9810dbf2060211097 SHA512 99946d8266f818b26993860a96aba32d23d548970b94fe9fc66aefe3bec088c04fae9bdf2f146600f9588e7b4158ac2660e09697e57d7f5d50669d2d56eb4023
 DIST inkscape-1.4.tar.xz 46321868 BLAKE2B 3f21402019995122f043f5ebd8f07e1c9548c507f27c494e4214e090c46acae016c21f950609c95cef2e1b0011693e6629326d733b257402391e2d919bcd0303 SHA512 3b81306b81416597073e7eda2a103112cee63493bcf96fa737bb1edfbd682ebb329e415bbbbfda877aef2a78dc376460040ebc5c0cc2c90c0fe60db5d7d12368
-EBUILD inkscape-1.4-r1.ebuild 5842 BLAKE2B fe1a661f60fdbbd5fa7756d983e3894b5518591339a94259967e0bf9c1e31a0b8738698dae019439d3e030c92936aa339e4b360ae660d03a082f6292e1c867d6 SHA512 569d883e4cde2214cb85c93cd9496d3ca30696436be0834c3b5d81166c56f5bdfd5f1f16936cff535385ac5f1c90d090600f3612d4b2662897da124a989856af
+EBUILD inkscape-1.4-r1.ebuild 5897 BLAKE2B 270efa14f368ed220b2463ce7f75ce55f8f9cced82f827cf8c0bb82e31f5049e8e56fae3bdfd3139943064d2a0576c0601563a17c9ec90e0d25831cc7649924b SHA512 cb7212c9894cb5e5f5243a3a0eb0bd4d59412a77eda1cf0385686ce1fa0f2ec4dfce70aa97256b8046edebb847232f90ccb6c48aa97e53f20d00d4db3998f3a6
 EBUILD inkscape-9999.ebuild 5683 BLAKE2B 9cb6edc014ae7b2f98a7c919ffd5a71a79168e406f4b6a2eb399e59200f9d0aa13990696c7f63b4910546bb02fd2cbd9a317337dfc184151ad6c625a6b105a47 SHA512 9ed2fcf53d8403a81903ecc62c1be47d36d3f8e62a08e7f1956f50fba72c3f241d542f5bcff0d8f3bf323ed668268643331d89dd7b2d9dc8fc1b09ae57818e09
 MISC metadata.xml 982 BLAKE2B f44f534865614c8dd7bf71e92ce69cff708fc08e3eb701765bf93144b433ec52df52a506b69cc98969909c695015881b60592cccdf27613c6fe82812fc50727b SHA512 2963a9b473f139d06cefd1c3231ef148045c005adb4688850522c183f39ba15a36331b7eae7752e9bf15a26e6370f2af14ec02e59735f1753246c45821c0cdbc
diff --git a/media-gfx/inkscape/files/inkscape-1.4-poppler-24.12.0.patch b/media-gfx/inkscape/files/inkscape-1.4-poppler-24.12.0.patch
new file mode 100644
index 000000000000..f4e0a8391b78
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-1.4-poppler-24.12.0.patch
@@ -0,0 +1,53 @@
+From c9046810d899a408bfbd489aad91872b1203ee6d Mon Sep 17 00:00:00 2001
+From: KrIr17 <elendil.krir17@gmail.com>
+Date: Thu, 5 Dec 2024 15:03:47 +0100
+Subject: [PATCH] Fix building with poppler 24.12.0
+
+Fixes https://gitlab.com/inkscape/inkscape/-/issues/5415
+---
+ src/extension/internal/pdfinput/pdf-parser.cpp           | 4 +++-
+ src/extension/internal/pdfinput/poppler-transition-api.h | 6 ++++++
+ 2 files changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
+index 28000a87b0c..9ea30b90a48 100644
+--- a/src/extension/internal/pdfinput/pdf-parser.cpp
++++ b/src/extension/internal/pdfinput/pdf-parser.cpp
+@@ -2403,6 +2403,7 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg)
+     int bits;
+     GBool interpolate;
+     StreamColorSpaceMode csMode;
++    GBool hasAlpha;
+     GBool mask;
+     GBool invert;
+     Object maskObj, smaskObj;
+@@ -2414,7 +2415,8 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg)
+     // get info from the stream
+     bits = 0;
+     csMode = streamCSNone;
+-    str->getImageParams(&bits, &csMode);
++    hasAlpha = false;
++    str->_POPPLER_GET_IMAGE_PARAMS(&bits, &csMode, &hasAlpha);
+     
+     // get stream dict
+     dict = str->getDict();
+diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h
+index 8f03aa17779..b7a54828e74 100644
+--- a/src/extension/internal/pdfinput/poppler-transition-api.h
++++ b/src/extension/internal/pdfinput/poppler-transition-api.h
+@@ -39,6 +39,12 @@
+ #define _POPPLER_FUNCTION_TYPE_STITCHING 3
+ #endif
+ 
++#if POPPLER_CHECK_VERSION(24,12,0)
++#define _POPPLER_GET_IMAGE_PARAMS(bits, csMode, hasAlpha) getImageParams(bits, csMode, hasAlpha)
++#else
++#define _POPPLER_GET_IMAGE_PARAMS(bits, csMode, hasAlpha) getImageParams(bits, csMode)
++#endif
++
+ #if POPPLER_CHECK_VERSION(22, 4, 0)
+ #define _POPPLER_FONTPTR_TO_GFX8(font_ptr) ((Gfx8BitFont *)font_ptr.get())
+ #else
+-- 
+GitLab
+
diff --git a/media-gfx/inkscape/inkscape-1.4-r1.ebuild b/media-gfx/inkscape/inkscape-1.4-r1.ebuild
index ad760e5f993d..574250c2b239 100644
--- a/media-gfx/inkscape/inkscape-1.4-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.4-r1.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
@@ -116,6 +116,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.4-gcc15.patch
 	"${FILESDIR}"/${PN}-1.4-poppler-24.10-fix-backport.patch
 	"${FILESDIR}"/${P}-poppler-24.11.0.patch # bug 943499
+	"${FILESDIR}"/${P}-poppler-24.12.0.patch # bug 946597
 )
 
 pkg_pretend() {
diff --git a/media-gfx/kxstitch/Manifest b/media-gfx/kxstitch/Manifest
index b821a52a8449..d0a8bea3ba44 100644
--- a/media-gfx/kxstitch/Manifest
+++ b/media-gfx/kxstitch/Manifest
@@ -1,6 +1,3 @@
-AUX kxstitch-2.2.0-drop-xkeylock.patch 5150 BLAKE2B ebe404416d6c836f2326c31fc9fc76598ef5197a7c1804c1bad80b7bc8606b3884bec11486beeab237c0af875169f89f0af374bbe3a9aa07be6460a28d138f94 SHA512 27dd3d84dfc445cfff4c4927966f413e0b4a5fee462a46fbaec66fa49484a8f4ccb9ed52cc56f43a19f7819fba22f7cf020f754d96d7145da07584609b9eb95f
-AUX kxstitch-2.2.0-fix-hidpi.patch 672 BLAKE2B 51f90ea504319a3e558d51c8a5d5eb8166f45880624c3680e3ea5aaad08b43efb6b50c56f6aa1eb95722f3241cafcd57defb9694669efb28fc5a54b24f5467a6 SHA512 e59439e147a57eb7085acf6c7b80cbb891945597add70e517d709f1ca34b8daa45c9f4a73abee825516e090b95ee7ba40ec940d471efad00ee1ae82fc12c6ee5
-AUX kxstitch-2.2.0-fix-render-scaled-painter.patch 7804 BLAKE2B 92d7b6677de47ddda7462e6cdcda96a57460c1540365096a0ab912452c6fc84434bbf2a802dbc881b8392d3222c773e90bfc286b673c9889645c274722d9e965 SHA512 fd1621d2aa789b305bc026a75bed9a0acd64e17e861628673beb4eb4a6f87e56e53a4f28585f056ae8a47d8adbdb3510aa21896d6400af41e1df97f3cc0620f5
-DIST kxstitch-2.2.0.tar.xz 1784360 BLAKE2B 6d06090bb33ccd4db7e8b8a3521b0e1377f253b472cc500862b1b8b0da1abf0d759a85a870b50a1a1f55f385274cdc94761e612a838d93aaffb76191df725150 SHA512 bf09130a35bc605db2bbd6e5e129ac494e8f02b920d4a8d6705b5030a9339306b3b302bd988839e1684da3e5e15e91d655dadf916eb4bf2dc9c1322fd435281d
-EBUILD kxstitch-2.2.0-r1.ebuild 1170 BLAKE2B d363e212e1d955dc285b672460fb075d9442f248783e6bd4be3a2c17adce39d29502243dd503edce5c9a4d8d05928ee46b0bab1fc29cbd30c789ab82728c913a SHA512 431b1a42e3919b86c425b0f1b4dbd3d9d37ccd7e3f9fd310a1b6759d6714ec09531e2122ccb3400c8181cf7bdfe0ff1d4170e3f87a605c747837cc8767a352ea
+DIST kxstitch-3.0.0_pre20250110-073debc5.tar.gz 2407504 BLAKE2B b564193a21094f25356cc2ef90815c90f975d307ef3fed2468ebf5f2a980e1976e5267a8362bb441ca7e67f4f53e3c64e481c285a243d0c0d5a77ee2b7ae0c41 SHA512 e4888f526c113425efad0a7de5705e5e9b28359ef581dc0445be6492754c61ff689233583907d953298532da025769b99ed2e54c3e9b2f4f7c0688c4265e5533
+EBUILD kxstitch-3.0.0_pre20250110.ebuild 998 BLAKE2B 4d04ec03827d1450b10a89f130333a6728fd0758132db1159ad5edb8eb1bb6ea9ab8775a4ba023d42016dbbf0466f203ce1ad320e912dd0c87207c502e1be796 SHA512 1fc7b296c2703d8e6e61226cea0a72ee86cfc3663944af2b9a4dce698dd89b515108e76712b90cbcade2ee22e0a06318d16301af4af49a867e4fd3425acc9e95
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/media-gfx/kxstitch/files/kxstitch-2.2.0-drop-xkeylock.patch b/media-gfx/kxstitch/files/kxstitch-2.2.0-drop-xkeylock.patch
deleted file mode 100644
index 805a67ea97c8..000000000000
--- a/media-gfx/kxstitch/files/kxstitch-2.2.0-drop-xkeylock.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-From f97d3eaf4c06b4740fcec63c9c0ca64a5bd56281 Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino@kde.org>
-Date: Sun, 28 Jun 2020 12:01:49 +0200
-Subject: [PATCH] cmake: require KGuiAddons
-
-It will be used soon.
----
- CMakeLists.txt | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 36e3169..7ccf7f0 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -32,6 +32,7 @@ find_package (KF5 REQUIRED COMPONENTS
-     Config
-     ConfigWidgets
-     Completion
-+    GuiAddons
-     I18n
-     KIO
-     TextWidgets
-@@ -145,6 +146,7 @@ target_link_libraries (kxstitch
-     Qt5::X11Extras
-     KF5::Completion
-     KF5::ConfigGui
-+    KF5::GuiAddons
-     KF5::KIOFileWidgets
-     KF5::I18n
-     KF5::TextWidgets
--- 
-GitLab
-
-From 817be56369a25de4dd12f2548f97e4ebcfb73571 Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino@kde.org>
-Date: Sun, 28 Jun 2020 12:02:34 +0200
-Subject: [PATCH] Switch from XKeyLock to KModifierKeyInfo
-
-Use KModifierKeyInfo from the KGuiAddons framework to get the status
-of keys. In particular, use it to get the status of the Caps Lock key
-instead of the local XKeyLock implementation.
-
-The KModifierKeyInfo object is kept as class member to avoid recreating
-it at each key press in Alphabet mode.
----
- src/Editor.cpp | 4 +---
- src/Editor.h   | 4 ++++
- 2 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/src/Editor.cpp b/src/Editor.cpp
-index bba0760..163e88e 100644
---- a/src/Editor.cpp
-+++ b/src/Editor.cpp
-@@ -46,7 +46,6 @@
- #include "Scale.h"
- #include "SchemeManager.h"
- #include "TextToolDlg.h"
--#include "XKeyLock.h"
- 
- 
- const Editor::keyPressCallPointer Editor::keyPressCallPointers[] = {
-@@ -858,10 +857,9 @@ void Editor::keyPressText(QKeyEvent *e)
- 
- void Editor::keyPressAlphabet(QKeyEvent *e)
- {
--    XKeyLock keylock(QX11Info::display());
-     Qt::KeyboardModifiers modifiers = e->modifiers();
- 
--    if (keylock.getCapsLock() && Configuration::alphabet_UseCapsLock()) {
-+    if (m_keyInfo.isKeyPressed(Qt::Key_CapsLock) && Configuration::alphabet_UseCapsLock()) {
-         modifiers = static_cast<Qt::KeyboardModifiers>(modifiers ^ Qt::ShiftModifier);
-     }
- 
-diff --git a/src/Editor.h b/src/Editor.h
-index 3189249..8345a38 100644
---- a/src/Editor.h
-+++ b/src/Editor.h
-@@ -16,6 +16,8 @@
- #include <QStack>
- #include <QWidget>
- 
-+#include <KModifierKeyInfo>
-+
- #include "Stitch.h"
- 
- #include "configuration.h"
-@@ -337,6 +339,8 @@ private:
-     QStack<QPoint>  m_cursorStack;
-     QMap<int, int>  m_cursorCommands;
- 
-+    KModifierKeyInfo m_keyInfo;
-+
-     typedef void (Editor::*keyPressCallPointer)(QKeyEvent*);
-     typedef void (Editor::*toolInitCallPointer)();
-     typedef void (Editor::*toolCleanupCallPointer)();
--- 
-GitLab
-
-From 17d6a17830ce190cd21f266dd319e36e4865e30a Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino@kde.org>
-Date: Sun, 28 Jun 2020 12:13:37 +0200
-Subject: [PATCH] Drop XKeyLock & X11 leftovers
-
-XKeyLock is not used anymore, so it can be dropped together with the
-X11 and QX11Extras requirements.
----
- CMakeLists.txt   |   6 --
- src/Editor.cpp   |   1 -
- src/XKeyLock.cpp | 202 -----------------------------------------------
- src/XKeyLock.h   |  70 ----------------
- 4 files changed, 279 deletions(-)
- delete mode 100644 src/XKeyLock.cpp
- delete mode 100644 src/XKeyLock.h
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7ccf7f0..c225859 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -23,7 +23,6 @@ find_package (Qt5 CONFIG REQUIRED
-     Core
-     PrintSupport
-     Widgets
--    X11Extras
- )
- 
- find_package (KF5DocTools)
-@@ -41,7 +40,6 @@ find_package (KF5 REQUIRED COMPONENTS
- )
- 
- find_package (ImageMagick COMPONENTS MagickCore Magick++ REQUIRED)
--find_package (X11 REQUIRED)
- find_package (Doxygen)
- find_package (SharedMimeInfo)
- 
-@@ -57,7 +55,6 @@ include_directories (BEFORE ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_D
- # only in older cmake versions, while the latter only in newer ones
- include_directories (${ImageMagick_Magick++_INCLUDE_DIR} ${ImageMagick_MagickCore_INCLUDE_DIR})
- include_directories (${ImageMagick_Magick++_INCLUDE_DIRS} ${ImageMagick_MagickCore_INCLUDE_DIRS})
--include_directories (${X11_INCLUDE_DIR})
- 
- set (kxstitch_SRCS
-     src/BackgroundImage.cpp
-@@ -96,7 +93,6 @@ set (kxstitch_SRCS
-     src/Symbol.cpp
-     src/SymbolLibrary.cpp
-     src/SymbolManager.cpp
--    src/XKeyLock.cpp
- 
-     src/AlphaSelect.cpp
-     src/CalibrateFlossDlg.cpp
-@@ -143,7 +139,6 @@ target_link_libraries (kxstitch
-     Qt5::Core
-     Qt5::PrintSupport
-     Qt5::Widgets
--    Qt5::X11Extras
-     KF5::Completion
-     KF5::ConfigGui
-     KF5::GuiAddons
-@@ -153,7 +148,6 @@ target_link_libraries (kxstitch
-     KF5::WidgetsAddons
-     KF5::XmlGui
-     ${ImageMagick_Magick++_LIBRARY} ${ImageMagick_MagickCore_LIBRARY}
--    ${X11_LIBRARIES}
- )
- 
- set (WITH_PROFILING OFF CACHE BOOL "Build with profiling support")
-diff --git a/src/Editor.cpp b/src/Editor.cpp
-index 163e88e..4d314e4 100644
---- a/src/Editor.cpp
-+++ b/src/Editor.cpp
-@@ -24,7 +24,6 @@
- #include <QScrollArea>
- #include <QStyleOptionRubberBand>
- #include <QToolTip>
--#include <QX11Info>
- 
- #include <KLocalizedString>
- #include <KMessageBox>
--- 
-GitLab
diff --git a/media-gfx/kxstitch/files/kxstitch-2.2.0-fix-hidpi.patch b/media-gfx/kxstitch/files/kxstitch-2.2.0-fix-hidpi.patch
deleted file mode 100644
index bf5d94dae4d6..000000000000
--- a/media-gfx/kxstitch/files/kxstitch-2.2.0-fix-hidpi.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 44d231b5604480601bedc623ca2f5204bd4a3ac8 Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Sun, 11 Sep 2022 15:55:44 +0200
-Subject: [PATCH] Enable highdpi scaling and pixmaps
-
----
- src/Main.cpp | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/Main.cpp b/src/Main.cpp
-index 0af162a..4088d37 100644
---- a/src/Main.cpp
-+++ b/src/Main.cpp
-@@ -85,6 +85,9 @@
-     */
- int main(int argc, char *argv[])
- {
-+    QGuiApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
-+    QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-+
-     QApplication app(argc, argv);
-     KLocalizedString::setApplicationDomain("kxstitch");
- 
--- 
-GitLab
-
diff --git a/media-gfx/kxstitch/files/kxstitch-2.2.0-fix-render-scaled-painter.patch b/media-gfx/kxstitch/files/kxstitch-2.2.0-fix-render-scaled-painter.patch
deleted file mode 100644
index 5b2bc07aa1ed..000000000000
--- a/media-gfx/kxstitch/files/kxstitch-2.2.0-fix-render-scaled-painter.patch
+++ /dev/null
@@ -1,202 +0,0 @@
-From c9e6a03c32fe6e6901fad8439bf2235ddb8c288c Mon Sep 17 00:00:00 2001
-From: Steve Allewell <steve.allewell@gmail.com>
-Date: Sun, 3 Jan 2021 13:43:59 +0000
-Subject: [PATCH] Fix for rendering on scaled painter
-
-Fixes for rendering seletion areas on scaled painter in recent versions
-of Qt which were half a square out.
----
- src/Editor.cpp | 74 ++++++++++++++++++++++++++++----------------------
- 1 file changed, 41 insertions(+), 33 deletions(-)
-
-diff --git a/src/Editor.cpp b/src/Editor.cpp
-index 4d314e4..263df1e 100644
---- a/src/Editor.cpp
-+++ b/src/Editor.cpp
-@@ -1388,11 +1388,12 @@ void Editor::renderRubberBandRectangle(QPainter *painter, const QRect&)
-     if (m_rubberBand.isValid()) {
-         painter->setRenderHint(QPainter::Qt4CompatiblePainting, true);
- 
-+        painter->resetTransform();
-         QStyleOptionRubberBand opt;
-         opt.initFrom(this);
-         opt.shape = QRubberBand::Rectangle;
-         opt.opaque = false;
--        opt.rect = m_rubberBand.adjusted(0, 0, 1, 1);
-+        opt.rect = rectToContents(m_rubberBand);
- 
-         style()->drawControl(QStyle::CE_RubberBand, &opt, painter);
-     }
-@@ -1408,14 +1409,15 @@ void Editor::renderRubberBandEllipse(QPainter *painter, const QRect&)
-     if (m_rubberBand.isValid()) {
-         painter->setRenderHint(QPainter::Qt4CompatiblePainting, true);
- 
--        painter->setPen(Qt::NoPen);
--        painter->setBrush(QColor(200,225,255));
--        painter->setOpacity(0.5);
--        painter->drawEllipse(m_rubberBand);
-+        painter->resetTransform();
-+        QStyleOptionRubberBand opt;
-+        opt.initFrom(this);
- 
--        painter->setPen(Qt::darkBlue);
--        painter->setBrush(Qt::NoBrush);
--        painter->drawEllipse(m_rubberBand);
-+        painter->setPen(opt.palette.color(QPalette::WindowText));
-+        painter->setBrush(QBrush(opt.palette.color(QPalette::Highlight), Qt::Dense4Pattern));
-+        painter->setBackground(QBrush(opt.palette.base()));
-+        painter->setBackgroundMode(Qt::TransparentMode);
-+        painter->drawEllipse(rectToContents(m_rubberBand));
-     }
- 
-     painter->restore();
-@@ -1427,7 +1429,10 @@ void Editor::renderFillPolygon(QPainter *painter, const QRect&)
-     QPolygonF polyline;
-     painter->save();
- 
--    painter->setPen(Qt::green);         // use green for the first point
-+    QPen pen(Qt::green);
-+    pen.setWidth(0);
-+
-+    painter->setPen(pen);         // use green for the first point
-     painter->setBrush(Qt::green);
- 
-     QVector<QPoint>::const_iterator i;
-@@ -1435,7 +1440,8 @@ void Editor::renderFillPolygon(QPainter *painter, const QRect&)
-     for (i = m_polygon.constBegin() ; i != m_polygon.constEnd() ; ++i) {
-         QPointF cell = QPointF(*i) + QPointF(0.5, 0.5);
-         painter->drawEllipse(QRectF(-0.5, -0.5, 1, 1).translated(cell));
--        painter->setPen(Qt::blue);      // use blue for subsequent points
-+        pen.setColor(Qt::blue);
-+        painter->setPen(pen);      // use blue for subsequent points
-         painter->setBrush(Qt::blue);
-         polyline.append(cell);
-     }
-@@ -1555,9 +1561,9 @@ void Editor::mouseMoveEvent_Draw(QMouseEvent *e)
- 
-     dynamic_cast<QScrollArea *>(parentWidget()->parentWidget())->ensureVisible(p.x(), p.y());
- 
--    m_cellTracking = contentsToCell(p);
--    m_cellEnd = m_cellTracking;
--    m_rubberBand = QRect(m_cellStart, m_cellEnd).normalized();
-+    m_cellEnd = m_cellTracking = contentsToCell(p);
-+    m_rubberBand = QRect(m_cellStart, QSize(1, 1)).united(QRect(m_cellEnd, QSize(1, 1)));
-+
-     update();
- }
- 
-@@ -1703,9 +1709,9 @@ void Editor::mouseMoveEvent_Rectangle(QMouseEvent *e)
- 
-     dynamic_cast<QScrollArea *>(parentWidget()->parentWidget())->ensureVisible(p.x(), p.y());
- 
--    m_cellTracking = contentsToCell(p);
--    m_cellEnd = m_cellTracking;
--    m_rubberBand = QRect(m_cellStart, m_cellEnd).normalized();
-+    m_cellEnd = m_cellTracking = contentsToCell(p);
-+    m_rubberBand = QRect(m_cellStart, QSize(1, 1)).united(QRect(m_cellEnd, QSize(1, 1)));
-+
-     update();
- }
- 
-@@ -1757,9 +1763,9 @@ void Editor::mouseMoveEvent_FillRectangle(QMouseEvent *e)
- 
-     dynamic_cast<QScrollArea *>(parentWidget()->parentWidget())->ensureVisible(p.x(), p.y());
- 
--    m_cellTracking = contentsToCell(p);
--    m_cellEnd = m_cellTracking;
--    m_rubberBand = QRect(m_cellStart, m_cellEnd).normalized();
-+    m_cellEnd = m_cellTracking = contentsToCell(p);
-+    m_rubberBand = QRect(m_cellStart, QSize(1, 1)).united(QRect(m_cellEnd, QSize(1, 1)));
-+
-     update();
- }
- 
-@@ -1793,9 +1799,9 @@ void Editor::mouseMoveEvent_Ellipse(QMouseEvent *e)
- 
-     dynamic_cast<QScrollArea *>(parentWidget()->parentWidget())->ensureVisible(p.x(), p.y());
- 
--    m_cellTracking = contentsToCell(p);
--    m_cellEnd = m_cellTracking;
--    m_rubberBand = QRect(m_cellStart, m_cellEnd).normalized();
-+    m_cellEnd = m_cellTracking = contentsToCell(p);
-+    m_rubberBand = QRect(m_cellStart, QSize(1, 1)).united(QRect(m_cellEnd, QSize(1, 1)));
-+
-     update();
- }
- 
-@@ -1848,9 +1854,9 @@ void Editor::mouseMoveEvent_FillEllipse(QMouseEvent *e)
- 
-     dynamic_cast<QScrollArea *>(parentWidget()->parentWidget())->ensureVisible(p.x(), p.y());
- 
--    m_cellTracking = contentsToCell(p);
--    m_cellEnd = m_cellTracking;
--    m_rubberBand = QRect(m_cellStart, m_cellEnd).normalized();
-+    m_cellEnd = m_cellTracking = contentsToCell(p);
-+    m_rubberBand = QRect(m_cellStart, QSize(1, 1)).united(QRect(m_cellEnd, QSize(1, 1)));
-+
-     update();
- }
- 
-@@ -1877,7 +1883,7 @@ void Editor::mouseReleaseEvent_FillEllipse(QMouseEvent*)
-         painter.setRenderHint(QPainter::Antialiasing, !useFractionals);
-         painter.setPen(QPen(Qt::color1));
-         painter.setBrush(Qt::color1);
--        painter.drawEllipse(QRect(m_cellStart, m_cellEnd).normalized());
-+        painter.drawEllipse(QRect(m_cellStart, QSize(1,1)).united(QRect(m_cellEnd, QSize(1, 1))));
-         painter.end();
- 
-         QUndoCommand *cmd = new FillEllipseCommand(m_document);
-@@ -1894,6 +1900,7 @@ void Editor::mousePressEvent_FillPolygon(QMouseEvent *e)
- {
-     m_cellStart = m_cellTracking = m_cellEnd = contentsToCell(e->pos());
-     m_polygon.append(m_cellStart);
-+
-     update();
- }
- 
-@@ -2001,6 +2008,7 @@ void Editor::mouseReleaseEvent_Alphabet(QMouseEvent *e)
- 
-     m_cellStart = m_cellTracking = m_cellEnd = contentsToCell(e->pos());
-     m_cursorStack.push(m_cellEnd);
-+
-     update();
- }
- 
-@@ -2023,9 +2031,9 @@ void Editor::mouseMoveEvent_Select(QMouseEvent *e)
- 
-     dynamic_cast<QScrollArea *>(parentWidget()->parentWidget())->ensureVisible(p.x(), p.y());
- 
--    m_cellTracking = contentsToCell(p);
--    m_cellEnd = m_cellTracking;
--    m_rubberBand = QRect(m_cellStart, m_cellEnd).normalized();
-+    m_cellEnd = m_cellTracking = contentsToCell(p);
-+    m_rubberBand = QRect(m_cellStart, QSize(1, 1)).united(QRect(m_cellEnd, QSize(1, 1)));
-+
-     update();
- 
-     QToolTip::showText(QCursor::pos(), QString::fromLatin1("%1,%2 %3 x %4").arg(m_rubberBand.left()).arg(m_rubberBand.top()).arg(m_rubberBand.width()).arg(m_rubberBand.height()));
-@@ -2034,7 +2042,7 @@ void Editor::mouseMoveEvent_Select(QMouseEvent *e)
- 
- void Editor::mouseReleaseEvent_Select(QMouseEvent*)
- {
--    m_selectionArea = QRect(m_cellStart, m_cellEnd).normalized();
-+    m_selectionArea = m_rubberBand;
-     emit(selectionMade(true));
- }
- 
-@@ -2052,9 +2060,9 @@ void Editor::mouseMoveEvent_Backstitch(QMouseEvent *e)
- 
-     dynamic_cast<QScrollArea *>(parentWidget()->parentWidget())->ensureVisible(p.x(), p.y());
- 
--    m_cellTracking = contentsToSnap(p);
--    m_cellEnd = m_cellTracking;
--    m_rubberBand = (snapToCells(m_cellStart).united(snapToCells(m_cellEnd))).normalized();
-+    m_cellEnd = m_cellTracking = contentsToSnap(p);
-+    m_rubberBand = snapToCells(m_cellStart).united(snapToCells(m_cellEnd));
-+
-     update();
- }
- 
--- 
-GitLab
-
diff --git a/media-gfx/kxstitch/kxstitch-2.2.0-r1.ebuild b/media-gfx/kxstitch/kxstitch-2.2.0-r1.ebuild
deleted file mode 100644
index 927de1cf02ef..000000000000
--- a/media-gfx/kxstitch/kxstitch-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.82.0
-QTMIN=5.15.5
-inherit ecm kde.org
-
-DESCRIPTION="Program to create cross stitch patterns"
-HOMEPAGE="https://apps.kde.org/kxstitch/ https://userbase.kde.org/KXStitch"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	media-gfx/imagemagick[cxx]
-"
-RDEPEND="${DEPEND}"
-BDEPEND="sys-devel/gettext"
-
-PATCHES=(
-	"${FILESDIR}/${P}-drop-xkeylock.patch"
-	"${FILESDIR}/${P}-fix-render-scaled-painter.patch"
-	"${FILESDIR}/${P}-fix-hidpi.patch"
-)
diff --git a/media-gfx/kxstitch/kxstitch-3.0.0_pre20250110.ebuild b/media-gfx/kxstitch/kxstitch-3.0.0_pre20250110.ebuild
new file mode 100644
index 000000000000..3a9523862ca1
--- /dev/null
+++ b/media-gfx/kxstitch/kxstitch-3.0.0_pre20250110.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_COMMIT=073debc567d0d6e14bbe560b2322dd1571520a96
+ECM_HANDBOOK="forceoptional"
+KFMIN=6.5.0
+QTMIN=6.7.2
+inherit ecm kde.org
+
+DESCRIPTION="Program to create cross stitch patterns"
+HOMEPAGE="https://apps.kde.org/kxstitch/ https://userbase.kde.org/KXStitch"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets,xml]
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	media-gfx/imagemagick[cxx]
+"
+RDEPEND="${DEPEND}
+	!${CATEGORY}/${PN}:5
+"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
diff --git a/media-gfx/pencil/Manifest b/media-gfx/pencil/Manifest
index b91387bf12c6..ed80946b9737 100644
--- a/media-gfx/pencil/Manifest
+++ b/media-gfx/pencil/Manifest
@@ -1,4 +1,3 @@
-DIST catch.hpp 656886 BLAKE2B 590fabc7970b97f333457f409276688f69a66de7fa3c43d767994ed212a3b5bde6e6c113c36a0ff03dd95bbb0cdb38cc12b43a96d16644525ea7425e028485a6 SHA512 ca401efb224e87c4f9d9f3bd58102d3223ef3356149837be2474fa2dbae645272c1ecb17d7db96c2b43b97034aacb63f840f4ebec16f2f3d447c1cc80a500d40
-DIST pencil-0.6.6.tar.gz 3807612 BLAKE2B a4933399ea7f3103eb097756684f42061f5db4c419983458ce8ad317e7eab667ccc5c29c6bf9a3dec5fe57887c4456b64c6e93be889684bd2b567c247aa6dfeb SHA512 1cb976011a1270a2715568fc740db28e6b1a0f050ff7cc2630687edb6e4b57245bf8f58e69721dabab0a2bd65f58780176e2a59691ed0b19f7276c1aad950e7d
-EBUILD pencil-0.6.6-r1.ebuild 1143 BLAKE2B 340348efb43e721af121328ca77e0a001cbf04e37537648db0b255f5095e4ca3b1be16efd59ee995b9fc957dcc563105af4072d67370dc9032f2fa86a29f136d SHA512 433bf1ac6a8fc8fb233352f3561a5e4d5be26a2a5e817a5a57db9df6e1d8041eb675ca36694d8182ea1cff48c4878939a2c795f00cb21e455a7361751870de56
+DIST pencil-0.7.0.tar.gz 3890882 BLAKE2B 56becddb43dd6e4cc1308238a2019aad3b7b056f2dfb182ea7c6591d502a7a0fda3f5d7783502c30c0c6f69b4e2a636e9461040c19c9818c74bfab2591c41ae0 SHA512 313ce4014b80ea94ba613d6d6a6e79894a224753ce083273d781e703617edd3f61a6fc33561d376cfdab8d99e2a13a645617943c91f40dec8b172d3ef0857e08
+EBUILD pencil-0.7.0.ebuild 805 BLAKE2B 901a23118fdee4b012975348e194bcfe934ef4d95ae03980da705b3409b70fed5d34276a41a90f750fe66f4979b23a58e7a1dad9be809031025f748c091f8107 SHA512 80f885d59076f1479392b6c73adf96130a4695edaa971d35772b2cd92b5ebcb2c83c60758dbd4fd68671d022e38933331c320ab09bdf0d65e56f26c1d52311fe
 MISC metadata.xml 325 BLAKE2B 19b0b8649907eede4a6de1f0a534f43f058d51b61e260fc94729899bb72f9e700893cb904ebb1e569c512040aaa68ff4d4da172a2cb8dafdfb1eae0907e13160 SHA512 50c8ce1c4c7e3f8f1f8150fb117981bc34147325fe68cb0fb8953c19b86290fa44f2ba8a9dcb565e31ce0030c1cda8998a4bc03a9f735837d5ffb555572583c3
diff --git a/media-gfx/pencil/pencil-0.6.6-r1.ebuild b/media-gfx/pencil/pencil-0.6.6-r1.ebuild
deleted file mode 100644
index 5eb1e6e06838..000000000000
--- a/media-gfx/pencil/pencil-0.6.6-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qmake-utils xdg-utils
-
-DESCRIPTION="2D animation and drawing program based on Qt5"
-HOMEPAGE="https://www.pencil2d.org/"
-SRC_URI="https://github.com/pencil2d/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz
-	https://raw.githubusercontent.com/pencil2d/pencil/617c8868fd27ce540de285ff75c8946fba0c975b/tests/src/catch.hpp"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-"
-DEPEND="${RDEPEND}
-	test? ( dev-qt/qttest:5 )
-"
-
-S="${WORKDIR}/${P/_/-}"
-
-src_prepare() {
-	cp "${DISTDIR}"/catch.hpp tests/src/
-	default
-	sed -e "/^QT/s/xmlpatterns //" \
-		-i core_lib/core_lib.pro tests/tests.pro || die
-}
-
-src_configure() {
-	eqmake5 PREFIX=/usr $(usex test "" "CONFIG+=NO_TESTS")
-}
-
-src_install() {
-	einstalldocs
-	emake INSTALL_ROOT="${D}" install
-	# TODO: Install l10n files
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/pencil/pencil-0.7.0.ebuild b/media-gfx/pencil/pencil-0.7.0.ebuild
new file mode 100644
index 000000000000..754e9dc03f06
--- /dev/null
+++ b/media-gfx/pencil/pencil-0.7.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qmake-utils xdg
+
+DESCRIPTION="2D animation and drawing program based on Qt"
+HOMEPAGE="https://www.pencil2d.org/"
+SRC_URI="https://github.com/pencil2d/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P/_/-}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-qt/qtbase:6[gui,network,widgets,xml]
+	dev-qt/qtmultimedia:6
+	dev-qt/qtsvg:6
+"
+DEPEND="${RDEPEND}"
+# BDEPEND="dev-qt/qttools:6[linguist]"
+
+src_configure() {
+# 	$(qt6_get_bindir)/lrelease gpxsee.pro || die
+	eqmake6 PREFIX=/usr $(usex test "" "CONFIG+=NO_TESTS")
+}
+
+src_install() {
+	einstalldocs
+	emake INSTALL_ROOT="${D}" install
+	# TODO: Install l10n files
+}