diff --git a/app-shells/fzf-tab/Manifest b/app-shells/fzf-tab/Manifest
index 159ffd9e3c..a051eae8e9 100644
--- a/app-shells/fzf-tab/Manifest
+++ b/app-shells/fzf-tab/Manifest
@@ -1 +1,2 @@
 DIST fzf-tab-0_pre20220331.tar.gz 774324 BLAKE2B 59ef88380952dce19e615faf9317a2b71e414bc8320d47da94d62cdfbe9eed9485e002d55bc987f0bf77ace2c6ed3d875b6d7bd1e020db26f15df97b544da676 SHA512 3a350af319f5dbb4405988c7bf7372ca17710199000a6807e5d5dfdc5bf8d97b2e93c7a668f33c6341687aebc9115fff6fe3bd312d473a34db12de51dc5c703f
+DIST fzf-tab-0_pre20220815.tar.gz 774621 BLAKE2B d945b8a206505972fe23f9339c470386d8cdd3b71336372ccf5bf0599fc0569813bcd577e290323f803e9d99cbfc0c275941a4710ee8dfe45002271cbee89bf0 SHA512 0fa16dbcc755717ae3f7873b5a62da28d620493eaf679f74e5f77187a5253f7c0dab55fbcdfceb0fd895be5e080a773bc1a75670551fc3ef7755ce976fa94591
diff --git a/app-shells/fzf-tab/fzf-tab-0_pre20220331-r1.ebuild b/app-shells/fzf-tab/fzf-tab-0_pre20220331-r1.ebuild
index 4bf956b446..70a7566496 100644
--- a/app-shells/fzf-tab/fzf-tab-0_pre20220331-r1.ebuild
+++ b/app-shells/fzf-tab/fzf-tab-0_pre20220331-r1.ebuild
@@ -27,7 +27,7 @@ BDEPEND="
 	)
 "
 
-RESTRICT="!test? ( test )"
+RESTRICT="test" # bug 861638
 
 DISABLE_AUTOFORMATTING="true"
 DOC_CONTENTS="In order to use ${CATEGORY}/${PN} add
diff --git a/app-shells/fzf-tab/fzf-tab-0_pre20220815.ebuild b/app-shells/fzf-tab/fzf-tab-0_pre20220815.ebuild
new file mode 100644
index 0000000000..94aec83ca2
--- /dev/null
+++ b/app-shells/fzf-tab/fzf-tab-0_pre20220815.ebuild
@@ -0,0 +1,75 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit readme.gentoo-r1
+
+MY_COMMIT="938eef72e93ddb0609205a663bf0783f4e1b5fae"
+DESCRIPTION="Replace zsh's default completion selection menu with fzf"
+HOMEPAGE="https://github.com/Aloxaf/fzf-tab"
+SRC_URI="https://github.com/Aloxaf/fzf-tab/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="
+	app-shells/fzf
+	app-shells/zsh
+"
+BDEPEND="
+	test? (
+		app-shells/zsh
+		dev-vcs/git
+	)
+"
+
+RESTRICT="test" # bug 861638
+
+DISABLE_AUTOFORMATTING="true"
+DOC_CONTENTS="In order to use ${CATEGORY}/${PN} add
+. /usr/share/zsh/site-functions/${PN}.zsh
+to your ~/.zshrc after compinit, but before plugins which will wrap
+widgets, such as zsh-autosuggestions or fast-syntax-highlighting"
+
+src_configure() {
+	# Test fails if we modify FZF_TAB_HOME in place
+	sed -E "s|^(FZF_TAB_HOME=\"[^\"]+)\"$|\1/${PN}\"|" \
+		${PN}.zsh > ${PN}-patched.zsh || die "Modifying FZF_TAB_HOME failed"
+
+	pushd modules || die "Changing directory failed"
+	default_src_configure
+}
+
+src_compile() {
+	pushd modules || die "Changing directory failed"
+	default_src_compile
+}
+
+src_test() {
+	pushd test || die "Changing directory failed"
+	ZTST_verbose=1 zsh -f ./runtests.zsh fzftab.ztst || die "One or more tests failed"
+}
+
+src_install() {
+	local zsh_libdir="/usr/share/zsh/site-functions"
+
+	insinto ${zsh_libdir}
+	newins ${PN}{-patched,}.zsh
+
+	insinto ${zsh_libdir}/${PN}
+	doins -r lib
+
+	insinto ${zsh_libdir}/${PN}/modules/Src/aloxaf
+	doins modules/Src/aloxaf/fzftab.so
+
+	readme.gentoo_create_doc
+	einstalldocs
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/dev-util/odb/Manifest b/dev-util/odb/Manifest
new file mode 100644
index 0000000000..5ff705effd
--- /dev/null
+++ b/dev-util/odb/Manifest
@@ -0,0 +1 @@
+DIST odb-2.5.0-b.21+1.tar.gz 714030 BLAKE2B a2930cff43cb56e7ab42adddbeb5fc11d32f662cb9cda3d2e3199092de9f73b1bb0691da3aa7b010230d93ea56dce437c3d507a4cb311a25b4596f564f2ea8d6 SHA512 9d4d132d7c32e30e2be05da7210f19c45bcb214b592dd5bda45c6b1488044e56f61c16de65451646d0b1acffe65ba8b50c791fe0982887952e95ce97814bbef8
diff --git a/dev-util/odb/odb-2.5.0_beta21_p1.ebuild b/dev-util/odb/odb-2.5.0_beta21_p1.ebuild
new file mode 100644
index 0000000000..90a95eb7e0
--- /dev/null
+++ b/dev-util/odb/odb-2.5.0_beta21_p1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="${PN}-$(ver_cut 1-3)-b.$(ver_cut 5)+$(ver_cut 7)"
+
+inherit build2
+
+SRC_URI="https://pkg.cppget.org/1/beta/${PN}/${MY_P}.tar.gz"
+KEYWORDS='~amd64 ~x86'
+DESCRIPTION='ODB compiler and the ODB system documentation'
+HOMEPAGE='https://www.codesynthesis.com/products/odb/'
+LICENSE='GPL-3'
+
+SLOT='0'
+IUSE='test'
+RESTRICT='!test? ( test )'
+
+RDEPEND='=dev-cpp/libcutl-1.11.0*'
+
+BDEPEND="
+	=dev-cpp/libstudxml-1.1.0*
+	${RDEPEND}
+"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/typescript-language-server/Manifest b/dev-util/typescript-language-server/Manifest
index a065aba241..9a7736d763 100644
--- a/dev-util/typescript-language-server/Manifest
+++ b/dev-util/typescript-language-server/Manifest
@@ -1,4 +1,4 @@
-DIST typescript-language-server-1.1.2-deps.tar.xz 1496552 BLAKE2B 0edf2dd42d218c82ccb32eeb32a716f63dd5badd7b2235d44dd828e9ba49dc4704ea7d539f800efa70ebef7b89b9f5a02743824c7898f47169f99842b1046d59 SHA512 8b60500027ae7ca056c7bb8012ec5d5adf2c210e446eda3ccedacc7a88471417e7b837e6ca15480e9ae54a1fd3b52b83d22c5f868b8c53deabcd52fe523e581d
-DIST typescript-language-server-1.1.2.tgz 122199 BLAKE2B bc7e22de39627df7d7b88113c7639170e809b875b7105e1e8b3ff17f7c871d78b4ab0bc344187c991e193700dd81583d895e4c8a9a378a465f4c139b8841e87b SHA512 8107f8a7716f28aa52842c19725221edbdd5b669ae304b6eaf5c4fcfaa531fe8a56b0de35029ab72f2d4e73cf9f7ff511c11e474fe97ad1ea9f51750f0afbc29
 DIST typescript-language-server-1.2.0-deps.tar.xz 1517048 BLAKE2B c50f025be2fa5ec5c3b792e05da21f6c785e6e25b6f6aac72c6d3da511f176f6aed780da1d457cfbc0570f7f68ca90ea515ec2df155cfee4c953f5257daa67bd SHA512 4ff12fa5f6f0cb4bf15b9e51218579660997b122c38cfa80a895d44cd7c16aa12e9cb7ec2562d8285e941150886b6396934f562ea9e6e2e9f11bb2c8a35839c5
 DIST typescript-language-server-1.2.0.tgz 141254 BLAKE2B bed5d6f8098daee226ac92f10c334a8ddacaaff20cee43c3ca922b3df29b99795c46fb767ba018d1495c0c1ed26ccc711bce40efdda8a43e6d9df136a15183ce SHA512 021c64a3874a80e63fa464cc773795c3f3532190b8cf7dcea84b3bc65477544577e88657d7639f27cbb05d26e64c9942875410d76769420c14b8dbd27db581e3
+DIST typescript-language-server-2.0.0-deps.tar.xz 1530024 BLAKE2B e595d969daddf565cf2d3da556a19db2a08f43acc9db6bdeb419928181e777448bfcba6e04bcd9c6291c86adefe4196db82a44f2cce9c4bfe962e8817480890b SHA512 f16f2cb7fedf185255109bfa3556e86c4c7997423fbed09501003c7d448b49980e5296707febbae2af7595e40de40e7771387a1666e0f0276f6861de2e0ddc64
+DIST typescript-language-server-2.0.0.tgz 148251 BLAKE2B c7fcdc11b552e0d2850d4f8fff429fb2257a926a9e03e467cc9a67ad1d01f6d331f02dd2811d511719282f9356d53dcdc78989c8433acdf1474b4ef6cd96c008 SHA512 c01577892b76e3df1697ac0ca330910f23eb2f42ac16db61bd8a95677245472ade04697111eddb7cad9b9cb4b0b51c18019b8ef67d6ba22fcd367f78ad3e58fb
diff --git a/dev-util/typescript-language-server/typescript-language-server-1.1.2.ebuild b/dev-util/typescript-language-server/typescript-language-server-2.0.0.ebuild
similarity index 93%
rename from dev-util/typescript-language-server/typescript-language-server-1.1.2.ebuild
rename to dev-util/typescript-language-server/typescript-language-server-2.0.0.ebuild
index ee1519addc..b003618498 100644
--- a/dev-util/typescript-language-server/typescript-language-server-1.1.2.ebuild
+++ b/dev-util/typescript-language-server/typescript-language-server-2.0.0.ebuild
@@ -41,5 +41,6 @@ src_install() {
 		--cache "${T}"/npm-cache \
 		install "${DISTDIR}"/${P}.tgz || die "npm install failed"
 
+	cd "${ED}"/usr/$(get_libdir)/node_modules/${PN} || die "cd failed"
 	einstalldocs
 }
diff --git a/net-im/go-sendxmpp/Manifest b/net-im/go-sendxmpp/Manifest
index 34e421da6b..c768c91d8e 100644
--- a/net-im/go-sendxmpp/Manifest
+++ b/net-im/go-sendxmpp/Manifest
@@ -1,4 +1,4 @@
-DIST go-sendxmpp-0.5.0-vendor.tar.xz 1237388 BLAKE2B 5708f68dee789353df9b9c0aabfc5182239831f74fd4a8e5572137a67c217580e515e3d32c776f1a85edd5259ac7e17482ca68ef9d33c278b08cc6cf0796c9f9 SHA512 38b390ca8806f52a963a14886d7a7a854ab43763b67715dae0f41e832d822a7191fa4a5a344e664ee060d86de3f192ef7822712b3d412aca837da3ddbdc264d0
-DIST go-sendxmpp-0.5.0.tar.bz2 26529 BLAKE2B 7240ead295ea694f3ff7ccbfff978b808ebfcbdcde9f81f98cac4cec548cbc4ad537e56eb7eaa937822397d9933b6b57a12269ff8a344ed327d6ab8545f3fa00 SHA512 45230b5b742e5476ac067d5671fd6c18bfdb2435c65b34b6ef180f74e6123f61fa8097957c05eadf4311a38a96e78446a653d26e1d534bdec4cedff8fd7df329
 DIST go-sendxmpp-0.5.1-vendor.tar.xz 1237104 BLAKE2B 76896da8365f3213518fc6fee4000216ceebbd56690ccb0234c274df2bba9387d8e4bb7c28213edb71df24efeaf94508a6c965b6891de643bc5207315dad61ac SHA512 91e97e060fc4f139e5c95281e0c32325bea4e52509de26b6cec2b43001143167af67c8661fca43cb81a527f5e6d51ea0474375fd5865518f144d3a19d4cbd0a9
 DIST go-sendxmpp-0.5.1.tar.bz2 26585 BLAKE2B 7a016b867cb5ece929fcab9aa2d828c53e1d113082ca3626637f7d8fedf14df456b01910c815dddaee66f13f3a36fa2c828873d1745af204c08e894754315c0e SHA512 470f54ef32946f22914af23b96327e30cb6f6bb4b7d76a955b8512ac818973d77babba6421b1e55a3fa80c9094734dc7ab612ff36e8bad97afc8c45814b97fa9
+DIST go-sendxmpp-0.5.2-vendor.tar.xz 1353640 BLAKE2B 6b87bf1a46f097c76767127f956d55dccb6a906d1e3fd7767ee24778a497a2c6a3d668b537c912a9707f9d325c8c98b310b4bdde741499ab78925df03c08cfb0 SHA512 6cbe286d93e9daa5b6653e7657eb1ebc5a9a71400928007c1c40505ecf8330c7b2f0cee1d1f0af55c3b93046ca36b1aa150412ca00fcf9b246212cda9c803749
+DIST go-sendxmpp-0.5.2.tar.bz2 28357 BLAKE2B 737d8c78cdb6834abdbf3b923ab694f008a35b9f2abd8156592e82a7e9e6c17930cd6d12f783a3d44b6f107743a1c70cdccb0db7498686d1fc727cea34e8b7e0 SHA512 61f7d879d530da241e4ed0697df5461bc7829017a233d8133ac4545bc48227ea60d451886ef1ae15939eda6bc6948d9aab0d7dfbc26a40ca6e13104e272bab6e
diff --git a/net-im/go-sendxmpp/go-sendxmpp-0.5.0.ebuild b/net-im/go-sendxmpp/go-sendxmpp-0.5.2.ebuild
similarity index 88%
rename from net-im/go-sendxmpp/go-sendxmpp-0.5.0.ebuild
rename to net-im/go-sendxmpp/go-sendxmpp-0.5.2.ebuild
index 95a653bb17..bea4ccb3b4 100644
--- a/net-im/go-sendxmpp/go-sendxmpp-0.5.0.ebuild
+++ b/net-im/go-sendxmpp/go-sendxmpp-0.5.2.ebuild
@@ -13,15 +13,12 @@ SRC_URI="
 "
 S="${WORKDIR}/${PN}-v${PV}"
 
-LICENSE="BSD-2 BSD MIT"
+LICENSE="BSD-2 BSD MIT MIT-with-advertising"
 SLOT="0"
 KEYWORDS="~amd64"
 
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
 src_compile() {
-	ego build
+	ego build -buildmode=pie
 }
 
 src_install() {
diff --git a/sys-cluster/neutron/neutron-20.0.0.ebuild b/sys-cluster/neutron/neutron-20.0.0.ebuild
index 7364e65c33..266f8d742a 100644
--- a/sys-cluster/neutron/neutron-20.0.0.ebuild
+++ b/sys-cluster/neutron/neutron-20.0.0.ebuild
@@ -160,7 +160,7 @@ python_install_all() {
 	newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent"
 	newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd" "neutron-linuxbridge-agent"
 
-	for svc in {dhcp,l3,linuxbridge,metadata,metering}_agent {linuxbridge,netns,ovs}_cleanup server ; do
+	for svc in {dhcp,l3,linuxbridge,metadata,metering}-agent {linuxbridge,netns,ovs}-cleanup server ; do
 		systemd_dounit "${FILESDIR}/openstack-neutron-${svc}.service"
 	done
 
diff --git a/sys-fs/ddrescueview/ddrescueview-0.4.5.ebuild b/sys-fs/ddrescueview/ddrescueview-0.4.5.ebuild
index 6b4771b539..4bb32ac07d 100644
--- a/sys-fs/ddrescueview/ddrescueview-0.4.5.ebuild
+++ b/sys-fs/ddrescueview/ddrescueview-0.4.5.ebuild
@@ -37,7 +37,6 @@ src_compile() {
 
 src_install() {
 	dobin source/ddrescueview
-	chmod +x "${D}/usr/bin/ddrescueview"
 
 	insinto /usr/share
 	doins -r resources/linux/applications