diff --git a/app-admin/himitsu-ssh/Manifest b/app-admin/himitsu-ssh/Manifest
index 08124549db..17bcadbeec 100644
--- a/app-admin/himitsu-ssh/Manifest
+++ b/app-admin/himitsu-ssh/Manifest
@@ -1 +1,2 @@
 DIST himitsu-ssh-0.3.tar.gz 18468 BLAKE2B ddc984ad1a2bd729b9b1be2685e8e33e646ef93c4e69a0767cc2858a1b5f364e21e2a6f8caa34367250897fd0e0b7f5b4c089c0c1a9b22d75e4f6cdf0681af69 SHA512 a969e38b00cb11cb2f060ddd4da489444d4e655eec54ea7aad1cc27548589460cee7ca36a1161291f79be270e342cfa86366c01b95ddd33a89eefcd6724de6e2
+DIST himitsu-ssh-0.4.tar.gz 20661 BLAKE2B b1f0e0ce8bd280989afd6566a4bf41c0e186f2589be1f6b917ee967ffed4472c8a3d239f544134349a1ceba9bf0c07994eedd1b811ff082fb699a5d93db94e76 SHA512 32720e3e7eb887ced62da2ac9897c2a26ae019ff4bab2d4cf02c178fad47094b7e6e7fddcc7a89779a3ad604e49cc0ae908143ea6e16544133a64b32630b7b33
diff --git a/app-admin/himitsu-ssh/himitsu-ssh-0.4.ebuild b/app-admin/himitsu-ssh/himitsu-ssh-0.4.ebuild
new file mode 100644
index 0000000000..ac947b82be
--- /dev/null
+++ b/app-admin/himitsu-ssh/himitsu-ssh-0.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ "${PV}" = "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/himitsu-ssh"
+else
+	SRC_URI="https://git.sr.ht/~sircmpwn/himitsu-ssh/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="SSH integration for Himitsu"
+HOMEPAGE="https://git.sr.ht/~sircmpwn/himitsu-ssh"
+LICENSE="GPL-3"
+SLOT="0"
+
+RDEPEND="
+	>=app-admin/himitsu-0.8:=
+	>=dev-hare/hare-ssh-0.24.2:=
+"
+DEPEND="
+	${RDEPEND}
+	>=dev-lang/hare-0.24.2:=
+"
+BDEPEND="app-text/scdoc"
+
+# All binaries are hare-built
+QA_FLAGS_IGNORED=".*"
+
+src_configure() {
+	sed -i 's;^PREFIX=.*;PREFIX=/usr;' Makefile || die
+}
+
+src_test() {
+	# Don't run tests if there's none (which is the case of 0.3)
+	grep -r '@test fn' . && emake check
+}
diff --git a/app-admin/himitsu-ssh/himitsu-ssh-9999.ebuild b/app-admin/himitsu-ssh/himitsu-ssh-9999.ebuild
index 8fb2e4fb69..ac947b82be 100644
--- a/app-admin/himitsu-ssh/himitsu-ssh-9999.ebuild
+++ b/app-admin/himitsu-ssh/himitsu-ssh-9999.ebuild
@@ -17,12 +17,12 @@ LICENSE="GPL-3"
 SLOT="0"
 
 RDEPEND="
-	app-admin/himitsu:=
-	>=dev-hare/hare-ssh-0.24.0:=
+	>=app-admin/himitsu-0.8:=
+	>=dev-hare/hare-ssh-0.24.2:=
 "
 DEPEND="
 	${RDEPEND}
-	>=dev-lang/hare-0.24.0:=
+	>=dev-lang/hare-0.24.2:=
 "
 BDEPEND="app-text/scdoc"
 
diff --git a/app-admin/himitsu-totp/Manifest b/app-admin/himitsu-totp/Manifest
index a5701767e4..33eb3b9ef8 100644
--- a/app-admin/himitsu-totp/Manifest
+++ b/app-admin/himitsu-totp/Manifest
@@ -1 +1,2 @@
 DIST himitsu-totp-0.1.tar.gz 15188 BLAKE2B c5165556e67440e847f9ee6ab653705f22953b08a678e6a865e9d0fe2946b8ad755e685b62b0bdf5dc9c5f44698d85c8095bd8b2b43f5731721c26e407868955 SHA512 767dbfc0bee2942e4b2a75ea2e76ec39f06bcc979cd6f6f1e63d7e64d4f26c311458f47c282915f0e6f4ea39582510b4f516ac76251acb617105495f9bdfeb30
+DIST himitsu-totp-0.2.tar.gz 15199 BLAKE2B bc6f7c4420956649a44a9c8a2a1315d49dc044f9a5bee72c690bcf3a6f8d9e2f3ab6c592bff40f813d6f76fb89b3a0f6a06003138c9165b46edb19b274a6ae13 SHA512 a6b3958e5b9c6e2e0bf4061ce9b4b5d738cc0635533ae944758630a7e3b6cae3c20e80e9f0078fa63c67965b5b3078b77b15a603d402bce3965cf58441a70781
diff --git a/app-admin/himitsu-totp/himitsu-totp-0.2.ebuild b/app-admin/himitsu-totp/himitsu-totp-0.2.ebuild
new file mode 100644
index 0000000000..68988fc7fc
--- /dev/null
+++ b/app-admin/himitsu-totp/himitsu-totp-0.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ "${PV}" = "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/himitsu-totp"
+else
+	SRC_URI="https://git.sr.ht/~sircmpwn/himitsu-totp/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~riscv"
+fi
+
+DESCRIPTION="TOTP support for Himitsu"
+HOMEPAGE="https://git.sr.ht/~sircmpwn/himitsu-totp"
+LICENSE="GPL-3"
+SLOT="0"
+
+RDEPEND="app-admin/himitsu:="
+DEPEND="
+	${RDEPEND}
+	>=dev-lang/hare-0.24.2:=
+"
+BDEPEND="app-text/scdoc"
+
+# hare binary
+QA_FLAGS_IGNORED="usr/bin/hitotp"
+
+src_configure() {
+	sed -i 's;^PREFIX=.*;PREFIX=/usr;' Makefile || die
+}
diff --git a/app-admin/himitsu-totp/himitsu-totp-9999.ebuild b/app-admin/himitsu-totp/himitsu-totp-9999.ebuild
index 7699eec111..68988fc7fc 100644
--- a/app-admin/himitsu-totp/himitsu-totp-9999.ebuild
+++ b/app-admin/himitsu-totp/himitsu-totp-9999.ebuild
@@ -19,7 +19,7 @@ SLOT="0"
 RDEPEND="app-admin/himitsu:="
 DEPEND="
 	${RDEPEND}
-	dev-lang/hare:=
+	>=dev-lang/hare-0.24.2:=
 "
 BDEPEND="app-text/scdoc"
 
diff --git a/app-admin/himitsu/Manifest b/app-admin/himitsu/Manifest
index 44d0520d71..c14a7faccc 100644
--- a/app-admin/himitsu/Manifest
+++ b/app-admin/himitsu/Manifest
@@ -1 +1,2 @@
 DIST himitsu-0.7.tar.gz 43447 BLAKE2B 79bf522be00af42506fe020b69013290cda221d7768579d0056fbafaf938c1a6dd61f039d5ca699e54e7292adc728be696b254785d45bed42ad0ee14c017c589 SHA512 5b7136d9145729e1d277f78595c5d2f7d7d73cdad3b46b585c90cc8ae945acdad7761abc14c49d686b0c9ff82183c7c7bae286e4818f08ac50b9cf751502744c
+DIST himitsu-0.8.tar.gz 52331 BLAKE2B 4cdedfbaaf804455f32b8bf63721c92a86ad7818b06ff88c497b8631edf27fc0fdf13ccc6f2ed693368cac6f17212f9c517811f4d66b2ec15a6e8fceeafe0261 SHA512 65947e516b90435d4b9635c6d8762d58c003b4bd3e128499b9f99bc94f6e238e3978f073c0f31c0a863b27026dccc39353fed422db95515610cc288cc65559af
diff --git a/app-admin/himitsu/himitsu-0.8.ebuild b/app-admin/himitsu/himitsu-0.8.ebuild
new file mode 100644
index 0000000000..a739e3bc79
--- /dev/null
+++ b/app-admin/himitsu/himitsu-0.8.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ "${PV}" = "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/himitsu"
+	SLOT="0"
+else
+	SRC_URI="https://git.sr.ht/~sircmpwn/himitsu/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~riscv"
+	SLOT="0/${PV}"
+fi
+
+DESCRIPTION="Secret storage system for Unix, suitable for storing passwords, keys, ..."
+HOMEPAGE="https://git.sr.ht/~sircmpwn/himitsu"
+LICENSE="GPL-3"
+
+
+DEPEND="
+	>=dev-lang/hare-0.24.2:=
+"
+RDEPEND="
+	gui-apps/hiprompt-gtk-py
+"
+BDEPEND="app-text/scdoc"
+
+# binaries are hare-built
+QA_FLAGS_IGNORED="usr/bin/.*"
+
+src_configure() {
+	sed -i 's;^PREFIX=.*;PREFIX=/usr;' Makefile || die
+}
diff --git a/app-admin/himitsu/himitsu-9999.ebuild b/app-admin/himitsu/himitsu-9999.ebuild
index 2ca5d1712a..a739e3bc79 100644
--- a/app-admin/himitsu/himitsu-9999.ebuild
+++ b/app-admin/himitsu/himitsu-9999.ebuild
@@ -19,7 +19,7 @@ LICENSE="GPL-3"
 
 
 DEPEND="
-	>=dev-lang/hare-0_pre20231127-r1:=
+	>=dev-lang/hare-0.24.2:=
 "
 RDEPEND="
 	gui-apps/hiprompt-gtk-py
diff --git a/dev-hare/hare-ssh/Manifest b/dev-hare/hare-ssh/Manifest
index daf3f553be..6418622044 100644
--- a/dev-hare/hare-ssh/Manifest
+++ b/dev-hare/hare-ssh/Manifest
@@ -1 +1,2 @@
 DIST hare-ssh-0.24.0.tar.gz 33013 BLAKE2B fc684f5f0b5c025f4e9fa10066f3d10e4a554973fa9d9d99fd3ca97a3005541690cb1eed0baf773f3a5d0e8a130cfb3bf5e837a04c4603077b22536c8cab229d SHA512 290fe762a019bf073cd18c244db022cb4423d919336b3b69fceaff1df1ebc78b616a14d3872bfaefaba540429c39d84e9255dddb94047ad0def25b22c9c9bbf6
+DIST hare-ssh-0.24.2.tar.gz 35412 BLAKE2B 936b5fb62780ce7673ce268bf24074d1206b912415a5b9f8f1b8caf33b3a7950c7dafe6d9c65811fb26319c10638197afb81037a9ad4ab2d940148d7430ef68a SHA512 cd631a025ff004bf0fe6acc3246858c655ff7875c06acd5c510aa3d5104c0604ef15d479d96040e5d49b919e71a672a61d1112d1175a3d5955b80c723ebe9fc2
diff --git a/dev-hare/hare-ssh/hare-ssh-0.24.2.ebuild b/dev-hare/hare-ssh/hare-ssh-0.24.2.ebuild
new file mode 100644
index 0000000000..c207a2c085
--- /dev/null
+++ b/dev-hare/hare-ssh/hare-ssh-0.24.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ "${PV}" = 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/hare-ssh"
+	SLOT="0"
+else
+	SRC_URI="https://git.sr.ht/~sircmpwn/hare-ssh/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SLOT="0/${PV}"
+
+	KEYWORDS="~amd64 ~arm64 ~riscv"
+fi
+
+DESCRIPTION="SSH library for Hare"
+HOMEPAGE="https://git.sr.ht/~sircmpwn/hare-ssh"
+LICENSE="MPL-2.0"
+
+RDEPEND=">=dev-lang/hare-0.24.2"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	sed -i 's;^PREFIX=.*;PREFIX=/usr;' Makefile || die
+}
diff --git a/dev-hare/hare-ssh/hare-ssh-9999.ebuild b/dev-hare/hare-ssh/hare-ssh-9999.ebuild
index fb55c3fba1..c207a2c085 100644
--- a/dev-hare/hare-ssh/hare-ssh-9999.ebuild
+++ b/dev-hare/hare-ssh/hare-ssh-9999.ebuild
@@ -18,7 +18,7 @@ DESCRIPTION="SSH library for Hare"
 HOMEPAGE="https://git.sr.ht/~sircmpwn/hare-ssh"
 LICENSE="MPL-2.0"
 
-RDEPEND=">=dev-lang/hare-0.24.0"
+RDEPEND=">=dev-lang/hare-0.24.2"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
diff --git a/dev-lang/hare/Manifest b/dev-lang/hare/Manifest
index 60d52977cf..996944dd6b 100644
--- a/dev-lang/hare/Manifest
+++ b/dev-lang/hare/Manifest
@@ -1,3 +1,2 @@
 DIST hare-0.24.0.tar.gz 767869 BLAKE2B 4e1e706a7e0623ebe71803dc591b362527dd140f025cb3529e95d9bec8bea464bc008d512e4981f1dcd34f770b8831a0d6dd37cb453ee54e01e900c1cd52c159 SHA512 d7b96bc031d432e0ca0a9186a043d4cd4af4d4b57be5ce4b913d6acd26cdb708d8c9ad8e2c64c78c192a11a96977d3e916985a548238591b3c4d177b9cc811d9
-DIST hare-009a8e873b688038aaf3c5e5e0b75c9205be56f5.tar.gz 728165 BLAKE2B ed3ecada9fc21e993548fa2b159b79ef3e8b537d3bd2ca54584127f315bf93e4440afa9cdf45f09aaac8665607a9e746b60ccd535a88aa538c6d7428b3d51e82 SHA512 16b8ef0a92c6ea8d6dabec283e4a7592fd301a11dd4bc837feff09f4f3743027efb615b2884eba2165ddfda197709324ed9fbb928d9d272f6585b3300c9d8582
-DIST hare-d94f355481a320fb2aec13ef62cb3bfe2416f5e4.tar.gz 716871 BLAKE2B 1805ca36c4e0faf581ad011d355eff63670e5dd13410e0aaaaee86c547ee7515a00577080c78e79c468274825e7905c386495e1b6520f60fd96d280f21e24044 SHA512 5638e213ac7dedd5a7a0c43bb481755e5cb5d9cbc227a0e08a53bbb4e9036e80111a5a7df2328bd4d1c0ede4cf703dd8a94f075a0850649b31770350223ecb96
+DIST hare-0.24.2.tar.gz 912808 BLAKE2B 2dbb83448efe85c36be50ebfbe9c8c567ac7a8c420253f242aa911e815fbf41ff4fbe0e36d22b5654b74441cc73bbaac9de5b9cdb06f9f687813babe2bf359c0 SHA512 6214d0068f507f156bff85d12aeb515e5f752bff03645b3b207d224aecc62e34d4a44a171fc2b357eaaf72a804c2b79d6ad2886caa2804f1dcad07cc25d7efac
diff --git a/dev-lang/hare/hare-0_pre20231127-r1.ebuild b/dev-lang/hare/hare-0.24.2.ebuild
similarity index 77%
rename from dev-lang/hare/hare-0_pre20231127-r1.ebuild
rename to dev-lang/hare/hare-0.24.2.ebuild
index 1eac4d7422..4ef0d76a9c 100644
--- a/dev-lang/hare/hare-0_pre20231127-r1.ebuild
+++ b/dev-lang/hare/hare-0.24.2.ebuild
@@ -8,9 +8,9 @@ if [[ "${PV}" = 9999 ]]; then
 	EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/hare"
 	SLOT="0"
 else
-	EGIT_COMMIT="d94f355481a320fb2aec13ef62cb3bfe2416f5e4"
-	MY_P="${PN}-${EGIT_COMMIT}"
-	SRC_URI="https://git.sr.ht/~sircmpwn/hare/archive/${EGIT_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
+	MY_PV="$(ver_rs 3 -)"
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI="https://git.sr.ht/~sircmpwn/hare/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
 	S="${WORKDIR}/${MY_P}"
 	SLOT="0/${PV}"
 	KEYWORDS="~amd64 ~arm64 ~riscv"
@@ -20,9 +20,10 @@ DESCRIPTION="The Hare systems programming language"
 HOMEPAGE="https://harelang.org/"
 LICENSE="MPL-2.0 GPL-3"
 
+# release policy: https://git.sr.ht/~sircmpwn/hare/tree/master/item/docs/release.md
 DEPEND="
-	~dev-lang/harec-0_pre20231128
-	~sys-devel/qbe-1.1
+	~dev-lang/harec-0.24.2
+	>=sys-devel/qbe-1.2
 "
 BDEPEND="app-text/scdoc"
 RDEPEND="${DEPEND}"
@@ -40,10 +41,8 @@ src_configure() {
 	esac
 
 	# Note: PREFIX needs to be set early as it is used for HAREPATH
-	cp config.example.mk config.mk || die
+	cp configs/linux.mk config.mk || die
 	sed -i \
-		-e 's;=aarch64-;=;' \
-		-e 's;=riscv64-;=;' \
 		-e "s;^ARCH =.*;ARCH = ${target_arch};" \
 		-e "s;^PREFIX =.*;PREFIX = ${EPREFIX}/usr;" \
 		-e 's;^AS =;AS ?=;' \
diff --git a/dev-lang/hare/hare-0_pre20230813.ebuild b/dev-lang/hare/hare-0_pre20230813.ebuild
deleted file mode 100644
index 10842221e9..0000000000
--- a/dev-lang/hare/hare-0_pre20230813.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ "${PV}" = 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/hare"
-	SLOT="0"
-else
-	EGIT_COMMIT="009a8e873b688038aaf3c5e5e0b75c9205be56f5"
-	MY_P="${PN}-${EGIT_COMMIT}"
-	SRC_URI="https://git.sr.ht/~sircmpwn/hare/archive/${EGIT_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
-	S="${WORKDIR}/${MY_P}"
-	SLOT="0/${PV}"
-
-	KEYWORDS="~amd64 ~arm64 ~riscv"
-fi
-
-DESCRIPTION="The Hare systems programming language"
-HOMEPAGE="https://harelang.org/"
-LICENSE="MPL-2.0 GPL-3"
-
-DEPEND="
-	sys-devel/qbe
-	>=dev-lang/harec-0_pre20220702
-"
-BDEPEND="
-	app-text/scdoc
-"
-RDEPEND="${DEPEND}"
-
-# hare and haredoc are built by hare
-QA_FLAGS_IGNORED="usr/bin/hare usr/bin/haredoc"
-
-src_configure() {
-	local target_arch
-	case ${ARCH} in
-		amd64 ) target_arch=x86_64 ;;
-		arm64 ) target_arch=aarch64 ;;
-		riscv ) target_arch=riscv64 ;;
-		* ) die "unsupported architecture: ${ARCH}" ;;
-	esac
-
-	cp config.example.mk config.mk || die
-	sed -i \
-		-e 's;=aarch64-;=;' \
-		-e 's;=riscv64-;=;' \
-		-e "s;^ARCH =.*;ARCH = ${target_arch};" \
-		-e 's;^PREFIX =.*;PREFIX = /usr;' \
-		-e 's;^AS =;AS ?=;' \
-		-e 's;^LD =;LD ?=;' \
-		-e 's;^AR =;AR ?=;' \
-		config.mk || die
-
-	sed -i 's; $(DESTDIR)$(LOCALSRCDIR);;' Makefile || die
-}
diff --git a/dev-lang/harec/Manifest b/dev-lang/harec/Manifest
index a3a4bffff3..421b6f2203 100644
--- a/dev-lang/harec/Manifest
+++ b/dev-lang/harec/Manifest
@@ -1,3 +1,2 @@
 DIST harec-0.24.0.tar.gz 193534 BLAKE2B 651fc34a6053b81c90e405dd53f84c4c9f549baa601dfba1227bdf1d660b461a1f1e20b0e99ac0c2aa8499375ddf37f52c9c05172433359cb777e806701209b3 SHA512 aab347351bcd748a98e3a58f1ff9a0d194aea907d6ebfacbc7e10671e018fb5ce296e71119ab975e3a1e66ba439d7b706943082d57af2459e694856a89453d8d
-DIST harec-ec3193e3870436180b0f3df82b769adc57a1c099.tar.gz 193069 BLAKE2B 7f34a25e53c864435740fbc5f4fb0a59b4611e50ece6ad18fd4b5f88f839177ed57431c3a4a24521b73f4a1af52e10b51ab574fe205a3a88314ea50b6c67a84e SHA512 2962af65f95d3db51432cea0b08b963a713c746a856623be6162873a34cc558577fd4673d1c502fced2582331886f5269c79381a4a26a8d743dc1a9fe7aefda0
-DIST harec-f735abab4516d2fb729e3ea7aee309eab5a1b0bf.tar.gz 186009 BLAKE2B d68070541ab61c3af9bc793df2911604095f007421f3b2e0176f25cac98596a3ca32046601fbc2fd78dd2e0406b557e8beb0206cc0827564287ead25057548fd SHA512 6183f5e78e116c2b1174c583e9a69a10cb93e7ea4c9197b583a9f8d056aae5ea28c42bf4a447aaf544b9bcbf181ae3f8d64c9716bfac5a046f41caa86e727a30
+DIST harec-0.24.2.tar.gz 201789 BLAKE2B b7241fc9e3265486982104fad4d21323a591642b7c19edbedaa4f8b299ed9cde8412b0ef95b0faf33fa8aa6153dc5f965199d5778a434823f8c6faabcd38fde3 SHA512 3b32e82df937de1fdd2af20a2162bc3754cb9178cd67e56f3e7bc7fc9eb9e9bad5609ca1c328d42ac5cdd527edf6d9c381dc384df72c2d7666c7ce5684871a17
diff --git a/dev-lang/harec/harec-0.24.2.ebuild b/dev-lang/harec/harec-0.24.2.ebuild
new file mode 100644
index 0000000000..b215ee6dd5
--- /dev/null
+++ b/dev-lang/harec/harec-0.24.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+if [[ "${PV}" = "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/harec"
+else
+	MY_PV="$(ver_rs 3 -)"
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI="https://git.sr.ht/~sircmpwn/harec/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+	S="${WORKDIR}/${MY_P}"
+	KEYWORDS="~amd64 ~arm64 ~riscv"
+fi
+
+DESCRIPTION="The Hare compiler"
+HOMEPAGE="https://harelang.org/"
+LICENSE="GPL-3"
+SLOT="0"
+
+DEPEND=">=sys-devel/qbe-1.2"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	cp configs/linux.mk config.mk || die
+	sed -i \
+		-e 's/-Werror//' \
+		-e 's/CC =/CC ?=/' \
+		-e 's/AS =/AS ?=/' \
+		-e 's/LD =/LD ?=/' \
+		config.mk || die
+
+	tc-export CC AS LD
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+}
diff --git a/dev-lang/harec/harec-0_pre20230807.ebuild b/dev-lang/harec/harec-0_pre20230807.ebuild
deleted file mode 100644
index e38257eb6a..0000000000
--- a/dev-lang/harec/harec-0_pre20230807.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ "${PV}" = "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/harec"
-	S="${WORKDIR}/${P}/build"
-else
-	EGIT_COMMIT="f735abab4516d2fb729e3ea7aee309eab5a1b0bf"
-	MY_P="${PN}-${EGIT_COMMIT}"
-	SRC_URI="https://git.sr.ht/~sircmpwn/harec/archive/${EGIT_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
-	S="${WORKDIR}/${MY_P}/build"
-
-	KEYWORDS="~amd64 ~arm64 ~riscv"
-fi
-
-DESCRIPTION="The Hare compiler"
-HOMEPAGE="https://harelang.org/"
-LICENSE="GPL-3"
-SLOT="0"
-
-DEPEND=">=sys-devel/qbe-1.1"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	default
-
-	[[ "${PV}" = "9999" ]] && git-r3_src_unpack
-
-	mkdir "${S}" || die
-}
-
-src_prepare() {
-	default
-
-	sed -i 's; -Werror ; ;' ../config.sh || die
-}
-
-src_configure() {
-	../configure --prefix="/usr" --libdir="/usr/$(get_libdir)" || die
-}
diff --git a/dev-lang/harec/harec-0_pre20231128.ebuild b/dev-lang/harec/harec-0_pre20231128.ebuild
deleted file mode 100644
index cc6e049fed..0000000000
--- a/dev-lang/harec/harec-0_pre20231128.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ "${PV}" = "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/harec"
-	S="${WORKDIR}/${P}/build"
-else
-	EGIT_COMMIT="ec3193e3870436180b0f3df82b769adc57a1c099"
-	MY_P="${PN}-${EGIT_COMMIT}"
-	SRC_URI="https://git.sr.ht/~sircmpwn/harec/archive/${EGIT_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
-	S="${WORKDIR}/${MY_P}/build"
-
-	KEYWORDS="~amd64 ~arm64 ~riscv"
-fi
-
-DESCRIPTION="The Hare compiler"
-HOMEPAGE="https://harelang.org/"
-LICENSE="GPL-3"
-SLOT="0"
-
-DEPEND=">=sys-devel/qbe-1.1-r1"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	default
-
-	[[ "${PV}" = "9999" ]] && git-r3_src_unpack
-
-	mkdir "${S}" || die
-}
-
-src_prepare() {
-	default
-
-	sed -i 's; -Werror ; ;' ../config.sh || die
-}
-
-src_configure() {
-	../configure --prefix="/usr" --libdir="/usr/$(get_libdir)" || die
-}
diff --git a/dev-libs/fastText/fastText-0.9.2.ebuild b/dev-libs/fastText/fastText-0.9.2.ebuild
index a55761421e..4e18b26faa 100644
--- a/dev-libs/fastText/fastText-0.9.2.ebuild
+++ b/dev-libs/fastText/fastText-0.9.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 DISTUTILS_EXT=1
 DISTUTILS_OPTIONAL=1
 DISTUTILS_USE_PEP517=setuptools
@@ -33,6 +33,7 @@ BDEPEND="
 DOCS=( {CODE_OF_CONDUCT,CONTRIBUTING,README}.md python/{README.rst,doc} docs )
 PATCHES=(
 	"${FILESDIR}/${P}-gcc13.patch"
+	"${FILESDIR}/${P}-numpy2.patch"
 	"${FILESDIR}/${P}-pep517.patch"
 )
 
diff --git a/dev-libs/fastText/files/fastText-0.9.2-numpy2.patch b/dev-libs/fastText/files/fastText-0.9.2-numpy2.patch
new file mode 100644
index 0000000000..4fe744aca2
--- /dev/null
+++ b/dev-libs/fastText/files/fastText-0.9.2-numpy2.patch
@@ -0,0 +1,30 @@
+https://numpy.org/devdocs/numpy_2_0_migration_guide.html#adapting-to-changes-in-the-copy-keyword
+--- a/python/fasttext_module/fasttext/FastText.py
++++ b/python/fasttext_module/fasttext/FastText.py
+@@ -43,7 +43,7 @@ class _Meter(object):
+         else:
+             y_scores, y_true = ([], ())
+ 
+-        return np.array(y_scores, copy=False), np.array(y_true, copy=False)
++        return np.asarray(y_scores), np.asarray(y_true)
+ 
+     def precision_recall_curve(self, label=None):
+         """Return precision/recall curve"""
+@@ -58,7 +58,7 @@ class _Meter(object):
+         else:
+             precision, recall = ([], ())
+ 
+-        return np.array(precision, copy=False), np.array(recall, copy=False)
++        return np.asarray(precision), np.asarray(recall)
+ 
+     def precision_at_recall(self, recall, label=None):
+         """Return precision for a given recall"""
+@@ -229,7 +229,7 @@ class _FastText(object):
+             else:
+                 probs, labels = ([], ())
+ 
+-            return labels, np.array(probs, copy=False)
++            return labels, np.asarray(probs)
+ 
+     def get_input_matrix(self):
+         """
diff --git a/dev-libs/fastText/metadata.xml b/dev-libs/fastText/metadata.xml
index 114c245e06..2e0aa32c6a 100644
--- a/dev-libs/fastText/metadata.xml
+++ b/dev-libs/fastText/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>pastalian46@gmail.com</email>
+		<name>Takuya Wakazono</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">facebookresearch/fastText</remote-id>
 		<remote-id type="pypi">fasttext</remote-id>
diff --git a/dev-libs/open62541/Manifest b/dev-libs/open62541/Manifest
index 203351ffbb..2ddc80c6c4 100644
--- a/dev-libs/open62541/Manifest
+++ b/dev-libs/open62541/Manifest
@@ -1 +1 @@
-DIST open62541-1.4.1.tar.gz 4191270 BLAKE2B 6d186eee099803a1501642ad4dd78d196a0b9e51bdc2f426ed4b8a7efea9939b05ec3d21f0cbaf87289d983168084080df530405d5b71f409feb25ab614e3c95 SHA512 e0a2f9e748ee1b27b0bd400d56b6e90602d545c7a5c794ba9a1ccd1ab15bde3c2908440ec1662b4a6980b9e7ffcf532018f8894821405f8edbd5f0168ca4ccf3
+DIST open62541-1.4.2.tar.gz 4197777 BLAKE2B 3b92e20b51acdff130c12cfb19d97d63f8313a3a23eef6c812bd4090aa2c89e92f8a5c6894c34b2725d25d3efcdaebb10d15caead49be4b8b9c74da1bb29f24b SHA512 145e152e4aab28e7100b518b991b47312c55cca9ece7fc9716ca09296e10d209223ee8d6da9e82543e00d536c19fbe071fcb0a43bcd5e59a0f86e798ee397596
diff --git a/dev-libs/open62541/open62541-1.4.1.ebuild b/dev-libs/open62541/open62541-1.4.2.ebuild
similarity index 100%
rename from dev-libs/open62541/open62541-1.4.1.ebuild
rename to dev-libs/open62541/open62541-1.4.2.ebuild
diff --git a/dev-python/pymeeus/files/pymeeus-0.5.12-pytest8.patch b/dev-python/pymeeus/files/pymeeus-0.5.12-pytest8.patch
new file mode 100644
index 0000000000..90fbf79211
--- /dev/null
+++ b/dev-python/pymeeus/files/pymeeus-0.5.12-pytest8.patch
@@ -0,0 +1,88 @@
+https://bugs.gentoo.org/928258
+https://github.com/architest/pymeeus/issues/24
+From f064abfda6b3cb48cb42a6827cd250413056f227 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= <anarcat@debian.org>
+Date: Sat, 6 Apr 2024 22:22:52 -0400
+Subject: [PATCH] fix pytest 7.2 compatibility
+
+Pytest 7.2 deprecated plain top-level `setup()` and `teardown()`
+functions in favor of their own decorators:
+
+https://docs.pytest.org/en/latest/changelog.html#pytest-7-2-0-2022-10-23
+https://docs.pytest.org/en/latest/deprecations.html#setup-teardown
+
+Now we need to use module-level setup/teardown, which is extremely
+similar, just named differently:
+
+https://docs.pytest.org/en/latest/how-to/xunit_setup.html#module-level-setup-teardown
+
+We keep compatibility shims for older pytest releases.
+
+Closes: #24
+---
+ tests/test_curvefitting.py  | 10 +++++++---
+ tests/test_interpolation.py |  9 +++++++--
+ 2 files changed, 14 insertions(+), 5 deletions(-)
+
+diff --git a/tests/test_curvefitting.py b/tests/test_curvefitting.py
+index 9398327..0d20cca 100644
+--- a/tests/test_curvefitting.py
++++ b/tests/test_curvefitting.py
+@@ -31,9 +31,8 @@
+ cf4 = CurveFitting()
+ 
+ 
+-def setup():
++def setup_module():
+     """This function is used to set up the environment for the tests"""
+-
+     # Set up a few CurveFitting objects
+     cf1.set([73.0, 38.0, 35.0, 42.0, 78.0, 68.0, 74.0, 42.0, 52.0, 54.0, 39.0,
+              61.0, 42.0, 49.0, 50.0, 62.0, 44.0, 39.0, 43.0, 54.0, 44.0, 37.0],
+@@ -58,10 +57,15 @@ def setup():
+              -0.8372, -0.4377, -0.3640, -0.3508, -0.2126])
+ 
+ 
+-def teardown():
++def teardown_module():
+     pass
+ 
+ 
++# pre pytest 7.2 compatibility
++setup = setup_module
++teardown = teardown_module
++
++
+ # CurveFitting class
+ 
+ def test_curvefitting_constructor():
+diff --git a/tests/test_interpolation.py b/tests/test_interpolation.py
+index e853c37..08f7b6e 100644
+--- a/tests/test_interpolation.py
++++ b/tests/test_interpolation.py
+@@ -32,7 +32,7 @@
+ i_sine = Interpolation()
+ 
+ 
+-def setup():
++def setup_module():
+     """This function is used to set up the environment for the tests"""
+     # Set up a interpolation object which uses Right Ascension
+     y0 = Angle(10, 18, 48.732, ra=True)
+@@ -64,10 +64,15 @@ def setup():
+                 0.5236885653, 0.5453707057])
+ 
+ 
+-def teardown():
++def teardown_module():
+     pass
+ 
+ 
++# pre pytest 7.2 ompatibility
++setup = setup_module
++teardown = teardown_module
++
++
+ # Interpolation class
+ 
+ def test_interpolation_constructor():
diff --git a/dev-python/pymeeus/metadata.xml b/dev-python/pymeeus/metadata.xml
index 05776cb320..977daa513a 100644
--- a/dev-python/pymeeus/metadata.xml
+++ b/dev-python/pymeeus/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>pastalian46@gmail.com</email>
+		<name>Takuya Wakazono</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">architest/pymeeus</remote-id>
 		<remote-id type="pypi">PyMeeus</remote-id>
diff --git a/dev-python/pymeeus/pymeeus-0.5.12.ebuild b/dev-python/pymeeus/pymeeus-0.5.12.ebuild
index aa3a9a7241..aec1ee397e 100644
--- a/dev-python/pymeeus/pymeeus-0.5.12.ebuild
+++ b/dev-python/pymeeus/pymeeus-0.5.12.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
 DISTUTILS_USE_PEP517=setuptools
 PYPI_PN="PyMeeus"
 PYPI_NO_NORMALIZE=1
@@ -19,6 +19,11 @@ LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
 
+PATCHES=(
+	# bug #928258
+	"${FILESDIR}/${P}-pytest8.patch"
+)
+
 distutils_enable_tests pytest
 
 distutils_enable_sphinx docs/source \
diff --git a/dev-util/deblob/Manifest b/dev-util/deblob/Manifest
index ece48925b8..57b1b3f551 100644
--- a/dev-util/deblob/Manifest
+++ b/dev-util/deblob/Manifest
@@ -1,4 +1,4 @@
-DIST deblob-0.6.tar.gz 47780 BLAKE2B 7c19c9dfb466ef705789768b9424b3ff5861c03f10715c63ea1215cf94a3bf8284304a771953f1311e74fc7aa60e2ab5990d5ab35622b9d578baad98bab3d5e2 SHA512 04381745af4d0bc4958a0a40de448ab45fdfe345dbaac08c93e1729bf90c1cc08f803a9831c346bf0d94258ea570e212ea924363aa50db2de1654f68aa27778a
-DIST deblob-0.6.tar.gz.sign 305 BLAKE2B 22f7ea757facb17afbe37b0bdce58c1cb43778a1ba08fe5547052233ef348a4416657ab4a2f08f71d9c4a94cb36de38fe721d0fc9ba2e7bd0ed992f91887c8b7 SHA512 2f96b6aeca51083bb8dd275c9bcfc4341d73a4ca90fe7d39282a591fa3c62849db5c44b9d9e7caa798107b579bf0e50c8873f75d79e906c8b94eacd0688ba16a
 DIST deblob-0.7.tar.gz 47879 BLAKE2B fa392bebcb07f36dfa894156ff494b23e514fd0c6d2d589fbfa110292a35e9ea8c2c89178e17a0797f01e66e98f16a8c71cea1b8746f8a70eca0cfabae83ae51 SHA512 b0857981a72bd52987a94ce7a6e59c17bc0ca882494bd4e6514f06ffd397bb14fba25562817f41b600b32c4708284d2768946696fbdd8d8a7d421c321fdfa0f7
 DIST deblob-0.7.tar.gz.sign 305 BLAKE2B 184e4868f276b11c7d64e8d3b1de839d47033595aaa58b67d4a8e6dcdb593980f40c6e12b499635aee1e6f2e6cf9efb439445ff4a443b5ba71a5e5776b3f8473 SHA512 c2f3645ae2cc3bd102a98ef2500a80fd9d0ddf2f3117494bcdc8b4162a8a7e561e8b1a5d34641c35376de36a99967fece80c0678f9f21d14c57ede1617403655
+DIST deblob-0.8.tar.gz 48230 BLAKE2B c00bf903c7704f0d86adbb641effcb34cef232fe0565a19e96579449ccfeff99ed8f8e15ea2e3de010af91cf0d4cc0afb2c20fae67f49908919e225536dd1d1b SHA512 fe40710344fd5ea24121114cd7f6435993f7fe4fc45412253bc71e5b54483d02a548be5eab379eb4581979e458177b6a9e341fb5652dccd35d71cb28484c8e97
+DIST deblob-0.8.tar.gz.sign 305 BLAKE2B f1eb227d36b196e562501fe7a471c647608ac0e1a4724f77be7fb4386a7994a5594008e90fcf0a3977ee3a960958eeb6fae0ca9405f6566589a68d0ddf99a9ca SHA512 09b8916bbe5e3d4202de8724f12d57ef56ce896d4d2f4caab7eef28370b7bd951efe40ee88051a89857273362675d6cffecfb5ec45a86fb72273daaff1a80e97
diff --git a/dev-util/deblob/deblob-0.7.ebuild b/dev-util/deblob/deblob-0.7.ebuild
index 6957771244..7e27bd9029 100644
--- a/dev-util/deblob/deblob-0.7.ebuild
+++ b/dev-util/deblob/deblob-0.7.ebuild
@@ -24,6 +24,7 @@ SLOT="0"
 
 DEPEND="
 	>=dev-lang/hare-0.24.0:=
+	<dev-lang/hare-0.24.2
 "
 
 # built by hare
diff --git a/dev-util/deblob/deblob-0.6.ebuild b/dev-util/deblob/deblob-0.8.ebuild
similarity index 86%
rename from dev-util/deblob/deblob-0.6.ebuild
rename to dev-util/deblob/deblob-0.8.ebuild
index 50e013ca81..5c90df1f67 100644
--- a/dev-util/deblob/deblob-0.6.ebuild
+++ b/dev-util/deblob/deblob-0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 Haelwenn (lanodan) Monnier <contact@hacktivis.me>
+# Copyright 2021-2024 Haelwenn (lanodan) Monnier <contact@hacktivis.me>
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -23,8 +23,7 @@ LICENSE="BSD"
 SLOT="0"
 
 DEPEND="
-	>=dev-lang/hare-0_pre20230615:=
-	<dev-lang/hare-0_pre20231127
+	>=dev-lang/hare-0.24.2:=
 "
 
 # built by hare
@@ -32,9 +31,9 @@ QA_FLAGS_IGNORED="usr/bin/deblob"
 
 if [[ "${PV}" != "9999" ]]
 then
-	BDEPEND="${BDEPEND} verify-sig? ( sec-keys/signify-keys-lanodan:2023 )"
+	BDEPEND="${BDEPEND} verify-sig? ( sec-keys/signify-keys-lanodan:2024 )"
 
-	VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/signify-keys/signify-keys-lanodan-2023.pub"
+	VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/signify-keys/signify-keys-lanodan-2024.pub"
 
 	src_unpack() {
 		if use verify-sig; then
diff --git a/eclass/rebar3.eclass b/eclass/rebar3.eclass
deleted file mode 100644
index 4104bdcf64..0000000000
--- a/eclass/rebar3.eclass
+++ /dev/null
@@ -1,295 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# @ECLASS: rebar3.eclass
-# @MAINTAINER:
-# Anna (cybertailor) Vyalkova <cyber+gentoo@sysrq.in>
-# @AUTHOR:
-# Amadeusz Żołnowski <aidecoe@gentoo.org>
-# @SUPPORTED_EAPIS: 8
-# @BLURB: Build Erlang/OTP projects using dev-util/rebar:3.
-# @DESCRIPTION:
-# An eclass providing functions to build Erlang/OTP projects using
-# dev-util/rebar:3.
-#
-# rebar is a tool which tries to resolve dependencies itself which is by
-# cloning remote git repositories. Dependent projects are usually expected to
-# be in sub-directory 'deps' rather than looking at system Erlang lib
-# directory. Projects relying on rebar usually don't have 'install' make
-# targets. The eclass workarounds some of these problems. It handles
-# installation in a generic way for Erlang/OTP structured projects.
-
-case ${EAPI} in
-	8) ;;
-	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
-esac
-
-if [[ -z ${_REBAR3_ECLASS} ]]; then
-
-inherit edo
-
-RDEPEND="dev-lang/erlang:="
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/rebar:3
-	>=sys-apps/gawk-4.1
-"
-
-# @ECLASS_VARIABLE: REBAR_PROFILE
-# @DESCRIPTION:
-# Rebar profile to use.
-: "${REBAR_PROFILE:=default}"
-
-# @ECLASS_VARIABLE: REBAR_APP_SRC
-# @DESCRIPTION:
-# Relative path to .app.src description file.
-: "${REBAR_APP_SRC:=src/${PN}.app.src}"
-
-# @FUNCTION: get_erl_libs
-# @RETURN: the path to Erlang lib directory
-# @DESCRIPTION:
-# Get the full path without EPREFIX to Erlang lib directory.
-get_erl_libs() {
-	echo "/usr/$(get_libdir)/erlang/lib"
-}
-
-# @FUNCTION: _rebar_find_dep
-# @INTERNAL
-# @USAGE: <project_name>
-# @RETURN: 0 success, 1 dependency not found, 2 multiple versions found
-# @DESCRIPTION:
-# Find a Erlang package/project by name in Erlang lib directory. Project
-# directory is usually suffixed with version. It is matched to '<project_name>'
-# or '<project_name>-*'.
-_rebar_find_dep() {
-	local pn="${1}"
-	local p
-	local result
-
-	pushd "${EPREFIX}/$(get_erl_libs)" >/dev/null || return 1
-	for p in ${pn} ${pn}-*; do
-		if [[ -d ${p} ]]; then
-			# Ensure there's at most one matching.
-			[[ ${result} ]] && return 2
-			result="${p}"
-		fi
-	done
-	popd >/dev/null || die
-
-	[[ ${result} ]] || return 1
-	echo "${result}"
-}
-
-# @FUNCTION: rebar_disable_coverage
-# @USAGE: [<rebar_config>]
-# @DESCRIPTION:
-# Disable coverage in rebar.config. This is a workaround for failing coverage.
-# Coverage is not relevant in this context, so there's no harm to disable it,
-# although the issue should be fixed.
-rebar_disable_coverage() {
-	debug-print-function ${FUNCNAME} "${@}"
-
-	local rebar_config="${1:-rebar.config}"
-
-	sed -e 's/{cover_enabled, true}/{cover_enabled, false}/' \
-		-i "${rebar_config}" \
-		|| die "failed to disable coverage in ${rebar_config}"
-}
-
-# @FUNCTION: erebar3
-# @USAGE: <targets>
-# @DESCRIPTION:
-# Run rebar with verbose flag. Die on failure.
-erebar3() {
-	debug-print-function ${FUNCNAME} "${@}"
-
-	(( $# > 0 )) || die "erebar: at least one target is required"
-
-	case ${1} in
-		eunit|ct)
-			local -x ERL_LIBS="." ;;
-		*)
-			local -x ERL_LIBS="${EPREFIX}/$(get_erl_libs)" ;;
-	esac
-
-	edo rebar3 "$@"
-}
-
-# @FUNCTION: rebar_fix_include_path
-# @USAGE: <project_name> [<rebar_config>]
-# @DESCRIPTION:
-# Fix path in rebar.config to 'include' directory of dependent project/package,
-# so it points to installation in system Erlang lib rather than relative 'deps'
-# directory.
-#
-# <rebar_config> is optional. Default is 'rebar.config'.
-#
-# The function dies on failure.
-rebar_fix_include_path() {
-	debug-print-function ${FUNCNAME} "${@}"
-
-	local pn="${1}"
-	local rebar_config="${2:-rebar.config}"
-	local erl_libs="${EPREFIX}/$(get_erl_libs)"
-	local p
-
-	p="$(_rebar_find_dep "${pn}")" \
-		|| die "failed to unambiguously resolve dependency of '${pn}'"
-
-	gawk -i inplace \
-		-v erl_libs="${erl_libs}" -v pn="${pn}" -v p="${p}" '
-/^{[[:space:]]*erl_opts[[:space:]]*,/, /}[[:space:]]*\.$/ {
-	pattern = "\"(./)?deps/" pn "/include\"";
-	if (match($0, "{i,[[:space:]]*" pattern "[[:space:]]*}")) {
-		sub(pattern, "\"" erl_libs "/" p "/include\"");
-	}
-	print $0;
-	next;
-}
-1
-' "${rebar_config}" || die "failed to fix include paths in ${rebar_config} for '${pn}'"
-}
-
-# @FUNCTION: rebar_remove_deps
-# @USAGE: [<rebar_config>]
-# @DESCRIPTION:
-# Remove dependencies list from rebar.config and deceive build rules that any
-# dependencies are already fetched and built. Otherwise rebar tries to fetch
-# dependencies and compile them.
-#
-# <rebar_config> is optional. Default is 'rebar.config'.
-#
-# The function dies on failure.
-rebar_remove_deps() {
-	debug-print-function ${FUNCNAME} "${@}"
-
-	local rebar_config="${1:-rebar.config}"
-
-	mkdir -p "${S}/deps" && :>"${S}/deps/.got" && :>"${S}/deps/.built" || die
-	gawk -i inplace '
-/^{[[:space:]]*deps[[:space:]]*,/, /}[[:space:]]*\.$/ {
-	if ($0 ~ /}[[:space:]]*\.$/) {
-		print "{deps, []}.";
-	}
-	next;
-}
-1
-' "${rebar_config}" || die "failed to remove deps from ${rebar_config}"
-}
-
-# @FUNCTION: rebar_set_vsn
-# @USAGE: [<version>]
-# @DESCRIPTION:
-# Set version in project description file if it's not set.
-#
-# <version> is optional. Default is PV stripped from version suffix.
-#
-# The function dies on failure.
-rebar_set_vsn() {
-	debug-print-function ${FUNCNAME} "${@}"
-
-	local version="${1:-${PV%_*}}"
-
-	sed -e "s/vsn, git/vsn, \"${version}\"/" \
-		-i "${S}/${REBAR_APP_SRC}" \
-		|| die "failed to set version in src/${PN}.app.src"
-}
-
-# @FUNCTION: rebar3_src_prepare
-# @DESCRIPTION:
-# Prevent rebar from fetching and compiling dependencies. Set version in
-# project description file if it's not set.
-#
-# Existence of rebar.config is optional, but file description file must exist
-# at 'src/${PN}.app.src'.
-rebar3_src_prepare() {
-	debug-print-function ${FUNCNAME} "${@}"
-
-	default_src_prepare
-	rebar_set_vsn
-	rm -f rebar.lock
-	if [[ -f rebar.config ]]; then
-		rebar_disable_coverage
-		rebar_remove_deps
-	fi
-}
-
-# @FUNCTION: rebar3_src_configure
-# @DESCRIPTION:
-# Configure with ERL_LIBS set.
-rebar3_src_configure() {
-	debug-print-function ${FUNCNAME} "${@}"
-
-	local -x ERL_LIBS="${EPREFIX}/$(get_erl_libs)"
-	default_src_configure
-}
-
-# @FUNCTION: rebar3_src_compile
-# @DESCRIPTION:
-# Compile project with rebar.
-rebar3_src_compile() {
-	debug-print-function ${FUNCNAME} "${@}"
-
-	erebar3 as "${REBAR_PROFILE}" release --all
-}
-
-# @FUNCTION: rebar3_src_test
-# @DESCRIPTION:
-# Run unit tests.
-rebar3_src_test() {
-	debug-print-function ${FUNCNAME} "${@}"
-
-	erebar3 eunit -v
-}
-
-# @FUNCTION: rebar3_install_lib
-# @USAGE: <dir>
-# @DESCRIPTION:
-# Install BEAM files, include headers and native libraries.
-#
-# Function expects that project conforms to Erlang/OTP structure.
-rebar3_install_lib() {
-	debug-print-function ${FUNCNAME} "${@}"
-
-	local dest="$(get_erl_libs)/${P}"
-	insinto "${dest}"
-
-	pushd "${1?}" >/dev/null || die
-	for dir in ebin include priv; do
-		if [[ -d ${dir} && ! -L ${dir} ]]; then
-			cp -pR ${dir} "${ED%/}/${dest}/" || die "failed to install ${dir}/"
-		fi
-	done
-	popd >/dev/null || die
-}
-
-# @FUNCTION: rebar3_src_install
-# @DESCRIPTION:
-# Install built release or library.
-#
-# Function expects that project conforms to Erlang/OTP structure.
-rebar3_src_install() {
-	debug-print-function ${FUNCNAME} "${@}"
-
-	pushd "_build/${REBAR_PROFILE}" >/dev/null || die
-	if [[ -d rel/${PN} ]]; then
-		if ! declare -f rebar3_install_release >/dev/null; then
-			die "${FUNCNAME}: a custom function named 'rebar3_install_release' is required to install a release"
-		fi
-		pushd rel/${PN} >/dev/null || die
-		rebar3_install_release || die
-		popd >/dev/null || die
-	elif [[ -d lib/${PN} ]]; then
-		rebar3_install_lib lib/${PN}
-	else
-		die "No releases or libraries to install"
-	fi
-	popd >/dev/null || die
-
-	einstalldocs
-}
-
-_REBAR3_ECLASS=1
-fi
-
-EXPORT_FUNCTIONS src_prepare src_compile src_test src_install
diff --git a/sys-kernel/uek-sources/Manifest b/sys-kernel/uek-sources/Manifest
index d5b2737db0..d481e12cab 100644
--- a/sys-kernel/uek-sources/Manifest
+++ b/sys-kernel/uek-sources/Manifest
@@ -6,6 +6,8 @@ DIST genpatches-5.15-168.base.tar.xz 6757748 BLAKE2B 32b6ebb14ed20864b51fef7cf5e
 DIST genpatches-5.15-168.extras.tar.xz 3972 BLAKE2B 6cde986105f72e9282c78f59c8bb82bd3ac7c5c03adb3b3c1c657204624df2a28048ac0fe095759d5906bcd6677831d9962894b76390c2861482440120e72fe5 SHA512 6e067603b8e0e318703a59347d38d7aeb44a3097c39df07881c0f5250207b05442053a8ddf32069ead729ab4c36ccc1177ee8d82417ae2dbe16014b221d0d1ad
 DIST genpatches-5.15-171.base.tar.xz 6912380 BLAKE2B 3d5572ca2854c0dcaa6000ffc7ccc6921115f95ada5e8902c5681c5e0367f525bc658afd504dfabf25111ad1a9a6f6de1bf90e699fec38be68997f1e780f4715 SHA512 176edf85ec8e212036ce90b83a1a00bae1ea84770d8cf60c4f313498a219644a29774da6be34247ad55e6def08b4fe2f1c4a880c528c1d98e63a65acb0ba5a2c
 DIST genpatches-5.15-171.extras.tar.xz 4048 BLAKE2B 823bf5a1a62a3a4f97ae296bf78581a3b8ba79134e8ec7098385e23783c317509f8320afb9ff0c25ebfd5b3fb32aa883afa970ac86c550c2d70613d8af7da5e3 SHA512 f2eacb2ebda97e86c20f24a6ab591b6c41fa831947610febce3589d32fb326d9439b63273c2ffe82630157b7559141598e5bb5edbe939e1bed45bca802085f1a
+DIST genpatches-5.15-172.base.tar.xz 7003732 BLAKE2B 0f9a38b1a0b8d85429b9f66eaf0fdb7f854f62d6e61c556bfc618d551c8497ded8d1413f8f0c9bcc27988faeb718c73646ae1437b14793837d14d5587f69aa2e SHA512 fcff72f4ddbca1c2fbd012e66ab2d1b1c9a666192edeceabe51a99588564a0937d88c62c8bd71c6a701577ead62bd543b77b520e159f2b60764c6ffd3bcd24fa
+DIST genpatches-5.15-172.extras.tar.xz 4048 BLAKE2B e9120574a9febf01edcb43d4c582fcbb90a05934d23c671b225a1c6d0ca8646d9efad2587497f6642024a7e1026f9b7dd56b49e79fd355d73848ee04e1dfb3e2 SHA512 582fd7b0360c7250ee8336079383d2b64bb96b22a86929a54157c1fbece2c18b88d0751adc13ba602cfcf7b39ddb249ea11449d6f56d1a3c55aa25f87d2d77ff
 DIST linux-uek-5.15.0-206.149.1.tar.gz 202941586 BLAKE2B e75c447582f0d3e33260a35e2994df87187f54dbd109143a4f4898899b13a026f60b668e0643c3828b6357584fa7c50d2ce1c1940a2a1ad562733ff2da463341 SHA512 5dc1491e00302cf52343deffd7fb36b698ed03559f49a9703659b8d1ba4f26e2d61485b0f0251936be18d29cbfbffd5ccdc8c6f12c938d2aeaaa4bc01c720c58
 DIST linux-uek-5.15.0-206.153.6.tar.gz 202965511 BLAKE2B 56249d6355c29e6770e483f92c9bbe0845fc6908bed0eac26104fc6664682565ec536fb05be036d07b61ddb583105f74ccf836061caf7e77bad979ca245f75c6 SHA512 b1b292491659002217308e3c0160d2568815645d2d2afd3497a16db4873208ed8754183f5c36e92a17f17668df32d0b3e1fdd48ce4e3819bf2f85c587acc5abf
 DIST linux-uek-5.15.0-206.153.7.tar.gz 202989143 BLAKE2B 974d2d983d38cdd9e526822d2091aaca4986f3078311347df968544676c63ece28cc9f7d4a4e47cb15b6655dc305a5d45105fee3a4dc8092201bb8906837abcd SHA512 6af27ed8f0ae95459182171437aac731b94d681ffc19885136dd0c3489fd6e262139ba276b269b293afd921b674e4af735352868263d98741aef891993e3b341
diff --git a/sys-kernel/uek-sources/uek-sources-5.15.0.300.159.7-r1.ebuild b/sys-kernel/uek-sources/uek-sources-5.15.0.300.159.7-r1.ebuild
new file mode 100644
index 0000000000..487ea43bed
--- /dev/null
+++ b/sys-kernel/uek-sources/uek-sources-5.15.0.300.159.7-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_VERSION=$(ver_cut 1-3)
+KERNEL_TRUNK=$(ver_cut 1-2)
+UEK_PATCH_VERSION=$(ver_cut 4-6)
+UEK_VERSION="${KERNEL_VERSION}-${UEK_PATCH_VERSION}"
+
+ETYPE="sources"
+
+K_GENPATCHES_VER="172"
+K_SECURITY_UNSUPPORTED="1"
+CKV="${KERNEL_VERSION}_p${UEK_PATCH_VERSION}"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+DESCRIPTION="Unbreakable Enterprise Kernel (UEK) sources built from Oracle"
+HOMEPAGE="https://github.com/oracle/linux-uek"
+SRC_URI="
+	https://github.com/oracle/linux-uek/archive/refs/tags/v${UEK_VERSION}.tar.gz
+		-> linux-uek-${UEK_VERSION}.tar.gz
+	mirror://gentoo/genpatches-${KERNEL_TRUNK}-${K_GENPATCHES_VER}.base.tar.xz
+	mirror://gentoo/genpatches-${KERNEL_TRUNK}-${K_GENPATCHES_VER}.extras.tar.xz
+"
+#mirror://gentoo/genpatches-${KERNEL_TRUNK}-${K_GENPATCHES_VER}.experimental.tar.xz
+S="${WORKDIR}/linux-uek-${UEK_VERSION}"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64"
+IUSE="+gentoo experimental"
+
+PATCHES=(
+	"${FILESDIR}"/uek-sources-5.4.17.2136.303.2-O3.patch
+)
+
+src_unpack() {
+	default
+
+	# remove all backup files
+	find . -iname "*~" -print -exec rm {} \; 2>/dev/null
+
+	unpack_set_extraversion
+	unpack_fix_install_path
+
+	env_setup_xmakeopts
+}
+
+src_prepare() {
+	use gentoo && PATCHES+=(
+		"${WORKDIR}"/1500_XATTR_USER_PREFIX.patch
+		"${WORKDIR}"/1510_fs-enable-link-security-restrictions-by-default.patch
+		"${WORKDIR}"/2000_BT-Check-key-sizes-only-if-Secure-Simple-Pairing-enabled.patch
+		"${WORKDIR}"/2920_sign-file-patch-for-libressl.patch
+		"${WORKDIR}"/3000_Support-printing-firmware-info.patch
+		"${WORKDIR}"/4567_distro-Gentoo-Kconfig.patch
+	)
+	#use experimental && PATCHES+=(
+	#	"${WORKDIR}"/5010_enable-cpu-optimizations-universal.patch
+	#)
+	default
+}