commit: faf772efd7bdf4b235db77247947e192dd0c95f5 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Aug 25 15:28:09 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Mon Aug 25 16:05:02 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=faf772ef
kde-apps/umbrello: drop 25.11.70_pre20250817-r1 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> kde-apps/umbrello/Manifest | 1 - .../umbrello-25.11.70_pre20250817-cmake.patch | 52 ----------------- .../umbrello-25.11.70_pre20250817-r1.ebuild | 68 ---------------------- 3 files changed, 121 deletions(-) diff --git a/kde-apps/umbrello/Manifest b/kde-apps/umbrello/Manifest index 22e13d58646e..ecaf9c4f0160 100644 --- a/kde-apps/umbrello/Manifest +++ b/kde-apps/umbrello/Manifest @@ -1,3 +1,2 @@ DIST umbrello-25.04.3.tar.xz 5618524 BLAKE2B 8c79a6e839d3a7ebea192f8b7e240500adcd8f4e7dece9ed1834e098e35f6b880b327555ad4455da80941c280a15e1e51070f56b888f4390fca857e439f76120 SHA512 ce6ac3783306e874b4deacf0e097317a49e004d35799b919887b5459de6a24e64865c3557160552b476eb7bba19be6ddccfdee788917b6d8ca21a5061f4fa4d9 -DIST umbrello-25.11.70_pre20250817-7c517048.tar.gz 8705761 BLAKE2B 361a03a297a25611e0fb82480578f44cf3975fbd6b3f0aa78f5481d2d063334265b7e319b1bbfa8320613d30fe6faf51254353bd9d9367f0bb153f42118c6500 SHA512 f889dc5978ff7df6af0f709bf336190658da8012a5def8d8decb2095a87cd8b3b890f63322a8f142eb4800fb806c3ce9ce5599f8bcddaed821735e472311933e DIST umbrello-25.11.70_pre20250824-15d660b0.tar.gz 8711397 BLAKE2B 6f14e99b7a5ec05f3d0bfc92bd0923080baf7aeff13d68c3654c00926c04d573da90d50067a57769d9e3d6594d86740753ee3c8587c285b2701992c29f0cba0f SHA512 f14fc208fa6f94eaabedebb8a02e13edbd11992b62d6f4d697d9cbfe874eeba6ad87b76ee9e8dc1268d3efacca32dc3454b9ec3ecfeff857214d8d912ee7b040 diff --git a/kde-apps/umbrello/files/umbrello-25.11.70_pre20250817-cmake.patch b/kde-apps/umbrello/files/umbrello-25.11.70_pre20250817-cmake.patch deleted file mode 100644 index a5e31cfe63f4..000000000000 --- a/kde-apps/umbrello/files/umbrello-25.11.70_pre20250817-cmake.patch +++ /dev/null @@ -1,52 +0,0 @@ -Pending MR: https://invent.kde.org/sdk/umbrello/-/merge_requests/68 - -From 22e2973e24762296d0bdf0fcd0c7f11353c0e376 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <[email protected]> -Date: Mon, 18 Aug 2025 18:10:52 +0200 -Subject: [PATCH] Fix install paths - -Deprecated since KF5, removed in KF6, leading to install to "/": -- DATA_INSTALL_DIR -- HTML_INSTALL_DIR - -Signed-off-by: Andreas Sturmlechner <[email protected]> ---- - CMakeLists.txt | 2 +- - doc/CMakeLists.txt | 2 +- - doc/apphelp/CMakeLists.txt | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 304cba56b..7ce9fce61 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -150,7 +150,7 @@ else() - set(BUILD_PHP_IMPORT 0) - endif() - --set(UMBRELLO_DATA_INSTALL_DIR ${DATA_INSTALL_DIR}/umbrello${APP_SUFFIX}) -+set(UMBRELLO_DATA_INSTALL_DIR ${KDE_INSTALL_DATADIR}/umbrello${APP_SUFFIX}) - - ki18n_install(po) - kdoctools_install(po) -diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt -index 1a4696e5d..cb67d93fd 100644 ---- a/doc/CMakeLists.txt -+++ b/doc/CMakeLists.txt -@@ -1,4 +1,4 @@ - ########### install files ############### --kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR umbrello) -+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR umbrello) - - add_subdirectory(apphelp) -diff --git a/doc/apphelp/CMakeLists.txt b/doc/apphelp/CMakeLists.txt -index 57b171f82..d9164008a 100644 ---- a/doc/apphelp/CMakeLists.txt -+++ b/doc/apphelp/CMakeLists.txt -@@ -1,2 +1,2 @@ - ########### install files ############### --kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR umbrello/apphelp) -+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR umbrello/apphelp) --- -2.50.1 - diff --git a/kde-apps/umbrello/umbrello-25.11.70_pre20250817-r1.ebuild b/kde-apps/umbrello/umbrello-25.11.70_pre20250817-r1.ebuild deleted file mode 100644 index bb598bf23462..000000000000 --- a/kde-apps/umbrello/umbrello-25.11.70_pre20250817-r1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2025 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" -KDE_ORG_COMMIT=7c5170480ff73d7f767e78f6278c9cc55fd7bba9 -KFMIN=6.16.0 -QTMIN=6.9.1 -inherit ecm gear.kde.org xdg - -DESCRIPTION="KDE UML Modeller" -HOMEPAGE="https://apps.kde.org/umbrello/"; - -LICENSE="GPL-2" # TODO: CHECK -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="php" - -RDEPEND=" - dev-libs/libxml2:= - dev-libs/libxslt - >=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}" - -PATCHES=( - "${FILESDIR}"/${PN}-24.11.80-gentoo-docbundledir.patch # fix hardcoded path - "${FILESDIR}"/${P}-cmake.patch # pending MR -) - -src_configure() { - local mycmakeargs=( - -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON # broken, re-enable w/ ECM_QTHELP - -DBUILD_APIDOC=OFF - -DBUILD_PHP_IMPORT=$(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 -}
