commit: 5f858634d034f43a8bebc12122bbe893ec7d0e54
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 14 16:39:41 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Aug 14 16:40:34 2025 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=5f858634
kde-apps/umbrello: Port to KF6
Upstream commit bd0cd90a0ef37e4a2e7fe4eb0602973a58666d04
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
eclass/gear.kde.org.eclass | 3 +-
kde-apps/umbrello/umbrello-9999.ebuild | 59 ++++++++++++++++------------------
2 files changed, 29 insertions(+), 33 deletions(-)
diff --git a/eclass/gear.kde.org.eclass b/eclass/gear.kde.org.eclass
index ddbd1863f3..95498f835b 100644
--- a/eclass/gear.kde.org.eclass
+++ b/eclass/gear.kde.org.eclass
@@ -316,7 +316,8 @@ fi
# list of applications ported to KF6 post-25.08 having to block SLOT=5
if $(ver_test -gt 25.11.50); then
case ${PN} in
- rocs)
+ rocs | \
+ umbrello)
RDEPEND+=" !${CATEGORY}/${PN}:5" ;;
*) ;;
esac
diff --git a/kde-apps/umbrello/umbrello-9999.ebuild
b/kde-apps/umbrello/umbrello-9999.ebuild
index 214860fc18..967beb88b9 100644
--- a/kde-apps/umbrello/umbrello-9999.ebuild
+++ b/kde-apps/umbrello/umbrello-9999.ebuild
@@ -6,48 +6,43 @@ EAPI=8
ECM_HANDBOOK="forceoptional"
ECM_QTHELP="false" # TODO: figure out install error
ECM_TEST="forceoptional"
-KFMIN=5.116.0
-QTMIN=5.15.17
+KFMIN=6.16.0
+QTMIN=6.9.1
inherit ecm gear.kde.org
DESCRIPTION="KDE UML Modeller"
HOMEPAGE="https://apps.kde.org/umbrello/";
LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
+SLOT="0"
KEYWORDS=""
-
-# TODO: Re-enable when ported to KF6
-# IUSE="php"
-# php? (
-# dev-util/kdevelop:5=
-# dev-util/kdevelop-pg-qt:5
-# dev-util/kdevelop-php:5
-# )
+IUSE="php"
RDEPEND="
dev-libs/libxml2:=
dev-libs/libxslt
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtprintsupport-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- >=kde-frameworks/karchive-${KFMIN}:5
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kjobwidgets-${KFMIN}:5
- >=kde-frameworks/ktexteditor-${KFMIN}:5
- >=kde-frameworks/ktextwidgets-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kwindowsystem-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
+ >=dev-qt/qtbase-${QTMIN}:6[gui,widgets,xml]
+ >=dev-qt/qtsvg-${QTMIN}:6
+ >=kde-frameworks/karchive-${KFMIN}:6
+ >=kde-frameworks/kcompletion-${KFMIN}:6
+ >=kde-frameworks/kconfig-${KFMIN}:6
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:6
+ >=kde-frameworks/kcoreaddons-${KFMIN}:6
+ >=kde-frameworks/kcrash-${KFMIN}:6
+ >=kde-frameworks/ki18n-${KFMIN}:6
+ >=kde-frameworks/kiconthemes-${KFMIN}:6
+ >=kde-frameworks/kio-${KFMIN}:6
+ >=kde-frameworks/kjobwidgets-${KFMIN}:6
+ >=kde-frameworks/ktexteditor-${KFMIN}:6
+ >=kde-frameworks/ktextwidgets-${KFMIN}:6
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+ >=kde-frameworks/kwindowsystem-${KFMIN}:6
+ >=kde-frameworks/kxmlgui-${KFMIN}:6
+ php? (
+ dev-util/kdevelop:6=
+ dev-util/kdevelop-pg-qt:0
+ dev-util/kdevelop-php:6
+ )
"
DEPEND="${RDEPEND}"
@@ -59,7 +54,7 @@ src_configure() {
local mycmakeargs=(
-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON # broken, re-enable w/
ECM_QTHELP
-DBUILD_APIDOC=OFF
- -DBUILD_PHP_IMPORT=OFF # $(usex php)
+ -DBUILD_PHP_IMPORT=$(usex php)
)
use test && mycmakeargs+=(
-DCMAKE_DISABLE_FIND_PACKAGE_LLVM=ON
