Sync with portage [Sun Feb 20 22:41:50 MSK 2022].

app-admin/awscli/Manifest

@@ -6,3 +6,4 @@ DIST awscli-1.22.54.tar.gz 2164355 BLAKE2B 86f103c0ab646f78b77ca35740af816d1e36b
 DIST awscli-1.22.55.tar.gz 2164540 BLAKE2B 7e69d2810ba3a829522e4ada836f70d229ac62d1dae6f9fb087f932ab356b9be98cfd85ab8fe80d7ea2cf1e886def41b11b4d30031784b1ff68bd00ba05798b2 SHA512 1f08c624739e59d416a0a1642e38da3230f6df2d4b2b497b704949965a17d955c0c7c65fde29b037a3176487ba6c5d86e6017aaadf980253fff19d44f410ea5b
 DIST awscli-1.22.56.tar.gz 2164531 BLAKE2B 86ed7632aded1a5c3b18d2eabfbf5fd9954ef2d8f61ebf5c23e596452381a3915909d6fc93c92eaa5d58f02a27df994476fbc847b40984c141946e6f08933dd8 SHA512 fb4ad95f2990397fb1d83559e71dbebf1b4f2f52b46912da02bded1d486a61141c94dabc0f59ba2ffd724ef7e379f66113a71f2ea466e7a28cf6ac9582579004
 DIST awscli-1.22.57.tar.gz 2164852 BLAKE2B 4387cd8a93972f23149c722aa03ce26f9d9fe8daa908d3d9db6e6e845265089a663d8b20f6cb7bd858f69ca29cbbda94813f58349921659534250177eb21dea6 SHA512 ad7912aa9bd2318b043796ffce4df42915e4af60ce85f76236ff9e9c1b06ef87a7acc45e560abcfc48c06ab9f14a9d3ebad12b9d02a02f66c9bbaccbbcc66100
+DIST awscli-1.22.58.tar.gz 2165016 BLAKE2B d7eec5a51a64d3a78555abfd4a3dd70a02b4e2c4399b57a023bf81603946cbbce3c0a5e49b02d90adfc74ea9d060f72d0350a9673abe855164aede6e35530085 SHA512 62e9eff1c8d0ad035566fb97bf26d52554cf314c35bf2277062aadcaa7d96a8c1cb949c85f61a79ace17821f5355d93aeb9f5692b8ca417e852fa4e3aa1325c9

app-admin/awscli/awscli-1.22.58.ebuild

@@ -0,0 +1,59 @@
+# 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
+
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="https://pypi.org/project/awscli/"
+#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/aws-cli-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# awscli 1.22.55 → botocore 1.24.0
+# so botocore is x.(y+2).(z-55)
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(( $(ver_cut 3-) - 55))"
+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.4.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${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}
+}
+
+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
+}

app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-1.30.0.ebuild

@@ -72,7 +72,7 @@ src_install() {
 
 	local x
 	for x in 16 32 48 64 256 512; do
-		doicon -s ${x} data/icons/hicolor/${x}*/*
+		doicon -s ${x} usr/share/icons/hicolor/${x}*/*
 	done
 }
 

app-admin/drush/drush-6.7.0-r2.ebuild

@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1
-
-DESCRIPTION="Command line shell and scripting interface for Drupal"
-HOMEPAGE="https://github.com/drush-ops/drush"
-SRC_URI="https://github.com/drush-ops/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-lang/php[cli,ctype,json(+),simplexml]
-	dev-php/PEAR-Console_Table"
-
-# Fixes the bash completion script, check the patch for Gentoo/upstream
-# bug numbers.
-PATCHES=( "${FILESDIR}/update-bash-completion-script-for-2.1.patch" )
-
-src_prepare() {
-	default
-
-	# dodoc compresses all of the documentation, so we fix the filenames
-	# in a few places.
-	#
-	# First, the README location in bootstrap.inc.
-	sed -i -e \
-		"s!/share/doc/drush!/share/doc/${PF}!" \
-		-e "s!README\.md!\0.bz2!g" \
-		includes/bootstrap.inc || die
-
-	# Next, the list of documentation in docs.drush.inc. Note that
-	# html files don't get compressed.
-	sed -i \
-		-e "s!\.bashrc'!.bashrc.bz2'!" \
-		-e "s!\.inc'!.inc.bz2'!" \
-		-e "s!\.ini'!.ini.bz2'!" \
-		-e "s!\.md'!.md.bz2'!" \
-		-e "s!\.php'!.php.bz2'!" \
-		-e "s!\.script'!.script.bz2'!" \
-		-e "s!\.txt'!.txt.bz2'!" \
-		commands/core/docs.drush.inc || die
-}
-
-src_install() {
-	# Always install the examples; they're referenced within the source
-	# code and too difficult to exorcise.
-	dodoc -r README.md docs examples
-
-	insinto /usr/share/drush
-	doins -r classes commands includes lib misc
-	doins drush_logo-black.png drush.info drush.php
-
-	exeinto /usr/share/drush
-	doexe drush
-	dosym ../share/drush/drush /usr/bin/drush
-
-	keepdir /etc/drush
-	newbashcomp drush.complete.sh drush
-}

app-admin/drush/drush-6.7.0-r3.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://github.com/drush-ops/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=""

app-admin/eselect/eselect-1.4.20.ebuild

@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
 
 LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-4.0 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~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="doc emacs vim-syntax"
 
 DEPEND="sys-apps/sed

app-admin/gam-server/gam-server-0.1.10-r2.ebuild

@@ -1,88 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-GNOME_ORG_MODULE="gamin"
-GNOME_TARBALL_SUFFIX="bz2"
-inherit autotools epatch flag-o-matic multilib gnome.org
-
-DESCRIPTION="Library providing the FAM File Alteration Monitor API"
-HOMEPAGE="https://www.gnome.org/~veillard/gamin/"
-SRC_URI="${SRC_URI}
-	mirror://gentoo/gamin-0.1.9-freebsd.patch.bz2
-	https://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz" # pkg.m4 for eautoreconf
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-solaris"
-IUSE="debug"
-
-RDEPEND=">=dev-libs/glib-2:2
-	>=dev-libs/libgamin-0.1.10
-	!app-admin/fam
-	!<app-admin/gamin-0.1.10"
-
-DEPEND="${RDEPEND}"
-
-#S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	mv -vf "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die
-
-	# Fix compile warnings; bug #188923
-	epatch "${DISTDIR}/gamin-0.1.9-freebsd.patch.bz2"
-
-	# Fix file-collision due to shared library, upstream bug #530635
-	epatch "${FILESDIR}/${PN}-0.1.10-noinst-lib.patch"
-
-	# Fix compilation with latest glib, bug #382783
-	epatch "${FILESDIR}/${PN}-0.1.10-G_CONST_RETURN-removal.patch"
-
-	# Fix crosscompilation issues, bug #267604
-	epatch "${FILESDIR}/${PN}-0.1.10-crosscompile-fix.patch"
-
-	# Enable linux specific features on armel, upstream bug #588338
-	epatch "${FILESDIR}/${P}-armel-features.patch"
-
-	# Fix deadlocks with glib-2.32, bug #413331, upstream #667230
-	epatch "${FILESDIR}/${P}-ih_sub_cancel-deadlock.patch"
-
-	# Drop DEPRECATED flags
-	sed -i -e 's:-DG_DISABLE_DEPRECATED:$(NULL):g' server/Makefile.am || die
-
-	sed -i \
-		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
-		-e 's:AM_PROG_CC_STDC:AC_PROG_CC:' \
-		configure.in || die #466948
-
-	# autoconf is required as the user-cflags patch modifies configure.in
-	# however, elibtoolize is also required, so when the above patch is
-	# removed, replace the following call with a call to elibtoolize
-	AT_M4DIR="${WORKDIR}" eautoreconf
-}
-
-src_configure() {
-	# fixes bug 225403
-	#append-flags "-D_GNU_SOURCE"
-
-	# Solaris' patchs adds this to configure, but it conflicts with
-	# Gentoo's FreeBSD patch.
-	[[ ${CHOST} == *-solaris* ]] && append-libs socket nsl
-
-	if ! has_version virtual/pkgconfig; then
-		export DAEMON_CFLAGS="-I${EPREFIX}/usr/include/glib-2.0 -I${EPREFIX}/usr/$(get_libdir)/glib-2.0/include"
-		export DAEMON_LIBS="-lglib-2.0"
-	fi
-
-	econf \
-		--disable-debug \
-		--disable-libgamin \
-		--without-python \
-		$(use_enable kernel_linux inotify) \
-		$(use_enable debug debug-api)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-}

app-admin/gam-server/gam-server-0.1.10-r3.ebuild

@@ -16,7 +16,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-solaris"
 IUSE="debug"
 
 RDEPEND=">=dev-libs/glib-2:2

app-admin/logrotate/logrotate-3.19.0.ebuild

@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="acl +cron selinux"
 
 DEPEND=">=dev-libs/popt-1.5

app-admin/pass/pass-1.7.4-r2.ebuild

@@ -12,7 +12,7 @@ S="${WORKDIR}/password-store-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
 IUSE="+git wayland X emacs dmenu importers"
 
 RDEPEND="

app-admin/sysklogd/sysklogd-2.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=7
@@ -13,7 +13,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/troglobit/sysklogd.git"
 else
 	SRC_URI="https://github.com/troglobit/sysklogd/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 fi
 
 LICENSE="BSD"

app-admin/xkcdpass/Manifest

@@ -1,2 +1 @@
-DIST xkcdpass-1.19.2.tar.gz 2073808 BLAKE2B 19ad3f505ab672b1a2554e534896b15c77eb9741e7da01e22efff44d069ff6a482c122ec7fa616bc3789d2ce4bd5f6050c06bcff9661476d15fbc78edc505c36 SHA512 20376fc22fb4d251e2b921d4db48fea2109a4c42832614d41e807b262130111c58e01d1ded2019fad230a458953a2f185d92cfe95f3950aaa0a97750b3b3a2b6
 DIST xkcdpass-1.19.3.tar.gz 2570967 BLAKE2B bd3576b707db2652e6979ea25476fcda51df7bc84a5182668ff1cf2878a57c89ab56a7272fe2030c38533bf4f75855facd7fd8aefa6e5c6335a00c8ef80b228f SHA512 5336e57edd7fbeb655573910b0c0868381a8b43d5ccbb8d388cc24ef16ba094c27517a4fe7b11dbfc7ff906b65a303f90b20cdf9bc551b844453640378b5e555

app-admin/xkcdpass/xkcdpass-1.19.2.ebuild

@@ -1,41 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Password generator inspired by XKCD 936"
-HOMEPAGE="https://github.com/redacted/XKCD-password-generator"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD CC-BY-3.0
-	l10n_de? ( GPL-3 )
-	l10n_it? ( CC-BY-SA-3.0 )
-	l10n_no? ( CC-BY-4.0 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="l10n_de +l10n_en l10n_es l10n_fi l10n_fr l10n_it l10n_no l10n_pt"
-
-distutils_enable_tests pytest
-REQUIRED_USE="test? ( l10n_en )"
-
-src_prepare() {
-	default
-
-	use l10n_de || rm ${PN}/static/ger-anlx
-	use l10n_en || rm ${PN}/static/{eff-short,eff-special,legacy}
-	use l10n_es || rm ${PN}/static/spa-mich
-	use l10n_fi || rm ${PN}/static/fin-kotus
-	use l10n_fr || rm ${PN}/static/fr-*
-	use l10n_it || rm ${PN}/static/ita-wiki
-	use l10n_no || rm ${PN}/static/nor-nb
-	use l10n_pt || rm ${PN}/static/pt-*
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman ${PN}.1
-}

app-arch/bzip2/bzip2-1.0.8-r1.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
 
 # XXX: atm, libbz2.a is always PIC :(, so it is always built quickly
@@ -8,6 +8,10 @@ EAPI=7
 
 inherit toolchain-funcs multilib-minimal usr-ldscript
 
+if [[ ${PVR} != 1.0.8-r1 ]]; then
+	die "Please remove libbz2.so.1.0 logic from multilib_src_install"
+fi
+
 DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
 HOMEPAGE="https://sourceware.org/bzip2/"
 SRC_URI="https://sourceware.org/pub/${PN}/${P}.tar.gz"

app-arch/innoextract/innoextract-1.9.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2020 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://constexpr.org/innoextract/files/${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="debug +iconv +lzma"
 
 RDEPEND="

app-arch/zstd/zstd-1.5.1-r2.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

app-arch/zstd/zstd-1.5.2.ebuild

@@ -11,7 +11,7 @@ SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="lz4 static-libs +threads"
 
 RDEPEND="app-arch/xz-utils

app-cdr/xcdroast/Manifest

@@ -1 +1,2 @@
 DIST xcdroast-0.98alpha16.tar.gz 3563666 BLAKE2B 781f06e89265e9f30ea651d39219d7083a2cfc2833bc2ab0b57d9f67de77b2eb8aa6755148cd259e3c188a72f07026ecda91d0bbe09af4b55c696c75274739e0 SHA512 dec789955eb70a14f6bcb7c0895a6ca4b7c471cc5ee7ab12af1e671c8586c481c4a05e20eb42724d686d561a551809d9437dafadd3cd081079cefc28e0b94df7
+DIST xcdroast-1.19.tar.gz 3448552 BLAKE2B 2e4e2b5119d5002870142d95345ddd33dad40c5a9d7517594da0dfd945bea012d5391b61fb6264d790aaaacf4de6b990fc77f4b40fab594ac1a5d2279dafa933 SHA512 79449353ba5a1be990366e85bd807e4ef35ec19f021986634ee9549608dca0e447b61dbbed0f30f588baac49fc6b93c055800bedb629ff77274d7da7c39d7881

app-cdr/xcdroast/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>bircoph@gentoo.org</email>
-		<name>Andrew Savchenko</name>
-	</maintainer>
+<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">xcdroast</remote-id>
 	</upstream>

app-cdr/xcdroast/xcdroast-1.19-r1.ebuild

@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop xdg
+
+DESCRIPTION="Lightweight cdrtools front-end for CD and DVD writing"
+HOMEPAGE="http://www.xcdroast.org/"
+SRC_URI="mirror://sourceforge/xcdroast/${P/_/}.tar.gz"
+S="${WORKDIR}"/${P/_/}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="nls suid"
+
+RDEPEND=">=app-cdr/cdrtools-3.02_alpha09
+	media-libs/alsa-lib
+	>=x11-libs/gtk+-2:2"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable suid user-host-mode)
+}
+
+src_install() {
+	default
+
+	dodoc -r AUTHORS ChangeLog README doc/*
+
+	newicon -s 48 xpms/ico_cdwriter.xpm xcdroast.xpm
+	make_desktop_entry xcdroast "X-CD-Roast" xcdroast "AudioVideo;DiscBurning"
+}

app-containers/buildah/Manifest

@@ -2,3 +2,4 @@ DIST buildah-1.21.1.tar.gz 11693142 BLAKE2B 513f75d8f2831130759f3bcb77fad311c288
 DIST buildah-1.23.1.tar.gz 11872323 BLAKE2B 6e4cffd11177bca6c3e86cd3372fc7bf295b23559b7478a679ea2bea022c149b5ea058224f0a156df1b9511905795c44ed5e988ec68ca834dd80d0c198543d5f SHA512 2ceb6df5adb671483557bb03937df583857d99c116be5d44aae533c155f560d5d454bebf25908ac02bb85e4c2ba31533adb99f0946ecc4f4830977c14f324b6f
 DIST buildah-1.24.0.tar.gz 14143490 BLAKE2B c9883cc849d8837cdc4d31c02d49138f61b99f97fc40eb36494368eb47f1d74a24c6ddc4f631a043769ecb03906d11978afc7fae993a2f10346d9ac072d6e322 SHA512 337792cb896de3c10a66f7e2cf7c52d0dffd0ca8fede48a4d3a666d2a05e17bb3116db7c20a39805e9360b24a5df12d8ebd7a3818be12bb8e06e4b16cd62fc60
 DIST buildah-1.24.1.tar.gz 14177522 BLAKE2B 74a0dc14e6e0ddc3f6ffa4a12ebb1f435f3d24467e6b2ca581642dc76eb2c394b8a148465fc810dc106387ecd579c9b42e7dfcef65fa9a93a179434ad9664828 SHA512 32e9d9873d3fbb40a03e240c7b460c555200f69ff60d54c670b0ee0651ef9154a43d75203bf26dc3f1375433b463342c27a358d30bbdaf9aa3fb211f4c3c1b36
+DIST buildah-1.24.2.tar.gz 14184511 BLAKE2B ad9ee6f332a89038368d9a5d86198f1dfa9cf99a970e85ccf3b272294fc262c68c37004131971b0ec148e999e4d8f192f4955e71673f05188110407949eb3546 SHA512 dada2b65340386355aba3980c38d9be0f43d5c3f9316c6f8e713f299ee2b975e409c1b3a785daa52b59e688c3a9c9016c43d9b0a6443d4a9453aababc0a8afa0

app-containers/buildah/buildah-1.24.2.ebuild

@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+GIT_COMMIT=ce608bce
+
+DESCRIPTION="A tool that facilitates building OCI images"
+HOMEPAGE="https://github.com/containers/buildah"
+SRC_URI="https://github.com/containers/buildah/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="selinux"
+
+RDEPEND="app-crypt/gpgme:=
+	app-containers/skopeo
+	dev-libs/libgpg-error:=
+	dev-libs/libassuan:=
+	sys-apps/shadow:=
+	sys-fs/lvm2:=
+	sys-libs/libseccomp:=
+	selinux? ( sys-libs/libselinux:= )"
+DEPEND="${RDEPEND}"
+
+RESTRICT+=" test"
+
+src_prepare() {
+	default
+	[[ -f selinux_tag.sh ]] || die
+	use selinux || { echo -e "#!/bin/sh\ntrue" > \
+		selinux_tag.sh || die; }
+	sed -i -e 's/make -C/$(MAKE) -C/' Makefile || die 'sed failed'
+}
+
+src_compile() {
+	emake GIT_COMMIT=${GIT_COMMIT} all
+}
+
+src_install() {
+	dodoc CHANGELOG.md CONTRIBUTING.md README.md install.md troubleshooting.md
+	doman docs/*.1
+	dodoc -r docs/tutorials
+	dobin bin/{${PN},imgtype}
+	dobashcomp contrib/completions/bash/buildah
+}
+
+src_test() {
+	emake test-unit
+}

app-containers/cosign/Manifest

@@ -1,4 +1,2 @@
-DIST cosign-1.5.0-vendor.tar.xz 10089292 BLAKE2B 71e9fc37df524496cb1639b0ddefbb4e5595ffd088ae8a36976b8d1ff4d7bd17781bd267b02d3d5aff74c7682dde9c4a990c787a7e0a4e523664134aa36c0512 SHA512 9d867828d183a093335adb53fb6424d13149c8ce41c77906a42ef3bea171b265967fe6dcca2b2569967e5c3ce8c2752e3f5d2c4a104e2be196708d85b73f7784
-DIST cosign-1.5.0.tar.gz 6595932 BLAKE2B dd4403ed71c6a3773cf5ff3adebeab197a0f2d2148da50d32ee6b4f3802ef2810fba500ba22aca65f7553f45caaf4d4044183925e77cad3dfe566e95b8272494 SHA512 fc7768e37bc7236d2275a51e4b3f0854051d018af62e25d7c20ac3d79f7deacde181b650752da9a859e24585915bbcaf2f1d34f73747f0ffe9871109e1a3e019
-DIST cosign-1.5.1-vendor.tar.xz 10098460 BLAKE2B cfb01a16e12638759ec0edfe58057fa405e4e281d0100e65bf11404967cd58296f3c522fd637a4a34b86a5d34209ba2177d5cc0e92f1aa020eda26615b856859 SHA512 b7fa85039d21501a20ce29732980db8b1b96aaeffccdb1158a2c3c3f8f6e9805991f25bb3e361dfce3b8daac8cce42b16b2a69a3d54efd3db99aafe49b6a81c1
-DIST cosign-1.5.1.tar.gz 6595482 BLAKE2B ce8056c3fa49a75e52b001693cc1c76dc152f7ddb1947d6862526e918e9dbbb7d934601ea00c3f47a747b748124846b68dbd4abbce5c332860cbbef52aae1be1 SHA512 6d46dd2ca59b0ad410d23c002727198bf94c35f6d15983b13a23216510efa555268cf31de84679ce6e9e9db7f82b51787cd923e7c263939d9eb7cabecaf9c428
+DIST cosign-1.5.2-vendor.tar.xz 10097760 BLAKE2B 836dae79dc596193f40826e9c203312f2e9b56d2371d22db6880a49b52e3b37741a0b0adda6ec717ce983e81e964d3ef75d4a3507c8fc03628b4a63e8d071dfb SHA512 a0362652b5b6a41997e125df45d84d5536f23fcb917eb5211d3adc0f90713e3fd8439974cd727d259a3fe8fae5a8b1882ef24685a8293ef0176327468e3f4997
+DIST cosign-1.5.2.tar.gz 6597815 BLAKE2B b1dd4c49c1f561f1e449a5884f62731fdefb79c8b4d234a27ab48483a7421d0581e68bf132b88830498e9153fe65a5a5b2b903b63cbfa56892c1db0cef8c2751 SHA512 f52b07410081dec66ab3f12ab2b52690686bcd6144703cb107c42c72d9514a94d227f653ecb9047e2fae8f5e763b6afaf703edd6a0c5b62fe9acb612eed9b43f

app-containers/cosign/cosign-1.5.0.ebuild

@@ -1,34 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module
-
-DESCRIPTION="container signing utility"
-HOMEPAGE="https://sigstore.dev"
-SRC_URI="https://github.com/sigstore/cosign/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~williamh/dist/${P}-vendor.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-makefile.patch
-)
-
-src_prepare() {
-	default
-	mv ../vendor . || die
-}
-
-src_compile() {
-	emake \
-		GIT_HASH=757252063bf4724f11a52336ef13a724059a39b6 \
-		GIT_VERSION=v${PV} \
-		GIT_TREESTATE=clean
-}
-
-src_install() {
-	dobin cosign
-}

app-containers/cosign/cosign-1.5.2.ebuild

@@ -24,11 +24,12 @@ src_prepare() {
 
 src_compile() {
 	emake \
-		GIT_HASH=c3e4d8b7cd2f6f065941510b260f173b70c695fa \
+		GIT_HASH=8ffcd1228c463e1ad26ccce68ae16deeca2960b4 \
 		GIT_VERSION=v${PV} \
 		GIT_TREESTATE=clean
 }
 
 src_install() {
 	dobin cosign
+	einstalldocs
 }

app-containers/cri-tools/cri-tools-1.23.0.ebuild

@@ -11,7 +11,7 @@ SRC_URI="https://github.com/kubernetes-sigs/cri-tools/archive/v${PV}.tar.gz -> $
 
 LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DEPEND="dev-lang/go"
 

app-containers/lxd/files/lxd-4.0.9-r1.service

@@ -5,8 +5,6 @@ Requires=network-online.target lxcfs.service lxd.socket
 Documentation=man:lxd(1)
 
 [Service]
-Group=lxd
-User=root
 EnvironmentFile=-/etc/environment
 ExecStart=/usr/sbin/lxd --group lxd --syslog
 ExecStartPost=/usr/sbin/lxd waitready --timeout=600

app-containers/lxd/lxd-4.0.9-r2.ebuild

@@ -99,7 +99,7 @@ src_prepare() {
 		lxd/apparmor/instance_qemu.go \
 		lxd/instance/drivers/driver_qemu.go || die "Failed to fix hardcoded ovmf paths."
 
-	cp "${FILESDIR}"/lxd-4.0.9.service "${T}"/lxd.service || die
+	cp "${FILESDIR}"/lxd-4.0.9-r1.service "${T}"/lxd.service || die
 	if use apparmor; then
 		sed -i \
 			'/^EnvironmentFile=.*/a ExecStartPre=\/usr\/libexec\/lxc\/lxc-apparmor-load' \

app-containers/nerdctl/Manifest

@@ -2,3 +2,4 @@ DIST nerdctl-0.14.0-vendor.tar.gz 8166023 BLAKE2B 9aeeceb8b35244723a618814dd0b53
 DIST nerdctl-0.15.0-vendor.tar.gz 8310858 BLAKE2B 2406d87e3f1ee17b501308cee4a662ce79d1a49510ab1b023a6e52d537feb8fe79e9a9eacb25a1dcdf019db206467f67bf6a95e3a2ba03c07ad658cb0757394c SHA512 65494af911382086e57eab669280cc377670ce1472a2a7aef74e437a7d70d3e811a858cba1a4e154397709531523c13f3840f286334c6df367ae8f9ba47a9976
 DIST nerdctl-0.16.0-vendor.tar.gz 7871495 BLAKE2B 048c5070cec7d8dd6260738b427c461fce5144d2a1c569b4872771d43682860d6406cf7768ea1261499d4dc768269fa2af017ce969a1698c12699e82cd968b47 SHA512 9cb782e7fec46dd1c939d7bc9c417437899c22579159439c82f4b8fa5b7d4a993da679aa9130a5ee24e190fa0030ba73ead87c3e7971791b3e9a7437ab77c95d
 DIST nerdctl-0.16.1-vendor.tar.gz 7749772 BLAKE2B aca9191a3119b43001fe5aeaba29650bbffdf1af0ddbad5ed7b251592427da46fbe5342338fbe716c77b6890585cfbebf0ff35e11dbe2cb412348282fb8727f8 SHA512 55d6bc64c5f292ad7305ebfc0cc47224663980066931e6fad6fec2fb9fc2fe5cb95e19a80b3cfe22129e6511c17ba52b4e594f2dcbffd2cb3fdfd92034ad89db
+DIST nerdctl-0.17.0-vendor.tar.gz 7762722 BLAKE2B ea2254e58c58844df037117f17fb23a87939715499d948e9b8fb29ebdda40d90594cb13988187c24e13fd5ea8aaf3694546c4ab0454f649cc4456037ec37865d SHA512 40f6925c44764ca0e1107ce4fcace5a5971c43b1fb459e858db4c16c4f4fd992e9e1bb901f5e16f830de5c0bd32322d57960d472a067fc43bb6c9c76eac087d7

app-containers/nerdctl/nerdctl-0.17.0.ebuild

@@ -0,0 +1,33 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Docker-compatible CLI for containerd, with support for Compose"
+HOMEPAGE="https://github.com/containerd/nerdctl"
+
+EGIT_COMMIT="9ec475aeb69209b9b2a3811aee0923e2eafd1644"
+# There are too many vendor dependencies to distribute via EGO_SUM (see https://bugs.gentoo.org/721088),
+# so they are instead distributed via a combined tarball.
+SRC_URI="https://github.com/zmedico/nerdctl/archive/refs/tags/v${PV}-vendor.tar.gz -> ${P}-vendor.tar.gz"
+BDEPEND=">=dev-lang/go-1.16"
+LICENSE="Apache-2.0 BSD BSD-2 ISC MIT"
+SLOT="0"
+
+KEYWORDS="~amd64"
+IUSE=""
+S=${WORKDIR}/${P}-vendor
+
+src_prepare() {
+	sed -e 's:/usr/local/bin:/usr/bin:' \
+		-e "s|^VERSION[[:space:]]*=.*|VERSION := v${PV}|" \
+		-e "s|^REVISION[[:space:]]*=.*|REVISION := ${EGIT_COMMIT}|" \
+		-i Makefile || die
+	default
+}
+
+src_install() {
+	DOCS=(README.md docs examples)
+	default_src_install
+}

app-containers/podman/Manifest

@@ -1 +1,2 @@
 DIST podman-3.4.4.tar.gz 10945990 BLAKE2B 3de69c9bc3bd1334837d21cb2817a9e9757fbb561a0b047658c7401608ecf1fbe09d5cd0c65497a82150a67a3775c77705d0dbd314a54f7b3a1953733cfb2906 SHA512 cfd295bf50ce86ea70741c3e663b409ed47b1e560c962bc579f319151a0fe2b24cdd3045667660083cce89449a9c5de1508c94a9a02375165a72ce7c16166666
+DIST podman-4.0.0.tar.gz 11379640 BLAKE2B 2d68b95206ef59873c2a5c434aa3901c33a3526f840805ab42ac4dad4ed5861824a6b2142d02b500e087d56f4da3255c2b156af4d835a6427c2ebfae34278a75 SHA512 2e25f303d143bc4e265f0f8998ea1c4af3d6da8b35452cf6b27a4eb204805a9b5f75f4b6430921b42c80b76a6b5c9cf35a732c265727a11261fca25cc96f57e7

app-containers/podman/podman-4.0.0.ebuild

@@ -0,0 +1,161 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+EGIT_COMMIT="84c8870ac236578c41713113fc09a29a5f727bdd"
+
+inherit bash-completion-r1 flag-o-matic go-module tmpfiles
+
+DESCRIPTION="Library and podman tool for running OCI-based containers in Pods"
+HOMEPAGE="https://github.com/containers/podman/"
+MY_PN=podman
+MY_P=${MY_PN}-${PV}
+SRC_URI="https://github.com/containers/podman/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+IUSE="apparmor btrfs +fuse +rootless selinux"
+RESTRICT+=" test"
+
+COMMON_DEPEND="
+	app-crypt/gpgme:=
+	>=app-containers/conmon-2.0.0
+	|| ( >=app-containers/runc-1.0.0_rc6 app-containers/crun )
+	dev-libs/libassuan:=
+	dev-libs/libgpg-error:=
+	>=net-misc/cni-plugins-0.8.6
+	sys-fs/lvm2
+	sys-libs/libseccomp:=
+
+	apparmor? ( sys-libs/libapparmor )
+	btrfs? ( sys-fs/btrfs-progs )
+	rootless? ( app-containers/slirp4netns )
+	selinux? ( sys-libs/libselinux:= )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-go/go-md2man"
+RDEPEND="${COMMON_DEPEND}
+	fuse? ( sys-fs/fuse-overlayfs )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+
+	# Disable installation of python modules here, since those are
+	# installed by separate ebuilds.
+	local makefile_sed_args=(
+		-e '/^GIT_.*/d'
+		-e 's/$(GO) build/$(GO) build -v -work -x/'
+		-e 's/^\(install:.*\) install\.python$/\1/'
+		-e 's|^pkg/varlink/iopodman.go: .gopathok pkg/varlink/io.podman.varlink$|pkg/varlink/iopodman.go: pkg/varlink/io.podman.varlink|'
+	)
+
+	has_version -b '>=dev-lang/go-1.13.9' || makefile_sed_args+=(-e 's:GO111MODULE=off:GO111MODULE=on:')
+
+	sed "${makefile_sed_args[@]}" -i Makefile || die
+}
+
+src_compile() {
+	local git_commit=${EGIT_COMMIT}
+
+	# Filter unsupported linker flags
+	filter-flags '-Wl,*'
+
+	[[ -f hack/apparmor_tag.sh ]] || die
+	if use apparmor; then
+		echo -e "#!/bin/sh\necho apparmor" > hack/apparmor_tag.sh || die
+	else
+		echo -e "#!/bin/sh\ntrue" > hack/apparmor_tag.sh || die
+	fi
+
+	[[ -f hack/btrfs_installed_tag.sh ]] || die
+	if use btrfs; then
+		echo -e "#!/bin/sh\ntrue" > hack/btrfs_installed_tag.sh || die
+	else
+		echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
+			hack/btrfs_installed_tag.sh || die
+	fi
+
+	[[ -f hack/selinux_tag.sh ]] || die
+	if use selinux; then
+		echo -e "#!/bin/sh\necho selinux" > hack/selinux_tag.sh || die
+	else
+		echo -e "#!/bin/sh\ntrue" > hack/selinux_tag.sh || die
+	fi
+
+	# Avoid this error when generating pkg/varlink/iopodman.go:
+	# cannot find package "github.com/varlink/go/varlink/idl"
+	mkdir -p _output || die
+	ln -snf ../vendor _output/src || die
+	GO111MODULE=off GOPATH=${PWD}/_output go generate ./pkg/varlink/... || die
+	rm _output/src || die
+
+	export -n GOCACHE GOPATH XDG_CACHE_HOME
+	GOBIN="${S}/bin" \
+		emake all \
+			GIT_BRANCH=master \
+			GIT_BRANCH_CLEAN=master \
+			COMMIT_NO="${git_commit}" \
+			GIT_COMMIT="${git_commit}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+
+	insinto /etc/containers
+	newins test/registries.conf registries.conf.example
+	newins test/policy.json policy.json.example
+
+	insinto /usr/share/containers
+	doins vendor/github.com/containers/common/pkg/seccomp/seccomp.json
+
+	newconfd "${FILESDIR}"/podman.confd podman
+	newinitd "${FILESDIR}"/podman.initd podman
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/podman.logrotated" podman
+
+	dobashcomp completions/bash/*
+
+	insinto /usr/share/zsh/site-functions
+	doins completions/zsh/*
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins completions/fish/*
+
+	keepdir /var/lib/containers
+}
+
+pkg_preinst() {
+	PODMAN_ROOTLESS_UPGRADE=false
+	if use rootless; then
+		has_version 'app-containers/podman[rootless]' || PODMAN_ROOTLESS_UPGRADE=true
+	fi
+}
+
+pkg_postinst() {
+	tmpfiles_process podman.conf
+
+	local want_newline=false
+	if [[ ! ( -e ${EROOT%/*}/etc/containers/policy.json && -e ${EROOT%/*}/etc/containers/registries.conf ) ]]; then
+		elog "You need to create the following config files:"
+		elog "/etc/containers/registries.conf"
+		elog "/etc/containers/policy.json"
+		elog "To copy over default examples, use:"
+		elog "cp /etc/containers/registries.conf{.example,}"
+		elog "cp /etc/containers/policy.json{.example,}"
+		want_newline=true
+	fi
+	if [[ ${PODMAN_ROOTLESS_UPGRADE} == true ]] ; then
+		${want_newline} && elog ""
+		elog "For rootless operation, you need to configure subuid/subgid"
+		elog "for user running podman. In case subuid/subgid has only been"
+		elog "configured for root, run:"
+		elog "usermod --add-subuids 1065536-1131071 <user>"
+		elog "usermod --add-subgids 1065536-1131071 <user>"
+		want_newline=true
+	fi
+}

app-containers/skopeo/Manifest

@@ -6,3 +6,4 @@ DIST skopeo-1.3.0.tar.gz 5593261 BLAKE2B b26e39d821e63b31a1cbd23bf7b836fbe3185f4
 DIST skopeo-1.3.1.tar.gz 5595931 BLAKE2B eda2767a1b1b899b99fc70ef361541c388cab77d4521cc2792baf78ca2474e73ff2d7d64d26f713410a40600866fd6c20855d4acdbdb0a31b11d7efaa8101b83 SHA512 65b8ba735bd409b25b56a5538de4e09edfd11d684752a6e9d28037d0f2b80aef80796c2e9588fcf192d24bd885cc7b2d65b0ee7f7c34d18b2eacc25816da5d36
 DIST skopeo-1.5.1.tar.gz 5636533 BLAKE2B 7f0e86cdee5c3250ec1280d7e71554ac2f8ad96ababe0e81dfabc00e8c128a13fc0c9c561b7a9be389d7386e9f664b95118bd2122612b9c2e8844db49769c03c SHA512 3f8c730eaa739bf2a29b82d3b04aa4eee1c09f957b61964fc8c48e59d1537bcb87b5bdf9c18fa48f9d36cf2b7ede3a1448918a20b5a3167f6ce09881a6cd3dde
 DIST skopeo-1.6.0.tar.gz 6542541 BLAKE2B d2898d8f80a04340e3174179e2397f7b5e66ed50ec8c11919adf1b0620c74a3a69f8be548c5c3bf081735e1a86dc5ae3390d058ef64fc4b73d8f01074ef4a210 SHA512 13a3660780ce43e31a9840811aaa7626f9d0de9999e52c469a2a58b4bf96bd5e4d67e0f0556ac2baef14c5a662afae1f2d407b260c8833d573326791a2193e48
+DIST skopeo-1.6.1.tar.gz 6543397 BLAKE2B 25ca8bc99b03516cb2312c5ce36c13ec87ad34f3831a04e37d5c0f5d4afe2a60ae5d8e6039d8d3651b978459cbdec65f6f43259116368a11b8c6d3478b8ca733 SHA512 92ebe121ae41b2f192e52e24ae05a2f12fedf3483f8d342f6bdde9cb902a291e0297b187c614a64a5c1a62098c7dc59d8a5e5fd1f61b48e4030b163822b47a2b

app-containers/skopeo/skopeo-1.6.1.ebuild

@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+COMMIT=49084d2cd8c9f8e7b38ba8405d61e701d5381bc0
+inherit go-module bash-completion-r1
+
+DESCRIPTION="Command line utility foroperations on container images and image repositories"
+HOMEPAGE="https://github.com/containers/skopeo"
+SRC_URI="https://github.com/containers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="btrfs"
+
+COMMON_DEPEND=">=app-crypt/gpgme-1.5.5:=
+	>=dev-libs/libassuan-2.4.3:=
+	dev-libs/libgpg-error:=
+	btrfs? ( >=sys-fs/btrfs-progs-4.0.1 )
+	>=sys-fs/lvm2-2.02.145:="
+DEPEND="${COMMON_DEPEND}
+	dev-go/go-md2man"
+RDEPEND="${COMMON_DEPEND}"
+
+RESTRICT+=" test"
+
+src_compile() {
+	local BUILDTAGS
+	BUILDTAGS="containers_image_ostree_stub $(usex btrfs "" exclude_graphdriver_btrfs)"
+	set -- go build -mod=vendor -ldflags "-X main.gitCommit=${COMMIT}" \
+		-gcflags "${GOGCFLAGS}" -tags "${BUILDTAGS}" \
+		-o skopeo ./cmd/skopeo
+	echo "$@"
+	"$@" || die
+	cd docs || die
+	for f in *.1.md; do
+		go-md2man -in ${f} -out ${f%%.md} || die
+	done
+}
+
+src_install() {
+	dobin skopeo
+	doman docs/*.1
+	dobashcomp completions/bash/skopeo
+	insinto /etc/containers
+	newins default-policy.json policy.json
+	insinto /etc/containers/registries.d
+	doins default.yaml
+	keepdir /var/lib/atomic/sigstore
+	einstalldocs
+}

app-containers/snapd/Manifest

@@ -1,3 +1 @@
-DIST snapd-2.53.4.tar.xz 4722696 BLAKE2B c4347db8d5a14b30f1e8811e9425dd7419dd2dcad02fc1cb6a51968cd7fa6a58da2b172c041de02202cbdba1072cb0a7a92d7f92def5c5dc1e253cbcbad86aae SHA512 0b4164d3c3c3ccc99b3fa1e25d9e7e3184a5f94deca5fd83bd6d4c7761b41d6ebd5fefd1e87432a5e18c716b3330b3991134f179e1b03326edd9511ebea4ef9a
-DIST snapd-2.54.1.tar.xz 4818344 BLAKE2B 654d4d6a8f08dabeb6c10ea3639e1fc31b68720953bd1456695eb6c1275f260e2793e49c39c80571727fb74c954583b1a2188c461b415803210be59c57775292 SHA512 65e14c85ab62d601fa46a271ba4322531a72e7d8880833cd74daac682188808ebd8c730c1fa62dea07d8f20ba76d314f84f89b3e565eaf3ae509a569f3ee7305
-DIST snapd-2.54.2.tar.xz 4824508 BLAKE2B b893a08a61e7db059f0a7ccdf7de01a8b8e4de65fb93fd44c23cec7fd557db692421da09a8ba705e9a8e734606267419291abe5d4e7a12883a68270f66d5b833 SHA512 9aec3c126d82f5e4e17c69af922dfe4e4f17950bf308217fece5fd3816f083b26e42d672052a6e6573d7c7064ea75f168fe7771840c68a3eb85184d6a17df3bd
+DIST snapd-2.54.3.tar.xz 4831376 BLAKE2B c74540e326e690ecced2e5dcab7246581e9f87412b2ba2fe16721fef5ec66eb20a915207e7c7d20579741929b0840760c336ebd75e4be77bc3f6d01e5909dad0 SHA512 ee89d7e02522ab9a50e17dbe34be19eeda10bf3518110e5c6b23987d618aaa324f762e745badb4e9d99e0b138788d1dc591802dd6c59e2ffc2ebec3eb384498f

app-containers/snapd/snapd-2.53.4.ebuild

@@ -1,180 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGO_PN="github.com/snapcore/${PN}"
-inherit autotools bash-completion-r1 golang-vcs-snapshot linux-info readme.gentoo-r1 systemd xdg-utils
-
-DESCRIPTION="Service and tools for management of snap packages"
-HOMEPAGE="http://snapcraft.io/"
-
-MY_S="${S}/src/github.com/snapcore/${PN}"
-
-SRC_URI="https://github.com/snapcore/${PN}/releases/download/${PV}/${PN}_${PV}.vendor.tar.xz -> ${P}.tar.xz"
-MY_PV=${PV}
-KEYWORDS="~amd64"
-
-LICENSE="GPL-3 Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT"
-SLOT="0"
-IUSE="apparmor +cgroup-hybrid +forced-devmode gtk kde systemd"
-REQUIRED_USE="!forced-devmode? ( apparmor cgroup-hybrid ) systemd"
-
-CONFIG_CHECK="~CGROUPS
-		~CGROUP_DEVICE
-		~CGROUP_FREEZER
-		~NAMESPACES
-		~SQUASHFS
-		~SQUASHFS_ZLIB
-		~SQUASHFS_LZO
-		~SQUASHFS_XZ
-		~BLK_DEV_LOOP
-		~SECCOMP
-		~SECCOMP_FILTER"
-
-RDEPEND="
-	sys-libs/libseccomp:=
-	apparmor? (
-		sec-policy/apparmor-profiles
-		sys-apps/apparmor:=
-	)
-	dev-libs/glib
-	virtual/libudev
-	systemd? ( sys-apps/systemd[cgroup-hybrid(+)?] )
-	sys-libs/libcap:=
-	sys-fs/squashfs-tools[lzma]"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	>=dev-lang/go-1.9
-	dev-python/docutils
-	sys-devel/gettext
-	sys-fs/xfsprogs"
-
-PDEPEND="sys-auth/polkit[gtk?,kde?]"
-
-README_GENTOO_SUFFIX=""
-
-pkg_setup() {
-	if use apparmor; then
-		CONFIG_CHECK+=" ~SECURITY_APPARMOR"
-	fi
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-	# Update apparmor profile to allow libtinfow.so*
-	sed -i 's/libtinfo/libtinfo{,w}/' \
-		"${MY_S}/cmd/snap-confine/snap-confine.apparmor.in" || die
-
-	if ! use forced-devmode; then
-		sed -e 's#return !apparmorFull#if !apparmorFull {\n\t\tpanic("USE=forced-devmode is disabled")\n\t}\n\treturn false#' \
-			-i "${MY_S}/sandbox/forcedevmode.go" || die
-		grep -q 'panic("USE=forced-devmode is disabled")' "${MY_S}/sandbox/forcedevmode.go" || die "failed to disable forced-devmode"
-	fi
-
-	sed -i 's:command -v git >/dev/null:false:' -i "${MY_S}/mkversion.sh" || die
-
-	pushd "${MY_S}" >/dev/null || die
-	./mkversion.sh "${PV}"
-	popd >/dev/null || die
-	pushd "${MY_S}/cmd" >/dev/null || die
-	eautoreconf
-}
-
-src_configure() {
-	SNAPD_MAKEARGS=(
-		"BINDIR=${EPREFIX}/usr/bin"
-		"DBUSSERVICESDIR=${EPREFIX}/usr/share/dbus-1/services"
-		"LIBEXECDIR=${EPREFIX}/usr/lib"
-		"SNAP_MOUNT_DIR=${EPREFIX}/var/lib/snapd/snap"
-		"SYSTEMDSYSTEMUNITDIR=$(systemd_get_systemunitdir)"
-	)
-	export CGO_ENABLED="1"
-	export CGO_CFLAGS="${CFLAGS}"
-	export CGO_CPPFLAGS="${CPPFLAGS}"
-	export CGO_CXXFLAGS="${CXXFLAGS}"
-
-	pushd "${MY_S}/cmd" >/dev/null || die
-	econf --libdir="${EPREFIX}/usr/lib" \
-		--libexecdir="${EPREFIX}/usr/lib/snapd" \
-		$(use_enable apparmor) \
-		--enable-nvidia-biarch \
-		--with-snap-mount-dir="${EPREFIX}/var/lib/snapd/snap"
-}
-
-src_compile() {
-	export -n GOCACHE XDG_CACHE_HOME
-	export GO111MODULE=off GOBIN="${S}/bin" GOPATH="${S}"
-
-	local file
-	for file in "${MY_S}/po/"*.po; do
-		msgfmt "${file}" -o "${file%.po}.mo" || die
-	done
-
-	emake -C "${MY_S}/data" "${SNAPD_MAKEARGS[@]}"
-
-	local -a flags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS}'" -trimpath)
-	local -a staticflags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS} -static'" -trimpath)
-
-	local cmd
-	for cmd in snap snapd snap-bootstrap snap-failure snap-preseed snap-recovery-chooser snap-repair snap-seccomp; do
-		go build -o "${GOBIN}/${cmd}" "${flags[@]}" \
-		    -v -x "github.com/snapcore/${PN}/cmd/${cmd}"
-		[[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}"
-	done
-	for cmd in snapctl snap-exec snap-update-ns; do
-		go build -o "${GOBIN}/${cmd}" "${staticflags[@]}" \
-		    -v -x "github.com/snapcore/${PN}/cmd/${cmd}"
-		[[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}"
-	done
-}
-
-src_install() {
-	emake -C "${MY_S}/data" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}"
-	emake -C "${MY_S}/cmd" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}"
-
-	if use apparmor; then
-		mv "${ED}/etc/apparmor.d/usr.lib.snapd.snap-confine"{,.real} || die
-		keepdir /var/lib/snapd/apparmor/profiles
-	fi
-	keepdir /var/lib/snapd/{apparmor/snap-confine,cache,cookie,snap,void}
-	fperms 700 /var/lib/snapd/{cache,cookie}
-
-	dobin "${GOBIN}/"{snap,snapctl}
-	ln "${ED}/usr/bin/snapctl" "${ED}/usr/lib/snapd/snapctl" || die
-
-	exeinto /usr/lib/snapd
-	doexe "${GOBIN}/"{snapd,snap-bootstrap,snap-failure,snap-exec,snap-preseed,snap-recovery-chooser,snap-repair,snap-seccomp,snap-update-ns} \
-		"${MY_S}/"{cmd/snap-discard-ns/snap-discard-ns,cmd/snap-gdb-shim/snap-gdb-shim,cmd/snap-mgmt/snap-mgmt} \
-		"${MY_S}/data/completion/bash/"{complete.sh,etelpmoc.sh,}
-
-	dobashcomp "${MY_S}/data/completion/bash/snap"
-
-	insinto /usr/share/zsh/site-functions
-	doins "${MY_S}/data/completion/zsh/_snap"
-
-	insinto "/usr/share/polkit-1/actions"
-	doins "${MY_S}/data/polkit/io.snapcraft.snapd.policy"
-
-	dodoc "${MY_S}/packaging/ubuntu-16.04/changelog"
-	domo "${MY_S}/po/"*.mo
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	xdg_desktop_database_update
-
-	if use apparmor && [[ -z ${ROOT} && -e /sys/kernel/security/apparmor/profiles &&
-		$(wc -l < /sys/kernel/security/apparmor/profiles) -gt 0 ]]; then
-		apparmor_parser -r "${EPREFIX}/etc/apparmor.d/usr.lib.snapd.snap-confine.real"
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}

app-containers/snapd/snapd-2.54.1.ebuild

@@ -1,180 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGO_PN="github.com/snapcore/${PN}"
-inherit autotools bash-completion-r1 golang-vcs-snapshot linux-info readme.gentoo-r1 systemd xdg-utils
-
-DESCRIPTION="Service and tools for management of snap packages"
-HOMEPAGE="http://snapcraft.io/"
-
-MY_S="${S}/src/github.com/snapcore/${PN}"
-
-SRC_URI="https://github.com/snapcore/${PN}/releases/download/${PV}/${PN}_${PV}.vendor.tar.xz -> ${P}.tar.xz"
-MY_PV=${PV}
-KEYWORDS="~amd64"
-
-LICENSE="GPL-3 Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT"
-SLOT="0"
-IUSE="apparmor +cgroup-hybrid +forced-devmode gtk kde systemd"
-REQUIRED_USE="!forced-devmode? ( apparmor cgroup-hybrid ) systemd"
-
-CONFIG_CHECK="~CGROUPS
-		~CGROUP_DEVICE
-		~CGROUP_FREEZER
-		~NAMESPACES
-		~SQUASHFS
-		~SQUASHFS_ZLIB
-		~SQUASHFS_LZO
-		~SQUASHFS_XZ
-		~BLK_DEV_LOOP
-		~SECCOMP
-		~SECCOMP_FILTER"
-
-RDEPEND="
-	sys-libs/libseccomp:=
-	apparmor? (
-		sec-policy/apparmor-profiles
-		sys-apps/apparmor:=
-	)
-	dev-libs/glib
-	virtual/libudev
-	systemd? ( sys-apps/systemd[cgroup-hybrid(+)?] )
-	sys-libs/libcap:=
-	sys-fs/squashfs-tools[lzma]"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	>=dev-lang/go-1.9
-	dev-python/docutils
-	sys-devel/gettext
-	sys-fs/xfsprogs"
-
-PDEPEND="sys-auth/polkit[gtk?,kde?]"
-
-README_GENTOO_SUFFIX=""
-
-pkg_setup() {
-	if use apparmor; then
-		CONFIG_CHECK+=" ~SECURITY_APPARMOR"
-	fi
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-	# Update apparmor profile to allow libtinfow.so*
-	sed -i 's/libtinfo/libtinfo{,w}/' \
-		"${MY_S}/cmd/snap-confine/snap-confine.apparmor.in" || die
-
-	if ! use forced-devmode; then
-		sed -e 's#return !apparmorFull#if !apparmorFull {\n\t\tpanic("USE=forced-devmode is disabled")\n\t}\n\treturn false#' \
-			-i "${MY_S}/sandbox/forcedevmode.go" || die
-		grep -q 'panic("USE=forced-devmode is disabled")' "${MY_S}/sandbox/forcedevmode.go" || die "failed to disable forced-devmode"
-	fi
-
-	sed -i 's:command -v git >/dev/null:false:' -i "${MY_S}/mkversion.sh" || die
-
-	pushd "${MY_S}" >/dev/null || die
-	./mkversion.sh "${PV}"
-	popd >/dev/null || die
-	pushd "${MY_S}/cmd" >/dev/null || die
-	eautoreconf
-}
-
-src_configure() {
-	SNAPD_MAKEARGS=(
-		"BINDIR=${EPREFIX}/usr/bin"
-		"DBUSSERVICESDIR=${EPREFIX}/usr/share/dbus-1/services"
-		"LIBEXECDIR=${EPREFIX}/usr/lib"
-		"SNAP_MOUNT_DIR=${EPREFIX}/var/lib/snapd/snap"
-		"SYSTEMDSYSTEMUNITDIR=$(systemd_get_systemunitdir)"
-	)
-	export CGO_ENABLED="1"
-	export CGO_CFLAGS="${CFLAGS}"
-	export CGO_CPPFLAGS="${CPPFLAGS}"
-	export CGO_CXXFLAGS="${CXXFLAGS}"
-
-	pushd "${MY_S}/cmd" >/dev/null || die
-	econf --libdir="${EPREFIX}/usr/lib" \
-		--libexecdir="${EPREFIX}/usr/lib/snapd" \
-		$(use_enable apparmor) \
-		--enable-nvidia-biarch \
-		--with-snap-mount-dir="${EPREFIX}/var/lib/snapd/snap"
-}
-
-src_compile() {
-	export -n GOCACHE XDG_CACHE_HOME
-	export GO111MODULE=off GOBIN="${S}/bin" GOPATH="${S}"
-
-	local file
-	for file in "${MY_S}/po/"*.po; do
-		msgfmt "${file}" -o "${file%.po}.mo" || die
-	done
-
-	emake -C "${MY_S}/data" "${SNAPD_MAKEARGS[@]}"
-
-	local -a flags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS}'" -trimpath)
-	local -a staticflags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS} -static'" -trimpath)
-
-	local cmd
-	for cmd in snap snapd snap-bootstrap snap-failure snap-preseed snap-recovery-chooser snap-repair snap-seccomp; do
-		go build -o "${GOBIN}/${cmd}" "${flags[@]}" \
-		    -v -x "github.com/snapcore/${PN}/cmd/${cmd}"
-		[[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}"
-	done
-	for cmd in snapctl snap-exec snap-update-ns; do
-		go build -o "${GOBIN}/${cmd}" "${staticflags[@]}" \
-		    -v -x "github.com/snapcore/${PN}/cmd/${cmd}"
-		[[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}"
-	done
-}
-
-src_install() {
-	emake -C "${MY_S}/data" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}"
-	emake -C "${MY_S}/cmd" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}"
-
-	if use apparmor; then
-		mv "${ED}/etc/apparmor.d/usr.lib.snapd.snap-confine"{,.real} || die
-		keepdir /var/lib/snapd/apparmor/profiles
-	fi
-	keepdir /var/lib/snapd/{apparmor/snap-confine,cache,cookie,snap,void}
-	fperms 700 /var/lib/snapd/{cache,cookie}
-
-	dobin "${GOBIN}/"{snap,snapctl}
-	ln "${ED}/usr/bin/snapctl" "${ED}/usr/lib/snapd/snapctl" || die
-
-	exeinto /usr/lib/snapd
-	doexe "${GOBIN}/"{snapd,snap-bootstrap,snap-failure,snap-exec,snap-preseed,snap-recovery-chooser,snap-repair,snap-seccomp,snap-update-ns} \
-		"${MY_S}/"{cmd/snap-discard-ns/snap-discard-ns,cmd/snap-gdb-shim/snap-gdb-shim,cmd/snap-mgmt/snap-mgmt} \
-		"${MY_S}/data/completion/bash/"{complete.sh,etelpmoc.sh,}
-
-	dobashcomp "${MY_S}/data/completion/bash/snap"
-
-	insinto /usr/share/zsh/site-functions
-	doins "${MY_S}/data/completion/zsh/_snap"
-
-	insinto "/usr/share/polkit-1/actions"
-	doins "${MY_S}/data/polkit/io.snapcraft.snapd.policy"
-
-	dodoc "${MY_S}/packaging/ubuntu-16.04/changelog"
-	domo "${MY_S}/po/"*.mo
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	xdg_desktop_database_update
-
-	if use apparmor && [[ -z ${ROOT} && -e /sys/kernel/security/apparmor/profiles &&
-		$(wc -l < /sys/kernel/security/apparmor/profiles) -gt 0 ]]; then
-		apparmor_parser -r "${EPREFIX}/etc/apparmor.d/usr.lib.snapd.snap-confine.real"
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}

app-crypt/gnupg/gnupg-2.2.33-r1.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="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"
+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.

app-crypt/swtpm/Manifest

@@ -1,2 +1 @@
-DIST swtpm-0.6.1.tar.gz 326488 BLAKE2B 46c53cbd4195cfc1d45ef5e56b1f78c59dcb9f859349e161f07d9933ce720ec3511343cf29236119d08162410355fc50cb5d15745c84db78d860b006812c169f SHA512 a44e36820ad61e84d62b330f3adf0c463c98438056d74c5ba30916d956e722633e0198ae87be8352a0ab909ae5a4bbc3826410d2166186c43bba067f533fec85
-DIST swtpm-0.7.0.tar.gz 353641 BLAKE2B a9169affdfd09cec887667e21d4db72b7d4b489bf3ecf5e43da9ae2d59ef3f15b94627ce22ed1f6fca69f46da40293ba1ef3d129fab7de3ca32c4b12ffc51544 SHA512 32096309bf710e51d7565f013db32627423682fb2bfa9358976126102a0bf07401146bae9346af389c932c038f3d03217739375cef01a2ff10b01c7bd004b55e
+DIST swtpm-0.7.1.tar.gz 353819 BLAKE2B dcabe72fc93c9e8099b879457d7698bf16a3c1b72ff3df9c040b1b0f3a72b3a3c453405626ade745e62d0aea4449f743c8039680accc496709915f689a69395b SHA512 c6eeb79f85550f2a184fa4a1e0d2e5b110f988b6153489001b356c2c16ee332fd462abeb77ca31268e71c3dd1680596f46dcea5031fdce185314cadb6a354c2b

app-crypt/swtpm/swtpm-0.6.1.ebuild

@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit autotools python-single-r1
-
-DESCRIPTION="Libtpms-based TPM emulator"
-HOMEPAGE="https://github.com/stefanberger/swtpm"
-SRC_URI="https://github.com/stefanberger/swtpm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="fuse +gnutls seccomp test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="fuse? (
-		dev-libs/glib:2
-		sys-fs/fuse:0
-	)
-	gnutls? (
-		dev-libs/libtasn1:=
-		>=net-libs/gnutls-3.1.0:=[tools,pkcs11]
-	)
-	seccomp? ( sys-libs/libseccomp )
-	acct-group/tss
-	acct-user/tss
-	dev-libs/openssl:0=
-	dev-libs/json-glib
-	dev-libs/libtpms
-	${PYTHON_DEPS}"
-
-DEPEND="${RDEPEND}
-	test? (
-		net-misc/socat
-		dev-tcltk/expect
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.6.0-fix-localca-path.patch"
-	"${FILESDIR}/${PN}-0.5.0-build-sys-Remove-WError.patch"
-)
-
-src_prepare() {
-	use test || eapply "${FILESDIR}/${PN}-0.5.0-disable-test-dependencies.patch"
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-openssl \
-		--without-selinux \
-		$(use_with fuse cuse) \
-		$(use_with gnutls) \
-		$(use_with seccomp)
-}
-
-src_install() {
-	default
-	fowners -R tss:root /var/lib/swtpm-localca
-	fperms 750 /var/lib/swtpm-localca
-	keepdir /var/lib/swtpm-localca
-	find "${D}" -name '*.la' -delete || die
-}

app-crypt/swtpm/swtpm-0.7.1.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

app-crypt/tpm2-tss/tpm2-tss-3.1.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
 IUSE="doc +fapi  +openssl mbedtls static-libs test"
 
 RESTRICT="!test? ( test )"

app-editors/gedit-plugins/Manifest

@@ -1 +1,2 @@
 DIST gedit-plugins-40.1.tar.xz 951024 BLAKE2B 8a5fa07d6b9a5848e66de995c05f389b288e7863fa506476fd82157dc203e472b8ac8b8bdd15b09513e5d819fc58ce4d1077e62e6c5b90f93b14775052bf2737 SHA512 71649d157ac5591e4dd317c44ae167c98fb59e253c45f8c1ff8ef397a9e3f0bb968f0ef2486f9021354269e77defb9e5e305f1538f69818480a250966143c7a3
+DIST gedit-plugins-41.0.tar.xz 948364 BLAKE2B d5efe779e1f0f70e23a7dadb01b0e5b22c47d3326df6530559698ace274e2a4a3647d34640e89bb250d76bee1f6369d5728316730ce9cf89f3a7db627b3c4d49 SHA512 e0389e8be68406fdcd3c9537b2d2dad0faf19d9a49804a7b5d9cf8e1006254906605dd0b14e2fa1eb7a22d6533d9b55d7f5593fe01a5b412df6361c8b9089f34

app-editors/gedit-plugins/gedit-plugins-41.0.ebuild

@@ -0,0 +1,108 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="xml"
+VALA_MIN_API_VERSION="0.28"
+
+inherit gnome.org gnome2-utils meson python-single-r1 vala xdg
+
+DESCRIPTION="Collection of extra plugins for the gedit Text Editor"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gedit/ShippedPlugins"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+SLOT="0"
+
+IUSE="charmap git +python terminal vala"
+REQUIRED_USE="
+	charmap? ( python )
+	git? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	terminal? ( python )
+"
+
+RDEPEND="
+	>=dev-libs/libpeas-1.14.1[gtk]
+	>=app-editors/gedit-40.0
+
+	>=dev-libs/glib-2.32:2
+	>=x11-libs/gtk+-3.9:3
+	>=x11-libs/gtksourceview-4.0.2:4
+
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			app-editors/gedit[python,${PYTHON_SINGLE_USEDEP}]
+			dev-libs/libpeas[python,${PYTHON_SINGLE_USEDEP}]
+			>=dev-python/dbus-python-0.82[${PYTHON_USEDEP}]
+			dev-python/pycairo[${PYTHON_USEDEP}]
+			dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+		')
+		>=x11-libs/gtk+-3.9:3[introspection]
+		>=x11-libs/gtksourceview-4.0.2:4[introspection]
+		x11-libs/pango[introspection]
+		x11-libs/gdk-pixbuf:2[introspection]
+	)
+	charmap? ( >=gnome-extra/gucharmap-3:2.90[introspection] )
+	git? ( >=dev-libs/libgit2-glib-0.0.6[python] )
+	terminal? ( >=x11-libs/vte-0.52:2.91[introspection] )
+" # vte-0.52+ for feed_child API compatibility
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/libxml2
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	use vala && vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dplugin_bookmarks=true
+		$(meson_use python plugin_bracketcompletion)
+		$(meson_use charmap plugin_charmap)
+		$(meson_use python plugin_codecomment)
+		$(meson_use python plugin_colorpicker)
+		$(meson_use python plugin_colorschemer)
+		$(meson_use python plugin_commander)
+		-Dplugin_drawspaces=true
+		$(meson_use vala plugin_findinfiles)
+		$(meson_use git plugin_git)
+		$(meson_use python plugin_joinlines)
+		$(meson_use python plugin_multiedit)
+		$(meson_use python plugin_sessionsaver)
+		$(meson_use python plugin_smartspaces)
+		$(meson_use python plugin_synctex)
+		$(meson_use terminal plugin_terminal)
+		$(meson_use python plugin_textsize)
+		$(meson_use python plugin_translate)
+		-Dplugin_wordcompletion=true
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	use python && python_optimize "${ED}/usr/$(get_libdir)/gedit/plugins/"
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}

app-editors/gedit/Manifest

@@ -1 +1,2 @@
 DIST gedit-40.1.tar.xz 6850264 BLAKE2B 2baabac1254d56bf4c6a663012f88505c8f3cfcdd8fd8e020e05d807f727f71cf9088c398702f559e40ba7db31d3a9d135c1148f8a8b178c9107aa2675265910 SHA512 ac4cd2864af63625dbdb5c55fcc5e7ea403d84d7cc25d9f1c121f544ef1cf686ab9b7c0d50ef73b4bf24e573cdf528622a49d82f675b0c1673c46f691b79ac09
+DIST gedit-41.0.tar.xz 6889320 BLAKE2B c4d2b923eab18cd27ffc0ff99882953e952c0956135fa7f6401ef01dd5cd0e1cf9a5a86c5751db9206fd88200c70434710881cd5b934a3620f14130a5066f18f SHA512 97c51ef24e53d6bd4b29350a8749eacbfcfb90b7c66c9f6d462101c53966282452f6a02043628e157e8179cf6260f103b41c61d7ba2a31da08b0687f8031974e

app-editors/gedit/gedit-41.0.ebuild

@@ -0,0 +1,91 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+VALA_MIN_API_VERSION="0.26"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome.org gnome2-utils meson python-single-r1 vala xdg
+
+DESCRIPTION="A text editor for the GNOME desktop"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gedit"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+SLOT="0"
+
+IUSE="+python gtk-doc spell"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+DEPEND="
+	>=dev-libs/glib-2.64:2
+	>=dev-libs/libpeas-1.14.1[gtk]
+	>=dev-libs/gobject-introspection-1.54:=
+	>=x11-libs/gtk+-3.22.0:3[introspection]
+	>=x11-libs/gtksourceview-4.0.2:4[introspection]
+
+	spell? ( >=app-text/gspell-0.2.5:0= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/pycairo[${PYTHON_USEDEP}]
+			>=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}]
+			dev-libs/libpeas[python,${PYTHON_SINGLE_USEDEP}]
+		')
+	)
+"
+RDEPEND="${DEPEND}
+	x11-themes/adwaita-icon-theme
+	gnome-base/gsettings-desktop-schemas
+	gnome-base/gvfs
+"
+BDEPEND="
+	$(vala_depend)
+	app-text/docbook-xml-dtd:4.1.2
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1 )
+	dev-util/itstool
+	>=sys-devel/gettext-0.18
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use python)
+		$(meson_feature spell)
+		-Duser_documentation=true
+		-Denable-gvfs-metadata=yes
+
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	if use python; then
+		python_optimize
+		python_optimize "${ED}/usr/$(get_libdir)/gedit/plugins/"
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}

app-editors/nano/Manifest

@@ -1,3 +1,3 @@
 DIST nano-5.9.tar.gz 3093675 BLAKE2B d4fa2f0e64b6ab243a2b127ff894e900098f6261f5d46657ff3459cc0b51683a63fc5de54bd4545b47bc16c633b09142f8501b84a09df3e8123da5233a063766 SHA512 61bf4de300579bc6f0028a2237e105228d8657819c02f32c7ef8f84f9c54734df8fb9a9cddbce0f7721ebc5ac8ae4799c118291ae15480082f8b1317019a485d
-DIST nano-6.0.tar.gz 3114631 BLAKE2B d89abcbd3673867447bbfd4eedfcd7b7d5250a3ebc1048068cf03f690b2fbd072c0224c00bef9b829bff8343dacf669e8e784fa24dafaa6441746471b692c55a SHA512 fa5726810cfb53fd2cc451d5a34e8f5c316c496f8d649a3899fae0b61cc5ca0bffd28deb780e4e0c98169487b8c34468fd401534b9110ba968d2d4ab6847bc87
 DIST nano-6.1.tar.gz 3146292 BLAKE2B ade773182d12b6d6452c23896e564a097d850630c87b0af622fe7766931aa2e5ef5e9d868e521e46e029851cdd428cd60b6c3e95bdb28df0733cba8b432f202a SHA512 e034c9d7c96bf6d7ac22a2188fccf87693dd5d19ddbcfb907f817544fb2ddfce2ee9331842d885870718617ea4fd0c9151f62b3e8dc52a486cec9a30e84539c0
+DIST nano-6.2.tar.gz 3146876 BLAKE2B be6dbc1f53890764184a701e97e792762600c892933830bfcb5c2c4eab19d659583fe797d7197c9045ea8912215aa5885a05f02c66194df17253d6788e0ba599 SHA512 5a59906664a88a03f215d8dba8f7e481fbaffc7bdf93c89ca997df7a8aba2cbb4d45ac84d11f03a796488b82b01ca75161a5ab49fd9115661575451b6ab018c4

app-editors/nano/nano-6.2.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

app-editors/retext/Manifest

@@ -1,3 +1 @@
-DIST ReText-7.1.0.tar.gz 484989 BLAKE2B 74f07218cba1d76d011e5347c65ec03ef84da29119c177f35cca206cb269ae4755fdb85448562a378d2ab610930d23b4eccb62a39807409c6e80a68102be2034 SHA512 92333f31f7a57440d642246ed30156384285bb44640a0d6e7654e82749681893eaef3cb16e41fa2d7b618aa59f1ea8cb07d431736b00f35cb9130d7294e3d105
-DIST ReText-7.2.1.tar.gz 522364 BLAKE2B 6334fd6dc1c625378426e408a0d4ad6bb9c02dcba18fcfa566d61ce006a44c34327686a8eb756f2195620e644e096b9393a7cfa73229aa0dab7d29ddf715edaa SHA512 1a375acb40792e3cae9f955a75ebac7c30c9e5cc719477989b28d8d7f06e18ad14d98f1a600a5b6d050b3276ef22bd46b5f1f07af90d561cca500674ff461604
 DIST ReText-7.2.2.tar.gz 522652 BLAKE2B f9b19f985c1381eade324758c4dc6bf2e5f74bc3f5bfc27afa10462b7387f64a3e72edd5875aabf1831f1f0a942f395e43b124c172cac8cec4b9f19334661484 SHA512 68345b57b2c5446158ed3a6f97b5ead103ef1c99a3aea9cbc69ef7d0807fb64546f38ebde2969b94429eeed6450abb345fecc566dcf6e0767fe84c4e27348e53

app-editors/retext/retext-7.1.0.ebuild

@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# no pypy{,3} support as PyQt5 does not support it at 2020-07-05 (towelday)
-# https://bitbucket.org/pypy/compatibility/wiki/Home#!gui-library-bindings
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1 optfeature virtualx xdg-utils
-
-MY_PN="ReText"
-MY_P="${MY_PN}-${PV/_/~}"
-
-DESCRIPTION="Simple editor for Markdown and reStructuredText"
-HOMEPAGE="https://github.com/retext-project/retext https://github.com/retext-project/retext/wiki"
-
-if [[ ${PV} == *9999 ]]
-	then
-		inherit git-r3
-		EGIT_REPO_URI="https://github.com/retext-project/retext.git"
-	else
-		SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-		KEYWORDS="amd64 x86"
-		S="${WORKDIR}"/${MY_P}
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/markdown[${PYTHON_USEDEP}]
-	dev-python/markups[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/python-markdown-math[${PYTHON_USEDEP}]
-	dev-python/PyQt5[gui,network,printsupport,widgets,${PYTHON_USEDEP}]
-	dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	esetup.py test
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-
-	optfeature "dictionary support" dev-python/pyenchant
-
-	einfo "Starting with retext-7.0.4 the markdown-math plugin is installed."
-	einfo "Note that you can use different math delimiters, e.g. \(...\) for inline math."
-	einfo "For more details take a look at:"
-	einfo "https://github.com/mitya57/python-markdown-math#math-delimiters"
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}

app-editors/retext/retext-7.2.1.ebuild

@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Please don't add pypy support before testing if it's actually supported. The
-# old compat matrix is no longer accessible as of 2021-02-13 but stated back
-# in 2020-07-05 that PyQt5 was explicitly not supported.
-PYTHON_COMPAT=( python3_{8,9} )
-
-inherit distutils-r1 optfeature virtualx xdg-utils
-
-MY_PN="ReText"
-MY_P="${MY_PN}-${PV/_/~}"
-
-DESCRIPTION="Simple editor for Markdown and reStructuredText"
-HOMEPAGE="https://github.com/retext-project/retext https://github.com/retext-project/retext/wiki"
-
-if [[ ${PV} == *9999 ]]
-	then
-		inherit git-r3
-		EGIT_REPO_URI="https://github.com/retext-project/retext.git"
-	else
-		SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-		KEYWORDS="amd64 ~riscv x86"
-		S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/markdown[${PYTHON_USEDEP}]
-	>=dev-python/markups-3.1.1[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/python-markdown-math[${PYTHON_USEDEP}]
-	dev-python/PyQt5[dbus,gui,printsupport,widgets,${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="test? ( dev-python/PyQt5[testlib,${PYTHON_USEDEP}] )"
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	esetup.py test
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-
-	optfeature "dictionary support" dev-python/pyenchant
-	# See https://bugs.gentoo.org/772197.
-	optfeature "rendering with webengine" dev-python/PyQtWebEngine
-
-	einfo "Starting with retext-7.0.4 the markdown-math plugin is installed."
-	einfo "Note that you can use different math delimiters, e.g. \(...\) for inline math."
-	einfo "For more details take a look at:"
-	einfo "https://github.com/mitya57/python-markdown-math#math-delimiters"
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}

app-editors/retext/retext-7.2.2.ebuild

@@ -23,7 +23,7 @@ else
 	SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 	S="${WORKDIR}/${MY_P}"
 
-	KEYWORDS="~amd64 ~riscv ~x86"
+	KEYWORDS="amd64 ~riscv x86"
 fi
 
 LICENSE="GPL-2+"

app-editors/vim-core/vim-core-8.2.4285.ebuild

@@ -193,9 +193,6 @@ src_install() {
 		rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
 		rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"
 
-		# Delete defaults.vim to avoid conflicts with one from vim[minimal]
-		rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"
-
 		local keep_colors="default"
 		ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
 
@@ -210,6 +207,13 @@ src_install() {
 		eshopts_pop
 	fi
 
+	# Delete defaults.vim to avoid conflicts with one from vim.
+	# If defaults.vim already exists in files installed from vim,
+	# do not install defaults.vim.
+	if [[ -f "${vimfiles}/defaults.vim" ]]; then
+		rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"
+	fi
+
 	newbashcomp "${FILESDIR}"/xxd-completion xxd
 
 	# install gvim icon since both vim/gvim desktop files reference it

app-editors/vim-core/vim-core-8.2.4328.ebuild

@@ -193,9 +193,6 @@ src_install() {
 		rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
 		rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"
 
-		# Delete defaults.vim to avoid conflicts with one from vim[minimal]
-		rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"
-
 		local keep_colors="default"
 		ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
 
@@ -210,6 +207,13 @@ src_install() {
 		eshopts_pop
 	fi
 
+	# Delete defaults.vim to avoid conflicts with one from vim.
+	# If defaults.vim already exists in files installed from vim,
+	# do not install defaults.vim.
+	if [[ -f "${vimfiles}/defaults.vim" ]]; then
+		rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"
+	fi
+
 	newbashcomp "${FILESDIR}"/xxd-completion xxd
 
 	# install gvim icon since both vim/gvim desktop files reference it

app-editors/vim/vim-8.2.4285.ebuild

@@ -320,8 +320,10 @@ src_install() {
 
 	# Fix an issue of missing defaults.vim when USE=minimal.
 	if use minimal ; then
-		insinto ${vimfiles}
-		doins runtime/defaults.vim
+		if [[ ! -f "${vimfiles}/defaults.vim" ]]; then
+			insinto ${vimfiles}
+			doins runtime/defaults.vim
+		fi
 	fi
 
 	domenu runtime/vim.desktop

app-editors/vim/vim-8.2.4328.ebuild

@@ -320,8 +320,10 @@ src_install() {
 
 	# Fix an issue of missing defaults.vim when USE=minimal.
 	if use minimal ; then
-		insinto ${vimfiles}
-		doins runtime/defaults.vim
+		if [[ ! -f "${vimfiles}/defaults.vim" ]]; then
+			insinto ${vimfiles}
+			doins runtime/defaults.vim
+		fi
 	fi
 
 	domenu runtime/vim.desktop

app-editors/zile/zile-2.6.2-r1.ebuild

@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 VALA_MIN_API_VERSION=0.52
 
 inherit toolchain-funcs vala
@@ -30,10 +30,13 @@ DOCS="README THANKS"
 
 QA_AM_MAINTAINER_MODE=".*help2man.*" #450278
 
+pkg_setup() {
+	vala_setup
+}
+
 src_prepare() {
 	default
 	rm *_vala.stamp || die
-	vala_src_prepare
 }
 
 src_configure() {

app-emacs/flycheck-inline/Manifest

@@ -0,0 +1 @@
+DIST flycheck-inline-0_pre20200808.tar.gz 112922 BLAKE2B 2fffd7801d5a882145703e5e24ce46bb9546a5dd797f348597abe8977c130762fc8e68af44f25d1b4bc5f57623ada87314f43949eae4d5795d7d34f76e3b7850 SHA512 7fefacc9913a484ddad3043d49130700bfb5f55d6fb04c3020170fc74c74ebca888a602ff6f0574bd3759552f677357d3eb479cd3600d57bf7e96e0491f93e40

app-emacs/flycheck-inline/files/50flycheck-inline-gentoo.el

@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'flycheck-inline-mode "flycheck-inline" nil t)
+(autoload 'global-flycheck-inline-mode "flycheck-inline" nil t)

app-emacs/flycheck-inline/flycheck-inline-0_pre20200808.ebuild

@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+NEED_EMACS=25
+MY_COMMIT="8e00b4c5951a9515a450a14aefe92e9f6ddcfbde"
+
+inherit elisp
+
+DESCRIPTION="Display Flycheck errors inline"
+HOMEPAGE="https://github.com/flycheck/flycheck-inline"
+SRC_URI="https://github.com/flycheck/flycheck-inline/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${MY_COMMIT}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+SITEFILE="50${PN}-gentoo.el"
+
+DEPEND="app-emacs/flycheck"
+RDEPEND="${DEPEND}"

app-emacs/flycheck-inline/metadata.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+  <email>gnu-emacs@gentoo.org</email>
+  <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+<upstream>
+  <remote-id type="github">flycheck/flycheck-inline</remote-id>
+</upstream>
+</pkgmetadata>

app-emacs/hl-todo/Manifest

@@ -1 +1 @@
-DIST hl-todo-3.1.2.tar.gz 5506 BLAKE2B b44b1b21e1d40bf8ddff9cfc1e30d66fde4e4ee4779029820b4d5b94f040b02ebc562f2c571d1113ac0501f107035e9d1d4e9e31052d3a2aa56fd7988d3c14c4 SHA512 c1ee4d50be93348ae9c4f754291b157592701bf362d83d1cc98406965d313539f362338d214b8574a83ebd06433ddb3e07fa33b6657f075b744eecf1e38b6114
+DIST hl-todo-3.3.0.tar.gz 5688 BLAKE2B 3e644ab68707ff7fb3f846d07ccec9631f0c84eaabe453efe3f36658cb09024fce3bcb299cbfbb911ff3a2e93a0134bb84cf2e9486881c656b0344b28a3dda82 SHA512 361ea9f36abd2a43731252cdcda420da1661b3f60f9673cf9975eff3846367f7f29c787de515c75fb61fd14c1849b5d24a0f91d813ca00d09512d2218a45ffd1

app-emacs/hl-todo/hl-todo-3.3.0.ebuild

@@ -15,3 +15,4 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 SITEFILE="50${PN}-gentoo.el"
+DOCS="README.md"

app-emacs/racket-mode/Manifest

@@ -1,3 +1,3 @@
-DIST racket-mode-20220120.tar.gz 286218 BLAKE2B 9786bc7a3f8127c342f90acebadef8f8468ba1cc27ad42c620554d5a478932317a2ede7061fe521a67ec0c624cea4743a1e6a50050ab2afe6e17ad220f7f7f9e SHA512 034527d62eae1c5ef09a8f5cd2bc5c5d0790bacd7ca180f0851ac6d93a3c897d4c4394d3e446285d1dbf4553fe94140656359df9b72d800202604948d9832901
 DIST racket-mode-20220129.tar.gz 286278 BLAKE2B af0e2c87affa5498b1d1d21947006749ceb6988e43f4a1d11bf730a4d0877481e6806ab4e41cad13b3389049a79f2b4b484f2ded52dfa71a7434128fceae6e44 SHA512 56559da32d7c6bb8b0ef9d04662837cd202ee901781eed6e34ad22f88942d40695c0bf04be1ebf82d80bf3a405301b1ca73193adf631350ce49140b62308701f
 DIST racket-mode-20220208.tar.gz 298473 BLAKE2B 6fcadfe7040efbc3a5e06ffec7abd05958add51a22fb68d5c7d57e052aa7998b9dd0f60816e94e6b80f967108c161a989a98d5516699fc7a6b0f6576a40423cf SHA512 ec6ff476ca23a1d50aa7355df269175b7994a7f57c58d00c27b9161e1fc9a23cfda833aea73b45379cde58a7a3f49a78b40e63724b7c229bc81a37c873b5fc29
+DIST racket-mode-20220219.tar.gz 298876 BLAKE2B b3dfbcd9b436648da1ecacf4b7434c3e1b6dea9bc904c2f1911be34bc6b1846684c349f38cd418b09e66f426866b805ca6bd0c98724e69740ad841ae482e62ea SHA512 94879fe9aed106d0210ca359a5d3d857eec098b4442256a489356db0c5b3493b44ee9a0dd6eff0a0d3d2f3c752632e91b1c0ef8705b7b305e3c75fbae42e826a

app-emacs/racket-mode/files/racket-mode-racket-util.el-defvar.patch

@@ -1,12 +0,0 @@
-index 0992711..a8897b4 100644
---- a/racket-util.el
-+++ b/racket-util.el
-@@ -93,7 +93,7 @@ When installed as a package, this can be found from the variable
- `load-file-name'. When developing interactively, get it from the
- .el buffer file name.")
- 
--(defconst racket--rkt-source-dir
-+(defvar racket--rkt-source-dir
-   (expand-file-name "./racket/" racket--el-source-dir)
-   "Path to dir of our Racket source files. ")
- 

app-emacs/racket-mode/racket-mode-20220219.ebuild

@@ -3,7 +3,7 @@
 
 EAPI=8
 
-H=59b227b1aab315cdaa798648e47c4c4a8f71ddba
+H=52e993f3b39416eeb4df6262491d4a42d0b35232
 NEED_EMACS=25.1
 
 inherit elisp
@@ -22,7 +22,6 @@ BDEPEND="${RDEPEND}"
 
 DOCS=( CONTRIBUTING.md README.md THANKS.md )
 ELISP_TEXINFO="doc/racket-mode.texi"
-PATCHES=( "${FILESDIR}/${PN}-racket-util.el-defvar.patch" )
 SITEFILE="50${PN}-gentoo.el"
 
 src_compile() {

app-emacs/setup/Manifest

@@ -0,0 +1 @@
+DIST setup-1.2.0.tar.gz 19709 BLAKE2B 704340f9ab8a3e10fdeafed88365fb3151fe8c9600960defcce0021850a1846ffc5e7a3c02a4567371c18b4bdf5b81c80544fe82c22a150ca4d4505818ba8148 SHA512 705e188876316eb76938229395676a9068e735074d63865dd9a2a21d83face2768f958f76cf9c88b6cb3d4668e271ee043d7aa81a40d3b384fb1bc75bb1f0af5

app-emacs/setup/files/50setup-gentoo.el

@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(load "@SITELISP@/setup-autoloads" nil t)

app-emacs/setup/metadata.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+  <email>gnu-emacs@gentoo.org</email>
+  <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>

app-emacs/setup/setup-1.2.0.ebuild

@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+NEED_EMACS=26
+
+# The upstream does not create git tags for releases.
+MY_HASH=4fc13e309ec1585a7e5033c394fa25a3078e39c5
+
+inherit elisp
+
+DESCRIPTION="Macro to simplify repetitive configuration patterns"
+HOMEPAGE="https://git.sr.ht/~pkal/setup"
+SRC_URI="https://git.sr.ht/~pkal/${PN}/archive/${MY_HASH}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${MY_HASH}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	elisp_src_compile
+	elisp-make-autoload-file
+}

app-emulation/xen-tools/Manifest

@@ -8,6 +8,8 @@ DIST ipxe-git-988d2c13cdf0f0b4140685af35ced70ac5b3283c.tar.gz 3931642 BLAKE2B bf
 DIST seabios-1.14.0.tar.gz 628985 BLAKE2B cc1126925dab1551a655680d20d06ebf28c12c386500d1ee4df9e1a99403b4c5bc6a66c2cc5ef58b4c3d6d7226f35007506a6a1855c2cf2742469dcb7aba05bb SHA512 215c42f59425f8abd062be7b11fc0e39c977cee5001a2381551b0f851ac337d0dd53c065267e6dee0e710ffd700fa635f9007b89da8dfce0f47122c984ee8146
 DIST xen-4.15.1-upstream-patches-1.tar.xz 15476 BLAKE2B 9f0cf8f3dd993e32939ff1ee35244224bd3d16fbd345500ff01e51eb5828d3e44bddc539462c39d8c37b6497d4bf8887261a8df5d31b17b413b0c21f7faf3a84 SHA512 aac3f91c3c753aa8430abad055252cba5dbdfd9e548f219df1452388ef2f82b65c428755363aa0645824431e812f3b799af4f9468669e42a0f5b6b8874397c75
 DIST xen-4.15.1.tar.gz 40800852 BLAKE2B 39475ea33f029fb0e84b82b4a2b13fd613bab01e3ef6c241dfede3d190ee9be53c99b62121d37d83b1e078764b3e4d88d1dfb99be1b5623691e56519850c6798 SHA512 8d3cbdf708f46477e32ee7cbd16a490c82efa855cecd84ee712b8680df4d69c987ba9ab00ff3851f627b98a8ebbc5dab71f92f142ed958ee2bc538bc792cd4b9
+DIST xen-4.15.2-upstream-patches-0.tar.xz 33368 BLAKE2B f22c0e9ce6b859a2741f09c0c52479e8acb38440b631882850993fcfcdc445c28fbeac4353df6bac1b2be89e39a99bae1a920796d505f888e3701a98f17ed29d SHA512 10a996cd87404ff6536119deeedfe67143c02475c4ca2d7f741e087197aaffa10c5831aad1f9ee2f9070461dd8cdc7af4851fbafb634a2f65235603d6fb0848f
+DIST xen-4.15.2.tar.gz 40773378 BLAKE2B 7c3e3bb066505f9838cd7c56d85debc64e5ed32cf4d4edf699ff843db49bee916e6eb46d07e5cd9021c2644bba0628a2aa567f60ace26c6d7ee5922643e04104 SHA512 1cbf988fa8ed38b7ad724978958092ca0e5506e38c709c7d1af196fb8cb8ec0197a79867782761ef230b268624b3d7a0d5d0cd186f37d25f495085c71bf70d54
 DIST xen-4.16.0.tar.gz 44982322 BLAKE2B 7e16a93b3f1131e2b10307fabc10641a9c5983173155b9a35eaf6ff317b6a747bccf6b8c87c06686830acc2c4bd3e19e5867eb443eabac9a1e4ee59124dfa87f SHA512 2869ed90d1779c9754d7f2397f5fc67a655304d9c32953ac20655ef96cb154521d8fce9f23915ac0c91f984dc54f72c67e5e619e2da318b5997748f44cf21b87
 DIST xen-gentoo-patches-23.tar.xz 20536 BLAKE2B 0064f79f8794a21ab13047a4ee296e37efa616e16ca6cd65b31fdafeb458fd9b80f0443758343c8328b1901d7169618346becfe75f16dcaeff08fc975f1d08d5 SHA512 09248e17ff7865feb2a505169d62ee5c8c60bd672fa8c4c7c4e3a2e4af58bfad0379d37b395bab3e3393af8d53d882f56749dfeb560edeea6b7ab56c902a3c49
 DIST xen-gentoo-patches-24.tar.xz 20952 BLAKE2B 292ea384f007a9615ca840068c45cd0e37a63a59e596c9c87a278a0136805327c85f5e5576eac751e40bda616559e413b396d313d43f2d36d904f09a41b0d302 SHA512 26b7344cea40ef44d1eaec330465071c96ee27a5b0ca91f787fc80c6801abed47cab9050a40ef80f20471a7cd9ee0dc7aaa46b16e5af7d0e50643ccc7d3a828b

app-emulation/xen-tools/files/gentoo-patches.conf

@@ -51,44 +51,11 @@ _gx056=" xen-tools-4.12.2-libxenstat-makefile.patch"
 # Fix building with gcc 10, bug #722930
 _gx060=" xen-tools-4.13.0-gcc10.patch"
 
-# xen-tools-4.14.2 patches set
-_gpv_xen_tools_4142_0="
-	xen-tools-4.12.0-gcc8.patch
-	xen-tools-4.12.0-shim.patch
-	xen-tools-4.12.0-unbundle-ipxe.patch
-	xen-tools-4.12.2-libxenstat-makefile.patch
-	xen-tools-4.14-ar-cc.patch
-	xen-tools-4.14-qemu-bridge.patch
-	xen-tools-4.15.0-disable-werror.patch
-	xen-tools-4.15.0-gcc11.patch
-	xen-tools-4.4.1-tinfo.patch
-	xen-tools-4.6-increase-stack-size.patch
-	xen-tools-4-anti-ovmf-download.patch
-	xen-tools-4-qemu-fix-po-collision.patch
-"
-
-# xen-tools-4.14.3 patches set
-_gpv_xen_tools_4143_0="
-	xen-tools-4.12.0-gcc8.patch
-	xen-tools-4.12.0-shim.patch
-	xen-tools-4.12.0-unbundle-ipxe.patch
-	xen-tools-4.12.2-libxenstat-makefile.patch
-	xen-tools-4.14-ar-cc.patch
-	xen-tools-4.14-qemu-bridge.patch
-	xen-tools-4.15.0-disable-werror.patch
-	xen-tools-4.4.1-tinfo.patch
-	xen-tools-4.6-increase-stack-size.patch
-	xen-tools-4-anti-ovmf-download.patch
-	xen-tools-4-qemu-fix-po-collision.patch
-"
-
-# xen-tools-4.15.0 patches set
-_gpv_xen_tools_4150_0="
+# xen-tools-4.15.1 patches set
+_gpv_xen_tools_4151_0="
 	xen-tools-4.14-ar-cc.patch
 	xen-tools-4.15.0-disable-werror.patch
-	xen-tools-4.15.0-gcc11.patch
 	xen-tools-4.15.0-libxenstat-makefile.patch
-	xen-tools-4.15.0-no-ld-no-pie.patch
 	xen-tools-4.15.0-qemu-bridge.patch
 	xen-tools-4.15.0-unbundle-ipxe.patch
 	xen-tools-4.4.1-tinfo.patch
@@ -96,8 +63,8 @@ _gpv_xen_tools_4150_0="
 	xen-tools-4-qemu-fix-po-collision.patch
 "
 
-# xen-tools-4.15.1 patches set
-_gpv_xen_tools_4151_0="
+# xen-tools-4.15.2 patches set
+_gpv_xen_tools_4152_0="
 	xen-tools-4.14-ar-cc.patch
 	xen-tools-4.15.0-disable-werror.patch
 	xen-tools-4.15.0-libxenstat-makefile.patch

app-emulation/xen-tools/xen-tools-4.15.2.ebuild

@@ -0,0 +1,556 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE='ncurses,xml,threads(+)'
+
+inherit bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs
+
+MY_PV=${PV/_/-}
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	REPO="xen.git"
+	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
+	S="${WORKDIR}/${REPO}"
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	UPSTREAM_VER=0
+	SECURITY_VER=
+	# xen-tools's gentoo patches tarball
+	GENTOO_VER=23
+	# xen-tools's gentoo patches version which apply to this specific ebuild
+	GENTOO_GPV=0
+	# xen-tools ovmf's patches
+	OVMF_VER=
+
+	SEABIOS_VER="1.14.0"
+	EDK2_COMMIT="a3741780fe3535e19e02efa869a7cac481891129"
+	EDK2_OPENSSL_VERSION="1_1_1j"
+	EDK2_SOFTFLOAT_COMMIT="b64af41c3276f97f0e181920400ee056b9c88037"
+	EDK2_BROTLI_COMMIT="666c3280cc11dc433c303d79a83d4ffbdd12cc8d"
+	IPXE_COMMIT="988d2c13cdf0f0b4140685af35ced70ac5b3283c"
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz
+		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz
+		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-security-patches-${SECURITY_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz
+		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	[[ -n ${OVMF_VER} ]] && \
+		OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
+
+	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz
+	https://www.seabios.org/downloads/seabios-${SEABIOS_VER}.tar.gz
+	ipxe? ( http://xenbits.xen.org/xen-extfiles/ipxe-git-${IPXE_COMMIT}.tar.gz )
+	ovmf? ( https://github.com/tianocore/edk2/archive/${EDK2_COMMIT}.tar.gz -> edk2-${EDK2_COMMIT}.tar.gz
+		https://github.com/openssl/openssl/archive/OpenSSL_${EDK2_OPENSSL_VERSION}.tar.gz
+		https://github.com/ucb-bar/berkeley-softfloat-3/archive/${EDK2_SOFTFLOAT_COMMIT}.tar.gz -> berkeley-softfloat-${EDK2_SOFTFLOAT_COMMIT}.tar.gz
+		https://github.com/google/brotli/archive/${EDK2_BROTLI_COMMIT}.tar.gz -> brotli-${EDK2_BROTLI_COMMIT}.tar.gz
+		${OVMF_PATCHSET_URI} )
+	${UPSTREAM_PATCHSET_URI}
+	${SECURITY_PATCHSET_URI}
+	${GENTOO_PATCHSET_URI}"
+
+	S="${WORKDIR}/xen-${MY_PV}"
+fi
+
+DESCRIPTION="Xen tools including QEMU and xl"
+HOMEPAGE="https://www.xenproject.org"
+DOCS=( README )
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
+# >=dev-lang/ocaml-4 stable
+# Masked in profiles/eapi-5-files instead
+IUSE="api debug doc +hvm +ipxe ocaml ovmf +pam pygrub python +qemu +qemu-traditional +rombios screen selinux sdl static-libs system-ipxe system-qemu system-seabios"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	ipxe? ( rombios )
+	ovmf? ( hvm )
+	pygrub? ( python )
+	rombios? ( hvm )
+	system-ipxe? ( rombios )
+	?? ( ipxe system-ipxe )
+	?? ( qemu system-qemu )"
+
+COMMON_DEPEND="
+	sys-apps/pciutils
+	dev-libs/lzo:2
+	dev-libs/glib:2
+	dev-libs/yajl
+	dev-libs/libaio
+	dev-libs/libgcrypt:0
+	sys-libs/zlib
+	${PYTHON_DEPS}
+"
+
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/iproute2[-minimal]
+	net-misc/bridge-utils
+	screen? (
+		app-misc/screen
+		app-admin/logrotate
+	)
+	selinux? ( sec-policy/selinux-xen )"
+
+DEPEND="${COMMON_DEPEND}
+	app-misc/pax-utils
+	>=sys-kernel/linux-headers-4.11
+	x11-libs/pixman
+	$(python_gen_cond_dep '
+		dev-python/lxml[${PYTHON_USEDEP}]
+		pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
+	')
+	x86? ( sys-devel/dev86
+		system-ipxe? ( sys-firmware/ipxe[qemu] )
+		sys-power/iasl )
+	api? ( dev-libs/libxml2
+		net-misc/curl )
+
+	ovmf? (
+		!arm? ( !arm64? ( dev-lang/nasm ) )
+		$(python_gen_impl_dep sqlite)
+		)
+	!amd64? ( >=sys-apps/dtc-1.4.0 )
+	amd64? ( sys-power/iasl
+		system-seabios? ( sys-firmware/seabios )
+		system-ipxe? ( sys-firmware/ipxe[qemu] )
+		rombios? ( sys-devel/bin86 sys-devel/dev86 ) )
+	doc? (
+		app-text/ghostscript-gpl
+		app-text/pandoc
+		$(python_gen_cond_dep '
+			dev-python/markdown[${PYTHON_USEDEP}]
+		')
+		dev-texlive/texlive-latexextra
+		media-gfx/transfig
+	)
+	hvm? ( x11-base/xorg-proto )
+	qemu? (
+		app-arch/snappy:=
+		sdl? (
+			media-libs/libsdl[X]
+			media-libs/libsdl2[X]
+		)
+	)
+	system-qemu? ( app-emulation/qemu[xen] )
+	ocaml? ( dev-ml/findlib
+		dev-lang/ocaml[ocamlopt] )
+	python? ( >=dev-lang/swig-4.0.0 )"
+
+BDEPEND="dev-lang/perl
+	sys-devel/bison
+	sys-devel/gettext"
+
+# hvmloader is used to bootstrap a fully virtualized kernel
+# Approved by QA team in bug #144032
+QA_WX_LOAD="
+	usr/libexec/xen/boot/hvmloader
+	usr/libexec/xen/boot/xen-shim
+	usr/share/qemu-xen/qemu/hppa-firmware.img
+	usr/share/qemu-xen/qemu/s390-ccw.img
+	usr/share/qemu-xen/qemu/u-boot.e500
+"
+
+QA_PREBUILT="
+	usr/libexec/xen/bin/elf2dmp
+	usr/libexec/xen/bin/ivshmem-client
+	usr/libexec/xen/bin/ivshmem-server
+	usr/libexec/xen/bin/qemu-edid
+	usr/libexec/xen/bin/qemu-img
+	usr/libexec/xen/bin/qemu-io
+	usr/libexec/xen/bin/qemu-keymap
+	usr/libexec/xen/bin/qemu-nbd
+	usr/libexec/xen/bin/qemu-pr-helper
+	usr/libexec/xen/bin/qemu-storage-daemon
+	usr/libexec/xen/bin/qemu-system-i386
+	usr/libexec/xen/bin/virtfs-proxy-helper
+	usr/libexec/xen/boot/xen-shim
+	usr/libexec/xen/libexec/qemu-pr-helper
+	usr/libexec/xen/libexec/virtfs-proxy-helper
+	usr/libexec/xen/libexec/virtiofsd
+	usr/libexec/xen/libexec/xen-bridge-helper
+	usr/share/qemu-xen/qemu/s390-ccw.img
+	usr/share/qemu-xen/qemu/s390-netboot.img
+	usr/share/qemu-xen/qemu/u-boot.e500
+"
+
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}/${PN}-4.15.0-fix-xenstat-python-bindings.patch" )
+
+pkg_setup() {
+	python_setup
+	export "CONFIG_LOMOUNT=y"
+
+	#bug 522642, disable compile tools/tests
+	export "CONFIG_TESTS=n"
+
+	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
+		if use x86 && use amd64; then
+			die "Confusion! Both x86 and amd64 are set in your use flags!"
+		elif use x86; then
+			export XEN_TARGET_ARCH="x86_32"
+		elif use amd64 ; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+}
+
+src_prepare() {
+	local i
+
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		einfo "Try to apply Xen Upstream patch set"
+		eapply "${WORKDIR}"/patches-upstream
+	fi
+
+	# Security patchset
+	if [[ -n ${SECURITY_VER} ]]; then
+	einfo "Try to apply Xen Security patch set"
+		# apply main xen patches
+		# Two parallel systems, both work side by side
+		# Over time they may concdense into one. This will suffice for now
+		EPATCH_SUFFIX="patch"
+		EPATCH_FORCE="yes"
+
+		source "${WORKDIR}"/patches-security/${PV}.conf || die
+
+		for i in ${XEN_SECURITY_MAIN}; do
+			eapply "${WORKDIR}"/patches-security/xen/$i
+		done
+
+		# apply qemu-xen/upstream patches
+		pushd "${S}"/tools/qemu-xen/ > /dev/null
+		for i in ${XEN_SECURITY_QEMUU}; do
+			eapply "${WORKDIR}"/patches-security/qemuu/$i
+		done
+		popd > /dev/null
+
+		# apply qemu-traditional patches
+		pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
+		for i in ${XEN_SECURITY_QEMUT}; do
+			eapply "${WORKDIR}"/patches-security/qemut/$i
+		done
+		popd > /dev/null
+	fi
+
+	# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
+	mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
+	pushd tools/firmware/ > /dev/null
+	ln -s seabios-dir-remote seabios-dir || die
+	popd > /dev/null
+
+	# Gentoo's patchset
+	if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
+		einfo "Try to apply Gentoo specific patch set"
+		source "${FILESDIR}"/gentoo-patches.conf || die
+		_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
+		for i in ${!_gpv}; do
+			eapply "${WORKDIR}"/patches-gentoo/$i
+		done
+	fi
+
+	# Ovmf's patchset
+	if use ovmf; then
+		if [[ -n ${OVMF_VER} ]];then
+			einfo "Try to apply Ovmf patch set"
+			pushd "${WORKDIR}"/edk2-*/ > /dev/null
+			eapply "${WORKDIR}"/patches-ovmf
+			popd > /dev/null
+		fi
+		mv ../edk2-${EDK2_COMMIT} tools/firmware/ovmf-dir-remote || die
+		rm -r tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die
+		rm -r tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die
+		rm -r tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die
+		rm -r tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die
+		mv ../openssl-OpenSSL_${EDK2_OPENSSL_VERSION} tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die
+		mv ../berkeley-softfloat-3-${EDK2_SOFTFLOAT_COMMIT} tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die
+		cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die
+		cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die
+		cp tools/firmware/ovmf-makefile tools/firmware/ovmf-dir-remote/Makefile || die
+
+		# Bug #816987
+		pushd tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli > /dev/null
+			eapply "${FILESDIR}/${PN}-4.15.1-brotli-gcc11.patch"
+		popd > /dev/null
+
+		pushd tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli > /dev/null
+			eapply "${FILESDIR}/${PN}-4.15.1-brotli-gcc11.patch"
+		popd > /dev/null
+
+		pushd tools/firmware/ovmf-dir-remote > /dev/null
+			eapply "${FILESDIR}/${PN}-4.15.1-edk2-python3.9.patch"
+		popd > /dev/null
+	fi
+
+	# Fix building with ocaml 4.12 #818100
+	eapply "${FILESDIR}/${PN}-4.15.1-ocaml-4.12.patch"
+
+	# ipxe
+	if use ipxe; then
+		cp "${DISTDIR}/ipxe-git-${IPXE_COMMIT}.tar.gz" tools/firmware/etherboot/_ipxe.tar.gz || die
+
+		# gcc 11
+		cp "${WORKDIR}/patches-gentoo/${PN}-4.15.0-ipxe-gcc11.patch" tools/firmware/etherboot/patches/ipxe-gcc11.patch || die
+		echo ipxe-gcc11.patch >> tools/firmware/etherboot/patches/series || die
+	fi
+
+	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
+
+	# Fix texi2html build error with new texi2html, qemu.doc.html
+	sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
+
+	use api || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
+	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
+		-i tools/firmware/Makefile || die
+
+	# Drop .config, fixes to gcc-4.6
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	# drop flags
+	unset CFLAGS
+	unset LDFLAGS
+	unset ASFLAGS
+	unset CPPFLAGS
+
+	if ! use pygrub; then
+		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
+	fi
+
+	if ! use python; then
+		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
+	fi
+
+	if ! use hvm; then
+		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
+	# Bug 351648
+	elif ! use x86 && ! has x86 $(get_all_abis); then
+		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
+		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
+		export CPATH="${WORKDIR}"/extra-headers
+	fi
+
+	if use qemu; then
+		if use sdl; then
+			sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \
+				tools/Makefile || die
+		else
+			sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \
+				tools/qemu-xen-traditional/xen-setup || die
+			sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \
+				tools/Makefile || die
+		fi
+	else
+		# Don't bother with qemu, only needed for fully virtualised guests
+		sed -i '/SUBDIRS-$(CONFIG_QEMU_XEN)/s/^/#/g' tools/Makefile || die
+	fi
+
+	# Reset bash completion dir; Bug 472438
+	sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
+		-i Config.mk || die
+
+	# xencommons, Bug #492332, sed lighter weight than patching
+	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
+		-i tools/hotplug/Linux/init.d/xencommons.in || die
+
+	# fix bashishm
+	sed -e '/Usage/s/\$//g' \
+		-i tools/hotplug/Linux/init.d/xendriverdomain.in || die
+
+	# respect multilib, usr/lib/libcacard.so.0.0.0
+	sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
+		-i tools/qemu-xen/configure || die
+
+	#bug 518136, don't build 32bit exactuable for nomultilib profile
+	if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
+		sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
+	fi
+
+	# uncomment lines in xl.conf
+	sed -e 's:^#autoballoon=:autoballoon=:' \
+		-e 's:^#lockfile=:lockfile=:' \
+		-e 's:^#vif.default.script=:vif.default.script=:' \
+		-i tools/examples/xl.conf  || die
+
+	# disable capstone (Bug #673474)
+	sed -e "s:\$\$source/configure:\0 --disable-capstone:" \
+		-i tools/Makefile || die
+
+	# disable glusterfs
+	sed -e "s:\$\$source/configure:\0 --disable-glusterfs:" \
+		-i tools/Makefile || die
+
+	# disable jpeg automagic
+	sed -e "s:\$\$source/configure:\0 --disable-vnc-jpeg:" \
+		-i tools/Makefile || die
+
+	# disable png automagic
+	sed -e "s:\$\$source/configure:\0 --disable-vnc-png:" \
+		-i tools/Makefile || die
+
+	# disable docker (Bug #732970)
+	sed -e "s:\$\$source/configure:\0 --disable-containers:" \
+		-i tools/Makefile || die
+
+	# disable abi-dumper (Bug #791172)
+	sed -e 's/$(ABI_DUMPER) /echo /g' \
+		-i tools/libs/libs.mk || die
+
+	default
+}
+
+src_configure() {
+	local myconf="--prefix=${PREFIX}/usr \
+		--libdir=${PREFIX}/usr/$(get_libdir) \
+		--libexecdir=${PREFIX}/usr/libexec \
+		--localstatedir=${EPREFIX}/var \
+		--disable-golang \
+		--disable-werror \
+		--disable-xen \
+		--enable-tools \
+		--enable-docs \
+		$(use_enable api xenapi) \
+		$(use_enable ipxe) \
+		$(usex system-ipxe '--with-system-ipxe=/usr/share/ipxe' '') \
+		$(use_enable ocaml ocamltools) \
+		$(use_enable ovmf) \
+		$(use_enable pam) \
+		$(use_enable rombios) \
+		--with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \
+		"
+
+	use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
+	use system-qemu && myconf+=" --with-system-qemu=/usr/bin/qemu-system-x86_64"
+	use amd64 && myconf+=" $(use_enable qemu-traditional)"
+	tc-ld-disable-gold # Bug 669570
+	econf ${myconf}
+}
+
+src_compile() {
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+	use python && myopt="${myopt} XENSTAT_PYTHON_BINDINGS=y"
+
+	if test-flag-CC -fno-strict-overflow; then
+		append-flags -fno-strict-overflow
+	fi
+
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" build-tools ${myopt}
+
+	if use doc; then
+		emake -C docs build
+	else
+		emake -C docs man-pages
+	fi
+}
+
+src_install() {
+	# Override auto-detection in the build system, bug #382573
+	export INITD_DIR=/tmp/init.d
+	export CONFIG_LEAF_DIR=../tmp/default
+
+	# Let the build system compile installed Python modules.
+	local PYTHONDONTWRITEBYTECODE
+	export PYTHONDONTWRITEBYTECODE
+
+	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
+		XEN_PYTHON_NATIVE_INSTALL=y install-tools
+
+	# Created at runtime
+	rm -rv "${ED}/var/run" || die
+
+	# Fix the remaining Python shebangs.
+	python_fix_shebang "${D}"
+
+	# Remove RedHat-specific stuff
+	rm -rf "${D}"/tmp || die
+
+	if use doc; then
+		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
+		dodoc -r docs/{pdf,txt}
+	else
+		emake -C docs DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-man-pages # Bug 668032
+	fi
+	dodoc ${DOCS[@]}
+
+	newconfd "${FILESDIR}"/xendomains.confd xendomains
+	newconfd "${FILESDIR}"/xenstored.confd xenstored
+	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
+	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
+	newinitd "${FILESDIR}"/xenstored.initd-r1 xenstored
+	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
+	newinitd "${FILESDIR}"/xencommons.initd xencommons
+	newconfd "${FILESDIR}"/xencommons.confd xencommons
+	newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
+	newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
+	newinitd "${FILESDIR}"/xen-watchdog.initd xen-watchdog
+
+	if use screen; then
+		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
+		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
+		keepdir /var/log/xen-consoles
+	fi
+
+	# For -static-libs wrt Bug 384355
+	if ! use static-libs; then
+		rm -f "${D}"/usr/$(get_libdir)/*.a "${D}"/usr/$(get_libdir)/ocaml/*/*.a
+	fi
+
+	# for xendomains
+	keepdir /etc/xen/auto
+
+	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
+	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
+		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
+
+	keepdir /var/lib/xen/dump
+	keepdir /var/lib/xen/xenpaging
+	keepdir /var/lib/xenstored
+	keepdir /var/log/xen
+
+	if use python; then
+		python_domodule "${S}/tools/libs/stat/bindings/swig/python/xenstat.py"
+		python_domodule "${S}/tools/libs/stat/bindings/swig/python/_xenstat.so"
+	fi
+
+	python_optimize
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the offical wiki page:"
+	elog "https://wiki.gentoo.org/wiki/Xen"
+	elog "https://wiki.xen.org/wiki/Main_Page"
+	elog ""
+	elog "Recommended to utilise the xencommons script to config system at boot"
+	elog "Add by use of rc-update on completion of the install"
+
+	if ! use hvm; then
+		echo
+		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
+		elog "support enable the hvm use flag."
+		elog "An x86 or amd64 system is required to build HVM support."
+	fi
+
+	if use qemu; then
+		elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
+		elog "build of qemu.  This allows for app-emulation/qemu to be emerged concurrently"
+		elog "with the qemu capable xen.  It is up to the user to distinguish between and utilise"
+		elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise"
+	fi
+}

app-emulation/xen/Manifest

@@ -1,5 +1,6 @@
-DIST xen-4.15.1-upstream-patches-2.tar.xz 30180 BLAKE2B 675c13cfb4a6f47121dfe125ddea21d98e7e37563f63b91cde96cd92d94eff648eaa65426fec09833ad668102959948b2e684860631db2b5a2a53b2521a01069 SHA512 f0a6c0829068828ac400d67230d3066b2370a90303e537dd5e0761920ac0d584139b59244a72d9dcd2e4cb1a151ab80d3197ba908e642e13817b89b9a33c73fb
 DIST xen-4.15.1-upstream-patches-3.tar.xz 49644 BLAKE2B 261d45d726ba9b06a817fd4f4e9d2a83e516cd637f73dff50ccb9b046d562e14bee47fc64795c0406947fb06988679047a19e5851482fbf85701bcc495225258 SHA512 8d8b7e42f9a401f6d3a7cb87b980714aa14dadbeadb3a26f495b6a1892d1a04de244490255b589952f565d0a0b8c69fd527c0168d40e974e0f77cecda25e7cb3
 DIST xen-4.15.1.tar.gz 40800852 BLAKE2B 39475ea33f029fb0e84b82b4a2b13fd613bab01e3ef6c241dfede3d190ee9be53c99b62121d37d83b1e078764b3e4d88d1dfb99be1b5623691e56519850c6798 SHA512 8d3cbdf708f46477e32ee7cbd16a490c82efa855cecd84ee712b8680df4d69c987ba9ab00ff3851f627b98a8ebbc5dab71f92f142ed958ee2bc538bc792cd4b9
+DIST xen-4.15.2-upstream-patches-0.tar.xz 33368 BLAKE2B f22c0e9ce6b859a2741f09c0c52479e8acb38440b631882850993fcfcdc445c28fbeac4353df6bac1b2be89e39a99bae1a920796d505f888e3701a98f17ed29d SHA512 10a996cd87404ff6536119deeedfe67143c02475c4ca2d7f741e087197aaffa10c5831aad1f9ee2f9070461dd8cdc7af4851fbafb634a2f65235603d6fb0848f
+DIST xen-4.15.2.tar.gz 40773378 BLAKE2B 7c3e3bb066505f9838cd7c56d85debc64e5ed32cf4d4edf699ff843db49bee916e6eb46d07e5cd9021c2644bba0628a2aa567f60ace26c6d7ee5922643e04104 SHA512 1cbf988fa8ed38b7ad724978958092ca0e5506e38c709c7d1af196fb8cb8ec0197a79867782761ef230b268624b3d7a0d5d0cd186f37d25f495085c71bf70d54
 DIST xen-4.16.0-upstream-patches-0.tar.xz 25168 BLAKE2B f572cca630e0461fba86eeec27043d949a7c0500ab47138572829394ae4354d5955af4a64b669abb932346bba1902511e35ede905b38fa1b2bd3b624c35470cf SHA512 d49d80bf687ba1046e82e7ad0196cb3fcdf595df0757d4f6e390bd0c6ba156ec012ea61cc606fbf3ceb03a9cd21f8acc6c45092a11b5a9a916bae80ff2d6c181
 DIST xen-4.16.0.tar.gz 44982322 BLAKE2B 7e16a93b3f1131e2b10307fabc10641a9c5983173155b9a35eaf6ff317b6a747bccf6b8c87c06686830acc2c4bd3e19e5867eb443eabac9a1e4ee59124dfa87f SHA512 2869ed90d1779c9754d7f2397f5fc67a655304d9c32953ac20655ef96cb154521d8fce9f23915ac0c91f984dc54f72c67e5e619e2da318b5997748f44cf21b87

app-emulation/xen/files/xen-4.16-efi.patch

@@ -0,0 +1,12 @@
+diff -urN a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile
+--- a/xen/arch/x86/Makefile	2021-11-30 06:42:42.000000000 -0500
++++ b/xen/arch/x86/Makefile	2022-02-17 07:43:06.597244620 -0500
+@@ -127,7 +127,7 @@
+ CFLAGS-$(XEN_BUILD_EFI) += -DXEN_BUILD_EFI
+ 
+ # Check if the linker supports PE.
+-EFI_LDFLAGS = $(patsubst -m%,-mi386pep,$(XEN_LDFLAGS)) --subsystem=10
++EFI_LDFLAGS = -mi386pep $(patsubst -m%,-mi386pep,$(XEN_LDFLAGS)) --subsystem=10
+ XEN_BUILD_PE := $(if $(XEN_BUILD_EFI),$(call ld-option,$(EFI_LDFLAGS) --image-base=0x100000000 -o efi/check.efi efi/check.o))
+ # If the above failed, it may be merely because of the linker not dealing well
+ # with debug info. Try again with stripping it.

app-emulation/xen/xen-4.15.1-r3.ebuild

@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
 	SRC_URI=""
 else
-	KEYWORDS="~amd64 ~arm -x86"
+	KEYWORDS="amd64 ~arm -x86"
 	UPSTREAM_VER=3
 	SECURITY_VER=
 	GENTOO_VER=

app-emulation/xen/xen-4.15.2.ebuild

@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit flag-o-matic mount-boot python-any-r1 toolchain-funcs
 
@@ -15,8 +15,8 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
 	SRC_URI=""
 else
-	KEYWORDS="amd64 ~arm -x86"
-	UPSTREAM_VER=2
+	KEYWORDS="~amd64 ~arm -x86"
+	UPSTREAM_VER=0
 	SECURITY_VER=
 	GENTOO_VER=
 

app-emulation/xen/xen-4.16.0-r3.ebuild

@@ -93,6 +93,8 @@ src_prepare() {
 	# Gentoo's patchset
 	[[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo
 
+	eapply "${FILESDIR}"/${PN}-4.16-efi.patch
+
 	# Symlinks do not work on fat32 volumes # 829765
 	if ! use boot-symlinks || use efi; then
 		eapply "${FILESDIR}"/${PN}-4.16-no-symlink.patch

app-i18n/transifex-client/Manifest

@@ -198,3 +198,4 @@ DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.mod 95 BLAKE2B
 DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.zip 105245 BLAKE2B f0bcfd9d097905364d9c2b032b92a8aad64b63e0942eb864759b156eb97ac58769fbc035acf4ba57bd55db1b6596499ddc6d36e6d2e5cc584c2a465256ca3a73 SHA512 f9c0400f1f5590d7185ae3fdac7adf1787a5f5198e52ebd02841b7df5113c5e34de6a66fa01b2f5735be4b21190dffb46e9d8b084ad5c00ebd99599a39ff73db
 DIST transifex-client-0.14.3.tar.gz 211428 BLAKE2B cab17d7103016a78b226df6ca9905a0ddfd1b8765fb7b161c7390911ac5693d97e7a872a00cbc86e9c8e7d84fbcd85904768f463885bb679e22ab052463db418 SHA512 9034111fa0253ce8799c5ba181d6d35e2addd14b8c2edb7822d8d572255c27f49e4cfce9d82e7e70e352c32e87f2e7bdc6bf09c2a591e689606b0831414dd863
 DIST transifex-client-1.0.0.tar.gz 81323 BLAKE2B 1e9dea8388e88756dc8da78882eb18586536c9d84e19cdd204b3c8451e716b76bddf00032537e7fb2f9149568837bb18e43f3f321ca64f6f1dd0524a4d10ca3d SHA512 e4e5c43684fef7a866154dbca5246d9230d357ad7abe1009901d2e27a326a4ff25528c53af90534f2187081df0ff663664314188e5f1b0010e5edd5e263b8db5
+DIST transifex-client-1.0.1.tar.gz 82601 BLAKE2B 8933a67b08f522f5e2c77d3f3e8ee635dd6a29f441120875f890c697b678c4d9ba003b77f9fc5f42213581b17de0e24a11646c78b91fa5a358da8b82ad3d727e SHA512 b687e23d1d1a0532ac0652dca33c4ea1ef9c59c018e53105f532409304f906c658587628fbabb195f72ef9d417db3b3da747c9c30d7abd948a1f76bf1e6a3fce

app-i18n/transifex-client/transifex-client-1.0.1.ebuild

@@ -0,0 +1,230 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="The Transifex command-line client"
+HOMEPAGE="https://github.com/transifex/cli"
+
+EGO_SUM=(
+	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/Microsoft/go-winio v0.4.14/go.mod"
+	"github.com/Microsoft/go-winio v0.4.16"
+	"github.com/Microsoft/go-winio v0.4.16/go.mod"
+	"github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7"
+	"github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod"
+	"github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239"
+	"github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod"
+	"github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5"
+	"github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod"
+	"github.com/atomicgo/cursor v0.0.1"
+	"github.com/atomicgo/cursor v0.0.1/go.mod"
+	"github.com/blang/semver v3.5.1+incompatible"
+	"github.com/blang/semver v3.5.1+incompatible/go.mod"
+	"github.com/chzyer/logex v1.1.10"
+	"github.com/chzyer/logex v1.1.10/go.mod"
+	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e"
+	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
+	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1"
+	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod"
+	"github.com/creack/pty v1.1.9/go.mod"
+	"github.com/davecgh/go-spew v1.1.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.1"
+	"github.com/davecgh/go-spew v1.1.1/go.mod"
+	"github.com/emirpasic/gods v1.12.0"
+	"github.com/emirpasic/gods v1.12.0/go.mod"
+	"github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod"
+	"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+	"github.com/gliderlabs/ssh v0.2.2"
+	"github.com/gliderlabs/ssh v0.2.2/go.mod"
+	"github.com/go-git/gcfg v1.5.0"
+	"github.com/go-git/gcfg v1.5.0/go.mod"
+	"github.com/go-git/go-billy/v5 v5.0.0/go.mod"
+	"github.com/go-git/go-billy/v5 v5.1.0"
+	"github.com/go-git/go-billy/v5 v5.1.0/go.mod"
+	"github.com/go-git/go-git-fixtures/v4 v4.0.2-0.20200613231340-f56387b50c12"
+	"github.com/go-git/go-git-fixtures/v4 v4.0.2-0.20200613231340-f56387b50c12/go.mod"
+	"github.com/go-git/go-git/v5 v5.3.0"
+	"github.com/go-git/go-git/v5 v5.3.0/go.mod"
+	"github.com/golang/protobuf v1.2.0/go.mod"
+	"github.com/golang/protobuf v1.3.2"
+	"github.com/golang/protobuf v1.3.2/go.mod"
+	"github.com/google/go-cmp v0.3.0"
+	"github.com/google/go-cmp v0.3.0/go.mod"
+	"github.com/google/go-github/v30 v30.1.0"
+	"github.com/google/go-github/v30 v30.1.0/go.mod"
+	"github.com/google/go-querystring v1.0.0"
+	"github.com/google/go-querystring v1.0.0/go.mod"
+	"github.com/gookit/color v1.4.2"
+	"github.com/gookit/color v1.4.2/go.mod"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+	"github.com/gosimple/slug v1.11.2"
+	"github.com/gosimple/slug v1.11.2/go.mod"
+	"github.com/gosimple/unidecode v1.0.1"
+	"github.com/gosimple/unidecode v1.0.1/go.mod"
+	"github.com/hpcloud/tail v1.0.0/go.mod"
+	"github.com/imdario/mergo v0.3.12"
+	"github.com/imdario/mergo v0.3.12/go.mod"
+	"github.com/inconshreveable/go-update v0.0.0-20160112193335-8152e7eb6ccf"
+	"github.com/inconshreveable/go-update v0.0.0-20160112193335-8152e7eb6ccf/go.mod"
+	"github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99"
+	"github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod"
+	"github.com/jessevdk/go-flags v1.5.0/go.mod"
+	"github.com/jtolds/gls v4.20.0+incompatible"
+	"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
+	"github.com/juju/ansiterm v0.0.0-20180109212912-720a0952cc2a"
+	"github.com/juju/ansiterm v0.0.0-20180109212912-720a0952cc2a/go.mod"
+	"github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351"
+	"github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+	"github.com/kr/pretty v0.1.0/go.mod"
+	"github.com/kr/pretty v0.2.1"
+	"github.com/kr/pretty v0.2.1/go.mod"
+	"github.com/kr/pty v1.1.1/go.mod"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/kr/text v0.2.0"
+	"github.com/kr/text v0.2.0/go.mod"
+	"github.com/lunixbochs/vtclean v0.0.0-20180621232353-2d01aacdc34a"
+	"github.com/lunixbochs/vtclean v0.0.0-20180621232353-2d01aacdc34a/go.mod"
+	"github.com/manifoldco/promptui v0.8.0"
+	"github.com/manifoldco/promptui v0.8.0/go.mod"
+	"github.com/mattn/go-colorable v0.0.9"
+	"github.com/mattn/go-colorable v0.0.9/go.mod"
+	"github.com/mattn/go-isatty v0.0.4"
+	"github.com/mattn/go-isatty v0.0.4/go.mod"
+	"github.com/mattn/go-runewidth v0.0.13"
+	"github.com/mattn/go-runewidth v0.0.13/go.mod"
+	"github.com/mitchellh/go-homedir v1.1.0"
+	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+	"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod"
+	"github.com/onsi/ginkgo v1.6.0/go.mod"
+	"github.com/onsi/gomega v1.4.2"
+	"github.com/onsi/gomega v1.4.2/go.mod"
+	"github.com/pkg/errors v0.8.1/go.mod"
+	"github.com/pkg/errors v0.9.1"
+	"github.com/pkg/errors v0.9.1/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/pterm/pterm v0.12.24"
+	"github.com/pterm/pterm v0.12.24/go.mod"
+	"github.com/rhysd/go-github-selfupdate v1.2.3"
+	"github.com/rhysd/go-github-selfupdate v1.2.3/go.mod"
+	"github.com/rivo/uniseg v0.2.0"
+	"github.com/rivo/uniseg v0.2.0/go.mod"
+	"github.com/russross/blackfriday/v2 v2.0.1"
+	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
+	"github.com/sergi/go-diff v1.1.0"
+	"github.com/sergi/go-diff v1.1.0/go.mod"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
+	"github.com/sirupsen/logrus v1.4.1/go.mod"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
+	"github.com/smartystreets/goconvey v1.6.4"
+	"github.com/smartystreets/goconvey v1.6.4/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/objx v0.1.1/go.mod"
+	"github.com/stretchr/testify v1.2.2/go.mod"
+	"github.com/stretchr/testify v1.4.0/go.mod"
+	"github.com/stretchr/testify v1.6.1/go.mod"
+	"github.com/stretchr/testify v1.7.0"
+	"github.com/stretchr/testify v1.7.0/go.mod"
+	"github.com/tcnksm/go-gitconfig v0.1.2"
+	"github.com/tcnksm/go-gitconfig v0.1.2/go.mod"
+	"github.com/ulikunitz/xz v0.5.9"
+	"github.com/ulikunitz/xz v0.5.9/go.mod"
+	"github.com/urfave/cli/v2 v2.3.0"
+	"github.com/urfave/cli/v2 v2.3.0/go.mod"
+	"github.com/xanzy/ssh-agent v0.3.0"
+	"github.com/xanzy/ssh-agent v0.3.0/go.mod"
+	"github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778"
+	"github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778/go.mod"
+	"golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod"
+	"golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2"
+	"golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod"
+	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+	"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
+	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod"
+	"golang.org/x/net v0.0.0-20210326060303-6b1517762897"
+	"golang.org/x/net v0.0.0-20210326060303-6b1517762897/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288"
+	"golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/go.mod"
+	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
+	"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
+	"golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
+	"golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod"
+	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+	"golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod"
+	"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
+	"golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod"
+	"golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod"
+	"golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44"
+	"golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod"
+	"golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod"
+	"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
+	"golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d"
+	"golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod"
+	"golang.org/x/text v0.3.0/go.mod"
+	"golang.org/x/text v0.3.3/go.mod"
+	"golang.org/x/text v0.3.5"
+	"golang.org/x/text v0.3.5/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+	"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod"
+	"google.golang.org/appengine v1.1.0/go.mod"
+	"google.golang.org/appengine v1.3.0"
+	"google.golang.org/appengine v1.3.0/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c"
+	"gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod"
+	"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
+	"gopkg.in/ini.v1 v1.62.0"
+	"gopkg.in/ini.v1 v1.62.0/go.mod"
+	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
+	"gopkg.in/warnings.v0 v0.1.2"
+	"gopkg.in/warnings.v0 v0.1.2/go.mod"
+	"gopkg.in/yaml.v2 v2.2.1/go.mod"
+	"gopkg.in/yaml.v2 v2.2.2/go.mod"
+	"gopkg.in/yaml.v2 v2.2.3/go.mod"
+	"gopkg.in/yaml.v2 v2.2.4/go.mod"
+	"gopkg.in/yaml.v2 v2.3.0"
+	"gopkg.in/yaml.v2 v2.3.0/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b"
+	"gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod"
+	)
+go-module_set_globals
+
+SRC_URI="https://github.com/transifex/cli/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+S="${WORKDIR}"/cli-${PV}
+
+LICENSE="Apache-2.0 BSD BSD-2 ISC LGPL-3 MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+src_test() {
+	# Skip tests depending on a network connection. Bug #831772
+	rm internal/txlib/update_test.go || die
+	go test ./... || die
+}
+
+src_install() {
+	dobin bin/tx
+	dodoc README.md
+}

app-metrics/redis_exporter/Manifest

@@ -44,7 +44,6 @@ DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod 40 BLAKE2B 6cc86f2bceda861767
 DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip 14678 BLAKE2B 6647c66a45f2dc67b83a1e493bc73d4439de7962f7f1472dc267be9a9408b5ddda66b8ee2fdadf18b2973648035fb3907fe539a8b7ccb768b8c99c4cae573eab SHA512 f973efba5ce7c651d9c3e4e467a1423b00b102034a054874d09977957b7b55557e05da06fb4c158e693db7bac01bf601f950cae0d411dc92afd0686d7e1de4cf
 DIST github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod 58 BLAKE2B d724c8e5ab039b227f3c437ba570398b789f53fe80db6f8e57fd2cb2199a5e7acef24d7451f9b27a4da464770660d31fc785c7165deafbc35009718851329fc6 SHA512 23d6171dbcf339c72fe25ab7a7e70cb385dffd654998824fac0f6b6464717873332d39fe1f96101414f5e2d240faaab0b960da2e31c08ef98443aa238bbf02d4
 DIST github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod 45 BLAKE2B 350e937e3f7b254b5c590445a9a7f7cc908daa2a5f208e293ac414d50b46bd29671bb483e55daeedca41d70a42fdcc62ce17fffd9992a932e29153ab6ca1168e SHA512 c1b9f572957bc4ed1ad0c61d22b7b5d6a4c863df2aaeb4cf914e304af21d949c9cfc53dc8eb67aacdf3dd56f339ee6f4a1f5fa464121d9db79b7b3febfb3251b
-DIST github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip 12031 BLAKE2B 47bd92ee66282b671cdfea60969710e371540e79b3c1e2f510380e3dbbfe40ff76be23ab48f44855b1cbbbed7cdbfc4f1ea21bc4bd7a37716de7c27a7ef81329 SHA512 dc5efd476875fe3cfb3c5f5ce9314920bb2175be85fd1a4667faddee1b5360113b66bdc2f17e4fe889a7d104d684558744bdc6c56c8ac3afc585d7aad0114486
 DIST github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.2.mod 45 BLAKE2B 350e937e3f7b254b5c590445a9a7f7cc908daa2a5f208e293ac414d50b46bd29671bb483e55daeedca41d70a42fdcc62ce17fffd9992a932e29153ab6ca1168e SHA512 c1b9f572957bc4ed1ad0c61d22b7b5d6a4c863df2aaeb4cf914e304af21d949c9cfc53dc8eb67aacdf3dd56f339ee6f4a1f5fa464121d9db79b7b3febfb3251b
 DIST github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.2.zip 15284 BLAKE2B 888c31aba348613af1c79333a9f7686e8c8f8048afd9b65b069afa157c68311738eebf0c2e7ce0dc482fa5ba112dcbe7ce36ee1b23a379ee27bef90d50666d86 SHA512 a13d75511ae89987df8e6ea1bff657c1b9570dc7beadda8fd282f7073136f28b6a1c1ebec484ff07c66332c3b1a70ae335d16acef1b0844bbf736777866dbf59
 DIST github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod 31 BLAKE2B 683f04ea11a77fcee27cfc84f41a1974ca6d61ee854dc77f072493358099ec03e94f01b5cd5cbb5ef69c856dc36790b660a3e90d7d520fd553e572f1b01a2304 SHA512 0e40cd7ff22a86cd23b49b509f5b5653f67e31ca67a07ab82743f56e5504f126cb2c11d88da644afbaf024dffa657560a420ec6d82f6b463452ad8a8bdb576d2
@@ -95,14 +94,10 @@ DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod 124 BLAKE2B 4c032e7f2e1c87
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod 124 BLAKE2B 9e60030e0014cbc67c0bc7064eef3b127dec57dfe25bbf7f0d0e2b9c8c77e28477066daf073a6793428116419900e7c9f6dea6e8841a5f61812cf11ff77e7009 SHA512 14a0f1fed404939fad835398d5889ad57621edeb0e183785b3094957183bb29a2026e2af939b94c7155f8496e966116c4a6a2497fab113a175a9aef3f7ec3f32
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod 124 BLAKE2B 3242575be48f0e1f74e2d0976d2a11f0edccc59c7b74cecde37233c19f97c51e576cd3032175cfad3c1ce9721cd41053f459341182fba836e0ff0456126e493e SHA512 9586be76b697c6a5c3216762ac13a7d297372ebe0c7ac5941d16c326d1580c8a73fb475236ed9a4214d158a7386e761877be16cdbd4ac2074e8a5e1dfdc95b54
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.mod 124 BLAKE2B 3242575be48f0e1f74e2d0976d2a11f0edccc59c7b74cecde37233c19f97c51e576cd3032175cfad3c1ce9721cd41053f459341182fba836e0ff0456126e493e SHA512 9586be76b697c6a5c3216762ac13a7d297372ebe0c7ac5941d16c326d1580c8a73fb475236ed9a4214d158a7386e761877be16cdbd4ac2074e8a5e1dfdc95b54
-DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.zip 206951 BLAKE2B da403116137f70222d2028df84c6f872d324e6aef808ceb2f58dae257e9b7cd2fb37b477c2b61bda55888f5aa72fe6f46afc79ed4fb440f1212c5105f8b6dcc2 SHA512 8df603b906846c265342236e7bff8ad4f37fbac2ab425b6002201ec727602bc2454708985d44de11bd91212e15e338ce1942f33a3e38c328f2ab9e3b990a2ab5
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.0.mod 129 BLAKE2B 15d140a0b2b22d6c9886ee9e517f923fda26ee8179755702a8eebf1ae8cf75be48e8d28a1df1bf875a7bfd499075d83a541c9716601856abe0e7c850a3ec68fd SHA512 467a3f6fb4c941cd55d8d4b2d6a2015966c60a8614691539c88c4bf0da2f8022055be8561cddd0e60b118f74f010be5998dd128b7b136f14edd2674e5650db2a
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.2.mod 192 BLAKE2B 08ac45ddd213c260f4b9d33fec4ba9758ce949c699e2d8d6c7b31bc0fbd7498618cd5144a6ccc3e1b852e9f1a6b7d00191ada7d464dd5784d132506c9a8639ce SHA512 44c996ad31bf02aec42bef934d7cd65379ae5eca4d1069dab8c478be169f9479cbd55f8f72bd9567e51535d31c9f65cd1d56bbefb8b745f96cad0f5953f8c420
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.2.zip 206858 BLAKE2B 42c113333104cf0335d16d24748ca111dc44a52b3c6ceb8e11388c85b8ac80c5c324ca9c6d90d08c07dc865909eed4510fb145153024890e4e160cde2b877269 SHA512 6df84a92489b04e55e35bb2334f7e9e55f4fac646e9ad904eca189d069443609fe1affc4cf5e92d0f90ea9c75162a72f134c6298f828608efe9a71b6e496eeb5
 DIST github.com%2Fgomodule%2Fredigo%2F@v%2Fv1.8.5.mod 87 BLAKE2B 0773fdd526eb902a32d34118dc076c69c3f139d460cf560de1e19c3e87c789e1bbc8817cdff589c3b80c2a6261cf12dddfff9dfa45c2b18115e8f58760772d5a SHA512 646e75a75a215257409eacab4870939be8858bb44279b446bfe11a3364272e9f9e463b6b0fa00dc739f6def2601aa1bf892c2c61b63135d597cd10249a672940
-DIST github.com%2Fgomodule%2Fredigo%2F@v%2Fv1.8.5.zip 72666 BLAKE2B 9fe1273c5c4e5014512831308c06f4c914dc381fd1bc92d4d960df160f28ca82b4d6d2f7adee682ae9c39b267022dbe2db6af06a395f8acffcf2797aa535c8ca SHA512 9db6bb9cd6f9a3578b1ba9ab15412029b4851d5734c6123ede4f4f2ef772604c7e16b880c355e73b5fe6773d7bd1cd1f06ba8ad6d2dab0d4dde0bc46c0ab2152
-DIST github.com%2Fgomodule%2Fredigo%2F@v%2Fv1.8.6.mod 87 BLAKE2B 0773fdd526eb902a32d34118dc076c69c3f139d460cf560de1e19c3e87c789e1bbc8817cdff589c3b80c2a6261cf12dddfff9dfa45c2b18115e8f58760772d5a SHA512 646e75a75a215257409eacab4870939be8858bb44279b446bfe11a3364272e9f9e463b6b0fa00dc739f6def2601aa1bf892c2c61b63135d597cd10249a672940
-DIST github.com%2Fgomodule%2Fredigo%2F@v%2Fv1.8.6.zip 73646 BLAKE2B d85a892ca57f6f54ec56041071a5ddbaba89adbc50ca55bb59047a5bd2271e60600782ce41f4bae4feaeaf296bab33bbc2a7b7e433bca0e973ab387bc19d5a68 SHA512 f9ade8aa45dc18612a9b27232c6fbd428ee0f7b73f2199a16db36bc716b083a7f46c7de3a3f49a3a5fffae587a2f69f8ccff45b5904025947b4e36896c755352
 DIST github.com%2Fgomodule%2Fredigo%2F@v%2Fv1.8.8.mod 247 BLAKE2B 49b4d601f133ddf248396906dcbb771b77cfd5fc7f4cc4f74d06903b098025ea3c418101b53d320f18aab11b5192e6294c590c3c8448c67f35e1ad79f50b0f5e SHA512 17a11c0c2575eda807c00edafca46b50b9e6a9aea2a86bc358afb3636803a03533c0aeba6aaa02aa406aaf0c3bc8a344956287861f2fe30119474e7886cb006f
 DIST github.com%2Fgomodule%2Fredigo%2F@v%2Fv1.8.8.zip 73761 BLAKE2B bfd1187ac48618697c3c89fec2771a08ff7adc0a8b561050cb2b9406e369c2549bac185eaac435e0f8251bcf78979f9990c82df006f02188454dc999905a9116 SHA512 7c0b2f988a78ccc7cfe424b919c9cd98e24e7c656019aaa97c3a1cc87db856db4c29a64348b0d930d849e9644aafb55367a2abd4fa01ef2d9b51c4bf45fb209c
 DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410
@@ -153,8 +148,6 @@ DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod 64 BLAKE2B 475c51201a379df2cc4ff8c
 DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip 12591 BLAKE2B 944b0b9a802757e78e3dfb11d6c4d79e0e0d90489d49262b7079e6ea4728328457f8773b392c8a618aacb5fdec78948a16cc852eff71ca6f4fb9eb422c03890b SHA512 3f0d00b0545769ad882e25a9a6f30b96ce4b72a8a46bb3c064907c94e2dda4e499eb32354c149f89752f9bc5d1ee5cb2ee5cafa46e2f65ea329fb432d0c0029f
 DIST github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod 56 BLAKE2B 50d2d6dc9c1ee92d629af8c9aae9fe5f70a0c6fe270a95a8232cee3c50132ef90c68218ac64a3b5b72d94e23ecbea5f567fef39a81be3d4585bae3f4f5348545 SHA512 5235188477921a263176fefaffccdaca4bf8175a2e248356a06596e37fa868400203172c7fe9fb80d0a65d335d23d80edefd242657de0eb83d9360589e063bba
 DIST github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip 44378 BLAKE2B 15ccda2b94bb024656859fb8a6968782b9a1bffb786b0b1ed69a3284b01f4a2100b3f3c46b6ebcb8f7febedb5bd4f6762fe333b7d4f1d14c700f8fce60843352 SHA512 e9349ee2a7d5e5b129ec6a1c0507854aebca82cf9ac2d0a681cac2f4630ea35551ede48e1931494362232a83dc9f26b6b4162c6114e0176084c50101b1da46b0
-DIST github.com%2Fmna%2Fredisc%2F@v%2Fv1.1.7.mod 29 BLAKE2B d4d689507276a73adb634e8f54c0240a14d4d2d2975fcfa550133d484a7ece416074a60aa3fbc4563528811adf60106cdfa22fc4e72238f4e3dd9733257172f8 SHA512 9c8ecef0f5d41af8a180b68b186e5994f9f7ba4dc82e9cd8c2b8ca021354d9cfc9fb7712efdd5d3383e31c67530a8b501a618ec379a0671ace1bf51b6740437e
-DIST github.com%2Fmna%2Fredisc%2F@v%2Fv1.1.7.zip 67467 BLAKE2B 5297849e4611b161a292d65c2828586674edf75808c77f03d3e69f87f20298d4289e61323a935049f6139afd46e9b3430c15659abb140c825d19bf06a9ee764f SHA512 6ec6b81aab52057332f8f04c129b5770f6a6363f28a3d5ccbc715f270b8d18610423ad399bac434a84c47d34d6f367a23cb5f48bb98ba689bbcf1823d3050128
 DIST github.com%2Fmna%2Fredisc%2F@v%2Fv1.3.2.mod 122 BLAKE2B 804cd6f970439bf5e254e72220ea015f40e6f2935f4074e59610c3a478de60ba3506c918a4b2bc164268426d5aa62ebb8a633b7755d9b3db924ce51ead27e6bc SHA512 37777e38e95b31ff62c090190e97ded4a7c1c913f25a39ff9dfcf7d67846a9ed067be5abe082455276b84253954e4bc9a10f15975eeac418319db8952af10dd4
 DIST github.com%2Fmna%2Fredisc%2F@v%2Fv1.3.2.zip 72689 BLAKE2B 99ab1bb925aa29b40d6c8a50c593dfd6f0bafc3952ed7012082d2af6aff5a3778417bf92a10cc1971d90a71d1cf04e82bf2d4879581d88ca4b278733e984d54a SHA512 784b43cc2477e566a104f32d461656c750e5cf428e673915081478417c5a0d1cd05adeff4d8a04f398a10340d968921ae5d11872dd354bbfba78aae7caca3886
 DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod 39 BLAKE2B a4d082021123db99b5d72a1d8d0011a517a79ff7b07238f0f01e550be684f18be03907b6280e673aaabee5ea837ce14b9e4daf278a23605c8dca8fba76bf40ac SHA512 4f29e15b1d18a8952c14f5142aa863b77b7be820129512cfeb3f8bc3335ff637a8a86c0284832a20543abc2c5351a3c0f992d52db895385e45f176af899b5844
@@ -172,9 +165,6 @@ DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip 12433 BLAKE2B 0c911c9d1
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod 43 BLAKE2B 2bfedb841a10d8d6a861189203de74eb9bc6bc37bb10cdfc2404b1e972b7672568ed27d235e143d831cf2f840943c039398296cb78f1309f00d1ad9e0ce21056 SHA512 191cf6496c41b2b82c9a8f2ab2aeab63ede47807160f7cf746c548b3e92e367fc8f80ff8c6efbb7e91ca5903d5672b235c1ab9f14d3f9f988e8ff1c821d3b8bf
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod 535 BLAKE2B a8d3fb22b519e88dcb6b6f305a80c94e8b40fba8bdc96941230b354cc6bd8ec4bfd121b8e5ee57e9883e0b01b6224ff22a55fa8434bee1623133cf59489e64d0 SHA512 1d3646f93821b2ff1a4d80074f773eca22ff3675caca9d267762a31c1ec719ab464ba7ade7c8e2aa79b16a4f35f5a64f779fd909060a0c3056f09af77cebd655
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.11.0.mod 468 BLAKE2B 4ac6ec5b71271218f33b753092c494ec6dd01e73373df68af2f399d8d8ba32de0f02150c1c5fdac8518ac244391f126cdac602c63ec862bff559d76015cc78f5 SHA512 9c6244491c9a3012c4a2e575cdb361f7fa577f391ced254adfd8d567c361f073ce23ddd57a0f18ec3327189cf97ad737254c0d0ef2872085af6af7bf9dec1d72
-DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.11.0.zip 240896 BLAKE2B 4745181476be50303fdf0e66ec147d643995c809a1fd969c846f656d453025f2cd67089f3065b41bede74bfcaa65e5307dd9541457ed7f7ace31b6b567e2e135 SHA512 20c4e6baf239cbc8c8a754ec1b9ee814ff29df1b41332f75f7440b27864bc28397071f3f4d60ba6ff4d0aa531b7a20857e11ecca93057784f76f03876151e8f8
-DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.12.0.mod 413 BLAKE2B 5eb306f5a61cfcc4d5892d6b262802103cb2d11e29cc689ac8be2ae5e8be2ad159689354ada7810f7dd6feb447505779598abce2750f6586680726bd3bb6204b SHA512 b8e737ef2d333b1f9b648d92752dfb6bba4a0bcefbc2320743f4e3f02ba71fc2d7125439b418dc55d94756f77d55baa44175f11f215f4c300379afed619cf249
-DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.12.0.zip 271783 BLAKE2B 8e65fab03abe911b837cad124d18ce56f085d68c4b7bbd6580ede338406d6b4e4b89a535e15e2e4c447a5d201bf9c3cc54006cb9d8f8e518ba484c1c3fcf52a2 SHA512 4355556710959a157dce69934251814f03e58d7deb3cfbb7592f9dd32a644287207266900118b9a13f9fd3fb7ce7c2339a0303643102054189a150d6daea6292
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.12.1.mod 413 BLAKE2B 5eb306f5a61cfcc4d5892d6b262802103cb2d11e29cc689ac8be2ae5e8be2ad159689354ada7810f7dd6feb447505779598abce2750f6586680726bd3bb6204b SHA512 b8e737ef2d333b1f9b648d92752dfb6bba4a0bcefbc2320743f4e3f02ba71fc2d7125439b418dc55d94756f77d55baa44175f11f215f4c300379afed619cf249
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.12.1.zip 275396 BLAKE2B 57a2e5a4f238568875afc87abf5820d7d4056842452935bd3f8a234f80fe17864518fc38510f4601ebaef62d5f4a80bea0ba33c63429f72fd12211c86bfa02d4 SHA512 98ded72adfa9ee40591ee3bf1c332bbf426734c0e7c3f40978befc416e0e61823c9925f8d69c54996cd7b010daf0d4bf7a4d59bb00f6bc05eef4dc343d054cf4
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.mod 569 BLAKE2B 0c975c1c48f40792b02fd8756be3b6bc044ca05725ae179445a858baed4861011ba76051aa25fb10be23c6cf14738cb9cab928418be49d8ad85211d398089ec8 SHA512 6fe81bf3c591058f2ff968b3c6656766d9d3fd74c8577b3e7cfac17e463392eed3268248237d252c98751b2f97bc7c48a8db15bfc3fbcd4afbbaca0e2970819b
@@ -185,7 +175,6 @@ DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod 164 BLAKE2B ed42e8
 DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip 13785 BLAKE2B 2cd44410ea7af88683792807b0f2c31b0943d8664a4be050f2e422095ef3674e6d42f4b9b6a76083e13bc9f44be1578cb06a7389b4a4b201b5a88e756b40193c SHA512 db2396362357b6d5e99b21bd4aa8d8dc193dd2676a8f437c62eafae849a56a53875bce7411d58ad78e4fe36445b72ee1a34360b174a23ca84de911f5df189354
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.10.0.mod 817 BLAKE2B b4cabfb93633359c6ac6dcd400484e6162bc6b609bf0edfc4a82a2cc0137edef114d0d3e9c55bc47d1abd906d9ac00f9d84f07ee7072452c570ba9f98118f4b2 SHA512 7e1b17c424c8ec889d0efb0f5a171043ac0fffb48725144836d8ac635c036e877e65f34f75055359747142051afd00374cec9e39911175adddca2c50fde4c893
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.26.0.mod 794 BLAKE2B 91c9bb4469ac63bd98bdd1ce4d2f2cf3a233f62f6c30b1da0b2a94eb1215a975f3a19cf066c6bc5847fd1a642da6082b8377825987ab5ba21620c2ed9ef26af4 SHA512 05a0bd8a7de559925fc5ba7753d9fc80db41271fedfcd0ca3137f9620c68468c0bfb706e0b4915151657c74a5d64f52a5594736e19fa1421aa65124f551f0ddf
-DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.26.0.zip 175437 BLAKE2B e86832a3d0eea09f43735d7b45ec2335200d530bad4981da1d7cb12939d284cd769dab8e85412482c3b58a778cc910de6f5492765ff9745ec9a03b8276440411 SHA512 979628ae2384dde963f40dca23a77bd12138dad2b8d7bdd261cba5951678cf9287c47c335d40d4e7b54b561cc3101fcbd6eb7d9b1d039dc603917dbc84c1c4ef
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.32.1.mod 583 BLAKE2B a104cd758a5cc7962ce174ce93e8cdcb0320f4bc20b21ed3579a201e85ac851322ce06087d4f5514317731f97903a3e118d1001eb3ebd614158c1f7de9113e3e SHA512 550dd35c6ce6d98886c4f73ad3afedca13e12e39ba3c0958a4cf05a92db92187787591d33ebdbde6d961a451c615bed95cb75ec36b3e91ce0f2b12805d82d248
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.32.1.zip 180639 BLAKE2B 3f710b2121951ca11b7d5e8c4ce3d1131e679ec414d9881150da8e1117aedd39410ad1b75716a7f5e7ba2f01e2b5081dee36ca14d5aa0190cba0deea4aa3b4f7 SHA512 80533dd4a9a2bc03e8a74b19919e870f447e45cd0edad75822048412616963db9095411fb970d859b583e08b9302d99a75640bab185699d19fff1940b45beae2
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod 1223 BLAKE2B 969e069f2e210c2863b54504d62dec9ca606c485612ab1c42249e623a4bbde4e4ad0b41da30f83594b7efb4d4a44e0a68a5faa8c115263d73738773c35a98dab SHA512 02db8fa79cd8368060c72ba3925624c779bcc9e39817b6ed86ba143024959496db2c23c1aefe93a5d9f22b48e742072382e2ccaab430c1c9eae6254184e2358f
@@ -193,7 +182,6 @@ DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod 98 BLAKE2B 23576c142554e5a22a11d704cbff1bbaf1029518ceec7f04e22aa849763a7aa5e26ad1405a8cbc0d87097264a5fa7cfa3d655cad18148f5de6209a06580722d3 SHA512 0897ba1b7b4a32f206763327e138d3b460194097d19bedb8ee1bb6889b9d188afae9439178d1c2151fbe17b7d18545cd6cfebd050bade93cd39b435b35b6acdb
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.1.3.mod 198 BLAKE2B 9b5c175c915db6a1fdf18f440acf348e395fd2059e1f44fb1fd556e7c2c6821cfa397f88d2123f681b41fe5c5689ebc58c7c75865ef63f7f1c61fd8d323d8117 SHA512 7a54bddb87350ba24423842fcf1cd8b031be427e9f689467503d8d6a876691b209a5d2ac33d848a977d2c3890284d816fe4f2fa9391642010c96c3c0d691efcb
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.6.0.mod 198 BLAKE2B 954749eeaffd58f7885eff94ed89b9c933b2506dce66db05c8aa640fc7e8ff21032d855776ad091c86d43b77bd9e2d1db3cfa7b176f2984ea66c4a49b4373d9c SHA512 539fdd264ff10a459bf00eefdfcd2d3d079426cbcce7c4ecd27e1191d6392e0451804bddd5a39f7279e3c91e63a40ed882ebe1bcce7e71913d6109b7b6ba403b
-DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.6.0.zip 282768 BLAKE2B 22c62ac51bb14578571aa93f0acdecb984ca370b4617122078b28b8ec5ab4ac8cbd6e986d60335d5f9848028f51f94d8fcdae3d8b428c8d3c8196d97cb2f04db SHA512 1b73a550dfdda98e41da9ace048b230ba05bfe7518cec7b5f877c11afa58bdf9d53ad25fa848e316fcb5b25ff6eabb0a2d2688c1cfbd9642a8670b72c3f90a92
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.7.3.mod 198 BLAKE2B 954749eeaffd58f7885eff94ed89b9c933b2506dce66db05c8aa640fc7e8ff21032d855776ad091c86d43b77bd9e2d1db3cfa7b176f2984ea66c4a49b4373d9c SHA512 539fdd264ff10a459bf00eefdfcd2d3d079426cbcce7c4ecd27e1191d6392e0451804bddd5a39f7279e3c91e63a40ed882ebe1bcce7e71913d6109b7b6ba403b
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.7.3.zip 300924 BLAKE2B 986ae7378c18369c4c5448edd5a34e7b5b3f24a885069ad32b0b23366bd17484cf56d359950a4d9635ca93457a10b6dd87d470ecb1c8fdf7a3082903de72cd1f SHA512 f5c15caf8831c777f218a258ab186dff4c7fc34b2e04667695ba637e75d9039db18dd055c02aecdfbdaad71fb78e8e1308c4b520ef032d405ed6dba8acaf7d31
 DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod 73 BLAKE2B 21e3545a4518c64daac1cf36e47a2c8e1fc8ab7402372f2e871052d0dd9d83fc2aa44babb2f8751180cb66dcd2af82ed202afbf5ad3a219c4562da23ae8ce185 SHA512 4fd07ae7c00bcc135cc10a0b34ab102a893ed8ea4708f9d38da52f98b09fb66144f970ffd8795476fd6625b25c9e48390a5b1c5c99bd0c8d536a94201dc96613
@@ -208,7 +196,6 @@ DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod 35 BLAKE2B 0357260904c9ba
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod 154 BLAKE2B 60cd7801e7cd33746305cd636b048b25a86270ec3b29a21c3c078c7e95b769bce7e80c2c7c5474113786bd788c7f88f3719e34f02141038e0d161b36e32f39b9 SHA512 bb808fad059f5abd0171e4bdc724411eff2c7e8d303a4ffb3608a00e21bb3cfafe9e83b4b4e9bccd42c9a4331f67ddc6043e3dd5eaa9a122c86626eed43a8383
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod 179 BLAKE2B 3bb7cee3118f0d335ade107dfefc3a594dc3883564fe4c9e96d615e179d394a49a3d6cd6584ba9c684772bc3dc6479af6a168dd3841c03957252667384f6ba11 SHA512 243bf1f69c146252164ad72f853773dcc77f15d7c9e9b731bee26a95e7c8f4ce9ed9738db601b01edb82f4b3808873e1f153a6d4a0c97be0babbe65abc0f8d52
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod 188 BLAKE2B e47d78f037db3684a329905985b02b7ddf0a609ab4c69dd4346202ed0981712d54d0fa1b9c230b50d1857854edbbf77ee144d54b12c7c46833e6542d6034171e SHA512 70adf6a86dc6f934ee611f6aefa459f1287b7294297eb9221a747427d031b10c3e606696a656be4c2746a25480c322106099ea2bb360cbe782f4d03c85cd9fcb
-DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.zip 91883 BLAKE2B 8bb8f10ba7a3c719844dbbcbdbb87773487921f493cf6f72d1a9fd1d553f7f7784b01b9795a5c26a352490ed6d75c29a542a0b3d7c18d8888c57e447d9d227eb SHA512 c539cd964718439715caee454b38fdb61eb5d4e20489e10f7f6a030b4b941b2ca52d33f950c0b04149962399f0c3cb5b6a90efa2d79acc0f57a7f49d508c67c7
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.mod 216 BLAKE2B c597010cf6690e73cd265e800f0f0bbea331fb76217457b6326f5a19481eca044aa5426fa32519870b2f0f4b3bed95768a23d3138dbcc9739b7cf7e044f50668 SHA512 197e6ef15edb27ded67ccfb636c252fe522f0930ff012341a4b593f25b5dd8282e4f658970931cfdeb8f2c5ee0b4ebac6738fe7634bf00896d12270fcbf4b31b
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.zip 105564 BLAKE2B 7b082ff11190ff27ce4a3de68896fffbbbf80ebdead7612aa3b06981171974ad2935bee7d5d71cb9ea29b110a82b3e04447248e7b9376e84c8f3f53d5001ae4b SHA512 be80972112f0a3907bde960637cb2c08d6ba4256ca27cfa07de5a0a8e523d0dfbd8e90ae593e5302d7351b7dbddecf69dc3985a9d19b96087732dd886eff371f
 DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.25.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
@@ -335,7 +322,6 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod 33 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210124154548-22da62e12c0c.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210423082822-04245dca01da.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210603081109-ebe580a85c40.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210603081109-ebe580a85c40.zip 1639382 BLAKE2B 3d70aca9182ad2dd59a1260987d32b876da2d668a5181e6a94ce07f252399a5e861787ef0ddf5d3fb45a93c77b3289243fe23f724150f0719c0519dbc9db6a3e SHA512 ef385003c7858782b40f36e70eb0d4af9c9b18cf705872e474c7720eb2de61b889a6a9c85a2c9e1ecde43522cab440f97afba80598ab26f1c11703fe1e76eb77
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20220114195835-da31bd327af9.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20220114195835-da31bd327af9.zip 1702263 BLAKE2B 29a01d1ca503380ebac78949fcdb048c5bb483d58c3ee1cb02772619b2e6af3e616ecc804266ebe114d14caffe99b974a9b781cce24fbc0045298a8deaab77e8 SHA512 2afbc059e6d0e502ebbbb9ea8b09b650eff59f0793d6ee0723a099abbb8de50d1901c98bba503c1281c0479def247f664251269b7c0733a56a1180b497fe889d
 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
@@ -391,7 +377,6 @@ DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200825202427-b303f430e36d.mod 271 BL
 DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
 DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
 DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
-DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip 22282 BLAKE2B 68df6b35d9043f23df13432b80074544f46833467294955ae5706713055d0cc9ababda892853c14e99c80a3571fd4a807a019a098fdd2ca695ba90c577ead5c4 SHA512 c72b8b73f89624889a2874c1b2445cb82f0e545fccf6a7761a278f3f659eb19f5f1c8585641b8f89f2bcfc3817ad2c0e267751cfeeab949e287e43af5df57e28
 DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
 DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip 22295 BLAKE2B 310f892b8ce32810a1afef53335428d73bc23e749e52d00d7624afea2d10422b1b73507026daf23efd2384b81262c4c7862c22da23f6fb43c1b5f79a51170d5e SHA512 34044424d303f5032d4fd302bbf1aca390d45e876583cc223fddf0d685a6eec2bde0a4c1b82c4e471eb5be97fc8aea9b14695b07940d1ecde806636a85d12051
 DIST google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod 851 BLAKE2B 16f0842a8e0082a8532a7c8f5cf5092cd196a90197b3e05c6fe0275e10390e0b97477f60c07d26b422d0da9289fe3c8f2d8fb8fe2fec63af9e005adc26921724 SHA512 bd693c28b65c1b369f89a6b1926a127c91df98feb137ab5595bf141c1a67e3adcf25f79b4cbf3e4c44755d45b9f4876dacafbf18afa1e8c09fd89a8f9d0e9330
@@ -468,7 +453,6 @@ DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.m
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.24.0.mod 186 BLAKE2B ac72ab4b58c29ea036b52ea6972dba93b3ff95ceea9b476355b14bc335bfb99ac350101e70ec678bfb6656157679f3dd42a200a1531b982ad9c995c5063ad541 SHA512 d9197910537264ba24d95110f470ce2b057b795e7244bcae423ea922a8eb4f2c89df3b6dceb58e71cc7ba1f68ccaa3dfa78d7c26d63f5949d4014b8df336512c
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod 186 BLAKE2B 7df4a9ba66d7fcfc40d73332ba6fcece38a38ffef4e9686fe7887272cdc81904438cfdd0e733224058289d24ee23efe087ed9a2b4f2dc31e7213bc3038ed9512 SHA512 1b0e5543fcdbca876b51ed261aa7b8abf09e985e4622111d46378893b7a2bbad882135fc1eb26ebbf97078800f6ad9f2983dd11c62a8aaa2ab1a4f0774585e65
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0-rc.1.mod 83 BLAKE2B 0e4901ba1d4e31ef22f0f978ee7b7d926ac2cd3a1cb5d8d8a81a33e02f9dc81aad6508280d65659862c3a9bc0667c334cb6cd8c0c532d5fdb3735a415c2a5eca SHA512 a7b2aad691925341e3d1f6d1d1453b68386902a4e2e1c0deb406bc157d04328c5519a01ce938a33a6e358cbd9dc0c2f862c9822bde5314d2eb9d416d7bf789d2
-DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0-rc.1.zip 1561863 BLAKE2B 45adceaa2751d3fd4fc1b55517aa1b11708013db858c4f52e3a8435629542a89fb53cc69fcc9f1b1345ce488c550d57ef0465313154d60a5a2fd958db75499f7 SHA512 b88c991dd4b03a46e8e5becfe22b50130a185988eaef4c0504a4da9dd3af7be7a060d1b8aedc199092d9813bd7ddc06a105340aa2925b6cc6246b2100b6df279
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.mod 123 BLAKE2B 73f875413489557d8f0bbcd665c06356b900f87e2cd9ef0ee5aba218a3a910842912d36dc9e653afa538c99cc723d28327a8bec6eac1f6bd93277d70fa891339 SHA512 d618524aca1cb3e525060bb66b0c8f06c9ad6be5389be228d265dbcdb368442f4f0a7e98f8c9082916b2579d77e627a550904f0b1c058b7d5e45eb7ceb77c2e0
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.zip 1557709 BLAKE2B bc672854cc46d48461bf28395c5be02fe99ff9da1d23e212078e549bf3e2beeaf953cc185e059c73a374f3e2662cb81fd6c3ff53472934964b8461f370b51a78 SHA512 de309c033d05be35503d6073e14ead585db4e6b75d478a674a37f93c7757e914c67bad446cf7ce04ccd49659d1ab2f9a024ee639a7536480ef92bb6b8b52dfdb
 DIST gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod 38 BLAKE2B e7781691d8c15b764ef6c89fcdf20e69fc28d46e8df2703b6fdc342247595c10ed25e3cc5b30cd29b81c57837f5685e4122e1b2c218a51fffbb1567c85b0835a SHA512 585188d3a75067e6b7d8a8321959fe7df80c6a19f8668a87f0d1b8687c4d2cefc039167446f6d02f7eeeb147371bc7a673348213bcb07f4d90bebc0ccf9f2015
@@ -482,7 +466,6 @@ DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e9102
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
-DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.zip 80765 BLAKE2B d6d8bfba5082aabb1a247add43b21ffa058b58fef60e8efbf973b724273cda2496ef0c9b226ad14bfea17f141f077d3bd98dfe3dbcf3c2938fd64570abd662b2 SHA512 2a89b2bce856cc11f3b71edec9e538048acf07f6aabbe27236b663b284c086c5862f086734e58727e9db8912a113fea51f72dad1a45a9e85860764f9c27b19d2
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.mod 95 BLAKE2B 888532a43aa7569fc03a62d78507081f30342eb4be40c01252683b16cd3658dd7b30d5f8a071dffe2c05f57bbee3afbc1ee4324c471788c633a878d498ff7d57 SHA512 2790882fbfa812468b9b3443630b1f1ee67a968eb20da8e4a1bfd410e4b516a8a7e77c07414b64f17e11e2151161b85d019e172cc833a45b19e66d4c70f89f82
 DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
 DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip 101467 BLAKE2B 8bb0aec8e693a4c0da59f1931e1fdcf6f94a236faba149d5af91e87284f39c693d20be65248eecde739cb555e371804fa6c723a56c69e6d02a347ba908e968b1 SHA512 bee7757d760f5ba1b9f7523af358652a5cb65f2b0064da097f78450871b2636efcbab0298a9871bbb3ce8012bf95a155949251d4f61464dde510097b936b47a8
@@ -493,10 +476,8 @@ DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod 26 BLA
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod 300 BLAKE2B 3e3f5a2be0918cbaacd5e43e59fcc6c7c6999645f0c9214cd5a522c31d34b6d3dad61e3ddae8ccdb2f3f0d90b406c047802ee3d9d54dc40fe6eff9cd35620792 SHA512 0c8aa788d0c03d6d049f0dd7468d0f81ce2131ccedd5a5a3a18362b7d30eef7ef325277844eefe4b707b1ad71c6f83a44e110b7af7b98e05406d347237a7bafb
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod 300 BLAKE2B 3aa707c72ce7e402cc1765fed30253eb87e9e87aecc8096130e973623f53ded2a7572ca3d464e4db9de524cd651b3aa8fbc9fa0ef6bdc4eb9670b4d8652f4dfc SHA512 d814675e448688f6a506397bedb262fb2583c913ec1f8ca9ffc11206bdcd7e1f4ee3c561aee366eb2cdaede8c522a6f58f116236f3033bc7e91ec139bdd140f9
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.4.mod 300 BLAKE2B 3aa707c72ce7e402cc1765fed30253eb87e9e87aecc8096130e973623f53ded2a7572ca3d464e4db9de524cd651b3aa8fbc9fa0ef6bdc4eb9670b4d8652f4dfc SHA512 d814675e448688f6a506397bedb262fb2583c913ec1f8ca9ffc11206bdcd7e1f4ee3c561aee366eb2cdaede8c522a6f58f116236f3033bc7e91ec139bdd140f9
-DIST redis_exporter-1.31.3.tar.gz 172115 BLAKE2B f576deff171a9769644a2085f0c5905e5053edf6b92242603ae82aea79fad486541d35b7ebb5d081ac9901caf7ecaeda5914bdbb41a6cfac9fed16f9ecde4659 SHA512 54aad6ed2ee136120af2246a924b1bd8891f75813791490c72cf3b68d7c2ab2f4675eafefd95cbba05080c012ffa05195296034e676e8bcf6f1bf3275abdc39a
-DIST redis_exporter-1.32.0.tar.gz 172639 BLAKE2B d6cf9e8c6d11fd9053d557577917e03c1681551f03bca0623f4d02f9a693990ea1396084213e8093a324acf7566a8914283209d2ccb960ff1fedfd6f7dc66d0e SHA512 e6cfdd0af6b39beebdd7af6ceb4006fbbc2133ff474bc8674a04903aefa62aadc745bb8df7115899d47da695dc62318c044070c68dd34f34602228f592b440e0
-DIST redis_exporter-1.34.1.tar.gz 185153 BLAKE2B 9db3cfb85952f7c517f1039a7ee11dd1774eef57447859f4aa8f99d5823474c99eea6673c2bca24bf42269246ec04556493a7c8d53c84f8b93b2e865bc097155 SHA512 824dac6696ea0d1d3bc983b5926b4c047f04a43fee612e8994b17709b96b485375139f924a9e4faf4689d97f954081166972efa6e603f9154fbe2a5ca2c3a825
 DIST redis_exporter-1.35.0.tar.gz 185150 BLAKE2B 57b39088f4f2fece0edaf59c551777e5b3f018906175c767dc81e0434d0238f44ce365d8e6c28ab5dfb56996e672c834ea2f0d7c0dd84e3efee5dcfb920ae262 SHA512 dfa9da08bb9d8f80af46901ed31b88873ef4fce5b4406a0447984ce70288dff1dbb485f83697a0bacc6db0e1234f6476a0f28b2e80dd41be1796415c33c8c08c
+DIST redis_exporter-1.35.1.tar.gz 185831 BLAKE2B 7d296d6dcaa3c61be76e3eed602fdfe7fd8b68fab0bf39fc8412c2e377aa01a230d7f44a3f09ed29c9308e3794da7db8780604feef218964fbc4445fc6b1bd03 SHA512 7c0ac25d0fed6b760593bf9fd08eb259d46d0690606da587d553bcd4c168ada3c87fe63d5082468a2c1ebfc20531a2de39219e3f201402d5b06f4238d7525b69
 DIST rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod 36 BLAKE2B 61110bed2b9e99e0250cf6e8b842257202c89b3462edf9368b73cab29f9dbd4dcc66c3e290a1d6329b7d62321eecc52082a8c4c0797eac743a29a8a00910a93f SHA512 db50ff677b0bdccbc1a1ad3df7c5cc76f2fcccf3ab99d08d1c2868440eb9b893fe89452f4286f7d42f2f16abf0f4acda67fe86e174dcfa730a743aafcc166774
 DIST rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod 55 BLAKE2B f1f0ba35f0ffd200ed37c06b2025c1fd436e3fd857bd525b9295c0cbcade7e1f037e3f566124a7ef428384d50525426f0d40468c967e39bac6057174710e2566 SHA512 e6357ddd7d09692c60e59e6cb80469ade8284052cdd3ea520ec4dbcb42c1cabe045c599e43cce94bec022bd82e87a554ecac42f8c917cf2ff44daff9c1a147d5
 DIST rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod 88 BLAKE2B c2ac3c9619e396db470c9951dfc11cdacccd56ae09b3b353015ee7e5fbb023df288dbf48d81b44c309241d1ea89a2e0ee42ee1d17e536fcfa531aaee0e651ab7 SHA512 2137507eb25fbae419605e0cd6bca4cfa584110eebc276cd759a4dcb6f97e52928e5b2d9b276e76bcabcec3bbfc2c42f97fa29f54695d27fb00f9423e1638863

app-metrics/redis_exporter/redis_exporter-1.31.3.ebuild

@@ -1,215 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module systemd
-EGIT_COMMIT=21bc8a0d5a1f6abe344d0aa148238656a25b8ea3
-
-DESCRIPTION="Prometheus Exporter for Redis Metrics. Supports Redis 2.x, 3.x and 4.x"
-HOMEPAGE="https://github.com/oliver006/redis_exporter"
-EGO_SUM=(
-"cloud.google.com/go v0.34.0/go.mod"
-"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
-"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
-"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
-"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
-"github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod"
-"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
-"github.com/beorn7/perks v1.0.0/go.mod"
-"github.com/beorn7/perks v1.0.1"
-"github.com/beorn7/perks v1.0.1/go.mod"
-"github.com/cespare/xxhash/v2 v2.1.1"
-"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
-"github.com/davecgh/go-spew v1.1.0/go.mod"
-"github.com/davecgh/go-spew v1.1.1"
-"github.com/davecgh/go-spew v1.1.1/go.mod"
-"github.com/go-kit/kit v0.8.0/go.mod"
-"github.com/go-kit/kit v0.9.0/go.mod"
-"github.com/go-kit/log v0.1.0/go.mod"
-"github.com/go-logfmt/logfmt v0.3.0/go.mod"
-"github.com/go-logfmt/logfmt v0.4.0/go.mod"
-"github.com/go-logfmt/logfmt v0.5.0/go.mod"
-"github.com/go-stack/stack v1.8.0/go.mod"
-"github.com/gogo/protobuf v1.1.1/go.mod"
-"github.com/golang/protobuf v1.2.0/go.mod"
-"github.com/golang/protobuf v1.3.1/go.mod"
-"github.com/golang/protobuf v1.3.2/go.mod"
-"github.com/golang/protobuf v1.4.0-rc.1/go.mod"
-"github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod"
-"github.com/golang/protobuf v1.4.0-rc.2/go.mod"
-"github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod"
-"github.com/golang/protobuf v1.4.0/go.mod"
-"github.com/golang/protobuf v1.4.2/go.mod"
-"github.com/golang/protobuf v1.4.3"
-"github.com/golang/protobuf v1.4.3/go.mod"
-"github.com/gomodule/redigo v1.8.5"
-"github.com/gomodule/redigo v1.8.5/go.mod"
-"github.com/google/go-cmp v0.3.0/go.mod"
-"github.com/google/go-cmp v0.3.1/go.mod"
-"github.com/google/go-cmp v0.4.0/go.mod"
-"github.com/google/go-cmp v0.5.4/go.mod"
-"github.com/google/go-cmp v0.5.5"
-"github.com/google/go-cmp v0.5.5/go.mod"
-"github.com/google/gofuzz v1.0.0/go.mod"
-"github.com/jpillora/backoff v1.0.0/go.mod"
-"github.com/json-iterator/go v1.1.6/go.mod"
-"github.com/json-iterator/go v1.1.10/go.mod"
-"github.com/json-iterator/go v1.1.11/go.mod"
-"github.com/julienschmidt/httprouter v1.2.0/go.mod"
-"github.com/julienschmidt/httprouter v1.3.0/go.mod"
-"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
-"github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod"
-"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
-"github.com/kr/pretty v0.1.0"
-"github.com/kr/pretty v0.1.0/go.mod"
-"github.com/kr/pty v1.1.1/go.mod"
-"github.com/kr/text v0.1.0"
-"github.com/kr/text v0.1.0/go.mod"
-"github.com/matttproud/golang_protobuf_extensions v1.0.1"
-"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
-"github.com/mna/redisc v1.1.7"
-"github.com/mna/redisc v1.1.7/go.mod"
-"github.com/mna/redisc v1.3.2"
-"github.com/mna/redisc v1.3.2/go.mod"
-"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
-"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
-"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
-"github.com/modern-go/reflect2 v1.0.1/go.mod"
-"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
-"github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod"
-"github.com/pkg/errors v0.8.0/go.mod"
-"github.com/pkg/errors v0.8.1/go.mod"
-"github.com/pkg/errors v0.9.1/go.mod"
-"github.com/pmezard/go-difflib v1.0.0"
-"github.com/pmezard/go-difflib v1.0.0/go.mod"
-"github.com/prometheus/client_golang v0.9.1/go.mod"
-"github.com/prometheus/client_golang v1.0.0/go.mod"
-"github.com/prometheus/client_golang v1.7.1/go.mod"
-"github.com/prometheus/client_golang v1.11.0"
-"github.com/prometheus/client_golang v1.11.0/go.mod"
-"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
-"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
-"github.com/prometheus/client_model v0.2.0"
-"github.com/prometheus/client_model v0.2.0/go.mod"
-"github.com/prometheus/common v0.4.1/go.mod"
-"github.com/prometheus/common v0.10.0/go.mod"
-"github.com/prometheus/common v0.26.0"
-"github.com/prometheus/common v0.26.0/go.mod"
-"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
-"github.com/prometheus/procfs v0.0.2/go.mod"
-"github.com/prometheus/procfs v0.1.3/go.mod"
-"github.com/prometheus/procfs v0.6.0"
-"github.com/prometheus/procfs v0.6.0/go.mod"
-"github.com/sirupsen/logrus v1.2.0/go.mod"
-"github.com/sirupsen/logrus v1.4.2/go.mod"
-"github.com/sirupsen/logrus v1.6.0/go.mod"
-"github.com/sirupsen/logrus v1.8.1"
-"github.com/sirupsen/logrus v1.8.1/go.mod"
-"github.com/stretchr/objx v0.1.0/go.mod"
-"github.com/stretchr/objx v0.1.1/go.mod"
-"github.com/stretchr/testify v1.2.2/go.mod"
-"github.com/stretchr/testify v1.3.0/go.mod"
-"github.com/stretchr/testify v1.4.0/go.mod"
-"github.com/stretchr/testify v1.5.1"
-"github.com/stretchr/testify v1.5.1/go.mod"
-"github.com/stretchr/testify v1.7.0/go.mod"
-"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
-"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
-"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
-"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
-"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
-"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
-"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
-"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
-"golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod"
-"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
-"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
-"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
-"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
-"golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod"
-"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
-"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
-"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
-"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
-"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
-"golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod"
-"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
-"golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod"
-"golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod"
-"golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod"
-"golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40"
-"golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod"
-"golang.org/x/text v0.3.0/go.mod"
-"golang.org/x/text v0.3.2/go.mod"
-"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
-"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
-"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
-"google.golang.org/appengine v1.4.0/go.mod"
-"google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
-"google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
-"google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
-"google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod"
-"google.golang.org/protobuf v1.21.0/go.mod"
-"google.golang.org/protobuf v1.23.0/go.mod"
-"google.golang.org/protobuf v1.26.0-rc.1"
-"google.golang.org/protobuf v1.26.0-rc.1/go.mod"
-"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
-"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
-"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
-"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
-"gopkg.in/yaml.v2 v2.2.1/go.mod"
-"gopkg.in/yaml.v2 v2.2.2/go.mod"
-"gopkg.in/yaml.v2 v2.2.4/go.mod"
-"gopkg.in/yaml.v2 v2.2.5/go.mod"
-"gopkg.in/yaml.v2 v2.3.0"
-"gopkg.in/yaml.v2 v2.3.0/go.mod"
-"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
-)
-go-module_set_globals
-SRC_URI="https://github.com/oliver006/redis_exporter/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_SUM_SRC_URI}"
-
-LICENSE="MIT Apache-2.0 BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-RDEPEND="
-	acct-user/redis_exporter
-	acct-group/redis_exporter"
-DEPEND="${RDEPEND}"
-RESTRICT+=" test"
-
-src_prepare() {
-	default
-	sed -e "s|\(^[[:space:]]*VERSION[[:space:]]*=[[:space:]]*\).*|\1\"${PV}\"|" \
-		-e "s|\(^[[:space:]]*BUILD_DATE[[:space:]]*=[[:space:]]*\).*|\1\"$(LC_ALL=C date -u)\"|" \
-		-e "s|\(^[[:space:]]*COMMIT_SHA1[[:space:]]*=[[:space:]]*\).*|\1\"${EGIT_COMMIT}\"|" \
-		-i main.go || die
-}
-
-src_compile() {
-	export GOBIN="${S}/bin"
-	go install \
-		-ldflags="-X main.BuildVersion=${PV} -X main.BuildCommitSha=${EGIT_COMMIT} -X main.BuildDate=$(date +%F-%T)" \
-		./... || die
-}
-
-src_test() {
-	go test -work ./... || die
-}
-
-src_install() {
-	dobin "${GOBIN}/redis_exporter"
-	dodoc README.md
-	local dir
-	for dir in /var/{lib,log}/${PN}; do
-		keepdir "${dir}"
-		fowners ${PN}:${PN} "${dir}"
-	done
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}

app-metrics/redis_exporter/redis_exporter-1.32.0.ebuild

@@ -1,217 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module systemd
-EGIT_COMMIT=224802c8d728c488e41db890f64cd33543724b5b
-
-DESCRIPTION="Prometheus Exporter for Redis Metrics. Supports Redis 2.x, 3.x and 4.x"
-HOMEPAGE="https://github.com/oliver006/redis_exporter"
-EGO_SUM=(
-"cloud.google.com/go v0.34.0/go.mod"
-"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
-"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
-"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
-"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
-"github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod"
-"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
-"github.com/beorn7/perks v1.0.0/go.mod"
-"github.com/beorn7/perks v1.0.1"
-"github.com/beorn7/perks v1.0.1/go.mod"
-"github.com/cespare/xxhash/v2 v2.1.1"
-"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
-"github.com/davecgh/go-spew v1.1.0/go.mod"
-"github.com/davecgh/go-spew v1.1.1"
-"github.com/davecgh/go-spew v1.1.1/go.mod"
-"github.com/go-kit/kit v0.8.0/go.mod"
-"github.com/go-kit/kit v0.9.0/go.mod"
-"github.com/go-kit/log v0.1.0/go.mod"
-"github.com/go-logfmt/logfmt v0.3.0/go.mod"
-"github.com/go-logfmt/logfmt v0.4.0/go.mod"
-"github.com/go-logfmt/logfmt v0.5.0/go.mod"
-"github.com/go-stack/stack v1.8.0/go.mod"
-"github.com/gogo/protobuf v1.1.1/go.mod"
-"github.com/golang/protobuf v1.2.0/go.mod"
-"github.com/golang/protobuf v1.3.1/go.mod"
-"github.com/golang/protobuf v1.3.2/go.mod"
-"github.com/golang/protobuf v1.4.0-rc.1/go.mod"
-"github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod"
-"github.com/golang/protobuf v1.4.0-rc.2/go.mod"
-"github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod"
-"github.com/golang/protobuf v1.4.0/go.mod"
-"github.com/golang/protobuf v1.4.2/go.mod"
-"github.com/golang/protobuf v1.4.3"
-"github.com/golang/protobuf v1.4.3/go.mod"
-"github.com/gomodule/redigo v1.8.5"
-"github.com/gomodule/redigo v1.8.5/go.mod"
-"github.com/gomodule/redigo v1.8.6"
-"github.com/gomodule/redigo v1.8.6/go.mod"
-"github.com/google/go-cmp v0.3.0/go.mod"
-"github.com/google/go-cmp v0.3.1/go.mod"
-"github.com/google/go-cmp v0.4.0/go.mod"
-"github.com/google/go-cmp v0.5.4/go.mod"
-"github.com/google/go-cmp v0.5.5"
-"github.com/google/go-cmp v0.5.5/go.mod"
-"github.com/google/gofuzz v1.0.0/go.mod"
-"github.com/jpillora/backoff v1.0.0/go.mod"
-"github.com/json-iterator/go v1.1.6/go.mod"
-"github.com/json-iterator/go v1.1.10/go.mod"
-"github.com/json-iterator/go v1.1.11/go.mod"
-"github.com/julienschmidt/httprouter v1.2.0/go.mod"
-"github.com/julienschmidt/httprouter v1.3.0/go.mod"
-"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
-"github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod"
-"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
-"github.com/kr/pretty v0.1.0"
-"github.com/kr/pretty v0.1.0/go.mod"
-"github.com/kr/pty v1.1.1/go.mod"
-"github.com/kr/text v0.1.0"
-"github.com/kr/text v0.1.0/go.mod"
-"github.com/matttproud/golang_protobuf_extensions v1.0.1"
-"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
-"github.com/mna/redisc v1.1.7"
-"github.com/mna/redisc v1.1.7/go.mod"
-"github.com/mna/redisc v1.3.2"
-"github.com/mna/redisc v1.3.2/go.mod"
-"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
-"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
-"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
-"github.com/modern-go/reflect2 v1.0.1/go.mod"
-"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
-"github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod"
-"github.com/pkg/errors v0.8.0/go.mod"
-"github.com/pkg/errors v0.8.1/go.mod"
-"github.com/pkg/errors v0.9.1/go.mod"
-"github.com/pmezard/go-difflib v1.0.0"
-"github.com/pmezard/go-difflib v1.0.0/go.mod"
-"github.com/prometheus/client_golang v0.9.1/go.mod"
-"github.com/prometheus/client_golang v1.0.0/go.mod"
-"github.com/prometheus/client_golang v1.7.1/go.mod"
-"github.com/prometheus/client_golang v1.11.0"
-"github.com/prometheus/client_golang v1.11.0/go.mod"
-"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
-"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
-"github.com/prometheus/client_model v0.2.0"
-"github.com/prometheus/client_model v0.2.0/go.mod"
-"github.com/prometheus/common v0.4.1/go.mod"
-"github.com/prometheus/common v0.10.0/go.mod"
-"github.com/prometheus/common v0.26.0"
-"github.com/prometheus/common v0.26.0/go.mod"
-"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
-"github.com/prometheus/procfs v0.0.2/go.mod"
-"github.com/prometheus/procfs v0.1.3/go.mod"
-"github.com/prometheus/procfs v0.6.0"
-"github.com/prometheus/procfs v0.6.0/go.mod"
-"github.com/sirupsen/logrus v1.2.0/go.mod"
-"github.com/sirupsen/logrus v1.4.2/go.mod"
-"github.com/sirupsen/logrus v1.6.0/go.mod"
-"github.com/sirupsen/logrus v1.8.1"
-"github.com/sirupsen/logrus v1.8.1/go.mod"
-"github.com/stretchr/objx v0.1.0/go.mod"
-"github.com/stretchr/objx v0.1.1/go.mod"
-"github.com/stretchr/testify v1.2.2/go.mod"
-"github.com/stretchr/testify v1.3.0/go.mod"
-"github.com/stretchr/testify v1.4.0/go.mod"
-"github.com/stretchr/testify v1.5.1"
-"github.com/stretchr/testify v1.5.1/go.mod"
-"github.com/stretchr/testify v1.7.0/go.mod"
-"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
-"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
-"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
-"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
-"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
-"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
-"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
-"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
-"golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod"
-"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
-"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
-"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
-"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
-"golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod"
-"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
-"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
-"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
-"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
-"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
-"golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod"
-"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
-"golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod"
-"golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod"
-"golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod"
-"golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40"
-"golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod"
-"golang.org/x/text v0.3.0/go.mod"
-"golang.org/x/text v0.3.2/go.mod"
-"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
-"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
-"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
-"google.golang.org/appengine v1.4.0/go.mod"
-"google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
-"google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
-"google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
-"google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod"
-"google.golang.org/protobuf v1.21.0/go.mod"
-"google.golang.org/protobuf v1.23.0/go.mod"
-"google.golang.org/protobuf v1.26.0-rc.1"
-"google.golang.org/protobuf v1.26.0-rc.1/go.mod"
-"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
-"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
-"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
-"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
-"gopkg.in/yaml.v2 v2.2.1/go.mod"
-"gopkg.in/yaml.v2 v2.2.2/go.mod"
-"gopkg.in/yaml.v2 v2.2.4/go.mod"
-"gopkg.in/yaml.v2 v2.2.5/go.mod"
-"gopkg.in/yaml.v2 v2.3.0"
-"gopkg.in/yaml.v2 v2.3.0/go.mod"
-"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
-)
-go-module_set_globals
-SRC_URI="https://github.com/oliver006/redis_exporter/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_SUM_SRC_URI}"
-
-LICENSE="MIT Apache-2.0 BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-RDEPEND="
-	acct-user/redis_exporter
-	acct-group/redis_exporter"
-DEPEND="${RDEPEND}"
-RESTRICT+=" test"
-
-src_prepare() {
-	default
-	sed -e "s|\(^[[:space:]]*VERSION[[:space:]]*=[[:space:]]*\).*|\1\"${PV}\"|" \
-		-e "s|\(^[[:space:]]*BUILD_DATE[[:space:]]*=[[:space:]]*\).*|\1\"$(LC_ALL=C date -u)\"|" \
-		-e "s|\(^[[:space:]]*COMMIT_SHA1[[:space:]]*=[[:space:]]*\).*|\1\"${EGIT_COMMIT}\"|" \
-		-i main.go || die
-}
-
-src_compile() {
-	export GOBIN="${S}/bin"
-	go install \
-		-ldflags="-X main.BuildVersion=${PV} -X main.BuildCommitSha=${EGIT_COMMIT} -X main.BuildDate=$(date +%F-%T)" \
-		./... || die
-}
-
-src_test() {
-	go test -work ./... || die
-}
-
-src_install() {
-	dobin "${GOBIN}/redis_exporter"
-	dodoc README.md
-	local dir
-	for dir in /var/{lib,log}/${PN}; do
-		keepdir "${dir}"
-		fowners ${PN}:${PN} "${dir}"
-	done
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}

app-metrics/redis_exporter/redis_exporter-1.35.1.ebuild

@@ -3,7 +3,7 @@
 
 EAPI=7
 inherit go-module systemd
-EGIT_COMMIT=43cc97dfbaa92ced42a76a661bec9018a9b675fc
+EGIT_COMMIT=a8f5b9cb192081fea5c95cf07dd5d13edd169389
 
 DESCRIPTION="Prometheus Exporter for Redis Metrics. Supports Redis 2.x, 3.x and 4.x"
 HOMEPAGE="https://github.com/oliver006/redis_exporter"
@@ -53,7 +53,6 @@ EGO_SUM=(
 "github.com/beorn7/perks v1.0.1"
 "github.com/beorn7/perks v1.0.1/go.mod"
 "github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
-"github.com/cespare/xxhash/v2 v2.1.1"
 "github.com/cespare/xxhash/v2 v2.1.1/go.mod"
 "github.com/cespare/xxhash/v2 v2.1.2"
 "github.com/cespare/xxhash/v2 v2.1.2/go.mod"
@@ -104,15 +103,11 @@ EGO_SUM=(
 "github.com/golang/protobuf v1.4.0/go.mod"
 "github.com/golang/protobuf v1.4.1/go.mod"
 "github.com/golang/protobuf v1.4.2/go.mod"
-"github.com/golang/protobuf v1.4.3"
 "github.com/golang/protobuf v1.4.3/go.mod"
 "github.com/golang/protobuf v1.5.0/go.mod"
 "github.com/golang/protobuf v1.5.2"
 "github.com/golang/protobuf v1.5.2/go.mod"
-"github.com/gomodule/redigo v1.8.5"
 "github.com/gomodule/redigo v1.8.5/go.mod"
-"github.com/gomodule/redigo v1.8.6"
-"github.com/gomodule/redigo v1.8.6/go.mod"
 "github.com/gomodule/redigo v1.8.8"
 "github.com/gomodule/redigo v1.8.8/go.mod"
 "github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
@@ -163,8 +158,6 @@ EGO_SUM=(
 "github.com/kr/text v0.1.0/go.mod"
 "github.com/matttproud/golang_protobuf_extensions v1.0.1"
 "github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
-"github.com/mna/redisc v1.1.7"
-"github.com/mna/redisc v1.1.7/go.mod"
 "github.com/mna/redisc v1.3.2"
 "github.com/mna/redisc v1.3.2/go.mod"
 "github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
@@ -182,10 +175,9 @@ EGO_SUM=(
 "github.com/prometheus/client_golang v0.9.1/go.mod"
 "github.com/prometheus/client_golang v1.0.0/go.mod"
 "github.com/prometheus/client_golang v1.7.1/go.mod"
-"github.com/prometheus/client_golang v1.11.0"
 "github.com/prometheus/client_golang v1.11.0/go.mod"
-"github.com/prometheus/client_golang v1.12.0"
-"github.com/prometheus/client_golang v1.12.0/go.mod"
+"github.com/prometheus/client_golang v1.12.1"
+"github.com/prometheus/client_golang v1.12.1/go.mod"
 "github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
 "github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
 "github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
@@ -193,14 +185,12 @@ EGO_SUM=(
 "github.com/prometheus/client_model v0.2.0/go.mod"
 "github.com/prometheus/common v0.4.1/go.mod"
 "github.com/prometheus/common v0.10.0/go.mod"
-"github.com/prometheus/common v0.26.0"
 "github.com/prometheus/common v0.26.0/go.mod"
 "github.com/prometheus/common v0.32.1"
 "github.com/prometheus/common v0.32.1/go.mod"
 "github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
 "github.com/prometheus/procfs v0.0.2/go.mod"
 "github.com/prometheus/procfs v0.1.3/go.mod"
-"github.com/prometheus/procfs v0.6.0"
 "github.com/prometheus/procfs v0.6.0/go.mod"
 "github.com/prometheus/procfs v0.7.3"
 "github.com/prometheus/procfs v0.7.3/go.mod"
@@ -215,8 +205,8 @@ EGO_SUM=(
 "github.com/stretchr/testify v1.2.2/go.mod"
 "github.com/stretchr/testify v1.3.0/go.mod"
 "github.com/stretchr/testify v1.4.0/go.mod"
-"github.com/stretchr/testify v1.5.1"
 "github.com/stretchr/testify v1.5.1/go.mod"
+"github.com/stretchr/testify v1.7.0"
 "github.com/stretchr/testify v1.7.0/go.mod"
 "github.com/yuin/goldmark v1.1.25/go.mod"
 "github.com/yuin/goldmark v1.1.27/go.mod"
@@ -341,7 +331,6 @@ EGO_SUM=(
 "golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
 "golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod"
 "golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod"
-"golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40"
 "golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod"
 "golang.org/x/sys v0.0.0-20220114195835-da31bd327af9"
 "golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod"
@@ -397,8 +386,8 @@ EGO_SUM=(
 "golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod"
 "golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
 "golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod"
-"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
 "golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
+"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1"
 "golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod"
 "google.golang.org/api v0.4.0/go.mod"
 "google.golang.org/api v0.7.0/go.mod"
@@ -473,7 +462,6 @@ EGO_SUM=(
 "google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod"
 "google.golang.org/protobuf v1.24.0/go.mod"
 "google.golang.org/protobuf v1.25.0/go.mod"
-"google.golang.org/protobuf v1.26.0-rc.1"
 "google.golang.org/protobuf v1.26.0-rc.1/go.mod"
 "google.golang.org/protobuf v1.26.0"
 "google.golang.org/protobuf v1.26.0/go.mod"
@@ -487,9 +475,9 @@ EGO_SUM=(
 "gopkg.in/yaml.v2 v2.2.2/go.mod"
 "gopkg.in/yaml.v2 v2.2.4/go.mod"
 "gopkg.in/yaml.v2 v2.2.5/go.mod"
-"gopkg.in/yaml.v2 v2.3.0"
 "gopkg.in/yaml.v2 v2.3.0/go.mod"
 "gopkg.in/yaml.v2 v2.4.0/go.mod"
+"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c"
 "gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
 "honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
 "honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"

app-misc/digitemp/digitemp-3.7.2.ebuild

@@ -11,7 +11,7 @@ SRC_URI="https://github.com/bcl/digitemp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="ds9097 ds9097u ds2490"
 
 DEPEND="ds2490? ( virtual/libusb:0 )"

app-misc/screen/files/screen-9999-no-utempter.patch

@@ -0,0 +1,15 @@
+--- i/configure.ac
++++ w/configure.ac
+@@ -151,12 +151,6 @@ AS_IF([test "x$enable_utmp" = "xyes"], [
+ 	AS_IF([test "x$have_utmpx" != "xyes"],
+ 	      AC_ERROR(Missing utmpx.h))
+ 
+-	AC_CHECK_HEADER(utempter.h, have_utempter=yes, have_utempter=no)
+-	AS_IF([test "x$have_utempter" = "xyes"], [
+-		AC_DEFINE(HAVE_UTEMPTER)
+-		LIBS="$LIBS -lutempter"
+-	])
+-
+ 	AC_MSG_CHECKING(if utmpx struct has ut_host field)
+ 	AC_TRY_COMPILE([#include <utmpx.h>], [
+ 		struct utmpx u;

app-misc/screen/screen-9999.ebuild

@@ -32,8 +32,7 @@ BDEPEND="sys-apps/texinfo"
 
 PATCHES=(
 	# Don't use utempter even if it is found on the system.
-	"${FILESDIR}"/${PN}-4.3.0-no-utempter.patch
-	"${FILESDIR}"/${PN}-4.6.2-utmp-exit.patch
+	"${FILESDIR}"/${P}-no-utempter.patch
 )
 
 src_prepare() {
@@ -41,7 +40,9 @@ src_prepare() {
 
 	# sched.h is a system header and causes problems with some C libraries
 	mv sched.h _sched.h || die
-	sed -i '/include/ s:sched.h:_sched.h:' screen.h || die
+	sed -i '/include/ s:sched\.h:_sched.h:' \
+		screen.h winmsg.c window.h sched.c canvas.h || die
+	sed -i 's@[[:space:]]sched\.h@ _sched.h@' Makefile.in || die
 
 	# Fix manpage
 	sed -i \
@@ -76,13 +77,12 @@ src_configure() {
 	use debug && append-cppflags "-DDEBUG"
 
 	local myeconfargs=(
-		--with-socket-dir="${EPREFIX}/tmp/${PN}"
-		--with-sys-screenrc="${EPREFIX}/etc/screenrc"
+		--enable-socket-dir="${EPREFIX}/tmp/${PN}"
+		--with-system_screenrc="${EPREFIX}/etc/screenrc"
 		--with-pty-mode=0620
 		--with-pty-group=5
-		--enable-rxvt_osc
 		--enable-telnet
-		--enable-colors256
+		--enable-utmp
 		$(use_enable pam)
 	)
 	econf "${myeconfargs[@]}"
@@ -90,7 +90,6 @@ src_configure() {
 
 src_compile() {
 	LC_ALL=POSIX emake comm.h term.h
-	emake osdef.h
 
 	emake -C doc screen.info
 	default
@@ -98,7 +97,7 @@ src_compile() {
 
 src_install() {
 	local DOCS=(
-		README ChangeLog INSTALL TODO NEWS* patchlevel.h
+		README ChangeLog INSTALL TODO NEWS*
 		doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
 	)