Sync with portage [Sun Apr 17 23:47:25 MSK 2022].

2 years ago · 8d9c7cb6ab
parent 3124a24b46
commit 8d9c7cb6ab
5301 changed files with 8135 additions and 56397 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/graylog/Manifest
+++ b/app-admin/graylog/Manifest
@ -1,5 +1,2 @@
-DIST graylog-4.1.11.tgz 197190151 BLAKE2B 10e8006c967861aec826768ada2c965729e992eba3701e1475ad68aec5c31ce35c0bbb41ffa8f4a0735cdeb85c8502d462f9925918d568ccbc669e935bc31de4 SHA512 4f903ec470d60836be720f59c24b8454d0689b961af84623eaeb061d4e719cfc4fc0bcfde7074de8e6a3c6d1e3f608cdc6713b50f2d9031d298660c08cf4e219
-DIST graylog-4.1.12.tgz 197206216 BLAKE2B 844c305bf8aad7289f7e8b5e9d6b25b2a0c360182be30e5f9c72d7dfce782f4bcac703a543fcca92e4d5fe281dbf6d717f0c12ea67cbed193d8e1fc93405c896 SHA512 dc27e82200f1e9dd828b99dd5947f198a575fb819a490f450badad47449b9a38f2ee6977511397eb84f2430a44a6f598fd426ec42f5e1ad00291314dbc963377
 DIST graylog-4.1.13.tgz 197209394 BLAKE2B 22e68bf723e9703a8c27e525a1634bcff347a9b99daa210e832a9a410b87f7040de28e0ebd083de3b72d00ae5b67351c955ad6770bbdf74e6bbf039c6d443adf SHA512 eb7b81899e111fc37eaba4232b1b56914c3b374c352d183b19e29ea1a67eebc679c7914e3889807e674b89411036d3c6f785bf063821bdbe6df743c0e294a0ea
-DIST graylog-4.2.6.tgz 197322595 BLAKE2B daa5466e9ab06b0af92f17abdaf77d604212c25bef3e6ea7b45e073ff54a27be0177b65956a8ec2b48814d490f5fbfa116ec278aad88ec727cd0d3aa89732073 SHA512 63ce15d556fcf38c501c1676b68e2e7f06442f57c0c5993a3ed5918deebac40cb47d7b4aaeb697f95257774eecedce2b5f7344e3799ba333a46a1bf1d5b48412
 DIST graylog-4.2.7.tgz 197298955 BLAKE2B eea69212ebe6a9e81b8ffe5f9b7f0fac33dbf45d1f337f8540d09e316798cfcda26bc8793db3fb33b039e3677d4bc5434393f90095ece3347b91d8e2395dae6d SHA512 137d2763e65d192750a9d6f02f536f51804c519e36b5c5bc2deadabcd9455a2711a901c396ed30c09c6d95aa34e2936b7c6614c60d30ee0969485fe5d23f1b6e
--- a/app-admin/graylog/graylog-4.1.11.ebuild
+++ b/app-admin/graylog/graylog-4.1.11.ebuild
@ -1,57 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Free and open source log management"
-HOMEPAGE="https://www.graylog.org"
-SRC_URI="https://downloads.graylog.org/releases/graylog/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-RESTRICT="strip"
-
-RDEPEND="acct-group/graylog
-	acct-user/graylog
-	>=virtual/jdk-1.8:*"
-
-DOCS=(
-	README.markdown UPGRADING.rst
-)
-
-GRAYLOG_DATA_DIR="/var/lib/graylog"
-GRAYLOG_INSTALL_DIR="/usr/share/graylog"
-QA_PREBUILT="${GRAYLOG_INSTALL_DIR}/lib/sigar/libsigar*"
-
-src_prepare() {
-	default
-
-	# gentoo specific paths
-	sed -i "s@\(node_id_file = \).*@\1${GRAYLOG_DATA_DIR}/node-id@g; \
-		s@\(message_journal_dir = \).*@\1${GRAYLOG_DATA_DIR}/data/journal@g;" \
-		graylog.conf.example || die
-}
-
-src_install() {
-	default
-
-	insinto /etc/graylog
-	doins graylog.conf.example
-
-	insinto "${GRAYLOG_INSTALL_DIR}"
-	doins graylog.jar
-	doins -r plugin
-
-	keepdir "${GRAYLOG_DATA_DIR}"
-
-	newconfd "${FILESDIR}/graylog.confd" graylog
-	newinitd "${FILESDIR}/graylog.initd" graylog
-}
-
-pkg_postinst() {
-	ewarn "Graylog does not depend on need.net any more (#439092)."
-	ewarn
-	ewarn "Please configure rc_need according to your binding address in:"
-	ewarn "/etc/conf.d/graylog"
-}
--- a/app-admin/graylog/graylog-4.1.12.ebuild
+++ b/app-admin/graylog/graylog-4.1.12.ebuild
@ -1,60 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Free and open source log management"
-HOMEPAGE="https://www.graylog.org"
-SRC_URI="https://downloads.graylog.org/releases/graylog/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-RESTRICT="strip"
-
-RDEPEND="acct-group/graylog
-	acct-user/graylog
-	>=virtual/jdk-1.8:*"
-
-DOCS=(
-	README.markdown UPGRADING.rst
-)
-
-GRAYLOG_DATA_DIR="/var/lib/graylog"
-GRAYLOG_INSTALL_DIR="/usr/share/graylog"
-QA_PREBUILT="${GRAYLOG_INSTALL_DIR}/lib/sigar/libsigar*"
-
-src_prepare() {
-	default
-
-	# gentoo specific paths
-	sed -i "s@\(node_id_file = \).*@\1${GRAYLOG_DATA_DIR}/node-id@g; \
-		s@\(message_journal_dir = \).*@\1${GRAYLOG_DATA_DIR}/data/journal@g;" \
-		graylog.conf.example || die
-}
-
-src_install() {
-	default
-
-	insinto /etc/graylog
-	doins graylog.conf.example
-
-	insinto "${GRAYLOG_INSTALL_DIR}"
-	doins graylog.jar
-	doins -r plugin
-
-	keepdir "${GRAYLOG_DATA_DIR}"
-
-	newconfd "${FILESDIR}/graylog.confd" graylog
-	newinitd "${FILESDIR}/graylog.initd" graylog
-}
-
-pkg_postinst() {
-	elog "Please visit the website for product changes:"
-	elog "https://docs.graylog.org/docs/changelog"
-	elog
-	ewarn "Graylog does not depend on need.net any more (#439092)."
-	ewarn
-	ewarn "Please configure rc_need according to your binding address in:"
-	ewarn "/etc/conf.d/graylog"
-}
--- a/app-admin/graylog/graylog-4.2.6.ebuild
+++ b/app-admin/graylog/graylog-4.2.6.ebuild
@ -1,60 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Free and open source log management"
-HOMEPAGE="https://www.graylog.org"
-SRC_URI="https://downloads.graylog.org/releases/graylog/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-RESTRICT="strip"
-
-RDEPEND="acct-group/graylog
-	acct-user/graylog
-	>=virtual/jdk-1.8:*"
-
-DOCS=(
-	README.markdown UPGRADING.rst
-)
-
-GRAYLOG_DATA_DIR="/var/lib/graylog"
-GRAYLOG_INSTALL_DIR="/usr/share/graylog"
-QA_PREBUILT="${GRAYLOG_INSTALL_DIR}/lib/sigar/libsigar*"
-
-src_prepare() {
-	default
-
-	# gentoo specific paths
-	sed -i "s@\(node_id_file = \).*@\1${GRAYLOG_DATA_DIR}/node-id@g; \
-		s@\(message_journal_dir = \).*@\1${GRAYLOG_DATA_DIR}/data/journal@g;" \
-		graylog.conf.example || die
-}
-
-src_install() {
-	default
-
-	insinto /etc/graylog
-	doins graylog.conf.example
-
-	insinto "${GRAYLOG_INSTALL_DIR}"
-	doins graylog.jar
-	doins -r plugin
-
-	keepdir "${GRAYLOG_DATA_DIR}"
-
-	newconfd "${FILESDIR}/graylog.confd" graylog
-	newinitd "${FILESDIR}/graylog.initd" graylog
-}
-
-pkg_postinst() {
-	elog "Please visit the website for product changes:"
-	elog "https://docs.graylog.org/docs/changelog"
-	elog
-	ewarn "Graylog does not depend on need.net any more (#439092)."
-	ewarn
-	ewarn "Please configure rc_need according to your binding address in:"
-	ewarn "/etc/conf.d/graylog"
-}
--- a/app-admin/prelude-manager/Manifest
+++ b/app-admin/prelude-manager/Manifest
@ -1,2 +1 @@
-DIST prelude-manager-5.1.0.tar.gz 1510054 BLAKE2B 88ef666a76c58af1a8164c033b7e9c1ea869a18a66cb489d8c7fdbf1fa331006e7844aea4386ea3185902afd108af5eb1b46ee17686032de460d8c5b336fd658 SHA512 1f0e993f9bf684ec65a741db3cdaf537dc47bc2f77652a37c194db422dd5da2aa33b78d3ee454c78b28b44c022eacc7246ee99187b0b8779c12f3a67320d89a3
 DIST prelude-manager-5.2.0.tar.gz 1564874 BLAKE2B cd00aca6a533cdb47e311c4a8eed17d514f39de3b1c5a4b334b8e8c8c2d318b36d1fc843bf36be0383da2ae5f4e41a936fc70ad92d5b55ab56e9a34c36fc1dae SHA512 49f8fd10c7f3c5c816e6bc49ce8d47abfe56b4b0a1d8a564774f67ef5f0e3058c62ef9c88ca709b1fe2961ed832269fe811ddf57d4118879fa561970561507d6
--- a/app-admin/prelude-manager/prelude-manager-5.1.0-r1.ebuild
+++ b/app-admin/prelude-manager/prelude-manager-5.1.0-r1.ebuild
@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd tmpfiles
-
-DESCRIPTION="Bus communication for all Prelude modules"
-HOMEPAGE="https://www.prelude-siem.org"
-SRC_URI="https://www.prelude-siem.org/pkg/src/5.1.0/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dbx geoip tcpd xml"
-
-RDEPEND="net-libs/gnutls:=
-	>=dev-libs/libprelude-5.1.0
-	<dev-libs/libprelude-6
-	dbx? (
-		>=dev-libs/libpreludedb-5.1.0
-		<dev-libs/libpreludedb-6
-	)
-	geoip? ( dev-libs/libmaxminddb )
-	tcpd? ( sys-apps/tcp-wrappers )
-	xml? ( dev-libs/libxml2 )"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.1.0-run.patch"
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--localstatedir="${EPREFIX}/var"
-		$(use_with dbx libpreludedb-prefix)
-		$(use_enable geoip libmaxminddb)
-		$(use_with tcpd libwrap)
-		$(usex xml '' '--without-xml-prefix')
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	rm -rv "${ED}/run" || die "rm failed"
-	keepdir /var/spool/prelude-manager{,/failover,/scheduler}
-
-	find "${D}" -name '*.la' -delete || die
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	newtmpfiles "${FILESDIR}/${PN}.run" "${PN}.conf"
-
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-}
-
-pkg_postinst() {
-	tmpfiles_process ${PN}.conf
-}
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@ -1,7 +1,4 @@
 DIST sudo-1.9.10.tar.gz 4516568 BLAKE2B 94d97379e31b41917616a829cbece3d3fce7dd6ab9d04791b928981c14249c306508298655c19dc59a054ccf7deed4e69e65367cbfe9f6d8b5aba8895cfa6064 SHA512 65cf92b67b64413cb807da8b9602fc90b75e5b30dd1402d682ca36f276a3d6209a8a59c14e463898abc9856bc56263e5ba4bb6d44774f56a2885a9eea4a35375
 DIST sudo-1.9.10.tar.gz.sig 566 BLAKE2B 808919c826faa4f63efc283461f9f2089fd745aaf7462bcc41c505e7f978e7d56307202f96548d95844c99236fec10cada8438b935a1e1b6ea3601ee857d6900 SHA512 4ea0b736783b8e7be47645f770d7684d99c31f901177d3527f1ff78f5126d41592a94d36c67762bf5cb941eed80b9f585637aaa81d7f4920576d31a83f447323
-DIST sudo-1.9.6p1.tar.gz 4119888 BLAKE2B 02bdb551c46cff11ac56e64937c64e6a29ccd8e0af34ea2f6b33c223bee8f7ad958d0fc3d7ef8ef12bf5bc82565769b923ff112a3f3d6bf6999fa4f6ea55e38e SHA512 632dfe72f04ce9a7a5a7236fcd5c09ce4535e695ced49d24dd848e3a7b1bea7380df44188b9e475af4271069539b5a5816948a98fbb0649ebebaba8b4c4b7745
 DIST sudo-1.9.8p2.tar.gz 4302256 BLAKE2B ba40df539b3466bebe0d876ef4f1809867125e83983609eae0447f933fbd499b2eda88d2f6c475779654e68af9580a2998eca3c3f7953129ff73c923e1c88ad9 SHA512 899b252e8c219226f658dff3dd34c97b07d42004998b45175b4c0c4de42a6bf9f909598e99b4056fa1171e63378e203854b0f8608b0f5c1b00e9d3677818f6d3
 DIST sudo-1.9.8p2.tar.gz.sig 566 BLAKE2B 1e1cf69ea391602a214aef253a19fff2e26a908ffd9f5e54f2eeb20245f9518fde7d8417e7160b33d1067916fc7cd3df0b59e626d54d24dc8c6453a0efa95200 SHA512 18a7170a4654ff22b23181f589ae2115acd2d635d94977586aa15093bb5144f947584588ae03fc2dd941fb934fac4d9fa689b3fd5a4ef0295156e5b9772b8126
-DIST sudo-1.9.9.tar.gz 4456969 BLAKE2B 1a661a24e9891c705ca1ff0ff0881be30888ac850d18478031379de6cfa10a581ee4b256fda7d8882e17c661bcaa03b1055ab0e525dc75a2b1feec2ca13283c8 SHA512 53064240431ae3d9409dc5cb7d72ab55d9ab5f802af4de99fadd987855461b3cca53f261d6256e3b6f35e30c7e162f4dfa3978ef6976415cf5be874fb2026614
-DIST sudo-1.9.9.tar.gz.sig 566 BLAKE2B 50bf100449312bc501d021b483694e2552e1f66db0fe7937281fa6a89b4131d8d3ee9560951e2ce6905e7b5ec8c68fbf9b8909475c099408f0df999e80079b0f SHA512 a186f0acf3875347106f14e58567bb15361adb50d20310b29d9f136e900cfdbebd1674c6f4db9d0eda650c03784c77e67e20cece0e03d6bee270cf790cbaaf95
--- a/app-admin/sudo/sudo-1.9.6_p1-r3.ebuild
+++ b/app-admin/sudo/sudo-1.9.6_p1-r3.ebuild
@ -1,257 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pam multilib libtool systemd tmpfiles toolchain-funcs
-
-MY_P="${P/_/}"
-MY_P="${MY_P/beta/b}"
-
-DESCRIPTION="Allows users or groups to run commands as other users"
-HOMEPAGE="https://www.sudo.ws/"
-if [[ ${PV} == "9999" ]] ; then
-	inherit mercurial
-	EHG_REPO_URI="https://www.sudo.ws/repos/sudo"
-else
-	uri_prefix=
-	case ${P} in
-		*_beta*|*_rc*) uri_prefix=beta/ ;;
-	esac
-
-	SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
-		ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
-	if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~sparc-solaris"
-	fi
-fi
-
-# Basic license is ISC-style as-is, some files are released under
-# 3-clause BSD license
-LICENSE="ISC BSD"
-SLOT="0"
-IUSE="gcrypt ldap nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd"
-
-DEPEND="
-	sys-libs/zlib:=
-	virtual/libcrypt:=
-	gcrypt? ( dev-libs/libgcrypt:= )
-	ldap? (
-		>=net-nds/openldap-2.1.30-r1:=
-		sasl? (
-			dev-libs/cyrus-sasl
-			net-nds/openldap:=[sasl]
-		)
-	)
-	nls? ( virtual/libintl )
-	pam? ( sys-libs/pam )
-	sasl? ( dev-libs/cyrus-sasl )
-	skey? ( >=sys-auth/skey-1.1.5-r1 )
-	ssl? ( dev-libs/openssl:0= )
-	sssd? ( sys-auth/sssd[sudo] )
-"
-RDEPEND="
-	${DEPEND}
-	>=app-misc/editor-wrapper-3
-	virtual/editor
-	ldap? ( dev-lang/perl )
-	pam? ( sys-auth/pambase )
-	selinux? ( sec-policy/selinux-sudo )
-	sendmail? ( virtual/mta )
-"
-BDEPEND="
-	sys-devel/bison
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-	?? ( pam skey )
-	?? ( gcrypt ssl )
-"
-
-MAKEOPTS+=" SAMPLES="
-
-src_prepare() {
-	default
-	elibtoolize
-}
-
-set_secure_path() {
-	# first extract the default ROOTPATH from build env
-	SECURE_PATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env;
-		echo "${ROOTPATH}")
-		case "${SECURE_PATH}" in
-			*/usr/sbin*) ;;
-			*) SECURE_PATH=$(unset PATH;
-				. "${EPREFIX}"/etc/profile.env; echo "${PATH}")
-				;;
-		esac
-	if [[ -z ${SECURE_PATH} ]] ; then
-		ewarn "	Failed to detect SECURE_PATH, please report this"
-	fi
-
-	# then remove duplicate path entries
-	cleanpath() {
-		local newpath thisp IFS=:
-		for thisp in $1 ; do
-			if [[ :${newpath}: != *:${thisp}:* ]] ; then
-				newpath+=:${thisp}
-			else
-				einfo "   Duplicate entry ${thisp} removed..."
-			fi
-		done
-		SECURE_PATH=${newpath#:}
-	}
-	cleanpath /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin${SECURE_PATH:+:${SECURE_PATH}}
-
-	# finally, strip gcc paths #136027
-	rmpath() {
-		local e newpath thisp IFS=:
-		for thisp in ${SECURE_PATH} ; do
-			for e ; do [[ ${thisp} == ${e} ]] && continue 2 ; done
-			newpath+=:${thisp}
-		done
-		SECURE_PATH=${newpath#:}
-	}
-	rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*'
-}
-
-src_configure() {
-	local SECURE_PATH
-	set_secure_path
-	tc-export PKG_CONFIG #767712
-
-	# audit: somebody got to explain me how I can test this before I
-	# enable it.. - Diego
-	# plugindir: autoconf code is crappy and does not delay evaluation
-	# until `make` time, so we have to use a full path here rather than
-	# basing off other values.
-	myeconfargs=(
-		# requires some python eclass
-		--disable-python
-		--enable-tmpfiles.d="${EPREFIX}"/usr/lib/tmpfiles.d
-		--enable-zlib=system
-		--with-editor="${EPREFIX}"/usr/libexec/editor
-		--with-env-editor
-		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
-		--with-rundir="${EPREFIX}"/run/sudo
-		--with-vardir="${EPREFIX}"/var/db/sudo
-		--without-linux-audit
-		--without-opie
-		$(use_enable gcrypt)
-		$(use_enable nls)
-		$(use_enable sasl)
-		$(use_enable ssl openssl)
-		$(use_with ldap)
-		$(use_with ldap ldap_conf_file /etc/ldap.conf.sudo)
-		$(use_with offensive insults)
-		$(use_with offensive all-insults)
-		$(use_with pam)
-		$(use_with pam pam-login)
-		$(use_with secure-path secure-path "${SECURE_PATH}")
-		$(use_with selinux)
-		$(use_with sendmail)
-		$(use_with skey)
-		$(use_with sssd)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	if use ldap ; then
-		dodoc README.LDAP
-
-		cat <<-EOF > "${T}"/ldap.conf.sudo
-		# See ldap.conf(5) and README.LDAP for details
-		# This file should only be readable by root
-
-		# supported directives: host, port, ssl, ldap_version
-		# uri, binddn, bindpw, sudoers_base, sudoers_debug
-		# tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key}
-		EOF
-
-		if use sasl ; then
-			cat <<-EOF >> "${T}"/ldap.conf.sudo
-
-			# SASL directives: use_sasl, sasl_mech, sasl_auth_id
-			# sasl_secprops, rootuse_sasl, rootsasl_auth_id, krb5_ccname
-			EOF
-		fi
-
-		insinto /etc
-		doins "${T}"/ldap.conf.sudo
-		fperms 0440 /etc/ldap.conf.sudo
-
-		insinto /etc/openldap/schema
-		newins doc/schema.OpenLDAP sudo.schema
-	fi
-
-	if use pam; then
-		pamd_mimic system-auth sudo auth account session
-		pamd_mimic system-auth sudo-i auth account session
-	fi
-
-	keepdir /var/db/sudo/lectured
-	fperms 0700 /var/db/sudo/lectured
-	fperms 0711 /var/db/sudo #652958
-
-	# Don't install into /run as that is a tmpfs most of the time
-	# (bug #504854)
-	rm -rf "${ED}"/run || die
-
-	find "${ED}" -type f -name "*.la" -delete || die #697812
-}
-
-pkg_postinst() {
-	tmpfiles_process sudo.conf
-
-	#652958
-	local sudo_db="${EROOT}/var/db/sudo"
-	if [[ "$(stat -c %a "${sudo_db}")" -ne 711 ]] ; then
-		chmod 711 "${sudo_db}" || die
-	fi
-
-	if use ldap ; then
-		ewarn
-		ewarn "sudo uses the /etc/ldap.conf.sudo file for ldap configuration."
-		ewarn
-		if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then
-			ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly"
-			ewarn "configured in /etc/nsswitch.conf."
-			ewarn
-			ewarn "To make use of LDAP, add this line to your /etc/nsswitch.conf:"
-			ewarn "  sudoers: ldap files"
-			ewarn
-		fi
-	fi
-	if use prefix ; then
-		ewarn
-		ewarn "To use sudo, you need to change file ownership and permissions"
-		ewarn "with root privileges, as follows:"
-		ewarn
-		ewarn "  # chown root:root ${EPREFIX}/usr/bin/sudo"
-		ewarn "  # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so"
-		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers"
-		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers.d"
-		ewarn "  # chown root:root ${EPREFIX}/var/db/sudo"
-		ewarn "  # chmod 4111 ${EPREFIX}/usr/bin/sudo"
-		ewarn
-	fi
-
-	elog "To use the -A (askpass) option, you need to install a compatible"
-	elog "password program from the following list. Starred packages will"
-	elog "automatically register for the use with sudo (but will not force"
-	elog "the -A option):"
-	elog ""
-	elog " [*] net-misc/ssh-askpass-fullscreen"
-	elog "     net-misc/x11-ssh-askpass"
-	elog ""
-	elog "You can override the choice by setting the SUDO_ASKPASS environmnent"
-	elog "variable to the program you want to use."
-}
--- a/app-admin/sudo/sudo-1.9.9-r1.ebuild
+++ b/app-admin/sudo/sudo-1.9.9-r1.ebuild
@ -1,263 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pam libtool tmpfiles toolchain-funcs
-
-MY_P="${P/_/}"
-MY_P="${MY_P/beta/b}"
-
-DESCRIPTION="Allows users or groups to run commands as other users"
-HOMEPAGE="https://www.sudo.ws/"
-if [[ ${PV} == "9999" ]] ; then
-	inherit mercurial
-	EHG_REPO_URI="https://www.sudo.ws/repos/sudo"
-else
-	inherit verify-sig
-	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/sudo.ws.asc
-	BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-sudo )"
-
-	uri_prefix=
-	case ${P} in
-		*_beta*|*_rc*) uri_prefix=beta/ ;;
-	esac
-
-	SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
-		ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz
-		verify-sig? (
-			https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz.sig
-			ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz.sig
-		)"
-	if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~sparc-solaris"
-	fi
-fi
-
-# Basic license is ISC-style as-is, some files are released under
-# 3-clause BSD license
-LICENSE="ISC BSD"
-SLOT="0"
-IUSE="gcrypt ldap nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd"
-
-DEPEND="
-	sys-libs/zlib:=
-	virtual/libcrypt:=
-	gcrypt? ( dev-libs/libgcrypt:= )
-	ldap? (
-		>=net-nds/openldap-2.1.30-r1:=
-		sasl? (
-			dev-libs/cyrus-sasl
-			net-nds/openldap:=[sasl]
-		)
-	)
-	pam? ( sys-libs/pam )
-	sasl? ( dev-libs/cyrus-sasl )
-	skey? ( >=sys-auth/skey-1.1.5-r1 )
-	ssl? ( dev-libs/openssl:0= )
-	sssd? ( sys-auth/sssd[sudo] )
-"
-RDEPEND="
-	${DEPEND}
-	>=app-misc/editor-wrapper-3
-	virtual/editor
-	ldap? ( dev-lang/perl )
-	pam? ( sys-auth/pambase )
-	selinux? ( sec-policy/selinux-sudo )
-	sendmail? ( virtual/mta )
-"
-BDEPEND+="
-	sys-devel/bison
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-	?? ( pam skey )
-	?? ( gcrypt ssl )
-"
-
-MAKEOPTS+=" SAMPLES="
-
-src_prepare() {
-	default
-	elibtoolize
-}
-
-set_secure_path() {
-	# first extract the default ROOTPATH from build env
-	SECURE_PATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env;
-		echo "${ROOTPATH}")
-		case "${SECURE_PATH}" in
-			*/usr/sbin*) ;;
-			*) SECURE_PATH=$(unset PATH;
-				. "${EPREFIX}"/etc/profile.env; echo "${PATH}")
-				;;
-		esac
-	if [[ -z ${SECURE_PATH} ]] ; then
-		ewarn "	Failed to detect SECURE_PATH, please report this"
-	fi
-
-	# then remove duplicate path entries
-	cleanpath() {
-		local newpath thisp IFS=:
-		for thisp in $1 ; do
-			if [[ :${newpath}: != *:${thisp}:* ]] ; then
-				newpath+=:${thisp}
-			else
-				einfo "   Duplicate entry ${thisp} removed..."
-			fi
-		done
-		SECURE_PATH=${newpath#:}
-	}
-	cleanpath /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin${SECURE_PATH:+:${SECURE_PATH}}
-
-	# finally, strip gcc paths #136027
-	rmpath() {
-		local e newpath thisp IFS=:
-		for thisp in ${SECURE_PATH} ; do
-			for e ; do [[ ${thisp} == ${e} ]] && continue 2 ; done
-			newpath+=:${thisp}
-		done
-		SECURE_PATH=${newpath#:}
-	}
-	rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*'
-}
-
-src_configure() {
-	local SECURE_PATH
-	set_secure_path
-	tc-export PKG_CONFIG #767712
-
-	# audit: somebody got to explain me how I can test this before I
-	# enable it.. - Diego
-	# plugindir: autoconf code is crappy and does not delay evaluation
-	# until `make` time, so we have to use a full path here rather than
-	# basing off other values.
-	myeconfargs=(
-		# requires some python eclass
-		--disable-python
-		--enable-tmpfiles.d="${EPREFIX}"/usr/lib/tmpfiles.d
-		--enable-zlib=system
-		--with-editor="${EPREFIX}"/usr/libexec/editor
-		--with-env-editor
-		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
-		--with-rundir="${EPREFIX}"/run/sudo
-		--with-vardir="${EPREFIX}"/var/db/sudo
-		--without-linux-audit
-		--without-opie
-		$(use_enable gcrypt)
-		$(use_enable nls)
-		$(use_enable sasl)
-		$(use_enable ssl openssl)
-		$(use_with ldap)
-		$(use_with ldap ldap_conf_file /etc/ldap.conf.sudo)
-		$(use_with offensive insults)
-		$(use_with offensive all-insults)
-		$(use_with pam)
-		$(use_with pam pam-login)
-		$(use_with secure-path secure-path "${SECURE_PATH}")
-		$(use_with selinux)
-		$(use_with sendmail)
-		$(use_with skey)
-		$(use_with sssd)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	if use ldap ; then
-		dodoc README.LDAP.md
-
-		cat <<-EOF > "${T}"/ldap.conf.sudo
-		# See ldap.conf(5) and README.LDAP.md for details
-		# This file should only be readable by root
-
-		# supported directives: host, port, ssl, ldap_version
-		# uri, binddn, bindpw, sudoers_base, sudoers_debug
-		# tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key}
-		EOF
-
-		if use sasl ; then
-			cat <<-EOF >> "${T}"/ldap.conf.sudo
-
-			# SASL directives: use_sasl, sasl_mech, sasl_auth_id
-			# sasl_secprops, rootuse_sasl, rootsasl_auth_id, krb5_ccname
-			EOF
-		fi
-
-		insinto /etc
-		doins "${T}"/ldap.conf.sudo
-		fperms 0440 /etc/ldap.conf.sudo
-
-		insinto /etc/openldap/schema
-		newins docs/schema.OpenLDAP sudo.schema
-	fi
-
-	if use pam; then
-		pamd_mimic system-auth sudo auth account session
-		pamd_mimic system-auth sudo-i auth account session
-	fi
-
-	keepdir /var/db/sudo/lectured
-	fperms 0700 /var/db/sudo/lectured
-	fperms 0711 /var/db/sudo #652958
-
-	# Don't install into /run as that is a tmpfs most of the time
-	# (bug #504854)
-	rm -rf "${ED}"/run || die
-
-	find "${ED}" -type f -name "*.la" -delete || die #697812
-}
-
-pkg_postinst() {
-	tmpfiles_process sudo.conf
-
-	#652958
-	local sudo_db="${EROOT}/var/db/sudo"
-	if [[ "$(stat -c %a "${sudo_db}")" -ne 711 ]] ; then
-		chmod 711 "${sudo_db}" || die
-	fi
-
-	if use ldap ; then
-		ewarn
-		ewarn "sudo uses the /etc/ldap.conf.sudo file for ldap configuration."
-		ewarn
-		if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then
-			ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly"
-			ewarn "configured in /etc/nsswitch.conf."
-			ewarn
-			ewarn "To make use of LDAP, add this line to your /etc/nsswitch.conf:"
-			ewarn "  sudoers: ldap files"
-			ewarn
-		fi
-	fi
-	if use prefix ; then
-		ewarn
-		ewarn "To use sudo, you need to change file ownership and permissions"
-		ewarn "with root privileges, as follows:"
-		ewarn
-		ewarn "  # chown root:root ${EPREFIX}/usr/bin/sudo"
-		ewarn "  # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so"
-		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers"
-		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers.d"
-		ewarn "  # chown root:root ${EPREFIX}/var/db/sudo"
-		ewarn "  # chmod 4111 ${EPREFIX}/usr/bin/sudo"
-		ewarn
-	fi
-
-	elog "To use the -A (askpass) option, you need to install a compatible"
-	elog "password program from the following list. Starred packages will"
-	elog "automatically register for the use with sudo (but will not force"
-	elog "the -A option):"
-	elog ""
-	elog " [*] net-misc/ssh-askpass-fullscreen"
-	elog "     net-misc/x11-ssh-askpass"
-	elog ""
-	elog "You can override the choice by setting the SUDO_ASKPASS environmnent"
-	elog "variable to the program you want to use."
-}
--- a/app-admin/xstow/Manifest
+++ b/app-admin/xstow/Manifest
@ -1,2 +1 @@
-DIST xstow-1.0.1.tar.bz2 153530 BLAKE2B ad5d2677725f2254bb87a4cf8f73e8158868a206f41e9a2ee7bb2547ae6e8634ab65f58655a04051425e5818071253672ccf96b8ddccd01026e992d085e0c1c5 SHA512 bb4bb0e9d8fbfe3933c2137cd2258e3246ebfba549aec669a7f324e82af0eea4ab7ca38e68d7102c1417c1566029318749139fa91efd7a904b8f742d426a3d4b
 DIST xstow-1.0.2.tar.bz2 151622 BLAKE2B 45123c2cb018605c2e47940707384ea1824ddf4f542cfad6a73bfc3559803ca6ec7811252221ad80125e1821cac6d65bcc106b4acf294c4fa453e8043c78cf04 SHA512 319dcd57290fcee9fd66811e64af73ddab8abb11d47c0cb79d3e11f1ecdf18ab9511b3a0690621061d2613193cd4895f3bddb3d741159c23c14d278a8a8bf9dd
--- a/app-admin/xstow/xstow-1.0.1.ebuild
+++ b/app-admin/xstow/xstow-1.0.1.ebuild
@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Replacement for GNU stow with extensions"
-HOMEPAGE="http://xstow.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xstow/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="ncurses"
-
-DEPEND="ncurses? ( sys-libs/ncurses:0= )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-ncurses.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with ncurses curses)
-}
-
-src_install() {
-	emake DESTDIR="${D}" docdir="${EPREFIX}/usr/share/doc/${PF}/html" install
-	dodoc AUTHORS ChangeLog NEWS README TODO
-
-	# create new STOWDIR
-	keepdir /var/lib/xstow
-
-	# install env.d file to add STOWDIR to PATH and LDPATH
-	doenvd "${FILESDIR}/99xstow"
-}
-
-pkg_postinst() {
-	elog "We now recommend that you use /var/lib/xstow as your STOWDIR"
-	elog "instead of /usr/local in order to avoid conflicts with the"
-	elog "symlink from /usr/lib64 -> /usr/lib.  See Bug 246264"
-	elog "(regarding app-admin/stow, equally applicable to XStow) for"
-	elog "more details on this change."
-	elog "For your convenience, PATH has been updated to include"
-	elog "/var/lib/bin."
-}
--- a/app-admin/yadm/Manifest
+++ b/app-admin/yadm/Manifest
@ -1,3 +1 @@
-DIST yadm-2.4.0.tar.gz 96877 BLAKE2B 462a5816e106c4502007ff34ab338904e14a9851ebcfc7ff79a32a8b11fbbe3e0b7e6538ed6b489ab67e2205c84b2250749e3091c77fa663886dc9792078a576 SHA512 43e16a9502f9dd9f6c6dba3bb5403bb048244a406d44cb42a96a43e62bf7342efd5f302304dbedede61423546787fc929f378d68da9031207e70239ec4e265ce
-DIST yadm-3.1.1.tar.gz 106890 BLAKE2B c85bfdaf15da8e88aea8e1b41af5396111fe95922f38c9709d09d76b6cb515d4aff99f0caaa225baf36bc408f6efe7f53e7b2febd45c78acf2b5f3c897b87290 SHA512 6be40ff6b1130be93649bb533d63ddc2dad626bb3022392863b600b31eef2529df443a9eb24915979bef2d1ea4ef04124668723ffb0ce0f86727f481a3997c74
 DIST yadm-3.2.1.tar.gz 109838 BLAKE2B 4e0b829ca6f74c1300b78831d64fd95250bcea7779cca672707751e38129a7e618e8a69b2f3862ac6e87cb086de09380e4e624d54c4672c125d16ea8cc3ea11c SHA512 8ce9bc66a33fc3841e47293e002b834fac5760dc771ede37adfc47a9e911ddade23c0ef5379cf8f00cf9b24853abbc1263198b8439ca4e8a3acd5787fbd935cb
--- a/app-admin/yadm/yadm-2.4.0.ebuild
+++ b/app-admin/yadm/yadm-2.4.0.ebuild
@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit bash-completion-r1 python-any-r1
-
-DESCRIPTION="A dotfile manager for the config files in your home folder"
-HOMEPAGE="https://github.com/TheLocehiliosan/yadm/"
-SRC_URI="https://github.com/TheLocehiliosan/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-crypt/gnupg
-	dev-vcs/git
-"
-
-BDEPEND="
-	test? (
-		${RDEPEND}
-		${PYTHON_DEPS}
-		dev-python/pytest
-		dev-tcltk/expect
-	)
-"
-
-python_check_deps() {
-	has_version -b "dev-python/pytest[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_compile() {
-	emake "${PN}.md"
-}
-
-src_test() {
-	# test_encryption: needs write access to /tmp
-	# test_alt, test_compat_jinja, test_unit_template_j2: needs envtpl
-	# test_syntax: needs =dev-util/yamllint-1.17.0 (not packaged)
-	# test_compat_alt: known broken, tests deprecated features
-	# test_compat_jinja: needs envtpl
-	rm -v test/test_encryption.py || die
-	rm -v test/test_alt.py || die
-	rm -v test/test_compat_jinja.py || die
-	rm -v test/test_unit_template_j2.py || die
-	rm -v test/test_syntax.py || die
-	rm -v test/test_compat_alt.py || die
-
-	pytest || die "Testsuite failed under ${EPYTHON}"
-}
-
-src_install() {
-	einstalldocs
-
-	dobin "${PN}"
-	doman "${PN}.1"
-
-	newbashcomp completion/yadm.bash_completion yadm
-
-	insinto /usr/share/zsh/site-functions
-	newins completion/yadm.zsh_completion _${PN}
-}
--- a/app-admin/yadm/yadm-3.1.1.ebuild
+++ b/app-admin/yadm/yadm-3.1.1.ebuild
@ -1,88 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit bash-completion-r1 python-any-r1 python-utils-r1
-
-DESCRIPTION="Git based tool for managing dotfiles"
-HOMEPAGE="https://github.com/TheLocehiliosan/yadm"
-SRC_URI="https://github.com/TheLocehiliosan/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-shells/bash
-	app-crypt/gnupg
-	dev-vcs/git
-"
-
-BDEPEND="
-	test? (
-		${RDEPEND}
-		${PYTHON_DEPS}
-		$(python_gen_any_dep '
-			dev-python/pytest[${PYTHON_USEDEP}]
-		')
-		dev-tcltk/expect
-	)
-"
-
-python_check_deps() {
-	has_version -b "dev-python/pytest[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_compile() {
-	emake "${PN}.md"
-}
-
-src_test() {
-	# prevent system config having influence on tests
-	local -x GIT_CONFIG_NOSYSTEM=1
-
-	# prevent git branch warning, it confuses tests
-	local -x GIT_CONFIG_GLOBAL="${HOME}/.gitconfig"
-	git config --global init.defaultBranch master || die "setting default branch name failed"
-
-	# un-hardcode path to tmp, otherwise encryption tests fail
-	sed -i "s@^cache_dir = /tmp@cache_dir = ${TMPDIR}@" pytest.ini || die
-
-	local EPYTEST_DESELECT=(
-		test/test_alt.py # requires envtpl, not packaged
-		test/test_compat_jinja.py # ditto
-		test/test_unit_template_j2.py # ditto
-		test/test_syntax.py # needs new yamllint, not packaged yet
-		test/test_upgrade.py::test_upgrade # needs old version of yadm
-		test/test_compat_alt.py # tests obsolete features, broken
-		test/test_unit_template_esh.py # requires esh, not packaged
-		test/test_encryption.py::test_symmetric_encrypt[clean-encrypt_exists-bad_phrase] # hangs in sandbox
-		test/test_encryption.py::test_symmetric_encrypt[overwrite-encrypt_exists-bad_phrase] # ditto
-	)
-
-	epytest
-}
-
-src_install() {
-	einstalldocs
-
-	dobin "${PN}"
-	doman "${PN}.1"
-
-	dobashcomp completion/bash/yadm
-
-	insinto /usr/share/zsh/site-functions
-	doins completion/zsh/_${PN}
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins completion/fish/${PN}.fish
-}
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
--- a/app-arch/advancecomp/Manifest
+++ b/app-arch/advancecomp/Manifest
@ -1 +1,2 @@
+DIST advancecomp-2.3.tar.gz 1292157 BLAKE2B 7fdbbc4c53c58a4988339189d5e2e2412e782a69081b6ba39f86f4c2b101b03d8400f8104091eb8b22d2d4969515c8126011e79e346787bddba77d67387a6efe SHA512 87dc6a25139708b975ff138f73555fb2053c0fb8310412823624de7786a2034657fc3b4ddb6eeda332788073bbe21ea955b7368707186ee3bb61d1fe59e672e3
 DIST advancecomp-fcf71a89265c78fc26243574dda3a872574a5c02.tar.gz 1195310 BLAKE2B 9dcab7e266023f996504cfcfc9ba8237f216f2bf1af56d645e3fe7fb79a5e3d0dae2abdd47cc9c38c6ade385d1eb44b1e0ae6afa6fd2485afd1423be37276d06 SHA512 2c3e01146441aa940f6de464e0c19613f22d6a5fd671e4e0b1b83e68cad322ff0dc6be0fa328524332e6a782198edfeac0443b72a30d9c51c86e7c5ad141f6b7
--- a/app-arch/advancecomp/advancecomp-2.3.ebuild
+++ b/app-arch/advancecomp/advancecomp-2.3.ebuild
@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Recompress ZIP, PNG and MNG, considerably improving compression"
+HOMEPAGE="
+	https://www.advancemame.it/comp-readme.html
+	https://github.com/amadvance/advancecomp/
+"
+SRC_URI="
+	https://github.com/amadvance/advancecomp/releases/download/v${PV}/${P}.tar.gz
+"
+
+LICENSE="GPL-2+ Apache-2.0 LGPL-2.1+ MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	app-arch/bzip2:=
+	sys-libs/zlib:=
+"
+DEPEND="
+	${RDEPEND}
+"
+
+# Tests seem to rely on exact output:
+# https://sourceforge.net/p/advancemame/bugs/270/
+RESTRICT="test"
+
+src_configure() {
+	local myconf=(
+		--enable-bzip2
+		# (--disable-* arguments are mishandled)
+		# --disable-debug
+		# --disable-valgrind
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	dodoc HISTORY
+}
--- a/app-arch/gzip/Manifest
+++ b/app-arch/gzip/Manifest
@ -1,5 +1,2 @@
-DIST gzip-1.10.tar.xz 775144 BLAKE2B 431dc0fd11061eabd9db86594777b86510b124b124fd74799eacd67334631af60f638be2638413bee0153a9da35528d0aecc5b5083152c395223705400c9103b SHA512 e6ba9e3906cdb6a6235b213515093d02afa1722686f73eddacbacae628542b586b449829783b6a1701e9b9e0c4d4dfa6845904d3b6b010f5cf21aec4997c9299
-DIST gzip-1.11.tar.xz 804096 BLAKE2B c251066f0bded6a6557a5cbfe5d20090c6446051c31fad610af4f9f7b2537c28fed1cfab424a459452db73b7d1df1361e5aeba163a9e980fc611faf408cac128 SHA512 af297c173297d588722f4d0f140a2ae4d3ea3861464191772fb2e11e47be43644b5ae01ed63f0051d6eb4751666284de53e14c4dd9f0c1d25f61cf676fbf11f3
-DIST gzip-1.11.tar.xz.sig 833 BLAKE2B 3fde8303efdb96c38272e7e6886590e324cb13ce66bc592449c38852f176faf85edc8b992be0ff6a97f97be5d3c7df108bca2821ecb94decb2455fb8c2e11429 SHA512 ec039bf980714cdf122b4f13ba479fe6e23f123f4a553ca4f72935f331485a4b69f451361fc955e9ba3461ca650e4eaf04c617cad1fb985dd07529263d69525e
 DIST gzip-1.12.tar.xz 825548 BLAKE2B 7e2d482c08555f5fb0ff5408c0afe48c61034e9779eed6e3dd8046c847234c0a8a6bc34d49a934a54db0d73033e12c71a228d373551384a4cd663315071637e0 SHA512 116326fe991828227de150336a0c016f4fe932dfbb728a16b4a84965256d9929574a4f5cfaf3cf6bb4154972ef0d110f26ab472c93e62ec9a5fd7a5d65abea24
 DIST gzip-1.12.tar.xz.sig 833 BLAKE2B ab7b4a759ef163d67f20773607ba0408ea9f1f7c7c224f43635fc3752acc521b74dbea4ec9ebb58a2f4fa13ecae19e00779b4b56c2cb95976301445beff817aa SHA512 1f4702797f7c5f1873c2f9c2f6210ba23824455d17ee82f50f0bf24240ed5bdf0090cf85338ccf76ba82422f8b4ad3a329d8bbf1350cb094d7bd61aa45550397
--- a/app-arch/gzip/gzip-1.10.ebuild
+++ b/app-arch/gzip/gzip-1.10.ebuild
@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-DESCRIPTION="Standard GNU compressor"
-HOMEPAGE="https://www.gnu.org/software/gzip/"
-SRC_URI="mirror://gnu/gzip/${P}.tar.xz
-	https://alpha.gnu.org/gnu/gzip/${P}.tar.xz
-	mirror://gentoo/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="pic static"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.3.8-install-symlinks.patch"
-)
-
-src_configure() {
-	use static && append-flags -static
-	# avoid text relocation in gzip
-	use pic && export DEFS="NO_ASM"
-	econf --disable-gcc-warnings #663928
-}
-
-src_install() {
-	default
-	docinto txt
-	dodoc algorithm.doc gzip.doc
-
-	# keep most things in /usr, just the fun stuff in /
-	dodir /bin
-	mv "${ED}"/usr/bin/{gunzip,gzip,uncompress,zcat} "${ED}"/bin/ || die
-	sed -e "s:${EPREFIX}/usr:${EPREFIX}:" -i "${ED}"/bin/gunzip || die
-}
--- a/app-arch/gzip/gzip-1.11.ebuild
+++ b/app-arch/gzip/gzip-1.11.ebuild
@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gzip.asc
-inherit flag-o-matic verify-sig
-
-DESCRIPTION="Standard GNU compressor"
-HOMEPAGE="https://www.gnu.org/software/gzip/"
-SRC_URI="mirror://gnu/gzip/${P}.tar.xz
-	https://alpha.gnu.org/gnu/gzip/${P}.tar.xz"
-SRC_URI+=" verify-sig? (
-		mirror://gnu/gzip/${P}.tar.xz.sig
-		https://alpha.gnu.org/gnu/gzip/${P}.tar.xz.sig
-	)"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="pic static"
-
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-gzip )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.3.8-install-symlinks.patch"
-)
-
-src_configure() {
-	use static && append-flags -static
-	# avoid text relocation in gzip
-	use pic && export DEFS="NO_ASM"
-	econf --disable-gcc-warnings #663928
-}
-
-src_install() {
-	default
-	docinto txt
-	dodoc algorithm.doc gzip.doc
-
-	# keep most things in /usr, just the fun stuff in /
-	dodir /bin
-	mv "${ED}"/usr/bin/{gunzip,gzip,uncompress,zcat} "${ED}"/bin/ || die
-	sed -e "s:${EPREFIX}/usr:${EPREFIX}:" -i "${ED}"/bin/gunzip || die
-}
--- a/app-arch/gzip/gzip-1.12.ebuild
+++ b/app-arch/gzip/gzip-1.12.ebuild
@ -17,7 +17,7 @@ SRC_URI+=" verify-sig? (

 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="pic static"

 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-gzip )"
--- a/app-arch/lrzip/Manifest
+++ b/app-arch/lrzip/Manifest
@ -1,3 +1 @@
-DIST lrzip-0.641.tar.gz 262761 BLAKE2B 5a81d9ca8b40c141c90488e9ffcd1dfd5bef3fe7cf9b02c00b9382cd902ef8cd891401f21c9cdd5d5750daf639c05a1e6f1f010fcbf42a9cdaa4f11921fac783 SHA512 cb14dda15485faa24cb840dd94ecd4741bd47464770ae8b27f97b5c263d8a32e40ceb17b288f0f70426598ef2acf84b091593fc8cf7a0f2db0abde88d09a301f
-DIST lrzip-0.650.tar.gz 238952 BLAKE2B 5013de6f8948aebf1bb7545c392b623a1628f74298cab3316555ec6a1acbbc64f81abcf1f5c8a7a67a547d8748f7bb05d0d88cb58b6fa3ab765baad596acb756 SHA512 30a3217703748f6894fbac438976e3179a46e3f6af59e5849f7f8460d1a094275a4b41790617f4bd1ae7c7476548d2daadcfab9ab60c167ce5c24cd593e70964
 DIST lrzip-0.651.tar.gz 238854 BLAKE2B 2680867ccbee6ff669581017c9bb22db4d7eba0fda80b935bd088191809cb8baa833a03e7732cd1fe5a0487edfe577b34f34dcdcda121c114145bff9fc17ba79 SHA512 97671c4705bc06dfd037e38f4384a5ffaf2e3508da217406ac43642b88eae16576818a378bce519812204fecefbd6552a75fc3e74af729ab7b11724b7a6d1998
--- a/app-arch/lrzip/files/lrzip-0.631-solaris.patch
+++ b/app-arch/lrzip/files/lrzip-0.631-solaris.patch
@ -1,11 +0,0 @@
--- a/liblrzip.c
-+++ b/liblrzip.c
-@@ -36,7 +36,7 @@
- #include "lrzip_core.h"
- #include "rzip.h"
- 
-#if defined(__APPLE__) || defined(__FreeBSD__)
-+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__sun) || defined(sun)
- # define fmemopen(s, len, modes) fake_fmemopen((s), (len), (modes))
- static FILE *fake_fmemopen(void *buf, size_t buflen, const char *mode)
- {
--- a/app-arch/lrzip/files/lrzip-missing-stdarg_h.patch
+++ b/app-arch/lrzip/files/lrzip-missing-stdarg_h.patch
@ -1,11 +0,0 @@
-diff -Naur Lrzip.h.orig Lrzip.h
--- a/Lrzip.h	2013-11-30 20:07:27.343086997 +0000
-+++ b/Lrzip.h	2013-11-30 20:07:44.072641056 +0000
-@@ -22,6 +22,7 @@
- 
- #include <stdbool.h>
- #include <stdio.h>
-+#include <stdarg.h>
- #ifdef _WIN32
- # include <stddef.h>
- #else
--- a/app-arch/lrzip/lrzip-0.641-r1.ebuild
+++ b/app-arch/lrzip/lrzip-0.641-r1.ebuild
@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Long Range ZIP or Lzma RZIP optimized for compressing large files"
-HOMEPAGE="https://github.com/ckolivas/lrzip"
-SRC_URI="https://github.com/ckolivas/lrzip/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND="
-	app-arch/bzip2
-	dev-libs/lzo
-	app-arch/lz4
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-perl/Pod-Parser
-	amd64? ( dev-lang/nasm )
-	x86? ( dev-lang/nasm )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-missing-stdarg_h.patch
-	"${FILESDIR}"/${PN}-0.631-solaris.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	# ASM optimizations are only available on amd64 and x86, bug #829003
-	local asm=no
-	if use amd64 || use x86; then
-		asm=yes
-	fi
-
-	econf \
-		$(use_enable static-libs static) \
-		--enable-asm=${asm}
-}
-
-src_install() {
-	default
-	# Don't collide with net-dialup/lrzsz and /usr/bin/lrz, bug #588206
-	rm -f "${ED}"/usr/bin/lrz || die
-	rm -f "${ED}"/usr/share/man/man1/lrz.* || die
-
-	find "${D}" -name '*.la' -delete || die
-}
--- a/app-arch/lrzip/lrzip-0.650.ebuild
+++ b/app-arch/lrzip/lrzip-0.650.ebuild
@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Long Range ZIP or Lzma RZIP optimized for compressing large files"
-HOMEPAGE="https://github.com/ckolivas/lrzip"
-SRC_URI="https://github.com/ckolivas/lrzip/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND="app-arch/bzip2
-	app-arch/lz4
-	dev-libs/lzo
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-perl/Pod-Parser
-	amd64? ( dev-lang/nasm )
-	x86? ( dev-lang/nasm )"
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	# ASM optimizations are only available on amd64 and x86, bug #829003
-	local asm=no
-	if use amd64 || use x86; then
-		asm=yes
-	fi
-
-	econf \
-		$(use_enable static-libs static) \
-		--enable-asm=${asm}
-}
-
-src_install() {
-	default
-	# Don't collide with net-dialup/lrzsz and /usr/bin/lrz, bug #588206
-	rm -f "${ED}"/usr/bin/lrz || die
-	rm -f "${ED}"/usr/share/man/man1/lrz.* || die
-
-	find "${ED}" -name '*.la' -delete || die
-}
--- a/app-arch/mt-st/Manifest
+++ b/app-arch/mt-st/Manifest
@ -1,2 +1 @@
-DIST mt-st-1.3.tar.gz 35341 BLAKE2B c58eee9bd58a3fa5105fe3f8dfb56f1af1c5ed73f99e5179ea14bc11d66151d1e6b6c99f61194c700ed79ce10a7e7f75f78ffe9b7d2c45c85e620d4da1aaeb5c SHA512 1d026ae85e1ca367e72f1810042314070f592306d9ddec331b95ea4e1153dc3edee68d8798bdf7e055a4cf9c67ec8c539e5d188e87f0546f48b5f4ee4bc6a820
 DIST mt-st-1.4.tar.gz 37864 BLAKE2B 25ae656b6442e53570366405ba76da9150cf1d4fe33c612bf922d8be967ce6b60be191948507a62bb1881d4be63ed192f7d03f1d63c38f5772aec2f3d2fe455b SHA512 e6655a5957d3ac470c0cb0a1955a12397aa22f3ea1a427cf776f6bf2d6fd665439b2bfa54c3870b7974da537f0fe71d3be43126be1a7db903e6bc7be4cfb10ec
--- a/app-arch/mt-st/mt-st-1.3.ebuild
+++ b/app-arch/mt-st/mt-st-1.3.ebuild
@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Control magnetic tape drive operation"
-HOMEPAGE="https://github.com/iustin/mt-st"
-SRC_URI="https://github.com/iustin/mt-st/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${CPPFLAGS} ${LDFLAGS}"
-}
-
-src_install() {
-	dosbin mt stinit
-	doman mt.1 stinit.8
-	dodoc README* stinit.def.examples
-}
--- a/app-arch/wimlib/Manifest
+++ b/app-arch/wimlib/Manifest
@ -1,2 +1 @@
-DIST wimlib-1.13.3.tar.gz 1030667 BLAKE2B 2b897392bed3c4a390479f34925474c229ee835ab624c81a0baa7ebb8f3484f27aa4efb2a440debdcafe23b152b385bbe0f198d6f0560e8f88a34c7328a74edd SHA512 5c6e3bd1d7bda55812c818cc527cd241ac8a15276648f2a307db1f2a858de0b322e9f2beffda5bab991811aee3f4a953c3e31847bfa76a7d32ad5850595a15d4
 DIST wimlib-1.13.4.tar.gz 1040411 BLAKE2B 4563429d42be39b959a15ef66ac4c173531ff0c0b0f1a341812a4f870c9f189478f3ce78bf6240544f71b1746d98c9eae3f7182d646355343e26526559384f07 SHA512 480fe6fa6c6e8f1bf9c3960f5e1671f3266535b18dc72e9d7c4c05c7fb833d9b00db5ae9fb49154da6e71e536cae8b562cbf81ab5a124e2a79326927e2cf7344
--- a/app-arch/wimlib/metadata.xml
+++ b/app-arch/wimlib/metadata.xml
@ -6,7 +6,6 @@
 		<flag name="fuse">Use fuse libraries</flag>
 		<flag name="iso">Install app-cdr/cdrtools in order to prepare iso images</flag>
 		<flag name="ntfs">Use libntfs-3g library from sys-fs/ntfs3g</flag>
-		<flag name="openssl">Use the SHA-1 message digest from libcrypto instead of compilling another implementation</flag>
 		<flag name="yasm">Use yasm assembler instead of nasm</flag>
 	</use>
 </pkgmetadata>
--- a/app-arch/wimlib/wimlib-1.13.3-r1.ebuild
+++ b/app-arch/wimlib/wimlib-1.13.3-r1.ebuild
@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools pax-utils
-if [[ -z ${PV%%*9999} ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://wimlib.net/${PN}"
-else
-	MY_PV="${PV/_/-}"
-	MY_PV="${MY_PV^^}"
-	SRC_URI="https://wimlib.net/downloads/${PN}-${MY_PV}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="The open source Windows Imaging (WIM) library"
-HOMEPAGE="https://wimlib.net/"
-
-LICENSE="|| ( GPL-3+ LGPL-3+ ) CC0-1.0"
-SLOT="0"
-IUSE="cpu_flags_x86_ssse3 fuse iso ntfs openssl test threads yasm"
-REQUIRED_USE="cpu_flags_x86_ssse3? ( !openssl )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-	cpu_flags_x86_ssse3? (
-		yasm? ( dev-lang/yasm )
-		!yasm? ( dev-lang/nasm )
-	)
-"
-RDEPEND="
-	dev-libs/libxml2:2
-	ntfs? ( sys-fs/ntfs3g:= )
-	fuse? ( sys-fs/fuse:0 )
-	openssl? ( dev-libs/openssl:= )
-	iso? (
-		app-arch/cabextract
-		app-cdr/cdrtools
-	)
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with ntfs ntfs-3g)
-		$(use_with fuse)
-		$(use_enable cpu_flags_x86_ssse3 ssse3-sha1)
-		$(use_with openssl libcrypto)
-		$(use_enable threads multithreaded-compression)
-		$(use_enable test test-support)
-		--disable-static
-	)
-	ac_cv_prog_NASM="$(usex yasm yasm nasm)" \
-		econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-	pax-mark m "${S}"/.libs/wimlib-imagex
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
--- a/app-arch/xz-utils/xz-utils-5.2.5-r1.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.5-r1.ebuild
@ -1,114 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Remember: we cannot leverage autotools in this ebuild in order
-#           to avoid circular deps with autotools
-
-EAPI=7
-
-inherit libtool multilib multilib-minimal preserve-libs usr-ldscript
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://git.tukaani.org/xz.git"
-	inherit git-r3 autotools
-
-	# bug #272880 and bug #286068
-	BDEPEND="sys-devel/gettext >=sys-devel/libtool-2"
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/lassecollin.asc
-	inherit verify-sig
-
-	MY_P="${PN/-utils}-${PV/_}"
-	SRC_URI="https://tukaani.org/xz/${MY_P}.tar.gz"
-	SRC_URI+=" verify-sig? ( https://tukaani.org/xz/${MY_P}.tar.gz.sig )"
-
-	if [[ ${PV} != *_alpha* ]] && [[ ${PV} != *_beta* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	fi
-	S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="Utils for managing LZMA compressed files"
-HOMEPAGE="https://tukaani.org/xz/"
-
-# See top-level COPYING file as it outlines the various pieces and their licenses.
-LICENSE="public-domain LGPL-2.1+ GPL-2+"
-SLOT="0"
-IUSE="+extra-filters nls static-libs"
-
-RDEPEND="!<app-arch/lzma-4.63
-	!<app-arch/p7zip-4.57
-	!<app-i18n/man-pages-de-2.16"
-DEPEND="${RDEPEND}"
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-lassecollin )"
-
-# Tests currently do not account for smaller feature set
-RESTRICT="!extra-filters? ( test )"
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999 ]] ; then
-		eautopoint
-		eautoreconf
-	else
-		# Allow building shared libs on Solaris/x64
-		elibtoolize
-	fi
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--enable-threads
-		$(use_enable nls)
-		$(use_enable static-libs static)
-	)
-
-	if ! multilib_is_native_abi ; then
-		myconf+=(
-			--disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts}
-		)
-	fi
-
-	if ! use extra-filters ; then
-		myconf+=(
-			# LZMA1 + LZMA2 for standard .lzma & .xz files
-			--enable-encoders=lzma1,lzma2
-			--enable-decoders=lzma1,lzma2
-
-			# those are used by default, depending on preset
-			--enable-match-finders=hc3,hc4,bt4
-
-			# CRC64 is used by default, though some (old?) files use CRC32
-			--enable-checks=crc32,crc64
-		)
-	fi
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		export gl_cv_posix_shell="${EPREFIX}"/bin/sh
-
-		# Undo Solaris-based defaults pointing to /usr/xpg5/bin
-		myconf+=( --disable-path-for-script )
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-multilib_src_install() {
-	default
-
-	gen_usr_ldscript -a lzma
-}
-
-multilib_src_install_all() {
-	find "${ED}" -type f -name '*.la' -delete || die
-	rm "${ED}"/usr/share/doc/${PF}/COPYING* || die
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/liblzma$(get_libname 0)
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/liblzma$(get_libname 0)
-}
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
--- a/app-backup/backintime/Manifest
+++ b/app-backup/backintime/Manifest
@ -1,3 +1,2 @@
-DIST backintime-1.2.1.tar.gz 713853 BLAKE2B 0f05d6cdc04a41ec9737badb8693c1270bb1333b2986fce925625ba2d7be05de0630ff5f59a7b5854a38ba382d6992df1ffc4e1cb584cae0e2618b877db4f06b SHA512 91dbc76a7db81469c5a538be03196c8e307d13307486d8e1c6cad10ce0af399de495f0292fecffc2853ed78804b5899750f06f274b4701efe3af6a708ea1024e
 DIST backintime-1.3.1.tar.gz 714401 BLAKE2B 5b6a294d5a22ee3928725caf1a9895b665bfcddd6b779355cd7f7e58b5a201c3d2158ef4b30fb73eb4525c1a54cacf878397874f28b06798b7bfd973df467a39 SHA512 faac8552748da75db62cf7fa7eea686fd8b262016d1072f432fff54a6c0c72929650582870b4c56efbaa4ef5984acaece9e1d76eb72abcce91c6fc92d34d52ad
 DIST backintime-1.3.2.tar.gz 714459 BLAKE2B cc53bd5391155705016248511e30cdfa7bc25f0a7cb170dfeeffda397e8be1b22f8e335063289d8c192f94c469430655064899ac8059f22f3b7582e3af87d373 SHA512 19f756d03cc7533e02bb5172ae3f8c167206bf5e8d60c0f3af1f647e01297a4eeb7889bbb5b58e46636bc31392ee436249b276ddbfa41697a0538c542fa26cb8
--- a/app-backup/backintime/backintime-1.2.1.ebuild
+++ b/app-backup/backintime/backintime-1.2.1.ebuild
@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit python-single-r1 xdg
-
-DESCRIPTION="Backup system inspired by TimeVault and FlyBack"
-HOMEPAGE="https://backintime.readthedocs.io/en/latest/ https://github.com/bit-team/backintime/"
-SRC_URI="https://github.com/bit-team/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples qt5"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-python/keyring[${PYTHON_USEDEP}]
-	')
-	net-misc/openssh
-	net-misc/rsync[xattr,acl]
-"
-RDEPEND="${DEPEND}
-	qt5? ( dev-python/PyQt5[gui,widgets] )
-"
-
-PATCHES=( "${FILESDIR}/${P}-no-compress-docs-examples.patch" )
-
-src_configure() {
-	pushd common > /dev/null || die
-		./configure --python3 --no-fuse-group || die
-	popd > /dev/null || die
-	if use qt5 ; then
-		pushd qt > /dev/null || die
-			./configure --python3 || die
-		popd > /dev/null || die
-	fi
-}
-
-src_compile() {
-	pushd common > /dev/null || die
-		emake
-	popd > /dev/null || die
-	if use qt5 ; then
-		pushd qt > /dev/null || die
-			emake
-		popd > /dev/null || die
-	fi
-}
-
-src_install() {
-	pushd common > /dev/null || die
-		emake DESTDIR="${D}" install
-	popd > /dev/null || die
-	if use qt5 ; then
-		pushd qt > /dev/null || die
-			emake DESTDIR="${D}" install
-		popd > /dev/null || die
-	fi
-
-	einstalldocs
-	if use examples ; then
-		docinto examples
-		dodoc common/{config-example-local,config-example-ssh}
-	fi
-
-	python_optimize "${D}"
-}
--- a/app-backup/dar/dar-2.7.4.ebuild
+++ b/app-backup/dar/dar-2.7.4.ebuild
@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/dar/${P}.tar.gz"

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ppc sparc ~x86 ~amd64-linux"
+KEYWORDS="amd64 ppc sparc x86 ~amd64-linux"
 IUSE="argon2 curl dar32 dar64 doc gcrypt gpg lz4 lzo nls rsync threads xattr"

 REQUIRED_USE="?? ( dar32 dar64 )
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
--- a/app-benchmarks/bootchart2/Manifest
+++ b/app-benchmarks/bootchart2/Manifest
@ -1,2 +1 @@
-DIST bootchart2-0.14.8.tar.gz 1175527 BLAKE2B 623ca2269420eda79b09d955ab9d4a37af004e9e97ad0e0c6014e53b4b0c63239661cb5359345306504980b060ccd11488970cb0aa3d832bfb55392724e715dd SHA512 58303db91d22ccc44c0dc765e7a6672fb277840555fd87ce64b8987cba85250cfe3db17f3ec7e0e1e726ad59166a5d3d01a7a262c07b5690c595877b46c66bd0
 DIST bootchart2-0.14.9.tar.gz 1175710 BLAKE2B af472193c7de313e770da1a88baf00e9ee38e36c0d3c900bab2657bfa5d2398dd9edc616ec770f49a6c5fa8e29f738ddf2c0951ea039a48a2a89b0ffd94759fb SHA512 7ee1220b0add027fc39f710cc01119d7aaa22fe11736497b089c26955216cef10552216ed29ca55bf08aa848f92bb11d74deeb3aa69769dfecf3a55aa988e58b
--- a/app-benchmarks/bootchart2/bootchart2-0.14.8-r1.ebuild
+++ b/app-benchmarks/bootchart2/bootchart2-0.14.8-r1.ebuild
@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info systemd toolchain-funcs
-
-DESCRIPTION="Performance analysis and visualization of the system boot process"
-HOMEPAGE="https://github.com/mmeeks/bootchart/"
-SRC_URI="https://github.com/mmeeks/bootchart/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RESTRICT="test"
-
-RDEPEND="
-	!app-benchmarks/bootchart
-	sys-apps/lsb-release"
-
-S="${WORKDIR}"/${PN%2}-${PV}
-
-CONFIG_CHECK="~PROC_EVENTS ~TASKSTATS ~TASK_DELAY_ACCT ~TMPFS"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.14.7-sysmacros.patch # bug 579922
-	"${FILESDIR}"/${P}-no-compressed-man.patch
-)
-
-src_prepare() {
-	default
-	tc-export CC
-	sed -i \
-		-e "/^install/s:py-install-compile::g" \
-		-e "/^SYSTEMD_UNIT_DIR/s:=.*:= $(systemd_get_systemunitdir):g" \
-		Makefile || die
-	sed -i \
-		-e '/^EXIT_PROC/s:^.*$:EXIT_PROC="agetty mgetty mingetty:g' \
-		bootchartd.conf bootchartd.in || die
-}
-
-src_install() {
-	export DOCDIR=/usr/share/doc/${PF}
-	default
-
-	# Note: LIBDIR is hardcoded as /lib in collector/common.h, so we shouldn't
-	# just change it. Since no libraries are installed, /lib is fine.
-	keepdir /lib/bootchart/tmpfs
-
-	newinitd "${FILESDIR}"/${PN}.init ${PN}
-}
-
-pkg_postinst() {
-	elog "If you are using an initrd during boot"
-	elog "please add the init script to your default runlevel"
-	elog "rc-update add bootchart2 default"
-}
--- a/app-benchmarks/bootchart2/files/bootchart2-0.14.7-sysmacros.patch
+++ b/app-benchmarks/bootchart2/files/bootchart2-0.14.7-sysmacros.patch
@ -1,30 +0,0 @@
-https://bugs.gentoo.org/579922
-https://github.com/xrmx/bootchart/commit/add58c3b57064afd6f7d2fd5f09006d28a3e770e
-
-From add58c3b57064afd6f7d2fd5f09006d28a3e770e Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Thu, 21 Apr 2016 00:19:32 -0400
-Subject: [PATCH] include sys/sysmacros.h for major/minor/makedev
-
-These funcs are defined in the sys/sysmacros.h header, not sys/types.h.
-Linux C libraries are updating to drop the implicit include, so we need
-to include it explicitly.
---
- collector/collector.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/collector/collector.c b/collector/collector.c
-index cfdcb26..2f3ce6b 100644
--- a/collector/collector.c
-+++ b/collector/collector.c
-@@ -33,6 +33,7 @@
- #include "common.h"
- 
- #include <sys/mount.h>
-+#include <sys/sysmacros.h>
- #include <linux/fs.h>
- #include <linux/genetlink.h>
- #include <linux/taskstats.h>
-- 
-2.7.4
-
--- a/app-benchmarks/siege/Manifest
+++ b/app-benchmarks/siege/Manifest
@ -1,2 +1 @@
-DIST siege-4.0.9.tar.gz 525804 BLAKE2B d857df05f40a0ac26a8abdd54e7de374125dde4c114bd1ac3ddd9e9856a30d4fdfefd325980717e59b5876df99a87f971c5b3f91d6478f9638f1860557615169 SHA512 6208b7924162be4dd7ea8cdc297930d28e8a1cb125cf26e8707c2cb67efad741cd090c12081ea80837314d4b5703da152a97b0e8fbf4c64ff64c6714eb4b5fc7
 DIST siege-4.1.0.tar.gz 541331 BLAKE2B c3e8e0f101e27a0902de80478e7c6595f44b4d129cfb265d66c48fcacef4129f587f9ca9ddd0c4d5016513ba19d7635135add1cb02290c4d2bbed5cea501a816 SHA512 15b3b82877153f044524cedc96750a6dab4d21ccbef1be53c0069adade6c3b4204287852a30a57275eea0f51c702857dff59648bd885c28ce65feae141cf6593
--- a/app-benchmarks/siege/siege-4.0.9.ebuild
+++ b/app-benchmarks/siege/siege-4.0.9.ebuild
@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1
-
-DESCRIPTION="A HTTP regression testing and benchmarking utility"
-HOMEPAGE="https://www.joedog.org/siege-home https://github.com/JoeDog/siege"
-SRC_URI="http://download.joedog.org/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ppc x86 ~x64-macos"
-SLOT="0"
-
-IUSE="ssl"
-
-RDEPEND="ssl? ( dev-libs/openssl:0= )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	# bundled macros break recent libtool
-	# remove /usr/lib from LDFLAGS, bug #732886
-	sed -i \
-		-e '/AC_PROG_SHELL/d' \
-		-e 's/SSL_LDFLAGS="-L.*lib"/SSL_LDFLAGS=""/g' \
-		-e 's/Z_LDFLAGS="-L.*lib"/Z_LDFLAGS=""/g' \
-		configure.ac || die
-	rm *.m4 || die "failed to remove bundled macros"
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_with ssl ssl "${EPREFIX}/usr")
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-
-	dodoc AUTHORS ChangeLog INSTALL README* doc/siegerc doc/urls.txt
-
-	newbashcomp "${FILESDIR}"/${PN}.bash-completion ${PN}
-}
-
-pkg_postinst() {
-	elog "An example ~/.siegerc file has been installed in"
-	elog "${EPREFIX}/usr/share/doc/${PF}/"
-}
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
--- a/app-containers/cri-tools/Manifest
+++ b/app-containers/cri-tools/Manifest
@ -1,4 +1 @@
-DIST cri-tools-1.18.0.tar.gz 5295512 BLAKE2B 9dda4a401b858e98aa60521d3268d8f6ff6a2c1bd2c219a0e5e9e5360fba58d41e97258c636da26ee57bbfc3286798c74107c7de92d3e3398bdf53b7d9078e94 SHA512 849b496e6d19eec29e0e56f0b37c094649311b80514f319b0c68c6519e3ddd48e1973c3d288144db998826676416644ec705b7ea0916c21898b40928ea800af1
-DIST cri-tools-1.21.0.tar.gz 6739482 BLAKE2B 365e3e9b220e63713dd21af4154b2282c20db1d19ba6b32da616c5d73957a375ab12ed2a86694abb9d90e1020be1fd89c128ed3e469d2f7524dcf42139e7df56 SHA512 a307f5526fb8b7b23a1635b168a8f3b9b9b4bd6ccb94d461dc5af2065e6d1be527dadcb1c86e04808b244d0851a4901ee78a0263f58cf673f6ca503621d5eb61
-DIST cri-tools-1.22.0.tar.gz 6821114 BLAKE2B 48bf99488cd3a65ac5ff14d8b46359f2ce7163f9810b255dfeeacea9aa2b86310d242dd174fc29490ae24a985d0cbf51bd1f4d9a752bd5828fdfae73eab2be31 SHA512 4a2751ebe0b1ed7cb739a71230272ace0cbddc516abba39c6bf07d5e2648bd60e2139935b77a5388028887915162c957f652ea05434ff7865256721d10f863df
 DIST cri-tools-1.23.0.tar.gz 6823865 BLAKE2B 75d394ec1f9ccf2122476c9b845499212d668f8170ae8551913e3e057271986ab77454bdd0fa646127bfadda203fabdc57cc448dfe1e64dd7cdbedc8f5ee8cf6 SHA512 36700eaf872da14921e0b2c8fa68f91e3e0226364e29a5b8e132fbd52504e130e0bc2cce30aba21e7def576a4682f150b0b051d44b78aa694c225c10999d7155
--- a/app-containers/cri-tools/cri-tools-1.18.0.ebuild
+++ b/app-containers/cri-tools/cri-tools-1.18.0.ebuild
@ -1,32 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module
-MY_PV="v${PV/_beta/-beta.}"
-
-DESCRIPTION="CLI and validation tools for Kubelet Container Runtime (CRI)"
-HOMEPAGE="https://github.com/kubernetes-sigs/cri-tools"
-SRC_URI="https://github.com/kubernetes-sigs/cri-tools/archive/${MY_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"
-
-RESTRICT+=" test"
-
-src_compile() {
-	emake VERSION="${MY_PV}"
-	_output/crictl completion bash > ${PN}.bash || die
-	_output/crictl completion zsh > ${PN}.zsh || die
-}
-
-src_install() {
-	dobin _output/crictl
-
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-
-	dodoc -r docs {README,RELEASE,CHANGELOG,CONTRIBUTING}.md
-}
--- a/app-containers/cri-tools/cri-tools-1.21.0.ebuild
+++ b/app-containers/cri-tools/cri-tools-1.21.0.ebuild
@ -1,34 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="CLI and validation tools for Kubelet Container Runtime (CRI)"
-HOMEPAGE="https://github.com/kubernetes-sigs/cri-tools"
-SRC_URI="https://github.com/kubernetes-sigs/cri-tools/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"
-
-DEPEND="dev-lang/go"
-
-RESTRICT+=" test"
-
-src_compile() {
-	emake VERSION="${PV}"
-	./build/bin/crictl completion bash > "${PN}.bash" || die
-	./build/bin/crictl completion zsh > "${PN}.zsh" || die
-}
-
-src_install() {
-	dobin ./build/bin/crictl
-
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-
-	dodoc -r docs {README,RELEASE,CHANGELOG,CONTRIBUTING}.md
-}
--- a/app-containers/cri-tools/cri-tools-1.22.0.ebuild
+++ b/app-containers/cri-tools/cri-tools-1.22.0.ebuild
@ -1,34 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="CLI and validation tools for Kubelet Container Runtime (CRI)"
-HOMEPAGE="https://github.com/kubernetes-sigs/cri-tools"
-SRC_URI="https://github.com/kubernetes-sigs/cri-tools/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"
-
-DEPEND="dev-lang/go"
-
-RESTRICT+=" test"
-
-src_compile() {
-	emake VERSION="${PV}"
-	./build/bin/crictl completion bash > "${PN}.bash" || die
-	./build/bin/crictl completion zsh > "${PN}.zsh" || die
-}
-
-src_install() {
-	dobin ./build/bin/crictl
-
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-
-	dodoc -r docs {README,RELEASE,CHANGELOG,CONTRIBUTING}.md
-}
--- a/app-containers/runc/files/CVE-2021-43784.patch
+++ b/app-containers/runc/files/CVE-2021-43784.patch
@ -1,86 +0,0 @@
-From b8dbe46687c2a96efa9252b69d3fc1ce33bdc416 Mon Sep 17 00:00:00 2001
-From: Aleksa Sarai <cyphar@cyphar.com>
-Date: Thu, 18 Nov 2021 16:12:59 +1100
-Subject: [PATCH] runc init: avoid netlink message length overflows
-
-When writing netlink messages, it is possible to have a byte array
-larger than UINT16_MAX which would result in the length field
-overflowing and allowing user-controlled data to be parsed as control
-characters (such as creating custom mount points, changing which set of
-namespaces to allow, and so on).
-
-Co-authored-by: Kir Kolyshkin <kolyshkin@gmail.com>
-Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
-Signed-off-by: Aleksa Sarai <cyphar@cyphar.com>
---
- libcontainer/container_linux.go | 20 +++++++++++++++++++-
- libcontainer/message_linux.go   |  9 +++++++++
- 2 files changed, 28 insertions(+), 1 deletion(-)
-
-diff --git a/libcontainer/container_linux.go b/libcontainer/container_linux.go
-index 6ce1854f68..1484703b0c 100644
--- a/libcontainer/container_linux.go
-+++ b/libcontainer/container_linux.go
-@@ -2028,16 +2028,34 @@ func encodeIDMapping(idMap []configs.IDMap) ([]byte, error) {
- 	return data.Bytes(), nil
- }
- 
-+// netlinkError is an error wrapper type for use by custom netlink message
-+// types. Panics with errors are wrapped in netlinkError so that the recover
-+// in bootstrapData can distinguish intentional panics.
-+type netlinkError struct{ error }
-+
- // bootstrapData encodes the necessary data in netlink binary format
- // as a io.Reader.
- // Consumer can write the data to a bootstrap program
- // such as one that uses nsenter package to bootstrap the container's
- // init process correctly, i.e. with correct namespaces, uid/gid
- // mapping etc.
-func (c *linuxContainer) bootstrapData(cloneFlags uintptr, nsMaps map[configs.NamespaceType]string) (io.Reader, error) {
-+func (c *linuxContainer) bootstrapData(cloneFlags uintptr, nsMaps map[configs.NamespaceType]string) (_ io.Reader, Err error) {
- 	// create the netlink message
- 	r := nl.NewNetlinkRequest(int(InitMsg), 0)
- 
-+	// Our custom messages cannot bubble up an error using returns, instead
-+	// they will panic with the specific error type, netlinkError. In that
-+	// case, recover from the panic and return that as an error.
-+	defer func() {
-+		if r := recover(); r != nil {
-+			if e, ok := r.(netlinkError); ok {
-+				Err = e.error
-+			} else {
-+				panic(r)
-+			}
-+		}
-+	}()
-+
- 	// write cloneFlags
- 	r.AddData(&Int32msg{
- 		Type:  CloneFlagsAttr,
-diff --git a/libcontainer/message_linux.go b/libcontainer/message_linux.go
-index 1d4f5033aa..e4107ce39f 100644
--- a/libcontainer/message_linux.go
-+++ b/libcontainer/message_linux.go
-@@ -3,6 +3,9 @@
- package libcontainer
- 
- import (
-+	"fmt"
-+	"math"
-+
- 	"github.com/vishvananda/netlink/nl"
- 	"golang.org/x/sys/unix"
- )
-@@ -54,6 +57,12 @@ type Bytemsg struct {
- 
- func (msg *Bytemsg) Serialize() []byte {
- 	l := msg.Len()
-+	if l > math.MaxUint16 {
-+		// We cannot return nil nor an error here, so we panic with
-+		// a specific type instead, which is handled via recover in
-+		// bootstrapData.
-+		panic(netlinkError{fmt.Errorf("netlink: cannot serialize bytemsg of length %d (larger than UINT16_MAX)", l)})
-+	}
- 	buf := make([]byte, (l+unix.NLA_ALIGNTO-1) & ^(unix.NLA_ALIGNTO-1))
- 	native := nl.NativeEndian()
- 	native.PutUint16(buf[0:2], uint16(l))
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/coolkey/coolkey-1.1.0-r7.ebuild
+++ b/app-crypt/coolkey/coolkey-1.1.0-r7.ebuild
@ -1,82 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PATCHVER="003"
-
-DESCRIPTION="Linux Driver support for the CoolKey and CAC products"
-HOMEPAGE="https://directory.fedora.redhat.com/wiki/CoolKey"
-SRC_URI="https://directory.fedora.redhat.com/download/coolkey/${P}.tar.gz
-	mirror://gentoo/${P}-patches-${PATCHVER}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug"
-
-RDEPEND=">=sys-apps/pcsc-lite-1.6.4
-	dev-libs/nss[utils]
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	>=app-crypt/ccid-1.4.0"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${WORKDIR}/${PN}-patches"
-)
-
-pkg_setup() {
-	pk="pk11install"
-	dbdir="/etc/pki/nssdb"
-	ck_mod_name="CoolKey PKCS #11 Module"
-
-	if ! [[ -x $dbdir ]]; then
-		ewarn "No /etc/pki/nssdb found; check under \$HOME/.pki and"
-		ewarn "follow the suggested commands using the correct path."
-	fi
-}
-
-src_configure() {
-	econf \
-		--enable-pk11install \
-		$(use_enable debug)
-}
-
-src_compile() {
-	emake CFLAGS+="-fno-strict-aliasing" -j1
-}
-
-src_install() {
-	emake DESTDIR="${D}" install -j1
-	einstalldocs
-}
-
-pkg_postinst() {
-	if [[ -x $dbdir ]]; then
-		if ! $(modutil -rawlist -dbdir $dbdir | grep libcoolkeypk11); then
-			elog "You still need to install libcoolkey in your PKCS11 library:"
-			elog "$pk -p $dbdir 'name=$ck_mod_name library=libcoolkeypk11.so'"
-
-		fi
-	else
-		elog ""
-		elog "You still need to setup your PKCS11 library, or at least"
-		elog "find where it is (perhaps \$HOME/.pki/nssdb).  Once you"
-		elog "find it, use 'modutil -rawlist -dbdir \$db' to look for"
-		elog "libcoolkeypk11.so, and if not found, add it using:"
-		elog ""
-		elog "$pk -p \$db 'name=$ck_mod_name library=libcoolkeypk11.so'"
-		elog ""
-		elog "where \$db is the full path to your pki/nssdb directory."
-		elog ""
-	fi
-}
-
-pkg_postrm() {
-	if [[ -x $dbdir ]]; then
-		if $(modutil -rawlist -dbdir $dbdir | grep libcoolkeypk11); then
-			elog "You should remove libcoolkey from your PKCS11 library."
-		fi
-	fi
-}
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@ -1,5 +1,3 @@
-DIST gnupg-2.2.32.tar.bz2 7212625 BLAKE2B 8e1feba83a0d8fa1c154c814e26b41aa252cef4af53937e4e8954860249c180c1d6910356b0c46dfefde094846b02bd5375f17c8b6fdcc9138281d0daa292d42 SHA512 76b75d3688561ce65a8014812656aa87c9722c898d7e186fdb1331dee6af32f886a6b0a4806975c348a22ad6dda60f956ece56076d00153b9706aad4c934c6a1
-DIST gnupg-2.2.33.tar.bz2 7238439 BLAKE2B 9655ab8733f79c56c706502ddeeb41a2841467146753965898528d53a95ba77c51bcaf7fb93c51fb1c36953253ef993e67ce3c9ec756c9eece1042dcd17aa455 SHA512 0e6382ebb78425dc81b280a3b453111fb4a764b3fb0565ac09ac24cec2ecd571079617e263d9fce077ba6ce8d202fb43425b51c26f9ec6e8c61706a1ca5f8c78
 DIST gnupg-2.2.34.tar.bz2 7252882 BLAKE2B f42fd8c4019a051c9f087ae1806ce61c831e0aa552baf7372fd26f2e81d612b919590b698e512343644b68ba220f8f4f751cb66a7f4966df5ba7819563d5351a SHA512 2232e2df58a8470f152d5d91816e14017bcc702bf56c7ae6210f8f42069b2117172b9eabc8fcc1d1174aa7a1068ff444c98335f6c503c2e17137c76fe2602b8b
 DIST gnupg-2.2.34.tar.bz2.sig 119 BLAKE2B 38d384f215f02bb45ab7c77bb7ad434d9038d8ed19610210ebf84e43e1548c2e938f1f45a1047a9c161c3a88308b83c21fb2bc254a77e68fcf00c7f0cf72e5f9 SHA512 220436aa2387376d4af41ee84dbac9a9e4fda2904024d81da9af6f8c704700c5c6f9da98cfa7e4a9f188ad2739189b905473cfd88747978300829ec382771745
 DIST gnupg-2.3.4.tar.bz2 7589561 BLAKE2B 6e04a90a5ffac7d4701202e35071a48530ba86d8c64cab3ed1617df23358f4d564ddf6cdbc6c861890725344a19619e0f6791ccabd97b18b28dc4e6e01f7837b SHA512 a3cf1c759512ec561c6f01cec72d533fc099dccf8c03b3a3e4a930862ae4c6815ecb856edd41884a65f058b65553cb69519e53e134d652353a7a76144bd99758
--- a/app-crypt/gnupg/gnupg-2.2.32-r2.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.32-r2.ebuild
@ -1,153 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic systemd toolchain-funcs
-
-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"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb user-socket wks-server"
-
-# 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.8.0:=
-	>=dev-libs/libgpg-error-1.29
-	>=dev-libs/libksba-1.3.5
-	>=dev-libs/npth-1.2
-	>=net-misc/curl-7.10
-	bzip2? ( app-arch/bzip2 )
-	ldap? ( net-nds/openldap:= )
-	readline? ( sys-libs/readline:0= )
-	smartcard? ( usb? ( virtual/libusb:1 ) )
-	ssl? ( >=net-libs/gnutls-3.0:0= )
-	sys-libs/zlib
-	tofu? ( >=dev-db/sqlite-3.7 )"
-
-RDEPEND="${DEPEND}
-	app-crypt/pinentry
-	nls? ( virtual/libintl )
-	selinux? ( sec-policy/selinux-gpg )
-	wks-server? ( virtual/mta )"
-
-BDEPEND="virtual/pkgconfig
-	doc? ( sys-apps/texinfo )
-	nls? ( sys-devel/gettext )"
-
-S="${WORKDIR}/${MY_P}"
-
-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"
-)
-
-src_prepare() {
-	default
-
-	# 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 doc/examples/systemd-user/gpg-agent-ssh.socket || die
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable bzip2)
-		$(use_enable nls)
-		$(use_enable smartcard scdaemon)
-		$(use_enable ssl gnutls)
-		$(use_enable tofu)
-		$(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver')
-		$(use_enable wks-server wks-tools)
-		$(use_with ldap)
-		$(use_with readline)
-		--with-mailprog=/usr/libexec/sendmail
-		--disable-ntbtls
-		--enable-all-tests
-		--enable-gpg
-		--enable-gpgsm
-		--enable-large-secmem
-		CC_FOR_BUILD="$(tc-getBUILD_CC)"
-		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
-		KSBA_CONFIG="${ESYSROOT}/usr/bin/ksba-config"
-		LIBASSUAN_CONFIG="${ESYSROOT}/usr/bin/libassuan-config"
-		LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config"
-		NPTH_CONFIG="${ESYSROOT}/usr/bin/npth-config"
-		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
-	)
-
-	if use prefix && use usb; then
-		# bug #649598
-		append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0"
-	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
-	[[ ${CC} == *clang ]] && \
-		export gl_cv_absolute_stdint_h=/usr/include/stdint.h
-
-	# 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.
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	default
-
-	use doc && emake -C doc html
-}
-
-src_test() {
-	#Bug: 638574
-	use tofu && export TESTFLAGS=--parallel
-	default
-}
-
-src_install() {
-	default
-
-	use tools &&
-		dobin \
-			tools/{convert-from-106,gpg-check-pattern} \
-			tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
-			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/* doc/*.png
-
-	systemd_douserunit doc/examples/systemd-user/*.{service,socket}
-}
--- a/app-crypt/gnupg/gnupg-2.2.33-r2.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.33-r2.ebuild
@ -1,153 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic systemd toolchain-funcs
-
-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"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb user-socket wks-server"
-
-# 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.8.0:=
-	>=dev-libs/libgpg-error-1.29
-	>=dev-libs/libksba-1.3.5
-	>=dev-libs/npth-1.2
-	>=net-misc/curl-7.10
-	bzip2? ( app-arch/bzip2 )
-	ldap? ( net-nds/openldap:= )
-	readline? ( sys-libs/readline:0= )
-	smartcard? ( usb? ( virtual/libusb:1 ) )
-	ssl? ( >=net-libs/gnutls-3.0:0= )
-	sys-libs/zlib
-	tofu? ( >=dev-db/sqlite-3.7 )"
-
-RDEPEND="${DEPEND}
-	app-crypt/pinentry
-	nls? ( virtual/libintl )
-	selinux? ( sec-policy/selinux-gpg )
-	wks-server? ( virtual/mta )"
-
-BDEPEND="virtual/pkgconfig
-	doc? ( sys-apps/texinfo )
-	nls? ( sys-devel/gettext )"
-
-S="${WORKDIR}/${MY_P}"
-
-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"
-)
-
-src_prepare() {
-	default
-
-	# 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 doc/examples/systemd-user/gpg-agent-ssh.socket || die
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable bzip2)
-		$(use_enable nls)
-		$(use_enable smartcard scdaemon)
-		$(use_enable ssl gnutls)
-		$(use_enable tofu)
-		$(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver')
-		$(use_enable wks-server wks-tools)
-		$(use_with ldap)
-		$(use_with readline)
-		--with-mailprog=/usr/libexec/sendmail
-		--disable-ntbtls
-		--enable-all-tests
-		--enable-gpg
-		--enable-gpgsm
-		--enable-large-secmem
-		CC_FOR_BUILD="$(tc-getBUILD_CC)"
-		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
-		KSBA_CONFIG="${ESYSROOT}/usr/bin/ksba-config"
-		LIBASSUAN_CONFIG="${ESYSROOT}/usr/bin/libassuan-config"
-		LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config"
-		NPTH_CONFIG="${ESYSROOT}/usr/bin/npth-config"
-		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
-	)
-
-	if use prefix && use usb; then
-		# bug #649598
-		append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0"
-	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
-	[[ ${CC} == *clang ]] && \
-		export gl_cv_absolute_stdint_h=/usr/include/stdint.h
-
-	# 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.
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	default
-
-	use doc && emake -C doc html
-}
-
-src_test() {
-	#Bug: 638574
-	use tofu && export TESTFLAGS=--parallel
-	default
-}
-
-src_install() {
-	default
-
-	use tools &&
-		dobin \
-			tools/{convert-from-106,gpg-check-pattern} \
-			tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
-			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/* doc/*.png
-
-	systemd_douserunit doc/examples/systemd-user/*.{service,socket}
-}
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@ -1,8 +1,4 @@
-DIST gpgme-1.15.1.tar.bz2 1699349 BLAKE2B d3a6ccaa35360ed3fc79364dfcc3f2fdcb70e5e41ac72ef011373a39d5def9be9ce1be45843ab65a87630d3fc570d29db5f40b9a273aa8e281464c9d1d3477de SHA512 1d75a848cce6389f7cb8896b57a28dfe1dc5a447bfb4f128b0994a43e04134343400a3be063e971f03dfd595474cfd558519741d5d56afb3e84853ad4f2a45c2
-DIST gpgme-1.15.1.tar.bz2.sig 119 BLAKE2B d1f8a940973fa25531d2e958aad6a3b2c7844a07679f639716778d43b33e53fc46a6d364a1be274b01394717b92b37206b9da161ee6497e9255b1be50458c13b SHA512 2f893c4978c6f34dddc0c0fe01c77017d49cda97429e0573083740551e612a8a3e94c5b19087e2b637387628e4eebc508118e91dfc9fde8ef2e677b62770bb7a
 DIST gpgme-1.16.0.tar.bz2 1718913 BLAKE2B da55e695b148e949a1c0770d0298d7a8c9f87d7a1f9e45d380f8c13c472bd44cb4266adb9a113e2b1dcc2596291744f48fdf998ff2de876059d89d184dc87f3a SHA512 69487be69612e9bf0221ff56ae687248bd13635db1b7087130e93c1670e38f3c810bbca17723555c04fe207976c35871bbc3da005179ce099504321cf33636e4
 DIST gpgme-1.16.0.tar.bz2.sig 119 BLAKE2B abf363142f67a005d1a4c13c2d3d944d0fd449e2297ad5a853fc145e106757e639b5bf5c23de6475055578633e12d8dc7d11ebb689ee6c74283c7cfe28058e65 SHA512 0c230b55bb0b24af85cd6df9e6be6ef8245d29af0fb8348fe044979ab75250987fafbd709d1898852a23df99fb16dd61b0b2bc6a821ed1c1b9aadd86182e5b9a
-DIST gpgme-1.17.0.tar.bz2 1748416 BLAKE2B 32df1e3e579275d39507cb013ab7eded12149735f27a5eb1f4c3142df6b97864947a64c7fa58736e6cdea4ae623fb42eeb007596ec08ac5fdfb2af7826447550 SHA512 7ab379c6be2031ff24334a636e596f01c9d491627b695cc6cce7a361e78c6054b7891c521f07becea3c5da10c58043c1acffbba6058bbbfaa515241d75dd6c46
-DIST gpgme-1.17.0.tar.bz2.sig 119 BLAKE2B 1cfa90bb80ef09b2984a91c27a49bb34da8fb630822f4152c9e1cee7423345d16159947f5209b2cd34d399bb4ff2ffdf512a27a22e405762c640c8100405d953 SHA512 f9968c2f90188ca483cb4fe2867980ea474c784ff4056c5baa3b209fb2c049e4e72604d6b33cbbdb3fffb06150310243a36144502db73579deb80b6e1197684b
 DIST gpgme-1.17.1.tar.bz2 1747692 BLAKE2B 44cf9309cbad038f23aa7c5c77fd85be23faf3d8e1eb7abdb87a737ad1ade1ee269a95ce618dba327bbd06e6f4b2a91e2446744ee08f09ea6fb3b2dad44431c5 SHA512 e6399c3de1e430e38f2692bf5ec0c02ecb36ea3dbb56ff29dc3a438a5be4900a77a0559dc5b673dc1ffbff5e7f589e548e19176b2644fe8f63e00c6b9181b920
 DIST gpgme-1.17.1.tar.bz2.sig 119 BLAKE2B 31832424c0e029dc520d3302a71b086d9fcb044c74344cc0fb4b6c6a02d0dd840e62e7eb60acfaf004e6f3650d58436b58e645ef2a50b948ecaf3ca162bf577a SHA512 e1a4213d0d39f2efd0d5c007a0449c76bd650e76e002a9acb673eef0579912db06d844df11a4f7cb821e1d8468d2d6c1303f1c5d915a5c3c9cb5abacfbd004fc
--- a/app-crypt/gpgme/gpgme-1.15.1.ebuild
+++ b/app-crypt/gpgme/gpgme-1.15.1.ebuild
@ -1,114 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_OPTIONAL=1
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc
-
-inherit distutils-r1 flag-o-matic libtool qmake-utils toolchain-funcs verify-sig
-
-DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"
-HOMEPAGE="http://www.gnupg.org/related_software/gpgme"
-SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2
-	verify-sig? ( mirror://gnupg/gpgme/${P}.tar.bz2.sig )"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="1/11" # subslot = soname major version
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="common-lisp static-libs +cxx python qt5"
-
-# Note: On each bump, update dep bounds on each version from configure.ac!
-RDEPEND=">=app-crypt/gnupg-2
-	>=dev-libs/libassuan-2.5.3:=
-	>=dev-libs/libgpg-error-1.36:=
-	python? ( ${PYTHON_DEPS} )
-	qt5? ( dev-qt/qtcore:5 )"
-	#doc? ( app-doc/doxygen[dot] )
-DEPEND="${RDEPEND}
-	qt5? ( dev-qt/qttest:5 )"
-BDEPEND="python? ( dev-lang/swig )
-	verify-sig? ( sec-keys/openpgp-keys-gnupg )"
-
-REQUIRED_USE="qt5? ( cxx ) python? ( ${PYTHON_REQUIRED_USE} )"
-
-do_python() {
-	if use python; then
-		pushd "lang/python" > /dev/null || die
-		top_builddir="../.." srcdir="." CPP="$(tc-getCPP)" distutils-r1_src_${EBUILD_PHASE}
-		popd > /dev/null
-	fi
-}
-
-pkg_setup() {
-	addpredict /run/user/$(id -u)/gnupg
-
-	local MAX_WORKDIR=66
-	if [[ "${#WORKDIR}" -gt "${MAX_WORKDIR}" ]]; then
-		ewarn "Disabling tests as WORKDIR '${WORKDIR}' is longer than ${MAX_WORKDIR} which will fail tests"
-		SKIP_TESTS=1
-	fi
-}
-
-src_prepare() {
-	default
-	elibtoolize
-
-	# Make best effort to allow longer PORTAGE_TMPDIR
-	# as usock limitation fails build/tests
-	ln -s "${P}" "${WORKDIR}/b"
-	S="${WORKDIR}/b"
-}
-
-src_configure() {
-	local languages=()
-	use common-lisp && languages+=( "cl" )
-	use cxx && languages+=( "cpp" )
-	if use qt5; then
-		languages+=( "qt" )
-		#use doc ||
-		export DOXYGEN=true
-		export MOC="$(qt5_get_bindir)/moc"
-	fi
-
-	econf \
-		$([[ -n "${SKIP_TESTS}" ]] && echo "--disable-gpg-test --disable-gpgsm-test") \
-		--enable-languages="${languages[*]}" \
-		$(use_enable static-libs static)
-
-	use python && make -C lang/python prepare
-
-	do_python
-}
-
-src_compile() {
-	default
-	do_python
-}
-
-src_test() {
-	[[ -z "${SKIP_TESTS}" ]] || return
-
-	default
-	if use python; then
-		test_python() {
-			emake -C lang/python/tests check \
-				PYTHON=${EPYTHON} \
-				PYTHONS=${EPYTHON} \
-				TESTFLAGS="--python-libdir=${BUILD_DIR}/lib"
-		}
-		python_foreach_impl test_python
-	fi
-}
-
-src_install() {
-	default
-	do_python
-	find "${ED}" -type f -name '*.la' -delete || die
-
-	# backward compatibility for gentoo
-	# in the past we had slots
-	dodir /usr/include/gpgme
-	dosym ../gpgme.h /usr/include/gpgme/gpgme.h
-}
--- a/app-crypt/gpgme/gpgme-1.17.0-r1.ebuild
+++ b/app-crypt/gpgme/gpgme-1.17.0-r1.ebuild
@ -1,117 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_OPTIONAL=1
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc
-
-inherit distutils-r1 flag-o-matic libtool qmake-utils toolchain-funcs verify-sig
-
-DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"
-HOMEPAGE="http://www.gnupg.org/related_software/gpgme"
-SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2
-	verify-sig? ( mirror://gnupg/gpgme/${P}.tar.bz2.sig )"
-
-LICENSE="GPL-2 LGPL-2.1"
-# Please check ABI on each bump, even if SONAMEs didn't change: bug #833355
-# Use e.g. app-portage/iwdevtools integration with dev-libs/libabigail's abidiff.
-# Subslot: SONAME of each: <libgpgme.libgpgmepp.libqgpgme>
-SLOT="1/11.6.7"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="common-lisp static-libs +cxx python qt5"
-
-# Note: On each bump, update dep bounds on each version from configure.ac!
-RDEPEND=">=app-crypt/gnupg-2
-	>=dev-libs/libassuan-2.5.3:=
-	>=dev-libs/libgpg-error-1.36:=
-	python? ( ${PYTHON_DEPS} )
-	qt5? ( dev-qt/qtcore:5 )"
-	#doc? ( app-doc/doxygen[dot] )
-DEPEND="${RDEPEND}
-	qt5? ( dev-qt/qttest:5 )"
-BDEPEND="python? ( dev-lang/swig )
-	verify-sig? ( sec-keys/openpgp-keys-gnupg )"
-
-REQUIRED_USE="qt5? ( cxx ) python? ( ${PYTHON_REQUIRED_USE} )"
-
-do_python() {
-	if use python; then
-		pushd "lang/python" > /dev/null || die
-		top_builddir="../.." srcdir="." CPP="$(tc-getCPP)" distutils-r1_src_${EBUILD_PHASE}
-		popd > /dev/null || die
-	fi
-}
-
-pkg_setup() {
-	addpredict /run/user/$(id -u)/gnupg
-
-	local MAX_WORKDIR=66
-	if [[ "${#WORKDIR}" -gt "${MAX_WORKDIR}" ]]; then
-		ewarn "Disabling tests as WORKDIR '${WORKDIR}' is longer than ${MAX_WORKDIR} which will fail tests"
-		SKIP_TESTS=1
-	fi
-}
-
-src_prepare() {
-	default
-	elibtoolize
-
-	# Make best effort to allow longer PORTAGE_TMPDIR
-	# as usock limitation fails build/tests
-	ln -s "${P}" "${WORKDIR}/b" || die
-	S="${WORKDIR}/b"
-}
-
-src_configure() {
-	local languages=()
-	use common-lisp && languages+=( "cl" )
-	use cxx && languages+=( "cpp" )
-	if use qt5; then
-		languages+=( "qt" )
-		#use doc ||
-		export DOXYGEN=true
-		export MOC="$(qt5_get_bindir)/moc"
-	fi
-
-	econf \
-		$([[ -n "${SKIP_TESTS}" ]] && echo "--disable-gpg-test --disable-gpgsm-test") \
-		--enable-languages="${languages[*]}" \
-		$(use_enable static-libs static)
-
-	use python && emake -C lang/python prepare
-
-	do_python
-}
-
-src_compile() {
-	default
-	do_python
-}
-
-src_test() {
-	[[ -z "${SKIP_TESTS}" ]] || return
-
-	default
-	if use python; then
-		test_python() {
-			emake -C lang/python/tests check \
-				PYTHON=${EPYTHON} \
-				PYTHONS=${EPYTHON} \
-				TESTFLAGS="--python-libdir=${BUILD_DIR}/lib"
-		}
-		python_foreach_impl test_python
-	fi
-}
-
-src_install() {
-	default
-	do_python
-	find "${ED}" -type f -name '*.la' -delete || die
-
-	# backward compatibility for gentoo
-	# in the past we had slots
-	dodir /usr/include/gpgme
-	dosym ../gpgme.h /usr/include/gpgme/gpgme.h
-}
--- a/app-crypt/heimdal/heimdal-7.7.0-r5.ebuild
+++ b/app-crypt/heimdal/heimdal-7.7.0-r5.ebuild
@ -29,10 +29,7 @@ CDEPEND="
 	lmdb? ( dev-db/lmdb:= )
 	caps? ( sys-libs/libcap-ng )
 	>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
-	|| (
-		>=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}]
-		sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
-	)
+	>=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}]
 	sys-libs/ncurses:0=
 	>=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}]
 	afs? ( net-fs/openafs )
--- a/app-crypt/mit-krb5/mit-krb5-1.19.2-r4.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.19.2-r4.ebuild
@ -22,10 +22,7 @@ RESTRICT="test"

 DEPEND="
 	!!app-crypt/heimdal
-	|| (
-		>=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}]
-		sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
-	)
+	>=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}]
 	|| (
 		>=dev-libs/libverto-0.2.5[libev,${MULTILIB_USEDEP}]
 		>=dev-libs/libverto-0.2.5[libevent,${MULTILIB_USEDEP}]
--- a/app-crypt/mit-krb5/mit-krb5-1.19.3-r2.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.19.3-r2.ebuild
@ -22,10 +22,7 @@ RESTRICT="test"

 DEPEND="
 	!!app-crypt/heimdal
-	|| (
-		>=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}]
-		sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
-	)
+	>=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}]
 	|| (
 		>=dev-libs/libverto-0.2.5[libev,${MULTILIB_USEDEP}]
 		>=dev-libs/libverto-0.2.5[libevent,${MULTILIB_USEDEP}]
--- a/app-crypt/pesign/Manifest
+++ b/app-crypt/pesign/Manifest
@ -1,2 +1 @@
-DIST pesign-113.tar.gz 124618 BLAKE2B 36cdface6ecdf9003251da3058b21b2ee8e94eb655e47a8668b38c4ea576d990a71860952eea277d5e029bb007039c8e3ded9918e89d47f6db404423acbd1cc7 SHA512 e71dc90c2ab8085d1b000c0d2cf9cb00ddaed1ea1393db75c2d19a96f1b1c188a26b76850533ba97ec254a3b48db6b07a69b597c329ac891e64422780a358c24
 DIST pesign-114.tar.gz 148898 BLAKE2B 0dae3b4e17c61bcea02a6f81f6a62f8d526e83954bf95d0de24726daa81e45a3b42b6867f2d64decd69f421a14f5e2ff6ff1ec26246f44d68b242b452e60d9a1 SHA512 567176718e098c3494e27ce29b61ef396ca2503137260fc36c784951f0bd2130c9f61c655461d6091e9bdb0df77c9e00cf2fde8fb1b1c5ab83e4b9c57d65fdab
--- a/app-crypt/pesign/files/pesign-113-enum-conversion.patch
+++ b/app-crypt/pesign/files/pesign-113-enum-conversion.patch
@ -1,46 +0,0 @@
-From c555fd74c009242c3864576bd5f17a1f8f4fdffd Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Tue, 18 Feb 2020 16:28:56 -0500
-Subject: [PATCH] pesigcheck: Fix a wrong assignment
-
-gcc says:
-
-  pesigcheck.c: In function 'check_signature':
-  pesigcheck.c:321:17: error: implicit conversion from 'enum <anonymous>' to 'enum <anonymous>' [-Werror=enum-conversion]
-  321 |    reason->type = siBuffer;
-      |                 ^
-  pesigcheck.c:333:17: error: implicit conversion from 'enum <anonymous>' to 'enum <anonymous>' [-Werror=enum-conversion]
-  333 |    reason->type = siBuffer;
-      |                 ^
-  cc1: all warnings being treated as errors
-
-And indeed, that line of code makes no sense at all - it was supposed to
-be reason->sig.type.
-
-Signed-off-by: Peter Jones <pjones@redhat.com>
---
- src/pesigcheck.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/pesigcheck.c b/src/pesigcheck.c
-index 524cce3..8fa0f1a 100644
--- a/src/pesigcheck.c
-+++ b/src/pesigcheck.c
-@@ -318,7 +318,7 @@ check_signature(pesigcheck_context *ctx, int *nreasons,
- 			reason->type = SIGNATURE;
- 			reason->sig.data = data;
- 			reason->sig.len = datalen;
-			reason->type = siBuffer;
-+			reason->sig.type = siBuffer;
- 			nreason += 1;
- 			is_invalid = true;
- 		}
-@@ -330,7 +330,7 @@ check_signature(pesigcheck_context *ctx, int *nreasons,
- 			reason->type = SIGNATURE;
- 			reason->sig.data = data;
- 			reason->sig.len = datalen;
-			reason->type = siBuffer;
-+			reason->sig.type = siBuffer;
- 			nreason += 1;
- 			has_valid_cert = true;
- 		}
--- a/app-crypt/pesign/files/pesign-113-nss.patch
+++ b/app-crypt/pesign/files/pesign-113-nss.patch
@ -1,47 +0,0 @@
-From b535d1ac5cbcdf18a97d97a92581e38080d9e521 Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Tue, 14 May 2019 11:28:38 -0400
-Subject: [PATCH] efikeygen: Fix the build with nss 3.44
-
-NSS 3.44 adds some certificate types, which changes a type and makes
-some encoding stuff weird.  As a result, we get:
-
-gcc8 -I/wrkdirs/usr/ports/sysutils/pesign/work/pesign-0.110/include -O2 -pipe  -fstack-protector-strong -Wl,-rpath=/usr/local/lib/gcc8 -isystem /usr/local/include -fno-strict-aliasing  -g -O0 -g -O0  -Wall -fshort-wchar -fno-strict-aliasing -fno-merge-constants --std=gnu99 -D_GNU_SOURCE -Wno-unused-result -Wno-unused-function -I../include/  -I/usr/local/include/nss -I/usr/local/include/nss/nss -I/usr/local/include/nspr  -Werror -fPIC -isystem /usr/local/include -DCONFIG_amd64 -DCONFIG_amd64 -c efikeygen.c -o efikeygen.o
-In file included from /usr/local/include/nss/nss/cert.h:22,
-                 from efikeygen.c:39:
-efikeygen.c: In function 'add_cert_type':
-/usr/local/include/nss/nss/certt.h:445:5: error: unsigned conversion from 'int' to 'unsigned char' changes value from '496' to '240' [-Werror=overflow]
-     (NS_CERT_TYPE_SSL_CLIENT | NS_CERT_TYPE_SSL_SERVER | NS_CERT_TYPE_EMAIL | \
-     ^
-efikeygen.c:208:23: note: in expansion of macro 'NS_CERT_TYPE_APP'
-  unsigned char type = NS_CERT_TYPE_APP;
-                       ^~~~~~~~~~~~~~~~
-cc1: all warnings being treated as errors
-
-This is fixed by just making it an int.
-
-Fixes github issue #48.
-
-Signed-off-by: Peter Jones <pjones@redhat.com>
-Upstream-Status: Accepted
-[https://github.com/rhboot/pesign/commit/b535d1ac5cbcdf18a97d97a92581e38080d9e521]
---
- src/efikeygen.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/efikeygen.c b/src/efikeygen.c
-index ede76ef..2cd953e 100644
--- a/src/efikeygen.c
-+++ b/src/efikeygen.c
-@@ -208,7 +208,7 @@ static int
- add_cert_type(cms_context *cms, void *extHandle, int is_ca)
- {
- 	SECItem bitStringValue;
-	unsigned char type = NS_CERT_TYPE_APP;
-+	int type = NS_CERT_TYPE_APP;
- 
- 	if (is_ca)
- 		type |= NS_CERT_TYPE_SSL_CA |
-- 
-2.22.0
-
--- a/app-crypt/pesign/pesign-113.ebuild
+++ b/app-crypt/pesign/pesign-113.ebuild
@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic 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:0=
-	dev-libs/popt
-	sys-apps/util-linux
-	sys-libs/efivar
-"
-DEPEND="${RDEPEND}
-	sys-boot/gnu-efi
-"
-BDEPEND="
-	sys-apps/help2man
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-113-nss.patch
-	"${FILESDIR}"/${PN}-113-enum-conversion.patch
-)
-
-src_configure() {
-	append-cflags -O1 #721934
-	default
-}
-
-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)"
-}
-
-src_install() {
-	emake DESTDIR="${ED}" VERSION="${PVR}" 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/seahorse/files/41.0-meson-fix-gpg-version-check-for-recent-gnupg.patch
+++ b/app-crypt/seahorse/files/41.0-meson-fix-gpg-version-check-for-recent-gnupg.patch
@ -0,0 +1,29 @@
+From 38a82911f9c35617e96587e59f796e4616d62483 Mon Sep 17 00:00:00 2001
+From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
+Date: Tue, 22 Mar 2022 09:37:17 +0100
+Subject: [PATCH] meson: fix gpg version check for recent gnupg
+
+Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
+---
+ meson.build | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index e3242323..12ce3d56 100644
+--- a/meson.build
+++ b/meson.build
+@@ -51,7 +51,10 @@ gpgme_dep = dependency('gpgme', version: '>= 1.14.0', required: get_option('pgp-
+ 
+ if get_option('pgp-support')
+   gpg_version_check = run_command([gpg_check_version, gpg_bin.path(), accepted_gpg_versions ])
+-  gpg_version = gpg_version_check.stdout()
+  # GnuPG now outputs e.g. 2.3.4-unknown so we need to drop this extra cruft
+  gpg_version_raw = gpg_version_check.stdout()
+  gpg_version_raw_split = gpg_version_raw.split('-')
+  gpg_version = gpg_version_raw_split[0]
+   message('GnuPG Version: @0@'.format(gpg_version))
+   if get_option('check-compatible-gpg') and gpg_version_check.returncode() != 0
+     error('Incompatible version of GnuPG. Accepted versions are: @0@'.format(accepted_gpg_versions))
+-- 
+2.35.1
+
--- a/app-crypt/seahorse/seahorse-41.0-r1.ebuild
+++ b/app-crypt/seahorse/seahorse-41.0-r1.ebuild
@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
-inherit gnome.org gnome2-utils meson xdg vala
+PYTHON_COMPAT=( python3_{8..10} )
+inherit gnome.org gnome2-utils meson python-any-r1 xdg vala

 DESCRIPTION="Manage your passwords and encryption keys"
 HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse"
@ -34,6 +35,7 @@ DEPEND="${RDEPEND}
 	gui-libs/libhandy:1[vala]
 "
 BDEPEND="
+	${PYTHON_DEPS}
 	app-text/docbook-xml-dtd:4.2
 	app-text/docbook-xsl-stylesheets
 	dev-libs/appstream-glib
@ -45,9 +47,14 @@ BDEPEND="
 	virtual/pkgconfig
 "

+PATCHES=(
+	"${FILESDIR}"/${PV}-meson-fix-gpg-version-check-for-recent-gnupg.patch
+)
+
 src_prepare() {
-	xdg_src_prepare
+	default
 	vala_src_prepare
+	gnome2_environment_reset
 }

 src_configure() {
--- a/app-crypt/xca/Manifest
+++ b/app-crypt/xca/Manifest
@ -1,2 +1 @@
-DIST xca-2.3.0.tar.gz 1354154 BLAKE2B 31a4ac96819e8d2f7e5f623cc343f0cbff18c931ed0699dbe093dcb963c3431a3943c4dcd8f3d727896104c05a565d062b9678169bf2a8d3f7cf7748c311b53b SHA512 35522aa308e1022a739f3255f13fcf63f481000f9b7411027a009a185e33ddceeb5cf9b55406a4899d2393c7e5ace10354ff24b3b2b0c3045d110f679756b0b8
 DIST xca-2.4.0.tar.gz 1778572 BLAKE2B 2e90ef264dc53019cc37700b37d5eb0c48904ca371ae1ce0cfe2ad61be8765951ea918d356c1f2764e73d846693a66c903cba1381df5d1a588aae8bb45f8c195 SHA512 e93e2cf9dc48ed43ee9b51e977f825d81ff08835eb4d77fcbe8f9dc8ce31c77c1da879b48c25ab535717542d1fe84faa6e46c410c116edbee02072040c59667c
--- a/app-crypt/xca/xca-2.3.0-r1.ebuild
+++ b/app-crypt/xca/xca-2.3.0-r1.ebuild
@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit xdg-utils
-
-DESCRIPTION="A GUI to OpenSSL, RSA public keys, certificates, signing requests etc"
-HOMEPAGE="https://hohnstaedt.de/xca/"
-SRC_URI="https://github.com/chris2511/${PN}/releases/download/RELEASE.${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="bindist doc"
-
-RDEPEND="
-	dev-libs/libltdl:0=
-	dev-qt/qtgui:5
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtwidgets:5
-	dev-libs/openssl:0=[bindist(-)=]
-	doc? ( app-text/linuxdoc-tools )"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.0-desktop.patch"
-	"${FILESDIR}/${P}-bug-733000.patch"
-)
-
-src_configure() {
-	econf \
-		--with-qt-version=5 \
-		$(use_enable doc) \
-		STRIP=true
-}
-
-src_prepare() {
-	sed '/^CFLAGS/s@-O2 -ggdb@@' -i Local.mak.in || die
-	default
-}
-
-src_compile() {
-	# enforce all to avoid the automatic silent rules
-	emake all
-}
-
-src_install() {
-	default
-
-	insinto /etc/xca
-	doins misc/*.txt
-
-	ewarn "Make a backup copy of your database!"
-	ewarn "Version 2 completely changes the database format to SQL(ite)"
-	ewarn "Don't try to open it with older versions of XCA (< 1.4.0). They will corrupt the database."
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
--- a/app-crypt/xca/xca-2.4.0-r1.ebuild
+++ b/app-crypt/xca/xca-2.4.0-r1.ebuild
@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit xdg-utils
-
-DESCRIPTION="A GUI to OpenSSL, RSA public keys, certificates, signing requests etc"
-HOMEPAGE="https://hohnstaedt.de/xca/"
-SRC_URI="https://github.com/chris2511/${PN}/releases/download/RELEASE.${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="bindist doc"
-
-RDEPEND="
-	dev-libs/libltdl:0=
-	dev-qt/qthelp:5
-	dev-qt/qtgui:5
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtwidgets:5
-	>=dev-libs/openssl-1.1.0:0=[bindist(-)=]
-	doc? ( app-text/linuxdoc-tools )"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.0-desktop.patch"
-	"${FILESDIR}/${P}-bug-733000.patch"
-)
-
-src_configure() {
-	econf \
-		--with-qt-version=5 \
-		$(use_enable doc) \
-		STRIP=true
-}
-
-src_prepare() {
-	sed '/^CFLAGS/s@-O2 -ggdb@@' -i Local.mak.in || die
-	default
-}
-
-src_compile() {
-	# enforce all to avoid the automatic silent rules
-	emake all
-}
-
-src_install() {
-	default
-
-	insinto /etc/xca
-	doins misc/*.txt
-
-	ewarn "Make a backup copy of your database!"
-	ewarn "Version 2 completely changes the database format to SQL(ite)"
-	ewarn "Don't try to open it with older versions of XCA (< 1.4.0). They will corrupt the database."
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
--- a/app-doc/cppman/Manifest
+++ b/app-doc/cppman/Manifest
@ -1,2 +1 @@
-DIST cppman-0.5.1.tar.gz 3596049 BLAKE2B 0189da1413720c00c89a0685b83231aaf0c54e19c84ede164e892e7f8855b7b1ceb1baee11866fd99d150e9c031ccea88bcecdda816fb8e53d58b918a000e04a SHA512 3248d9795d3a379f13e43d5e0753f62a0412dcf3760b8dec6a176f08cb71c4983065c7d27eb15ffed4cc77264e66a3f7d9fe5757a8c7a582741751bcfd1b2fd6
 DIST cppman-0.5.3.tar.gz 3614734 BLAKE2B 3b764be07c19ad026e20f6b0f1ac6709ef0fba6042225ce53d6aeb627bc80fba4c4775f9c4d9fa7e75f5d5fbc847dffab1eecbca9f55eab0c447b9d6b9f0f401 SHA512 4e89c8e4ec4b8fb7f577ae83ac77198fb2a56f85550b9efa2b534c1e3d25f45be7932e0cfe663d51b5ff2846668022386af0b018056bcc25c5a1b2e5d32eb111
--- a/app-doc/cppman/cppman-0.5.1.ebuild
+++ b/app-doc/cppman/cppman-0.5.1.ebuild
@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-PYTHON_REQ_USE="sqlite,threads(+)"
-
-DISTUTILS_SINGLE_IMPL=true
-DISTUTILS_USE_SETUPTOOLS=no
-inherit distutils-r1
-
-DESCRIPTION="C++ man pages for Linux, with source from cplusplus.com and cppreference.com"
-HOMEPAGE="https://github.com/aitjcize/cppman"
-SRC_URI="https://github.com/aitjcize/cppman/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
-
-RDEPEND="
-	sys-apps/groff
-	$(python_gen_cond_dep '
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-	')
-"
-
-src_prepare() {
-	default
-
-	# Don't allow setup.py to install documentation directly
-	sed -i '\:share/doc/cppman:d' setup.py || die "sed failed"
-}
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/diakonos/Manifest
+++ b/app-editors/diakonos/Manifest
@ -1,2 +1 @@
-DIST diakonos-0.9.4.tar.gz 126301 BLAKE2B 197d32968053fe8b68f7e9909619f9be6548d1a32545d32c7cd4a9501f2df2635178ce681e6f77e9a1e0ea7f22fe80eed116239a1df655f3e3567e435d29dbad SHA512 c4737fa1de42549745b606bd881fbe7cff1e46517084142c10fe2a7076f25a6f7418d7aefbc569e3647bbdd04a185f07866021c24161f1675f11ecddde5d654c
 DIST diakonos-0.9.7.tar.gz 129807 BLAKE2B 26c3a72a00e1d41b4a7b2916b37024658d7607ac657d4f71a12b939830578d7939a4f9f4c3886693eae9eeaf91bfe1abe055be7bcc7681619448e298acb5c546 SHA512 ec23d93ed6871d18b6a91e02bc6916ac667ca773be5f093a68fffa5c9cbe89b123e80b18762c8649620eda23b1b9ba582a5236eb9eaefc0e22a411390cd30c73
--- a/app-editors/diakonos/diakonos-0.9.4-r1.ebuild
+++ b/app-editors/diakonos/diakonos-0.9.4-r1.ebuild
@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-inherit ruby-ng
-
-DESCRIPTION="A Linux editor for the masses"
-HOMEPAGE="https://git.sr.ht/~pistos/diakonos"
-SRC_URI="https://github.com/Pistos/diakonos/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-IUSE="doc test"
-
-ruby_add_rdepend "dev-ruby/curses"
-
-ruby_add_bdepend "doc? ( dev-ruby/yard )
-	test? ( dev-ruby/bacon )"
-
-each_ruby_test() {
-	${RUBY} -S bacon -Ilib spec/*.rb spec/*/*.rb || die
-}
-
-each_ruby_install() {
-	${RUBY} install.rb --dest-dir "${D}" --doc-dir /usr/share/doc/${PF} || die "install failed"
-}
-
-all_ruby_install() {
-	if use doc; then
-		rake docs || die
-		dodoc -r doc/*
-	fi
-}
--- a/app-editors/lpe/Manifest
+++ b/app-editors/lpe/Manifest
@ -1,2 +1 @@
 DIST lpe-1.2.8_p20210401.tar.gz 840016 BLAKE2B 81fa0b1c3f9a7164eb219692a2e7bc092d0ee09c9de15f6fd2a4f66cc486be5b744eaa2fb0569a9f44f45d6a19159c55286be76d9ae0f4947f5b7c749e84a8fb SHA512 0b40f2f3fc1241e07291dfdbfcf2466cf5dedc1c91bf36c4f36c8af792ce718be2ad66884b049e25d7b9f9e796d60ce25ca42b37610d26894cd1dc6b74e51157
-DIST lpe_1.2.6.13-0.1.tar.gz 600523 BLAKE2B 8866aff63276d5e39ed48b4d9e8b9a23d541c13e196815c29586df83f8c6b5895a8dde8fb16b0929bffc49416907d74d48fdbc5ce736a855f2d2daad6472fb96 SHA512 f02769baca396285fe8f98c934f6274185d2bf8b08f3b007cbfa4e6aadb455abfb7cab13d53a3d1fa71ea0c29c4222784dcbc9a7508501c7d1839671503758ed
--- a/app-editors/lpe/files/lpe-1.2.6.13-fno-common.patch
+++ b/app-editors/lpe/files/lpe-1.2.6.13-fno-common.patch
@ -1,31 +0,0 @@
-https://bugs.gentoo.org/707188
--- a/src/cfg.c
-+++ b/src/cfg.c
-@@ -22,6 +22,7 @@
- #include <string.h>
- #endif
- 
-+extern char *LPE_CONFIG_FILE;
- int cfg_errno;
- 
- void
--- a/src/lpe.c
-+++ b/src/lpe.c
-@@ -25,6 +25,7 @@
- #include "strfuncs.h"
- #include "exports.h"
- 
-+char *LPE_CONFIG_FILE;
- /* A flag indicating a desire to quit the editor.  This is set whenever a
-  * command should cause an exit.
-  */
--- a/src/options.h
-+++ b/src/options.h
-@@ -38,6 +38,6 @@
- /*
-  * Other things that are used in some places...
-  */
-char *LPE_CONFIG_FILE;
-+extern char *LPE_CONFIG_FILE;
- 
- #endif /* LPE_OPTIONS_H */
--- a/app-editors/lpe/files/lpe-1.2.6.13-make-382.patch
+++ b/app-editors/lpe/files/lpe-1.2.6.13-make-382.patch
@ -1,22 +0,0 @@
-http://bugs.gentoo.org/335324
--- a/intl/Makefile.in
-+++ b/intl/Makefile.in
-@@ -202,12 +202,12 @@
- # The dependency for intlh.inst is different in gettext and all other
- # packages.  Because we cannot you GNU make features we have to solve
- # the problem while rewriting Makefile.in.
-@GT_YES@intlh.inst: intlh.inst.in ../config.status
-@GT_YES@	cd .. \
-@GT_YES@	&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
-@GT_YES@	  $(SHELL) ./config.status
-@GT_NO@.PHONY: intlh.inst
-@GT_NO@intlh.inst:
-+intlh.inst: intlh.inst.in ../config.status
-+	cd .. \
-+	&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
-+	  $(SHELL) ./config.status
-+.PHONY: intlh.inst
-+intlh.inst:
- 
- # Tell versions [3.59,3.63) of GNU make not to export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/app-editors/lpe/lpe-1.2.6.13.ebuild
+++ b/app-editors/lpe/lpe-1.2.6.13.ebuild
@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="a lightweight programmers editor"
-HOMEPAGE="https://packages.qa.debian.org/l/lpe.html"
-SRC_URI="mirror://debian/pool/main/l/${PN}/${PN}_${PV}-0.1.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86 ~x86-linux"
-IUSE="nls"
-
-RDEPEND="
-	sys-libs/ncurses:0=
-	sys-libs/slang"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-make-382.patch
-	"${FILESDIR}"/${P}-fno-common.patch
-)
-
-src_prepare() {
-	default
-
-	# You should add PKG_CHECK_MODULES(NCURSES, ncurses) to configure.in and
-	# replace -lncurses in src/Makefile.am with $(NCURSES_LIBS)
-	# That is, if you need eautoreconf
-	sed -i \
-		-e "s:-lncurses:$($(tc-getPKG_CONFIG) --libs-only-l ncurses):" \
-		src/Makefile.in || die
-}
-
-src_configure() {
-	econf $(use_enable nls)
-}
-
-src_install() {
-	emake \
-		libdir="${ED}/usr/$(get_libdir)" \
-		prefix="${ED}/usr" \
-		datadir="${ED}/usr/share" \
-		mandir="${ED}/usr/share/man" \
-		infodir="${ED}/usr/share/info" \
-		docdir="${ED}/usr/share/doc/${PF}" \
-		exdir="${ED}/usr/share/doc/${PF}/examples" \
-		install
-
-	find "${ED}" -name '*.la' -delete || die
-}
--- a/app-editors/vim/vim-8.2.0814-r100.ebuild
+++ b/app-editors/vim/vim-8.2.0814-r100.ebuild
@ -280,7 +280,7 @@ src_test() {
 # Call eselect vi update with --if-unset
 # to respect user's choice (bug 187449)
 eselect_vi_update() {
-	einfo "Calling eselect vi update..."
+	ebegin "Calling eselect vi update"
 	eselect vi update --if-unset
 	eend $?
 }
--- a/app-editors/vim/vim-8.2.3428-r1.ebuild
+++ b/app-editors/vim/vim-8.2.3428-r1.ebuild
@ -292,7 +292,7 @@ src_test() {
 # Call eselect vi update with --if-unset
 # to respect user's choice (bug 187449)
 eselect_vi_update() {
-	einfo "Calling eselect vi update..."
+	ebegin "Calling eselect vi update"
 	eselect vi update --if-unset
 	eend $?
 }
--- a/app-editors/vim/vim-8.2.3567.ebuild
+++ b/app-editors/vim/vim-8.2.3567.ebuild
@ -294,7 +294,7 @@ src_test() {
 # Call eselect vi update with --if-unset
 # to respect user's choice (bug #187449)
 eselect_vi_update() {
-	einfo "Calling eselect vi update..."
+	ebegin "Calling eselect vi update"
 	eselect vi update --if-unset
 	eend $?
 }
--- a/app-editors/vim/vim-8.2.3582.ebuild
+++ b/app-editors/vim/vim-8.2.3582.ebuild
@ -294,7 +294,7 @@ src_test() {
 # Call eselect vi update with --if-unset
 # to respect user's choice (bug #187449)
 eselect_vi_update() {
-	einfo "Calling eselect vi update..."
+	ebegin "Calling eselect vi update"
 	eselect vi update --if-unset
 	eend $?
 }
--- a/app-editors/vim/vim-8.2.3669.ebuild
+++ b/app-editors/vim/vim-8.2.3669.ebuild
@ -294,7 +294,7 @@ src_test() {
 # Call eselect vi update with --if-unset
 # to respect user's choice (bug #187449)
 eselect_vi_update() {
-	einfo "Calling eselect vi update..."
+	ebegin "Calling eselect vi update"
 	eselect vi update --if-unset
 	eend $?
 }
--- a/app-editors/vim/vim-8.2.3741.ebuild
+++ b/app-editors/vim/vim-8.2.3741.ebuild
@ -294,7 +294,7 @@ src_test() {
 # Call eselect vi update with --if-unset
 # to respect user's choice (bug #187449)
 eselect_vi_update() {
-	einfo "Calling eselect vi update..."
+	ebegin "Calling eselect vi update"
 	eselect vi update --if-unset
 	eend $?
 }
--- a/app-editors/vim/vim-8.2.3950.ebuild
+++ b/app-editors/vim/vim-8.2.3950.ebuild
@ -294,7 +294,7 @@ src_test() {
 # Call eselect vi update with --if-unset
 # to respect user's choice (bug #187449)
 eselect_vi_update() {
-	einfo "Calling eselect vi update..."
+	ebegin "Calling eselect vi update"
 	eselect vi update --if-unset
 	eend $?
 }
--- a/app-editors/vim/vim-8.2.4285.ebuild
+++ b/app-editors/vim/vim-8.2.4285.ebuild
@ -294,7 +294,7 @@ src_test() {
 # Call eselect vi update with --if-unset
 # to respect user's choice (bug #187449)
 eselect_vi_update() {
-	einfo "Calling eselect vi update..."
+	ebegin "Calling eselect vi update"
 	eselect vi update --if-unset
 	eend $?
 }
--- a/app-editors/vim/vim-8.2.4328-r1.ebuild
+++ b/app-editors/vim/vim-8.2.4328-r1.ebuild
@ -295,7 +295,7 @@ src_test() {
 # Call eselect vi update with --if-unset
 # to respect user's choice (bug #187449)
 eselect_vi_update() {
-	einfo "Calling eselect vi update..."
+	ebegin "Calling eselect vi update"
 	eselect vi update --if-unset
 	eend $?
 }
--- a/app-editors/vim/vim-8.2.4586.ebuild
+++ b/app-editors/vim/vim-8.2.4586.ebuild
@ -295,7 +295,7 @@ src_test() {
 # Call eselect vi update with --if-unset
 # to respect user's choice (bug #187449)
 eselect_vi_update() {
-	einfo "Calling eselect vi update..."
+	ebegin "Calling eselect vi update"
 	eselect vi update --if-unset
 	eend $?
 }
--- a/app-editors/vim/vim-9999.ebuild
+++ b/app-editors/vim/vim-9999.ebuild
@ -295,7 +295,7 @@ src_test() {
 # Call eselect vi update with --if-unset
 # to respect user's choice (bug #187449)
 eselect_vi_update() {
-	einfo "Calling eselect vi update..."
+	ebegin "Calling eselect vi update"
 	eselect vi update --if-unset
 	eend $?
 }
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
--- a/app-emacs/ebuild-mode/Manifest
+++ b/app-emacs/ebuild-mode/Manifest
@ -1,3 +1,2 @@
-DIST ebuild-mode-1.54.tar.xz 35768 BLAKE2B 8cfba7230eb61bcdede498c696aedd7c64d01e5a1e7a22ad0edf793fbf6970bddd818d431e717bcc0b5ea07d35b525468131df260206db912f36341947b98d08 SHA512 7e67f3875beb42bc94fe522364212a02ea93e11aa1a64512283ab783c5a41097076b29a3ecf72b4369180253efd26fd3a223d617909953b2c7626f5cbc2aaba1
 DIST ebuild-mode-1.55.tar.xz 36444 BLAKE2B b044f136dcd90608d2e6b3192ea35bdcfb19efb71a1ed9035d22afd9ee1aafe39e12c8e07908df8a222cded58b0549497298fb6cc92844794214d86e67225529 SHA512 ee1b25fcd12d5df56d9898eef49bd6df02d970bb62fa61a12a1a4a2fd165076d31cb99c92ee3bc7b64ad6b6d2d70a16933d84165640f25acfe5fc9252b0cee51
 DIST ebuild-mode-1.56.tar.xz 36448 BLAKE2B 9126dd5d004a5818a5214f10c88db84faee3945ac25ee141a577a868bf7f127490ee34d6ea103fb788f96c391eea3d00d18abe12564a2f6c70650fc8fe9c6cdf SHA512 2b67208d9f553a322761dc9b64e7b891722c2099cc7c9bfc929e1a424b22ec32c594e0ba029554434b51ef233d2d4435b6c639b06c25fd551608fe5dd830cb03
--- a/app-emacs/ebuild-mode/ebuild-mode-1.54-r1.ebuild
+++ b/app-emacs/ebuild-mode/ebuild-mode-1.54-r1.ebuild
@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp readme.gentoo-r1
-
-DESCRIPTION="Emacs modes for editing ebuilds and other Gentoo specific files"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
-SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-BDEPEND="sys-apps/texinfo"
-
-DOCS="ChangeLog keyword-generation.sh"
-ELISP_TEXINFO="${PN}.texi"
-SITEFILE="50${PN}-gentoo-1.54.el"
-DOC_CONTENTS="Some optional features may require installation of additional
-	packages, like dev-python/docutils-glep for glep."
--- a/app-emacs/ebuild-mode/ebuild-mode-1.56.ebuild
+++ b/app-emacs/ebuild-mode/ebuild-mode-1.56.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"

 BDEPEND="sys-apps/texinfo"

--- a/app-emacs/puppet-mode/puppet-mode-0.4.ebuild
+++ b/app-emacs/puppet-mode/puppet-mode-0.4.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/voxpupuli/puppet-mode/archive/${PV}.tar.gz -> ${P}.t

 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"

 DOCS="CHANGES.md README.md"
 SITEFILE="50${PN}-1-gentoo.el"
--- a/app-emacs/python-mode/python-mode-6.3.0.ebuild
+++ b/app-emacs/python-mode/python-mode-6.3.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/python-mode-devs/${PN}/-/archive/${PV}/${P}.tar.bz2"

 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"

 ELISP_REMOVE="python-mode-pkg.el"
 SITEFILE="50${PN}-gentoo.el"
--- a/app-emacs/ruby-mode/Manifest
+++ b/app-emacs/ruby-mode/Manifest
@ -1,4 +1,3 @@
-DIST ruby-2.5.5.tar.xz 11459832 BLAKE2B ced1105a87e7df8f82a65ca8d1d329d5a9d110d2f3f88b27a79262c4ac1484dda16d8646c0c03f18c1bb25f8b154075eb03a0614355ec62f677c2fa56ab3c956 SHA512 06b1d58536ebfacb7b56c1e6ed4b8ab816fadc4f48c845a452554cd262e7908199a30e5793f3cbaec2db56a8803aa5c6089abf7bf06c8fc47867e97870b7dfec
 DIST ruby-mode-2.6.3.tar.gz 28460 BLAKE2B 15ab0115cc669f31d656a6af03c061699cfd872130ed51240ecbf80fae413b1d2d8ed87ea1515584f276d15ee164a3c14f9138bf5054418419f6c09b2a72e8e4 SHA512 bbeaa3ae788ea3a536715dc8dc0b4c82803d0a21ce44ae048a5a1c1e331f8c571980feaf38f42455e2de099210bbd4d6f3e8dc2984d6318a70fe04aa6c0d9520
 DIST ruby-mode-2.7.0.tar.gz 28533 BLAKE2B a41bdd88ab6ee56b81d1fefd923967fe7b7219429a2727f62bbff5a76b294c18ec5fa941428dd6b8cd76687e1f362752e598cc8ad9fb8b8813143b0d1cfa25ce SHA512 17644db69d3ea5674d8bf48a87db5e2f396a7d032428e9e8b63dac2a45fafbe506440af7429c440e82d194df670d6dec5e3d6908b49654300493dba1be5450d8
 DIST ruby-mode-3.0.0.tar.gz 17748 BLAKE2B c0fc06ed11be0fa2fe82f1557ab4e55013abe53137557afcc3a8737ee73aa009d0f2b6069e2d8267afbd3d3d60442911c5e0328d7ec76d493719e7dce5c928e4 SHA512 6d1ef6adeff8de90705c25a726491d35476c6c7841f0ec016e9580f8781403a785da6083e76d14b699c054c1eed1cf52572284932797fdeb318426d76d328029
--- a/app-emacs/ruby-mode/ruby-mode-2.5.5.ebuild
+++ b/app-emacs/ruby-mode/ruby-mode-2.5.5.ebuild
@ -1,18 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit elisp
-
-DESCRIPTION="Emacs major mode for editing Ruby code"
-HOMEPAGE="https://www.ruby-lang.org/"
-SRC_URI="https://cache.ruby-lang.org/pub/ruby/ruby-${PV}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-S="${WORKDIR}/ruby-${PV}/misc"
-DOCS="README"
-SITEFILE="50${PN}-gentoo-2.5.0.el"
--- a/app-emacs/ruby-mode/ruby-mode-3.0.0.ebuild
+++ b/app-emacs/ruby-mode/ruby-mode-3.0.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -13,7 +13,7 @@ SRC_URI="https://github.com/ruby/elisp/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"

 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"

 S="${WORKDIR}/elisp-${COMMIT}"
 DOCS="README"
--- a/Show More
+++ b/Show More