commit: 4d685bdee13a2f14acf1812358f7b82a14468e0a Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Apr 29 19:30:19 2023 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Apr 29 21:50:53 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d685bde
kde-apps/umbrello: drop 22.12.3 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> kde-apps/umbrello/Manifest | 1 - .../umbrello-20.08.3-gentoo-docbundledir.patch | 41 ------------ kde-apps/umbrello/umbrello-22.12.3.ebuild | 74 ---------------------- 3 files changed, 116 deletions(-) diff --git a/kde-apps/umbrello/Manifest b/kde-apps/umbrello/Manifest index 1c90a1103078..12ef595435c8 100644 --- a/kde-apps/umbrello/Manifest +++ b/kde-apps/umbrello/Manifest @@ -1,2 +1 @@ -DIST umbrello-22.12.3.tar.xz 5801500 BLAKE2B 5ac29cf8c3e994dae896ee12f430423c53a95682d23a6f2833d889c125107cd3a8691516ab5e2b1295d0da7504dae2501030e15374945b3b40b23792702c483b SHA512 a88984c79f176f2589e83f8e94434ef641f35dd4b0a9f361a2d7b1c117c416c898a3b26aa419a2b8c4746dd5f2eab9c6a35c81b34441e0471051962017744cf8 DIST umbrello-23.04.0.tar.xz 5774008 BLAKE2B 25b8ab6c63c5d5813e3348da7d7e08bbdb4b3648891d769f2a6c590935b52eee29f08014f5944fdd76080bb286ed9df1ae437f04dc9967ff0b37b584f79f9094 SHA512 aca07d2bdea918ed3d3b12cc3a8dd0bbd875200f7326e6a1d011ee04a98feefb49e23b015aa0bb089b3f1e9bc0d05029fad597ec8206020bb7f8e72bf20127fd diff --git a/kde-apps/umbrello/files/umbrello-20.08.3-gentoo-docbundledir.patch b/kde-apps/umbrello/files/umbrello-20.08.3-gentoo-docbundledir.patch deleted file mode 100644 index e3915379be2a..000000000000 --- a/kde-apps/umbrello/files/umbrello-20.08.3-gentoo-docbundledir.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 29186bb3c1c3e4de89d77340db966c660789cdab Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <[email protected]> -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 <[email protected]> ---- - umbrello/umlappprivate.cpp | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/umbrello/umlappprivate.cpp b/umbrello/umlappprivate.cpp -index d8bae2cfe..8c1c58a02 100644 ---- a/umbrello/umlappprivate.cpp -+++ b/umbrello/umlappprivate.cpp -@@ -36,17 +36,17 @@ QString UMLAppPrivate::findWelcomeFile() - - // from custom install - foreach(const QString &lang, langList) { -- dirList.append(QCoreApplication::applicationDirPath() + QString(QLatin1String("/../share/doc/HTML/%1/umbrello/apphelp")).arg(lang)); -+ dirList.append(QCoreApplication::applicationDirPath() + QString(QLatin1String("/../share/help/%1/umbrello/apphelp")).arg(lang)); - } -- dirList.append(QCoreApplication::applicationDirPath() + QLatin1String("/../share/doc/HTML/en/umbrello/apphelp")); -+ dirList.append(QCoreApplication::applicationDirPath() + QLatin1String("/../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(QLatin1String("%1/doc/HTML/%2/umbrello/apphelp")).arg(location).arg(lang)); -+ dirList.append(QString(QLatin1String("%1/help/%2/umbrello/apphelp")).arg(location).arg(lang)); - } -- dirList.append(QString(QLatin1String("%1/doc/HTML/en/umbrello/apphelp")).arg(location)); -+ dirList.append(QString(QLatin1String("%1/help/en/umbrello/apphelp")).arg(location)); - } - #else - KLocale *local = KGlobal::locale(); --- -2.29.2 - diff --git a/kde-apps/umbrello/umbrello-22.12.3.ebuild b/kde-apps/umbrello/umbrello-22.12.3.ebuild deleted file mode 100644 index 322e4a9cdcd1..000000000000 --- a/kde-apps/umbrello/umbrello-22.12.3.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# 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.101.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/kdelibs4support-${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}-20.08.3-gentoo-docbundledir.patch # fix hardcoded path -) - -src_configure() { - local mycmakeargs=( - -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON # broken, re-enable w/ ECM_QTHELP - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets=ON - -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 -}
