diff --git a/app-shells/antibody/antibody-6.1.1-r1.ebuild b/app-shells/antibody/antibody-6.1.1-r1.ebuild
index 70fdaf8f48..9c65147e79 100644
--- a/app-shells/antibody/antibody-6.1.1-r1.ebuild
+++ b/app-shells/antibody/antibody-6.1.1-r1.ebuild
@@ -52,11 +52,19 @@ SRC_URI="
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-vcs/git"
 
 PATCHES=( "${FILESDIR}/${PN}-6.1.1_remove-failing-tests.patch" )
 
+src_configure() {
+	if use test; then
+		GOFLAGS="${GOFLAGS/-buildmode=pie/-buildmode=exe}" # bug 893190
+	fi
+}
+
 src_compile() {
 	local -a mygoargs=(
 		-ldflags "-X main.version=${PV}"
diff --git a/net-misc/maestral-qt/Manifest b/net-misc/maestral-qt/Manifest
index 6d96b9989f..7f57eca638 100644
--- a/net-misc/maestral-qt/Manifest
+++ b/net-misc/maestral-qt/Manifest
@@ -1,3 +1,3 @@
 DIST maestral-qt-1.5.3.gh.tar.gz 1209467 BLAKE2B d810df1f7e21938b81565afb16049e385c5de1e295d64feeaa317966e139ddc76542a747db71ae76dc1c82a11ec7e266b69968cefa2839878941def4af7711f8 SHA512 fbc8723d6751e31504529a62f00f7becd4531d8613559edde2a4725bc0d5ac783e6c817814059489bead87923135462a871cdffd0f8d1f0f06481df20efde4f5
 DIST maestral-qt-1.6.5.gh.tar.gz 1217959 BLAKE2B fb57171e3b6ed286e03d143e0fbd7dba0eae69bd4402c271bd9897549d84f3b509f459577f0c44ba252bca6a9b651d70bd825565e2afdb86a97966a728803eaf SHA512 f34ca35fad1b1509a1cea605974c5f0ffb79763c2e6e6dcf68454246dd303d67274e1e46954270cd0d2eb171a427af2ef477cc19d0bb05634a3aeb593f69d7aa
-DIST maestral-qt-1.6.6_rc1.gh.tar.gz 1219500 BLAKE2B 221750f753f1e8dd58365823fb8aedfadf0ef59aadac700712e8637a18878769c90862a8ac406551e695f07dbfe7e212037d2b6ba8674b62e73c6e9d1c45d45d SHA512 adbf4efded4130d7d955409511389608d71b5171d0e5d64e04c391311bf94ff8c1c79e5934cd42d5fab168e081ac85ee8be31a6812c3c4903eb1b8b6bdefd018
+DIST maestral-qt-1.7.0_rc0.gh.tar.gz 1219498 BLAKE2B 854d70652aaeb53b83c5d984d2b9eb0158308fc7c3d6d191aa13db26bf9e01acdf4f4c29a03c886b14f3103813b47c821b0e421d1842a13cc9c36b487a08416e SHA512 12cbda6dc1f30a6438838667e531fd583e8374adccdf5212db915b2a29d27fc5897eda3ad1ed7166d9edb8a07a34960f71b9b8db5bf4094e4219c6035918c3f1
diff --git a/net-misc/maestral-qt/maestral-qt-1.6.6_rc1.ebuild b/net-misc/maestral-qt/maestral-qt-1.7.0_rc0.ebuild
similarity index 100%
rename from net-misc/maestral-qt/maestral-qt-1.6.6_rc1.ebuild
rename to net-misc/maestral-qt/maestral-qt-1.7.0_rc0.ebuild
diff --git a/net-misc/maestral/Manifest b/net-misc/maestral/Manifest
index 7d95b64280..6cac333709 100644
--- a/net-misc/maestral/Manifest
+++ b/net-misc/maestral/Manifest
@@ -1,3 +1,3 @@
 DIST maestral-1.5.3.gh.tar.gz 8280040 BLAKE2B dcda43880cea3fb00098b6bf87e43318a523a7c9d83886efff58be715cde17f67504b31735a006b951963e5cf0ef70b4b6431cb84200722cae186053a01edd63 SHA512 aa21277623f4e6f3283cd989be910eeb1caa3a842abca595b27a551c1c9bd1e7ef083e495ee0f096190accd91835939cb2f4a26624feae0046d8770d53aaac2f
 DIST maestral-1.6.5.gh.tar.gz 7983512 BLAKE2B b77cc7eb1a6089cc78e47680d99a53bc4c4752feed3970a57e67eefcf1ab2491c0b3aaebd2fb7caf6fc5420eef2e7fe8776e87047f82db7d1466a4c3d17beaf8 SHA512 ee182505b305dbd6730078ce71725eb75515fb5682889c5226c26a69d32f85ad28e335bcd65b57fd1624da8ecd8914df337a93f6b296d86dcc6e94d4f2747995
-DIST maestral-1.6.6_rc1.gh.tar.gz 7985890 BLAKE2B e83f63e7bb082bc494e4c3e865a04dede4b969a3f4fc093b714eac7663264d32c0ac9e56b0a7fdb1ffd18d0793c9f22be06145a0890ea4f53057391017bfb148 SHA512 e3ec2612a7dc496a81c6c33de9dc601ed4d78494b2d56652dab2cf2bd5f9dd93fcaea62475662fb7a419769be361f2e8cae67d3706fdbaef3de646e6a0071746
+DIST maestral-1.7.0_rc0.gh.tar.gz 7985893 BLAKE2B 1d3faa9c22f580c90ce0a436a686144ad97e546e5e3ba3aab5f80d8b378259e0e0c89adcd5ef8a789634d751b35496bca4a942d27d7ac24c6cabd190a46834f4 SHA512 a1d7426095bab47a89ed79f4b4c5e5d8848c65324822a3a4a56f482930b58c618ffbf913c6e99925c5ef093917a6d4c5abb52076a3f9122a984ea72a6cb0e8aa
diff --git a/net-misc/maestral/maestral-1.6.6_rc1.ebuild b/net-misc/maestral/maestral-1.7.0_rc0.ebuild
similarity index 100%
rename from net-misc/maestral/maestral-1.6.6_rc1.ebuild
rename to net-misc/maestral/maestral-1.7.0_rc0.ebuild
diff --git a/sys-devel/just/just-1.12.0.ebuild b/sys-devel/just/just-1.12.0.ebuild
index f3bf666242..89cf59ab73 100644
--- a/sys-devel/just/just-1.12.0.ebuild
+++ b/sys-devel/just/just-1.12.0.ebuild
@@ -116,7 +116,7 @@ CRATES="
 	${P}
 "
 
-inherit bash-completion-r1 cargo
+inherit bash-completion-r1 cargo toolchain-funcs
 
 DESCRIPTION="Just a command runner (with syntax inspired by 'make')"
 HOMEPAGE="
@@ -134,10 +134,14 @@ RESTRICT="mirror"
 QA_FLAGS_IGNORED="usr/bin/just"
 
 src_test() {
-        # $USER must be set or tests fail Bug #890889
-        export USER=portage
+	# $USER must be set or tests fail Bug #890889
+	export USER=portage
+	default
+}
 
-        default
+src_prepare() {
+	default
+	tc-export CC
 }
 
 src_install() {
diff --git a/sys-devel/just/just-1.13.0.ebuild b/sys-devel/just/just-1.13.0.ebuild
index 89e32e9062..ebcc0d1395 100644
--- a/sys-devel/just/just-1.13.0.ebuild
+++ b/sys-devel/just/just-1.13.0.ebuild
@@ -116,7 +116,7 @@ CRATES="
 	${P}
 "
 
-inherit bash-completion-r1 cargo
+inherit bash-completion-r1 cargo toolchain-funcs
 
 DESCRIPTION="Just a command runner (with syntax inspired by 'make')"
 HOMEPAGE="
@@ -134,10 +134,14 @@ RESTRICT="mirror"
 QA_FLAGS_IGNORED="usr/bin/just"
 
 src_test() {
-        # $USER must be set or tests fail Bug #890889
-        export USER=portage
+	# $USER must be set or tests fail Bug #890889
+	export USER=portage
+	default
+}
 
-        default
+src_prepare() {
+	default
+	tc-export CC
 }
 
 src_install() {
diff --git a/sys-power/linux-tools-power-x86/Manifest b/sys-power/linux-tools-power-x86/Manifest
index 907336dceb..db36dab303 100644
--- a/sys-power/linux-tools-power-x86/Manifest
+++ b/sys-power/linux-tools-power-x86/Manifest
@@ -1 +1,2 @@
 DIST linux-5.18.tar.xz 129790264 BLAKE2B e2745a69eb70169e90505a9318a3993046eab3020496eecde7d8352ecda0eb71a25b21becf7ce93fc593507dce7d1cd61b94ddcdf82b3094d79c0d3d48508eeb SHA512 dbbc9d1395898a498fa4947fceda1781344fa5d360240f753810daa4fa88e519833e2186c4e582a8f1836e6413e9e85f6563c7770523b704e8702d67622f98b5
+DIST linux-6.1.tar.xz 134728520 BLAKE2B ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e SHA512 6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68
diff --git a/sys-power/linux-tools-power-x86/files/linux-tools-power-x86-6.1-cflags.patch b/sys-power/linux-tools-power-x86/files/linux-tools-power-x86-6.1-cflags.patch
new file mode 100644
index 0000000000..d0072fe5dc
--- /dev/null
+++ b/sys-power/linux-tools-power-x86/files/linux-tools-power-x86-6.1-cflags.patch
@@ -0,0 +1,36 @@
+diff -urN a/tools/power/x86/intel-speed-select/Makefile b/tools/power/x86/intel-speed-select/Makefile
+--- a/tools/power/x86/intel-speed-select/Makefile	2022-12-11 17:15:18.000000000 -0500
++++ b/tools/power/x86/intel-speed-select/Makefile	2023-02-04 05:47:25.961523494 -0500
+@@ -13,7 +13,7 @@
+ # Do not use make's built-in rules
+ # (this improves performance and avoids hard-to-debug behaviour);
+ MAKEFLAGS += -r
+-override CFLAGS += -O2 -Wall -g -D_GNU_SOURCE -I$(OUTPUT)include -I/usr/include/libnl3
++override CFLAGS += -Wall -g -D_GNU_SOURCE -I$(OUTPUT)include -I/usr/include/libnl3
+ override LDFLAGS += -lnl-genl-3 -lnl-3
+ 
+ ALL_TARGETS := intel-speed-select
+diff -urN a/tools/power/x86/turbostat/Makefile b/tools/power/x86/turbostat/Makefile
+--- a/tools/power/x86/turbostat/Makefile	2022-12-11 17:15:18.000000000 -0500
++++ b/tools/power/x86/turbostat/Makefile	2023-02-04 05:49:01.960951027 -0500
+@@ -9,7 +9,7 @@
+ endif
+ 
+ turbostat : turbostat.c
+-override CFLAGS +=	-O2 -Wall -Wextra -I../../../include
++override CFLAGS +=	-Wall -Wextra -I../../../include
+ override CFLAGS +=	-DMSRHEADER='"../../../../arch/x86/include/asm/msr-index.h"'
+ override CFLAGS +=	-DINTEL_FAMILY_HEADER='"../../../../arch/x86/include/asm/intel-family.h"'
+ override CFLAGS +=	-D_FILE_OFFSET_BITS=64
+diff -urN a/tools/power/x86/x86_energy_perf_policy/Makefile b/tools/power/x86/x86_energy_perf_policy/Makefile
+--- a/tools/power/x86/x86_energy_perf_policy/Makefile	2022-12-11 17:15:18.000000000 -0500
++++ b/tools/power/x86/x86_energy_perf_policy/Makefile	2023-02-04 05:47:25.962523488 -0500
+@@ -9,7 +9,7 @@
+ endif
+ 
+ x86_energy_perf_policy : x86_energy_perf_policy.c
+-override CFLAGS +=	-O2 -Wall -I../../../include
++override CFLAGS +=	-Wall -I../../../include
+ override CFLAGS +=	-DMSRHEADER='"../../../../arch/x86/include/asm/msr-index.h"'
+ override CFLAGS +=	-D_FORTIFY_SOURCE=2
+ 
diff --git a/sys-power/linux-tools-power-x86/linux-tools-power-x86-5.18.ebuild b/sys-power/linux-tools-power-x86/linux-tools-power-x86-5.18.ebuild
index 65175d6110..9b6ab76853 100644
--- a/sys-power/linux-tools-power-x86/linux-tools-power-x86-5.18.ebuild
+++ b/sys-power/linux-tools-power-x86/linux-tools-power-x86-5.18.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit fcaps linux-info python-r1 toolchain-funcs
 
diff --git a/sys-power/linux-tools-power-x86/linux-tools-power-x86-6.1.ebuild b/sys-power/linux-tools-power-x86/linux-tools-power-x86-6.1.ebuild
new file mode 100644
index 0000000000..b915c39b7a
--- /dev/null
+++ b/sys-power/linux-tools-power-x86/linux-tools-power-x86-6.1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 2013-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit fcaps linux-info python-r1 toolchain-funcs
+
+DESCRIPTION="Linux x86 CPU power tools"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI="https://cdn.kernel.org/pub/linux/kernel/v${PV%%.*}.x/linux-${PV}.tar.xz"
+S="${WORKDIR}/linux-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0/0"
+KEYWORDS="~amd64"
+IUSE="pstate-tracer"
+
+CDEPEND="dev-libs/libnl:3"
+RDEPEND="
+	pstate-tracer? (
+		${PYTHON_DEPS}
+		dev-python/gnuplot-py[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		sci-visualization/gnuplot
+	)
+"
+DEPEND="
+	${CDEPEND}
+	virtual/os-headers
+"
+
+REQUIRED_USE="pstate-tracer? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=( "${FILESDIR}/${P}-cflags.patch" )
+FILECAPS=( 'cap_sys_rawio=ep' usr/bin/turbostat )
+
+pkg_setup() {
+	linux-info_pkg_setup
+	if linux_config_exists; then
+		CONFIG_CHECK_MODULES="CONFIG_X86_MSR" || ewarn "msr module is needed at runtime"
+	fi
+}
+
+src_configure() {
+	export bindir="${EPREFIX}/usr/bin"
+	export sbindir="${EPREFIX}/usr/sbin"
+	export mandir="${EPREFIX}/usr/share/man"
+	export includedir="${EPREFIX}/usr/include"
+	export libdir="${EPREFIX}/usr/$(get_libdir)"
+	export localedir="${EPREFIX}/usr/share/locale"
+	export docdir="${EPREFIX}/usr/share/doc/${PF}"
+	export confdir="${EPREFIX}/etc"
+	export bash_completion_dir="${EPREFIX}/usr/share/bash-completion/completions"
+	export V=1
+}
+
+src_compile() {
+	myemakeargs=(
+		AR="$(tc-getAR)"
+		CC="$(tc-getCC)"
+		LD="$(tc-getCC)"
+		VERSION=${PV}
+	)
+	emake -C tools/power/x86/intel-speed-select "${myemakeargs[@]}"
+	emake -C tools/power/x86/turbostat "${myemakeargs[@]}"
+	emake -C tools/power/x86/x86_energy_perf_policy "${myemakeargs[@]}"
+}
+
+src_install() {
+	pushd "${S}/tools/power/x86/intel-speed-select" || die
+	emake "${myemakeargs[@]}" DESTDIR="${D}" install
+	popd || die
+	pushd "${S}/tools/power/x86/turbostat" || die
+	emake "${myemakeargs[@]}" DESTDIR="${D}" install
+	popd || die
+	pushd "${S}/tools/power/x86/x86_energy_perf_policy" || die
+	emake "${myemakeargs[@]}" DESTDIR="${D}" install
+	popd || die
+
+	if use pstate-tracer; then
+		python_foreach_impl python_doscript tools/power/x86/intel_pstate_tracer/intel_pstate_tracer.py
+		python_foreach_impl python_doscript tools/power/x86/amd_pstate_tracer/amd_pstate_trace.py
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+}