Sync with portage [Sat Dec 25 14:27:22 MSK 2021].

app-accessibility/caribou/caribou-0.4.21-r4.ebuild

@@ -15,7 +15,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 COMMON_DEPEND="
 	${PYTHON_DEPS}

app-admin/apache-tools/apache-tools-2.4.52.ebuild

@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"
 

app-admin/integrit/integrit-4.2_rc1.ebuild

@@ -13,7 +13,7 @@ SRC_URI="https://github.com/integrit/integrit/archive/v${MY_PV}.tar.gz -> ${P}.t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 # Tests don't work in 4.2_rc1. Please re-check on version bump!
 RESTRICT="test"

app-admin/logmon/logmon-0.4.4-r1.ebuild

@@ -7,7 +7,7 @@ inherit autotools
 
 MY_P="LogMon-${PV}"
 DESCRIPTION="Split-screen terminal/ncurses based log viewer"
-HOMEPAGE="http://www.edespot.com/code/LogMon/"
+HOMEPAGE="http://www.edespot.com/logmon/"
 SRC_URI="http://www.edespot.com/code/LogMon/${MY_P}.tar.bz2"
 S="${WORKDIR}/${MY_P}"
 

app-admin/sud/files/sud-1.3-use-system-queue.patch

@@ -0,0 +1,68 @@
+https://bugs.gentoo.org/713470
+
+--- a/sud/Makefile.am
++++ b/sud/Makefile.am
+@@ -1,7 +1,7 @@
+ AM_YFLAGS = -d
+ 
+ sbin_PROGRAMS = sud
+-sud_SOURCES = conf.c conf_parser.y conf_lexer.l interactive.c noninteractive.c control.c main.c popen.c request.c session.c service.c utility.c extern.h conf.h control.h queue.h session.h
++sud_SOURCES = conf.c conf_parser.y conf_lexer.l interactive.c noninteractive.c control.c main.c popen.c request.c session.c service.c utility.c extern.h conf.h control.h session.h
+ sud_CFLAGS = -Wall -DYY_NO_UNPUT
+ 
+ #INCLUDES = -I..
+--- a/sud/conf.h
++++ b/sud/conf.h
+@@ -31,7 +31,7 @@
+ #include <sys/types.h>
+ #include <grp.h>
+ 
+-#include "queue.h"
++#include <sys/queue.h>
+ /*
+  * XXX: have* variables are oversized, perhaps these could be implemented using
+  * for example gid_t negative values
+--- a/sud/conf_lexer.c
++++ b/sud/conf_lexer.c
+@@ -537,7 +537,7 @@ char *yytext;
+ #include "conf.h"
+ #include "conf_parser.h"
+ #include "extern.h"
+-#include "queue.h"
++#include <sys/queue.h>
+ 
+ extern int nline;
+ 
+--- a/sud/conf_lexer.l
++++ b/sud/conf_lexer.l
+@@ -40,7 +40,7 @@
+ #include "conf.h"
+ #include "conf_parser.h"
+ #include "extern.h"
+-#include "queue.h"
++#include <sys/queue.h>
+ 
+ extern int nline;
+ 
+--- a/sud/service.c
++++ b/sud/service.c
+@@ -47,7 +47,7 @@
+ 
+ #include "conf.h"
+ #include "extern.h"
+-#include "queue.h"
++#include <sys/queue.h>
+ #include "session.h"
+ 
+ 
+--- a/sud/session.h
++++ b/sud/session.h
+@@ -32,7 +32,7 @@
+ 
+ #include <unistd.h>
+ 
+-#include "queue.h"
++#include <sys/queue.h>
+ 
+ 
+ struct sctl {

app-admin/sud/sud-1.3-r1.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,12 +12,20 @@ SRC_URI="http://s0ftpj.org/projects/sud/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
 
-PATCHES=( "${FILESDIR}"/${PN}-1.3-fix-build-system.patch )
+DEPEND="elibc_musl? ( sys-libs/queue-standalone )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3-fix-build-system.patch
+	"${FILESDIR}"/${PN}-1.3-use-system-queue.patch
+)
 
 src_prepare() {
 	default
+
+	# bug #713470
+	rm sud/queue.h || die
+
 	eautoreconf
 }
 

app-admin/vault/Manifest

@@ -1756,5 +1756,9 @@ DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.zip 20937 BLAKE2B 1bc20da34d11c6704b2d34eb
 DIST sourcegraph.com%2Fsourcegraph%2Fappdash%2F@v%2Fv0.0.0-20190731080439-ebfcffb1b5c0.mod 43 BLAKE2B 44d562f1cdabdb24ca05eb508183dc158939129a4cf6ec0c58815076367b2902b660ee0ef526aa01e920846fb633d001c499bf63a3cea16494213eec41587408 SHA512 7d863e4af4e480a247bc767d1de96ff8050b12a13a182a9a8fa68c983c2f0b1a16b509d40de3cca552082535f876458034e1510f0f0feef383f16e1f84f81282
 DIST vault-1.8.6-webui.tar.xz 1382280 BLAKE2B d9bca29f73dc6990fba018d86d9a6078a727bd19648d4787618343929fa566f8518311e535bdbea086929a58d0690e4a0666c54d027622e7622f6fbd7d6e2ef3 SHA512 9ab6ea27ef65bc53c3b80c7959b047fdf861fafe2cf60084f5c2dcec1246cbbc0891ebab90737b61f2c3b9b0267d83db9062fc3ac1573cf4e4002891b8bf5ddb
 DIST vault-1.8.6.tar.gz 20961693 BLAKE2B 0da065f47144f471ecc17e40961b89deb82f9471f3b77cb045beda34b4320256cf671321a4dc8c1c91081521b834b7ccc4b53c2ce5fd2d117d1e3fb0cc2b55d7 SHA512 1d219e910e7a8f1a2fc2813de82dee10ca65104a432743c72616d174e5093c1e0f49221d818ab882a6f80760a5f89ec72803d8540413d5550c0ffa78ce9a2146
+DIST vault-1.8.7-webui.tar.xz 1385584 BLAKE2B a1dfde6cb7a3ffd2521f5090571f8227f6ea404ca2d821f007a03a18f4d5bd3680a3c223e740cdf02fc1defa385af0c23d12bb4aa5a67b49c7fa72056befeab6 SHA512 b2879b18183d5e16fed52378793b5fec0dc33dac06f743256da73c09ca2ccf888cbfdaf7142113df1f59cd79186ac613863ace2c636dc9f4bc441d933b562f13
+DIST vault-1.8.7.tar.gz 20963269 BLAKE2B 0b77fcff26484a8031bcc44868708e75397574dd47f390fea7e539778503c2209aa78b674e544095901900971a9838b190d3c6799879f99992b759b1fe62cd79 SHA512 6fbe060bb51a0bde63d24c9a201af63d93a6853798b205f0efd4ee5cd766a420af2873ce5ef1ed632862505ef9c9a0a65c74b599bff5ba4eb9f88ae2f1c5f829
 DIST vault-1.9.1-vendor.tar.gz 43355935 BLAKE2B 72d23d10143a52ea6c1a7cf24f5c4db3e1ff2449e4f3ac2bc7a8c4d28f274cdcd2746babf55b9409bf489d37b688ba7f4ea3b7deaebc73940e83f93809ae4e51 SHA512 71e3a8735c28f5ca9a127b5448a0c46cb4f87e7e241aa241d2f19dc62e2af190fa54b3b6e2c2e2d17ecd14b19164005787965d8459cc4929fac8f497ecbb1fce
 DIST vault-1.9.1-webui.tar.xz 1088388 BLAKE2B bd2e4db976d2f62d3327cf116cf9f84d47c18d0b1ec0c24ad9d2061714c0270b93e861ca889fae1af91160bdc697ad45bd6d3bd7b5df003246c08e78722d2c5d SHA512 696cbb3558030bd972545725715c494d0b9b9b46df93210fe5197be0400bfa2a9bdc8a3c7381547f1442659913b666d09b281808fdc3cce1de9b8ab8b78f0053
+DIST vault-1.9.2-vendor.tar.gz 43356262 BLAKE2B 5975c58cfec150f8b12003c682362cb038305cf87fff1765ffde1b09841986c29086e0df81e9b3f6cb1d463e34a08f5a7df0a080d9b641a170b2b2f899ed2cf5 SHA512 eab2654a817806c711c0e3b7c17a9125745fd02da8ea750d7d62f2b740f445712279944035e333465e5263529c797bb270ecf7dda27ff7794068862110d9328a
+DIST vault-1.9.2-webui.tar.xz 1088616 BLAKE2B 7841a7bb8b1a664692dd9fc89c928dee8767533cf661fa5ed429e6d8e1db6f6633882cd8f919b059d76b95fd2095b9eaaa95237fdd411aef730b2b80ffe9469a SHA512 b6adda55576011389e981ec7b22177623838b5de6246d775e3f360fdf8bd1596d7a01d1e0578301bb28764293eba00fca95265816aba1ecbe7824e104af21bf6

app-admin/vault/vault-1.9.2.ebuild

@@ -0,0 +1,82 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fcaps go-module systemd
+
+DESCRIPTION="A tool for managing secrets"
+HOMEPAGE="https://vaultproject.io/"
+
+VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz"
+SRC_URI="https://github.com/zmedico/vault/archive/refs/tags/v${PV}-vendor.tar.gz -> ${P}-vendor.tar.gz
+	webui? (
+		https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE}
+	)
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+webui"
+
+BDEPEND="
+	app-arch/zip
+	dev-go/gox
+	>=dev-lang/go-1.15.3"
+COMMON_DEPEND="acct-group/vault
+	acct-user/vault"
+	DEPEND="${COMMON_DEPEND}"
+	RDEPEND="${COMMON_DEPEND}"
+
+FILECAPS=(
+	-m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
+)
+
+RESTRICT+=" test"
+S=${WORKDIR}/${P}-vendor
+
+src_unpack() {
+	default
+}
+
+src_prepare() {
+	default
+	# Avoid the need to have a git checkout
+	sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
+		-e 's:^\(GIT_DIRTY=\).*:\1:' \
+		-e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
+		-i scripts/build.sh || die
+	sed -e "/hooks/d" \
+		-e 's|^\([[:space:]]*\)goimports .*)|\1true|' \
+		-e "s/gofumpt/gofmt/g" \
+		-i Makefile || die
+	if [[ -d "${WORKDIR}/http/web_ui" ]]; then
+		mv "${WORKDIR}/http/web_ui" "${S}/http/web_ui" ||
+			die "mv failed"
+	fi
+}
+
+src_compile() {
+	mkdir "${T}"/bin || die
+	BUILD_TAGS="$(usex webui ui '')" \
+	GOPATH="${T}" \
+	XC_ARCH=$(go env GOARCH) \
+	XC_OS=$(go env GOOS) \
+	XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
+	emake bin
+}
+
+src_install() {
+	dobin bin/${PN}
+	dodoc CHANGELOG.md CONTRIBUTING.md README.md
+	insinto /etc/${PN}.d
+	doins "${FILESDIR}/"*.json.example
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}

app-antivirus/clamtk/Manifest

@@ -1,10 +1,5 @@
-DIST clamtk-6.13.tar.xz 286300 BLAKE2B ec299699547e643966fd0262a85e668e9d087cc9e2598f86c633c170146ee56a0f291f2f57b8cf084bfaeabedcd510b5625194cca08729eb7b62ffe21172b8e5 SHA512 193b08ef143a4c13c1e103e109bcc815eca96a788186a4f6fa12b4f273985aa4bb8aa327b21a1adb51fd69253551562f78affa8e71e409fdea7bb43c0eadcf69
 DIST clamtk-6.14.tar.xz 286356 BLAKE2B e9bf43f221463c78c2f42258c181a851ef5067a8e57fe14bdc72481f0f00daf242179f2258c0c32f50025046ea35ce686d4f10a0da5f97f582aef928ea87050c SHA512 e5fb584f85f7e89eae10ed15ffa0268ecf79d81baf2bbf5d5974c080014d7fe24e4350c0139e8372d0e45a94302a0ec2cd824d05e04fee29dc681cbaf9d0fe14
-DIST clamtk-gnome-0.05.tar.xz 15148 BLAKE2B d72ad0c9b3272c1a21d3722994152e23aeb01bd79d006cbcd3545c2689887b4f596daeeef72a13d9cdd9cfc89c4091963b4a1917824bbb06be4678f2c446a114 SHA512 a5d3b0e87889880272aa61a0feebca8e885c7fa964bad767351c826188c236f2152b3c43328b6aa720c5942b2bf1da69916d3664358c274813a6ac032ee4dea0
 DIST clamtk-gnome-6.14.tar.xz 15156 BLAKE2B ed87dc8317b60a63c4f8824b0e24568ab29874d1e62ef0f4eddeb636960d9b2753b12dfb8fb6f3eb27a6fbfb18dc88b6a480b532afd0d22f20955f4023278eb8 SHA512 3fd798a7d8dbea0e33db09f266b6ad74b96ae5097ecc4d54e00c30c2a5f76a93cd6f2cbaa2b83dc69eb295905c09db88dc2f364592a398786e473783d1ee2c4e
-DIST clamtk-kde-0.18.tar.xz 17732 BLAKE2B ca82934417f2d869fd8c8e36a31ef4a52cf4ee73581c5d1d400c1b28908c5ea2524a8f5d1110b1e949038378613fb4d5607d5123eebe91df695a53d0dd489302 SHA512 145ddd349010e0bb6fe3295e50d6e15a2dd96e604babbd5de4cb49ba75169d2050777cac38e40ac6a64cb89ddf94025d610aca73136c75f81115d0a2d863d24e
 DIST clamtk-kde-0.19.tar.xz 18652 BLAKE2B 4ecb849c9312948d493938683310904c9bbe7f4e26514d76dbfee3afdd063eec2a0aa85a638f83130c8e3ff41cfabee1479885691cc484680d97d1f8fbb76f00 SHA512 57a99d50f171ada999723dc69c2d193e91a482533add4281c6aac96a23273b3eb5456bff6918f69c72edf1635d22be86beae4c434eb29fc3c27fb687fa716861
-DIST nemo-sendto-clamtk-0.04.tar.xz 4228 BLAKE2B ce656d4f021bc30cd12fb2ee5f98a78c1f1fdb2460ed2cbba0b572408617f91b39b2ca2fe542b9cec7be79b4b9fdfd685f5553e1a671454ca1e6723241dcb805 SHA512 2b5d3abbc4ae5dbc71b1b7bc836df88ad51e6afa00d5e954b5c1355a70c0420b6fef895e1cb5cccb86a662aee2039cef6c01821c1347fa155b5da3529b25562c
 DIST nemo-sendto-clamtk-0.05.tar.xz 5980 BLAKE2B ca5f37fb9ba9e7f7dc9dc67d52fe36f430697f200c2c91f4d912b068f28d79bee100a85878f66414012728e979073a0afc411e6789959a35bd468c28bf207618 SHA512 4cb2d32711da47c959be84d69654ea0ab0bfb4f2c4a806cbc035129fd0d985a93b89d51c5874de272f2a2841c66702c8867178f5af41505e698c8e37e3c74da9
-DIST thunar-sendto-clamtk-0.06.tar.xz 4416 BLAKE2B 6b9f8857fead9f175af0a5fd3585790c49865b07016ddbc0dfc21f761ecbac32d97a65731fdca0335fd4852af9efc93c06ecb994f769a5efeade35cb734e9924 SHA512 f3b6f296213ad5974f8134d682cce4e426d9730d1898e8f7ea474e27314ee47957b033bbd7f16196cabf054eccec844c05ff8c8f9a98ad013a7f89b899cee591
 DIST thunar-sendto-clamtk-0.07.tar.xz 5432 BLAKE2B 7b0911abbcf1601ee961a0449815e21273acb7e757b4c4f532a100da48fe4c7b2f6ecb05a27931e0cf60af94e7cd52af23736180f0d9afa1dd00b9f44eaa3c0b SHA512 f25802c80d5e8a6d703b7b3b2266a91eb031a377792420052f6873cb0eb759235d79df457dc26303d6ef4ed9989dbc4ff803258255fb568fef27c782144c1145

app-antivirus/clamtk/clamtk-6.13.ebuild

@@ -1,142 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit desktop perl-functions python-single-r1 xdg-utils
-
-MY_PV_KDE="0.18"
-MY_PV_NAUTILUS="0.05"
-MY_PV_NEMO="0.04"
-MY_PV_THUNAR="0.06"
-
-DESCRIPTION="A graphical front-end for ClamAV"
-HOMEPAGE="https://gitlab.com/dave_m/clamtk/wikis/Home"
-SRC_URI="
-	https://github.com/dave-theunsub/${PN}/releases/download/v${PV}/${P}.tar.xz
-	kde? ( https://bitbucket.org/davem_/${PN}-kde/downloads/${PN}-kde-${MY_PV_KDE}.tar.xz )
-	nautilus? ( https://bitbucket.org/davem_/${PN}-gnome/downloads/${PN}-gnome-${MY_PV_NAUTILUS}.tar.xz )
-	nemo? ( https://bitbucket.org/davem_/nemo-sendto-${PN}/downloads/nemo-sendto-${PN}-${MY_PV_NEMO}.tar.xz )
-	thunar? ( https://bitbucket.org/davem_/thunar-sendto-${PN}/downloads/thunar-sendto-${PN}-${MY_PV_THUNAR}.tar.xz )
-"
-
-LICENSE="|| ( Artistic GPL-1+ )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="kde nautilus nemo +nls thunar"
-REQUIRED_USE="nautilus? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	app-antivirus/clamav
-	dev-perl/File-chdir
-	dev-perl/Gtk3
-	dev-perl/JSON
-	dev-perl/LWP-Protocol-https
-	dev-perl/LWP-UserAgent-Cached
-	dev-perl/Locale-gettext
-	dev-perl/Text-CSV
-	dev-perl/glib-perl
-	dev-perl/libwww-perl
-	virtual/perl-Digest-MD5
-	virtual/perl-Digest-SHA
-	virtual/perl-Encode
-	virtual/perl-MIME-Base64
-	virtual/perl-Time-Piece
-	nautilus? (
-		${PYTHON_DEPS}
-		dev-python/nautilus-python[${PYTHON_SINGLE_USEDEP}]
-	)
-"
-
-BDEPEND="nls? ( sys-devel/gettext )"
-
-DOCS=( "CHANGES" "credits.md" "DISCLAIMER" "README.md" )
-
-pkg_setup() {
-	use nautilus && python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	default
-
-	unpack "${S}"/clamtk.1.gz
-
-	use kde && unpack "${S}"/../clamtk-kde-${MY_PV_KDE}/clamtk-kde.1.gz
-	use nautilus && unpack "${S}"/../clamtk-gnome-${MY_PV_NAUTILUS}/clamtk-gnome.1.gz
-	use nemo && unpack "${S}"/../nemo-sendto-clamtk-${MY_PV_NEMO}/nemo-sendto-clamtk.1.gz
-	use thunar && unpack "${S}"/../thunar-sendto-clamtk-${MY_PV_THUNAR}/thunar-sendto-clamtk.1.gz
-}
-
-src_install() {
-	dobin clamtk
-
-	perl_set_version
-	insinto "${VENDOR_LIB}"/ClamTk
-	doins lib/*.pm
-
-	use nls && domo po/*.mo
-
-	doicon images/clamtk.png images/clamtk.xpm
-
-	domenu clamtk.desktop
-
-	doman ../clamtk.1
-
-	if use kde; then
-		insinto /usr/share/kservices5/ServiceMenus
-		doins ../clamtk-kde-${MY_PV_KDE}/clamtk-kde.desktop
-
-		doicon ../clamtk-kde-${MY_PV_KDE}/clamtk-kde.png ../clamtk-kde-${MY_PV_KDE}/clamtk-kde.xpm
-
-		doman ../clamtk-kde.1
-
-		docinto dolphin
-		dodoc ../clamtk-kde-${MY_PV_KDE}/CHANGES ../clamtk-kde-${MY_PV_KDE}/README.md
-	fi
-
-	if use nautilus; then
-		insinto /usr/share/nautilus-python/extensions
-		doins ../clamtk-gnome-${MY_PV_NAUTILUS}/clamtk-gnome.py
-
-		doicon ../clamtk-gnome-${MY_PV_NAUTILUS}/images/clamtk-gnome.png
-
-		doman ../clamtk-gnome.1
-
-		docinto nautilus
-		dodoc ../clamtk-gnome-${MY_PV_NAUTILUS}/CHANGES ../clamtk-gnome-${MY_PV_NAUTILUS}/DISCLAIMER ../clamtk-gnome-${MY_PV_NAUTILUS}/README.md
-	fi
-
-	if use nemo; then
-		insinto /usr/share/nemo/actions/
-		doins ../nemo-sendto-clamtk-${MY_PV_NEMO}/nemo-sendto-clamtk.nemo_action
-
-		doman ../nemo-sendto-clamtk.1
-
-		docinto nemo
-		dodoc ../nemo-sendto-clamtk-${MY_PV_NEMO}/CHANGES ../nemo-sendto-clamtk-${MY_PV_NEMO}/DISCLAIMER ../nemo-sendto-clamtk-${MY_PV_NEMO}/README.md
-	fi
-
-	if use thunar; then
-		insinto /usr/share/Thunar/sendto
-		doins ../thunar-sendto-clamtk-${MY_PV_THUNAR}/thunar-sendto-clamtk.desktop
-
-		doman ../thunar-sendto-clamtk.1
-
-		docinto thunar
-		dodoc ../thunar-sendto-clamtk-${MY_PV_THUNAR}/CHANGES ../thunar-sendto-clamtk-${MY_PV_THUNAR}/DISCLAIMER ../thunar-sendto-clamtk-${MY_PV_THUNAR}/README
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}

app-antivirus/clamtk/clamtk-6.14.ebuild

@@ -24,7 +24,7 @@ SRC_URI="
 
 LICENSE="|| ( Artistic GPL-1+ )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="kde nautilus nemo +nls thunar"
 REQUIRED_USE="nautilus? ( ${PYTHON_REQUIRED_USE} )"
 

app-backup/bacula/bacula-11.0.5.ebuild

@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X"
 
 DEPEND="

app-backup/rsnapshot/Manifest

@@ -1,2 +1,3 @@
 DIST rsnapshot-1.4.2.tar.gz 487959 BLAKE2B 90a52af1b2b3de5eae7e98f87b87dae4564a7fa5d240d9e844180d6a57bb4e14b4cf762aa0ed6bbdba8deda0436d77e6c5d281ca8b62eba1c3b6caf948ae9432 SHA512 621be52715a6c1f70ddb251d7f6103ba3487cd0c6c607411d744866547d3ced571862a8f6b5e40a1d050696703f3a15821bd6e829a3fca057848f04566d0e4a0
 DIST rsnapshot-1.4.3.tar.gz 370840 BLAKE2B 6a3acde4afd8d1f999cfb00f07a0547b6d877aa483e2548b5ecb933c3f6e742046730a78b95fd83bfa6496a71f61dbce2a8bedc42562503bef753b0c72c40eba SHA512 606b5c195e609197ae6711a9764c07a0f0822fe228aba07014155636bd5caa7ad7dbf8f42316275a71490b5c9dd33bf04c42580b92f4910c38ef871694ae09e3
+DIST rsnapshot-1.4.4.tar.gz 374269 BLAKE2B 1e4a0c99d12d48cf4dacd3817b621f7e6b0ba32e9d9de87b61252875ae0bf735e8ce2c7d8bb60edb2f7d6345a06b183a2616bf1ac3dd7d1b5d3a3ef22a0ede6f SHA512 da45039457b9f3feb53b823f6ee36e8f7447d0689281d1bc857c6fedd450db2fdf8a98e66ba6e135a86654666888f7744ad9ff0aabbd605e1fc09dd5f1f7b838

app-backup/rsnapshot/rsnapshot-1.4.4.ebuild

@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A filesystem backup utility based on rsync"
+HOMEPAGE="https://www.rsnapshot.org"
+SRC_URI="https://www.rsnapshot.org/downloads/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND=">=dev-lang/perl-5.8.2
+		dev-perl/Lchown
+		>=sys-apps/util-linux-2.12-r4
+		>=sys-apps/coreutils-5.0.91-r4
+		>=net-misc/openssh-3.7.1_p2-r1
+		>=net-misc/rsync-2.6.0"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	# remove '/etc/' since we don't place it here, bug #461554
+	sed -i -e 's:/etc/rsnapshot.conf.default:rsnapshot.conf.default:' rsnapshot-program.pl || die
+}
+
+src_install() {
+	docompress -x "/usr/share/doc/${PF}/rsnapshot.conf.default"
+
+	# Change sysconfdir to install the template file as documentation
+	# rather than in /etc.
+	emake install DESTDIR="${D}" \
+		sysconfdir="${EPREFIX}/usr/share/doc/${PF}"
+
+	dodoc README.md AUTHORS ChangeLog \
+		docs/Upgrading_from_1.1
+
+	docinto utils
+	dodoc utils/{README,rsnaptar,*.sh,*.pl}
+
+	docinto utils/rsnapshotdb
+	dodoc utils/rsnapshotdb/*
+}
+
+pkg_postinst() {
+	elog "The template configuration file has been installed as"
+	elog "  /usr/share/doc/${PF}/rsnapshot.conf.default"
+	elog "Copy and edit the the above file as /etc/rsnapshot.conf"
+}

app-benchmarks/geekbench/Manifest

@@ -3,3 +3,4 @@ DIST Geekbench-2.4.3-Linux.tar.gz 3337551 BLAKE2B cb660f3c08cc812cb23374032490a1
 DIST Geekbench-3.4.2-Linux.tar.gz 9986039 BLAKE2B 63d7e768d65bc033260a0d99da17df2e518750f19882e63dbc9bbe6ff0b52a8cddb35b9143e85c01838bf5d77a04599578fc0a57a3e6fd89e7aec8c8ffdd4f5b SHA512 a61a5d5481682baefdce64f6054c3373900e8cd585dcbfa2feabbf386032986b40b603619c552102401a83e0b748831d00af5b5b5278e88ef42dee176adf06e9
 DIST Geekbench-4.4.1-Linux.tar.gz 71076124 BLAKE2B 14c2b80c971798e7d2bb256e76c7ab9c48e8c1c389e2f7547a436f706ac4f21c1e52e564cd584893071ee2f9f0a4747cd03ea72cc728ff8e4f369d5cc794d77a SHA512 fa687d33a7d7a2d09c544e3d17de93f41cfa77915c708cd1ef0743f84f7f83df9d3f8df2872a8f85ed2c4c872e3cd41932685ffeb19cdb0ea047ab5116713420
 DIST Geekbench-5.4.3-Linux.tar.gz 93169377 BLAKE2B c84f99d7f5be1002d26179085cef21baee20e14c99114b78d6d04caadea3835d8a05f07431a8a16a6d58dda9e11f27836b9b8261bccbd0549b5172b94ebbfae4 SHA512 d86abc0d9b1dfd59074cdc3ce9ebf32f7b7bfbca1badc9d45c5284b6b76f29a600f1796b0fb582a2861611515660b0a2680317b1361822c8809b3584cf00b0ac
+DIST Geekbench-5.4.4-Linux.tar.gz 93166494 BLAKE2B c49f399378c00af35df0b17a90af2a92c4366a8ad62f6743144b46a54e81cea77ed5e190b66db2e59f76ac6e47f4ba00d392ab0ac16cbd9e876e99297cc4b7c8 SHA512 46008903e34e7f118886ad391b11ca69d977e8e0cb84b7b78419b0689fe02b3c72d67e1698655cdddee039b102a2314dacd2329b5496f0406f465c6781b83aac

app-benchmarks/geekbench/geekbench-5.4.4.ebuild

@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A Cross-Platform Benchmark for Android, iOS, Linux, MacOS and Windows"
+HOMEPAGE="https://www.geekbench.com/"
+SRC_URI="https://cdn.geekbench.com/Geekbench-${PV}-Linux.tar.gz"
+S="${WORKDIR}/Geekbench-${PV}-Linux"
+
+KEYWORDS="-* ~amd64"
+LICENSE="geekbench"
+SLOT="5"
+
+RESTRICT="bindist mirror"
+
+QA_PREBUILT="
+	opt/geekbench5/geekbench5
+	opt/geekbench5/geekbench_x86_64
+"
+
+pkg_nofetch() {
+	elog "Please download ${A} from ${HOMEPAGE}/download/linux"
+	elog "and place it in your DISTDIR directory."
+}
+
+src_install() {
+	exeinto /opt/geekbench5
+	doexe geekbench5 geekbench_x86_64
+
+	insinto /opt/geekbench5
+	doins geekbench.plar
+
+	dodir /opt/bin
+	dosym ../geekbench5/geekbench5 /opt/bin/geekbench5
+}
+
+pkg_postinst() {
+	elog "If you have purchased a commercial license, you can enter"
+	elog "your email address and your license key with the following command:"
+	elog "geekbench5 -r <email address> <license key>"
+}

app-containers/podman/Manifest

@@ -1,6 +1,2 @@
-DIST podman-3.3.1.tar.gz 10917305 BLAKE2B fe7856c2ad8893e40ec42fb242a088794ea18910388d5e8089885013cab45c98e03bef99a5e911749f95ce469518e6fa5b6d30400f52696645c9ba8c140ba445 SHA512 19003f63c17c1c5788f34d0d6426a366035fc76aa2312e6355464d204d6536e5f78652abaf01643d4be7c2ee5224c25717b41760a4be4f6de8031cca9b06efaa
-DIST podman-3.4.0.tar.gz 10950594 BLAKE2B 4a96b9be980f336bc7cfa6efa0f955da90b67e1ff3e45c34097b9eb4fcd611b3454860048410238aeb1063331b246e9c156f738813e7f585d2254a1568d20642 SHA512 195354b15beaaed19b4d5f71f5dbfcd1ebfc5c80c07db91043b76e3254d62b5fd001c52c536773656e5eba65954511c1639a50b955a9992fa4d18a55e573c2a1
 DIST podman-3.4.1.tar.gz 10953738 BLAKE2B 423aaecabce5242ae87887e36e9caaf499b3d5c18978e47b738ef3b6a0a094c64f18f5fef614193157c3de0a6c0d88a232efcdcb60de4ae8ab14abbe266ad512 SHA512 b8602464358ab73429a9003262c92c38c9a06e1133c776fd0c4ce65dae26639db66f8f5ad510528f3e6e7bc2fe692746fcf1d90d4e95d701d102006d9a83b27e
-DIST podman-3.4.2.tar.gz 10959727 BLAKE2B 6c5ead8f4dc6e79edeb16e72fb906c6aa77f84b53bdd2435f100f923f7cb708c68898d3a1837db2c154700730adcedfb9769b996b5f602954f8388fda09c3650 SHA512 849a4d5897de7dae5d6ac71fab11449f7a814e6414a0f463846ddd3817cd91c5f12e288bd44e64cc5bdf5f6073d52dfbf77aba5cbc1fec6ac12a7b222d2a21a2
-DIST podman-3.4.3.tar.gz 10945852 BLAKE2B cb2076be27900b2ce4d781fa94592503d3b0421535e225e0166477aede4892b7f2b428a4f466daa6c85f3c479f8f197194d2b827afe5dd1b3b7c3e9c7829f800 SHA512 c3eed482ac78a70f9babb39798a2925f29d0452f5e66f2e46f8eb9bb8aeeb4cd8392a9d961a9a37fc5aa3bccad8fb6754db65191b80f3ad882d72a329722994f
 DIST podman-3.4.4.tar.gz 10945990 BLAKE2B 3de69c9bc3bd1334837d21cb2817a9e9757fbb561a0b047658c7401608ecf1fbe09d5cd0c65497a82150a67a3775c77705d0dbd314a54f7b3a1953733cfb2906 SHA512 cfd295bf50ce86ea70741c3e663b409ed47b1e560c962bc579f319151a0fe2b24cdd3045667660083cce89449a9c5de1508c94a9a02375165a72ce7c16166666

app-containers/podman/podman-3.3.1.ebuild

@@ -1,164 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-EGIT_COMMIT="4c5283fabff2de5145838f1847a5a7b2b1fbc0a5"
-
-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
-
-	sed -e 's|OUTPUT="${CIRRUS_TAG:.*|OUTPUT='v${PV}'|' \
-		-i hack/get_release_info.sh || 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/podman/podman-3.4.0.ebuild

@@ -1,164 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-EGIT_COMMIT="6e8de00bb224f9931d7402648f0177e7357ed079"
-
-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
-
-	sed -e 's|OUTPUT="${CIRRUS_TAG:.*|OUTPUT='v${PV}'|' \
-		-i hack/get_release_info.sh || 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/podman/podman-3.4.2.ebuild

@@ -1,164 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-EGIT_COMMIT="2ad1fd3555de12de34e20898cc2ef901f08fe5ed"
-
-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
-
-	sed -e 's|OUTPUT="${CIRRUS_TAG:.*|OUTPUT='v${PV}'|' \
-		-i hack/get_release_info.sh || 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/podman/podman-3.4.3.ebuild

@@ -1,164 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-EGIT_COMMIT="3450a60d2196cc0bee8a3fc28a7c93a7370d4515"
-
-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
-
-	sed -e 's|OUTPUT="${CIRRUS_TAG:.*|OUTPUT='v${PV}'|' \
-		-i hack/get_release_info.sh || 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/podman/podman-3.4.4.ebuild

@@ -14,7 +14,7 @@ SRC_URI="https://github.com/containers/podman/archive/v${PV}.tar.gz -> ${MY_P}.t
 LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
 SLOT="0"
 
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm64 ~ppc64"
 IUSE="apparmor btrfs +fuse +rootless selinux"
 RESTRICT+=" test"
 

app-containers/snapd/Manifest

@@ -1,3 +1,2 @@
-DIST snapd-2.53.1.tar.xz 4713180 BLAKE2B 8c46c7257eeb7794d082833448ea30dbeee5ebec3b36dcec1e3d6c9e8b00121319829ceaf354c055a0edd9032f3d74b66823be0f640860b931c461e607b89485 SHA512 167c84fdf5df151c9d06774677649c365a6fd1fbbc68900c060c775fffaa51bf7bfee5a62900035fae3bd5ad1d637bb381fe15e8277a93acc6409028b36ef780
-DIST snapd-2.53.2.tar.xz 4714868 BLAKE2B 8ce0358a31c095e90c17b01a0229b665655949f91b4094b6b426f6df07794c1633497ee9edbb9d175aa920e7ac3b39316631a985b1e57f6cb15ef2fa56fd3321 SHA512 414f819b1590e6324c3f5141ccfa60141fd42f0e0160ad78d1937ad57bc2313de54af9b7718d956a9db9981954fcbe75e80556c6544bff99ac6da9db5142c014
 DIST snapd-2.53.4.tar.xz 4722696 BLAKE2B c4347db8d5a14b30f1e8811e9425dd7419dd2dcad02fc1cb6a51968cd7fa6a58da2b172c041de02202cbdba1072cb0a7a92d7f92def5c5dc1e253cbcbad86aae SHA512 0b4164d3c3c3ccc99b3fa1e25d9e7e3184a5f94deca5fd83bd6d4c7761b41d6ebd5fefd1e87432a5e18c716b3330b3991134f179e1b03326edd9511ebea4ef9a
+DIST snapd-2.54.1.tar.xz 4818344 BLAKE2B 654d4d6a8f08dabeb6c10ea3639e1fc31b68720953bd1456695eb6c1275f260e2793e49c39c80571727fb74c954583b1a2188c461b415803210be59c57775292 SHA512 65e14c85ab62d601fa46a271ba4322531a72e7d8880833cd74daac682188808ebd8c730c1fa62dea07d8f20ba76d314f84f89b3e565eaf3ae509a569f3ee7305

app-containers/snapd/snapd-2.53.2.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/chntpw/chntpw-140201.ebuild

@@ -26,6 +26,10 @@ DOCS=(
 	regedit.txt
 )
 
+PATCHES=(
+	"${FILESDIR}"/${P}-missing-stdint.patch
+)
+
 src_prepare() {
 	default
 	sed -i -e '/-o/s:$(CC):$(CC) $(LDFLAGS):' Makefile || die

app-crypt/chntpw/files/chntpw-140201-missing-stdint.patch

@@ -0,0 +1,26 @@
+From c72bedece14b5797b1826e779c7fcb3e3024f820 Mon Sep 17 00:00:00 2001
+From: Jory Pratt <anarchy@gentoo.org>
+Date: Thu, 11 Jul 2019 14:19:30 -0500
+Subject: [PATCH] include missing stdint header
+
+Signed-off-by: Jory Pratt <anarchy@gentoo.org>
+Upstream-Status: Submitted
+---
+ ntreg.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/ntreg.h b/ntreg.h
+index 4b46106..d6fc7cf 100644
+--- a/ntreg.h
++++ b/ntreg.h
+@@ -24,6 +24,7 @@
+ 
+ #ifndef _INCLUDE_NTREG_H
+ #define _INCLUDE_NTREG_H 1
++#include <stdint.h>
+ 
+ #define SZ_MAX     4096       /* Max unicode strlen before we truncate */
+ 
+-- 
+2.22.0
+

app-crypt/chntpw/metadata.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>marecki@gentoo.org</email>

app-editors/ghex/Manifest

@@ -1,2 +1,3 @@
 DIST ghex-3.18.4.tar.xz 1420268 BLAKE2B 70a3027a2c228481ecbc6ae44c0a707c9858453e3af7bfc268b6e32a8496722cf117c1b2ce4dd798795a429dccd24e1fa9cb9d1a8c9c8fb5998243369f76ccc4 SHA512 6121a5986ee7d7f96bf7f401e155f8aa37f076af455bc68e43d1b5b02b63bc9aed3eba5209511d1b659eb4c9093ab5d9601c14a5e868d979e92a6d0ca0cf9ce2
 DIST ghex-3.41.1.tar.xz 1499804 BLAKE2B dd75dc1cc5d847ae3b932ed0bb98b8e15f44943f76f0ba9f053c6770d05e31d211c9f75a910c93c09cf2de143db8fa0eda4fdb876a0ea3ed0534650e7ac36a65 SHA512 5eccf81c41f5ae56bfe5eab0fb843db0095c75080e7dfc0b19a4c71f40f89931e1cbcd2c58744a6b249d16e2a2e4f96513aaac4c41f46d3b5ae8b2bc851851a0
+DIST ghex-4.alpha.1.tar.gz 2165701 BLAKE2B f98758b657f2cc73913bb205439d265e8d8168c91080ca0e064decf277a7e300d9eb82a869951f846a66b5155016f69b0935b2877d24a0482a6b003a821adac2 SHA512 6e7e8d8ff0b981f14f48ed16d3b31ce51a0fb4c978c525cc9f3b2c06114bc1cfaf42e71ea98f1b0d33940a2f6b15a5e053228484259bdc4525bb18f2835b97c8

app-editors/ghex/ghex-4.0.0_alpha.ebuild

@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="GNOME hexadecimal editor"
+HOMEPAGE="https://wiki.gnome.org/Apps/Ghex"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/ghex.git"
+	SRC_URI=""
+else
+	MY_PV="4.alpha.1"
+	SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/${MY_PV}/${PN}-${MY_PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+fi
+
+LICENSE="GPL-2+ FDL-1.1+"
+SLOT="4"
+
+RDEPEND="
+	>=dev-libs/atk-1.0.0
+	>=dev-libs/glib-2.31.10:2
+	>=x11-libs/gtk+-3.3.8:3
+	gui-libs/gtk:4
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-libs/libxml2:2
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}

app-editors/ghex/ghex-9999.ebuild

@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="GNOME hexadecimal editor"
+HOMEPAGE="https://wiki.gnome.org/Apps/Ghex"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/ghex.git"
+	SRC_URI=""
+else
+	MY_PV="4.alpha.1"
+	SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/${MY_PV}/${PN}-${MY_PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+fi
+
+LICENSE="GPL-2+ FDL-1.1+"
+SLOT="4"
+
+RDEPEND="
+	>=dev-libs/atk-1.0.0
+	>=dev-libs/glib-2.31.10:2
+	>=x11-libs/gtk+-3.3.8:3
+	gui-libs/gtk:4
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-libs/libxml2:2
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}

app-officeext/texmaths/texmaths-0.48.2.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.oxt"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="

app-portage/portage-utils/Manifest

@@ -1,4 +1,4 @@
 DIST portage-utils-0.90.1.tar.xz 1779252 BLAKE2B 27c94694cab84970c0c92e835b9039d9420fbfa20f9f2e03f4f53d118df4dc243cddce33994095a3e41bd1027a42c9c29cda65cb7cf4f45279a028b21555f4f8 SHA512 67290a69ad6ac40da3ce0f41d2630096690e69bb97a1428af921ccc582dcfbf903bbf98259f68afdbe9e96aef81672ea3352a9266a649e75f99acec7fa00cd8a
 DIST portage-utils-0.90.tar.xz 1776636 BLAKE2B bbacc05aa97c77705ae4fbdb5efde5f1d49a99ac8ed259e026c9a997f43a86551b3a10a397e0c5f1da161d2c0d88afe88e22870705ca39d911c4a98ad13f4928 SHA512 2077061dd7dfd444d4ad38faf5a87aa44392d7747f71d7283b5e2775ce3d714773cd642ea085aea3dd34a715f2c446d42fd64ba42fa99e716e8d843aae3d9682
 DIST portage-utils-0.92.tar.xz 1819676 BLAKE2B 01798e3984745140bca1bcc1eda5c2aea7c517bee2656acfe1bd810fc8088ddcb474f2c64fee6832c5e1699e2ec8ad5a9c6d5afba8a2e2b6f1861d49fbf7fcb7 SHA512 7d36263c9c242c8e82786fa12e171a3f396f65520acb8caa91516862615bd71241699ab6c2232122f7009875aa0a10b06b614a842d45afc86e599b39711e12b3
-DIST portage-utils-0.93.tar.xz 1795964 BLAKE2B 496bed1cbe53c309ceda3eed7b0c343bbf428cc9e8871ff52759f754c5f1d4a834cd648a6ea25b10e7e043077b5a65e40eeebe9101b04f5e5920665aadec822c SHA512 23e85b358fd79c59474aab752fc259e825e90c2b0dd8885cfada79caf59fe71425135e0b6177fcb857e53f1644d159f2e42f1d9116d26757822eb8e6b3ce9989
+DIST portage-utils-0.93.1.tar.xz 1795788 BLAKE2B b2ec546ad391d9d1862321907120e24d8d451166d759ea1f1f0d12aa6e34627c9bca9fcd331c02310937e739171428f3491f596d5e01aac2d699fa924f3ca6a2 SHA512 7245e8e75e99f6fec19363b974963bd7ff385c9f6c4834779501030fe9d134a36b32dd1b41d015fed3c81f76fd41a663e9a2fd8246e97d26e3b2ebbce6b5baad

app-shells/fish/Manifest

@@ -1,4 +1 @@
-DIST fish-3.1.2.tar.gz 6816214 BLAKE2B d994cb867a1a86850db2ec36d262328cd8dc21d63edb860c26d727aac08fa257392690999e099d754287d9f12a294222815e4cc84abbb2e2a87a982bb6627b6b SHA512 b6ae2c928774a2eaccf35312d3a9446bfa3e1335182c8f2b2d6198161d0916904f4964fb20ed13a5bf850c1c819e003905d13db3bc8b1faa5b401a60b47dc563
-DIST fish-3.2.1.tar.xz 3409808 BLAKE2B ad136c60cc98ae9fdb2e2abecb722107543184cb162a3c6b058e8ebe40a383a09c0e9b0eca762ab95725227dd6630605ad875bd4da59d38e605bc1f82fa1d517 SHA512 bf565bac93e7d163af5253b4053f9c9e760508b929624440fd8a160504a127c34013882576293c72a47ce7f285f87e0b594d61d7cebcefcc3be4e92c572926bc
-DIST fish-3.2.2.tar.xz 3411748 BLAKE2B f8b20b6c56c54f84f347b930b71528dbd61a4f53adfd8addec05314c9d15992257cea89ce854adef2eecf3adfb07e6fa576b9d45c2e362ff360b24cf1edf3afc SHA512 e82c5a390bd94f84c60843a94dc4f30bd46539828a54d2e96f208e0d54a0aa361a8c9d4a66cdf2fa636a5fab310a96bf1c165c58440c38d123f788fff3598f4a
 DIST fish-3.3.1.tar.xz 3489152 BLAKE2B 61b2bf96526d957d3f9706df5a76d4d9b4ccf55a1ff2b7b66f1a0d5d126a220df9984551f5adb06dcedbfb5674b93c4f3d75ef991585980a29d4dd84f7697559 SHA512 fc50ca44fab3f2d942284d4f714150f7ccf1e49c73da36f8d4ae4a33a9b3280f98bed15848839f5d443b4274fd0ff90174bafa6a8e9a4da226dda63d7766a660

app-shells/fish/fish-3.1.2-r1.ebuild

@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake readme.gentoo-r1
-
-DESCRIPTION="Friendly Interactive SHell"
-HOMEPAGE="http://fishshell.com/"
-
-MY_PV="${PV/_beta/b}"
-MY_P="${PN}-${MY_PV}"
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git"
-else
-	SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="doc nls test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/libpcre2-10.32:=[pcre32]
-	sys-libs/ncurses:=[unicode(+)]
-"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	nls? ( sys-devel/gettext )
-	test? ( dev-tcltk/expect )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# workaround for https://github.com/fish-shell/fish-shell/issues/4883
-	sed -i 's#${TEST_INSTALL_DIR}/${CMAKE_INSTALL_PREFIX}#${TEST_INSTALL_DIR}#' \
-		cmake/Tests.cmake || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_BINDIR="${EPREFIX}/bin"
-		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
-		-DCURSES_NEED_NCURSES=ON
-		-DBUILD_DOCS="$(usex doc)"
-		-DWITH_GETTEXT="$(usex nls)"
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	keepdir /usr/share/fish/vendor_{completions,conf,functions}.d
-	readme.gentoo_create_doc
-}
-
-src_test() {
-	cmake_build -j1 test
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}

app-shells/fish/fish-3.2.1-r1.ebuild

@@ -1,89 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit cmake python-any-r1 readme.gentoo-r1
-
-DESCRIPTION="Friendly Interactive SHell"
-HOMEPAGE="http://fishshell.com/"
-
-MY_PV="${PV/_beta/b}"
-MY_P="${PN}-${MY_PV}"
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git"
-else
-	SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+doc nls test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/libpcre2-10.32:=[pcre32]
-	sys-apps/coreutils
-	sys-libs/ncurses:=[unicode(+)]
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-	nls? ( sys-devel/gettext )
-	test? (
-		${PYTHON_DEPS}
-		dev-tcltk/expect
-		$(python_gen_any_dep '
-			dev-python/pexpect[${PYTHON_USEDEP}]
-		')
-	)
-"
-# we don't need shpinx dep for release tarballs
-[[ ${PV} == 9999 ]] && DEPEND+=" doc? ( dev-python/sphinx )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_check_deps() {
-	use test || return 0
-	has_version -d "dev-python/pexpect[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	# workaround for https://github.com/fish-shell/fish-shell/issues/4883
-	sed -i 's#${TEST_INSTALL_DIR}/${CMAKE_INSTALL_PREFIX}#${TEST_INSTALL_DIR}#' \
-		cmake/Tests.cmake || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_BINDIR="${EPREFIX}/bin"
-		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
-		-DCURSES_NEED_NCURSES=ON
-		-DINSTALL_DOCS="$(usex doc)"
-		-DWITH_GETTEXT="$(usex nls)"
-	)
-	# release tarballs ship pre-built docs // -DHAVE_PREBUILT_DOCS=TRUE
-	[[ ${PV} == 9999 ]] && mycmakeargs+=( -DBUILD_DOCS="$(usex doc)" )
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	keepdir /usr/share/fish/vendor_{completions,conf,functions}.d
-	readme.gentoo_create_doc
-}
-
-src_test() {
-	cmake_build -j1 test
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}

app-shells/fish/fish-3.2.2-r1.ebuild

@@ -1,89 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit cmake python-any-r1 readme.gentoo-r1
-
-DESCRIPTION="Friendly Interactive SHell"
-HOMEPAGE="http://fishshell.com/"
-
-MY_PV="${PV/_beta/b}"
-MY_P="${PN}-${MY_PV}"
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git"
-else
-	SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+doc nls test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/libpcre2-10.32:=[pcre32]
-	sys-apps/coreutils
-	sys-libs/ncurses:=[unicode(+)]
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-	nls? ( sys-devel/gettext )
-	test? (
-		${PYTHON_DEPS}
-		dev-tcltk/expect
-		$(python_gen_any_dep '
-			dev-python/pexpect[${PYTHON_USEDEP}]
-		')
-	)
-"
-# we don't need shpinx dep for release tarballs
-[[ ${PV} == 9999 ]] && DEPEND+=" doc? ( dev-python/sphinx )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_check_deps() {
-	use test || return 0
-	has_version -d "dev-python/pexpect[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	# workaround for https://github.com/fish-shell/fish-shell/issues/4883
-	sed -i 's#${TEST_INSTALL_DIR}/${CMAKE_INSTALL_PREFIX}#${TEST_INSTALL_DIR}#' \
-		cmake/Tests.cmake || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_BINDIR="${EPREFIX}/bin"
-		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
-		-DCURSES_NEED_NCURSES=ON
-		-DINSTALL_DOCS="$(usex doc)"
-		-DWITH_GETTEXT="$(usex nls)"
-	)
-	# release tarballs ship pre-built docs // -DHAVE_PREBUILT_DOCS=TRUE
-	[[ ${PV} == 9999 ]] && mycmakeargs+=( -DBUILD_DOCS="$(usex doc)" )
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	keepdir /usr/share/fish/vendor_{completions,conf,functions}.d
-	readme.gentoo_create_doc
-}
-
-src_test() {
-	cmake_build -j1 test
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}

app-shells/fish/fish-3.3.1-r1.ebuild

@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git"
 else
 	SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
@@ -76,7 +76,11 @@ src_configure() {
 		-DWITH_GETTEXT="$(usex nls)"
 	)
 	# release tarballs ship pre-built docs // -DHAVE_PREBUILT_DOCS=TRUE
-	[[ ${PV} == 9999 ]] && mycmakeargs+=( -DBUILD_DOCS="$(usex doc)" )
+	if [[ ${PV} == 9999 ]]; then
+		mycmakeargs+=( -DBUILD_DOCS="$(usex doc)" )
+	else
+		mycmakeargs+=( -DBUILD_DOCS=OFF )
+	fi
 	cmake_src_configure
 }
 
@@ -89,10 +93,10 @@ src_install() {
 src_test() {
 	# some tests are fragile, sanitize environment
 	local -x COLUMNS=80
-	local -X LINES=24
+	local -x LINES=24
 
 	# very fragile, depends on terminal, size, tmux, screen and timing
-	rm -v tests/pexpects/terminal.py || die 
+	rm -v tests/pexpects/terminal.py || die
 
 	cmake_build test
 }

app-shells/fish/fish-9999.ebuild

@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-any-r1 readme.gentoo-r1
 
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git"
 else
 	SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
@@ -70,7 +70,11 @@ src_configure() {
 		-DWITH_GETTEXT="$(usex nls)"
 	)
 	# release tarballs ship pre-built docs // -DHAVE_PREBUILT_DOCS=TRUE
-	[[ ${PV} == 9999 ]] && mycmakeargs+=( -DBUILD_DOCS="$(usex doc)" )
+	if [[ ${PV} == 9999 ]]; then
+		mycmakeargs+=( -DBUILD_DOCS="$(usex doc)" )
+	else
+		mycmakeargs+=( -DBUILD_DOCS=OFF )
+	fi
 	cmake_src_configure
 }
 
@@ -81,7 +85,16 @@ src_install() {
 }
 
 src_test() {
-	cmake_build -j1 test
+	# some tests are fragile, sanitize environment
+	local -x COLUMNS=80
+	local -x LINES=24
+
+	# very fragile, depends on terminal, size, tmux, screen and timing
+	if [[ ${PV} != 9999 ]]; then
+		rm -v tests/pexpects/terminal.py || die
+	fi
+
+	cmake_build test
 }
 
 pkg_postinst() {

app-text/libexttextcat/libexttextcat-3.4.6.ebuild

@@ -9,7 +9,7 @@ SRC_URI="https://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 src_configure() {
 	econf \

app-text/libmwaw/libmwaw-0.3.21.ebuild

@@ -10,7 +10,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 fi
 
 DESCRIPTION="Library parsing many pre-OSX MAC text formats"

app-text/pdfarranger/Manifest

@@ -1,3 +1,2 @@
-DIST pdfarranger-1.6.2.tar.gz 197726 BLAKE2B aee8ee7d32603f20bc01d9f5f77290390e8a038bf79e3c4f689a71ec1c3e454784b2225b43d33bdfd7897785827141cfe1770dcf41d233c4ec1f3865d6f1e3c0 SHA512 610c4dfaa141cfb8caebfc72b524cda05455ed4a5c1e336772655bd02ceac25fafedb439dbe83e87c88da189147eaf91149e9af92ec745a52f8a24fcee5fd390
-DIST pdfarranger-1.7.0.tar.gz 236125 BLAKE2B f16eb23fb597a22a48f075ee6435c74d51a4c45d35e03ec02b2b2353c29ad327f36f6af9ef028ddc53777ecae069e62437728308cda2a6296bd520c2a54e1220 SHA512 8f3c804119d5e4aa78cdae1964757be3404977a68dacccddea0e3e598c531a0ae163567709358ccd60764bebf3a55b5ed1bfbd2e0392c97569ffd9a18f549552
 DIST pdfarranger-1.7.1.tar.gz 236699 BLAKE2B b82a1f2309cc326bfba33458aaccee5396597a5c937c67baba767632cadddfae4f7ad21e0c86300c889f8e6d5f7dba9c6483b11bc97c83077e5ab01596b76617 SHA512 1adb5700b6497db95c3f727d1c18fc7b98ecc382cf15bc58bb7ce784d094e0d8cd45a26241e06a593eeb7601aa9f32ebba7d7f0f3a816e9384be09102eb0b4db
+DIST pdfarranger-1.8.1.tar.gz 258488 BLAKE2B e595735fceb156a9fb0dd1221e290f990dc2ee57b623278d9adac69308d0a3258849366d04541d5e7fc4db3605c4478f3e822274de4291286e888d7ae0b8f603 SHA512 de2d48816a362b082b66853f8a7bdc0f3aab78ca4a033ce44752ad755c22b23bcc6ecb796d7e2f3dd29525450807821b55b396dc2922e4092c79c84b8a703425

app-text/pdfarranger/pdfarranger-1.6.2.ebuild

@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1 optfeature xdg-utils desktop
-
-DESCRIPTION="Merge or split pdfs; rearrange, rotate, crop pages."
-HOMEPAGE="https://github.com/jeromerobert/pdfarranger"
-SRC_URI="https://github.com/jeromerobert/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-RDEPEND="
-	app-text/poppler[introspection,cairo]
-	dev-python/pikepdf[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
-	x11-libs/gtk+:3[introspection]
-	x11-libs/pango[introspection]
-"
-DEPEND="${RDEPEND}
-	dev-python/python-distutils-extra[${PYTHON_USEDEP}]
-"
-
-src_install() {
-	distutils-r1_src_install
-	for x in 16 32 48 256 scalable
-	do doicon -s ${x} data/icons/hicolor/${x}*/*
-	done
-}
-
-pkg_postinst() {
-	optfeature "image file import" media-gfx/img2pdf
-
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}

app-text/pdfarranger/pdfarranger-1.8.1.ebuild

@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1 optfeature xdg-utils desktop
 

app-text/pdftk/Manifest

@@ -1 +1,2 @@
 DIST pdftk-v3.2.2.tar.bz2 1245439 BLAKE2B ac1991e60ad06308cb7be1e74f9b3772c80416e490fe525e806efb6d30c6bbc9d310b98c255ef9e3eb3f814541d7388140210c4df2b694bd4a9ee325c27b3f24 SHA512 03220ac3036098768dd4250bbfeb6675561e9126697b99703ab5788b2cee7551256c301d9191745c5fdedf429056b46641351d1fb92631ef17673d7e740c5431
+DIST pdftk-v3.3.2.tar.bz2 2169492 BLAKE2B 53cb98fe3e3d1dbe8b01a45b5b11c6fbe57017ea8029efe35677914a48ffd446c5d67621443a89f512b15d0f7e77a81c945d4c220ccaf4fd658cc1726cc32059 SHA512 b02c713b67531205e760e8d8a240a82af47dbdc28e59aa683e03772d2fb27b504b98f8be1e8dc73bfc967cc9532f3dc1eccbd105abb21db396268855233051eb

app-text/pdftk/pdftk-3.3.2.ebuild

@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="gcj-free version of pdftk written in Java"
+HOMEPAGE="https://gitlab.com/pdftk-java/pdftk"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/pdftk-java/pdftk/"
+else
+	SRC_URI="https://gitlab.com/pdftk-java/pdftk/-/archive/v${PV}/pdftk-v${PV}.tar.bz2"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	S="${WORKDIR}/pdftk-v${PV}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+JAVA_PKG_STRICT="yes"
+EANT_GENTOO_CLASSPATH="bcprov,commons-lang-3.6"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+CDEPEND="
+	dev-java/bcprov:0
+	dev-java/commons-lang:3.6"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.8:*"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.8:*"
+
+src_install() {
+	java-pkg_newjar "build/jar/pdftk.jar"
+	java-pkg_dolauncher ${PN} --main com.gitlab.pdftk_java.pdftk
+}

app-text/pdftk/pdftk-9999.ebuild

@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit java-pkg-2 java-ant-2
 
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://gitlab.com/pdftk-java/pdftk/"
 else
 	SRC_URI="https://gitlab.com/pdftk-java/pdftk/-/archive/v${PV}/pdftk-v${PV}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 	S="${WORKDIR}/pdftk-v${PV}"
 fi
 
@@ -30,11 +30,11 @@ CDEPEND="
 
 RDEPEND="
 	${CDEPEND}
-	>=virtual/jre-1.7"
+	>=virtual/jre-1.8:*"
 
 DEPEND="
 	${CDEPEND}
-	>=virtual/jdk-1.7"
+	>=virtual/jdk-1.8:*"
 
 src_install() {
 	java-pkg_newjar "build/jar/pdftk.jar"

app-text/qpdf/qpdf-10.4.0.ebuild

@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz"
 LICENSE="|| ( Apache-2.0 Artistic-2 )"
 # subslot = libqpdf soname version
 SLOT="0/28"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
 IUSE="examples ssl test"
 RESTRICT="!test? ( test )"
 

app-text/qpdfview/qpdfview-0.4.18_p1.ebuild

@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE="cups +dbus djvu fitz +pdf postscript +sqlite +svg synctex"
 
 REQUIRED_USE="?? ( fitz pdf )"

app-text/ronn-ng/ronn-ng-0.9.1.ebuild

@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/apjanke/ronn-ng"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc"
 
 IUSE=""
 

dev-ada/gnatcoll-db/gnatcoll-db-22.0.0.ebuild

@@ -34,6 +34,8 @@ REQUIRED_USE="gnatinspect? ( xref )
 	sqlite? ( sql )
 	db2ada? ( sql )
 	postgres? ( sql )
+	|| ( shared static-libs static-pic )
+	|| ( sql sqlite xref postgres gnatinspect db2ada )
 	${ADA_REQUIRED_USE}
 	${PYTHON_REQUIRED_USE}"
 

dev-ada/gprbuild/files/gprbuild-2021-ar.patch

@@ -1,11 +0,0 @@
---- a/share/gprconfig/linker.xml	2021-12-22 22:06:14.895471351 +0100
-+++ b/share/gprconfig/linker.xml	2021-12-22 22:08:01.050767123 +0100
-@@ -864,7 +864,7 @@
-       <host name="^x86_64-.*linux.*" />
-     </hosts>
-     <config>
--   for Archive_Builder  use ("ar", "cr");
-+   for Archive_Builder  use ("${HOST(Ada)}-ar", "cr");
-    for Archive_Builder_Append_Option use ("q");
-    for Archive_Indexer  use ("ranlib");
-    for Archive_Suffix   use ".a";

dev-ada/gprbuild/files/gprbuild-2021-nm.patch

@@ -1,11 +1,12 @@
 --- a/share/gprconfig/linker.xml	2021-12-21 21:36:45.306813518 +0100
 +++ b/share/gprconfig/linker.xml	2021-12-21 22:20:21.642668870 +0100
-@@ -128,7 +128,7 @@
+@@ -128,7 +128,8 @@
        <host name="^i686.*-linux.*$" />
      </hosts>
      <config>
 -   for Object_Lister use ("nm", "-g");
-+   for Object_Lister use ("${HOST(Ada)}-nm", "-g");
++   NM := External("NM", "nm");
++   for Object_Lister use (NM, "-g");
     for Object_Lister_Matcher use " [TDRB] (.*)";
  
     LDFLAGS := External_As_List ("LDFLAGS", " ");

dev-ada/gprbuild/files/gprbuild-22.0.0-ar.patch

@@ -1,11 +1,12 @@
 --- a/share/gprconfig/linker.xml	2021-12-22 22:40:42.611766036 +0100
 +++ b/share/gprconfig/linker.xml	2021-12-22 22:42:28.839096356 +0100
-@@ -877,7 +877,7 @@
+@@ -877,7 +877,8 @@
        <host name="^x86_64-.*linux.*" />
      </hosts>
      <config>
 -   for Archive_Builder  use ("ar", "cr");
-+   for Archive_Builder  use ("${HOST(Ada)}-ar", "cr");
++   AR := External("AR", "ar");
++   for Archive_Builder  use (AR, "cr");
     for Archive_Builder_Append_Option use ("q");
     for Archive_Indexer  use ("ranlib");
     for Archive_Suffix   use ".a";

dev-ada/gprbuild/files/gprbuild-22.0.0-nm.patch

@@ -1,11 +1,12 @@
 --- a/share/gprconfig/linker.xml	2021-12-21 22:36:01.054738486 +0100
 +++ b/share/gprconfig/linker.xml	2021-12-21 22:36:59.973738600 +0100
-@@ -128,7 +128,7 @@
+@@ -128,7 +128,8 @@
        <host name="^i686.*-linux.*$" />
      </hosts>
      <config>
 -   for Object_Lister use ("nm", "-g");
-+   for Object_Lister use ("${HOST(Ada)}-nm", "-g");
++   NM := External("NM", "nm");
++   for Object_Lister use (NM, "-g");
     for Object_Lister_Matcher use " [TDRB] (.*)";
  
     package Linker is

dev-ada/gprbuild/gprbuild-2021-r2.ebuild

@@ -32,7 +32,7 @@ REQUIRED_USE="${ADA_REQUIRED_USE}"
 PATCHES=(
 	"${FILESDIR}"/${P}-gentoo.patch
 	"${FILESDIR}"/${P}-nm.patch
-	"${FILESDIR}"/${P}-ar.patch
+	"${FILESDIR}"/${PN}-22.0.0-ar.patch
 )
 
 src_prepare() {

dev-ada/libadalang/libadalang-22.0.0.ebuild

@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{7,8,9} )
 ADA_COMPAT=( gnat_202{0,1} )
 
-inherit ada python-single-r1
+inherit ada python-single-r1 multiprocessing
 
 DESCRIPTION="high performance semantic engine for the Ada programming language"
 HOMEPAGE="https://libre.adacore.com/"
@@ -16,17 +16,16 @@ SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
 LICENSE="GPL-3 gcc-runtime-library-exception-3.1"
 SLOT="0/${PV}"
 KEYWORDS="~amd64"
-IUSE="test shared +static-libs static-pic"
-REQUIRED_USE="|| ( shared static-libs static-pic )
-	${PYTHON_REQUIRED_USE}
+IUSE="test +static-libs static-pic"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	${ADA_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/pyyaml
-	dev-ada/gnatcoll-bindings[${ADA_USEDEP},gmp,iconv,shared?,static-libs?,static-pic?]
+	dev-ada/gnatcoll-bindings[${ADA_USEDEP},gmp,iconv,shared,static-libs?,static-pic?]
 	${ADA_DEPS}
 	${PYTHON_DEPS}
-	dev-ada/langkit[${ADA_USEDEP},shared?,static-libs?,static-pic?]
+	dev-ada/langkit[${ADA_USEDEP},shared,static-libs?,static-pic?]
 	$(python_gen_cond_dep '
 		dev-ada/langkit[${PYTHON_USEDEP}]
 	')"
@@ -38,6 +37,7 @@ BDEPEND="test? (
 		dev-ml/zarith
 		dev-ml/camomile
 		dev-ml/ocaml-ctypes
+		dev-ada/e3-testsuite
 	)"
 
 pkg_setup() {
@@ -50,12 +50,15 @@ pkg_setup() {
 	if use static-pic; then
 		libType+=',static-pic'
 	fi
-	if use shared; then
-		libType+=',relocatable'
-	fi
+	libType+=',relocatable'
 	libType=${libType:1}
 }
 
+src_prepare() {
+	default
+	rm -r testsuite/tests/misc/copyright || die
+}
+
 src_configure() {
 	${EPYTHON} manage.py generate -v debug || die
 }
@@ -63,20 +66,32 @@ src_configure() {
 src_compile() {
 	${EPYTHON} manage.py build -v \
 		--build-mode "prod" \
-		--gargs "-cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS}" \
+		-j$(makeopts_jobs) \
+		--gargs "-cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} -largs:C ${LDFLAGS}" \
 		--library-types=${libType} || die
+	GPR_PROJECT_PATH="${S}"/build \
+		gprbuild -P contrib/highlight/highlight.gpr \
+		-j$(makeopts_jobs) -v \
+		-XBUILD_MODE=prod \
+		-XLIBRARY_TYPE=relocatable \
+		-XXMLADA_BUILD=relocatable \
+		-cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} \
+		-largs:C ${LDFLAGS} \
+		|| die
 }
 
 src_test() {
-	#eval $(${EPYTHON} ./manage.py setenv)
-	${EPYTHON} manage.py test --restricted-env -j 1 |& > /dev/null
-	${EPYTHON} manage.py test --restricted-env -j 1 |& tee libadalang.testOut
+	${EPYTHON} manage.py test \
+		--build-mode "prod" \
+		--restricted-env -j 1 \
+		|& tee libadalang.testOut
 	grep -qw FAIL libadalang.testOut && die
 }
 
 src_install() {
 	${EPYTHON} manage.py \
 		install "${D}"/usr \
+		--build-mode "prod" \
 		--library-types=${libType} || die
 	rm -r "${D}"/usr/python || die
 	python_domodule build/python/libadalang

dev-ada/libadalang/metadata.xml

@@ -5,7 +5,6 @@
 		<email>ada@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name="shared">Build shared library</flag>
 		<flag name="static-pic">Build static library with pic code</flag>
 	</use>
 	<longdescription lang="en">

dev-java/java-config/java-config-2.3.1.ebuild

@@ -4,7 +4,7 @@
 EAPI=7
 
 # jython depends on java-config, so don't add it or things will break
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1

dev-java/java-config/java-config-9999.ebuild

@@ -4,7 +4,7 @@
 EAPI=7
 
 # jython depends on java-config, so don't add it or things will break
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1

dev-java/javatoolkit/javatoolkit-0.6.7.ebuild

@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 PYTHON_REQ_USE="xml(+)"
 DISTUTILS_USE_SETUPTOOLS=no
 

dev-java/joda-convert/joda-convert-2.2.2.ebuild

@@ -18,7 +18,7 @@ SRC_URI="https://github.com/JodaOrg/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 # Compile dependencies
 # POM: pom.xml

dev-java/typesafe-config/Manifest

@@ -1,2 +1,3 @@
 DIST typesafe-config-1.2.1.zip 287878 BLAKE2B bf4d1001bb84d0102b91b7ff383d9313302d95fd854928a40ecfbaae7a18309cf3f8509af0968fa21cedc485a1691c135395ccea5f9e6ba1c94856f2bb7ce81c SHA512 178f0df81f081b9355951debd3a5435c7d6aae25893f049917a25861015eba18a305d5370d914b89a7c46e55b5d9f3939ddd0656cfa9a4691bd16cf32c796502
+DIST typesafe-config-1.3.0.tar.gz 257311 BLAKE2B 6df016ef84f8e3f717ac22ea3a8a66ad54ab378645e853fbb5fbb3316dde56e4cf6ba7a256f38d8912514321060290a92c412ad9753c0244b35c20bb0a9e4950 SHA512 e8c0e3100b9e7c50ddd19285a3e33cc708711d0007719bb191012d88ddbd0286529172fce54a369c0dd86ced1c61807f40d5334a69b2c8bc6865a8b65740798e
 DIST typesafe-config-1.3.0.zip 363061 BLAKE2B 94c3f1f4eaaa831a15ef10619b672fb1882cfc472ab4d4ebb3494805f281152f7d01c56cee5f06a70319822d3e4254d540d4a5dde0f1c321b79fc4fbc18da6b8 SHA512 8b9821de442dc24b8b7be4c5ebc91d57214a32dceda8dc160cfaf801f70b34d2a2df6f8b2cbb744d18be3fbc887f1666f431b52882edcbde408d8adf3681fec4

dev-java/typesafe-config/typesafe-config-1.3.0-r3.ebuild

@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A library of arguably useful Java utilities"
+HOMEPAGE="https://lightbend.github.io/config/"
+SRC_URI="https://github.com/lightbend/config/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="doc source"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+DEPEND=">=virtual/jdk-1.8:*"

dev-lang/crystal/Manifest

@@ -6,3 +6,5 @@ DIST crystal-1.1.1-1-linux-x86_64.tar.gz 27999355 BLAKE2B 115d9002973d9e0e1ad2ed
 DIST crystal-1.1.1.tar.gz 2477825 BLAKE2B 4e1b06c831a22447a4d1f065be64b12642ee4b4a75f24b0b73b990944afe6e2a6fca95189b46ea0656b8d13bd7c6a83a23452779b494822803a0264e02b9d4ce SHA512 6e9e977792c863d17ae94aa285a65a453da581a71c3fd9c57cc606ae20813504d675faffa74f78e7c4cf863b6334c4a63ab5356c04fb11d3267dd516e060fe74
 DIST crystal-1.2.1-1-linux-x86_64.tar.gz 28586682 BLAKE2B 4d7847cdc6263c369de0926055569986cece1302d2251e4b2d25308609e45c0aa3afe7cdfecba3b7909d7568b1e81aafe69f9976a90c8980684a92231cc3857c SHA512 23cfb2389c65202dc70ebadb85cf0390ba2366520fbfd4b7bb0683c5194cd2b5c87b6b4142dd251471ec4146a5c1046ec86bcafa50c66389a41c9cb394ee6f5d
 DIST crystal-1.2.1.tar.gz 2618956 BLAKE2B e9ffd8b9114af419ee433093066dcf69f86e2f3293a6eeafee20f00c982dcd78774b3faf64d1e2568ba3141e24ef751cb2b5e0b2a2c57dac92d0039e6e224971 SHA512 a6acfac36a8a0d93e39947f2e35238f9cfc43485994fd6caf102f1d62ebc4d71d13d96801e998dbbff9541b76a8eb4fade7b998b179807ed49c1c338207a4720
+DIST crystal-1.2.2-1-linux-x86_64.tar.gz 28611412 BLAKE2B 95593120b00b09b0a250917cbfd0841a77ead5e768ad483a900452678be5b231408017c4ac668df4de675612a008a385ed0dbf6ea216aec0343f8b5e8ede3e98 SHA512 7fdb247074723f52f8dfb9d2e18eef1ceb6fcf595bd12ec7304eb292716c4462ee34d2d87eac56302053dd4d8cd2beccde3dc5bfa3c75e6e832813afecfadcde
+DIST crystal-1.2.2.tar.gz 2621720 BLAKE2B abd196aab8d874e7a26116b92b046893c5f03d3ad7a28902fd2bbc3fe8e801f4c5d6766397583864bc3b7642f5c508e7ea0beb82661f87943c8a9914e014e71b SHA512 855f9c103f05d1ebb03d146d93362849a15ea67a64c993219f7c66438585b590caa53a9482daf81810920b39795c9f5c3e2a0caf316b3d62826e2540fd5fb60e

dev-lang/crystal/crystal-1.2.2.ebuild

@@ -0,0 +1,104 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LLVM_MAX_SLOT=13
+inherit bash-completion-r1 llvm multiprocessing toolchain-funcs
+
+BV=${PV}-1
+BV_AMD64=${BV}-linux-x86_64
+
+DESCRIPTION="The Crystal Programming Language"
+HOMEPAGE="https://crystal-lang.org"
+SRC_URI="https://github.com/crystal-lang/crystal/archive/${PV}.tar.gz -> ${P}.tar.gz
+	amd64? ( https://github.com/crystal-lang/crystal/releases/download/${BV/-*}/crystal-${BV_AMD64}.tar.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc debug llvm-libunwind"
+
+# Upstream test suite not reliable
+RESTRICT=test
+
+DEPEND="
+	dev-libs/boehm-gc[static-libs,threads]
+	dev-libs/gmp:=
+	dev-libs/libatomic_ops
+	dev-libs/libevent
+	dev-libs/libpcre
+	dev-libs/pcl:=
+	<sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):=
+	llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+	!llvm-libunwind? ( sys-libs/libunwind:= )
+"
+RDEPEND="${DEPEND}
+	dev-libs/libxml2
+	dev-libs/libyaml
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.0-verbose.patch
+	"${FILESDIR}"/${PN}-0.26.1-gentoo-tests-sandbox.patch
+	"${FILESDIR}"/${PN}-0.27.0-extra-spec-flags.patch
+	"${FILESDIR}"/${PN}-0.27.0-gentoo-tests-long-unix.patch
+	"${FILESDIR}"/${PN}-0.27.0-gentoo-tests-long-unix-2.patch
+)
+
+src_configure() {
+	local bootstrap_path=${WORKDIR}/${PN}-${BV}/bin
+	if [[ ! -d ${bootstrap_path} ]]; then
+		eerror "Binary tarball does not contain expected directory:"
+		die "'${bootstrap_path}' path does not exist."
+	fi
+
+	MY_EMAKE_COMMON_ARGS=(
+		$(usex debug "" release=1)
+		progress=true
+		stats=1
+		threads=$(makeopts_jobs)
+		verbose=1
+		CC=$(tc-getCC)
+		CXX=$(tc-getCXX)
+		AR=$(tc-getAR)
+		LLVM_CONFIG="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config"
+		PATH="${bootstrap_path}:${PATH}"
+		CRYSTAL_PATH=src
+		CRYSTAL_CONFIG_VERSION=${PV}
+		CRYSTAL_CONFIG_PATH="lib:${EPREFIX}/usr/$(get_libdir)/crystal"
+	)
+
+	# crystal uses 'LLVM_TARGETS' to override default list of targets
+	unset LLVM_TARGETS
+}
+
+src_compile() {
+	emake "${MY_EMAKE_COMMON_ARGS[@]}"
+	use doc && emake docs
+}
+
+src_test() {
+	# EXTRA_SPEC_FLAGS is useful to debug individual tests
+	# as part of full build:
+	#    USE=debug EXTRA_SPEC_FLAGS='-e parse_set_cookie' emerge -1 crystal
+	emake std_spec "${MY_EMAKE_COMMON_ARGS[@]}" "EXTRA_SPEC_FLAGS=${EXTRA_SPEC_FLAGS}"
+}
+
+src_install() {
+	insinto /usr/$(get_libdir)/crystal
+	doins -r src/.
+	dobin .build/crystal
+
+	insinto /usr/share/zsh/site-functions
+	newins etc/completion.zsh _crystal
+
+	dodoc -r samples
+
+	if use doc ; then
+		docinto api
+		dodoc -r docs/.
+	fi
+
+	newbashcomp etc/completion.bash ${PN}
+}

dev-lang/tcl/tcl-8.6.12.ebuild

@@ -119,18 +119,3 @@ multilib_src_install() {
 		dodoc "${SPARENT}"/{ChangeLog*,README.md,changes}
 	fi
 }
-
-pkg_postinst() {
-	for version in ${REPLACING_VERSIONS}; do
-		if ver_test 8.6 -lt ${version}; then
-			echo
-			ewarn "You're upgrading from <${P}, you must recompile the other"
-			ewarn "packages on your system that link with tcl after the upgrade"
-			ewarn "completes. To perform this action, please run revdep-rebuild"
-			ewarn "in package app-portage/gentoolkit."
-			ewarn "If you have dev-lang/tk and dev-tcltk/tclx installed you should"
-			ewarn "upgrade them before this recompilation, too,"
-			echo
-		fi
-	done
-}

dev-lang/zig/Manifest

@@ -1,3 +1,4 @@
 DIST zig-0.7.1.tar.gz 16082917 BLAKE2B 401bb079f2d0e2ad26837940e3b79c14237a492bd0b4df616f91b8b454ebd4ac3de36b2c988369c9eaaf7c2df4f95d4b1bb97760629f813ac8c7220e9542e12b SHA512 ad0b36f7b40481aca03940adfd42d34a724922993fc29a23a80412dc087ca6ce4876a400dc9bb7da455564521a88ea205c218988759ff6c56251a08232bfa41a
 DIST zig-0.8.0.tar.gz 19596459 BLAKE2B 7b688fdd201ce7b0b1e12127c4b1bf898699de18f410021e09bb056a56666aa8de512688a0048d6ac0ea8d6b7dfdb86e1a5416d2fab0a4911e16269d7b6be2a4 SHA512 2082810d5ab0560167766e80f0853e5ff99e32b1935836a6a0029b8e1c88061c55dd0c285cbcc506f4c38aac8477ec7162b771537699be9b3d387de94e3baa57
 DIST zig-0.8.1.tar.gz 19643170 BLAKE2B bc52f3399b3355a1fc7675329870dd107b21798fc562a9e55cd4a7c838cfdb2ed58ae3a01e3841a1a58c82fe27bec8758703b654b7548b9e431728aaabcd7ea6 SHA512 36bea566eee3dc5c00f2713cbc6616258dbadd3ee994749339f124f8b70c691cfe7fdce6a00194f879679ea417dadb3bcc244f8b79153957a426fea2d52caaf5
+DIST zig-0.9.0.tar.gz 21994175 BLAKE2B aadef89d5fddc3e802965125625e62140ac37bdac40b29ab8b7652056589c037cbed5d4e46889f335b3c296fb4ae2a7cafd5d064a02d728a8325ad515cdc8c7a SHA512 fef36221e818364b45cf65de210b0a9d535c411a510371a3ab4dfd6f4621c0a16dba786169f115a006966875102acc742abee19a74d83e2bc999ea5b8304b879

dev-lang/zig/zig-0.9.0.ebuild

@@ -0,0 +1,59 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LLVM_MAX_SLOT=13
+inherit cmake llvm
+
+DESCRIPTION="A robust, optimal, and maintainable programming language"
+HOMEPAGE="https://ziglang.org/"
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/ziglang/zig.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/ziglang/zig/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BUILD_DIR="${S}/build"
+
+# According to zig's author, zig builds that do not support all targets are not
+# supported by the upstream project.
+ALL_LLVM_TARGETS=(
+	AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430 NVPTX
+	PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
+)
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+LLVM_TARGET_USEDEPS="${ALL_LLVM_TARGETS[@]}"
+
+RDEPEND="
+	sys-devel/clang:${LLVM_MAX_SLOT}
+	>=sys-devel/lld-${LLVM_MAX_SLOT}
+	<sys-devel/lld-$((${LLVM_MAX_SLOT} + 1))
+	sys-devel/llvm:${LLVM_MAX_SLOT}[${LLVM_TARGET_USEDEPS// /,}]
+"
+DEPEND="${RDEPEND}"
+
+llvm_check_deps() {
+	has_version "sys-devel/clang:${LLVM_SLOT}"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DZIG_USE_CCACHE=OFF
+		-DZIG_PREFER_CLANG_CPP_DYLIB=ON
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cd "${BUILD_DIR}" || die
+	./zig build test || die
+}

dev-lang/zig/zig-9999.ebuild

@@ -3,23 +3,24 @@
 
 EAPI=7
 
+LLVM_MAX_SLOT=13
 inherit cmake llvm
 
 DESCRIPTION="A robust, optimal, and maintainable programming language"
 HOMEPAGE="https://ziglang.org/"
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/ziglang/zig.git"
 	inherit git-r3
 else
 	SRC_URI="https://github.com/ziglang/zig/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~arm64"
 fi
 
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
 BUILD_DIR="${S}/build"
 
 # According to zig's author, zig builds that do not support all targets are not
@@ -31,12 +32,10 @@ ALL_LLVM_TARGETS=(
 ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 LLVM_TARGET_USEDEPS="${ALL_LLVM_TARGETS[@]}"
 
-LLVM_MAX_SLOT=13
-
 RDEPEND="
 	sys-devel/clang:${LLVM_MAX_SLOT}
-	>=sys-devel/lld-12.0.0
-	<sys-devel/lld-14.0.0
+	>=sys-devel/lld-${LLVM_MAX_SLOT}
+	<sys-devel/lld-$((${LLVM_MAX_SLOT} + 1))
 	sys-devel/llvm:${LLVM_MAX_SLOT}[${LLVM_TARGET_USEDEPS// /,}]
 "
 DEPEND="${RDEPEND}"
@@ -50,6 +49,7 @@ src_configure() {
 		-DZIG_USE_CCACHE=OFF
 		-DZIG_PREFER_CLANG_CPP_DYLIB=ON
 	)
+
 	cmake_src_configure
 }
 

dev-libs/cereal/cereal-1.3.0.ebuild

@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Header-only C++11 serialization library"
-HOMEPAGE="https://uscilab.github.io/cereal/"
-SRC_URI="https://github.com/USCiLab/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-libs/boost )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DJUST_INSTALL_CEREAL=$(usex !test)
-		-DWITH_WERROR=OFF
-	)
-	cmake_src_configure
-}

dev-libs/ell/ell-0.46.ebuild

@@ -12,7 +12,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
 else
 	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
 fi
 LICENSE="LGPL-2.1"
 SLOT="0"

dev-libs/jsoncpp/jsoncpp-1.9.5.ebuild

@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="|| ( public-domain MIT )"
 SLOT="0/25"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-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 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 

dev-libs/libbytesize/files/libbytesize-2.6-configure-bashism.patch

@@ -0,0 +1,31 @@
+https://github.com/storaged-project/libbytesize/pull/102
+
+From: Sam James <sam@gentoo.org>
+Date: Fri, 24 Dec 2021 07:58:47 +0000
+Subject: [PATCH] build: avoid bashisms in configure
+
+configure needs to be executable by a POSIX-compliant shell (/bin/sh)
+and while this is often Bash, which tolerates non-POSIX statements, it
+might sometimes be e.g. dash which doesn't.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -59,7 +59,7 @@ AC_ARG_WITH([python3],
+ AC_SUBST(WITH_PYTHON3, 0)
+ if test "x$with_python3" != "xno"; then
+     AC_PATH_PROG([python3], [python3], [no])
+-    AS_IF([test "x$python3" == "xno"],
++    AS_IF([test "x$python3" = "xno"],
+     [if test "x$with_python3" = "xyes"; then
+       LIBBYTESIZE_SOFT_FAILURE([Python3 support requested, but python3 is not available])
+       fi],
+@@ -77,7 +77,7 @@ AC_ARG_WITH([gtk-doc],
+ AC_SUBST(WITH_GTK_DOC, 0)
+ if test "x$with_gtk_doc" != "xno"; then
+     AC_PATH_PROG([gtkdoc_scan], [gtkdoc-scan], [no])
+-    AS_IF([test "x$gtkdoc_scan" == "xno"],
++    AS_IF([test "x$gtkdoc_scan" = "xno"],
+     [if test "x$with_gtk_doc" = "xyes"; then
+       LIBBYTESIZE_SOFT_FAILURE([Building documentation with gtk-doc requested, but not available])
+       fi],

dev-libs/libbytesize/libbytesize-2.5.ebuild

@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit autotools python-r1
 
@@ -66,7 +66,7 @@ src_configure() {
 		$(use_with tools)
 	)
 	local ECONF_SOURCE="${S}"
-	python_do econf "${myeconfargs[@]}"
+	CONFIG_SHELL="${BROOT}/bin/bash" python_do econf "${myeconfargs[@]}"
 }
 
 src_compile() {

dev-libs/libbytesize/libbytesize-2.6.ebuild

@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit autotools python-r1
 
@@ -44,6 +44,7 @@ RESTRICT="test"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2.4-no_Werror.patch"
+	"${FILESDIR}/${PN}-2.6-configure-bashism.patch"
 )
 
 python_do() {

dev-libs/libgit2-glib/Manifest

@@ -1 +1,2 @@
 DIST libgit2-glib-0.99.0.1.tar.xz 140996 BLAKE2B 0c163467ea43ab236b2c856416940b1ed7c93e6ed8ce9980d2d146f0633830ab3765d8bd34bdaab31efdb4096e88e0513c9585b9e06a3efc800d5c32a0d29479 SHA512 48b34ba84b5315d23d0429a684753c3a64c62086d70a67fdb4dfbf8f2ee883f5a90d7e59cfcfd229682794c455b668eb9bd7bf6159d6bfa45a99ddc2461d7c25
+DIST libgit2-glib-1.0.0.1.tar.xz 141664 BLAKE2B a99ad6db55d0d4bee4d7d96b92e92d12712843e41e25e5ab57f5722926fe3e95109a33654d0ab94b7f919bd5d51a0b159dcae720eee763200c964d0327b8a37d SHA512 8e156791783f79d585fa83267a5e14a4a93324fcca75e836478ddd5b5c53d9e827b07a3738c67116478435613639aab0992f32413b9a4de5fc4ff641dd042e80

dev-libs/libgit2-glib/libgit2-glib-1.0.0.1.ebuild

@@ -0,0 +1,60 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome.org meson python-r1 vala xdg
+
+DESCRIPTION="Git library for GLib"
+HOMEPAGE="https://wiki.gnome.org/Projects/Libgit2-glib"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="gtk-doc python +ssh +vala"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	>=dev-libs/gobject-introspection-1.54:=
+	>=dev-libs/glib-2.44.0:2
+	>=dev-libs/libgit2-0.26.0:0=[ssh?]
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pygobject:3[${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.1.2 )
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	xdg_src_prepare
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc gtk_doc)
+		-Dintrospection=true
+		-Dpython=false # we install python scripts manually
+		$(meson_use ssh)
+		$(meson_use vala vapi)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	if use python ; then
+		python_moduleinto gi.overrides
+		python_foreach_impl python_domodule libgit2-glib/Ggit.py
+	fi
+}

dev-libs/libgusb/libgusb-0.3.7.ebuild

@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit meson-multilib python-any-r1 vala
-
-DESCRIPTION="GObject wrapper for libusb"
-HOMEPAGE="https://github.com/hughsie/libgusb"
-SRC_URI="https://people.freedesktop.org/~hughsient/releases/${P}.tar.xz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
-
-IUSE="gtk-doc +introspection static-libs test +vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
-	>=dev-libs/glib-2.44.0:2[${MULTILIB_USEDEP}]
-	virtual/libusb:1[udev,${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-	sys-apps/hwids
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
-	gtk-doc? (
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/docbook-xml-dtd:4.4
-		dev-util/gtk-doc
-	)
-	vala? ( $(vala_depend) )
-	virtual/pkgconfig
-"
-
-RESTRICT="!test? ( test )"
-
-python_check_deps() {
-	has_version -b "dev-python/setuptools[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	use vala && vala_src_prepare
-	default
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Ddefault_library=$(usex static-libs both shared)
-		$(meson_use test tests)
-		$(meson_native_use_bool vala vapi)
-		-Dusb_ids="${EPREFIX}"/usr/share/misc/usb.ids
-		$(meson_native_use_bool gtk-doc docs)
-		$(meson_native_use_bool introspection)
-
-	)
-	meson_src_configure
-}