* [gentoo-commits] repo/gentoo:master commit in: kde-apps/umbrello/files/, kde-apps/umbrello/
@ 2021-04-06 8:23 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2021-04-06 8:23 UTC (permalink / raw
To: gentoo-commits
commit: 33108594992db78a518bf3a9a92b09379433ae65
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 4 17:07:35 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Apr 6 08:23:21 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33108594
kde-apps/umbrello: drop 20.08.3*
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-apps/umbrello/Manifest | 1 -
.../umbrello-20.08.3-unbundle-kdevelop-php.patch | 92 ----------------------
kde-apps/umbrello/umbrello-20.08.3.ebuild | 76 ------------------
3 files changed, 169 deletions(-)
diff --git a/kde-apps/umbrello/Manifest b/kde-apps/umbrello/Manifest
index ee65e951e9c..96769a301aa 100644
--- a/kde-apps/umbrello/Manifest
+++ b/kde-apps/umbrello/Manifest
@@ -1,2 +1 @@
-DIST umbrello-20.08.3.tar.xz 5555108 BLAKE2B c8ccc39d43f061d78889776e6adc6d1a07a67608b8cbfc8c18e8f94a3d1608b3764c15d496538bb76db2672cd6bdfa8158b30a24f38f3c40e8b18dfe72262155 SHA512 541d637cd892f5b162fa88e3380c9ed4c9c175d5479bb1947b415b8fa59a419fd90eac2e47d939ec3d9b7b43b14fbf6777683f884b7ff10e7dee85eccb59f813
DIST umbrello-20.12.3.tar.xz 5555804 BLAKE2B a923d4f4d952dbbfc8166b2ca2bff990a4ad8652762277c3f16d4c37ffd26c1761a3480d45640c2821b0e85633158a90d82358afedc11fae98b2d5e58d0e7f57 SHA512 619d83ffd307be57fc8f3dc935dde6bdeffc60186ab675b8f2e530bb6a125ec1e03fccc49772c6d4cc120b3280e56f28344cba2627c3b955f9cd338cd071da6a
diff --git a/kde-apps/umbrello/files/umbrello-20.08.3-unbundle-kdevelop-php.patch b/kde-apps/umbrello/files/umbrello-20.08.3-unbundle-kdevelop-php.patch
deleted file mode 100644
index cce395a837f..00000000000
--- a/kde-apps/umbrello/files/umbrello-20.08.3-unbundle-kdevelop-php.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 57fef3b1d54959d5b719469c7c67e1d3e7be49dc Mon Sep 17 00:00:00 2001
-From: Ralf Habacker <ralf.habacker@freenet.de>
-Date: Fri, 30 Oct 2020 08:32:41 +0100
-Subject: [PATCH] Add support to use external KDevPHP packaga
-
-If no external development package has been found fallback to embedded
-version.
-
-This commit adds an additional optional dependency for the KDevPHP package, which
-named e.g. on openSUSE 'kdevelop5-plugin-php-devel'.
-
-BUG:428460
-FIXED-IN:2.32.80 (KDE releases 20.11.80)
----
- CMakeLists.txt | 20 ++++++++++++++------
- umbrello/codeimport/phpimport.cpp | 19 +++++++++++--------
- 2 files changed, 25 insertions(+), 14 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 221c04e31..398415f09 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -129,18 +129,26 @@ if(KDEVPGQT_FOUND AND KDEVPLATFORM_FOUND)
- include_directories(
- ${KDEVPGQT_INCLUDE_DIR}
- ${KDEVPLATFORM_INCLUDE_DIR}
-- ${CMAKE_SOURCE_DIR}/${KDEV_SOURCE_DIR}/parser
-- ${CMAKE_BINARY_DIR}/${KDEV_SOURCE_DIR}/parser
- )
-- set(NO_INSTALL 1)
-- set(BUILD_PARSER_ONLY 1)
- set(BUILD_PHP_IMPORT 1)
- add_definitions(
-- -DKDEVPHPPARSER_EXPORT=
- -DENABLE_PHP_IMPORT
- )
- add_subdirectory(lib/kdevplatform)
-- add_subdirectory(${KDEV_SOURCE_DIR})
-+ find_package(KDevPHP)
-+ if(NOT KDevPHP_FOUND)
-+ set(NO_INSTALL 1)
-+ set(BUILD_PARSER_ONLY 1)
-+ set(BUILD_PHP_IMPORT 1)
-+ add_definitions(
-+ -DKDEVPHPPARSER_EXPORT=
-+ )
-+ include_directories(
-+ ${CMAKE_SOURCE_DIR}/${KDEV_SOURCE_DIR}
-+ ${CMAKE_BINARY_DIR}/${KDEV_SOURCE_DIR}
-+ )
-+ add_subdirectory(${KDEV_SOURCE_DIR})
-+ endif()
- else()
- set(BUILD_PHP_IMPORT 0)
- endif()
-diff --git a/umbrello/codeimport/phpimport.cpp b/umbrello/codeimport/phpimport.cpp
-index f45f1416f..f714dcbad 100644
---- a/umbrello/codeimport/phpimport.cpp
-+++ b/umbrello/codeimport/phpimport.cpp
-@@ -39,18 +39,21 @@ QTextStream qout(stdout);
- QTextStream qerr(stderr);
- QTextStream qin(stdin);
-
--#include "parsesession.h"
--#include "phplexer.h"
--#include "phpparser.h"
--#include "phpdebugvisitor.h"
--#include "phpast.h"
--#include "tokenstream.h"
--#include "phptokentext.h"
--
-+// kdevphp
-+#include <parser/parsesession.h>
-+#include <parser/phplexer.h>
-+#include <parser/phpparser.h>
-+#include <parser/phpdebugvisitor.h>
-+#include <parser/phpast.h>
-+#include <parser/tokenstream.h>
-+#include <parser/phptokentext.h>
-+
-+// kdevplatform
- #include <tests/autotestshell.h>
- #include <language/duchain/duchain.h>
- #include <language/duchain/problem.h>
- #include <language/codegen/coderepresentation.h>
-+#include <language/editor/documentrange.h>
- #include <tests/testcore.h>
-
- namespace Php {
---
-GitLab
-
diff --git a/kde-apps/umbrello/umbrello-20.08.3.ebuild b/kde-apps/umbrello/umbrello-20.08.3.ebuild
deleted file mode 100644
index ac0fd86af5d..00000000000
--- a/kde-apps/umbrello/umbrello-20.08.3.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_QTHELP="false" # TODO: figure out install error
-ECM_TEST="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE UML Modeller"
-HOMEPAGE="https://apps.kde.org/en/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}"/${P}-{no,unused}-qtwebkit.patch
- "${FILESDIR}"/${P}-gentoo-docbundledir.patch # downstream fix hardcoded path
- "${FILESDIR}"/${P}-unbundle-kdevelop-php.patch
-)
-
-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
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/umbrello/files/, kde-apps/umbrello/
@ 2025-08-18 16:27 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2025-08-18 16:27 UTC (permalink / raw
To: gentoo-commits
commit: 8fcf38717345fcda247495a1c1a907c359bcf87b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 18 16:23:13 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Aug 18 16:27:04 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fcf3871
kde-apps/umbrello: drop 25.11.70_pre20250817
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-apps/umbrello/Manifest | 1 -
.../umbrello/files/umbrello-25.11.70-cmake.patch | 50 ----------------
.../umbrello/umbrello-25.11.70_pre20250817.ebuild | 68 ----------------------
3 files changed, 119 deletions(-)
diff --git a/kde-apps/umbrello/Manifest b/kde-apps/umbrello/Manifest
index 25da68423905..a229d3638047 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_pre20250817-b2541da6.tar.gz 8705686 BLAKE2B b9fb9a4d31eebff7c6011bd225da18a7dff882f4c4b192365b30afcdbb6744fd3f42173f6762da366c21f1ca5542a8959be5505fcc43da9791791499802088dd SHA512 0530879742ee1e3af401fcae8fc8623df9fefa2d26b5bfaf866f499022ebbd426b3bee697ea69e0a54ba74d7f2d9cc2239a42e936e85dcc606cfc8a43ee40f7f
diff --git a/kde-apps/umbrello/files/umbrello-25.11.70-cmake.patch b/kde-apps/umbrello/files/umbrello-25.11.70-cmake.patch
deleted file mode 100644
index 6160de3b4e8f..000000000000
--- a/kde-apps/umbrello/files/umbrello-25.11.70-cmake.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Pending MR: https://invent.kde.org/sdk/umbrello/-/merge_requests/67
-
-From 7982ba18ad401c8d030afeb6bda13652addc9f85 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 17 Aug 2025 18:40:14 +0200
-Subject: [PATCH] Do not rely on BUILD_WITH_QT6 being set for build targets
-
-In fact, even QtVersionOption will return early if QT_MAJOR_VERSION
-is already set. BUILD_WITH_QT6 is not necessarily set in such a case.
-
-Amends bd0cd90a0ef37e4a2e7fe4eb0602973a58666d04
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 2 +-
- umbrello/CMakeLists.txt | 4 +++-
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3d0a8581c..304cba56b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -113,7 +113,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
- endif()
-
- if(BUILD_PHP_IMPORT)
-- if(BUILD_WITH_QT6)
-+ if(QT_MAJOR_VERSION STREQUAL "6")
- set(_name KDevelopPGQt)
- else()
- set(_name KDevelop-PG-Qt)
-diff --git a/umbrello/CMakeLists.txt b/umbrello/CMakeLists.txt
-index ce97ff703..c9b2fac00 100644
---- a/umbrello/CMakeLists.txt
-+++ b/umbrello/CMakeLists.txt
-@@ -535,8 +535,10 @@ target_link_libraries(libumbrello
- ${LIBXSLT_LIBRARIES}
- ${LIBXML2_LIBRARIES}
- codeimport
-- $<$<BOOL:${BUILD_WITH_QT6}>:KF6::KIOWidgets>
- )
-+if(QT_MAJOR_VERSION STREQUAL "6")
-+ target_link_libraries(libumbrello KF6::KIOWidgets)
-+endif()
- ecm_add_app_icon(umbrello_SRCS
- ICONS
- ${CMAKE_CURRENT_SOURCE_DIR}/pics/global/16-apps-umbrello.png
---
-2.50.1
-
diff --git a/kde-apps/umbrello/umbrello-25.11.70_pre20250817.ebuild b/kde-apps/umbrello/umbrello-25.11.70_pre20250817.ebuild
deleted file mode 100644
index 278a10a28b6c..000000000000
--- a/kde-apps/umbrello/umbrello-25.11.70_pre20250817.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=b2541da64dc5b4c561904bd72b36f1776b0d9066
-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}"/${PN}-25.11.70-cmake.patch
-)
-
-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
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/umbrello/files/, kde-apps/umbrello/
@ 2025-08-25 16:05 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2025-08-25 16:05 UTC (permalink / raw
To: gentoo-commits
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 <asturm@gentoo.org>
-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 <asturm@gentoo.org>
----
- 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
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-08-25 16:07 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-08-25 16:05 [gentoo-commits] repo/gentoo:master commit in: kde-apps/umbrello/files/, kde-apps/umbrello/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2025-08-18 16:27 Andreas Sturmlechner
2021-04-06 8:23 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox