diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index 827585ec4d182..14d3693844bb1 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -1,2 +1,3 @@
 DIST mosquitto-2.0.20.tar.gz 799972 BLAKE2B fe1445ff6e2a6869ca911dbc556a2ea3d8826ddfd7dc1c46d6c409a320e58cbae4a3c62f02e3cad96cd2d09d30acd8667e1be2cd197211ca80de2ba782b7c7dc SHA512 4c16ff0ad0e9c6fe5c65ec5a82bef123d9e6490f42658d646e1fad60f098530b7cbbd743460c52d4dec8bc27698c84a557bd539b35ac6c81444539822a544c4c
 DIST mosquitto-2.0.21.tar.gz 804168 BLAKE2B b8afd947dd05293e47d17e1f87186abd7e8719fdcf7e98b680e581bab3d8060e7d43b55421f9a477a797eb17c031523c8282e859f3ff216ded88e022f35e463e SHA512 3acc093ef709c3f0f9d837abbb9e39e4e4ed60488c6180e2da733d65b19107f607c1fb89592d39a14faea531c8689227232e7cb13f3f58cb5ee43dad317c7cd6
+DIST mosquitto-2.0.22.tar.gz 805967 BLAKE2B fb66fdc2513f954b8d207e326dbf9b69e8e89d9ac44894e89afea9278dbb99ffd1ee14cbdac5c1b7be71c1094df5a80887ef3eb0ca95211285e85c568dc8faee SHA512 5aae399b308d8262a758a72064c613bfd6930e1a54f34939e30454d988c65c9d7c4c139ed70a016baa1264a0100a0c842c00e843ffe3ef83f90be440403e7482
diff --git a/app-misc/mosquitto/mosquitto-2.0.22.ebuild b/app-misc/mosquitto/mosquitto-2.0.22.ebuild
new file mode 100644
index 0000000000000..adf71d495fade
--- /dev/null
+++ b/app-misc/mosquitto/mosquitto-2.0.22.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{11..14} )
+
+inherit eapi9-ver python-any-r1 systemd toolchain-funcs
+
+DESCRIPTION="An Open Source MQTT v3 Broker"
+HOMEPAGE="https://mosquitto.org/ https://github.com/eclipse/mosquitto"
+SRC_URI="https://mosquitto.org/files/source/${P}.tar.gz"
+
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+bridge examples +persistence +srv ssl systemd tcpd test websockets"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="test? ( bridge )"
+
+RDEPEND="
+	acct-user/mosquitto
+	acct-group/mosquitto
+	dev-libs/cJSON
+	srv? ( net-dns/c-ares:= )
+	ssl? (
+		dev-libs/openssl:0=
+	)
+	systemd? ( sys-apps/systemd:= )
+	tcpd? ( sys-apps/tcp-wrappers )
+	websockets? ( net-libs/libwebsockets[lejp] )
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-util/cunit )
+"
+BDEPEND="
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-python/psutil[${PYTHON_USEDEP}]')
+	)
+"
+
+python_check_deps() {
+	python_has_version -b "dev-python/psutil[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python_setup
+}
+
+_emake() {
+	local LIBDIR=$(get_libdir)
+	emake \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		CLIENT_LDFLAGS="${LDFLAGS}" \
+		LIB_SUFFIX="${LIBDIR:3}" \
+		WITH_BRIDGE="$(usex bridge)" \
+		WITH_PERSISTENCE="$(usex persistence)" \
+		WITH_SRV="$(usex srv)" \
+		WITH_SYSTEMD="$(usex systemd)" \
+		WITH_TLS="$(usex ssl)" \
+		WITH_WEBSOCKETS="$(usex websockets)" \
+		WITH_WRAP="$(usex tcpd)" \
+		"$@"
+}
+
+src_prepare() {
+	default
+	if use persistence; then
+		sed -i -e "/^#autosave_interval/s|^#||" \
+			-e "s|^#persistence false$|persistence true|" \
+			-e "/^#persistence_file/s|^#||" \
+			-e "s|#persistence_location|persistence_location /var/lib/mosquitto/|" \
+			mosquitto.conf || die
+	fi
+
+	# Remove failing tests
+	sed -i \
+		-e '/06-bridge-reconnect-local-out.py/d' \
+		test/broker/Makefile || die
+	sed -i \
+		-e '/02-subscribe-qos1-async2.test/d' \
+		test/lib/Makefile || die
+
+	# Extend test timeout to prevent spurious failures
+	sed -i -e 's/SUB_TIMEOUT=1/SUB_TIMEOUT=3/' \
+		test/client/test.sh || die
+
+	use test && python_fix_shebang test
+}
+
+src_compile() {
+	_emake
+}
+
+src_test() {
+	_emake test
+}
+
+src_install() {
+	_emake DESTDIR="${D}" prefix=/usr install
+	keepdir /var/lib/mosquitto
+	fowners mosquitto:mosquitto /var/lib/mosquitto
+	dodoc README.md CONTRIBUTING.md ChangeLog.txt
+	doinitd "${FILESDIR}"/mosquitto
+	insinto /etc/mosquitto
+	doins mosquitto.conf
+	insinto /usr/share/mosquitto
+	doins misc/letsencrypt/mosquitto-copy.sh
+	systemd_newunit "${FILESDIR}/mosquitto.notify.service" mosquitto.service
+
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+}
+
+pkg_postinst() {
+	if ver_replacing -lt 2; then
+		elog
+		elog "Please read the migration guide at:"
+		elog "https://mosquitto.org/documentation/migrating-to-2-0/"
+		elog
+		elog "If you use Lets Encrypt TLS certificates, take note of"
+		elog "the changes required to run the daemon as the unprivileged"
+		elog "mosquitto user. The mosquitto-copy.sh script has been"
+		elog "installed to /usr/share/mosquitto/ for your convenience."
+		elog
+	fi
+}
diff --git a/eclass/toolchain-funcs.eclass b/eclass/toolchain-funcs.eclass
index 1f3f958badee9..fa2820035cb7e 100644
--- a/eclass/toolchain-funcs.eclass
+++ b/eclass/toolchain-funcs.eclass
@@ -292,7 +292,7 @@ tc-tuple-is-softfloat() {
 			echo "yes" ;;
 		*-softfp-*)
 			echo "softfp" ;;
-		arm*-hardfloat-*|arm*eabihf)
+		arm*-hardfloat-*|arm*eabihf*)
 			echo "no" ;;
 		# bare-metal targets have their defaults. bug #666896
 		*-newlib|*-elf|*-eabi)
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index bcbdd1305cfa7..274789559d5ec 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -1596,7 +1596,7 @@ toolchain_src_configure() {
 			# If they've explicitly opt-ed in, do hardfloat,
 			# otherwise let the gcc default kick in.
 			case ${CTARGET//_/-} in
-				*-hardfloat-*|*eabihf)
+				*-hardfloat-*|*eabihf*)
 					confgcc+=( --with-float=hard )
 				;;
 			esac
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index ae0380ed3d8f8..c7d9a8835741f 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -1,5 +1,5 @@
 DIST postfix-3.10.2.tar.gz 5048137 BLAKE2B b75fec52e837d43e0fa5d6ede3f44ccc62144133a2c433f536c566362b20a6a9b8a8cbf8e11f64d84fa751311cc9451158cda0edc212a0e45a9097530f41cea4 SHA512 722a29613beae57caacbda1180c7882bfdfe7b948fd64acecbe704b0dbcd1989c59b73adfa6c686a51ad9d4c7a51650b7287b185515de2eaa1a6355127ca634f
 DIST postfix-3.10.3.tar.gz 5048719 BLAKE2B f21f5d7f05c93ac4f1286bbcecc7e54ec62bb75aa6c70c455c981e31a2c33a6da45e23bab6c1dbeb67f93ad03e505f89ea8d0f60abf9ce7b6da00f364d07eb62 SHA512 457f2d49c0845992b19601fb597422190f7506da5edd66eac1b0387e9adb339a65d3822205b1c4e9243d8f0a9a4108eb7cf11fba6b53f366934caf8cd489157c
-DIST postfix-3.11-20250709.tar.gz 5079306 BLAKE2B 15cfbf7b05ed5af02b3e2266600e9c50623d5909db9834b9eca90545414d069f53841f9afd1312e270f27982b53243a646ba56f34cb54d6d1262bdf0a414a9e5 SHA512 1088865458d53564e249cbb30fe216481012bf071483a3e6ce3cc2ea5b8e93f8aa9706087aedec0fec2d3a625e2fa880413617f3951895eeab095d93f4625e87
+DIST postfix-3.11-20250714.tar.gz 5084608 BLAKE2B 5720333b60f3a7455e3bef6541ae42fdaf8ddc3a92f78c8b0da5407436e31951d996d547bc84c4e270b42ec5b68835d472399fdb76e76c49e3db2328d84a759f SHA512 abc1c4d9e51cf85da3e0e2e3677b957b00c41291c27a12c2f1d43e70e3d8a86d4bf080694373d85be041e0fd43af96f859c56e72ef78f78d48d065c9121140d2
 DIST postfix-3.9.3.tar.gz 4956314 BLAKE2B 01d69092483f3894a54489c7455a4a1a0125e13b3e7675316ce0a34a193004c488a123c473d243f6b3ca6e288807a7251d165d64f0e448e198ebee6422e97851 SHA512 7539d81296da6d7d569a1f7ad0cee413a87e0293f09b5fbcc7d4b847dfbfba02c106a4d6be87c7443831fee1d0d6cc7fa152133dd784e960865afc240fda1946
 DIST postfix-3.9.4.tar.gz 4956598 BLAKE2B e26b41a1631babf81b1c1cc469f72fae4e0b2681f4aa48e48dd9feb69beab68c3d7dc9445ddd2e17b49effc2bf45cc23acdcea6a421b671938a17cbec6dd3082 SHA512 edea13b7ad468dc2550345f2e0b73df36ee7fa569b7e85bba99a06764c6794150c2fcd71fada53aea4ef91ffe120219500d550b428c1369abfa718a8ceb04846
diff --git a/mail-mta/postfix/postfix-3.11_pre20250709.ebuild b/mail-mta/postfix/postfix-3.11_pre20250714.ebuild
similarity index 100%
rename from mail-mta/postfix/postfix-3.11_pre20250709.ebuild
rename to mail-mta/postfix/postfix-3.11_pre20250714.ebuild