gentoo resync : 13.06.2020

3 files changed, 2 insertions, 80 deletions

diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest
index 19bbb4d6e0d8..139d7dc9f1a1 100644
--- a/kde-frameworks/extra-cmake-modules/Manifest
+++ b/kde-frameworks/extra-cmake-modules/Manifest
@@ -1,7 +1,5 @@
 AUX extra-cmake-modules-5.49.0-no-fatal-warnings.patch 1104 BLAKE2B 9f70e75ed92696e0856a5f1962d9c420ce67b13591dceb0b24990407e3c2b567f5a8c59f16bd97464be40fb291184f0825542e48f0c287ea47536f34eada1a56 SHA512 0aae30715bd5e7ac7eb65bef5caafdcdd22b46a81ba6f3fa9dcca356b146793b6877c7bfbe67ea3f38114c4cba8094c063470421ebf44c06289ef61398200697
 AUX extra-cmake-modules-5.65.0-disable-qmlplugindump.patch 2666 BLAKE2B a321b9881f643fee4b790ce47063b54722a17d98fcc7a17da4a84fcd412ae1dd5ed959767990ae5953e282fc3a8e9ecd4089aa056f0f366a937aa38bd27e153c SHA512 f43998ab4f9cb334d2a269e589aed9db08bdc8c91f2f5413c6e4ea9c5391068146cb7d9de1c7a0bffe61489075231caee535d1e669d95df3bce1fac6aa4155c9
-DIST extra-cmake-modules-5.67.0.tar.xz 339812 BLAKE2B 9fa1c93e512341f6ae91dd2bb7126bdc55b5d1df6390a54f1fa7506f1f903a005103d1259f7962e94c0f2e27bf82d8d4c5320053b197c18305d32ba870ced67e SHA512 1a0e185ea4eac16d57c34f140a4709c0bcd9baaa7e0727ab5c1bfee88fe08efe23dc3634d8f73abade98ad6f2dbf529563e0778f0fbeddaa50b435e12b674229
 DIST extra-cmake-modules-5.70.0.tar.xz 343476 BLAKE2B efcf47af54decc383c150aff14628408f6e77001ba4c6bc8a6f1636e62e20c06fb435a0bf7d93ce610ed7404ae186b732d994d2a530f2d65207cee70cdac8af8 SHA512 cbee488db0ccef4c876770ec073408208037d791ea67d9f72937c4fa20765f69d9312a3f9e2106526d4fb0a76e25d7fed13178209f8e0b1b3f01b76be17d4784
-EBUILD extra-cmake-modules-5.67.0.ebuild 1660 BLAKE2B a50fb5034e3359dbe527670ff439baadc4a4e77f895de0944610887cabfa466aa2e343a30cdbac3f58bbaa04319eaeaa16c6bdafcdadca530fd37bccabdad6c6 SHA512 ddba4f393fcee5691ac437fa9295836b5b3f791389372937adf917693dec8bebc764bef4484a281b75003ab0824c051dee351dfdbcc05d0da79f72344a9caec0
-EBUILD extra-cmake-modules-5.70.0.ebuild 1665 BLAKE2B 7609809a3ac84303225d2a00535db9f23472f81f8eb828dcb159b77d267b1463add266708e95a96586497fca24f2a461cec4fbbe4cce93bb8bba479398bf3e03 SHA512 b4a8b8f4a907e77a6b4ba57f35f42e2aa2041ccd0b8791c59606ec658fd4023505b2e8c2d73a7dc930bb3e5b741e78e4b4ecb3a4125749b016d8c184b9a8fb35
+EBUILD extra-cmake-modules-5.70.0.ebuild 1660 BLAKE2B a50fb5034e3359dbe527670ff439baadc4a4e77f895de0944610887cabfa466aa2e343a30cdbac3f58bbaa04319eaeaa16c6bdafcdadca530fd37bccabdad6c6 SHA512 ddba4f393fcee5691ac437fa9295836b5b3f791389372937adf917693dec8bebc764bef4484a281b75003ab0824c051dee351dfdbcc05d0da79f72344a9caec0
 MISC metadata.xml 273 BLAKE2B e5a4eabc4773a11bcdf052b2ce87104bb85b0ed030475140ad0ec7fea2dcb401f539c67e1b1dc1138a5985be143947c86ff3b0b4d6881cc3a0952140ce33732e SHA512 570f3ea3dd25cac1410c3290a4003a288b9e1a0b873884fc33250dfa110cc39b61bd4db1f4d06e3b6e5f761bda8da222a4e294d12ebd8194d771ac61069ffc92
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.67.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.67.0.ebuild
deleted file mode 100644
index 36c1e259b30d..000000000000
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.67.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-QTMIN=5.12.3
-inherit cmake kde.org python-any-r1
-
-DESCRIPTION="Extra modules and scripts for CMake"
-HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"
-
-LICENSE="BSD"
-KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 x86"
-IUSE="doc test"
-
-BDEPEND="
-	doc? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
-		>=dev-qt/qthelp-${QTMIN}:5
-	)
-	test? (
-		>=dev-qt/linguist-tools-${QTMIN}:5
-		>=dev-qt/qtcore-${QTMIN}:5
-	)
-"
-RDEPEND="
-	app-arch/libarchive[bzip2]
-"
-
-RESTRICT+=" !test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch"
-	"${FILESDIR}/${PN}-5.65.0-disable-qmlplugindump.patch"
-)
-
-python_check_deps() {
-	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use doc && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	# Requires PyQt5, bug #680256
-	sed -i -e "/^if(NOT SIP_Qt5Core_Mod_FILE)/s/NOT SIP_Qt5Core_Mod_FILE/TRUE/" \
-		tests/CMakeLists.txt || die "failed to disable GenerateSipBindings tests"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DDOC_INSTALL_DIR=/usr/share/doc/"${PF}"
-		-DBUILD_QTHELP_DOCS=$(usex doc)
-		-DBUILD_HTML_DOCS=$(usex doc)
-		-DBUILD_MAN_DOCS=$(usex doc)
-		-DBUILD_TESTING=$(usex test)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	# ECMToolchainAndroidTest passes but then breaks src_install
-	# ECMPoQmToolsTest is broken, bug #627806
-	# possible race condition with multiple jobs, bug #701854
-	local myctestargs=(
-		-j1
-		-E "(ECMToolchainAndroidTest|ECMPoQmToolsTest)"
-	)
-
-	cmake_src_test
-}
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.70.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.70.0.ebuild
index c03e1023d120..36c1e259b30d 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.70.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.70.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Extra modules and scripts for CMake"
 HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 x86"
 IUSE="doc test"
 
 BDEPEND="