gentoo Easter resync : 12.04.2020

4 files changed, 11 insertions, 10 deletions

diff --git a/dev-qt/qdoc/Manifest b/dev-qt/qdoc/Manifest
index cab19b304cdb..993a562e4ba7 100644
--- a/dev-qt/qdoc/Manifest
+++ b/dev-qt/qdoc/Manifest
@@ -1,7 +1,7 @@
-DIST qttools-everywhere-src-5.12.3.tar.xz 9809196 BLAKE2B 8d0317dc70c1dc6fc7c125453d22bbaa7decd57f9ba0f7572cc1e27f9494ff3423b5be412bcbd2e841a1f9b7494dae9101b3ac9254c563c24f22492b3b6ec3c9 SHA512 d37c0e11a26a21aa60f29f3b17ddc9895385d848692956e4481e49003cbe9c227daf8fda1c40a2ab70ac8e7e56d3771c1b2964524589eb77ac1f2362c269162e
 DIST qttools-everywhere-src-5.13.2.tar.xz 9110256 BLAKE2B 4651c350d5bb9200dc6c4b362b8d69abd108f63fde74f6b3382317c8b0f4447cd56f6a463617f50c0901155457ddd693dcf2bc75cde9cbb1565e693b36469bec SHA512 46e76d81c1b16160c9ab8da1475cfeed28e7140bc94868d4fc834639cc15ec67199b6169a7c820107cb72982bc2d56ba6987225f3fc773b8464e4023fda74265
 DIST qttools-everywhere-src-5.14.1.tar.xz 8810972 BLAKE2B 324246728e814eeb5d297fe72cfdc8af584c555f4676f8f6325c9f2353140dc04c98b3f1e1d39ffacecd43527e13df1ce1b1608377794eb8247d3f2549d6697b SHA512 59874ed00f7f9749f0dda49d6e1ad064d1594c6b0bde577961c5d45628763d2a2031aa7ebed952f1cebc8a241eb6a0e4a4f8e36c0a93ffe738a0ff360b8d3f30
-EBUILD qdoc-5.12.3.ebuild 774 BLAKE2B 86b50d6d1437ab8803c5e9ef8cbdad801d71aaf34b45f2e102506992aa828cedcd72d03f883b22da584c01b25503d0357409915955901d40c0d2cf87602fb447 SHA512 9040d8591931f2a92c817eab2f50608e33b7d6bad3941d0806224d931679d61876439982f3db612753e7602a771660a852dffb10832531a98fcad139c20f67ea
-EBUILD qdoc-5.13.2.ebuild 799 BLAKE2B 32223e78a5f49acc66410dfc8e530a588a18c8fed0ac92216eccf5470e27f9ee4853c06af0c244c27cd54d18867d303149204e095d3019b731db38a45d30374d SHA512 f2c0f59403e1f3763826e15ce8fc6a75f851791193bbb1068790540298c5a13c25395201facab50bfd7001dd1b8b228faa229d05aaa191129baff2aedfa3acee
-EBUILD qdoc-5.14.1.ebuild 801 BLAKE2B f56554843e028402860c757aa0ebf84d4ac6dd1f6db921cbb485b9dfb5c1a5239e6371c4c7feedf9a9a35b035c86f05d73fea8b1cd291782940883f455bd437d SHA512 3919b666e386fe16bc6829fb70d30deb8c1697711fab07e5a06a0e2ff31248e4cb87b6bb97b28c8d801331cda70ce6cbcc4b59b17878808b9cb801e32c8e46f1
+DIST qttools-everywhere-src-5.14.2.tar.xz 8815020 BLAKE2B 2535541b53cec5cc2dce1ac06ad70b145fce38642d8142f43a800a630aa2f69ad255e8f0a38c44022d14cc5b4373603026cc7c149c2435621f91a66ea0bf223d SHA512 e5b56d38acaa59511f24c817999f901510397d6e8baccc06a8fb8375f09b71dcffda4c57def4eb88d6c2782926d612b382957175a087a0c2224245051c54fe7e
+EBUILD qdoc-5.13.2.ebuild 775 BLAKE2B 7206ae2cc4f83ac2238ac21c1087b3d71f472509e11cc1dee103b7a85cc45796e7492ec48be70338f44a73bcd53adc4b2dbb9bd17d6bbc2ed488ed6b85c21cd7 SHA512 25f1afa4d734fa8060f263188f5512284dfa4ad0fe4ad5017328ca5647efd3c7948f282d000c21dad56f8e2f3d90965cf326f27502d3da88b450283946527969
+EBUILD qdoc-5.14.1.ebuild 798 BLAKE2B 2fbc714f5ad1b1cbcaeee4ef3bde22861fde2ac944aaf62d8b7be62094d385af8d3eb559210dc4b6a0b3524dbd24e2b90962bdca5b94e5b911d307272e884965 SHA512 ef758aa9f4faa40134cc9c52f5f72b506680197e2e40eb8765e5e9eeeee2848423ba55609858f3e4311c9cbe185d56e7275e78ef6fb9558db95bedb2cd3166bc
+EBUILD qdoc-5.14.2.ebuild 870 BLAKE2B 2759828685fe15591e4eb0ddc9a353d5c3f909d21884a0c90b7b50798d749cafdd97c77cce4bc46ec633362bd743849b22c6ec8db552ea0ce4d76393d91e695f SHA512 5dbaf3a693383caa50ec26a98e10e85f0c24b9a0d435a48c2e636741f0810167ae40da4952eb602079e122e28f637ac228c7f5787b9b3904324a799ac88c565e
 MISC metadata.xml 552 BLAKE2B c4dbe379b76afe850e804dfc428aff9f79ed1e2c4344892aa1737a0c61c7baa6c74fc3fa2f07b8132d25a59b0f9710f407a1ba927e5ede20d571ce3f79e8acbf SHA512 61014159b2af5f277f1a7e9d7bc5881da2f04c152adc349de16c60a980f7c76858c1ec3ddfd5760ce1111c81a90482214b03da745cf291c155d4ad50eaa0acdf
diff --git a/dev-qt/qdoc/qdoc-5.13.2.ebuild b/dev-qt/qdoc/qdoc-5.13.2.ebuild
index 06860e804591..125cde124885 100644
--- a/dev-qt/qdoc/qdoc-5.13.2.ebuild
+++ b/dev-qt/qdoc/qdoc-5.13.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Qt documentation generator"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
+	KEYWORDS="~arm"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qdoc/qdoc-5.14.1.ebuild b/dev-qt/qdoc/qdoc-5.14.1.ebuild
index 5f500925c67b..5b4083a910f9 100644
--- a/dev-qt/qdoc/qdoc-5.14.1.ebuild
+++ b/dev-qt/qdoc/qdoc-5.14.1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Qt documentation generator"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qdoc/qdoc-5.12.3.ebuild b/dev-qt/qdoc/qdoc-5.14.2.ebuild
index 82a5b3039ff7..dddcd583777e 100644
--- a/dev-qt/qdoc/qdoc-5.12.3.ebuild
+++ b/dev-qt/qdoc/qdoc-5.14.2.ebuild
@@ -1,20 +1,20 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 QT5_MODULE="qttools"
 inherit qt5-build
 
 DESCRIPTION="Qt documentation generator"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 fi
 
 IUSE="qml"
 
 DEPEND="
-	~dev-qt/qtcore-${PV}
+	~dev-qt/qtcore-${PV}:5=
 	sys-devel/clang:=
 	qml? ( ~dev-qt/qtdeclarative-${PV} )
 "
@@ -36,5 +36,6 @@ src_configure() {
 	# run in the root directory. bug 676948; same fix as bug 633776
 	mkdir -p "${QT5_BUILD_DIR}"/src/qdoc || die
 	qt5_qmake "${QT5_BUILD_DIR}"
+	cp src/qdoc/qtqdoc-config.pri "${QT5_BUILD_DIR}"/src/qdoc || die
 	qt5-build_src_configure
 }