8 files changed, 13 insertions, 99 deletions
diff --git a/dev-embedded/gputils/gputils-1.5.2.ebuild b/dev-embedded/gputils/gputils-1.5.2.ebuild
index 77d6dec680e1..92ff42022c4a 100644
--- a/dev-embedded/gputils/gputils-1.5.2.ebuild
+++ b/dev-embedded/gputils/gputils-1.5.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="doc"
 
 PATCHES=(
diff --git a/dev-embedded/sdcc/sdcc-4.2.0.ebuild b/dev-embedded/sdcc/sdcc-4.2.0.ebuild
index dc4655403f3d..291623b8d48a 100644
--- a/dev-embedded/sdcc/sdcc-4.2.0.ebuild
+++ b/dev-embedded/sdcc/sdcc-4.2.0.ebuild
@@ -14,7 +14,7 @@ else
 		doc? ( https://downloads.sourceforge.net/project/${PN}/sdcc-doc/${PV}/${PN}-doc-${PV}.tar.bz2 )
 	"
 
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 DESCRIPTION="Small device C compiler (for various microprocessors)"
diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass
index b81038237a6b..d808b7bd98b3 100644
--- a/eclass/ruby-ng.eclass
+++ b/eclass/ruby-ng.eclass
@@ -419,6 +419,13 @@ _ruby_each_implementation() {
 		use ruby_targets_${_ruby_implementation} || continue
 
 		RUBY=$(ruby_implementation_command ${_ruby_implementation})
+
+		if [[ -z ${RUBY} ]]; then
+			eerror "Failed to determine a path for \${RUBY} for USE=ruby_targets_${_ruby_implementation}:"
+			eerror " ruby_implementation_command returned an empty RUBY for ${_ruby_implementation}"
+			die "Could not find RUBY for ${_ruby_implementation}. Is $(_ruby_implementation_depend ${_ruby_implementation}) installed?"
+		fi
+
 		invoked=yes
 
 		if [[ -n "$1" ]]; then
diff --git a/media-sound/qmidiarp/qmidiarp-0.6.5.ebuild b/media-sound/qmidiarp/qmidiarp-0.6.5.ebuild
index 3f32bdbdb919..4a93ca1e850f 100644
--- a/media-sound/qmidiarp/qmidiarp-0.6.5.ebuild
+++ b/media-sound/qmidiarp/qmidiarp-0.6.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="lv2 nls osc"
 
 BDEPEND="
diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest
index 2fa336b25db1..f1822ee751ee 100644
--- a/net-mail/mu/Manifest
+++ b/net-mail/mu/Manifest
@@ -1,3 +1,2 @@
-DIST mu-1.10.1.tar.xz 569024 BLAKE2B 4be2a8461d146df7a2abd618c669972d5d1c97815ccaf2fec9bb8a10c682003726b3cd4ae1b8c84a5ae25889787f6f4d88537dd967d497a42f3f86ddf0376da6 SHA512 56f6389b85dde2bd2dec1de5edbb81dc87becbf814a42b3c0e431d8e9dc50d36d5b1006e0001f94360d3c8e7435e85913eb66d851b15f5f089becdd0522da58b
-DIST mu-1.8.13.tar.xz 543696 BLAKE2B 7e96040b12630d8dd1320475e8b7e62b7f349767d331237838e2dd092df51c4f94cf8605d1266d26f4d2fa9aa092ba03546ed21968448302c3a12495702e46bb SHA512 c9dd7564070191e251e8e072042c0d2957e9c9c31064aececf24b9dc99a9b51c6bd60138e88bd86f175365775e98ba49e3bdb5bea02f7738b5e1e68efd7e1a7c
+DIST mu-1.10.2.tar.xz 569692 BLAKE2B a75ad3d60806a5d336665b5dbc7d1f062928eff6fd2424651d3d85c4dd3134d1b4f912bd24120c14670dab49ef2e51056a0b130cc714edd0d56ab87bbdb7832b SHA512 2e8843846676c4f9ed9abb48bce8c52ffbfafcf1b7542c9f0663c2f5572c101871e935938f0406b284c6b78fb0fb190469d193151c5adbc50a10eea0edf76ccd
 DIST mu-1.8.14.tar.xz 543828 BLAKE2B d64e52a66f3b68a2d5b039eaff668c5ecf0da8b1e77719de49316cbe96bb9d34c3e4f8636cfd63cf473218ea6ec428f8c2be2d80c94d1b1456e4b7f17c5ab52c SHA512 8d5514cf08891180163e4d7caff7a3d75dd39a6397c0c8608a85b613f83a4f714f772400c2a057c1f9ef46dedd4f240828ced4e8a1b38ebe4340041059a3ad44
diff --git a/net-mail/mu/mu-1.10.1.ebuild b/net-mail/mu/mu-1.10.2.ebuild
index 2acec2e5ddb5..2acec2e5ddb5 100644
--- a/net-mail/mu/mu-1.10.1.ebuild
+++ b/net-mail/mu/mu-1.10.2.ebuild
diff --git a/net-mail/mu/mu-1.8.13.ebuild b/net-mail/mu/mu-1.8.13.ebuild
deleted file mode 100644
index 4a5365df91b8..000000000000
--- a/net-mail/mu/mu-1.8.13.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp-common meson
-
-DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
-HOMEPAGE="https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu"
-SRC_URI="https://github.com/djcb/mu/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~riscv x86 ~x64-macos"
-IUSE="emacs readline"
-
-DEPEND="
-	dev-libs/glib:2
-	dev-libs/gmime:3.0
-	>=dev-libs/xapian-1.4:=
-	emacs? ( >=app-editors/emacs-25.3:* )
-	readline? ( sys-libs/readline:= )"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	sys-apps/texinfo
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/mu-1.8.13-add-cstdint-inc.patch"
-)
-
-SITEFILE="70mu-gentoo-autoload.el"
-
-src_prepare() {
-	default
-
-	# Don't install NEWS.org into /usr/share/doc.
-	sed -i '/NEWS.org/,+1 d' meson.build || die
-	sed -i '/mu4e-about.org/d' mu4e/meson.build || die
-
-	# Don't compress the info file.
-	sed -i '/gzip/d' build-aux/meson-install-info.sh || die
-
-	# Instead, put it in /usr/share/doc/${PF}.
-	sed -i "/MU_DOC_DIR/s/mu/${PF}/" mu4e/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature readline)
-		-Demacs="$(usex emacs "${EMACS}" emacs-not-enabled)"
-		# NOTE: Guile interface is deprecated to be removed shortly.
-		-Dguile=disabled
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# Since meson no longer installs NEWS.org, install it with dodoc.
-	# Also, it must be uncompressed so that it can be viewed with
-	# mu4e-info.
-	docompress -x /usr/share/doc/${PF}/NEWS.org
-	dodoc NEWS.org
-
-	# Same as above.
-	docompress -x /usr/share/doc/${PF}/mu4e-about.org
-	dodoc mu4e/mu4e-about.org
-}
-
-pkg_preinst() {
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		elog "After upgrading from an old major version, you should"
-		elog "rebuild your mail index."
-	fi
-}
-
-pkg_postinst() {
-	if use emacs; then
-		einfo "To use mu4e you need to configure it in your .emacs file"
-		einfo "See the manual for more information:"
-		einfo "https://www.djcbsoftware.nl/code/mu/mu4e/"
-
-		elisp-site-regen
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r1.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r1.ebuild
index ddf176788218..786735ef4908 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r1.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/$
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cron fuse nls static-libs test +tools"
 RESTRICT="!test? ( test )"