diff --git a/dev-cpp/scitokens-cpp/Manifest b/dev-cpp/scitokens-cpp/Manifest
index c935ffbbef..76d04dd3cd 100644
--- a/dev-cpp/scitokens-cpp/Manifest
+++ b/dev-cpp/scitokens-cpp/Manifest
@@ -1 +1,2 @@
 DIST scitokens-cpp-0.7.0.tar.gz 98971 BLAKE2B 3429ff89b5a5202f9892fc68fc558c8b64276977a396981af845f05f8eb3f638602cedd30ea97f3ab5e6d188de7249247854dd6281aeb138d6e304b5aa006bb9 SHA512 1be8a84b7d88c10ab7336c3c6bc8d7e7be5feb3253ef618cba1f3ed908aad3fc480f30dd2a292aa2774ec88ceba370af3fa7d96f228cba3df8f78b6face6991b
+DIST scitokens-cpp-0.7.1.tar.gz 99411 BLAKE2B b89c63ad35105a064e6f8ecd7596ba51de43096828a756b7c64669a352784c56bcb9295638f173cdbeac833e9dfc14828daf775d60a6cd124abf639125cf5842 SHA512 5c73fcccfb2db92916caced118e2ab4e110f7a8331a9bd84d06bd059da5258d7e8423822356e1833bbce7b047d7f31e2cd20cf4c0eb064dc2d248d9febab35b5
diff --git a/dev-cpp/scitokens-cpp/files/scitokens-cpp-0.7.1-fix-external-gtest.patch b/dev-cpp/scitokens-cpp/files/scitokens-cpp-0.7.1-fix-external-gtest.patch
new file mode 100644
index 0000000000..91a508c0d0
--- /dev/null
+++ b/dev-cpp/scitokens-cpp/files/scitokens-cpp-0.7.1-fix-external-gtest.patch
@@ -0,0 +1,18 @@
+Bug: https://github.com/scitokens/scitokens-cpp/pull/89
+Bug: https://github.com/scitokens/scitokens-cpp/pull/90
+
+diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
+index 22f86a6..2083bff 100644
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -1,6 +1,8 @@
+ 
+ add_executable(scitokens-gtest main.cpp)
+-add_dependencies(scitokens-gtest gtest)
++if( NOT SCITOKENS_EXTERNAL_GTEST )
++    add_dependencies(scitokens-gtest gtest)
++    include_directories("${PROJECT_SOURCE_DIR}/vendor/gtest/googletest/include")
++endif()
+-include_directories("${PROJECT_SOURCE_DIR}/vendor/gtest/googletest/include")
+ 
+ if(SCITOKENS_EXTERNAL_GTEST)
diff --git a/dev-cpp/scitokens-cpp/scitokens-cpp-0.7.1.ebuild b/dev-cpp/scitokens-cpp/scitokens-cpp-0.7.1.ebuild
new file mode 100644
index 0000000000..5d3e16ae92
--- /dev/null
+++ b/dev-cpp/scitokens-cpp/scitokens-cpp-0.7.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/scitokens/scitokens-cpp"
+else
+	SRC_URI="https://github.com/scitokens/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION=" A C++ implementation of the SciTokens library with a C library interface"
+HOMEPAGE="https://scitokens.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+DEPEND="${RDEPEND}
+	<dev-cpp/jwt-cpp-0.5.0
+	dev-db/sqlite
+	dev-libs/openssl
+	net-misc/curl
+	sys-apps/util-linux
+	test? ( dev-cpp/gtest )"
+BDEPEND="virtual/pkgconfig"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/"${PN}"-0.7.1-fix-external-gtest.patch
+)
+
+src_prepare() {
+	# Unbundle dev-cpp/gtest, dev-cpp/jwt-cpp
+	rm -rvf vendor
+	# Fix include path for picojson.
+	find src/ \( -name '*.cpp' -o -name '*.h' \) -type f -print0 | xargs -0 sed -r -e "s:picojson/picojson\.h:picojson.h:g" -i || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+			-DSCITOKENS_BUILD_UNITTESTS="$(usex test)"
+			-DSCITOKENS_EXTERNAL_GTEST=YES
+			)
+	cmake_src_configure
+}
+
+src_test() {
+	cmake_run_in "${BUILD_DIR}" ctest --verbose || die
+}
diff --git a/net-p2p/bisq/Manifest b/net-p2p/bisq/Manifest
index 3861bda31f..6b46d2e9ea 100644
--- a/net-p2p/bisq/Manifest
+++ b/net-p2p/bisq/Manifest
@@ -1 +1 @@
-DIST Bisq-64bit-1.9.1.deb 200403760 BLAKE2B 56b2326f87d89bad739ea475f4e096755be051c185a4899bb8f84c8f84ada182ffa7d0f00ec32f72647cd6698305ecc749975186bc2d5c04f2ca6fb1086da50e SHA512 883e65b145f6b96328e0e9e8fd4d8eb3d4d7f209ce5085c08e5b27278f04502559bec8b04a792c68bb7cb803c7db2a244c72ef854d27244a2986324fbc42b586
+DIST Bisq-64bit-1.9.2.deb 203432688 BLAKE2B 45fdd948b8c3826a0664926f82ff35f3cef56a3533c23ab5d8af3832ef7c2766c704dee8d5d989e37d029d4591b3f40ca27a8680d60dad6d268f2d91f9205ed0 SHA512 82c6061f5a37d3f52d3602253f1b770c75fa4b6600b6072051de6bbb9f9d2d0733856f44666c49fc50b2f266abf9783add946c9bd2cb21246246189836b31e3a
diff --git a/net-p2p/bisq/bisq-1.9.1.ebuild b/net-p2p/bisq/bisq-1.9.2.ebuild
similarity index 100%
rename from net-p2p/bisq/bisq-1.9.1.ebuild
rename to net-p2p/bisq/bisq-1.9.2.ebuild
diff --git a/sci-electronics/kactus2/kactus2-3.10.0.ebuild b/sci-electronics/kactus2/kactus2-3.10.0.ebuild
index f8dd19778a..5ac2c48777 100644
--- a/sci-electronics/kactus2/kactus2-3.10.0.ebuild
+++ b/sci-electronics/kactus2/kactus2-3.10.0.ebuild
@@ -41,11 +41,12 @@ DEPEND="
 	${RDEPEND}
 "
 
-QA_PRESTRIPPED="usr/share/kactus2/plugins/*"
-
 src_prepare() {
 	default
-
+	# Fix QA pre-stripped warnings, bug 781674
+	while IFS= read -r -d '' i; do
+		echo "CONFIG+=nostrip" >> "${i}" || die
+	done < <(find . -type f '(' -name "*.pro" ')' -print0)
 	# Fix QTBIN_PATH
 	sed -i -e "s|QTBIN_PATH=.*|QTBIN_PATH=\"$(qt5_get_bindir)/\"|" configure || die
 }
diff --git a/sci-electronics/kactus2/kactus2-9999.ebuild b/sci-electronics/kactus2/kactus2-9999.ebuild
index f8dd19778a..5ac2c48777 100644
--- a/sci-electronics/kactus2/kactus2-9999.ebuild
+++ b/sci-electronics/kactus2/kactus2-9999.ebuild
@@ -41,11 +41,12 @@ DEPEND="
 	${RDEPEND}
 "
 
-QA_PRESTRIPPED="usr/share/kactus2/plugins/*"
-
 src_prepare() {
 	default
-
+	# Fix QA pre-stripped warnings, bug 781674
+	while IFS= read -r -d '' i; do
+		echo "CONFIG+=nostrip" >> "${i}" || die
+	done < <(find . -type f '(' -name "*.pro" ')' -print0)
 	# Fix QTBIN_PATH
 	sed -i -e "s|QTBIN_PATH=.*|QTBIN_PATH=\"$(qt5_get_bindir)/\"|" configure || die
 }
diff --git a/sys-devel/qbe/Manifest b/sys-devel/qbe/Manifest
new file mode 100644
index 0000000000..fd1f19c3fe
--- /dev/null
+++ b/sys-devel/qbe/Manifest
@@ -0,0 +1 @@
+DIST qbe-1.0.tar.xz 237756 BLAKE2B ca6e1ee81f7329a8aee1f4597de391dcc44595fb8371468360fbcf1a5fc9fa404c614d49e4668fba568fa8d11e753d10b4c46380884fa635a56331b059b69abd SHA512 7f53d4440fda36b21dbf390aa8b9c17ae7c137a6e034dd73ca1c2068d84dbe236a452d86cab8d8bce0b3d66c3f08e70f2bf54bc7cc2e93208cc1900014c18ad1
diff --git a/sys-devel/qbe/qbe-1.0.ebuild b/sys-devel/qbe/qbe-1.0.ebuild
new file mode 100644
index 0000000000..f493d7680b
--- /dev/null
+++ b/sys-devel/qbe/qbe-1.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://c9x.me/qbe.git"
+else
+	SRC_URI="https://c9x.me/compile/release/${P}.tar.xz"
+fi
+
+DESCRIPTION="Pure-C embeddable compiler backend"
+HOMEPAGE="https://c9x.me/compile/"
+LICENSE="MIT"
+SLOT="0"
+
+src_install() {
+	PREFIX=/usr default
+}
diff --git a/sys-devel/qbe/qbe-9999.ebuild b/sys-devel/qbe/qbe-9999.ebuild
index b1d9485606..f493d7680b 100644
--- a/sys-devel/qbe/qbe-9999.ebuild
+++ b/sys-devel/qbe/qbe-9999.ebuild
@@ -3,11 +3,15 @@
 
 EAPI=7
 
-inherit git-r3
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://c9x.me/qbe.git"
+else
+	SRC_URI="https://c9x.me/compile/release/${P}.tar.xz"
+fi
 
 DESCRIPTION="Pure-C embeddable compiler backend"
 HOMEPAGE="https://c9x.me/compile/"
-EGIT_REPO_URI="git://c9x.me/qbe.git"
 LICENSE="MIT"
 SLOT="0"