gentoo resync : 25.11.2020

3 files changed, 28 insertions, 15 deletions

diff --git a/kde-plasma/kdeplasma-addons/Manifest b/kde-plasma/kdeplasma-addons/Manifest
index 730a615b42a4..eaa60711483a 100644
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -1,7 +1,7 @@
 AUX kdeplasma-addons-5.19.3-kross-optional.patch 1956 BLAKE2B 922b8e73147439a706a37fcec29dcf7fb424e8ceaa8bfa1e4e54ca6c5851cf937318ee91654bf5cb352b80076aa90c9063ec07b02c7fbade8613f3d560178e86 SHA512 f9c87b27b0e8d020519259fda8df118266dd11b589873a3a8a5b4bcdf1e77e65fad29334aee80717cfe208c54021d39caee36533d144538bd80b5c1618cd36b4
 AUX kdeplasma-addons-5.19.5-fix-potd.patch 2485 BLAKE2B cddf302e5956c3c215c51c08e3358083b02d27038b6e46a345881f2ae4b38c7af3f0012ca300fbe9697bcc15165d09bd0596f91f743dc6cc6bc7f4b286a85951 SHA512 5ef0b40c381bdda5a701240e4622df2044ccb68093b2d0853671db9d6de7274f28723b799d4552e2a99d35e67c232d26a0e1a24939bf02c155366c050a0bce6f
-DIST kdeplasma-addons-5.18.5.tar.xz 623872 BLAKE2B 684c9e569575024fe96d6043a91e6a810db69205e3867db9840442b901c120db4f0dacb09540a145f5ae90b5fc6fcd934e26a3d4435e9d23eb374f4e5ca1e391 SHA512 7baa84335af5afc1af2cd47134863961df7a43c719bdde180754aa0b5a83975c3d5fb79435b523589751029f0fbb1751fae90db5db8e42c995c9dd24578cbeb6
 DIST kdeplasma-addons-5.19.5.tar.xz 629136 BLAKE2B 992df5d362aca213531cb96b8d01a3c2792ed91562d4f6a7f71e8b50ba6ee28cbd6501b75c7c91923b6afcb13fdf1b385189f718d8cebb482d1cedd040f67d94 SHA512 93de717c623605ceb9fdcedecdf656030b6e9bc360ce834ea918403f64f250029e9a2406bddc0b324e4738006d4ca155bc509f4a7d40c073a2aefb2017db9731
-EBUILD kdeplasma-addons-5.18.5.ebuild 1752 BLAKE2B 010e42c867df1157c15996b23f68cbaf268508a53842c76caff7831975f60c9a3099798e9579167bd093584d690390ce9d43524ec3e7aba12a7c3d94c70ec2f4 SHA512 253c8e7abef4701ba3ec136ea225a4c181491056cf66ff3a4114522a041d6bcf36bd14da939d3e3979d793de50e845207dd4f9453b0a5d9335668373f79c479c
-EBUILD kdeplasma-addons-5.19.5-r1.ebuild 2185 BLAKE2B c917128a820f56cd8d01e8a75d076b437651e167b38fdba2834667c0229292a952edecba8ea9b3fbe0c0a58a97a00e628707b3f5a161640b8a8ddf424279b359 SHA512 3b0097081115e210f94b09d4ad6026978feacb2dc3a5188fa6de204a139545e843e48ed21b8382c38a34e6f6f9ef95748d6d716b9408d1d412eec755e2584247
+DIST kdeplasma-addons-5.20.3.tar.xz 634740 BLAKE2B fa7141863c1aeb3b2c5d43af12eb67288b67030a76f24e86be73f7b1cadd461151a4c54a6e9ac5bda2a8d1cf63530d1d83a6812041b5d683485592e325de2359 SHA512 e1509b547cea891af84c1d5d1a2bc3232a0039e4a96852d4da898eb83381bcd5403f6bea5d8bed2400f5c77d74dd3c82bc00b05aaf69396df7d964a90e240347
+EBUILD kdeplasma-addons-5.19.5-r1.ebuild 2182 BLAKE2B ad22125c6d0d678ca69b404131c9472057f35f13867a0268ee2f4c0139a12841b37b1fbdca11dad1f575436a26769fd4d24b416cdbeb023ebfb89c4c58bfa186 SHA512 0e9e5d29a0a6dbadfb4adaad2ac6f7776b441463236680e7ce6e8982eb3c315b1520df3a78852534d1c62a78ce17bab8dd55307ea6960e60acffedd905309e32
+EBUILD kdeplasma-addons-5.20.3.ebuild 2123 BLAKE2B 91c91591fcd5e923e652495eef9f6db3c7d68dedafcdd86a3b3b3513f68d111480868bd2033dfecd0a4b3231f70a75dbb936ea69b8ebb2750f4cf2ee6dcb9a02 SHA512 8874430e4c50ca99e55a15cdbd8ea7ce1b8550ccdd5287bb9c6434db5ccfd0c103cd5b4d10500fda16eff970991715ae4f36fcdc016fe7ab4de133dacb6168a4
 MISC metadata.xml 567 BLAKE2B 5009c2a6fd74956562b1b3b33322a457a0d295ae472f89208c3756d9847aed9f7b501d0a7e135e95c1a455a57f65876dca71e94446043b9b7d3dc551d58da854 SHA512 2e2fdba9c39b93e082b24d38b1134245e682b07a99b587c9eb6060aae318dd10d08af661880df478a1a97a23c46f1259a4753b9b6169af6af75babfbccf1c7ce
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.19.5-r1.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.19.5-r1.ebuild
index 3dc39311c4ce..5fe105d32ea5 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.19.5-r1.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.19.5-r1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Extra Plasma applets and engines"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="+comic share webengine"
 
 RESTRICT+=" test" # bug 727846
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.18.5.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.20.3.ebuild
index e17cb42f9487..3f921c96d88c 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.18.5.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.20.3.ebuild
@@ -3,19 +3,25 @@
 
 EAPI=7
 
-KFMIN=5.66.0
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.74.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org optfeature
 
 DESCRIPTION="Extra Plasma applets and engines"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="5"
-KEYWORDS="amd64 ~arm 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
@@ -30,7 +36,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
@@ -39,24 +44,32 @@ 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" ) # downstream 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() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "Optional dependencies:"
+		optfeature "Disk quota applet" sys-fs/quota
+	fi
+	ecm_pkg_postinst
+}