gentoo resync : 22.10.2018

3 files changed, 15 insertions, 11 deletions

diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest
index 5a697912c544..575d53c84d31 100644
--- a/kde-frameworks/extra-cmake-modules/Manifest
+++ b/kde-frameworks/extra-cmake-modules/Manifest
@@ -1,6 +1,6 @@
 AUX extra-cmake-modules-5.49.0-no-fatal-warnings.patch 1104 BLAKE2B 9f70e75ed92696e0856a5f1962d9c420ce67b13591dceb0b24990407e3c2b567f5a8c59f16bd97464be40fb291184f0825542e48f0c287ea47536f34eada1a56 SHA512 0aae30715bd5e7ac7eb65bef5caafdcdd22b46a81ba6f3fa9dcca356b146793b6877c7bfbe67ea3f38114c4cba8094c063470421ebf44c06289ef61398200697
-DIST extra-cmake-modules-5.46.0.tar.xz 317056 BLAKE2B c67e5a4d207cb5fd3f7ff7d0e2dd16c5a0a44c562c0a9c0b7eac3a54930ae59b6fd8b36d7a464e7d03950c44c101befc57825f8ee2f23b35e3f7ddc792d5267e SHA512 6431ad8e5230bbc0a5e1199037102014c376a682d711211b257359c35c8a3aaddb6128277721ca40cedf43fcca77312a2754f306487a1b3dbea728d643f0ad3a
 DIST extra-cmake-modules-5.50.0.tar.xz 323928 BLAKE2B 79bc97221cda54a51f2f6ff8797f715f4e27b1d5724da852cf06022eaf88b687a6d6aa0afb5eb2abb45b846cb49bd4c2b5e8e863e4d2f1b9b8d4446bc57ccd60 SHA512 0e56b1137a9cd8ff6a25b7790986713fb2358d8ffa1a175ca87054790440e528a37f56e2785190b40a469fd4d32bc731d4d24f55d6557515c8edb311abf3a56c
-EBUILD extra-cmake-modules-5.46.0.ebuild 1275 BLAKE2B 26d0cbbedbb94bdd3a120927ddc53fecade47a421da8a4d0a44e59a35931a577ea20c5eb41da2fc4c2cfbb215b124bc9d7494b6e14941b57b3b77671819ac678 SHA512 617e537fb35c8d79db273839da20dc16bc94aa245a9cc9e292f6a651cc2bd7ba75a9a399e01211613040d785e68720c0a83af80988384898f76d39a13ba2a999
-EBUILD extra-cmake-modules-5.50.0.ebuild 1390 BLAKE2B a2f2d64e306aeac906ec763105e5a0c8593cad9098bbad8b68728cab3d0333e8023f7d990248186e5b785ecb916f2b075af2636d02c3342e008724cf3b982935 SHA512 cd44e0818039d4931d541bf8bcfeaa6271369f002c16bbb69787a39d85a128eac3a4837479a0794a31c1f59c33dc645f04c6ab9370f121629748ea3f8921dd15
+DIST extra-cmake-modules-5.51.0.tar.xz 323936 BLAKE2B aefde21b46b4ea708a61165abdeec6841869c622bc6c955c88d12d714e2420c6fb277f5a06d3dc3d4ffb4e69c6ad1779a4983a80853ada83d53890a1160695ce SHA512 71b809139a844f324054ac52946820db8fe0662a670127d8c71f133b498b8d6bb62f61f115d1f49d06fb34e936a5fa38b465a3bea5b166cfd546a185cc1f1517
+EBUILD extra-cmake-modules-5.50.0.ebuild 1386 BLAKE2B 16f75f82ea521a30e082008d8a0ba30beae0435bf9e43bc3ad0b7da3cce13a8b7a4118b0158bcbc41acb5eceba9e63ae54e3e9ff73d7ec4b58d85d20a1f6c46c SHA512 ecf310790562133f700fabe77de96b98566ecd87c0d9c976a227e027bc9aabb20f2ce6c9ed36273d91e93f897b1f39dc6b62986cce6a73a018e24bc578862951
+EBUILD extra-cmake-modules-5.51.0.ebuild 1390 BLAKE2B a2f2d64e306aeac906ec763105e5a0c8593cad9098bbad8b68728cab3d0333e8023f7d990248186e5b785ecb916f2b075af2636d02c3342e008724cf3b982935 SHA512 cd44e0818039d4931d541bf8bcfeaa6271369f002c16bbb69787a39d85a128eac3a4837479a0794a31c1f59c33dc645f04c6ab9370f121629748ea3f8921dd15
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.50.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.50.0.ebuild
index 4f32e710baca..3b13c99a3559 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.50.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.50.0.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Extra modules and scripts for CMake"
 HOMEPAGE="https://cgit.kde.org/extra-cmake-modules.git"
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd"
 IUSE="doc test"
 
 DEPEND="
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.46.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.51.0.ebuild
index a557df1f65c5..4f32e710baca 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.46.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.51.0.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+ECM_KDEINSTALLDIRS="false"
 KDE_AUTODEPS="false"
 KDE_DEBUG="false"
 KDE_QTHELP="false"
@@ -14,7 +15,7 @@ DESCRIPTION="Extra modules and scripts for CMake"
 HOMEPAGE="https://cgit.kde.org/extra-cmake-modules.git"
 
 LICENSE="BSD"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"
 IUSE="doc test"
 
 DEPEND="
@@ -31,6 +32,8 @@ RDEPEND="
 	app-arch/libarchive[bzip2]
 "
 
+PATCHES=( "${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch" )
+
 python_check_deps() {
 	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
 }
@@ -41,13 +44,14 @@ pkg_setup() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DBUILD_HTML_DOCS="$(usex doc)"
-		-DBUILD_MAN_DOCS="$(usex doc)"
-		-DDOC_INSTALL_DIR="/usr/share/doc/${PF}"
+		-DBUILD_QTHELP_DOCS=$(usex doc)
+		-DBUILD_HTML_DOCS=$(usex doc)
+		-DBUILD_MAN_DOCS=$(usex doc)
+		-DDOC_INSTALL_DIR=/usr/share/doc/"${PF}"
 	)
 	use test && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON )
 
-	cmake-utils_src_configure
+	kde5_src_configure
 }
 
 src_test() {