7 files changed, 44 insertions, 235 deletions
diff --git a/media-gfx/kgraphviewer/Manifest b/media-gfx/kgraphviewer/Manifest
index 953242a64e9b..b718f1d03162 100644
--- a/media-gfx/kgraphviewer/Manifest
+++ b/media-gfx/kgraphviewer/Manifest
@@ -1,8 +1,5 @@
-AUX kgraphviewer-2.4.3-highdpi.patch 577 BLAKE2B bfe4613b9e67cc01bde9ec7f9c9a827fc823f8cb016af2f27e12e75e5865ed847d745ac022deb799946ed1b13d01eeed5c9f9ba2c57f161c2d3ef2940c95469e SHA512 886f044b18a38fd5c73b17be8837af815ebaf82b277068502d16f5e3c64b0fb19b378c9773c408c8c62df52b7d1703c33bf2a662973f5e2fc4f3666a4d7f752d
-AUX kgraphviewer-2.4.3-obsolete-dep.patch 4965 BLAKE2B da1924881e582840e533eed3069274b23ea1a335975d1bbe01627970f64ed46b37f1610b0cefb2d7916b500caf1799eb5b52ee6f954c3acd8dc306affc554d2e SHA512 a43b19dbc068f03011b126b1950cd84b58b784c17464ed2b96042a40ccd36c55e7a4806a7ea5092f392db3fdb4e06777eef2dd046a191db75b3a1a207043ebcd
-AUX kgraphviewer-2.4.3-set-startupwmclass.patch 1045 BLAKE2B 8e48bc5a67cf8857a5eb5a57873fbe19a5a3cc52ef70d5c01ca3674d889acfa28dc46456caccd3a6078572b876e9f73b15e483f46fe35f82bd6fcdbed5d2312c SHA512 b4005bf61e448be43f7bcc3886ec092c9f2930e475067f4c1a382db4039dfdb580ce7e2a4765480438f80dc2e905013c43c8b65711f87fb14e62de73c60bedcd
-DIST kgraphviewer-2.4.3.tar.xz 1491328 BLAKE2B b51cf825ad4763538139f917a7d16d15a7244c19b3cab9c79bbd938ee3dd80e4e35e37012199e1256bcc9a9404d756cdb0f5ffb975484d527577c208ecf1d3fa SHA512 d18146ba380efe73e1ec716dd1cc310fe1eac23eccb10e2a699b107451637b9332cc25d62a4de762df4706cea182c9474ba1e885801c9832e1bb9bff1648e72d
-DIST kgraphviewer-2.5.0.tar.xz 1571364 BLAKE2B 77a749f6b2c7707e26993685445fac679067b1188a5e2bf974d99ddc89844eeea19de9fbdf86b9c0738a95515c3a5155743df4232167e24350c8d356ea96f6e3 SHA512 80056703cd42b709925b771fe4bafe17771954705a607d6c352a0818c726bc7b48d299fffd7f3d2f75ac498059f79923d4de468db20f8538554c4d6b8baffedb
-EBUILD kgraphviewer-2.4.3-r2.ebuild 1097 BLAKE2B 312301205617180031aafc740d5749cdb436f601047e2433992d5f376c1b3e82e56dc8137a106faea8131da322dfcd6f2d6b392ad39009dcde368256d3212da7 SHA512 47208d70b25113a5d53168923bdcf16b03230758ace49fcca01fe071102f3f95b382f293c17e422c4ea6a8f6a764ea80c86e60ec5c6e107af0d106a41f00e38e
-EBUILD kgraphviewer-2.5.0.ebuild 999 BLAKE2B 5b224407b1262ec4c2bab104b484215b89b24dfe09a0249c876c7b5080d151d81734b68e91145ccca578d72ca8395de2d7c1556f2b6d1db551bcc629efc13416 SHA512 ed93e79b51690ac45fb3fbc2e0b70e75c651af61224ae3b2018ebc69ec47b6c95e02b8ec9817d93f6883f50dd79deac93895bd048ef60ae95779e266ab6dcf49
+DIST kgraphviewer-24.08.0.tar.xz 1582636 BLAKE2B 0043a4a77cf202d96c9e7e0f708e8d93bb71642ba220aa32655f671a8ec92b522d2c8914bdde65187bb270117e2d60f1f7b806895d337c443d7a91860a01f9c3 SHA512 c2ba1a82240fdbbd285b4815d6cc43804e7b26f856185b2d9b3a789e30c6a32c98bd8c92676db3007a58426cbc5961d0bcbf3f4d9c9aa4aed1c58ab12f68f51e
+DIST kgraphviewer-24.08.1.tar.xz 1583016 BLAKE2B b253ab2aa4688a5a2063ae2d62d395c16a243655ad859e6f66c92bbf79120b8c773d7b34a3ca890bf06bbfa935eb9ac5ff4386847d86439d5afde024e0a10d97 SHA512 80647c0db32997c277524b5d5520ba5a285c31441582a081f8f6c6265c7b8f2977043a81f75b62446540a91236744075543811ba274dd1a5cdd8d1b368bb2f0b
+EBUILD kgraphviewer-24.08.0.ebuild 849 BLAKE2B f0c2391b502f1ebde86f9515942bed34686eb57c15057a4c115eb48371da601cb2ef60d2208a180b30371fa3a87bd7d02a1a6a92e26851b658a7b0075a761078 SHA512 59827fef87d9cbc218e84f3fe2cc93b2601ab5e108dc7e6a7fc812d60ea6264454f77ae148e667e380aedafec37b6a4ed89cee8d189107fa029de9cf07096015
+EBUILD kgraphviewer-24.08.1.ebuild 851 BLAKE2B 5c5b1dd4ff2e4c26b39bd3e26049d4cd28cc008827f96d90c970f6b2d30995db1142708214134244e624d224cb979dcc2ffb19bd79be472ef6602735fb7ee5fd SHA512 f27d6ba7343de6bf0fd924c00748122062faf7ea09771df1706e8c8d342e534e8c12bf1d26a289a5d26f55651efcef8bc2063532ea792a86bb8299116ef4f76c
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-highdpi.patch b/media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-highdpi.patch
deleted file mode 100644
index 8b31d40fb157..000000000000
--- a/media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-highdpi.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 9961c92736abfc6d0aedea9c4e7c679e1fd564d2 Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Mon, 7 Mar 2022 19:49:21 +0100
-Subject: [PATCH] Enable highdpi pixmaps
-
----
- src/main.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/main.cpp b/src/main.cpp
-index 32ad115..271e61f 100644
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -38,6 +38,7 @@
- 
- int main(int argc, char **argv)
- {
-+  QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
-   QApplication app(argc, argv);
- 
-   KLocalizedString::setApplicationDomain("kgraphviewer");
--- 
-GitLab
-
diff --git a/media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-obsolete-dep.patch b/media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-obsolete-dep.patch
deleted file mode 100644
index 76fa878bc364..000000000000
--- a/media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-obsolete-dep.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From a6f0587d8cbbb246c33423d19f2aabf6ea9d7417 Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Sun, 8 May 2022 16:59:25 +0200
-Subject: [PATCH] Remove pointless/broken icons
-
-The distribute-horizontal-page icon doesn't serve any apparent purpose
-
-The portrait/landscape icons don't exist in any theme
-
-(cherry picked from commit 7b214252ec5f486912944d987581f207c7b03681)
----
- CMakeLists.txt                          |  1 -
- src/part/CMakeLists.txt                 |  2 +-
- src/part/KgvPageLayoutSize.cpp          | 10 ----------
- src/part/simpleprintingpagesetup.cpp    |  4 ----
- src/part/simpleprintingpagesetupbase.ui | 10 ----------
- 5 files changed, 1 insertion(+), 26 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fd715d2..238a9dd 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -27,7 +27,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
-     DocTools
-     Parts
-     WidgetsAddons
--    IconThemes
- )
- 
- find_package(Boost 1.36 REQUIRED)
-diff --git a/src/part/CMakeLists.txt b/src/part/CMakeLists.txt
-index 0e70be8..922e5c5 100644
---- a/src/part/CMakeLists.txt
-+++ b/src/part/CMakeLists.txt
-@@ -64,7 +64,7 @@ ki18n_wrap_ui(kgraphviewerlib_LIB_SRCS ${kgraphviewerprinting_UI} )
- 
- add_library(kgraphviewerlib ${kgraphviewerlib_LIB_SRCS})
- 
--target_link_libraries(kgraphviewerlib Qt5::Core Qt5::Svg Qt5::PrintSupport Qt5::Svg KF5::WidgetsAddons KF5::IconThemes KF5::XmlGui KF5::I18n KF5::Parts ${graphviz_LIBRARIES})
-+target_link_libraries(kgraphviewerlib Qt5::Core Qt5::Svg Qt5::PrintSupport Qt5::Svg KF5::WidgetsAddons KF5::XmlGui KF5::I18n KF5::Parts ${graphviz_LIBRARIES})
- 
- set_target_properties(kgraphviewerlib PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${KGRAPHVIEWER_SOVERSION} OUTPUT_NAME kgraphviewer )
- 
-diff --git a/src/part/KgvPageLayoutSize.cpp b/src/part/KgvPageLayoutSize.cpp
-index bb8b3d1..4053a20 100644
---- a/src/part/KgvPageLayoutSize.cpp
-+++ b/src/part/KgvPageLayoutSize.cpp
-@@ -42,7 +42,6 @@
- #include <QHBoxLayout>
- #include <QGridLayout>
- #include <QPixmap>
--#include <KIconTheme>
- #include "klocalizedstring.h"
- 
- KgvPageLayoutSize::KgvPageLayoutSize(
-@@ -148,19 +147,10 @@ KgvPageLayoutSize::KgvPageLayoutSize(
- //     m_orientGroup->setInsideSpacing( KDialog::spacingHint() );
-     grid1->addWidget( m_orientGroup, 2, 0 );
- 
--    const int iconSize = KIconTheme(KIconTheme::current()).defaultSize(KIconLoader::Small);
--    QLabel* lbPortrait = new QLabel( m_orientGroup );
--    lbPortrait->setPixmap( QPixmap( QIcon::fromTheme( "koPortrait" ).pixmap(iconSize, iconSize) ) );
--    lbPortrait->setMaximumWidth( lbPortrait->pixmap()->width() );
--    lay3->addWidget(lbPortrait);
-     QRadioButton* rbPortrait = new QRadioButton( i18n("&Portrait"), m_orientGroup );
-     lay3->addWidget(rbPortrait);
-     m_orientButtons.addButton(rbPortrait);
-   
--    QLabel* lbLandscape = new QLabel( m_orientGroup );
--    lbLandscape->setPixmap( QPixmap( QIcon::fromTheme( "koLandscape" ).pixmap(iconSize, iconSize) ) );
--    lbLandscape->setMaximumWidth( lbLandscape->pixmap()->width() );
--    lay3->addWidget(lbLandscape);
-     QRadioButton* rbLandscape = new QRadioButton( i18n("La&ndscape"), m_orientGroup );
-     lay3->addWidget(rbLandscape);
-     m_orientGroup->setLayout(lay3);
-diff --git a/src/part/simpleprintingpagesetup.cpp b/src/part/simpleprintingpagesetup.cpp
-index 9882fbf..cd707b9 100644
---- a/src/part/simpleprintingpagesetup.cpp
-+++ b/src/part/simpleprintingpagesetup.cpp
-@@ -57,7 +57,6 @@
- #include <QPixmap>
- #include <QVBoxLayout>
- #include <klocalizedstring.h>
--#include <KIconTheme>
- #include <iostream>
- 
- namespace KGraphViewer
-@@ -109,9 +108,6 @@ KGVSimplePrintingPageSetup::KGVSimplePrintingPageSetup(
- 	connect(m_contents->printPreviewButton, &QPushButton::clicked,
-                 this, &KGVSimplePrintingPageSetup::slotPrintPreview);
- 
--	m_contents->iconLabel->setFixedWidth(32+6);
--    const int iconSize = KIconTheme(KIconTheme::current()).defaultSize(KIconLoader::Small);
--  m_contents->iconLabel->setPixmap(QIcon::fromTheme("distribute-horizontal-page").pixmap(iconSize, iconSize));
- 	m_contents->headerTitleFontButton->setText(i18n("Font..."));
- 	m_contents->headerTitleFontButton->setWhatsThis(i18n("Changes font for title text."));
- 	connect(m_contents->headerTitleFontButton, &QPushButton::clicked,
-diff --git a/src/part/simpleprintingpagesetupbase.ui b/src/part/simpleprintingpagesetupbase.ui
-index ddc6ee0..719a7d6 100644
---- a/src/part/simpleprintingpagesetupbase.ui
-+++ b/src/part/simpleprintingpagesetupbase.ui
-@@ -157,16 +157,6 @@
-        </item>
-       </layout>
-      </item>
--     <item>
--      <widget class="QLabel" name="iconLabel">
--       <property name="text">
--        <string/>
--       </property>
--       <property name="alignment">
--        <set>Qt::AlignVCenter</set>
--       </property>
--      </widget>
--     </item>
-      <item>
-       <widget class="QGroupBox" name="groupBox4">
-        <property name="title">
--- 
-2.37.3
-
diff --git a/media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-set-startupwmclass.patch b/media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-set-startupwmclass.patch
deleted file mode 100644
index 970bf57f2cfb..000000000000
--- a/media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-set-startupwmclass.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 50fea8d6413e06fcfaf0d0ca03cc6c266a1cda14 Mon Sep 17 00:00:00 2001
-From: "Friedrich W. H. Kossebau" <kossebau@kde.org>
-Date: Tue, 5 Feb 2019 04:49:16 +0100
-Subject: Set StartupWMClass in desktop file
-
-Used by non-Plasma unixoid X-based shells to map windows to desktop files
-e.g. in launcher UIs, which do not know about _KDE_NET_WM_DESKTOP_FILE and
-instead expect (one of) the WM_CLASS entries to match the basename of the
-desktop file by default. StartupWMClass overwrites that default.
----
- src/org.kde.kgraphviewer.desktop | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/org.kde.kgraphviewer.desktop b/src/org.kde.kgraphviewer.desktop
-index bfff1bf..6b3affb 100644
---- a/src/org.kde.kgraphviewer.desktop
-+++ b/src/org.kde.kgraphviewer.desktop
-@@ -41,6 +41,7 @@ MimeType=text/vnd.graphviz
- Exec=kgraphviewer -qwindowtitle %c %u
- Icon=kgraphviewer
- Type=Application
-+StartupWMClass=kgraphviewer
- Categories=Qt;KDE;Graphics;Viewer;2DGraphics;DataVisualization;
- X-DocPath=kgraphviewer/index.html
- InitialPreference=10
--- 
-cgit v1.1
diff --git a/media-gfx/kgraphviewer/kgraphviewer-2.4.3-r2.ebuild b/media-gfx/kgraphviewer/kgraphviewer-2.4.3-r2.ebuild
deleted file mode 100644
index 4716b8e8e2e9..000000000000
--- a/media-gfx/kgraphviewer/kgraphviewer-2.4.3-r2.ebuild
+++ /dev/null
@@ -1,43 +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.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Graphviz dot graph file viewer"
-HOMEPAGE="https://apps.kde.org/kgraphviewer"
-[[ ${PV} != *9999* ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2 GPL-2+ LGPL-2+ LGPL-2.1+ handbook? ( FDL-1.2 )"
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=media-gfx/graphviz-2.30
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-set-startupwmclass.patch"
-	"${FILESDIR}/${P}-highdpi.patch"
-	"${FILESDIR}/${P}-obsolete-dep.patch"
-)
diff --git a/media-gfx/kgraphviewer/kgraphviewer-2.5.0.ebuild b/media-gfx/kgraphviewer/kgraphviewer-24.08.0.ebuild
index 99f0bcf99af9..4e65fec3c592 100644
--- a/media-gfx/kgraphviewer/kgraphviewer-2.5.0.ebuild
+++ b/media-gfx/kgraphviewer/kgraphviewer-24.08.0.ebuild
@@ -4,23 +4,19 @@
 EAPI=8
 
 ECM_HANDBOOK="optional"
-KFMIN=6.1.0
-QTMIN=6.6.2
-inherit ecm kde.org
+KFMIN=6.5.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
 
 DESCRIPTION="Graphviz dot graph file viewer"
 HOMEPAGE="https://apps.kde.org/kgraphviewer/"
 
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64"
-fi
-
 LICENSE="GPL-2 GPL-2+ LGPL-2+ LGPL-2.1+ handbook? ( FDL-1.2 )"
 SLOT="0"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE=""
 
-COMMON_DEPEND="
+RDEPEND="
 	>=dev-qt/qt5compat-${QTMIN}:6
 	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
 	>=dev-qt/qtsvg-${QTMIN}:6
@@ -33,9 +29,6 @@ COMMON_DEPEND="
 	>=kde-frameworks/kxmlgui-${KFMIN}:6
 	>=media-gfx/graphviz-2.30
 "
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
 	dev-libs/boost
 "
-RDEPEND="${COMMON_DEPEND}
-	!${CATEGORY}/${PN}:5
-"
diff --git a/media-gfx/kgraphviewer/kgraphviewer-24.08.1.ebuild b/media-gfx/kgraphviewer/kgraphviewer-24.08.1.ebuild
new file mode 100644
index 000000000000..4f98c56730e6
--- /dev/null
+++ b/media-gfx/kgraphviewer/kgraphviewer-24.08.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+KFMIN=6.5.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Graphviz dot graph file viewer"
+HOMEPAGE="https://apps.kde.org/kgraphviewer/"
+
+LICENSE="GPL-2 GPL-2+ LGPL-2+ LGPL-2.1+ handbook? ( FDL-1.2 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qt5compat-${QTMIN}:6
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=media-gfx/graphviz-2.30
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+"