gentoo resync : 12.05.2022

3 files changed, 2 insertions, 52 deletions

diff --git a/kde-frameworks/kdoctools/Manifest b/kde-frameworks/kdoctools/Manifest
index aee74e7dfd37..f3061ae2ddc7 100644
--- a/kde-frameworks/kdoctools/Manifest
+++ b/kde-frameworks/kdoctools/Manifest
@@ -1,8 +1,6 @@
 AUX kdoctools-5.54.0-gentoo-docbundledir.patch 1055 BLAKE2B 0b57d4d23fdac39a939d1355ddecb5d0ba53c1a2b2ef43fb1127834b1004b4fd63a8e32a160794a51879a103c658068a67663fe8f9e1cb99ede5154cbccf2c1d SHA512 18dcd82bfccec19eccb5993cfabf4ead9222dbf29cad3a9df4b1c225a2693ea0b882dac78f969da7bf98aa4bdf5b09ee28cef6ff28935502439ca20fad427bdb
-DIST kdoctools-5.90.0.tar.xz 439420 BLAKE2B 22bcf675fdae01426c2bdc868bdaeb743f8efed7adaa59f70be0222ea1e96af31c71ac4d0c74cd017da0298ad045c20c57fe8f8e393d9736fd41127f5203d7b8 SHA512 b6f1d1ef6f4d9c90a357d59d606e5a28cffcd03066897530432c93c5e8a1adcf6f2b2da4934c17574925823f6b56632c7279844fd439dcc3748787f23ef51700
 DIST kdoctools-5.92.0.tar.xz 440352 BLAKE2B 95a4202c31d7880ae7c6ee35877e4b156edbcc89f25ea3bc9f756359d710c296831b19943ec0704c2bc15c8d17b5aa93a01a1751719485bf4a7fe794eea77e4d SHA512 bf87ca5cf7709d634dba631564f45dc5b1bfc6d1ba688ef6534045f5946a9b5cfd3746c5f599b34b25b2b3c174e7a78cf598036e80959b3c7d47e2f08fdbdf99
 DIST kdoctools-5.93.0.tar.xz 440420 BLAKE2B fbb9c59c46b5b95f125015330e83edf195ac9dca4360b64dc5d0c8f0f000eaf1101fc3a48b6694431c57335b00c3c2eddd00d71030574e8539060acbc9944f25 SHA512 3e28363b6197334b7bcd9e8f3c1cc5730e24204647c10795a8c271cad03a1b05735611e367bfb25bc8b20b267d7df7579492d03bcbf2402127f3e30bfd7df273
-EBUILD kdoctools-5.90.0.ebuild 876 BLAKE2B 35daa5b95f2564391673dfa8214fee1ed585d7c0875fd5fc4cbb9dbe6a0ba58ade22527c083ab2371046b567bc2be51ad493b8d2dbe469e38880ac85acaeb588 SHA512 7636b1b0fe7c51ac31368719b4a2d037f4719194ed5c88cbebf7b87e77e92ebe563c249ed96f4391e3be9e44b1f5d60e8b8703e65825ffb1351db238cda0318c
-EBUILD kdoctools-5.92.0.ebuild 879 BLAKE2B 7abb4c5b8274ff56b9809ce268efcfc00a784c78e65ae3c778f69425464b4c68ab2bf5b2c785be9b2289436075effbdb9016497e278eac3dfbf01330901d132d SHA512 075cbcb7af69a6dd9ef5e22c36ee2c677e1413db3dcb605be842b087dca7360f105236e77da597f51cda8443b6205c4182f3fe7b68256cf961a2d9e54b7c2084
+EBUILD kdoctools-5.92.0.ebuild 876 BLAKE2B 35daa5b95f2564391673dfa8214fee1ed585d7c0875fd5fc4cbb9dbe6a0ba58ade22527c083ab2371046b567bc2be51ad493b8d2dbe469e38880ac85acaeb588 SHA512 7636b1b0fe7c51ac31368719b4a2d037f4719194ed5c88cbebf7b87e77e92ebe563c249ed96f4391e3be9e44b1f5d60e8b8703e65825ffb1351db238cda0318c
 EBUILD kdoctools-5.93.0.ebuild 879 BLAKE2B 7abb4c5b8274ff56b9809ce268efcfc00a784c78e65ae3c778f69425464b4c68ab2bf5b2c785be9b2289436075effbdb9016497e278eac3dfbf01330901d132d SHA512 075cbcb7af69a6dd9ef5e22c36ee2c677e1413db3dcb605be842b087dca7360f105236e77da597f51cda8443b6205c4182f3fe7b68256cf961a2d9e54b7c2084
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kdoctools/kdoctools-5.90.0.ebuild b/kde-frameworks/kdoctools/kdoctools-5.90.0.ebuild
deleted file mode 100644
index a8fa655b8393..000000000000
--- a/kde-frameworks/kdoctools/kdoctools-5.90.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 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 kde.org
-
-DESCRIPTION="Tools to generate documentation in various formats from DocBook files"
-
-LICENSE="MIT"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="nls"
-
-BDEPEND="
-	dev-lang/perl
-	dev-perl/URI
-	nls? ( >=kde-frameworks/ki18n-${PVCUT}:5 )
-"
-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}*:5
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-5.54.0-gentoo-docbundledir.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package nls KF5I18n)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	# bug 665622
-	local myctestargs=(
-		-E "(kdoctools_install)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-frameworks/kdoctools/kdoctools-5.92.0.ebuild b/kde-frameworks/kdoctools/kdoctools-5.92.0.ebuild
index 24615f4122fb..a8fa655b8393 100644
--- a/kde-frameworks/kdoctools/kdoctools-5.92.0.ebuild
+++ b/kde-frameworks/kdoctools/kdoctools-5.92.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org
 DESCRIPTION="Tools to generate documentation in various formats from DocBook files"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="nls"
 
 BDEPEND="