kde-plasma/kdeplasma-addons: 5.19.3 version bump

Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

4 files changed, 142 insertions, 0 deletions

diff --git a/kde-plasma/kdeplasma-addons/Manifest b/kde-plasma/kdeplasma-addons/Manifest
index 9a06319acd5e..7f95d662ba94 100644
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -1,2 +1,3 @@
 DIST kdeplasma-addons-5.18.5.tar.xz 623872 BLAKE2B 684c9e569575024fe96d6043a91e6a810db69205e3867db9840442b901c120db4f0dacb09540a145f5ae90b5fc6fcd934e26a3d4435e9d23eb374f4e5ca1e391 SHA512 7baa84335af5afc1af2cd47134863961df7a43c719bdde180754aa0b5a83975c3d5fb79435b523589751029f0fbb1751fae90db5db8e42c995c9dd24578cbeb6
 DIST kdeplasma-addons-5.19.2.tar.xz 627952 BLAKE2B 13f6ce0cd5ab71f99d32e825302f561d6de13fa4cdea561ab456a635d2f902fe42e58c1e9d44aaabb4a71bf4bd3520c61d8731c66efef0934e3db5b29e493752 SHA512 8a09986dc994d66923b297022381213b0012763431146c4779af5d50ffac2834045ca3bb1a48c561b459914de29fe0502a3283f6bccacdc4a281ef0982fca712
+DIST kdeplasma-addons-5.19.3.tar.xz 628024 BLAKE2B aab3839bade974dd2fde985ccd8c26fa4c4c6ecff989558f009ddd70f37c89aa2d944bdb9917c0d1819821cf5ee6eb58cd2892116fc94b6e782c0e41f544b2c4 SHA512 59bb2553ec80e927806c9953f87d028eb7ade88ac07321487f1056eac0e00be342edde475b8e321f7e12789f820c7369e011f32ff11e582188375b29600faca8
diff --git a/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.19.3-kross-optional.patch b/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.19.3-kross-optional.patch
new file mode 100644
index 000000000000..485acd542a83
--- /dev/null
+++ b/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.19.3-kross-optional.patch
@@ -0,0 +1,65 @@
+From bbaaa3e2eac712887780c0849f955889e64ff358 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 7 Jul 2020 22:22:13 +0200
+Subject: [PATCH] Make KF5Kross optional, it is only used for comic applet
+
+---
+ CMakeLists.txt             | 7 ++++++-
+ applets/CMakeLists.txt     | 4 +++-
+ dataengines/CMakeLists.txt | 4 +++-
+ 3 files changed, 12 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9c4697a52..e5d14bc8c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -48,7 +48,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
+     IconThemes
+     KIO
+     KCMUtils
+-    Kross
+     Notifications
+     Plasma
+     Runner
+@@ -59,6 +58,12 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
+     NewStuff
+ )
+ 
++find_package(KF5Kross CONFIG QUIET)
++set_package_properties(KF5Kross PROPERTIES
++    PURPOSE "Needed for Comic applet"
++    TYPE OPTIONAL
++)
++
+ find_package(KF5Purpose CONFIG QUIET)
+ set_package_properties(KF5Purpose PROPERTIES
+     DESCRIPTION "Framework for cross-application services and actions"
+diff --git a/applets/CMakeLists.txt b/applets/CMakeLists.txt
+index 93b637b1b..6af5ffc67 100644
+--- a/applets/CMakeLists.txt
++++ b/applets/CMakeLists.txt
+@@ -6,7 +6,9 @@ plasma_install_package(keyboardindicator org.kde.plasma.keyboardindicator)
+ add_subdirectory(binary-clock)
+ add_subdirectory(calculator)
+ add_subdirectory(colorpicker)
+-add_subdirectory(comic)
++if(KF5Kross_FOUND)
++    add_subdirectory(comic)
++endif()
+ add_subdirectory(dict)
+ if(NOT WIN32)
+     # uses the command line tool 'quota', does not make sense on Windows
+diff --git a/dataengines/CMakeLists.txt b/dataengines/CMakeLists.txt
+index 8d91dd84f..38f715b11 100644
+--- a/dataengines/CMakeLists.txt
++++ b/dataengines/CMakeLists.txt
+@@ -1,3 +1,5 @@
+- add_subdirectory(comic)
++if(KF5Kross_FOUND)
++    add_subdirectory(comic)
++endif()
+ add_subdirectory(potd)
+ add_subdirectory(konsoleprofiles)
+-- 
+2.27.0
+
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.19.3.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.19.3.ebuild
new file mode 100644
index 000000000000..800727ee89ac
--- /dev/null
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.19.3.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.71.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.14.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Extra Plasma applets and engines"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="+comic share webengine"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kholidays-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kpackage-${KFMIN}:5
+	>=kde-frameworks/krunner-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kunitconversion-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+	>=kde-frameworks/sonnet-${KFMIN}:5
+	comic? ( >=kde-frameworks/kross-${KFMIN}:5 )
+	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
+	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5 )
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-plasma/plasma-workspace-${PVCUT}:5
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.19.3-kross-optional.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package comic KF5Kross)
+		$(cmake_use_find_package share KF5Purpose)
+		$(cmake_use_find_package webengine Qt5WebEngine)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		has_version sys-fs/quota || \
+			elog "For using disk quota applet, install sys-fs/quota."
+	fi
+}
diff --git a/kde-plasma/kdeplasma-addons/metadata.xml b/kde-plasma/kdeplasma-addons/metadata.xml
index a3b3507b1a26..7421b6e64e74 100644
--- a/kde-plasma/kdeplasma-addons/metadata.xml
+++ b/kde-plasma/kdeplasma-addons/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<use>
+		<flag name="comic">Enable comic applet (requires deprecated <pkg>kde-frameworks/kross</pkg>)</flag>
 		<flag name="share">Enable applet for quickly sharing data to a variety of sources</flag>
 		<flag name="webengine">Enable dictionary and web browser applets using <pkg>dev-qt/qtwebengine</pkg></flag>
 	</use>