gentoo resync : 12.01.2019

4 files changed, 74 insertions, 4 deletions

diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest
index 2994d4058ba1..cc15f05aa933 100644
--- a/kde-frameworks/extra-cmake-modules/Manifest
+++ b/kde-frameworks/extra-cmake-modules/Manifest
@@ -2,6 +2,8 @@ AUX extra-cmake-modules-5.49.0-no-fatal-warnings.patch 1104 BLAKE2B 9f70e75ed926
 AUX extra-cmake-modules-5.52.0-fix-FindQHelpGenerator.patch 1587 BLAKE2B 48095429a52441e33145ee32c49827de7d9dac339ed520c1d1548a41567452a5a0df1412568f7066196f30e8b62ff49142df277555f5713a29e02b17b2d6fe7d SHA512 aa83832d6cecab6bf5583193b59145139a57e568239d39718018555fe1c36c4d110e825dbaa5fbbf148fd5867a954be71d14e20d5d3a4477ee31017d914c52b0
 DIST extra-cmake-modules-5.52.0.tar.xz 324412 BLAKE2B 36099a820b79e010a3f1616f852e0364e1e72a5553786d35a9a9f5d9452574ab3166179856d76a89d1b801b5e99452c19a6419561f1c9e3e873cb6f5fbf8d3d6 SHA512 f3147f493c24bea3c53a6537ba78ac81e0b8d31162c5d6e12305d318e5f13cdda70ea79d7e9db2a1d834609c7e1a0134e76bcae9f6c9109beaee2c051afbe269
 DIST extra-cmake-modules-5.53.0.tar.xz 324504 BLAKE2B 0337e20330cfd68c3c3d37f285cceaf17b52effa16c9c24568bb05c53b83b5e983f3a7967ea69bd5b852c9854dea14576d244c61233a4a6335019c5079a393d6 SHA512 f760c6040585730dee261cc09b47f7df12cb3e6be6d859f4a5b065641fdf9329bd831e47a9d51d9978d7379501e045614d40b9c55b0f4082222a2e662a0952ea
-EBUILD extra-cmake-modules-5.52.0-r1.ebuild 1436 BLAKE2B e00c1953635a9186071099b757458f8356af632a99fb1ee3a7402a51f9b6a51c27894747bce371202437b0d830ad6e767a71acf3df9eb7951c7d11db7e052f63 SHA512 31df94ee812cd1310e1c07739b9760430a1fcecc1cd414a7d72c65151ab9063ba3130d796a2ebacabba35f0374dd7772f5f0339614fbe321c4291a785fca85a8
-EBUILD extra-cmake-modules-5.53.0.ebuild 1390 BLAKE2B a2f2d64e306aeac906ec763105e5a0c8593cad9098bbad8b68728cab3d0333e8023f7d990248186e5b785ecb916f2b075af2636d02c3342e008724cf3b982935 SHA512 cd44e0818039d4931d541bf8bcfeaa6271369f002c16bbb69787a39d85a128eac3a4837479a0794a31c1f59c33dc645f04c6ab9370f121629748ea3f8921dd15
+DIST extra-cmake-modules-5.54.0.tar.xz 324996 BLAKE2B 37ba7eb0b651da5bf18de292a59c9783b7d85801701223580144d366da3621da66ad2c6b8a55479d67e27249784be9994c0cdacdee540e601b34b5ed5d5af863 SHA512 2c592ab659dc2c1167111d394b976f7d008b9c3e8e18aea06001f4852f93d6a0e61c2ea5f6add2680e11f76da9f5f8c437afd350c5d3224cf1e9adba2dd765e1
+EBUILD extra-cmake-modules-5.52.0-r1.ebuild 1459 BLAKE2B 3a17f4acd3f5fd831bb8ee71ee34a2831ff7874bcc96cf43dd72f2b341282944782e1b1f7d8ac8556242b137f49b5284855b99ac37b35a02da5056d3083aa51f SHA512 4514c6acbb496a3bc2b8cde81f76b77c3643cc899340c61a388989faab343ea851c88eddfaf0d1485a7867925a03f2013d2af9969155792d8ff30d387da67bd5
+EBUILD extra-cmake-modules-5.53.0.ebuild 1413 BLAKE2B 30ecbde32b154e6ca17c64b491b372e82f99722ab4ab22e05ed6315139c654d1e17a460c99af3e841269bbfa3f273f7259e7fff3a478051ab11d0f8f17dd16c1 SHA512 429d749868d955b88e69045f3fec48182c5c63c873a43e166b6305ced3c19b0af0d960abe79a99d557d4d62b229357a398ecfecfac3747509f25a5f1baecc72b
+EBUILD extra-cmake-modules-5.54.0.ebuild 1413 BLAKE2B 30ecbde32b154e6ca17c64b491b372e82f99722ab4ab22e05ed6315139c654d1e17a460c99af3e841269bbfa3f273f7259e7fff3a478051ab11d0f8f17dd16c1 SHA512 429d749868d955b88e69045f3fec48182c5c63c873a43e166b6305ced3c19b0af0d960abe79a99d557d4d62b229357a398ecfecfac3747509f25a5f1baecc72b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.52.0-r1.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.52.0-r1.ebuild
index 9f3d2cfead04..50ce271fe961 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.52.0-r1.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.52.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,6 +22,7 @@ DEPEND="
 	doc? (
 		${PYTHON_DEPS}
 		$(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
+		$(add_qt_dep qthelp)
 	)
 	test? (
 		$(add_qt_dep qtcore)
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.53.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.53.0.ebuild
index 4f32e710baca..1d15c03c25dd 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.53.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.53.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,6 +22,7 @@ DEPEND="
 	doc? (
 		${PYTHON_DEPS}
 		$(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
+		$(add_qt_dep qthelp)
 	)
 	test? (
 		$(add_qt_dep qtcore)
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.54.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.54.0.ebuild
new file mode 100644
index 000000000000..1d15c03c25dd
--- /dev/null
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.54.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+ECM_KDEINSTALLDIRS="false"
+KDE_AUTODEPS="false"
+KDE_DEBUG="false"
+KDE_QTHELP="false"
+KDE_TEST="false"
+inherit kde5 python-any-r1
+
+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"
+IUSE="doc test"
+
+DEPEND="
+	doc? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
+		$(add_qt_dep qthelp)
+	)
+	test? (
+		$(add_qt_dep qtcore)
+		$(add_qt_dep linguist-tools)
+	)
+"
+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}]"
+}
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-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 )
+
+	kde5_src_configure
+}
+
+src_test() {
+	# ECMToolchainAndroidTest passes but then breaks src_install
+	# ECMPoQmToolsTest is broken, bug #627806
+	local myctestargs=(
+		-E "(ECMToolchainAndroidTest|ECMPoQmToolsTest)"
+	)
+
+	kde5_src_test
+}