gentoo resync : 25.11.2020

4 files changed, 5 insertions, 89 deletions

diff --git a/kde-apps/libkdegames/Manifest b/kde-apps/libkdegames/Manifest
index a1f7b02448df..a40cc8137d86 100644
--- a/kde-apps/libkdegames/Manifest
+++ b/kde-apps/libkdegames/Manifest
@@ -1,6 +1,3 @@
-AUX libkdegames-20.04.2-optional-tests.patch 838 BLAKE2B 7eac9c9a2a6c316ee8573205a1a9cdf72806b3ed1b35512c4aa8b817e9dac47745afa72b0858906b8923d0f0607c532256c4151d263685c4cfc132afc089084b SHA512 bafbbb49184023e1e4adb7aa2b754b8d240a11f5ecb1f022b292b628dcca8db39f132c83ede52ab5956a10be06d1b3a01c0e17a3bbe78621701c3db49ba066e5
-DIST libkdegames-20.04.3.tar.xz 6384092 BLAKE2B 8c7137558776f69a5f7c6accaaa22cbbd33665624eb7ce50dd4ec8c79837d8e1bf6f3ad137ce1b94c0107e0f1489eede5680c0217efda970c7eb0b9e3a515894 SHA512 4681b4b37a78796eecd0daf00d231909391510122de4ad2ecb0c50ba7309c3119895c3490e727425ef0088a84e76cae26bc595730f4a673f7cfdf9aa559f0a74
-DIST libkdegames-20.08.1.tar.xz 6380124 BLAKE2B 7e4275c3be18c6a7436cd954816779c05f0f2025d81c26e9efc92c976acce749fbdb2766ede2a6e8047359d0b206531f6f7c8be1e76ac0cf101e106fcfe2f7a7 SHA512 bf72bd28d3db3f7aa7344c284e81fe0ae8a402965892e0338814870c34652575a5ac980e87b42a40e7ee056f1869c305b094bdc3050862ae9f8ff67c4f5b078e
-EBUILD libkdegames-20.04.3.ebuild 1532 BLAKE2B 23f3e773e5738c3875238aef96ae9df964d3e15ede015afa20d2638bd72c9dbd805aa619a1793e481df42503a680d62a0fee29c247c3348dc062e6b7f21075fa SHA512 83b7cd378c72f2a114270a78a375b64bb4f071102acdd1f01b9a121af0bcc9518a7348419909f61450a54ffa8e25bba131858cf9f9b8cd875ac743ce5096933b
-EBUILD libkdegames-20.08.1.ebuild 1473 BLAKE2B d8e6c53e24f5c772c8fc21ec54b2ffa6435e414fda6f818f5b36dff73192bd8e6b2ff8699e1f2023e303b5b049c233951cd61dc197975f8e7a5f70346c4626a2 SHA512 5a62fe47fa5c6d73cd6e08aec37f547d3b52605faba3bd25e6b27cadadff8ddc86705f129726e980f160ec760d914d952d69056b3f5916f53cca96ce376092d0
+DIST libkdegames-20.08.3.tar.xz 6391180 BLAKE2B edfcc6084730708f5bfc553212a4e9fe399d781812523a344eb3119c61225bb38bd019266bf39c99287e48c9bf3d8effcdacda73c56c46d4b4018948d7421bec SHA512 83a6f990744db08e539722d469be0368507b075b80c99891e351e8e05acf52c5958247fa8772188545f7844c896dd4a7f0160379959677f554e35b6ded3367dc
+EBUILD libkdegames-20.08.3.ebuild 1470 BLAKE2B e5725fdb34deb51c095cb71bd452f9662f27bedb9df25f00d82f0f617ad77bc8907238fe3028167a6e42c0bf40156f098a3c324aa709a4a8085293ceb0488ddc SHA512 25cecf04d87f7df86628959135f5505fd379cae85b999b8baf594773aae8b877133af2de669421a27eb6a9cdbf21b9f496f01ea54d9d934c421a761fa47e4d97
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkdegames/files/libkdegames-20.04.2-optional-tests.patch b/kde-apps/libkdegames/files/libkdegames-20.04.2-optional-tests.patch
deleted file mode 100644
index e7ffd23ade60..000000000000
--- a/kde-apps/libkdegames/files/libkdegames-20.04.2-optional-tests.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From f80393453a5645c0e9a4bdb8a23c9b303b0c4d41 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Wed, 17 Jun 2020 17:51:36 +0200
-Subject: [PATCH] Also add BUILD_TESTING condition in subdir
-
-Follow-up to 02679f6d.
----
- libkdegamesprivate/CMakeLists.txt | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/libkdegamesprivate/CMakeLists.txt b/libkdegamesprivate/CMakeLists.txt
-index b122f37a..c2e9572e 100644
---- a/libkdegamesprivate/CMakeLists.txt
-+++ b/libkdegamesprivate/CMakeLists.txt
-@@ -1,7 +1,9 @@
- enable_testing()
- project(libkdegamesprivate)
- 
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+    add_subdirectory(tests)
-+endif()
- 
- # NOTE: The libkdegamesprivate target is compiled in the parent directory,
- # because CMake can't cope with exported libraries in two different
--- 
-2.27.0
-
diff --git a/kde-apps/libkdegames/libkdegames-20.04.3.ebuild b/kde-apps/libkdegames/libkdegames-20.04.3.ebuild
deleted file mode 100644
index 274080c63f29..000000000000
--- a/kde-apps/libkdegames/libkdegames-20.04.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-KFMIN=5.70.0
-QTMIN=5.14.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Base library common to many KDE games"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kdnssd-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	media-libs/libsndfile
-	media-libs/openal
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-20.04.2-optional-tests.patch" )
diff --git a/kde-apps/libkdegames/libkdegames-20.08.1.ebuild b/kde-apps/libkdegames/libkdegames-20.08.3.ebuild
index 548975df8ae1..512985ecf35a 100644
--- a/kde-apps/libkdegames/libkdegames-20.08.1.ebuild
+++ b/kde-apps/libkdegames/libkdegames-20.08.3.ebuild
@@ -4,8 +4,8 @@
 EAPI=7
 
 ECM_TEST="forceoptional"
-KFMIN=5.72.0
-QTMIN=5.14.2
+KFMIN=5.74.0
+QTMIN=5.15.1
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
@@ -13,7 +13,7 @@ DESCRIPTION="Base library common to many KDE games"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="