gentoo resync : 15.01.2020

3 files changed, 44 insertions, 2 deletions

diff --git a/dev-qt/qdoc/Manifest b/dev-qt/qdoc/Manifest
index 968c667eb191..dafc1ab654cd 100644
--- a/dev-qt/qdoc/Manifest
+++ b/dev-qt/qdoc/Manifest
@@ -1,7 +1,9 @@
 DIST qttools-everywhere-src-5.12.3.tar.xz 9809196 BLAKE2B 8d0317dc70c1dc6fc7c125453d22bbaa7decd57f9ba0f7572cc1e27f9494ff3423b5be412bcbd2e841a1f9b7494dae9101b3ac9254c563c24f22492b3b6ec3c9 SHA512 d37c0e11a26a21aa60f29f3b17ddc9895385d848692956e4481e49003cbe9c227daf8fda1c40a2ab70ac8e7e56d3771c1b2964524589eb77ac1f2362c269162e
 DIST qttools-everywhere-src-5.12.5.tar.xz 9759888 BLAKE2B a9d8477a8f27de405c390d0901754020bed457dfaf7419cb070c5bf4eee30f3bb0b39bd29d3c32f8f78e82ffa8bc10e58cea3eae389792227cd6f21f783624c2 SHA512 e88af049ad9261720bc44ff9030113179d9429eaf073bed45115decd520ecf5d3ca860983f012bac189310ce9f3826b1fcb484faadb4f6d0b16c67c0d998f34c
 DIST qttools-everywhere-src-5.13.2.tar.xz 9110256 BLAKE2B 4651c350d5bb9200dc6c4b362b8d69abd108f63fde74f6b3382317c8b0f4447cd56f6a463617f50c0901155457ddd693dcf2bc75cde9cbb1565e693b36469bec SHA512 46e76d81c1b16160c9ab8da1475cfeed28e7140bc94868d4fc834639cc15ec67199b6169a7c820107cb72982bc2d56ba6987225f3fc773b8464e4023fda74265
+DIST qttools-everywhere-src-5.14.0.tar.xz 9143808 BLAKE2B 261d5d6004f0653f2c7c32839c8c3a916ac747406db9689501357e2709bc23569919f278e29784f1f844f2df7fa8c4a55e3d6395129ba9fdb592eeac85bbf07c SHA512 1c77d6b6027d301b7afae92834ba2296b903495cd0546d53e9d82cd24289089d02a4a7b0e802061ead4f9f8272f8389fb5f06f3788aac3624f52593324ce78dc
 EBUILD qdoc-5.12.3.ebuild 798 BLAKE2B 4150d9cfb7427b9b719266fe4f23a5aa708cde4faed2c9c2da9c1a0edc8c11d0dc48466f232408a03932b2fcef504a1fb78ef01da4596da700e3b7e67caa3c3e SHA512 fdf381372a5774152ddf568f7786f8e4925ecdbef909ab29d542d98ddf5b890c21bf45c0741c545decbaa5be58207001a7ff0be5c31ffc39babd6070e73ba4f9
 EBUILD qdoc-5.12.5.ebuild 799 BLAKE2B 32223e78a5f49acc66410dfc8e530a588a18c8fed0ac92216eccf5470e27f9ee4853c06af0c244c27cd54d18867d303149204e095d3019b731db38a45d30374d SHA512 f2c0f59403e1f3763826e15ce8fc6a75f851791193bbb1068790540298c5a13c25395201facab50bfd7001dd1b8b228faa229d05aaa191129baff2aedfa3acee
-EBUILD qdoc-5.13.2.ebuild 801 BLAKE2B a2e216d3080520837f20dcb263de0566c8f06bcc83400c3cc330a96d8cb9f24d480cf2ceed14f942fbe619ef26144387d7a2f9c338e677446d987c0046b0c762 SHA512 608211262627716f746432a073379374df9cd918071f28be7bb3591aaf273596db9c53ce8f60047ca67817ec341f834182fcdda1aed4011c0258104d338635b0
+EBUILD qdoc-5.13.2.ebuild 799 BLAKE2B 32223e78a5f49acc66410dfc8e530a588a18c8fed0ac92216eccf5470e27f9ee4853c06af0c244c27cd54d18867d303149204e095d3019b731db38a45d30374d SHA512 f2c0f59403e1f3763826e15ce8fc6a75f851791193bbb1068790540298c5a13c25395201facab50bfd7001dd1b8b228faa229d05aaa191129baff2aedfa3acee
+EBUILD qdoc-5.14.0.ebuild 801 BLAKE2B a2e216d3080520837f20dcb263de0566c8f06bcc83400c3cc330a96d8cb9f24d480cf2ceed14f942fbe619ef26144387d7a2f9c338e677446d987c0046b0c762 SHA512 608211262627716f746432a073379374df9cd918071f28be7bb3591aaf273596db9c53ce8f60047ca67817ec341f834182fcdda1aed4011c0258104d338635b0
 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 b7f1696614f9..06860e804591 100644
--- a/dev-qt/qdoc/qdoc-5.13.2.ebuild
+++ b/dev-qt/qdoc/qdoc-5.13.2.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.14.0.ebuild b/dev-qt/qdoc/qdoc-5.14.0.ebuild
new file mode 100644
index 000000000000..b7f1696614f9
--- /dev/null
+++ b/dev-qt/qdoc/qdoc-5.14.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+QT5_MODULE="qttools"
+inherit qt5-build
+
+DESCRIPTION="Qt documentation generator"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+IUSE="qml"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	sys-devel/clang:=
+	qml? ( ~dev-qt/qtdeclarative-${PV} )
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/qdoc
+)
+
+src_prepare() {
+	qt_use_disable_mod qml qmldevtools-private \
+		src/qdoc/qdoc.pro
+
+	qt5-build_src_prepare
+}
+
+src_configure() {
+	# src/qdoc requires files that are only generated when qmake is
+	# 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}"
+	qt5-build_src_configure
+}