gentoo resync : 29.01.2021

4 files changed, 2 insertions, 149 deletions

diff --git a/kde-plasma/kdeplasma-addons/Manifest b/kde-plasma/kdeplasma-addons/Manifest
index 4db014c3c815..0a961aaad245 100644
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -1,8 +1,5 @@
 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
 AUX kdeplasma-addons-5.20.5-no-kiconthemes.patch 1004 BLAKE2B a1b1e95d377b15ab9753df6ca0d4121f6690de8e32782b3cda5f3d42b5be2791d400189c990ae4f2820820c8da68d3e39150bbc6de95db7a0104da4c74a01ed3 SHA512 376c8b2cd185b7ee633c43067192e775db61cb05456df615c6230076ca3ed0e5ae04e7e1ebb1147cbf482094d82748b3a29d1c52fa81d5a5fbbb9b6f18ab9499
-DIST kdeplasma-addons-5.19.5.tar.xz 629136 BLAKE2B 992df5d362aca213531cb96b8d01a3c2792ed91562d4f6a7f71e8b50ba6ee28cbd6501b75c7c91923b6afcb13fdf1b385189f718d8cebb482d1cedd040f67d94 SHA512 93de717c623605ceb9fdcedecdf656030b6e9bc360ce834ea918403f64f250029e9a2406bddc0b324e4738006d4ca155bc509f4a7d40c073a2aefb2017db9731
 DIST kdeplasma-addons-5.20.5.tar.xz 644352 BLAKE2B 2579fafc102210006a8cdb4b303c865ec3aabe149c0d0acfa47640c272e4327fa84934f33e14f6c2fad20656fbe145793d375c81fa4028251cf623e37b243aaa SHA512 3a4f0715ac1dbc9edbb62f253b48520f9b011c29f87ef0a7ba25ea14dc24dcc698405e7d8e83593b51bab2976b274b0ac869cab8b17a50ba34902bd8121ee421
-EBUILD kdeplasma-addons-5.19.5-r1.ebuild 2182 BLAKE2B ad22125c6d0d678ca69b404131c9472057f35f13867a0268ee2f4c0139a12841b37b1fbdca11dad1f575436a26769fd4d24b416cdbeb023ebfb89c4c58bfa186 SHA512 0e9e5d29a0a6dbadfb4adaad2ac6f7776b441463236680e7ce6e8982eb3c315b1520df3a78852534d1c62a78ce17bab8dd55307ea6960e60acffedd905309e32
-EBUILD kdeplasma-addons-5.20.5.ebuild 2163 BLAKE2B 52e2939950b75f51bdad8e216f4b33cdc7b570997cbf3d644120bfa94c1ce861379e53b11d3b32ed682e9d8013608dab484eedbe42a1941fae249f686c874556 SHA512 e2a3815b92207f3fcf11ac0c8d0f82704d14664301c024885f224e5e0fa40ff786f1e96b6b3a9eab63ef347828f4149bdc682ec8981c737391c2ed47d6594db1
+EBUILD kdeplasma-addons-5.20.5.ebuild 2161 BLAKE2B 2813bf768a3a911b5f3f6bb795be186afbc318f7459bede11984e5f7379280d1e4a553682a09697a9d81d8aa92c5592ebf39640d8977eae0d37fc8dbd8c99736 SHA512 ce676856febab179ed0de7636c43ec20eccc5f62252f8bb7a93cf78d0557dea85be8ff8f3035a2a80ce2b947a11318ca970e342eb518801eb09995d4f99d0552
 MISC metadata.xml 567 BLAKE2B 5009c2a6fd74956562b1b3b33322a457a0d295ae472f89208c3756d9847aed9f7b501d0a7e135e95c1a455a57f65876dca71e94446043b9b7d3dc551d58da854 SHA512 2e2fdba9c39b93e082b24d38b1134245e682b07a99b587c9eb6060aae318dd10d08af661880df478a1a97a23c46f1259a4753b9b6169af6af75babfbccf1c7ce
diff --git a/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.19.5-fix-potd.patch b/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.19.5-fix-potd.patch
deleted file mode 100644
index 8cc7f7fb91a0..000000000000
--- a/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.19.5-fix-potd.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From d5f9e6af9f9cda210b15d5c10b370006c86bd7ad Mon Sep 17 00:00:00 2001
-From: Guo Yunhe <i@guoyunhe.me>
-Date: Thu, 23 Apr 2020 22:36:34 +0300
-Subject: [PATCH] Fix POTD in lock screen
-
-Summary:
-2. Flickr and APOD(NASA) providers cannot cache pictures in `PNG` but
-`JPEG` works. So I simply changed the cache format to `JPEG`. Most POTD
-are photos. JPEG saves more spaces.
-
-Subscribers: plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D29140
-
-Merge Request: https://invent.kde.org/plasma/kdeplasma-addons/-/merge_requests/3
-
-BUG: 389962
-
-FIXED-IN: 5.20
-
-* asturm 2020-09-04: Backported to 5.19.5, including merged commits e7c51a04 and
-* e6472153, shortened summary to relevant bits, dropped unrelated hunks.
----
- dataengines/potd/PoTD-list.txt      |  1 +
- dataengines/potd/cachedprovider.cpp | 14 +++----
- 2 files changed, 8 insertions(+), 7 deletions(-)
-
-diff --git a/dataengines/potd/PoTD-list.txt b/dataengines/potd/PoTD-list.txt
-index 53b0fe02a..c74316614 100644
---- a/dataengines/potd/PoTD-list.txt
-+++ b/dataengines/potd/PoTD-list.txt
-@@ -5,6 +5,7 @@ LIST OF POSSIBLE PROVIDERS
- http://antwrp.gsfc.nasa.gov/apod/astropix.html
- Each day can be reached via the URL http://antwrp.gsfc.nasa.gov/apod/apYYMMDD.html
- where YY is the 2 digits year, MM is the 2 digits month and DD is the 2 digits day.
-+Note: sometimes, the webpage shows a YouTube video and picture cannot be fetched.
- 
- * Flickr Interestingness  ----------------------------  DONE
- http://www.flickr.com/explore/interesting/
-diff --git a/dataengines/potd/cachedprovider.cpp b/dataengines/potd/cachedprovider.cpp
-index 476a7c253..d6fb63fe9 100644
---- a/dataengines/potd/cachedprovider.cpp
-+++ b/dataengines/potd/cachedprovider.cpp
-@@ -51,13 +51,13 @@ SaveImageThread::SaveImageThread(const QString &identifier, const QImage &image)
- void SaveImageThread::run()
- {
-     const QString path = CachedProvider::identifierToPath( m_identifier );
--    m_image.save(path, "PNG");
-+    m_image.save(path, "JPEG");
-     emit done( m_identifier, path, m_image );
- }
- 
- QString CachedProvider::identifierToPath( const QString &identifier )
- {
--    const QString dataDir = QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + QLatin1String("/plasma_engine_potd/");
-+    const QString dataDir = QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation) + QLatin1String("/plasma_engine_potd/");
-     QDir d;
-     d.mkpath(dataDir);
-     return dataDir + identifier;
--- 
-GitLab
-
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
deleted file mode 100644
index 5fe105d32ea5..000000000000
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.19.5-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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 ~arm arm64 ~ppc64 x86"
-IUSE="+comic share webengine"
-
-RESTRICT+=" test" # bug 727846
-
-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}/${P}-fix-potd.patch" # in Plasma/5.20
-	"${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() {
-	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/kdeplasma-addons-5.20.5.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.20.5.ebuild
index 81fd1421612e..00bc4b8a63fd 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.20.5.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.20.5.ebuild
@@ -14,7 +14,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