diff --git a/app-benchmarks/forkbomb/forkbomb-1.4-r2.ebuild b/app-benchmarks/forkbomb/forkbomb-1.4-r2.ebuild
new file mode 100644
index 0000000000000..ff9c264610c34
--- /dev/null
+++ b/app-benchmarks/forkbomb/forkbomb-1.4-r2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Controlled fork() bomber for testing heavy system load"
+HOMEPAGE="http://home.tiscali.cz:8080/~cz210552/forkbomb.html"
+SRC_URI="http://home.tiscali.cz:8080/~cz210552/distfiles/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_prepare() {
+	sed -i '/^all/s/tags//' Makefile || die
+	default
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.8
+}
diff --git a/app-containers/docker-bench-security/Manifest b/app-containers/docker-bench-security/Manifest
index 92012dead76a1..349c578306b27 100644
--- a/app-containers/docker-bench-security/Manifest
+++ b/app-containers/docker-bench-security/Manifest
@@ -1 +1,2 @@
 DIST docker-bench-security-1.3.3.tar.gz 274361 BLAKE2B b0a3fef0fedd7353a11f18603af0a9bd5a9c5674df8e0c2988f3b7430739b1fe1c37b3bc29323f39604e8f9d3af66e4a64b97c1e4bb1ef253cc39e9b1e1cb6e2 SHA512 0b9a8bb3cc0bf0887f3b3462c3529568f6cc4d327f66fe482ceb24865a3df51ffee48a1a12c93ca13401f23bf1cd47b3e8b25c99537f63a823ff173d54994fe9
+DIST docker-bench-security-1.6.0.tar.gz 349131 BLAKE2B ce4700e3b7448365420adfb20ca3fa1fa5316157b1f587c40a1ea24e45312ac059a31f5fb152838442e19822c977855323f528d8ddca95eb11347a74606e5913 SHA512 1f3391946dd93540f99e8ea212c9d907d7939d248105082e81845e62eb2a08c4c5a1a32d13c93676ca31df1ee76079a804d36de1874341ed5da64806ea1c7c7b
diff --git a/app-containers/docker-bench-security/docker-bench-security-1.6.0.ebuild b/app-containers/docker-bench-security/docker-bench-security-1.6.0.ebuild
new file mode 100644
index 0000000000000..45778b2f8d607
--- /dev/null
+++ b/app-containers/docker-bench-security/docker-bench-security-1.6.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Test for best practices around deploying docker containers"
+HOMEPAGE="https://github.com/docker/docker-bench-security"
+SRC_URI="https://github.com/docker/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND=">=app-containers/docker-1.13"
+
+src_install() {
+	dobin "${FILESDIR}/docker-bench-security"
+	exeinto /usr/lib/${PN}
+	doexe ${PN}.sh
+	insinto /usr/lib/${PN}
+	doins -r functions/*.sh tests
+	dodoc -r img/benchmark_log.png CONTRIBUTING.md docker-compose.yml \
+		  Dockerfile MAINTAINERS README.md
+}
diff --git a/app-containers/docker-bench-security/metadata.xml b/app-containers/docker-bench-security/metadata.xml
index cbef0562c18d8..2214840c4cc03 100644
--- a/app-containers/docker-bench-security/metadata.xml
+++ b/app-containers/docker-bench-security/metadata.xml
@@ -9,4 +9,7 @@
 		The Docker Bench for Security is a script that checks for dozens of
 		common best-practices around deploying Docker containers in production.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">docker/docker-bench-security</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-dicts/mecab-ipadic/mecab-ipadic-2.7.0.20070801-r1.ebuild b/app-dicts/mecab-ipadic/mecab-ipadic-2.7.0.20070801-r1.ebuild
new file mode 100644
index 0000000000000..a634041be0bb5
--- /dev/null
+++ b/app-dicts/mecab-ipadic/mecab-ipadic-2.7.0.20070801-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="${PN}-${PV%.*}-${PV/*.}"
+
+DESCRIPTION="IPA dictionary for MeCab"
+HOMEPAGE="https://taku910.github.io/mecab/"
+SRC_URI="mirror://sourceforge/${PN%-*}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="ipadic"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="unicode"
+
+DEPEND="app-text/mecab[unicode=]"
+
+src_configure() {
+	econf $(use_with unicode charset UTF-8)
+}
diff --git a/app-dicts/mecab-naist-jdic/mecab-naist-jdic-0.6.3b_p20111013-r1.ebuild b/app-dicts/mecab-naist-jdic/mecab-naist-jdic-0.6.3b_p20111013-r1.ebuild
new file mode 100644
index 0000000000000..94c36a30f1fd4
--- /dev/null
+++ b/app-dicts/mecab-naist-jdic/mecab-naist-jdic-0.6.3b_p20111013-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="${P/_p/-}"
+
+DESCRIPTION="NAIST Japanese Dictionary"
+HOMEPAGE="http://sourceforge.jp/projects/naist-jdic/"
+SRC_URI="mirror://sourceforge.jp/${PN#*-}/53500/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~loong ~riscv ~x86"
+IUSE="unicode"
+
+DEPEND="app-text/mecab[unicode=]"
+
+src_configure() {
+	econf $(use_with unicode charset UTF-8)
+}
diff --git a/app-dicts/mecab-unidic/mecab-unidic-2.1.2-r1.ebuild b/app-dicts/mecab-unidic/mecab-unidic-2.1.2-r1.ebuild
new file mode 100644
index 0000000000000..602e5f43d1ca0
--- /dev/null
+++ b/app-dicts/mecab-unidic/mecab-unidic-2.1.2-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="unidic-mecab-${PV}_src"
+
+DESCRIPTION="IPA dictionary for MeCab"
+HOMEPAGE="https://osdn.jp/projects/unidic/"
+SRC_URI="mirror://sourceforge.jp/${PN#*-}/58338/${MY_P}.zip"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="|| ( BSD GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+
+DEPEND="app-text/mecab"
+BDEPEND="app-arch/unzip"
diff --git a/app-dicts/wnn-ldic/wnn-ldic-1.04-r1.ebuild b/app-dicts/wnn-ldic/wnn-ldic-1.04-r1.ebuild
new file mode 100644
index 0000000000000..350c879e0a8de
--- /dev/null
+++ b/app-dicts/wnn-ldic/wnn-ldic-1.04-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Wnn dictionary for librarian"
+#HOMEPAGE="http://www.tulips.tsukuba.ac.jp/misc/export/cat/ldic"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://gentoo/ldic-${PV}-wnn.txt"
+S="${WORKDIR}"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+DEPEND="app-i18n/freewnn"
+
+src_unpack() {
+	:
+}
+
+src_compile() {
+	local atod=atod
+	if has_version "<app-i18n/freewnn-1.1.1_alpha23"; then
+		atod="${BROOT}"/usr/bin/Wnn4/atod
+	fi
+	"${atod}" lib.dic < "${DISTDIR}"/${A} || die
+}
+
+src_install() {
+	insinto /usr/lib/wnn/ja_JP/dic/misc
+	doins lib.dic
+}
+
+pkg_postinst() {
+	elog "lib.dic is installed in ${EPREFIX}/usr/lib/wnn/ja_JP/dic/misc."
+	elog "You have to edit your wnnenvrc or eggrc to use it."
+}
diff --git a/app-doc/diveintopython/diveintopython-3-r1.ebuild b/app-doc/diveintopython/diveintopython-3-r1.ebuild
deleted file mode 100644
index d35d122240cad..0000000000000
--- a/app-doc/diveintopython/diveintopython-3-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="'Dive Into Python' by Mark Pilgrim - Python 3"
-HOMEPAGE="http://www.diveintopython3.net/"
-
-SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz
-	pdf? (
-		https://dev.gentoo.org/~monsieurp/packages/${P}-pdf.tar.gz
-	)"
-
-LICENSE="CC-BY-SA-3.0"
-SLOT="3"
-KEYWORDS="amd64 ppc ppc64 ~riscv x86"
-IUSE="pdf"
-
-src_install() {
-	insinto "/usr/share/doc/${PN}-${SLOT}"
-	use pdf && doins "${P}.pdf"
-	doins -r *
-}
diff --git a/app-doc/diveintopython/diveintopython-3-r2.ebuild b/app-doc/diveintopython/diveintopython-3-r2.ebuild
new file mode 100644
index 0000000000000..ad40d614daa69
--- /dev/null
+++ b/app-doc/diveintopython/diveintopython-3-r2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="'Dive Into Python' by Mark Pilgrim - Python 3"
+HOMEPAGE="https://www.diveintopython3.net/"
+
+SRC_URI="
+	https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz
+	https://dev.gentoo.org/~monsieurp/packages/${P}-pdf.tar.gz
+"
+
+LICENSE="CC-BY-SA-3.0"
+SLOT="3"
+KEYWORDS="amd64 ppc ppc64 ~riscv x86"
+
+src_install() {
+	dodoc ${P}.pdf
+	rm ${P}.pdf || die
+	docinto html
+	dodoc -r ./*
+}
diff --git a/dev-cpp/highway/Manifest b/dev-cpp/highway/Manifest
index 65a8a68fddf06..728a3cdb72779 100644
--- a/dev-cpp/highway/Manifest
+++ b/dev-cpp/highway/Manifest
@@ -1,3 +1,4 @@
 DIST highway-1.0.1.tar.gz 1730746 BLAKE2B 1c6185af91afe32fbb35285d49101d381ade7ded262cbcd3b0a8bf28b1924a76ac5a11423a1613068f3435fbbdd2ab0119aa8a1aafe2c3467e0aff1987f40aad SHA512 35b6287579b6248966b0d36fda1522fd6338523934b079e94e857f9de08354f20b99739c99d53249a3a6c583519da0e0ac5e06dfbe6e3a89262f627c75b59dd8
 DIST highway-1.0.3.tar.gz 1770704 BLAKE2B 5454f7e661270f25d1439a2a3d649a0f9970d7e10e0cfe6818c470b00460cc77b044ca83e912c91a3582b4a60af5d8d0f7c0aba01762acd3c98b9692fa0b20c6 SHA512 fc419c862e1686b6278081e8e10da41dc2bdfbd386a29b59e21a57375a47d3eeb5c7297e3078c78007b212121d936640b192a26a16c941e73cf599f24e081021
 DIST highway-1.0.5.tar.gz 2012129 BLAKE2B cd7673bc5e3a32551554c83c4e1beb31f9855d9ad9550f156be2fb9e93b20391bd98d4b3ed4d0edf0a2786e403dcca86f4a50d00c27f0e08242dc66e2e6b2262 SHA512 0886b60147b78807e40c4987438fe664b4fbc012c3c681a45f3043ee4077afa493cb75550bc18ae160d00e527bf15bcf1f14220ea8561a4baacb3317fc25e347
+DIST highway-1.0.7.tar.gz 2055819 BLAKE2B da10291124dfdb5d9fd2b661f4d7e594c1e80e4159c9d704e1b4203facf7a0603e7ba808ffb1d8f1aba13d992df24abdb0ae89807329fffb67dee78b58574c28 SHA512 6ee5007ec13ac20b5d816b38a1b31c31a06678ca6d2ea090dd75e364f04cb2cf7ad8a82d1bdfff51079efa54b9a95fb554d62e6cc1bbf7d7e794cb272032d8f5
diff --git a/dev-cpp/highway/highway-1.0.7.ebuild b/dev-cpp/highway/highway-1.0.7.ebuild
new file mode 100644
index 0000000000000..9314e1341deb5
--- /dev/null
+++ b/dev-cpp/highway/highway-1.0.7.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+DESCRIPTION="Performance-portable, length-agnostic SIMD with runtime dispatch"
+HOMEPAGE="https://github.com/google/highway"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/google/highway.git"
+else
+	SRC_URI="https://github.com/google/highway/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="cpu_flags_arm_neon test"
+
+DEPEND="test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )"
+
+RESTRICT="!test? ( test )"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DHWY_CMAKE_ARM7=$(usex cpu_flags_arm_neon)
+		-DBUILD_TESTING=$(usex test)
+		-DHWY_WARNINGS_ARE_ERRORS=OFF
+	)
+
+	use test && mycmakeargs+=( "-DHWY_SYSTEM_GTEST=ON" )
+
+	cmake_src_configure
+}
diff --git a/media-libs/libjxl/libjxl-9999.ebuild b/media-libs/libjxl/libjxl-9999.ebuild
index 4376812b1c37f..73aedf5718752 100644
--- a/media-libs/libjxl/libjxl-9999.ebuild
+++ b/media-libs/libjxl/libjxl-9999.ebuild
@@ -20,7 +20,7 @@ IUSE="gdk-pixbuf openexr test"
 RESTRICT="!test? ( test )"
 
 DEPEND="app-arch/brotli:=[${MULTILIB_USEDEP}]
-	>=dev-cpp/highway-1.0.5[${MULTILIB_USEDEP}]
+	>=dev-cpp/highway-1.0.7[${MULTILIB_USEDEP}]
 	media-libs/giflib:=[${MULTILIB_USEDEP}]
 	>=media-libs/lcms-2.13:2[${MULTILIB_USEDEP}]
 	media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}]
diff --git a/sys-block/hpssacli/hpssacli-2.40.13.0-r1.ebuild b/sys-block/hpssacli/hpssacli-2.40.13.0-r2.ebuild
similarity index 97%
rename from sys-block/hpssacli/hpssacli-2.40.13.0-r1.ebuild
rename to sys-block/hpssacli/hpssacli-2.40.13.0-r2.ebuild
index b405794a6ecbe..b52f1d77c8a26 100644
--- a/sys-block/hpssacli/hpssacli-2.40.13.0-r1.ebuild
+++ b/sys-block/hpssacli/hpssacli-2.40.13.0-r2.ebuild
@@ -58,5 +58,5 @@ src_install() {
 
 	dodoc "${DOCS[@]}"
 
-	pax-mark m "${D%/}${HPSSACLI_BASEDIR}"/*.bin
+	pax-mark m "${D}${HPSSACLI_BASEDIR}"/*.bin
 }
diff --git a/sys-block/hpssacli/hpssacli-3.40.3.0.ebuild b/sys-block/hpssacli/hpssacli-3.40.3.0-r1.ebuild
similarity index 97%
rename from sys-block/hpssacli/hpssacli-3.40.3.0.ebuild
rename to sys-block/hpssacli/hpssacli-3.40.3.0-r1.ebuild
index 1dca689c245e8..1ec8e9744d5cc 100644
--- a/sys-block/hpssacli/hpssacli-3.40.3.0.ebuild
+++ b/sys-block/hpssacli/hpssacli-3.40.3.0-r1.ebuild
@@ -59,5 +59,5 @@ src_install() {
 
 	dodoc "${DOCS[@]}"
 
-	pax-mark m "${D%/}${HPSSACLI_BASEDIR}"/*.bin
+	pax-mark m "${D}${HPSSACLI_BASEDIR}"/*.bin
 }