gentoo resync : 25.11.2020

4 files changed, 14 insertions, 192 deletions

diff --git a/app-office/libalkimia/Manifest b/app-office/libalkimia/Manifest
index 68a0f3f66095..27891295bb07 100644
--- a/app-office/libalkimia/Manifest
+++ b/app-office/libalkimia/Manifest
@@ -1,5 +1,4 @@
 AUX libalkimia-8.0.3-cmake.patch 1447 BLAKE2B 0e6c9d928461943950f6e3c49188c3a9e7c53061b43ec6683e76f44fe731a2eeabe74e5a6d49cd56a3e975093ac2b031a48d6bb9514e22e4cbd1f7434fcead37 SHA512 6353bb424077df9befa451df792c2c94d96e70572ae50b2f9ed122d9fa36fe2bc268d2b75a21fd35b25b2ab3c17296e9b2153e5051c241ecc710cc0be156b356
-AUX libalkimia-8.0.3-no-financequote.patch 6420 BLAKE2B f30f9de62f71a2276473817373add651384805666a087993bddae49d8cfeeaf9addb545cfa1be815c0c0dec1618b124fa3ebdfed77d1d890fb96c1a19e5afc8a SHA512 e85d527cbe9fa24ebbdfd916346e06e3b57072760c3f17644bc7bd1a7de7de016b3b1d8d368a57fdfb06f04eb3e38f8282ae859b0807452ec6af08991c16f4e3
-DIST alkimia-8.0.3.tar.xz 212780 BLAKE2B 4863bd2fba7e92518618da250b08772e288697eab9e45980c72c4a29d51f3df94899ead344a9dd5f16ea73cab8dc5596c696156f7da678a030623e77c766949c SHA512 04debd3adeba6380ffe7e9d3949e927dca12ecd7f83dea7b7ba6295b158272c636978c89800757166889e632fed09f3e8b3ce19adc9b91e3369e3b16a5b6cb1e
-EBUILD libalkimia-8.0.3.ebuild 1879 BLAKE2B 3fb216ce72fcfa1d5d34089a4329ea8a102bb5fb4664368cc88ea47fd5d6cc6b8c573804f2f040b349a5fbebd64be99460ee25239fc2d25a7023fc448f09eef4 SHA512 976efc8e606e35ee05f12a1c80e013d48f1b5a45f496cf06e7a34e842e2bc3c9291a0115fa2747333a2396de0e83b200f6f5fe777a32b2edfa24dcf5a413c5d4
-MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
+DIST alkimia-8.0.4.tar.xz 221108 BLAKE2B 90a89bfc76998aeec95989455d62b2a46e06e86f01b96d0a28e3226ec4228108b35a9ca9f8d50f95a32130e39b4954515e205f40d6aad6346bc9310fd31dff75 SHA512 49b771ac28ec76143cf1237a21a834fa38689c91c773a472cc090e94f49287a79ad7790ef068cd6bebc4e64aa97e5026a9ea5be841bbdb3ca89b00b6ca7acc27
+EBUILD libalkimia-8.0.4.ebuild 2000 BLAKE2B 73f280dc5f7f8e389d6348abca1ebb1372c474ae0b88aa5e4a0b53f4fe2ef9b8ba73acd4c0f0cd0cddd8d041df649601b16ec0a47d14310ed755ae00b1d68071 SHA512 cb870fefdb9e734b0333b51cbd62dfd916ff7270ea6091761bae9555a531a4839c54235add2eec0aca3d67a8ee5bf3ea422002c11e1b864fdec14100053625cc
+MISC metadata.xml 351 BLAKE2B 2ef8ddf9828250cbd533cbee3e394319db2bfef425a2b2a8b560a79b936f5e2137b37737355a2f45989d811e9d5dd93d0fc7ed6ad2dc9ddb4f4b49519db76818 SHA512 b5f8205d1cbe54b56e39a5291655927261bad8cbc6bc768285e2d2362f0f1f1697c40cdbe494679ac38d23efb4a143820a684dc571a59f983fb0cfa6cd5308f4
diff --git a/app-office/libalkimia/files/libalkimia-8.0.3-no-financequote.patch b/app-office/libalkimia/files/libalkimia-8.0.3-no-financequote.patch
deleted file mode 100644
index a94359062767..000000000000
--- a/app-office/libalkimia/files/libalkimia-8.0.3-no-financequote.patch
+++ /dev/null
@@ -1,181 +0,0 @@
-From 4f79ab942936c2985136575e9244aae4d9b81323 Mon Sep 17 00:00:00 2001
-From: Ralf Habacker <ralf.habacker@freenet.de>
-Date: Fri, 24 Jan 2020 09:47:28 +0100
-Subject: [PATCH] Add option ENABLE_FINANCEQUOTE and set to false by default on
- Windows
-
-Financequote needs perl, which isn't supported on Windows yet.
----
- CMakeLists.txt                          | 10 ++++++++++
- src/CMakeLists.txt                      | 15 ++++++++++-----
- src/alkonlinequote.cpp                  |  7 ++++++-
- src/alkonlinequotesprofile.cpp          |  7 ++++++-
- tools/onlinequoteseditor/mainwindow.cpp |  2 ++
- 5 files changed, 34 insertions(+), 7 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ae48620..02bea7c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -10,6 +10,16 @@ option(BUILD_QT4 "Build for Qt4" OFF)
- option(BUILD_DOXYGEN_DOCS "Build api docs" ON)
- option(BUILD_APPLETS "Build plasma applets" ON)
- 
-+if(WIN32)
-+    set(ENABLE_FINANCEQUOTE_DEFAULT 0)
-+else()
-+    set(ENABLE_FINANCEQUOTE_DEFAULT 1)
-+endif()
-+option(ENABLE_FINANCEQUOTE "Enable finance quote support (requires perl)" ENABLE_FINANCEQUOTE_DEFAULT)
-+if(ENABLE_FINANCEQUOTE)
-+    add_definitions(-DENABLE_FINANCEQUOTE)
-+endif()
-+
- find_package(ECM 0.0.11 REQUIRED NO_MODULE)
- 
- set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 2692a79..b863fa1 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -49,7 +49,6 @@ set(ALKIMIA_LIB_SOVERSION "${alkimia_VERSION_MAJOR}")
- 
- set(alkimia_LIB_SRCS
-     alkcompany.cpp
--    alkfinancequoteprocess.cpp
-     alkonlinequote.cpp
-     alkonlinequotesource.cpp
-     alkonlinequotesprofile.cpp
-@@ -61,7 +60,6 @@ set(alkimia_LIB_SRCS
- 
- set(alkimia_LIB_HEADERS
-     alkcompany.h
--    alkfinancequoteprocess.h
-     alkonlinequote.h
-     alkonlinequotesource.h
-     alkonlinequotesprofile.h
-@@ -70,6 +68,11 @@ set(alkimia_LIB_HEADERS
-     alkwebpage.h
- )
- 
-+if(ENABLE_FINANCEQUOTE)
-+    list(APPEND alkimia_LIB_SRCS alkfinancequoteprocess.cpp)
-+    list(APPEND alkimia_LIB_HEADERS alkfinancequoteprocess.h)
-+endif()
-+
- set(alkimia_UI
-     alkonlinequoteswidget.ui
- )
-@@ -177,9 +180,11 @@ install(FILES
- make_directory(${FQ_LOCAL_INSTALL_PATH})
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/financequote.pl ${FQ_LOCAL_INSTALL_PATH}/financequote.pl IMMEDIATE COPYONLY)
- 
--install(PROGRAMS financequote.pl
--  DESTINATION ${APPDATA_INSTALL_DIR}/alkimia${ALKIMIA_PATH_SUFFIX}/misc
--)
-+if(ENABLE_FINANCEQUOTE)
-+    install(PROGRAMS financequote.pl
-+      DESTINATION ${APPDATA_INSTALL_DIR}/alkimia${ALKIMIA_PATH_SUFFIX}/misc
-+    )
-+endif()
- 
- if (NOT WIN32)
-    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libalkimia.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libalkimia${ALKIMIA_PATH_SUFFIX}.pc IMMEDIATE @ONLY)
-diff --git a/src/alkonlinequote.cpp b/src/alkonlinequote.cpp
-index 5b1b6e6..83a839c 100644
---- a/src/alkonlinequote.cpp
-+++ b/src/alkonlinequote.cpp
-@@ -337,6 +337,7 @@ bool AlkOnlineQuote::Private::launchNative(const QString &_symbol, const QString
-     return result;
- }
- 
-+#ifdef ENABLE_FINANCEQUOTE
- bool AlkOnlineQuote::Private::launchFinanceQuote(const QString &_symbol, const QString &_id,
-                                         const QString &_sourcename)
- {
-@@ -374,6 +375,7 @@ bool AlkOnlineQuote::Private::launchFinanceQuote(const QString &_symbol, const Q
-     }
-     return result;
- }
-+#endif
- 
- bool AlkOnlineQuote::Private::parsePrice(const QString &_pricestr)
- {
-@@ -560,10 +562,13 @@ void AlkOnlineQuote::setAcceptLanguage(const QString &language)
- 
- bool AlkOnlineQuote::launch(const QString &_symbol, const QString &_id, const QString &_source)
- {
-+#ifdef ENABLE_FINANCEQUOTE
-     if (AlkOnlineQuoteSource::isFinanceQuote(_source) ||
-             d->m_profile->type() == AlkOnlineQuotesProfile::Type::Script) {
-         return d->launchFinanceQuote(_symbol, _id, _source);
--    } else if (_source.endsWith(".css")) {
-+    } else
-+#endif
-+        if (_source.endsWith(".css")) {
-         return d->launchWebKitCssSelector(_symbol, _id, _source);
-     } else if (_source.endsWith(".webkit")) {
-         return d->launchWebKitHtmlParser(_symbol, _id, _source);
-diff --git a/src/alkonlinequotesprofile.cpp b/src/alkonlinequotesprofile.cpp
-index c3a6c96..637fb38 100644
---- a/src/alkonlinequotesprofile.cpp
-+++ b/src/alkonlinequotesprofile.cpp
-@@ -59,11 +59,12 @@ public:
-         , m_config(0)
-         , m_type(Type::Undefined)
-     {
--
-+#ifdef ENABLE_FINANCEQUOTE
-         if (m_financeQuoteScriptPath.isEmpty()) {
-             m_financeQuoteScriptPath = KGlobal::dirs()->findResource("appdata",
-                                                                      QString("misc/financequote.pl"));
-         }
-+#endif
-     }
- 
-     ~Private()
-@@ -135,6 +136,7 @@ public Q_SLOTS:
-         return groups;
-     }
- 
-+#ifdef ENABLE_FINANCEQUOTE
-     const QStringList quoteSourcesFinanceQuote()
-     {
-         if (m_financeQuoteSources.empty()) { // run the process one time only
-@@ -153,6 +155,7 @@ public Q_SLOTS:
-         }
-         return m_financeQuoteSources;
-     }
-+#endif
- 
-     const QStringList quoteSourcesSkrooge()
-     {
-@@ -391,9 +394,11 @@ const QStringList AlkOnlineQuotesProfile::quoteSources()
-     case AlkOnlineQuotesProfile::Type::KMyMoney5:
-         result << d->quoteSourcesNative();
-         break;
-+#ifdef ENABLE_FINANCEQUOTE
-     case AlkOnlineQuotesProfile::Type::Script:
-         result << d->quoteSourcesFinanceQuote();
-         break;
-+#endif
-     case AlkOnlineQuotesProfile::Type::None:
-         result << d->defaultQuoteSources().keys();
-         break;
-diff --git a/tools/onlinequoteseditor/mainwindow.cpp b/tools/onlinequoteseditor/mainwindow.cpp
-index 59af0c4..791b1e6 100644
---- a/tools/onlinequoteseditor/mainwindow.cpp
-+++ b/tools/onlinequoteseditor/mainwindow.cpp
-@@ -82,7 +82,9 @@ MainWindow::MainWindow(QWidget *parent)
-     manager.addProfile(new AlkOnlineQuotesProfile("skrooge5", AlkOnlineQuotesProfile::Type::Skrooge5, "skrooge-quotes.knsrc"));
-     manager.addProfile(new AlkOnlineQuotesProfile("kmymoney5", AlkOnlineQuotesProfile::Type::KMyMoney5, "kmymoney-quotes.knsrc"));
- #endif
-+#ifdef ENABLE_FINANCEQUOTE
-     manager.addProfile(new AlkOnlineQuotesProfile("Finance::Quote", AlkOnlineQuotesProfile::Type::Script));
-+#endif
-     d->ui.setupUi(this);
- 
-     d->quotesWidget = new AlkOnlineQuotesWidget(true, true);
--- 
-GitLab
-
diff --git a/app-office/libalkimia/libalkimia-8.0.3.ebuild b/app-office/libalkimia/libalkimia-8.0.4.ebuild
index 6a102d8a6201..dbc12daf7d25 100644
--- a/app-office/libalkimia/libalkimia-8.0.3.ebuild
+++ b/app-office/libalkimia/libalkimia-8.0.4.ebuild
@@ -5,8 +5,8 @@ EAPI=7
 
 ECM_TEST="forceoptional"
 KDE_ORG_NAME="alkimia"
-KFMIN=5.60.0
-QTMIN=5.12.3
+KFMIN=5.74.0
+QTMIN=5.15.1
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
@@ -21,7 +21,7 @@ https://community.kde.org/Alkimia"
 
 LICENSE="LGPL-2.1"
 SLOT="0/8"
-IUSE="doc gmp plasma"
+IUSE="doc gmp plasma webengine"
 
 BDEPEND="
 	virtual/pkgconfig
@@ -43,27 +43,28 @@ DEPEND="
 	>=kde-frameworks/knewstuff-${KFMIN}:5
 	>=kde-frameworks/ktextwidgets-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	!gmp? ( sci-libs/mpir:=[cxx] )
 	gmp? ( dev-libs/gmp:0=[cxx] )
 	plasma? (
 		>=kde-frameworks/kpackage-${KFMIN}:5
 		>=kde-frameworks/plasma-${KFMIN}:5
 	)
+	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5 )
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=(
-	"${FILESDIR}/${P}-cmake.patch"
-	"${FILESDIR}/${P}-no-financequote.patch"
-)
+PATCHES=( "${FILESDIR}/${PN}-8.0.3-cmake.patch" )
 
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_FINANCEQUOTE=OFF
+		-DBUILD_TOOLS=ON
 		-DBUILD_WITH_WEBKIT=OFF
 		-DBUILD_DOXYGEN_DOCS=$(usex doc)
 		$(cmake_use_find_package !gmp MPIR)
 		-DBUILD_APPLETS=$(usex plasma)
+		-DBUILD_WITH_WEBENGINE=$(usex webengine)
 	)
 	ecm_src_configure
 }
diff --git a/app-office/libalkimia/metadata.xml b/app-office/libalkimia/metadata.xml
index 2fdbf33d963d..2222575f4335 100644
--- a/app-office/libalkimia/metadata.xml
+++ b/app-office/libalkimia/metadata.xml
@@ -5,4 +5,7 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
+	<use>
+		<flag name="webengine">Use dev-qt/qtwebengine for embedded web browser widget</flag>
+	</use>
 </pkgmetadata>