gentoo resync : 12.05.2022

12 files changed, 131 insertions, 95 deletions

diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index 787b404543ae..1a785e34bad2 100644
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
diff --git a/app-accessibility/at-spi2-core/Manifest b/app-accessibility/at-spi2-core/Manifest
index 255d0b4373af..25a2ae5c83c5 100644
--- a/app-accessibility/at-spi2-core/Manifest
+++ b/app-accessibility/at-spi2-core/Manifest
@@ -3,6 +3,8 @@ AUX at-spi2-core-2.0.2-disable-teamspaces-test.patch 302 BLAKE2B 4165c68b7e8d983
 AUX at-spi2-core-2.42.0-fix-disabling-x11.patch 1017 BLAKE2B 7db683a92ff8587444a34a6c4ad12be8e8a31b26128c843f6c89fa42b1604d55e25a72855272930082c3a1ca2b73f2d3a51ae5274770aa0cc0c530f691e062be SHA512 22ff6474e7fdcee3e00c979e56d23b40f8625236f0cc885171ded9434af6ea12900d29577fbdf08cd655919b9b623c172bca4dada7f2b9d15a57c900b326c333
 DIST at-spi2-core-2.42.0.tar.xz 198016 BLAKE2B 9b14d7d0f5845c7510f7b256a05f5e30c3d3d893a9ae63eee81b3d378dfa9f6ebaa9853f60b23734929692efc4b8c652d4bd7bd035bd989fe0006975bdbea427 SHA512 befcab94b3aa99471723238d9666fc6667041b058a2bac3b012cfa15a91950996431296f33c921764e0ec4ffd0cc41ebe00be461a8460d6f4d2bafff19a38e10
 DIST at-spi2-core-2.44.0.tar.xz 209692 BLAKE2B 149251ba4061f5dbfac1e27775491bb6d7cee279cb7bd58c05f97cdec8a4e0208e5a129651a07c9febea681cc3fe36a7d7fa57c43c2b558249cdd321466729dd SHA512 6d74a56d7ad6c643985e98aebbbf0cdaad69c03b8030f8968bd9cce9357805cd846d71d35d2cc4a193770cd6d4a83cbfb98ef082e17719f3dee7b839c48bda44
+DIST at-spi2-core-2.44.1.tar.xz 209780 BLAKE2B e76f0b0c478564181db774633dfc9613bdfa6c74c5c52878d877723e37605b7b7169fee45a9025b331e84bf5af8132eed50b388db9ac1aee0fec7776a633628a SHA512 8d85df75f886c4a19d829d14e5a9412b607b9cbe2d1b7ecb95b4082602f0624e90747fe955f96d378c3a52bc0e732074b97008bb34e6acc2722c7056b2c0504e
 EBUILD at-spi2-core-2.42.0.ebuild 1510 BLAKE2B f9ccee7e9bf28fc0c9865284cdf2fd76215d6cc90a7130c17ee21eb67d56998594a130530a467758ccf095c2de5ed560e1686ea1751b8b22f73040fc173c6ea8 SHA512 d4da094c2b88c0eb26a41c89bde4be1793888a50cb43c88dd4801bca5c02d24e744d19ce73f5c3dab5f07b15d6426a85c2f8530068f05acc46899dfb39d776fe
 EBUILD at-spi2-core-2.44.0.ebuild 1520 BLAKE2B e43adcb6ff0f55e4ea43f2a87a442e108b4e144d3fc1b2ce7da3872d6b6606f92fbd5f202a7af005033985fd60abb1c67dd9a3626b25c957d1ea66f1c792b2ea SHA512 ea203e37cebb4d89c9bc4f5b23085ac4c275368ba62f69350b5a4d6936d4dfa3e17256d83779d5652b06de0b7c93f13d50f03cba2a34ca4f593d9e65229bc09a
+EBUILD at-spi2-core-2.44.1.ebuild 1465 BLAKE2B 74255d325bbac9c6d4e7800178b2a7b519a7272d3dab8c1740a85c26f221374cd872a06d2ab515a30add7b31e321493fe4ab820645790f100db3d99e153db94f SHA512 36d7fd8b245dd5e5c410cf19eb69d248357deddc051da3280007880c631357236ecf1c0488618e2ef6054fda67db30c20582e917008ed9a6668dcf148f428d72
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.44.1.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.44.1.ebuild
new file mode 100644
index 000000000000..6d1568dc223b
--- /dev/null
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.44.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org meson-multilib systemd virtualx xdg
+
+DESCRIPTION="D-Bus accessibility specifications and registration daemon"
+HOMEPAGE="https://wiki.gnome.org/Accessibility https://gitlab.gnome.org/GNOME/at-spi2-core"
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+IUSE="X gtk-doc +introspection"
+REQUIRED_USE="gtk-doc? ( X )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+RDEPEND="
+	>=sys-apps/dbus-1.5[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.62:2[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-1.54.0:= )
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXtst[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	gtk-doc? (
+		>=dev-util/gtk-doc-1.25
+		app-text/docbook-xml-dtd:4.3
+	)
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# disable teamspaces test since that requires Novell.ICEDesktop.Daemon
+	"${FILESDIR}/${PN}-2.0.2-disable-teamspaces-test.patch"
+)
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dsystemd_user_dir="$(systemd_get_userunitdir)"
+		$(meson_native_use_bool gtk-doc docs)
+		-Dintrospection=$(multilib_native_usex introspection)
+		-Dx11=$(usex X)
+	)
+	meson_src_configure
+}
+
+multilib_src_test() {
+	virtx dbus-run-session meson test -C "${BUILD_DIR}"
+}
diff --git a/app-accessibility/edbrowse/Manifest b/app-accessibility/edbrowse/Manifest
index a858139bfc47..ecda679cdbcb 100644
--- a/app-accessibility/edbrowse/Manifest
+++ b/app-accessibility/edbrowse/Manifest
@@ -1,5 +1,5 @@
-AUX edbrowse-3.7.5.1-fno-common.patch 508 BLAKE2B b7908cf4019500da7df9f37c59e76b204227fefc16e068a1f5f3454ba6c33f30f7740cf89f6d6a9d193e79fd4b35d8f9584bc43b89c888b339742f5708bb8d27 SHA512 8adaa0621546b24b471f1afe5c93991876320170619dae5babe48099a3ef14286914136efb6643924be84ab5b6d7f709f4f5728d117d45f502db3befe3e4195d
-AUX edbrowse-3.7.5.1-manpage.patch 946 BLAKE2B 34ee1e54da6d1f980f8876bf43dff170136ce18fa216df14e9bb62b62bafb7d33b622a01df6fdc8db9af95e27d2149b0916e0e7834960e647919e1a237257cdb SHA512 5aa93520e1765db0cf38c9d85debed9e97f08f3941c104611850a5bb496d13882ab12d850eec509378ed8c878049c659af460a334eaa5dcce7ed48fa85d8b906
-DIST edbrowse-3.7.5.1.tar.gz 790742 BLAKE2B 7047cc2b1c7bc51aaa88f7a6aa981020ae80b6498bcb97f670646267dab94bab565b9ecc23c36f75d2653175917720dbb9e40a0f9bfd44251716669155e8de9e SHA512 ec217bf98334e8b493a1a80082cebfb11da9fa84d20d8b5f3f3286a78ae1dc6a2731c578d000f9f0f19d3dcbec9aa2c3e2a6b5b35f7ea7672840b9bcd1c5c67a
-EBUILD edbrowse-3.7.5.1-r3.ebuild 896 BLAKE2B c8ef654c3a52fc5f85441d33ee21a93a2554e28fa8f6dc85c387a3e87374647df70e8d6c6d259fc963657c638f7371723bdc6ae3671bf23cfe8f8af757dc1638 SHA512 700c1b9595b877965146e05fdc45a0f7dfd28aaf78168c259eb04c2ba7c49c95374b1037277fe1dd18622ded12843aec1eaa7a339684f3a8ac4b0240a0541f93
+AUX edbrowse-3.8.2.1-respect-ldflags.patch 392 BLAKE2B 65237beadceab3928786d56c6ac8872564f085b886e80e4638cf4872f2104fffa34119b7fa7443dc1d90fae0e5a3a9b124691ee69877aad8f6d786286b85c850 SHA512 cc7f096f30fb93f5fd3d15af77edfab43ef83df1ab341ff8984372c1c4a22aaf4cfb823446d2ed8da380a2baf178debb647dde05c1d633dd88cb6987b172cb0f
+DIST edbrowse-3.8.2.1.tar.gz 909574 BLAKE2B e5358861f6747dfe12498403b2d4761ab16dabc513fe94455d88c44e07793fb1128b0c1b7ebdf9ef922e371148182f8127f67f11eb123877e804858cb7e6378b SHA512 b5774a836efe96aae77052b02f6fcc85920b5f86a6ab8436a6dc363d81531b30e7f9c7555aacb20af27e59565042bdd685eed2acd4dfde8b99e2ad0358f19927
+DIST quickjs-2788d71.tar.gz 599260 BLAKE2B 67618f491c3efd1aa15a8906557983dd7123a3cfb2584f2f499f005667ccac4ded1c77934d2807cfce9e042572c6c41d63982b3df7afab5b2c67f4ce9f357879 SHA512 4493d11bc60855711955e0159e9f568d7e3db59c9843ef3aae00846f82c5e33f501372f7f5861b431353355f400f77720f3265963ea7bc0e38635ab5b89a27a0
+EBUILD edbrowse-3.8.2.1-r1.ebuild 1266 BLAKE2B e7328e8263f61e0025200b1a586d647eaf0c146b4c78af3604fe6826c085e8913b4ea4cb9c0d59fcc7ddafd4b7f6b1a043a23023995c00c19787247aa4d56a6c SHA512 6fc658efeec35a44bff32fdb2af4e09ee1a12b2ce7f12111290bede9b2865378547670bdf42568327f19f9ed428351869bcdf589b3ca11d654a5744a2a720585
 MISC metadata.xml 340 BLAKE2B 13c88efa300cbf9a242554fa41b530a764b874060608cc3720ce7e835a3fff28524efb121270bc80a5ef8aeac04e1a0b51ac5eb421c7173b9896b9c8fa56e02f SHA512 03dd5a0561636f582985dc98b8d1b37a268f6d7a4109844be462066cae2162f53f8f09dd3d63f5a87e188c6754297b9daca190e481cd323ab6c9c045e8c33cc2
diff --git a/app-accessibility/edbrowse/edbrowse-3.7.5.1-r3.ebuild b/app-accessibility/edbrowse/edbrowse-3.7.5.1-r3.ebuild
deleted file mode 100644
index 5fc5f1ffa3c1..000000000000
--- a/app-accessibility/edbrowse/edbrowse-3.7.5.1-r3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Combination editor, browser, and mail client that is 100% text based"
-HOMEPAGE="http://edbrowse.org"
-SRC_URI="https://github.com/CMB/edbrowse/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="odbc"
-
-RDEPEND="
-	>=app-text/htmltidy-5.0.0:=
-	dev-lang/duktape:=
-	dev-libs/libpcre:=
-	net-misc/curl
-	sys-libs/readline:=
-	odbc? ( dev-db/unixODBC )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-lang/perl
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fno-common.patch
-	"${FILESDIR}"/${P}-manpage.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -i -e "s:/usr/share/doc/edbrowse:/usr/share/doc/${PF}:" CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_EDBR_ODBC=$(usex odbc)
-	)
-	cmake_src_configure
-}
diff --git a/app-accessibility/edbrowse/edbrowse-3.8.2.1-r1.ebuild b/app-accessibility/edbrowse/edbrowse-3.8.2.1-r1.ebuild
new file mode 100644
index 000000000000..d9e6b8f22449
--- /dev/null
+++ b/app-accessibility/edbrowse/edbrowse-3.8.2.1-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+QUICKJS_HASH=2788d71e823b522b178db3b3660ce93689534e6d
+QUICKJS_SHORT=2788d71
+QUICKJS_S="${WORKDIR}/quickjs-${QUICKJS_HASH}"
+QUICKJS_P="quickjs-${QUICKJS_SHORT}"
+
+DESCRIPTION="Combination editor, browser, and mail client that is 100% text based"
+HOMEPAGE="https://edbrowse.org"
+SRC_URI="https://github.com/CMB/edbrowse/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/bellard/quickjs/archive/${QUICKJS_HASH}.tar.gz -> ${QUICKJS_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="odbc"
+
+RDEPEND="
+	>=app-text/htmltidy-5.0.0:=
+	dev-libs/libpcre2:=
+	net-misc/curl
+	sys-libs/readline:=
+	odbc? ( dev-db/unixODBC )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/perl
+	sys-apps/ed
+	virtual/pkgconfig"
+
+	PATCHES=(
+		"${FILESDIR}/${P}"-respect-ldflags.patch
+	)
+
+src_compile() {
+	# First build quickjs so we can link to its static library.
+	# Also, quickjs doesn't appear to tag releases.
+	tools/quickjobfixup "${QUICKJS_S}" || die
+	emake -C "${QUICKJS_S}"
+	emake -C src QUICKJS_DIR="${QUICKJS_S}" STRIP=
+}
+
+src_install() {
+	dobin src/edbrowse
+	newman doc/man-edbrowse-debian.1 edbrowse.1
+	DOCS="doc/sample*"
+	HTML_DOCS="doc/*.html"
+	einstalldocs
+}
diff --git a/app-accessibility/edbrowse/files/edbrowse-3.7.5.1-fno-common.patch b/app-accessibility/edbrowse/files/edbrowse-3.7.5.1-fno-common.patch
deleted file mode 100644
index bf9fa08245da..000000000000
--- a/app-accessibility/edbrowse/files/edbrowse-3.7.5.1-fno-common.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/eb.h
-+++ b/src/eb.h
-@@ -287,7 +287,7 @@ extern char *sslCerts;		/* ssl certificates to validate the secure server */
- extern int verifyCertificates;	/* is a certificate required for the ssl connection? */
- extern int displayLength;	// when printing a line
- extern int formatLineLength;	// when formatting html
--bool formatOverflow;
-+extern bool formatOverflow;
- extern int webTimeout, mailTimeout;
- extern uchar browseLocal;
- extern bool sqlPresent;		/* Was edbrowse compiled with SQL built in? */
diff --git a/app-accessibility/edbrowse/files/edbrowse-3.7.5.1-manpage.patch b/app-accessibility/edbrowse/files/edbrowse-3.7.5.1-manpage.patch
deleted file mode 100644
index f0d667669113..000000000000
--- a/app-accessibility/edbrowse/files/edbrowse-3.7.5.1-manpage.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -249,19 +249,7 @@ if (UNIX)
-     endif()
-     # copy to build dir
-     configure_file( ${UnixManFile} ${CMAKE_BINARY_DIR}/edbrowse.1 )
--    # find 'gzip' - warn if not...
--    find_program(GZIP_EXE gzip PATHS /bin )
--    if (GZIP_EXE)
--        # gzip it in place
--        execute_process(COMMAND ${GZIP_EXE} -f "edbrowse.1"
--            WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
--            INPUT_FILE edbrowse.1
--            OUTPUT_FILE edbrowse.1.gz )
--        # install it
--	install(FILES ${CMAKE_BINARY_DIR}/edbrowse.1.gz DESTINATION ${UnixManDir})
--    else ()
--        message(WARNING "Unable to locate 'gzip'! No man page...")
--    endif ()
-+    install(FILES ${CMAKE_BINARY_DIR}/edbrowse.1 DESTINATION ${UnixManDir})
-     # install user guide
-     install(FILES doc/usersguide.html doc/usersguide_fr.html doc/sample.ebrc doc/sample_fr.ebrc doc/sample_it.ebrc DESTINATION ${UnixDocDir})
- endif ()
diff --git a/app-accessibility/edbrowse/files/edbrowse-3.8.2.1-respect-ldflags.patch b/app-accessibility/edbrowse/files/edbrowse-3.8.2.1-respect-ldflags.patch
new file mode 100644
index 000000000000..3b511e1d2b38
--- /dev/null
+++ b/app-accessibility/edbrowse/files/edbrowse-3.8.2.1-respect-ldflags.patch
@@ -0,0 +1,13 @@
+diff --git a/src/makefile b/src/makefile
+index d65369a3..410d3e9d 100644
+--- a/src/makefile
++++ b/src/makefile
+@@ -31,7 +31,7 @@ endif
+ CFLAGS += $(DEBUGFLAGS)
+ 
+ #  Libraries and linker flags for edbrowse.
+-LDFLAGS = $(STRIP) $(LINKER_LIBS) -lpthread -lm
++LDFLAGS += $(STRIP) $(LINKER_LIBS) -lpthread -lm
+ 
+ # LDFLAGS for quickjs loading.
+ QUICKJS_LDFLAGS = $(QUICKJS_DIR)/libquickjs.a -ldl
diff --git a/app-accessibility/kontrast/Manifest b/app-accessibility/kontrast/Manifest
index e43f6c22f066..a94633a313f7 100644
--- a/app-accessibility/kontrast/Manifest
+++ b/app-accessibility/kontrast/Manifest
@@ -1,5 +1,5 @@
-DIST kontrast-21.08.3.tar.xz 125632 BLAKE2B 8734de15fcfd542d037cde92e6a80060e9c6628cd69d3cfee1f1f4c9b8938647d83924381966600ac9978acfa14723e0920c98f3ce2e666ddfdb624b8cc5f010 SHA512 193d372cdcecb3b90a352fb2deb24528d004c44e50c834e02a63c562eb97bd1f528fd81254bfc3ab7152edcc9894129eae7c6e1826a9ae42bc5ab22bf9a660c9
 DIST kontrast-21.12.3.tar.xz 125760 BLAKE2B b72d78961d22fc0eb51c0a64f9a7381ef9e87709d9fc24a08c3b08c60ad8102eadbc97943e72b1153f950654f442f97190d1e34c3beb24f4f8ea070f923dba55 SHA512 36d084f0801d393a0d7bdd771d23163a192e6d0e50f6499b9080e3928f5f3982dcee81c3e3453f8de2ece721c508479928fdff4a971cfef945acadd917e19581
-EBUILD kontrast-21.08.3-r1.ebuild 842 BLAKE2B 0f58b885b95066a8095e5379734fa81108bb21d7c16674c7b27797b10f2a6ff8cb03b1eef3350215a502701402c0fb2672eb72f9195672416a2f8eab53abab05 SHA512 4b05775123f53b74caf013947d3f6fa6743aadfb0eead7f1f2351d3bd95b7cc7f3ab2bceb4adb1d668b8084c6e43d197ef4bad1c4f38787ec6ae49866266d8d5
-EBUILD kontrast-21.12.3.ebuild 771 BLAKE2B 3aff904aaac1a9cb46581f6a23a26e4cf70fd9f5334a975bef9b6217bda57792cb31f7d9ec79820fb0ba8221bdaa1c8ec85a9847d99ff1173dce24ff33ddcf75 SHA512 4e29be3cbc3cbf34a59db589e1c4691fdc429540fe19356eda593b13baa14bea8e4c7f8d8c2d7ab5c4df99a5b3a379fc079c2eeb6291adfe6e935cdf2eac6173
+DIST kontrast-22.04.0.tar.xz 125872 BLAKE2B a04569299df54635687d0e30b7453d4fa7dfe9699cbac4da82749d0e0e37e2f6006b1d7e0de88813c1103b59dd10141d6c034fd51bebe0846120790d4aa0cfa2 SHA512 cf8103b28b0e2658c251af2e9adcc7099a55655d4f59a6d410bfbf12fe20830f6be80ab28bd80534e0a20d7ad6b8f83740bb022b1c1602f9c24a0cd94198cbfd
+EBUILD kontrast-21.12.3.ebuild 770 BLAKE2B 19f1755af31903f1c391c4ab4e0c15d12db3e3746804540500362d5d756ad040506411529e1d2bf57006e4b06836b4d55f08007558174f314ebabab81934b9b0 SHA512 e4769b4221d09ba72d5c0f4020f10785e463833f4af43847beb7500c852eba18b3e0e4b2284a7fde325801d9d174360802ccae64db4cccb042e471f87483dc22
+EBUILD kontrast-22.04.0.ebuild 773 BLAKE2B f18a5b24b4a4133babcf2fd3539edcbabf86e760e9c10cc7f3789000c07ed8a4bca105e51d401b76b407002149e635ac5efe1adeda664581112e931b467b5ff2 SHA512 7d4b450343c883bfcc74ff3767a665d8bf13bd254ef1aa1408321eaeca4c1bad3822bb0ca5467f6fdadcfb72cddaeac01d04d952e127faa99a2ae8b36e6a73ec
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/app-accessibility/kontrast/kontrast-21.12.3.ebuild b/app-accessibility/kontrast/kontrast-21.12.3.ebuild
index 067e39bd2f12..451c6b4c9b7d 100644
--- a/app-accessibility/kontrast/kontrast-21.12.3.ebuild
+++ b/app-accessibility/kontrast/kontrast-21.12.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kontrast/"
 
 LICENSE="GPL-3+"
 SLOT="5"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/app-accessibility/kontrast/kontrast-21.08.3-r1.ebuild b/app-accessibility/kontrast/kontrast-22.04.0.ebuild
index d47adaf161fc..daa1ea4b32a8 100644
--- a/app-accessibility/kontrast/kontrast-21.08.3-r1.ebuild
+++ b/app-accessibility/kontrast/kontrast-22.04.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 KDE_GEAR="true"
-KFMIN=5.84.0
+KFMIN=5.92.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kontrast/"
 
 LICENSE="GPL-3+"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~riscv x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
@@ -31,8 +31,3 @@ DEPEND="
 RDEPEND="${DEPEND}
 	kde-plasma/xdg-desktop-portal-kde
 "
-
-src_prepare() {
-	ecm_src_prepare
-	ecm_punt_bogus_dep KF5 Declarative
-}