Sync with portage [Mon Sep 11 00:11:34 MSK 2023].

8 months ago · b56ca7ed27
parent 71d8b46371
commit b56ca7ed27
1779 changed files with 18355 additions and 32032 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@ -6,3 +6,4 @@ DIST aws-cli-1.29.40.gh.tar.gz 2515692 BLAKE2B 1d7b93da39719ddd4813973f9b06f9f97
 DIST aws-cli-1.29.41.gh.tar.gz 2516949 BLAKE2B ae8b2c2c47b72832a038e883fdc6e15d2b59ac520203a21a1093f29d84131d054457700e59d3184768d1040f84708a73c4dac85fe2b1e99e121924c03f9b1ded SHA512 c48d16c577d4d3ac1038f33c716db6b9a61241a595b37105cde0841c84a3157f3004aaf8fd1ff95ef9b64837f8ab4c50cd875cd36154b4285bf01315b817b283
 DIST aws-cli-1.29.42.gh.tar.gz 2517766 BLAKE2B 88f70820385eb6930b8f4cc3724c3823019ce3de419689a7d2b400ec1ee66cb76d325cfc2ad6d5ad740003f2ce53fff198f470e69b79697f17b52430e8cc704c SHA512 3e37c45189531045a44e9b6295a1618f3fa321c89681956e362dc7675e94616a33734e8aa644e6e2236f72979bd8f1a7ce5d95e70f684bb14c2e9a5bd1c2aefb
 DIST aws-cli-1.29.43.gh.tar.gz 2517922 BLAKE2B 958a60e055ad83b8ed69ff0cb217d75bf7b2714fcffd1ad56c9929502c698d5d98f421d6bb7c34b9134c5a8ef8b792f2077ebb862e1b9f805eccf7a1acac9003 SHA512 9ce4b4cdee3dbbf6c75ed222fe1f34504a1b7d7ac3dfde18e4b341044a6f522653995bfda9dd891c84bf05672e62912b370060b6b7f77aed12c38bd5e9a06067
+DIST aws-cli-1.29.44.gh.tar.gz 2530834 BLAKE2B f2cb6eb13deb07b3f4ad3e7c5cea71d716092ac96a92201ddc0703d1a1031843900d697be1bceee1d05bd5443ff2ef6086717e97b49c3e550f53307823b3efe3 SHA512 0ef736b2ef43822f66da01ee4090df18b6e837b4a37b86ac0bdf45742eda0ec2f7b9bdd494d3642585088cfcb4dfec8b2a46b3b9ae76aa427fff6c8e82353826
--- a/app-admin/awscli/awscli-1.29.44.ebuild
+++ b/app-admin/awscli/awscli-1.29.44.ebuild
@ -0,0 +1,78 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+	https://github.com/aws/aws-cli/
+	https://pypi.org/project/awscli/
+"
+SRC_URI="
+	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# botocore is x.(y+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# broken xdist (signal() works only in main thread)
+		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
+		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
+	)
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit} -p xdist -n "$(makeopts_jobs)"
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
--- a/app-admin/ccze/ccze-0.2.1-r5.ebuild
+++ b/app-admin/ccze/ccze-0.2.1-r5.ebuild
@ -0,0 +1,43 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools fixheadtails toolchain-funcs
+
+DESCRIPTION="A flexible and fast logfile colorizer"
+HOMEPAGE="https://git.madhouse-project.org/archive/ccze"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+
+DEPEND="dev-libs/libpcre
+	sys-libs/ncurses:0="
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog ChangeLog-0.1 NEWS THANKS README FAQ )
+
+PATCHES=(
+	"${FILESDIR}"/ccze-fbsd.patch
+	"${FILESDIR}"/ccze-segfault.patch
+	"${FILESDIR}"/ccze-ldflags.patch
+	"${FILESDIR}"/${P}-tinfo.patch
+)
+
+src_prepare() {
+	default
+
+	# GCC 4.x fixes
+	sed -e 's/-Wswitch -Wmulticharacter/-Wswitch/' \
+	    -i src/Makefile.in || die
+	sed -e '/AC_CHECK_TYPE(error_t, int)/d' \
+	    -i configure.ac || die
+
+	eautoreconf
+
+	ht_fix_file Rules.mk.in
+
+	tc-export CC
+}
--- a/app-admin/entr/Manifest
+++ b/app-admin/entr/Manifest
@ -1 +1,2 @@
 DIST entr-5.3.tar.gz 20905 BLAKE2B 79b4c39ee3f9530db1d8a6cd62a6aa925e201d6b5b370b25c3884b160a83658688204005db612b1d18743ba39f0de6ccad8492910142ebfff7b550a5ec48516d SHA512 b160cb60de99a743226b472256d937ef6ace54f5350a83420f59ac2706cd0fb042d6f85fcac6c73e76c161c6225b956df8b00156dea9ce55d8b8225e8ca13e7f
+DIST entr-5.4.tar.gz 21215 BLAKE2B 52e24b56d876ff22bb8660ed3bb822e532da97999b20a358c5b9c120a5526eeb80ed01b56c993d7da10471124c52295145f8c948f88530b086d6af5b593ee70a SHA512 c366254df6df28edbcb2a9d12ab97e063baa4d78889e54b3de6b75e8c7ef2468c661216485bbf297a4d539ac3d186fcc9b140a99a1a89306f6cac1f969a7d95f
--- a/app-admin/entr/entr-5.4.ebuild
+++ b/app-admin/entr/entr-5.4.ebuild
@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo toolchain-funcs
+
+DESCRIPTION="Run arbitrary commands when files change"
+HOMEPAGE="
+	https://eradman.com/entrproject/
+	https://github.com/eradman/entr
+"
+SRC_URI="https://eradman.com/entrproject/code/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		app-editors/vim
+		app-misc/tmux
+		dev-vcs/git
+		sys-apps/file
+	)
+"
+
+src_configure() {
+	tc-export CC
+	export PREFIX="${EPREFIX}/usr"
+	export SHELL="${BROOT}/bin/bash"
+	export TMUX_TMPDIR="${T}"
+
+	edo ./configure
+}
--- a/app-admin/eselect/eselect-1.4.26.ebuild
+++ b/app-admin/eselect/eselect-1.4.26.ebuild
@ -16,7 +16,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"

 LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-4.0 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc emacs vim-syntax"

 DEPEND="sys-apps/sed
--- a/app-admin/helm/Manifest
+++ b/app-admin/helm/Manifest
@ -1,2 +1,4 @@
 DIST helm-3.11.2-deps.tar.xz 125570640 BLAKE2B 7dd267c0070add0bd9ce70bc115cf9d2b427e32c5040f900ff750218aafcee331712ddc8da8c9655f06522696c5f4923a73ba8b94a13f16d09b8973d447817ad SHA512 4223461fa3d0032826387a4170492df561f828546fd4f4307ec5f2006e2abb77275382ebab57baea81767de97bcaa3642d88a022b07448e452e151d83fc04652
+DIST helm-3.12.3-deps.tar.xz 156473664 BLAKE2B 88e2e99465f977b1bec52350a3c4988a595152bacf8db0208e81b38c050ccbadb48f97e3c239ddae5fa8d16d04be5bff6d76fa09ce8fdfc73487c2a44980a2ab SHA512 211775262e51d2ebabd4bf991ba7ecc8fc0fa6b9fa06e35cb6edf127bbc21143fd04a6441759dba423950def31951067407e253b3554b9efd56b4ed93444f7ea
 DIST k8s-helm-3.11.2.tar.gz 733884 BLAKE2B 2077927a61b8dcbf5907f8b2760445c8f846c186d504fc9bc9037fdafa4ad15cd8ccaaed3033be7d96cc3e05c74c283bf84c69d666721fef43198c44529db681 SHA512 32b251abf520692490e5dc9affa33b73955540a90854c84cc645364be8a4ca7afa1a9bf356a19be1efba6d35d36ef69f7b420402f73b96790f04635e9e881756
+DIST k8s-helm-3.12.3.tar.gz 721672 BLAKE2B d426d77e8fc8bb4ccd149e05bb3ee6f2ac38260a609bd2a5301a6318b961fb2ac19cd30f0c1372eaad67c5b8d301e356f310653ed8a682eba77d980cb0bf35e7 SHA512 25015a8ce8f04887ebb3add1a151670ff500c24b5b8933cfe3a956db1478483902a9c9c5bf57887b9f4b891e8d479752d9422ee68b43b9140fa0edc37cf38753
--- a/app-admin/helm/helm-3.12.3.ebuild
+++ b/app-admin/helm/helm-3.12.3.ebuild
@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit bash-completion-r1 go-module
+GIT_COMMIT=3a31588ad33fe3b89af5a2a54ee1d25bfe6eaa5e
+GIT_SHA=3a31588a
+MY_PV=${PV/_rc/-rc.}
+
+DESCRIPTION="Kubernetes Package Manager"
+HOMEPAGE="https://github.com/helm/helm https://helm.sh"
+SRC_URI="https://github.com/helm/helm/archive/v${MY_PV}.tar.gz -> k8s-${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-4.0 CC-BY-SA-4.0 ISC MIT ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
+
+RESTRICT=" test"
+
+src_compile() {
+	emake \
+		GOFLAGS="${GOFLAGS}" \
+		LDFLAGS="" \
+		GIT_COMMIT=${GIT_COMMIT} \
+		GIT_SHA=${GIT_SHA} \
+		GIT_TAG=v${MY_PV} \
+		GIT_DIRTY=clean \
+		build
+	bin/${PN} completion bash > ${PN}.bash || die
+	bin/${PN} completion zsh > ${PN}.zsh || die
+}
+
+src_install() {
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+
+	dobin bin/${PN}
+	dodoc README.md
+}
--- a/app-admin/mcelog/Manifest
+++ b/app-admin/mcelog/Manifest
@ -1 +1,2 @@
 DIST mcelog-194.tar.gz 317449 BLAKE2B 68124209247ab0545d2f33c703bc6c10a6225275b929fe035cdad49f30d0ed2e8e5b30968b29f95c537a406b6aaca322adeaa22f1dc33c5f6dc92526f707b003 SHA512 b253b96bac2b6abe6c112f26b0b2d7cfc7720235fa0eec85bd60b1670d36d4032c8c9b27b9e0e22d77b4247ac661bf9278cf0bd43f196fd446ca3e04a41b65ed
+DIST mcelog-195.tar.gz 318965 BLAKE2B aebfcac2a5e5aab43cf3b08d169c75469c81d8724d2e907890bb5b947e1dbea8e418fdf4c00512112ddc67d1ddcc3a014409c7a546bd60c8e36b2e7af72480c7 SHA512 45436f5859a3ffd1c0eaf998282910ad317b85d03f15130a66a2d4e32e2653dbd86b2033db7f6b321a4b9692354adb92773c26958eb5d474954e12c9ab4a9cda
--- a/app-admin/mcelog/mcelog-195.ebuild
+++ b/app-admin/mcelog/mcelog-195.ebuild
@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit linux-info python-any-r1 systemd toolchain-funcs
+
+DESCRIPTION="A tool to log and decode Machine Check Exceptions"
+HOMEPAGE="http://mcelog.org/"
+SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="selinux"
+
+RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
+DEPEND="${PYTHON_DEPS}"
+
+# TODO: add mce-inject to the tree to support test phase
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch
+	"${FILESDIR}"/${PN}-129-debugflags.patch
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		local CONFIG_CHECK="~X86_MCE"
+		kernel_is -ge 4 12 && CONFIG_CHECK+=" ~X86_MCELOG_LEGACY"
+		check_extra_config
+	fi
+}
+
+src_prepare() {
+	default
+	tc-export CC
+	python_fix_shebang genconfig.py
+}
+
+src_install() {
+	default
+
+	insinto /etc/logrotate.d/
+	newins ${PN}.logrotate ${PN}
+
+	newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
+	systemd_dounit ${PN}.service
+
+	dodoc *.pdf
+}
--- a/app-admin/metalog/metalog-20230719.ebuild
+++ b/app-admin/metalog/metalog-20230719.ebuild
@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-${P}"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="unicode"

 RDEPEND="
--- a/app-admin/r10k/Manifest
+++ b/app-admin/r10k/Manifest
@ -1,2 +1,3 @@
 DIST r10k-3.15.4.tar.gz 258268 BLAKE2B 6f2f69895d84e13f54f2a7e6dba086c5b4234f0644709dafa8f88366dbe37fe8f165ef2d316f4c5b60df843448d164132878d67750bc3a65a2b8f66b205d3266 SHA512 521cf69a7372a60db74c3795b608c5ab4148f628365210228d79d9146a80d7105e4c757241e891e8e37027ae0cc2f37e59773c9838bd88042b0fdab13e36cd88
 DIST r10k-3.16.0.tar.gz 253547 BLAKE2B 683fdd5588c7b3c3b47ae0d28d75fbfb929d5595c715531eed86b8d89f76708c91f38f9ca558040b36fac38c038211086a74fdf109b37350126bc78b25f8b751 SHA512 399a357cf8617427632516e0f439a40464ba0c8201ee7b6ce15c893ae029bfd9ae1438b76aff3b9601685d14febf8fc71dbdd2954eb3352d6ce713e769cb586d
+DIST r10k-4.0.0.tar.gz 254074 BLAKE2B 8053d435691d33cd1d8b3c55c2cb3a153cd952112a93f2eeb4b715c6c0b92e9192c65f8809b4187d5ff4f5f6b9ed8f67a644d7920bf8d8294dd0b5d8fd735836 SHA512 a6b92fabcc405fe6678da724743e43d9dc3a286e3a973a3320ac94c25dd385315baaaf495dbd1706005d31f13d4c52f1c425148d3b397448fed07fd83acb04fa
--- a/app-admin/r10k/r10k-4.0.0.ebuild
+++ b/app-admin/r10k/r10k-4.0.0.ebuild
@ -0,0 +1,52 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_EXTRAINSTALL=locales
+
+inherit ruby-fakegem
+
+DESCRIPTION="Puppet environment and module deployment"
+HOMEPAGE="https://github.com/puppetlabs/r10k"
+SRC_URI="https://github.com/puppetlabs/r10k/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+git"
+
+ruby_add_rdepend "
+	~dev-ruby/colored2-3.1.2
+	>=dev-ruby/cri-2.15.10:0
+	|| ( dev-ruby/gettext-setup:1 >=dev-ruby/gettext-setup-0.24:0 )
+	>=dev-ruby/jwt-2.2.3:2 <dev-ruby/jwt-2.8.0:2
+	>=dev-ruby/ruby-gettext-3.0.2:0
+	~dev-ruby/log4r-1.1.10
+	>=dev-ruby/minitar-0.9:0
+	>=dev-ruby/multi_json-1.10:0
+	dev-ruby/puppet_forge:5
+"
+
+ruby_add_bdepend "test? (
+	>=dev-ruby/minitar-0.9
+)"
+
+RDEPEND="${RDEPEND} git? ( >=dev-vcs/git-1.6.6 )"
+
+all_ruby_prepare() {
+	sed -e '/s.files/d' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid specs for unpackaged rugget git provider
+	rm -rf spec/unit/git_spec.rb spec/unit/git/rugged || die
+
+	# Avoid spec making assumptions on availability of relative symlinks
+	rm -f spec/integration/util/purageable_spec.rb || die
+}
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@ -1,3 +1,4 @@
 DIST salt-3005.1.tar.gz 17914349 BLAKE2B 697c2068bf119e4a19f92a86ce880fec9375c10ba549cdcdd2182cfeaacce31c7bc4c4c91e1a609906b4c5373bb5e3120e0db47ede5b45ee20942d7b2d201e64 SHA512 391f995f0129f3d7104a0eea4fd83b18aa6ecae0fd7a2c77c1154e24b0bcd52cef4b63db12597c85737bb33ddf605e0c23370cef3bf47f9ea85af5b77d74dc50
 DIST salt-3005.2.tar.gz 17935313 BLAKE2B 550853b8245351b251438ac87d775e8b39d71ddc1eee0375f4bb29c04e2aacf5905ef9ac5373d9e7ff47a1cc8d6b9ce1a2a4c3d75b5647d4047bc06a5e526664 SHA512 07e7afc732a97006557d4556d60aa1854934893d0566bf8c295d4b1c01515988a1bf2798ce228f6b37e657de8fdfff51153ad2ea8d54baa6a5c377e30794f317
 DIST salt-3006.2.tar.gz 20411634 BLAKE2B dff474017918ef3ee0031856a2739282077205d8c2589809a91e5f1c3741cb26d2bd2458734ea4d3533118c881851dfd853f4ba4f1c631e7db28e95bc1b6f7f8 SHA512 2626cb5beb1b30fc63f554f5804f0d9b7e36b7c569c5f9049e5f5ac5a413e9d99a98b3d91089683338e3d3890ec973dff80782b4e41acb291872e45084fd2546
+DIST salt-3006.3.tar.gz 20461738 BLAKE2B dfa4698dbc611c9c4954b4631d11b685e1efc978915918ce6d8f1890bb4a230d234b6a191166ffff9243058d44530bfc14b43386c8bc295c035c6609d6bf3fa0 SHA512 9cced766db2144de445ed53b52c1551c986ba43774c40512fd07973862d6d3a361e25f55fcfeeb0e03ba44eec1051909834e5d0a352ead5ec6f418b15c909628
--- a/app-admin/salt/files/salt-3006-tests.patch
+++ b/app-admin/salt/files/salt-3006-tests.patch
@ -1,74 +0,0 @@
-diff --git a/tests/pytests/unit/modules/test_linux_sysctl.py b/tests/pytests/unit/modules/test_linux_sysctl.py
-index 0bdd24039d..22df70c58d 100644
--- a/tests/pytests/unit/modules/test_linux_sysctl.py
-+++ b/tests/pytests/unit/modules/test_linux_sysctl.py
-@@ -215,7 +215,7 @@ def test_persist_no_conf_failure():
-         ):
-             with pytest.raises(CommandExecutionError):
-                 linux_sysctl.persist("net.ipv4.ip_forward", 42, config=None)
-    fopen_mock.called_once()
-+    fopen_mock.assert_called_once()
- 
- 
- def test_persist_no_conf_success():
-diff --git a/tests/pytests/unit/modules/test_win_ip.py b/tests/pytests/unit/modules/test_win_ip.py
-index 38eb6b1ac5..94a3fe7ca9 100644
--- a/tests/pytests/unit/modules/test_win_ip.py
-+++ b/tests/pytests/unit/modules/test_win_ip.py
-@@ -151,7 +151,7 @@ def test_enable():
-     ):
-         assert win_ip.enable("Ethernet")
- 
-    mock_cmd.called_once_with(
-+    mock_cmd.assert_called_once_with(
-         [
-             "netsh",
-             "interface",
-@@ -180,7 +180,7 @@ def test_disable():
-     ):
-         assert win_ip.disable("Ethernet")
- 
-    mock_cmd.called_once_with(
-+    mock_cmd.assert_called_once_with(
-         [
-             "netsh",
-             "interface",
-diff --git a/tests/pytests/unit/test_master.py b/tests/pytests/unit/test_master.py
-index cd11d217c7..502767d3e3 100644
--- a/tests/pytests/unit/test_master.py
-+++ b/tests/pytests/unit/test_master.py
-@@ -60,7 +60,7 @@ def test_fileserver_duration():
-         end = time.time()
-         # Interval is equal to timeout so the _do_update method will be called
-         # one time.
-        update.called_once()
-+        update.assert_called_once()
-         # Timeout is 1 second
-         duration = end - start
-         if duration > 2 and salt.utils.platform.spawning_platform():
-diff --git a/tests/pytests/unit/utils/event/test_event.py b/tests/pytests/unit/utils/event/test_event.py
-index e289e72dad..2abd4066c4 100644
--- a/tests/pytests/unit/utils/event/test_event.py
-+++ b/tests/pytests/unit/utils/event/test_event.py
-@@ -300,7 +300,7 @@ def test_connect_pull_should_debug_log_on_StreamClosedError():
-     event = SaltEvent(node=None)
-     with patch.object(event, "pusher") as mock_pusher:
-         with patch.object(
-            salt.utils.event.log, "debug", auto_spec=True
-+            salt.utils.event.log, "debug", auto_spec=True, unsafe=True
-         ) as mock_log_debug:
-             mock_pusher.connect.side_effect = (
-                 salt.ext.tornado.iostream.StreamClosedError
-@@ -317,10 +317,10 @@ def test_connect_pull_should_error_log_on_other_errors(error):
-     event = SaltEvent(node=None)
-     with patch.object(event, "pusher") as mock_pusher:
-         with patch.object(
-            salt.utils.event.log, "debug", auto_spec=True
-+            salt.utils.event.log, "debug", auto_spec=True, unsafe=True
-         ) as mock_log_debug:
-             with patch.object(
-                salt.utils.event.log, "error", auto_spec=True
-+                salt.utils.event.log, "error", auto_spec=True, unsafe=True
-             ) as mock_log_error:
-                 mock_pusher.connect.side_effect = error
-                 event.connect_pull()
--- a/app-admin/salt/files/salt-3006.3-tests.patch
+++ b/app-admin/salt/files/salt-3006.3-tests.patch
@ -0,0 +1,26 @@
+diff --git a/tests/pytests/unit/utils/event/test_event.py b/tests/pytests/unit/utils/event/test_event.py
+index e289e72dad..2abd4066c4 100644
+--- a/tests/pytests/unit/utils/event/test_event.py
+++ b/tests/pytests/unit/utils/event/test_event.py
+@@ -300,7 +300,7 @@ def test_connect_pull_should_debug_log_on_StreamClosedError():
+     event = SaltEvent(node=None)
+     with patch.object(event, "pusher") as mock_pusher:
+         with patch.object(
+-            salt.utils.event.log, "debug", auto_spec=True
+            salt.utils.event.log, "debug", auto_spec=True, unsafe=True
+         ) as mock_log_debug:
+             mock_pusher.connect.side_effect = (
+                 salt.ext.tornado.iostream.StreamClosedError
+@@ -317,10 +317,10 @@ def test_connect_pull_should_error_log_on_other_errors(error):
+     event = SaltEvent(node=None)
+     with patch.object(event, "pusher") as mock_pusher:
+         with patch.object(
+-            salt.utils.event.log, "debug", auto_spec=True
+            salt.utils.event.log, "debug", auto_spec=True, unsafe=True
+         ) as mock_log_debug:
+             with patch.object(
+-                salt.utils.event.log, "error", auto_spec=True
+                salt.utils.event.log, "error", auto_spec=True, unsafe=True
+             ) as mock_log_error:
+                 mock_pusher.connect.side_effect = error
+                 event.connect_pull()
--- a/app-admin/salt/salt-3006.3.ebuild
+++ b/app-admin/salt/salt-3006.3.ebuild
@ -0,0 +1,237 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_10 )
+
+DISTUTILS_USE_PEP517=setuptools
+inherit systemd distutils-r1
+
+DESCRIPTION="Salt is a remote execution and configuration manager"
+HOMEPAGE="https://www.saltstack.com/resources/community/
+	https://github.com/saltstack"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git"
+	EGIT_BRANCH="develop"
+else
+	inherit pypi
+	KEYWORDS="~amd64 ~riscv ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="
+	cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako
+	mongodb neutron	nova openssl portage profile redis selinux test raet
+	+zeromq vim-syntax
+"
+
+RDEPEND="
+	sys-apps/pciutils
+	>=dev-python/cryptography-41.0.3[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.5[${PYTHON_USEDEP}]
+	>=dev-python/jinja-3.1.2[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/libnacl[${PYTHON_USEDEP}]
+	dev-python/looseversion[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
+	>=dev-python/psutil-5.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pycryptodome-3.9.8[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-6.0.1[${PYTHON_USEDEP}]
+	>=dev-python/markupsafe-2.1.2[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.31.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/tomli[${PYTHON_USEDEP}]
+	dev-python/watchdog[${PYTHON_USEDEP}]
+	libcloud? (
+		dev-python/aiohttp[${PYTHON_USEDEP}]
+		dev-python/aiosignal[${PYTHON_USEDEP}]
+		>=dev-python/apache-libcloud-2.5.0[${PYTHON_USEDEP}]
+		dev-python/async-timeout[${PYTHON_USEDEP}]
+	)
+	mako? ( dev-python/mako[${PYTHON_USEDEP}] )
+	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+	libvirt? (
+		dev-python/libvirt-python[${PYTHON_USEDEP}]
+	)
+	openssl? (
+		dev-libs/openssl:0=[-bindist(-)]
+		>=dev-python/pyopenssl-23.2.0[${PYTHON_USEDEP}]
+	)
+	raet? (
+		>=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
+		>=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
+	)
+	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
+	cheetah? ( >=dev-python/cheetah3-3.2.2[${PYTHON_USEDEP}] )
+	genshi? ( dev-python/genshi[${PYTHON_USEDEP}] )
+	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+	portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
+	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
+	redis? ( dev-python/redis[${PYTHON_USEDEP}] )
+	selinux? ( sec-policy/selinux-salt )
+	nova? (
+		>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]
+	)
+	neutron? (
+		>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]
+	)
+	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
+	profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
+	vim-syntax? ( app-vim/salt-vim )
+	zeromq? ( >=dev-python/pyzmq-19.0.0[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+	dev-python/build[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/apache-libcloud[${PYTHON_USEDEP}]
+		>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
+		>=dev-python/certifi-2023.07.22[${PYTHON_USEDEP}]
+		dev-python/cherrypy[${PYTHON_USEDEP}]
+		>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+		dev-python/mako[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/moto-2.0.0[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/bcrypt[${PYTHON_USEDEP}]
+		dev-python/pip[${PYTHON_USEDEP}]
+		>=dev-python/pyopenssl-23.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-7.2.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-salt-factories-1.0.0_rc25[${PYTHON_USEDEP}]
+		dev-python/pytest-tempdir[${PYTHON_USEDEP}]
+		dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
+		dev-python/pytest-subtests[${PYTHON_USEDEP}]
+		dev-python/pytest-shell-utilities[${PYTHON_USEDEP}]
+		dev-python/pytest-skip-markers[${PYTHON_USEDEP}]
+		dev-python/pytest-system-statistics[${PYTHON_USEDEP}]
+		dev-python/pytest-custom-exit-code[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		net-dns/bind-tools
+		>=dev-python/virtualenv-20.3.0[${PYTHON_USEDEP}]
+		dev-util/yamllint[${PYTHON_USEDEP}]
+		!x86? ( >=dev-python/boto3-1.21.46[${PYTHON_USEDEP}] )
+	)
+"
+
+DOCS=( README.rst AUTHORS )
+
+REQUIRED_USE="|| ( raet zeromq )
+	test? ( cheetah genshi )"
+RESTRICT="!test? ( test ) x86? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/salt-3003-gentoolkit-revdep.patch"
+	"${FILESDIR}/salt-3005.1-no-entry-points.patch"
+	"${FILESDIR}/salt-3006-skip-tests-that-oom-machine.patch"
+	"${FILESDIR}/salt-3006.2-tests.patch"
+	"${FILESDIR}/salt-3006.3-tests.patch"
+)
+
+python_prepare_all() {
+	# remove tests with external dependencies that may not be available, and
+	# tests that don't work in sandbox
+	rm tests/unit/{test_{zypp_plugins,module_names},utils/test_extend}.py || die
+	rm tests/unit/modules/test_boto_{vpc,secgroup,elb}.py || die
+	rm tests/unit/states/test_boto_vpc.py || die
+
+	#rm tests/support/gitfs.py || die
+	rm tests/pytests/functional/transport/server/test_req_channel.py || die
+	rm tests/pytests/functional/utils/test_async_event_publisher.py || die
+	rm tests/pytests/functional/runners/test_winrepo.py || die
+	rm tests/unit/netapi/rest_tornado/test_saltnado.py || die
+
+	# tests that require network access
+	rm tests/unit/{states,modules}/test_zcbuildout.py || die
+	rm -r tests/integration/cloud || die
+	rm -r tests/kitchen/tests/wordpress/tests || die
+	rm tests/kitchen/test_kitchen.py || die
+	rm tests/unit/modules/test_network.py || die
+	rm tests/pytests/functional/modules/test_pip.py || die
+	rm tests/pytests/unit/client/ssh/test_ssh.py || die
+	rm -r tests/pytests/{integration,functional}/netapi tests/integration/netapi || die
+
+	# tests require root access
+	rm tests/integration/pillar/test_git_pillar.py || die
+	rm tests/integration/states/test_supervisord.py || die
+
+	# removes contextvars, see bug: https://bugs.gentoo.org/799431
+	sed -i '/^contextvars/d' requirements/base.txt || die
+
+	# make sure pkg_resources doesn't bomb because pycrypto isn't installed
+	find "${S}" -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d ; /pycryptodomex/ d' -i || die
+	# pycryptodome rather than pycryptodomex
+	find "${S}" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:Cryptodome:Crypto:g' -- || die
+	# called_once should be assert_called_once_with
+	find "${S}/tests" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:[.]called_once:.assert_called_once:g' -- || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	local svc
+	USE_SETUPTOOLS=1 distutils-r1_python_install_all
+
+	for svc in minion master syndic api; do
+		newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc}
+		newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
+		systemd_dounit "${FILESDIR}"/salt-${svc}.service
+	done
+
+	insinto /etc/${PN}
+	doins -r conf/*
+}
+
+python_test() {
+	local -a EPYTEST_DESELECT=(
+		# doesn't like the distutils warning
+		tests/pytests/integration/cli/test_batch.py::test_batch_retcode
+		tests/pytests/integration/cli/test_batch.py::test_multiple_modules_in_batch
+		# hangs indefinitely
+		tests/pytests/unit/test_minion.py::test_master_type_disable
+		# needs root
+		tests/pytests/unit/modules/test_cmdmod.py::test_runas_env_sudo_group
+		# don't like sandbox
+		tests/pytests/functional/cli/test_salt.py::test_versions_report
+		tests/unit/utils/test_vt.py::test_split_multibyte_characters_unicode
+		tests/unit/utils/test_vt.py::test_split_multibyte_characters_shiftjis
+		tests/pytests/unit/utils/test_vt.py::test_log_sanitize
+		tests/pytests/unit/client/ssh/test_single.py::test_run_with_pre_flight_args
+		tests/pytests/unit/modules/test_aptpkg.py::test_call_apt_dpkg_lock
+		tests/pytests/unit/test_master.py::test_fileserver_duration
+		tests/pytests/unit/test_template.py::test_compile_template_str_mkstemp_cleanup
+		tests/pytests/unit/_logging/handlers/test_deferred_stream_handler.py::test_deferred_write_on_flush
+		tests/pytests/unit/_logging/handlers/test_deferred_stream_handler.py::test_sync_with_handlers
+		tests/pytests/unit/modules/test_portage_config.py::test_enforce_nice_config
+		tests/pytests/unit/modules/test_msteams.py::test_post_card
+		tests/pytests/unit/states/test_file.py::test_file_recurse_directory_test
+		tests/unit/utils/test_schema.py::ConfigTestCase::test_anyof_config_validation
+		tests/unit/utils/test_schema.py::ConfigTestCase::test_dict_config_validation
+		tests/unit/utils/test_schema.py::ConfigTestCase::test_hostname_config_validation
+		tests/unit/utils/test_schema.py::ConfigTestCase::test_not_config_validation
+		tests/unit/utils/test_schema.py::ConfigTestCase::test_oneof_config_validation
+		tests/unit/utils/test_schema.py::ConfigTestCase::test_optional_requirements_config_validation
+	)
+
+	# testsuite likes lots of files
+	ulimit -n 4096 || die
+
+	# ${T} is too long a path for the tests to work
+	local TMPDIR
+	TMPDIR="$(mktemp --directory --tmpdir=/tmp ${PN}-XXXX)" || die
+	(
+		export TMPDIR
+		cleanup() { rm -rf "${TMPDIR}" || die; }
+
+		trap cleanup EXIT
+
+		addwrite "${TMPDIR}"
+
+		USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \
+			epytest
+	)
+}
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
--- a/app-arch/dump/dump-0.4.47-r3.ebuild
+++ b/app-arch/dump/dump-0.4.47-r3.ebuild
@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ppc64 ~sparc ~x86"
 # We keep uuid USE flag default dsiabled for this version. Don't forget
 # to default enable it for later versions as this is the upstream default.
 IUSE="bzip2 debug ermt lzo readline selinux sqlite ssl static test uuid zlib"
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@ -1 +1 @@
-DIST stress-ng-0.16.04.tar.gz 3918769 BLAKE2B 5e2b457be2e38c583dcfc72719c5abacfaca658f7861a4faee5b709568ff4dd646e595b88be9542cf2b977e0184678c4c15a2aabfd421df8d92f8c18040a4773 SHA512 9c0ebcef697cb1fcf6f0836a8d0d88da0be20ed0683c35304e540bf040beff4152e231ba98c8a3ebe3c22bbde66a22ff8929397c35f7e070b9498ad1275e7a8d
+DIST stress-ng-0.16.05.tar.gz 3930948 BLAKE2B 41aabb35ac8f00899dfea144a368f0a7f625c4631d341bd456f3a9bdb1f28b1975ec960ebe81935fcb27df7019c07bbe8c3ad43a698a19e65a6ce2da7bac1bda SHA512 03c854a0b5028e43a826f8f2c721ed828731c0b52c0d15f4415807d885d3d81abe969820e27e2c40eb459c2c5a987c18ae9dd7923a755bac1aade923d71d71d8
--- a/app-benchmarks/stress-ng/stress-ng-0.16.05.ebuild
+++ b/app-benchmarks/stress-ng/stress-ng-0.16.05.ebuild
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
--- a/app-containers/lxc/Manifest
+++ b/app-containers/lxc/Manifest
@ -1,4 +1,2 @@
-DIST lxc-5.0.2.tar.gz 973977 BLAKE2B e6017406b96f53525b576528814922a017a7d65fb04724046236307f4e85219b3c8ac725678e57ae3f77a4e817f718748e8c61fbc8147160e4ac87d3146b6567 SHA512 2e8800875e9c91cc0cbfdfc33c43d84bad9471d8a1b8ccd52d7d9c6fe44f280f9f701b8ccc2e0f5319a3e4c50d8c4331722f0dd9c0347575eb4f7b4ed110bef3
-DIST lxc-5.0.2.tar.gz.asc 833 BLAKE2B 3d78f8a87b2f45d2b91a9a6595d286e2fc1dcfc7d28f3c1d86e968860a7e346506ab28d4dafffede8acf1f82e8b12f90eda2e6210cd6bdec702f59bad97295c6 SHA512 9bd1ef117cf256841b75d409e8f14b88ed54fdfc9c8c472b6baa5e9695e39cdb8c1f47ce612dc8263abb65511df0812554cc9a5820cdd6c1539a07283a4cd08f
 DIST lxc-5.0.3.tar.gz 975269 BLAKE2B 533d97fe4d986acbf5d562bb2c295a63df2a9a8bfc27aeff5056e4235f667102500debc586c5698482ec048c1b222a0fdc234db6fd6648c4b649f87a85de18f8 SHA512 0553be317431ab7ec0c450c0f85724a53de1f251c39c9716168e17cda6a8daec70b8221228c4be64027df28a327e0f1fd508e6bb48348ab540bbfeaf2b9ac974
 DIST lxc-5.0.3.tar.gz.asc 833 BLAKE2B c35278ed17cad76d2ea94b3985e0110731efea751fb5f1c2d1c9db71486e4844285f372a94c8611dcfe91fdb16459694843b9e0a8273cfc68a56f549c7162cfb SHA512 a5ce5769d49abdf35d94de8273fd3e9c2a8ba4fafea71cf33ee6bce1d83531c8b550d972f7080409a4cc5a92e9d04ece50ed108f92c6aec4868d150e58d7d11a
--- a/app-containers/lxc/files/lxc.initd.8
+++ b/app-containers/lxc/files/lxc.initd.8
@ -1,131 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-CONTAINER=${SVCNAME#*.}
-
-LXC_PATH=`lxc-config lxc.lxcpath`
-
-lxc_get_configfile() {
-	if [ -f "${LXC_PATH}/${CONTAINER}.conf" ]; then
-		echo "${LXC_PATH}/${CONTAINER}.conf"
-	elif [ -f "${LXC_PATH}/${CONTAINER}/config" ]; then
-		echo "${LXC_PATH}/${CONTAINER}/config"
-	else
-		eerror "Unable to find a suitable configuration file."
-		eerror "If you set up the container in a non-standard"
-		eerror "location, please set the CONFIGFILE variable."
-		return 1
-	fi
-}
-
-[ $CONTAINER != $SVCNAME ] && CONFIGFILE=${CONFIGFILE:-$(lxc_get_configfile)}
-
-lxc_get_var() {
-	awk 'BEGIN { FS="[ \t]*=[ \t]*" } $1 == "'$1'" { print $2; exit }' ${CONFIGFILE}
-}
-
-lxc_get_net_link_type() {
-	awk 'BEGIN { FS="[ \t]*=[ \t]*"; _link=""; _type="" }
-		$1 == "lxc.network.type" {_type=$2;}
-		$1 == "lxc.network.link" {_link=$2;}
-		match($1, /lxc\.net\.[[:digit:]]+\.type/) {_type=$2;}
-		match($1, /lxc\.net\.[[:digit:]]+\.link/) {_link=$2;}
-		{if(_link != "" && _type != ""){
-			printf("%s:%s\n", _link, _type );
-			_link=""; _type="";
-		}; }' <${CONFIGFILE}
-}
-
-checkconfig() {
-	if [ ${CONTAINER} = ${SVCNAME} ]; then
-		eerror "You have to create an init script for each container:"
-		eerror " ln -s lxc /etc/init.d/lxc.container"
-		return 1
-	fi
-
-	# no need to output anything, the function takes care of that.
-	[ -z "${CONFIGFILE}" ] && return 1
-
-	utsname=$(lxc_get_var lxc.uts.name)
-	if [ -z "$utsname" ] ; then
-		utsname=$(lxc_get_var lxc.utsname)
-	fi
-
-	if [ "${CONTAINER}" != "${utsname}" ]; then
-	    eerror "You should use the same name for the service and the"
-	    eerror "container. Right now the container is called ${utsname}"
-	    return 1
-	fi
-}
-
-depend() {
-	# be quiet, since we have to run depend() also for the
-	# non-muxed init script, unfortunately.
-	checkconfig 2>/dev/null || return 0
-
-	config ${CONFIGFILE}
-	need localmount
-	use lxcfs
-
-	local _x _if
-	for _x in $(lxc_get_net_link_type); do
-		_if=${_x%:*}
-		case "${_x##*:}" in
-			# when the network type is set to phys, we can make use of a
-			# network service (for instance to set it up before we disable
-			# the net_admin capability), but we might also  not set it up
-			# at all on the host and leave the net_admin capable service
-			# to take care of it.
-			phys)	use net.${_if} ;;
-			*)	need net.${_if} ;;
-		esac
-	done
-}
-
-start() {
-	checkconfig || return 1
-	rm -f /var/log/lxc/${CONTAINER}.log
-
-	rootpath=$(lxc_get_var lxc.rootfs)
-
-	# Check the format of our init and the chroot's init, to see
-	# if we have to use linux32 or linux64; always use setarch
-	# when required, as that makes it easier to deal with
-	# x32-based containers.
-	case $(scanelf -BF '%a#f' ${rootpath}/sbin/init) in
-		EM_X86_64)	setarch=linux64;;
-		EM_386)		setarch=linux32;;
-	esac
-
-	ebegin "Starting LXC container ${CONTAINER}"
-	env -i ${setarch} $(which lxc-start) -n ${CONTAINER} -f ${CONFIGFILE} -d -o /var/log/lxc/${CONTAINER}.log
-	sleep 1
-
-	# lxc-start -d will _always_ report a correct startup, even if it
-	# failed, so rather than trust that, check that the cgroup exists.
-	# fix for LXC 3.1	
-
-	STATE="$(lxc-info -s -H ${CONTAINER})"
-	[ "$STATE" = "RUNNING" ]
-	
-	eend $?
-}
-
-stop() {
-	checkconfig || return 1
-
-	STATE="$(lxc-info -s -H ${CONTAINER})"
-	
-	if ! [ "$STATE" = "RUNNING" ]; then
-	    ewarn "${CONTAINER} doesn't seem to be started."
-	    return 0
-	fi
-
-	# 30s should be enough to shut everything down
-	# lxc-stop will return back anyway as soon as successful shutdown
-	# after 30s, lxc-stop sends SIGKILL (dirty shotdown)
-	ebegin "Stopping LXC container ${CONTAINER}"
-	lxc-stop -t 30 -n ${CONTAINER}
-	eend $?
-}
--- a/app-containers/lxc/lxc-5.0.2.ebuild
+++ b/app-containers/lxc/lxc-5.0.2.ebuild
@ -1,168 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 linux-info meson optfeature systemd toolchain-funcs verify-sig
-
-DESCRIPTION="A userspace interface for the Linux kernel containment features"
-HOMEPAGE="https://linuxcontainers.org/ https://github.com/lxc/lxc"
-SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz
-	verify-sig? ( https://linuxcontainers.org/downloads/lxc/${P}.tar.gz.asc )"
-
-LICENSE="GPL-2 LGPL-2.1 LGPL-3"
-SLOT="0/1.502" # SONAME liblxc.so.1 + ${PV//./} _if_ breaking ABI change while bumping.
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-IUSE="apparmor +caps examples io-uring lto man pam seccomp selinux ssl systemd test +tools"
-
-RDEPEND="acct-group/lxc
-	acct-user/lxc
-	apparmor? ( sys-libs/libapparmor )
-	caps? ( sys-libs/libcap[static-libs] )
-	io-uring? ( >=sys-libs/liburing-2:= )
-	pam? ( sys-libs/pam )
-	seccomp? ( sys-libs/libseccomp )
-	selinux? ( sys-libs/libselinux )
-	ssl? ( dev-libs/openssl:0= )
-	systemd? ( sys-apps/systemd:= )
-	tools? ( sys-libs/libcap[static-libs] )"
-DEPEND="${RDEPEND}
-	sys-kernel/linux-headers"
-BDEPEND="virtual/pkgconfig
-	man? ( app-text/docbook2X )
-	verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
-
-RESTRICT="!test? ( test )"
-
-CONFIG_CHECK="~!NETPRIO_CGROUP
-	~CGROUPS
-	~CGROUP_CPUACCT
-	~CGROUP_DEVICE
-	~CGROUP_FREEZER
-
-	~CGROUP_SCHED
-	~CPUSETS
-	~IPC_NS
-	~MACVLAN
-
-	~MEMCG
-	~NAMESPACES
-	~NET_NS
-	~PID_NS
-
-	~POSIX_MQUEUE
-	~USER_NS
-	~UTS_NS
-	~VETH"
-
-ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER: needed to freeze containers"
-ERROR_MACVLAN="CONFIG_MACVLAN: needed for internal (inter-container) networking"
-ERROR_MEMCG="CONFIG_MEMCG: needed for memory resource control in containers"
-ERROR_NET_NS="CONFIG_NET_NS: needed for unshared network"
-ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: needed for lxc-execute command"
-ERROR_UTS_NS="CONFIG_UTS_NS: needed to unshare hostnames and uname info"
-ERROR_VETH="CONFIG_VETH: needed for internal (host-to-container) networking"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
-
-DOCS=( AUTHORS CONTRIBUTING MAINTAINERS README.md doc/FAQ.txt )
-
-pkg_setup() {
-	linux-info_pkg_setup
-}
-
-src_configure() {
-	local emesonargs=(
-		--localstatedir "${EPREFIX}/var"
-
-		-Dcoverity-build=false
-		-Doss-fuzz=false
-
-		-Dcommands=true
-		-Dmemfd-rexec=true
-		-Dthread-safety=true
-
-		$(meson_use apparmor)
-		$(meson_use caps capabilities)
-		$(meson_use examples)
-		$(meson_use io-uring io-uring-event-loop)
-		$(meson_use lto b_lto)
-		$(meson_use man)
-		$(meson_use pam pam-cgroup)
-		$(meson_use seccomp)
-		$(meson_use selinux)
-		$(meson_use ssl openssl)
-		$(meson_use test tests)
-		$(meson_use tools)
-
-		-Ddata-path=/var/lib/lxc
-		-Ddoc-path=/usr/share/doc/${PF}
-		-Dlog-path=/var/log/lxc
-		-Drootfs-mount-path=/var/lib/lxc/rootfs
-		-Druntime-path=/run
-	)
-
-	if use systemd; then
-		local emesonargs+=( -Dinit-script="systemd" )
-		local emesonargs+=( -Dsd-bus=enabled )
-	else
-		local emesonargs+=( -Dinit-script="sysvinit" )
-		local emesonargs+=( -Dsd-bus=disabled )
-	fi
-
-	use tools && local emesonargs+=( -Dcapabilities=true )
-
-	if $(tc-ld-is-gold) || $(tc-ld-is-lld); then
-		local emesonargs+=( -Db_lto_mode=thin )
-	else
-		local emesonargs+=( -Db_lto_mode=default )
-	fi
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# The main bash-completion file will collide with lxd, need to relocate and update symlinks.
-	mkdir -p "${ED}"/$(get_bashcompdir) || die "Failed to create bashcompdir."
-
-	if use tools; then
-		bashcomp_alias lxc-start lxc-{attach,autostart,cgroup,checkpoint,config,console,copy,create,destroy,device,execute,freeze,info,ls,monitor,snapshot,stop,top,unfreeze,unshare,usernsexec,wait}
-	else
-		bashcomp_alias lxc-start lxc-usernsexec
-	fi
-
-	keepdir /var/lib/cache/lxc /var/lib/lib/lxc
-
-	find "${ED}" -name '*.la' -delete -o -name '*.a' -delete || die
-
-	# Replace upstream sysvinit/systemd files.
-	if use systemd; then
-		rm -r "${D}$(systemd_get_systemunitdir)" || die "Failed to remove systemd lib dir"
-	else
-		rm "${ED}"/etc/init.d/lxc-{containers,net} || die "Failed to remove sysvinit scripts"
-	fi
-
-	newinitd "${FILESDIR}/${PN}.initd.8" ${PN}
-	systemd_newunit "${FILESDIR}"/lxc-monitord.service.5.0.0 lxc-monitord.service
-	systemd_newunit "${FILESDIR}"/lxc-net.service.5.0.0 lxc-net.service
-	systemd_newunit "${FILESDIR}"/lxc.service-5.0.0 lxc.service
-	systemd_newunit "${FILESDIR}"/lxc_at.service.5.0.0 "lxc@.service"
-
-	if ! use apparmor; then
-		sed -i '/lxc-apparmor-load/d' "${D}$(systemd_get_systemunitdir)/lxc.service" || die "Failed to remove apparmor references from lxc.service systemd unit."
-	fi
-}
-
-pkg_postinst() {
-	elog "Please refer to "
-	elog "https://wiki.gentoo.org/wiki/LXC for introduction and usage guide."
-	elog
-	elog "Run 'lxc-checkconfig' to see optional kernel features."
-	elog
-
-	optfeature "automatic template scripts" app-containers/lxc-templates
-	optfeature "Debian-based distribution container image support" dev-util/debootstrap
-	optfeature "snapshot & restore functionality" sys-process/criu
-}
--- a/app-containers/lxd/Manifest
+++ b/app-containers/lxd/Manifest
@ -2,3 +2,5 @@ DIST lxd-4.0.9.tar.gz 9117078 BLAKE2B aa6689c1e958258484fba5c060765dd71d5406cb43
 DIST lxd-4.0.9.tar.gz.asc 833 BLAKE2B 7cd0d3ab518d947ca3ea6dc804c6a59b592e4e568152c078fdd3c102420bcd94d2f0b2c335b8b4ecdb19dc3c9a10f665a1510903f395247da956717beaa172a3 SHA512 79a4111571ab43e79cf669e416ed50f3ccae0fbceb86d73757d23c778035e827f47643bc87ff6a2fc64b095345a3d53cbd0c4eb245c75364e907d7449f3a0886
 DIST lxd-5.0.2.tar.gz 16258766 BLAKE2B a0d4e3108664724c064fb8c16031ff7dfa3f49735c81290c78fca1dd8c95774e8d8faf131a9de0961a51fb3f1fb1e3a1219d325e6c440dc42d077bfb6550df0b SHA512 e44b210828251ef2bbdcca332f605294a9258572a52a8e94f5c8dcf8d5c2b3d4cdaf46f85236d9c963de5654d3a0437b5f177ea908a6dac3b5b03fb721be6eaa
 DIST lxd-5.0.2.tar.gz.asc 833 BLAKE2B 606cae1439148060acd3fb04fdb108654a351ce2b7484081f7874ab2b0af8de2b5befc5a5409a94af0da25308622234db2e3b411edb20324df458fe85f46ac21 SHA512 884c921a263a8baf2d94958c72e232a0a47d0747f5a9d36ed8fc270edfa18dfc240d1e858e75dcc03eae921dae08d3ddfd34d9146d1510de6a09031da26aaccc
+DIST lxd-5.17.tar.gz 22319517 BLAKE2B b9dfd934fad6b21b6f2b1d25291b4201f647b2b09a1ae155577a88257c021cc36b43a08802411d0f3268b726da7fa38b8627302696f670a1747e3795db0b0efe SHA512 f5feca34fff0b01a9db8041dd18fde82ad089f36ab171cf338556ebec9b2accfa450b0734d72b25bbb7296aaaeafed247aac2117c32f3ebfce5ae716e4b196bf
+DIST lxd-5.17.tar.gz.asc 833 BLAKE2B bc781d520b8314261b6681603f17fcb82d045bb969ebf8eec64c82ef73f493892d48d50c870f72e9f4f1f6c7dd4b63239a5039949e4f7bb49539c69538b4a2f2 SHA512 7e76a6cfcb1bf5b7b864125b412d5bd4766b4af6cdab40d70324c4103d1a716c39dfa5cf0eccf2cb7862f182c7c469f18ca46b981a1be3fc0fac8c47537d6c1c
--- a/app-containers/lxd/files/lxd-5.17-remove-shellcheck-buildsystem-checks.patch
+++ b/app-containers/lxd/files/lxd-5.17-remove-shellcheck-buildsystem-checks.patch
@ -0,0 +1,31 @@
+--- a/Makefile
+++ b/Makefile
+@@ -249,28 +249,6 @@ endif
+ .PHONY: build-mo
+ build-mo: $(MOFILES)
+ 
+-.PHONY: static-analysis
+-static-analysis:
+-ifeq ($(shell command -v golangci-lint),)
+-	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $$(go env GOPATH)/bin
+-endif
+-ifeq ($(shell command -v shellcheck),)
+-	echo "Please install shellcheck"
+-	exit 1
+-endif
+-ifneq "$(shell shellcheck --version | grep version: | cut -d ' ' -f2)" "0.8.0"
+-	@echo "WARN: shellcheck version is not 0.8.0"
+-endif
+-ifeq ($(shell command -v flake8),)
+-	echo "Please install flake8"
+-	exit 1
+-endif
+-	golangci-lint run --timeout 5m
+-	flake8 test/deps/import-busybox
+-	shellcheck --shell sh test/*.sh test/includes/*.sh test/suites/*.sh test/backends/*.sh test/lint/*.sh
+-	shellcheck test/extras/*.sh
+-	run-parts --exit-on-error --regex '.sh' test/lint
+-
+ .PHONY: tags
+ tags: *.go lxd/*.go shared/*.go lxc/*.go
+ 	find . -type f -name '*.go' | xargs gotags > tags
--- a/app-containers/lxd/lxd-4.0.9-r4.ebuild
+++ b/app-containers/lxd/lxd-4.0.9-r4.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
 	verify-sig? ( https://linuxcontainers.org/downloads/lxd/${P}.tar.gz.asc )"

 LICENSE="Apache-2.0"
-SLOT="0"
+SLOT="0/lts"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="apparmor ipv6 nls verify-sig"

--- a/app-containers/lxd/lxd-5.0.2-r3.ebuild
+++ b/app-containers/lxd/lxd-5.0.2-r3.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
 	verify-sig? ( https://linuxcontainers.org/downloads/lxd/${P}.tar.gz.asc )"

 LICENSE="Apache-2.0 BSD LGPL-3 MIT"
-SLOT="0"
+SLOT="0/lts"
 KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="apparmor nls"

--- a/app-containers/lxd/lxd-5.17.ebuild
+++ b/app-containers/lxd/lxd-5.17.ebuild
@ -0,0 +1,187 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 go-module linux-info optfeature systemd verify-sig
+
+DESCRIPTION="Modern, secure and powerful system container and virtual machine manager"
+HOMEPAGE="https://ubuntu.com/lxd https://github.com/canonical/lxd"
+SRC_URI="https://github.com/canonical/lxd/releases/download/${P}/${P}.tar.gz
+	verify-sig? ( https://github.com/canonical/lxd/releases/download/${P}/${P}.tar.gz.asc
+)"
+
+LICENSE="Apache-2.0 BSD LGPL-3 MIT"
+SLOT="0/stable"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="apparmor nls"
+
+DEPEND="acct-group/lxd
+	app-arch/xz-utils
+	>=app-containers/lxc-5.0.0:=[apparmor?,seccomp(+)]
+	dev-db/sqlite:3
+	>=dev-libs/dqlite-1.13.0:=
+	dev-libs/lzo
+	>=dev-libs/raft-0.17.1:=[lz4]
+	>=dev-util/xdelta-3.0[lzma(+)]
+	net-dns/dnsmasq[dhcp]
+	sys-libs/libcap
+	virtual/udev"
+RDEPEND="${DEPEND}
+	net-firewall/ebtables
+	net-firewall/iptables
+	sys-apps/iproute2
+	sys-fs/fuse:3
+	>=sys-fs/lxcfs-5.0.0
+	sys-fs/squashfs-tools[lzma]
+	virtual/acl"
+BDEPEND="dev-lang/go
+	nls? ( sys-devel/gettext )
+	verify-sig? ( sec-keys/openpgp-keys-canonical )"
+
+CONFIG_CHECK="
+	~CGROUPS
+	~IPC_NS
+	~NET_NS
+	~PID_NS
+
+	~SECCOMP
+	~USER_NS
+	~UTS_NS
+
+	~KVM
+	~MACVTAP
+	~VHOST_VSOCK
+"
+
+ERROR_IPC_NS="CONFIG_IPC_NS is required."
+ERROR_NET_NS="CONFIG_NET_NS is required."
+ERROR_PID_NS="CONFIG_PID_NS is required."
+ERROR_SECCOMP="CONFIG_SECCOMP is required."
+ERROR_UTS_NS="CONFIG_UTS_NS is required."
+
+WARNING_KVM="CONFIG_KVM and CONFIG_KVM_AMD/-INTEL is required for virtual machines."
+WARNING_MACVTAP="CONFIG_MACVTAP is required for virtual machines."
+WARNING_VHOST_VSOCK="CONFIG_VHOST_VSOCK is required for virtual machines."
+
+# Go magic.
+QA_PREBUILT="/usr/bin/fuidshift
+	/usr/bin/lxc
+	/usr/bin/lxc-to-lxd
+	/usr/bin/lxd-agent
+	/usr/bin/lxd-benchmark
+	/usr/bin/lxd-migrate
+	/usr/sbin/lxd"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/canonical.asc
+
+# The testsuite must be run as root.
+# make: *** [Makefile:156: check] Error 1
+RESTRICT="test"
+
+GOPATH="${S}/_dist"
+
+PATCHES=(
+	"${FILESDIR}"/lxd-5.17-remove-shellcheck-buildsystem-checks.patch
+)
+
+src_prepare() {
+	export GOPATH="${S}/_dist"
+
+	default
+
+	sed -i \
+		-e "s:\./configure:./configure --prefix=/usr --libdir=${EPREFIX}/usr/lib/lxd:g" \
+		-e "s:make:make ${MAKEOPTS}:g" \
+		Makefile || die
+
+	# Fix hardcoded ovmf file path, see bug 763180
+	sed -i \
+		-e "s:/usr/share/OVMF:/usr/share/edk2-ovmf:g" \
+		-e "s:OVMF_VARS.ms.fd:OVMF_VARS.fd:g" \
+		doc/environment.md \
+		lxd/apparmor/instance.go \
+		lxd/apparmor/instance_qemu.go \
+		lxd/instance/drivers/driver_qemu.go || die "Failed to fix hardcoded ovmf paths."
+
+	# Fix hardcoded virtfs-proxy-helper file path, see bug 798924
+	sed -i \
+		-e "s:/usr/lib/qemu/virtfs-proxy-helper:/usr/libexec/virtfs-proxy-helper:g" \
+		lxd/device/device_utils_disk.go || die "Failed to fix virtfs-proxy-helper path."
+
+	cp "${FILESDIR}"/lxd-4.0.9-r1.service "${T}"/lxd.service || die
+	if use apparmor; then
+		sed -i \
+			'/^EnvironmentFile=.*/a ExecStartPre=\/usr\/libexec\/lxc\/lxc-apparmor-load' \
+			"${T}"/lxd.service || die
+	fi
+
+	# Disable -Werror's from go modules.
+	find "${S}" -name "cgo.go" -exec sed -i "s/ -Werror / /g" {} + || die
+}
+
+src_configure() { :; }
+
+src_compile() {
+	export GOPATH="${S}/_dist"
+	export CGO_LDFLAGS_ALLOW="-Wl,-z,now"
+
+	for k in fuidshift lxd-benchmark lxc lxc-to-lxd; do
+		go install -v -x "${S}/${k}" || die "failed compiling ${k}"
+	done
+
+	go install -v -x -tags libsqlite3 "${S}"/lxd || die "Failed to build the daemon"
+
+	# Needs to be built statically
+	CGO_ENABLED=0 go install -v -tags netgo "${S}"/lxd-migrate
+	CGO_ENABLED=0 go install -v -tags agent,netgo "${S}"/lxd-agent
+
+	use nls && emake build-mo
+}
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	export GOPATH="${S}/_dist"
+	local bindir="_dist/bin"
+
+	dosbin ${bindir}/lxd
+
+	for l in fuidshift lxd-agent lxd-benchmark lxd-migrate lxc lxc-to-lxd; do
+		dobin ${bindir}/${l}
+	done
+
+	newbashcomp scripts/bash/lxd-client lxc
+
+	newconfd "${FILESDIR}"/lxd-4.0.0.confd lxd
+	newinitd "${FILESDIR}"/lxd-5.0.2-r1.initd lxd
+
+	systemd_dounit "${T}"/lxd.service
+	systemd_newunit "${FILESDIR}"/lxd-containers-4.0.0.service lxd-containers.service
+	systemd_newunit "${FILESDIR}"/lxd-4.0.0.socket lxd.socket
+
+	dodoc AUTHORS
+	dodoc -r doc/*
+	use nls && domo po/*.mo
+}
+
+pkg_postinst() {
+	elog
+	elog "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
+	elog "including a Quick Start."
+	elog "For virtual machine support, see:"
+	elog "https://wiki.gentoo.org/wiki/LXD#Virtual_machines"
+	elog
+	elog "Please run 'lxc-checkconfig' to see all optional kernel features."
+	elog
+	optfeature "virtual machine support" app-emulation/qemu[spice,usbredir,virtfs]
+	optfeature "btrfs storage backend" sys-fs/btrfs-progs
+	optfeature "ipv6 support" net-dns/dnsmasq[ipv6]
+	optfeature "full lxd-migrate support"
+	optfeature "lvm2 storage backend" sys-fs/lvm2
+	optfeature "zfs storage backend" sys-fs/zfs
+	elog
+	elog "Be sure to add your local user to the lxd group."
+}
--- a/app-containers/lxd/metadata.xml
+++ b/app-containers/lxd/metadata.xml
@ -5,10 +5,18 @@
    <email>juippis@gentoo.org</email>
    <name>Joonas Niilola</name>
  </maintainer>
+  <maintainer type="person" proxied="yes">
+    <email>brahmajit.xyz@gmail.com</email>
+    <name>Brahmajit Das</name>
+  </maintainer>
  <maintainer type="project">
    <email>virtualization@gentoo.org</email>
    <name>Gentoo Virtualization Project</name>
  </maintainer>
+  <maintainer type="project" proxied="proxy">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
  <longdescription>
    LXD is a modern, secure and powerful system container and virtual machine manager.

--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/acr38u/acr38u-1.7.11-r4.ebuild
+++ b/app-crypt/acr38u/acr38u-1.7.11-r4.ebuild
@ -1,38 +1,36 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8

-inherit autotools toolchain-funcs udev
+inherit autotools udev

-MY_P=ACR38_LINUX_$(ver_cut 1)00$(ver_cut 2)$(ver_cut 3)_P
+MY_P="ACR38_LINUX_$(ver_cut 1)00$(ver_cut 2)$(ver_cut 3)_P"

-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
 DESCRIPTION="Non CCID driver for ACR38 AC1038-based Smart Card Reader"
-
 #SRC_URI="http://www.acs.com.hk/drivers/eng/${MY_P}.tar.bz2"
 # tarball release is encapsuled in a .zip file :-(
 # http://www.acs.com.hk/drivers/eng/ACR38_Driver_Lnx_101_P.zip
-# This drivers is not maintained by ACS anymore.
+# This driver is not maintained by ACS anymore.
 SRC_URI="https://www.linuxunderground.be/${MY_P}.tar.bz2"
 HOMEPAGE="https://www.acs.com.hk"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"

 # Make this safe from collisions, require a version of pcsc-lite that
 # uses libusb-1.0 and use the wrapper library instead.
 # Changed back from dev-libs/libusb-compat to virtual/libusb:0 because
 # libusb-compat is marked stable and primary in the virtual. -ssuominen
-RDEPEND=">=sys-apps/pcsc-lite-1.6.4
+RDEPEND="
+	>=sys-apps/pcsc-lite-1.6.4
 	virtual/libusb:0"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"

-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-build.patch
-)
+PATCHES=( "${FILESDIR}"/${P}-build.patch )

 src_prepare() {
 	default
@ -41,7 +39,7 @@ src_prepare() {

 src_install() {
 	default
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die

 	# note: for eudev support this pkg may always need to install rules to /usr
 	udev_newrules "${FILESDIR}/${PV}-bis.rules" 92-pcscd-acr38u.rules
--- a/app-crypt/aespipe/Manifest
+++ b/app-crypt/aespipe/Manifest
@ -1,2 +1 @@
-DIST aespipe-v2.4e.tar.bz2 107741 BLAKE2B 9331441214b495f042f8ac41b57203057e762156aa7b6bd9fcb8d55b3e149fb79dd0d7c06358599fefd6662d797baf4cf9ba84fc4425e637c9fef0abf1b254c7 SHA512 e038f710ac971e5ba740648c0f255e8bc9fcea9be1a6b76208a453f21f013e1662c006d4f4495fa2b2560fd9b0c236947462a9b337a120073c6a5335b29f077e
 DIST aespipe-v2.4f.tar.bz2 107663 BLAKE2B 80af945ec938307ddaeb1a1f7a91da71d4f1aeabe4cb303166cad95c36e0d0090fd8440bb636ac0245d2701d61fdea715c84e18dfacf32bfba7f4b85a2db091f SHA512 75b6b2069a0e013dbded29b07b990fc783cc04ce05fc37e6591dae7e8190485960735ec1a1af18d065be57d0b7ec23dbe520e920f92e9c01170b7a23eb32eb3f
--- a/app-crypt/aespipe/aespipe-2.4e.ebuild
+++ b/app-crypt/aespipe/aespipe-2.4e.ebuild
@ -1,28 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-DESCRIPTION="Encrypts data from stdin to stdout"
-HOMEPAGE="https://loop-aes.sourceforge.net"
-SRC_URI="https://loop-aes.sourceforge.net/aespipe/${PN}-v${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="+asm cpu_flags_x86_aes cpu_flags_x86_padlock static"
-DEPEND=""
-RDEPEND="app-arch/sharutils
-	app-crypt/gnupg"
-
-S="${WORKDIR}/${PN}-v${PV}"
-
-src_configure() {
-	use static && append-ldflags -static
-	econf \
-		$(use_enable asm) \
-		$(use_enable cpu_flags_x86_aes intelaes) \
-		$(use_enable cpu_flags_x86_padlock padlock)
-}
--- a/app-crypt/aespipe/aespipe-2.4f-r1.ebuild
+++ b/app-crypt/aespipe/aespipe-2.4f-r1.ebuild
@ -1,22 +1,23 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=7
+EAPI=8

 inherit flag-o-matic

 DESCRIPTION="Encrypts data from stdin to stdout"
 HOMEPAGE="https://loop-aes.sourceforge.net"
 SRC_URI="https://loop-aes.sourceforge.net/aespipe/${PN}-v${PV}.tar.bz2"
+S="${WORKDIR}/${PN}-v${PV}"

 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="+asm cpu_flags_x86_aes cpu_flags_x86_padlock static"
-RDEPEND="app-arch/sharutils
-	app-crypt/gnupg"

-S="${WORKDIR}/${PN}-v${PV}"
+RDEPEND="
+	app-arch/sharutils
+	app-crypt/gnupg"

 src_configure() {
 	use static && append-ldflags -static
--- a/app-crypt/ccid/Manifest
+++ b/app-crypt/ccid/Manifest
@ -1,3 +1 @@
-DIST ccid-1.4.35.tar.bz2 676789 BLAKE2B d1123c024a798a22906a5c2c2e35f5485b8d2252ddec28571af835bbf169bc5abeb26fea871ef70d67270cc1eb52f992c56f0abb74f6deed555f15e39dbf4756 SHA512 da990b5537ec35baa1b36b9c4be7f1bdccfc149cfa4ce024ddf59504f2a2044273057c1454f227fdad8f6b04fceaf48b88e70d4d0a5475384749b367529deaeb
-DIST ccid-1.5.0.tar.bz2 689961 BLAKE2B e5621f9af647028787cddd1b5a0d674420b4bf0c532a8527b4e10773bbd8af6f6600e7c40039e27f1ae182504d4b69b5e1e4aae509154ebd9653a34bd085f820 SHA512 fa2eac306066255fd89e8220e2b8d82811ce9e284baa155ea968b7afe0f113a94b1ee1898578d02fb8cde0634b6fe60ae8af956089ce5401c11bb90c3b334d5a
 DIST ccid-1.5.1.tar.bz2 702586 BLAKE2B 7b9e3c6daf03c186f34ac9b13bd960293a6481f9237ee52937ece1040bd3a79b7dab318e1244205a7feae992261ab5e82292d80ae023a4f621e0e7af7cdb9df5 SHA512 492bde96f5752e2a5316693c44e35e2d041785a00d15e094905c0aafad392f5329009d12801899367276328a582936ee53a1c5239c1813c4536001cb8a608f2e
--- a/app-crypt/ccid/ccid-1.4.35.ebuild
+++ b/app-crypt/ccid/ccid-1.4.35.ebuild
@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs udev
-
-DESCRIPTION="CCID free software driver"
-HOMEPAGE="https://ccid.apdu.fr https://github.com/LudovicRousseau/CCID"
-SRC_URI="https://ccid.apdu.fr/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
-IUSE="twinserial kobil-midentity +usb"
-
-RDEPEND=">=sys-apps/pcsc-lite-1.8.3
-	usb? ( virtual/libusb:1 )"
-DEPEND="${RDEPEND}"
-BDEPEND="kernel_linux? ( virtual/pkgconfig )"
-
-DOCS=( README.md AUTHORS )
-
-src_configure() {
-	econf \
-		LEX=: \
-		$(use_enable twinserial) \
-		$(use_enable usb libusb)
-}
-
-src_compile() {
-	default
-	use kobil-midentity && emake -C contrib/Kobil_mIDentity_switch
-}
-
-src_install() {
-	default
-
-	if use kobil-midentity; then
-		dosbin contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch
-		doman contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch.8
-	fi
-
-	if use kernel_linux; then
-		# note: for eudev support, rules probably will always need to be
-		# installed to /usr
-
-		# ccid >=1.4.11 version changed the rules drastically in a minor
-		# release to no longer use the pcscd group. Using the old ones in
-		# the mean time.
-		udev_newrules "${FILESDIR}"/92_pcscd_ccid-2.rules 92-pcsc-ccid.rules
-
-		# disable Kobil_mIDentity_switch udev rule with USE=-kobil-midentity
-		if ! use kobil-midentity; then
-			sed \
-				-e '/Kobil_mIDentity_switch/s/^/#/' \
-				-i "${D}/$(get_udevdir)"/rules.d/92-pcsc-ccid.rules || die
-		fi
-
-	fi
-}
--- a/app-crypt/ccid/ccid-1.5.0.ebuild
+++ b/app-crypt/ccid/ccid-1.5.0.ebuild
@ -1,69 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs udev
-
-DESCRIPTION="CCID free software driver"
-HOMEPAGE="https://ccid.apdu.fr https://github.com/LudovicRousseau/CCID"
-SRC_URI="https://ccid.apdu.fr/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
-IUSE="twinserial kobil-midentity +usb"
-
-RDEPEND=">=sys-apps/pcsc-lite-1.8.3
-	usb? ( virtual/libusb:1 )"
-DEPEND="${RDEPEND}"
-BDEPEND="kernel_linux? ( virtual/pkgconfig )"
-
-DOCS=( README.md AUTHORS )
-
-src_configure() {
-	econf \
-		LEX=: \
-		$(use_enable twinserial) \
-		$(use_enable usb libusb)
-}
-
-src_compile() {
-	default
-	use kobil-midentity && emake -C contrib/Kobil_mIDentity_switch
-}
-
-src_install() {
-	default
-
-	if use kobil-midentity; then
-		dosbin contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch
-		doman contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch.8
-	fi
-
-	if use kernel_linux; then
-		# note: for eudev support, rules probably will always need to be
-		# installed to /usr
-
-		# ccid >=1.4.11 version changed the rules drastically in a minor
-		# release to no longer use the pcscd group. Using the old ones in
-		# the mean time.
-		udev_newrules "${FILESDIR}"/92_pcscd_ccid-2.rules 92-pcsc-ccid.rules
-
-		# disable Kobil_mIDentity_switch udev rule with USE=-kobil-midentity
-		if ! use kobil-midentity; then
-			sed \
-				-e '/Kobil_mIDentity_switch/s/^/#/' \
-				-i "${D}/$(get_udevdir)"/rules.d/92-pcsc-ccid.rules || die
-		fi
-
-	fi
-}
-
-pkg_postrm() {
-	udev_reload
-}
-
-pkg_postinst() {
-	udev_reload
-}
--- a/app-crypt/ccid/files/92_pcscd_ccid-2.rules
+++ b/app-crypt/ccid/files/92_pcscd_ccid-2.rules
@ -1,50 +0,0 @@
-# udev rules to set the access rights of CCID smart card readers
-# so they can be used by pcscd
-
-# $Id: 92_pcscd_ccid.rules 6587 2013-04-05 16:31:55Z rousseau $
-
-# Gemplus PCMCIA Card
-#SUBSYSTEMS=="pcmcia", DRIVERS=="serial_cs", ACTION=="add", ATTRS{prod_id1}=="Gemplus", ATTRS{prod_id2}=="SerialPort", ATTRS{prod_id3}=="GemPC Card", RUN+="/usr/sbin/pcscd --hotplug" 
-
-# If not adding the device, go away
-ACTION!="add", GOTO="pcscd_ccid_rules_end"
-SUBSYSTEM!="usb", GOTO="pcscd_ccid_rules_end"
-ENV{DEVTYPE}!="usb_device", GOTO="pcscd_ccid_rules_end"
-
-# Kobil mIDentity
-ATTRS{idVendor}=="0d46", ATTRS{idProduct}=="4081", RUN+="/usr/sbin/Kobil_mIDentity_switch"
-
-# generic CCID device (bInterfaceClass = 0x0b)
-# change group from default "root" to "pcscd"
-ENV{ID_USB_INTERFACES}=="*:0b0000:*", ENV{PCSCD}="1"
-
-# set USB power management to auto. "power/level" has been deprecated in
-# Linux 2.6.35 and replaced by "power/control"
-ENV{ID_USB_INTERFACES}==":0b0000:", RUN+="/bin/sh -c 'if test -e /sys/$env{DEVPATH}/power/control; then echo auto > /sys/$env{DEVPATH}/power/control; elif test -e /sys/$env{DEVPATH}/power/level; then echo auto > /sys/$env{DEVPATH}/power/level; fi'"
-
-# non CCID generic (InterfaceClass: 0xFF)
-# CherrySmartTerminalST2XXX.txt
-ATTRS{idVendor}=="046a", ATTRS{idProduct}=="003e", ENV{PCSCD}="1"
-# DellSK-3106.txt
-ATTRS{idVendor}=="413c", ATTRS{idProduct}=="2100", ENV{PCSCD}="1"
-# MySmartPad.txt
-ATTRS{idVendor}=="09be", ATTRS{idProduct}=="0002", ENV{PCSCD}="1"
-# SCR3310-NTTCom USB SmartCard Reader
-ATTRS{idVendor}=="04e6", ATTRS{idProduct}=="511a", ENV{PCSCD}="1"
-# SCR331-DI USB Smart Card Reader
-ATTRS{idVendor}=="04e6", ATTRS{idProduct}=="5120", ENV{PCSCD}="1"
-# SCR331-DI.txt
-ATTRS{idVendor}=="04e6", ATTRS{idProduct}=="5111", ENV{PCSCD}="1"
-# SDI010.txt
-ATTRS{idVendor}=="04e6", ATTRS{idProduct}=="5121", ENV{PCSCD}="1"
-# SPR532.txt
-ATTRS{idVendor}=="04e6", ATTRS{idProduct}=="e003", ENV{PCSCD}="1"
-# Verisign_secure_storage_token.txt
-ATTRS{idVendor}=="08e6", ATTRS{idProduct}=="1359", ENV{PCSCD}="1"
-# Verisign_secure_token.txt
-ATTRS{idVendor}=="08e6", ATTRS{idProduct}=="ace0", ENV{PCSCD}="1"
-# SchlumbergerSema Cyberflex Access e-gate
-ATTRS{idVendor}=="0973", ATTRS{idProduct}=="0003", ENV{PCSCD}="1"
-
-# All done
-LABEL="pcscd_ccid_rules_end"
--- a/app-crypt/ccid/metadata.xml
+++ b/app-crypt/ccid/metadata.xml
@ -3,7 +3,6 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<use>
-		<flag name="kobil-midentity">Build and install Kobil_mIDentity_switch tool</flag>
 		<flag name="twinserial">Enable twinserial reader</flag>
 	</use>
 	<upstream>
--- a/app-crypt/crackpkcs12/Manifest
+++ b/app-crypt/crackpkcs12/Manifest
@ -1,2 +1 @@
-DIST crackpkcs12-0.2.10.tar.gz 94473 BLAKE2B 4e83dddfae5c861d442e7d040f4ba7065e1b89b1e7487c554acd871a11445de16fbd25787d581ce4c903ba6eb63d458902fd41711e72aee2ccfa2188031aa65a SHA512 5a2217e7809bef90a983cf8b7efff394bf59dac8ebea2b44c241b27ff07af59c86ce72db77ca1c9b1cbea15245165c200711bcb0bb64ccd4f3b38d3a2dfecbc5
 DIST crackpkcs12-0.2.11.tar.gz 94400 BLAKE2B 11d53f95f55f95d82885ebce780a3ff99e71217529f912c1f935898d9df9724f991b8e84ee08c3050b8484e50b2d22f0a1b2c6df0548e08ddf1d6e50d0700f90 SHA512 555f2fb1dd26ac2a1fbfe0d104c3e9f4188323ecf40d9825b32c694faf29d9bb6e49efc76f0728b940b940c363d6579fb0cd523a76454ca5b9eb1057b85609bf
--- a/app-crypt/crackpkcs12/crackpkcs12-0.2.10.ebuild
+++ b/app-crypt/crackpkcs12/crackpkcs12-0.2.10.ebuild
@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Multithreaded program to crack PKCS#12 files"
-HOMEPAGE="http://crackpkcs12.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-libs/openssl:0="
-DEPEND="${RDEPEND}"
--- a/app-crypt/easy-rsa/Manifest
+++ b/app-crypt/easy-rsa/Manifest
@ -1,5 +1,2 @@
-DIST easy-rsa-3.0.6.tar.gz 663190 BLAKE2B 2c7f526c3ddddf13b4c6193bcd52bc992b9e81db28dec8cd9b5f44aba231eed18b6f25c64a42072a6409a5dd23db21fa8ccefc210ce924c68ad3a79475d2eaa1 SHA512 ce553b483ed2facab71d9bc212c4a454c6ed4a6489a0b963c4fc190916c71d048955e1e24d3e58a39438a51a83a02bf696bb2b9292c6ff665113043509062eb1
-DIST easy-rsa-3.0.8.tar.gz 3864366 BLAKE2B 8bbb16a8885a2141c59f590882002f5e4fa5c52c77130ac56b7ee5b1817a6c3acdecac2d8db4f4f4bce39f62b469afaf60b5d56f46c1ea9472afe36a5fb7a818 SHA512 db23262ba2cd1b7fec17340ebe11504741baff23098ea9b4b1118077abf8ff3091b1299f9624a6dd788b2e1c169d9820ba41d11b091949f3f6c96ee8e0509231
 DIST easy-rsa-3.1.2.tar.gz 6424018 BLAKE2B fef84b90875837c151bf9d71f71587d81aba79579948f4ff29ec3632cd17b0de82bf64c7d25b93720a696d339acdbf520b3a366e3ab214789acd17629d5db5ba SHA512 f36d3e11488ee98be4d901a8ae4f6cf08f4f0efc95bec38d1f1cde3ebd9dd133fe493cab2ebbbbbc99e803e318f93536e6a45ae677adb65c94d998114278035a
-DIST easy-rsa-3.1.5.tar.gz 6456901 BLAKE2B 04bf53b5e6c4dc9062b05f96fea5e28005fd409dcb0f4ac490318322fd80b91bae3d66d2af62b59f8f2ccb24becc27ea1510a5edf4b4a401deafcdc6a09f63e2 SHA512 f803e790d5a93c3cfd127621f55af572d4d5eb99220c2ec9ccfc6db6659588bcbf43a41ac0aca81c45f964ecd9584f27e0cd3384b7141ebf49420e5ad4a8521c
 DIST easy-rsa-3.1.6.tar.gz 6814828 BLAKE2B e61fa195e8edeb4b529c86f5814f47f8b10746dfe2effe48685651edd43e4ec9efe4acc2df4d5d13e4348455e36d0623bf5d1a78f2b0f68fb0e63afcee8630d4 SHA512 fb4cb25d63c2ca81cb1723d2ad0f321ff78b519fbde99ebbb97cea82d69292d283a5b927583f9721e91d157587615ecb7c918364d3aca0676b4e2ee624883074
--- a/app-crypt/easy-rsa/easy-rsa-3.0.6.ebuild
+++ b/app-crypt/easy-rsa/easy-rsa-3.0.6.ebuild
@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Small RSA key management package, based on OpenSSL"
-HOMEPAGE="https://openvpn.net/"
-SRC_URI="https://github.com/OpenVPN/easy-rsa/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-
-DEPEND=">=dev-libs/openssl-0.9.6:0="
-RDEPEND="${DEPEND}"
-
-src_install() {
-	exeinto /usr/share/easy-rsa
-	doexe easyrsa3/easyrsa
-	insinto /usr/share/easy-rsa
-	doins -r easyrsa3/{vars.example,openssl-easyrsa.cnf,x509-types}
-	dodoc README.quickstart.md ChangeLog
-	dodoc -r doc
-	doenvd "${FILESDIR}/65easy-rsa" # config-protect easy-rsa
-}
--- a/app-crypt/easy-rsa/easy-rsa-3.0.8.ebuild
+++ b/app-crypt/easy-rsa/easy-rsa-3.0.8.ebuild
@ -1,25 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Small RSA key management package, based on OpenSSL"
-HOMEPAGE="https://openvpn.net/"
-SRC_URI="https://github.com/OpenVPN/easy-rsa/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-
-DEPEND=">=dev-libs/openssl-0.9.6:0="
-RDEPEND="${DEPEND}"
-
-src_install() {
-	exeinto /usr/share/easy-rsa
-	doexe easyrsa3/easyrsa
-	insinto /usr/share/easy-rsa
-	doins -r easyrsa3/{vars.example,openssl-easyrsa.cnf,x509-types}
-	dodoc README.quickstart.md ChangeLog
-	dodoc -r doc
-	doenvd "${FILESDIR}/65easy-rsa" # config-protect easy-rsa
-}
--- a/app-crypt/easy-rsa/easy-rsa-3.1.5.ebuild
+++ b/app-crypt/easy-rsa/easy-rsa-3.1.5.ebuild
@ -1,25 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Small RSA key management package, based on OpenSSL"
-HOMEPAGE="https://openvpn.net/"
-SRC_URI="https://github.com/OpenVPN/easy-rsa/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-DEPEND=">=dev-libs/openssl-0.9.6:0="
-RDEPEND="${DEPEND}"
-
-src_install() {
-	exeinto /usr/share/easy-rsa
-	doexe easyrsa3/easyrsa
-	insinto /usr/share/easy-rsa
-	doins -r easyrsa3/{vars.example,openssl-easyrsa.cnf,x509-types}
-	dodoc README.quickstart.md ChangeLog
-	dodoc -r doc
-	doenvd "${FILESDIR}/65easy-rsa" # config-protect easy-rsa
-}
--- a/app-crypt/jitterentropy/Manifest
+++ b/app-crypt/jitterentropy/Manifest
@ -1,4 +1 @@
-DIST jitterentropy-2.2.0.tar.gz 25556 BLAKE2B d0a8faa9131e9fd5712fad4179725ac29ba813e0d77e5ae9dc905841b92f67fc51e79c407142b2e8c3473f92a59a5b03f03d2013bd7e5d1ae07110da52461255 SHA512 4701a7e0a82ee583cbde5edfdacb737a5f588b42c61b16434b5a11bdfb1a108e7b9df8b8b38d9e92290e702b33f2ae8774580d6a71e6e8ac3af295ffc8ff5ff9
-DIST jitterentropy-3.0.1.tar.gz 31212 BLAKE2B 522e9b88e96ed1e6f57e793779c46f7799185f9d25390268f628eb309239a3522ac13277a037acf54dcce7e7b1364b2ec6e15d21a5f13aaa5a87ece7690d57fd SHA512 fd195e150ea861fcd5ff72a84f48ef8b7d0d8a3d44aae51f0fe5c39a1d1409ca98271a6cf06140fa8b6aba08d8bbbddf097cd7d99b5c1b698db08f056236e547
-DIST jitterentropy-3.3.1.tar.gz 81596 BLAKE2B ad8bf87d5a30b4bc98a3af7c1dcff442516c0330050aea90f2f05d68c4c2f1e9fe4b8db885f00dcd138ae7cb5a6ca58800686ae507f0e41596c95176a33e2b96 SHA512 7dc17c377cf90d38057bbc135e00730a3f84bc66aeed83eca1ad1b0e1c2fb89c5346ec20bdf25d3ce27f1d21893d44e52c08e96175554c18dfa1934a8d4fd9f7
 DIST jitterentropy-3.4.1.tar.gz 86110 BLAKE2B 729ef7d01a17c9eb16cc352da0286bd292f2faae63754b06036dbb44d52e85e2e2e0d2a38ac57d4350eaebbc47457f0457a988a657f7fe6c5d782d50922552d2 SHA512 c832b33c084a8c56fb9ee0c0f7397fa9206cbd6fcbea047495e543566fc0d9b5d8978c8668103203d87b5b70c0e177f9ef7cc614b3ce689b90fbb8b85e6fedbb
--- a/app-crypt/jitterentropy/jitterentropy-2.2.0.ebuild
+++ b/app-crypt/jitterentropy/jitterentropy-2.2.0.ebuild
@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Hardware RNG based on CPU timing jitter"
-HOMEPAGE="https://github.com/smuellerDD/jitterentropy-library"
-SRC_URI="https://github.com/smuellerDD/jitterentropy-library/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv x86"
-IUSE="static-libs"
-
-S="${WORKDIR}/${PN}-library-${PV}"
-
-src_prepare() {
-	default
-
-	# Disable man page compression on install
-	sed -e '/\tgzip.*man/ d' -i Makefile || die
-	# Let the package manager handle stripping
-	sed -e '/\tinstall.*-s / s/-s //g' -i Makefile || die
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)" CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake PREFIX="${EPREFIX}/usr" \
-		  LIBDIR="$(get_libdir)" \
-		  DESTDIR="${D}" install
-	use static-libs && dolib.a lib${PN}.a
-}
--- a/app-crypt/jitterentropy/jitterentropy-3.0.1.ebuild
+++ b/app-crypt/jitterentropy/jitterentropy-3.0.1.ebuild
@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Hardware RNG based on CPU timing jitter"
-HOMEPAGE="https://github.com/smuellerDD/jitterentropy-library"
-SRC_URI="https://github.com/smuellerDD/jitterentropy-library/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86"
-IUSE="static-libs"
-
-S="${WORKDIR}/${PN}-library-${PV}"
-
-src_prepare() {
-	default
-
-	# Disable man page compression on install
-	sed -e '/\tgzip.*man/ d' -i Makefile || die
-	# Remove the default upstream optimization level
-	sed -e '/^CFLAGS +=/ s|-O2||' -i Makefile || die
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)" CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake PREFIX="${EPREFIX}/usr" \
-		  LIBDIR="$(get_libdir)" \
-		  DESTDIR="${D}" \
-		  INSTALL_STRIP="install" \
-		  install $(usex static-libs install-static '')
-}
--- a/app-crypt/jitterentropy/jitterentropy-3.3.1.ebuild
+++ b/app-crypt/jitterentropy/jitterentropy-3.3.1.ebuild
@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Hardware RNG based on CPU timing jitter"
-HOMEPAGE="https://github.com/smuellerDD/jitterentropy-library"
-SRC_URI="https://github.com/smuellerDD/jitterentropy-library/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-# For future reference, tests/raw-entropy/validation-{restart,runtime}
-# have a weird license clause where it says:
-#   The licensee IS NOT granted permission to redistribute the source code or
-#   derivatives of the source code, and the binaries compiled from the source
-#   code or its derivatives to any third parties.
-# Do not package these two components!
-LICENSE="BSD"
-SLOT="0/3"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv x86"
-IUSE="static-libs"
-
-S="${WORKDIR}/${PN}-library-${PV}"
-
-src_prepare() {
-	default
-
-	# Disable man page compression on install
-	sed -e '/\tgzip.*man/ d' -i Makefile || die
-}
-
-src_compile() {
-	# Upstream defines some of CFLAGS in the Makefile using '?='
-	# This allows those default flags to be overwritten by
-	# user-defined CFLAGS. Restore some of the defaults.
-	append-cflags '-fwrapv' '-fvisibility=hidden' '-fPIE'
-	# Optimizations are not allowed by upstream, which already
-	# overrides CFLAGS in Makefile. We need to handle CPPFLAGS here.
-	append-cppflags '-O0'
-	emake AR="$(tc-getAR)" CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake PREFIX="${EPREFIX}/usr" \
-		  LIBDIR="$(get_libdir)" \
-		  DESTDIR="${D}" \
-		  INSTALL_STRIP="install" \
-		  install $(usex static-libs install-static '')
-}
--- a/app-crypt/jitterentropy/metadata.xml
+++ b/app-crypt/jitterentropy/metadata.xml
@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>gokturk@gentoo.org</email>
-	<name>Göktürk Yüksek</name>
-</maintainer>
-<longdescription>
-	The Jitter RNG provides a noise source using the CPU execution
-	timing jitter. It does not depend on any system resource other
-	than a high-resolution time stamp. It is a small-scale, yet
-	fast entropy source that is viable in almost all environments
-	and on a lot of CPU architectures.
-</longdescription>
-<upstream>
-	<remote-id type="github">smuellerDD/jitterentropy-library</remote-id>
-</upstream>
+	<maintainer type="person">
+		<email>gokturk@gentoo.org</email>
+		<name>Göktürk Yüksek</name>
+	</maintainer>
+	<longdescription>
+		The Jitter RNG provides a noise source using the CPU execution
+		timing jitter. It does not depend on any system resource other
+		than a high-resolution time stamp. It is a small-scale, yet
+		fast entropy source that is viable in almost all environments
+		and on a lot of CPU architectures.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">smuellerDD/jitterentropy-library</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-crypt/libb2/libb2-0.98.1-r2.ebuild
+++ b/app-crypt/libb2/libb2-0.98.1-r2.ebuild
@ -1,69 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal toolchain-funcs
-
-DESCRIPTION="C library providing BLAKE2b, BLAKE2s, BLAKE2bp, BLAKE2sp"
-HOMEPAGE="https://github.com/BLAKE2/libb2"
-GITHASH="73d41c8255a991ed2adea41c108b388d9d14b449"
-SRC_URI="https://github.com/BLAKE2/libb2/archive/${GITHASH}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC0-1.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="static-libs native-cflags openmp"
-
-DEPEND="
-	openmp? (
-		|| ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] )
-	)
-"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${PN}-${GITHASH}
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
-	default
-	# fix bashism
-	sed -i -e 's/ == / = /' configure.ac || die
-	# https://github.com/BLAKE2/libb2/pull/28
-	echo 'libb2_la_LDFLAGS = -no-undefined' >> src/Makefile.am || die
-	eautoreconf  # upstream doesn't make releases
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable native-cflags native) \
-		$(use_enable openmp)
-}
-
-do_make() {
-	# respect our CFLAGS when native-cflags is not in effect
-	local openmp=$(use openmp && echo -fopenmp)
-	emake $(use native-cflags && echo no)CFLAGS="${CFLAGS} ${openmp}" "$@"
-}
-
-multilib_src_compile() {
-	do_make
-}
-
-multilib_src_test() {
-	do_make check
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name '*.la' -type f -delete || die
-}
--- a/app-crypt/minisign/Manifest
+++ b/app-crypt/minisign/Manifest
@ -1,2 +1 @@
-DIST minisign-0.10.tar.gz 18242 BLAKE2B 8b71f01ced4be00c38937e7db5ace2c7e348410a9381f6cc27374827fa0a9da70cca96153af199880ccd5f2265e18a7f21d074f877e0e21ca797bbba2bf5cbf5 SHA512 6a38500ed896c17b100bca47443f9806debe6e44d3ce09189f5f8913a41d4913434397175d1caa770fb0cc0918078dfc71c01b82b9bf919fdfba00434f4ce100
 DIST minisign-0.11.tar.gz 18410 BLAKE2B 503d73f53b9405f337865536d132e0de880cdefa9df2c08815b4cc9f7e2995a0d3032fe7b2ec48610c10b6023d998286ac705e0d10c6a475185b60405f69ec50 SHA512 a7445cb9646ae56fcba718f61f73486d5774d9cafe72ef051a3e60f94baf852b597261778bce50371ea5ee63395b0477bf1a33c7683fde32d003fab66029241f
--- a/app-crypt/minisign/minisign-0.10.ebuild
+++ b/app-crypt/minisign/minisign-0.10.ebuild
@ -1,31 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Dead simple tool to sign files and verify signatures"
-HOMEPAGE="https://github.com/jedisct1/minisign"
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/jedisct1/${PN}.git"
-else
-	SRC_URI="https://github.com/jedisct1/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-LICENSE="ISC"
-SLOT="0"
-
-IUSE=""
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="dev-libs/libsodium:=[-minimal]"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=( -DCMAKE_STRIP=OFF )
-	cmake_src_configure
-}
--- a/app-crypt/p11-kit/Manifest
+++ b/app-crypt/p11-kit/Manifest
@ -1,3 +1 @@
-DIST p11-kit-0.23.22.tar.xz 830016 BLAKE2B 4e1edfd9e2441d237c07a16c003aee5ffde38f1cf545c26e435645429f2cfa4fe7ca61cdc3c3940390aa040ba991f2ee3995b14cc31bb886d5eeffa8ed5e1721 SHA512 098819e6ca4ad9cc2a0bc2e478aea67354d051a4f03e6c7d75d13d2469b6dc7654f26b15530052f6ed51acb35531c2539e0f971b31e29e6673e857c903afb080
-DIST p11-kit-0.24.1.tar.xz 838304 BLAKE2B e5cb98881279199e2674e2ff4f12d72c4d126c54429ee7ece6dd56ad1987f84abf58a67b8bf2405b19a5bca9d1106f8ec901364ac3d2488f65b3f92b51f850fe SHA512 8cf170c714bb9e0cf3df93e8ec55b8e3c55cabf2c6a27f177ac6de8b8028985df2ca0216d3215d6828dc2ae3095c4e1a4febe8cb26b88ec321defc66bb011e81
 DIST p11-kit-0.25.0.tar.xz 958940 BLAKE2B 6ffce977f86c516a327afe50f4cc5a36e86ba7f43c6cb555db419d9e4ba7543a9f1847ba83da348cd6d7bbebe55dfa26cfe3a3aaa3e1d5420a4b8dc6cbbff088 SHA512 e6df3cb224f6ff5671bd3c0557503b5f20bbfded1b6ec340b1dafcbd1b1725ea2d41d0e920756716e0fe9cb28270d115fe77b23ec876a15007b22e3f30d015fe
--- a/app-crypt/p11-kit/files/p11-kit-0.24.1-configure-clang16.patch
+++ b/app-crypt/p11-kit/files/p11-kit-0.24.1-configure-clang16.patch
@ -1,35 +0,0 @@
-https://github.com/p11-glue/p11-kit/commit/d39043f7c6e44247b5b1a237888e80b2a4d9c2b2
-
-From d39043f7c6e44247b5b1a237888e80b2a4d9c2b2 Mon Sep 17 00:00:00 2001
-From: Florian Weimer <fweimer@redhat.com>
-Date: Mon, 12 Dec 2022 19:40:25 +0100
-Subject: [PATCH] Fix meson/configure _Thread_local checks for C99
- compatibility
-
-The type was missing from the definition, which happens to work
-in current compilers for historic reasons.  Implicit ints were
-actually removed from C in 1999.
--- a/configure.ac
-+++ b/configure.ac
-@@ -148,7 +148,7 @@ if test "$os_unix" = "yes"; then
- 		[ac_cv_tls_keyword=
- 		for keyword in _Thread_local __thread; do
- 		AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h>]],
-			[[static ]$keyword[ foo;]])],
-+			[[static ]$keyword[ int foo;]])],
- 			[ac_cv_tls_keyword=$keyword])
- 		done])
- 	if test -n "$ac_cv_tls_keyword"; then
--- a/meson.build
-+++ b/meson.build
-@@ -200,7 +200,7 @@ if host_system != 'windows'
-   tls_test_code_template = '''
- #include <stdlib.h>
- int main (void) {
-static @0@ foo;
-+static @0@ int foo;
- return 0;
- }
- '''
-
-
--- a/app-crypt/p11-kit/metadata.xml
+++ b/app-crypt/p11-kit/metadata.xml
@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<use>
-		<flag name="asn1">Enable ASN.1 certificate support</flag>
-		<flag name="trust">Build the trust policy module</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">p11-glue/p11-kit</remote-id>
 	</upstream>
--- a/app-crypt/p11-kit/p11-kit-0.23.22.ebuild
+++ b/app-crypt/p11-kit/p11-kit-0.23.22.ebuild
@ -1,48 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal
-
-DESCRIPTION="Provides a standard configuration setup for installing PKCS#11"
-HOMEPAGE="https://p11-glue.github.io/p11-glue/p11-kit.html"
-SRC_URI="https://github.com/p11-glue/p11-kit/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="+asn1 debug +libffi systemd +trust"
-REQUIRED_USE="trust? ( asn1 )"
-
-RDEPEND="asn1? ( >=dev-libs/libtasn1-3.4:=[${MULTILIB_USEDEP}] )
-	libffi? ( dev-libs/libffi:=[${MULTILIB_USEDEP}] )
-	systemd? ( sys-apps/systemd:= )
-	trust? ( app-misc/ca-certificates )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-pkg_setup() {
-	# disable unsafe tests, bug#502088
-	export FAKED_MODE=1
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable trust trust-module) \
-		$(use_with trust trust-paths "${EPREFIX}"/etc/ssl/certs/ca-certificates.crt) \
-		$(use_enable debug) \
-		$(use_with libffi) \
-		$(use_with asn1 libtasn1) \
-		$(multilib_native_use_with systemd)
-
-	if multilib_is_native_abi; then
-		# re-use provided documentation
-		ln -s "${S}"/doc/manual/html doc/manual/html || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -name '*.la' -delete || die
-}
--- a/app-crypt/p11-kit/p11-kit-0.24.1-r1.ebuild
+++ b/app-crypt/p11-kit/p11-kit-0.24.1-r1.ebuild
@ -1,59 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# TODO: port to meson on next release
-inherit autotools multilib-minimal
-
-DESCRIPTION="Provides a standard configuration setup for installing PKCS#11"
-HOMEPAGE="https://p11-glue.github.io/p11-glue/p11-kit.html"
-SRC_URI="https://github.com/p11-glue/p11-kit/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="+asn1 debug +libffi systemd +trust"
-REQUIRED_USE="trust? ( asn1 )"
-
-RDEPEND="asn1? ( >=dev-libs/libtasn1-3.4:=[${MULTILIB_USEDEP}] )
-	libffi? ( dev-libs/libffi:=[${MULTILIB_USEDEP}] )
-	systemd? ( sys-apps/systemd:= )
-	trust? ( app-misc/ca-certificates )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-configure-clang16.patch
-)
-
-pkg_setup() {
-	# disable unsafe tests, bug#502088
-	export FAKED_MODE=1
-}
-
-src_prepare() {
-	default
-	# TODO: drop in next release (after 0.24.1), p11-kit-0.24.1-configure-clang16.patch is emrged
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable trust trust-module) \
-		$(use_with trust trust-paths "${EPREFIX}"/etc/ssl/certs/ca-certificates.crt) \
-		$(use_enable debug) \
-		$(use_with libffi) \
-		$(use_with asn1 libtasn1) \
-		$(multilib_native_use_with systemd)
-
-	if multilib_is_native_abi; then
-		# re-use provided documentation
-		ln -s "${S}"/doc/manual/html doc/manual/html || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -name '*.la' -delete || die
-}
--- a/app-crypt/p11-kit/p11-kit-0.25.0-r1.ebuild
+++ b/app-crypt/p11-kit/p11-kit-0.25.0-r1.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/p11-glue/p11-kit/releases/download/${PV}/${P}.tar.xz

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="+libffi gtk-doc nls systemd test"
 RESTRICT="!test? ( test )"

--- a/app-crypt/p11-kit/p11-kit-0.25.0.ebuild
+++ b/app-crypt/p11-kit/p11-kit-0.25.0.ebuild
@ -1,48 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 meson-multilib
-
-DESCRIPTION="Provides a standard configuration setup for installing PKCS#11"
-HOMEPAGE="https://p11-glue.github.io/p11-glue/p11-kit.html"
-SRC_URI="https://github.com/p11-glue/p11-kit/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="+libffi gtk-doc nls systemd test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-misc/ca-certificates
-	>=dev-libs/libtasn1-3.4:=[${MULTILIB_USEDEP}]
-	libffi? ( dev-libs/libffi:=[${MULTILIB_USEDEP}] )
-	systemd? ( sys-apps/systemd:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	gtk-doc? ( dev-util/gtk-doc )
-	nls? ( sys-devel/gettext )
-"
-
-multilib_src_configure() {
-	# Disable unsafe tests, bug#502088
-	export FAKED_MODE=1
-
-	local emesonargs=(
-		-Dbashcompdir="$(get_bashcompdir)"
-		-Dtrust_module=enabled
-		-Dtrust_paths="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt
-		$(meson_feature libffi)
-		$(meson_use nls)
-		$(meson_use test)
-		$(meson_native_use_bool gtk-doc gtk_doc)
-		$(meson_native_true man)
-		$(meson_native_use_feature systemd)
-	)
-
-	meson_src_configure
-}
--- a/app-crypt/rhash/rhash-1.4.4.ebuild
+++ b/app-crypt/rhash/rhash-1.4.4.ebuild
@ -42,6 +42,14 @@ src_prepare() {
 			librhash/util.h || die
 	fi

+	# upstream fix for BSD and others, but was only applied for BSD
+	# we need support for Solaris, where we use a GNU toolchain, so use
+	# the original hack, hopefully next release has this fixed
+	# https://github.com/rhash/RHash/issues/238
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		sed -i -e 's/^elif linux; then/else/' configure || die
+	fi
+
 	multilib_copy_sources
 }

--- a/app-crypt/swtpm/Manifest
+++ b/app-crypt/swtpm/Manifest
@ -1,3 +1,2 @@
-DIST swtpm-0.7.3.tar.gz 354088 BLAKE2B 687e3161cbc08be68427648187ba2fb05749bcaaf9929b951eea4884bd4210c6105a2494f5e7d51915e5be1b700b13889cd83c96d22e00d621ea9336221ee67b SHA512 7f4cdf7ca2539f28e3a78e2a081b24983f3305905c7cafcac0957b14f5c06c8ee9485a0adaf3710561091f9ee85e00822fe1ff874389808218c1e17f938c45d9
 DIST swtpm-0.8.0.tar.gz 363951 BLAKE2B 8ec91961c5ac145dc5d1c3c4a609d18bc425caef0efb4d2b18c08c76acacefa619617b6e7b6e8e4e707117a29e3ff3c0198b63d81d24fc747435c6e06e48e8e9 SHA512 7f70c19f732404061be6168c96c0dd3ec91ed8b50dddcafcb50d810062ce0e83ad85360191f97db5db9dc034e01d91cebe3912449d896d2cde68fe060a0adb09
 DIST swtpm-0.8.1.tar.gz 364169 BLAKE2B 4b364ed581ea97d78c5c6248870503b1612d7d164b05b76c1f02644aade6fd09f204396f0a2d0db4e0ecec2792dc512f7c4393c44bf7ce447a3a7fbb8754594f SHA512 07276519b0e20c9c4167ce78e789d2072eb90172ed9bcba2a11eef46ee03a77860f7a2218f4dc013a2ddb8471079e3cbe43f8ab02174bd704a78aea8eee3d2fc
--- a/app-crypt/swtpm/swtpm-0.7.3.ebuild
+++ b/app-crypt/swtpm/swtpm-0.7.3.ebuild
@ -1,70 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9,10,11} )
-
-inherit autotools python-any-r1
-
-DESCRIPTION="Libtpms-based TPM emulator"
-HOMEPAGE="https://github.com/stefanberger/swtpm"
-SRC_URI="https://github.com/stefanberger/swtpm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
-IUSE="fuse +gnutls seccomp test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="fuse? (
-		dev-libs/glib:2
-		sys-fs/fuse:0
-	)
-	gnutls? (
-		dev-libs/libtasn1:=
-		>=net-libs/gnutls-3.1.0:=[tools,pkcs11]
-	)
-	seccomp? ( sys-libs/libseccomp )
-	acct-group/tss
-	acct-user/tss
-	dev-libs/openssl:0=
-	dev-libs/json-glib
-	dev-libs/libtpms"
-
-DEPEND="${RDEPEND}
-	test? (
-		net-misc/socat
-		dev-tcltk/expect
-	)"
-
-BDEPEND="${PYTHON_DEPS}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.6.0-fix-localca-path.patch"
-	"${FILESDIR}/${PN}-0.5.0-build-sys-Remove-WError.patch"
-	"${FILESDIR}/${PN}-0.7.2-Conditionalize-test-dependencies.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-openssl \
-		--without-selinux \
-		$(use_with fuse cuse) \
-		$(use_with gnutls) \
-		$(use_with seccomp) \
-		$(use_enable test)
-}
-
-src_install() {
-	default
-	fowners -R tss:root /var/lib/swtpm-localca
-	fperms 750 /var/lib/swtpm-localca
-	keepdir /var/lib/swtpm-localca
-	find "${D}" -name '*.la' -delete || die
-}
--- a/app-crypt/swtpm/swtpm-0.8.0-r2.ebuild
+++ b/app-crypt/swtpm/swtpm-0.8.0-r2.ebuild
@ -1,66 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9,10,11} )
-
-inherit autotools python-any-r1
-
-DESCRIPTION="Libtpms-based TPM emulator"
-HOMEPAGE="https://github.com/stefanberger/swtpm"
-SRC_URI="https://github.com/stefanberger/swtpm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-IUSE="fuse seccomp test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="fuse? (
-		dev-libs/glib:2
-		sys-fs/fuse:0
-	)
-	seccomp? ( sys-libs/libseccomp )
-	dev-libs/libtasn1:=
-	acct-group/tss
-	acct-user/tss
-	dev-libs/openssl:0=
-	dev-libs/json-glib
-	dev-libs/libtpms"
-
-DEPEND="${RDEPEND}
-	test? (
-		net-misc/socat
-		dev-tcltk/expect
-	)"
-
-BDEPEND="${PYTHON_DEPS}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.6.0-fix-localca-path.patch"
-	"${FILESDIR}/${PN}-0.5.0-build-sys-Remove-WError.patch"
-	"${FILESDIR}/${PN}-0.7.2-Conditionalize-test-dependencies.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-openssl \
-		--without-selinux \
-		$(use_with fuse cuse) \
-		$(use_with seccomp) \
-		$(use_enable test)
-}
-
-src_install() {
-	default
-	fowners -R tss:root /var/lib/swtpm-localca
-	fperms 750 /var/lib/swtpm-localca
-	keepdir /var/lib/swtpm-localca
-	find "${D}" -name '*.la' -delete || die
-}
--- a/app-crypt/swtpm/swtpm-0.8.1.ebuild
+++ b/app-crypt/swtpm/swtpm-0.8.1.ebuild
@ -3,7 +3,7 @@

 EAPI=8

-PYTHON_COMPAT=( python3_{10,11} )
+PYTHON_COMPAT=( python3_{10..12} )

 inherit autotools python-any-r1

--- a/app-crypt/tc-play/Manifest
+++ b/app-crypt/tc-play/Manifest
@ -1,2 +1 @@
-DIST tc-play-2.0.tar.gz 1015525 BLAKE2B 1481eecc8aaf2cb9698eed96a9cdabaa2b74daf11865dd29a6fab7e66fb76aa2f6e544fe7ac53a2510415ee6ddf3c5732c774a26708fe354113eb9de6a9b62d9 SHA512 17408b2a664eb6822c77ede4f38ca67cdf643512014619d830a2c024bb8971811eded4edd65f6398d6112a3b57cd11a5b414357878c817c9cc2aac9d851946d7
 DIST tc-play-3.3.tar.gz 2591752 BLAKE2B c02489d6e291dfc1425745af86506e72fda7f67dba0668b9250a85604ba301761b5bbbad6927238042a0f89da1035d9e3275006e34e895835a53cdc24974f419 SHA512 78cc84b1ca333e6760b87dfd22035a027bea8d562201c028247e9cfc4377260490cdc42236ef1eeb1c263a49ca1654d8ae637abdf1b4e507f958bc780fc85d94
--- a/app-crypt/tc-play/files/tc-play-2.0-build.patch
+++ b/app-crypt/tc-play/files/tc-play-2.0-build.patch
@ -1,27 +0,0 @@
-From 3f9235841ba4494962b3c7dafcd16fd3ff5f6575 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Sat, 8 Apr 2017 20:27:17 +0300
-Subject: [PATCH] build: include sys/sysmacros.h for recent glibc
-
-https://sourceware.org/ml/libc-alpha/2015-11/msg00253.html
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
---
- tcplay.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tcplay.c b/tcplay.c
-index cd882cf..a6d4655 100644
--- a/tcplay.c
-+++ b/tcplay.c
-@@ -47,6 +47,7 @@
- #if defined(__linux__)
- #include <libdevmapper.h>
- #include <uuid/uuid.h>
-+#include <sys/sysmacros.h>
- #elif defined(__DragonFly__)
- #include <libdm.h>
- #include <uuid.h>
-- 
-2.10.2
-
--- a/app-crypt/tc-play/metadata.xml
+++ b/app-crypt/tc-play/metadata.xml
@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">bwalex/tc-play</remote-id>
-  </upstream>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">bwalex/tc-play</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-crypt/tc-play/tc-play-2.0-r2.ebuild
+++ b/app-crypt/tc-play/tc-play-2.0-r2.ebuild
@ -1,60 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="A free, pretty much fully featured and stable TrueCrypt implementation"
-HOMEPAGE="https://github.com/bwalex/tc-play"
-SRC_URI="https://github.com/bwalex/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="gnutls"
-
-DEPEND="
-	dev-libs/libgcrypt:=
-	dev-libs/libgpg-error
-	sys-apps/util-linux
-	sys-fs/lvm2
-	gnutls? ( net-libs/gnutls )
-	!gnutls? (
-		dev-libs/openssl:=
-	)
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.md )
-
-PATCHES=(
-	"${FILESDIR}/${P}-build.patch"
-)
-
-pkg_setup() {
-	local backend="openssl"
-	use gnutls && local backend="gcrypt"
-
-	EXTRA_MAKE_FLAGS=(
-		PBKDF_BACKEND="${backend}"
-		WARNFLAGS=""
-		CC="$(tc-getCC)"
-		AR="$(tc-getAR)"
-		PREFIX=/usr
-		LIBDIR=/usr/$(get_libdir)
-	)
-}
-
-src_compile() {
-	emake -f Makefile.classic \
-		tcplay \
-		"${EXTRA_MAKE_FLAGS[@]}"
-}
-
-src_install() {
-	emake -f Makefile.classic \
-		"${EXTRA_MAKE_FLAGS[@]}" \
-		install_program \
-		DESTDIR="${ED}"
-}
--- a/app-crypt/tpm-tools/Manifest
+++ b/app-crypt/tpm-tools/Manifest
@ -1,2 +1 @@
-DIST tpm-tools-1.3.9.1.tar.gz 482859 BLAKE2B ee915679e23bead04672bf719ce59bb6f20b550be39855b5304caeff554bf54d3cfe9104d464af7762388995e51d2bed0f9bedad83e42146cb7457382d09f4b2 SHA512 63a9c0e761cd890cc0a218de79a9c0169e151aba7824c19bf6b7ec894cf41c4950de1f63bd849aa93a4bdff36cf0fe557bc17113912b6d77f57f2bf1190b6a08
 DIST tpm-tools-1.3.9.2.tar.gz 431930 BLAKE2B bbea3848765d9907c6faa1b5f4a60002e94243040985ce503f392bc8d7392bea41b54317b15fd227b5d73d589cf2c330729532448751d4375484375725310dfa SHA512 b684716c71702140591d89eb03d3724ed5b448e7ba2881bc44de9d44ffc23a9f7dfcf4351eec24e5438cc883f49a7dafee82bb19f90800610cf764ce74e60ccb
--- a/app-crypt/tpm-tools/files/tpm-tools-1.3.9.1-openssl-1.1.patch
+++ b/app-crypt/tpm-tools/files/tpm-tools-1.3.9.1-openssl-1.1.patch
@ -1,238 +0,0 @@
-From 31d9cebc43833de939a0e13be0110ed830b66cbd Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Sat, 8 Dec 2018 23:28:54 +0200
-Subject: [PATCH] data_import.c: support openssl-1.1
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
-Bug: https://sourceforge.net/p/trousers/bugs/227/
---
- src/data_mgmt/data_import.c | 159 +++++++++++++++++++++++++-----------
- 1 file changed, 112 insertions(+), 47 deletions(-)
-
-diff --git a/src/data_mgmt/data_import.c b/src/data_mgmt/data_import.c
-index f534717..33c76e7 100644
--- a/src/data_mgmt/data_import.c
-+++ b/src/data_mgmt/data_import.c
-@@ -39,6 +39,30 @@
- #include <openssl/evp.h>
- #include <openssl/err.h>
- 
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+static void RSA_get0_key(const RSA *r, const BIGNUM **n, const BIGNUM **e, const BIGNUM **d) {
-+	if ( n )
-+		*n = r->n;
-+	if ( e )
-+		*e = r->e;
-+	if ( d )
-+		*d = r->d;
-+}
-+static void RSA_get0_factors(const RSA *r, const BIGNUM **p, const BIGNUM **q) {
-+	if ( p )
-+		*p = r->p;
-+	if ( q )
-+		*q = r->q;
-+}
-+static void RSA_get0_crt_params(const RSA *r, const BIGNUM **dmp1, const BIGNUM **dmq1, const BIGNUM **iqmp) {
-+	if ( dmp1 )
-+		*dmp1 = r->dmp1;
-+	if ( dmq1 )
-+		*dmq1 = r->dmq1;
-+	if ( iqmp )
-+		*iqmp = r->iqmp;
-+}
-+#endif
- 
- /*
-  * Global variables
-@@ -372,7 +396,7 @@ readX509Cert( const char  *a_pszFile,
- 		goto out;
- 	}
- 
-	if ( EVP_PKEY_type( pKey->type ) != EVP_PKEY_RSA ) {
-+	if ( EVP_PKEY_base_id( pKey ) != EVP_PKEY_RSA ) {
- 		logError( TOKEN_RSA_KEY_ERROR );
- 
- 		X509_free( pX509 );
-@@ -691,17 +715,35 @@ createRsaPubKeyObject( RSA               *a_pRsa,
- 
- 	int  rc = -1;
- 
-	int  nLen = BN_num_bytes( a_pRsa->n );
-	int  eLen = BN_num_bytes( a_pRsa->e );
-+	const BIGNUM *bn;
-+	const BIGNUM *be;
-+	int  nLen;
-+	int  eLen;
-+	CK_BYTE *n = NULL;
-+	CK_BYTE *e = NULL;
-+
-+	RSA_get0_key( a_pRsa, &bn, &be, NULL );
-+
-+	nLen = BN_num_bytes( bn );
-+	eLen = BN_num_bytes( be );
-+	n = malloc( nLen );
-+	e = malloc( eLen );
-+
-+	if ( !n || !e ) {
-+		logError( TOKEN_MEMORY_ERROR );
-+		goto out;
-+	}
-+
-+	// Get binary representations of the RSA key information
-+	BN_bn2bin( bn, n );
-+	BN_bn2bin( be, e );
- 
-+	{
- 	CK_RV  rv;
- 
- 	CK_BBOOL  bTrue  = TRUE;
- 	CK_BBOOL  bFalse = FALSE;
- 
-	CK_BYTE *n = malloc( nLen );
-	CK_BYTE *e = malloc( eLen );
-
- 	CK_OBJECT_CLASS  clPubClass  = CKO_PUBLIC_KEY;
- 	CK_KEY_TYPE      tKeyType    = CKK_RSA;
- 	CK_BBOOL         bPrivate    = ( !g_bPublic ) ? TRUE : FALSE;
-@@ -726,21 +768,13 @@ createRsaPubKeyObject( RSA               *a_pRsa,
- 
- 	*a_hObject = 0;
- 
-	if ( !n || !e ) {
-		logError( TOKEN_MEMORY_ERROR );
-		goto out;
-	}
-
-	// Get binary representations of the RSA key information
-	BN_bn2bin( a_pRsa->n, n );
-	BN_bn2bin( a_pRsa->e, e );
-
- 	// Create the RSA public key object
- 	rv = createObject( a_hSession, tAttr, ulAttrCount, a_hObject );
- 	if ( rv != CKR_OK )
- 		goto out;
- 
- 	rc = 0;
-+	}
- 
- out:
- 	free( n );
-@@ -760,29 +794,74 @@ createRsaPrivKeyObject( RSA               *a_pRsa,
- 
- 	int  rc = -1;
- 
-	int  nLen = BN_num_bytes( a_pRsa->n );
-	int  eLen = BN_num_bytes( a_pRsa->e );
-	int  dLen = BN_num_bytes( a_pRsa->d );
-	int  pLen = BN_num_bytes( a_pRsa->p );
-	int  qLen = BN_num_bytes( a_pRsa->q );
-	int  dmp1Len = BN_num_bytes( a_pRsa->dmp1 );
-	int  dmq1Len = BN_num_bytes( a_pRsa->dmq1 );
-	int  iqmpLen = BN_num_bytes( a_pRsa->iqmp );
-+	const BIGNUM *bn;
-+	const BIGNUM *be;
-+	const BIGNUM *bd;
-+	const BIGNUM *bp;
-+	const BIGNUM *bq;
-+	const BIGNUM *bdmp1;
-+	const BIGNUM *bdmq1;
-+	const BIGNUM *biqmp;
-+	int  nLen;
-+	int  eLen;
-+	int  dLen;
-+	int  pLen;
-+	int  qLen;
-+	int  dmp1Len;
-+	int  dmq1Len;
-+	int  iqmpLen;
-+	CK_BYTE *n = NULL;
-+	CK_BYTE *e = NULL;
-+	CK_BYTE *d = NULL;
-+	CK_BYTE *p = NULL;
-+	CK_BYTE *q = NULL;
-+	CK_BYTE *dmp1 = NULL;
-+	CK_BYTE *dmq1 = NULL;
-+	CK_BYTE *iqmp = NULL;
-+
-+	RSA_get0_key( a_pRsa, &bn, &be, &bd);
-+	RSA_get0_factors( a_pRsa, &bp, &bq);
-+	RSA_get0_crt_params( a_pRsa, &bdmp1, &bdmq1, &biqmp );
-+
-+	nLen = BN_num_bytes( bn );
-+	eLen = BN_num_bytes( be );
-+	dLen = BN_num_bytes( bd );
-+	pLen = BN_num_bytes( bp );
-+	qLen = BN_num_bytes( bq );
-+	dmp1Len = BN_num_bytes( bdmp1 );
-+	dmq1Len = BN_num_bytes( bdmq1 );
-+	iqmpLen = BN_num_bytes( biqmp );
-+
-+	n = malloc( nLen );
-+	e = malloc( eLen );
-+	d = malloc( dLen );
-+	p = malloc( pLen );
-+	q = malloc( qLen );
-+	dmp1 = malloc( dmp1Len );
-+	dmq1 = malloc( dmq1Len );
-+	iqmp = malloc( iqmpLen );
- 
-+	if ( !n || !e || !d || !p || !q || !dmp1 || !dmq1 || !iqmp ) {
-+		logError( TOKEN_MEMORY_ERROR );
-+		goto out;
-+	}
-+
-+	// Get binary representations of the RSA key information
-+	BN_bn2bin( bn, n );
-+	BN_bn2bin( be, e );
-+	BN_bn2bin( bd, d );
-+	BN_bn2bin( bp, p );
-+	BN_bn2bin( bq, q );
-+	BN_bn2bin( bdmp1, dmp1 );
-+	BN_bn2bin( bdmq1, dmq1 );
-+	BN_bn2bin( biqmp, iqmp );
-+
-+	{
- 	CK_RV  rv;
- 
- 	CK_BBOOL  bTrue  = TRUE;
- 	CK_BBOOL  bFalse = FALSE;
- 
-	CK_BYTE *n = malloc( nLen );
-	CK_BYTE *e = malloc( eLen );
-	CK_BYTE *d = malloc( dLen );
-	CK_BYTE *p = malloc( pLen );
-	CK_BYTE *q = malloc( qLen );
-	CK_BYTE *dmp1 = malloc( dmp1Len );
-	CK_BYTE *dmq1 = malloc( dmq1Len );
-	CK_BYTE *iqmp = malloc( iqmpLen );
-
- 	CK_OBJECT_CLASS  clPrivClass = CKO_PRIVATE_KEY;
- 	CK_KEY_TYPE      tKeyType    = CKK_RSA;
- 	CK_BBOOL         bPrivate    = ( !g_bPublic ) ? TRUE : FALSE;
-@@ -815,25 +894,11 @@ createRsaPrivKeyObject( RSA               *a_pRsa,
- 
- 	*a_hObject = 0;
- 
-	if ( !n || !e || !d || !p || !q || !dmp1 || !dmq1 || !iqmp ) {
-		logError( TOKEN_MEMORY_ERROR );
-		goto out;
-	}
-
-	// Get binary representations of the RSA key information
-	BN_bn2bin( a_pRsa->n, n );
-	BN_bn2bin( a_pRsa->e, e );
-	BN_bn2bin( a_pRsa->d, d );
-	BN_bn2bin( a_pRsa->p, p );
-	BN_bn2bin( a_pRsa->q, q );
-	BN_bn2bin( a_pRsa->dmp1, dmp1 );
-	BN_bn2bin( a_pRsa->dmq1, dmq1 );
-	BN_bn2bin( a_pRsa->iqmp, iqmp );
-
- 	// Create the RSA private key object
- 	rv = createObject( a_hSession, tAttr, ulAttrCount, a_hObject );
- 	if ( rv != CKR_OK )
- 		goto out;
-+	}
- 
- 	rc = 0;
- 
--- a/app-crypt/tpm-tools/tpm-tools-1.3.9.1-r1.ebuild
+++ b/app-crypt/tpm-tools/tpm-tools-1.3.9.1-r1.ebuild
@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="TrouSerS' support tools for the Trusted Platform Modules"
-HOMEPAGE="http://trousers.sourceforge.net"
-SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
-
-LICENSE="CPL-1.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~m68k ~s390 x86"
-IUSE="nls pkcs11 debug"
-
-DEPEND=">=app-crypt/trousers-0.3.0
-	dev-libs/openssl:0=
-	pkcs11? ( dev-libs/opencryptoki )"
-RDEPEND="${DEPEND}"
-BDEPEND="nls? ( sys-devel/gettext )"
-
-S="${WORKDIR}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-openssl-1.1.patch"
-)
-
-src_prepare() {
-	default
-
-	sed -i -r \
-		-e '/CFLAGS/s/ -m64//' \
-		configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags $(usex debug -DDEBUG -DNDEBUG)
-
-	econf \
-		$(use_enable nls) \
-		$(use pkcs11 || echo --disable-pkcs11-support)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
--- a/app-crypt/tpm-tools/tpm-tools-1.3.9.2.ebuild
+++ b/app-crypt/tpm-tools/tpm-tools-1.3.9.2.ebuild
@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="TrouSerS' support tools for the Trusted Platform Modules"
-HOMEPAGE="http://trousers.sourceforge.net"
-SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
-
-LICENSE="CPL-1.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~m68k ~s390 x86"
-IUSE="nls pkcs11 debug"
-
-DEPEND=">=app-crypt/trousers-0.3.0
-	dev-libs/openssl:0=
-	pkcs11? ( dev-libs/opencryptoki )"
-RDEPEND="${DEPEND}"
-BDEPEND="nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	default
-
-# upstream didn't generate the tarball correctly so we must bootstrap
-# ouselves
-	mkdir -p po || die
-	mkdir -p m4 || die
-	cp -R po_/* po/ || die
-	touch po/Makefile.in.in || die
-	touch m4/Makefile.am || die
-
-	sed -i -r \
-		-e '/CFLAGS/s/ -m64//' \
-		configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags $(usex debug -DDEBUG -DNDEBUG)
-
-	econf \
-		$(use_enable nls) \
-		$(use pkcs11 || echo --disable-pkcs11-support)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
--- a/app-crypt/tpm2-abrmd/Manifest
+++ b/app-crypt/tpm2-abrmd/Manifest
@ -1,2 +1 @@
-DIST tpm2-abrmd-2.4.1.tar.gz 577259 BLAKE2B 7d97e1069a171f3693fb11b8e2ce0243993f4352aae9fd691bfbf1b8fcef8615b79957f8f662ac00fe59bf7e3830d8abb79c67790f7be1cd3140fd1c7b1ed560 SHA512 0335285678cfceca4f185981ded90d213ff796cadddc9b5d6dbf2db533f81023a0f1089bbd8a8017bccb95190889be23b24d38a176d3368d221479aff4ff7d6c
 DIST tpm2-abrmd-3.0.0.tar.gz 576822 BLAKE2B cdcb677a2dec59cdc454b98793bb0784ba3403c276b618cd37c5748ab1d883ee8f3f69c0ae95c7bf262e2e993dcc0b12ae39010de12c6c211fe3de8c21515160 SHA512 65a39cd0518dfbcbd5835ac6c6628444d412e36471702f2cd1f1077d788330a477778e6403899ea2fa0497b643e5db9ca3e746845492eff78c4c78d8dd8f9e7d
--- a/app-crypt/tpm2-abrmd/tpm2-abrmd-2.4.1-r1.ebuild
+++ b/app-crypt/tpm2-abrmd/tpm2-abrmd-2.4.1-r1.ebuild
@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic systemd
-
-DESCRIPTION="TPM2 Access Broker & Resource Manager"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-abrmd"
-SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
-IUSE="static-libs test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="acct-group/tss
-	acct-user/tss
-	sys-apps/dbus
-	dev-libs/glib:=
-	app-crypt/tpm2-tss:="
-DEPEND="${RDEPEND}
-	test? (
-		app-crypt/swtpm
-		>=app-crypt/tpm2-tss-3.0.0:=
-		dev-util/cmocka
-	)"
-BDEPEND="virtual/pkgconfig
-	dev-util/gdbus-codegen"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# tests fail with LTO enabbled. See bug 865275
-	filter-lto
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable test unit) \
-		$(use_enable test integration) \
-		--disable-defaultflags \
-		--with-dbuspolicydir="${EPREFIX}/etc/dbus-1/system.d" \
-		--with-systemdpresetdir="$(systemd_get_systemunitdir)/../system-preset" \
-		--with-systemdpresetdisable \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-}
-
-src_install() {
-	default
-
-	if [[ ${PV} != $(sed -n -e 's/^Version: //p' "${ED}/usr/$(get_libdir)/pkgconfig/tss2-tcti-tabrmd.pc" || die) ]] ; then
-		# Safeguard for bug #833887
-		die "pkg-config file version doesn't match ${PV}! Please report a bug!"
-	fi
-
-	find "${D}" -name '*.la' -delete || die
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
--- a/app-crypt/tpm2-abrmd/tpm2-abrmd-3.0.0-r1.ebuild
+++ b/app-crypt/tpm2-abrmd/tpm2-abrmd-3.0.0-r1.ebuild
@ -1,64 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic systemd
-
-DESCRIPTION="TPM2 Access Broker & Resource Manager"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-abrmd"
-SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
-IUSE="static-libs test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="acct-group/tss
-	acct-user/tss
-	sys-apps/dbus
-	dev-libs/glib:=
-	app-crypt/tpm2-tss:="
-DEPEND="${RDEPEND}
-	test? (
-		app-crypt/swtpm
-		>=app-crypt/tpm2-tss-3.0.0:=
-		dev-util/cmocka
-	)"
-BDEPEND="virtual/pkgconfig
-	dev-util/gdbus-codegen"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# tests fail with LTO enabbled. See bug 865275
-	filter-lto
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable test unit) \
-		$(use_enable test integration) \
-		--disable-defaultflags \
-		--with-dbuspolicydir="${EPREFIX}/etc/dbus-1/system.d" \
-		--with-systemdpresetdir="$(systemd_get_systemunitdir)/../system-preset" \
-		--with-systemdpresetdisable \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
-
-pkg_postinst() {
-	einfo "As of tpm2-abrmd 3.0.0, users must be in the tss group"
-	einfo "to access the TPM"
-}
--- a/app-crypt/tpm2-tools/Manifest
+++ b/app-crypt/tpm2-tools/Manifest
@ -1,3 +1 @@
-DIST tpm2-tools-5.2.tar.gz 1072078 BLAKE2B 27d035e0f44029db57477a1fd10e1cee9b470ad54411297985cb7f33ba7bbb7a94ac392815e32287d69abf928dce0c361703542b812ae88b208ddca645bb3be2 SHA512 9fb5dc298717a8a57c89d286e3590370a096c81b14d2d8d4eb5fca140d66148a8e24727ee04fb02057bbfcc3ede50e93ba0ef22396888c9df48bf6f42a5d6e6b
-DIST tpm2-tools-5.4.tar.gz 1241132 BLAKE2B 21406ec61de19db49f1dd1ff9648e1b0a9ae2647df2ce290acca40c2fc54464e3c8a744afdbc9314ca731869ac974a7863e2bea3c70df844a972501a5b7973f2 SHA512 8d7802b85bd26b6efa0ed6be73b917b907bb7b424ff7d07e46e5574dfdd9d46ea2d7727904ebaba4651c8d1249cd52a7dc6dff8e9635666c8d97ca7c337a0396
 DIST tpm2-tools-5.5.tar.gz 1241390 BLAKE2B 2225f9e0835988351f84ed06f914616e25fd65bacaa93b51d0bb04185314efb9a6f60eb3539b250f54b2c2ba590f1b76594df3e625e45c8d37e38d13371bea26 SHA512 24f72a3e9840d531d900e96771a863baae1c71a76fcad0fda8020dff06acd8e3b65b86401ace21f034766403caf9ae97ce710ff6013bb7ed25657a6ecf325470
--- a/app-crypt/tpm2-tools/files/tpm2-tools-5.1.1-no-efivar-automagic.patch
+++ b/app-crypt/tpm2-tools/files/tpm2-tools-5.1.1-no-efivar-automagic.patch
@ -1,34 +0,0 @@
-https://bugs.gentoo.org/812047
-
-From 0cea7f0f78f1a9e8dca789eb5f2ece052e026bed Mon Sep 17 00:00:00 2001
-From: Christopher Byrne <salah.coronya@gmail.com>
-Date: Tue, 7 Sep 2021 20:22:27 -0500
-Subject: [PATCH] configure.ac: Fix automagic depency on libefivar
-
-Signed-off-by: Christopher Byrne <salah.coronya@gmail.com>
---
- configure.ac | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index f1c17116..bdb4abda 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -62,8 +62,12 @@ PKG_CHECK_MODULES([CRYPTO], [libcrypto >= 1.1.0])
- PKG_CHECK_MODULES([CURL], [libcurl])
- 
- # pretty print of devicepath if efivar library is present
-PKG_CHECK_MODULES([EFIVAR], [efivar],,[true])
-AC_CHECK_HEADERS([efivar/efivar.h])
-+AC_ARG_WITH([efivar], AS_HELP_STRING([--without-efivar], [Build without efivar library (default: test)]))
-+
-+AS_IF([test "x$with_efivar" != "xno"], [
-+	PKG_CHECK_MODULES([EFIVAR], [efivar])
-+	AC_CHECK_HEADERS([efivar/efivar.h])
-+])
- 
- # backwards compat with older pkg-config
- # - pull in AC_DEFUN from pkg.m4
-- 
-2.32.0
-
--- a/app-crypt/tpm2-tools/files/tpm2-tools-5.2-testparms-fix-condition-for-negative-test.patch
+++ b/app-crypt/tpm2-tools/files/tpm2-tools-5.2-testparms-fix-condition-for-negative-test.patch
@ -1,33 +0,0 @@
-From 3d80fad66694ad14a58dd89204a25e9248c4ab0c Mon Sep 17 00:00:00 2001
-From: Jonas Witschel <git@diabonas.de>
-Date: Wed, 29 Sep 2021 17:08:07 +0200
-Subject: [PATCH] testparms: fix condition for negative test
-
-Commit e858dec76686bb4c42e74e0984b433231e530f93 ("testparms: ensure curve not
-supported before negative test") is supposed to ensure that the negative test
-is run only if ecc521 is *not* supported, but instead it runs the negative test
-if ecc521 is *available*. This worked anyway for libtpms < 0.9.0 because camellia
-was not supported, but since libtpms 0.9.0 added support for this algorithm, the
-test suite fails now with swtpm.
-
-Signed-off-by: Jonas Witschel <git@diabonas.de>
---
- test/integration/tests/testparms.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/integration/tests/testparms.sh b/test/integration/tests/testparms.sh
-index 8c3548e5..a587a60a 100644
--- a/test/integration/tests/testparms.sh
-+++ b/test/integration/tests/testparms.sh
-@@ -63,7 +63,7 @@ else
- fi
- 
- # Attempt to specify a suite that is not supported (error from TPM)
-if tpm2 getcap ecc-curves | grep -q TPM2_ECC_NIST_P521; then
-+if ! tpm2 getcap ecc-curves | grep -q TPM2_ECC_NIST_P521; then
-     if tpm2 testparms "ecc521:ecdsa:camellia" &>/dev/null; then
-         echo "tpm2 testparms succeeded while it shouldn't or TPM failed"
-         exit 1
-- 
-2.32.0
-
--- a/app-crypt/tpm2-tools/tpm2-tools-5.2-r1.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.2-r1.ebuild
@ -1,76 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit autotools bash-completion-r1 flag-o-matic python-any-r1
-
-DESCRIPTION="Tools for the TPM 2.0 TSS"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-tools"
-SRC_URI="https://github.com/tpm2-software/tpm2-tools/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 x86"
-IUSE="+fapi test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=app-crypt/tpm2-tss-3.0.1:=[fapi?]
-	dev-libs/openssl:=
-	net-misc/curl
-	sys-libs/efivar:="
-DEPEND="${RDEPEND}
-	test? (
-		app-crypt/swtpm
-		app-crypt/tpm2-abrmd
-		dev-util/cmocka
-	)"
-BDEPEND="virtual/pkgconfig
-	sys-devel/autoconf-archive
-	test? (
-		app-editors/vim-core
-		dev-tcltk/expect
-		$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
-	)
-	${PYTHON_DEPS}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.1.1-no-efivar-automagic.patch"
-	"${FILESDIR}/${PN}-5.2-testparms-fix-condition-for-negative-test.patch"
-)
-
-python_check_deps() {
-	python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	sed -i \
-	"s/m4_esyscmd_s(\[git describe --tags --always --dirty\])/${PV}/" \
-		"configure.ac" || die
-	"./scripts/utils/man_to_bashcompletion.sh" || die
-	eautoreconf
-}
-
-src_configure() {
-	# tests fail with LTO enabbled. See bug 865275 and 865277
-	filter-lto
-	econf \
-		$(use_enable fapi) \
-		$(use_enable test unit) \
-		--with-bashcompdir=$(get_bashcompdir) \
-		--enable-hardening
-}
-
-src_install() {
-	default
-	mv "${ED}"/$(get_bashcompdir)/tpm2{_completion.bash,} || die
-	local utils=( "${ED}"/usr/bin/tpm2_* )
-	bashcomp_alias tpm2 "${utils[@]##*/}"
-}
--- a/app-crypt/tpm2-tools/tpm2-tools-5.4.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.4.ebuild
@ -1,62 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit bash-completion-r1 flag-o-matic python-any-r1
-
-DESCRIPTION="Tools for the TPM 2.0 TSS"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-tools"
-SRC_URI="https://github.com/tpm2-software/tpm2-tools/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 x86"
-IUSE="+fapi test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=app-crypt/tpm2-tss-3.0.1:=[fapi?]
-	dev-libs/openssl:=
-	net-misc/curl
-	sys-libs/efivar:="
-DEPEND="${RDEPEND}
-	test? (
-		app-crypt/swtpm
-		app-crypt/tpm2-abrmd
-		dev-util/cmocka
-	)"
-BDEPEND="virtual/pkgconfig
-	sys-devel/autoconf-archive
-	test? (
-		app-editors/vim-core
-		dev-tcltk/expect
-		$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
-	)
-	${PYTHON_DEPS}"
-
-python_check_deps() {
-	python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-        use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	# tests fail with LTO enabbled. See bug 865275 and 865277
-	filter-lto
-	econf \
-		$(use_enable fapi) \
-		$(use_enable test unit) \
-		--with-bashcompdir=$(get_bashcompdir) \
-		--enable-hardening
-}
-
-src_install() {
-	default
-	mv "${ED}"/$(get_bashcompdir)/tpm2{_completion.bash,} || die
-	local utils=( "${ED}"/usr/bin/tpm2_* )
-	bashcomp_alias tpm2 "${utils[@]##*/}"
-}
--- a/app-crypt/tpm2-tools/tpm2-tools-5.5.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.5.ebuild
@ -3,7 +3,7 @@

 EAPI=8

-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit bash-completion-r1 flag-o-matic python-any-r1

 DESCRIPTION="Tools for the TPM 2.0 TSS"
--- a/app-crypt/veracrypt/Manifest
+++ b/app-crypt/veracrypt/Manifest
@ -1,3 +1 @@
-DIST veracrypt-1.24_p8.tar.gz 25116825 BLAKE2B fccab3e7de7637f6f3a7f448a9dcc6671198ea6155e8f6741844c5bd844819c639f968e4cc6e13c274c90f2ba8e540a020b98cb12617a109d5911ce8dd9cb991 SHA512 16139d055e2b2dda6c38ecf156cf5d15cd4788253fe0c85e42050eafd8afbd5c5908e590e53a7b5220767ebbb3b9e81d0049a910b322e42f1c29d2c131bd29d0
-DIST veracrypt-1.25.7.tar.gz 26108318 BLAKE2B e3974e6abec3ff462239b6c7a775ebfde4138dde295863c8788de88b593bc4bcd69db66eb81dd08333055b0efed2cccccf24d5f038099f6fc25b8f550cb90347 SHA512 955d5354d7401625196f1bd43d5e40695f4a2ebc7742cdfe0850d3b974a02126446346fe7e3174e16a38de39b507fc436b45b5e43d6fb714f37a4b8b394843dd
 DIST veracrypt-1.25.9.tar.gz 26200897 BLAKE2B e48f060343f875a0660040dde35fa826ca87c3659d97a039c2b84193276075b4d3596119bde6727e51eead0c876c91a5a1a3ea77717e74061d5d20a4ea1a6fed SHA512 e83bf7ca52d3893347dd06295db0534931f6f388fc6b0f26dc80ffef77f13918bf9558ab8ac2e6225945415f3291646d7c1c8de382dbe8e468ab1e927251982c
--- a/app-crypt/veracrypt/metadata.xml
+++ b/app-crypt/veracrypt/metadata.xml
@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<use>
-	<flag name="asm">Enable assembly for optimization</flag>
-</use>
-<maintainer type="person">
-	<email>gokturk@gentoo.org</email>
-	<name>Göktürk Yüksek</name>
-</maintainer>
-<upstream>
-	<remote-id type="github">veracrypt/VeraCrypt</remote-id>
-</upstream>
+	<use>
+		<flag name="asm">Enable assembly for optimization</flag>
+	</use>
+	<maintainer type="person">
+		<email>gokturk@gentoo.org</email>
+		<name>Göktürk Yüksek</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">veracrypt/VeraCrypt</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-crypt/veracrypt/veracrypt-1.24_p8.ebuild
+++ b/app-crypt/veracrypt/veracrypt-1.24_p8.ebuild
@ -1,101 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER="3.0-gtk3"
-inherit desktop flag-o-matic linux-info pax-utils toolchain-funcs wxwidgets
-
-MY_PV="$(ver_cut 1-2)-Update$(ver_cut 4)_MacOSX"
-
-DESCRIPTION="Disk encryption with strong security based on TrueCrypt"
-HOMEPAGE="https://www.veracrypt.fr/en/Home.html"
-SRC_URI="https://github.com/${PN}/VeraCrypt/archive/VeraCrypt_${MY_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/VeraCrypt-VeraCrypt_${MY_PV}/src"
-
-# The modules not linked against in Linux include (but not limited to):
-#   libzip, chacha-xmm, chacha256, chachaRng, rdrand, t1ha2
-# Tested by actually removing the source files and performing a build
-# For this reason, we don't have to worry about their licenses
-LICENSE="Apache-2.0 BSD truecrypt-3.0"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="+asm cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 doc X"
-RESTRICT="bindist mirror"
-
-RDEPEND="
-	sys-fs/lvm2
-	sys-fs/fuse:0
-	x11-libs/wxGTK:${WX_GTK_VER}[X?]
-	app-admin/sudo
-	dev-libs/pkcs11-helper"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	asm? ( dev-lang/yasm )"
-
-CONFIG_CHECK="~BLK_DEV_DM ~CRYPTO ~CRYPTO_XTS ~DM_CRYPT ~FUSE_FS"
-
-src_configure() {
-	setup-wxwidgets
-
-	# https://bugs.gentoo.org/786741
-	# std::byte clashes with src/Common/Tcdefs.h typedef
-	append-cxxflags -std=c++14
-}
-
-src_compile() {
-	local myemakeargs=(
-		NOSTRIP=1
-		NOTEST=1
-		VERBOSE=1
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-		AR="$(tc-getAR)"
-		RANLIB="$(tc-getRANLIB)"
-		TC_EXTRA_CFLAGS="${CFLAGS}"
-		TC_EXTRA_CXXFLAGS="${CXXFLAGS}"
-		TC_EXTRA_LFLAGS="${LDFLAGS}"
-		WX_CONFIG="${WX_CONFIG}"
-		$(usex X "" "NOGUI=1")
-		$(usex asm "" "NOASM=1")
-		$(usex cpu_flags_x86_sse2 "" "NOSSE2=1")
-		$(usex cpu_flags_x86_sse4_1 "SSE41=1" "")
-		$(usex cpu_flags_x86_ssse3 "SSSE3=1" "")
-	)
-
-	emake "${myemakeargs[@]}"
-}
-
-src_test() {
-	./Main/veracrypt --text --test || die "tests failed"
-}
-
-src_install() {
-	local DOCS=( Readme.txt )
-
-	dobin Main/veracrypt
-	if use doc; then
-		DOCS+=( "${S}"/../doc/EFI-DCS )
-		docompress -x /usr/share/doc/${PF}/EFI-DCS
-		HTML_DOCS=( "${S}"/../doc/html/. )
-	fi
-	einstalldocs
-
-	newinitd "${FILESDIR}"/veracrypt.init veracrypt
-
-	if use X; then
-		local s
-		for s in 16 48 128 256; do
-			newicon -s ${s} Resources/Icons/VeraCrypt-${s}x${s}.xpm veracrypt.xpm
-		done
-		make_desktop_entry veracrypt "VeraCrypt" veracrypt "Utility;Security"
-	fi
-
-	pax-mark -m "${ED}"/usr/bin/veracrypt
-}
-
-pkg_postinst() {
-	ewarn "VeraCrypt has a very restrictive license. Please be explicitly aware"
-	ewarn "of the limitations on redistribution of binaries or modified source."
-}
--- a/app-crypt/veracrypt/veracrypt-1.25.7.ebuild
+++ b/app-crypt/veracrypt/veracrypt-1.25.7.ebuild
@ -1,99 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WX_GTK_VER="3.0-gtk3"
-inherit desktop flag-o-matic linux-info pax-utils toolchain-funcs wxwidgets
-
-DESCRIPTION="Disk encryption with strong security based on TrueCrypt"
-HOMEPAGE="https://www.veracrypt.fr/en/Home.html"
-SRC_URI="https://github.com/${PN}/VeraCrypt/archive/VeraCrypt_${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/VeraCrypt-VeraCrypt_${PV}/src"
-
-# The modules not linked against in Linux include (but not limited to):
-#   libzip, chacha-xmm, chacha256, chachaRng, rdrand, t1ha2
-# Tested by actually removing the source files and performing a build
-# For this reason, we don't have to worry about their licenses
-LICENSE="Apache-2.0 BSD truecrypt-3.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+asm cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 doc X"
-RESTRICT="bindist mirror"
-
-RDEPEND="
-	sys-fs/lvm2
-	sys-fs/fuse:0
-	x11-libs/wxGTK:${WX_GTK_VER}[X?]
-	app-admin/sudo
-	dev-libs/pkcs11-helper"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	asm? ( dev-lang/yasm )"
-
-CONFIG_CHECK="~BLK_DEV_DM ~CRYPTO ~CRYPTO_XTS ~DM_CRYPT ~FUSE_FS"
-
-src_configure() {
-	setup-wxwidgets
-
-	# https://bugs.gentoo.org/786741
-	# std::byte clashes with src/Common/Tcdefs.h typedef
-	append-cxxflags -std=c++14
-}
-
-src_compile() {
-	local myemakeargs=(
-		NOSTRIP=1
-		NOTEST=1
-		VERBOSE=1
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-		AR="$(tc-getAR)"
-		RANLIB="$(tc-getRANLIB)"
-		TC_EXTRA_CFLAGS="${CFLAGS}"
-		TC_EXTRA_CXXFLAGS="${CXXFLAGS}"
-		TC_EXTRA_LFLAGS="${LDFLAGS}"
-		WX_CONFIG="${WX_CONFIG}"
-		$(usex X "" "NOGUI=1")
-		$(usex asm "" "NOASM=1")
-		$(usex cpu_flags_x86_sse2 "" "NOSSE2=1")
-		$(usex cpu_flags_x86_sse4_1 "SSE41=1" "")
-		$(usex cpu_flags_x86_ssse3 "SSSE3=1" "")
-	)
-
-	emake "${myemakeargs[@]}"
-}
-
-src_test() {
-	./Main/veracrypt --text --test || die "tests failed"
-}
-
-src_install() {
-	local DOCS=( Readme.txt )
-
-	dobin Main/veracrypt
-	if use doc; then
-		DOCS+=( "${S}"/../doc/EFI-DCS )
-		docompress -x /usr/share/doc/${PF}/EFI-DCS
-		HTML_DOCS=( "${S}"/../doc/html/. )
-	fi
-	einstalldocs
-
-	newinitd "${FILESDIR}"/veracrypt.init veracrypt
-
-	if use X; then
-		local s
-		for s in 16 48 128 256; do
-			newicon -s ${s} Resources/Icons/VeraCrypt-${s}x${s}.xpm veracrypt.xpm
-		done
-		make_desktop_entry veracrypt "VeraCrypt" veracrypt "Utility;Security"
-	fi
-
-	pax-mark -m "${ED}"/usr/bin/veracrypt
-}
-
-pkg_postinst() {
-	ewarn "VeraCrypt has a very restrictive license. Please be explicitly aware"
-	ewarn "of the limitations on redistribution of binaries or modified source."
-}
--- a/app-crypt/xca/files/xca-2.4.0-man-page.patch
+++ b/app-crypt/xca/files/xca-2.4.0-man-page.patch
@ -0,0 +1,24 @@
+--- a/doc/CMakeLists.txt	2023-09-09 11:10:22.671031619 +0200
+++ b/doc/CMakeLists.txt	2023-09-09 11:17:15.398798825 +0200
+@@ -138,7 +138,7 @@
+ if (NOT WIN32)
+   add_custom_command(
+-	OUTPUT "${D}/xca.1.gz"
+	OUTPUT "${D}/xca.1"
+-	COMMAND cat "${S}/xca.1.head" "${D}/xca.1.options" "${S}/xca.1.tail" | gzip -n9 > "${D}/xca.1.gz"
+	COMMAND cat "${S}/xca.1.head" "${D}/xca.1.options" "${S}/xca.1.tail" | cat > "${D}/xca.1"
+ 	DEPENDS "${S}/xca.1.head" "${S}/xca.1.tail"
+ 		"${D}/xca.1.options"
+ 	COMMENT "Compiling man page"
+@@ -148,9 +148,9 @@
+ 	COMMAND xcadoc man "${D}/xca.1.options"
+ 	COMMENT "Generate 'man' commandline documentation"
+   )
+-  add_custom_target(manpage ALL DEPENDS ${D}/xca.1.gz)
+  add_custom_target(manpage ALL DEPENDS ${D}/xca.1)
+   if (NOT APPLE)
+-    install(FILES "${D}/xca.1.gz"
+    install(FILES "${D}/xca.1"
+         DESTINATION ${CMAKE_INSTALL_MANDIR}/man1
+     )
+   endif()
--- a/app-crypt/xca/xca-2.4.0_p20230526-r1.ebuild
+++ b/app-crypt/xca/xca-2.4.0_p20230526-r1.ebuild
@ -0,0 +1,72 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit cmake xdg-utils
+
+COMMIT=8983e5010d99c8d37bc7e316bf3ef00265763027
+
+DESCRIPTION="A GUI to OpenSSL, RSA public keys, certificates, signing requests etc"
+HOMEPAGE="https://hohnstaedt.de/xca/"
+#SRC_URI="https://github.com/chris2511/${PN}/releases/download/RELEASE.${PV}/${P}.tar.gz"
+SRC_URI="https://github.com/chris2511/xca/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/xca-${COMMIT}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="doc"
+
+RDEPEND="
+	dev-libs/libltdl:0=
+	dev-qt/qthelp:5
+	dev-qt/qtgui:5
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtwidgets:5
+	dev-libs/openssl:*
+	doc? ( app-text/linuxdoc-tools )"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.0-desktop.patch"
+	"${FILESDIR}/${PN}-2.4.0-man-page.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DQTFIXEDVERSION=Qt5
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_install() {
+	cmake_src_install
+
+	insinto /etc/xca
+	doins misc/*.txt
+
+	dosym xca /usr/bin/xca-console
+
+	ewarn "This is an unofficial snapshot that is compatible with openssl 3."
+	ewarn "One known flaw is that starting xca without a database will no longer open"
+	ewarn "the GUI. Provide either a new or existing database as an argument on the"
+	ewarn "command line."
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
--- a/app-crypt/xca/xca-2.4.0_p20230526.ebuild
+++ b/app-crypt/xca/xca-2.4.0_p20230526.ebuild
@ -50,9 +50,12 @@ src_install() {
 	insinto /etc/xca
 	doins misc/*.txt

-	ewarn "Make a backup copy of your database!"
-	ewarn "Version 2 completely changes the database format to SQL(ite)"
-	ewarn "Don't try to open it with older versions of XCA (< 1.4.0). They will corrupt the database."
+	dosym xca /usr/bin/xca-console
+
+	ewarn "This is an unofficial snapshot that is compatible with openssl 3."
+	ewarn "One known flaw is that starting xca without a database will no longer open"
+	ewarn "the GUI. Provide either a new or existing database as an argument on the"
+	ewarn "command line."
 }

 pkg_postinst() {
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/featherpad/featherpad-1.4.1.ebuild
+++ b/app-editors/featherpad/featherpad-1.4.1.ebuild
@ -13,12 +13,11 @@ S="${WORKDIR}/FeatherPad-${PV}"
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~riscv ~x86"
-IUSE="+qt5 qt6 +X"
-REQUIRED_USE="^^ ( qt5 qt6 )"
+IUSE="qt6 +X"

 RDEPEND="
 	app-text/hunspell:=
-	qt5? (
+	!qt6? (
 		dev-qt/qtcore:5
 		dev-qt/qtdbus:5
 		dev-qt/qtgui:5
@ -37,14 +36,14 @@ DEPEND="${RDEPEND}
 	X? ( x11-base/xorg-proto )
 "
 BDEPEND="
-	qt5? ( dev-qt/linguist-tools:5 )
+	!qt6? ( dev-qt/linguist-tools:5 )
 	qt6? ( dev-qt/qttools:6[linguist] )
 "

 src_configure() {
 	local mycmakeargs=(
 		-DWITHOUT_X11=$(usex !X)
-		-DENABLE_QT5=$(usex qt5)
+		-DENABLE_QT5=$(usex !qt6)
 	)
 	cmake_src_configure
 }
--- a/app-editors/okteta/Manifest
+++ b/app-editors/okteta/Manifest
@ -1,2 +1 @@
-DIST okteta-0.26.12.tar.xz 1077320 BLAKE2B 9817789d099431d49f9c6f1a1d48d285f7e8a684c3a24684a8fd101d6e401ba484ecf439cda63204533a80b3437715b8de73145fa35df89cf996e2ba57d66a80 SHA512 50159269099e08bf95e4d358f9f8fbf3fb87e1f01888d5f78a1bdea83a2b56145e95c42a67eb3c82a7525b1352eb3ea1bf93187e8df0f06f35f6834a54ffa892
 DIST okteta-0.26.13.tar.xz 1080884 BLAKE2B 1e5382b6832d7b77d3739bd4dc90b3317a33c7df1e55627a3bb718ee9fb7fcf58145f0decff0cc037a88c44fdab86cf57fd8174216cbfc29d4e607557226aa57 SHA512 1f7d099acda1d39382b9d36fc75e301588a4f026e46a363f0ac15f3025a37c2edd2fac20c8097761469f4259adc20874d90acae5fa7b378f2d88e88521952fd8
--- a/app-editors/okteta/okteta-0.26.12.ebuild
+++ b/app-editors/okteta/okteta-0.26.12.ebuild
@ -1,69 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_DESIGNERPLUGIN="true"
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-KFMIN=5.92.0
-QTMIN=5.15.5
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Hex editor by KDE"
-HOMEPAGE="https://apps.kde.org/okteta/"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-fi
-
-LICENSE="GPL-2 handbook? ( FDL-1.2 )"
-SLOT="5"
-IUSE="crypt"
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtscript-${QTMIN}:5[scripttools]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	crypt? ( >=app-crypt/qca-2.3.0:2[qt5(+)] )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DOMIT_EXAMPLES=ON
-		$(cmake_use_find_package crypt Qca-qt5)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	local myctestargs=( -j1 )
-
-	ecm_src_test
-}
--- a/app-editors/vscode/Manifest
+++ b/app-editors/vscode/Manifest
@ -1,6 +1,6 @@
-DIST vscode-1.81.0-amd64.tar.gz 128464266 BLAKE2B c3d2c19062d9999363db60f9356c075518b9de5a9364bd396585f0fb185362e603db9ecb37fd1ded2bc09c0a760ea7973a8b0e26cff84fb9e78cb72ca7da695b SHA512 7eccf494c6e36137ad5b6f7aecef4905c2bad2e9d10954904f9766f80b591ce6ee7f7ee29d02b30744168805ec242d06dd459712caf5e3a9dc3eaf33a3e1571b
-DIST vscode-1.81.0-arm.tar.gz 113352419 BLAKE2B 5597a92af36d4f5caedf00fca528b87735756b251b67565f720214fc72424c52aadd914f10cf3bab48a0bf9b94c3e91a097f7d40617e46194243f845cc5eb25c SHA512 cc09c865d35aec1842cc0200875a429b66fd7d936a4ea0e2708808495504758bb12a07e22905bae2584a9122e266a4e0a09b6f72a84983270b74c4b5b91cf83b
-DIST vscode-1.81.0-arm64.tar.gz 124958839 BLAKE2B 5e4595bd42736a7d2a9d0d97897d9f1a28fabe006a90ac0904e47edac4cefd956b63d23dc042db95ac24bcf96579dfe1ca8f5c7c2a3753e944e5a36ffcc08c84 SHA512 4dc7fd77954cdd4be3b7722bbbdb2eb592deb38953339d9e57552d5d23fb984407a34511ddeaaeb44e24af7dc2f9742aad7f78ce7a1884bb197f83fea6598cc7
 DIST vscode-1.81.1-amd64.tar.gz 128457191 BLAKE2B ae24ceca58b1a23ff1b22ace4ff65a4e648435c70ab418babd64b0d5a337190046f274c3e2618c97493faa992320cf3418d6b7faaadd4966129defe7c9d4c249 SHA512 c00bc1e9d583334a5936853071420937963ead2a556ac2767efb0b286687abf16ce9d1e3d6042025fb1843629352b9b0406a33234615e1300b4e2b7133a215ac
 DIST vscode-1.81.1-arm.tar.gz 113366792 BLAKE2B 127a7accf96bc9e0bef7cc592fae31963c7335ad61425c677b41851fb0712c38c1f9e2a0f80b0c431654643ad3a84c49cd3f073f3d34b276a2743eeb2c6e0c17 SHA512 de935ba4c9d9cd8e3c1a157e4d37e30d58422f0844a16963ee9f682723b5ba0a8390c422d400793148aec223ca9acc6ce92efa203be3e447710e6394d223ef0b
 DIST vscode-1.81.1-arm64.tar.gz 124991405 BLAKE2B 1812a924857d78023c2b93dd714ea3eb690f28cf644f2ce0a7d083ceb52e1c67f137d31e262cf143f3a0cf2d86128bf6d584321627d0cc85df6c482d0c9d4118 SHA512 4f8e37c1189be47dca0259db54d2dcb33c94bfd9c8392031792d64200d5ff5b780a5e38dc91c2aba62f42ef6ebc5aaadc7539ef8b9839b5d3387c328a630e920
+DIST vscode-1.82.0-amd64.tar.gz 135420502 BLAKE2B 81af0649a5e16e953c4ce4bf66c3a572ca01ba0b2c586dc3114974c5950fe5ea6cf152e6fc34ab76faa54011f8c1bea43ae27df57387093b3d1a94ecb1255005 SHA512 bf86ee854934c180c8cd026395dcadf31d53f6a8631a3721affb229a388cbbf9c3b7c5675f8b5ffc8996e61dc1040afc37d3197963992849a124f731fa3b5793
+DIST vscode-1.82.0-arm.tar.gz 122224065 BLAKE2B 8702ff5b435f04a7159f9a6cfe315d561d366d67220d73512a8f3cd016e612b7f9c64455a96bb652fa07c7efb2a59fb03881a9db6b20b37df7dd31b8de82af20 SHA512 59476638d3b59a8585f0fe534a038071b1664ff38ffacbaf837232551ae00bd46764e720ed0dd9c91ffcb159a747287862da52c89344f5244c81c2b560109268
+DIST vscode-1.82.0-arm64.tar.gz 132347258 BLAKE2B b36bc943b4495285b34925661a2320ad7bb0476b9e9270d7d72a4dd581a5799f7b822e889750d344c536977c3eaa78f15ad65ec81ae85419c2faaeaa8d62446e SHA512 02f59800bff3ed6e68ee1a624b7211198ae53e6df23d45b77ca883f732b63e300b8a76e79e073a933a168e523c619bcb44c71be9ee8e342e08849206a1e66d58
--- a/app-editors/vscode/vscode-1.81.0-r1.ebuild
+++ b/app-editors/vscode/vscode-1.81.0-r1.ebuild
@ -37,6 +37,7 @@ LICENSE="
 "
 SLOT="0"
 KEYWORDS="-* ~amd64 ~arm ~arm64"
+IUSE="kerberos"

 RDEPEND="
 	>=app-accessibility/at-spi2-core-2.46.0:2
@ -64,23 +65,10 @@ RDEPEND="
 	x11-libs/libXrandr
 	x11-libs/libxshmfence
 	x11-libs/pango
+	kerberos? ( app-crypt/mit-krb5 )
 "

-QA_PREBUILT="
-	/opt/vscode/bin/code-tunnel
-	/opt/vscode/chrome_crashpad_handler
-	/opt/vscode/chrome-sandbox
-	/opt/vscode/code
-	/opt/vscode/libEGL.so
-	/opt/vscode/libffmpeg.so
-	/opt/vscode/libGLESv2.so
-	/opt/vscode/libvk_swiftshader.so
-	/opt/vscode/libvulkan.so*
-	/opt/vscode/resources/app/extensions/*
-	/opt/vscode/resources/app/node_modules.asar.unpacked/*
-	/opt/vscode/swiftshader/libEGL.so
-	/opt/vscode/swiftshader/libGLESv2.so
-"
+QA_PREBUILT="*"

 src_install() {
 	if use amd64; then
@ -99,6 +87,10 @@ src_install() {
 	# Disable update server
 	sed -e "/updateUrl/d" -i ./resources/app/product.json || die

+	if ! use kerberos; then
+		rm -r ./resources/app/node_modules.asar.unpacked/kerberos || die
+	fi
+
 	# Install
 	pax-mark m code
 	mkdir -p "${ED}/opt/${PN}" || die
--- a/Show More
+++ b/Show More