Sync with portage [Tue Dec 3 14:00:16 MSK 2024].

2024-12-03 14:00:16 +03:00 · 2024-12-03 14:00:16 +03:00 · fa16352676
commit fa16352676
parent fbe9239a33
1552 changed files with 17395 additions and 9887 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
@ -1,3 +1,4 @@
 DIST aws-cli-1.36.12.gh.tar.gz 2842234 BLAKE2B b9f333d7fa8b7aa9c0452b6da87c3b097f1b5027f1f9c36888448f5e5763a93696e1d25cca167a17d9ab7332c5491be500a44462eed44c18f886ec9f0816a248 SHA512 b7797a29230628201d808958c4f9660768646f1c1a3f53c39c09791fb8ff0cbfab000b950abc87541ff9e54723b726913a487cf5f164c8b82e609fd92dae7b14
+DIST aws-cli-1.36.13.gh.tar.gz 2845931 BLAKE2B 53a4dc5bfa111ea32a89aa1e6f8795a2007419dd65b092abd5f9d0040d7f1750c570b480071e427ce1738a37d4ac8f5e56628d9f4462cdfbdfe90509bc1c83f7 SHA512 df2ce608b52efb2d8641e1ecea201507def53c11ef7dfd85e4a83423fdfbff75ff94f3e3c0ab1e9ebbce56442fface5b13d95e441519abb3b05af14f77145a2c
 DIST aws-cli-1.36.4.gh.tar.gz 2825870 BLAKE2B 3a13a50077087633972c0eb908e0116e432f0036871f4d5a5e2429ea86dfc0c5d40a87e0950c02bc7622fb0e56b9a3ee9fc8ee9a6a1ed8ae17728bf479401d13 SHA512 735a228d52b525cfc4a9a403ad8364bfb9c558ba86daf6966743126eb21de6d0f49d76fd21d9c7a0fd29f229b4b71e0778d4b1ccd0b2e27b0c794f1e11cd6c83
 DIST aws-cli-1.36.9.gh.tar.gz 2836018 BLAKE2B aada8a63f5bedd5aeeddd56fe18bb49ae1763ba5c737f72aa2f2e00b57fa4e1ab52ec266ca6883859ec633ec2b1658383426809870ba1372d86f9d8e0a055ac6 SHA512 ec47c26012027071732d60f9bd8b3322c1c75b2362dffe7affd8cd6d70732e6239bfbb6531759a247bcb2f29613a88b196d10f405302d25a05ada7968bd7574e
--- a/app-admin/awscli/awscli-1.36.13.ebuild
+++ b/app-admin/awscli/awscli-1.36.13.ebuild
@ -0,0 +1,95 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit bash-completion-r1 distutils-r1
+
+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-1).(z+59)
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) - 1)).$(( $(ver_cut 3-) + 59 ))"
+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.10.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
+"
+BDEPEND="
+	test? (
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+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 serial_tests=(
+		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
+		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
+		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
+		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
+		tests/unit/customizations/test_sessionmanager.py
+		tests/unit/test_compat.py::TestIgnoreUserSignals
+		tests/unit/test_help.py
+		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
+	)
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	EPYTEST_XDIST= epytest "${serial_tests[@]}"
+
+	local EPYTEST_DESELECT=(
+		"${serial_tests[@]}"
+
+		# flaky (some ordering?)
+		tests/functional/s3/test_cp_command.py::TestCPCommand::test_multipart_upload_with_checksum_algorithm_crc32
+	)
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit}
+}
+
+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/bitwarden-desktop-bin/Manifest
+++ b/app-admin/bitwarden-desktop-bin/Manifest
@ -1 +1,2 @@
+DIST Bitwarden-2024.11.2-amd64.deb 84510298 BLAKE2B 7decb80519111fd9d2d29c27aba59acd7bf6ca9733ee06a0e798364a9aad1f91e44e4ed30a021da5e527b562a6b908aa50f07568bae69450d938f89668716364 SHA512 ff5d77afaca6c2579bcd9f4f23be9da4de871cef4288a2fc85bae98517c86eda6040b6affee40256a25e1451bc48c098cf33a83bbcaba69cd7acf13fd1bef794
 DIST Bitwarden-2024.9.0-amd64.deb 83998696 BLAKE2B adce754866e47c82de6defe08bdb91135dca744e11b460d116c9b23d45cef1e95302ea04c5d1f9c77c7c52fb125490272bce0bbeae0ac3738f4fc6cd2529572e SHA512 e0ed593fe1501f40c1721f23e1673e5ea6bda265ffc65c526956a0c26ebc33d88d314bd9db8138a4052fd35c3827a355d36fbf4f171f9702d21f3bbab4ea9fa8
--- a/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2024.11.2.ebuild
+++ b/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2024.11.2.ebuild
@ -0,0 +1,91 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop unpacker xdg-utils
+
+MY_PN="Bitwarden"
+
+DESCRIPTION="Bitwarden password manager desktop client"
+HOMEPAGE="https://bitwarden.com/"
+SRC_URI="https://github.com/bitwarden/clients/releases/download/desktop-v${PV}/Bitwarden-${PV}-amd64.deb"
+S="${WORKDIR}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	app-crypt/libsecret
+	dev-libs/expat
+	dev-libs/glib
+	dev-libs/nspr
+	dev-libs/nss
+	dev-libs/wayland
+	media-libs/alsa-lib
+	media-libs/mesa
+	net-print/cups
+	sys-apps/dbus
+	sys-apps/util-linux
+	sys-libs/glibc
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/libdrm
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libxkbcommon
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXScrnSaver
+	x11-libs/libxshmfence
+	x11-libs/libXtst
+	x11-libs/pango
+"
+IDEPEND="
+	dev-util/desktop-file-utils
+	dev-util/gtk-update-icon-cache
+"
+
+QA_PREBUILT="
+	opt/Bitwarden/*.so*
+	opt/Bitwarden/bitwarden
+	opt/Bitwarden/bitwarden-app
+	opt/Bitwarden/chrome-sandbox
+	opt/Bitwarden/chrome_crashpad_handler
+"
+
+src_install() {
+	insinto /opt
+	doins -r opt/${MY_PN}
+	fperms 755 /opt/Bitwarden/bitwarden \
+		/opt/Bitwarden/bitwarden-app
+	fperms 4755 /opt/Bitwarden/chrome-sandbox
+
+	domenu usr/share/applications/bitwarden.desktop
+
+	local x
+	for x in 16 32 64 128 256 512; do
+		doicon -s ${x} usr/share/icons/hicolor/${x}*/*
+	done
+
+	dosym -r "/opt/Bitwarden/bitwarden" "usr/bin/${PN}"
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@ -1,3 +1,3 @@
-DIST conky-1.19.8.tar.gz 1711683 BLAKE2B f1c1057f07570e63026e51a03fc4d7a51cc1dcaefb963b5f9ce9fba4e71342770bc1a59aa9a834fe8f9d6d552e7775ab0e2d5a487d9b6ec2d215768349c4994c SHA512 bdc5b29bea3a3050f4fe4ce76fc642134d93a91362e491203dc10cdde1d9c1bde8a106cd8388aab1893e4b1def058abf1f35c1fd022c26ac773071ddd44abbc4
 DIST conky-1.21.7.tar.gz 1961997 BLAKE2B 80ca17e0d1065655c410d8108668b3f09df574b761d57e374a2d51c946b51bd1ce4d29d320def0a197d465401cb4a665fb84a394406611903877c0acf42b4ad3 SHA512 52b6621e3e693654610ebd1b9e1adbeaec2ae2a2aaed4b038882a6825e6573f4afdea85f9156e1ffaa5999e30b3b05170b6b101f415980f0edab5c85151e9e6c
 DIST conky-1.21.8.tar.gz 1963431 BLAKE2B 86b93971cb442fc6c2c61b7f681b6ad11e5b3dbfdcb39231da1dc70501497b364a0e99007d961d4310a7f76b9568114d3fce41455d461077cf703b795a53f278 SHA512 72c5cadc89760445888029cc54320267ad0d2ada8d76a6ee85056a9822005232900df2e8c7c1667c970ab72316115f6b2c5d6af72a9b5810aa6a024fbb487001
+DIST conky-1.21.9.tar.gz 1966277 BLAKE2B 90735ab5e4a42f31ccc12c27fa7a5ca35c6c6cc93d97a06d33f37ee7f1300e7c4546ed34f348338661c8efe7a598b32564977ded2f28dc48a0133696031fee69 SHA512 649b7cb2ab482bae33010239ee96deb08a5f3b6954e55e6380f45d753a7690ac446f4471682e293b25f94c3c68e7d5373f5b63a42fec69392e34c4336c6f1b96
--- a/app-admin/conky/conky-1.21.9.ebuild
+++ b/app-admin/conky/conky-1.21.9.ebuild
@ -14,11 +14,12 @@ SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.

 LICENSE="GPL-3 BSD LGPL-2.1 MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ppc64 ~riscv sparc x86"
-IUSE="apcupsd bundled-toluapp cmus curl doc extras hddtemp ical iconv imlib
-	intel-backlight iostats irc lua-cairo lua-imlib lua-rsvg math moc mpd
-	mysql ncurses nvidia +portmon pulseaudio rss systemd test thinkpad
-	truetype wayland webserver wifi X xinerama xmms2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="apcupsd bundled-toluapp cmus colour-name-map curl doc extras hddtemp ical
+	iconv imlib intel-backlight iostats irc lua-cairo lua-cairo-xlib
+	lua-imlib lua-rsvg math moc mouse-events mpd mysql ncurses nvidia
+	+portmon pulseaudio rss systemd test thinkpad truetype wayland webserver
+	wifi X xinerama xinput xmms2"
 RESTRICT="!test? ( test )"

 # Note: toluapp is bundled in conky since 1.11.2
@ -32,7 +33,8 @@ COMMON_DEPEND="
 	iconv? ( virtual/libiconv )
 	imlib? ( >=media-libs/imlib2-1.11.0[X] )
 	irc? ( net-libs/libircclient )
-	lua-cairo? ( x11-libs/cairo[X] )
+	lua-cairo? ( x11-libs/cairo[X?] )
+	lua-cairo-xlib? ( x11-libs/cairo[X] )
 	lua-imlib? ( >=media-libs/imlib2-1.11.0[X] )
 	lua-rsvg? ( gnome-base/librsvg )
 	mysql? ( dev-db/mysql-connector-c )
@ -41,7 +43,6 @@ COMMON_DEPEND="
 	pulseaudio? ( media-libs/libpulse )
 	rss? (
 		dev-libs/libxml2
-		net-misc/curl
 		dev-libs/glib:2
 	)
 	systemd? ( sys-apps/systemd )
@ -56,10 +57,11 @@ COMMON_DEPEND="
 	wifi? ( net-wireless/wireless-tools )
 	webserver? ( net-libs/libmicrohttpd:= )
 	X? (
-		x11-libs/libX11
 		x11-libs/libXdamage
 		x11-libs/libXfixes
 		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libX11
 	)
 	xinerama? ( x11-libs/libXinerama )
 	xmms2? ( media-sound/xmms2 )
@ -82,6 +84,9 @@ DEPEND="
 	)
 "
 BDEPEND="
+	colour-name-map? (
+		dev-util/gperf
+	)
 	doc? (
 		virtual/pandoc
 		$(python_gen_any_dep '
@ -107,12 +112,16 @@ python_check_deps() {
 REQUIRED_USE="
 	${LUA_REQUIRED_USE}
 	imlib? ( X )
-	lua-cairo? ( X  bundled-toluapp )
-	lua-imlib? ( X  bundled-toluapp )
-	lua-rsvg? ( X  bundled-toluapp )
+	lua-cairo? ( || ( X wayland ) bundled-toluapp )
+	lua-cairo-xlib? ( X  bundled-toluapp )
+	lua-imlib? ( X bundled-toluapp )
+	lua-rsvg? ( || ( X wayland ) bundled-toluapp )
+	mouse-events? ( X wayland )
 	nvidia? ( X )
+	rss? ( curl )
 	truetype? ( X )
 	xinerama? ( X )
+	xinput? ( X )
 "

 CONFIG_CHECK="~IPV6"
@ -149,15 +158,13 @@ src_configure() {

 	if use X; then
 		mycmakeargs+=(
-			-DBUILD_ARGB=yes
-			-DBUILD_X11=yes
-			-DBUILD_XDAMAGE=yes
-			-DBUILD_XDBE=yes
-			-DBUILD_XFIXES=yes
-			-DBUILD_XSHAPE=yes
-			-DBUILD_XINPUT=yes
-			-DBUILD_MOUSE_EVENTS=yes
 			-DOWN_WINDOW=yes
+			-DBUILD_XDAMAGE=yes
+			-DBUILD_XFIXES=yes
+			-DBUILD_ARGB=yes
+			-DBUILD_XDBE=yes
+			-DBUILD_XSHAPE=yes
+			-DBUILD_X11=yes
 		)
 	else
 		mycmakeargs+=(
@ -170,6 +177,7 @@ src_configure() {
 		-DBUILD_AUDACIOUS=no
 		-DBUILD_BUILTIN_CONFIG=yes
 		-DBUILD_CMUS=$(usex cmus)
+		-DBUILD_COLOUR_NAME_MAP=$(usex colour-name-map)
 		-DBUILD_CURL=$(usex curl)
 		-DBUILD_DOCS=$(usex doc)
 		-DBUILD_EXTRAS=$(usex extras)
@ -186,10 +194,12 @@ src_configure() {
 		-DBUILD_IRC=$(usex irc)
 		-DBUILD_JOURNAL=$(usex systemd)
 		-DBUILD_LUA_CAIRO=$(usex lua-cairo)
+		-DBUILD_LUA_CAIRO_XLIB=$(usex lua-cairo-xlib)
 		-DBUILD_LUA_IMLIB2=$(usex lua-imlib)
 		-DBUILD_LUA_RSVG=$(usex lua-rsvg)
 		-DBUILD_MATH=$(usex math)
 		-DBUILD_MOC=$(usex moc)
+		-DBUILD_MOUSE_EVENTS=$(usex mouse-events)
 		-DBUILD_MPD=$(usex mpd)
 		-DBUILD_MYSQL=$(usex mysql)
 		-DBUILD_NCURSES=$(usex ncurses)
@ -203,6 +213,7 @@ src_configure() {
 		-DBUILD_WLAN=$(usex wifi)
 		-DBUILD_XFT=$(usex truetype)
 		-DBUILD_XINERAMA=$(usex xinerama)
+		-DBUILD_XINPUT=$(usex xinput)
 		-DBUILD_XMMS2=$(usex xmms2)
 		-DDOC_PATH=/usr/share/doc/${PF}
 		-DMAINTAINER_MODE=no
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@ -7,3 +7,5 @@ DIST consul-1.18.2-deps.tar.xz 10054328 BLAKE2B ed8dd4188f692b9ea0104eccc9d32668
 DIST consul-1.18.2.tar.gz 34440848 BLAKE2B c1b383c088db069a5acc4b09929f0e129be6eb35b2ab1177bd78638687d1274ded75111adc0c4a1511fa10d95e0a6218d2a7ae0b8c4692afabba21392a4d2a5e SHA512 e02296199bc8e53549ef4b7e63b8392c2ddb3d78a1ec5ceee2ea08acb1b7a78b25c383172a6abf8be07717b3c8462297bdf594327784854788f902e938509931
 DIST consul-1.19.1-deps.tar.xz 10102748 BLAKE2B 9d121764915ff191e660450007adaab4a2b2f6ee3dbd7993a32a9d0f105584aff1940f4ebdde1811dcaedcd253df77f2227e6ddb36b165657532f1d9693b716e SHA512 3981ce7dfeaf0b8bf83342edfe6cb3f01112af60b7ec155ee6df355e9f7e7a6d928a34d5be299a31dafb8bc87d369882d1ef80acce72dd53a071dc80ba37b243
 DIST consul-1.19.1.tar.gz 35683711 BLAKE2B 47504c91413388ef3439adc848af19af2e344944845e0a275fb9b5e5df81b13d86002f4df421a467a82b194b738422e90691b281c37ff7807093905eba95ff10 SHA512 d5912b5340e49f38823f265c0a90f09a20d6b7d8920d6d1bcce96ee556e7edf2fca0441afe4b2f65cc50b3c228479ef6babc917c5c0f17fa521c136a5147c899
+DIST consul-1.20.1-deps.tar.xz 10033856 BLAKE2B dcd9df79d1f5948eb7ed1c6279a679d1d368271c2dd971451fffe58c7de7d15e6656f9f8fbfd274bd0269a2d6495d5f9d88a5440e82ca71e9ebf50d1dfa1aafa SHA512 7484183b0b38665df7758afb18928d0cc4a96e8df1f71c4654e6527370c74451c96c3f5cc7b055cdd9fe33dd7e9a39b02e9254b4faeb60171043c624947b800b
+DIST consul-1.20.1.tar.gz 35647978 BLAKE2B 3287c57ea426f5fc0be6c023bd5c3701908d1d2f2309dcb815a1087f2b2c10bc40895d362c56ac53a1daac90d65c8dbb03b55126244608d18eb7bb19f79a8bb0 SHA512 88ddb750f60d87d31713dabd6cc22590fd96ec12d912d08f1d4690839c64e896254e207c029001233b7e47ddf03b171e0daaf24a26437c36199c30632b183163
--- a/app-admin/consul/consul-1.20.1.ebuild
+++ b/app-admin/consul/consul-1.20.1.ebuild
@ -0,0 +1,61 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module systemd
+
+DESCRIPTION="A tool for service discovery, monitoring and configuration"
+HOMEPAGE="https://www.consul.io"
+GIT_COMMIT="920cc7c649225b52e1c45951e609c3d37a49324d"
+GIT_DATE="2024-10-29T19:04:05Z" # source build-support/functions/10-util.sh; git_date
+
+SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
+LICENSE="BUSL-1.1 MPL-2.0"
+LICENSE+=" Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+RESTRICT="test"
+
+BDEPEND="dev-go/gox"
+COMMON_DEPEND="
+	acct-group/consul
+	acct-user/consul"
+	DEPEND="${COMMON_DEPEND}"
+	RDEPEND="${COMMON_DEPEND}"
+
+src_prepare() {
+	default
+	sed -e "s|^GIT_DATE=.*|GIT_DATE=${GIT_DATE}|" -i Makefile || die
+}
+
+src_compile() {
+	if use x86; then
+		#924629 pie breaks build on x86
+		GOFLAGS=${GOFLAGS//-buildmode=pie}
+	fi
+	# The dev target sets causes build.sh to set appropriate XC_OS
+	# and XC_ARCH, and skips generation of an unused zip file,
+	# avoiding a dependency on app-arch/zip.
+	GIT_DESCRIBE="v${PV}" \
+	GIT_DIRTY="" \
+	GIT_COMMIT="${GIT_COMMIT}" \
+	emake dev-build
+}
+
+src_install() {
+	dobin bin/consul
+
+	keepdir /etc/consul.d
+	insinto /etc/consul.d
+	doins "${FILESDIR}/"*.json.example
+
+	keepdir /var/log/consul
+	fowners consul:consul /var/log/consul
+
+	newinitd "${FILESDIR}/consul.initd" "${PN}"
+	newconfd "${FILESDIR}/consul.confd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	systemd_dounit "${FILESDIR}/consul.service"
+}
--- a/app-admin/git-credential-gopass/Manifest
+++ b/app-admin/git-credential-gopass/Manifest
@ -1,4 +1,4 @@
-DIST git-credential-gopass-1.15.13-deps.tar.xz 29702324 BLAKE2B 5d4ee46252419ffa28994ba4fd2a3b4c3201be209d5f53b93ed6f15a32aa990c7be4e1a0f3d72c11883eb6d12cf11bf3b43ab735717a661d5ad5586d14334ed2 SHA512 d21d06eb4c8557b6466809865f35e89b2ed330d00b89cb91c16ef04cf65a96d36c4226081e4d85a5d0b0d2735b00b2bcfd922da423a3d0daafdd1b36a23d6938
-DIST git-credential-gopass-1.15.13.tar.gz 19323 BLAKE2B 6889fbb0f22b5a9ca882893bf0860bb41319e0f3ed01ea6c542caf8c94d4762116f5b84f907380dd723ffe1c57a7359a20cc1e05e7d3958d9f3a3debbd39c659 SHA512 f95d9ce853c5f9b46148d53504cad5992f701c776c3c4a2d53b10b7e94717651231ef5ab7cec7ab572c2badb75a0972c129ba09576598cf067bc4140f6c42196
 DIST git-credential-gopass-1.15.14-deps.tar.xz 14646676 BLAKE2B 2423b090fa1a292dafa577a0070dcb66e01daa5971ce07b3c9d47a879a9c990485d86330b97324b35606e2ee7257f6b72fd452a52fc0186741987699890b5bab SHA512 872d0772c61b71a729368c45587c88c5056a0fed1ddf6516936ae41884cfd2f971a05925582f89cc8ab0499b27f6599d28b093bf335ab4a6c7e115af157d8c66
 DIST git-credential-gopass-1.15.14.tar.gz 19535 BLAKE2B 5b878bb9381b1c2684fc56e76dcec58ad11a9fda65b5c8be30f719eae2ed019279bfa832d837e6e7cdb03fa4f37d4271ebd12f02a92a737c4fe3853613cc24df SHA512 7f251ecc6a47944a6c5170eefaca61cbad9d65b386f2f23690faef6ee0ae2dbcfaf57c7c4b29f12c0350d48ff342b6eac92534de22adcea80bc300d68da70c51
+DIST git-credential-gopass-1.15.15-deps.tar.xz 16648580 BLAKE2B 7e7c575b27a3ce4f468e231302d1045b2b97d2ec93c781fa82ad72f8e90e9e9760b13b2b67391aff482c1786afde11952bf5cc79151c9662f5884e069e2281b7 SHA512 fd515971377b025c7ce23110f412ce7b3b7e8d321983f4e28135e5d41aca003f4675cd3e5841d9318f4af562cc4d25673e8c904a07e205e4e44035493b179244
+DIST git-credential-gopass-1.15.15.tar.gz 18143 BLAKE2B bb9325dc46ff5e908c34e2191a89612e5c5e120121f4fd8b36464dddaf38027b3c2ea5bb38b952d8a0dde79e7052fde0225e0ca94a47e9a25acd95cfa442a6e2 SHA512 6ffa1523b9ba9a00d1ad937f257724d76a0f35b58f9b8f25cdf1d3eb58be2b68943d9dd7eae965be6ae42142f5ae0c09a51aa8a93dbe62c2698b497c240049bc
--- a/app-admin/git-credential-gopass/git-credential-gopass-1.15.15.ebuild
+++ b/app-admin/git-credential-gopass/git-credential-gopass-1.15.15.ebuild
@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/${P}-deps.ta

 LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"

 DEPEND=">=dev-lang/go-1.16"
 RDEPEND="
--- a/app-admin/gopass-hibp/Manifest
+++ b/app-admin/gopass-hibp/Manifest
@ -1,4 +1,4 @@
-DIST gopass-hibp-1.15.13-deps.tar.xz 29737100 BLAKE2B 25cce3936716dda6fd1c760d055a6df6e412f50678295f139724eb84291f6a4447f6cfc05f57b636e67316fab29e94b164615d1ac86dd8738f46e8ddde9b5e71 SHA512 21afb52268e527d4b58bebdab62af8b812a0b2977532c0a99ea092d8e549221169c3f7260b75949d5abc689a9fb1ca6bdcb1e7235f1f2d6360a915c170059ba2
-DIST gopass-hibp-1.15.13.tar.gz 24047 BLAKE2B 79da4ca110585b6b928a27c7fdbf9094ce8110ac4d4bd99e645ae192caf816ab2f9f89d988bff60d84469853d3d08ffdda8eb51de9ccdf53474cedd3017b9687 SHA512 eb2eff7ffd16c166ee9ebfaa52273893b4f349fddba900ea966d0b39bf5f6f22b37cb76de8e0a327002138f1013d227bb066afcb9ff785b9afded97ebba17030
 DIST gopass-hibp-1.15.14-deps.tar.xz 14656156 BLAKE2B 2aabc11371eaa3199c85b186d033f9a64d69ef07c91aa0e0f1a39694d8b84542cb95e65954b7627a6123b49a570f805ede3478cdbd203f1e3379039ed1f35773 SHA512 2325052e3b1077e98a7f21fde1e82ba90d114bba94d1e033f32bbdf5cbe7beef1ea3a613d82e1b7e379c0c87d6bb49afd7d9de33f8ea9b206a54982ce9d93985
 DIST gopass-hibp-1.15.14.tar.gz 24232 BLAKE2B b5906237339805bc57069254346db49040056a2dce4b9ebd33d678772fb9eab286413127e269111317e548a40f8ba071974e461b05dc76a180e86d90fd54c26c SHA512 efbecfc631faed28edda088c80f5919e3cc665b66c5fd999b99469a9a810bf25fe119863accef3d9b68d05b7994dd91efce0c2652a84b1001c85d7b29ab425d5
+DIST gopass-hibp-1.15.15-deps.tar.xz 16659260 BLAKE2B 5bc41cb7822512842730ebcc52b3c17dc8d0061d70e490a59ae84a647bd875bea2779700598e7cffa2cca862b2f158f19dd84f89061e7e565e7ed8226ca87524 SHA512 40c0c4925d71a00f58512106f33eec1d6d82d8d789e8555ed6d89d4a654f9f8dbdd607cb1ede05e2eaf7e80e800b057af98ef1d5750dba5348596852eb994181
+DIST gopass-hibp-1.15.15.tar.gz 22701 BLAKE2B b357b69e9f79da6599f200c01352233f9a79b76c0739f7d992e13216cc4151ea967cec74905861a2f6ee6411c059632428c913053b71fd82af22d2e3a09a5e7b SHA512 214e6f007f4d4f48fa37116da32c751631f8a4f763892324ff2098336927cc4c271d5ae1caec5535d96f09b1525412608b78bc0b9936d7f309d2a07cb65b1663
--- a/app-admin/gopass-hibp/gopass-hibp-1.15.15.ebuild
+++ b/app-admin/gopass-hibp/gopass-hibp-1.15.15.ebuild
@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/${P}-deps.ta

 LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"

 DEPEND=">=dev-lang/go-1.16"
 RDEPEND="
--- a/app-admin/gopass-jsonapi/Manifest
+++ b/app-admin/gopass-jsonapi/Manifest
@ -1,4 +1,4 @@
-DIST gopass-jsonapi-1.15.13-deps.tar.xz 149388536 BLAKE2B 2b5068a830edef67e330f918081bbdf218a2a0e80dc6c26e3d7b9d1d3779919dd869f57af32b0580f5be4787dc6df1325b5b1aba864c0bf0c2fd9d3e1c65364f SHA512 b6034103e0df9897cb95db3b8c9dc2895d7680385de14afcf7ab20db1d7eb537fa86ec56447267623b8493788802b1a1d6a9abff5c9d76f171847b79994cfa16
-DIST gopass-jsonapi-1.15.13.tar.gz 32433 BLAKE2B 6e16c2b060f2a380ede13840bea419b76b5e00cbc0dd29bbf72fc41900acfdeb6bb63908d09bfecbdc89c8c7266274a722fbb6d4b5848ee42fd986d36c3e30ca SHA512 e4b92558d17b27f4f4aada045ccfae4237e2021310ce1c64f3c29406c17f9f73ff61891ede96baebd741b4af15c0584ba8fe9fcb9693e288d17947e606d837b3
 DIST gopass-jsonapi-1.15.14-deps.tar.xz 70627032 BLAKE2B 129b78c19b20dc1d2a51786c0747bed0528edca0b149c490cc76cf5213e599e9271d11b79b0c198759117a5ca03c2bc7568464f77ef463b1680e7a3dce0b5d99 SHA512 f8447d650bf680e7ff93e1d6eb08634a02e7082af5a45f06302b929e7c5ecb8779d56a92f0080be99a89ef98a07295380592603c85f671441b6d57c12b3e9124
 DIST gopass-jsonapi-1.15.14.tar.gz 32520 BLAKE2B 6c7c8a960244f22d0cf239c43ec63c1a1b985e18335c090e16ae9e983fb64118266f8cfc1b70f3f42b8f8a92159d89509b81ab4300bd086e6c313789e986e9cc SHA512 8d2409919c43ef34ac4c3909815d9ac63325fda8bb30a696e31db60db50452b05cf59fbae9d733d40ff52183deea0d98a732089b4e2e50f587ca0984c291dfea
+DIST gopass-jsonapi-1.15.15-deps.tar.xz 72620048 BLAKE2B 58789502501ce95ae70d1a7914b5b46ba02ffb8f3adb1d518c52b3ab794a771de14a9ab7995eabf6ce007f5a6377cfad68c96052708ac3281b221fc65ce2fa15 SHA512 ab0d2af3bf9a37980ee0754df3544755818e4c6312a481d23d3411ea4a3f4ff2caf6363fce6c405e93ef28c6aeb65ab837ee02739a7fafed5d9d32e08213f0d4
+DIST gopass-jsonapi-1.15.15.tar.gz 31538 BLAKE2B fe2c45223e9c119fcc3fcbe572a38c7480eac08d72899d05f33e3c098e9f8675c81d9487e61995e3dd4e86467901a07886d7ce11e39907f3ed9037b5177307df SHA512 8daf7d4c59b0a07335c4963f29f2003500159aa4663e89d0ce9a7e6228f4f417bc283e7e448b63aaa73a300b77adbfa62ed7bf18ad585443ffdc452857f505ac
--- a/app-admin/gopass-jsonapi/gopass-jsonapi-1.15.15.ebuild
+++ b/app-admin/gopass-jsonapi/gopass-jsonapi-1.15.15.ebuild
@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/${P}-deps.ta

 LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"

 DEPEND=">=dev-lang/go-1.16"
 RDEPEND="
--- a/app-admin/gopass-summon-provider/Manifest
+++ b/app-admin/gopass-summon-provider/Manifest
@ -1,4 +1,4 @@
-DIST gopass-summon-provider-1.15.13-deps.tar.xz 29702324 BLAKE2B 5d4ee46252419ffa28994ba4fd2a3b4c3201be209d5f53b93ed6f15a32aa990c7be4e1a0f3d72c11883eb6d12cf11bf3b43ab735717a661d5ad5586d14334ed2 SHA512 d21d06eb4c8557b6466809865f35e89b2ed330d00b89cb91c16ef04cf65a96d36c4226081e4d85a5d0b0d2735b00b2bcfd922da423a3d0daafdd1b36a23d6938
-DIST gopass-summon-provider-1.15.13.tar.gz 16086 BLAKE2B b3b7656daf1189454c77772915120ab77615cf953ca1434919c901c5c0b708f0b1e124cfa63e9d8fa847d1aa12e403b630ccd023e16d6d3ef4d4cb507c7b36b9 SHA512 74809663c6b754894dc2f86c2153325b49bac862dbd29794b1997a11de34fd2bec4ddc583fefc19d4b920df64deedd7d9c508798d90426051d73648c3b545b7e
 DIST gopass-summon-provider-1.15.14-deps.tar.xz 14646676 BLAKE2B 2423b090fa1a292dafa577a0070dcb66e01daa5971ce07b3c9d47a879a9c990485d86330b97324b35606e2ee7257f6b72fd452a52fc0186741987699890b5bab SHA512 872d0772c61b71a729368c45587c88c5056a0fed1ddf6516936ae41884cfd2f971a05925582f89cc8ab0499b27f6599d28b093bf335ab4a6c7e115af157d8c66
 DIST gopass-summon-provider-1.15.14.tar.gz 16307 BLAKE2B cfe83ea69a20a71017c0ecb32ebe5c83ef3f6eaf2b0215f10885ccbb38f8b98aa6e677d751cbd558ae421113b0513a2571392c1ddd2779224ddc2f6f3279a21a SHA512 ae9f65dcd1982230d3495e00c927266c70c1a5fd924b74c435c32a1956f25beaee717ef42493f769b8cf0327ac1bc7703479778706a67a09a941fdc92cc9ec79
+DIST gopass-summon-provider-1.15.15-deps.tar.xz 16648580 BLAKE2B 7e7c575b27a3ce4f468e231302d1045b2b97d2ec93c781fa82ad72f8e90e9e9760b13b2b67391aff482c1786afde11952bf5cc79151c9662f5884e069e2281b7 SHA512 fd515971377b025c7ce23110f412ce7b3b7e8d321983f4e28135e5d41aca003f4675cd3e5841d9318f4af562cc4d25673e8c904a07e205e4e44035493b179244
+DIST gopass-summon-provider-1.15.15.tar.gz 15025 BLAKE2B 4d2122099fa69495f5365eef2e9d9ed5478d2760e3274bfb87b15846974e3621d793f4c9fa29f89ddd6a5494b1bd7e9102f6586090c18aa2016751a367f7d115 SHA512 b84f8ccde84b3fc6298386e959c4486119c24bf9f15d5f3820a0f2c062d490e6979889738283518c85a944043012172ee50a1de43818a7bdabbdf0672f0274f0
--- a/app-admin/gopass-summon-provider/gopass-summon-provider-1.15.15.ebuild
+++ b/app-admin/gopass-summon-provider/gopass-summon-provider-1.15.15.ebuild
@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/${P}-deps.ta

 LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"

 DEPEND=">=dev-lang/go-1.16"
 RDEPEND="
--- a/app-admin/gopass/Manifest
+++ b/app-admin/gopass/Manifest
@ -1,4 +1,4 @@
-DIST gopass-1.15.13-deps.tar.xz 284979668 BLAKE2B 12e42b897dfc613de810cc4c42e2318b5cad013e14b007daba454b800092f6e408e5ca10731b14d895673cd9426b322d94615a45954e3a0871b0b46533b6f6c9 SHA512 5e4a2f564d0140d77cdaf52a3784d75984db8b68152bf7137d3fbd727238e9509d56d280ceb1106fa47198bb8bc52980637652c10bd95524063bf1e3e962fdfb
-DIST gopass-1.15.13.tar.gz 2328529 BLAKE2B 276ea675c7978ac1627cb313b595d9f252cc3aae29245eca758aed3b6632ddcdfa0da93cdc06f4c0767a2d5f58ded41fcccfac774b5001351bb4b743e976c595 SHA512 b7fcc7814ccad0cf0e3116eac848df080338e313ddcbb0cc8413cb353a1596b250aed427c97e791326e04c6c4241dbb529e112398218f2a905fc0fb48bc49963
 DIST gopass-1.15.14-deps.tar.xz 129535712 BLAKE2B efb790782a25d6f22b3b5f8b747bd72ea8f487bac18e7da746ebefd159a1ae6e36930d6bfe9b000c5d4096d9bbf277f9e263e922a57094d0d337bdd3add65a97 SHA512 88c27326563a3b3d35e05a31fde3d563a6d5c3ee67eb36580b4723c3b2646cc2662b2c8c77e1e2db9edaa8c25e73fa390fc08d98524a66f6b99a0fa8a84303b3
 DIST gopass-1.15.14.tar.gz 2328921 BLAKE2B 76d58f43cd0d95743a3160ec1eae372a4e26e58483a4685b41fa8b8845a1b2adbb3f0be61e23523558eb96a9d10af4b43f5610ba7f44cb5736b944d97a4f7b6e SHA512 874ea69816df46bc03113cbc3f1fae5b9c08a9c0b09a566097163f2f03f97e5d256351432f0f0eb1f89c5643b5866b4800e986d344f6fe06c5c3d4b3721c0521
+DIST gopass-1.15.15-deps.tar.xz 132123176 BLAKE2B 9ae5d2fe422162cedfa2b0e031885efe8f2fdc03de4d9d8698033554bbbb99eb7602834f7f1e107677b054264151cf62f8ff8349713e49e55d2489c2275d47d6 SHA512 33d0d60e9f020edccffd8c2bb71d2f038dd0d5ddca012a19ab47a4efc172660ae13d77283bc2103cf7466353d52a461a15b84309f1e1781ecd00b35db4bb5b25
+DIST gopass-1.15.15.tar.gz 2335086 BLAKE2B a871decc50024cee032ed2d494da05ea6443de500138a0067120fd070c7797e03e81676edbeb71301a503a13644cc1878c702ffa72a970a835f59543941b75b0 SHA512 f5949d0e21ce7e9de9ae8d89e2371ed4fe0c2ffbb112f9529b8e6361a327c2692e1355b50f8f962c333e2ce397ba024b5ac90b4239851905c67baf3e363b1737
--- a/app-admin/gopass/gopass-1.15.14.ebuild
+++ b/app-admin/gopass/gopass-1.15.14.ebuild
@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/${P}-deps.ta

 LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"

 DEPEND=">=dev-lang/go-1.18"
 RDEPEND="
--- a/app-admin/gopass/gopass-1.15.15.ebuild
+++ b/app-admin/gopass/gopass-1.15.15.ebuild
@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/${P}-deps.ta

 LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"

 DEPEND=">=dev-lang/go-1.18"
 RDEPEND="
--- a/app-admin/pass/pass-1.7.3-r2.ebuild
+++ b/app-admin/pass/pass-1.7.3-r2.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -10,7 +10,7 @@ HOMEPAGE="https://www.passwordstore.org/"
 SRC_URI="https://git.zx2c4.com/password-store/snapshot/password-store-${PV}.tar.xz"
 S="${WORKDIR}/password-store-${PV}"

-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~x64-macos"
 IUSE="+git X emacs dmenu importers"
--- a/app-admin/pass/pass-1.7.4-r2.ebuild
+++ b/app-admin/pass/pass-1.7.4-r2.ebuild
@ -10,7 +10,7 @@ HOMEPAGE="https://www.passwordstore.org/"
 SRC_URI="https://git.zx2c4.com/password-store/snapshot/password-store-${PV}.tar.xz"
 S="${WORKDIR}/password-store-${PV}"

-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86 ~arm64-macos ~x64-macos"
 IUSE="+git wayland X emacs dmenu importers"
--- a/app-admin/pass/pass-9999.ebuild
+++ b/app-admin/pass/pass-9999.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -17,7 +17,7 @@ fi
 DESCRIPTION="Stores, retrieves, generates, and synchronizes passwords securely"
 HOMEPAGE="https://www.passwordstore.org/"

-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 IUSE="+git wayland X emacs dmenu importers"

--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
--- a/app-arch/alien/alien-8.95.6.ebuild
+++ b/app-arch/alien/alien-8.95.6.ebuild
@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/a/${PN}/${PN}_${PV}.tar.xz -> ${P}.tar.xz"

 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ppc ppc64 ~riscv ~x86"
 IUSE="+bzip2"

 RDEPEND="
--- a/app-arch/par2cmdline/par2cmdline-0.8.1-r2.ebuild
+++ b/app-arch/par2cmdline/par2cmdline-0.8.1-r2.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
@ -11,7 +11,7 @@ SRC_URI="https://github.com/Parchive/${PN}/releases/download/v${PV}/${P}.tar.bz2

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~arm ~hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="openmp"

 PATCHES=( "${FILESDIR}"/${P}-big-endian.patch )
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@ -4,3 +4,4 @@ DIST bareos-22.1.5.tar.gz 14747894 BLAKE2B 560bc1ceb34fccfb370e8643d24917e24b244
 DIST bareos-22.1.6.tar.gz 14758055 BLAKE2B e49c2f6b38394b71a15e4826286a761e78b8c301429843630bbf024a76505381a84581296e7bcdd537bf04194e10abc3c8b4f358234ae968a10163993c9451bc SHA512 6fda879ed6ac05843d9c8c0da16228e2b009ee094230ce7cec0deb9125723f1bd8964517c355f61fda34ee5664ebaf4e76b3c6ce2b0e9b88c66788abf5d9b93e
 DIST bareos-23.0.4.tar.gz 13954430 BLAKE2B dfeea6ca63be1cb376507a1270cc835d8f6ea336a8cf9c07ac74a2817d84f044da7ac974b11a34b3d6c8a66ed4cb27a1e9ba06b4dad697937e6068181f42eb03 SHA512 50686548cb2bb398d524fa208db97a68e30f40e53ac8a8f57182157e713d743baf8a3177453327943b17de128f6dd6c5b5de0fe65ddcedf7cbca715e7ae05bd5
 DIST bareos-23.1.0.tar.gz 14002357 BLAKE2B f063bf0d4ce422766f8d71133e69ed39bf914672f2ff3321d792cd28bf58d6e2daac53a1fe48586e4accd6a895e9ef83b17e51e3f6b4dabccf7c54bf02fb2680 SHA512 480a7f420c7f0a626f5261e0b9c136f3ed71f08ee09ce9d493b66645e0f2c5dc00455719a3ce06a57a5424206b1c0f62cd19904f83bcaaa45066726a6b223281
+DIST bareos-23.1.1.tar.gz 14010988 BLAKE2B ee56a93fdffaee51ff43fda272f48f18b811447401885538afa5fa7a59bc5b31eac884a7552439765955e08a20708101725b7561526ab7204970bcfb67dffca3 SHA512 3ff7bb42537d2654dfaa967e4b63f624953572499f118f870857bfb9f83c84d6e27adcf34ef3a1347e7dd23c54d1bcb17db7820070268f29dda69a89e661791b
--- a/app-backup/bareos/bareos-23.1.1.ebuild
+++ b/app-backup/bareos/bareos-23.1.1.ebuild
@ -0,0 +1,439 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+CMAKE_WARN_UNUSED_CLI=no
+
+inherit python-any-r1 systemd cmake tmpfiles flag-o-matic
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/Release/${PV}.tar.gz -> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+	S=${WORKDIR}/${PN}-Release-${PV}
+fi
+
+DESCRIPTION="Featureful client/server network backup suite"
+HOMEPAGE="https://www.bareos.org/"
+
+LICENSE="AGPL-3"
+SLOT="0"
+IUSE="X acl ceph clientonly cpu_flags_x86_avx +director glusterfs ipv6 lmdb
+	logwatch ndmp readline scsi-crypto split-usr
+	static +storage-daemon systemd tcpd test vim-syntax vmware xattr"
+
+# some tests still fail propably due to missing bits in src_test -> TODO
+RESTRICT="mirror test"
+#RESTRICT="
+#	mirror
+#	!test? ( test )
+#"
+
+# get cmake variables from core/cmake/BareosSetVariableDefaults.cmake
+DEPEND="
+	!app-backup/bacula
+	acct-group/${PN}
+	!x86? (
+		ceph? ( sys-cluster/ceph )
+	)
+	dev-libs/libfmt
+	dev-libs/utfcpp
+	glusterfs? ( sys-cluster/glusterfs )
+	lmdb? ( dev-db/lmdb )
+	dev-libs/gmp:0
+	!clientonly? (
+		acct-user/${PN}
+		dev-db/postgresql:*[threads(+)]
+		director? (
+			virtual/mta
+		)
+	)
+	logwatch? ( sys-apps/logwatch )
+	ndmp? ( net-libs/rpcsvc-proto )
+	tcpd? ( sys-apps/tcp-wrappers )
+	readline? ( sys-libs/readline:0 )
+	static? (
+		acl? ( virtual/acl[static-libs] )
+		dev-libs/jansson:=[static-libs]
+		dev-libs/lzo[static-libs]
+		dev-libs/openssl:0=[static-libs]
+		sys-libs/ncurses:=[static-libs]
+		sys-libs/zlib[static-libs]
+	)
+	!static? (
+		acl? ( virtual/acl )
+		dev-libs/jansson:=
+		dev-libs/lzo
+		dev-libs/openssl:0=
+		sys-libs/ncurses:=
+		sys-libs/zlib
+	)
+	X? (
+		dev-qt/qtwidgets:5=
+	)
+	"
+RDEPEND="${DEPEND}
+	!clientonly? (
+		storage-daemon? (
+			sys-block/mtx
+			app-arch/mt-st
+		)
+	)
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+	"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	test? (
+		dev-cpp/gtest
+		dev-db/postgresql:*[server,threads(+)]
+		dev-db/mariadb:*[server]
+	)
+"
+
+REQUIRED_USE="
+	static? ( clientonly )
+	clientonly? ( !director !storage-daemon !ceph !glusterfs !lmdb !ndmp !scsi-crypto )
+	x86? ( !ceph )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-21-cmake-gentoo.patch"
+	"${FILESDIR}/${PN}-22.0.2-werror.patch"
+	"${FILESDIR}/${PN}-21.1.2-no-automagic-ccache.patch"
+)
+
+pkg_pretend() {
+	local active_removed_backend=""
+	if has_version "<app-backup/bareos-21[director,mysql]"; then
+		if grep -qhriE "dbdriver.*=.*mysql" /etc/bareos/; then
+			active_removed_backend=MySQL
+		fi
+	elif has_version "<app-backup/bareos-21[director,sqlite]"; then
+		if grep -qhriE "dbdriver.*=.*sqlite" /etc/bareos/; then
+			active_removed_backend=SQLite
+		fi
+	fi
+	if [[ -n $active_removed_backend ]]; then
+		ewarn
+		ewarn "You are currently using bareos with the $active_removed_backend"
+		ewarn "catalog backend."
+		ewarn
+		ewarn "THIS IS NOT SUPPORTED ANYMORE"
+		ewarn
+		ewarn "Beginning with version 21.0.0 bareos has dropped support for"
+		ewarn "MySQL and SQLite catalog backends."
+		ewarn
+		ewarn "To upgrade to bareos >=21.0.0 you need to migrate to PostgreSQL"
+		ewarn "catalog backend using the 'bareos-dbcopy' tool of your current"
+		ewarn "installation first."
+		ewarn
+		die "current catalog backend not supported anymore"
+	fi
+}
+
+src_test() {
+	# initialze catalog test database
+	initdb -D "${T}"/pgsql || die
+	pg_ctl -w -D "${T}"/pgsql start \
+		-o "-h '' -k '${T}'" || die
+	createuser -h "${T}" bareos || die
+	createdb -h "${T}" --owner bareos bareos || die
+	export PGHOST="${T}"
+
+	# initiale mariadb database for backup tests
+	# $USER must be set and != root
+	export USER=portage
+
+	default
+	cmake_src_test
+
+	pg_ctl -w -D "${T}"/pgsql stop || die
+	rm -rvf "${T}"/pgsql
+}
+
+src_prepare() {
+	# fix missing DESTDIR in symlink creation
+	sed -i '/bareos-symlink-default-db-backend.cmake/d' "${S}/core/src/cats/CMakeLists.txt"
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=()
+
+	if use clientonly; then
+		mycmakeargs+=(
+			-Dclient-only=ON
+			-Dstatic-cons=$(usex static)
+			-Dstatic-fd=$(usex static)
+		)
+	fi
+
+	for useflag in acl ipv6 ndmp scsi-crypto \
+		systemd lmdb; do
+		mycmakeargs+=( -D$useflag=$(usex $useflag) )
+	done
+	if use X; then
+		mycmakeargs+=( -Dtraymonitor=yes )
+	fi
+
+	mycmakeargs+=(
+		-DHAVE_PYTHON=0
+		-DCPM_USE_LOCAL_PACKAGES=1
+		-DCPM_LOCAL_PACKAGES_ONLY=1
+		-DENABLE_WEBUI=0
+		-Darchivedir=/var/lib/bareos/storage
+		-Dbackenddir=/usr/$(get_libdir)/${PN}/backend
+		-Dbasename="`hostname -s`"
+		-Dbatch-insert=yes
+		-Dbsrdir=/var/lib/bareos/bsr
+		-Dconfdir=/etc/bareos
+		-Dcoverage=no
+		-Ddb_password=`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 16 | head -n 1`
+		-Ddir-group=bareos
+		-Ddir-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Ddir-user=bareos
+		-Ddocdir=/usr/share/doc/${PF}
+		-Ddynamic-cats-backends=yes
+		-Ddynamic-storage-backends=yes
+		-Dfd-group=bareos
+		-Dfd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Dfd-user=root
+		-Dhost=${CHOST}
+		-Dhostname="`hostname -s`"
+		-Dhtmldir=/usr/share/doc/${PF}/html
+		-Dlibdir=/usr/$(get_libdir)
+		-Dlogdir=/var/log/bareos
+		-Dmandir=/usr/share/man
+		-Dmon-dir-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Dmon-fd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Dmon-sd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Dopenssl=yes
+		-Dpiddir=/run/bareos
+		-Dplugindir=/usr/$(get_libdir)/${PN}/plugin
+		-Dsbin-perm=0755
+		-Dsbindir=/usr/sbin
+		-Dscriptdir=/usr/libexec/bareos
+		-Dsd-group=bareos
+		-Dsd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Dsd-user=root
+		-Dsubsysdir=/run/lock/subsys
+		-Dsysconfdir=/etc
+		-Dworkingdir=/var/lib/bareos
+		-Dx=$(usex X)
+		)
+
+		use cpu_flags_x86_avx && append-flags "-DXXH_X86DISPATCH_ALLOW_AVX"
+
+		# disable droplet support for now as it does not build with gcc 10
+		# ... and this is a bundled lib, which should have its own package
+		cd core && cmake_comment_add_subdirectory "src/droplet"
+
+		cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# remove some scripts we don't need at all
+	rm -f "${D}"/usr/libexec/bareos/{bareos,bareos-ctl-dir,bareos-ctl-fd,bareos-ctl-sd}
+	rm -f "${D}"/usr/sbin/bareos
+
+	# remove upstream init scripts and systemd units
+	rm -f "${D}"/etc/init.d/bareos-* "${D}"/lib/systemd/system/bareos-*.service
+
+	# remove misc stuff we do not need in production
+	rm -f "${D}"/etc/bareos/bareos-regress.conf
+	rm -f "${D}"/etc/logrotate.d/bareos-dir
+
+	# remove duplicate binaries being installed in /usr/sbin and replace
+	# them by symlinks to not break systems that still use split-usr
+	if use split-usr; then
+		for f in bwild bregex bsmtp bconsole; do
+			rm -f "${D}/usr/sbin/$f" || die
+			ln -s "../bin/$f" "${D}/usr/sbin/$f" || die
+		done
+	fi
+
+	# get rid of py2 stuff
+	rm -rf "$D"/usr/lib64/python2.7 || die
+	rm -f "$D"/usr/lib64/bareos/plugin/python-fd.so || die
+	if ! use vmware; then
+		rm -f "$D"/usr/lib64/bareos/plugin/{BareosFdPluginVMware.py,bareos-fd-vmware.py}
+	fi
+
+	# rename statically linked apps
+	if use clientonly && use static ; then
+		pushd "${D}"/usr/sbin || die
+		mv static-bareos-fd bareos-fd || die
+		mv static-bconsole bconsole || die
+		popd || die
+	fi
+
+	# extra files which 'make install' doesn't cover
+	if ! use clientonly; then
+		# the logrotate configuration
+		# (now unconditional wrt bug #258187)
+		diropts -m0755
+		insinto /etc/logrotate.d
+		insopts -m0644
+		newins "${S}"/core/scripts/logrotate bareos
+
+		# the logwatch scripts
+		if use logwatch; then
+			diropts -m0750
+			dodir /etc/log.d/scripts/services
+			dodir /etc/log.d/scripts/shared
+			dodir /etc/log.d/conf/logfiles
+			dodir /etc/log.d/conf/services
+			pushd "${S}"/core/scripts/logwatch >&/dev/null || die
+
+			into /etc/log.d/scripts/services
+			dobin bareos
+
+			into /etc/log.d/scripts/shared
+			dobin applybareosdate
+
+			insinto /etc/log.d/conf/logfiles
+			newins logfile.bareos.conf bareos.conf
+
+			insinto /etc/log.d/conf/services
+			newins services.bareos.conf bareos.conf
+
+			popd >&/dev/null || die
+		fi
+	fi
+
+	rm -vf "${D}"/usr/share/man/man1/bareos-bwxconsole.1*
+	if use clientonly || ! use director; then
+		rm -vf "${D}"/usr/share/man/man8/bareos-dir.8*
+		rm -vf "${D}"/usr/share/man/man8/bareos-dbcheck.8*
+		rm -vf "${D}"/usr/share/man/man1/bsmtp.1*
+		rm -vf "${D}"/usr/share/man/man8/bwild.8*
+		rm -vf "${D}"/usr/share/man/man8/bregex.8*
+		rm -vf "${D}"/usr/share/man/man8/bpluginfo.8*
+		rm -vf "${D}"/usr/libexec/bareos/create_*_database
+		rm -vf "${D}"/usr/libexec/bareos/drop_*_database
+		rm -vf "${D}"/usr/libexec/bareos/make_*_tables
+		rm -vf "${D}"/usr/libexec/bareos/update_*_tables
+		rm -vf "${D}"/usr/libexec/bareos/drop_*_tables
+		rm -vf "${D}"/usr/libexec/bareos/grant_*_privileges
+		rm -vf "${D}"/usr/libexec/bareos/*_catalog_backup
+	fi
+	if use clientonly || ! use storage-daemon; then
+		rm -vf "${D}"/usr/share/man/man8/bareos-sd.8*
+		rm -vf "${D}"/usr/share/man/man8/bcopy.8*
+		rm -vf "${D}"/usr/share/man/man8/bextract.8*
+		rm -vf "${D}"/usr/share/man/man8/bls.8*
+		rm -vf "${D}"/usr/share/man/man8/bscan.8*
+		rm -vf "${D}"/usr/share/man/man8/btape.8*
+		rm -vf "${D}"/usr/libexec/bareos/disk-changer
+		rm -vf "${D}"/usr/libexec/bareos/mtx-changer
+		rm -vf "${D}"/usr/libexec/bareos/dvd-handler
+		rm -vf "${D}"/etc/bareos/mtx-changer.conf
+	fi
+	if ! use scsi-crypto; then
+		rm -vf "${D}"/usr/share/man/man8/bscrypto.8*
+	fi
+
+	# documentation
+	dodoc README.md
+	dodoc core/README.configsubdirectories
+	use glusterfs dodoc core/README.glusterfs
+	use ndmp && dodoc core/README.NDMP
+	use scsi-crypto && dodoc core/README.scsicrypto
+
+	# vim-files
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins core/scripts/bareos.vim
+		insinto /usr/share/vim/vimfiles/ftdetect
+		newins core/scripts/filetype.vim bareos_ft.vim
+	fi
+
+	# setup init scripts
+	myscripts="bareos-fd"
+	if ! use clientonly; then
+		if use director; then
+			myscripts+=" bareos-dir"
+		fi
+		if use storage-daemon; then
+			myscripts+=" bareos-sd"
+		fi
+	fi
+	for script in ${myscripts}; do
+		# install init script and config
+		newinitd "${FILESDIR}/${script}-21-r1".initd "${script}"
+		newconfd "${FILESDIR}/${script}-21".confd "${script}"
+	done
+
+	# install systemd unit files
+	if use systemd; then
+		if ! use clientonly; then
+			use director && systemd_newunit "${FILESDIR}"/bareos-dir-21.service bareos-dir.service
+			use storage-daemon && systemd_dounit "${FILESDIR}"/bareos-sd.service
+		fi
+		systemd_dounit "${FILESDIR}"/bareos-fd.service
+	fi
+
+	# make sure the working directory exists
+	diropts -m0750
+	keepdir /var/lib/bareos
+	keepdir /var/lib/bareos/storage
+
+	# set log directory ownership
+	if ! use clientonly; then
+		diropts -m0755 -o bareos -g bareos
+	fi
+	keepdir /var/log/bareos
+
+	newtmpfiles "${FILESDIR}"/tmpfiles.d-bareos.conf bareos.conf
+
+	# make sure bareos group can execute bareos libexec scripts
+	fowners -R root:bareos /usr/libexec/bareos
+}
+
+pkg_postinst() {
+	tmpfiles_process bareos.conf
+
+	if use clientonly; then
+		fowners root:bareos /var/lib/bareos
+	else
+		fowners bareos:bareos /var/lib/bareos
+	fi
+
+	if ! use clientonly && use director; then
+		einfo
+		einfo "If this is a new install, you must create the database:"
+		einfo
+		einfo "  su postgres -c '/usr/libexec/bareos/create_bareos_database'"
+		einfo "  su postgres -c '/usr/libexec/bareos/make_bareos_tables'"
+		einfo "  su postgres -c '/usr/libexec/bareos/grant_bareos_privileges'"
+		einfo
+		einfo "or run"
+		einfo
+		einfo " emerge --config app-backup/bareos"
+		einfo
+		einfo "to do this"
+		einfo
+		einfo "For major upgrades you may need to run:"
+		einfo
+		einfo "  su postgres -c '/usr/libexec/bareos/update_bareos_tables'"
+		einfo
+		einfo "Please see release notes for details."
+		einfo "( https://docs.bareos.org/Appendix/ReleaseNotes.html )"
+		einfo
+	fi
+}
+
+pkg_config() {
+	su postgres -c '/usr/libexec/bareos/create_bareos_database' || die "could not create bareos database"
+	su postgres -c '/usr/libexec/bareos/make_bareos_tables' || die "could not create bareos database tables"
+	su postgres -c '/usr/libexec/bareos/grant_bareos_privileges' || die "could not grant bareos database privileges"
+}
--- a/app-backup/bareos/bareos-9999.ebuild
+++ b/app-backup/bareos/bareos-9999.ebuild
@ -42,6 +42,7 @@ DEPEND="
 		ceph? ( sys-cluster/ceph )
 	)
 	dev-libs/libfmt
+	dev-libs/utfcpp
 	glusterfs? ( sys-cluster/glusterfs )
 	lmdb? ( dev-db/lmdb )
 	dev-libs/gmp:0
--- a/app-backup/btrbk/btrbk-0.32.6-r2.ebuild
+++ b/app-backup/btrbk/btrbk-0.32.6-r2.ebuild
@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	SRC_URI=""
 else
 	SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz"
-	KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
 fi

 DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes"
--- a/app-backup/snapper/Manifest
+++ b/app-backup/snapper/Manifest
@ -1,3 +1,3 @@
 DIST snapper-0.11.0.tar.gz 445685 BLAKE2B 301e6d745d8d6d7acc6ca0c9fc431a0e46700aabd9882785bb2be38152693f9dbe897f85f6ad724c9529a0754b6146b53dda0a24141b386e59e7737855bc5da2 SHA512 fe86be4ceb1439b5be3fa61f5bc037bc51a5fe47451d0698851f83e2783d6c245ef8d40a33f79b03e8d1d8b63433743c35938ad7dca0747e0e1f650a5a766c40
-DIST snapper-0.11.1.tar.gz 450693 BLAKE2B 06c90cfdca71550e8dc8a246008a94bceb582f98dc4d56546592ae70ec69bd21f1f73ff1e41776f7eb5a02c42c382e05b771afa3fe583eb63486f640dc1d23d4 SHA512 0d7f6d9a012892c3ea0916cc92da5a6a435aa0a90067941f03b6e5a08adff54a7f3c52cc500cd28e7a7b496fb436c88db4399307cdd5518cfa54f2287e285993
 DIST snapper-0.11.2.tar.gz 451240 BLAKE2B 08afbdb7808d16555ca476e2a4336b9ee7da7e368a8bba1f131b7413d60ce0c61cb8e6ebc14cfebf5184d426b39c2d042f450494dcd65de30627870407ec8652 SHA512 b418ff91c6ba655edebd600691e2a7c0bc277eb6e327d5c57d0e5b2e008ee859e82a7dc49f2b25003001f0e6e5fc69e611c843231160bbb4626867cfc4cf95e2
+DIST snapper-0.12.0.tar.gz 530406 BLAKE2B 575a1cf251c789c38f3cce623e6074dde4d195914f7b391f2a0d4f588e5ff90b47c56b1897cb9a6d6a7789ed6d5e3676cb9ac3719fa33e9dabdc26227ea5b1e2 SHA512 f022ce76633e3d64e2c3c825a9113b2f77d0e672188b4af644e37388cb3636b4878131917a734aab3b74e744b5e437d53657744df37ec53671442cef4e3bb873
--- a/app-backup/snapper/snapper-0.12.0.ebuild
+++ b/app-backup/snapper/snapper-0.12.0.ebuild
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
--- a/app-cdr/gaffitter/Manifest
+++ b/app-cdr/gaffitter/Manifest
@ -1,3 +1,2 @@
-DIST gaffitter-0.6.0.tar.bz2 44433 BLAKE2B 8ae8fb68711168619e69b79c8544dcb926e984ed3e311062060c71f691588c581fb90744c3e984847bd3061e6ed18e6ae07896af8812d6896fb27291af9450e0 SHA512 f27313b0274d2b08e6e9cd7ce86d93c3a944d6d4e4ad103cba8137dd4074bcdfcbd470ef6decdd192e6e5086f27968e27e0b76ca738e9b538db14d83816010b6
 DIST gaffitter-1.0.0.tar.gz 50827 BLAKE2B 0056ece791fa5531087d35ac3282087bbacc7c0c8bf362986e964b46262213ffd5b1a03392cbb4efa97264ca4d5203126c67cc5f0980034304245c25189f4c8d SHA512 86d90d03b06346333f6770f81b5cd0916180f12e77b1ee491a75190a24c584ecfbb2d2b85bbb8c271a122ad6309ba13acb3bcdfa6b96a38083fe68bf7e8433ff
 DIST scripts-0.1.0.tar.bz2 5859 BLAKE2B fa774440d9f5b1e8c3a1b4cfd2d65d1d943a904d196df2657ff12e079266b211476bd61b2514be9f629522106ef0b1ef2b21fbb8e0431bf4c6a04273fe3d8a83 SHA512 6730df258444fa4fb17a0d0438b8b1394f857638ce95aaa28dae5345d0bf7517a226a0483a6e8ab89a5012aef9b79586a0cd2b576f9a1ceafc6f29e45d797a20
--- a/app-cdr/gaffitter/files/gaffitter-0.6.0-fix-build-system.patch
+++ b/app-cdr/gaffitter/files/gaffitter-0.6.0-fix-build-system.patch
@ -1,32 +0,0 @@
--- a/src/Makefile
-+++ b/src/Makefile
-@@ -6,28 +6,14 @@
- 			  optimizers/BestFit.cc optimizers/Split.cc \
- 			  util/CmdLineParser.cc
- 
-INCLUDES = -I/usr/local/include -I.
-CXX = g++
-CXXFLAGS = -O3 -Wno-long-long $(INCLUDES)
-LIBPATH = 
-LIBS = 
-LDFLAGS = $(LIBPATH) $(LIBS)
-
- ###########################################################################
- 
- OBJS = $(CPPFILES:.cc=.o)
- 
-.SUFFIXES: .o .cc 
-
-.cc.o:
-	@echo $<:
-	$(CXX) $(CXXFLAGS) -c $*.cc -o $*.o
-
- default: gaffitter 
- 
- 
-gaffitter: $(OBJS) gaffitter.cc Params.h
-	$(CXX) $(CXXFLAGS) $@.cc $(OBJS) -o $@ $(LDFLAGS)
-+gaffitter: $(OBJS)
- ###########################################################################
- 
- objs: $(OBJS)	
--- a/app-cdr/gaffitter/gaffitter-0.6.0-r2.ebuild
+++ b/app-cdr/gaffitter/gaffitter-0.6.0-r2.ebuild
@ -1,44 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-SV="0.1.0"
-SCRIPTS="scripts-${SV}"
-
-DESCRIPTION="Genetic Algorithm File Fitter"
-HOMEPAGE="https://gaffitter.sourceforge.net/"
-SRC_URI="
-	https://downloads.sourceforge.net/${PN}/${P}.tar.bz2
-	scripts? ( https://downloads.sourceforge.net/${PN}/scripts/${SV}/${SCRIPTS}.tar.bz2 )"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="scripts"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.6.0-fix-build-system.patch )
-
-src_prepare() {
-	default
-
-	if use scripts; then
-		sed -i -re "s:--data((cd)|(dvd)):--data:" "${WORKDIR}"/${PN}/${SCRIPTS}/gaff-k3b || die
-	fi
-}
-
-src_configure() {
-	tc-export CXX
-}
-
-src_install() {
-	dobin src/gaffitter
-	einstalldocs
-
-	if use scripts; then
-		dobin "${WORKDIR}"/${PN}/${SCRIPTS}/gaff-**
-		dobin "${WORKDIR}"/${PN}/${SCRIPTS}/nautilus/nautilus-*
-	fi
-}
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
--- a/app-containers/cni-plugins/Manifest
+++ b/app-containers/cni-plugins/Manifest
@ -1,3 +1,2 @@
-DIST cni-plugins-1.2.0.tar.gz 3365015 BLAKE2B 6b487a9c9b240c73510f2bc6aaa4a6c79055e43cacca8204781dbc65d231164fed9f3f68a2a0cead7a41a67bfc9d9e4480b488be26415d368da007559a721b25 SHA512 fb6fb4f46ac1610b3721f5f3a6ddfb096cbf2e5d5b792306edca5351a3944d2f802170d83e5adec01420395bf64fc8a174ede61ac9b93b5ac6b938a4b48651e6
 DIST cni-plugins-1.3.0.tar.gz 3684138 BLAKE2B c5599f1d8ac3bffb802877ae8c49024a9dea1940923316e534397a8dc7e467f6fe3ceef514a41522611a8f06c4f4ba0788105081e68a4712e2eefade33226c7b SHA512 87e186b3cd64f66280f5b2293dcdd1fc22cb8f51a248124fb622adc48a893348419ba4c29c4769dede4d9e60f2e9fea5d4198f10badb4ecd20a1551e0b344e10
 DIST cni-plugins-1.5.1.tar.gz 3808203 BLAKE2B 481e6c3e929d9169c643596ba48e008151aef10ff670cac9fa00294a3fe98bc5d7c9ee9f83394becb4c127290abb3b082c4124d332b32c8d97f44fcb01b7e3cf SHA512 d2e01958dd8328407164cb6be9d962321742dae7011ce7cd7b2342f5e4b4bbcd992d8249c53d3d81250a60c27f049969bbf329a75440524f52c1f1466b6e7132
--- a/app-containers/cni-plugins/cni-plugins-1.2.0.ebuild
+++ b/app-containers/cni-plugins/cni-plugins-1.2.0.ebuild
@ -1,37 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module linux-info systemd
-
-DESCRIPTION="Standard networking plugins for container networking"
-HOMEPAGE="https://github.com/containernetworking/plugins"
-SRC_URI="https://github.com/containernetworking/plugins/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv"
-IUSE="hardened"
-
-RDEPEND="net-firewall/iptables"
-
-CONFIG_CHECK="~BRIDGE_VLAN_FILTERING ~NETFILTER_XT_MATCH_COMMENT
-	~NETFILTER_XT_MATCH_MULTIPORT"
-
-S="${WORKDIR}/plugins-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" ./build_linux.sh || die
-}
-
-src_install() {
-	exeinto /opt/cni/bin
-	doexe bin/*
-	dodoc README.md
-	local i
-	for i in plugins/{meta/{bandwidth,firewall,flannel,portmap,sbr,tuning},main/{bridge,host-device,ipvlan,loopback,macvlan,ptp,vlan},ipam/{dhcp,host-local,static},sample}; do
-		newdoc README.md ${i##*/}.README.md
-	done
-	systemd_dounit plugins/ipam/dhcp/systemd/cni-dhcp.{service,socket}
-	newinitd "${FILESDIR}"/cni-dhcp.initd cni-dhcp
-}
--- a/app-containers/cni-plugins/cni-plugins-1.3.0.ebuild
+++ b/app-containers/cni-plugins/cni-plugins-1.3.0.ebuild
@ -10,7 +10,7 @@ SRC_URI="https://github.com/containernetworking/plugins/archive/v${PV}.tar.gz ->

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 arm64 ~ppc64 ~riscv"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv"
 IUSE="hardened"

 RDEPEND="net-firewall/iptables"
--- a/app-containers/cri-o/Manifest
+++ b/app-containers/cri-o/Manifest
@ -1,2 +1 @@
-DIST cri-o-1.29.2.tar.gz 21203342 BLAKE2B deec88f8a505bdc1f184a3512da7f6d4b78499c4a66cacf0651a9fe56b62d33d62eaaf2ce68e5d8e856e13988b26e076ab69c24b30a62b42d88656441d948fcb SHA512 dd4105e0097a098b9009b00b59a8e8aeaad85b07177305e2e4b2c68a583a0c342e7a615f47a8cbcb7f179035f2c279573069f15aa1e91e491fe770eec1df326c
-DIST cri-o-1.30.4.tar.gz 19645954 BLAKE2B bb55eb674e7703ca313ed03cf6fa9952390121440a37c3413aac0c739b2cd7f03d36993139d41ae210faabb0530cab939074a78b8aa4319e0994063132a2e344 SHA512 fe0d69107e186943482909dac5e332226d7dfd5a1702722edc5c4f5df3ad9c6bff63e43dc7831c057ecc3ca387ee77815d43f531ad1e7b921d645d59797aa95d
+DIST cri-o-1.31.2.tar.gz 19921920 BLAKE2B 4e60c15d73691dabab8f7f1229b0b8e534393128a53cd31639509454286ec237cf5e6bf258c8e06478b76b872b6e1e8d3481b19a277be4c0bf756b1a6d858d95 SHA512 be42d08ee2a9d030d9279dee269d121822de5c74aafa765688c91383a284cda890aa969a5a2b0649835893bd3b382e6bf2a1f81991710b479b4159877e0626aa
--- a/app-containers/cri-o/cri-o-1.30.4.ebuild
+++ b/app-containers/cri-o/cri-o-1.30.4.ebuild
@ -1,103 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-EGIT_COMMIT=dbc00ffd41a487c847158032193b6dca9b49e821
-
-inherit go-module
-
-DESCRIPTION="OCI-based implementation of Kubernetes Container Runtime Interface"
-HOMEPAGE="https://cri-o.io/"
-SRC_URI="https://github.com/cri-o/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="btrfs +device-mapper selinux systemd"
-
-COMMON_DEPEND="
-	app-crypt/gpgme:=
-	app-containers/conmon
-	app-containers/runc
-	dev-libs/glib:=
-	dev-libs/libassuan:=
-	dev-libs/libgpg-error:=
-	net-firewall/conntrack-tools
-	net-firewall/iptables
-	app-containers/cni-plugins
-	net-misc/socat
-	sys-apps/iproute2
-	sys-libs/libseccomp:=
-	btrfs? ( sys-fs/btrfs-progs )
-	device-mapper? ( sys-fs/lvm2:= )
-	selinux? ( sys-libs/libselinux:= )
-	systemd? ( sys-apps/systemd:= )"
-DEPEND="
-	${COMMON_DEPEND}
-	dev-go/go-md2man"
-RDEPEND="${COMMON_DEPEND}
-	!<app-containers/podman-1.3.2-r1
-	selinux? ( sec-policy/selinux-crio )"
-BDEPEND="sys-apps/which"
-
-src_prepare() {
-	default
-
-	sed -e '/^export GOPROXY=/d' \
-		-e '/^GIT_.*/d' \
-		-e '/	git diff --exit-code/d' \
-		-e 's/$(GO) build -i/$(GO) build -v -work -x/' \
-		-e 's/\${GIT_COMMIT}/'${EGIT_COMMIT}'/' \
-		-e "s|^GIT_COMMIT := .*|GIT_COMMIT := ${EGIT_COMMIT}|" \
-		-e "s|^COMMIT_NO := .*|COMMIT_NO := ${EGIT_COMMIT}|" \
-		-i Makefile || die
-
-	echo ".NOTPARALLEL: binaries docs" >> Makefile || die
-
-	sed -e 's:/usr/local/bin:/usr/bin:' \
-		-i contrib/systemd/* || die
-}
-
-src_compile() {
-	[[ -f hack/btrfs_installed_tag.sh ]] || die
-	use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
-		hack/btrfs_installed_tag.sh || die; }
-
-	[[ -f hack/libdm_installed.sh ]] || die
-	use device-mapper || { echo -e "#!/bin/sh\necho exclude_graphdriver_devicemapper" > \
-		hack/libdm_installed.sh || die; }
-
-	[[ -f hack/selinux_tag.sh ]] || die
-	use selinux || { echo -e "#!/bin/sh\ntrue" > \
-		hack/selinux_tag.sh || die; }
-
-	mkdir -p bin || die
-	emake all \
-		GOBIN="${S}/bin" \
-		GO_BUILD="go build ${GOFLAGS}" \
-		GO_MD2MAN="$(which go-md2man)"
-}
-
-src_install() {
-	emake install install.config install.systemd \
-		DESTDIR="${D}" \
-		GO_MD2MAN="$(which go-md2man)" \
-		PREFIX="${D}${EPREFIX}/usr"
-	keepdir /etc/crio
-	mv "${ED}/etc/crio/crio.conf"{,.example} || die
-
-	newinitd "${FILESDIR}/crio.initd" crio
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-
-	# Suppress crio log error messages triggered if these don't exist.
-	keepdir /etc/containers/oci/hooks.d
-	keepdir /usr/share/containers/oci/hooks.d
-
-	# Suppress crio "Missing CNI default network" log message.
-	keepdir /etc/cni/net.d
-	insinto /etc/cni/net.d
-	doins contrib/cni/99-loopback.conflist
-}
--- a/app-containers/cri-o/cri-o-1.31.2.ebuild
+++ b/app-containers/cri-o/cri-o-1.31.2.ebuild
@ -3,7 +3,7 @@

 EAPI=8

-EGIT_COMMIT=d317b5dc918bbfbc78481072a0d93e572aa8d0e8
+EGIT_COMMIT=920af25f2b6fd4f52bced0e73f696e48464da543

 inherit go-module

--- a/app-containers/docker-buildx/docker-buildx-0.11.2.ebuild
+++ b/app-containers/docker-buildx/docker-buildx-0.11.2.ebuild
@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/docker/buildx.git"
 else
 	SRC_URI="https://github.com/docker/buildx/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv ~x86"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi

--- a/app-containers/nerdctl/Manifest
+++ b/app-containers/nerdctl/Manifest
@ -2,3 +2,7 @@ DIST nerdctl-1.7.5-go-mod-vendor.tar.gz 7229228 BLAKE2B 24dd81b3b54542e8723c44d7
 DIST nerdctl-1.7.5.tar.gz 517127 BLAKE2B 800fc487c60ea62641b26a1b41f95747bd39467d8e1c7fd7b5302c5d515c2e6765fcf7ef8860b3cbfe04428fe849a7293ec914bae3da65ac6418a1f5c789d832 SHA512 3e35c5e3c68c675d23c1a106d267f62c2e36cd8026308ac6237fa5aa2f3ebaea0f47888e6702290f40c26f543e90bca91d76cae28b74732e8fb351f6ef2441f9
 DIST nerdctl-1.7.6-go-mod-vendor.tar.gz 7224842 BLAKE2B 65b06708bd9e568a58f486af7e1f47f4118543158035437f6145bba8221963e13014baeb16e16e0c038ca9b3b1109437594b92d25036779634d4c0360bd84595 SHA512 62e0dce2480c3f50c2f9473864294e36ee09bcb0b5f0e9655c1995f7067b6feb6d379a5f6331dde0e1f5bd1f673e0b172d96edf060167cc17cf2ec8a38cfeafa
 DIST nerdctl-1.7.6.tar.gz 517166 BLAKE2B 0ba11ac7331fdcbdab03a63284d0c9f3e2d6e11860c014cc88b4fbcac3ba7a76b6f359c8094a0dbe4d5f69c02b5c1e87e940b8cf839c93a512de2d5b8e68ded9 SHA512 8fd8a393c25206b7213fa7a95f4d6c76ed68aad82cfc6c8968d134e7d31304f4b7c20e6fa8b6d825c5398ccf5f08f3af94a3e3f7b30ebdf2ac7aa2066120bc50
+DIST nerdctl-2.0.0-go-mod-vendor.tar.gz 7302844 BLAKE2B 16b286ccab4ea143fd067c0b0f6dc55f4976010609702c3d8517e3cc6b774fd86684ea2da89152602dad6f17ae6f25d4f7b564b573e6fa62fa5907c32d91184f SHA512 504bbbb2b11166703866adc509d6c66a9da718c59aad9d73644f3f805040a6dfe7c016a896dcc2191aa25d89f4e19154ec8a24bf0d8d2f8bbbc5d55b830e993a
+DIST nerdctl-2.0.0.tar.gz 1326169 BLAKE2B 1f3518045eb41d694535663d5426d7a68e09bb1323bbdd037088ef1049d41812d1d3176628d230bd4f6bd83e7ee844769b0449d268ab4d390ea81739e035609b SHA512 645df69994921c92685c8dcaeeeef6a3e64554029d70550d783ee9b199ae80ffd4c7f7126bb8e122d7b0958b80452cb49be3267138d17cfac535da36e65d6d57
+DIST nerdctl-2.0.1-go-mod-vendor.tar.gz 7349046 BLAKE2B 70e9044055d24e80843f37ff7ff6ba9fdef93ccdbed398114c109cfe99ca5c65597ba39e3fd78ea2521d6fe16f289cdbe3dace2b78c125845c417657839a16f6 SHA512 aa9b01db2f0860bfbd3af755418219ab8fed1bd7a1097ac9c6961b28eda4a6292f49c4dddacdc84884f8032330ccb293b90f70dae18b7909b1e8078cc7da2936
+DIST nerdctl-2.0.1.tar.gz 1327776 BLAKE2B dd185fb3c22f3ae57076e9a1e446a4d7c402d87c66d4dd54fa857c999f7634451a811543c7e114eef46bfbee70b4196ee1c71a9bc466544713ac02f44c8c48b0 SHA512 1df3bab770d397fa6a7811a5f6e7752b216d04e5281150e98c8a918311c099b7a3fce6f4c668558b5c7ac31f21223f192826cac96a6ed1eb73f5f5b462d34357
--- a/app-containers/nerdctl/nerdctl-2.0.0.ebuild
+++ b/app-containers/nerdctl/nerdctl-2.0.0.ebuild
@ -0,0 +1,53 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+EGIT_COMMIT="ef588dafa080e3dbc9c061ff3802affb66aef291"
+
+DESCRIPTION="Docker-compatible CLI for containerd, with support for Compose"
+HOMEPAGE="https://github.com/containerd/nerdctl"
+SRC_URI="
+	https://github.com/containerd/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/containerd/${PN}/releases/download/v${PV}/${P}-go-mod-vendor.tar.gz
+"
+
+LICENSE="Apache-2.0"
+LICENSE+=" BSD BSD-2 ISC MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="rootless"
+
+DEPEND="
+	rootless? (
+		app-containers/slirp4netns
+		sys-apps/rootlesskit
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	cd "${S}"
+	unpack "${P}-go-mod-vendor.tar.gz"
+	mv home/runner/work/nerdctl/nerdctl/vendor . || die
+}
+
+src_compile() {
+	emake VERSION=v${PV} REVISION="${EGIT_COMMIT}"
+}
+
+src_install() {
+	local emake_args=(
+		DESTDIR="${D}"
+		VERSION=v${PV}
+		REVISION="${EGIT_COMMIT}"
+		DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+		PREFIX="${EPREFIX}/usr"
+	)
+	emake "${emake_args[@]}" install
+	local DOCS=( README.md docs/* examples )
+	einstalldocs
+}
--- a/app-containers/nerdctl/nerdctl-2.0.1.ebuild
+++ b/app-containers/nerdctl/nerdctl-2.0.1.ebuild
@ -0,0 +1,53 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+EGIT_COMMIT="47f31ff2c1615c1accb85c1ce4e7882ad739102f"
+
+DESCRIPTION="Docker-compatible CLI for containerd, with support for Compose"
+HOMEPAGE="https://github.com/containerd/nerdctl"
+SRC_URI="
+	https://github.com/containerd/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/containerd/${PN}/releases/download/v${PV}/${P}-go-mod-vendor.tar.gz
+"
+
+LICENSE="Apache-2.0"
+LICENSE+=" BSD BSD-2 ISC MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="rootless"
+
+DEPEND="
+	rootless? (
+		app-containers/slirp4netns
+		sys-apps/rootlesskit
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	cd "${S}"
+	unpack "${P}-go-mod-vendor.tar.gz"
+	mv home/runner/work/nerdctl/nerdctl/vendor . || die
+}
+
+src_compile() {
+	emake VERSION=v${PV} REVISION="${EGIT_COMMIT}"
+}
+
+src_install() {
+	local emake_args=(
+		DESTDIR="${D}"
+		VERSION=v${PV}
+		REVISION="${EGIT_COMMIT}"
+		DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+		PREFIX="${EPREFIX}/usr"
+	)
+	emake "${emake_args[@]}" install
+	local DOCS=( README.md docs/* examples )
+	einstalldocs
+}
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/johntheripper/johntheripper-1.9.0.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.9.0.ebuild
@ -15,7 +15,7 @@ SRC_URI="https://www.openwall.com/john/k/${MY_P}.tar.xz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 arm ~hppa ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 CPU_FLAGS="cpu_flags_x86_mmx cpu_flags_x86_sse2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_xop"
 IUSE="custom-cflags openmp ${CPU_FLAGS}"

--- a/app-crypt/libsecret/libsecret-0.21.4-r2.ebuild
+++ b/app-crypt/libsecret/libsecret-0.21.4-r2.ebuild
@ -0,0 +1,164 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit bash-completion-r1 gnome2 meson-multilib python-any-r1 vala virtualx
+
+DESCRIPTION="GObject library for accessing the freedesktop.org Secret Service API"
+HOMEPAGE="https://wiki.gnome.org/Projects/Libsecret"
+
+LICENSE="LGPL-2.1+ Apache-2.0" # Apache-2.0 license is used for tests only
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="+crypt +gcrypt gnutls gtk-doc +introspection pam test test-rust tpm +vala"
+
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	vala? ( introspection )
+	gtk-doc? ( crypt )
+	crypt? ( || ( gcrypt gnutls ) )
+"
+
+DEPEND="
+	>=dev-libs/glib-2.44:2[${MULTILIB_USEDEP}]
+	gcrypt? ( >=dev-libs/libgcrypt-1.2.2:0=[${MULTILIB_USEDEP}] )
+	gnutls? ( >=net-libs/gnutls-3.8.2:0=[${MULTILIB_USEDEP}] )
+	pam? ( sys-libs/pam )
+	tpm? ( >=app-crypt/tpm2-tss-3.0.3:= )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+RDEPEND="${DEPEND}"
+PDEPEND="virtual/secret-service"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.2
+	dev-libs/libxslt
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	gtk-doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		>=dev-util/gi-docgen-2021.7
+	)
+	pam? ( sys-libs/pam_wrapper )
+	test? (
+		$(python_gen_any_dep '
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			introspection? ( dev-python/pygobject:3[${PYTHON_USEDEP}] )')
+		test-rust? ( introspection? ( >=dev-libs/gjs-1.32 ) )
+		tpm? (
+			app-crypt/swtpm
+			app-crypt/tpm2-abrmd
+			>=app-crypt/tpm2-tss-3.2.0:=
+		)
+	)
+	vala? ( $(vala_depend) )
+"
+
+dbus_run() {
+	(
+		# start isolated dbus session bus
+		dbus_data=$(dbus-launch --sh-syntax) || exit
+		eval "${dbus_data}"
+
+		$@
+		ret=${?}
+
+		kill "${DBUS_SESSION_BUS_PID}"
+		exit "${ret}"
+	) || die
+}
+
+tpm2_run_with_emulator() {
+	export XDG_CONFIG_HOME=${T}/.config/swtpm
+	"${BROOT}"/usr/share/swtpm/swtpm-create-user-config-files --overwrite || die
+
+	mkdir -p ${XDG_CONFIG_HOME}/mytpm1 || die
+	swtpm_setup_args=(
+		--tpm2
+		--tpmstate ${XDG_CONFIG_HOME}/mytpm1
+		--createek
+		--allow-signing
+		--decryption
+		--create-ek-cert
+		--create-platform-cert
+		--lock-nvram
+		--overwrite
+		--display
+	)
+	swtpm_setup "${swtpm_setup_args[@]}" || die
+
+	swtpm_socket_args=(
+		--tpm2
+		--tpmstate dir=${XDG_CONFIG_HOME}/mytpm1
+		--flags startup-clear
+		--ctrl type=unixio,path=${XDG_CONFIG_HOME}/mytpm1/swtpm.socket.ctrl
+		--server type=unixio,path=${XDG_CONFIG_HOME}/mytpm1/swtpm.socket
+		--pid file=${XDG_CONFIG_HOME}/mytpm1/swtpm.pid
+		--daemon
+	)
+	swtpm socket "${swtpm_socket_args[@]}" || die
+
+	tpm2_abrmd_args=(
+		--logger=stdout
+		--tcti=swtpm:path=${XDG_CONFIG_HOME}/mytpm1/swtpm.socket
+		--session
+		--flush-all
+	)
+	tpm2-abrmd "${tpm2_abrmd_args[@]}" &
+	export TCTI=tabrmd:bus_type=session
+
+	$@ || die
+
+	# When swtpm dies, tmp2-abrmd will exit
+	kill $(< ${XDG_CONFIG_HOME}/mytpm1/swtpm.pid) || die
+}
+
+python_check_deps() {
+	if use introspection; then
+		python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
+	fi
+	python_has_version "dev-python/dbus-python[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	use vala && vala_setup
+	default
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_native_true manpage)
+		$(meson_native_use_bool vala vapi)
+		$(meson_native_use_bool gtk-doc gtk_doc)
+		$(meson_native_use_bool introspection)
+		-Dbashcompdir="$(get_bashcompdir)"
+		$(meson_native_enabled bash_completion)
+		$(meson_native_use_bool tpm tpm2)
+		$(meson_native_use_bool pam)
+	)
+
+	if use crypt ; then
+		use gcrypt && emesonargs+=( -Dcrypto=libgcrypt )
+		use gnutls && emesonargs+=( -Dcrypto=gnutls )
+	else
+		emesonargs+=( -Dcrypto=disabled )
+	fi
+
+	meson_src_configure
+}
+
+multilib_src_test() {
+	if use tpm; then
+		dbus_run tpm2_run_with_emulator virtx meson test -C "${BUILD_DIR}"
+	else
+		virtx dbus-run-session meson test -C "${BUILD_DIR}"
+	fi
+}
--- a/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3-r4.ebuild
+++ b/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3-r4.ebuild
@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"

 LICENSE="openafs-krb5-a BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc ppc64 ~s390 sparc x86"

 BDEPEND="virtual/pkgconfig"
 RDEPEND=">=app-crypt/mit-krb5-1.8.0
--- a/app-crypt/osslsigncode/Manifest
+++ b/app-crypt/osslsigncode/Manifest
@ -1,2 +1 @@
-DIST osslsigncode-2.8.tar.gz 747274 BLAKE2B 62472d0830b53b2d182b37585a225f0699600bcc2bad5915a64a52b5b7c3fab6f7e936ba82e41907e41c9b0cc1f8ff5f47aa79feb8c5742b16d1fe101baf3db0 SHA512 dd7349e3a64c1d6f63379a14450c8e643c006d2824dc41ce9ecde64ba276466772c440e577aca4a805a49c7ba88aa0dcf5ea73c323abcc4945491407b20e8e96
 DIST osslsigncode-2.9.tar.gz 1033420 BLAKE2B 63897907102f7e3ee241d4a0436ac2c217351cbdf330c302344ad648cc5d7962ea9936b1c1ccfe6072c3188f6e49f892b323eecc0c87476071effb6d02f9e0e0 SHA512 c88d3050b0f4af5cf4ec899ac1935cd04833ed8c7690298ab1bf0c00c4e53bf5a4f9ee31940d63e29350a6babf43f212e56aa480a67745b6d715a30a8093e3a6
--- a/app-crypt/osslsigncode/osslsigncode-2.8.ebuild
+++ b/app-crypt/osslsigncode/osslsigncode-2.8.ebuild
@ -1,66 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-#OSSLSIGNCODE_TEST_FILES=( unsigned.{cat,ex_,exe,msi} )
-inherit cmake python-any-r1
-
-DESCRIPTION="Platform-independent tool for Authenticode signing of EXE/CAB files"
-HOMEPAGE="https://github.com/mtrojnar/osslsigncode"
-SRC_URI="https://github.com/mtrojnar/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-for test_file in "${OSSLSIGNCODE_TEST_FILES[@]}" ; do
-	SRC_URI+=" test? ( https://github.com/mtrojnar/osslsigncode/raw/${PV}/tests/files/${test_file} -> ${PN}-test-${test_file} )"
-done
-unset test_file
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="curl test"
-#RESTRICT="!test? ( test )"
-# https://github.com/mtrojnar/osslsigncode/issues/140#issuecomment-1060636197
-RESTRICT="test"
-
-RDEPEND="
-	dev-libs/openssl:=
-	sys-libs/zlib:=
-	curl? ( net-misc/curl )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	test? (
-		${PYTHON_DEPS}
-		sys-libs/libfaketime
-	)
-"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	if use test ; then
-		local test_file
-		for test_file in "${OSSLSIGNCODE_TEST_FILES[@]}" ; do
-			cp "${DISTDIR}"/${PN}-test-${test_file} tests/files/${test_file} || die
-		done
-		unset test_file
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package curl CURL)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	cmake_src_test -j1
-}
--- a/app-crypt/pesign/Manifest
+++ b/app-crypt/pesign/Manifest
@ -1,2 +1 @@
-DIST pesign-114.tar.gz 148898 BLAKE2B 0dae3b4e17c61bcea02a6f81f6a62f8d526e83954bf95d0de24726daa81e45a3b42b6867f2d64decd69f421a14f5e2ff6ff1ec26246f44d68b242b452e60d9a1 SHA512 567176718e098c3494e27ce29b61ef396ca2503137260fc36c784951f0bd2130c9f61c655461d6091e9bdb0df77c9e00cf2fde8fb1b1c5ab83e4b9c57d65fdab
 DIST pesign-116.tar.bz2 120424 BLAKE2B a1bce804c13a0aba1eb5fdf0b3963d658011484d4708d58bd9265b6ad8a3d2d3e3156a49736e6fb029bd5d8cc175f6440e62dbc34722357888a239e4d7e7d9e2 SHA512 be3e1083f5e9f889cb8f7c50a8ebe723542fb2f6d1de8de9b04a9f21526ebaa8ab1efc7d4be11bcb0bc9862fa4bc6f78ee35e4d3496dd3b8927170b97795d25c
--- a/app-crypt/pesign/files/pesign-114-format-string.patch
+++ b/app-crypt/pesign/files/pesign-114-format-string.patch
@ -1,111 +0,0 @@
-https://github.com/rhboot/pesign/commit/df8783ed4ed87fef850268098690985049916ee9.patch
-
-From df8783ed4ed87fef850268098690985049916ee9 Mon Sep 17 00:00:00 2001
-From: Robbie Harwood <rharwood@redhat.com>
-Date: Tue, 1 Feb 2022 17:37:14 -0500
-Subject: [PATCH] Fix format strings for 32-bit arches
-
-Sadly, in 2022, this remains a thing.
-
-Signed-off-by: Robbie Harwood <rharwood@redhat.com>
---
- src/cms_pe_common.c | 16 +++++++++-------
- src/password.c      |  7 ++++---
- 2 files changed, 13 insertions(+), 10 deletions(-)
-
-diff --git a/src/cms_pe_common.c b/src/cms_pe_common.c
-index 964f0d9..3a3921b 100644
--- a/src/cms_pe_common.c
-+++ b/src/cms_pe_common.c
-@@ -49,7 +49,7 @@ check_pointer_and_size(cms_context *cms, Pe *pe, void *ptr, size_t size)
- 
- 	if (p + size > m + map_size)
- 		cmsreterr(0, cms,
-			  "pointer %p is above mmap end at %p (%lu is %lu bytes past EOF at %lu)",
-+			  "pointer %p is above mmap end at %p (%lu is %lu bytes past EOF at %zu)",
- 			  (void *)((uintptr_t)p + size),
- 			  (void *)((uintptr_t)m + map_size),
- 			  p + size - m,
-@@ -189,7 +189,7 @@ generate_digest(cms_context *cms, Pe *pe, int padded)
- 	if (!check_pointer_and_size(cms, pe, hash_base, hash_size))
- 		cmsgotoerr(error, cms, "PE header is invalid");
- 	dprintf("beginning of hash");
-	dprintf("digesting %lx + %lx", hash_base - map, hash_size);
-+	dprintf("digesting %tx + %zx", hash_base - map, hash_size);
- 	generate_digest_step(cms, hash_base, hash_size);
- 
- 	/* 5. Skip over the image checksum
-@@ -209,7 +209,7 @@ generate_digest(cms_context *cms, Pe *pe, int padded)
- 		cmsgotoerr(error, cms, "PE data directory is invalid");
- 
- 	generate_digest_step(cms, hash_base, hash_size);
-	dprintf("digesting %lx + %lx", hash_base - map, hash_size);
-+	dprintf("digesting %tx + %zx", hash_base - map, hash_size);
- 
- 	/* 8. Skip over the crt dir
- 	 * 9. Hash everything up to the end of the image header. */
-@@ -222,7 +222,7 @@ generate_digest(cms_context *cms, Pe *pe, int padded)
- 		cmsgotoerr(error, cms, "PE relocations table is invalid");
- 
- 	generate_digest_step(cms, hash_base, hash_size);
-	dprintf("digesting %lx + %lx", hash_base - map, hash_size);
-+	dprintf("digesting %tx + %zx", hash_base - map, hash_size);
- 
- 	/* 10. Set SUM_OF_BYTES_HASHED to the size of the header. */
- 	hashed_bytes = pe32opthdr ? pe32opthdr->header_size
-@@ -265,7 +265,7 @@ generate_digest(cms_context *cms, Pe *pe, int padded)
- 		}
- 
- 		generate_digest_step(cms, hash_base, hash_size);
-		dprintf("digesting %lx + %lx", hash_base - map, hash_size);
-+		dprintf("digesting %tx + %zx", hash_base - map, hash_size);
- 
- 		hashed_bytes += hash_size;
- 	}
-@@ -285,10 +285,12 @@ generate_digest(cms_context *cms, Pe *pe, int padded)
- 			memset(tmp_array, '\0', tmp_size);
- 			memcpy(tmp_array, hash_base, hash_size);
- 			generate_digest_step(cms, tmp_array, tmp_size);
-			dprintf("digesting %lx + %lx", (unsigned long)tmp_array, tmp_size);
-+			dprintf("digesting %tx + %zx", (ptrdiff_t)tmp_array,
-+				tmp_size);
- 		} else {
- 			generate_digest_step(cms, hash_base, hash_size);
-			dprintf("digesting %lx + %lx", hash_base - map, hash_size);
-+			dprintf("digesting %tx + %zx", hash_base - map,
-+				hash_size);
- 		}
- 	}
- 	dprintf("end of hash");
-diff --git a/src/password.c b/src/password.c
-index 644f362..05add9a 100644
--- a/src/password.c
-+++ b/src/password.c
-@@ -213,7 +213,7 @@ parse_pwfile_line(char *start, struct token_pass *tp)
- 	dprintf("non-whitespace span is %zd", span);
- 
- 	if (line[span] == '\0') {
-		dprintf("returning %ld", (line + span) - start);
-+		dprintf("returning %td", (line + span) - start);
- 		return (line + span) - start;
- 	}
- 	line[span] = '\0';
-@@ -241,7 +241,7 @@ parse_pwfile_line(char *start, struct token_pass *tp)
- 	dprintf("Setting token pass %p to { %p, %p }", tp, tp->token, tp->pass);
- 	dprintf("token:\"%s\"", tp->token);
- 	dprintf("pass:\"%s\"", tp->pass);
-	dprintf("returning %ld", (line + span) - start);
-+	dprintf("returning %td", (line + span) - start);
- 	return (line + span) - start;
- }
- 
-@@ -330,7 +330,8 @@ SECU_FilePasswd(PK11SlotInfo *slot, PRBool retry, void *arg)
- 		if (c != '\0')
- 			span++;
- 		start += span;
-		dprintf("start is file[%ld] == '\\x%02hhx'", start - file, start[0]);
-+		dprintf("start is file[%td] == '\\x%02hhx'", start - file,
-+			start[0]);
- 	}
- 
- 	qsort(phrases, nphrases, sizeof(struct token_pass), token_pass_cmp);
--- a/app-crypt/pesign/files/pesign-114-no-werror.patch
+++ b/app-crypt/pesign/files/pesign-114-no-werror.patch
@ -1,13 +0,0 @@
-diff --git a/Make.defaults b/Make.defaults
-index fdb961a..cdbb064 100644
--- a/Make.defaults
-+++ b/Make.defaults
-@@ -58,7 +58,7 @@ cflags	= $(CFLAGS) $(ARCH3264) \
- 	-Wall -Wextra -Wsign-compare -Wno-unused-result \
- 	-Wno-unused-function -Wno-missing-field-initializers \
- 	-Wno-analyzer-malloc-leak \
-	-Werror -Wno-error=cpp -Wno-free-nonheap-object \
-+	-Wno-error=cpp -Wno-free-nonheap-object \
- 	-std=gnu11 -fshort-wchar -fPIC -fno-strict-aliasing \
- 	-D_GNU_SOURCE -DCONFIG_$(ARCH) -I${TOPDIR}/include \
- 	'-DRUNDIR="$(rundir)"' \
--- a/app-crypt/pesign/files/pesign-114-wanalyzer-diagnostic.patch
+++ b/app-crypt/pesign/files/pesign-114-wanalyzer-diagnostic.patch
@ -1,19 +0,0 @@
-https://github.com/rhboot/pesign/issues/78
-
-daemon.c:922:32: error: unknown option after ‘#pragma GCC diagnostic’ kind [-Werror=pragmas]
-  922 | #pragma GCC diagnostic ignored "-Wanalyzer-use-of-uninitialized-value"
-      |                                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-cc1: all warnings being treated as errors
--- a/src/daemon.c
-+++ b/src/daemon.c
-@@ -916,10 +916,6 @@ do_shutdown(context *ctx, int nsockets, struct pollfd *pollfds)
- 	free(pollfds);
- }
- 
-/* GCC -fanalyzer has trouble with realloc
- * https://bugzilla.redhat.com/show_bug.cgi?id=2047926 */
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wanalyzer-use-of-uninitialized-value"
- static int
- handle_events(context *ctx)
- {
--- a/app-crypt/pesign/pesign-114.ebuild
+++ b/app-crypt/pesign/pesign-114.ebuild
@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Tools for manipulating signed PE-COFF binaries"
-HOMEPAGE="https://github.com/rhboot/pesign"
-SRC_URI="https://github.com/rhboot/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-libs/nspr
-	dev-libs/nss
-	dev-libs/openssl:=
-	dev-libs/popt
-	sys-apps/util-linux
-	>=sys-libs/efivar-38
-"
-DEPEND="${RDEPEND}
-	sys-boot/gnu-efi
-"
-BDEPEND="
-	sys-apps/help2man
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-114-wanalyzer-diagnostic.patch
-	"${FILESDIR}"/${PN}-114-no-werror.patch
-
-	"${FILESDIR}"/${P}-format-string.patch
-)
-
-src_compile() {
-	emake \
-		AR="$(tc-getAR)" \
-		ARFLAGS="-cvqs" \
-		AS="$(tc-getAS)" \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getLD)" \
-		OBJCOPY="$(tc-getOBJCOPY)" \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
-		RANLIB="$(tc-getRANLIB)" \
-		rundir="${EPREFIX}/var/run"
-}
-
-src_install() {
-	emake DESTDIR="${ED}" VERSION="${PVR}" rundir="${EPREFIX}/var/run" install
-	einstalldocs
-
-	# remove some files that don't make sense for Gentoo installs
-	rm -rf "${ED}/etc" "${ED}/var" "${ED}/usr/share/doc/${PF}/COPYING" || die
-}
--- a/app-crypt/sbctl/Manifest
+++ b/app-crypt/sbctl/Manifest
@ -1,9 +1,6 @@
-DIST sbctl-0.13-deps.tar.xz 21415148 BLAKE2B cf16f7dd3341f7fef273d542f879d5e0a60b8b648fcd1efc8c85a66f0342b0631c5d273417777ecdd4231709ba6ef59592d40adc70a55b59af1aa36987019492 SHA512 f969ca335f14b9f3df52188e00ea68dbd69eef3bcbf71bbd162d0487f28f040ab14ce755ef56b554e7bde3e1c587f0f09ee7b4331edf5baa380b904694f0ad9f
-DIST sbctl-0.13.tar.gz 1642040 BLAKE2B 569f42ca5694a4db0b1b66ef58dc255ec337a99f8025c61c58d5b54860e09f543e29e63b0e3adf65e3883abacabf6c1554e8849a8b25569ea05414d86fe0cfc4 SHA512 02c1f3e745f83f0e0a2fe90974f940a314aadbe26bd0d0c3e314bb3720b72c74715a26c891f8b22023f40eb8d1d8d24a7d2b1bc1c5d60f9781971f7e97224a4c
-DIST sbctl-0.13.tar.gz.sig 566 BLAKE2B e0996fc4732501b1e66b7c65c9f4523a0c9f4b714e8b985bf5ad8b6d662dff99ddd4f4269374cf8e9e206c1ae8884ad312cd20cc8fcf33ed0af1ca0d1d81e967 SHA512 9435943dda069a5ae5629ab1880158349127654f122a2e5251cf8625db00cb12e85a671c24dda630c2e9beb312cc1c6cf2c24edc7d3a37e6b22ddb871e5c8682
-DIST sbctl-0.14-deps.tar.xz 114919252 BLAKE2B a2baa7cca501d924c1353404725999fb8372b52e88a3e2bd7760cf04da4900c676a326c3687adb58169acfb032e4009bb35be66cef3547cf888767325a0baecb SHA512 75122f835dc4f2bd41a8dbdd2b5ed6ad4c9c2f2f802f989245d08c55620d4eb992d23c78812bc761b96fb6b44b6eb6b6ae702b32d8b8f60ad23ac8a76f7e70bd
-DIST sbctl-0.14.tar.gz 17809255 BLAKE2B a59eb3c5a32cb73cb2993c785d16798cbc83b70186eda8c8ce064a17fc338d3e70b93b277ad55c20991952e8d807c77f2a23ae4467c045019ba717ba342d5442 SHA512 a541324ec0b42503f5b5837b18e5f3076aa6fbe3c32041c3362945be52c281c6d057a856512cd134df37bf133106061af34d2b4fbfc377852ae4a86078e65fd8
-DIST sbctl-0.14.tar.gz.sig 566 BLAKE2B a5ec700d7ebf42393114c7b193483218df285977622f8ca6c2fb50b622478889647083b34c008fe8618244232416b374f099dd0ca7fce0f961949ef8b9cddbd8 SHA512 8508cc4a77e8bd08d77b2119d59c65d8724ace4576e1d233d0801c0b470afaac96981915c86a185ad0a29e94b7ad6aae1c6c3d52574f353d75d20d11cd503b0f
 DIST sbctl-0.15.4-deps.tar.xz 123785076 BLAKE2B c54b60e89b4ea0bf6ce414198a74465b5e176a5a200f070e092fa536f81d48945a2c2ac88fdcaadfd4d7bc6511c32cbfe9e8c8a4c30c7ea8ea9947af9fdf9545 SHA512 7c5ca431e8832e576cef662d5ba806b4be07a23567d86f7b8e8cb16c57167aaeafe8bafa8875806db2ba7aced9979d5999b837dccd1d90ade60c029de244b242
 DIST sbctl-0.15.4.tar.gz 17822565 BLAKE2B a2c7f1c49ac3052a30af9245b015c730cdc0cc9d9bca011e52de967da5d733f0de0bee2da8ba28da00418553ce4d86cfd3859a5f029f44ae8cfec6f18da50102 SHA512 98278b816c14f61191d3aadeb7bcf22b5482315b36b201764ce88d3287420f488b7c9cb2cc1468800bfa2351cb0e8c8dbc32ecabbe4f6ab275f375859379fc03
 DIST sbctl-0.15.4.tar.gz.sig 566 BLAKE2B 678351ba31138e2b1bb90e2dbfe20f0af333b47c6f1cfb5caf5d473efa716d5ac00d407f858ab6510130430a0f54fc61edb8e261f2c11faa49763a97395850d5 SHA512 3cc14391c4d2446a64bd9f34b29816f05e1e2ff2db2c65228b536298bca0035eb991322264f03f5c68e7b488af0df09fb77276d942b265e43f831e5d9777fcfe
+DIST sbctl-0.16-deps.tar.xz 123763220 BLAKE2B 9e63332dbf5a0b091be05ebad12792d313e5ce5f32568ae97adbc1085f6976e95a32b9b39a42549c70506af63c2a193896fc765405cd2c363470a0e158834a5f SHA512 46d65051ff97a4a4d67fd75dd77f7aea462488e74d011c736be3701d2538eb95f24bd74e0129a2338bd1750f59047cb44ab800c1df538959cb9ca539ab36d13e
+DIST sbctl-0.16.tar.gz 17822936 BLAKE2B e0955b0cd464b3edc5eb2f35235be244e78dc46c0b7e8c510cedd3b7b8f386ab5c59a00df7a956dd6e0c67695e587daea72792e27966b56ed37afa1efd448643 SHA512 6e01fa093d6e301329962acfa738e325c492c07ae07ada85f49c2141f847646b6b46b5bd5c70b959214723bec9bedf264fd2330d1fcf7bc53b7f148a3c09fc2a
+DIST sbctl-0.16.tar.gz.sig 565 BLAKE2B f51dd52b220258ccd7e01e75b81c51d05e9fdf5e11f4c196a78be37a27cb4e466f4bf7bbd3b8f18d8436851f0895c366f142f52c5e3d2cf06f5cc9197343a5da SHA512 f1fe49cfbc043c3568eb36da47705c1fdb3593ea5eb65f3239c1631d2e4de6fc19445561a5a0b78099a8dfea892d802baf31081f0a9fdafacf014d71db2360e1
--- a/app-crypt/sbctl/sbctl-0.14-r1.ebuild
+++ b/app-crypt/sbctl/sbctl-0.14-r1.ebuild
@ -1,42 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module optfeature verify-sig
-
-DESCRIPTION="Secure Boot key manager"
-HOMEPAGE="https://github.com/Foxboron/sbctl"
-SRC_URI="https://github.com/Foxboron/${PN}/releases/download/${PV}/${P}.tar.gz
-	verify-sig? ( https://github.com/Foxboron/${PN}/releases/download/${PV}/${P}.tar.gz.sig )"
-SRC_URI+=" https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
-
-LICENSE="Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-BDEPEND="app-text/asciidoc
-	verify-sig? ( sec-keys/openpgp-keys-foxboron )"
-
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/foxboron.asc"
-
-PATCHES=(
-	"${FILESDIR}/sbctl-0.14-installkernel-bashism.patch"
-)
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.sig}
-	fi
-
-	default
-}
-
-src_install() {
-	emake PREFIX="${ED}/usr" install
-}
-
-pkg_postinst() {
-	optfeature "automatically signing installed kernels with sbctl keys on each kernel installation" \
-		"sys-kernel/installkernel[systemd]"
-}
--- a/app-crypt/sbctl/sbctl-0.15.4.ebuild
+++ b/app-crypt/sbctl/sbctl-0.15.4.ebuild
@ -13,7 +13,7 @@ SRC_URI+=" https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/${P}-deps.ta

 LICENSE="Apache-2.0 BSD BSD-2 MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"

 BDEPEND="app-text/asciidoc
 	verify-sig? ( sec-keys/openpgp-keys-foxboron )"
--- a/app-crypt/sbctl/sbctl-0.13-r1.ebuild
+++ b/app-crypt/sbctl/sbctl-0.13-r1.ebuild
@ -13,13 +13,11 @@ SRC_URI+=" https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/${P}-deps.ta

 LICENSE="Apache-2.0 BSD BSD-2 MIT"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"

 BDEPEND="app-text/asciidoc
 	verify-sig? ( sec-keys/openpgp-keys-foxboron )"

-PATCHES=( "${FILESDIR}/${PN}-0.13-no-installkernel-error.patch" )
-
 VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/foxboron.asc"

 src_unpack() {
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@ -1,3 +1,4 @@
 DIST NeXT_XEmacs.tar.gz 39571 BLAKE2B 7abf17627ec34e6b0d0edde444028c46dca6d703cfa208a8a1eaf30e2fc2543b953c9a9582c3d55bd5b37e746f45c03ebfc408a0d965606e45d5f4adb9148dea SHA512 611ddbbf5be3d2274e7f76be7f8200c6c7f3cba917efcc24e73685aa5f61c94237e6e48ce66f2d59ee4b74862e686f3ea7a29cf006717d5d0674db24d243d566
+DIST xemacs-21.5.35-info-handle-compress.patch.xz 7852 BLAKE2B 61b8d3a7d63d76311cdbb10153101ea8546ff5e4c8d6345750e44b7e80dfe7afb280dfa847097163fcb92888e5abd837c1a932170a3c362de7a523fc019269f5 SHA512 6c83a4b739075c6da88ba56b84b8521ceb1f34dc71ea51b7fbdb992b459794a3f479ea7db5df777d6497291e2eed8e33809edf5d7572822007f599cdd57955f8
 DIST xemacs-21.5.35-ootags-boolint.patch.xz 7660 BLAKE2B 9567cebeea7828dd7a207e627c4a21d49ef129ea7cf92defde67c068aab6694d0c7f70d90648b9177cea8b6ea3fc3734e1f65f1821b5e4c820df507bb6d6835b SHA512 f43656a5e4c9781e2250fca7f8750bbc131223f4a252dfdfc6315e06ac578974877ac0bbc695f957ade5a7960c4257b090ee34199965110da28851e58986e985
 DIST xemacs-21.5.35.tar.gz 16403617 BLAKE2B efab8d3d984ec2223913b09ff1abc9f2df187fb5b8c2ccf99fcfc60c86369f4411cffd48b03532d53329bd5b3d3149271a445da4c0a3cd7bdc2834021b1297b3 SHA512 e592af6ffbb6f95299039de28f59ee770bf62f54a15b1358b9d1059ed25dcb410c01dcf6e88c1d2196d54f0c6902f309d709fe003accee82e516023fa4363019
--- a/app-editors/xemacs/xemacs-21.5.35-r6.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.35-r6.ebuild
@ -13,6 +13,7 @@ HOMEPAGE="https://www.xemacs.org/"

 SRC_URI="http://ftp.xemacs.org/pub/xemacs/xemacs-$(ver_cut 1-2)/${P}.tar.gz
 	https://dev.gentoo.org/~matsl/${P}-ootags-boolint.patch.xz
+	https://dev.gentoo.org/~matsl/${P}-info-handle-compress.patch.xz
 	neXt? ( http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz )"

 LICENSE="GPL-3+"
@ -71,6 +72,7 @@ src_prepare() {
 	eapply "${FILESDIR}/${P}-linker-flags.patch"
 	eapply "${WORKDIR}/${P}-ootags-boolint.patch"
 	eapply "${FILESDIR}/${P}-unknown-command-test.patch"
+	eapply "${WORKDIR}/${P}-info-handle-compress.patch"

 	eapply_user

--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/nemu/nemu-3.3.0.ebuild
+++ b/app-emulation/nemu/nemu-3.3.0.ebuild
@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${MY_PV}/"

 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="dbus network-map +ovf remote-api +usb"

 RDEPEND="
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-8.2.0.ebuild
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-8.2.0.ebuild
@ -4,6 +4,7 @@
 EAPI=8

 PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_REQ_USE="ensurepip(-),ncurses,readline"

 inherit edo systemd toolchain-funcs python-any-r1 udev

--- a/app-emulation/qemu/files/qemu-9.2.0-capstone-include-path.patch
+++ b/app-emulation/qemu/files/qemu-9.2.0-capstone-include-path.patch
@ -0,0 +1,41 @@
+From: Sam James <sam@gentoo.org>
+Date: Sun, 6 Oct 2024 09:47:03 +0100
+Subject: [PATCH] Forward ported from qemu-7.1.0-capstone-include-path.patch.
+
+Bug: https://bugs.gentoo.org/873157
+Signed-off-by: Sam James <sam@gentoo.org>
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+---
+ include/disas/capstone.h | 2 +-
+ meson.build              | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/disas/capstone.h b/include/disas/capstone.h
+index c43033f7f6..02bc067cd8 100644
+--- a/include/disas/capstone.h
+++ b/include/disas/capstone.h
+@@ -5,7 +5,7 @@
+ 
+ #define CAPSTONE_AARCH64_COMPAT_HEADER
+ #define CAPSTONE_SYSTEMZ_COMPAT_HEADER
+-#include <capstone.h>
+#include <capstone/capstone.h>
+ 
+ #else
+ 
+diff --git a/meson.build b/meson.build
+index 2c924f8f10..86858a325b 100644
+--- a/meson.build
+++ b/meson.build
+@@ -1892,7 +1892,7 @@ if not get_option('capstone').auto() or have_system or have_user
+   # that reports a wrong -I path, causing the #include to
+   # fail later. If the system has such a broken version
+   # do not use it.
+-  if capstone.found() and not cc.compiles('#include <capstone.h>',
+  if capstone.found() and not cc.compiles('#include <capstone/capstone.h>',
+                                           dependencies: [capstone])
+     capstone = not_found
+     if get_option('capstone').enabled()
+-- 
+2.45.2
+
--- a/app-emulation/qemu/qemu-8.2.3.ebuild
+++ b/app-emulation/qemu/qemu-8.2.3.ebuild
@ -515,6 +515,7 @@ qemu_src_configure() {
 		--disable-guest-agent
 		--disable-strip
 		--disable-download
+		--python="${PYTHON}"

 		# bug #746752: TCG interpreter has a few limitations:
 		# - it does not support FPU
--- a/app-emulation/qemu/qemu-8.2.7.ebuild
+++ b/app-emulation/qemu/qemu-8.2.7.ebuild
@ -515,6 +515,7 @@ qemu_src_configure() {
 		--disable-guest-agent
 		--disable-strip
 		--disable-download
+		--python="${PYTHON}"

 		# bug #746752: TCG interpreter has a few limitations:
 		# - it does not support FPU
--- a/app-emulation/qemu/qemu-8.2.8.ebuild
+++ b/app-emulation/qemu/qemu-8.2.8.ebuild
@ -515,6 +515,7 @@ qemu_src_configure() {
 		--disable-guest-agent
 		--disable-strip
 		--disable-download
+		--python="${PYTHON}"

 		# bug #746752: TCG interpreter has a few limitations:
 		# - it does not support FPU
--- a/app-emulation/qemu/qemu-9.0.4.ebuild
+++ b/app-emulation/qemu/qemu-9.0.4.ebuild
@ -521,6 +521,7 @@ qemu_src_configure() {
 		--disable-guest-agent
 		--disable-strip
 		--disable-download
+		--python="${PYTHON}"

 		# bug #746752: TCG interpreter has a few limitations:
 		# - it does not support FPU
--- a/app-emulation/qemu/qemu-9.1.2.ebuild
+++ b/app-emulation/qemu/qemu-9.1.2.ebuild
@ -520,6 +520,7 @@ qemu_src_configure() {
 		--disable-guest-agent
 		--disable-strip
 		--disable-download
+		--python="${PYTHON}"

 		# bug #746752: TCG interpreter has a few limitations:
 		# - it does not support FPU
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@ -90,6 +90,7 @@ COMMON_TARGETS="
 	riscv64
 	s390x
 	sh4
+	sh4eb
 	sparc
 	sparc64
 	x86_64
@ -110,7 +111,6 @@ IUSE_USER_TARGETS="
 	mipsn32
 	mipsn32el
 	ppc64le
-	sh4eb
 	sparc32plus
 "

@ -316,7 +316,7 @@ RDEPEND="

 PATCHES=(
 	"${FILESDIR}"/${PN}-9.0.0-disable-keymap.patch
-	"${FILESDIR}"/${PN}-9.1.0-capstone-include-path.patch
+	"${FILESDIR}"/${PN}-9.2.0-capstone-include-path.patch
 	"${FILESDIR}"/${PN}-8.1.0-skip-tests.patch
 	"${FILESDIR}"/${PN}-8.1.0-find-sphinx.patch

@ -518,6 +518,7 @@ qemu_src_configure() {
 		--disable-guest-agent
 		--disable-strip
 		--disable-download
+		--python="${PYTHON}"

 		# bug #746752: TCG interpreter has a few limitations:
 		# - it does not support FPU
--- a/app-emulation/virtio-win/virtio-win-0.1.240.1.ebuild
+++ b/app-emulation/virtio-win/virtio-win-0.1.240.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
@ -14,7 +14,7 @@ SRC_URI="https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archiv

 LICENSE="BSD Apache-2.0 GPL-2 GPL-2+ GPL-3+ LGPL-2+ Ms-RL"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 S="${WORKDIR}"
 INSTALL_PATH=/usr/share/drivers/windows

--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
--- a/app-i18n/fcitx-chinese-addons/Manifest
+++ b/app-i18n/fcitx-chinese-addons/Manifest
@ -1,2 +1 @@
-DIST fcitx5-chinese-addons-5.1.6_dict.tar.zst 1005756 BLAKE2B c3b3c12c3b269c71c7136ba140fa833fb28d4ff2698213aa47bdb3fe50ee65830a99c9591180ae0bfd2873c7d84013f26df895f2574372a64cdea9ea887cb052 SHA512 f130f4492977662916a1591048832a37ec306f3664a2c5bc5225ba220ea5ffebc3ef78022b2b6d2d8475b556285a0d45508eaf00473f5b636d2e56a7c73d2f38
 DIST fcitx5-chinese-addons-5.1.7_dict.tar.zst 1014942 BLAKE2B fb386dad971b2a8751202733ef593b72d35f9ab8a266f13e6839ea25010cf54e45c287e10d285a02d268f16b5b8f7a3dc6f6f20ffcc79759d8c1ef1136a29cb5 SHA512 fe04699672f034bde328049a19f23b9dbea75a980e706fcaf95138294b8aaaee54eb9ec5c696c343d5e4ce4788216821ad3eb45cd669d94d2f3b67551ae7360f
--- a/app-i18n/fcitx-chinese-addons/fcitx-chinese-addons-5.1.6.ebuild
+++ b/app-i18n/fcitx-chinese-addons/fcitx-chinese-addons-5.1.6.ebuild
@ -1,62 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN="fcitx5-chinese-addons"
-
-inherit cmake unpacker xdg
-
-DESCRIPTION="Addons related to Chinese, including IME previous bundled inside fcitx4."
-HOMEPAGE="https://github.com/fcitx/fcitx5-chinese-addons"
-SRC_URI="https://download.fcitx-im.org/fcitx5/${MY_PN}/${MY_PN}-${PV}_dict.tar.zst"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="5"
-KEYWORDS="amd64 ~arm64 ~loong ~riscv x86"
-IUSE="+data +gui webengine +cloudpinyin +qt5 qt6 lua +opencc test"
-REQUIRED_USE="
-	webengine? ( gui )
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=app-i18n/fcitx-5.1.9:5
-	>=app-i18n/libime-1.1.7:5[data?]
-	>=dev-libs/boost-1.61:=
-	cloudpinyin? ( net-misc/curl )
-	lua? ( app-i18n/fcitx-lua:5 )
-	opencc? ( app-i18n/opencc:= )
-	gui? (
-		qt5? (
-			dev-qt/qtconcurrent:5
-			app-i18n/fcitx-qt:5[qt5,-onlyplugin]
-			webengine? ( dev-qt/qtwebengine:5[widgets] )
-		)
-		qt6? (
-			dev-qt/qtbase:6[concurrent]
-			app-i18n/fcitx-qt:5[qt6,-onlyplugin]
-			webengine? ( dev-qt/qtwebengine:6[widgets] )
-		)
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	kde-frameworks/extra-cmake-modules:0
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_BROWSER=$(usex webengine)
-		-DENABLE_CLOUDPINYIN=$(usex cloudpinyin)
-		-DENABLE_DATA=$(usex data)
-		-DENABLE_GUI=$(usex gui)
-		-DENABLE_OPENCC=$(usex opencc)
-		-DENABLE_TEST=$(usex test)
-		-DUSE_WEBKIT=no
-		-DUSE_QT6=$(usex qt6)
-	)
-	cmake_src_configure
-}
--- a/app-i18n/fcitx-qt/Manifest
+++ b/app-i18n/fcitx-qt/Manifest
@ -1,3 +1,2 @@
 DIST fcitx-qt-5.1.5.tar.xz 93980 BLAKE2B b119cbf886a6c7d37c3d959897dea38ad2c1112811ed776ed53ee715f441798b300d54023b34980f625ef2cf3235be4f6c64f7e8c2c65568c8487306714bdb1f SHA512 736677a268d345a962e8c44af81870d2cfc62db72c7a089e2c11151f7f682659ec83307a3397d1feb2dda7e9419847d5e365f7a20ca9b7d6216b690cb9c515c7
-DIST fcitx-qt-5.1.7.tar.zst 128686 BLAKE2B f1f86282e10313b63b2c36f168043dd9a6e090e2cb9644b6359724798b1fd001a866eb1ec84a4ab8f14946fe5339d8935b7b3749614d0a2eeb9e83d8bba8c334 SHA512 1078c3f275fa883b7b9bf2e1b71e926c9f639f637f4838fe0401648a73338c3b9e08c1e83cd8ab44994b4450983247a6882c42b012e4642111592050ee2ce144
 DIST fcitx-qt-5.1.8.tar.zst 128800 BLAKE2B f8fd49f7cb6d152fd99d036494274f6a1883159140edbd73f525ca4caeb0a8f626671e182ba988b57b85e3f840c900353907eb0a941189b1d5a0b21430df8656 SHA512 ecd9131b2266888345363c39bf4446f6d6d127662d0e67a9837a106f6124d189fa0c74e0cac3f3a6680a3d533316fb6333a83fca1cf9c90561e0b84174abbabd
--- a/app-i18n/fcitx-qt/fcitx-qt-5.1.7.ebuild
+++ b/app-i18n/fcitx-qt/fcitx-qt-5.1.7.ebuild
@ -1,65 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN="fcitx5-qt"
-
-inherit cmake unpacker
-
-DESCRIPTION="Qt library and IM module for fcitx5"
-HOMEPAGE="https://github.com/fcitx/fcitx5-qt"
-SRC_URI="https://download.fcitx-im.org/fcitx5/${MY_PN}/${MY_PN}-${PV}.tar.zst -> ${P}.tar.zst"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-LICENSE="BSD LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
-IUSE="qt5 onlyplugin staticplugin +qt6 +X wayland"
-REQUIRED_USE="
-	|| ( qt5 qt6 )
-	qt5? ( X )
-	staticplugin? ( onlyplugin )
-"
-
-RDEPEND="
-	!onlyplugin? (
-		>=app-i18n/fcitx-5.1.5:5
-		qt5? ( dev-qt/qtconcurrent:5 )
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5=
-		dev-qt/qtwidgets:5
-		wayland? ( dev-qt/qtwayland:5 )
-	)
-	qt6? (
-		dev-qt/qtbase:6=[dbus,gui,widgets,wayland?]
-		wayland? ( dev-qt/qtwayland:6 )
-	)
-	X? (
-		x11-libs/libX11
-		x11-libs/libxcb
-		x11-libs/libxkbcommon
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	kde-frameworks/extra-cmake-modules:0
-	virtual/pkgconfig
-	!onlyplugin? ( sys-devel/gettext )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_QT4=no
-		-DENABLE_QT5=$(usex qt5)
-		-DENABLE_QT6=$(usex qt6)
-		-DENABLE_QT6_WAYLAND_WORKAROUND=$(usex qt6 $(usex wayland))
-		-DENABLE_X11=$(usex X)
-		-DBUILD_ONLY_PLUGIN=$(usex onlyplugin)
-		-DBUILD_STATIC_PLUGIN=$(usex staticplugin)
-	)
-	cmake_src_configure
-}
--- a/app-i18n/fcitx-rime/Manifest
+++ b/app-i18n/fcitx-rime/Manifest
@ -1,3 +1,2 @@
 DIST fcitx-rime-0.3.2.tar.xz 40960 BLAKE2B 1c9185dd9d2912e74b9916916fed09a01c30e0867d93fe94e04d5324883783dddbdca0f553d80aa19e2e59d2ec8fd2a50a7f89118c22cb09310296292a566760 SHA512 8c6d845b0899d9b8b9b41b895abd5c1b8916856b71f529aabd08d1c27a2b09bb5a9343912d088da460c2e22da0a3ce759a34fd13099a149bb8cd1ff4eafe29f1
-DIST fcitx-rime-5.1.8.tar.zst 61573 BLAKE2B a406603aa66146735e3009837e050d0c46446b449e865429a95cfeee361768d5ba0b77cdd5b674f3b90e63912222146c115ac07fd0ce88cf6aa04bcac3e4a602 SHA512 75b8be80bd5ddc509bfa631f8ed093d89afee2588665b2b7604745b7c0b52376c4d55b36e33b53086c9b63992bfbeaae6292fa3096ec8f9ff9222647ff52e98c
 DIST fcitx-rime-5.1.9.tar.zst 64335 BLAKE2B aac7f54cc5bf3617744d1f85c13ed402fd13c41c81b144225d49e6ddfc11b207d286bdf8f91ec8b7156bebc9af4c6c6c2badc3fe1747c35851d88b4574cdf651 SHA512 efffd620d960346b96333bc3403e1c8a25acc99103ba2c465a5c27bb32842497c64647af540af306d8e0bb6d9ac4fdf852db7911233564ea38ee3980098f7336
--- a/app-i18n/fcitx-rime/fcitx-rime-5.1.8.ebuild
+++ b/app-i18n/fcitx-rime/fcitx-rime-5.1.8.ebuild
@ -1,30 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake unpacker xdg
-
-MY_PN="fcitx5-rime"
-DESCRIPTION="Chinese RIME input methods for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx5-rime"
-SRC_URI="https://download.fcitx-im.org/fcitx5/fcitx5-rime/fcitx5-rime-${PV}.tar.zst -> ${P}.tar.zst"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-LICENSE="LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
-
-DEPEND="
-	!app-i18n/fcitx-rime:4
-	>=app-i18n/fcitx-5.1.2:5
-	app-i18n/librime
-	app-i18n/rime-data
-	virtual/libintl
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	kde-frameworks/extra-cmake-modules
-	sys-devel/gettext
-	virtual/pkgconfig
-"
--- a/app-i18n/fcitx/fcitx-5.1.10-r1.ebuild
+++ b/app-i18n/fcitx/fcitx-5.1.10-r1.ebuild
@ -1,127 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN="fcitx5"
-
-inherit cmake unpacker xdg
-
-DESCRIPTION="Fcitx 5 is a generic input method framework"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx5"
-SRC_URI="https://download.fcitx-im.org/fcitx5/fcitx5/fcitx5-${PV}_dict.tar.zst -> ${P}.tar.zst"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-LICENSE="LGPL-2+ Unicode-DFS-2016"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
-IUSE="+autostart doc +emoji +enchant +keyboard presage +server systemd test wayland +X"
-REQUIRED_USE="
-	|| ( wayland X )
-	X? ( keyboard )
-	wayland? ( keyboard )
-"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!app-i18n/fcitx:4
-	dev-libs/libfmt
-	sys-devel/gettext
-	virtual/libintl
-	x11-libs/cairo[X?]
-	x11-libs/gdk-pixbuf:2
-	x11-libs/pango[X?]
-	doc? (
-		app-text/doxygen
-		dev-texlive/texlive-fontutils
-	)
-	emoji? ( sys-libs/zlib )
-	enchant? ( app-text/enchant:2 )
-	keyboard? (
-		app-text/iso-codes
-		dev-libs/expat
-		dev-libs/json-c:=
-		x11-misc/xkeyboard-config
-		x11-libs/libxkbcommon[X?,wayland?]
-	)
-	systemd? (
-		sys-apps/systemd
-	)
-	!systemd? (
-		dev-libs/libuv
-		sys-apps/dbus
-	)
-	wayland? (
-		dev-libs/glib:2
-		dev-libs/wayland
-		dev-libs/wayland-protocols
-		dev-util/wayland-scanner
-	)
-	X? (
-		dev-libs/glib:2
-		>=x11-libs/xcb-imdkit-1.0.3:5
-		x11-libs/libX11
-		x11-libs/libxkbfile
-		x11-libs/xcb-util
-		x11-libs/xcb-util-keysyms
-		x11-libs/xcb-util-wm
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	kde-frameworks/extra-cmake-modules:0
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-include-cstdint-for-gcc-15.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_DBUS=on
-		-DENABLE_XDGAUTOSTART=$(usex autostart)
-		-DENABLE_SERVER=$(usex server)
-		-DENABLE_KEYBOARD=$(usex keyboard)
-		-DENABLE_TEST=$(usex test)
-		-DENABLE_ENCHANT=$(usex enchant)
-		-DENABLE_EMOJI=$(usex emoji)
-		-DENABLE_PRESAGE=$(usex presage)
-		-DENABLE_WAYLAND=$(usex wayland)
-		-DENABLE_X11=$(usex X)
-		-DENABLE_DOC=$(usex doc)
-		-DUSE_SYSTEMD=$(usex systemd)
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use doc && cmake_src_compile doc
-}
-
-src_install() {
-	cmake_src_install
-	use doc && dodoc -r "${BUILD_DIR}"/doc/*
-}
-
-src_test() {
-	# break by sandbox
-	local CMAKE_SKIP_TESTS=(
-		testdbus
-		testservicewatcher
-	)
-	cmake_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog
-	elog "Follow the instrcutions on:"
-	elog "https://wiki.gentoo.org/wiki/Fcitx#Using_Fcitx"
-	elog "https://fcitx-im.org/wiki/Setup_Fcitx_5"
-	elog "https://fcitx-im.org/wiki/Using_Fcitx_5_on_Wayland"
-	elog
-}
--- a/app-i18n/libime/libime-1.1.8-r1.ebuild
+++ b/app-i18n/libime/libime-1.1.8-r1.ebuild
@ -1,54 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake unpacker
-
-DESCRIPTION="Fcitx5 Next generation of fcitx"
-HOMEPAGE="https://fcitx-im.org/"
-SRC_URI="https://download.fcitx-im.org/fcitx5/libime/libime-${PV}_dict.tar.zst"
-
-LICENSE="LGPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
-IUSE="+data doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=app-i18n/fcitx-5.1.5:5
-	app-arch/zstd:=
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	kde-frameworks/extra-cmake-modules:0
-	virtual/pkgconfig
-	doc? (
-		app-text/doxygen
-		dev-texlive/texlive-fontutils
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-include-cstdint-for-gcc-15.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_DATA=$(usex data)
-		-DENABLE_DOC=$(usex doc)
-		-DENABLE_TEST=$(usex test)
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use doc && cmake_src_compile doc
-}
-
-src_install() {
-	cmake_src_install
-	use doc && dodoc -r "${BUILD_DIR}"/doc/*
-}
--- a/app-i18n/librime/Manifest
+++ b/app-i18n/librime/Manifest
@ -1,4 +1,3 @@
 DIST librime-1.11.2.tar.gz 2635435 BLAKE2B 6106b6934761fd61508756bfcdfc2b892ee6b31eec9816569e9a6b96fd91cf6255f119de23dac70e8b56f06c52f7bd278d9ad2434419681a18d75e2c14b86077 SHA512 7b8ba708489d4d6bd6f71618f3c3270d07e088aae5ecdfcba5128a456dc49d3799e335b3ba386a1894ee01f5c5a51993e0a1821ff46d8addb02d0c8c4aacf5f3
 DIST librime-1.12.0.tar.gz 2638566 BLAKE2B cbd734181eb80dd919a0f27d787dd5625974ed8b76e7f294308a7ee1b50ee904ac6460e3da4b3c1ec96c65dcfef011ae8dc6f6db880a21b2ab6fd2c96bfe203e SHA512 46c2d740dea5c0592266c7b3aaff1deba50ff5be6dbab48cc2fd49a5b7b0c9c28d8e0cc858e7d4845b70b7850c1e20ef559525ed3b70da9ad1bd65562f0df400
 DIST librime-1.7.3.tar.gz 2859513 BLAKE2B 834622860cdc3038d1b983f476bca70f211dfbc3bc2b565a998163e22688841ee3a0c7f9a64bce285e2f3f5b5a9a802bd5506f17904ccb3291babf80d4748fb5 SHA512 8767d17c3d14a5a1bbb8269fab1627b907de72c288b362fdbc6191223937da21e8b18471b4ae8f83ce5afc0ec5c3ab12fbcb49930eb9969c1764c7390d9ee4b0
-DIST librime-1.9.0.tar.gz 2628091 BLAKE2B 5026fbe537520679b60b7f39cab65e97e175d574ad709e2b09bb5d71f6655f48f9f046d2caeaad73dcd839f58cd76796eded4deb775d6817a99ab7de107187a1 SHA512 7f432bbfeedc0949391fca82ebf080d113089ec9f0ab40f4bc63cf3037052a27b4ef44e55e7fc43b1217cf6635c62be0fb7520c3cc1492ec169fe5ee864e61ea
--- a/app-i18n/librime/librime-1.9.0.ebuild
+++ b/app-i18n/librime/librime-1.9.0.ebuild
@ -1,51 +0,0 @@
-# Copyright 2012-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit cmake multiprocessing
-
-DESCRIPTION="RIME (Rime Input Method Engine) core library"
-HOMEPAGE="https://rime.im/ https://github.com/rime/librime"
-SRC_URI="https://github.com/rime/librime/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD BSD-2 Boost-1.0 MIT"
-SLOT="0/1-${PV}"
-KEYWORDS="~amd64 ~loong ~x86"
-IUSE="debug test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-cpp/glog:=
-	>=dev-libs/boost-1.74:=
-	app-i18n/opencc:0=
-	dev-cpp/yaml-cpp:0=
-	dev-libs/leveldb:0=
-	dev-libs/marisa:0=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
-"
-
-DOCS=(CHANGELOG.md README.md)
-
-src_configure() {
-	local -x CXXFLAGS="${CXXFLAGS}"
-
-	# for glog
-	if use debug; then
-		CXXFLAGS+=" -DDCHECK_ALWAYS_ON"
-		CMAKE_BUILD_TYPE=Debug
-	else
-		CXXFLAGS+=" -DNDEBUG"
-	fi
-
-	local mycmakeargs=(
-		-DBUILD_TEST=$(usex test ON OFF)
-		-DCMAKE_BUILD_PARALLEL_LEVEL=$(makeopts_jobs)
-		-DENABLE_EXTERNAL_PLUGINS=ON
-		-DINSTALL_PRIVATE_HEADERS=ON
-	)
-
-	cmake_src_configure
-}
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
--- a/app-misc/dateutils/dateutils-0.4.10.ebuild
+++ b/app-misc/dateutils/dateutils-0.4.10.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
@ -13,7 +13,7 @@ case "${PV}" in
 		;;
 	*)
 		SRC_URI="https://github.com/hroptatyr/dateutils/releases/download/v${PV}/${P}.tar.xz"
-		KEYWORDS="~amd64 ~x86"
+		KEYWORDS="~amd64 x86"
 esac

 LICENSE="BSD"
--- a/app-misc/gojq/Manifest
+++ b/app-misc/gojq/Manifest
@ -1,2 +1,4 @@
 DIST gojq-0.12.16-deps.tar.xz 537848 BLAKE2B 11e0a6a03cb88eac6345b4cb02b0a2132b08d0d3198e8d12a7e7cd4d51c0ee4bf6fc0222de9aa1bca75a1a55fef1f60567bb7aaf52a86ea4c09b83d3210fb135 SHA512 b68c7d4401880f8ef232fe2880b9439b9198fd17dd356f95680195a30f8833a80b896e1ab27a075b2aa495657a1cb91ecd48bece5b3db6c6d9d20441af36f617
 DIST gojq-0.12.16.tar.gz 131894 BLAKE2B 094b51e9200ce9cda01b67e68be362ac111418f67e2ef9d96ede1a3da0c9469bde76bd958152b15f9231d84f8d2e6200ea10d1cad9102f2f1ef51c2623af159a SHA512 08129dac68e280b4a7c2d64ea3da4cf8a00ab0ba8431e76468cb9d4b52e052eb5f2b92d1dc8545c3a5e08e354b0d4ec60c39137a13b4df6ea9027f0278e148c5
+DIST gojq-0.12.17-deps.tar.xz 537768 BLAKE2B 5526f97f5dce68d40255849cdfd096834183f2a2540add18bbf96ffd54b27926d1f5a9d995cf039b99f138eb7b940cfbe66bed6ab2824e2eca9c941fe1473cb5 SHA512 3fa1bdab3815d7dac71a9162de40a854fce431ae399e3375e4bd5a54c37a60ccfa0449be140e40038210388dca96602bbf461353f3ca562136d11a932b40f850
+DIST gojq-0.12.17.tar.gz 132749 BLAKE2B 9dc62ca9578f62f3d065f13d9a7fe3c1a4c90208e7cc4ff1000491276183c2b67ca86bd93e2c3b965641a3812388cfcfe4c81cec603cfc98edb78f2e25b58194 SHA512 e90fbf337c4390ac5664024fa64666f878ac509f0b844efea42169c6e19e3e90af5f22b32c15babfc4ca05ee734b23ce3ee5b7b1d179db28d6877b62ce7d0a00
--- a/app-misc/gojq/gojq-0.12.17.ebuild
+++ b/app-misc/gojq/gojq-0.12.17.ebuild
@ -0,0 +1,43 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+EGIT_COMMIT=f4c2cfe
+DESCRIPTION="Pure Go implementation of jq with yaml support"
+HOMEPAGE="https://github.com/itchyny/gojq"
+SRC_URI="https://github.com/itchyny/gojq/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
+
+LICENSE="MIT"
+LICENSE+=" Apache-2.0 BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+DOCS=(README.md)
+
+src_prepare() {
+	default
+	local -a sed_args=(
+		-e "s/^VERSION := .*/VERSION := ${PV}/"
+		-e "s/^CURRENT_REVISION = .*/CURRENT_REVISION = ${EGIT_COMMIT}/"
+	)
+	# -buildmode=pie not supported when -race is enabled
+	[[ ${GOFLAGS} == *buildmode=pie* ]] && sed_args+=(
+		-e 's/ -race / /'
+	)
+	sed  "${sed_args[@]}" -i Makefile || die
+}
+
+src_compile() {
+	emake build
+}
+
+src_install() {
+	einstalldocs
+	dobin "${PN}"
+}
+
+src_test() {
+	emake test
+}
--- a/app-misc/jq/files/jq-1.7-runpath.patch
+++ b/app-misc/jq/files/jq-1.7-runpath.patch
@ -1,17 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 0441d4a..8f1aa23 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -283,4 +283,11 @@ AC_SUBST([BUNDLER], ["$bundle_cmd"])
- AC_CONFIG_MACRO_DIR([config/m4])
- AC_CONFIG_FILES([Makefile libjq.pc])
- AC_OUTPUT
-
-+AC_ARG_ENABLE([rpathhack],
-+	[AC_HELP_STRING([--enable-rpathhack], [patch libtool to remove RPATH])],
-+	[
-+AC_MSG_RESULT([patching libtool to fix rpath])
-+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-+	],
-+	[])
--- a/app-misc/jq/files/jq-1.7.1-runpath.patch
+++ b/app-misc/jq/files/jq-1.7.1-runpath.patch
@ -0,0 +1,38 @@
+Fixes: https://github.com/gentoo/gentoo/commit/df24c1f97695d8a64a82577cd785e85ebe7ad4e7
+Upstream-PR: https://github.com/jqlang/jq/pull/3212
+
+From f23a7373d079a4d4fd1f975936e81f35a66dfe84 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Mon, 2 Dec 2024 09:46:33 -0800
+Subject: [PATCH] build: fix insecure RUNPATH
+
+In Gentoo -static-libtool-libs causes a QA Notice.
+
+ * QA Notice: The following files contain insecure RUNPATHs
+ *  Please file a bug about this at https://bugs.gentoo.org/
+ *  with the maintainer of the package.
+ *   /var/tmp/portage/app-misc/jq-1.7.1/image/usr/bin/jqn    RPATH: /var/tmp/portage/app-misc/jq-1.7.1/work/jq-jq-1.7.1/.libs
+
+Gentoo-Issue: https://bugs.gentoo.org/945698
+Signed-off-by: orbea <orbea@riseup.net>
+---
+ Makefile.am | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index a183477fde..3f36993c0a 100644
+--- a/Makefile.am
+++ b/Makefile.am
+@@ -132,11 +132,10 @@ CLEANFILES = src/version.h .remake-version-h src/builtin.inc src/config_opts.inc
+ 
+ bin_PROGRAMS = jq
+ jq_SOURCES = src/main.c src/version.h
+-jq_LDFLAGS = -static-libtool-libs
+ jq_LDADD = libjq.la -lm
+ 
+ if ENABLE_ALL_STATIC
+-jq_LDFLAGS += -all-static
+jq_LDFLAGS = -all-static
+ endif
+ 
+ ### Tests (make check)
--- a/app-misc/jq/jq-1.7.1-r1.ebuild
+++ b/app-misc/jq/jq-1.7.1-r1.ebuild
@ -30,6 +30,7 @@ RDEPEND="
 "
 PATCHES=(
 	"${FILESDIR}"/jq-1.6-r3-never-bundle-oniguruma.patch
+	"${FILESDIR}"/jq-1.7.1-runpath.patch
 )

 RESTRICT="!test? ( test )"
@ -58,7 +59,6 @@ src_configure() {
 		--disable-docs
 		--disable-valgrind
 		--disable-maintainer-mode
-		--enable-rpathhack
 		$(use_enable static-libs static)
 		$(use_with oniguruma oniguruma yes)
 	)
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
--- a/app-office/wps-office/Manifest
+++ b/app-office/wps-office/Manifest
@ -1,2 +1 @@
-DIST wps-office_11.1.0.11719.XA_amd64.deb 319340366 BLAKE2B b2d9a93ea5ec3dfefc49b276556c1fdcd37b24fee9abae8c0521aa8c816102f739b345b6442c8fc27b7fe64c4c03468afbe74a5da41b8c22de8f2dda4b04e346 SHA512 9e4bdaa7c3e276d8b38b020adbae69f395bfda0da91e41566eb427b9eeeddfcf8957eff69e134cdb1e4c42a2d08a32069920db8834145a035b1b1739e23b7203
 DIST wps-office_11.1.0.11723.XA_amd64.deb 318892996 BLAKE2B c6e1ac5279cdf91a0eaf7807e701ae45e12d55fc84fa68516593fadc3471b884a09870fb468aa2b610db2557134f860668700d885b991536a92eadfab40e9711 SHA512 3c9bcce0a9a653b3e9159167197d317ef56e3c38bf3781890de187194bb90503c6bda6c73a9b8c6da59a32a8ddad9c7e763efcb217796d6a62303969a5dc7093
--- a/app-office/wps-office/wps-office-11.1.0.11719.ebuild
+++ b/app-office/wps-office/wps-office-11.1.0.11719.ebuild
@ -1,90 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit unpacker xdg
-
-MY_PV="$(ver_cut 4)"
-
-DESCRIPTION="WPS Office is an office productivity suite"
-HOMEPAGE="https://www.wps.com/office/linux/"
-
-KEYWORDS="~amd64"
-
-SRC_URI="
-	amd64?	( https://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/${MY_PV}/${PN}_${PV}.XA_amd64.deb )
-"
-
-SLOT="0"
-RESTRICT="bindist strip mirror" # mirror as explained at bug #547372
-QA_PREBUILT="*"
-LICENSE="WPS-EULA"
-IUSE="systemd"
-
-# Deps got from this (listed in order):
-# rpm -qpR wps-office-10.1.0.5707-1.a21.x86_64.rpm
-# ldd /opt/kingsoft/wps-office/office6/wps
-# ldd /opt/kingsoft/wps-office/office6/wpp
-RDEPEND="
-	app-arch/bzip2:0
-	app-arch/lz4
-	app-arch/xz-utils
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/libbsd
-	dev-libs/libffi:0/8
-	dev-libs/libgcrypt:0
-	dev-libs/libgpg-error
-	dev-libs/libpcre:3
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	media-libs/flac:0/10-12
-	media-libs/libogg
-	media-libs/libpulse
-	media-libs/libsndfile
-	media-libs/libvorbis
-	media-libs/tiff-compat:4
-	net-libs/libasyncns
-	net-print/cups
-	sys-apps/attr
-	sys-apps/tcp-wrappers
-	sys-apps/util-linux
-	sys-libs/libcap
-	sys-libs/libcxx
-	sys-libs/zlib:0
-	virtual/glu
-	x11-libs/gtk+:2
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libxcb
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libXtst
-	systemd? ( sys-apps/systemd )
-"
-
-S="${WORKDIR}"
-
-src_install() {
-	# https://bugs.gentoo.org/878451
-	rm "${S}"/opt/kingsoft/wps-office/office6/libstdc++.so* || die
-
-	# https://bugs.gentoo.org/813138
-	use systemd || { rm "${S}"/opt/kingsoft/wps-office/office6/libdbus-1.so* || die ; }
-
-	exeinto /usr/bin
-	exeopts -m0755
-	doexe "${S}"/usr/bin/*
-
-	insinto /usr/share
-	# Skip mime subdir to not get selected over rest of office suites
-	doins -r "${S}"/usr/share/{applications,desktop-directories,icons,templates}
-
-	insinto /opt/kingsoft/wps-office
-	doins -r "${S}"/opt/kingsoft/wps-office/{office6,templates}
-
-	fperms 0755 /opt/kingsoft/wps-office/office6/{wps,wpp,et,wpspdf,wpsoffice,promecefpluginhost,transerr,ksolaunch,wpscloudsvr}
-}
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
--- a/Show more
+++ b/Show more