80 files changed, 939 insertions, 1209 deletions
diff --git a/app-arch/7-zip/7-zip-22.01.ebuild b/app-arch/7-zip/7-zip-22.01.ebuild
deleted file mode 100644
index 81229fc..0000000
--- a/app-arch/7-zip/7-zip-22.01.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-MY_PV=${PV%%_*}
-MY_PV=${MY_PV//./}
-
-DESCRIPTION="File archiver with a high compression ratio"
-HOMEPAGE="https://7-zip.org/"
-SRC_URI="https://7-zip.org/a/7z${MY_PV}-src.tar.xz"
-
-LICENSE="LGPL-2.1+ BSD rar? ( unRAR )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+asm rar"
-
-BDEPEND="
-	asm? ( dev-lang/jwasm )
-"
-RDEPEND="!app-arch/p7zip"
-
-S=${WORKDIR}
-
-PATCHES=(
-	"${FILESDIR}/7-zip-flags.patch"
-	"${FILESDIR}/7-zip-less-asm.patch"
-)
-
-src_compile() {
-	cd CPP/7zip/Bundles/Alone2 || die
-	local myemakeargs=(
-		CC="$(tc-getCC) ${CFLAGS} -fno-strict-aliasing ${LDFLAGS}"
-		CXX="$(tc-getCXX) ${CXXFLAGS} -fno-strict-aliasing ${LDFLAGS}"
-	)
-	if use asm; then
-		myemakeargs+=(USE_ASM=1 USE_JWASM=1)
-		if use amd64; then
-			myemakeargs+=(IS_X64=1)
-		elif use arm64; then
-			myemakeargs+=(IS_ARM64=1)
-		elif use x86; then
-			myemakeargs+=(IS_X86=1)
-		else
-			einfo "asm is not supported on this arch, ignoring"
-		fi
-	fi
-	use rar || myemakeargs+=(DISABLE_RAR=1)
-	mkdir -p b/g || die
-	emake -f ../../cmpl_gcc.mak "${myemakeargs[@]}"
-}
-
-src_install() {
-	dobin CPP/7zip/Bundles/Alone2/b/g/7zz
-	dosym 7zz /usr/bin/7z
-	dodoc DOC/*
-}
diff --git a/app-arch/7-zip/Manifest b/app-arch/7-zip/Manifest
deleted file mode 100644
index ac40149..0000000
--- a/app-arch/7-zip/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST 7z2201-src.tar.xz 1291560 BLAKE2B 1d88234fdf9d7074e3dc6c243c209f694897ac23f82d7f5d4767186114245c1aa9c4290c8a538dc3cdd1074385ae9142f1efd22771942ec63d8c00ed38b7082b SHA512 3f391b1bd65a0654eb5b31b50f1d400f0ec38ab191d88e15849a6e4d164b7bf2ce4a6d70ec8b6e27bde1b83bb2d45b65c03129499334669e05ee025784be455a
diff --git a/app-arch/7-zip/files/7-zip-flags.patch b/app-arch/7-zip/files/7-zip-flags.patch
deleted file mode 100644
index 963037c..0000000
--- a/app-arch/7-zip/files/7-zip-flags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -ru a/CPP/7zip/7zip_gcc.mak b/CPP/7zip/7zip_gcc.mak
---- a/CPP/7zip/7zip_gcc.mak	2021-11-20 04:00:00.000000000 -0500
-+++ b/CPP/7zip/7zip_gcc.mak	2021-12-16 11:01:16.236763027 -0500
-@@ -14,13 +14,13 @@
- 
- 
- ifneq ($(CC), xlc)
--CFLAGS_WARN_WALL = -Wall -Werror -Wextra
-+CFLAGS_WARN_WALL = -Wall -Wextra
- endif
- 
- # for object file
- CFLAGS_BASE_LIST = -c
- # CFLAGS_BASE_LIST = -S
--CFLAGS_BASE = -O2 $(CFLAGS_BASE_LIST) $(CFLAGS_WARN_WALL) $(CFLAGS_WARN) \
-+CFLAGS_BASE = $(CFLAGS_BASE_LIST) $(CFLAGS_WARN_WALL) $(CFLAGS_WARN) \
-  -DNDEBUG -D_REENTRANT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
-  -fPIC
- 
-@@ -162,7 +162,7 @@
- $(O):
- 	$(MY_MKDIR) $(O)
- 
--LFLAGS_ALL = -s $(MY_ARCH_2) $(LDFLAGS) $(LD_arch) $(OBJS) $(MY_LIBS) $(LIB2)
-+LFLAGS_ALL = $(MY_ARCH_2) $(LDFLAGS) $(LD_arch) $(OBJS) $(MY_LIBS) $(LIB2)
- $(PROGPATH): $(OBJS)
- 	$(CXX) -o $(PROGPATH) $(LFLAGS_ALL)
- 
diff --git a/app-arch/7-zip/files/7-zip-less-asm.patch b/app-arch/7-zip/files/7-zip-less-asm.patch
deleted file mode 100644
index 040b445..0000000
--- a/app-arch/7-zip/files/7-zip-less-asm.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/CPP/7zip/7zip_gcc.mak	2021-12-25 09:00:00.000000000 -0500
-+++ b/CPP/7zip/7zip_gcc.mak	2022-05-13 12:20:17.539629635 -0400
-@@ -1127,21 +1127,6 @@
- endif
- endif
- 
--ifdef USE_X86_ASM
--$O/7zCrcOpt.o: ../../../../Asm/x86/7zCrcOpt.asm
--	$(MY_ASM) $(AFLAGS) $<
--$O/XzCrc64Opt.o: ../../../../Asm/x86/XzCrc64Opt.asm
--	$(MY_ASM) $(AFLAGS) $<
--$O/Sha1Opt.o: ../../../../Asm/x86/Sha1Opt.asm
--	$(MY_ASM) $(AFLAGS) $<
--$O/Sha256Opt.o: ../../../../Asm/x86/Sha256Opt.asm
--	$(MY_ASM) $(AFLAGS) $<
--
--ifndef USE_JWASM
--USE_X86_ASM_AES=1
--endif
--
--else
- $O/7zCrcOpt.o: ../../../../C/7zCrcOpt.c
- 	$(CC) $(CFLAGS) $<
- $O/XzCrc64Opt.o: ../../../../C/XzCrc64Opt.c
-@@ -1150,16 +1135,10 @@
- 	$(CC) $(CFLAGS) $<
- $O/Sha256Opt.o: ../../../../C/Sha256Opt.c
- 	$(CC) $(CFLAGS) $<
--endif
- 
- 
--ifdef USE_X86_ASM_AES
--$O/AesOpt.o: ../../../../Asm/x86/AesOpt.asm
--	$(MY_ASM) $(AFLAGS) $<
--else
- $O/AesOpt.o: ../../../../C/AesOpt.c
- 	$(CC) $(CFLAGS) $<
--endif
- 
- 
- ifdef USE_X64_ASM
diff --git a/app-arch/7-zip/metadata.xml b/app-arch/7-zip/metadata.xml
deleted file mode 100644
index d212dd9..0000000
--- a/app-arch/7-zip/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>alex_y_xu@yahoo.ca</email>
-		<name>Alex Xu (Hello71)</name>
-	</maintainer>
-	<use>
-		<flag name="asm">Use assembly implementations (currently only amd64, arm64, x86)</flag>
-		<flag name="rar">RAR archive support, requires accepting unRAR license</flag>
-	</use>
-</pkgmetadata>
diff --git a/app-arch/unar/Manifest b/app-arch/unar/Manifest
deleted file mode 100644
index 270ff06..0000000
--- a/app-arch/unar/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST XADMaster-1.10.7.tar.gz 2064770 BLAKE2B f6119dfb46f3d617fafb5847f41d6c0f3e5e87c8cd0763cd8e5986fae1d5b1c6e6761e9e7e4fa84125003979151b2b34d35ff47dc9be3271107cf53f1be22644 SHA512 3447b6d8f3f4fa5eea93c6628a1633017da6ff09c580d5ce4fd422027b3b79acbf38d6e41a059806d1e60eb25a9d66889938b32599168dc2c0ca648e1c1976b1
-DIST universal-detector-1.1.tar.gz 196274 BLAKE2B d84dc1f850031213d88c288341edcbb588197f23ae0d10632ed129e73e4cc2b7670c8c862bba2165fcc7421c265e4dc3e791ea188e3d2b647bd1ab9b428bb866 SHA512 e514670b3d37b2472ed3e9cb0fdc3298a8479772264b7573411f104be554222bec2e01f73e1f35db95620fe785bee2dcf9ddc9c2b1f4ff6b522fa64d14d020f5
diff --git a/app-arch/unar/metadata.xml b/app-arch/unar/metadata.xml
deleted file mode 100644
index b6ae255..0000000
--- a/app-arch/unar/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<upstream>
-		<remote-id type="github">MacPaw/XADMaster</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-arch/unar/unar-1.10.7-r1.ebuild b/app-arch/unar/unar-1.10.7-r1.ebuild
deleted file mode 100644
index 30a0409..0000000
--- a/app-arch/unar/unar-1.10.7-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 toolchain-funcs
-
-DESCRIPTION="Unpacker for various archiving formats, e.g. rar v3"
-HOMEPAGE="https://unarchiver.c3.cx/"
-SRC_URI="
-	https://github.com/MacPaw/XADMaster/archive/v${PV}/XADMaster-${PV}.tar.gz
-	https://github.com/MacPaw/universal-detector/archive/1.1/universal-detector-1.1.tar.gz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	app-arch/bzip2:=
-	dev-libs/icu:=
-	gnustep-base/gnustep-base:=
-	media-sound/wavpack
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	${BDEPEND}
-	gnustep-base/gnustep-make[native-exceptions]
-"
-
-S="${WORKDIR}/XADMaster-${PV}"
-
-src_prepare() {
-	default
-	# avoid jobserver warning "make[1]: warning: jobserver unavailable: using -j1"
-	sed -i -e 's:make:$(MAKE):g' Makefile.linux || die
-	mv "${WORKDIR}/universal-detector-1.1" "${WORKDIR}/UniversalDetector" || die
-}
-
-src_compile() {
-	emake -f Makefile.linux \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		OBJCC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		CXXFLAGS="${CXXFLAGS}" \
-		OBJCFLAGS="${CFLAGS}" \
-		LD="$(tc-getCXX)" \
-		LDFLAGS="-Wl,--whole-archive -fexceptions -fgnu-runtime ${LDFLAGS}"
-}
-
-src_install() {
-	dobin {ls,un}ar
-	doman Extra/{ls,un}ar.1
-	dobashcomp Extra/{ls,un}ar.bash_completion
-}
diff --git a/app-text/zathura/Manifest b/app-text/zathura/Manifest
deleted file mode 100644
index 10f9a96..0000000
--- a/app-text/zathura/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST zathura-0.5.2.tar.gz 208606 BLAKE2B fc7e8042a373a3fd66973fd5d6c7c3e7d6da884fb40269545e4074b42fdbc9b6f286089769a435394812e24a8b24de328521a2fd797bbb13c16115b112dd9a48 SHA512 17f2a6535b2b3c6f61986cd8a6ccdef2c1a129d8ebf8c86cbe3c8eac868c2780801f3fe2fdc17c429ca0c63a71a328bbb6c7f814f82714dd7f1a5a4728663b1f
diff --git a/app-text/zathura/files/zathura-disable-seccomp-tests.patch b/app-text/zathura/files/zathura-disable-seccomp-tests.patch
deleted file mode 100644
index f3d88a2..0000000
--- a/app-text/zathura/files/zathura-disable-seccomp-tests.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/tests/meson.build b/tests/meson.build
-index ac7edb8..68216f3 100644
---- a/tests/meson.build
-+++ b/tests/meson.build
-@@ -25,17 +25,6 @@ if check.found()
-     timeout: 60*60
-   )
- 
--  if seccomp.found()
--    sandbox = executable('test_sandbox', ['test_sandbox.c', 'tests.c'],
--      dependencies: build_dependencies + test_dependencies,
--      include_directories: include_directories,
--      c_args: defines + flags
--    )
--    test('sandbox', sandbox,
--      timeout: 60*60
--    )
--  endif
--
-   utils = executable('test_utils', ['test_utils.c', 'tests.c'],
-     dependencies: build_dependencies + test_dependencies,
-     include_directories: include_directories,
diff --git a/app-text/zathura/files/zathura-docutils.patch b/app-text/zathura/files/zathura-docutils.patch
deleted file mode 100644
index 7d313f6..0000000
--- a/app-text/zathura/files/zathura-docutils.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-diff --git a/doc/man/conf.py b/doc/man/conf.py
-deleted file mode 100644
-index 2aad25f..0000000
---- a/doc/man/conf.py
-+++ /dev/null
-@@ -1,36 +0,0 @@
--# -*- coding: utf-8 -*-
--#
--# SPDX-License-Identifier: Zlib
--
--import os.path
--import glob
--import time
--
--dirname = os.path.dirname(__file__)
--files = glob.glob(os.path.join(dirname, '*.rst'))
--
--maxdate = 0
--for path in files:
--    s = os.stat(path)
--    maxdate = max(maxdate, s.st_mtime)
--
--# -- General configuration ------------------------------------------------
--
--source_suffix  = '.rst'
--master_doc     = 'zathura.1'
--templates_path = ['_templates']
--today          = time.strftime('%Y-%m-%d', time.gmtime(maxdate))
--
--# -- Project configuration ------------------------------------------------
--
--project   = 'zathura'
--copyright = '2009-2018, pwmt.org'
--version   = '0.2.7'
--release   = '0.2.7'
--
--# -- Options for manual page output ---------------------------------------
--
--man_pages = [
--    ('zathura.1', 'zathura', 'a document viewer', ['pwmt.org'], 1),
--    ('zathurarc.5', 'zathurarc', 'zathura configuration file', ['pwmt.org'], 5)
--]
-diff --git a/doc/man/zathura.1.rst b/doc/man/zathura.1.rst
-index 089dbf7..19cc44c 100644
---- a/doc/man/zathura.1.rst
-+++ b/doc/man/zathura.1.rst
-@@ -1,5 +1,14 @@
--Manpage
- =======
-+zathura
-+=======
-+
-+-----------------
-+a document viewer
-+-----------------
-+
-+:Author: pwmt.org
-+:Copyright: 2009-2018, pwmt.org
-+:Manual section: 1
- 
- Synopsis
- --------
-diff --git a/doc/man/zathurarc.5.rst b/doc/man/zathurarc.5.rst
-index bf519ae..1ec6462 100644
---- a/doc/man/zathurarc.5.rst
-+++ b/doc/man/zathurarc.5.rst
-@@ -2,6 +2,14 @@
- zathurarc
- *********
- 
-+--------------------------
-+zathura configuration file
-+--------------------------
-+
-+:Author: pwmt.org
-+:Copyright: 2009-2018, pwmt.org
-+:Manual section: 5
-+
- SYNOPSIS
- ========
- 
-diff --git a/doc/meson.build b/doc/meson.build
-index b67c8ab..a02116b 100644
---- a/doc/meson.build
-+++ b/doc/meson.build
-@@ -1,24 +1,10 @@
--sphinx = find_program('sphinx-build', required: get_option('manpages'))
--if sphinx.found()
--  custom_target('man pages',
--    command: [
--      sphinx,
--      '-b', 'man',
--      '-D', 'version=' + version,
--      '-D', 'release=' + version,
--      join_paths(meson.current_source_dir(), 'man'),
--      meson.current_build_dir()],
--    output: ['zathura.1', 'zathurarc.5'],
--    input: [
--      'man/conf.py',
--      'man/zathurarc.5.rst',
--      'man/zathura.1.rst'
--    ],
--    build_by_default: true,
--    install: true,
--    install_dir: [
--      join_paths(get_option('mandir'), 'man1'),
--      join_paths(get_option('mandir'), 'man5')
--    ]
--  )
-+rst2man = find_program('rst2man', 'rst2man.py', required: get_option('manpages'))
-+
-+if rst2man.found()
-+  custom_target('zathura.1', input: [ 'man/zathura.1.rst' ], output: [ 'zathura.1' ],
-+                command: [rst2man, '@INPUT@', '@OUTPUT@'], install: true,
-+                install_dir: join_paths(get_option('mandir'), 'man1'))
-+  custom_target('zathurarc.5', input: [ 'man/zathurarc.5.rst' ], output: [ 'zathurarc.5' ],
-+                command: [rst2man, '@INPUT@', '@OUTPUT@'], install: true,
-+                install_dir: join_paths(get_option('mandir'), 'man5'))
- endif
diff --git a/app-text/zathura/metadata.xml b/app-text/zathura/metadata.xml
deleted file mode 100644
index f7b9cf8..0000000
--- a/app-text/zathura/metadata.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>slashbeast@gentoo.org</email>
-		<name>Piotr Karbowski</name>
-	</maintainer>
-	<use>
-		<flag name="synctex">Use libsynctex to get latex codeline from pdf</flag>
-	</use>
-	<upstream>
-		<maintainer status="active">
-			<email>mlq@pwmt.org</email>
-			<name>Moritz Lipp</name>
-		</maintainer>
-		<maintainer status="active">
-			<email>sebastian+dev@ramacher.at</email>
-			<name>Sebastian Ramacher</name>
-		</maintainer>
-		<changelog>http://pwmt.org/projects/zathura/download/</changelog>
-		<doc lang="en">http://pwmt.org/projects/zathura/</doc>
-		<bugs-to>http://bugs.pwmt.org/</bugs-to>
-	</upstream>
-</pkgmetadata>
diff --git a/app-text/zathura/zathura-0.5.2-r3.ebuild b/app-text/zathura/zathura-0.5.2-r3.ebuild
deleted file mode 100644
index da82595..0000000
--- a/app-text/zathura/zathura-0.5.2-r3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson virtualx xdg
-
-DESCRIPTION="A highly customizable and functional document viewer"
-HOMEPAGE="https://pwmt.org/projects/zathura/"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
-	EGIT_BRANCH="develop"
-else
-	SRC_URI="https://github.com/pwmt/zathura/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="ZLIB"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="seccomp sqlite synctex test"
-
-RESTRICT="!test? ( test )"
-
-DEPEND=">=dev-libs/girara-0.3.7
-	>=dev-libs/glib-2.50:2
-	>=sys-devel/gettext-0.19.8
-	x11-libs/cairo
-	>=x11-libs/gtk+-3.22:3
-	sys-apps/file
-	seccomp? ( sys-libs/libseccomp )
-	sqlite? ( >=dev-db/sqlite-3.5.9:3 )
-	synctex? ( app-text/texlive-core )"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="dev-python/docutils
-	test? ( dev-libs/appstream-glib
-		dev-libs/check )
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/zathura-disable-seccomp-tests.patch
-	"${FILESDIR}/zathura-docutils.patch"
-)
-
-src_configure() {
-	local emesonargs=(
-		-Dconvert-icon=disabled
-		-Dmanpages=enabled
-		-Dseccomp=$(usex seccomp enabled disabled)
-		-Dsqlite=$(usex sqlite enabled disabled)
-		-Dsynctex=$(usex synctex enabled disabled)
-		)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
diff --git a/dev-dotnet/dotnet-runtime-bin/Manifest b/dev-dotnet/dotnet-runtime-bin/Manifest
index 146e455..8148053 100644
--- a/dev-dotnet/dotnet-runtime-bin/Manifest
+++ b/dev-dotnet/dotnet-runtime-bin/Manifest
@@ -1,9 +1,18 @@
-DIST dotnet-runtime-3.1.32-linux-arm.tar.gz 31846724 BLAKE2B c3515a186492cebe9fc5d094c5d983fe7cc9eb6747d3ef2600fcf5fa628c1e17fc1a05c32cb5679a819702c92250e53bfe29c8e6932cfd1abdd392231363d042 SHA512 eaa5e439e9a70ca72a1de731e4b2b7b97e59c8d60bc694e0a08c8da6246aaecc3498dc14729c83140039a285a8cda8fcd334bdc81e507d97c2f92b9dffcf0140
-DIST dotnet-runtime-3.1.32-linux-arm64.tar.gz 30300088 BLAKE2B c6ff1d6e3b451712df38ebe8694bc9a3b9b3ebc5125b73c274f823c25bc755083b49134e3d10ff4a3a75516cb2f6c72ce1162bd2135749506e6fa56e906d4f08 SHA512 ff311df0db488f3b5cc03c7f6724f8442de7e60fa0a503ec8f536361ce7a357ad26d09d2499d68c50ebdfa751a5520bba4aaa77a38b191c892d5a018561ce422
-DIST dotnet-runtime-3.1.32-linux-x64.tar.gz 30466403 BLAKE2B 0e79d0bc3319529f6ebf00b6b7bb0010b7f62cee89aabab22758e3f9935926415a00351169dc96fb9286c244ca59b55215c8da8e318e6750c7eddb7defe0d5c6 SHA512 a1de9bbc3d2e3a4f5f52b7742c678b182a58a724d36232997511e390027044d60144a7e010a29d6ee016ec91f2911daef28ac5712a827fff8bdde73314b7e002
-DIST dotnet-runtime-6.0.12-linux-arm.tar.gz 28624442 BLAKE2B 7b0c0f8f0a15e870cd087d2989ceffc9a39f16155d8256b4a7a5d748da37f80bccceaac0f9ddd5771589c5fe9ce2547e39b184e728cae535b5f1c6a73e169705 SHA512 c3bf5d831ed36a42f8b775923eb7f039fc2bd36d87f13228ef2005dad74744c8f49f1359bcd34bba244eed64d365eb40d35e76bd3dd41faa47428c1c652ebef4
-DIST dotnet-runtime-6.0.12-linux-arm64.tar.gz 28387811 BLAKE2B f792d474aafa21058e63eebc4d5268f13bd863f46e39c4fceaa2a63475c7320bc3ed4fd2545d9ac334fbf8b919094792d14b1186200ab49a95badddd2f4b020b SHA512 4fc1b7ca6429abcf586a2d106b2b7e345d024c174a303a607c21f7a00071362ca9f7f85e2c583db18caa597a0404af379a740c0fd180045051ab081d571a9a25
-DIST dotnet-runtime-6.0.12-linux-x64.tar.gz 30688050 BLAKE2B 3d9e061de584f73054e5de9ffc36fec640b5264dea95dc07fea3ee24457989a3742c88f2dcf19ea89d23f784e5d0b5c32b09b6d0570b9e5e97fe0fd7363f2a1f SHA512 74fc12712a1ab29f864592c21252db9710bebc965f502d0eb2ae5473da1d9bd3381195859cc452e3beec0ac91094e1c034c6a51c0378dada65fb2581efb73f13
-DIST dotnet-runtime-7.0.1-linux-arm.tar.gz 29655058 BLAKE2B 4af51ca6c22084d6e59948370e88a9adf538fc3aa259ef0cc460af940e28a4cbf8b284cb2ec548e571be5c9d2bf1c4a6ab2fa744680e2e1ac9f08f305b3b9664 SHA512 2ff35a40fe8809743eacea8d38c15aaffa54f17aaaaa07914c437e912c7253ae7d143fb8a968ed98238af8cb6d14f36b5b062a6a4297c16bae75b46f3b040e26
-DIST dotnet-runtime-7.0.1-linux-arm64.tar.gz 29764670 BLAKE2B 424e5d505d1a2795b3f2794bc4db9522b3f89d243e5a59b3e15688a6f40a9651561bd783a15a0293e4469f8095b3e8c900bf7f5db4870dac6c25ae332b69b950 SHA512 53e9b03326c2fdb8d2366a97f3cfbeca4f0f497b82cf665d5d4543f5d0fa8a177c53e8f48597f79072e962e3c7ef6baaca96143c2f775be52071e8ebbae88f34
-DIST dotnet-runtime-7.0.1-linux-x64.tar.gz 31479781 BLAKE2B 050b7826799d05a59b436fda9144f2ca629f033b77e9c46454fbd855c986176ef81dce25ed0abd6158575f80533e24c83d4d5494c7ac3634d81e6c48128b73a2 SHA512 db79b221f6bfa4d56fe0e2b7c237612bd74a81deb18f038ab7226b9e06eaea6e90909f1493f0ab4cf7778b6544b8aaa1295ece1c4a9f1fe39ca44bbfaced46c7
+DIST dotnet-runtime-6.0.36-linux-arm.tar.gz 28668069 BLAKE2B 38779311abe9eabf941d0e692575266170f380dfdae1a19a5aead83da71a38bb3a010037b041c834ec40fd35df0596f3a93268933849740c4963bbb8a658f3e7 SHA512 f3f9199a97db81d3e3ed249e0e9b8f17afb785e8b9ebad00016576382d3d0f2029a31eaf760be2509fde796a42efeb727b156488a42f48cc08013f87479cacfd
+DIST dotnet-runtime-6.0.36-linux-arm64.tar.gz 28419386 BLAKE2B b42909acefc8a7dd2328e628877c5903fba654930b24efd31984ddce14b36694fb5d60982dcd72a0486d42ad0b413fd2ee0f3debfdcde3c09dc82b5f43a6bb72 SHA512 aa9a35f181204199ac6c44863c4773f8967b25adce218e23ce2822b40b26c38edc1e4e2ff323dabb81ae049bc187f14d209ef1365e68970fd6c32af21f0a1d44
+DIST dotnet-runtime-6.0.36-linux-musl-arm.tar.gz 28682171 BLAKE2B 9d7e42a723b6b5d5b66a7977223fa772aa08c215e571166287e6694101d96365a937a4e28b64297f99b34c8c3fa121790e5da825dd03a2b8969f327fdb5327e2 SHA512 3dd539816405ec2d818f611a7cb98fe4069960e8ac4664ccca04ff8b2e0679387b0a3f2cc5045bef95657626ac1045bedc4e502da304ee54678afbbe83dcc3b3
+DIST dotnet-runtime-6.0.36-linux-musl-arm64.tar.gz 28445012 BLAKE2B 9baebfd86b7eee765b18cff5600df9459ea1c71d3d12defa9a13bb56926d2f309150cbde2abe7b49347de49433f3c7cfb92056f1b48a3f0dc463284844c87035 SHA512 0830715511ab602242487c5fae0dc7a5b75e0c9d7705e624181ec13cc4726a06d7935df952aeddda0dc2c46db95ab14af9d8229a2302b1e6d2fd7e892b42267b
+DIST dotnet-runtime-6.0.36-linux-musl-x64.tar.gz 30274917 BLAKE2B f91058ea230a8bf30aa1238f050d60fa20c197ad5a454c268c92a45149c1cc4ca0fa11a5769281fd6352107835406ca31dfe9e5ba6d247d6a4cc38205f448aa0 SHA512 56c2161c52901706fd769d2c9168cff5959576bd1a72d89f7c27858f467f59970624ea9a0559368462bc178e7c9ef7d86d0fda08c7dbdb72dd3e9084280823eb
+DIST dotnet-runtime-6.0.36-linux-x64.tar.gz 30710677 BLAKE2B 0ce592fa15dcb7fab1b4f6a56ce75319c704a4a7f20dbf8459f2217bfb8addae300f04c3fe62315167868e123f124c662c47f704b22b053a2866992bbf7735fe SHA512 afb6018fcabec468ccd7ae2f1131d8c9de7f4de7645b8f0c223efbbdbfdc515fb0642a399ebfe372c02044416c4cae463c9c802cd156b9da4181efff0e33ee94
+DIST dotnet-runtime-8.0.11-linux-arm.tar.gz 29507762 BLAKE2B fe596a37f5ff52e93c458ad4086b227660b091f7c28c6fc955529496a82875cc64f4ee70239e52735c4ccdceed8dbf54007d40edc6df22acabe82e4a39aca799 SHA512 279b93bf6b5c5c2f45427b620c56bff0e22ec8f3fb9a4f3749e7a6a0d0d0ee8163851b5bd081c6814b758068df7ba1b9401c844ba5905b27a830020846ef6406
+DIST dotnet-runtime-8.0.11-linux-arm64.tar.gz 29865496 BLAKE2B 9f083e8dc662fd33f4404c57114ddd15315c0d2f6e8a6927fe2850e615c82d8c7e3858079613b2ec18fd98c6317bf78499e3460239f84ae5155309e6c15fe937 SHA512 f27d66dcdd249a6a2f87241b460238960240d163ffc081d8e7b42bd62702079f1a6784e3503dbd4ea8f9e816d82142fc829c759cbf9a1682b0340f0cebe16db5
+DIST dotnet-runtime-8.0.11-linux-musl-arm.tar.gz 29525229 BLAKE2B 1cf7d9c412ef07ea1ab30e9f0511ca52a343115f364bc2dae1a13f3c1fc6f59ac134a1a8926dd564e4d3e1da4a2402552cf23e134fa303255b4f8b7ba2313c31 SHA512 e29ec7c4c123debfb1c20aa49eccdbcb6c493a0bca8d480c113d0e413b2b546ed01767b1056dda4b0f58029c147f513c3af95669d29cb2babdbda4d358b2d0fd
+DIST dotnet-runtime-8.0.11-linux-musl-arm64.tar.gz 29888696 BLAKE2B 7255f7948d8eec355b92445d8c8967a9efcb09cbf17cbacba1ab6bd2fb3810d45a0832acf4f9142206cc59624abf68fe83f02b263008f28f45385ee3a42d9284 SHA512 6a94ce888eb060f63a0ec9554985198c48c5c5612577db7c10204b58b2ef36ef96a597067d75574abdca61a87472914b5df3312be74773ac32fa7043d60370d8
+DIST dotnet-runtime-8.0.11-linux-musl-x64.tar.gz 31308143 BLAKE2B 72ef859e230be60a46a275b303fbcd11a6e8d3a46af482bcee82e5e7508c86385ce5670c73e447e438de1e180b0df1c5a17726cf34d397149af530d3b5565bc9 SHA512 ff00d19ced7ea204caccc6c11c484e5a1ecdb9ffa9ac9a6b8ed2f7f7c9089aad098e5b41d2ebe5c24cbbc0956df64032b62ed7277fac3d3b64b742c50209be61
+DIST dotnet-runtime-8.0.11-linux-x64.tar.gz 31277651 BLAKE2B a9f47f68b896461e8be209c5ca03e2cb17ee001a319dedce2a4cf18efedc633132afa905916344d4dd409f132b89dfe46c2673e5b5590c71bbc04bc4b9597361 SHA512 71ea528900c6fc7b54e951622296421d2a96191870c47e937117b84b28f91bf407d02046ddfecfe4ac37dc6182c65d1940927c33e45fa3d6f0179f81692490d6
+DIST dotnet-runtime-9.0.0-linux-arm.tar.gz 31224167 BLAKE2B 89713e8365b6307baa2849b437064f93536a6db58cad4c20fbfd116a70f83664ac07da05cd889acb188721d984484b661cd76b0bd2a1336538ec81235c638bcb SHA512 fab552df6d884090aba1f658c8812b5369e9bea17e6a1f905145cde512772b57db5d5cf586c6c2b7f2e56a8cb83c206f0cf7594bcf42d32844b8103538bd883f
+DIST dotnet-runtime-9.0.0-linux-arm64.tar.gz 31797263 BLAKE2B e406e8de36edc2f2102b6dd4e0ee6d3a17e1376a5d94079fb53238f09f3d99e33a79f68706d80e6eb18c44326236a54319f503d16a23782606037487d5f1c4e0 SHA512 4f9c2dd544af0b8540c16352b9f01f75f828b8e4e084057a300a4dec652fb3d6532906cdd4246399cc13f16b571b17575812ec2f9c297e27bbed678baf4b2fde
+DIST dotnet-runtime-9.0.0-linux-musl-arm.tar.gz 31214926 BLAKE2B 54e0b161d9a30a2c51c2f2a78e195689ff74b3e63e3f4a3b21804996c08ed10d1f05427a460caa7ad925948bd5cb755008efecabce242cb7e5669834f9983be8 SHA512 97dc1ddcac177d73b517d651326ec484eac52501c506c8c837c3f9ceaf476ddf929ccece9b6dc2c0a4e7d378576fd73930a8835814690631a560642527335b33
+DIST dotnet-runtime-9.0.0-linux-musl-arm64.tar.gz 31820840 BLAKE2B 906a367cbf4505e567ed49e0268c2a46043d8dc36583675e976f65af458d23dd7e84c2d4a5b031bf3876b01aa8327b370ad8389ed1b339ab26ce913dd77cf8a8 SHA512 33523364d9310b75d9819a4866b120c03b9ef7946bd3646b15930e37ff1e211de294c8a94b4ad6c1c0f7d291cb70601a4188e396d4252f5767a36a6dbe68502a
+DIST dotnet-runtime-9.0.0-linux-musl-x64.tar.gz 33527934 BLAKE2B 37a46215147cbe82a64dfec490cab26018bd325d08c8b440aef314acc2fac6f6030a646de542abe47e38e1dc3134c618dedffe58d149d2518cfcad7dbc91c0c4 SHA512 9c33d73a898fa9b4e84ae1844468b69086979f7c2c8ea6b32db0fea62a4014513cea0619025f9edb23e67ab4ae4e2f2725d1d9bb892858bba7dfe8ed17aee799
+DIST dotnet-runtime-9.0.0-linux-x64.tar.gz 33497524 BLAKE2B eb64e433cebc129f39c4d657855a4b09ca98b8f0d3dd81684042cb1bf140f4e8a14773ae26bd5a56375b32df160a6d62ab16eba312c63c2bbfb62279d80172c6 SHA512 5176bd68637646cd36fce7a88f83effe1065fb075e6d4a46b8be3c33d5a8394740577f0ed4f8b4fb13fa69fe83b229eb55ab7f45caac90849bf0392a670ed5af
diff --git a/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-3.1.32.ebuild b/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-3.1.32.ebuild
deleted file mode 100644
index 701889a..0000000
--- a/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-3.1.32.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION=".NET is a free, cross-platform, open-source developer platform"
-HOMEPAGE="https://dotnet.microsoft.com/"
-LICENSE="MIT"
-
-SRC_URI="
-amd64? ( https://dotnetcli.azureedge.net/dotnet/Runtime/${PV}/dotnet-runtime-${PV}-linux-x64.tar.gz )
-arm? ( https://dotnetcli.azureedge.net/dotnet/Runtime/${PV}/dotnet-runtime-${PV}-linux-arm.tar.gz )
-arm64? ( https://dotnetcli.azureedge.net/dotnet/Runtime/${PV}/dotnet-runtime-${PV}-linux-arm64.tar.gz )
-"
-
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64"
-IUSE="dotnet-symlink kerberos lttng"
-REQUIRED_USE="elibc_glibc"
-QA_PREBUILT="*"
-RESTRICT="splitdebug"
-RDEPEND="
-	kerberos? ( app-crypt/mit-krb5:0/0 )
-	lttng? ( dev-util/lttng-ust:0 )
-	sys-libs/zlib:0/1
-	dotnet-symlink? (
-		!dev-dotnet/dotnet-sdk[dotnet-symlink(+)]
-		!dev-dotnet/dotnet-sdk-bin[dotnet-symlink(+)]
-		!dev-dotnet/dotnet-runtime[dotnet-symlink(+)]
-	)
-"
-
-S=${WORKDIR}
-
-delete() {
-	test -n "$(find . -name "$1" -print -delete)"
-}
-
-src_compile() {
-	use kerberos || delete System.Net.Security.Native.so || die
-	use lttng || delete libcoreclrtraceptprovider.so || die
-}
-
-src_install() {
-	local dest="opt/${PN}-${SLOT}"
-	dodir "${dest%/*}"
-
-	{ mv "${S}" "${ED}/${dest}" && mkdir "${S}" && fperms 0755 "/${dest}"; } || die
-	dosym "../../${dest}/dotnet" "/usr/bin/dotnet-bin-${SLOT}"
-
-	if use dotnet-symlink; then
-		dosym "../../${dest}/dotnet" "/usr/bin/dotnet"
-		dosym "../../${dest}/dotnet" "/usr/bin/dotnet-${SLOT}"
-
-		# set an env-variable for 3rd party tools
-		echo "DOTNET_ROOT=/${dest}" > "${T}/90${PN}-${SLOT}" || die
-		doenvd "${T}/90${PN}-${SLOT}"
-	fi
-}
diff --git a/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-6.0.12.ebuild b/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-6.0.12.ebuild
deleted file mode 100644
index c12d54c..0000000
--- a/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-6.0.12.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION=".NET is a free, cross-platform, open-source developer platform"
-HOMEPAGE="https://dotnet.microsoft.com/"
-LICENSE="MIT"
-
-SRC_URI="
-amd64? ( https://dotnetcli.azureedge.net/dotnet/Runtime/${PV}/dotnet-runtime-${PV}-linux-x64.tar.gz )
-arm? ( https://dotnetcli.azureedge.net/dotnet/Runtime/${PV}/dotnet-runtime-${PV}-linux-arm.tar.gz )
-arm64? ( https://dotnetcli.azureedge.net/dotnet/Runtime/${PV}/dotnet-runtime-${PV}-linux-arm64.tar.gz )
-"
-
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64"
-IUSE="+dotnet-symlink kerberos lttng"
-REQUIRED_USE="elibc_glibc"
-QA_PREBUILT="*"
-RESTRICT="splitdebug"
-RDEPEND="
-	kerberos? ( app-crypt/mit-krb5:0/0 )
-	lttng? ( dev-util/lttng-ust:0 )
-	sys-libs/zlib:0/1
-	dotnet-symlink? (
-		!dev-dotnet/dotnet-sdk[dotnet-symlink(+)]
-		!dev-dotnet/dotnet-sdk-bin[dotnet-symlink(+)]
-		!dev-dotnet/dotnet-runtime[dotnet-symlink(+)]
-	)
-"
-
-S=${WORKDIR}
-
-delete() {
-	test -n "$(find . -name "$1" -print -delete)"
-}
-
-src_compile() {
-	use kerberos || delete libSystem.Net.Security.Native.so || die
-	use lttng || delete libcoreclrtraceptprovider.so || die
-}
-
-src_install() {
-	local dest="opt/${PN}-${SLOT}"
-	dodir "${dest%/*}"
-
-	{ mv "${S}" "${ED}/${dest}" && mkdir "${S}" && fperms 0755 "/${dest}"; } || die
-
-	if use dotnet-symlink; then
-		dosym "../../${dest}/dotnet" "/usr/bin/dotnet"
-		dosym "../../${dest}/dotnet" "/usr/bin/dotnet-${SLOT}"
-		dosym "../../${dest}/dotnet" "/usr/bin/dotnet-bin-${SLOT}"
-
-		# set an env-variable for 3rd party tools
-		echo "DOTNET_ROOT=/${dest}" > "${T}/90${PN}-${SLOT}" || die
-		doenvd "${T}/90${PN}-${SLOT}"
-	fi
-}
diff --git a/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-6.0.36.ebuild b/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-6.0.36.ebuild
new file mode 100644
index 0000000..b3e3224
--- /dev/null
+++ b/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-6.0.36.ebuild
@@ -0,0 +1,66 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION=".NET is a free, cross-platform, open-source developer platform"
+HOMEPAGE="https://dotnet.microsoft.com/"
+
+gen_src_uri() {
+	echo "$1? (
+		elibc_glibc? ( https://dotnetcli.azureedge.net/dotnet/Runtime/${PV}/dotnet-runtime-${PV}-linux-${2:-$1}.tar.gz )
+		elibc_musl? ( https://dotnetcli.azureedge.net/dotnet/Runtime/${PV}/dotnet-runtime-${PV}-linux-musl-${2:-$1}.tar.gz )
+	)"
+}
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="-* ~amd64 ~arm ~arm64"
+IUSE="lttng"
+
+SRC_URI="
+	$(gen_src_uri amd64 x64)
+	$(gen_src_uri arm)
+	$(gen_src_uri arm64)
+"
+
+RDEPEND="
+	sys-libs/zlib:0/1
+	!dev-dotnet/dotnet-sdk-bin:${SLOT}
+	lttng? ( =dev-util/lttng-ust-2.12* )
+"
+IDEPEND="
+	app-eselect/eselect-dotnet
+"
+
+S=${WORKDIR}
+
+QA_PREBUILT="*"
+RESTRICT+=" splitdebug"
+
+delete() {
+	test -n "$(find . -name "$1" -print -delete)"
+}
+
+src_compile() {
+	use lttng || delete libcoreclrtraceptprovider.so || die
+}
+
+src_install() {
+	local dest="opt/${PN}-${SLOT}"
+	dodir "${dest%/*}"
+
+	mv "${S}" "${ED}/${dest}" || die
+	mkdir "${S}" || die
+	fperms 0755 "/${dest}"
+
+	dosym "../../${dest}/dotnet" "/usr/bin/dotnet-bin-${SLOT}"
+}
+
+pkg_postinst() {
+	eselect dotnet update ifunset
+}
+
+pkg_postrm() {
+	eselect dotnet update ifunset
+}
diff --git a/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-7.0.1.ebuild b/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-7.0.1.ebuild
deleted file mode 100644
index c12d54c..0000000
--- a/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-7.0.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION=".NET is a free, cross-platform, open-source developer platform"
-HOMEPAGE="https://dotnet.microsoft.com/"
-LICENSE="MIT"
-
-SRC_URI="
-amd64? ( https://dotnetcli.azureedge.net/dotnet/Runtime/${PV}/dotnet-runtime-${PV}-linux-x64.tar.gz )
-arm? ( https://dotnetcli.azureedge.net/dotnet/Runtime/${PV}/dotnet-runtime-${PV}-linux-arm.tar.gz )
-arm64? ( https://dotnetcli.azureedge.net/dotnet/Runtime/${PV}/dotnet-runtime-${PV}-linux-arm64.tar.gz )
-"
-
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64"
-IUSE="+dotnet-symlink kerberos lttng"
-REQUIRED_USE="elibc_glibc"
-QA_PREBUILT="*"
-RESTRICT="splitdebug"
-RDEPEND="
-	kerberos? ( app-crypt/mit-krb5:0/0 )
-	lttng? ( dev-util/lttng-ust:0 )
-	sys-libs/zlib:0/1
-	dotnet-symlink? (
-		!dev-dotnet/dotnet-sdk[dotnet-symlink(+)]
-		!dev-dotnet/dotnet-sdk-bin[dotnet-symlink(+)]
-		!dev-dotnet/dotnet-runtime[dotnet-symlink(+)]
-	)
-"
-
-S=${WORKDIR}
-
-delete() {
-	test -n "$(find . -name "$1" -print -delete)"
-}
-
-src_compile() {
-	use kerberos || delete libSystem.Net.Security.Native.so || die
-	use lttng || delete libcoreclrtraceptprovider.so || die
-}
-
-src_install() {
-	local dest="opt/${PN}-${SLOT}"
-	dodir "${dest%/*}"
-
-	{ mv "${S}" "${ED}/${dest}" && mkdir "${S}" && fperms 0755 "/${dest}"; } || die
-
-	if use dotnet-symlink; then
-		dosym "../../${dest}/dotnet" "/usr/bin/dotnet"
-		dosym "../../${dest}/dotnet" "/usr/bin/dotnet-${SLOT}"
-		dosym "../../${dest}/dotnet" "/usr/bin/dotnet-bin-${SLOT}"
-
-		# set an env-variable for 3rd party tools
-		echo "DOTNET_ROOT=/${dest}" > "${T}/90${PN}-${SLOT}" || die
-		doenvd "${T}/90${PN}-${SLOT}"
-	fi
-}
diff --git a/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-8.0.11.ebuild b/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-8.0.11.ebuild
new file mode 100644
index 0000000..b3e3224
--- /dev/null
+++ b/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-8.0.11.ebuild
@@ -0,0 +1,66 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION=".NET is a free, cross-platform, open-source developer platform"
+HOMEPAGE="https://dotnet.microsoft.com/"
+
+gen_src_uri() {
+	echo "$1? (
+		elibc_glibc? ( https://dotnetcli.azureedge.net/dotnet/Runtime/${PV}/dotnet-runtime-${PV}-linux-${2:-$1}.tar.gz )
+		elibc_musl? ( https://dotnetcli.azureedge.net/dotnet/Runtime/${PV}/dotnet-runtime-${PV}-linux-musl-${2:-$1}.tar.gz )
+	)"
+}
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="-* ~amd64 ~arm ~arm64"
+IUSE="lttng"
+
+SRC_URI="
+	$(gen_src_uri amd64 x64)
+	$(gen_src_uri arm)
+	$(gen_src_uri arm64)
+"
+
+RDEPEND="
+	sys-libs/zlib:0/1
+	!dev-dotnet/dotnet-sdk-bin:${SLOT}
+	lttng? ( =dev-util/lttng-ust-2.12* )
+"
+IDEPEND="
+	app-eselect/eselect-dotnet
+"
+
+S=${WORKDIR}
+
+QA_PREBUILT="*"
+RESTRICT+=" splitdebug"
+
+delete() {
+	test -n "$(find . -name "$1" -print -delete)"
+}
+
+src_compile() {
+	use lttng || delete libcoreclrtraceptprovider.so || die
+}
+
+src_install() {
+	local dest="opt/${PN}-${SLOT}"
+	dodir "${dest%/*}"
+
+	mv "${S}" "${ED}/${dest}" || die
+	mkdir "${S}" || die
+	fperms 0755 "/${dest}"
+
+	dosym "../../${dest}/dotnet" "/usr/bin/dotnet-bin-${SLOT}"
+}
+
+pkg_postinst() {
+	eselect dotnet update ifunset
+}
+
+pkg_postrm() {
+	eselect dotnet update ifunset
+}
diff --git a/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-9.0.0.ebuild b/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-9.0.0.ebuild
new file mode 100644
index 0000000..b3e3224
--- /dev/null
+++ b/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-9.0.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION=".NET is a free, cross-platform, open-source developer platform"
+HOMEPAGE="https://dotnet.microsoft.com/"
+
+gen_src_uri() {
+	echo "$1? (
+		elibc_glibc? ( https://dotnetcli.azureedge.net/dotnet/Runtime/${PV}/dotnet-runtime-${PV}-linux-${2:-$1}.tar.gz )
+		elibc_musl? ( https://dotnetcli.azureedge.net/dotnet/Runtime/${PV}/dotnet-runtime-${PV}-linux-musl-${2:-$1}.tar.gz )
+	)"
+}
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="-* ~amd64 ~arm ~arm64"
+IUSE="lttng"
+
+SRC_URI="
+	$(gen_src_uri amd64 x64)
+	$(gen_src_uri arm)
+	$(gen_src_uri arm64)
+"
+
+RDEPEND="
+	sys-libs/zlib:0/1
+	!dev-dotnet/dotnet-sdk-bin:${SLOT}
+	lttng? ( =dev-util/lttng-ust-2.12* )
+"
+IDEPEND="
+	app-eselect/eselect-dotnet
+"
+
+S=${WORKDIR}
+
+QA_PREBUILT="*"
+RESTRICT+=" splitdebug"
+
+delete() {
+	test -n "$(find . -name "$1" -print -delete)"
+}
+
+src_compile() {
+	use lttng || delete libcoreclrtraceptprovider.so || die
+}
+
+src_install() {
+	local dest="opt/${PN}-${SLOT}"
+	dodir "${dest%/*}"
+
+	mv "${S}" "${ED}/${dest}" || die
+	mkdir "${S}" || die
+	fperms 0755 "/${dest}"
+
+	dosym "../../${dest}/dotnet" "/usr/bin/dotnet-bin-${SLOT}"
+}
+
+pkg_postinst() {
+	eselect dotnet update ifunset
+}
+
+pkg_postrm() {
+	eselect dotnet update ifunset
+}
diff --git a/dev-dotnet/dotnet-runtime-bin/metadata.xml b/dev-dotnet/dotnet-runtime-bin/metadata.xml
index 5eeaef8..196723c 100644
--- a/dev-dotnet/dotnet-runtime-bin/metadata.xml
+++ b/dev-dotnet/dotnet-runtime-bin/metadata.xml
@@ -9,9 +9,6 @@
     <doc>https://docs.microsoft.com/en-us/dotnet/</doc>
   </upstream>
   <use>
-    <flag name="dotnet-symlink">
-      Install a dotnet symlink that points to dotnet-bin.
-    </flag>
     <flag name="lttng">
       Install support libraries for LTTng with .NET.
     </flag>
diff --git a/dev-java/openj9-openjdk-bin/Manifest b/dev-java/openj9-openjdk-bin/Manifest
index 9624a51..b22ccfa 100644
--- a/dev-java/openj9-openjdk-bin/Manifest
+++ b/dev-java/openj9-openjdk-bin/Manifest
@@ -1,12 +1,18 @@
-DIST ibm-semeru-open-debugimage_aarch64_linux_11.0.20_8_openj9-0.40.0.tar.gz 272530796 SHA256 f760b6b6267fbddddc643710cdbe124ab64d531a64941e63fc1bce659029fcc2
-DIST ibm-semeru-open-debugimage_aarch64_linux_17.0.8_7_openj9-0.40.0.tar.gz 285749406 SHA256 c4cd196dda57bab3bcb65cf4e6a9e4e3afc09631d8d04db5328bbe877a50a392
-DIST ibm-semeru-open-debugimage_ppc64le_linux_11.0.20_8_openj9-0.40.0.tar.gz 352339723 SHA256 97f1d2730f4dbbad08603dcc933231de3a6a2eb9442713ac04b90c2f1442d152
-DIST ibm-semeru-open-debugimage_ppc64le_linux_17.0.8_7_openj9-0.40.0.tar.gz 367746021 SHA256 8c014d18bdac414f5d3096441b20a3c391ad58eaa141c9b62af7896755375af9
-DIST ibm-semeru-open-debugimage_x64_linux_11.0.20_8_openj9-0.40.0.tar.gz 364119325 SHA256 067faeb375fc6eb025c1435e35362338de36f50755370687aa953a86baf82abc
-DIST ibm-semeru-open-debugimage_x64_linux_17.0.8_7_openj9-0.40.0.tar.gz 380658643 SHA256 24d819e0bb8ce4060e4259003f3b842c0e98ce76cdc69dbbd2eb7811ae5713d9
-DIST ibm-semeru-open-jdk_aarch64_linux_11.0.20_8_openj9-0.40.0.tar.gz 201061810 SHA256 40aedd05e8dc71685488d6d518672c6c6866e6c0684c690708314746c809bd72
-DIST ibm-semeru-open-jdk_aarch64_linux_17.0.8_7_openj9-0.40.0.tar.gz 205153306 SHA256 48b7d0e887dd70cef3573394e3b591f2e5b1a4acdd00e69c10c4210eeece4e31
-DIST ibm-semeru-open-jdk_ppc64le_linux_11.0.20_8_openj9-0.40.0.tar.gz 206029889 SHA256 97b410f5929093b6424bd90e6dbcc5684eee480c2175207cbd7a24750358ba5b
-DIST ibm-semeru-open-jdk_ppc64le_linux_17.0.8_7_openj9-0.40.0.tar.gz 211431955 SHA256 cb673ea4d68363981ee054b71b146b47ca528cd28a88ec20fa21fb6e5464a8e7
-DIST ibm-semeru-open-jdk_x64_linux_11.0.20_8_openj9-0.40.0.tar.gz 205187490 SHA256 37700b66221fbc657a695c94882f398c23350d27ebe72c260cfc679ea87134ce
-DIST ibm-semeru-open-jdk_x64_linux_17.0.8_7_openj9-0.40.0.tar.gz 209221881 SHA256 12f51e74a449af35d8dcfe9d7809053c2d9a15e68ba74eacfadf9f4f97dead18
+DIST ibm-semeru-open-debugimage_aarch64_linux_11.0.26_4_openj9-0.49.0.tar.gz 388470497 SHA256 f401e98ad7c8af236e08d405f604cebaa2f45246567d0641e96a995a9ae96801
+DIST ibm-semeru-open-debugimage_aarch64_linux_17.0.14_7_openj9-0.49.0.tar.gz 383962955 SHA256 1649f65237984f903879c0ce7989bad1a50a135ed9f16ebdb3eef2f885ba5862
+DIST ibm-semeru-open-debugimage_aarch64_linux_21.0.6_7_openj9-0.49.0.tar.gz 387703742 SHA256 6bbaf3edabbdce9d112e8b50e31c76461c0f25a802ecb2a2754de9e7d3d4b19b
+DIST ibm-semeru-open-debugimage_ppc64le_linux_11.0.26_4_openj9-0.49.0.tar.gz 400720711 SHA256 412fb4ab239a9ec97b62d6baabe76e6f2394b62bdfc792d843386fc4098fcc6b
+DIST ibm-semeru-open-debugimage_ppc64le_linux_17.0.14_7_openj9-0.49.0.tar.gz 396415219 SHA256 fd38d0eb6734549717995e8fa90f98b389b422d798c4facada1268035174b374
+DIST ibm-semeru-open-debugimage_ppc64le_linux_21.0.6_7_openj9-0.49.0.tar.gz 400373285 SHA256 926594a7c5fde7ce3f80412fd69f74070c0f292325a41e3395d35e9649bd0a7a
+DIST ibm-semeru-open-debugimage_x64_linux_11.0.26_4_openj9-0.49.0.tar.gz 412147449 SHA256 61d6fb27fc23654651b2d367ef6145141697ed276e88f56d1f8632215eb87987
+DIST ibm-semeru-open-debugimage_x64_linux_17.0.14_7_openj9-0.49.0.tar.gz 407635989 SHA256 4b94d1918f18eb95fbc60cc87ad0e6c14ddea35a6a14894e3901a3886eadb33e
+DIST ibm-semeru-open-debugimage_x64_linux_21.0.6_7_openj9-0.49.0.tar.gz 411761072 SHA256 2acbf72d7ea09a3c0c1890d6c9ee407206b8044f2d734fb695f9de61a61eac32
+DIST ibm-semeru-open-jdk_aarch64_linux_11.0.26_4_openj9-0.49.0.tar.gz 205826199 SHA256 b6d20a7bde624df0d1f07a501edaa63573a4550aa50c1eac105ef0afb3957664
+DIST ibm-semeru-open-jdk_aarch64_linux_17.0.14_7_openj9-0.49.0.tar.gz 209124955 SHA256 87206cea25338cce0d348bc6956e38da71ae3d5ce3ceb3e399a0678b3c989ccb
+DIST ibm-semeru-open-jdk_aarch64_linux_21.0.6_7_openj9-0.49.0.tar.gz 222744253 SHA256 a71681168cba543a0c4d2bd43c4125cde3a908492f14e2c2549b4eb0e922ab20
+DIST ibm-semeru-open-jdk_ppc64le_linux_11.0.26_4_openj9-0.49.0.tar.gz 214780755 SHA256 e8e60ed9442617476bf5141ac61af1b6b99dcd13a379c88ed95f9a752677590f
+DIST ibm-semeru-open-jdk_ppc64le_linux_17.0.14_7_openj9-0.49.0.tar.gz 218290186 SHA256 c5c03d671a7c57b534044734f76c0a958eb396c5db742cb81c5ea015d45bd4ea
+DIST ibm-semeru-open-jdk_ppc64le_linux_21.0.6_7_openj9-0.49.0.tar.gz 231572995 SHA256 de58bccd963972fc756c6b4689d27b7286b3c7ade89270fc554d2c88fa5e204e
+DIST ibm-semeru-open-jdk_x64_linux_11.0.26_4_openj9-0.49.0.tar.gz 213260737 SHA256 5d53d417a08514dea2ed88d3efa0a04ba330189ffaaa1da4e349ae00f86c7e69
+DIST ibm-semeru-open-jdk_x64_linux_17.0.14_7_openj9-0.49.0.tar.gz 217121422 SHA256 6253cc925e1b9f53e2d26d752a64c9947d6c8cd45170116a77fa9a260b306d2b
+DIST ibm-semeru-open-jdk_x64_linux_21.0.6_7_openj9-0.49.0.tar.gz 230760484 SHA256 9a37a30a3803c00a3dbdb9c7d61f8a1cdf2d798e1a08903d35d7b55cc6ac2747
diff --git a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-17.0.8_p7.ebuild b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.26_p4.ebuild
index c447ec6..dcd91b5 100644
--- a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-17.0.8_p7.ebuild
+++ b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.26_p4.ebuild
@@ -15,7 +15,7 @@ abi_uri() {
 }
 
 JDK_PV=${PV//_p/+}
-DL_PV=${JDK_PV}_openj9-0.40.0
+DL_PV=${JDK_PV}_openj9-0.49.0
 SLOT=$(ver_cut 1)
 
 SRC_URI="
diff --git a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.20_p8.ebuild b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-17.0.14_p7.ebuild
index c447ec6..dcd91b5 100644
--- a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.20_p8.ebuild
+++ b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-17.0.14_p7.ebuild
@@ -15,7 +15,7 @@ abi_uri() {
 }
 
 JDK_PV=${PV//_p/+}
-DL_PV=${JDK_PV}_openj9-0.40.0
+DL_PV=${JDK_PV}_openj9-0.49.0
 SLOT=$(ver_cut 1)
 
 SRC_URI="
diff --git a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-21.0.6_p7.ebuild b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-21.0.6_p7.ebuild
new file mode 100644
index 0000000..dcd91b5
--- /dev/null
+++ b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-21.0.6_p7.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-vm-2 toolchain-funcs
+
+abi_uri() {
+	echo "${2-$1}? (
+		debug? (
+			https://github.com/ibmruntimes/semeru${SLOT}-binaries/releases/download/jdk-${DL_PV/+/%2B}/ibm-semeru-open-debugimage_${1}_linux_${DL_PV/+/_}.tar.gz
+		)
+		https://github.com/ibmruntimes/semeru${SLOT}-binaries/releases/download/jdk-${DL_PV/+/%2B}/ibm-semeru-open-jdk_${1}_linux_${DL_PV/+/_}.tar.gz
+	)"
+}
+
+JDK_PV=${PV//_p/+}
+DL_PV=${JDK_PV}_openj9-0.49.0
+SLOT=$(ver_cut 1)
+
+SRC_URI="
+	$(abi_uri aarch64 arm64)
+	$(abi_uri ppc64le ppc64)
+	$(abi_uri x64 amd64)
+"
+
+DESCRIPTION="Prebuilt IBM Semeru JDK binaries provided by IBM"
+HOMEPAGE="https://developer.ibm.com/languages/java/semeru-runtimes/"
+LICENSE="GPL-2-with-classpath-exception"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+IUSE="alsa cups debug headless-awt selinux source"
+
+RDEPEND="
+	>=sys-apps/baselayout-java-0.1.0-r1
+	kernel_linux? (
+		media-libs/fontconfig:1.0
+		media-libs/freetype:2
+		media-libs/harfbuzz
+		elibc_glibc? ( >=sys-libs/glibc-2.2.5:* )
+		elibc_musl? ( sys-libs/musl )
+		sys-libs/zlib
+		alsa? ( media-libs/alsa-lib )
+		cups? ( net-print/cups )
+		selinux? ( sec-policy/selinux-java )
+		!headless-awt? (
+			x11-libs/libX11
+			x11-libs/libXext
+			x11-libs/libXi
+			x11-libs/libXrender
+			x11-libs/libXtst
+		)
+	)"
+
+RESTRICT="preserve-libs splitdebug"
+QA_PREBUILT="*"
+
+S="${WORKDIR}/jdk-${JDK_PV}"
+
+pkg_pretend() {
+	if [[ "$(tc-is-softfloat)" != "no" ]]; then
+		die "These binaries require a hardfloat system."
+	fi
+}
+
+src_unpack() {
+	default
+	if [[ ${A} == *_mac_* ]] ; then
+		mv -v "${S}/Contents/Home/"* "${S}" || die
+		rm -Rf "${S}/Contents"  # drop macOS executable
+	fi
+}
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}/${dest#/}"
+
+	# on macOS if they would exist they would be called .dylib, but most
+	# importantly, there are no different providers, so everything
+	# that's shipped works.
+	if [[ ${A} != *_mac_* ]] ; then
+		# Not sure why they bundle this as it's commonly available and they
+		# only do so on x86_64. It's needed by libfontmanager.so. IcedTea
+		# also has an explicit dependency while Oracle seemingly dlopens it.
+		rm -vf lib/libfreetype.so || die
+
+		# prefer system copy # https://bugs.gentoo.org/776676
+		rm -vf lib/libharfbuzz.so || die
+
+		# Oracle and IcedTea have libjsoundalsa.so depending on
+		# libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
+		if ! use alsa ; then
+			rm -v lib/libjsound.* || die
+		fi
+
+		if use headless-awt ; then
+			rm -v lib/lib*{[jx]awt,splashscreen}* || die
+		fi
+	fi
+
+	if ! use source ; then
+		rm -v lib/src.zip || die
+	fi
+
+	rm -v lib/security/cacerts || die
+	dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
+
+	dodir "${dest}"
+	cp -pPR * "${ddest}" || die
+
+	# provide stable symlink
+	dosym "${P}" "/opt/${PN}-${SLOT}"
+
+	java-vm_install-env "${FILESDIR}"/${PN}.env.sh
+	java-vm_set-pax-markings "${ddest}"
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
diff --git a/dev-java/openj9-openjdk-jre-bin/Manifest b/dev-java/openj9-openjdk-jre-bin/Manifest
index db9f1b4..9c4e476 100644
--- a/dev-java/openj9-openjdk-jre-bin/Manifest
+++ b/dev-java/openj9-openjdk-jre-bin/Manifest
@@ -1,6 +1,9 @@
-DIST ibm-semeru-open-jre_aarch64_linux_11.0.20_8_openj9-0.40.0.tar.gz 45855654 SHA256 9e18c0e333f6d6c7962ccc0c2531c27921c4b76e108fded459e0659038c21f21
-DIST ibm-semeru-open-jre_aarch64_linux_17.0.8_7_openj9-0.40.0.tar.gz 45789622 SHA256 b8904df2fee0797e493e3482fddb873b25d1e05f27053a2d96a25310c2dce3d4
-DIST ibm-semeru-open-jre_ppc64le_linux_11.0.20_8_openj9-0.40.0.tar.gz 48605043 SHA256 2b767b490858900e773589e2c6395fef111c5d70696db371449491db617079d6
-DIST ibm-semeru-open-jre_ppc64le_linux_17.0.8_7_openj9-0.40.0.tar.gz 48853830 SHA256 0986b451944deac0832c2905f1497fddb3ab7c0f63cd9fad707072381c9948a1
-DIST ibm-semeru-open-jre_x64_linux_11.0.20_8_openj9-0.40.0.tar.gz 47781278 SHA256 7706a511bded7b3972cdb98c5c7942b8f2dcf9ab4c2a6e81d72fb8a754812bb2
-DIST ibm-semeru-open-jre_x64_linux_17.0.8_7_openj9-0.40.0.tar.gz 47708806 SHA256 461aab09409b3ac26ded0ca921171e141c6b1400a17d8026e924109518b365d4
+DIST ibm-semeru-open-jre_aarch64_linux_11.0.26_4_openj9-0.49.0.tar.gz 47702776 SHA256 2425d0daa7c0ef6603910c1c51ed7f3d8dbeb4dff8e1542957771ac5045fc21e
+DIST ibm-semeru-open-jre_aarch64_linux_17.0.14_7_openj9-0.49.0.tar.gz 47041849 SHA256 f26b2b2d8654a09fade4c0ce5819e72e00f1e751bb11a4731537e834900c3282
+DIST ibm-semeru-open-jre_aarch64_linux_21.0.6_7_openj9-0.49.0.tar.gz 51591397 SHA256 1090db3f7b30b4a45e3d5f228ac529ace87000bd9b342d91a639f0181a0058f5
+DIST ibm-semeru-open-jre_ppc64le_linux_11.0.26_4_openj9-0.49.0.tar.gz 52506982 SHA256 d013d38e03a3455c6867b10544dc30041bf7afdb595d60ee09af43d46cdb5720
+DIST ibm-semeru-open-jre_ppc64le_linux_17.0.14_7_openj9-0.49.0.tar.gz 51677267 SHA256 578a651e9e26de4ec30612afbd69c2530c8ed37db2c46bc62eb6a39dfa35c080
+DIST ibm-semeru-open-jre_ppc64le_linux_21.0.6_7_openj9-0.49.0.tar.gz 56159039 SHA256 ece962ee7ce419e25048a89228b61c4ce8c318ec6fade470484d6537bb87ea3f
+DIST ibm-semeru-open-jre_x64_linux_11.0.26_4_openj9-0.49.0.tar.gz 51312021 SHA256 08586859b8a53aa9d5424a38838e8332664622049c3c33b1b0e5ea88b56ce2d9
+DIST ibm-semeru-open-jre_x64_linux_17.0.14_7_openj9-0.49.0.tar.gz 50639277 SHA256 e2469f16a616ee467d6a590ec043ee9464b039d2f9859327dd36d50953cd60bf
+DIST ibm-semeru-open-jre_x64_linux_21.0.6_7_openj9-0.49.0.tar.gz 55202515 SHA256 cca7d1599ff83063dd16965dcbf91915a7654e5086f3b3b71744adf7769d11de
diff --git a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.20_p8.ebuild b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.26_p4.ebuild
index 20b1d9b..4f5ad3b 100644
--- a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.20_p8.ebuild
+++ b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.26_p4.ebuild
@@ -12,7 +12,7 @@ abi_uri() {
 }
 
 JDK_PV=${PV//_p/+}
-DL_PV=${JDK_PV}_openj9-0.40.0
+DL_PV=${JDK_PV}_openj9-0.49.0
 SLOT=$(ver_cut 1)
 
 SRC_URI="
@@ -30,7 +30,6 @@ IUSE="alsa cups headless-awt selinux"
 RDEPEND="
 	media-libs/fontconfig:1.0
 	media-libs/freetype:2
-	>net-libs/libnet-1.1
 	>=sys-apps/baselayout-java-0.1.0-r1
 	>=sys-libs/glibc-2.2.5:*
 	sys-libs/zlib
diff --git a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-17.0.8_p7.ebuild b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-17.0.14_p7.ebuild
index 20b1d9b..4f5ad3b 100644
--- a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-17.0.8_p7.ebuild
+++ b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-17.0.14_p7.ebuild
@@ -12,7 +12,7 @@ abi_uri() {
 }
 
 JDK_PV=${PV//_p/+}
-DL_PV=${JDK_PV}_openj9-0.40.0
+DL_PV=${JDK_PV}_openj9-0.49.0
 SLOT=$(ver_cut 1)
 
 SRC_URI="
@@ -30,7 +30,6 @@ IUSE="alsa cups headless-awt selinux"
 RDEPEND="
 	media-libs/fontconfig:1.0
 	media-libs/freetype:2
-	>net-libs/libnet-1.1
 	>=sys-apps/baselayout-java-0.1.0-r1
 	>=sys-libs/glibc-2.2.5:*
 	sys-libs/zlib
diff --git a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-21.0.6_p7.ebuild b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-21.0.6_p7.ebuild
new file mode 100644
index 0000000..4f5ad3b
--- /dev/null
+++ b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-21.0.6_p7.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-vm-2
+
+abi_uri() {
+	echo "${2-$1}? (
+		https://github.com/ibmruntimes/semeru${SLOT}-binaries/releases/download/jdk-${DL_PV/+/%2B}/ibm-semeru-open-jre_${1}_linux_${DL_PV/+/_}.tar.gz
+	)"
+}
+
+JDK_PV=${PV//_p/+}
+DL_PV=${JDK_PV}_openj9-0.49.0
+SLOT=$(ver_cut 1)
+
+SRC_URI="
+	$(abi_uri aarch64 arm64)
+	$(abi_uri ppc64le ppc64)
+	$(abi_uri x64 amd64)
+"
+
+DESCRIPTION="Prebuilt IBM Semeru JRE binaries provided by IBM"
+HOMEPAGE="https://developer.ibm.com/languages/java/semeru-runtimes/"
+LICENSE="GPL-2-with-classpath-exception"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+IUSE="alsa cups headless-awt selinux"
+
+RDEPEND="
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	>=sys-apps/baselayout-java-0.1.0-r1
+	>=sys-libs/glibc-2.2.5:*
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	selinux? ( sec-policy/selinux-java )
+	!headless-awt? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		x11-libs/libXtst
+	)"
+
+RESTRICT="preserve-libs splitdebug"
+QA_PREBUILT="*"
+
+S="${WORKDIR}/jdk-${JDK_PV}-jre"
+
+src_install() {
+	local dest="/opt/${PN}-${SLOT}"
+	local ddest="${ED}/${dest#/}"
+
+	# Not sure why they bundle this as it's commonly available and they
+	# only do so on x86_64. It's needed by libfontmanager.so. IcedTea
+	# also has an explicit dependency while Oracle seemingly dlopens it.
+	rm -vf lib/libfreetype.so || die
+
+	# Oracle and IcedTea have libjsoundalsa.so depending on
+	# libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
+	if ! use alsa ; then
+		rm -v lib/libjsound.* || die
+	fi
+
+	if use headless-awt ; then
+		rm -v lib/lib*{[jx]awt,splashscreen}* || die
+	fi
+
+	rm -v lib/security/cacerts || die
+	dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
+
+	dodir "${dest}"
+	cp -pPR * "${ddest}" || die
+
+	java-vm_install-env "${FILESDIR}"/${PN}.env.sh
+	java-vm_set-pax-markings "${ddest}"
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
+
+pkg_postinst() {
+	java-vm-2_pkg_postinst
+}
diff --git a/dev-java/openj9-openjdk/Manifest b/dev-java/openj9-openjdk/Manifest
index ff6a853..533a846 100644
--- a/dev-java/openj9-openjdk/Manifest
+++ b/dev-java/openj9-openjdk/Manifest
@@ -1,4 +1,4 @@
-DIST openj9-0.40.0.tar.gz 18146593 BLAKE2B fbc092d481f567ed697a87f90a2d0c657e195744a76e848e62061667f07d7c022b174c47b91cbf29606ed7a783042c825a82583d481ef2149e084816abf4af60 SHA512 4947d9863b84ae936a2e8a569fe62797b34ce30b3fe3e5792a640bd9a3d281fcc14ac1ac44b0a9c0b326ec31fc101d946dc38700f6a8e1f42cb0f3b7b7573860
-DIST openj9-omr-0.40.0.tar.gz 8037707 BLAKE2B d5df776d64293edb2d50ea0536f22a6ec6889fc4a84f5fab7d36792b9c0bc705631b65d4fbe028b08ad83d632aa8146a96371459a70eb63a262ce22016011d4a SHA512 9737c13bf1f6b67502355191cb34f45e3dc3fc80e429be5452c0f26a14cf5856040868c13e08e7e03b52f6b5f7ddc700f63a03488652a2a8e0d0f6f531f1d379
-DIST openj9-openjdk-jdk11-openj9-0.40.0.tar.gz 102287197 BLAKE2B c83dc8effa26d0966a0648d2f6e42250ea1fdc2ddf543e55e798945560d9686b0df42a32d37511a0c816ab9ab8aec2246abfe5fba4772e58e89b05b40ce053f6 SHA512 a32c361e18c31e2f07b039d25e68d2b2520c16d14e2d7dc5f9155721afe4f5065df3a681daa7029a9b967e8d3ab7095d422b835e4c7b4d187ee70ca9febdc7fb
-DIST openj9-openjdk-jdk17-openj9-0.40.0.tar.gz 94895676 BLAKE2B 3a5112a273df0451b4ed0818e9d1cb06715ae5fc8ee8fa1d30688d04b8bfd99e0d0bf59c22068109eb2344a2dc66038fc113e1afce5b19c4df7fa76a9d39feb8 SHA512 0d6b73ee0794e73888122a9852a21cc8ca6f087469f2d7f02143730f69b0e6b73319c416022a0f05406c0bda04153663884ea15feeaa3023b5381080f4306ce9
+DIST openj9-0.48.0.tar.gz 18480709 BLAKE2B 4d3d593ce295c0ba40ef32cc79f0e00b4864d2bc5d36e26c0bd0e2c3aa3406888e8a764472c212ff45ab59d092055e9e9775231fd8d979643d91d022911bd147 SHA512 28247eb763056becf881f1a3f431a073f4605d062e26bfc30a8cad86cab7b7a9a114a44faff40743957315d808a42ff7636554ff794dac640578ec75e9328749
+DIST openj9-omr-0.48.0.tar.gz 8126272 BLAKE2B d343b0129d639cd2887c98fe64b92c66ff2932537520158faa2dbaa465cfb32d6ff0c5c7bf0a5591a8f57e25f85cfc1a85f34c7f6bd9f07e04a35d5b50eb09f7 SHA512 090aee202bb7dd46fcc93f94a7168d22f3b2546d86456d40ba12aba7d76699345502aafc25ca5b675ba7683cfa2414564113c91ba31ad720d1f6867d63f70aab
+DIST openj9-openjdk-jdk11-openj9-0.48.0.tar.gz 102800187 BLAKE2B 82a04892e389a5e24c59a17d2efa95a37e092480dfbbf89f47da965179aaead0b56c1cbe26efcd905bfeb018667880faf077e410bf0d689a1b99178acf398fb4 SHA512 9288f83706aeb945a479b4478b365911408a92ac703f43418f3f98fc1beaefb008c8d0b46dd055200122a9d549da89cd727a2eef8598b7ba069cf36055d1207d
+DIST openj9-openjdk-jdk21-openj9-0.48.0.tar.gz 100484633 BLAKE2B c23d1325c8db43a7076cc589ea0a485cae2d0d26668f8da5cb2a2db2cc6b43052a7e848d04e7c66f03f7696a19690a0812f9aff92deedf7c426ede03b9aa36c7 SHA512 5b4a390c53643ee10affd5b0c6277f5ac6be873f34035c28fb7b75fca04f9e08e91b66ed505e8a5c0eb114f0cf00d6af2bb8c42f2495e3b6913cc253a7969836
diff --git a/dev-java/openj9-openjdk/openj9-openjdk-11.0.40.0.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-11.0.48.0.ebuild
index 35bc082..4e7eb58 100644
--- a/dev-java/openj9-openjdk/openj9-openjdk-11.0.40.0.ebuild
+++ b/dev-java/openj9-openjdk/openj9-openjdk-11.0.48.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
+inherit check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
 
 SLOT="$(ver_cut 1)"
 OPENJ9_PV="$(ver_cut 2-4)"
@@ -24,7 +24,7 @@ else
 	"
 fi
 
-LICENSE="GPL-2"
+LICENSE="GPL-2-with-classpath-exception"
 KEYWORDS="~amd64"
 
 IUSE="alsa cups ddr debug doc headless-awt javafx +jbootstrap jitserver numa selinux source systemtap"
@@ -41,7 +41,7 @@ COMMON_DEPEND="
 	media-libs/lcms:2=
 	sys-libs/zlib
 	media-libs/libjpeg-turbo:0=
-	systemtap? ( dev-util/systemtap )
+	systemtap? ( dev-debug/systemtap )
 
 	dev-libs/elfutils
 	ddr? ( dev-libs/libdwarf )
@@ -162,9 +162,18 @@ src_prepare() {
 }
 
 src_configure() {
-	# Work around stack alignment issue, bug #647954. in case we ever have x86
+	# Work around stack alignment issue, bug #647954.
 	use x86 && append-flags -mincoming-stack-boundary=2
 
+	# Strip some flags users may set, but should not. #818502
+	filter-flags -fexceptions
+
+	# Strip lto related flags, we rely on USE=lto and --with-jvm-features=link-time-opt
+	# https://bugs.gentoo.org/833097
+	# https://bugs.gentoo.org/833098
+	filter-lto
+	filter-flags -fdevirtualize-at-ltrans
+
 	# Enabling full docs appears to break doc building. If not
 	# explicitly disabled, the flag will get auto-enabled if pandoc and
 	# graphviz are detected. pandoc has loads of dependencies anyway.
@@ -202,7 +211,14 @@ src_configure() {
 		$(use_enable jitserver)
 	)
 
+	use lto && myconf+=( --with-jvm-features=link-time-opt )
+
 	if use javafx; then
+		# this is not useful for users, just for upstream developers
+		# build system compares mesa version in md file
+		# https://bugs.gentoo.org/822612
+		export LEGAL_EXCLUDES=mesa3d.md
+
 		local zip="${EPREFIX}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip"
 		if [[ -r ${zip} ]]; then
 			myconf+=( --with-import-modules="${zip}" )
@@ -220,6 +236,10 @@ src_configure() {
 }
 
 src_compile() {
+	# Too brittle - gets confused by e.g. -Oline
+	export MAKEOPTS="-j$(makeopts_jobs) -l$(makeopts_loadavg)"
+	unset GNUMAKEFLAGS MAKEFLAGS
+
 	local mycmakeargsx=(
 		"-DCMAKE_C_FLAGS='${CFLAGS}'"
 		"-DJ9JIT_EXTRA_CFLAGS='${CFLAGS}'"
@@ -282,6 +302,10 @@ src_install() {
 	if use doc ; then
 		docinto html
 		dodoc -r "${S}"/build/*-release/images/docs/*
-		dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
+		dosym -r /usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
 	fi
 }
+
+pkg_postinst() {
+	java-vm-2_pkg_postinst
+}
diff --git a/dev-java/openj9-openjdk/openj9-openjdk-17.0.40.0.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-21.0.48.0.ebuild
index ca64ddd..6bf8ca9 100644
--- a/dev-java/openj9-openjdk/openj9-openjdk-17.0.40.0.ebuild
+++ b/dev-java/openj9-openjdk/openj9-openjdk-21.0.48.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
+inherit check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
 
 SLOT="$(ver_cut 1)"
 OPENJ9_PV="$(ver_cut 2-4)"
@@ -24,10 +24,10 @@ else
 	"
 fi
 
-LICENSE="GPL-2"
+LICENSE="GPL-2-with-classpath-exception"
 KEYWORDS="~amd64"
 
-IUSE="alsa cups ddr debug doc headless-awt javafx +jbootstrap jitserver numa selinux source systemtap"
+IUSE="alsa cups ddr debug doc headless-awt javafx +jbootstrap jitserver lto numa selinux source systemtap"
 
 REQUIRED_USE="
 	javafx? ( alsa !headless-awt )
@@ -41,7 +41,7 @@ COMMON_DEPEND="
 	media-libs/lcms:2=
 	sys-libs/zlib
 	media-libs/libjpeg-turbo:0=
-	systemtap? ( dev-util/systemtap )
+	systemtap? ( dev-debug/systemtap )
 
 	dev-libs/elfutils
 	ddr? ( dev-libs/libdwarf )
@@ -193,6 +193,12 @@ src_configure() {
 	# Work around stack alignment issue, bug #647954. in case we ever have x86
 	use x86 && append-flags -mincoming-stack-boundary=2
 
+	# /tmp/portage/dev-java/openj9-openjdk-21.0.48.0/work/openj9-openjdk-jdk21-openj9-0.48.0/openj9/runtime/codert_vm/thunkcrt.c:95: error: function 'icallVMprJavaSendVirtualL' redeclared as variable
+	#    95 | extern void * icallVMprJavaSendVirtualL;
+	# /tmp/portage/dev-java/openj9-openjdk-21.0.48.0/work/openj9-openjdk-jdk21-openj9-0.48.0/openj9/runtime/compiler/runtime/Runtime.cpp:341:1: note: previously declared here
+	#   341 | JIT_HELPER(icallVMprJavaSendVirtualL);
+	filter-lto
+
 	# Enabling full docs appears to break doc building. If not
 	# explicitly disabled, the flag will get auto-enabled if pandoc and
 	# graphviz are detected. pandoc has loads of dependencies anyway.
@@ -221,7 +227,7 @@ src_configure() {
 		--with-vendor-version-string="${PVR}"
 		--with-version-pre=""
 		--with-zlib=system
-		--enable-dtrace=$(usex systemtap yes no)
+		--enable-jvm-feature-dtrace=$(usex systemtap yes no)
 		--enable-headless-only=$(usex headless-awt yes no)
 		$(tc-is-clang && echo "--with-toolchain-type=clang")
 
@@ -230,6 +236,8 @@ src_configure() {
 		$(use_enable jitserver)
 	)
 
+	use lto && myconf+=( --with-jvm-features=link-time-opt )
+
 	if use javafx; then
 		local zip="${EPREFIX}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip"
 		if [[ -r ${zip} ]]; then
@@ -269,7 +277,7 @@ src_compile() {
 		OPENJ9_TAG=${OPENJ9_P}
 		OPENJ9OMR_SHA=${OPENJ9_P}
 	)
-	emake "${myemakeargs[@]}" -j1 #nowarn
+	emake "${myemakeargs[@]}" -j1
 }
 
 src_install() {
@@ -298,7 +306,7 @@ src_install() {
 	dodir "${dest}"
 	cp -pPR * "${ddest}" || die
 
-	dosym8 -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
+	dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
 
 	# must be done before running itself
 	java-vm_set-pax-markings "${ddest}"
diff --git a/dev-libs/libdwarf/Manifest b/dev-libs/libdwarf/Manifest
index 00a2d91..09c1620 100644
--- a/dev-libs/libdwarf/Manifest
+++ b/dev-libs/libdwarf/Manifest
@@ -1 +1 @@
-DIST libdwarf-0.7.0.tar.xz 2506816 BLAKE2B 8cc5d2c28d570ac44b3244fa3745f89ae9391262c0887b946cc3611cc16309fd9b2542cf567c2e0a136dc081603d545f3543d6206870d33dad202dd96fdcf177 SHA512 0fe027e517551d138c15695ffdebe2dfbb0e89184fc0cc93bed5c342cd1cd901dc23f6b2aa8643ec8e62808cbdc0d94389fe44438c694d19c45c6a7367e8f7af
+DIST libdwarf-0.11.1.tar.xz 2747004 BLAKE2B b98467abd547e222594843263ef36a9362aa4a8c8ace770d128016e65a50c7ae15d91e769e6fd966ca9b8c5b5ed471d14e5e7259c713c126ac17e13d5d074a77 SHA512 d927b1d0e8dd1540c2f5da2a9d39b2914bb48225b2b9bdca94e7b36349358e1f537044eadc345f11d75de717fdda07ad99a8a7a5eb45e64fe4c79c37e165012f
diff --git a/dev-libs/libdwarf/libdwarf-0.7.0.ebuild b/dev-libs/libdwarf/libdwarf-0.11.1.ebuild
index ee99812..5c4daa8 100644
--- a/dev-libs/libdwarf/libdwarf-0.7.0.ebuild
+++ b/dev-libs/libdwarf/libdwarf-0.11.1.ebuild
@@ -10,11 +10,13 @@ SRC_URI="https://github.com/davea42/libdwarf-code/releases/download/v${PV}/${P}.
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="dwarfexample dwarfgen static-libs"
+IUSE="+decompression dwarfexample dwarfgen static-libs"
 
 DEPEND="
-	sys-libs/zlib
-	dwarfgen? ( virtual/libelf )
+	decompression? (
+		app-arch/zstd
+		sys-libs/zlib
+	}
 "
 RDEPEND="${DEPEND}"
 
@@ -22,9 +24,9 @@ src_configure() {
 	local myeconfargs=(
 		--includedir="${EPREFIX}/usr/include/${PN}"
 		--enable-shared
+		$(use_enable decompression)
 		$(use_enable dwarfexample)
 		$(use_enable dwarfgen)
-		$(use_enable dwarfgen libelf)
 		$(use_enable static-libs static)
 	)
 	econf "${myeconfargs[@]}"
diff --git a/dev-libs/libdwarf/metadata.xml b/dev-libs/libdwarf/metadata.xml
index 32edad3..086dc90 100644
--- a/dev-libs/libdwarf/metadata.xml
+++ b/dev-libs/libdwarf/metadata.xml
@@ -6,8 +6,9 @@
 		<name>Alex Xu (Hello71)</name>
 	</maintainer>
 	<use>
-		<flag name="dwarfexample">dwarfexample</flag>
-		<flag name="dwarfgen">dwarfgen</flag>
+		<flag name="decompression">Enable decompression with zlib/zstd</flag>
+		<flag name="dwarfexample">Install dwarfexample bin</flag>
+		<flag name="dwarfgen">Install dwarfgen bin</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">davea42/libdwarf-code</remote-id>
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index a86d270..ff260cf 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -1,2 +1,2 @@
-DIST openssl-3.1.1.tar.gz 15544757 BLAKE2B 094f7e28f16de6528016fcd21df1d7382b0dbdcd80ec469d37add9c37f638c059dda3ffb4415eba890a33d146ddc9016bcc7192df101c73be5e70faf6e3b1097 SHA512 8ba9dd6ab87451e126c19cc106ccd1643ca48667d6c37504d0ab98205fbccf855fd0db54474b4113c4c3a15215a4ef77a039fb897a69f71bcab2054b2effd1d9
-DIST openssl-3.1.1.tar.gz.asc 833 BLAKE2B 5a2a9aeb475b843862e133d53bc5bb3c8e12e8e03b1e2da41d0eaa0eade1ae03c4318ad1f5c490c5e1ed7e6ac6275a6d7c881d99993911722b043b15d1622b25 SHA512 83349020c67e5b956f3ef37604a03a1970ea393f862691f5fd5d85930c01e559e25db17d397d8fd230c3862a8b2fba2d5c7df883d56d7472f4c01dab3a661cb2
+DIST openssl-3.3.2.tar.gz 18076531 BLAKE2B cc53d45418673bc2a406d6697b8bd17ff6c726463c4ccc87bb2fa5a6592d0d178dc8cfeb2fbb980ea354a5dc2c86f31c48453427c6937896c7221273e623c9b5 SHA512 5ae47bf1aed2740a33ba5df7dc7345a6738aa6bfa3c9c4de5e51742485e24b25192988d7a2c1b8201ef70056ad8abd0ca78b3d55abe24c0b0373d83b47ed9b74
+DIST openssl-3.3.2.tar.gz.asc 833 BLAKE2B c318e2dcef085b83ced77048dc136d9bc8438d49a7985f3c6ebd4ffd0e5e290ece47e8fd1074c6cc056e87b2bae2101dd58b8d70dbc0eb99aa134d776125439c SHA512 981f8438bbd541b97e745aca1bb77cde68900ce4b5ffefc9eccc2f18c675292203f6b4c7bffefde2256a442b7310d8438279b52fb21aac65921e9a529bc00067
diff --git a/dev-libs/openssl/files/openssl-3.3.2-CVE-2024-9143.patch b/dev-libs/openssl/files/openssl-3.3.2-CVE-2024-9143.patch
new file mode 100644
index 0000000..5776c78
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-3.3.2-CVE-2024-9143.patch
@@ -0,0 +1,193 @@
+https://bugs.gentoo.org/941643
+https://github.com/openssl/openssl/commit/c0d3e4d32d2805f49bec30547f225bc4d092e1f4
+
+From c0d3e4d32d2805f49bec30547f225bc4d092e1f4 Mon Sep 17 00:00:00 2001
+From: Viktor Dukhovni <viktor@openssl.org>
+Date: Thu, 19 Sep 2024 01:02:40 +1000
+Subject: [PATCH] Harden BN_GF2m_poly2arr against misuse.
+
+The BN_GF2m_poly2arr() function converts characteristic-2 field
+(GF_{2^m}) Galois polynomials from a representation as a BIGNUM bitmask,
+to a compact array with just the exponents of the non-zero terms.
+
+These polynomials are then used in BN_GF2m_mod_arr() to perform modular
+reduction.  A precondition of calling BN_GF2m_mod_arr() is that the
+polynomial must have a non-zero constant term (i.e. the array has `0` as
+its final element).
+
+Internally, callers of BN_GF2m_poly2arr() did not verify that
+precondition, and binary EC curve parameters with an invalid polynomial
+could lead to out of bounds memory reads and writes in BN_GF2m_mod_arr().
+
+The precondition is always true for polynomials that arise from the
+standard form of EC parameters for characteristic-two fields (X9.62).
+See the "Finite Field Identification" section of:
+
+    https://www.itu.int/ITU-T/formal-language/itu-t/x/x894/2018-cor1/ANSI-X9-62.html
+
+The OpenSSL GF(2^m) code supports only the trinomial and pentanomial
+basis X9.62 forms.
+
+This commit updates BN_GF2m_poly2arr() to return `0` (failure) when
+the constant term is zero (i.e. the input bitmask BIGNUM is not odd).
+
+Additionally, the return value is made unambiguous when there is not
+enough space to also pad the array with a final `-1` sentinel value.
+The return value is now always the number of elements (including the
+final `-1`) that would be filled when the output array is sufficiently
+large.  Previously the same count was returned both when the array has
+just enough room for the final `-1` and when it had only enough space
+for non-sentinel values.
+
+Finally, BN_GF2m_poly2arr() is updated to reject polynomials whose
+degree exceeds `OPENSSL_ECC_MAX_FIELD_BITS`, this guards against
+CPU exhausition attacks via excessively large inputs.
+
+The above issues do not arise in processing X.509 certificates.  These
+generally have EC keys from "named curves", and RFC5840 (Section 2.1.1)
+disallows explicit EC parameters.  The TLS code in OpenSSL enforces this
+constraint only after the certificate is decoded, but, even if explicit
+parameters are specified, they are in X9.62 form, which cannot represent
+problem values as noted above.
+
+Initially reported as oss-fuzz issue 71623.
+
+A closely related issue was earlier reported in
+<https://github.com/openssl/openssl/issues/19826>.
+
+Severity: Low, CVE-2024-9143
+
+Reviewed-by: Matt Caswell <matt@openssl.org>
+Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
+Reviewed-by: Paul Dale <ppzgs1@gmail.com>
+Reviewed-by: Tomas Mraz <tomas@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/25639)
+
+(cherry picked from commit 8e008cb8b23ec7dc75c45a66eeed09c815b11cd2)
+--- a/crypto/bn/bn_gf2m.c
++++ b/crypto/bn/bn_gf2m.c
+@@ -15,6 +15,7 @@
+ #include "bn_local.h"
+ 
+ #ifndef OPENSSL_NO_EC2M
++# include <openssl/ec.h>
+ 
+ /*
+  * Maximum number of iterations before BN_GF2m_mod_solve_quad_arr should
+@@ -1130,16 +1131,26 @@ int BN_GF2m_mod_solve_quad(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
+ /*
+  * Convert the bit-string representation of a polynomial ( \sum_{i=0}^n a_i *
+  * x^i) into an array of integers corresponding to the bits with non-zero
+- * coefficient.  Array is terminated with -1. Up to max elements of the array
+- * will be filled.  Return value is total number of array elements that would
+- * be filled if array was large enough.
++ * coefficient.  The array is intended to be suitable for use with
++ * `BN_GF2m_mod_arr()`, and so the constant term of the polynomial must not be
++ * zero.  This translates to a requirement that the input BIGNUM `a` is odd.
++ *
++ * Given sufficient room, the array is terminated with -1.  Up to max elements
++ * of the array will be filled.
++ *
++ * The return value is total number of array elements that would be filled if
++ * array was large enough, including the terminating `-1`.  It is `0` when `a`
++ * is not odd or the constant term is zero contrary to requirement.
++ *
++ * The return value is also `0` when the leading exponent exceeds
++ * `OPENSSL_ECC_MAX_FIELD_BITS`, this guards against CPU exhaustion attacks,
+  */
+ int BN_GF2m_poly2arr(const BIGNUM *a, int p[], int max)
+ {
+     int i, j, k = 0;
+     BN_ULONG mask;
+ 
+-    if (BN_is_zero(a))
++    if (!BN_is_odd(a))
+         return 0;
+ 
+     for (i = a->top - 1; i >= 0; i--) {
+@@ -1157,12 +1168,13 @@ int BN_GF2m_poly2arr(const BIGNUM *a, int p[], int max)
+         }
+     }
+ 
+-    if (k < max) {
++    if (k > 0 && p[0] > OPENSSL_ECC_MAX_FIELD_BITS)
++        return 0;
++
++    if (k < max)
+         p[k] = -1;
+-        k++;
+-    }
+ 
+-    return k;
++    return k + 1;
+ }
+ 
+ /*
+--- a/test/ec_internal_test.c
++++ b/test/ec_internal_test.c
+@@ -155,6 +155,56 @@ static int field_tests_ecp_mont(void)
+ }
+ 
+ #ifndef OPENSSL_NO_EC2M
++/* Test that decoding of invalid GF2m field parameters fails. */
++static int ec2m_field_sanity(void)
++{
++    int ret = 0;
++    BN_CTX *ctx = BN_CTX_new();
++    BIGNUM *p, *a, *b;
++    EC_GROUP *group1 = NULL, *group2 = NULL, *group3 = NULL;
++
++    TEST_info("Testing GF2m hardening\n");
++
++    BN_CTX_start(ctx);
++    p = BN_CTX_get(ctx);
++    a = BN_CTX_get(ctx);
++    if (!TEST_ptr(b = BN_CTX_get(ctx))
++        || !TEST_true(BN_one(a))
++        || !TEST_true(BN_one(b)))
++        goto out;
++
++    /* Even pentanomial value should be rejected */
++    if (!TEST_true(BN_set_word(p, 0xf2)))
++        goto out;
++    if (!TEST_ptr_null(group1 = EC_GROUP_new_curve_GF2m(p, a, b, ctx)))
++        TEST_error("Zero constant term accepted in GF2m polynomial");
++
++    /* Odd hexanomial should also be rejected */
++    if (!TEST_true(BN_set_word(p, 0xf3)))
++        goto out;
++    if (!TEST_ptr_null(group2 = EC_GROUP_new_curve_GF2m(p, a, b, ctx)))
++        TEST_error("Hexanomial accepted as GF2m polynomial");
++
++    /* Excessive polynomial degree should also be rejected */
++    if (!TEST_true(BN_set_word(p, 0x71))
++        || !TEST_true(BN_set_bit(p, OPENSSL_ECC_MAX_FIELD_BITS + 1)))
++        goto out;
++    if (!TEST_ptr_null(group3 = EC_GROUP_new_curve_GF2m(p, a, b, ctx)))
++        TEST_error("GF2m polynomial degree > %d accepted",
++                   OPENSSL_ECC_MAX_FIELD_BITS);
++
++    ret = group1 == NULL && group2 == NULL && group3 == NULL;
++
++ out:
++    EC_GROUP_free(group1);
++    EC_GROUP_free(group2);
++    EC_GROUP_free(group3);
++    BN_CTX_end(ctx);
++    BN_CTX_free(ctx);
++
++    return ret;
++}
++
+ /* test EC_GF2m_simple_method directly */
+ static int field_tests_ec2_simple(void)
+ {
+@@ -443,6 +493,7 @@ int setup_tests(void)
+     ADD_TEST(field_tests_ecp_simple);
+     ADD_TEST(field_tests_ecp_mont);
+ #ifndef OPENSSL_NO_EC2M
++    ADD_TEST(ec2m_field_sanity);
+     ADD_TEST(field_tests_ec2_simple);
+ #endif
+     ADD_ALL_TESTS(field_tests_default, crv_len);
+
diff --git a/dev-libs/openssl/openssl-3.1.1.ebuild b/dev-libs/openssl/openssl-3.3.2-r1.ebuild
index d391173..4030adf 100644
--- a/dev-libs/openssl/openssl-3.1.1.ebuild
+++ b/dev-libs/openssl/openssl-3.3.2-r1.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/openssl.org.asc
-inherit edo flag-o-matic linux-info toolchain-funcs multilib-minimal multiprocessing verify-sig
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openssl.org.asc
+inherit edo flag-o-matic linux-info toolchain-funcs
+inherit multilib multilib-minimal multiprocessing preserve-libs verify-sig
 
 DESCRIPTION="Robust, full-featured Open Source Toolkit for the Transport Layer Security (TLS)"
-HOMEPAGE="https://www.openssl.org/"
+HOMEPAGE="https://openssl-library.org/"
 
 MY_P=${P/_/-}
 
@@ -17,17 +18,22 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="
-		mirror://openssl/source/${MY_P}.tar.gz
-		verify-sig? ( mirror://openssl/source/${MY_P}.tar.gz.asc )
+		https://github.com/openssl/openssl/releases/download/${P}/${P}.tar.gz
+		verify-sig? (
+			https://github.com/openssl/openssl/releases/download/${P}/${P}.tar.gz.asc
+		)
 	"
-	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+	if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
+		KEYWORDS="~amd64 ~x86"
+	fi
 fi
 
 S="${WORKDIR}"/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1)" # .so version of libssl/libcrypto
-IUSE="+asm cpu_flags_x86_sse2 fips ktls rfc3779 sctp static-libs test tls-compression vanilla verify-sig weak-ssl-ciphers"
+IUSE="+asm cpu_flags_x86_sse2 fips ktls quic rfc3779 sctp static-libs test tls-compression vanilla verify-sig weak-ssl-ciphers"
 RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
@@ -39,11 +45,11 @@ BDEPEND="
 	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
 	test? (
 		sys-apps/diffutils
-		sys-devel/bc
+		app-alternatives/bc
 		sys-process/procps
 	)
-	verify-sig? ( >=sec-keys/openpgp-keys-openssl-20230207 )"
-
+	verify-sig? ( >=sec-keys/openpgp-keys-openssl-20240920 )
+"
 DEPEND="${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}"
 PDEPEND="app-misc/ca-certificates"
@@ -52,6 +58,10 @@ MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/openssl/configuration.h
 )
 
+PATCHES=(
+	"${FILESDIR}"/${P}-CVE-2024-9143.patch
+)
+
 pkg_setup() {
 	if use ktls ; then
 		if kernel_is -lt 4 18 ; then
@@ -83,7 +93,7 @@ src_unpack() {
 	# Can delete this once test fix patch is dropped
 	if use verify-sig ; then
 		# Needed for downloaded patch (which is unsigned, which is fine)
-		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
+		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.asc}
 	fi
 
 	default
@@ -92,7 +102,7 @@ src_unpack() {
 src_prepare() {
 	# Make sure we only ever touch Makefile.org and avoid patching a file
 	# that gets blown away anyways by the Configure script in src_configure
-	rm -f Makefile
+	rm -f Makefile || die
 
 	if ! use vanilla ; then
 		PATCHES+=(
@@ -125,6 +135,7 @@ src_configure() {
 	# code. This has been in the ebuild for > 10 years but even in 2022,
 	# it's still relevant:
 	# - https://github.com/llvm/llvm-project/issues/55255
+	# - https://github.com/openssl/openssl/issues/12247
 	# - https://github.com/openssl/openssl/issues/18225
 	# - https://github.com/openssl/openssl/issues/18663#issuecomment-1181478057
 	# Don't remove the no strict aliasing bits below!
@@ -137,6 +148,11 @@ src_configure() {
 
 	append-flags $(test-flags-CC -Wa,--noexecstack)
 
+	# bug #895308 -- check inserts GNU ld-compatible arguments
+	[[ ${CHOST} == *-darwin* ]] || append-atomic-flags
+	# Configure doesn't respect LIBS
+	export LDLIBS="${LIBS}"
+
 	# bug #197996
 	unset APPS
 	# bug #312551
@@ -161,6 +177,7 @@ multilib_src_configure() {
 	local myeconfargs=(
 		${sslout}
 
+		$(multilib_is_native_abi || echo "no-docs")
 		$(use cpu_flags_x86_sse2 || echo "no-sse2")
 		enable-camellia
 		enable-ec
@@ -172,6 +189,7 @@ multilib_src_configure() {
 		enable-idea
 		enable-mdc2
 		$(use fips && echo "enable-fips")
+		$(use quic && echo "enable-quic")
 		$(use_ssl asm)
 		$(use_ssl ktls)
 		$(use_ssl rfc3779)
@@ -193,29 +211,33 @@ multilib_src_configure() {
 
 multilib_src_compile() {
 	emake build_sw
-
-	if multilib_is_native_abi; then
-		emake build_docs
-	fi
 }
 
 multilib_src_test() {
+	# See https://github.com/openssl/openssl/blob/master/test/README.md for options.
+	#
 	# VFP = show subtests verbosely and show failed tests verbosely
 	# Normal V=1 would show everything verbosely but this slows things down.
-	emake HARNESS_JOBS="$(makeopts_jobs)" VFP=1 test
+	#
+	# -j1 here for https://github.com/openssl/openssl/issues/21999, but it
+	# shouldn't matter as tests were already built earlier, and HARNESS_JOBS
+	# controls running the tests.
+	emake -Onone -j1 HARNESS_JOBS="$(makeopts_jobs)" VFP=1 test
 }
 
 multilib_src_install() {
-	emake DESTDIR="${D}" install_sw
+	# Only -j1 is supported for the install targets:
+	# https://github.com/openssl/openssl/issues/21999#issuecomment-1771150305
+	emake DESTDIR="${D}" -j1 install_sw
 	if use fips; then
-		emake DESTDIR="${D}" install_fips
+		emake DESTDIR="${D}" -j1 install_fips
 		# Regen this in pkg_preinst, bug 900625
 		rm "${ED}${SSL_CNF_DIR}"/fipsmodule.cnf || die
 	fi
 
 	if multilib_is_native_abi; then
-		emake DESTDIR="${D}" install_ssldirs
-		emake DESTDIR="${D}" DOCDIR='$(INSTALLTOP)'/share/doc/${PF} install_docs
+		emake DESTDIR="${D}" -j1 install_ssldirs
+		emake DESTDIR="${D}" DOCDIR='$(INSTALLTOP)'/share/doc/${PF} -j1 install_docs
 	fi
 
 	# This is crappy in that the static archives are still built even
@@ -255,10 +277,16 @@ pkg_preinst() {
 			-module "${ED}/usr/$(get_libdir)/ossl-modules/fips.so"
 		eend $?
 	fi
+
+	preserve_old_lib /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1) \
+		/usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1.1)
 }
 
 pkg_postinst() {
 	ebegin "Running 'openssl rehash ${EROOT}${SSL_CNF_DIR}/certs' to rebuild hashes (bug #333069)"
 	openssl rehash "${EROOT}${SSL_CNF_DIR}/certs"
 	eend $?
+
+	preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1) \
+		/usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1.1)
 }
diff --git a/gui-apps/wlsunset/Manifest b/gui-apps/wlsunset/Manifest
deleted file mode 100644
index dc36999..0000000
--- a/gui-apps/wlsunset/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST wlsunset-0.3.0.tar.gz 16533 BLAKE2B 930635e82963d14fae9f95e2219574c962adbf32406bd184d35b79848dce2f2edaa526aaaf21c2dfdde9f4d4f9fe04011d592955867c3b01b5de4778ef9915f1 SHA512 0685989ec99d7066d5d1efacfbb4676d2df235d33d64cfe3d41c762ccc2ff5c292e03430414b43d719c35ddc0ad8267b765764c15afd1b3177ed1e0bb6f449c1
diff --git a/gui-apps/wlsunset/metadata.xml b/gui-apps/wlsunset/metadata.xml
deleted file mode 100644
index ec5cc1f..0000000
--- a/gui-apps/wlsunset/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<upstream>
-		<remote-id type="sourcehut">~kennylevinsen/wlsunset</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/gui-apps/wlsunset/wlsunset-0.3.0.ebuild b/gui-apps/wlsunset/wlsunset-0.3.0.ebuild
deleted file mode 100644
index 3a80af2..0000000
--- a/gui-apps/wlsunset/wlsunset-0.3.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson
-
-if [[ "${PV}" == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.sr.ht/~kennylevinsen/wlsunset"
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://git.sr.ht/~kennylevinsen/wlsunset/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="Day/night gamma adjustments for Wayland"
-HOMEPAGE="https://sr.ht/~kennylevinsen/wlsunset/"
-LICENSE="MIT"
-SLOT="0"
-
-BDEPEND="
-	app-text/scdoc
-	dev-util/wayland-scanner
-"
-RDEPEND="dev-libs/wayland"
-DEPEND="
-	${RDEPEND}
-	dev-libs/wayland-protocols
-"
-
-src_configure() {
-	local emesonargs=(
-		-Dwerror=false
-		-Dman-pages=enabled
-	)
-
-	meson_src_configure
-}
diff --git a/gui-apps/wob/Manifest b/gui-apps/wob/Manifest
deleted file mode 100644
index aab291a..0000000
--- a/gui-apps/wob/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST wob-0.14.2.tar.gz 21848 BLAKE2B 10dffa9a168ae9b17ec3aed651029100c35050d65fc392dcd6775a321d1ced46b085376c8b74b789c6712577f380ec97d7141d44429acf1a2def2443b20ca3b5 SHA512 933d6bb0469f3b446f8998738ebe7045a1d707a814345961848a025e53cd9bd367cf138c8c6deafe8906c887e783bef85f669e9f107c51c51d357f087aaad6b8
diff --git a/gui-apps/wob/metadata.xml b/gui-apps/wob/metadata.xml
deleted file mode 100644
index 78784e3..0000000
--- a/gui-apps/wob/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<longdescription lang="en">
-		A lightweight overlay volume/backlight/progress/anything bar
-		for wlroots based Wayland compositors (requrires support for
-		wlr_layer_shell_unstable_v1). This project is inspired by
-		xob - X Overlay Bar
-	</longdescription>
-	<upstream>
-		<remote-id type="github">francma/wob</remote-id>
-		<bugs-to>https://github.com/francma/wob/issues</bugs-to>
-	</upstream>
-	<use>
-		<flag name="man">Install man page</flag>
-		<flag name="seccomp">Linux kernel syscall filtering</flag>
-	</use>
-</pkgmetadata>
diff --git a/gui-apps/wob/wob-0.14.2.ebuild b/gui-apps/wob/wob-0.14.2.ebuild
deleted file mode 100644
index bf8f34d..0000000
--- a/gui-apps/wob/wob-0.14.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="Lightweight overlay volume/backlight/progress/anything bar for Wayland"
-HOMEPAGE="https://github.com/francma/wob"
-SRC_URI="https://github.com/francma/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+man +seccomp"
-
-RDEPEND="dev-libs/wayland"
-DEPEND="${RDEPEND}
-	dev-libs/inih
-	dev-libs/wayland-protocols
-	seccomp? ( sys-libs/libseccomp )
-"
-BDEPEND="
-	dev-util/wayland-scanner
-	man? ( app-text/scdoc )
-"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature man man-pages)
-		$(meson_feature seccomp)
-	)
-	meson_src_configure
-}
diff --git a/mail-client/astroid/astroid-9999.ebuild b/mail-client/astroid/astroid-9999.ebuild
index a75b422..76a54d6 100644
--- a/mail-client/astroid/astroid-9999.ebuild
+++ b/mail-client/astroid/astroid-9999.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=7
 
-: "${CMAKE_MAKEFILE_GENERATOR:=ninja}"
-
 inherit cmake git-r3 optfeature virtualx
 
 DESCRIPTION="lightweight graphical threads-with-tags style email client for notmuch"
@@ -36,16 +34,18 @@ RDEPEND="
 	>=dev-cpp/gtkmm-3.10:3.0
 	dev-libs/boost[nls]
 	dev-libs/libsass
-	>=dev-libs/protobuf-3.6.0:=
-	net-libs/libsoup:2.4
-	>=net-libs/webkit-gtk-2.22.0:4
+	>=dev-libs/protobuf-3.6.0:=[protobuf(+)]
+	|| (
+		>=net-libs/webkit-gtk-2.22.0:4.1
+		>=net-libs/webkit-gtk-2.22.0:4
+	)
 	net-mail/notmuch
 "
 DEPEND="${RDEPEND}
 	doc? (
 		|| (
 			app-text/scdoc
-			app-text/ronn
+			app-text/ronn-ng
 		)
 	)
 	test? (
diff --git a/media-fonts/noto-cjk/Manifest b/media-fonts/noto-cjk/Manifest
index 3a78c49..586ea66 100644
--- a/media-fonts/noto-cjk/Manifest
+++ b/media-fonts/noto-cjk/Manifest
@@ -1,3 +1,3 @@
-DIST NotoSansCJK-VF-473da44c32fec739db7e5458c81a833513cb4084.otf.ttc 32682580 BLAKE2B c52d4edad19be495f48a7f7d5481a284645c3cd728fc810f945b49f630a24d41e442d4e1167519c35545c7ec29668d41e33a120d02b705cf220ef3029d2cf20c SHA512 b44200c0b8149004150cba40204af489b1275310f9b574727bebf13e4c3036a99447636a158af1b660a49049325cc1c803ea02b110fa1f58b666808b08dbfd52
-DIST NotoSansMonoCJK-VF-473da44c32fec739db7e5458c81a833513cb4084.otf.ttc 31908332 BLAKE2B 542face4ef7f0b9bfcd19ec637589c6a255a045d0fc19efebc84a567c561fa4c25c253bf4cf486cfb2db5c4e80bf69b196dff49a8fc2c20e80182aaef0cc7003 SHA512 840c83fd069c83f7475a12448dfb0bfc6689d5227a7e390e9b7de52b427632f5b1c85f53084d4bd2d53ec3e38d5629e0455242d89ac98fbaf3d0c24fe8ba723b
-DIST NotoSerifCJK-VF-473da44c32fec739db7e5458c81a833513cb4084.otf.ttc 56909616 BLAKE2B 3c5dd25b60e438dab597beaa620e80a04eb5cf18e5636741296d8b6c8f768dfdb81b54cf1210da01730895bbe0b4ea18410323bb9ac36a99868fe5b1cfee8ae9 SHA512 fa6c1ef94ed9d30b046d20eb360311b630e1f8d727288d3f1d73751f4f6d4731558fdce895d2235fc86bbda1b5e52c9c48a4f5fb604a0dbb3d93a71dde749f50
+DIST NotoSansCJK-VF-4efc595762d1f4b4fa504bccfe8e59de91fda063.otf.ttc 32682580 BLAKE2B c52d4edad19be495f48a7f7d5481a284645c3cd728fc810f945b49f630a24d41e442d4e1167519c35545c7ec29668d41e33a120d02b705cf220ef3029d2cf20c SHA512 b44200c0b8149004150cba40204af489b1275310f9b574727bebf13e4c3036a99447636a158af1b660a49049325cc1c803ea02b110fa1f58b666808b08dbfd52
+DIST NotoSansMonoCJK-VF-4efc595762d1f4b4fa504bccfe8e59de91fda063.otf.ttc 31908332 BLAKE2B 542face4ef7f0b9bfcd19ec637589c6a255a045d0fc19efebc84a567c561fa4c25c253bf4cf486cfb2db5c4e80bf69b196dff49a8fc2c20e80182aaef0cc7003 SHA512 840c83fd069c83f7475a12448dfb0bfc6689d5227a7e390e9b7de52b427632f5b1c85f53084d4bd2d53ec3e38d5629e0455242d89ac98fbaf3d0c24fe8ba723b
+DIST NotoSerifCJK-VF-4efc595762d1f4b4fa504bccfe8e59de91fda063.otf.ttc 56820256 BLAKE2B 06dfc91de4de8fe87c35aed2a258ba04529c01a13d3498c05648891d8b23515f4cefe6d3989b5fa1da4d751d29ac57ff524c0c04a065b2e06b17612bdd7f8496 SHA512 87533362980d2447ca798d453999f0e919833e09fe5090bf7915471c40fa82dd653eac6162657240e3c542a6d69be04747966a96c05c59b4ebebfa54cd9769a6
diff --git a/media-fonts/noto-cjk/noto-cjk-20220126.ebuild b/media-fonts/noto-cjk/noto-cjk-20230817.ebuild
index 56298d3..ec3451a 100644
--- a/media-fonts/noto-cjk/noto-cjk-20220126.ebuild
+++ b/media-fonts/noto-cjk/noto-cjk-20230817.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 DESCRIPTION="Google's CJK font family"
 HOMEPAGE="https://www.google.com/get/noto/ https://github.com/googlefonts/noto-cjk"
 
-COMMIT="473da44c32fec739db7e5458c81a833513cb4084"
+COMMIT="4efc595762d1f4b4fa504bccfe8e59de91fda063"
 SRC_URI="
 	https://github.com/googlefonts/noto-cjk/raw/${COMMIT}/Sans/Variable/OTC/NotoSansCJK-VF.otf.ttc -> NotoSansCJK-VF-${COMMIT}.otf.ttc
 	https://github.com/googlefonts/noto-cjk/raw/${COMMIT}/Sans/Variable/OTC/NotoSansMonoCJK-VF.otf.ttc -> NotoSansMonoCJK-VF-${COMMIT}.otf.ttc
@@ -15,8 +15,7 @@ SRC_URI="
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~*"
-IUSE=""
+KEYWORDS="~amd64 ~x86"
 
 S="${DISTDIR}"
 
diff --git a/media-fonts/noto-emoji/Manifest b/media-fonts/noto-emoji/Manifest
new file mode 100644
index 0000000..7cf18a2
--- /dev/null
+++ b/media-fonts/noto-emoji/Manifest
@@ -0,0 +1 @@
+DIST Noto-COLRv1-d79d23e6822e0f6e5731b114cbfb26b2a4e380da.ttf 4760384 BLAKE2B 7a3190ed3c5f46cd6b15027792d203fef8b863f6bd93cafc3f4a6d043263c58aeb0976ed2be03da227a8f9e308d033322b830734126b27da0fc33656f66d88c1 SHA512 b7fc0e7e4a4c68a02635f3efd0e88e2292a7e85d871e28efc7596da7a11ed1413703a38e7a7bc9c94d0d34a79a22db587547876e633a8391b00500bfc020dae6
diff --git a/media-fonts/noto-emoji/noto-emoji-20231130.ebuild b/media-fonts/noto-emoji/noto-emoji-20231130.ebuild
new file mode 100644
index 0000000..5c0337f
--- /dev/null
+++ b/media-fonts/noto-emoji/noto-emoji-20231130.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit font
+
+DESCRIPTION="Google Noto Emoji fonts"
+HOMEPAGE="https://fonts.google.com/noto/specimen/Noto+Emoji"
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+COMMIT="d79d23e6822e0f6e5731b114cbfb26b2a4e380da"
+SRC_URI="https://github.com/googlefonts/noto-emoji/raw/${COMMIT}/fonts/Noto-COLRv1.ttf -> Noto-COLRv1-${COMMIT}.ttf"
+
+S="${WORKDIR}"
+
+FONT_SUFFIX="ttf"
+
+src_compile() {
+	for f in "${DISTDIR}"/*.ttf; do
+		fn=${f##*/}
+		cp "$f" "${fn/-$COMMIT}"
+	done
+}
diff --git a/media-fonts/noto-emoji/noto-emoji-99999999.ebuild b/media-fonts/noto-emoji/noto-emoji-99999999.ebuild
deleted file mode 100644
index ecdbbf0..0000000
--- a/media-fonts/noto-emoji/noto-emoji-99999999.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Google Noto Emoji fonts"
-HOMEPAGE="https://fonts.google.com/noto/specimen/Noto+Emoji"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="~*"
-IUSE=""
-
-PROPERTIES="live"
-
-BDEPEND="
-	app-arch/unzip
-	|| (
-		net-misc/curl
-		net-misc/wget
-	)
-"
-
-S="${WORKDIR}"
-
-get() {
-	if hash curl 2>/dev/null; then
-		curl -Lf --retry 3 --connect-timeout 60 --speed-limit 300 --speed-time 10 "$@"
-	elif hash wget 2>/dev/null; then
-		wget -O- "$@"
-	else
-		die
-	fi
-}
-
-src_unpack() {
-	get https://fonts.google.com/download?family=Noto%20Emoji > Noto_Emoji.zip || die
-	get https://fonts.google.com/download?family=Noto%20Color%20Emoji > Noto_Color_Emoji.zip || die
-	unzip Noto_Emoji.zip NotoEmoji-VariableFont_wght.ttf || die
-	unzip Noto_Color_Emoji.zip NotoColorEmoji-Regular.ttf || die
-}
-
-src_install() {
-	insinto /usr/share/fonts/${PN}
-	doins NotoEmoji-VariableFont_wght.ttf
-	doins NotoColorEmoji-Regular.ttf
-}
diff --git a/media-fonts/noto/Manifest b/media-fonts/noto/Manifest
index 6133dda..7013cb3 100644
--- a/media-fonts/noto/Manifest
+++ b/media-fonts/noto/Manifest
@@ -1,4 +1,4 @@
-DIST NotoSans%5Bwdth%2Cwght%5D.ttf 2370304 BLAKE2B ddf2e7922a6c3670da55eea3bf65fb20aeed331713017374a3ace2d20df6ec183fe3b71e14c5b98f60b1233e1510e440981431ad0eb95be5b12527692320a28b SHA512 838abbf9158c91a559d04f1d3a471d6e5bc631b46dec04ef54eed5b1f148fc1119e9f154dcd87f48912f320c5903dbef54b74a45ae41ef5cca64d7a93fe547b5
-DIST NotoSans-Italic%5Bwdth%2Cwght%5D.ttf 2541752 BLAKE2B d8335ac4cc70dee748f4d389eec1d6e43cdfe88a2744540e9d7c81b83976e8bc5375643f517888adfb0007c110337dc4e8158973245bbe3f6e3c49f791b6e05e SHA512 31ae013b6175e87c68b1248d92626f66668527b6139c226da96d490f9b99d51002fac646662ea2613d5629d7d9aea67be229afa7f8c071f61ba9acca66e9f742
-DIST NotoSerif%5Bwdth%2Cwght%5D.ttf 2278204 BLAKE2B b7eff19e590956ffef243366d7244c2bec720b21be150f1dac08ffe423243bb2e7c7b45d2dfaa8cc4d849b08979b2e13b17f5bbab099e25bfbcae98dd6a794e8 SHA512 b0b507fbd1108aa62b896b414285a7f615050bb62cd7dd9a3a282016631c1efcfbdd3ed0f762836a7d351e2e0bdd56614eeeee591a2fc0f748cab890b74a3c0f
-DIST NotoSerif-Italic%5Bwdth%2Cwght%5D.ttf 2294324 BLAKE2B 599a8796729222381f98101cff9cd723093956fe0ddd653d346f913145b23f420ac9fe590ec5d607583f7caa64a791966183e85428525c23ea2dfd747e27a7cc SHA512 c18908217dde40d78684111562b094fb57f6b15c3753de27f24bb56c1c4ff2f6bbd5b867606dd600d597eacfdc8ecea7b3d24c185353b6c740818a25a5afecd2
+DIST NotoSans-Italic[wdth,wght]-8bcb8b16321f305a4fca87dcbdef453e19dfc987.ttf 2675320 BLAKE2B 763c2562ae44c74cd3889c9e9b222f5e8136d33c2382f9e2a4710a73d2f4675e49e30912458234bd7d799f9774fb7493dcd37b11bb7e84afa8efe1c21f59f448 SHA512 6c0a5a85f8ef0cdebd8d64b221f6fbfe1aff85ad21d518e8bc0acb8c59e78de495d58b013df53a9a26f6bbb056ee3876692308cdc9cf2459c5719387ece0e044
+DIST NotoSans[wdth,wght]-8bcb8b16321f305a4fca87dcbdef453e19dfc987.ttf 2493792 BLAKE2B a2c8904c841d553d129cc57f7b35828034f9825c7fb63929f7bfbc889c7ecebc16009d5b39c5d79b69addf2226d10f2eb4979a479857130ee5dd3b9cdc2ff968 SHA512 a4ebea5ec83d554b35bca70ac22a077a19dd41cafe0a23622ade62a278b4a5a8d9f3b453945bc128f2a27469f8d287c669a77a8aad5d9cb93bde5a20e76dc5cc
+DIST NotoSerif-Italic[wdth,wght]-8bcb8b16321f305a4fca87dcbdef453e19dfc987.ttf 2448496 BLAKE2B 853301c53445355fcd0be6f13aaebdc7cd5d5820dcd2972bb8521a94e9a4aa80f1e8dab264c202eeb41ba383968d94918869256883746c62dd1b2a043bc1ff80 SHA512 fa63eef7fa9f30bc9c48ed62038031bbbad3c9408aae6f9854fb93bceb18c8247f6c5de79dbbcf3a5082a188f37ec847452cf094a9411bacd2e747ebe24f630d
+DIST NotoSerif[wdth,wght]-8bcb8b16321f305a4fca87dcbdef453e19dfc987.ttf 2420628 BLAKE2B f19080179e54567a92edb576143940be99734e841479ba2fdea4c65862e637a5f3216082ca426f18354aadb962955a83dd47e89d1a24b4a8433fa825b10388d0 SHA512 c419f4d2777cd4c97038b97190eb50274bb9c2f2e508d5bdac53eb218c0b31ff7c7b8d0f4111fbd41ba866671f7224e3374f06e5b9179e8f0ab42eae6a077a38
diff --git a/media-fonts/noto/noto-20230117.ebuild b/media-fonts/noto/noto-20230117.ebuild
deleted file mode 100644
index d0503aa..0000000
--- a/media-fonts/noto/noto-20230117.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Google's font family that aims to support all the world's languages"
-HOMEPAGE="https://www.google.com/get/noto/ https://github.com/googlefonts/noto-fonts"
-
-COMMIT="6bff404f9a23cd603190277422d043a0afd7908e"
-SRC_URI="
-	https://github.com/notofonts/notofonts.github.io/raw/${COMMIT}/fonts/NotoSans/googlefonts/variable-ttf/NotoSans%5Bwdth%2Cwght%5D.ttf -> NotoSans[wdth,wght]-${COMMIT}.ttf
-	https://github.com/notofonts/notofonts.github.io/raw/${COMMIT}/fonts/NotoSans/googlefonts/variable-ttf/NotoSans-Italic%5Bwdth%2Cwght%5D.ttf -> NotoSans-Italic[wdth,wght]-${COMMIT}.ttf
-	https://github.com/notofonts/notofonts.github.io/raw/${COMMIT}/fonts/NotoSerif/googlefonts/variable-ttf/NotoSerif%5Bwdth%2Cwght%5D.ttf -> NotoSerif[wdth,wght]-${COMMIT}.ttf
-	https://github.com/notofonts/notofonts.github.io/raw/${COMMIT}/fonts/NotoSerif/googlefonts/variable-ttf/NotoSerif-Italic%5Bwdth%2Cwght%5D.ttf -> NotoSerif-Italic[wdth,wght]-${COMMIT}.ttf
-	"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="~*"
-IUSE=""
-
-S="${DISTDIR}"
-
-src_install() {
-	insinto /usr/share/fonts/${PN}
-	newins "NotoSans[wdth,wght]-${COMMIT}.ttf" "NotoSans[wdth,wght].ttf"
-	newins "NotoSans-Italic[wdth,wght]-${COMMIT}.ttf" "NotoSans-Italic[wdth,wght].ttf"
-	newins "NotoSerif[wdth,wght]-${COMMIT}.ttf" "NotoSerif[wdth,wght].ttf"
-	newins "NotoSerif-Italic[wdth,wght]-${COMMIT}.ttf" "NotoSerif-Italic[wdth,wght].ttf"
-	insinto /etc/fonts/conf.avail
-	# From ArchLinux
-	doins "${FILESDIR}/66-noto-serif.conf"
-	doins "${FILESDIR}/66-noto-mono.conf"
-	doins "${FILESDIR}/66-noto-sans.conf"
-}
diff --git a/media-fonts/noto/noto-20231001.ebuild b/media-fonts/noto/noto-20231001.ebuild
new file mode 100644
index 0000000..15104ae
--- /dev/null
+++ b/media-fonts/noto/noto-20231001.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit font
+
+DESCRIPTION="Google's font family that aims to support all the world's languages"
+HOMEPAGE="https://fonts.google.com/noto https://github.com/notofonts/notofonts.github.io"
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMIT="8bcb8b16321f305a4fca87dcbdef453e19dfc987"
+SRC_URI="
+	https://github.com/notofonts/notofonts.github.io/raw/${COMMIT}/fonts/NotoSans/googlefonts/variable/NotoSans%5Bwdth%2Cwght%5D.ttf -> NotoSans[wdth,wght]-${COMMIT}.ttf
+	https://github.com/notofonts/notofonts.github.io/raw/${COMMIT}/fonts/NotoSans/googlefonts/variable/NotoSans-Italic%5Bwdth%2Cwght%5D.ttf -> NotoSans-Italic[wdth,wght]-${COMMIT}.ttf
+	https://github.com/notofonts/notofonts.github.io/raw/${COMMIT}/fonts/NotoSerif/googlefonts/variable/NotoSerif%5Bwdth%2Cwght%5D.ttf -> NotoSerif[wdth,wght]-${COMMIT}.ttf
+	https://github.com/notofonts/notofonts.github.io/raw/${COMMIT}/fonts/NotoSerif/googlefonts/variable/NotoSerif-Italic%5Bwdth%2Cwght%5D.ttf -> NotoSerif-Italic[wdth,wght]-${COMMIT}.ttf
+"
+
+S="${WORKDIR}"
+
+FONT_SUFFIX="ttf"
+FONT_CONF=(
+    # From ArchLinux
+    "${FILESDIR}/66-noto-serif.conf"
+    "${FILESDIR}/66-noto-mono.conf"
+    "${FILESDIR}/66-noto-sans.conf"
+)
+
+src_compile() {
+	for f in "${DISTDIR}"/*.ttf; do
+		fn=${f##*/}
+		cp "$f" "${fn/-$COMMIT}"
+	done
+}
diff --git a/media-fonts/source-pro/Manifest b/media-fonts/source-pro/Manifest
deleted file mode 100644
index 99d65ef..0000000
--- a/media-fonts/source-pro/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST source-code-pro-20210115.tar.gz 6818951 BLAKE2B b133aa317bf5057e8b346d81491bf08c0c257066ed05b2001a9e327308a63a3ef943da3b12b5933c217c31839750fbb3947b4f566f48aac6e88c7096cbbf82cd SHA512 96981af2a470027a372ab8a02265d34a6b2a810c4cca0b498b01e613019a04c9760d95e21fb740af2c7fff076098bb36f5c282bf9b8f1875eed72ed70e4b3ac9
-DIST source-sans-pro-20210115.tar.gz 12105836 BLAKE2B 3e2fed594f74614afd49ef731497b9abd6c75a78850cc1c5abbae0c246f454a0d06b82d4b7eaeefe8fb6b0d8246adb3f2751b4de6e2637f05f6cc20ead66faba SHA512 4b53ca10053bf10b23f3a2488d562b79a8dfd39f1402d068098856bbd1bd5bd9ddbb8f269acea45f003289dc95378229ed14e21fdcd39d49e3d6864693c0fbb4
-DIST source-serif-pro-20210115.tar.gz 40747188 BLAKE2B 9c91fbb5d9b29c28e1e64f36e410afce8ae6f0e6d030a6ee4e6069a20d270bf7852967641eb54b33bfe9a23eae024448f6c22de25d766a9f8a830cce04d29db1 SHA512 fff923121f1d536886468fd4887e036d9d85603e57c4ecabe64f73af4506b15265481ca69cbe7d83751f93ff72f7f9dce3aae56dacdd2c4da1bc1e7285f76d6b
diff --git a/media-fonts/source-pro/files/63-source-pro.conf b/media-fonts/source-pro/files/63-source-pro.conf
deleted file mode 100644
index 4265e65..0000000
--- a/media-fonts/source-pro/files/63-source-pro.conf
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
-<fontconfig>
-  <alias>
-    <family>Source Code Pro</family>
-    <default>
-      <family>monospace</family>
-    </default>
-  </alias>
-  <alias>
-    <family>monospace</family>
-    <prefer>
-      <family>Source Code Pro</family>
-    </prefer>
-  </alias>
-  <alias>
-    <family>Source Sans Pro</family>
-    <default>
-      <family>sans-serif</family>
-    </default>
-  </alias>
-  <alias>
-    <family>sans-serif</family>
-    <prefer>
-      <family>Source Sans Pro</family>
-    </prefer>
-  </alias>
-  <alias>
-    <family>Source Serif Pro</family>
-    <default>
-      <family>serif</family>
-    </default>
-  </alias>
-  <alias>
-    <family>serif</family>
-    <prefer>
-      <family>Source Serif Pro</family>
-    </prefer>
-  </alias>
-</fontconfig>
diff --git a/media-fonts/source-pro/metadata.xml b/media-fonts/source-pro/metadata.xml
deleted file mode 100644
index bcdcbf1..0000000
--- a/media-fonts/source-pro/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>fonts@gentoo.org</email>
-		<name>Fonts</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">adobe-fonts/source-code-pro</remote-id>
-		<remote-id type="sourceforge">sourcesans.adobe</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-fonts/source-pro/source-pro-20210115.ebuild b/media-fonts/source-pro/source-pro-20210115.ebuild
deleted file mode 100644
index 00605fc..0000000
--- a/media-fonts/source-pro/source-pro-20210115.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit font
-
-SANSV="3.046R"
-SERIFV="4.004R"
-CODEV="2.038R-ro/1.058R-it/1.018R-VAR"
-
-DESCRIPTION="Adobe's open source typeface family designed for UI environments"
-HOMEPAGE="https://adobe-fonts.github.io/source-sans/
-	https://adobe-fonts.github.io/source-serif/
-	https://adobe-fonts.github.io/source-code-pro/"
-SRC_URI="https://github.com/adobe-fonts/source-sans/archive/${SANSV}.tar.gz -> source-sans-pro-${PV}.tar.gz
-	https://github.com/adobe-fonts/source-serif/archive/${SERIFV}.tar.gz -> source-serif-pro-${PV}.tar.gz
-	https://github.com/adobe-fonts/source-code-pro/archive/${CODEV}.tar.gz -> source-code-pro-${PV}.tar.gz"
-S="${WORKDIR}"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
-IUSE="cjk"
-
-RESTRICT="binchecks strip"
-
-RDEPEND="
-	media-libs/fontconfig
-	cjk? ( media-fonts/source-han-sans )
-"
-
-FONT_CONF=( "${FILESDIR}"/63-${PN}.conf )
-FONT_SUFFIX="otf"
-
-src_prepare() {
-	default
-	mv source-*/OTF/*.otf . || die
-}
diff --git a/media-sound/pamixer/Manifest b/media-sound/pamixer/Manifest
deleted file mode 100644
index 996e474..0000000
--- a/media-sound/pamixer/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pamixer-1.4.tar.gz 17614 BLAKE2B afd8b26d987d85c043e88870805b5504ff1f7fb96583b8002dfe106ba4d9a25cf429d7ff81d4ab8a2c75501d5926136089b68fe919c997dd3bb6d4662957c66b SHA512 e3916ed8dc020bb43e57994a9f35a506147a0fde42b88c30c661cbeffa40e0f74cae66cd015394e524684c32f9674de3e3763a1396a3e1b9aecbfdc3ed117fe4
diff --git a/media-sound/pamixer/metadata.xml b/media-sound/pamixer/metadata.xml
deleted file mode 100644
index c0718b5..0000000
--- a/media-sound/pamixer/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>alex_y_xu@yahoo.ca</email>
-		<name>Alex Xu (Hello71)</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">cdemoulins/pamixer</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-sound/pamixer/pamixer-1.4.ebuild b/media-sound/pamixer/pamixer-1.4.ebuild
deleted file mode 100644
index a9205dd..0000000
--- a/media-sound/pamixer/pamixer-1.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Pulseaudio command line mixer."
-HOMEPAGE="https://github.com/cdemoulins/pamixer"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/cdemoulins/pamixer"
-else
-	SRC_URI="https://github.com/cdemoulins/pamixer/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-
-RDEPEND="
-	dev-libs/boost
-	media-sound/pulseaudio"
-
-DEPEND="${RDEPEND}"
-
-src_install() {
-	dobin ${PN}
-	dodoc README.rst
-}
diff --git a/net-dns/libidn-compat/Manifest b/net-dns/libidn-compat/Manifest
index 43e891c..8be52ee 100644
--- a/net-dns/libidn-compat/Manifest
+++ b/net-dns/libidn-compat/Manifest
@@ -1,2 +1 @@
-DIST libidn-1.33-security_backports-01.tar.xz 3420 BLAKE2B c0311d83dee53b83bceab7777e9508ffdc2737e31eec71dc7e67b29ee75cdcef8558db0e89d857ed8c402980fdd7c3419fbb123eba91dddc2358a06684114811 SHA512 e925d20c9258b47821d444c563c75f09f003d1c6b367c934a808242ce4c259ff83e9d67e886cb3e832117df1cd9cae4b18417c48fbf9c77266ab379d3afcd4f4
 DIST libidn-1.33.tar.gz 3501056 BLAKE2B ce6319dc61dd825cf7ddb33f4279c178709e16ce2815c3d1a464bba6b5c6cc493107a10a686f349247a0d6023b1b834a650046e68da9f2f559870dba13a59384 SHA512 38dd459eaeda0c9e3cc2d24d967113515a499747550a2a9157f32357def90d71a3a3b52398e96a44a28cd5948dc353b0473c4ff0453a69720191c4cb49cac2c6
diff --git a/net-dns/libidn-compat/libidn-compat-1.33.ebuild b/net-dns/libidn-compat/libidn-compat-1.33.ebuild
index cda239e..ae8027a 100644
--- a/net-dns/libidn-compat/libidn-compat-1.33.ebuild
+++ b/net-dns/libidn-compat/libidn-compat-1.33.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 inherit autotools multilib-minimal libtool
 
 MY_PN=libidn
@@ -11,7 +11,6 @@ DESCRIPTION="Internationalized Domain Names (IDN) implementation"
 HOMEPAGE="https://www.gnu.org/software/libidn/"
 SRC_URI="
 	mirror://gnu/libidn/${MY_P}.tar.gz
-	https://dev.gentoo.org/~polynomial-c/${MY_P}-security_backports-01.tar.xz
 "
 
 LICENSE="GPL-2 GPL-3 LGPL-3"
@@ -29,8 +28,6 @@ S="${WORKDIR}/${MY_P}"
 src_prepare() {
 	default
 
-	eapply "${WORKDIR}"/patches
-
 	# breaks eautoreconf
 	sed '/AM_INIT_AUTOMAKE/s@ -Werror@@' -i configure.ac || die
 	# Breaks build because --disable-gtk-doc* gets ignored
diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 280ff50..0b58477 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -1,2 +1,2 @@
 DIST database-v1.tar.xz 204876 BLAKE2B 846a8d2f17edb61ed1c3d3c655becd1f60b4046772058706f13d516f65421a5105593660f1c556907bb2bb9607a3c2521243d1be07bffb70817ad3b8461680ca SHA512 e2d87373e00b65756d7fea40c54fb236d7a37ce839145c3afd99ab26efdc17796e540c021e2c24e521df2d0a01ccbf918994f87a0d83235ff9b109a51555b3d0
-DIST notmuch-0.37.tar.xz 792568 BLAKE2B 0a968b776efc39ddc09bb2cb2721609fcdf65171978d285b6877abd4c3aa7d0221b25f1052a211be1864c57d961c7a1f0c9915fd9c65497a9e4bce3a2cdbc1c0 SHA512 31cac1ff03b139b18a4fec5e29907ba0e3a965f0a7bf5f2f2b0f75980f9663173745be854e83943f344a09cdb7f5615fa48218e327c4ade7a55b3a22b2a9c45e
+DIST notmuch-0.38.3.tar.xz 805416 BLAKE2B 08f4f5c5732a788a52ca5fb6e6296d7348586796f86cab8273aebf88521e52c52b4515287334d246d030bf3ba0666f24bf0badad843e8b20a1a8bc1da32f6509 SHA512 247f8b365a75b29df719403bc2c9645eb669a7ee6eb4c1e0047dcf55fea4d66c8dcb4899162b952643aa6148ec6e1538ebe3e7e8408376153165e394084aed19
diff --git a/net-mail/notmuch/files/notmuch-assume-modern-gmime.patch b/net-mail/notmuch/files/notmuch-assume-modern-gmime.patch
index 5c9f86a..a138814 100644
--- a/net-mail/notmuch/files/notmuch-assume-modern-gmime.patch
+++ b/net-mail/notmuch/files/notmuch-assume-modern-gmime.patch
@@ -1,8 +1,6 @@
-diff --git a/configure b/configure
-index 5247e05a..097b2039 100755
 --- a/configure
 +++ b/configure
-@@ -490,230 +490,9 @@ if pkg-config --exists "gmime-3.0 >= $GMIME_MINVER"; then
+@@ -502,230 +502,9 @@
      gmime_cflags=$(pkg-config --cflags gmime-3.0)
      gmime_ldflags=$(pkg-config --libs gmime-3.0)
  
@@ -41,9 +39,9 @@ index 5247e05a..097b2039 100755
 -	printf 'No.\nCould not make tempdir for testing session-key support.\n'
 -	errors=$((errors + 1))
 -    elif ${CC} ${CFLAGS} ${gmime_cflags} _check_session_keys.c ${gmime_ldflags} -o _check_session_keys \
--	   && GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import < "$srcdir"/test/gnupg-secret-key.asc \
+-	   && GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import < "$srcdir"/test/openpgp4-secret-key.asc \
 -	   && SESSION_KEY=$(GNUPGHOME=${TEMP_GPG} ./_check_session_keys) \
--	   && [ $SESSION_KEY = 9:0BACD64099D1468AB07C796F0C0AC4851948A658A15B34E803865E9FC635F2F5 ]
+-	   && [ $SESSION_KEY = 9:496A0B6D15A5E7BA762FB8E5FE6DEE421D4D9BBFCEAD1CDD0CCF636D07ADE621 ]
 -    then
 -	printf "OK.\n"
 -    else
@@ -57,8 +55,8 @@ index 5247e05a..097b2039 100755
 -Please try to rebuild your version of GMime against a more recent
 -version of GPGME (at least GPGME 1.8.0).
 -EOF
--	if command -v gpgme-config >/dev/null; then
--	    printf 'Your current GPGME development version is: %s\n' "$(gpgme-config --version)"
+-	if GPGME_VERS="$(pkg-config --modversion gpgme || gpgme-config --version)"; then
+-	    printf 'Your current GPGME development version is: %s\n' "$GPGME_VERS"
 -	else
 -	    printf 'You do not have the GPGME development libraries installed.\n'
 -	fi
@@ -186,7 +184,7 @@ index 5247e05a..097b2039 100755
 -    body = GMIME_MULTIPART_ENCRYPTED(g_mime_message_get_mime_part (g_mime_parser_construct_message (parser, NULL)));
 -    if (body == NULL) return !!	fprintf (stderr, "did not find a multipart/encrypted message\n");
 -
--    output = g_mime_multipart_encrypted_decrypt (body, GMIME_DECRYPT_NONE, "9:13607E4217515A70EC8DF9DBC16C5327B94577561D98AD1246FA8756659C7899", &result, &error);
+-    output = g_mime_multipart_encrypted_decrypt (body, GMIME_DECRYPT_NONE, "9:9E1CDF53BBF794EA34F894B5B68E1E56FB015EA69F81D2A5EAB7F96C7B65783E", &result, &error);
 -    if (error || output == NULL) return !! fprintf (stderr, "decrypt failed\n");
 -
 -    sig_list = g_mime_decrypt_result_get_signatures (result);
@@ -207,7 +205,7 @@ index 5247e05a..097b2039 100755
 -	printf 'No.\nCould not make tempdir for testing signature verification when decrypting with session keys.\n'
 -	errors=$((errors + 1))
 -    elif ${CC} ${CFLAGS} ${gmime_cflags} _verify_sig_with_session_key.c ${gmime_ldflags} -o _verify_sig_with_session_key \
--	    && GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import < "$srcdir"/test/gnupg-secret-key.asc \
+-	    && GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import < "$srcdir"/test/openpgp4-secret-key.asc \
 -	    && rm -f ${TEMP_GPG}/private-keys-v1.d/*.key
 -    then
 -	if GNUPGHOME=${TEMP_GPG} ./_verify_sig_with_session_key; then
diff --git a/net-mail/notmuch/metadata.xml b/net-mail/notmuch/metadata.xml
index e186496..cf5cb52 100644
--- a/net-mail/notmuch/metadata.xml
+++ b/net-mail/notmuch/metadata.xml
@@ -12,7 +12,6 @@
 		<flag name="nmbug">Install experimental tag sharing /
 			pseudo-bug-tracking script for Notmuch
 			(see http://notmuchmail.org/nmbug/)</flag>
-		<flag name="valgrind">Depend on dev-util/valgrind for test suite</flag>
 	</use>
 	<longdescription lang="en">
 		Notmuch is a system for indexing, searching, reading, and tagging large
diff --git a/net-mail/notmuch/notmuch-0.37-r2.ebuild b/net-mail/notmuch/notmuch-0.38.3.ebuild
index f9fd203..92fc94f 100644
--- a/net-mail/notmuch/notmuch-0.37-r2.ebuild
+++ b/net-mail/notmuch/notmuch-0.38.3.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
+DISTUTILS_EXT=1
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{9..12} pypy3 )
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
 
 inherit bash-completion-r1 desktop distutils-r1 elisp-common flag-o-matic pax-utils toolchain-funcs xdg-utils
 
@@ -17,7 +18,7 @@ LICENSE="GPL-3"
 # Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
 # meant to be binary backward compatible.
 SLOT="0/5"
-KEYWORDS="~alpha amd64 arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	apidoc? ( doc )
@@ -31,7 +32,7 @@ BDEPEND="
 	app-arch/xz-utils[extra-filters(-)]
 	virtual/pkgconfig
 	apidoc? (
-		app-doc/doxygen
+		app-text/doxygen
 		dev-lang/perl
 	)
 	doc? (
@@ -67,7 +68,7 @@ DEPEND="${COMMON_DEPEND}
 	test? (
 		>=app-editors/emacs-${NEED_EMACS}:*[libxml2]
 		app-misc/dtach
-		sys-devel/gdb[python]
+		dev-debug/gdb[python]
 		crypt? (
 			app-crypt/gnupg
 			dev-libs/openssl
@@ -81,7 +82,6 @@ RDEPEND="${COMMON_DEPEND}
 		dev-perl/File-Which
 		dev-perl/Mail-Box
 		dev-perl/MailTools
-		dev-perl/String-ShellQuote
 		dev-perl/Term-ReadLine-Gnu
 		virtual/perl-Digest-SHA
 		virtual/perl-File-Path
@@ -95,7 +95,6 @@ SITEFILE="50${PN}-gentoo.el"
 
 PATCHES=(
 	"${FILESDIR}/notmuch-assume-modern-gmime.patch"
-	"${FILESDIR}"/${PN}-0.37-configure-clang16.patch
 )
 
 pkg_setup() {
@@ -183,7 +182,7 @@ src_compile() {
 	# prevent race in emacs doc generation
 	# FileNotFoundError: [Errno 2] No such file or directory: '..work/notmuch-0.31/emacs/notmuch.rsti'
 	if use emacs; then
-		use doc && emake -j1 -C emacs docstring.stamp V=1 #nowarn
+		use doc && emake -j1 -C emacs docstring.stamp V=1
 	fi
 
 	emake V=1
@@ -191,9 +190,7 @@ src_compile() {
 	use python && distutils-r1_src_compile
 
 	if use mutt; then
-		pushd contrib/notmuch-mutt > /dev/null || die
-		emake notmuch-mutt.1
-		popd > /dev/null || die
+		emake -C contrib/notmuch-mutt notmuch-mutt.1
 	fi
 }
 
@@ -212,8 +209,10 @@ src_test() {
 	# we run pytest via eclass phasefunc, so delete upstream launcher
 	use python && { rm -v test/T391-python-cffi.sh || die ; }
 
-	LD_LIBRARY_PATH="${S}/lib" \
-		nonfatal emake test V=1 OPTIONS="--verbose --tee" || test_failures+=( "'emake tests'" )
+	# These both fail because of line wrapping in the output
+	rm test/T315-emacs-tagging.sh test/T310-emacs.sh || die
+
+	LD_LIBRARY_PATH="${S}/lib" nonfatal emake test V=1 OPTIONS="--verbose --tee" || test_failures+=( "'emake tests'" )
 	pax-mark -ze notmuch
 
 	# both lib and bin needed for testsuite.
diff --git a/profiles/eapi b/profiles/eapi
new file mode 100644
index 0000000..7ed6ff8
--- /dev/null
+++ b/profiles/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/package.mask b/profiles/package.mask
index 2ee9b05..7fb4701 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,2 +1,3 @@
 # untested
 dev-lang/zig
+dev-java/openj9-openjdk:11
diff --git a/sci-calculators/units/Manifest b/sci-calculators/units/Manifest
deleted file mode 100644
index 62a5de3..0000000
--- a/sci-calculators/units/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST units-2.21.tar.gz 1308533 BLAKE2B 0a02979eafa21af759128ec72b11e1f532640c9d0e88ae8f389a1beb52d5a400cbd6294042aa4c7d8786c06c8ac4106a77c302805b8c5e3bb84d4134805fd517 SHA512 34bacff606f12aa5b2e59170f6b2142277aa1121d79610a51b57f07f17ae2dbdfbbb0e60be34522f367679cc152408f77c1ebb551016224d23f81c21f4b3ba62
diff --git a/sci-calculators/units/files/units-2.17-network-sandbox.patch b/sci-calculators/units/files/units-2.17-network-sandbox.patch
deleted file mode 100644
index e457610..0000000
--- a/sci-calculators/units/files/units-2.17-network-sandbox.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -107,7 +107,7 @@
-             -e "s@/usr/bin/python@$(PYTHON)@" \
-              $(srcdir)/units_cur > units_cur_inst
- 
--install-support: definitions.units units_cur_inst currency-units-update
-+install-support: definitions.units units_cur_inst
- 	$(MKDIR_P) $(DESTDIR)@UDAT@ $(DESTDIR)$(bindir) $(DESTDIR)@CDAT@
- 	$(INSTALL_DATA) $(srcdir)/definitions.units $(DESTDIR)@UDAT@definitions.units
- 	-rm -f $(DESTDIR)@UDAT@currency.units
diff --git a/sci-calculators/units/files/units-2.20-readerror.patch b/sci-calculators/units/files/units-2.20-readerror.patch
deleted file mode 100644
index ccb12c6..0000000
--- a/sci-calculators/units/files/units-2.20-readerror.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/units.c
-+++ b/units.c
-@@ -761,7 +761,7 @@
- }
- 
- 
--#define readerror (goterr=1) && errfile && fprintf
-+#define readerror(...) do { goterr=1; if (errfile) fprintf(__VA_ARGS__); } while (0)
- 
- #define VAGUE_ERR "%s: error in units file '%s' line %d\n", \
-                        progname, file, linenum
diff --git a/sci-calculators/units/files/units_cur-urllib.patch b/sci-calculators/units/files/units_cur-urllib.patch
deleted file mode 100644
index b0c61f9..0000000
--- a/sci-calculators/units/files/units_cur-urllib.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -ru a/units_cur b/units_cur
---- a/units_cur	2018-09-15 16:30:09.000000000 -0400
-+++ b/units_cur	2021-07-11 18:01:29.030260473 -0400
-@@ -28,8 +28,12 @@
- #
- #
- 
--version = '5.0'
-+version = '5.1'
- 
-+# Version 5.1:
-+#
-+# Switch to urllib to avoid requests dependency.
-+#
- # Version 5.0:
- #
- # Rewrite to support multiple different data sources due to disappearance
-@@ -54,8 +58,11 @@
- # Python 2 or Python 3.  Thanks to Ray Hamel for some help with this update.  
- 
- # Normal imports
--import requests
- import codecs
-+import json
-+import urllib.error
-+import urllib.parse
-+import urllib.request
- from argparse import ArgumentParser
- from collections import OrderedDict
- from datetime import date
-@@ -288,11 +295,12 @@
-                                                   currency[code][rate_index]))
- 
- def getjson(address,args=None):
-+  if args:
-+    address = address + "?" + urllib.parse.urlencode(args)
-   try:
--    res = requests.get(address,args)
--    res.raise_for_status()
--    return(res.json())
--  except requests.exceptions.RequestException as e:
-+    res = urllib.request.urlopen(address)
-+    return(json.load(res))
-+  except urllib.error.URLError as e:
-     stderr.write('Error connecting to currency server:\n{}.\n'.format(e))
-     exit(1)
-         
-@@ -323,9 +331,8 @@
-     stderr.write('European bank uses euro for base currency.  Specified base {} ignored.\n'.format(base))
-   import xml.etree.ElementTree as ET
-   try:
--    res=requests.get('https://www.ecb.europa.eu/stats/eurofxref/eurofxref-daily.xml')
--    res.raise_for_status()
--    data = ET.fromstring(res.content)[2][0]
-+    res=urllib.request.urlopen('https://www.ecb.europa.eu/stats/eurofxref/eurofxref-daily.xml')
-+    data = ET.fromstring(res.read())[2][0]
-   except requests.exceptions.RequestException as e:
-     stderr.write('Error connecting to currency server:\n{}.\n'.
-                  format(e))
diff --git a/sci-calculators/units/metadata.xml b/sci-calculators/units/metadata.xml
deleted file mode 100644
index fc2b905..0000000
--- a/sci-calculators/units/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-<use>
-<flag name="units-cur">Install the units_cur python script that updates currencies</flag>
-</use>
-</pkgmetadata>
diff --git a/sci-calculators/units/units-2.21-r2.ebuild b/sci-calculators/units/units-2.21-r2.ebuild
deleted file mode 100644
index d44ccf9..0000000
--- a/sci-calculators/units/units-2.21-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-inherit python-r1
-
-DESCRIPTION="Unit conversion program"
-HOMEPAGE="https://www.gnu.org/software/units/units.html"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="FDL-1.3 GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="+units-cur"
-REQUIRED_USE="units-cur? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	sys-libs/readline:=
-	units-cur? (
-		${PYTHON_DEPS}
-	)
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.17-network-sandbox.patch
-	"${FILESDIR}"/${PN}-2.20-readerror.patch
-	"${FILESDIR}"/units_cur-urllib.patch
-)
-
-DOCS=( ChangeLog NEWS README )
-
-src_configure() {
-	econf \
-		--sharedstatedir="${EPREFIX}"/var/lib \
-		ac_cv_path_PYTHON=no
-}
-
-src_compile() {
-	emake ${PN}
-}
-
-src_install() {
-	default
-
-	if use units-cur; then
-		sed \
-			-e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" \
-			-e 's|^#!|&/usr/bin/python|g' \
-			units_cur_inst > units_cur || die
-		python_foreach_impl python_doscript units_cur
-	fi
-}
diff --git a/sys-boot/limine/Manifest b/sys-boot/limine/Manifest
new file mode 100644
index 0000000..515aa98
--- /dev/null
+++ b/sys-boot/limine/Manifest
@@ -0,0 +1 @@
+DIST limine-8.0.13.tar.xz 407784 BLAKE2B 2722b6a644766b181bb456605a16fb957eecfa2808303443fc890b28074bfe11961f8f3ffa904c890b867ad7c4eca105bb6d727a98d405c075ad603ecea2e011 SHA512 116082e74e15a1f2cc0e13a14b215929902589da08ff2dc8617de1a87e9ae9ba9fe81f6e40f56f00860841034feac93609601fc2557df25ee602d71933784be3
diff --git a/sys-boot/limine/limine-8.0.13.ebuild b/sys-boot/limine/limine-8.0.13.ebuild
new file mode 100644
index 0000000..5d41343
--- /dev/null
+++ b/sys-boot/limine/limine-8.0.13.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Limine is a modern, advanced, and portable BIOS/UEFI multiprotocol bootloader"
+HOMEPAGE="https://limine-bootloader.org/"
+SRC_URI="https://github.com/limine-bootloader/limine/releases/download/v${PV}/limine-${PV}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="abi_x86_32 abi_x86_64 bios bios-pxe bios-cd uefi uefi-cd"
+
+BDEPEND="
+	app-alternatives/gzip
+	dev-lang/nasm
+	sys-apps/findutils
+	uefi-cd? ( sys-fs/mtools )
+"
+
+REQUIRED_USE="
+	bios? ( || ( amd64 x86 ) )
+	bios-cd? ( || ( amd64 x86 ) )
+	bios-pxe? ( || ( amd64 x86 ) )
+"
+
+src_configure() {
+	local myconf=(
+		$(use_enable bios)
+		$(use_enable bios-cd)
+		$(use_enable bios-pxe)
+
+		$(use_enable uefi-cd)
+	)
+
+	if use uefi; then
+		myconf+=(
+			$(use_enable abi_x86_32 uefi-ia32)
+			$(use_enable abi_x86_64 uefi-x86-64)
+			$(use_enable arm64 uefi-aarch64)
+			$(use_enable riscv uefi-riscv64)
+		)
+	fi
+
+	econf "${myconf[@]}"
+}
diff --git a/sys-boot/limine/metadata.xml b/sys-boot/limine/metadata.xml
new file mode 100644
index 0000000..6b13f02
--- /dev/null
+++ b/sys-boot/limine/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>arsen@gentoo.org</email>
+    <name>Arsen Arsenović</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">limine-bootloader/limine</remote-id>
+  </upstream>
+  <use>
+    <flag name="uefi-cd">
+        Enable building cd-efi.bin using <pkg>sys-fs/mtools</pkg>.
+        This flag was previously known as eltorito-efi.
+    </flag>
+
+    <flag name="bios">
+      Enable BIOS/MBR boot support.
+    </flag>
+    <flag name="bios-pxe">
+      Enables BIOS PXE boot support.
+    </flag>
+    <flag name="bios-cd">
+      Enables BIOS boot support for CDs.
+    </flag>
+  </use>
+</pkgmetadata>
diff --git a/virtual/jdk/jdk-17-r1.ebuild b/virtual/jdk/jdk-21-r1.ebuild
index a18c1a8..a18c1a8 100644
--- a/virtual/jdk/jdk-17-r1.ebuild
+++ b/virtual/jdk/jdk-21-r1.ebuild
diff --git a/virtual/jre/jre-11-r3.ebuild b/virtual/jre/jre-11-r3.ebuild
index 510db0f..0986578 100644
--- a/virtual/jre/jre-11-r3.ebuild
+++ b/virtual/jre/jre-11-r3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="Virtual for Java Runtime Environment (JRE)"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 
 RDEPEND="|| (
 		dev-java/openjdk-jre-bin:${SLOT}[gentoo-vm(+)]
diff --git a/virtual/jre/jre-17-r1.ebuild b/virtual/jre/jre-21-r1.ebuild
index 510db0f..08a3961 100644
--- a/virtual/jre/jre-17-r1.ebuild
+++ b/virtual/jre/jre-21-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="Virtual for Java Runtime Environment (JRE)"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 
 RDEPEND="|| (
 		dev-java/openjdk-jre-bin:${SLOT}[gentoo-vm(+)]