gentoo auto-resync : 03:12:2022 - 14:59:58

3 files changed, 0 insertions, 188 deletions

diff --git a/kde-apps/umbrello/Manifest b/kde-apps/umbrello/Manifest
index 2519dc1bc771..7f0075a7d5fd 100644
--- a/kde-apps/umbrello/Manifest
+++ b/kde-apps/umbrello/Manifest
@@ -1,7 +1,4 @@
 AUX umbrello-20.08.3-gentoo-docbundledir.patch 1990 BLAKE2B c629fa51a4d701576e2c5bc870d8368851773687b93309a02986f2cd3140089c435a2964edafd1be930796906295bc8ef1477ba8c9837f560f986ed07ae19358 SHA512 9635b33d0aa612eebbbed37f82812b5f1ea8edcc6bfd0a8749e667cbc718d3ed56568397a6db43838a84f04085682dcd5c3a8a272b92bd9ee9a84de30a2f2d40
-AUX umbrello-20.08.3-no-qtwebkit.patch 3512 BLAKE2B ae1f25f42c75f061c52f2f9316d88337153c81d20ca407dacdf786d7d343b5fa1207216c3ccb761321648cdcfc7785ddc77161fe6e471014cc36438e002c5486 SHA512 f03b54ee66d10dd51cb9b1a8a9affc0c832501ac0f40377c7357999649fecb05374f6227cd43bfff069900dfc94f9c6ee507e42188a826ed9f675dab39e77225
-DIST umbrello-22.04.3.tar.xz 5674976 BLAKE2B 2e314adc1ea1466c332b34dd861d5eba7a1f09a3363a2c658c9459c1006d39a220fa6bbd80ef1bba393007fc7eb7a10a0b3dba48360a022c65d8eac6a2d86aed SHA512 8c44eca651bef1f4b5022a6c4ef8b6e58277ae4694a1797b75465c6d0cf3936c0f5f3bc2c1d6344885b2a3b0e4f9247b76a63432099590396da634457d56e59e
 DIST umbrello-22.08.3.tar.xz 5687876 BLAKE2B 454673200be32570d89c76d6047bfbcccb4cb589769cbaf452f07a4d6348f64e9ebef6b43e2619745ac143adf64b2b34a1f518c7788af7e745fdedee83da43e2 SHA512 0c1e43e57b6a0a0eeb7ebe6c7c16c1751a109491fa12bb3edd0a528afc1d7215e22615670ea93fb0d3e525429bd6485cce27d94da3b841e188b5c87c7a31c9fb
-EBUILD umbrello-22.04.3.ebuild 1951 BLAKE2B 29636232deef8ef8caef53198e5275329af424cc75b70d53de05b29bf4ec033f4562d82ded0af512f998b43823d6728659ce966120642ebd5a123cf84aee335f SHA512 843d6be4ba80d1ba9acd36bed68f6f37b369e4d9339555c79aa182a3dd428650685cd8f24bb0ff111a3dbd4204dfd010a715361c4ad3e014de170e87d581f714
 EBUILD umbrello-22.08.3.ebuild 1951 BLAKE2B 37a710ef9a48cb20a8b9ee44a146ad1e90871be12bf5508143f8cf6443c18903ccdbed505b019712f0bb1b347d8ae6beeda1d5ab4385ef9e2e1c9ae176e6dac8 SHA512 966896eb72764c40e2e0122c83d81f5903da879ef965af8f181357ebe2b64b0a97260e58faad4004ac058941e914931bf963818a64a60d9b944a082dcf4484da
 MISC metadata.xml 459 BLAKE2B 465f4c84b8aeb296c6c2e6b7c387545709a78db7bd3a42e276ecd67b9e0d6137be482e058b984784a3e68f965561763149de1fec93abb3d4c601f9de115c5b38 SHA512 fee91c5580066b6e088669602c6629a20e65e58390809427e737c6042b1233b118dc9d245b15af14f588aaf84cdba30e811e8a1d246ba6ecfd43215285741608
diff --git a/kde-apps/umbrello/files/umbrello-20.08.3-no-qtwebkit.patch b/kde-apps/umbrello/files/umbrello-20.08.3-no-qtwebkit.patch
deleted file mode 100644
index 74a1e9b3e6d4..000000000000
--- a/kde-apps/umbrello/files/umbrello-20.08.3-no-qtwebkit.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-From eb753a7eb0f49c6ac5b349f81387ca4b4c64342b Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Mon, 12 Oct 2020 11:46:24 +0200
-Subject: [PATCH] Make QtWebKit usage in WelcomePage optional, with
- QTextBrowser fallback
-
-Thanks-to: Ralf Habacker <ralf.habacker@freenet.de> for QTextBrowser fallback code.
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt                    |  7 ++++++-
- umbrello/CMakeLists.txt           |  4 +++-
- umbrello/umlappprivate.h          | 13 +++++++++++++
- 3 files changed, 22 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 50b0bd163..8673740cc 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -102,9 +102,14 @@ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS
-     Test
-     Widgets
-     Xml
--    WebKitWidgets
- )
- 
-+find_package(Qt5WebKitWidgets ${QT_MIN_VERSION})
-+if(Qt5WebKitWidgets_FOUND)
-+    add_definitions(-DWEBKIT_WELCOMEPAGE)
-+    set(WEBKIT_WELCOMEPAGE 1)
-+endif()
-+
- # search packages used by KDE
- find_package(KF5 REQUIRED COMPONENTS
-     Archive
-diff --git a/umbrello/CMakeLists.txt b/umbrello/CMakeLists.txt
-index 4a2168542..fd5ef8fbf 100644
---- a/umbrello/CMakeLists.txt
-+++ b/umbrello/CMakeLists.txt
-@@ -549,7 +549,6 @@ else()
-         Qt5::Xml
-         Qt5::PrintSupport
-         Qt5::Svg
--        Qt5::WebKitWidgets
-         KF5::Archive
-         KF5::Completion
-         KF5::CoreAddons
-@@ -565,6 +564,9 @@ else()
-         ${LIBXML2_LIBRARIES}
-         codeimport
-     )
-+    if(WEBKIT_WELCOMEPAGE)
-+        target_link_libraries(libumbrello Qt5::WebKitWidgets)
-+    endif()
-     ecm_add_app_icon(umbrello_SRCS
-         ICONS
-         ${CMAKE_CURRENT_SOURCE_DIR}/pics/global/16-apps-umbrello.png
-diff --git a/umbrello/umlappprivate.h b/umbrello/umlappprivate.h
-index 0c832048d..ad425a37f 100644
---- a/umbrello/umlappprivate.h
-+++ b/umbrello/umlappprivate.h
-@@ -37,7 +37,11 @@
- #include <QFileInfo>
- #include <QListWidget>
- #include <QObject>
-+#ifdef WEBKIT_WELCOMEPAGE
- #include <QWebView>
-+#else
-+#include <QTextBrowser>
-+#endif
- 
- class QWidget;
- 
-@@ -155,6 +159,7 @@ public slots:
-         // qDebug() << html;
-         welcomeWindow = new QDockWidget(i18n("Welcome"), parent);
-         welcomeWindow->setObjectName(QLatin1String("WelcomeDock"));
-+#ifdef WEBKIT_WELCOMEPAGE
-         QWebView *view = new QWebView;
-         view->page()->setLinkDelegationPolicy(QWebPage::DelegateAllLinks);
-         view->setContextMenuPolicy(Qt::NoContextMenu);
-@@ -162,6 +167,14 @@ public slots:
-         view->setHtml(html);
-         view->show();
-         welcomeWindow->setWidget(view);
-+#else
-+        QTextBrowser *tb = new QTextBrowser(dynamic_cast<QWidget*>(this));
-+        tb->setOpenExternalLinks(true);
-+        tb->setOpenLinks(false);
-+        tb->setHtml(html);
-+        connect(tb, SIGNAL(anchorClicked(const QUrl)), this, SLOT(slotWelcomeWindowLinkClicked(const QUrl)));
-+        welcomeWindow->setWidget(tb);
-+#endif
-         parent->addDockWidget(Qt::RightDockWidgetArea, welcomeWindow);
- 
-         viewWelcomeWindow = parent->actionCollection()->add<KToggleAction>(QLatin1String("view_show_welcome"));
-diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt
-index 26bd4b870..9dadb484a 100644
---- a/unittests/CMakeLists.txt
-+++ b/unittests/CMakeLists.txt
-@@ -59,7 +59,6 @@ else()
-         Qt5::Xml
-         Qt5::Test
-         Qt5::Widgets
--        Qt5::WebKitWidgets
-         KF5::I18n
-         KF5::Crash
-         ${LIBXML2_LIBRARIES}
--- 
-2.29.2
-
diff --git a/kde-apps/umbrello/umbrello-22.04.3.ebuild b/kde-apps/umbrello/umbrello-22.04.3.ebuild
deleted file mode 100644
index b8fbda150bad..000000000000
--- a/kde-apps/umbrello/umbrello-22.04.3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 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.92.0
-QTMIN=5.15.4
-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
-}