gentoo auto-resync : 13:12:2024 - 02:01:50

3 files changed, 115 insertions, 0 deletions

diff --git a/kde-apps/umbrello/Manifest b/kde-apps/umbrello/Manifest
index aae0bcd01cb6..380be6fdb837 100644
--- a/kde-apps/umbrello/Manifest
+++ b/kde-apps/umbrello/Manifest
@@ -1,4 +1,7 @@
 AUX umbrello-23.03.80-gentoo-docbundledir.patch 2064 BLAKE2B 4645a03331876abd1876360f0165585441c192a43a56135da66150bf8f691b30120a8b32143c52e3421022f26b2b4ab2c57ea7b421826527c6d3aa7da66bf921 SHA512 c6e7458ac419af6d66968f4d8a1badb4795fcfdbeda61902ab0b99a205a80fc2e1e35b24d39ab925203f66c9e145e56427851fb5d4c297a4b5068fd5ed33331e
+AUX umbrello-24.11.80-gentoo-docbundledir.patch 2054 BLAKE2B 6ec1acd9de9905ca35a61cf1505ee10f441d07fd8fe779c86a6a9acca10a5f1d50a37d887ba2eca0f99558ba9c3a1e3cd679b5d8cf89d2356076a3370c9ffc51 SHA512 9588e2942a78dd7211d721dc4cbdcf1f92098546b6f0dc480e8bd2793eb6d94ab1f052bc8bdf5725a7aaced2be9d621d7ea064a94d70c3d3eab90c85bfcfd31c
 DIST umbrello-24.08.3.tar.xz 5609628 BLAKE2B e5a0feac3e136a43dd2ab7101dc9fe428e9856dc670dcd5fb399fcf949b2a1cf27c002043f739f3027bc73488cda387e0adf0048b038d61012530cd94e90a3fb SHA512 ed9c984f23257df74bf84be1d87dea4b2d22779061d6d371165bc6ab4c3309a6b233a7cd02101947fd4bfde043e3aceede8d2e2e52ecb8da7276f6a43a1d81bb
+DIST umbrello-24.12.0.tar.xz 5617524 BLAKE2B 664d40b4ea717e03f7c6b9a69d6d153117f8228fc562974619328dc398d187a9973ac88d023f39a24af7891ca867c293e3bf4cc97efc4878cba3f4cd75f5d136 SHA512 1dec0f3cd4b23099039b478393c9226c536592674e9a5596f890d1e5d7ab60c303179a074a43d9fea07c70525a1bc7ebefd1ace0b286956a20b339c84ab82294
 EBUILD umbrello-24.08.3.ebuild 1814 BLAKE2B 858a369a1c67d5f25c5402475801f808c13108a4d337e4b33c68ad3b1817f32a122e2b49d2221506d3bc09c337547b838266e2e515d13a0b50d36be548aa6823 SHA512 2208633c435d73137302985c882a2fb1d757cbc9e7936bf82b605c64eb7e3368c9ecede647f7749182b5438b1077ee918d158abf8d1a04e83be65553e34bf806
+EBUILD umbrello-24.12.0.ebuild 1817 BLAKE2B ab1d8e57198ddd547449b88205b96ed4e3316994f42c9f578d989a2c809ec1c443f48da6c8245180910c256cdd5d1ce761d094d56f691481682ad8c32e784f0a SHA512 28c7e902e23ae7ae7bf5126136130ff86a27be3662f473839913795e4b5b35b1044c5664bebce3739d4b67c1068b17552781e959b6a3171c6266928e01c264eb
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/umbrello/files/umbrello-24.11.80-gentoo-docbundledir.patch b/kde-apps/umbrello/files/umbrello-24.11.80-gentoo-docbundledir.patch
new file mode 100644
index 000000000000..7af65f2a297a
--- /dev/null
+++ b/kde-apps/umbrello/files/umbrello-24.11.80-gentoo-docbundledir.patch
@@ -0,0 +1,41 @@
+From ce2c9900c36376cde471344e699b37f28ececd98 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Thu, 5 Nov 2020 14:39:51 +0100
+Subject: [PATCH] Fix hardcoded docbook install paths for Gentoo
+
+Gentoo sets KDE_INSTALL_DOCBUNDLEDIR="${EPREFIX}/usr/share/help".
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ umbrello/umlappprivate.cpp | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/umbrello/umlappprivate.cpp b/umbrello/umlappprivate.cpp
+index 8966837fb..d5a56bfd8 100644
+--- a/umbrello/umlappprivate.cpp
++++ b/umbrello/umlappprivate.cpp
+@@ -33,17 +33,17 @@ QString UMLAppPrivate::findWelcomeFile()
+ 
+     // from custom install
+     for(const QString &lang : langList) {
+-        dirList.append(QCoreApplication::applicationDirPath() + QString(QStringLiteral("/../share/doc/HTML/%1/umbrello/apphelp")).arg(lang));
++        dirList.append(QCoreApplication::applicationDirPath() + QString(QStringLiteral("/../share/help/%1/umbrello/apphelp")).arg(lang));
+     }
+-    dirList.append(QCoreApplication::applicationDirPath() + QStringLiteral("/../share/doc/HTML/en/umbrello/apphelp"));
++    dirList.append(QCoreApplication::applicationDirPath() + QStringLiteral("/../share/help/en/umbrello/apphelp"));
+ 
+     QStringList locations = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);
+     // from real installation
+     for(const QString &location : locations) {
+         for (const QString &lang :  langList) {
+-            dirList.append(QString(QStringLiteral("%1/doc/HTML/%2/umbrello/apphelp")).arg(location).arg(lang));
++            dirList.append(QString(QStringLiteral("%1/help/%2/umbrello/apphelp")).arg(location).arg(lang));
+         }
+-        dirList.append(QString(QStringLiteral("%1/doc/HTML/en/umbrello/apphelp")).arg(location));
++        dirList.append(QString(QStringLiteral("%1/help/en/umbrello/apphelp")).arg(location));
+     }
+     for(const QString &dir : dirList) {
+         QString filePath = dir + QStringLiteral("/index.cache.bz2");
+-- 
+2.47.0
+
diff --git a/kde-apps/umbrello/umbrello-24.12.0.ebuild b/kde-apps/umbrello/umbrello-24.12.0.ebuild
new file mode 100644
index 000000000000..b5b576811142
--- /dev/null
+++ b/kde-apps/umbrello/umbrello-24.12.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_QTHELP="false" # TODO: figure out install error
+ECM_TEST="forceoptional"
+KFMIN=5.115.0
+QTMIN=5.15.12
+inherit ecm gear.kde.org
+
+DESCRIPTION="KDE UML Modeller"
+HOMEPAGE="https://apps.kde.org/umbrello/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# 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
+# 	)
+
+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
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-24.11.80-gentoo-docbundledir.patch # fix hardcoded path
+)
+
+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)
+	)
+	use test && mycmakeargs+=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_LLVM=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Clang=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_CLANG=ON
+	)
+
+	ecm_src_configure
+}