5 files changed, 74 insertions, 29 deletions
diff --git a/kde-frameworks/kdoctools/Manifest b/kde-frameworks/kdoctools/Manifest
index 8974948de659..d3d203d3f45f 100644
--- a/kde-frameworks/kdoctools/Manifest
+++ b/kde-frameworks/kdoctools/Manifest
@@ -1,2 +1,3 @@
-DIST kdoctools-5.82.0.tar.xz 437024 BLAKE2B 6e51452eef36a28af3adae497906ab02429ac57361bf598b347dca7ae0f9df33b7af0ef4c7ecaa5cde1f1021e9a44633013014d2d5a893f319bd8085b732eb65 SHA512 5255b78f1a51a9e2adeb1c6fe113c6555f50eb8af04d3d78c3942f924c071c11c1598245793c68c97eaa3bd1f299b8f9fe7f190da5b720ab7930ed53070f58d3
-DIST kdoctools-5.83.0.tar.xz 436976 BLAKE2B cdab2b1172a909f005c4d5ceb2dce778f43aa8b5ed2330b23a7410956d5a3e3ae5f7c85711823e89d26f9494aafbf398c525a1732b95b1f50c20c0dbb2ef2fab SHA512 6b70865c1b8735b4d43c58eed68a2428087b6eb2f4e4c23996d6a1607faef68f1fe897aba34513f55147dac19faa8c5f7f42989f1cec03848212d72afb4f3cb2
+DIST kdoctools-5.115.0.tar.xz 465436 BLAKE2B bf7af3333a8fbf121e326eaa2c54c16f9a9ba1552a982061337c365d57eb9d5beab8952f0360b6bb2c0bda07afd42fae050072a3ae9fafe32a54e77df4dce48d SHA512 f7c95c090899fa8d7ea0d730e48a87a4881f271a37bb1d0af6f67aaa52954613e957e04a91b94b985bf993c0b9db3736aa922033d100d2c8beb2f24ae50b2caf
+DIST kdoctools-5.116.0.tar.xz 465400 BLAKE2B cc4292a871272b72ec1fc4c4d96e9d6ed796c8959198f3c19448527fb01b03a6e539232989adcd46296a9b589bbcaeb2b29bbe14a2e3a0aec2bc4499533b53cf SHA512 06a9d79f5e449ae606f6c5dba20038ad60202c908bb0f7f1dbc8bb3a955db5b6b34e4caa453a7b562d744f30faa62574425d78552b497227d4b5ca8eac3adaab
+DIST kdoctools-6.2.0.tar.xz 456128 BLAKE2B 045412ef0a4b1476c78bc28792d049bfa65c65d7ab3ec1c8f1aa9f5989662cc40585e9818fd909ef0b28bbdbbe10ffb812dd9c8de9027428ebd9b317af68ca04 SHA512 8bdc956301d6ea0c3095c5170040b43d33fee4e9fcde1a4b907d7eb9baa7a5100b8c37287d181b331488926d2370a31ed6c51c4e5e3428a02a2a13e7a213d5fd
diff --git a/kde-frameworks/kdoctools/kdoctools-5.82.0.ebuild b/kde-frameworks/kdoctools/kdoctools-5.115.0.ebuild
index 9718a54d230d..e0ad7364b427 100644
--- a/kde-frameworks/kdoctools/kdoctools-5.82.0.ebuild
+++ b/kde-frameworks/kdoctools/kdoctools-5.115.0.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_QTHELP="false"
 PVCUT=$(ver_cut 1-2)
-inherit ecm kde.org
+inherit ecm frameworks.kde.org
 
 DESCRIPTION="Tools to generate documentation in various formats from DocBook files"
 
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
 IUSE="nls"
 
 BDEPEND="
@@ -28,6 +28,11 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+CMAKE_SKIP_TESTS=(
+	# bug 665622
+	kdoctools_install
+)
+
 PATCHES=( "${FILESDIR}/${PN}-5.54.0-gentoo-docbundledir.patch" )
 
 src_configure() {
@@ -37,12 +42,3 @@ src_configure() {
 
 	ecm_src_configure
 }
-
-src_test() {
-	# bug 665622
-	local myctestargs=(
-		-E "(kdoctools_install)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-frameworks/kdoctools/kdoctools-5.83.0.ebuild b/kde-frameworks/kdoctools/kdoctools-5.116.0.ebuild
index 3b3ac23b5f35..28624c95ad1c 100644
--- a/kde-frameworks/kdoctools/kdoctools-5.83.0.ebuild
+++ b/kde-frameworks/kdoctools/kdoctools-5.116.0.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_QTHELP="false"
 PVCUT=$(ver_cut 1-2)
-inherit ecm kde.org
+inherit ecm frameworks.kde.org
 
 DESCRIPTION="Tools to generate documentation in various formats from DocBook files"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="nls"
 
 BDEPEND="
@@ -28,6 +28,11 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+CMAKE_SKIP_TESTS=(
+	# bug 665622
+	kdoctools_install
+)
+
 PATCHES=( "${FILESDIR}/${PN}-5.54.0-gentoo-docbundledir.patch" )
 
 src_configure() {
@@ -37,12 +42,3 @@ src_configure() {
 
 	ecm_src_configure
 }
-
-src_test() {
-	# bug 665622
-	local myctestargs=(
-		-E "(kdoctools_install)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-frameworks/kdoctools/kdoctools-6.2.0.ebuild b/kde-frameworks/kdoctools/kdoctools-6.2.0.ebuild
new file mode 100644
index 000000000000..95efa167a741
--- /dev/null
+++ b/kde-frameworks/kdoctools/kdoctools-6.2.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="false"
+PVCUT=$(ver_cut 1-2)
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Tools to generate documentation in various formats from DocBook files"
+
+LICENSE="MIT"
+KEYWORDS="~amd64"
+IUSE="nls"
+
+DEPEND="
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	app-text/sgml-common
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	=kde-frameworks/karchive-${PVCUT}*:6
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-lang/perl
+	dev-perl/URI
+	nls? ( >=kde-frameworks/ki18n-${PVCUT}:6 )
+"
+
+CMAKE_SKIP_TESTS=(
+	# bug 665622
+	kdoctools_install
+)
+
+PATCHES=( "${FILESDIR}/${PN}-5.54.0-gentoo-docbundledir.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package nls KF6I18n)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kdoctools/metadata.xml b/kde-frameworks/kdoctools/metadata.xml
index 2fdbf33d963d..506ecf605bc4 100644
--- a/kde-frameworks/kdoctools/metadata.xml
+++ b/kde-frameworks/kdoctools/metadata.xml
@@ -1,8 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
+	<upstream>
+		<bugs-to>https://bugs.kde.org/</bugs-to>
+	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Frameworks API.
+		</subslots>
+	</slots>
 </pkgmetadata>