Sync with portage [Sat Apr 17 01:26:34 MSK 2021].

3 years ago · 22fc1aa978
parent 4451d7e5fe
commit 22fc1aa978
192 changed files with 2519 additions and 972 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
--- a/app-backup/borgmatic/Manifest
+++ b/app-backup/borgmatic/Manifest
@ -1 +1,2 @@
 DIST borgmatic-1.5.12.tar.gz 72964 BLAKE2B d71537eed019b10c3257d4b068c31aff63919e0cdb068b49c2ed92d2e97d37b8735f30b1225fb453e79372aeab49817e9200770aac4cc0f80c0bac14e84678d1 SHA512 67c7c7683e9fb7dd0321b3db6887212b040596f1d7e767cceeae6fa4cc02bb0a46344befbbc7a33b454a4692b04ae88d9031f71867788a94f771999d885112d5
+DIST borgmatic-1.5.13.tar.gz 72469 BLAKE2B 3a71be201143a96968bb1ea6008b62e11f6ab199f44f38d0d66f31f24827a8f32cc7b8f50cc5d33a8bbd7046e6697afe509525be90dd9519f4c686b8737f64c5 SHA512 60bcbcc825db3f93a423ab8e44e0b0809ff4937d8e41bc56ec6226e4865c3a66fae8b6749d33cdb0692ea9dd07cfff56750ff2feee68c96791b83c9dd5f35433
--- a/app-backup/borgmatic/borgmatic-1.5.13.ebuild
+++ b/app-backup/borgmatic/borgmatic-1.5.13.ebuild
@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+inherit distutils-r1 systemd
+
+DESCRIPTION="Automatically create, prune and verify backups with borgbackup"
+HOMEPAGE="https://torsion.org/borgmatic/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64"
+
+# Fails due to problems with dev-python/flexmock-0.10.4; see Bug #740128
+RESTRICT="test"
+
+# borg is called as an external tool, hence no pythonic stuff
+RDEPEND="app-backup/borgbackup
+	$(python_gen_cond_dep '
+		dev-python/colorama[${PYTHON_USEDEP}]
+		>=dev-python/pykwalify-1.6.0[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		<dev-python/ruamel-yaml-0.18.0[${PYTHON_USEDEP}]
+	')"
+#BDEPEND="
+#	test? (
+#		$(python_gen_cond_dep '
+#			dev-python/flexmock[${PYTHON_USEDEP}]
+#		')
+#	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.1-systemd_service_bin_path.patch
+	"${FILESDIR}"/${PN}-1.5.1-no_test_coverage.patch
+)
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# Unlike the other two test files in integration/commands, which use the
+	# relevant modules' respective APIs, test_borgmatic.py tries to call the
+	# 'borgmatic' executable - which by the time we execute src_test will
+	# not have been created yet. Adding --install to distutils_enable_tests would
+	# likely take care of this - but between the aforementioned behaviour
+	# inconsistency and the fact the only test run from this file as of version
+	# 1.5.13 is the parsing of contents of 'borgmatic --version', just skip it.
+	rm -f "${S}"/tests/integration/commands/test_borgmatic.py
+}
+
+src_install() {
+	distutils-r1_src_install
+	systemd_dounit sample/systemd/borgmatic.{service,timer}
+	keepdir /etc/borgmatic
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "To generate a sample configuration file, run:"
+		elog "    generate-borgmatic-config"
+	fi
+	elog
+	elog "Systemd users wishing to periodically run borgmatic can use the provided timer and service units."
+}
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/winetricks/Manifest
+++ b/app-emulation/winetricks/Manifest
@ -1,3 +1,2 @@
-DIST winetricks-20200412.tar.gz 684548 BLAKE2B e29eba0c73ec0649523dac0f0efd145a5c9fe60d94ae98bc55ec430f511cc5bdf3149d87289973a85a373f2f91c3bd5521470853e06f5ec4af83fc810aa4fdc5 SHA512 d6ca5628b7d296b3168ef088ca0b03aff8b73da8a139061ca64fac0685ec29bf2b7e075b89226f8ce3af511947eac45d4c72cfb1199e6b72666fc67547b77588
 DIST winetricks-20210206.tar.gz 690837 BLAKE2B a1d068e9659f6b176873af49994f1e0ca884eaa1ac9b8f5dd6d7abe79a2b8b827a2334efa7862547b17cca5bcfc285ce2d65ac0e5736cddcc777d4df2dbc7af9 SHA512 57f2ce5fe531eb6ee9a578ca565fadf5ef2e6e1379abee640ee9dc0d6000c92ce983c7507002bc6ace613d6d0dd03260ede11f7bf267adf19eb67900a0449f58
 DIST winetricks-gentoo-2012.11.24.tar.bz2 6398 BLAKE2B 54a4502f6e8ef15d21b02c43e3ce599e32d476c2559246064de14cc4ce2243ff11dde681d24c8a7f4913c3d7a10b855bda47e8fb8ecad31e00d839705416be6f SHA512 59c93b73f3a7b2d11aefcde2ff66659ff1de21ad4b5f232f4b60572f3a48b15a6c49f369b1696862bf1b33fde190bf5598945e9536fb41ddec42d8def4d2be2a
--- a/app-emulation/winetricks/winetricks-20200412.ebuild
+++ b/app-emulation/winetricks/winetricks-20200412.ebuild
@ -1,93 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop xdg
-
-if [[ ${PV} == "99999999" ]] ; then
-	EGIT_REPO_URI="https://github.com/Winetricks/${PN}.git"
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/Winetricks/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-wtg="winetricks-gentoo-2012.11.24"
-
-SRC_URI="${SRC_URI}
-	gtk? ( https://dev.gentoo.org/~chiitoo/distfiles/${wtg}.tar.bz2 )
-	kde? ( https://dev.gentoo.org/~chiitoo/distfiles/${wtg}.tar.bz2 )
-"
-
-DESCRIPTION="Easy way to install DLLs needed to work around problems in Wine"
-HOMEPAGE="https://github.com/Winetricks/winetricks https://wiki.winehq.org/Winetricks"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="gtk kde rar test"
-RESTRICT="!test? ( test )"
-
-# dev-util/shellcheck is not available for x86
-RESTRICT+=" x86? ( test )"
-
-BDEPEND="
-	test? (
-		dev-python/bashate
-		dev-util/checkbashisms
-		|| (
-			dev-util/shellcheck-bin
-			dev-util/shellcheck
-		)
-	)
-"
-DEPEND=""
-RDEPEND="${DEPEND}
-	app-arch/cabextract
-	app-arch/p7zip
-	app-arch/unzip
-	net-misc/wget
-	virtual/wine
-	x11-misc/xdg-utils
-	gtk? ( gnome-extra/zenity )
-	kde? ( kde-apps/kdialog )
-	rar? ( app-arch/unrar )
-"
-
-# Test targets include syntax checks only, not the "heavy duty" tests
-# that would require a lot of disk space, as well as network access.
-
-# This uses a non-standard "Wine" category, which is provided by
-# '/etc/xdg/menus/applications-merged/wine.menu' from the
-# 'app-emulation/wine-desktop-common' package.
-# https://bugs.gentoo.org/451552
-QA_DESKTOP_FILE="usr/share/applications/winetricks.desktop"
-
-src_unpack() {
-	if [[ ${PV} == "99999999" ]]; then
-		git-r3_src_unpack
-
-		if use gtk || use kde; then
-			unpack ${wtg}.tar.bz2
-		fi
-
-	else
-		default
-	fi
-}
-
-src_test() {
-	./tests/shell-checks || die "Test(s) failed."
-}
-
-src_install() {
-	default
-
-	if use gtk || use kde; then
-		cd "${WORKDIR}/${wtg}" || die
-		domenu winetricks.desktop
-		insinto /usr/share/icons/hicolor/scalable/apps
-		doins wine-winetricks.svg
-	fi
-}
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
--- a/app-text/yelp-tools/yelp-tools-40.0.ebuild
+++ b/app-text/yelp-tools/yelp-tools-40.0.ebuild
@ -15,6 +15,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"

 RDEPEND="
 	${PYTHON_DEPS}
+	$(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
 	>=dev-libs/libxml2-2.6.12
 	>=dev-libs/libxslt-1.1.8
 	dev-util/itstool
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
--- a/dev-java/snakeyaml/snakeyaml-1.28-r1.ebuild
+++ b/dev-java/snakeyaml/snakeyaml-1.28-r1.ebuild
@ -53,7 +53,7 @@ PATCHES=(

 JAVA_SRC_DIR="src/main/java"

-JAVA_TEST_GENTOO_CLASSPATH="commons-io-1,joda-time,junit-4,commons-lang-3.4,velocity"
+JAVA_TEST_GENTOO_CLASSPATH="commons-io-1,joda-time,junit-4,commons-lang-3.6,velocity"
 JAVA_TEST_SRC_DIR="src/test/java"
 JAVA_TEST_RESOURCE_DIRS="src/test/resources"

--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
--- a/dev-lang/nim/Manifest
+++ b/dev-lang/nim/Manifest
@ -1 +1,2 @@
 DIST nim-1.4.4.tar.xz 4686420 BLAKE2B ad59365b07c04bace859f18f5bbbc8178e21ae69ab7e87dd68d80f6c95bbfdb6e738057e543c4fb562af07cc2085204c1a4f6a2bf7c0352f51f6b46f3cb680d1 SHA512 42db962295a6014ccb3e2df3c07248a3abac863169f16af0c947dc97ca1ada683484f95773dc5fc11118001e9a48f116787d34d71aa77bef18877ce04e1f4fe9
+DIST nim-1.4.6.tar.xz 4793544 BLAKE2B 5d015193564c63f16bd812eed19ace6cdeb2c944aa3aad3a41f4f811e8d56bdde02c5b405e7939ab09ad8b29d84ef9212c2df7c9f9148e0c26288157d20f4846 SHA512 6b1971a920c3572f9a1997648a297afc1696b09ac20ca031a4b23eba3b66b9ff93606bff2eeacaa651ed8cf6af2df7d38ec6253a4e66955a3e04c6d88991e013
--- a/dev-lang/nim/nim-1.4.6.ebuild
+++ b/dev-lang/nim/nim-1.4.6.ebuild
@ -0,0 +1,80 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 multiprocessing toolchain-funcs
+
+DESCRIPTION="compiled, garbage-collected systems programming language"
+HOMEPAGE="https://nim-lang.org/"
+SRC_URI="https://nim-lang.org/download/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+readline test"
+
+RESTRICT=test # need to sort out depends and numerous failures
+
+RDEPEND="
+	readline? ( sys-libs/readline:0= )
+"
+DEPEND="
+	${DEPEND}
+	test? ( net-libs/nodejs )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.20.0-paths.patch
+)
+
+_run() {
+	echo "$@"
+	"$@" || die "'$*' failed"
+}
+
+nim_use_enable() {
+	[[ -z $2 ]] && die "usage: nim_use_enable <USE flag> <compiler flag>"
+	use $1 && echo "-d:$2"
+}
+
+src_configure() {
+	export XDG_CACHE_HOME=${T}/cache #667182
+	tc-export CC LD
+
+	# Override default CC=gcc.
+	echo "gcc.exe            = \"$(tc-getCC)\"" >> config/nim.cfg || die
+	echo "gcc.linkerexe      = \"$(tc-getCC)\"" >> config/nim.cfg || die
+	echo "gcc.cpp.exe        = \"$(tc-getCXX)\"" >> config/nim.cfg || die
+	echo "gcc.cpp.linkerexe  = \"$(tc-getCXX)\"" >> config/nim.cfg || die
+}
+
+src_compile() {
+
+	_run ./build.sh
+
+	_run ./bin/nim --parallelBuild:$(makeopts_jobs) c koch
+	_run ./koch boot --parallelBuild:$(makeopts_jobs) -d:release $(nim_use_enable readline useGnuReadline)
+	PATH="./bin:$PATH" _run ./koch tools --parallelBuild:$(makeopts_jobs)
+}
+
+src_test() {
+	PATH="./bin:$PATH" _run ./koch test --parallelBuild:$(makeopts_jobs)
+}
+
+src_install() {
+	PATH="./bin:$PATH" _run ./koch install "${ED}"
+	rm -r "${ED}/usr/share/nim/doc" || die "failed to remove 'doc'"
+
+	exeinto /usr/bin
+
+	local bin_exe
+	for bin_exe in bin/*; do
+		# './koch install' installs only 'nim' binary
+		# but not the rest
+		[[ ${bin_exe} == bin/nim ]] && continue
+		doexe "${bin_exe}"
+	done
+
+	newbashcomp tools/nim.bash-completion ${PN}
+}
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
--- a/dev-libs/libburn/libburn-1.5.4.ebuild
+++ b/dev-libs/libburn/libburn-1.5.4.ebuild
@ -4,7 +4,7 @@
 EAPI=7

 DESCRIPTION="Open-source library for reading, mastering and writing optical discs"
-HOMEPAGE="https://dev.lovelyhq.com/libburnia/web/wikis/home"
+HOMEPAGE="https://dev.lovelyhq.com/libburnia/web/wiki/Libburn"
 SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"

 LICENSE="GPL-2"
--- a/dev-libs/libisoburn/libisoburn-1.5.4.ebuild
+++ b/dev-libs/libisoburn/libisoburn-1.5.4.ebuild
@ -4,7 +4,7 @@
 EAPI=7

 DESCRIPTION="Creation/expansion of ISO-9660 filesystems on CD/DVD media supported by libburn"
-HOMEPAGE="https://dev.lovelyhq.com/libburnia/web/wikis/home"
+HOMEPAGE="https://dev.lovelyhq.com/libburnia/web/wiki/Libisoburn"
 SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"

 LICENSE="GPL-2 GPL-3"
--- a/dev-libs/libisofs/libisofs-1.5.4.ebuild
+++ b/dev-libs/libisofs/libisofs-1.5.4.ebuild
@ -4,7 +4,7 @@
 EAPI=7

 DESCRIPTION="Open-source library for reading, mastering and writing optical discs"
-HOMEPAGE="https://dev.lovelyhq.com/libburnia/web/wikis/home"
+HOMEPAGE="https://dev.lovelyhq.com/libburnia/web/wiki/Libisofs"
 SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"

 LICENSE="GPL-2"
--- a/dev-libs/oniguruma/Manifest
+++ b/dev-libs/oniguruma/Manifest
@ -1 +1,3 @@
 DIST onig-6.9.6.tar.gz 926459 BLAKE2B 7a5fb49b35abe11fb91e7e4529855411fa0eb357897a2b327ddb5696a2c1e5f9fe7eb653fe84dbaeeff9c77e5489fd042d65e84f5b8e3e907bd30d60a0b75914 SHA512 eb44f70347f49945fe054ad65370dbfd6b30b2e8442fb90b6c72413b7f9a8cb77ca98d1a4714d1d32b763551430436cc0175c0efaf2c73268363a9b6ecb5e3bc
+DIST onig-6.9.7.1.tar.gz 935705 BLAKE2B 1042d5b211f53ad8983eb6b4e53beb165bc948bbef9a85ad12578a9237a804e3dcd0a8105914156230ec30e11f2c8a0372c37919cdde7b2be104c66a8b22fb52 SHA512 17711e0d451c41e74cb3f8ab4e78b0181578ef42cb35dc64e87871c82a41909334cb4eeb03eccdccf6904f699e6e82b0dbb54077138225b9b95471fcdeb8c486
+DIST onig-6.9.7.tar.gz 935733 BLAKE2B dcabf46429ba1a99fb3c645144ee68cba2594ae30972dbfedc229eaca0686c32b776688218c68564a8c24f9f782f84901cd81bca01e2126ec39c742c002a517c SHA512 eba6057f87ef5897fe72d4535942e005329ec532db2f4cf8d5e901c478c151eedf3886ce04d595c406e2d5ad98273c0c2696eb46da5ee359b24f8221531e1f5a
--- a/dev-libs/oniguruma/oniguruma-6.9.7.1.ebuild
+++ b/dev-libs/oniguruma/oniguruma-6.9.7.1.ebuild
@ -0,0 +1,55 @@
+# Copyright 2003-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit multilib-minimal
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit autotools git-r3
+
+	EGIT_REPO_URI="https://github.com/kkos/oniguruma"
+fi
+
+DESCRIPTION="Regular expression library for different character encodings"
+HOMEPAGE="https://github.com/kkos/oniguruma"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/onig-${PV}.tar.gz"
+fi
+
+LICENSE="BSD-2"
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+IUSE="crnl-as-line-terminator static-libs"
+
+BDEPEND=""
+DEPEND=""
+RDEPEND=""
+
+if [[ "${PV}" != "9999" ]]; then
+	S="${WORKDIR}/onig-$(ver_cut 1-3)"
+fi
+
+DOCS=(AUTHORS HISTORY README{,_japanese} doc/{API,CALLOUTS.API,CALLOUTS.BUILTIN,FAQ,RE}{,.ja} doc/{SYNTAX.md,UNICODE_PROPERTIES})
+
+src_prepare() {
+	default
+
+	if [[ "${PV}" == "9999" ]]; then
+		eautoreconf
+	fi
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		--enable-posix-api \
+		$(use_enable crnl-as-line-terminator) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name "*.la" -delete || die
+}
--- a/dev-libs/oniguruma/oniguruma-6.9.7.ebuild
+++ b/dev-libs/oniguruma/oniguruma-6.9.7.ebuild
@ -0,0 +1,55 @@
+# Copyright 2003-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit multilib-minimal
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit autotools git-r3
+
+	EGIT_REPO_URI="https://github.com/kkos/oniguruma"
+fi
+
+DESCRIPTION="Regular expression library for different character encodings"
+HOMEPAGE="https://github.com/kkos/oniguruma"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/onig-${PV}.tar.gz"
+fi
+
+LICENSE="BSD-2"
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+IUSE="crnl-as-line-terminator static-libs"
+
+BDEPEND=""
+DEPEND=""
+RDEPEND=""
+
+if [[ "${PV}" != "9999" ]]; then
+	S="${WORKDIR}/onig-${PV}"
+fi
+
+DOCS=(AUTHORS HISTORY README{,_japanese} doc/{API,CALLOUTS.API,CALLOUTS.BUILTIN,FAQ,RE}{,.ja} doc/{SYNTAX.md,UNICODE_PROPERTIES})
+
+src_prepare() {
+	default
+
+	if [[ "${PV}" == "9999" ]]; then
+		eautoreconf
+	fi
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		--enable-posix-api \
+		$(use_enable crnl-as-line-terminator) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name "*.la" -delete || die
+}
--- a/dev-lua/Manifest.gz
+++ b/dev-lua/Manifest.gz
--- a/dev-lua/luacheck/Manifest
+++ b/dev-lua/luacheck/Manifest
@ -1,2 +1 @@
-DIST luacheck-0.23.0.tar.gz 158201 BLAKE2B c0780143a335b1deb7725819dbdac03446742fd459eed5a6de0cf3de5576f3be5379ff7086348b8880eba70dd5f7a1e719e9a09fdcc70abc293e1636f575ad57 SHA512 d76e4b22f1e9d868a8531ad51fb98607e5bfb1fbbd55053105d9978ba6c0455de99202c53d4e199733ea997863b26527fb84e7e9717209fd588f1d02db9db028
 DIST luacheck-0.24.0.tar.gz 162474 BLAKE2B 6ec2b35deb2f0e5dacbe00e9d5adda7a1d66ee55475adf2b40cfff4d876cd44c9aec762e52bf02bb6f65cccc7c42203d94d3c9ed7a9f2311b3b7ae7bf8ab09e0 SHA512 759079d4a033c8af1d7c314f39bb75398b8ad89b627eaf8b60cf0a878c3ea86bd5e8993ad3d564746614b06b93b4100f016fdcb805d02b226e8e1e5b4c81c6d2
--- a/dev-lua/luacheck/luacheck-0.23.0-r100.ebuild
+++ b/dev-lua/luacheck/luacheck-0.23.0-r100.ebuild
@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..3} luajit )
-
-inherit lua toolchain-funcs
-
-DESCRIPTION="A tool for linting and static analysis of Lua code"
-HOMEPAGE="https://github.com/mpeterv/luacheck"
-SRC_URI="https://github.com/mpeterv/luacheck/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-lua/lua-argparse[${LUA_USEDEP}]
-	dev-lua/lua-utf8[${LUA_USEDEP}]
-	dev-lua/luafilesystem[${LUA_USEDEP}]
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( dev-python/sphinx )
-	test? (
-		>=dev-lua/busted-2.0.0-r100[${LUA_USEDEP}]
-		${RDEPEND}
-	)
-"
-
-PATCHES=( "${FILESDIR}/${PN}-0.23.0-disable-measuring-performance-test.patch" )
-
-src_compile() {
-	if use doc; then
-		sphinx-build docsrc html || die
-	fi
-}
-
-lua_src_test() {
-	busted --lua=${ELUA} || die
-}
-
-src_test() {
-	lua_foreach_impl lua_src_test
-}
-
-lua_src_install() {
-	insinto "$(lua_get_lmod_dir)"
-	doins -r src/luacheck
-}
-
-src_install() {
-	lua_foreach_impl lua_src_install
-
-	newbin bin/luacheck.lua luacheck
-
-	use doc && local -a HTML_DOCS=( "html/." )
-	einstalldocs
-}
--- a/dev-lua/luacheck/luacheck-0.24.0.ebuild
+++ b/dev-lua/luacheck/luacheck-0.24.0.ebuild
@ -13,7 +13,7 @@ SRC_URI="https://github.com/luarocks/luacheck/archive/${PV}.tar.gz -> ${P}.tar.g

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"

--- a/dev-lua/luacheck/metadata.xml
+++ b/dev-lua/luacheck/metadata.xml
@ -13,6 +13,7 @@
 		<email>gyakovlev@gentoo.org</email>
 		<name>Georgy Yakovlev</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<longdescription lang="en">
 		A tool for linting and static analysis of Lua code.
 		Luacheck supports checking Lua files using syntax of
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
--- a/dev-python/pytest-env/Manifest
+++ b/dev-python/pytest-env/Manifest
@ -0,0 +1 @@
+DIST pytest-env-0.6.2.tar.gz 1693 BLAKE2B b303b8b2b486cd5f6c6273fefe709e3986183a56b6758b05f8bde973c561ebba9646538d38783749305740d8bd637966966a109fcd600cd6f6ee059449ffb328 SHA512 0b3bb21fc881023c102b584593c6e28840400ce8190810f33f9a421df4141e17dcfad2943c4159aaab82376b7b47b07b45f97c9cb232a7d17c4d35b55966596d
--- a/dev-python/pytest-env/metadata.xml
+++ b/dev-python/pytest-env/metadata.xml
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">MobileDynasty/pytest-env</remote-id>
+		<remote-id type="pypi">pytest-env</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/dev-python/pytest-env/pytest-env-0.6.2.ebuild
+++ b/dev-python/pytest-env/pytest-env-0.6.2.ebuild
@ -0,0 +1,17 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="py.test plugin that allows you to add environment variables"
+HOMEPAGE="https://github.com/MobileDynasty/pytest-env"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
--- a/dev-util/bazel/Manifest
+++ b/dev-util/bazel/Manifest
@ -9,3 +9,4 @@ DIST bazel-1.2.0-rename-gettid-functions.patch 3303 BLAKE2B 75aaed0b8e5fe33910d1
 DIST bazel-1.2.1-dist.zip 267514406 BLAKE2B f9d316ac096f503a2c7fe101b103b88e7f0247f767a8dc28eb8c9d2cd0b6df6fa785f3b187e1a3963e2f9f0ae742a3330e5104e7a8aea75cb9b9e100366a5aca SHA512 bc0e6526bfbb8725a4f2ae95fc88b22229301b64559325fca3bcf5a9bc642cec2b2284eb9a6ce0699f1f910378b89ee23657dbea7928a92cc1900f1f2f405ff3
 DIST bazel-2.0.0-dist.zip 259625808 BLAKE2B 31b62fb3da1f6fc7efc4c3f44521e12f879a1e5b532fe814d8f49c01c511b34cd65df252d6d143fdcd96f72dc94d76249f79be50fc66a459132c030ef0182ca8 SHA512 db609e9d0ee0cdbfb999de850db17907af02dc26e605f4617dfeb2fbac5c30c4c0a9f48c6ba3673ffe8babb5b9e157cc51c32832015b85ed279b6b160506cdae
 DIST bazel-3.2.0-dist.zip 269368916 BLAKE2B 1eb54c42e22432d2c836a87179094563b797744de423468bf9bce1b7b4dbcdce20e033ed03c4cd7ea5026c9e0d971e16202aff09f9c45d91c9fc53af6f0f8802 SHA512 fd8191188ecb49087b2b474bc383b2bb5d131460952be64b8930dc7e573fd14f99f231c4270b88fb4c9537fb94a04588fb580891519d20c7b90d705238f17f81
+DIST bazel-3.7.2-dist.zip 313677756 BLAKE2B cd6363762c68d25739a6bf6c13f10e191302a10b6fb7d97455effbc678d4f0b644c76115cad478aad7c09f703d9e594f4bdb8669ed6ab97d6a559a27723c510c SHA512 e8746ef5ec22feb95e9dbbddb3fb56cf8f49c80f326fc2a4e0ce2619607826fac22f46bfb995daee55bf9ffabb9d646b8454be2bce7b479da5cf2a7e5b3be62b
--- a/dev-util/bazel/bazel-3.7.2.ebuild
+++ b/dev-util/bazel/bazel-3.7.2.ebuild
@ -0,0 +1,113 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 java-pkg-2 multiprocessing
+
+DESCRIPTION="Fast and correct automated build system"
+HOMEPAGE="https://bazel.build/"
+
+SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples tools prefix static-libs"
+REQUIRED_USE="prefix? ( static-libs )"
+# strip corrupts the bazel binary
+# test fails with network-sandbox: An error occurred during the fetch of repository 'io_bazel_skydoc' (bug 690794)
+RESTRICT="strip test"
+RDEPEND=">=virtual/jdk-1.8:*"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	app-arch/zip"
+
+S="${WORKDIR}"
+
+bazel-get-flags() {
+	local i fs=()
+	for i in ${CFLAGS}; do
+		fs+=( "--copt=${i}" "--host_copt=${i}" )
+	done
+	for i in ${CXXFLAGS}; do
+		fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
+	done
+	for i in ${CPPFLAGS}; do
+		fs+=( "--copt=${i}" "--host_copt=${i}" )
+		fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
+	done
+	for i in ${LDFLAGS}; do
+		fs+=( "--linkopt=${i}" "--host_linkopt=${i}" )
+	done
+	echo "${fs[*]}"
+}
+
+pkg_setup() {
+	echo ${PATH} | grep -q ccache && \
+		ewarn "${PN} usually fails to compile with ccache, you have been warned"
+	java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+	# Only unpack the main distfile
+	unpack ${P}-dist.zip
+}
+
+src_prepare() {
+	default
+
+	# F: fopen_wr
+	# S: deny
+	# P: /proc/self/setgroups
+	# A: /proc/self/setgroups
+	# R: /proc/24939/setgroups
+	# C: /usr/lib/systemd/systemd
+	addpredict /proc
+}
+
+src_compile() {
+	export EXTRA_BAZEL_ARGS="--jobs=$(makeopts_jobs) $(bazel-get-flags) --host_javabase=@local_jdk//:jdk"
+	if use static-libs; then
+		export BAZEL_LINKOPTS=-static-libs:-static-libgcc BAZEL_LINKLIBS=-l%:libstdc++.a:-lm
+	fi
+	VERBOSE=yes ./compile.sh || die
+
+	./scripts/generate_bash_completion.sh \
+		--bazel=output/bazel \
+		--output=bazel-complete.bash \
+		--prepend=scripts/bazel-complete-header.bash \
+		--prepend=scripts/bazel-complete-template.bash
+}
+
+src_test() {
+	output/bazel test \
+		--verbose_failures \
+		--spawn_strategy=standalone \
+		--genrule_strategy=standalone \
+		--verbose_test_summary \
+		examples/cpp:hello-success_test || die
+	output/bazel shutdown
+}
+
+src_install() {
+	dobin output/bazel
+	newbashcomp bazel-complete.bash ${PN}
+	bashcomp_alias ${PN} ibazel
+	insinto /usr/share/zsh/site-functions
+	doins scripts/zsh_completion/_bazel
+
+	if use examples; then
+		docinto examples
+		dodoc -r examples/*
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	# could really build tools but I don't know which ones
+	# are actually used
+	if use tools; then
+		docinto tools
+		dodoc -r tools/*
+		docompress -x /usr/share/doc/${PF}/tools
+		docompress -x /usr/share/doc/${PF}/tools/build_defs/pkg/testdata
+	fi
+}
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
--- a/dev-vcs/pre-commit/pre-commit-2.12.0.ebuild
+++ b/dev-vcs/pre-commit/pre-commit-2.12.0.ebuild
@ -25,9 +25,7 @@ KEYWORDS="~amd64"
 #     Ditto
 #  - tests/commands/install_uninstall_test.py::test_installed_from_venv
 #     "git commit" returns 1 instead of 0, again no details
-# even with the environment variables normally handled by pytest-env (which we haven't got in the tree yet)
-# explicitly declared in python_test().
-#RESTRICT="test"
+RESTRICT="test"

 RDEPEND="dev-vcs/git
 	$(python_gen_cond_dep '
@ -39,7 +37,10 @@ RDEPEND="dev-vcs/git
 		>=dev-python/virtualenv-20.0.8[${PYTHON_USEDEP}]
 	')"
 BDEPEND="test? (
-	$(python_gen_cond_dep 'dev-python/re-assert[${PYTHON_USEDEP}]')
+	$(python_gen_cond_dep '
+		dev-python/pytest-env[${PYTHON_USEDEP}]
+		dev-python/re-assert[${PYTHON_USEDEP}]
+	')
 )"

 DOCS=( CHANGELOG.md CONTRIBUTING.md README.md )
@ -53,15 +54,3 @@ src_prepare() {
 	# and while some of them do include "skip if not found" logic, most of them do not.
 	rm -rf tests/languages tests/repository_test.py
 }
-
-python_test() {
-	# TODO: add pytest-env to the tree so that these can be read from tox.ini
-	declare -x GIT_AUTHOR_NAME=test
-	declare -x GIT_COMMITTER_NAME=test
-	declare -x GIT_AUTHOR_EMAIL=test@example.com
-	declare -x GIT_COMMITTER_EMAIL=test@example.com
-	declare -x VIRTUALENV_NO_DOWNLOAD=1
-	declare -x PRE_COMMIT_NO_CONCURRENCY=1
-
-	distutils-r1_python_test
-}
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
--- a/eclass/readme.gentoo.eclass
+++ b/eclass/readme.gentoo.eclass
@ -1,6 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

+# @DEAD
 # @ECLASS: readme.gentoo.eclass
 # @MAINTAINER:
 # Pacho Ramos <pacho@gentoo.org>
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
--- a/gnome-extra/gnome-system-monitor/Manifest
+++ b/gnome-extra/gnome-system-monitor/Manifest
@ -1 +1,2 @@
 DIST gnome-system-monitor-3.38.0.tar.xz 712320 BLAKE2B a59fbe39a8c04793c5584f645dbe0e0bcb9747394c0b923532afc95443aadeeb17ca211248a5c61747699eb95d4f8530fcc18076753bcc6d28cf2ce47a4f6825 SHA512 9f54045fa837b85d40a80bc8b519f91513ae27ca157e07f415860e906444bf144b7a7a66e4a2a9a5b1fea4e69305414cf081bb34624c91d1476265b37b59368c
+DIST gnome-system-monitor-40.0.tar.xz 763344 BLAKE2B 3a9b0f7a823eda4a00b58ece53604a127047a0d087fdc74584d5e1453744063332bb084ab32dc624812d80fa233a0fbbb39c20e2cc18b962dbd248799d587a3a SHA512 b0e326c3abdca0a3b5807976a04b7090861717840b11829d75fe5da91ef7adb34b80d2952aee4c1ff843bd5356dab7490d1c2e403712fd3c1381baddb8542501
--- a/gnome-extra/gnome-system-monitor/gnome-system-monitor-40.0.ebuild
+++ b/gnome-extra/gnome-system-monitor/gnome-system-monitor-40.0.ebuild
@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="The Gnome System Monitor"
+HOMEPAGE="https://help.gnome.org/users/gnome-system-monitor/stable/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="systemd X"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-cpp/glibmm-2.46:2
+	>=dev-libs/glib-2.56.0:2
+	>=x11-libs/gtk+-3.22:3[X(+)]
+	>=dev-cpp/gtkmm-3.3.18:3.0
+	>=dev-cpp/atkmm-2.28:0
+	>=gnome-base/libgtop-2.37.2:2=
+	>=gui-libs/libhandy-1.0.0:1=
+	>=gnome-base/librsvg-2.35:2
+	>=dev-libs/libxml2-2.0:2
+	X? ( >=x11-libs/libwnck-2.91.0:3 )
+	systemd? ( >=sys-apps/systemd-44:0= )
+"
+# eautoreconf requires gnome-base/gnome-common
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	>=sys-auth/polkit-0.114
+" # polkit needed at buildtime for ITS rules of policy files, first available in 0.114
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use X wnck)
+		$(meson_use systemd)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@ -1,3 +1,3 @@
-DIST gmic_2.9.4.tar.gz 7279628 BLAKE2B ca5fc69a2990a86a340c4305dc406d4e9032ba04afa59819dc2c788b4c181d23bd03d3050380802fe1effa2b6389df60734f8b3523fac7b0ff6bc35b64a368a6 SHA512 76bb4798e91a68e76a985d7fbc488f8677facaa1efc4ab3a0b9c7d966aa3f5763d1ae1de80f572636d58f1831d9bdae1651ea0b6a76d49a18bf5ad6e12756d73
 DIST gmic_2.9.5.tar.gz 7304367 BLAKE2B 5227aced76cc5ff0a0144f940c71daeeb947e282b6f8c28894ecfda6b863803d0c2227bac869362ba0710fa33fcf81a4c77ea582cbea77ab8a670f65eef9826c SHA512 95d0642cad057eeaa8f7bdd4259719adf6f36189e7851e9e09399bb61f3a52722f0f83f0d2d5991c4e44a692fd3afc735fdb93e6fe45ae092d1e51a139560809
 DIST gmic_2.9.6.tar.gz 7304588 BLAKE2B 50afbc4d84e180a02bb920b0302dff800284c4f7bc2f11ecfcf74f4a505a3173317b670656c03c5e29149886deb238b0be17f192c019f29d43652072790e56fb SHA512 231bae405ad66e28488468d9cc0ff2d4ca7dad289b75c51d2e2984086c5b2cbe646432992be1185e533e3a8c13aa51e0a330253dbf21ec530f93d3ae83bdaaf2
+DIST gmic_2.9.7.tar.gz 7401418 BLAKE2B 528edcd45c27fce22b16a9ec279ac91465a720fafcc87ac5fcb6ab2bb8a914581592ad3e4e2cd5a64934bd35b13b65d0832e1ca5e07525205c45f9d3c10a719f SHA512 d54a2a8f61f40dcc90f497f223484b63f9658c499e39720ea7b90b06d00cfdc057497ada4790dc757191e2905ed9bd36ca4076019c519cf79393cdc123b24730
--- a/media-gfx/gmic/gmic-2.9.7.ebuild
+++ b/media-gfx/gmic/gmic-2.9.7.ebuild
@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="amd64 arm64 x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 fi

 DESCRIPTION="GREYC's Magic Image Converter"
@ -20,10 +20,8 @@ HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"

 LICENSE="CeCILL-2 GPL-3"
 SLOT="0"
-IUSE="+cli curl digikam ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
+IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
 REQUIRED_USE="
-	|| ( cli digikam gimp krita qt5 )
-	digikam? ( png zlib fftw X )
 	gimp? ( png zlib fftw X )
 	krita? ( png zlib fftw X )
 	qt5? ( png zlib fftw X )
@ -38,10 +36,6 @@ QT_DEPEND="
 "
 COMMON_DEPEND="
 	curl? ( net-misc/curl )
-	digikam? (
-		media-gfx/digikam
-		${QT_DEPEND}
-	)
 	fftw? ( sci-libs/fftw:3.0=[threads] )
 	gimp? (
 		media-gfx/gimp:0/2
@ -67,7 +61,6 @@ RDEPEND="${COMMON_DEPEND}
 	ffmpeg? ( media-video/ffmpeg:0= )
 "
 DEPEND="${COMMON_DEPEND}
-	digikam? ( dev-qt/linguist-tools )
 	gimp? ( dev-qt/linguist-tools )
 	krita? ( dev-qt/linguist-tools )
 	qt5? ( dev-qt/linguist-tools )
@ -90,7 +83,7 @@ src_prepare() {
 	cmake_src_prepare
 	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die

-	if use digikam || use gimp || use krita || use qt5; then
+	if use gimp || use krita || use qt5; then
 		# respect user flags
 		sed -e '/CMAKE_CXX_FLAGS_RELEASE/d' \
 			-e '/${CMAKE_EXE_LINKER_FLAGS} -s/d' \
@ -136,11 +129,6 @@ src_configure() {
 		-DGMIC_PATH="${S}/src"
 	)

-	if use digikam; then
-		mycmakeargs+=( -DGMIC_QT_HOST=digikam )
-		BUILD_DIR="${BUILD_DIR}"/digikam cmake_src_configure
-	fi
-
 	if use gimp; then
 		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
 		BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure
@ -162,7 +150,6 @@ src_compile() {

 	# build gmic-qt frontends
 	local S="${S}/gmic-qt"
-	use digikam && { BUILD_DIR="${BUILD_DIR}"/digikam cmake_src_compile || die "failed building digikam plugin" ; }
 	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; }
 	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile || die "failed building krita plugin" ; }
 	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; }
@ -178,11 +165,6 @@ src_install() {
 	doins resources/gmic_cluts.gmz

 	# install gmic-qt frontends
-	if use digikam; then
-		local DIGIKAMDIR="/usr/$(get_libdir)/qt5/plugins/digikam/editor"
-		exeinto "${DIGIKAMDIR}"
-		doexe "${BUILD_DIR}"/digikam/Editor_GmicQt_Plugin.so
-	fi
 	if use gimp; then
 		exeinto "${PLUGINDIR}"
 		doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
--- a/media-gfx/gmic/metadata.xml
+++ b/media-gfx/gmic/metadata.xml
@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="cli">Build CLI interface</flag>
-		<flag name="digikam">Build <pkg>media-gfx/digikam</pkg> plugin</flag>
 		<flag name="krita">Build <pkg>media-gfx/krita</pkg> plugin</flag>
 		<flag name="opencv">Enable support for webcams using the OpenCV library</flag>
 	</use>
--- a/media-gfx/gnome-photos/Manifest
+++ b/media-gfx/gnome-photos/Manifest
@ -1 +1,2 @@
 DIST gnome-photos-3.34.2.tar.xz 639992 BLAKE2B f189e7e1a831f4d19416b689733ef6a55822d57b5f1ea29a4dcb4fc06d5f9a450e45aaf53f65e392ac78e9959f7359f3df17827a326cfd6dbf8cc7d77cc0a367 SHA512 6315fb8e7623de48a42f1b47a2935c80f8f9f6db1ab724d1857697f673c4ca0d5ca1afa5c0d147455c3c0ad0224b85b52a220b1dd39a1409804bb75794d0a04b
+DIST gnome-photos-40.0.tar.xz 632440 BLAKE2B 4a3be35e627169afa4b3b9aca2c675f6035f3e46822450fc479550a3e48aebba6f9e335dc528a6593f1bd844fde501b8535ed368be9825f229280a08d5ead7e6 SHA512 70641e7fc6375e15cadc62ad75804d3ffb1d2193dd0bbed21b291b38f1d271ba7d34a4714a1658b9f13345f20e421190958b4713aae64f4f46913628079ba814
--- a/media-gfx/gnome-photos/gnome-photos-40.0.ebuild
+++ b/media-gfx/gnome-photos/gnome-photos-40.0.ebuild
@ -0,0 +1,97 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit gnome.org gnome2-utils meson python-any-r1 virtualx xdg
+
+DESCRIPTION="Access, organize and share your photos on GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Photos"
+
+LICENSE="GPL-3+ LGPL-2+ CC0-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="flickr test upnp-av"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	media-libs/babl
+	>=x11-libs/cairo-1.14.0
+	>=x11-libs/gdk-pixbuf-2.36.8:2
+	>=media-libs/gegl-0.4.0:0.4[cairo,raw]
+	sci-geosciences/geocode-glib
+	>=media-libs/gexiv2-0.10.8
+	>=dev-libs/glib-2.62.0:2
+	>=net-libs/gnome-online-accounts-3.8.0:=
+	>=media-libs/grilo-0.3.5:0.3=
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/gtk+-3.22.16:3
+	>=dev-libs/libdazzle-3.26.0
+	>=dev-libs/libgdata-0.17.13:0=[gnome-online-accounts]
+	>=net-libs/libgfbgraph-0.2.1:0.2
+	>=gui-libs/libhandy-1.1.90:1=
+	virtual/jpeg:0
+	>=media-libs/libpng-1.6:0=
+	app-misc/tracker:3=
+	sys-apps/dbus
+"
+# gnome-online-miners is also used for google, facebook, DLNA - not only flickr
+# but out of all the grilo-plugins, only upnp-av and flickr get used, which have USE flags here,
+# so don't pull it always, but only if either USE flag is enabled.
+# tracker-miners gschema used at runtime.
+RDEPEND="${DEPEND}
+	net-misc/gnome-online-miners[flickr?]
+	upnp-av? ( media-plugins/grilo-plugins:0.3[upnp-av] )
+	flickr? ( media-plugins/grilo-plugins:0.3[flickr] )
+	app-misc/tracker-miners:3
+"
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-util/desktop-file-utils
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? ( $(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') )
+"
+
+DOCS=() # meson installs docs itself
+
+python_check_deps() {
+	use test && has_version "dev-util/dogtail[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	xdg_src_prepare
+	sed -i -e "/photos_docdir.*=.*join_paths/s/meson.project_name()/'${PF}'/" meson.build
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use test dogtail)
+		-Dflatpak=false
+		-Dinstalled_tests=false
+		-Dmanuals=true
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
--- a/media-gfx/simple-scan/Manifest
+++ b/media-gfx/simple-scan/Manifest
@ -1 +1,2 @@
 DIST simple-scan-3.36.7.tar.xz 914572 BLAKE2B dee363c08b0454bc6a4990fc14831069162f74365549a081421c286658cce130957b91030558d1232c979601be00e955996f702e8bafeeeb30710b89ee3e42c0 SHA512 ff0dd82d0db30dbfacfd8b04d7bcbc0599c1b1b47f845e1176ec7ffce0aa44253735431c2c531ef428dae0cee80818acfbba4fb2514f501623c0c0242aa8a7a2
+DIST simple-scan-40.0.tar.xz 1469740 BLAKE2B 120da2785066abf010b7f5a1dba902f596f28f7b89f667dc00c8117f36b94688ef3d1582bdd47aa93e42d6a4946a71ef1b475e482a660e708e06fbb050741f0d SHA512 978c11b789219cb08a961b1bc1428150d023e823ee1f7fd39a3bee714f0079e25559a918ef98f42a464f8a22f4a93a59893b7b4c054dc28d343479d3fc593d8a
--- a/media-gfx/simple-scan/files/40.0-add-control-optional-deps.patch
+++ b/media-gfx/simple-scan/files/40.0-add-control-optional-deps.patch
@ -0,0 +1,82 @@
+From a5f01beb41a81f483d90eb4dd785822a8615f65f Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Wed, 30 May 2018 08:44:18 +0200
+Subject: [PATCH] build: Add control for optional dependencies
+
+---
+ meson.build       | 18 ++++++++++++++----
+ meson_options.txt |  3 +++
+ src/meson.build   | 12 ++++++++----
+ 3 files changed, 25 insertions(+), 8 deletions(-)
+ create mode 100644 meson_options.txt
+
+diff --git a/meson.build b/meson.build
+index 1e1522c..45d7ed7 100644
+--- a/meson.build
+++ b/meson.build
+@@ -34,10 +34,20 @@ zlib_dep = dependency ('zlib')
+ cairo_dep = dependency ('cairo')
+ gdk_pixbuf_dep = dependency ('gdk-pixbuf-2.0')
+ gusb_dep = dependency ('gusb', version: '>= 0.2.7')
+-colord_dep = dependency ('colord', required: false)
+-packagekit_dep = dependency ('packagekit-glib2', version: '>= 1.1.5', required: false)
+-webp_dep = dependency ('libwebp', required: false)
+-webpmux_dep = dependency ('libwebpmux', required: false)
+
+if get_option('colord')
+    colord_dep = dependency ('colord')
+endif
+
+if get_option('packagekit')
+    packagekit_dep = dependency ('packagekit-glib2', version: '>= 1.1.5')
+endif
+
+if get_option('webp')
+    webp_dep = dependency ('libwebp')
+    webpmux_dep = dependency ('libwebpmux')
+endif
+
+ sane_dep = dependency ('sane-backends')
+ msgfmt = find_program  ('msgfmt')
+ itstool = find_program  ('itstool')
+diff --git a/meson_options.txt b/meson_options.txt
+new file mode 100644
+index 0000000..570ecdd
+--- /dev/null
+++ b/meson_options.txt
+@@ -0,0 +1,3 @@
+option('colord', type: 'boolean', value: false)
+option('packagekit', type: 'boolean', value: false)
+option('webp', type: 'boolean', value: false)
+diff --git a/src/meson.build b/src/meson.build
+index 3f699eb..0c8965e 100644
+--- a/src/meson.build
+++ b/src/meson.build
+@@ -1,16 +1,20 @@
+ vala_args = [ '--pkg=posix', '--vapidir=' + meson.current_source_dir () ]
+ dependencies = [ glib_dep, gtk_dep, libhandy_dep, zlib_dep, cairo_dep, gdk_pixbuf_dep, gusb_dep, sane_dep ]
+-if colord_dep.found ()
+if get_option('colord')
+     vala_args += [ '-D', 'HAVE_COLORD' ]
+     dependencies += colord_dep
+ endif
+-if packagekit_dep.found ()
+if get_option('packagekit')
+     vala_args += [ '-D', 'HAVE_PACKAGEKIT' ]
+     dependencies += packagekit_dep
+ endif
+-if webp_dep.found () and (not colord_dep.found () or webpmux_dep.found ()) # Webpmux only required if colord
+if get_option('webp')
+     vala_args += [ '-D', 'HAVE_WEBP' ]
+-    dependencies += [ webp_dep, webpmux_dep ]
+    dependencies += [ webp_dep ]
+    # Webpmux only required if colord
+    if get_option('colord')
+        dependencies += [ webpmux_dep ]
+    endif
+ endif
+ 
+ simple_scan = executable ('simple-scan',
+-- 
+2.26.3
+
--- a/media-gfx/simple-scan/simple-scan-40.0.ebuild
+++ b/media-gfx/simple-scan/simple-scan-40.0.ebuild
@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+VALA_MIN_API_VERSION="0.34"
+inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
+
+DESCRIPTION="Simple document scanning utility"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/simple-scan"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="colord webp"
+
+DEPEND="
+	>=dev-libs/glib-2.38:2
+	>=x11-libs/gtk+-3.22:3
+	>=gui-libs/libhandy-1.1.90:1=
+	>=sys-libs/zlib-1.2.3.1:=
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:2
+	>=dev-libs/libgusb-0.2.7
+	colord? ( >=x11-misc/colord-0.1.24:=[udev] )
+	webp? ( media-libs/libwebp )
+	>=media-gfx/sane-backends-1.0.20:=
+
+	virtual/jpeg:0=
+"
+# packagekit? ( >=app-admin/packagekit-base-1.1.5 )
+RDEPEND="${DEPEND}
+	x11-misc/xdg-utils
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	$(vala_depend)
+	dev-libs/libxml2:2
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	dev-libs/libgusb[vala]
+	colord? ( x11-misc/colord[vala] )
+"
+
+PATCHES=(
+	# Add control for optional dependencies
+	"${FILESDIR}"/40.0-add-control-optional-deps.patch
+)
+
+src_prepare() {
+	vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use colord)
+		-Dpackagekit=false
+		$(meson_use webp)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
--- a/media-libs/gexiv2/Manifest
+++ b/media-libs/gexiv2/Manifest
@ -1 +1,2 @@
 DIST gexiv2-0.12.1.tar.xz 372104 BLAKE2B e712bc8056e0e02d66ee831425776c26b65275db8f4cb4a526dbe9f00bddc473312f6c4c8e011906ca02ff256c00c7fe8d602acd64c787b05e13ad582ff8ebee SHA512 cbf83ea79eead9aab15ba760217fd6a1b55a5c60059f14f243327ad7d3c09d6a0528dbdb33a8ee235c76dac5aab0afa8b7d2ab4367fe9128a096dce5da19a68d
+DIST gexiv2-0.12.2.tar.xz 378428 BLAKE2B bb3fd6310cdb76f3e88bb31e018d78013bb626559b9e95bf59688601388cff10739c20c431fa9539c1d24c9045d2b3590a0f783a994d3b8966c4df12e9127f4e SHA512 850bf41f6180b0fdd050ab08da6e3bbd8d25ffc25a1f48e17a1d7a65771893cc79fba9cbd6718bf1754251ac4a4754983f0ab8f006a05f8c4a15085846d001a5
--- a/media-libs/gexiv2/gexiv2-0.12.2.ebuild
+++ b/media-libs/gexiv2/gexiv2-0.12.2.ebuild
@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit meson python-r1 vala
+
+DESCRIPTION="GObject-based wrapper around the Exiv2 library"
+HOMEPAGE="https://wiki.gnome.org/Projects/gexiv2"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gexiv2.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://gnome/sources/${PN}/$(ver_cut 1-2)/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+LICENSE="LGPL-2.1+ GPL-2"
+SLOT="0"
+IUSE="gtk-doc +introspection python static-libs test +vala"
+REQUIRED_USE="
+	python? ( introspection ${PYTHON_REQUIRED_USE} )
+	test? ( python introspection )
+	vala? ( introspection )
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=media-gfx/exiv2-0.26:=
+	>=dev-libs/glib-2.46.0:2
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+	python? ( ${PYTHON_DEPS}
+		dev-python/pygobject:3[${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	gtk-doc? ( dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3 )
+	test? ( media-gfx/exiv2[xmp] )
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	default
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use introspection)
+		$(meson_use vala vapi)
+		-Dtools=false # requires vala, freshly promoted tool that some other distros don't ship yet either
+		# Prevents installation of python modules (uses install_data from meson
+		# which does not optimize the modules)
+		-Dpython2_girdir=no
+		-Dpython3_girdir=no
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	if use python ; then
+		python_moduleinto gi/overrides/
+		python_foreach_impl python_domodule GExiv2.py
+	fi
+}
--- a/media-libs/graphene/Manifest
+++ b/media-libs/graphene/Manifest
@ -1 +1,2 @@
 DIST graphene-1.10.2.tar.xz 292372 BLAKE2B 94553a32dc57216402a9676e11525552c010d970caeb1256dde50ca842b4d673ad78d004d57e7c7a017b8c6e64ad75fc3b03603cba746027ab10befa76d32955 SHA512 a8a8ef1e4ccffee2313a18b9b8dda06c7ede6d49fdde8578694500634e3c90278fd30af7d88938d5ecb08c519cc3e09d21fe69d0f21cb766e056ceedbb3eafb0
+DIST graphene-1.10.6.tar.xz 333332 BLAKE2B d353efb22510b78c7360b748b7e83237309b88c170909e521d50e95618e907bd8b2424c3583a5db3ff2ca57954bf793646a69251bbb31caac55155c15981ed3a SHA512 075e8c712509655d0614258a7fd2943e67a9642334cdabdc15d2489a88c961e278f7464a513080cd287f5371c7ece8ceb7565d1718a8b71fea4a4977f82aeb72
--- a/media-libs/graphene/graphene-1.10.6.ebuild
+++ b/media-libs/graphene/graphene-1.10.6.ebuild
@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit xdg-utils meson multilib-minimal python-any-r1
+
+DESCRIPTION="A thin layer of types for graphic libraries"
+HOMEPAGE="https://ebassi.github.io/graphene/"
+SRC_URI="https://github.com/ebassi/graphene/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="cpu_flags_arm_neon cpu_flags_x86_sse2 doc +introspection test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.30.0:2[${MULTILIB_USEDEP}]
+	introspection? ( dev-libs/gobject-introspection:= )
+"
+DEPEND="${RDEPEND}"
+# Python is only needed with USE=introspection or FEATURES=test, but not bothering with conditional python_setup, as meson uses it too anyway
+BDEPEND="
+	${PYTHON_DEPS}
+	doc? (
+		dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3
+	)
+	virtual/pkgconfig
+"
+
+multilib_src_configure() {
+	# TODO: Do we want G_DISABLE_ASSERT as buildtype=release would do upstream?
+	local emesonargs=(
+		-Dgtk_doc=$(multilib_native_usex doc true false)
+		-Dgobject_types=true
+		-Dintrospection=$(multilib_native_usex introspection enabled disabled)
+		-Dgcc_vector=true # if built-in support tests fail, it'll just not enable vector intrinsics; unfortunately this probably means disabled on clang too, due to it claiming to be <gcc-4.9
+		$(meson_use cpu_flags_x86_sse2 sse2)
+		$(meson_use cpu_flags_arm_neon arm_neon)
+		$(meson_use test tests)
+		-Dinstalled_tests=false
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+multilib_src_install() {
+	meson_src_install
+}
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
--- a/media-sound/gnome-sound-recorder/Manifest
+++ b/media-sound/gnome-sound-recorder/Manifest
@ -1 +1,2 @@
 DIST gnome-sound-recorder-3.38.1.tar.xz 198328 BLAKE2B 80fc581a9aad2d1ee944982f9b0c93eb4de75711d7242a25fdbcdbd6edcf71af337bf6c49806b2265f4d099ac58fb5619964f6d473f291827f026d01fe497461 SHA512 e725b8c0d899680eff767f61360645a4adc2df29db8813d6e799b4affa3d05cffc5a7de4c8ee8eafafbc34314655831d7524963f974a23f472fdbb6f292e6c2c
+DIST gnome-sound-recorder-40.0.tar.xz 199056 BLAKE2B e830b746ccf9e038a6f425dee9a6ef8eb88cd849659570c11364b833b0be8c7e7302c0b20e8c853d7228a589d6e3953fecf2fddb31304a1905678aa99b461248 SHA512 28de1dbb9251c834513be55c3f4107cd014d74e634e383e6feb3b9430ff562e19d29e9abcd566b0fc0ed1ec3841add0f694b47c51fe91a3b4ba33b9f43a0d617
--- a/media-sound/gnome-sound-recorder/gnome-sound-recorder-40.0.ebuild
+++ b/media-sound/gnome-sound-recorder/gnome-sound-recorder-40.0.ebuild
@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit gnome.org gnome2-utils meson python-any-r1 xdg
+
+DESCRIPTION="Simple sound recorder"
+HOMEPAGE="https://wiki.gnome.org/Design/Apps/SoundRecorder"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	>=dev-libs/gjs-1.54.0
+	>=dev-libs/glib-2.46:2
+	>=x11-libs/gtk+-3.12:3[introspection]
+	media-libs/gst-plugins-bad:1.0
+	>=gui-libs/libhandy-1.1.90:1=
+	>=dev-libs/gobject-introspection-1.31.6
+	x11-libs/gdk-pixbuf:2[introspection]
+"
+RDEPEND="${DEPEND}
+	media-libs/gstreamer:1.0[introspection]
+	media-libs/gst-plugins-base:1.0[introspection,ogg]
+	media-libs/gst-plugins-good:1.0
+	media-plugins/gst-plugins-flac:1.0
+	media-plugins/gst-plugins-pulse:1.0
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
--- a/media-sound/sound-juicer/Manifest
+++ b/media-sound/sound-juicer/Manifest
@ -1 +1,2 @@
 DIST sound-juicer-3.24.0.tar.xz 1019588 BLAKE2B 04ba81aaa2e02fa0f6d7bfc1304be3dd1eb750c324c577b4a12809fbf43fc5ff74339750af3d99e91dc66bb0f0e4e6c33144177421f34258fb13c949a3fd5b63 SHA512 7bd158a4e3a7c3072513fc508f59cd70b6d9371cde142fdb58597e72b3687790b9368fc7e1a35fd8c7b49cb28703f8b2da4a789854f96cdc0af076278818a91f
+DIST sound-juicer-3.38.0.tar.xz 1775916 BLAKE2B d811f91256197cb6575f491e3c692a60ccfaa78ae28d5a489c27e835dec07a16c19b5bae6cae774e6efe3bc7ae10cffc3c03f652f9e60263325167cb1b348743 SHA512 d76d38839c1f5a997a900d0ba4f43d59e38d9a1d547f51bdf15d1aa9ee0a2b24210a876bfccb7b221feb1adab5882ac1d884da6131a0f259dd985326222eff9f
--- a/media-sound/sound-juicer/sound-juicer-3.38.0.ebuild
+++ b/media-sound/sound-juicer/sound-juicer-3.38.0.ebuild
@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome2 meson
+
+DESCRIPTION="CD ripper for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/SoundJuicer"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="flac test vorbis"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=dev-libs/glib-2.49.5:2[dbus]
+	>=x11-libs/gtk+-3.21.6:3
+	media-libs/libcanberra[gtk3]
+	gnome-base/gsettings-desktop-schemas
+	>=app-cdr/brasero-2.90
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0[vorbis?]
+	>=media-libs/musicbrainz-5.0.1:5=
+	app-text/iso-codes
+	>=media-libs/libdiscid-0.4.0
+
+	sys-apps/dbus
+
+	flac? ( media-plugins/gst-plugins-flac:1.0 )
+"
+RDEPEND="${DEPEND}
+	gnome-base/gvfs[cdda,udev]
+	|| (
+		media-plugins/gst-plugins-cdparanoia:1.0
+		media-plugins/gst-plugins-cdio:1.0
+	)
+	media-plugins/gst-plugins-meta:1.0
+"
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.6
+	virtual/pkgconfig
+	test? ( ~app-text/docbook-xml-dtd-4.3 )
+"
+
+src_prepare() {
+	# Avoid sandbox failures
+	sed -i -e '/gst_inspect/d' meson.build || die
+	default
+}
+
+src_install() {
+	meson_src_install
+
+	# Don't put files in deprecated directory
+	rm -rf "${ED}"/usr/doc
+}
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@ -1 +1,2 @@
 DIST totem-3.34.1.tar.xz 2157160 BLAKE2B 9ae9c8f6485c7377af07803c328e8ea3cc6fa80d8e30a7045bd2b50f7bc3d5a12582e5b60d901d22683f89e994c619c26ddb8b0890e343c873d4457fa177786d SHA512 9a3556f5cf522fca29926db185c2e5d25bdb80a25e14d0ba3062a7f15fc3ec40ae9f25752763bc444d4fd82ec2098efd732da662a1b1c5923ec19fde432606db
+DIST totem-3.38.0.tar.xz 2235672 BLAKE2B 31a69bce69316e06b6ba1b1c98bfc5b87cae0b30e682bb1b32bbac713fb2ff262084e76c19690eb78495969a67c2be484bc45adcd1b432a3de7a33c3dc04109c SHA512 231aca873bb53f23f81a7981177761d0bf7768baa845309b0dc0821db58377d692cf7e8a65135090dac14e856aa3e1dc0c1f11c55a7b25d694822019bfa9eecf
--- a/media-video/totem/files/3.38.0-gst-inspect-sandbox.patch
+++ b/media-video/totem/files/3.38.0-gst-inspect-sandbox.patch
@ -0,0 +1,42 @@
+From abb91b315f407b7e180bc00eb96f1cd6bb0ab25d Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Thu, 7 Jun 2018 23:47:48 +0200
+Subject: [PATCH] Make gst-inspect calls optional at build-time
+
+Crashes on Gentoo due to plugins trying to access dri nodes which are sandboxed
+---
+ meson_options.txt       | 1 +
+ src/backend/meson.build | 2 ++
+ 2 files changed, 3 insertions(+)
+
+diff --git a/meson_options.txt b/meson_options.txt
+index 7070fd5d0..678b8f588 100644
+--- a/meson_options.txt
+++ b/meson_options.txt
+@@ -3,3 +3,4 @@ option('enable-python', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'a
+ option('with-plugins', type: 'combo', choices: ['all', 'none', 'auto'], value: 'auto', description: 'Which Totem plugins to compile (default: auto; "all", "none" and "auto" are valid)')
+ option('enable-gtk-doc', type: 'boolean', value: false, description: 'use gtk-doc to build documentation')
+ option('profile', type: 'combo', choices: ['default', 'development'], value: 'default', description: 'Build profiles')
+option('gst-inspect', type: 'boolean', value: true, description: 'build-time test of available gstreamer plugins')
+diff --git a/src/backend/meson.build b/src/backend/meson.build
+index fbf74258b..1e025a5b9 100644
+--- a/src/backend/meson.build
+++ b/src/backend/meson.build
+@@ -1,5 +1,6 @@
+ backend_inc = include_directories('.')
+ 
+if get_option('gst-inspect')
+ gst_inspect = find_program(
+   'gst-inspect-1.0',
+   join_paths(gst_dep.get_pkgconfig_variable('toolsdir'), 'gst-inspect-1.0'),
+@@ -31,6 +32,7 @@ foreach plugin: gst_good_plugins
+   assert(r.returncode() == 0,
+          'Cannot find required GStreamer-1.0 plugin "' + plugin + '". It should be part of gst-plugins-good. Please install it.')
+ endforeach
+endif
+ 
+ sources = files(
+   'bacon-time-label.c',
+-- 
+2.26.3
+
--- a/media-video/totem/totem-3.38.0.ebuild
+++ b/media-video/totem/totem-3.38.0.ebuild
@ -0,0 +1,119 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit gnome.org gnome2-utils meson virtualx xdg python-single-r1
+
+DESCRIPTION="Media player for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Videos"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="gtk-doc +python test"
+# see bug #359379
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+
+DEPEND="
+	>=dev-libs/glib-2.56.0:2
+	>=x11-libs/gtk+-3.19.4:3[introspection]
+	>=media-libs/gstreamer-1.6.0:1.0
+	>=media-libs/gst-plugins-base-1.6.0:1.0[pango]
+	>=media-libs/gst-plugins-good-1.6.0:1.0
+	>=media-libs/grilo-0.3.0:0.3[playlist]
+	>=dev-libs/libpeas-1.1.0[gtk]
+	>=dev-libs/totem-pl-parser-3.26.5:0=[introspection]
+	>=media-libs/clutter-1.17.3:1.0[gtk]
+	>=media-libs/clutter-gst-2.99.2:3.0
+	>=media-libs/clutter-gtk-1.8.1:1.0
+	gnome-base/gnome-desktop:3=
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/cairo-1.14
+	x11-libs/gdk-pixbuf:2
+	>=dev-libs/gobject-introspection-1.54:=
+
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			>=dev-python/pygobject-2.90.3:3[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+"
+RDEPEND="${DEPEND}
+	media-plugins/grilo-plugins:0.3
+	media-plugins/gst-plugins-meta:1.0
+	media-plugins/gst-plugins-taglib:1.0
+	x11-themes/adwaita-icon-theme
+	python? (
+		x11-libs/pango[introspection]
+		>=dev-libs/libpeas-1.1.0[python,${PYTHON_SINGLE_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+"
+BDEPEND="
+	dev-lang/perl
+	gtk-doc? ( >=dev-util/gtk-doc-1.14
+		app-text/docbook-xml-dtd:4.5 )
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+# perl for pod2man
+# Prevent dev-python/pylint dep, bug #482538
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-gst-inspect-sandbox.patch # Allow disabling calls to gst-inspect (sandbox issue)
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Drop pointless samplepython plugin from build
+	sed -e '/samplepython/d' -i src/plugins/meson.build || die
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Denable-easy-codec-installation=yes
+		-Denable-python=$(usex python yes no)
+		-Dwith-plugins=all # in 3.34.1 only builtin and python plugins are left, and python is extra controlled by enable-python
+		$(meson_use gtk-doc enable-gtk-doc)
+		-Dgst-inspect=false
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	if use python ; then
+		python_optimize "${ED}"/usr/$(get_libdir)/totem/plugins/
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
+
+src_test() {
+	virtx meson_src_test
+}
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@ -1 +1 @@
-Fri, 16 Apr 2021 16:38:31 +0000
+Fri, 16 Apr 2021 21:38:30 +0000
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@ -1 +1 @@
-Fri, 16 Apr 2021 16:38:31 +0000
+Fri, 16 Apr 2021 21:38:30 +0000
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
--- a/metadata/md5-cache/app-admin/system-tools-backends-2.10.2-r1
+++ b/metadata/md5-cache/app-admin/system-tools-backends-2.10.2-r1
@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!<app-admin/gnome-system-tools-1.1.91 >=sys-apps/dbus-1.1.2 >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.15.2:2 >=dev-perl/Net-DBus-0.33.4 dev-lang/perl >=sys-auth/polkit-0.94 userland_GNU? ( sys-apps/shadow )
 SLOT=0
 SRC_URI=mirror://gnome/sources/system-tools-backends/2.10/system-tools-backends-2.10.2.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	3b23843470b60724ee8b179916815a4e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	user	26d8ce6329c43cbac965617f1c0627e2	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	a97aee298f128902ba03cf0ff69f9446	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	user	26d8ce6329c43cbac965617f1c0627e2	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=018263c474f45bce1b337cdd0c7d25d5
--- a/metadata/md5-cache/app-backup/Manifest.gz
+++ b/metadata/md5-cache/app-backup/Manifest.gz
--- a/metadata/md5-cache/app-backup/borgmatic-1.5.13
+++ b/metadata/md5-cache/app-backup/borgmatic-1.5.13
@ -0,0 +1,15 @@
+BDEPEND=test? ( app-backup/borgbackup python_single_target_python3_7? ( dev-python/colorama[python_targets_python3_7(-)] >=dev-python/pykwalify-1.6.0[python_targets_python3_7(-)] dev-python/requests[python_targets_python3_7(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/colorama[python_targets_python3_8(-)] >=dev-python/pykwalify-1.6.0[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/colorama[python_targets_python3_9(-)] >=dev-python/pykwalify-1.6.0[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_9(-)] ) python_single_target_python3_7? ( >=dev-python/pytest-4.5.0[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-4.5.0[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DESCRIPTION=Automatically create, prune and verify backups with borgbackup
+EAPI=7
+HOMEPAGE=https://torsion.org/borgmatic/
+IUSE=test python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~arm ~arm64
+LICENSE=GPL-3
+RDEPEND=app-backup/borgbackup python_single_target_python3_7? ( dev-python/colorama[python_targets_python3_7(-)] >=dev-python/pykwalify-1.6.0[python_targets_python3_7(-)] dev-python/requests[python_targets_python3_7(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/colorama[python_targets_python3_8(-)] >=dev-python/pykwalify-1.6.0[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/colorama[python_targets_python3_9(-)] >=dev-python/pykwalify-1.6.0[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/borgmatic/borgmatic-1.5.13.tar.gz
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=88d4510279b7699efc8a0a8f318f253c
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
--- a/metadata/md5-cache/app-emulation/winetricks-20200412
+++ b/metadata/md5-cache/app-emulation/winetricks-20200412
@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/bashate dev-util/checkbashisms || ( dev-util/shellcheck-bin dev-util/shellcheck ) )
-DEFINED_PHASES=install postinst postrm preinst prepare test unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Easy way to install DLLs needed to work around problems in Wine
-EAPI=7
-HOMEPAGE=https://github.com/Winetricks/winetricks https://wiki.winehq.org/Winetricks
-IUSE=gtk kde rar test
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1+
-RDEPEND=app-arch/cabextract app-arch/p7zip app-arch/unzip net-misc/wget virtual/wine x11-misc/xdg-utils gtk? ( gnome-extra/zenity ) kde? ( kde-apps/kdialog ) rar? ( app-arch/unrar )
-RESTRICT=!test? ( test ) x86? ( test )
-SLOT=0
-SRC_URI=https://github.com/Winetricks/winetricks/archive/20200412.tar.gz -> winetricks-20200412.tar.gz gtk? ( https://dev.gentoo.org/~chiitoo/distfiles/winetricks-gentoo-2012.11.24.tar.bz2 ) kde? ( https://dev.gentoo.org/~chiitoo/distfiles/winetricks-gentoo-2012.11.24.tar.bz2 )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1c3206f5b87634d5d9052b06c8ea1fe2
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
--- a/metadata/md5-cache/app-text/yelp-tools-40.0
+++ b/metadata/md5-cache/app-text/yelp-tools-40.0
@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=dev-libs/libxml2-2.6.12 >=dev-libs/libxslt-1.1.8 dev-util/itstool >=gnome-extra/yelp-xsl-3.36 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-python/lxml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] ) >=dev-libs/libxml2-2.6.12 >=dev-libs/libxslt-1.1.8 dev-util/itstool >=gnome-extra/yelp-xsl-3.36 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Collection of tools for building and converting documentation
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/Yelp/Tools
 IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( GPL-2+ freedist ) GPL-2+
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=dev-libs/libxml2-2.6.12 >=dev-libs/libxslt-1.1.8 dev-util/itstool >=gnome-extra/yelp-xsl-3.36
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-python/lxml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] ) >=dev-libs/libxml2-2.6.12 >=dev-libs/libxslt-1.1.8 dev-util/itstool >=gnome-extra/yelp-xsl-3.36
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/yelp-tools/40/yelp-tools-40.0.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4e1fe2b1b14c0f30f28e1e75c9e87c1d
+_md5_=cf3683c08d108bd82b439360f896f0b7
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
--- a/metadata/md5-cache/dev-java/snakeyaml-1.28-r1
+++ b/metadata/md5-cache/dev-java/snakeyaml-1.28-r1
@ -11,4 +11,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://bitbucket.org/asomov/snakeyaml/get/snakeyaml-1.28.tar.gz -> asomov-snakeyaml-b28f0b4d87c6.tar.gz
 _eclasses_=java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e
-_md5_=bb9813fc72ecfc5a70456f6e9f08ed42
+_md5_=3bdfe3a4687bcee2fb07aaeb82098325
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
--- a/metadata/md5-cache/dev-lang/nim-1.4.6
+++ b/metadata/md5-cache/dev-lang/nim-1.4.6
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=test? ( net-libs/nodejs )
+DESCRIPTION=compiled, garbage-collected systems programming language
+EAPI=7
+HOMEPAGE=https://nim-lang.org/
+IUSE=+readline test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MIT
+RDEPEND=readline? ( sys-libs/readline:0= )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://nim-lang.org/download/nim-1.4.6.tar.xz
+_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=0cbbba59704ca78143b32b8d7ed9d514
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
--- a/metadata/md5-cache/dev-libs/libburn-1.5.4
+++ b/metadata/md5-cache/dev-libs/libburn-1.5.4
@ -2,10 +2,10 @@ BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=configure install
 DESCRIPTION=Open-source library for reading, mastering and writing optical discs
 EAPI=7
-HOMEPAGE=https://dev.lovelyhq.com/libburnia/web/wikis/home
+HOMEPAGE=https://dev.lovelyhq.com/libburnia/web/wiki/Libburn
 IUSE=debug static-libs
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://files.libburnia-project.org/releases/libburn-1.5.4.tar.gz
-_md5_=45fd5e79fbf643f6e7e86271b669de15
+_md5_=3f6502d5bb568f8315cfbbbdc27bbc1e
--- a/metadata/md5-cache/dev-libs/libisoburn-1.5.4
+++ b/metadata/md5-cache/dev-libs/libisoburn-1.5.4
@ -3,7 +3,7 @@ DEFINED_PHASES=configure install
 DEPEND=>=dev-libs/libburn-1.5.4 >=dev-libs/libisofs-1.5.4 readline? ( sys-libs/readline:0= ) !readline? ( libedit? ( dev-libs/libedit ) ) acl? ( virtual/acl ) xattr? ( sys-apps/attr ) zlib? ( sys-libs/zlib ) launch-frontend? ( dev-lang/tcl:0 dev-lang/tk:0 ) launch-frontend-setuid? ( dev-lang/tcl:0 dev-lang/tk:0 ) frontend-optional? ( dev-tcltk/bwidget )
 DESCRIPTION=Creation/expansion of ISO-9660 filesystems on CD/DVD media supported by libburn
 EAPI=7
-HOMEPAGE=https://dev.lovelyhq.com/libburnia/web/wikis/home
+HOMEPAGE=https://dev.lovelyhq.com/libburnia/web/wiki/Libisoburn
 IUSE=acl debug external-filters external-filters-setuid frontend-optional launch-frontend launch-frontend-setuid libedit readline static-libs xattr zlib
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2 GPL-3
@ -11,4 +11,4 @@ RDEPEND=>=dev-libs/libburn-1.5.4 >=dev-libs/libisofs-1.5.4 readline? ( sys-libs/
 REQUIRED_USE=frontend-optional? ( || ( launch-frontend launch-frontend-setuid ) )
 SLOT=0
 SRC_URI=http://files.libburnia-project.org/releases/libisoburn-1.5.4.tar.gz
-_md5_=eb3a749dd62bc496910957db3fcc8764
+_md5_=a82b1da02a0bb4cc9d88ac23c34ef31f
--- a/metadata/md5-cache/dev-libs/libisofs-1.5.4
+++ b/metadata/md5-cache/dev-libs/libisofs-1.5.4
@ -3,11 +3,11 @@ DEFINED_PHASES=configure install
 DEPEND=acl? ( virtual/acl ) xattr? ( sys-apps/attr ) zlib? ( sys-libs/zlib )
 DESCRIPTION=Open-source library for reading, mastering and writing optical discs
 EAPI=7
-HOMEPAGE=https://dev.lovelyhq.com/libburnia/web/wikis/home
+HOMEPAGE=https://dev.lovelyhq.com/libburnia/web/wiki/Libisofs
 IUSE=acl debug static-libs verbose-debug xattr zlib
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=acl? ( virtual/acl ) xattr? ( sys-apps/attr ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=http://files.libburnia-project.org/releases/libisofs-1.5.4.tar.gz
-_md5_=77526dac126950a0811babde5d344c77
+_md5_=e61357a76d55bf403e947b0d7461d512
--- a/metadata/md5-cache/dev-libs/oniguruma-6.9.7
+++ b/metadata/md5-cache/dev-libs/oniguruma-6.9.7
@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Regular expression library for different character encodings
+EAPI=7
+HOMEPAGE=https://github.com/kkos/oniguruma
+IUSE=crnl-as-line-terminator static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+LICENSE=BSD-2
+SLOT=0/5
+SRC_URI=https://github.com/kkos/oniguruma/releases/download/v6.9.7/onig-6.9.7.tar.gz
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=8558b8513fea566be5375fcbecb6ef92
--- a/metadata/md5-cache/dev-libs/oniguruma-6.9.7.1
+++ b/metadata/md5-cache/dev-libs/oniguruma-6.9.7.1
@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Regular expression library for different character encodings
+EAPI=7
+HOMEPAGE=https://github.com/kkos/oniguruma
+IUSE=crnl-as-line-terminator static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+LICENSE=BSD-2
+SLOT=0/5
+SRC_URI=https://github.com/kkos/oniguruma/releases/download/v6.9.7.1/onig-6.9.7.1.tar.gz
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=d03560ac7bab2ae35e6c65b114033353
--- a/metadata/md5-cache/dev-lua/Manifest.gz
+++ b/metadata/md5-cache/dev-lua/Manifest.gz
--- a/metadata/md5-cache/dev-lua/luacheck-0.23.0-r100
+++ b/metadata/md5-cache/dev-lua/luacheck-0.23.0-r100
@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( dev-python/sphinx ) test? ( >=dev-lua/busted-2.0.0-r100[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] dev-lua/lua-argparse[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] dev-lua/lua-utf8[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] dev-lua/luafilesystem[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] )
-DEFINED_PHASES=compile install test
-DEPEND=dev-lua/lua-argparse[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] dev-lua/lua-utf8[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] dev-lua/luafilesystem[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?]
-DESCRIPTION=A tool for linting and static analysis of Lua code
-EAPI=7
-HOMEPAGE=https://github.com/mpeterv/luacheck
-IUSE=doc test lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3
-KEYWORDS=amd64 arm ~arm64 ppc ppc64 x86
-LICENSE=MIT
-RDEPEND=dev-lua/lua-argparse[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] dev-lua/lua-utf8[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] dev-lua/luafilesystem[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/mpeterv/luacheck/archive/0.23.0.tar.gz -> luacheck-0.23.0.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=a4887b5b6161262c6171439cb9abdb8a
--- a/metadata/md5-cache/dev-lua/luacheck-0.24.0
+++ b/metadata/md5-cache/dev-lua/luacheck-0.24.0
@ -5,11 +5,11 @@ DESCRIPTION=A tool for linting and static analysis of Lua code
 EAPI=7
 HOMEPAGE=https://github.com/luarocks/luacheck
 IUSE=doc test lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 lua_targets_lua5-4
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=dev-lua/lua-argparse[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?,lua_targets_lua5-4(-)?] dev-lua/lua-utf8[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?,lua_targets_lua5-4(-)?] dev-lua/luafilesystem[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?,lua_targets_lua5-4(-)?]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/luarocks/luacheck/archive/0.24.0.tar.gz -> luacheck-0.24.0.tar.gz
 _eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=a0ec84f4f72ec1ba1ab4a071a6299a72
+_md5_=8dc9b4d1d4e2aeaad56583cf114d145e
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
--- a/metadata/md5-cache/dev-python/pytest-env-0.6.2
+++ b/metadata/md5-cache/dev-python/pytest-env-0.6.2
@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=py.test plugin that allows you to add environment variables
+EAPI=7
+HOMEPAGE=https://github.com/MobileDynasty/pytest-env
+IUSE=python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=mirror://pypi/p/pytest-env/pytest-env-0.6.2.tar.gz
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=8be452cf6fb7e714f798595d7683ad93
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
--- a/metadata/md5-cache/dev-util/bazel-3.7.2
+++ b/metadata/md5-cache/dev-util/bazel-3.7.2
@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test unpack
+DEPEND=>=virtual/jdk-1.8:* app-arch/unzip app-arch/zip >=dev-java/java-config-2.2.0-r3
+DESCRIPTION=Fast and correct automated build system
+EAPI=7
+HOMEPAGE=https://bazel.build/
+IUSE=examples tools prefix static-libs elibc_FreeBSD
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3
+REQUIRED_USE=prefix? ( static-libs )
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/bazelbuild/bazel/releases/download/3.7.2/bazel-3.7.2-dist.zip
+_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=2a18cfc0241e70401226fa9cb3b6d33c
--- a/metadata/md5-cache/dev-vcs/Manifest.gz
+++ b/metadata/md5-cache/dev-vcs/Manifest.gz
--- a/metadata/md5-cache/dev-vcs/pre-commit-2.12.0
+++ b/metadata/md5-cache/dev-vcs/pre-commit-2.12.0
@ -1,4 +1,4 @@
-BDEPEND=test? ( python_single_target_python3_8? ( dev-python/re-assert[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/re-assert[python_targets_python3_9(-)] ) ) test? ( dev-vcs/git python_single_target_python3_8? ( dev-python/cfgv[python_targets_python3_8(-)] dev-python/identify[python_targets_python3_8(-)] dev-python/nodeenv[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] dev-python/toml[python_targets_python3_8(-)] >=dev-python/virtualenv-20.0.8[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/cfgv[python_targets_python3_9(-)] dev-python/identify[python_targets_python3_9(-)] dev-python/nodeenv[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/toml[python_targets_python3_9(-)] >=dev-python/virtualenv-20.0.8[python_targets_python3_9(-)] ) python_single_target_python3_8? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-4.5.0[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] )
+BDEPEND=test? ( python_single_target_python3_8? ( dev-python/pytest-env[python_targets_python3_8(-)] dev-python/re-assert[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pytest-env[python_targets_python3_9(-)] dev-python/re-assert[python_targets_python3_9(-)] ) ) test? ( dev-vcs/git python_single_target_python3_8? ( dev-python/cfgv[python_targets_python3_8(-)] dev-python/identify[python_targets_python3_8(-)] dev-python/nodeenv[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] dev-python/toml[python_targets_python3_8(-)] >=dev-python/virtualenv-20.0.8[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/cfgv[python_targets_python3_9(-)] dev-python/identify[python_targets_python3_9(-)] dev-python/nodeenv[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/toml[python_targets_python3_9(-)] >=dev-python/virtualenv-20.0.8[python_targets_python3_9(-)] ) python_single_target_python3_8? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-4.5.0[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] )
 DEFINED_PHASES=compile configure install prepare setup test
 DESCRIPTION=A framework for managing and maintaining multi-language Git pre-commit hooks
 EAPI=7
@ -8,8 +8,8 @@ KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=dev-vcs/git python_single_target_python3_8? ( dev-python/cfgv[python_targets_python3_8(-)] dev-python/identify[python_targets_python3_8(-)] dev-python/nodeenv[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] dev-python/toml[python_targets_python3_8(-)] >=dev-python/virtualenv-20.0.8[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/cfgv[python_targets_python3_9(-)] dev-python/identify[python_targets_python3_9(-)] dev-python/nodeenv[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/toml[python_targets_python3_9(-)] >=dev-python/virtualenv-20.0.8[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
+RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pre-commit/pre-commit/archive/refs/tags/v2.12.0.tar.gz -> pre-commit-2.12.0.tar.gz
 _eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=5d7fefa8f25bae01830ead79d3ab7627
+_md5_=18a695a4be19bc2d18a60327a270ccd2
--- a/metadata/md5-cache/gnome-extra/Manifest.gz
+++ b/metadata/md5-cache/gnome-extra/Manifest.gz
--- a/metadata/md5-cache/gnome-extra/gnome-system-monitor-40.0
+++ b/metadata/md5-cache/gnome-extra/gnome-system-monitor-40.0
@ -0,0 +1,14 @@
+BDEPEND=dev-util/glib-utils dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=sys-auth/polkit-0.114 app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-cpp/glibmm-2.46:2 >=dev-libs/glib-2.56.0:2 >=x11-libs/gtk+-3.22:3[X(+)] >=dev-cpp/gtkmm-3.3.18:3.0 >=dev-cpp/atkmm-2.28:0 >=gnome-base/libgtop-2.37.2:2= >=gui-libs/libhandy-1.0.0:1= >=gnome-base/librsvg-2.35:2 >=dev-libs/libxml2-2.0:2 X? ( >=x11-libs/libwnck-2.91.0:3 ) systemd? ( >=sys-apps/systemd-44:0= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=The Gnome System Monitor
+EAPI=7
+HOMEPAGE=https://help.gnome.org/users/gnome-system-monitor/stable/
+IUSE=systemd X
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-cpp/glibmm-2.46:2 >=dev-libs/glib-2.56.0:2 >=x11-libs/gtk+-3.22:3[X(+)] >=dev-cpp/gtkmm-3.3.18:3.0 >=dev-cpp/atkmm-2.28:0 >=gnome-base/libgtop-2.37.2:2= >=gui-libs/libhandy-1.0.0:1= >=gnome-base/librsvg-2.35:2 >=dev-libs/libxml2-2.0:2 X? ( >=x11-libs/libwnck-2.91.0:3 ) systemd? ( >=sys-apps/systemd-44:0= )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-system-monitor/40/gnome-system-monitor-40.0.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1cebb4b219017c50926b8769efacef1a
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
--- a/metadata/md5-cache/media-gfx/gmic-2.9.4
+++ b/metadata/md5-cache/media-gfx/gmic-2.9.4
@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare pretend test
-DEPEND=curl? ( net-misc/curl ) digikam? ( media-gfx/digikam >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) fftw? ( sci-libs/fftw:3.0=[threads] ) gimp? ( media-gfx/gimp:0/2 >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) graphicsmagick? ( media-gfx/graphicsmagick:0= ) jpeg? ( virtual/jpeg:0 ) krita? ( >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) opencv? ( >=media-libs/opencv-2.3.1a-r1:0= ) openexr? ( media-libs/ilmbase:0= media-libs/openexr:0= ) png? ( media-libs/libpng:0= ) qt5? ( >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) tiff? ( media-libs/tiff:0 ) X? ( x11-libs/libX11 x11-libs/libXext ) zlib? ( sys-libs/zlib:0= ) digikam? ( dev-qt/linguist-tools ) gimp? ( dev-qt/linguist-tools ) krita? ( dev-qt/linguist-tools ) qt5? ( dev-qt/linguist-tools )
-DESCRIPTION=GREYC's Magic Image Converter
-EAPI=7
-HOMEPAGE=https://gmic.eu/ https://github.com/dtschump/gmic
-IUSE=+cli curl digikam ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib
-KEYWORDS=amd64 arm64 x86
-LICENSE=CeCILL-2 GPL-3
-RDEPEND=curl? ( net-misc/curl ) digikam? ( media-gfx/digikam >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) fftw? ( sci-libs/fftw:3.0=[threads] ) gimp? ( media-gfx/gimp:0/2 >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) graphicsmagick? ( media-gfx/graphicsmagick:0= ) jpeg? ( virtual/jpeg:0 ) krita? ( >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) opencv? ( >=media-libs/opencv-2.3.1a-r1:0= ) openexr? ( media-libs/ilmbase:0= media-libs/openexr:0= ) png? ( media-libs/libpng:0= ) qt5? ( >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) tiff? ( media-libs/tiff:0 ) X? ( x11-libs/libX11 x11-libs/libXext ) zlib? ( sys-libs/zlib:0= ) ffmpeg? ( media-video/ffmpeg:0= )
-REQUIRED_USE=|| ( cli digikam gimp krita qt5 ) digikam? ( png zlib fftw X ) gimp? ( png zlib fftw X ) krita? ( png zlib fftw X ) qt5? ( png zlib fftw X )
-SLOT=0
-SRC_URI=https://gmic.eu/files/source/gmic_2.9.4.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e05d776324f31fc6e3b5cccf9af19090
--- a/metadata/md5-cache/media-gfx/gmic-2.9.7
+++ b/metadata/md5-cache/media-gfx/gmic-2.9.7
@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare pretend test
+DEPEND=curl? ( net-misc/curl ) fftw? ( sci-libs/fftw:3.0=[threads] ) gimp? ( media-gfx/gimp:0/2 >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) graphicsmagick? ( media-gfx/graphicsmagick:0= ) jpeg? ( virtual/jpeg:0 ) krita? ( >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) opencv? ( >=media-libs/opencv-2.3.1a-r1:0= ) openexr? ( media-libs/ilmbase:0= media-libs/openexr:0= ) png? ( media-libs/libpng:0= ) qt5? ( >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) tiff? ( media-libs/tiff:0 ) X? ( x11-libs/libX11 x11-libs/libXext ) zlib? ( sys-libs/zlib:0= ) gimp? ( dev-qt/linguist-tools ) krita? ( dev-qt/linguist-tools ) qt5? ( dev-qt/linguist-tools )
+DESCRIPTION=GREYC's Magic Image Converter
+EAPI=7
+HOMEPAGE=https://gmic.eu/ https://github.com/dtschump/gmic
+IUSE=cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=CeCILL-2 GPL-3
+RDEPEND=curl? ( net-misc/curl ) fftw? ( sci-libs/fftw:3.0=[threads] ) gimp? ( media-gfx/gimp:0/2 >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) graphicsmagick? ( media-gfx/graphicsmagick:0= ) jpeg? ( virtual/jpeg:0 ) krita? ( >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) opencv? ( >=media-libs/opencv-2.3.1a-r1:0= ) openexr? ( media-libs/ilmbase:0= media-libs/openexr:0= ) png? ( media-libs/libpng:0= ) qt5? ( >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) tiff? ( media-libs/tiff:0 ) X? ( x11-libs/libX11 x11-libs/libXext ) zlib? ( sys-libs/zlib:0= ) ffmpeg? ( media-video/ffmpeg:0= )
+REQUIRED_USE=gimp? ( png zlib fftw X ) krita? ( png zlib fftw X ) qt5? ( png zlib fftw X )
+SLOT=0
+SRC_URI=https://gmic.eu/files/source/gmic_2.9.7.tar.gz
+_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9c3260cc9a0b364c5b0a4e348a3f34b3
--- a/metadata/md5-cache/media-gfx/gnome-photos-40.0
+++ b/metadata/md5-cache/media-gfx/gnome-photos-40.0
@ -0,0 +1,15 @@
+BDEPEND=dev-libs/appstream-glib dev-util/desktop-file-utils dev-util/gdbus-codegen dev-util/glib-utils dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( || ( ( dev-lang/python:3.9 dev-util/dogtail[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-util/dogtail[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-util/dogtail[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=media-libs/babl >=x11-libs/cairo-1.14.0 >=x11-libs/gdk-pixbuf-2.36.8:2 >=media-libs/gegl-0.4.0:0.4[cairo,raw] sci-geosciences/geocode-glib >=media-libs/gexiv2-0.10.8 >=dev-libs/glib-2.62.0:2 >=net-libs/gnome-online-accounts-3.8.0:= >=media-libs/grilo-0.3.5:0.3= gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.22.16:3 >=dev-libs/libdazzle-3.26.0 >=dev-libs/libgdata-0.17.13:0=[gnome-online-accounts] >=net-libs/libgfbgraph-0.2.1:0.2 >=gui-libs/libhandy-1.1.90:1= virtual/jpeg:0 >=media-libs/libpng-1.6:0= app-misc/tracker:3= sys-apps/dbus dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Access, organize and share your photos on GNOME
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Apps/Photos
+IUSE=flickr test upnp-av test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-3+ LGPL-2+ CC0-1.0
+RDEPEND=media-libs/babl >=x11-libs/cairo-1.14.0 >=x11-libs/gdk-pixbuf-2.36.8:2 >=media-libs/gegl-0.4.0:0.4[cairo,raw] sci-geosciences/geocode-glib >=media-libs/gexiv2-0.10.8 >=dev-libs/glib-2.62.0:2 >=net-libs/gnome-online-accounts-3.8.0:= >=media-libs/grilo-0.3.5:0.3= gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.22.16:3 >=dev-libs/libdazzle-3.26.0 >=dev-libs/libgdata-0.17.13:0=[gnome-online-accounts] >=net-libs/libgfbgraph-0.2.1:0.2 >=gui-libs/libhandy-1.1.90:1= virtual/jpeg:0 >=media-libs/libpng-1.6:0= app-misc/tracker:3= sys-apps/dbus net-misc/gnome-online-miners[flickr?] upnp-av? ( media-plugins/grilo-plugins:0.3[upnp-av] ) flickr? ( media-plugins/grilo-plugins:0.3[flickr] ) app-misc/tracker-miners:3
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-photos/40/gnome-photos-40.0.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a254679ea2c3ab676cc24732fd0cb879
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`DIST pytest-env-0.6.2.tar.gz 1693 BLAKE2B b303b8b2b486cd5f6c6273fefe709e3986183a56b6758b05f8bde973c561ebba9646538d38783749305740d8bd637966966a109fcd600cd6f6ee059449ffb328 SHA512 0b3bb21fc881023c102b584593c6e28840400ce8190810f33f9a421df4141e17dcfad2943c4159aaab82376b7b47b07b45f97c9cb232a7d17c4d35b55966596d`