gentoo resync : 29.12.2022

3 files changed, 46 insertions, 4 deletions

diff --git a/dev-qt/qdoc/Manifest b/dev-qt/qdoc/Manifest
index 0b9a720e1943..7a9f6269fe70 100644
--- a/dev-qt/qdoc/Manifest
+++ b/dev-qt/qdoc/Manifest
@@ -1,4 +1,5 @@
-DIST qttools-5.15.3-gentoo-kde-1.tar.xz 1472 BLAKE2B eb4f5555127b91767a06c126795930a8331b8431e77dc6c689098dd0249dc324bec37f2f7e816505cc41fd9578d62110a41d2d064b3ca509a56600f967c31690 SHA512 5572b228cd80df8d49627bba4078943eed3e284de53336608ef7c2db36d6f9fd03be0f6060ccce79c59ab439650125fd59ad7d8ae16a2aeeebe4702f7b7f9354
-DIST qttools-everywhere-opensource-src-5.15.3.tar.xz 8896764 BLAKE2B 65a5d67a5f1c00c244ed91baf24ca10cd2e371963c4f55b3837701d71859b7adc03897db2021040eb08b85eb0f5d353bc8b9d7944aecbeec64397f7e0c20735f SHA512 3c4ffee1d67126e3dd10c1dabae3660b94b97541480814b77bc88c0eaf86d8d43324d582465521fbdbd49dbb4155561f93e91c998dc1ad6553da02a3fcb0da47
-EBUILD qdoc-5.15.3.ebuild 850 BLAKE2B 3f867eaaa673ad85092060b27a5da4086ebda12bde6a12d48de936991d84a7488d169dcb636638c862e6a37bd2e048a90941395889d4840d711d007bf8a40b3d SHA512 faa5cae28f36f0d75da34fa8a4a6b1990d86968e7cf481ea075147c4bb6819a50d0771fdf3c5c50ab5bb1032409c2d40edcd88159113d0a4fdb519dd430002d0
+DIST qttools-everywhere-opensource-src-5.15.4.tar.xz 8897256 BLAKE2B e7d8055c9b4b52b188f61c73a300275838647d95f9eb0437129482d91584bbc0705ce9360b0a8fee2775a4cfefda53bc5aae70b10ca34d1bdeb09aa19b7d13bb SHA512 26edf546a1ec7195f1ff5a9e40e430fdd0c7ebb7d86e44ed22b093426c23ff25b2c972fa520abd1064369d32609019746c2fe972a3f593c6f7539d339642f06e
+DIST qttools-everywhere-opensource-src-5.15.5.tar.xz 8898140 BLAKE2B 49b7b0db9d9ae9c6d405678eab0ec097bc160eb7787bc939aa92816cc63c5c97aef2de0c978a2a3597014878dca9466631131bc7746bd03d87229ed7edb6594c SHA512 ff5e658ec812dd36d00ad3ac7e824de708968ff1c66a73da1470b6f0cdb6853a7084f18b1bcf1614afd4c23f381d817d7eb665f8573a4e981a9b87c6e4d6fa2b
+EBUILD qdoc-5.15.4.ebuild 828 BLAKE2B 32b639569f782c96b1fcec85ba86e94b69019cac9621c6cb720ef71f36456fd1cbd048a4c833f1eda29f78fd34755f311d60cac9158a9e207cb035ab7abb84f0 SHA512 85ef7be7123e7d3d650585a7730777372dd756f1f13b188dbc2becb6e3983b57d53db07b04ff49b116d9b3b92220b0c0e58fb06ebc56bbf0c435c7a6d6f29da4
+EBUILD qdoc-5.15.5.ebuild 831 BLAKE2B 4ff9134da6fa3b1fe9aa30f08c435169f477b4f3a85b279c18944deeef3b5ef72936577d3783ffa1fb0cd24c59a876e67938acb34263cb5d1585cccca35b8b74 SHA512 af3a085112d77da9522e58da50cdd9e82ac73b247dc686a402638f3c79b3e0ff127066e186d0ccdc8ea486c0dbd7d07f32e3c1cdb33d05e63520e22f14898bfc
 MISC metadata.xml 553 BLAKE2B 6512e790088d4b7a76a22edfb8e278399315d3136239d5ea1e37ba5fcdd761fec2a1a30504882e7660b5ced6d582ad37cb9cfc68775e8593d638a4594f693339 SHA512 40075da7d634cc291dcc15c00d1fc63debc6704443fcc0c5d3d06d227b8cf86f89884ea43eb3a1cf8a722a6b260cf9cb6cd7f88c0b14babe301e4344533d472e
diff --git a/dev-qt/qdoc/qdoc-5.15.3.ebuild b/dev-qt/qdoc/qdoc-5.15.4.ebuild
index 4abca25a217a..8da082dbcfde 100644
--- a/dev-qt/qdoc/qdoc-5.15.3.ebuild
+++ b/dev-qt/qdoc/qdoc-5.15.4.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=8
 
-QT5_KDEPATCHSET_REV=1
 QT5_MODULE="qttools"
 inherit qt5-build
 
diff --git a/dev-qt/qdoc/qdoc-5.15.5.ebuild b/dev-qt/qdoc/qdoc-5.15.5.ebuild
new file mode 100644
index 000000000000..80459c8d4436
--- /dev/null
+++ b/dev-qt/qdoc/qdoc-5.15.5.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 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"
+
+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
+}