diff --git a/dev-cpp/scitokens-cpp/Manifest b/dev-cpp/scitokens-cpp/Manifest
index 76d04dd3cd..56804bd766 100644
--- a/dev-cpp/scitokens-cpp/Manifest
+++ b/dev-cpp/scitokens-cpp/Manifest
@@ -1,2 +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
+DIST scitokens-cpp-0.7.2.tar.gz 99557 BLAKE2B 93b5a4e331004b8bcec9b9ad931d5de2bb5ecd69dc75b4100261110aa0488f4b4616e085235dc8703f492bb80cce2d7a8e90824c32f11d9db6dec65e2be87d1f SHA512 40e4bd8b14e040f748e8b7c00a32f26028b502d293c8d4ed77f20294fe7356a991d9d0a449731cde28a90556aeefd42e4ca63ec882b94697abeef2483544451c
diff --git a/dev-cpp/scitokens-cpp/files/scitokens-cpp-0.7.0-install-when-testing.patch b/dev-cpp/scitokens-cpp/files/scitokens-cpp-0.7.0-install-when-testing.patch
deleted file mode 100644
index c2b5008109..0000000000
--- a/dev-cpp/scitokens-cpp/files/scitokens-cpp-0.7.0-install-when-testing.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Bug: https://github.com/scitokens/scitokens-cpp/issues/82
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ec5c878..611afb1 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -81,13 +81,12 @@ endif()
- enable_testing()
- add_subdirectory(test)
- 
--else()
-+endif()
- get_directory_property(TARGETS BUILDSYSTEM_TARGETS)
- install(
-   TARGETS ${TARGETS} 
-   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} )
--endif()
- 
- install(
-   FILES src/scitokens.h
diff --git a/dev-cpp/scitokens-cpp/scitokens-cpp-0.7.0.ebuild b/dev-cpp/scitokens-cpp/scitokens-cpp-0.7.2.ebuild
similarity index 89%
rename from dev-cpp/scitokens-cpp/scitokens-cpp-0.7.0.ebuild
rename to dev-cpp/scitokens-cpp/scitokens-cpp-0.7.2.ebuild
index 59eac5e9b4..5d3e16ae92 100644
--- a/dev-cpp/scitokens-cpp/scitokens-cpp-0.7.0.ebuild
+++ b/dev-cpp/scitokens-cpp/scitokens-cpp-0.7.2.ebuild
@@ -31,7 +31,7 @@ BDEPEND="virtual/pkgconfig"
 RESTRICT="!test? ( test )"
 
 PATCHES=(
-	"${FILESDIR}"/"${PN}"-0.7.0-install-when-testing.patch
+	"${FILESDIR}"/"${PN}"-0.7.1-fix-external-gtest.patch
 )
 
 src_prepare() {
@@ -44,8 +44,8 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-			-DBUILD_UNITTESTS="$(usex test)"
-			-DEXTERNAL_GTEST=YES
+			-DSCITOKENS_BUILD_UNITTESTS="$(usex test)"
+			-DSCITOKENS_EXTERNAL_GTEST=YES
 			)
 	cmake_src_configure
 }
diff --git a/dev-libs/unordered_dense/Manifest b/dev-libs/unordered_dense/Manifest
new file mode 100644
index 0000000000..ad9aa17eaa
--- /dev/null
+++ b/dev-libs/unordered_dense/Manifest
@@ -0,0 +1 @@
+DIST unordered_dense-2.0.0.tar.gz 307275 BLAKE2B d579740134a8e67e8487c1d6779bc5ea2bf0b3ab70ce60f3b8b68d1fdabc9b45a099e49500b417f21a3fc4c88d2aadbf96afa7b56a8d7d581a0d3f3f6badf61b SHA512 8c7d582abd2142310b50d835ce3cb9a0731a6f7bc6419d01742860cbcb0ade31aad393c93523b8ff82ce456f6cbab5a3d93f91f95c8eb5f7f960fa4793f57d8d
diff --git a/dev-libs/unordered_dense/metadata.xml b/dev-libs/unordered_dense/metadata.xml
new file mode 100644
index 0000000000..552890653e
--- /dev/null
+++ b/dev-libs/unordered_dense/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>vowstar@gmail.com</email>
+		<name>Huang Rui</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">martinus/unordered_dense</remote-id>
+	</upstream>
+	<longdescription lang="en">
+		A fast and densely stored hashmap and hashset based on robin-hood
+		backward shift deletion.
+		The classes ankerl::unordered_dense::map and
+		ankerl::unordered_dense::set are (almost) drop-in replacements of
+		std::unordered_map and std::unordered_set. While they don't have as
+		strong iterator / reference stability guaranties, they are typically
+		much faster.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-libs/unordered_dense/unordered_dense-2.0.0.ebuild b/dev-libs/unordered_dense/unordered_dense-2.0.0.ebuild
new file mode 100644
index 0000000000..96d0837dec
--- /dev/null
+++ b/dev-libs/unordered_dense/unordered_dense-2.0.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit cmake
+
+DESCRIPTION="A fast and densely stored hashmap and hashset"
+HOMEPAGE="https://github.com/martinus/unordered_dense"
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/martinus/${PN}.git"
+else
+	SRC_URI="https://github.com/martinus/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+	S="${WORKDIR}/${P}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=""
+
+DEPEND="
+	${RDEPEND}
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-D CMAKE_INSTALL_LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+		-D BUILD_SHARED_LIBS=ON
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	# fix cmake module file install path
+	mkdir -p "${D}"/usr/"$(get_libdir)"/cmake/"${PN}" || die
+	mv "${D}"/usr/share/${PN}/cmake/* "${D}"/usr/"$(get_libdir)"/cmake/"${PN}"/ || die
+	rm -r "${D}"/usr/share/${PN} || die
+}
diff --git a/dev-libs/unordered_dense/unordered_dense-9999.ebuild b/dev-libs/unordered_dense/unordered_dense-9999.ebuild
new file mode 100644
index 0000000000..96d0837dec
--- /dev/null
+++ b/dev-libs/unordered_dense/unordered_dense-9999.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit cmake
+
+DESCRIPTION="A fast and densely stored hashmap and hashset"
+HOMEPAGE="https://github.com/martinus/unordered_dense"
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/martinus/${PN}.git"
+else
+	SRC_URI="https://github.com/martinus/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+	S="${WORKDIR}/${P}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=""
+
+DEPEND="
+	${RDEPEND}
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-D CMAKE_INSTALL_LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+		-D BUILD_SHARED_LIBS=ON
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	# fix cmake module file install path
+	mkdir -p "${D}"/usr/"$(get_libdir)"/cmake/"${PN}" || die
+	mv "${D}"/usr/share/${PN}/cmake/* "${D}"/usr/"$(get_libdir)"/cmake/"${PN}"/ || die
+	rm -r "${D}"/usr/share/${PN} || die
+}
diff --git a/games-misc/varlpenis/varlpenis-3.0.2.ebuild b/games-misc/varlpenis/varlpenis-3.0.2.ebuild
new file mode 100644
index 0000000000..05ba2f782a
--- /dev/null
+++ b/games-misc/varlpenis/varlpenis-3.0.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit git-r3
+
+DESCRIPTION="Generates ASCII-art penis of arbitrary length"
+HOMEPAGE="https://gitlab.com/ssterling/varlpenis"
+EGIT_REPO_URI="https://gitlab.com/ssterling/varlpenis.git https://github.com/ssterling/varlpenis.git"
+EGIT_COMMIT="v${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+
+BDEPEND="sys-devel/bmake"
+
+src_configure() {
+	local myconf
+	econf --ignore-invalid-arguments \
+		--use-color-ansi \
+		--use-posixtime \
+		--use-fullwidth \
+		${myconf}
+}
+
+src_compile() {
+	bmake varlpenis
+}
+
+src_install() {
+	bmake DESTDIR="${D}" install
+	dodoc BUGS.md
+	dodoc CHANGELOG.md
+	dodoc README.md
+}
diff --git a/media-sound/spotify_dl/spotify_dl-8.5.0.ebuild b/media-sound/spotify_dl/spotify_dl-8.5.0.ebuild
index 2afa04e1fe..f9b617f0c1 100644
--- a/media-sound/spotify_dl/spotify_dl-8.5.0.ebuild
+++ b/media-sound/spotify_dl/spotify_dl-8.5.0.ebuild
@@ -4,6 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517=setuptools
 
 inherit distutils-r1
 
diff --git a/www-servers/hinsightd/Manifest b/www-servers/hinsightd/Manifest
index a5e73193f7..43b5b9b6f7 100644
--- a/www-servers/hinsightd/Manifest
+++ b/www-servers/hinsightd/Manifest
@@ -1 +1 @@
-DIST hin9-4843c07f40c4ed6ea7b5945b73fa999fb7881564.tar.gz 116931 BLAKE2B c2d2af2b14e465b38dd7c19d0eece7b745b2686ab786b2f6266ac70fd5a94fca2d7da37b672fffcfcdfac9b8940d47089adf04b81a9542e0e52d6d324afc62c8 SHA512 26ec3e1468ba354af4d0a5eb0540fdb80810713700f63ce1fb32c68682b3a39463bc950eee8b1dd7ca103d5623ce3f385b925cc7408a23bdda802adddbb3e2cc
+DIST hin9-v0.9.16.tar.gz 121567 BLAKE2B 418856248b7ed36542be06dda342b4abc2ae971f4097c669239806b8df8dfc4a24a9fd80aa45c4bd1b77146f60a51e239b1d3fb69c6cfc59c3b1e83ea8578a0c SHA512 22dc98187d8ed0a4930225f977a9ba19ded516f5c05a96768d93f04b9433a227648b4a89a88d357b8f60d27093b389d6d70f1cf67c1b436498ca18b10b8c6fd9
diff --git a/www-servers/hinsightd/hinsightd-0.9.15_p20220828.ebuild b/www-servers/hinsightd/hinsightd-0.9.16.ebuild
similarity index 97%
rename from www-servers/hinsightd/hinsightd-0.9.15_p20220828.ebuild
rename to www-servers/hinsightd/hinsightd-0.9.16.ebuild
index b536211536..2f6e9c8e98 100644
--- a/www-servers/hinsightd/hinsightd-0.9.15_p20220828.ebuild
+++ b/www-servers/hinsightd/hinsightd-0.9.16.ebuild
@@ -12,8 +12,6 @@ HOMEPAGE="https://tiotags.gitlab.io/hinsightd"
 LICENSE="BSD"
 SLOT="0"
 
-mycommit="4843c07f40c4ed6ea7b5945b73fa999fb7881564"
-
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://gitlab.com/tiotags/hin9.git"