gentoo resync : 10.09.2021

3 files changed, 45 insertions, 33 deletions

diff --git a/dev-qt/qdoc/Manifest b/dev-qt/qdoc/Manifest
index 58141a2351e4..f0d196ac5926 100644
--- a/dev-qt/qdoc/Manifest
+++ b/dev-qt/qdoc/Manifest
@@ -1,4 +1,5 @@
+DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
 DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
-EBUILD qdoc-5.15.2-r1.ebuild 624 BLAKE2B 5ea2d3296a79b8f3c69b4fba87d46b7ae106e01ae04259de3cc17fceb7e02584d8eca51ddd4e6ae6390248f562bf51a2ab132ca977dcffe80253ee8cd495dd86 SHA512 a5f46fe3a14d8181068161679724f0bde3989de6191539e91cc791f9c02b95958992b0d794453d3478f7ee5e652bdc283b89654cd0ee0710a6885abd68458645
+EBUILD qdoc-5.15.2-r10.ebuild 887 BLAKE2B 1fe2784b9683ea141813326bf8d803b2c5cd5204d88498ec843b8ff65a636089a11b40648c19b458e2070690ebdcfefb4b609d7b38c4555ec1766b77cca489e1 SHA512 43c3e777efe2106ec062c9ea8026ad6544ec1c9c4100026afe3e1d925e9737223d084dba3a8eb9b40d1ce33923f3011dddff844cc51b9e345f9268e9ce34babc
 EBUILD qdoc-5.15.2.ebuild 543 BLAKE2B 049d072f3fe6f36d4703150ebe4326f0ade72c2e415743da40bd2015dfe9818595f606ecd4e7ed543fd9175b2f1df77da811c3a655dae4112f816f901e3771f8 SHA512 4de93172b553430ff0507f32519b22e4668e024ada835c938defec5037f95f9752dc6f58951f6d3a3167586083f20679ba1eadf5927abcd6b3e2ab15de7824b8
 MISC metadata.xml 552 BLAKE2B c4dbe379b76afe850e804dfc428aff9f79ed1e2c4344892aa1737a0c61c7baa6c74fc3fa2f07b8132d25a59b0f9710f407a1ba927e5ede20d571ce3f79e8acbf SHA512 61014159b2af5f277f1a7e9d7bc5881da2f04c152adc349de16c60a980f7c76858c1ec3ddfd5760ce1111c81a90482214b03da745cf291c155d4ad50eaa0acdf
diff --git a/dev-qt/qdoc/qdoc-5.15.2-r1.ebuild b/dev-qt/qdoc/qdoc-5.15.2-r1.ebuild
deleted file mode 100644
index 09d86b11c1d4..000000000000
--- a/dev-qt/qdoc/qdoc-5.15.2-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Qt documentation generator"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-fi
-
-IUSE="qml"
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}:5=
-	sys-devel/clang:=
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-"
-# TODO: we know it is bogus, figure out how to disable checks, bug 802492
-DEPEND="${RDEPEND}
-	~dev-qt/qtxml-${PV}
-"
-
-src_prepare() {
-	qt_use_disable_mod qml qmldevtools-private \
-		src/qdoc/qdoc.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qdoc/qdoc-5.15.2-r10.ebuild b/dev-qt/qdoc/qdoc-5.15.2-r10.ebuild
new file mode 100644
index 000000000000..1a250f857b1d
--- /dev/null
+++ b/dev-qt/qdoc/qdoc-5.15.2-r10.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_COMMIT=33693a928986006d79c1ee743733cde5966ac402
+QT5_MODULE="qttools"
+inherit qt5-build
+
+DESCRIPTION="Qt documentation generator"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+IUSE="qml"
+
+DEPEND="
+	=dev-qt/qtcore-${QT5_PV}*:5=
+	sys-devel/clang:=
+	qml? ( =dev-qt/qtdeclarative-${QT5_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() {
+	# qt5_tools_configure() not enough here, needs another fix, bug 676948
+	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
+}