8 files changed, 6 insertions, 259 deletions
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index fa4413591960..39d854bde034 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/dehydrated/Manifest b/app-crypt/dehydrated/Manifest
index 9232deeaf0ac..8b314e8da391 100644
--- a/app-crypt/dehydrated/Manifest
+++ b/app-crypt/dehydrated/Manifest
@@ -3,10 +3,8 @@ AUX 00_gentoo.sh-r1 153 BLAKE2B b424d130079704b69af2395e32740be8cb4e8befded6d721
 AUX cron-r1 72 BLAKE2B dcdbf92a1c0bc66684df095c4bff4e2688550e89368af18d6e84732e3f8e8d62d0ddc3ee1a231122a2758d94d72e1c5e41d4fdde5f5287332b7f8f34b0b18d39 SHA512 bb81518b8de629340dc00e4f4d0b73eba7f322aa9e7f7b8d43ab653991dffa8e417ad058522b49b9bbcb5e8a92359f6d27175893a00134ba90729069b26d54b1
 AUX dehydrated-0.7.0-fix-CN-extraction-for-older-openssl-versions.patch 1179 BLAKE2B d4925675e868e24e2bd38aa0444e9b934e351fb706be5b66e71315d213186719260c20ebb976c160b1458eed1f14416ed6d27dad79a6b39b08cca50285802cb9 SHA512 2f18fa75ea6674b9b8746645395317046012f01032e35736580d87ac9a410ec4641e81c5f307d31bb238a53886b30820cde778bf83e3d04083ae1b6323777307
 AUX dehydrated-0.7.1-openssl-stdout.patch 560 BLAKE2B f3961940dc89eb8f0e8e1403d59ef34e208bc84a433006b56d448398850f55ad2a1f1260ea493cce7878822a5708bc07f39f06214a22ab529ed3d378155f36b5 SHA512 24744d9ce82416dc3a7548dddd4f009d47b04ec85a9a8ec3be98ddc6d170761ef3694cb37e2be6fc053d9ec6b0df46a9fc135f0b25cf63aeca50c5d020856a86
-DIST dehydrated-0.7.0.tar.gz 86574 BLAKE2B 35a3b0b7592126ca65003a6c9eb8934a76584710d028057e5add7f77bb2fa3799e89a060306da3b98a62d291229a2a78f23e0f95f19e033796aee31e97b94488 SHA512 47740d2d31ca73482a4fc5ed0dfce986af907dd5449cb3a5230bf9683845686c8122fc32e6219a4439574ef11d6fb104ee09591c5ff667927a2c9c13ba005511
 DIST dehydrated-0.7.1.tar.gz 119992 BLAKE2B 0b287537206936ceff33bde8bbb8ab7b13f28bf58cd29c898348db0cf5a83157fed4535da218ac48a810a93b99474e96334a27c062c157e2f164b0e516b47111 SHA512 b7ac078d6034e784f3f485e8ce56b5fa2f1e2a3b5ef014d260046b5f1d5cbd99727501e95a9530d0d1b2f300003d3fa5bf7e7f532092041597236d92fbeb0f3c
 DIST dehydrated-0.7.1.tar.gz.asc 488 BLAKE2B 0dd678976f897e8684695bce1742e498bcbec0f78781a53dae7f715a1a379f85eba3531c0f3181dcab9bd7005f086e82889dad6d26f7d2075c877eef3d653acf SHA512 f03872b7e087b3f719a76aaebd46f017f47595feb03a29f5fcbe33796655cdcd0a34580ae34a85e3280c8305a2fe2ada47e4436bfbec294b7dbf67768df86394
-EBUILD dehydrated-0.7.0-r1.ebuild 1280 BLAKE2B 0783eab859934b0de7a88301c568103d952e78e094d7504c3f3cd67d514f667245790117154eb8067319d61b6f481302e558ca7ea1d813e1f8cb4cbc9afb4975 SHA512 8f977733f22a3f56505670205fa892bd07e01bbc22b51470429f8ee5fc71b1a285a5e2fa829d20b6323aa31f537dd4de8bca264492c52731b6580a2e6b11dc80
-EBUILD dehydrated-0.7.1-r1.ebuild 1563 BLAKE2B 81eb869977977f2952b214aa94d07e35b4e9acc8cc26adec79fc143eb5b30417beab1ea59bbe5e5d4f8a0fda0b956630355aa66c4fc96f250336babc91ad7e1e SHA512 eb766b25fd8193c83616a82b7b3d0cd4965b200fa975eea64577ea81dfa7d632e13d9b24174793aa4eccca01f25cf52f954ad4793e52aa26130830f667152ad6
+EBUILD dehydrated-0.7.1-r1.ebuild 1559 BLAKE2B ca5ea998955b1284f9f2003f7ee07ba70a190b10fae88a9b5aceb93f00103609875f9ae0cc049b4586f8408ce5b6cf53ad618cd56feb8b33b434f80fefd08fe8 SHA512 ae9aa20b548bd6eebbbc61427b1159eaf57dc8cca45fe1d8ba7f9b779140cbda6ad6124ddc74a4f9a33543320ad0c6d5f8bab1a5fa53f0ed7d0f8c52d6dff91e
 EBUILD dehydrated-0.7.1.ebuild 1506 BLAKE2B a6bbf29f4a72b407997ee0e1468de0f654f557a467e443b8fb61a542d3cf6aa74d540bd04500b623ff58eabe3d2eabe1a1f4ba8ebf7d68faf5710edd0ccc8fba SHA512 15182f425dc1dbe4bb69da765502558abcfdc148103ba4b6b2a9be322a34caeb31da985c29c470a0ffacfb9586d517705013c9f70231cb3b8d36be376f5a3874
 MISC metadata.xml 444 BLAKE2B 05cdd8b05987524fd177cb35227291039e57b4272498ecadabb6f0497d4695e752eb68f764790504d79e1b3e5b9e63fd24af331df161fdad41e130ea168be317 SHA512 e265142fd3a2a11ccadc497e1dc400d81e2b3f04c0f42c5fb9f00c1b2c1cd298f917b5185a3fd0aac2a608a1905984f31fbf2ab52b25b20258f5324fd5aa3d24
diff --git a/app-crypt/dehydrated/dehydrated-0.7.0-r1.ebuild b/app-crypt/dehydrated/dehydrated-0.7.0-r1.ebuild
deleted file mode 100644
index 120ac925e81f..000000000000
--- a/app-crypt/dehydrated/dehydrated-0.7.0-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="A client for signing certificates with an ACME-server"
-HOMEPAGE="https://github.com/dehydrated-io/dehydrated"
-SRC_URI="https://github.com/dehydrated-io/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
-IUSE="+cron"
-
-RDEPEND="acct-group/dehydrated
-	acct-user/dehydrated
-	app-shells/bash
-	net-misc/curl
-	cron? ( virtual/cron )"
-
-PATCHES=( "${FILESDIR}"/${P}-fix-CN-extraction-for-older-openssl-versions.patch )
-
-src_configure() {
-	default
-	sed -i  's,^#CONFIG_D=.*,CONFIG_D="/etc/dehydrated/config.d",' docs/examples/config || die "could not set config (CONFIG_D)"
-}
-
-src_install() {
-	dobin ${PN}
-	insinto /etc/${PN}
-	doins docs/examples/{config,domains.txt,hook.sh}
-	fperms u+x /etc/${PN}/hook.sh
-	dodoc docs/*.md
-
-	insinto /etc/${PN}/config.d
-	doins "${FILESDIR}"/00_gentoo.sh
-
-	if use cron ; then
-		insinto /etc/cron.d
-		newins "${FILESDIR}"/cron-r1 ${PN}
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		einfo "See /etc/dehydrated/config for configuration."
-
-		use cron && einfo "After finishing setup you should enable the cronjob in /etc/cron.d/dehydrated."
-	fi
-}
diff --git a/app-crypt/dehydrated/dehydrated-0.7.1-r1.ebuild b/app-crypt/dehydrated/dehydrated-0.7.1-r1.ebuild
index db7d63245d29..8a1c824b3ae7 100644
--- a/app-crypt/dehydrated/dehydrated-0.7.1-r1.ebuild
+++ b/app-crypt/dehydrated/dehydrated-0.7.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
 IUSE="+cron"
 
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-dehydrated )"
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index c1086c86fe44..be9debb09030 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -12,14 +12,11 @@ AUX gpg-agent.service 223 BLAKE2B ad71d7fab2a92a8da454c34884b5724e94adc0925a7f97
 AUX gpg-agent.socket 234 BLAKE2B 622da5cb56ac2bba99054b9eecefc95aca523074aff24f77d1fb1fcdb94c1ad99c0411375816a0ac1b9f68d172207ed5061bc3afc167d0d1e3e57de1b41f19ee SHA512 551df5183fccc261505983880010c5be7135a9858d74354723f947163b101b2859ebdfd529f8c3746770394256afedc219ea0eb2df5c985be48f5f45430ca541
 DIST gnupg-2.2.45.tar.bz2 7447141 BLAKE2B 8fe2036325e31332166c0477ce9514152c8417a9f61b3edc43487340d5b52e6a4d4c2b104ca9fe7ce6893e6d2977e2cd9c9ccfb52c0b1ea18dae3304ec6ec7f3 SHA512 086bb2a96ff4a681451b357495c8b435229e6526e1121d8faee3cb2ecc9c14965c92c9b1ccbbf3a03f6c59c215cca85a5c4f740f2df7c008a9fa672b370bf33c
 DIST gnupg-2.2.45.tar.bz2.sig 119 BLAKE2B 6656747b2d640a95c4172a221952fa75f7d03c231b7c6d40ea57b43a5bcfbceb800023ca2f352ca09325aaf186a7bf31fcfe7104129c5d6628f0e1256994df76 SHA512 181195a76eede8113bd8f2a7f5bc20674226f6327cf8263389e3d178c205ed2d817b28f2d3b504dd9f852f22fc283d2c14e809ba1c05cfe88b66103845ff114c
-DIST gnupg-2.4.6.tar.bz2 8011304 BLAKE2B 3b0deb3da1ec404e8f0aa50c424c7072727f933228de732d661a17ca15785b7430700e7b88afba69538f9794863cb218c90ae3d43469541fb9152fbabd3bc909 SHA512 192ae6cb18547e9c5fc4263dc968b548c1ce563ceb8cc2e651b264d4e5afa1cd99a2c1cdd80906faf5e0b0ca99cef76e003b1f7e73238f311a74a1de6c35b5cb
-DIST gnupg-2.4.6.tar.bz2.sig 119 BLAKE2B f22b9488a46e585eaa4ed6434c37603756de2a0136a6e8a44d974304d31299f64dee5065a0c1f8ed6aff24555e369ffa213558027698a7e7b2244cef7c9eff76 SHA512 699f99d5aedbb1adef0fc46fbfb4184996ebaeb08e3c5a4d64195cd14e628a17a234ff9d990ad63c32119cbab24bcba802590eaf69f030a0a0addf9928172221
 DIST gnupg-2.4.7.tar.bz2 8010244 BLAKE2B 4cdc6be4330b0c8f150d9d1a9ce9c7d34232ecf9b980b15fbd20e96ff6fcd8665688456d66f1c862b816472034eaa0796444357b1f36e75e8520a603a0e6b298 SHA512 3e84f1679904bf0efb789df6466e468bd2be9149d52561f35e2380038133479bebf1c61ee7adf6d3564b370915f32111098c052be6e6acaf3083a807f9f36019
 DIST gnupg-2.4.7.tar.bz2.sig 119 BLAKE2B e97012f433c2818dda953ccaa2f5e8e94492b306a7815b16d7a9f8bf165f11972114d94a1aaba6156baed0ee3566ad998ed74a9521c71464268f4c6f8f14306c SHA512 d944a57b21fa7a4058fb4f00e3c164220be038037010a07a43e48c881dd66d901f8ea249f5df183a1c7de811ecc3aa9ed1591c18baf201e338129eb7e28bddc4
 DIST gnupg-2.5.1.tar.bz2 8126739 BLAKE2B 46955d2eebe14395adc0fdf81e89a32f3f9baaabfe1eee78f256a1fab25ce6fdb96b873678cfeb5e4abf4894c7ab4908359ed04cc6571ff442dcc5325b3ccd66 SHA512 733a11ff24145e23dd7d34d954a70c25bf70ecb1d517b8e15cc34bf690786c9f7007e4e99cde573500ac012852e91b29568fed00491f8c8254b3fb63ca5777cd
 DIST gnupg-2.5.1.tar.bz2.sig 238 BLAKE2B cd024a63ecb82a12e92444cbff8dbc9bef6a4e436d59957aae77927cce0baf9e282e63df7a5159a521c7c8694a0dbe96d6537ad3ec5f779c7c0dea8d02b5e70d SHA512 8ffd5cc72a2907972bf1854e804f6c215ff66ba2d6e91952700f49b2b5ba8bab035d0f42efdb0d3c3166301cda6e716394928bdd9c0d0d1e1789a02c7aa1a926
 EBUILD gnupg-2.2.45-r1.ebuild 5615 BLAKE2B 2367e2d5a3bde07a8b9c713272b80f87b3987c6c4c8160f1bb83f84ee94f7112b17e7c34153453d3ea8030a81ab198060729c8ac02e9ab7d19c694af1ac61911 SHA512 da37d469fc5e64ce0dbd3f96fd608efc84febf6e33da06e2c71d3b6c8a8f54ff55a36ac3f7df301da1d623d312ff63ce75450980e3e073020a00aeda2cc30979
-EBUILD gnupg-2.4.6-r2.ebuild 6078 BLAKE2B e269eee4e9ebaff41ab9925d175bbf97a83b08077c39f0750b0bcbbc4d5b8c3b43780e48cb878e725bf39c3160d41d2b7f5f0866456becde688259453c568dfa SHA512 db9ab1f104850fb9b49f15742a1241234cc95ba7da896f7898e6312eab079f4a2dbacb97a46a016e7fea0ff99bf40cc3549f789e7b917a116e04d9d281473aed
 EBUILD gnupg-2.4.7-r1.ebuild 6041 BLAKE2B 8a1cbda11993cdcecd92213d761b9e014a5c011edc0c18bb9b1da251bf0660afb4f98e355a2c7a42572a94a5824cc6c8e671c02b6f4d4cbf3941a1ec01a64a04 SHA512 d63295efa3a0e260986b7da0c7fc97e9cc0cd45f1fd21356c6d18d94fbd0b362ca469e974689e4ebce152a3d34cef6f9547a341857f248c4b6b7f410f6279a91
 EBUILD gnupg-2.5.1-r1.ebuild 6065 BLAKE2B 207b8ade632d160007d945f624046df0fa4fbe79f776ebedd09462807316bb0b4ce465df1cead79fa9b840d4142708d4c1cd9eae1aa64a9d7f1022ee13bda150 SHA512 84a0293d5b6986faf2c08deeffe32ca8a7293838ea6a6817447f8ddf9caf0e795df88e5993a0c8b8e3453bd98354604a7c5e6d2fca12221d3776620a9ff1d849
 MISC metadata.xml 1189 BLAKE2B dae783678abfe0bae095970d96d952f591a569debad411708d29a2f128c6a291b73a33ee0b3491a6a5ec44c11f56d33c1531022e0ef9eaad3326c9cd0f79e3fb SHA512 bc7d6a9ceda213c134d9afc527fe0b0c87a4886a171b7a1e1f662f3978fec5e71323bae4c9f3882e1d763d5738446f161265070a8e513a59fa62ef0f792e9fa5
diff --git a/app-crypt/gnupg/gnupg-2.4.6-r2.ebuild b/app-crypt/gnupg/gnupg-2.4.6-r2.ebuild
deleted file mode 100644
index 332896a3c5b9..000000000000
--- a/app-crypt/gnupg/gnupg-2.4.6-r2.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Maintainers should:
-# 1. Join the "Gentoo" project at https://dev.gnupg.org/project/view/27/
-# 2. Subscribe to release tasks like https://dev.gnupg.org/T6159
-# (find the one for the current release then subscribe to it +
-# any subsequent ones linked within so you're covered for a while.)
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gnupg.asc
-# in-source builds are not supported: https://dev.gnupg.org/T6313#166339
-inherit flag-o-matic out-of-source multiprocessing systemd toolchain-funcs verify-sig
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
-HOMEPAGE="https://gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
-SRC_URI+=" verify-sig? ( mirror://gnupg/gnupg/${P}.tar.bz2.sig )"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl test +tofu tpm tools usb user-socket wks-server"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( tofu )"
-
-# Existence of executables is checked during configuration.
-# Note: On each bump, update dep bounds on each version from configure.ac!
-DEPEND="
-	>=dev-libs/libassuan-2.5.0:=
-	>=dev-libs/libgcrypt-1.9.1:=
-	>=dev-libs/libgpg-error-1.46
-	>=dev-libs/libksba-1.6.3
-	>=dev-libs/npth-1.2
-	sys-libs/zlib
-	bzip2? ( app-arch/bzip2 )
-	ldap? ( net-nds/openldap:= )
-	readline? ( sys-libs/readline:0= )
-	smartcard? ( usb? ( virtual/libusb:1 ) )
-	tofu? ( >=dev-db/sqlite-3.27 )
-	tpm? ( >=app-crypt/tpm2-tss-2.4.0:= )
-	ssl? ( >=net-libs/gnutls-3.2:0= )
-"
-RDEPEND="
-	${DEPEND}
-	nls? ( virtual/libintl )
-	selinux? ( sec-policy/selinux-gpg )
-	wks-server? ( virtual/mta )
-"
-PDEPEND="
-	app-crypt/pinentry
-"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( sys-apps/texinfo )
-	nls? ( sys-devel/gettext )
-	verify-sig? ( sec-keys/openpgp-keys-gnupg )
-"
-
-DOCS=(
-	ChangeLog NEWS README THANKS TODO VERSION
-	doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch
-	"${FILESDIR}"/${PN}-2.4.5-revert-rfc4880bis.patch # bug #926186
-	"${FILESDIR}"/${PN}-2.4.6-c99.patch
-)
-
-src_prepare() {
-	default
-
-	GNUPG_SYSTEMD_UNITS=(
-		dirmngr.service
-		dirmngr.socket
-		gpg-agent-browser.socket
-		gpg-agent-extra.socket
-		gpg-agent.service
-		gpg-agent.socket
-		gpg-agent-ssh.socket
-	)
-
-	cp "${GNUPG_SYSTEMD_UNITS[@]/#/${FILESDIR}/}" "${T}" || die
-
-	# Inject SSH_AUTH_SOCK into user's sessions after enabling gpg-agent-ssh.socket in systemctl --user mode,
-	# idea borrowed from libdbus, see
-	#   https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/bus/systemd-user/dbus.socket.in#L6
-	#
-	# This cannot be upstreamed, as it requires determining the exact prefix of 'systemctl',
-	# which in turn requires discovery in Autoconf, something that upstream deeply resents.
-	sed -e "/DirectoryMode=/a ExecStartPost=-${EPREFIX}/bin/systemctl --user set-environment SSH_AUTH_SOCK=%t/gnupg/S.gpg-agent.ssh" \
-		-i "${T}"/gpg-agent-ssh.socket || die
-}
-
-my_src_configure() {
-	# Upstream don't support LTO, bug #854222.
-	filter-lto
-
-	local myconf=(
-		$(use_enable bzip2)
-		$(use_enable nls)
-		$(use_enable smartcard scdaemon)
-		$(use_enable ssl gnutls)
-		$(use_enable test all-tests)
-		$(use_enable test tests)
-		$(use_enable tofu)
-		$(use_enable tofu keyboxd)
-		$(use_enable tofu sqlite)
-		$(usex tpm '--with-tss=intel' '--disable-tpm2d')
-		$(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver')
-		$(use_enable wks-server wks-tools)
-		$(use_with ldap)
-		$(use_with readline)
-
-		# Hardcode mailprog to /usr/libexec/sendmail even if it does not exist.
-		# As of GnuPG 2.3, the mailprog substitution is used for the binary called
-		# by wks-client & wks-server; and if it's autodetected but not not exist at
-		# build time, then then 'gpg-wks-client --send' functionality will not
-		# work. This has an unwanted side-effect in stage3 builds: there was a
-		# [R]DEPEND on virtual/mta, which also brought in virtual/logger, bloating
-		# the build where the install guide previously make the user chose the
-		# logger & mta early in the install.
-		--with-mailprog=/usr/libexec/sendmail
-
-		--disable-ntbtls
-		--enable-gpgsm
-		--enable-large-secmem
-
-		CC_FOR_BUILD="$(tc-getBUILD_CC)"
-		GPGRT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpgrt-config"
-
-		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
-	)
-
-	if use prefix && use usb; then
-		# bug #649598
-		append-cppflags -I"${ESYSROOT}/usr/include/libusb-1.0"
-	fi
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# https://dev.gnupg.org/T7368
-		append-cppflags -D_XOPEN_SOURCE=500
-	fi
-
-	# bug #663142
-	if use user-socket; then
-		myconf+=( --enable-run-gnupg-user-socket )
-	fi
-
-	# glib fails and picks up clang's internal stdint.h causing weird errors
-	tc-is-clang && export gl_cv_absolute_stdint_h="${ESYSROOT}"/usr/include/stdint.h
-
-	econf "${myconf[@]}"
-}
-
-my_src_compile() {
-	default
-
-	use doc && emake -C doc html
-}
-
-my_src_test() {
-	export TESTFLAGS="--parallel=$(makeopts_jobs)"
-
-	default
-}
-
-my_src_install() {
-	emake DESTDIR="${D}" install
-
-	use tools && dobin tools/{gpgconf,gpgsplit,gpg-check-pattern} tools/make-dns-cert
-
-	dosym gpg /usr/bin/gpg2
-	dosym gpgv /usr/bin/gpgv2
-	echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
-	echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
-
-	dodir /etc/env.d
-	echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
-
-	use doc && dodoc doc/gnupg.html/*
-}
-
-my_src_install_all() {
-	einstalldocs
-
-	use tools && dobin tools/{convert-from-106,mail-signed-keys,lspgpot}
-	use doc && dodoc doc/*.png
-
-	# Dropped upstream in https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commitdiff;h=eae28f1bd4a5632e8f8e85b7248d1c4d4a10a5ed.
-	dodoc "${FILESDIR}"/README-systemd
-	systemd_douserunit "${GNUPG_SYSTEMD_UNITS[@]/#/${T}/}"
-}
diff --git a/app-crypt/mit-krb5-appl/Manifest b/app-crypt/mit-krb5-appl/Manifest
index 65211cae5481..c60ee0ba6c1f 100644
--- a/app-crypt/mit-krb5-appl/Manifest
+++ b/app-crypt/mit-krb5-appl/Manifest
@@ -4,6 +4,6 @@ AUX mit-krb5-appl-sig_t.patch 1411 BLAKE2B c2a34ada3f811459d006c1be6e79cb0811b0a
 AUX mit-krb5-appl-tinfo.patch 579 BLAKE2B 8db4885b88e2eb155ea80ce8d4e7f320ae39a9183e70de452081a452c51ba9ae3dfad4ea000582b3f3f361e17de02b0720cd794473c974c5551b69afde869445 SHA512 3b90b4f9539b94ddc8a0483dc156f61d33b436a01d32d8e66de13a82e653ec51c7996e3e5b4f5d8e1edf6a21d6c4fe09f4a4382e2f918edff070e71bfcee0951
 DIST krb5-appl-1.0.3-signed.tar 634880 BLAKE2B 0341ce0f3845bbf49ac2c43dea95d1bf196a9e6fb07a1bb4e8d1eac9ef74765f4b02b7f6e2794cf55ce6c7a7e2623bd325457dcb60f94b7e30bdc65a370751ad SHA512 1d85be6eb39a01c21308f6b159a375ae4ee331de8052c3990c9252f708d717b8b518f92c424bd6beebe344d940b4813e6ea11dd18df5d7caa4b5effc2513dd23
 EBUILD mit-krb5-appl-1.0.3-r3.ebuild 1647 BLAKE2B 74db80eb31f6b83f44e31a19781ad9c2d2d4470bc585f7caf7acbac4826cf6d25418a3383c8092545b41806e52916b9ffcc6612dd49a6daadeccf84369741a35 SHA512 ede93a96c657c9ebe68a12981e5608a7072cae5534db26f89cae907d64909257c1bf6f44fee6ed41b584eb26cbac3f325f8d2c3f80aca612de981f86b194fec3
-EBUILD mit-krb5-appl-1.0.3-r4.ebuild 1690 BLAKE2B ea66bb4edcf307f1ab68672d45d92e0c136d4484a72b8d8a662ae3267d7a72222d09cb9bddcb38a1f5d80416361414f276575112a706c8b30e9eda2a53ede9f7 SHA512 9c5cd33ed33f6f1d9586f8ae768848912215dfd4adee371934f05d8b6b220448044c2a19cde09a032963e0b4de158ebcea2300c0c8010d76f4569400daf44f0b
+EBUILD mit-krb5-appl-1.0.3-r4.ebuild 1688 BLAKE2B 133dbdc6e0f4baf4dbe6a5a9cd3d9fccc3e507c42a31a51fd86218cc672f90ffc7851b9f5fb86ea36023c49d4f7c03c8cd80b52a42adc415f94a7656c1f1af19 SHA512 89dd2d337c3c785e814ee34e0b5db20383af16ac386387d09e6f58f2eaf5bf8a42e82beb86fe8e33949b0305726e3d861186ebd96af49d22c9f6ec01adc03c9a
 EBUILD mit-krb5-appl-1.0.3-r5.ebuild 1802 BLAKE2B b6469ebfefe1b339f25262def1d3b3c16eded9403821ec7a966ce50faa9518064dde316973e01963b792fc6d0b6f7c4d3a051e40265146f4bbb581d7280b76f0 SHA512 0913cdb2e4cf0fd49d8accd7fbca80a956cc11b9ce6bc7534753207bdd1c7bf9db12318d36c96bfb4492abcc241e4a562e4712f0a7906b1a9ceebe87b48a1723
 MISC metadata.xml 241 BLAKE2B ccde51ebe69cc26698aafb45f6c9491703ea0760efd8c1f32141ba61bf183e4015eb62ab6d779cc112b8ca9d08d5832a2f1ec1d8fb94d650bd4f3f7b2a1f4a22 SHA512 cd13ed42d7b37e1773b00b79fde8ffe9ef2a685eb88c30b6b974a026df67e99fb20c54cb208e8bb7c3b6d7508e0ef94e05eeb9e463d565a1570675460537c176
diff --git 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
index 0d9b992a05ef..e6711763f74f 100644
--- 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -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