gentoo auto-resync : 22:04:2023 - 12:04:32

3 files changed, 116 insertions, 0 deletions

diff --git a/kde-apps/umbrello/Manifest b/kde-apps/umbrello/Manifest
index dbc72ae128a5..307e9389bc4e 100644
--- a/kde-apps/umbrello/Manifest
+++ b/kde-apps/umbrello/Manifest
@@ -1,4 +1,7 @@
 AUX umbrello-20.08.3-gentoo-docbundledir.patch 1990 BLAKE2B c629fa51a4d701576e2c5bc870d8368851773687b93309a02986f2cd3140089c435a2964edafd1be930796906295bc8ef1477ba8c9837f560f986ed07ae19358 SHA512 9635b33d0aa612eebbbed37f82812b5f1ea8edcc6bfd0a8749e667cbc718d3ed56568397a6db43838a84f04085682dcd5c3a8a272b92bd9ee9a84de30a2f2d40
+AUX umbrello-23.03.80-gentoo-docbundledir.patch 2064 BLAKE2B 4645a03331876abd1876360f0165585441c192a43a56135da66150bf8f691b30120a8b32143c52e3421022f26b2b4ab2c57ea7b421826527c6d3aa7da66bf921 SHA512 c6e7458ac419af6d66968f4d8a1badb4795fcfdbeda61902ab0b99a205a80fc2e1e35b24d39ab925203f66c9e145e56427851fb5d4c297a4b5068fd5ed33331e
 DIST umbrello-22.12.3.tar.xz 5801500 BLAKE2B 5ac29cf8c3e994dae896ee12f430423c53a95682d23a6f2833d889c125107cd3a8691516ab5e2b1295d0da7504dae2501030e15374945b3b40b23792702c483b SHA512 a88984c79f176f2589e83f8e94434ef641f35dd4b0a9f361a2d7b1c117c416c898a3b26aa419a2b8c4746dd5f2eab9c6a35c81b34441e0471051962017744cf8
+DIST umbrello-23.04.0.tar.xz 5774008 BLAKE2B 25b8ab6c63c5d5813e3348da7d7e08bbdb4b3648891d769f2a6c590935b52eee29f08014f5944fdd76080bb286ed9df1ae437f04dc9967ff0b37b584f79f9094 SHA512 aca07d2bdea918ed3d3b12cc3a8dd0bbd875200f7326e6a1d011ee04a98feefb49e23b015aa0bb089b3f1e9bc0d05029fad597ec8206020bb7f8e72bf20127fd
 EBUILD umbrello-22.12.3.ebuild 1952 BLAKE2B 6b933be7976943d7ef613c07bef1a3bc29722705dc5757367cf1da1853bd0c694091917e2751eef702afb4da70f726a11ac6c765f69b69d1563bf8a5be31a7ba SHA512 fb82ac63a84043796fad2e4da5759ca4a4b4fa4786d23d08f5136a8f0604244ede7ce471f2ede1960b66db063f2324a954b6f8f24c4763c8bd5dd4151aed7f4d
+EBUILD umbrello-23.04.0.ebuild 1860 BLAKE2B 316f20eb01a92b16824d27f34a46142976630c4d751fef12b0dcdd621f12183324e50d46fa556ea4cc56c32a3c95221809464b3e88757e08316db37c909918e4 SHA512 c50a375bc1e33ac8b1091b14fabdce4914ffa12076c9748a278709a20c6c6025e6b33b7c5002d181a14a929ec60dde4d059e44859f35deccdb369a25845f8f4b
 MISC metadata.xml 459 BLAKE2B 465f4c84b8aeb296c6c2e6b7c387545709a78db7bd3a42e276ecd67b9e0d6137be482e058b984784a3e68f965561763149de1fec93abb3d4c601f9de115c5b38 SHA512 fee91c5580066b6e088669602c6629a20e65e58390809427e737c6042b1233b118dc9d245b15af14f588aaf84cdba30e811e8a1d246ba6ecfd43215285741608
diff --git a/kde-apps/umbrello/files/umbrello-23.03.80-gentoo-docbundledir.patch b/kde-apps/umbrello/files/umbrello-23.03.80-gentoo-docbundledir.patch
new file mode 100644
index 000000000000..c577a72f74a1
--- /dev/null
+++ b/kde-apps/umbrello/files/umbrello-23.03.80-gentoo-docbundledir.patch
@@ -0,0 +1,41 @@
+From 20e7b4e1cf4e150e7de2d9fa3f0ee43f434e8ec3 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 08c138518..28e5d3086 100644
+--- a/umbrello/umlappprivate.cpp
++++ b/umbrello/umlappprivate.cpp
+@@ -33,17 +33,17 @@ QString UMLAppPrivate::findWelcomeFile()
+ 
+     // from custom install
+     foreach(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
+     foreach(const QString &location, locations) {
+         foreach(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));
+     }
+     foreach(const QString &dir, dirList) {
+         QString filePath = dir + QStringLiteral("/index.cache.bz2");
+-- 
+2.40.0
+
diff --git a/kde-apps/umbrello/umbrello-23.04.0.ebuild b/kde-apps/umbrello/umbrello-23.04.0.ebuild
new file mode 100644
index 000000000000..eda602e7f8ca
--- /dev/null
+++ b/kde-apps/umbrello/umbrello-23.04.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2023 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.104.0
+QTMIN=5.15.5
+VIRTUALX_REQUIRED="test"
+inherit ecm gear.kde.org
+
+DESCRIPTION="KDE UML Modeller"
+HOMEPAGE="https://apps.kde.org/umbrello/ https://umbrello.kde.org"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+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
+	php? (
+		dev-util/kdevelop:5=
+		dev-util/kdevelop-pg-qt:5
+		dev-util/kdevelop-php:5
+	)
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-23.03.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_KF5=ON
+		-DBUILD_PHP_IMPORT=$(usex php)
+		-DBUILD_unittests=$(usex test)
+	)
+	use test && mycmakeargs+=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_LLVM=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Clang=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_CLANG=ON
+	)
+
+	ecm_src_configure
+}