Sync with portage [Sun Jul 24 15:28:05 MSK 2022].

2022-07-24 15:28:06 +03:00 · 2022-07-24 15:28:06 +03:00 · 668ccb518c
commit 668ccb518c
parent 76f304327f
11948 changed files with 48489 additions and 48486 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/acct-group/Manifest.gz
+++ b/acct-group/Manifest.gz
--- a/acct-group/bumblebee/metadata.xml
+++ b/acct-group/bumblebee/metadata.xml
@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>np-hardass@gentoo.org</email>
-		<name>Adam Feldman</name>
-	</maintainer>
 	<maintainer type="person">
 		<email>pacho@gentoo.org</email>
 		<name>Pacho Ramos</name>
--- a/acct-group/jellyfin/metadata.xml
+++ b/acct-group/jellyfin/metadata.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person" proxied="yes">
 		<email>gentoo@wb9.se</email>
--- a/acct-group/prowlarr/metadata.xml
+++ b/acct-group/prowlarr/metadata.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person" proxied="yes">
 		<email>mcrawford@eliteitminds.com</email>
--- a/acct-group/radarr/metadata.xml
+++ b/acct-group/radarr/metadata.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person" proxied="yes">
 		<email>mcrawford@eliteitminds.com</email>
--- a/acct-group/readarr/metadata.xml
+++ b/acct-group/readarr/metadata.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person" proxied="yes">
 		<email>mcrawford@eliteitminds.com</email>
--- a/acct-group/sonarr/metadata.xml
+++ b/acct-group/sonarr/metadata.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="person" proxied="yes">
 	<email>mcrawford@eliteitminds.com</email>
--- a/acct-user/Manifest.gz
+++ b/acct-user/Manifest.gz
--- a/acct-user/jellyfin/metadata.xml
+++ b/acct-user/jellyfin/metadata.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person" proxied="yes">
 		<email>gentoo@wb9.se</email>
--- a/acct-user/prowlarr/metadata.xml
+++ b/acct-user/prowlarr/metadata.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person" proxied="yes">
 		<email>mcrawford@eliteitminds.com</email>
--- a/acct-user/radarr/metadata.xml
+++ b/acct-user/radarr/metadata.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person" proxied="yes">
 		<email>mcrawford@eliteitminds.com</email>
--- a/acct-user/readarr/metadata.xml
+++ b/acct-user/readarr/metadata.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person" proxied="yes">
 		<email>mcrawford@eliteitminds.com</email>
--- a/acct-user/sonarr/metadata.xml
+++ b/acct-user/sonarr/metadata.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="person" proxied="yes">
 	<email>mcrawford@eliteitminds.com</email>
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
--- a/app-accessibility/orca/Manifest
+++ b/app-accessibility/orca/Manifest
@ -1,3 +1,2 @@
 DIST orca-42.1.tar.xz 3700132 BLAKE2B 1310a1b43da709e9b273ce21374fff9fa30fbf08d1d0e171eb7eff4511ad5e2bcee12a2d6549a4c0c8e21526fb6f4b3b311d0e09fd6bfa863e29168809df9c10 SHA512 98f016087317666c4dcc7543d16ffb93214075d49d3708a1aa3dc8b6dd5d9d85c52dd31e650f4511371061c58d53e73455a09d6d7b4405b8a972b58ff1d7db91
-DIST orca-42.2.tar.xz 3707612 BLAKE2B a181c994ee8c35561d493dd00949807c09ccb3dd406ed0c61083c746c29fe7ef9db010484c34ca4416170cf51555b1f595f78816ca5f66ccf29970a0ff447088 SHA512 78c4e6d588d4929869100b761c85aa1d37a503e0960953c6ef7488ac7ed3c6d4ec400b9fd034b5178d64a69aca7daeaac2f25e292c32dfa814f7428b1c159fd5
 DIST orca-42.3.tar.xz 3707048 BLAKE2B b1a03cee97ba2ad17e32b863effba46974f86e5cbdcea72235085e369189e8e92cba8b83931fd83a7b859edfc8da9236f462e250c468ad1533768479eb25aad0 SHA512 59d9d61af2e385d8e356f825fc1733d73d136f89a3a06c352eaf1e7b05cd6ebf5bd13282afb478adb4ea7981398db0138324c3e275eb372b99ba648d9fafeab6
--- a/app-accessibility/orca/orca-42.2.ebuild
+++ b/app-accessibility/orca/orca-42.2.ebuild
@ -1,63 +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} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit gnome2 python-single-r1
-
-DESCRIPTION="Extensible screen reader that provides access to the desktop"
-HOMEPAGE="https://wiki.gnome.org/Projects/Orca"
-
-LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-IUSE="+braille"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	>=app-accessibility/at-spi2-atk-2.34:2
-	>=app-accessibility/at-spi2-core-2.36:2[introspection]
-	>=dev-libs/atk-2.36
-	>=dev-libs/glib-2.28:2
-	media-libs/gstreamer:1.0[introspection]
-	>=x11-libs/gtk+-3.6.2:3[introspection]
-	$(python_gen_cond_dep '
-		dev-python/gst-python:1.0[${PYTHON_USEDEP}]
-		>=dev-python/pygobject-3.18:3[${PYTHON_USEDEP}]
-	')
-	braille? (
-		$(python_gen_cond_dep '
-			>=app-accessibility/brltty-5.0-r3[python,${PYTHON_USEDEP}]
-			dev-libs/liblouis[python,${PYTHON_USEDEP}]
-		')
-	)
-"
-RDEPEND="${DEPEND}
-	dev-libs/atk[introspection]
-	$(python_gen_cond_dep '
-		>=app-accessibility/speech-dispatcher-0.8[python,${PYTHON_USEDEP}]
-		>=dev-python/pyatspi-2.36[${PYTHON_USEDEP}]
-		dev-python/setproctitle[${PYTHON_USEDEP}]
-	')
-	x11-libs/libwnck:3[introspection]
-	x11-libs/pango[introspection]
-"
-BDEPEND="
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-#	app-text/yelp-tools
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_with braille liblouis)
-}
-
-src_install() {
-	gnome2_src_install
-	python_optimize
-}
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/ansible-base/ansible-base-2.12.7.ebuild
+++ b/app-admin/ansible-base/ansible-base-2.12.7.ebuild
@ -19,7 +19,7 @@ else
 	MY_PN="${PN/-base/-core}"
 	MY_P="${MY_PN}-${PV}"
 	SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
 	S="${WORKDIR}"/${MY_P}
 fi

--- a/app-admin/ansible-base/ansible-base-2.13.1.ebuild
+++ b/app-admin/ansible-base/ansible-base-2.13.1.ebuild
@ -19,7 +19,7 @@ else
 	MY_PN="${PN/-base/-core}"
 	MY_P="${MY_PN}-${PV}"
 	SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
 	S="${WORKDIR}"/${MY_P}
 fi

--- a/app-admin/ansible/ansible-5.9.0.ebuild
+++ b/app-admin/ansible/ansible-5.9.0.ebuild
@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
 RESTRICT="test"

 RDEPEND=">=app-admin/ansible-base-2.12.0
--- a/app-admin/ansible/ansible-6.0.0.ebuild
+++ b/app-admin/ansible/ansible-6.0.0.ebuild
@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
 RESTRICT="test"

 RDEPEND=">=app-admin/ansible-base-2.13.0
--- a/app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild
@ -0,0 +1,109 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
+HOMEPAGE="https://httpd.apache.org/"
+SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris"
+IUSE="ssl"
+RESTRICT="test"
+
+RDEPEND=">=dev-libs/apr-1.5.0:1=
+	dev-libs/apr-util:1=
+	dev-libs/expat
+	dev-libs/libpcre
+	virtual/libcrypt:=
+	kernel_linux? ( sys-apps/util-linux )
+	ssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}
+	sys-devel/libtool"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/httpd-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4.54-Makefile.patch" #459446
+	"${FILESDIR}/${PN}-2.4.54-no-which.patch" #844868
+	"${FILESDIR}/${PN}-2.4.54-libtool.patch" #858833
+)
+
+src_prepare() {
+	default
+
+	# This package really should upgrade to using pcre's .pc file.
+	cat <<-\EOF >"${T}"/pcre-config
+	#!/bin/bash
+	flags=()
+	for flag; do
+		if [[ ${flag} == "--version" ]]; then
+			flags+=( --modversion )
+		else
+			flags+=( "${flag}" )
+		fi
+	done
+	exec ${PKG_CONFIG} libpcre "${flags[@]}"
+	EOF
+	chmod a+x "${T}"/pcre-config || die
+
+	# Only here for libtool and which patches
+	eautoreconf
+}
+
+src_configure() {
+	# Brain dead check.
+	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
+
+	tc-export PKG_CONFIG
+
+	local myeconfargs=(
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules
+		--sbindir="${EPREFIX}"/usr/sbin
+		--with-z="${EPREFIX}"/usr
+		--with-apr="${ESYSROOT}"/usr
+		--with-apr-util="${ESYSROOT}"/usr
+		--with-pcre="${T}"/pcre-config
+		$(use_enable ssl)
+		$(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
+	)
+	# econf overwrites the stuff from config.layout.
+	ac_cv_path_PKGCONFIG="${PKG_CONFIG}" \
+	econf "${myeconfargs[@]}"
+	sed -i \
+		-e '/^LTFLAGS/s:--silent::' \
+		build/rules.mk build/config_vars.mk || die
+}
+
+src_compile() {
+	emake -C support
+}
+
+src_install() {
+	emake -C support DESTDIR="${D}" install
+	dodoc CHANGES
+	doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
+		docs/man/{htcacheclean,rotatelogs}.8
+
+	# Providing compatiblity symlinks for #177697 (which we'll stop to install
+	# at some point).
+	pushd "${ED}"/usr/sbin >/dev/null || die
+	local i
+	for i in *; do
+		dosym ${i} /usr/sbin/${i}2
+	done
+	popd >/dev/null || die
+
+	# Provide a symlink for ab-ssl
+	if use ssl ; then
+		dosym ab /usr/bin/ab-ssl
+		dosym ab /usr/bin/ab2-ssl
+	fi
+}
--- a/app-admin/apache-tools/files/apache-tools-2.4.54-Makefile.patch
+++ b/app-admin/apache-tools/files/apache-tools-2.4.54-Makefile.patch
@ -0,0 +1,37 @@
+Bug: https://bugs.gentoo.org/459446
+
+From: orbea <orbea@riseup.net>
+Date: Tue, 19 Jul 2022 10:42:26 -0700
+Subject: [PATCH] support: Install fewer programs
+
+--- a/support/Makefile.in
+++ b/support/Makefile.in
+@@ -14,27 +14,12 @@ include $(top_builddir)/build/rules.mk
+ 
+ install:
+ 	@test -d $(DESTDIR)$(bindir) || $(MKINSTALLDIRS) $(DESTDIR)$(bindir)
+-	@test -d $(DESTDIR)$(sbindir) || $(MKINSTALLDIRS) $(DESTDIR)$(sbindir)
+-	@test -d $(DESTDIR)$(libexecdir) || $(MKINSTALLDIRS) $(DESTDIR)$(libexecdir)
+-	@cp -p $(top_builddir)/server/httpd.exp $(DESTDIR)$(libexecdir)
+-	@for i in apxs dbmmanage; do \
+	@for i in dbmmanage; do \
+ 	    if test -f "$(builddir)/$$i"; then \
+ 	        cp -p $$i $(DESTDIR)$(bindir); \
+ 	        chmod 755 $(DESTDIR)$(bindir)/$$i; \
+ 	    fi ; \
+ 	done
+-	@for i in apachectl; do \
+-	    if test -f "$(builddir)/$$i"; then \
+-	        cp -p $$i $(DESTDIR)$(sbindir); \
+-	        chmod 755 $(DESTDIR)$(sbindir)/$$i; \
+-	    fi ; \
+-	done
+-	@if test -f "$(builddir)/envvars-std"; then \
+-	    cp -p envvars-std $(DESTDIR)$(sbindir); \
+-	    if test ! -f $(DESTDIR)$(sbindir)/envvars; then \
+-	        cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \
+-	    fi ; \
+-	fi
+ 
+ htpasswd.lo: passwd_common.h
+ passwd_common.lo: passwd_common.h
--- a/app-admin/apache-tools/files/apache-tools-2.4.54-libtool.patch
+++ b/app-admin/apache-tools/files/apache-tools-2.4.54-libtool.patch
@ -0,0 +1,21 @@
+Bug: https://bugs.gentoo.org/858833
+
+From: orbea <orbea@riseup.net>
+Date: Tue, 19 Jul 2022 07:46:36 -0700
+Subject: [PATCH] build: Fix the build with slibtool
+
+Adding LT_INIT to configure.in generates the libtool script in the build
+directory which is required by rlibtool to determine if the build is
+shared or static.
+
+--- a/configure.in
+++ b/configure.in
+@@ -398,7 +398,7 @@ AC_PATH_PROG(RSYNC, rsync)
+ AC_PATH_PROG(SVN, svn)
+ AC_PROG_AWK
+ AC_PROG_LN_S
+-AC_CHECK_TOOL(RANLIB, ranlib, true)
+LT_INIT
+ dnl AC_PATH_PROG(PERL_PATH, perl)
+ AC_CHECK_PROGS(LYNX_PATH,[lynx links elinks], [lynx])
+ 
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@ -3,3 +3,4 @@ DIST aws-cli-1.25.26.gh.tar.gz 2230449 BLAKE2B bb792fb2e4ba25870168e4fc3301d4b92
 DIST aws-cli-1.25.31.gh.tar.gz 2233721 BLAKE2B 791bd78851c5643ee72faddc8e4d4e39c94a91e4879d749bcf2cadbe4797cdd448a95dd2b3c626b76e648303ec93fc0338d08f79227f05ff467754810166731b SHA512 586f0fa0f81ec8acc0b79fba5372a37ebcf162981c8fbab31633f63736337cae0b4788bb7a4cdabf6e04800fb63ed6804a6a73a7d5552a9b4c85b4eb273ee6d8
 DIST aws-cli-1.25.32.gh.tar.gz 2234199 BLAKE2B 01298ae8efd9f33c71856a3e866b6df86af1ad83e6085015bd76caa6ba4c48847a66348cfbde19ef47bdb1b8f61ded2565d319cbef1f7e2c3472e6dace89193b SHA512 d55eeb201209cfc6c4e1ba443ca049dc1b4ebabfa6abf3327ea0c8967d0d77c9963c2727f29482b475b3b66fc711130c1b40dc29e28c037c912115c24890810f
 DIST aws-cli-1.25.33.gh.tar.gz 2234361 BLAKE2B fd4d91cf4ed0ae3715f629754c664802f2fb402c7cec6349ba8faab9e09901a306eeb9f69a15984526177c1ecc75c09965b430607a5d7606b070bd1c7cb4d6dc SHA512 f0fe3b8f31318303bbe4fc16f3ba02cebb27349364351c152ba508dd0a70bf7ba2a82983cfc21da6532b80be7417719d889e620fb5666e70b3f74091bb252dfc
+DIST aws-cli-1.25.36.gh.tar.gz 2237211 BLAKE2B fbab136a1c1211646c1213357cd80068da376e4aceb38007c14b2fb670a694b37aaa0157d58eb4edf10c3a9b5a700575a42b48c06db1c4034f39ccda584be19a SHA512 b66ba357085c82dcefc4ed9a6d0765d8768c8d216cd255056be055d3b5f604b62bace3eacccac83275d7c9487847f7de542efa804f8e0f454947cfe453d6e705
--- a/app-admin/awscli/awscli-1.25.36.ebuild
+++ b/app-admin/awscli/awscli-1.25.36.ebuild
@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+	https://github.com/aws/aws-cli/
+	https://pypi.org/project/awscli/
+"
+SRC_URI="
+	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# botocore is x.(y+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
--- a/app-admin/chroot_safe/chroot_safe-1.4-r1.ebuild
+++ b/app-admin/chroot_safe/chroot_safe-1.4-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN//_}/${P}.tgz"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ppc ~riscv x86"

 PATCHES=( "${FILESDIR}"/${P}-ldflags.patch )

--- a/app-admin/chrpath/chrpath-0.16.ebuild
+++ b/app-admin/chrpath/chrpath-0.16.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
@ -11,7 +11,7 @@ SRC_URI="https://alioth-archive.debian.org/releases/${PN}/${PN}/${PV}/${P}.tar.g

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"

 PATCHES=(
--- a/app-admin/haskell-updater/haskell-updater-1.3.2-r1.ebuild
+++ b/app-admin/haskell-updater/haskell-updater-1.3.2-r1.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"

 DEPEND=">=dev-lang/ghc-6.12.1:="

--- a/app-admin/helm/Manifest
+++ b/app-admin/helm/Manifest
@ -1,2 +1,4 @@
 DIST helm-3.8.1-deps.tar.xz 374838312 BLAKE2B 13700d77faef89828a98b0410f1539c4370848d3f741881dfff4fb6d08b50d152052b4c1fa7ce4fe19d1d08583530c89f9e8ca35ede178b08c05dbecbdf36fbb SHA512 5686ca6c3f9b114032dda78842c3e3d2012f97d5721455aedc204ffae8a6bdafcb5191beaaca0e89cb827a7846fe65658d4440c2982b36b008e8aa235be41736
+DIST helm-3.9.1-deps.tar.xz 126714520 BLAKE2B 139903532e2e2bc8e4a1609416e543cc3105f831c1182fc35afdc96c9dbb5a893328c05855891e5a5d2953a5ee3f9dc6903ff4cbe85c1a7db203b370dd45650d SHA512 9f10f66e0ea5989978ae397773b90fe4336165bb92ab4ac13a9811ec598033e57456266a5dbfafb53b413e22ce5c659cf0c3e29249155b11876f888dd388f45a
 DIST k8s-helm-3.8.1.tar.gz 715683 BLAKE2B 2b0fc2a844f848e2a696be54224c1ca6027bf461c0885b3e082b57a09117b6ebc2500b35f1e6ad03cdc7ad4d0f18b3b6c24a1e79782b1b0492effc6a80031a93 SHA512 c4c3c8272ac4d83fad7dcdd41f81e9123ee71b01b6ebf352c3f3836048d7d240e144a52fd78e156c1957020bb1e4a868059486a4a4c3d37e4be150203a1e6158
+DIST k8s-helm-3.9.1.tar.gz 704718 BLAKE2B 688b15dcd104bb0c95feaaa63292cbb56c7d30d136ec8cc5ba5b380718eb42ef3d7b94a08317f80811eafd7bf68de7af2fc5b7849126f45502913af88c7e49a8 SHA512 3d96673bdbd4d6337841b9a12d623c7ab132028b01e594bfc289209f5f6c04c8f6e6e9212435ae1438793412764eb0e74e4c54f4e480ce813dbc646b3b75ccaf
--- a/app-admin/helm/helm-3.9.1.ebuild
+++ b/app-admin/helm/helm-3.9.1.ebuild
@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit bash-completion-r1 go-module
+GIT_COMMIT=a7c043acb5ff905c261cfdc923a35776ba5e66e4
+GIT_SHA=a7c043ac
+MY_PV=${PV/_rc/-rc.}
+
+DESCRIPTION="Kubernetes Package Manager"
+HOMEPAGE="https://github.com/helm/helm https://helm.sh"
+SRC_URI="https://github.com/helm/helm/archive/v${MY_PV}.tar.gz -> k8s-${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+RESTRICT=" test"
+
+src_compile() {
+	emake \
+		GOFLAGS="${GOFLAGS}" \
+		LDFLAGS="" \
+		GIT_COMMIT=${GIT_COMMIT} \
+		GIT_SHA=${GIT_SHA} \
+		GIT_TAG=v${MY_PV} \
+		GIT_DIRTY=clean \
+		build
+	bin/${PN} completion bash > ${PN}.bash || die
+	bin/${PN} completion zsh > ${PN}.zsh || die
+}
+
+src_install() {
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+
+	dobin bin/${PN}
+	dodoc README.md
+}
--- a/app-admin/keepass/metadata.xml
+++ b/app-admin/keepass/metadata.xml
@ -1,17 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>ale@clearmind.me</email>
-	</maintainer>
 	<maintainer type="person">
 		<email>kensington@gentoo.org</email>
 		<name>Michael Palimaka</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<use>
 		<flag name="aot">Generate native code at build time, rather than runtime.</flag>
 	</use>
--- a/app-admin/kpcli/Manifest
+++ b/app-admin/kpcli/Manifest
@ -1 +1,2 @@
 DIST kpcli-3.7.pl 241191 BLAKE2B a3a851ab9d5244dc2c17c084f116fd8b7adc6770715011c119e8238a7f5ecc0fd894d98c47c4762413dadfff83798f1a134a21d9e156d12ae76aac51259ee58b SHA512 2f66686e6f563e9ef5a2ae1fe23085c2563455e6041ce60eaedbb87492ae517a19163393e640e58b3a8d761cefd924bad605762ad6ba045de8f45fad4fb90abc
+DIST kpcli-3.8.1.pl 263292 BLAKE2B 70e9e4ca56466e51314e891de2282f9124c7eedd0f7aea7abfc4ad94a1f4ebcc4d65dc09573560e4cc90be4a2f4a3156d6d4e57f3cb5a27de297fca137fc9cbb SHA512 5d4ba12112b6b82dc150193f6c2210c868c6582726cf157f05d2ad74224ac6f637d09075ae410ce91481b222cc1f40c3fb2f6267923a04a06211929d92a05097
--- a/app-admin/kpcli/kpcli-3.8.1.ebuild
+++ b/app-admin/kpcli/kpcli-3.8.1.ebuild
@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit optfeature
+
+DESCRIPTION="A command line interface to KeePass database files"
+HOMEPAGE="http://kpcli.sourceforge.net"
+SRC_URI="https://downloads.sourceforge.net/project/kpcli/${P}.pl"
+
+LICENSE="|| ( Artistic GPL-1+ )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-perl/Clone
+	dev-perl/Crypt-Rijndael
+	dev-perl/File-KeePass
+	dev-perl/Math-Random-ISAAC
+	dev-perl/Sort-Naturally
+	dev-perl/Sub-Install
+	dev-perl/TermReadKey
+	dev-perl/Term-ReadLine-Gnu
+	dev-perl/Term-ShellUI"
+
+src_unpack() {
+	mkdir "${S}" || die
+	cp "${DISTDIR}/${P}.pl" "${S}/${PN}" || die
+}
+
+src_compile() { :; }
+
+src_install() {
+	dobin kpcli
+}
+
+pkg_postinst() {
+	optfeature "time-based-one-time-only password support" "dev-perl/Authen-OATH dev-perl/Convert-Base32"
+	optfeature "X clipboard support" "dev-perl/Capture-Tiny dev-perl/Clipboard"
+	optfeature "password quality check" dev-perl/Data-Password
+	optfeature "better password quality check" dev-perl/Data-Password-passwdqc
+	optfeature "importing Password Safe v3 databases" dev-perl/Crypt-PWSafe3
+}
--- a/app-admin/quickswitch/quickswitch-1.05.ebuild
+++ b/app-admin/quickswitch/quickswitch-1.05.ebuild
@ -1,13 +1,13 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=6
+EAPI=8

 DESCRIPTION="Utility to switch network profiles on the fly"
+HOMEPAGE="https://muthanna.com/quickswitch/index.html"
 SRC_URI="mirror://sourceforge/quickswitch/${P}.tar.gz"
-HOMEPAGE="http://quickswitch.sf.net"

-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ppc ~s390 sparc x86"
 IUSE="ncurses"
--- a/app-admin/vault/Manifest
+++ b/app-admin/vault/Manifest
@ -2,5 +2,9 @@ DIST vault-1.10.3-vendor.tar.gz 48109465 BLAKE2B 45985a6ae4445ec75b29f198113fdd1
 DIST vault-1.10.3-webui.tar.xz 1258176 BLAKE2B 85fd1b804b880a3dcdbbd4e825b663f02a985259d0a74ab7cddf4a9a2393c60918b389d0e4e81574b93c8b0867647fc1d17f7ca3e719b36ab41d6825adfbdaae SHA512 9640a7e25de0761a310e234098a0dd31db9e04b30036045ff7edaaca8f7496466f1c0148855a5e1ef270638e90a8fb97aff2c5482b32512772021c99691a5aa5
 DIST vault-1.10.4-vendor.tar.gz 50089463 BLAKE2B 299e7619f158a2ea0683feaaff4a7c5019da02fa03daf25e0b4415f03b703ca11733c486165a21ffcd5b3c1d221db5b9e24e898f3cf3de014c09e29531841dcf SHA512 056a6056bac127083358f1811e8e587f0521b734219a6e03e019527fafcadfbd0d71a05314cb269e27b03423349b5a857d234d3949d0d15e7c7b1175bc573c57
 DIST vault-1.10.4-webui.tar.xz 1258340 BLAKE2B 556da0e566852e5c6a091bd9139a88a9099e5f6422e225b7a4068e1bef3d9fd5a2292bb2efbe12545c20f6c956fd6180500972d5248f05bbb96db50a90ae4741 SHA512 ec9cc568d8d56ba379d0fdee31e0edc8aa8110366b112790573794975a0b32324f517e5fead39fbf59ab99667837b0e08ebadfb6d41dcde85d474712b34b475a
+DIST vault-1.10.5-vendor.tar.gz 50096802 BLAKE2B 07f797666f97666a3dbdfb3cca7ba9fea1a45b26fd35d902200acdf3bad33ad365f4d547a1c3fe42f9e6a41258713b48673236d5f64547016ba08b43ede4eeda SHA512 87f56ff16a2a28690dd128ff0f1c480616ae7948eaff337e3d3e4eb3370d6d1322b2a488044bc237f9eafc60d42652f3a7decb7283d1596285762cf570fea8ca
+DIST vault-1.10.5-webui.tar.xz 1258192 BLAKE2B c546475dc9949c8854e702ff97267cde97472b47f209e7ed923e6caf9d0fe2b615c0087299148c0325669ae25b4ec111d7e8eff8454dfe5fe15a47bf4c969984 SHA512 fb44ad261cfa2e492b824fc8ec0ad44e54eaa417980bd9cd845e017fcad23670231a696df306332df5cfd5ce039cc1e3f744fe3ef35563b4902ebb15798a6b1d
 DIST vault-1.11.0-vendor.tar.gz 49927497 BLAKE2B d7a12c1c1710c2a487b9c08a871b1d7b011d90957cab6980eb2f7eaff4ff544509899ee07c326bba8310ff16ee3bf88586dba340249cf0f7804007963af7d692 SHA512 b3b9275d5ae41c21826ed0bf1eeaffffe10e5e95b085bf8cf6af6c9ff565848f4a3f83d9a8d6165867de11b0f877383cb972e7d4313a753b0dca391203ecb4c6
 DIST vault-1.11.0-webui.tar.xz 1335764 BLAKE2B 9733ae0c2fe04018dac73358a56a162e23877e68b3ce59ca569cea7e27f39c91727ab0810a737167b3f02d92a0d58e9a7195da892c677bece60fbe965dba7fdf SHA512 a5df9f0e854af8f30d6b5d15628a087c1c37361e2a0de4e412e7f78ac51affc774c1a6ed084dd849b68b147d527547593c1124d1170be38b918efd28081a6f0b
+DIST vault-1.11.1-vendor.tar.gz 52063513 BLAKE2B adb2fb6ab7991e94ce00aa298837f2fac21c24bb8ea8edd2265eed6664498b38567d81fcfe28749b4bf16c449c769448a75fa3c1403f5cdf33b18580d8a65936 SHA512 c1247308f390117c98e43dd82498a069c34d3e766298dd05d5ddb5f69b9a3db2e312b897f35c9f63225cffcac476ba1021a4a71100721848642b6c4412123251
+DIST vault-1.11.1-webui.tar.xz 1335740 BLAKE2B 6a6fdcb22563ad4c3f18bf3816fe8a016c11d19a014458594c2dade3dc8e908db252c34bad88be9e80c2a6408af28af6324158e1e69b40061af6d6fe1a66c655 SHA512 1c02e0ef645df946ffb9d967a9be230800e67597d0ed6cf8afb2688eed9ca863a1f29efeefbb51e0257d2be588da443864df9e1306956844645b0168c2d58d9b
--- a/app-admin/vault/vault-1.10.5.ebuild
+++ b/app-admin/vault/vault-1.10.5.ebuild
@ -0,0 +1,85 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fcaps go-module systemd
+
+DESCRIPTION="A tool for managing secrets"
+HOMEPAGE="https://vaultproject.io/"
+
+VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz"
+SRC_URI="https://github.com/zmedico/vault/archive/refs/tags/v${PV}-vendor.tar.gz -> ${P}-vendor.tar.gz
+	webui? (
+		https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE}
+	)"
+
+LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="+webui"
+
+BDEPEND="
+	app-arch/zip
+	dev-go/gox
+	>=dev-lang/go-1.15.3"
+COMMON_DEPEND="acct-group/vault
+	acct-user/vault"
+	DEPEND="${COMMON_DEPEND}"
+	RDEPEND="${COMMON_DEPEND}"
+
+FILECAPS=(
+	-m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
+)
+
+RESTRICT+=" test"
+S=${WORKDIR}/${P}-vendor
+
+src_unpack() {
+	default
+}
+
+src_prepare() {
+	default
+	# Avoid the need to have a git checkout
+	sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
+		-e 's:^\(GIT_DIRTY=\).*:\1:' \
+		-e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
+		-i scripts/build.sh || die
+	sed -e "/hooks/d" \
+		-e 's|^\([[:space:]]*\)goimports .*)|\1true|' \
+		-e "s/gofumpt/gofmt/g" \
+		-i Makefile || die
+	if [[ -d "${WORKDIR}/http/web_ui" ]]; then
+		rm -rf "${S}/http/web_ui" || die
+		mv "${WORKDIR}/http/web_ui" "${S}/http/web_ui" ||
+			die "mv failed"
+	else
+		mkdir -p "${S}/http/web_ui" || die
+		touch "${S}/http/web_ui/no_web_ui" || die
+	fi
+}
+
+src_compile() {
+	mkdir "${T}"/bin || die
+	BUILD_TAGS="$(usex webui ui '')" \
+	GOPATH="${T}" \
+	XC_ARCH=$(go env GOARCH) \
+	XC_OS=$(go env GOOS) \
+	XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
+	emake bin
+}
+
+src_install() {
+	dobin bin/${PN}
+	dodoc CHANGELOG.md CONTRIBUTING.md README.md
+	insinto /etc/${PN}.d
+	doins "${FILESDIR}/"*.json.example
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
--- a/app-admin/vault/vault-1.11.1.ebuild
+++ b/app-admin/vault/vault-1.11.1.ebuild
@ -0,0 +1,86 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fcaps go-module systemd
+
+DESCRIPTION="A tool for managing secrets"
+HOMEPAGE="https://vaultproject.io/"
+
+VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz"
+SRC_URI="https://github.com/zmedico/vault/archive/refs/tags/v${PV}-vendor.tar.gz -> ${P}-vendor.tar.gz
+	webui? (
+		https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE}
+	)"
+
+LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="+webui"
+
+BDEPEND="
+	app-arch/zip
+	dev-go/gox
+	>=dev-lang/go-1.15.3"
+COMMON_DEPEND="acct-group/vault
+	acct-user/vault"
+	DEPEND="${COMMON_DEPEND}"
+	RDEPEND="${COMMON_DEPEND}"
+
+FILECAPS=(
+	-m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
+)
+
+RESTRICT+=" test"
+S=${WORKDIR}/${P}-vendor
+
+src_unpack() {
+	default
+}
+
+src_prepare() {
+	default
+	# Avoid the need to have a git checkout
+	sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
+		-e 's:^\(GIT_DIRTY=\).*:\1:' \
+		-e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
+		-e "s|^BUILD_DATE=.*|BUILD_DATE=$(date +%Y-%m-%dT%H:%M:%SZ)|" \
+		-i scripts/build.sh || die
+	sed -e "/hooks/d" \
+		-e 's|^\([[:space:]]*\)goimports .*)|\1true|' \
+		-e "s/gofumpt/gofmt/g" \
+		-i Makefile || die
+	if [[ -d "${WORKDIR}/http/web_ui" ]]; then
+		rm -rf "${S}/http/web_ui" || die
+		mv "${WORKDIR}/http/web_ui" "${S}/http/web_ui" ||
+			die "mv failed"
+	else
+		mkdir -p "${S}/http/web_ui" || die
+		touch "${S}/http/web_ui/no_web_ui" || die
+	fi
+}
+
+src_compile() {
+	mkdir "${T}"/bin || die
+	BUILD_TAGS="$(usex webui ui '')" \
+	GOPATH="${T}" \
+	XC_ARCH=$(go env GOARCH) \
+	XC_OS=$(go env GOOS) \
+	XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
+	emake bin
+}
+
+src_install() {
+	dobin bin/${PN}
+	dodoc CHANGELOG.md CONTRIBUTING.md README.md
+	insinto /etc/${PN}.d
+	doins "${FILESDIR}/"*.json.example
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
--- a/app-antivirus/Manifest.gz
+++ b/app-antivirus/Manifest.gz
--- a/app-antivirus/lkrg/Manifest
+++ b/app-antivirus/lkrg/Manifest
@ -2,3 +2,5 @@ DIST lkrg-0.9.2.tar.gz 125976 BLAKE2B c3da2d4599c9dd5b7d6fbec426fd93d802715f6c85
 DIST lkrg-0.9.2.tar.gz.sign 801 BLAKE2B 0cd8b18c8a0fbcca61ffa868b406d048461ddf9189fb08f15faa45e01b8731906a6b14105dfcf92bb5124373860f6695594063ee8d138c94c70adf471bc15e0a SHA512 18b547ca84a7fd2957484857e17983408e92fd005d58b77b399c5156ecb09fc5e9e6c910337654a2655883d103098c1769b1993017eec753bd21e63d6491ad04
 DIST lkrg-0.9.3.tar.gz 127986 BLAKE2B 5d059247c9a8a5abe4795d22b3806544dbb4c332947012ec33ceace27747663375acf68a4e859fae293eead5f7d9540b4261d3fef149d1e5c6ee8714a2df28d6 SHA512 9b441b93ff28b733afc513643a5d843c1707ac5a05adb359a3142b9ca7cba6a4790ebca4f9e6ca88a6ddf61f2b06aa242e02f288e9295e74999ed534794fb45d
 DIST lkrg-0.9.3.tar.gz.sign 801 BLAKE2B c054522f281d09a008821f92c7b43b5384241100c68ef0b0ea7171b8c492772a5d668b425089e1aac990bf6a675215dd5861f3f2598995e31a8db82a8b2ec7e9 SHA512 87c2bfe8d342b85f3c6c8226be5b698527a507369603a03eefead89ea8635b5ba95f3cbbe1d84cd77ac42bb8a773a7133917e0c87132b4851ff4017f77bc683a
+DIST lkrg-0.9.4.tar.gz 127462 BLAKE2B 4085d517e0a6360739a031e8afe4540354d35a8a59d33c96900c2def0c80bf81bef76b84322bb4beca649917693fd6a121ce81ba8caf652adbe406757729083d SHA512 7dd88a3071bbc7a1e6ca725a339f8a93544bf97f1b73e6a4b424895810a4f094d056b644120ad6df14650cd7e5678a356063b1e40113d770e059a7ca4d3e461c
+DIST lkrg-0.9.4.tar.gz.sign 801 BLAKE2B eb7c6f1aa925f73bbec7cad5da9f6676b3b6b2691151455ff240f8c6af844f61478df7050b73d3144877b2ad64bf9a25e13e8ea9fcbaf85988c02438b82893ab SHA512 6bec0699b15ba42dc7a7afc18a91d77668b3404b9e069db69634ff1e1af33b96eb4ffa5e25ce46cd012acdfdce7535d3cd2eb05ac55ae3bb4134f27f45712ce8
--- a/app-antivirus/lkrg/files/lkrg-0.9.4-gentoo-paths.patch
+++ b/app-antivirus/lkrg/files/lkrg-0.9.4-gentoo-paths.patch
@ -0,0 +1,20 @@
+commit fa75ae17394574d07cbf55a184a2ac7a73e9a0ed (HEAD -> main)
+Author: John Helmert III <ajak@gentoo.org>
+Date:   Sat Jul 23 00:15:11 2022 -0500
+
+    Fix paths for Gentoo
+
+    Signed-off-by: John Helmert III <ajak@gentoo.org>
+
+diff --git a/scripts/bootup/systemd/lkrg.service b/scripts/bootup/systemd/lkrg.service
+index 4ac9812..495adb9 100644
+--- a/scripts/bootup/systemd/lkrg.service
+++ b/scripts/bootup/systemd/lkrg.service
+@@ -18,6 +18,6 @@ ConditionKernelCommandLine=!nolkrg
+ [Service]
+ Type=oneshot
+ ExecStart=/sbin/modprobe -v lkrg
+-ExecStartPost=/sbin/sysctl -p /etc/sysctl.d/01-lkrg.conf
+ExecStartPost=/usr/sbin/sysctl -p /lib/sysctl.d/01-lkrg.conf
+ ExecStop=/sbin/modprobe -v -r lkrg
+ RemainAfterExit=yes
--- a/app-antivirus/lkrg/lkrg-0.9.4.ebuild
+++ b/app-antivirus/lkrg/lkrg-0.9.4.ebuild
@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-mod linux-info systemd verify-sig
+
+DESCRIPTION="Linux Kernel Runtime Guard"
+HOMEPAGE="https://lkrg.org"
+SRC_URI="https://lkrg.org/download/${P}.tar.gz
+	verify-sig? ( https://lkrg.org/download/${P}.tar.gz.sign )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-openwall )"
+
+MODULE_NAMES="lkrg(misc:${S}:${S})"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/openwall.asc"
+
+PATCHES=( "${FILESDIR}/${P}-gentoo-paths.patch" )
+
+pkg_setup() {
+	CONFIG_CHECK="HAVE_KRETPROBES KALLSYMS_ALL KPROBES JUMP_LABEL"
+	CONFIG_CHECK+=" MODULE_UNLOAD !PREEMPT_RT ~STACKTRACE"
+	linux-mod_pkg_setup
+
+	# compile against selected (not running) target
+	BUILD_PARAMS="P_KVER=${KV_FULL} P_KERNEL=${KERNEL_DIR}"
+	BUILD_TARGETS="all"
+}
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.sign}
+	fi
+
+	default
+}
+
+src_install() {
+	linux-mod_src_install
+
+	systemd_dounit scripts/bootup/systemd/lkrg.service
+	newinitd scripts/bootup/openrc/lkrg lkrg.initd
+
+	insinto /lib/sysctl.d
+	newins scripts/bootup/lkrg.conf 01-lkrg.conf
+}
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
--- a/app-arch/funzix/funzix-1.0-r1.ebuild
+++ b/app-arch/funzix/funzix-1.0-r1.ebuild
@ -5,8 +5,8 @@ EAPI=8

 inherit toolchain-funcs

-DESCRIPTION="unpacker for the bogus ZIX format"
-HOMEPAGE="http://funzix.sourceforge.net/"
+DESCRIPTION="Unpacker for the bogus ZIX format"
+HOMEPAGE="https://funzix.sourceforge.io/"
 SRC_URI="mirror://sourceforge/funzix/${P}.tar.bz2"

 LICENSE="public-domain"
--- a/app-arch/lxqt-archiver/lxqt-archiver-0.6.0.ebuild
+++ b/app-arch/lxqt-archiver/lxqt-archiver-0.6.0.ebuild
@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~riscv x86"
+	KEYWORDS="amd64 ~riscv x86"
 fi

 LICENSE="GPL-2 GPL-2+"
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
--- a/app-backup/kfoldersync/Manifest
+++ b/app-backup/kfoldersync/Manifest
@ -1 +0,0 @@
-DIST kfoldersync-3.4.1.tar.xz 49308 BLAKE2B b2d928d7b4111d69f9fdf28efcddb72da715b6bc143d94cc6d37fd8e5888f5ebd70d11e57a1cdce046ced7f55b6ba4a3da9d64947928d60ddb560b593af9a996 SHA512 b51c005942f0627f8ab3428e860c5f336df0282fd3dc184cac6897755a740ca873241e63828b1af7704b373e0a92de1a4bd9dbe8db3b7a35fbbafc2a509603d0
--- a/app-backup/kfoldersync/files/kfoldersync-3.4.1-kwindowsystem-5.82.patch
+++ b/app-backup/kfoldersync/files/kfoldersync-3.4.1-kwindowsystem-5.82.patch
@ -1,11 +0,0 @@
--- a/src/kfoldersync.cxx	2017-01-24 10:27:17.000000000 +0100
-+++ b/src/kfoldersync.cxx	2021-05-08 23:52:28.891166974 +0200
-@@ -173,7 +173,7 @@
- {
-     // Connect to dbus (keep it without parent to avoid potential SIGABRT)
-     static const KDBusService dbus_service(KDBusService::Unique);
-    connect(&dbus_service, &KDBusService::activateRequested, this, [&]{KStartupInfo::setNewStartupId(this, KStartupInfo::startupId()); KWindowSystem::forceActiveWindow(winId());}, Qt::DirectConnection);
-+    connect(&dbus_service, &KDBusService::activateRequested, this, [&]{KStartupInfo::setNewStartupId(this->window()->windowHandle(), KStartupInfo::startupId()); KWindowSystem::forceActiveWindow(winId());}, Qt::DirectConnection);
- 
-     // Setup toolbar
-     QMenu * const app_menu = new QMenu(this);
--- a/app-backup/kfoldersync/kfoldersync-3.4.1.ebuild
+++ b/app-backup/kfoldersync/kfoldersync-3.4.1.ebuild
@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm
-
-DESCRIPTION="Folder synchronization and backup tool based on KDE Frameworks"
-HOMEPAGE="https://www.linux-apps.com/p/1127677/"
-SRC_URI="https://dl.opendesktop.org/api/files/download/id/1485353737/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="5"
-KEYWORDS="amd64 ~arm x86"
-
-BDEPEND="
-	sys-devel/gettext
-"
-DEPEND="
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-kwindowsystem-5.82.patch" ) # downstream patch
--- a/app-backup/kfoldersync/metadata.xml
+++ b/app-backup/kfoldersync/metadata.xml
@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<upstream>
-		<maintainer status="active">
-			<email>vindex17@outlook.it</email>
-			<name>Lorenzo Porta</name>
-		</maintainer>
-		<changelog>https://build.opensuse.org/package/view_file/home:Vindex17:myapps/kfoldersync/kfoldersync.changes?expand=1</changelog>
-	</upstream>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
--- a/app-benchmarks/pipebench/pipebench-0.40-r2.ebuild
+++ b/app-benchmarks/pipebench/pipebench-0.40-r2.ebuild
@ -1,18 +1,17 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=6
+EAPI=8

 inherit flag-o-matic toolchain-funcs

 DESCRIPTION="Measures the speed of stdin/stdout communication"
-HOMEPAGE="http://www.habets.pp.se/synscan/programs.php?prog=pipebench"
-SRC_URI="ftp://ftp.habets.pp.se/pub/synscan/${P}.tar.gz"
+HOMEPAGE="https://www.habets.pp.se/synscan/programs_pipebench.html"
+SRC_URI="https://www.habets.pp.se/synscan/files/${P}.tar.gz"

-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha amd64 ppc ppc64 x86 ~x86-linux"
-IUSE=""

 PATCHES=( "${FILESDIR}"/${PN}-0.40-fix-build-system.patch )

--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@ -1 +1 @@
-DIST stress-ng-0.14.02.tar.gz 3610303 BLAKE2B a21ac2c3b67b2ec7522c020d01ae50c51b1cfc7d357dde4bd1585fcf0eed77bb9b664805eec5b8cf84cf72383d444da91ed587d113d727c762b9611be4171c39 SHA512 80d6f6d9a8e521f2c58b6aa3680bf22f5e0e75e267f49cb3c30512e3387d1d71a31a932b2e6568166f77c7f2a36bed7902a1ed4cb6aded35f48372e916d64590
+DIST stress-ng-0.14.03.tar.gz 3630312 BLAKE2B d0c9c543402abcc4b771c0810d0900c4d0a478d40205ca56f8b59bfd2d1faa05381495a25e9e7cc6048cf45fef6bd27957fe72390d0be3e5592b97d161755556 SHA512 48373f2facf0c080e134835c975370aae4d0693c7c2de4b3db21b91e215ad10be6e3701751df41a09669ce66446039e7d97ee1e8bda06fa563831752d61c52c5
--- a/app-benchmarks/stress-ng/stress-ng-0.14.03.ebuild
+++ b/app-benchmarks/stress-ng/stress-ng-0.14.03.ebuild
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
--- a/app-cdr/b5i2iso/b5i2iso-0.2-r2.ebuild
+++ b/app-cdr/b5i2iso/b5i2iso-0.2-r2.ebuild
@ -1,24 +1,26 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI="6"
+EAPI=8
+
 inherit toolchain-funcs

 DESCRIPTION="Convert CD images from b5i (BlindWrite) to iso"
 HOMEPAGE="https://web.archive.org/web/20100116120705/b5i2iso.berlios.de"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
+S="${WORKDIR}/${PN}"

 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-PATCHES=( "${FILESDIR}/${P}-segfault.patch" )

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

 src_compile() {
-	$(tc-getCC) ${LDFLAGS} ${CFLAGS} src/${PN}.c -o ${PN}
+	tc-export CC
+	emake -C src b5i2iso
 }

 src_install() {
-	dobin ${PN}
+	dobin src/b5i2iso
 }
--- a/app-cdr/b5i2iso/files/b5i2iso-0.2-segfault.patch
+++ b/app-cdr/b5i2iso/files/b5i2iso-0.2-segfault.patch
@ -1,5 +1,5 @@
--- b5i2iso/src/b5i2iso.c
-+++ b5i2iso/src/b5i2iso.c
+--- a/src/b5i2iso.c
+++ b/src/b5i2iso.c
@@ -1,3 +1,4 @@
 +#include <errno.h>
 #include <stdio.h>
@ -15,4 +15,4 @@
 +}
 fdest = fopen(destfilename,"wb");
 
- fseek(fsource, 2352, SEEK_CUR);
+ fseek(fsource, 2352, SEEK_CUR);
--- a/app-cdr/bin2iso/bin2iso-19b-r3.ebuild
+++ b/app-cdr/bin2iso/bin2iso-19b-r3.ebuild
@ -1,28 +1,30 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=6
+EAPI=8

 inherit toolchain-funcs

 DESCRIPTION="converts RAW format (.bin/.cue) files to ISO/WAV format"
 HOMEPAGE="http://users.andara.com/~doiron/bin2iso/"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
+S="${WORKDIR}/${PN}"

 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""

-S=${WORKDIR}/${PN}
-
-PATCHES=( "${FILESDIR}"/${P}-sanity-checks.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-sanity-checks.patch
+	"${FILESDIR}"/${P}-fixes.patch
+)

 src_compile() {
-	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} bin2iso19b_linux.c -o ${PN} || die "compile failed"
+	tc-export CC
+	emake bin2iso19b_linux
 }

 src_install() {
-	dobin ${PN}
+	newbin bin2iso19b_linux bin2iso
 	dodoc readme.txt
 }
--- a/app-cdr/bin2iso/files/bin2iso-19b-fixes.patch
+++ b/app-cdr/bin2iso/files/bin2iso-19b-fixes.patch
@ -0,0 +1,24 @@
+--- a/bin2iso19b_linux.c
+++ b/bin2iso19b_linux.c
+@@ -1,6 +1,12 @@
+#ifndef _POSIX_C_SOURCE
+#define _POSIX_C_SOURCE 200809L
+#endif
+
+ #include <stdio.h>
+ #include <string.h>
+ #include <stdlib.h>
+#include <unistd.h>
+#include <sys/types.h>
+ 
+ #define DEBUG 0
+ #define CHECK 0 /* don't bother checking bin for validity... */
+@@ -111,7 +117,7 @@
+    unsigned long size; /* track size in bytes */
+ } tTrack;
+ 
+-buffered_fread(unsigned char *array, unsigned int size) {
+int buffered_fread(unsigned char *array, unsigned int size) {
+    unsigned int i;
+    
+    if(INBUF_WIDX == 0) {    
--- a/app-cdr/ccd2iso/ccd2iso-0.3-r1.ebuild
+++ b/app-cdr/ccd2iso/ccd2iso-0.3-r1.ebuild
@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI="6"
+EAPI=8

 DESCRIPTION="Convert CD images from ccd (CloneCD) to iso"
 HOMEPAGE="https://sourceforge.net/projects/ccd2iso/"
@ -10,9 +10,5 @@ SRC_URI="mirror://sourceforge/ccd2iso/${P}.tar.gz"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-PATCHES=( "${FILESDIR}/${P}-headers.patch" )

-src_install() {
-	emake install DESTDIR="${D}"
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
+PATCHES=( "${FILESDIR}"/${P}-headers.patch )
--- a/app-cdr/ccd2iso/metadata.xml
+++ b/app-cdr/ccd2iso/metadata.xml
@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!--maintainer-needed-->
-<upstream>
-    <remote-id type="sourceforge">ccd2iso</remote-id>
-</upstream>
+	<!--maintainer-needed-->
+	<upstream>
+		<remote-id type="sourceforge">ccd2iso</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-cdr/cdck/cdck-0.7.0-r3.ebuild
+++ b/app-cdr/cdck/cdck-0.7.0-r3.ebuild
@ -1,7 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=6
+EAPI=8
+
+inherit autotools

 DESCRIPTION="Measure the read time per sector on CD or DVD to check the quality"
 HOMEPAGE="http://swaj.net/unix/index.html#cdck"
@ -10,21 +12,21 @@ SRC_URI="http://swaj.net/unix/cdck/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+
+PATCHES=(
+	"${FILESDIR}"/${P}-man.patch
+	"${FILESDIR}"/${P}-wording.patch
+	"${FILESDIR}"/${P}-automake.patch
+	"${FILESDIR}"/${P}-cross.patch
+	"${FILESDIR}"/${P}-gcc-10.patch
+)

 src_prepare() {
 	default
-
-	sed -e '1d' -i man/cdck_man.in || die "sed failed"
-}
-
-src_configure() {
-	econf --disable-shared
+	eautoreconf
 }

 src_install() {
 	default
-
-	dobin src/cdck
-	doman man/cdck.1
+	find "${ED}" -type f -name '*.la' -delete || die
 }
--- a/app-cdr/cdck/files/cdck-0.7.0-automake.patch
+++ b/app-cdr/cdck/files/cdck-0.7.0-automake.patch
@ -0,0 +1,42 @@
+Description: allow libtool to auto(re)conf
+Origin: vendor
+Forwarded: no
+Author: tony mancill <tmancill@debian.org>
+Last-Update: 2015-03-04
+
+--- a/configure.ac
+++ b/configure.ac
+@@ -16,7 +16,6 @@
+ 
+ AC_SYS_LARGEFILE
+ 
+-AC_DISABLE_SHARED
+ AM_PROG_LIBTOOL
+ AC_SUBST(LIBTOOL_DEPS)
+ 
+--- a/src/Makefile.am
+++ b/src/Makefile.am
+@@ -10,12 +10,12 @@ CLEANFILES = *~ *.o *.la *.lo *.a
+ EXTRA_DIST = config.h cdck template.plot template-ps.plot
+ 
+ INCLUDES = @CPPFLAGS@
+-CFLAGS =  @CFLAGS@ -DBUILD=\"@target@\" -DDATE=\""`date`"\"
+AM_CFLAGS =  @CFLAGS@ -DBUILD=\"@target@\" -DDATE=\""`date`"\"
+ 
+ CXXLINK = $(LIBTOOL) --mode=link $(CC) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ 
+ lib_LTLIBRARIES  = libcdck.la
+-noinst_LIBRARIES = libcdck.a
+#noinst_LIBRARIES = libcdck.a
+ 
+ LIBCDCK_SRCS = 		\
+ 	lib_main.cpp	\
+@@ -28,7 +28,7 @@ LIBCDCK_SRCS = 		\
+ 	lib_cdinfo.h
+ 
+ libcdck_la_SOURCES = $(LIBCDCK_SRCS)
+-libcdck_a_SOURCES  = $(LIBCDCK_SRCS)
+#libcdck_a_SOURCES  = $(LIBCDCK_SRCS)
+ 
+ bin_PROGRAMS = cdck
+ 
--- a/app-cdr/cdck/files/cdck-0.7.0-cross.patch
+++ b/app-cdr/cdck/files/cdck-0.7.0-cross.patch
@ -0,0 +1,20 @@
+Description: replace hard-coded `gcc' with $CC in configure.ac
+ to allow cross-building.
+Origin: vendor
+Bug-Debian: https://bugs.debian.org/901177
+Forwarded: not-yet
+Author: Helmut Grohne <helmut@subdivi.de>
+Reviewed-by: gregor herrmann <gregoa@debian.org>
+Last-Update: 2018-06-09
+
+--- a/configure.ac
+++ b/configure.ac
+@@ -96,7 +96,7 @@
+    CXXFLAGS="$CXXFLAGS -Wall -Wwrite-strings -Woverloaded-virtual -fno-exceptions -fno-rtti -export-dynamic "
+ fi
+ 
+-SUPCXX=`gcc -print-file-name=libsupc++.a`
+SUPCXX=`$CC -print-file-name=libsupc++.a`
+ 
+ LIBS="$SUPCXX $LIBS"
+ 
--- a/app-cdr/cdck/files/cdck-0.7.0-gcc-10.patch
+++ b/app-cdr/cdck/files/cdck-0.7.0-gcc-10.patch
@ -0,0 +1,18 @@
+Description: Fix detection of gcc version.
+ Use numeric instead of string comparison, then gcc version 10 is greater then 3.
+Origin: vendor
+Bug-Debian: https://bugs.debian.org/957073
+Author: gregor herrmann <gregoa@debian.org>
+Last-Update: 2020-04-17
+
+--- a/configure.ac
+++ b/configure.ac
+@@ -50,7 +50,7 @@
+ echo $_echo_n "checking version of ${CC} ... $_echo_c"
+ exec 15> ./.gcc.test
+ cat >&15 <<EOF
+-${CC} -v 2>&1 | perl -e '\$/=undef;\$_=<STDIN>;s/.*ver.+?([[0-9\.]]+).*//s;\$_=\$1;print; s/\.//sg;s/^.*?(\d{0,4}).*\$/\$1/; exit 0 if (\$_ gt 300); exit -1'
+${CC} -v 2>&1 | perl -e '\$/=undef;\$_=<STDIN>;s/.*ver.+?([[0-9\.]]+).*//s;\$_=\$1;print; s/\.//sg;s/^.*?(\d{0,4}).*\$/\$1/; exit 0 if (\$_ >= 300); exit -1'
+ EOF
+ sh ./.gcc.test 2>/dev/null
+ if test $? -ne 0 ; then
--- a/app-cdr/cdck/files/cdck-0.7.0-man.patch
+++ b/app-cdr/cdck/files/cdck-0.7.0-man.patch
@ -0,0 +1,50 @@
+Author: gregor herrmann <gregoa@debian.org>
+Last-Update: 2015-03-04
+Description:
+ - fix calls to pod2man
+ - remove stray "=cut", leads to pod2man errors
+ - add a note about using the gnuplot datafile
+Bugs-Ubuntu: https://bugs.launchpad.net/bugs/476591
+
+--- a/man/Makefile.am
+++ b/man/Makefile.am
+@@ -11,7 +11,7 @@
+ EXTRA_DIST = cdck_man.in
+ 
+ cdck.1:
+-	pod2man --section=cdck.1 --verbose cdck_man.in > cdck.1
+	pod2man --section=1 --verbose --name=cdck cdck_man.in > cdck.1
+ 
+ 
+ #
+--- a/man/cdck_man.in
+++ b/man/cdck_man.in
+@@ -1,5 +1,3 @@
+-=cut
+-
+ =head1 NAME
+ 
+        cdck - simple CD/DVD check program
+@@ -17,6 +15,8 @@
+        -i Print CD/DVD information and quit, perform no timings (default mode)
+ 
+        -t Perform timing test
+
+	  Note: this option will not work for audio CDs.
+ 
+        -p Save data for gnuplot(1) program
+ 
+@@ -26,7 +26,11 @@
+ 
+        -v Verbose operations
+ 
+       To actually plot your data you have to start gnuplot and plot the datafile:
+          $ gnuplot
+          gnuplot> plot "cdck-plot.dat"
+
+ =head1 COPYRIGHT
+ 
+-       This manpage was written by gregor herrmann <gregor+debian@comodo.priv.at> for the
+-       Debian project but may be used by others.
+       This manpage was written by gregor herrmann <gregoa@debian.org>
+       for the Debian project, but may be used by others.
--- a/app-cdr/cdck/files/cdck-0.7.0-wording.patch
+++ b/app-cdr/cdck/files/cdck-0.7.0-wording.patch
@ -0,0 +1,25 @@
+Description: improve wording
+Author: DenverD
+Reviewed-by: gregor herrmann <gregoa@debian.org>
+Last-Update: 2010-05-25
+
+--- a/src/lib_main.cpp
+++ b/src/lib_main.cpp
+@@ -566,7 +566,7 @@
+ 	fprintf (stdout, "\nConclusion:\n");
+ 
+ 	if (bad_sectors > 0) {
+-		fprintf (stdout, "   Disc contains BAD or even readable sectors, put it into trash can!\n");
+		fprintf (stdout, "   Disc contains BAD or even unreadable sectors, put it into trash can!\n");
+ 		return;
+ 	}
+ 
+@@ -580,7 +580,7 @@
+ 		return;
+ 	}
+ 
+-	fprintf (stdout, "   Even there is no unreadable sectors, disc is unstable!\n");
+	fprintf (stdout, "   Even though there are no unreadable sectors, disc is unstable!\n");
+ }
+ 
+ void Ccdrom::DeallocateTimings()
--- a/app-cdr/cdlabelgen/cdlabelgen-4.3.0-r1.ebuild
+++ b/app-cdr/cdlabelgen/cdlabelgen-4.3.0-r1.ebuild
@ -1,27 +1,27 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=6
+EAPI=8

 DESCRIPTION="CD cover, tray card and envelope generator"
 HOMEPAGE="https://www.aczoom.com/tools/cdinsert"
 SRC_URI="https://www.aczoom.com/pub/tools/${P}.tgz"
+
 LICENSE="aczoom"
 SLOT="0"
 KEYWORDS="amd64 ppc ~sparc x86"
-IUSE=""

 RDEPEND="dev-lang/perl"
-DEPEND=""

 PATCHES=( "${FILESDIR}"/4.0.0-create-MAN_DIR.diff )
-DOCS=( ChangeLog README INSTALL.WEB )

 src_install() {
-	emake BASE_DIR="${D}"/usr install
-	einstalldocs
-	insinto "/usr/share/${PN}"
+	emake BASE_DIR="${ED}"/usr install
+	dodoc ChangeLog README INSTALL.WEB
+
+	insinto /usr/share/cdlabelgen
 	doins *.html
-	exeinto "/usr/share/${PN}"
+
+	exeinto /usr/share/cdlabelgen
 	doexe cdinsert{,-ps}.pl
 }
--- a/app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild
@ -1,265 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit fcaps toolchain-funcs flag-o-matic gnuconfig
-
-MY_P="${P/_alpha/a}"
-
-DESCRIPTION="A set of tools for CD/DVD reading and recording, including cdrecord"
-HOMEPAGE="https://sourceforge.net/projects/cdrtools/"
-SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 -riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="acl caps nls unicode"
-
-RDEPEND="acl? ( virtual/acl )
-	caps? ( sys-libs/libcap )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	x11-misc/makedepend
-	nls? ( >=sys-devel/gettext-0.18.1.1 )"
-
-S=${WORKDIR}/${P/_alpha[0-9][0-9]}
-
-FILECAPS=(
-	cap_sys_resource,cap_dac_override,cap_sys_admin,cap_sys_nice,cap_net_bind_service,cap_ipc_lock,cap_sys_rawio+ep usr/bin/cdrecord --
-	cap_dac_override,cap_sys_admin,cap_sys_nice,cap_net_bind_service,cap_sys_rawio+ep usr/bin/cdda2wav --
-	cap_dac_override,cap_sys_admin,cap_net_bind_service,cap_sys_rawio+ep usr/bin/readcd
-)
-
-cdrtools_os() {
-	local os="linux"
-	[[ ${CHOST} == *-darwin* ]] && os="mac-os10"
-	echo "${os}"
-}
-
-src_prepare() {
-	default
-
-	gnuconfig_update
-
-	# Remove profiled make files.
-	find -name '*_p.mk' -delete || die "delete *_p.mk"
-
-	# Adjusting hardcoded paths.
-	sed -i -e "s|opt/schily|usr|" \
-		$(find ./ -type f -name \*.[0-9ch] -exec grep -l 'opt/schily' '{}' '+') \
-		|| die "sed opt/schily"
-
-	sed -i -e "s|\(^INSDIR=\t\tshare/doc/\)|\1${PF}/|" \
-		$(find ./ -type f -exec grep -l '^INSDIR.\+doc' '{}' '+') \
-		|| die "sed doc"
-
-	# Respect libdir.
-	sed -i -e "s|\(^INSDIR=\t\t\)lib|\1$(get_libdir)|" \
-		$(find ./ -type f -exec grep -l '^INSDIR.\+lib\(/siconv\)\?$' '{}' '+') \
-		|| die "sed multilib"
-
-	# Do not install static libraries.
-	sed -i -e "s|include\t\t.*rules.lib||" \
-		$(find ./ -type f -exec grep -l '^include.\+rules\.lib' '{}' '+') \
-		|| die "sed rules"
-
-	# Enable verbose build.
-	sed -i -e '/@echo.*==>.*;/s:@echo[^;]*;:&set -x;:' \
-		RULES/*.rul RULES/rules.prg RULES/rules.inc \
-		|| die "sed verbose rules"
-
-	# Respect CC/CXX variables.
-	cd "${S}"/RULES || die
-	local tcCC="$(tc-getCC)"
-	local tcCXX="$(tc-getCXX)"
-	sed -i -e "/cc-config.sh/s|\$(C_ARCH:%64=%) \$(CCOM_DEF)|${tcCC} ${tcCC}|" \
-		rules1.top || die "sed rules1.top"
-	sed -i -e "/^CC_COM_DEF=/s|gcc|${tcCC}|" \
-		-e "/^CC++_COM_DEF=/s|g++|${tcCXX}|" \
-		-e "/COPTOPT=/s|-O||" \
-		-e 's|$(GCCOPTOPT)||' \
-		cc-gcc.rul || die "sed cc-gcc.rul"
-	sed -i -e "s|^#\(CONFFLAGS +=\).*|\1\t-cc=${tcCC}|" \
-		rules.cnf || die "sed rules.cnf"
-
-	# Schily make setup.
-	cd "${S}"/DEFAULTS || die
-	local os=$(cdrtools_os)
-
-	sed -i \
-		-e "s|^\(DEFLINKMODE=\).*|\1\tdynamic|" \
-		-e "s|^\(LINUX_INCL_PATH=\).*|\1|" \
-		-e "s|^\(LDPATH=\).*|\1|" \
-		-e "s|^\(RUNPATH=\).*|\1|" \
-		-e "s|^\(INS_BASE=\).*|\1\t${ED}/usr|" \
-		-e "s|^\(INS_RBASE=\).*|\1\t${ED}|" \
-		-e "s|^\(DEFINSGRP=\).*|\1\t0|" \
-		-e '/^DEFUMASK/s,002,022,g' \
-		Defaults.${os} || die "sed Schily make setup"
-	# re DEFUMASK above:
-	# bug 486680: grsec TPE will block the exec if the directory is
-	# group-writable. This is painful with cdrtools, because it makes a bunch of
-	# group-writable directories during build. Change the umask on their
-	# creation to prevent this.
-}
-
-ac_cv_sizeof() {
-	cat <<-EOF >"${T}"/test.c
-	#include <inttypes.h>
-	#include <stddef.h>
-	#include <stdint.h>
-	#include <sys/types.h>
-	int main () {
-		static int test_array [1 - 2 * !((sizeof(TYPE)) == LEN)];
-		test_array [0] = 0;
-		return test_array [0];
-	}
-	EOF
-
-	local i=1
-	while [[ ${i} -lt 20 ]] ; do
-		if ${CC} ${CPPFLAGS} ${CFLAGS} -c "${T}"/test.c -o /dev/null -DTYPE="$1" -DLEN=$i 2>/dev/null; then
-			echo ${i}
-			return 0
-		fi
-		: $(( i += 1 ))
-	done
-	return 1
-}
-
-src_configure() {
-	use acl || export ac_cv_header_sys_acl_h="no"
-	use caps || export ac_cv_lib_cap_cap_get_proc="no"
-	export ac_cv_header_pulse_pulseaudio_h="no"
-
-	# skip obsolete configure script
-	if tc-is-cross-compiler ; then
-		# Cache known values for targets. #486680
-
-		tc-export CC
-		local var val t types=(
-			char "short int" int "long int" "long long"
-			"unsigned char" "unsigned short int" "unsigned int"
-			"unsigned long int" "unsigned long long"
-			float double "long double" size_t ssize_t ptrdiff_t
-			mode_t uid_t gid_t pid_t dev_t time_t wchar_t
-			"char *" "unsigned char *"
-		)
-		for t in "${types[@]}" ; do
-			var="ac_cv_sizeof_${t// /_}"
-			var=${var//[*]/p}
-			val=$(ac_cv_sizeof "${t}") || die "could not compute ${t}"
-			export "${var}=${val}"
-			einfo "Computing sizeof(${t}) as ${val}"
-		done
-		# We don't have these types.
-		export ac_cv_sizeof___int64=0
-		export ac_cv_sizeof_unsigned___int64=0
-		export ac_cv_sizeof_major_t=${ac_cv_sizeof_dev_t}
-		export ac_cv_sizeof_minor_t=${ac_cv_sizeof_dev_t}
-		export ac_cv_sizeof_wchar=${ac_cv_sizeof_wchar_t}
-
-		export ac_cv_type_prototypes="yes"
-		export ac_cv_func_mlock{,all}="yes"
-		export ac_cv_func_{e,f,g}cvt=$(usex elibc_glibc)
-		export ac_cv_func_dtoa_r="no"
-		export ac_cv_func_sys_siglist{,_def}="no"
-		export ac_cv_func_printf_{j,ll}="yes"
-		export ac_cv_realloc_null="yes"
-		export ac_cv_no_user_malloc="no"
-		export ac_cv_var_timezone="yes"
-		export ac_cv_var___progname{,_full}="yes"
-		export ac_cv_fnmatch_igncase="yes"
-		export ac_cv_file__dev_{fd_{0,1,2},null,std{err,in,out},tty,zero}="yes"
-		export ac_cv_file__usr_src_linux_include="no"
-
-		case $(cdrtools_os) in
-		linux)
-			export ac_cv_func_bsd_{g,s}etpgrp="no"
-			export ac_cv_hard_symlinks="yes"
-			export ac_cv_link_nofollow="yes"
-			export ac_cv_access_e_ok="no"
-
-			export ac_cv_dev_minor_noncontig="yes"
-			case ${ac_cv_sizeof_long_int} in
-			4) export ac_cv_dev_minor_bits="32";;
-			8) export ac_cv_dev_minor_bits="44";;
-			esac
-
-			cat <<-EOF >"${T}"/test.c
-			struct {
-				char start[6];
-				unsigned char x1:4;
-				unsigned char x2:4;
-				char end[5];
-			} a = {
-				.start = {'S', 't', 'A', 'r', 'T', '_'},
-				.x1 = 5,
-				.x2 = 4,
-				.end = {'_', 'e', 'N', 'd', 'X'},
-			};
-			EOF
-			${CC} ${CPPFLAGS} ${CFLAGS} -c "${T}"/test.c -o "${T}"/test.o
-			if grep -q 'StArT_E_eNdX' "${T}"/test.o ; then
-				export ac_cv_c_bitfields_htol="no"
-			elif grep -q 'StArT_T_eNdX' "${T}"/test.o ; then
-				export ac_cv_c_bitfields_htol="yes"
-			fi
-			;;
-		esac
-	fi
-}
-
-src_compile() {
-	if use unicode; then
-		local flags="$(test-flags -finput-charset=ISO-8859-1 -fexec-charset=UTF-8)"
-		if [[ -n ${flags} ]]; then
-			append-flags ${flags}
-		else
-			ewarn "Your compiler does not support the options required to build"
-			ewarn "cdrtools with unicode in USE. unicode flag will be ignored."
-		fi
-	fi
-
-	# If not built with -j1, "sometimes" cdda2wav will not be built.
-	emake -j1 CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" C++OPTX="${CXXFLAGS}" \
-		LDOPTX="${LDFLAGS}" GMAKE_NOWARN="true"
-}
-
-src_install() {
-	# If not built with -j1, "sometimes" manpages are not installed.
-	emake -j1 CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" C++OPTX="${CXXFLAGS}" \
-		LDOPTX="${LDFLAGS}" GMAKE_NOWARN="true" install
-
-	# These symlinks are for compat with cdrkit.
-	dosym schily /usr/include/scsilib
-	dosym ../scg /usr/include/schily/scg
-
-	dodoc ABOUT Changelog* CONTRIBUTING PORTING README.linux-shm READMEs/README.linux
-
-	cd "${S}"/cdda2wav || die
-	docinto cdda2wav
-	dodoc Changelog FAQ Frontends HOWTOUSE NEEDED README THANKS TODO
-
-	cd "${S}"/mkisofs || die
-	docinto mkisofs
-	dodoc ChangeLog* TODO
-
-	# Remove man pages related to the build system
-	rm -rvf "${ED}"/usr/share/man/man5 || die
-}
-
-pkg_postinst() {
-	fcaps_pkg_postinst
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		einfo
-		einfo "Darwin/OS X use the following device names:"
-		einfo
-		einfo "CD burners: (probably) ./cdrecord dev=IOCompactDiscServices"
-		einfo
-		einfo "DVD burners: (probably) ./cdrecord dev=IODVDServices"
-		einfo
-	fi
-}
--- a/app-cdr/cue2toc/cue2toc-0.4-r1.ebuild
+++ b/app-cdr/cue2toc/cue2toc-0.4-r1.ebuild
@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=6
+EAPI=8

 DESCRIPTION="Convert CUE files to cdrdao's TOC format"
 HOMEPAGE="http://cue2toc.sourceforge.net/"
@ -10,6 +10,5 @@ SRC_URI="mirror://sourceforge/cue2toc/${P}.tar.gz"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc ~x86"
-IUSE=""

-DEPEND="!app-cdr/cdrdao"
+DEPEND="!!app-cdr/cdrdao"
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
--- a/app-containers/grype/Manifest
+++ b/app-containers/grype/Manifest
@ -1,6 +1,4 @@
-DIST grype-0.36.1-deps.tar.xz 671469268 BLAKE2B 227b76230e45851c0980e80c1299efca2299e196b2f9432d8dcbaff9ab08c545f7e64fdc8c88ba79392d3e3d0067f03155ace14473aeacc65da7909d7d3fe4cb SHA512 432ed203febeeb26db4d50a9bb1b95bef11c91e0335e1e75b7eec68484a2f5e5d9ff6f84b05ced703519d2490723adeaca6009efd18647f0a8d6ce515727c4dc
-DIST grype-0.36.1.tar.gz 1028910 BLAKE2B 70327fdbb1426537c623f7e8c8c286cfba336454e129166bbda6ff19403a4e6ab260ad2136e00acf8a76aab4de6073ae4c28614c0ab5c7955c14f07c124bc833 SHA512 299d440bb96a5092173a8baa42e80bf5ea4f90663ba50241f6b0d7a2f75d94496dc91eca78c3d4341f68f7e874223d49a7663146f7e20db8cac15ed65a8650f9
-DIST grype-0.39.0-deps.tar.xz 632583420 BLAKE2B 5fab5394d2f48200d9c1a59f7e12abf1be875ff8dafb237b86239d8acaadc76395e7e1d4ab38eed8c82f88cc71adc1659cdd60274c1721ebdf8674483102f9e2 SHA512 cd4492180f3f7008d0247c47069b187ec4e18f3167efd71eaf9dadf9f4c3a370463df48056db850f7d0bf7dbbea5e8d14e7966f219c615479d26827ad3aeb719
-DIST grype-0.39.0.tar.gz 1026121 BLAKE2B 1d9063e0752732af7c6364be65fdaf915730695d2cbeeab080a1b06b2c056ad4716c5355b51c8aa3c19baed7dd51318c0c5b76b5709a740e0151c5734e951de0 SHA512 a8ad6c5b1918804adcd2d71a2defd0557e6acd876342582f07673224723a86834937d2e94f6f61fb9bc9304bf560b407648b8d9997ead66f7f4bf3738ce5c0e5
 DIST grype-0.42.0-deps.tar.xz 632719096 BLAKE2B 1da875fc55e907d905fd612a77cb103caea89fd32d6cceb2159d3b8615ec38ce1a7d5aba99b8a10481df788f5abc0e9f48d8464ac601b056531c97fc87721437 SHA512 9f07c42d41e2db1fab8942c2ace339a3b5a8a887ef656bc05c4ed6ea976a70ec5a496342c45d1c0b10e9883439f7348ec2d140d6d6b6c217badf9b1bb5b9d3c2
 DIST grype-0.42.0.tar.gz 1072252 BLAKE2B 9bf52453ac54130ca36716b0b94d0a428ed637995f96b3e9019c922cf758d55c2d7fa876ffac1fff5b59a716c918d801a883fce868c5005c38fa9f0e924684d6 SHA512 6e9ff3c61dd60cf7ed502cd4c979b79d0dec732c7305c40b4194a9f27cbb1513a63aa214f560878cd65af5b3fd16b453df43735d68a8340ad4923c5436a140ce
+DIST grype-0.43.0-deps.tar.xz 632690832 BLAKE2B 88bd2f94ae2a1c3ed8736fbed0a6cdf3a8fa7f0164d683ad45a398442e5b582caa27ab70b41e21e1cfa42a9c257367dedc81584da2537d24007fbb59bba9114a SHA512 e4adbe781cb6727e1ba522ac616f17785fdf6b5a13d7a801d60b62426d23c7c2389edf54386f0d00b6931a92b369e3551cef07bbe2887bebbe71c632547b3b00
+DIST grype-0.43.0.tar.gz 1074142 BLAKE2B 6f96ec212c6298d95dcb251d3b025b6ce513e4ba9643fb3c3c1435b598ec100e32631d7963a50d54b9e865769e34603a662afac53d2ecbf59fc7783952b69e80 SHA512 347fd42a64f76a1cb0bfb28ac47d21ee18dfec335858f63f78f63914298c3d8ff3949ff113b06c37127b689d7d7ae4bc1e946543499f7bd6137579a617a8843c
--- a/app-containers/grype/grype-0.39.0.ebuild
+++ b/app-containers/grype/grype-0.39.0.ebuild
@ -1,22 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module
-
-DESCRIPTION="A vulnerability scanner for container images and filesystems"
-HOMEPAGE="https://www.anchore.com"
-SRC_URI="https://github.com/anchore/grype/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-src_compile() {
-	ego build -o bin/grype
-}
-
-src_install() {
-	dobin bin/grype
-}
--- a/app-containers/grype/grype-0.43.0.ebuild
+++ b/app-containers/grype/grype-0.43.0.ebuild
--- a/app-containers/lxc/files/lxc-5.0.0-fix-strerror-r-char-p-musl.patch
+++ b/app-containers/lxc/files/lxc-5.0.0-fix-strerror-r-char-p-musl.patch
@ -0,0 +1,36 @@
+https://github.com/lxc/lxc/commit/8ee8879083f40d2d0b9cef46d6a6907c1b5a814b
+
+From 8ee8879083f40d2d0b9cef46d6a6907c1b5a814b Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Thu, 14 Jul 2022 12:31:21 +0200
+Subject: [PATCH] src/lxc/log.h: fix STRERROR_R_CHAR_P
+
+STRERROR_R_CHAR_P is always defined to 0 or 1 depending on the value of
+have_func_strerror_r_char_p in meson.build so replace #ifdef by #if to
+avoid a redefinition build failure if char *strerror_r is not defined
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+---
+ src/lxc/log.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/lxc/log.h b/src/lxc/log.h
+index 554a2e1d48..fcddc679a8 100644
+--- a/src/lxc/log.h
+++ b/src/lxc/log.h
+@@ -304,13 +304,13 @@ __lxc_unused static inline void LXC_##LEVEL(struct lxc_log_locinfo* locinfo,	\
+  * Helper macro to define errno string.
+  */
+ #if HAVE_STRERROR_R
+-	#ifdef STRERROR_R_CHAR_P
+	#if STRERROR_R_CHAR_P
+ 	char *strerror_r(int errnum, char *buf, size_t buflen);
+ 	#else
+ 	int strerror_r(int errnum, char *buf, size_t buflen);
+ 	#endif
+ 
+-	#ifdef STRERROR_R_CHAR_P
+	#if STRERROR_R_CHAR_P
+ 		#define lxc_log_strerror_r                                               \
+ 			char errno_buf[PATH_MAX / 2] = {"Failed to get errno string"};   \
+ 			char *ptr = NULL;                                                \
--- a/app-containers/lxc/lxc-5.0.0.ebuild
+++ b/app-containers/lxc/lxc-5.0.0.ebuild
@ -67,7 +67,8 @@ VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc

 DOCS=( AUTHORS CONTRIBUTING MAINTAINERS README.md doc/FAQ.txt )

-PATCHES=( "${FILESDIR}"/lxc-5.0.0-dont-depend-on-static-libcap.patch )
+PATCHES=( "${FILESDIR}"/lxc-5.0.0-dont-depend-on-static-libcap.patch
+	"${FILESDIR}"/${PN}-5.0.0-fix-strerror-r-char-p-musl.patch )

 pkg_setup() {
 	linux-info_pkg_setup
--- a/app-containers/syft/Manifest
+++ b/app-containers/syft/Manifest
@ -1,5 +1,3 @@
-DIST syft-0.45.1-deps.tar.xz 619145524 BLAKE2B c39ce29edb6820ff620f2d25b564084b2328f24cd453aad0cfed3a799768ff5e18f6de2fd11d981c544b6f377bb8ef64433158c71cab63c184587e648ab6bae0 SHA512 f734266b51956543e2aa94b62d47abeb45fa63de31b4f2d2d6e084b2c9233a1a0dbd36890523f54836d4e341c6fb38c3a2a0aca775a8ce2ca2bf3672e7dfbd72
-DIST syft-0.45.1.tar.gz 3826388 BLAKE2B 9600f44d4d0390c2cda422ccec04ab8f27165ed00cb031dfc441e21a156f5abfb1e63ed26bbc5795b074d2b8f578486624f8a88c87248a5c70a02268d728bbf2 SHA512 938af62b5c9d724d206db98174892bede409f4bfb9199d636cf3cedfa605cc79f2e4d9c2b49868e4f9ac1ab64d05b42849d15c9f28bf4c7a2b531449f346ef85
 DIST syft-0.47.0-deps.tar.xz 631564724 BLAKE2B 4eb6dedb2173d5dda214b4bb450fa6e85c1946ee8388064d8a7beb3f9fd4589ede95069b1ade378e04320326f012af155375b67c9502026454d4b97cb5183be6 SHA512 e2d0ff159be544a525a9628ad698499735073323e6b91531c636bc6ca15acfd3ee0625b87abc76dd74eaceffd912f98845c0f4126a364672414fac29cd7b3af7
 DIST syft-0.47.0.tar.gz 3846983 BLAKE2B 2833b360de24fc8c5ca2073bc776e2d33f8c78d7d25f8a622e8420b528e4c517c1298c1479d916a2a90b97cb44f1b5e407a9dc2a09016e7ccf6238d0050eb696 SHA512 997d6e7139be8c686ee38df9fe42fa50dac17e522c51db005628cf3fd6a97ef9f9758e86fe6c6e58a199d852bc4eeac88b3932c5f3847547382987cd02260551
 DIST syft-0.51.0-deps.tar.xz 632084588 BLAKE2B f9b3e4e41521c25b6e338f2b8f3bba0be08e7608d95de7dba6f5f104e22b8de8a4b419e574e19634099a3bbc55556f83949c68abd5ae52d14b5e97cb9306bf22 SHA512 819236c275762cc42c60339ee2d6886f0998f34609ab0bbef3150b23fbcf3cecaea63d92f6e2e161bf3ec30edae00ef467755900fd1c98389db2f9cd8113fbf4
--- a/app-containers/syft/syft-0.45.1.ebuild
+++ b/app-containers/syft/syft-0.45.1.ebuild
@ -1,22 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module
-
-DESCRIPTION="Generate a Software Bill of Materials from container images and filesystems"
-HOMEPAGE="https://www.anchore.com"
-SRC_URI="https://github.com/anchore/syft/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-src_compile() {
-	ego build -o bin/syft ./cmd/syft
-}
-
-src_install() {
-dobin bin/*
-}
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/acme-tiny/metadata.xml
+++ b/app-crypt/acme-tiny/metadata.xml
@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>np-hardass@gentoo.org</email>
-		<name>Adam Feldman</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">diafygi/acme-tiny</remote-id>
 	</upstream>
--- a/app-crypt/ckpass/ckpass-0.2-r2.ebuild
+++ b/app-crypt/ckpass/ckpass-0.2-r2.ebuild
@ -6,10 +6,10 @@ EAPI=8
 inherit autotools

 DESCRIPTION="ncurses based password database client compatible with KeePass 1.x databases"
-HOMEPAGE="http://ckpass.sourceforge.net/"
+HOMEPAGE="https://sourceforge.net/projects/ckpass/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"

-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64"

--- a/app-crypt/efitools/Manifest
+++ b/app-crypt/efitools/Manifest
@ -1,2 +1 @@
-DIST efitools-1.8.1.tar.gz 115319 BLAKE2B 3aad65defc203055122027cc3a48f50912d2f08b592841780fdc1bf337d75774116e698c4270865275ce7fe64988cd84105138ca979d81818f0065d7ae90f1d0 SHA512 114ef8e52160f5a5239ec306dbd587610849bce771ba8145ed092afd79e44f3ecee93cc1d97e2d5fdb880cc825bbbe928b3ef6701fd3b1fa444053894be1098a
 DIST efitools-1.9.2.tar.gz 116037 BLAKE2B b3540932eb112e362fd0eed47090360603807dcaec8c6a10058618f8252eeb5dcbbd703d313cb6fadae62c1312815080cf2c77fc86f9dfc9f9afca24ad97f584 SHA512 77e0ad7e865814ed388ff6daabe0f4b49ba51672bf2cbb98b7905e209cbd28f9ede2f73213ce45af8a978c1e67dba24ec88a1188661317cc22317b47e575cde8
--- a/app-crypt/efitools/efitools-1.8.1.ebuild
+++ b/app-crypt/efitools/efitools-1.8.1.ebuild
@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Tools for manipulating UEFI secure boot platforms"
-HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git"
-SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git/snapshot/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="static"
-
-LIB_DEPEND="dev-libs/openssl:0=[static-libs(+)]"
-
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	sys-apps/util-linux"
-
-DEPEND="${RDEPEND}
-	app-crypt/sbsigntools
-	dev-perl/File-Slurp
-	static? ( ${LIB_DEPEND} )
-	sys-apps/help2man
-	sys-boot/gnu-efi
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/1.7.0-Make.rules.patch"
-	"${FILESDIR}/1.8.1-respect-ar.patch"
-)
-
-src_prepare() {
-	if use static; then
-		append-ldflags -static
-		sed -i "s/-lcrypto\b/$($(tc-getPKG_CONFIG) --static --libs libcrypto)/g" \
-			Makefile || die
-	fi
-
-	# Respect users CFLAGS
-	sed -i -e 's/CFLAGS.*= -O2 -g/CFLAGS += /' Make.rules || die
-
-	# Respect users LDFLAGS
-	sed -i -e 's/LDFLAGS/LIBS/g' Make.rules || die
-	sed -i -e 's/\$(CC)/& $(LDFLAGS)/g' Makefile || die
-
-	# Run 'default', to apply user patches
-	default
-}
--- a/app-crypt/gcr/Manifest
+++ b/app-crypt/gcr/Manifest
@ -1,2 +1 @@
-DIST gcr-3.40.0.tar.xz 1011044 BLAKE2B 6b1016f74e5fd3ace32a534a59575db9c39b5deefd2f4f3a747ef7e87a43c7c00b33500d8151009347af9fe6b073c390895bb6e17c577c6e150c780c487b997e SHA512 7118608e7bef7d0cf2eea33cb3286b7f9c3622a38892ce88cf33ed453d343cc33e070831e7b4d0c5cdb43c2e57b3f0b91c7cbd6aa8463982d3af8844b59bcb81
 DIST gcr-3.41.0.tar.xz 1039744 BLAKE2B c646a04168310051d5b582a9d2f7ab9da89eef095e856e56b8d730600debead051ad8bb40eddb7457b1be2be3e092227dd886f647258a9c6a81d4bab728245f7 SHA512 455acc40ed77feeb35f9845b00229f468b322b7eda0b1b5abb0153f0a6ba29f3d0364df22225143f4caf130254a1258b3c7f934370e5142f2f64e1c3084b6f6e
--- a/app-crypt/gcr/gcr-3.40.0.ebuild
+++ b/app-crypt/gcr/gcr-3.40.0.ebuild
@ -1,84 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
-
-DESCRIPTION="Libraries for cryptographic UIs and accessing PKCS#11 modules"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gcr"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0/1" # subslot = suffix of libgcr-base-3 and co
-
-IUSE="gtk gtk-doc +introspection test +vala"
-REQUIRED_USE="vala? ( introspection )"
-RESTRICT="!test? ( test )"
-
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-
-DEPEND="
-	>=dev-libs/glib-2.44.0:2
-	>=dev-libs/libgcrypt-1.2.2:0=
-	>=app-crypt/p11-kit-0.19.0
-	gtk? ( >=x11-libs/gtk+-3.22:3[introspection?] )
-	>=sys-apps/dbus-1
-	introspection? ( >=dev-libs/gobject-introspection-1.58:= )
-"
-RDEPEND="${DEPEND}"
-PDEPEND="app-crypt/gnupg"
-BDEPEND="
-	${PYTHON_DEPS}
-	gtk? ( dev-libs/libxml2:2 )
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	gtk-doc? (
-		>=dev-util/gtk-doc-1.9
-		app-text/docbook-xml-dtd:4.1.2
-	)
-	>=sys-devel/gettext-0.19.8
-	test? ( app-crypt/gnupg )
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-PATCHES=(
-	"${FILESDIR}"/3.38.0-optional-vapi.patch
-	"${FILESDIR}"/${P}-meson-0.61-build.patch
-)
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	use vala && vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use introspection)
-		$(meson_use gtk)
-		$(meson_use gtk-doc gtk_doc)
-		-Dgpg_path="${EPREFIX}"/usr/bin/gpg
-		$(meson_use vala vapi)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
--- a/app-crypt/gcr/gcr-3.41.0.ebuild
+++ b/app-crypt/gcr/gcr-3.41.0.ebuild
@ -16,7 +16,7 @@ IUSE="gtk gtk-doc +introspection systemd test +vala"
 REQUIRED_USE="vala? ( introspection )"
 RESTRICT="!test? ( test )"

-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"

 DEPEND="
 	>=dev-libs/glib-2.44.0:2
--- a/app-crypt/keybase/Manifest
+++ b/app-crypt/keybase/Manifest
@ -1,5 +1 @@
-DIST keybase-4.4.2.tar.gz 57819398 BLAKE2B 0852aa850ad4d66457a123e97449ae24081b695b2a6a70aa0b7ad928d59aa163b9a199e806090586579cc87ee77ebd5dcb18fb137b57aec7d61007be1cba51b5 SHA512 5eccfde7cfa35277fae71c4527c0d93bcedd0657311a9c055e50330a97a24e8c339aa3778e6e926f1230542c898e6a27c4fad18c4e2486c084c6b8d58eb2e125
-DIST keybase-4.5.0.tar.gz 60207510 BLAKE2B 11acd22139fa33988a13cce3db62c7000aedb9d157de37d589a450910628a9325edd38a5dab150b7b053112e3f40930c0e569be6c990cff559bdc64dd0d34376 SHA512 5299d7eab28d487299200a97beb894a2254a2d6a525053b9acac8bd2088e581097bdb8515c9d37ed54ce3f27996e0dacd5ef943acef3c976646c85f00003bf52
-DIST keybase-4.7.0.tar.gz 63827539 BLAKE2B 237a638b9b4e6dad9a0b0e0146d355f94ea87c459e64edca4253dd8f2eba4ba959a0d1e4ebd768b6572d0ab9c4f05abed539a3d8a778b23ae840a202e3fc6144 SHA512 4dc49b102f7d18345c960081a0a8cfa4d36f19159ec09ab468eb3c86e0ec2c259e9c4b2b769ea57c555c79f3cfb457c7896ca05bf185c9c5725f9458377e4048
-DIST keybase-4.7.2.tar.gz 63834062 BLAKE2B e4d2977982d60e191e51ea54b64d52930524a71d1159da15fac8280a4be866d51804a928b2db60fee211a9ba499a6af63a7ae2698d7879ed2eaa3704cd7f49ab SHA512 4d43e2ab222b8c82fc97c15c52c718323ea19ffb2be35d19b5f631960d452f8cfe2ac48bd87e13f8e03587a7ed32ded233774a3230bafced7adb6c6f2818c891
 DIST keybase-5.1.1.tar.gz 65387553 BLAKE2B 8207fb1113a8585d562c19a9d886083b9bec57091f83dee52d4fbc735020be1dd9fc3194c29f4a736ee04fb1550cd03f3d9c4ef6b112aa1b6399e1200e3771ac SHA512 8a1bab428b3c41e7cdb45f5ea68a6c86067c9324c07ea71704bde8a5b5ae478a8468cb8d8638a41b7067b2ab5dc825d2aa28c4e7be4f33e3e3a41c942d852e09
--- a/app-crypt/keybase/keybase-4.4.2.ebuild
+++ b/app-crypt/keybase/keybase-4.4.2.ebuild
@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-build systemd
-
-DESCRIPTION="Client for keybase.io"
-HOMEPAGE="https://keybase.io/"
-SRC_URI="https://github.com/keybase/client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="app-crypt/gnupg"
-
-src_unpack() {
-	unpack "${P}.tar.gz"
-	ln -vs "client-${PV}" "${P}" || die
-	mkdir -vp "${S}/src/github.com/keybase" || die
-	ln -vs "${S}" "${S}/src/github.com/keybase/client" || die
-}
-
-src_compile() {
-	EGO_PN="github.com/keybase/client/go/keybase" \
-		EGO_BUILD_FLAGS="-tags production -o ${T}/keybase" \
-		golang-build_src_compile
-}
-
-src_test() {
-	EGO_PN="github.com/keybase/client/go/keybase" \
-		golang-build_src_test
-}
-
-src_install() {
-	dobin "${T}/keybase"
-	dobin "${S}/packaging/linux/run_keybase"
-	systemd_douserunit "${S}/packaging/linux/systemd/keybase.service"
-	dodir "/opt/keybase"
-	insinto "/opt/keybase"
-	doins "${S}/packaging/linux/crypto_squirrel.txt"
-}
-
-pkg_postinst() {
-	elog "Start/Restart keybase: run_keybase"
-	elog "Run the service:       keybase service"
-	elog "Run the client:        keybase login"
-	ewarn "Note that the user keybasehelper is obsolete and can be removed"
-}
--- a/app-crypt/keybase/keybase-4.5.0.ebuild
+++ b/app-crypt/keybase/keybase-4.5.0.ebuild
@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-build systemd
-
-DESCRIPTION="Client for keybase.io"
-HOMEPAGE="https://keybase.io/"
-SRC_URI="https://github.com/keybase/client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="app-crypt/gnupg"
-
-src_unpack() {
-	unpack "${P}.tar.gz"
-	ln -vs "client-${PV}" "${P}" || die
-	mkdir -vp "${S}/src/github.com/keybase" || die
-	ln -vs "${S}" "${S}/src/github.com/keybase/client" || die
-}
-
-src_compile() {
-	EGO_PN="github.com/keybase/client/go/keybase" \
-		EGO_BUILD_FLAGS="-tags production -o ${T}/keybase" \
-		golang-build_src_compile
-}
-
-src_test() {
-	EGO_PN="github.com/keybase/client/go/keybase" \
-		golang-build_src_test
-}
-
-src_install() {
-	dobin "${T}/keybase"
-	dobin "${S}/packaging/linux/run_keybase"
-	systemd_douserunit "${S}/packaging/linux/systemd/keybase.service"
-	dodir "/opt/keybase"
-	insinto "/opt/keybase"
-	doins "${S}/packaging/linux/crypto_squirrel.txt"
-}
-
-pkg_postinst() {
-	elog "Start/Restart keybase: run_keybase"
-	elog "Run the service:       keybase service"
-	elog "Run the client:        keybase login"
-	ewarn "Note that the user keybasehelper is obsolete and can be removed"
-}
--- a/app-crypt/keybase/keybase-4.7.0.ebuild
+++ b/app-crypt/keybase/keybase-4.7.0.ebuild
@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-build systemd
-
-DESCRIPTION="Client for keybase.io"
-HOMEPAGE="https://keybase.io/"
-SRC_URI="https://github.com/keybase/client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="app-crypt/gnupg"
-
-src_unpack() {
-	unpack "${P}.tar.gz"
-	ln -vs "client-${PV}" "${P}" || die
-	mkdir -vp "${S}/src/github.com/keybase" || die
-	ln -vs "${S}" "${S}/src/github.com/keybase/client" || die
-}
-
-src_compile() {
-	EGO_PN="github.com/keybase/client/go/keybase" \
-		EGO_BUILD_FLAGS="-tags production -o ${T}/keybase" \
-		golang-build_src_compile
-}
-
-src_test() {
-	EGO_PN="github.com/keybase/client/go/keybase" \
-		golang-build_src_test
-}
-
-src_install() {
-	dobin "${T}/keybase"
-	dobin "${S}/packaging/linux/run_keybase"
-	systemd_douserunit "${S}/packaging/linux/systemd/keybase.service"
-	dodir "/opt/keybase"
-	insinto "/opt/keybase"
-	doins "${S}/packaging/linux/crypto_squirrel.txt"
-}
-
-pkg_postinst() {
-	elog "Start/Restart keybase: run_keybase"
-	elog "Run the service:       keybase service"
-	elog "Run the client:        keybase login"
-	ewarn "Note that the user keybasehelper is obsolete and can be removed"
-}
--- a/app-crypt/keybase/keybase-4.7.2.ebuild
+++ b/app-crypt/keybase/keybase-4.7.2.ebuild
@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-build systemd
-
-DESCRIPTION="Client for keybase.io"
-HOMEPAGE="https://keybase.io/"
-SRC_URI="https://github.com/keybase/client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="app-crypt/gnupg"
-
-src_unpack() {
-	unpack "${P}.tar.gz"
-	ln -vs "client-${PV}" "${P}" || die
-	mkdir -vp "${S}/src/github.com/keybase" || die
-	ln -vs "${S}" "${S}/src/github.com/keybase/client" || die
-}
-
-src_compile() {
-	EGO_PN="github.com/keybase/client/go/keybase" \
-		EGO_BUILD_FLAGS="-tags production -o ${T}/keybase" \
-		golang-build_src_compile
-}
-
-src_test() {
-	EGO_PN="github.com/keybase/client/go/keybase" \
-		golang-build_src_test
-}
-
-src_install() {
-	dobin "${T}/keybase"
-	dobin "${S}/packaging/linux/run_keybase"
-	systemd_douserunit "${S}/packaging/linux/systemd/keybase.service"
-	dodir "/opt/keybase"
-	insinto "/opt/keybase"
-	doins "${S}/packaging/linux/crypto_squirrel.txt"
-}
-
-pkg_postinst() {
-	elog "Start/Restart keybase: run_keybase"
-	elog "Run the service:       keybase service"
-	elog "Run the client:        keybase login"
-	ewarn "Note that the user keybasehelper is obsolete and can be removed"
-}
--- a/app-crypt/nwipe/Manifest
+++ b/app-crypt/nwipe/Manifest
@ -1 +1,2 @@
 DIST nwipe-0.33.tar.gz 6377115 BLAKE2B d31f30b434bee50488649569721c52689535e2ec9ee4b750e8ccc8b34ecd128f53361fcb0c5261ac46e5cc2a353253f477153d0b5123a72f3e42468266d62d51 SHA512 d39537e7e53fdb8c90abeededc432fc0c0243a101818fc4b387d1808a45481aff6f563c3cf61038d3c463b602b8298f44e30c776c1cc45f8cbd57a516bfe05fa
+DIST nwipe-0.34.tar.gz 6377241 BLAKE2B 1fb785b8f3911124c1982284792b943416c6a33a151fe17aadc851478c45a16d0f16881dc6c8ade2b6eaf06710be59bfb6de1d69fed8d4cf7c4442e0b36a6d60 SHA512 8a9a0bba0e888d2578f41c985ba35ecfb9920f32eca089a73c9926afa8538835682c7ada96a720d928bb0902668b774ebe88bb50c67545f55245623f7140e9c0
--- a/app-crypt/nwipe/nwipe-0.34.ebuild
+++ b/app-crypt/nwipe/nwipe-0.34.ebuild
@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Securely erase disks using a variety of recognized methods"
+HOMEPAGE="https://github.com/martijnvanbrummelen/nwipe/"
+SRC_URI="https://github.com/martijnvanbrummelen/nwipe/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	sys-block/parted
+	sys-libs/ncurses:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+	eautoreconf
+}
--- a/app-crypt/seahorse/Manifest
+++ b/app-crypt/seahorse/Manifest
@ -1,2 +1 @@
-DIST seahorse-41.0.tar.xz 1371984 BLAKE2B fdfc7c6d5ba41ab83c639d93c92fe6e1c36d42a02c7a384c2055bfe594e2a16415115bfb07597de93a886e492974e38c812fbbd59c7112c0360adeed96cb437d SHA512 cc51e27a55ed646ee376aa1b1bffe28369d80e4b8c484c9711de6bdf190694714ef208579d0399b5c199b5619491d72dede1b1f6c03b89cf3a53e8519a4d4fcf
 DIST seahorse-42.0.tar.xz 1395040 BLAKE2B ae40d587c881851014b1989af986993768598a6a530f281cef3e177f0e6dbb3a97ec5128c5f39a463f69a4dfabb5c9f95af1dd3de7af12247338b8003c102ea3 SHA512 2a961a4054360c9a4fe0e9e360d6ea621a65325db8e40365e75d747cfe751c2dc3230ff51ffe0435d24766a91e8a042b8c01183fd58a70974a7ad095af8d247e
--- 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
@ -1,29 +0,0 @@
-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
@ -1,83 +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} )
-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"
-
-LICENSE="GPL-2+ FDL-1.1+"
-SLOT="0"
-IUSE="ldap zeroconf"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.66:2
-	>=app-crypt/gcr-3.38:=
-	>=app-crypt/gpgme-1.14.0:=
-	>=x11-libs/gtk+-3.24.0:3
-	>=app-crypt/gnupg-2.2
-	>=gui-libs/libhandy-1.1:1=
-	>=app-crypt/libsecret-0.16
-	dev-libs/libpwquality
-	net-misc/openssh
-	ldap? ( net-nds/openldap:= )
-	>=net-libs/libsoup-2.33.92:2.4
-	zeroconf? ( >=net-dns/avahi-0.6:=[dbus] )
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	dev-libs/libxml2:2
-	app-crypt/gcr[vala]
-	app-crypt/libsecret[vala]
-	gui-libs/libhandy:1[vala]
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xsl-stylesheets
-	dev-libs/appstream-glib
-	dev-libs/libxslt
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-meson-fix-gpg-version-check-for-recent-gnupg.patch
-)
-
-src_prepare() {
-	default
-	vala_src_prepare
-	gnome2_environment_reset
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dhelp=true
-		-Dpgp-support=true
-		-Dcheck-compatible-gpg=false # keep lowest version listed as compatible as min dep for gnupg RDEPEND
-		-Dpkcs11-support=true
-		-Dkeyservers-support=true
-		-Dhkp-support=true
-		$(meson_use ldap ldap-support)
-		$(meson_use zeroconf key-sharing)
-		-Dmanpage=true
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
--- a/app-crypt/ssdeep/ssdeep-2.14.1.ebuild
+++ b/app-crypt/ssdeep/ssdeep-2.14.1.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}-project/${PN}/releases/download/release-${PV}/

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~riscv x86"
 IUSE="static-libs"

 DOCS=(
--- a/app-crypt/xor-analyze/xor-analyze-0.5-r1.ebuild
+++ b/app-crypt/xor-analyze/xor-analyze-0.5-r1.ebuild
@ -1,18 +1,17 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=6
+EAPI=8

 inherit toolchain-funcs

-DESCRIPTION="program for cryptanalyzing xor 'encryption' with variable key length"
-HOMEPAGE="http://www.habets.pp.se/synscan/programs.php?prog=xor-analyze"
-SRC_URI="http://www.habets.pp.se/synscan/files/${P}.tar.gz"
+DESCRIPTION="Program for cryptanalyzing xor 'encryption' with variable key length"
+HOMEPAGE="https://www.habets.pp.se/synscan/programs_xor-analyze.html"
+SRC_URI="https://www.habets.pp.se/synscan/files/${P}.tar.gz"

-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""

 src_compile() {
 	rm -f Makefile || die
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
--- a/Show more
+++ b/Show more
				`@ -1 +0,0 @@`
				`DIST kfoldersync-3.4.1.tar.xz 49308 BLAKE2B b2d928d7b4111d69f9fdf28efcddb72da715b6bc143d94cc6d37fd8e5888f5ebd70d11e57a1cdce046ced7f55b6ba4a3da9d64947928d60ddb560b593af9a996 SHA512 b51c005942f0627f8ab3428e860c5f336df0282fd3dc184cac6897755a740ca873241e63828b1af7704b373e0a92de1a4bd9dbe8db3b7a35fbbafc2a509603d0`