Merge updates from master

28 files changed, 146 insertions, 91 deletions

diff --git a/app-text/xmlto/xmlto-0.0.28-r8.ebuild b/app-text/xmlto/xmlto-0.0.28-r8.ebuild
index d28ba15e6679..319eaa49c811 100644
--- a/app-text/xmlto/xmlto-0.0.28-r8.ebuild
+++ b/app-text/xmlto/xmlto-0.0.28-r8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="latex text"
 
 RDEPEND="
diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.27.ebuild b/dev-db/mysql-workbench/mysql-workbench-8.0.27.ebuild
index 6ce9aed7c684..273419842bc6 100644
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.27.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.27.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,7 @@ SRC_URI="https://cdn.mysql.com/Downloads/MySQLGUITools/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.0.ebuild b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.0.ebuild
index f1ee5befc428..4430aa547511 100644
--- a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.0.ebuild
+++ b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/log4j-12-api/log4j-12-api-2.17.1.ebuild b/dev-java/log4j-12-api/log4j-12-api-2.17.1.ebuild
index b623dce8e57d..c4147fc64083 100644
--- a/dev-java/log4j-12-api/log4j-12-api-2.17.1.ebuild
+++ b/dev-java/log4j-12-api/log4j-12-api-2.17.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/logging/log4j/${PV}/apache-log4j-${PV}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 
 # We don't have junit-vintage and junit-jupiter
 RESTRICT="test"
diff --git a/dev-java/log4j-core/log4j-core-2.17.1-r1.ebuild b/dev-java/log4j-core/log4j-core-2.17.1-r1.ebuild
index 79d595da15bf..6ea5ab5fa81f 100644
--- a/dev-java/log4j-core/log4j-core-2.17.1-r1.ebuild
+++ b/dev-java/log4j-core/log4j-core-2.17.1-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/logging/log4j/${PV}/apache-log4j-${PV}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 
 # We don't have junit-vintage and junit-jupiter
 RESTRICT="test"
diff --git a/dev-lang/erlang/erlang-24.2.2.ebuild b/dev-lang/erlang/erlang-24.2.2.ebuild
index 260dbdf84d07..a11aca085eff 100644
--- a/dev-lang/erlang/erlang-24.2.2.ebuild
+++ b/dev-lang/erlang/erlang-24.2.2.ebuild
@@ -22,7 +22,7 @@ LICENSE="Apache-2.0"
 # same build of ERTS that was used when compiling the code.  See
 # http://erlang.org/doc/system_principles/misc.html for more information.
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc emacs java +kpoll odbc sctp ssl systemd tk wxwidgets"
 
 RDEPEND="
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r1.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r1.ebuild
index 034e9ed863fe..6185656c2941 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r1.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCH_VE
 
 LICENSE="BSD-with-attribution"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample selinux sqlite srp ssl static-libs urandom"
 REQUIRED_USE="ldapdb? ( openldap )"
 
diff --git a/dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.260.0.ebuild b/dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.260.0.ebuild
index b96601b050f5..dfdb6e1e84f6 100644
--- a/dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.260.0.ebuild
+++ b/dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.260.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Create and manipulate tables in Perl + Tk"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ~riscv sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-perl/Tk-800.22.0
diff --git a/dev-php/pecl-redis/pecl-redis-5.3.6.ebuild b/dev-php/pecl-redis/pecl-redis-5.3.6.ebuild
index d9bbe83e2992..8b0fdebbfc3d 100644
--- a/dev-php/pecl-redis/pecl-redis-5.3.6.ebuild
+++ b/dev-php/pecl-redis/pecl-redis-5.3.6.ebuild
@@ -16,7 +16,7 @@ inherit php-ext-pecl-r3
 DESCRIPTION="PHP extension for interfacing with Redis"
 LICENSE="PHP-3.01"
 SLOT="0"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="amd64 ~arm"
 IUSE="igbinary +json lz4 +session zstd"
 
 DEPEND="
diff --git a/dev-python/cfn-lint/cfn-lint-0.58.3.ebuild b/dev-python/cfn-lint/cfn-lint-0.58.3.ebuild
index b8ea9d7827e1..de09469670c8 100644
--- a/dev-python/cfn-lint/cfn-lint-0.58.3.ebuild
+++ b/dev-python/cfn-lint/cfn-lint-0.58.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/aws-sam-translator-1.42.0[${PYTHON_USEDEP}]
diff --git a/dev-python/croniter/croniter-1.3.4.ebuild b/dev-python/croniter/croniter-1.3.4.ebuild
index 56914f77185a..0f8e9044d11b 100644
--- a/dev-python/croniter/croniter-1.3.4.ebuild
+++ b/dev-python/croniter/croniter-1.3.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 
 RDEPEND="
 	dev-python/python-dateutil[${PYTHON_USEDEP}]"
diff --git a/dev-python/doit/doit-0.34.2.ebuild b/dev-python/doit/doit-0.34.2.ebuild
index b499b853c2da..3148083ded7e 100644
--- a/dev-python/doit/doit-0.34.2.ebuild
+++ b/dev-python/doit/doit-0.34.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/cloudpickle[${PYTHON_USEDEP}]
diff --git a/dev-python/krb5/krb5-0.3.0.ebuild b/dev-python/krb5/krb5-0.3.0.ebuild
index 2f970f72d609..4a960e781166 100644
--- a/dev-python/krb5/krb5-0.3.0.ebuild
+++ b/dev-python/krb5/krb5-0.3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="
 	virtual/krb5
diff --git a/dev-python/lxml/lxml-4.8.0-r1.ebuild b/dev-python/lxml/lxml-4.8.0-r1.ebuild
index 7a2ee9cd0d94..a13e0e7baf58 100644
--- a/dev-python/lxml/lxml-4.8.0-r1.ebuild
+++ b/dev-python/lxml/lxml-4.8.0-r1.ebuild
@@ -15,7 +15,7 @@ S=${WORKDIR}/lxml-${P}
 
 LICENSE="BSD ElementTree GPL-2 PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples +threads test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/markupsafe/markupsafe-2.1.1.ebuild b/dev-python/markupsafe/markupsafe-2.1.1.ebuild
index 3fe25269a5f9..1efceb08980b 100644
--- a/dev-python/markupsafe/markupsafe-2.1.1.ebuild
+++ b/dev-python/markupsafe/markupsafe-2.1.1.ebuild
@@ -18,6 +18,6 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 
 distutils_enable_tests pytest
diff --git a/dev-python/oslo-serialization/oslo-serialization-4.3.0.ebuild b/dev-python/oslo-serialization/oslo-serialization-4.3.0.ebuild
index 7be2f3d2aa46..968510426ef2 100644
--- a/dev-python/oslo-serialization/oslo-serialization-4.3.0.ebuild
+++ b/dev-python/oslo-serialization/oslo-serialization-4.3.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 RDEPEND="
 	>=dev-python/msgpack-0.5.2[${PYTHON_USEDEP}]
diff --git a/dev-python/pybind11/pybind11-2.9.1.ebuild b/dev-python/pybind11/pybind11-2.9.1.ebuild
index 3dce07219271..eafef41f8c08 100644
--- a/dev-python/pybind11/pybind11-2.9.1.ebuild
+++ b/dev-python/pybind11/pybind11-2.9.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/pybind/pybind11/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="
 	dev-cpp/eigen:3
diff --git a/dev-python/python-slugify/python-slugify-6.1.1.ebuild b/dev-python/python-slugify/python-slugify-6.1.1.ebuild
index e06ea5dfd456..b21f1c70787b 100644
--- a/dev-python/python-slugify/python-slugify-6.1.1.ebuild
+++ b/dev-python/python-slugify/python-slugify-6.1.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 RDEPEND="dev-python/text-unidecode[${PYTHON_USEDEP}]"
 
diff --git a/dev-util/git-delta/git-delta-0.12.0.ebuild b/dev-util/git-delta/git-delta-0.12.0.ebuild
index 7522374d2fec..b01a2f913588 100644
--- a/dev-util/git-delta/git-delta-0.12.0.ebuild
+++ b/dev-util/git-delta/git-delta-0.12.0.ebuild
@@ -154,7 +154,7 @@ S="${WORKDIR}/${P/git-/}"
 
 LICENSE="0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 LGPL-3+ MIT Unlicense ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv"
 
 BDEPEND="virtual/pkgconfig"
 DEPEND="
diff --git a/dev-util/patchelf/patchelf-0.14.5.ebuild b/dev-util/patchelf/patchelf-0.14.5.ebuild
index 05802ed8d121..4325154af06e 100644
--- a/dev-util/patchelf/patchelf-0.14.5.ebuild
+++ b/dev-util/patchelf/patchelf-0.14.5.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Small utility to modify the dynamic linker and RPATH of ELF executa
 HOMEPAGE="https://github.com/NixOS/patchelf"
 SRC_URI="https://github.com/NixOS/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 LICENSE="GPL-3"
 
 src_prepare() {
diff --git a/dev-util/quilt/quilt-0.67.ebuild b/dev-util/quilt/quilt-0.67.ebuild
index 4b0a1a4a4ff4..b9fcafe87bc3 100644
--- a/dev-util/quilt/quilt-0.67.ebuild
+++ b/dev-util/quilt/quilt-0.67.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://savannah.nongnu.org/download/quilt/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
 IUSE="emacs graphviz"
 # unresolved test failures
 RESTRICT="test"
diff --git a/media-libs/assimp/assimp-5.2.2.ebuild b/media-libs/assimp/assimp-5.2.2.ebuild
index d2628095f7fb..c3332c860a4d 100644
--- a/media-libs/assimp/assimp-5.2.2.ebuild
+++ b/media-libs/assimp/assimp-5.2.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
 IUSE="samples test"
 
 RESTRICT="!test? ( test )"
diff --git a/media-sound/drumstick/Manifest b/media-sound/drumstick/Manifest
index 803627b0acda..3408da4b59e7 100644
--- a/media-sound/drumstick/Manifest
+++ b/media-sound/drumstick/Manifest
@@ -1,2 +1 @@
-DIST drumstick-2.5.0.tar.gz 1914679 BLAKE2B 1b9c12304156577230f22dee5bde068ecdc2a3c0dc7406db4d9d8588788a29e1115330d0f9bab8376e1adb72cbf0ff23f4b72ac66c90e1ee83c8322510cf2a2a SHA512 d2e4438d66307dc8259b1da8455c4f2c9954bc3605836b993ec004fb0ca326189d3c8a706ea86bf4836701b80b24d51e756d46c86f04301d5c1601687d1fa6fc
 DIST drumstick-2.5.1.tar.gz 1917814 BLAKE2B b4e9957288a05cf74347e39d05a638a26abb72b1dbbda856ad81e7dab87069e9bd4d57ff9eadece1673c0cd5fc9e9149bc4c9a06ff1fadef77c1ad38fc58d24f SHA512 9dba509bb5ef519f78251787a7a2607cf1cee0255d74ab1f6707a0611abbf8963e51b2114d41d347e55d293336e2ca34d9e2b5ac7989fcfe24e355392bae024a
diff --git a/media-sound/drumstick/drumstick-2.5.0.ebuild b/media-sound/drumstick/drumstick-2.5.0.ebuild
deleted file mode 100644
index 29329502f5d2..000000000000
--- a/media-sound/drumstick/drumstick-2.5.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg
-
-DESCRIPTION="Qt/C++ wrapper for ALSA sequencer"
-HOMEPAGE="https://drumstick.sourceforge.io/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc fluidsynth network pulseaudio"
-
-RESTRICT="test"
-
-BDEPEND="
-	dev-libs/libxslt
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-	x11-misc/shared-mime-info
-	doc? (
-		app-doc/doxygen[dot]
-		app-text/docbook-xsl-stylesheets
-	)
-"
-DEPEND="
-	dev-qt/designer:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	media-libs/alsa-lib
-	fluidsynth? ( media-sound/fluidsynth )
-	network? ( dev-qt/qtnetwork:5 )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS ChangeLog NEWS readme.md TODO )
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=OFF
-		-DUSE_DBUS=ON
-		-DUSE_FLUIDSYNTH=$(usex fluidsynth)
-		-DUSE_NETWORK=$(usex network)
-		-DUSE_PULSEAUDIO=$(usex pulseaudio)
-		-DBUILD_DOCS=$(usex doc)
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use doc && cmake_src_compile doxygen
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
-	cmake_src_install
-}
diff --git a/media-sound/drumstick/drumstick-2.5.1.ebuild b/media-sound/drumstick/drumstick-2.5.1.ebuild
index 818e06285dc5..29329502f5d2 100644
--- a/media-sound/drumstick/drumstick-2.5.1.ebuild
+++ b/media-sound/drumstick/drumstick-2.5.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc fluidsynth network pulseaudio"
 
 RESTRICT="test"
diff --git a/media-sound/fluidsynth/Manifest b/media-sound/fluidsynth/Manifest
index 6be11cfc54a9..53bd8349ed92 100644
--- a/media-sound/fluidsynth/Manifest
+++ b/media-sound/fluidsynth/Manifest
@@ -1 +1,2 @@
 DIST fluidsynth-2.2.5.tar.gz 1747610 BLAKE2B a658e5fb66ebb091560d9e0b8bddd99ec7e7e84c58d9074057fd612a2eb0abf637778ea06c3481dd4d5179a917d47a08f25533d9002c1a915037a83279e2381a SHA512 9ba96da560d3e0a3e38febc6f10d2b3d8019b63ffa0a4c6fa9032efd019333df0367bdd3056faba22517f59f4ef27b18d52429606ed2b8306f69778fd755beb2
+DIST fluidsynth-2.2.6.tar.gz 1749202 BLAKE2B 5296d48809a457770a968fb9ae20ae4091bbae11d6fbf8a11f75e44de1ca9fa1c121e925e61f25ab1016907ced73364ff632ffa3e7edfa9d15019bf3f3e0bb3c SHA512 e4958c409e057fe6e09a0aa86cc0d7c939aa883de479aa90c43f19faa4d0c3a0f6aca7242fad11ec7a7776cb7e2e602c953c6249fc94b9f04425101584ae3e6c
diff --git a/media-sound/fluidsynth/fluidsynth-2.2.6.ebuild b/media-sound/fluidsynth/fluidsynth-2.2.6.ebuild
new file mode 100644
index 000000000000..51908c546139
--- /dev/null
+++ b/media-sound/fluidsynth/fluidsynth-2.2.6.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib systemd toolchain-funcs
+
+DESCRIPTION="Software real-time synthesizer based on the Soundfont 2 specifications"
+HOMEPAGE="https://www.fluidsynth.org"
+SRC_URI="https://github.com/FluidSynth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="alsa dbus debug examples ipv6 jack ladspa lash network oss portaudio pulseaudio +readline sdl +sndfile systemd threads"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-libs/glib:2[${MULTILIB_USEDEP}]
+	alsa? (
+		media-libs/alsa-lib[${MULTILIB_USEDEP}]
+		lash? ( media-sound/lash[${MULTILIB_USEDEP}] )
+	)
+	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
+	ladspa? (
+		media-libs/ladspa-sdk[${MULTILIB_USEDEP}]
+		media-plugins/cmt-plugins[${MULTILIB_USEDEP}]
+	)
+	portaudio? ( media-libs/portaudio[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
+	sndfile? ( media-libs/libsndfile[${MULTILIB_USEDEP}] )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog README.md THANKS TODO doc/fluidsynth-v20-devdoc.txt )
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_C_COMPILER="$(tc-getCC)"
+		-Denable-alsa=$(usex alsa)
+		-Denable-aufile=ON
+		-Denable-dbus=$(usex dbus)
+		-Denable-debug=$(usex debug)
+		-Denable-dsound=OFF # Windows
+		-Denable-floats=OFF # loat instead of double for DSP samples
+		-Denable-fpe-check=$(usex debug)
+		-Denable-ipv6=$(usex ipv6)
+		-Denable-jack=$(usex jack)
+		-Denable-ladspa=$(usex ladspa)
+		-Denable-libinstpatch=ON # https://github.com/swami/libinstpatch
+		-Denable-midishare=OFF # http://midishare.sourceforge.net/
+		-Denable-network=$(usex network)
+		-Denable-opensles=OFF
+		-Denable-oboe=OFF # requires OpenSLES and/or AAudio
+		-Denable-oss=$(usex oss)
+		-Denable-libsndfile=$(usex sndfile)
+		-Denable-pkgconfig=ON
+		-Denable-portaudio=$(usex portaudio)
+		-Denable-profiling=$(usex debug)
+		-Denable-pulseaudio=$(usex pulseaudio)
+		-Denable-readline=$(usex readline)
+		-Denable-sdl2=$(usex sdl)
+		-Denable-systemd=$(usex systemd)
+		-Denable-threads=$(usex threads)
+		-Denable-trap-on-fpe=$(usex debug)
+		-Denable-ubsan=OFF # compile and link against UBSan (for debugging fluidsynth internals)
+		-Denable-waveout=OFF # Windows
+		-Denable-winmidi=OFF # Windows
+	)
+
+	if use alsa; then
+		mycmakeargs+=( -Denable-lash=$(usex lash) )
+	else
+		mycmakeargs+=( -Denable-lash=OFF )
+	fi
+
+	if use systemd; then
+		mycmakeargs+=( -DFLUID_DAEMON_ENV_FILE="/etc/fluidsynth.conf" )
+	fi
+
+	cmake-multilib_src_configure
+}
+
+install_systemd_files() {
+	if multilib_is_native_abi; then
+		systemd_dounit "${BUILD_DIR}/fluidsynth.service"
+		insinto /etc
+		doins "${BUILD_DIR}/fluidsynth.conf"
+	fi
+}
+
+multilib_src_test() {
+	eninja check
+}
+
+src_install() {
+	cmake-multilib_src_install
+
+	docinto pdf
+	dodoc doc/*.pdf
+
+	if use examples; then
+		docinto examples
+		dodoc doc/examples/*.c
+	fi
+
+	if use systemd; then
+		multilib_foreach_abi install_systemd_files
+
+		elog "When using fluidsynth as a systemd service, make sure"
+		elog "to configure your fluidsynth settings globally in "
+		elog "/etc/fluidsynth.conf or per-user in ~/.config/fluidsynth"
+	fi
+}
diff --git a/net-mail/dovecot/dovecot-2.3.18.ebuild b/net-mail/dovecot/dovecot-2.3.18.ebuild
index 8754894a3018..337be0b0ec6d 100644
--- a/net-mail/dovecot/dovecot-2.3.18.ebuild
+++ b/net-mail/dovecot/dovecot-2.3.18.ebuild
@@ -29,7 +29,7 @@ HOMEPAGE="https://www.dovecot.org/"
 
 SLOT="0"
 LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite"
 IUSE_DOVECOT_COMPRESS="lz4 zstd"