gentoo resync : 25.08.2020

4 files changed, 90 insertions, 11 deletions

diff --git a/kde-plasma/kdeplasma-addons/Manifest b/kde-plasma/kdeplasma-addons/Manifest
index e27813c8bffd..3accca9ffde4 100644
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -1,5 +1,6 @@
+AUX kdeplasma-addons-5.19.3-kross-optional.patch 1956 BLAKE2B 922b8e73147439a706a37fcec29dcf7fb424e8ceaa8bfa1e4e54ca6c5851cf937318ee91654bf5cb352b80076aa90c9063ec07b02c7fbade8613f3d560178e86 SHA512 f9c87b27b0e8d020519259fda8df118266dd11b589873a3a8a5b4bcdf1e77e65fad29334aee80717cfe208c54021d39caee36533d144538bd80b5c1618cd36b4
 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.4.tar.xz 628036 BLAKE2B c0d3417eb2ac722dd6a93a667214dccacb305893c1054c3b85124e862d530fbd09827ea23f475cdf0cb754bd6fb54cde7c0fa1b7238d67efab472abf9d7cebb7 SHA512 01e43e573b0d1fc1cb62ae469d93974405138e3139a1973a0e78b42f46221feb58efa389e527fb81941df91807da7dc22d56d2b419c652af3af872660c661f12
 EBUILD kdeplasma-addons-5.18.5.ebuild 1752 BLAKE2B 010e42c867df1157c15996b23f68cbaf268508a53842c76caff7831975f60c9a3099798e9579167bd093584d690390ce9d43524ec3e7aba12a7c3d94c70ec2f4 SHA512 253c8e7abef4701ba3ec136ea225a4c181491056cf66ff3a4114522a041d6bcf36bd14da939d3e3979d793de50e845207dd4f9453b0a5d9335668373f79c479c
-EBUILD kdeplasma-addons-5.19.2.ebuild 1775 BLAKE2B fc4dc4e71a893d27562262e88d372b92fc15e5618596c8213f112db04dd20fa8d81ea7506a6608184bf67991ff55b7da8c868307578c5b182d48d2b6b5b9af74 SHA512 75f4a13801317b910fad9d2707c99d3fb6764cab1348a921cf54ec496c2f7b2960c09d2dd8ce2e46f369ed0e76f208028b69b134528eff23e9d1c2d7842374a4
-MISC metadata.xml 465 BLAKE2B 94fe9737b3b632b7c4cb0907ebe49ada7f7216ed88f5132f0b24f5f0b9532993744f9167c775a265bfe827d6b4d430c3949d82da49af275c286003f1d6f25bbc SHA512 c4800f7c56aad0ee306380ddc0f09f39c48565320d38349fa3d3a11e466b40bf35d2bc593fa70c3768dc940f635319ad848724f0ae537d12fa680e24d83110a8
+EBUILD kdeplasma-addons-5.19.4.ebuild 2081 BLAKE2B 3018fc8e512e02f71ee65085e25057195867859496ccc8d6109312bca00a6900295a5503692614c4ed754279ab1da71bedf5de9f03ef71d6e2710ec4980da90e SHA512 5319dc917c35b10fa957f183b10c0dd4cc29003120290d3dbb68f95ae856a620d2fd71cfed0b2369aac2dc34052d75b6a9a13a53143101f0774fc2371022ae34
+MISC metadata.xml 567 BLAKE2B 5009c2a6fd74956562b1b3b33322a457a0d295ae472f89208c3756d9847aed9f7b501d0a7e135e95c1a455a57f65876dca71e94446043b9b7d3dc551d58da854 SHA512 2e2fdba9c39b93e082b24d38b1134245e682b07a99b587c9eb6060aae318dd10d08af661880df478a1a97a23c46f1259a4753b9b6169af6af75babfbccf1c7ce
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.2.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.19.4.ebuild
index 1dacb6f5f385..0b16be6fcc80 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.19.2.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.19.4.ebuild
@@ -13,10 +13,14 @@ DESCRIPTION="Extra Plasma applets and engines"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="share webengine"
+KEYWORDS="~amd64 ~arm ~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
@@ -31,7 +35,6 @@ DEPEND="
 	>=kde-frameworks/knewstuff-${KFMIN}:5
 	>=kde-frameworks/knotifications-${KFMIN}:5
 	>=kde-frameworks/kpackage-${KFMIN}:5
-	>=kde-frameworks/kross-${KFMIN}:5
 	>=kde-frameworks/krunner-${KFMIN}:5
 	>=kde-frameworks/kservice-${KFMIN}:5
 	>=kde-frameworks/kunitconversion-${KFMIN}:5
@@ -40,24 +43,33 @@ DEPEND="
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	>=kde-frameworks/plasma-${KFMIN}:5
 	>=kde-frameworks/sonnet-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
+	comic? ( >=kde-frameworks/kross-${KFMIN}:5 )
 	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
 	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5 )
 "
 RDEPEND="${DEPEND}
-	>=kde-plasma/plasma-workspace-${PVCUT}:5
 	>=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>