Sync with portage [Thu Feb 4 22:26:01 MSK 2021].

3 years ago · 4b295a7b0e
parent 534dbb25e3
commit 4b295a7b0e
931 changed files with 4516 additions and 2096 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
--- a/app-accessibility/kontrast/Manifest
+++ b/app-accessibility/kontrast/Manifest
@ -1,2 +1,2 @@
 DIST kontrast-1.0.2.tar.xz 35300 BLAKE2B dbcf66706d707d2e277ab8a551533495c4005556421321b0a2a03fc046c193a931c00ed9a82160f51b44cf081550c86c8933e849158f5f1e63dd0c85c4506b96 SHA512 637b2fb65e42b208b26349e6d971827d616f647db53b5d2b5e5c7264388e723912fecb130138693060c9ec877e8a6d4dd1478f68942b6b10db024e8a4d66173c
-DIST kontrast-20.12.1.tar.xz 122392 BLAKE2B c640aaf493ba1090a32ce447661863777fe5346f63288078d8a0c4e6989a4cbb61a4f526ac80475dcc402bdfbafb2ade357fe9b94266acd75f6392c4b3db7c61 SHA512 ab2ccdb404d856f8f1f1ce775416a0a374848c2214771c0c3c82a732f2425b1ff83246b8b146503df7ad312b53885564e85017d88797bd2dd282830dc6470633
+DIST kontrast-20.12.2.tar.xz 122432 BLAKE2B 26cce9a0bd62c039af9a9870322f075d95acb62fa709d3174c0b228007515ca2a7cee35545f8f57629ce29f3d803fa434437d889c5ed7cf3b33f553b37492b1f SHA512 01a94efc2ac2cf8faad1d41dba97b33a9ca9753a159e1e065e89ba819a370c7f96e79de242e675b1ca1a16699c07be4b25e556f3f9fdf5de28ebd07c7bd50e99
--- a/app-accessibility/kontrast/kontrast-20.12.2.ebuild
+++ b/app-accessibility/kontrast/kontrast-20.12.2.ebuild
@ -5,7 +5,7 @@ EAPI=7

 KDE_RELEASE_SERVICE="true"
 KFMIN=5.74.0
-QTMIN=5.15.1
+QTMIN=5.15.2
 inherit ecm kde.org

 DESCRIPTION="Tool to check contrast for colors to verify they are correctly accessible"
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/eselect/eselect-1.4.17.ebuild
+++ b/app-admin/eselect/eselect-1.4.17.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"

 LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-4.0 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs vim-syntax"

 DEPEND="sys-apps/sed
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
--- a/app-backup/borgbackup/borgbackup-1.1.15.ebuild
+++ b/app-backup/borgbackup/borgbackup-1.1.15.ebuild
@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~ppc64 x86"
 fi

 DESCRIPTION="Deduplicating backup program with compression and authenticated encryption"
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
--- a/app-cdr/dolphin-plugins-mountiso/Manifest
+++ b/app-cdr/dolphin-plugins-mountiso/Manifest
@ -1,2 +1,2 @@
 DIST dolphin-plugins-20.08.3.tar.xz 230272 BLAKE2B 1978ffebe88d95350cac0892c56e127507b6ddd6d5675bca8f420990552e20ff271e6f5742a2bdeff685c82464e70177ac83e5e9368547eb175a3e8133d77624 SHA512 2010be567ef025375caac92e90c0259faea1eb58bdbc55e441e42a10af68b6313391707a7f6b6b10285ba80dcbdee92468fa5088970eb98d4ea8afea145976d9
-DIST dolphin-plugins-20.12.1.tar.xz 238592 BLAKE2B 32b8e7e92e16b65f10255eff940496bd77fd544ba96e63db1a914ab97b3e9049cbec5c3136ddbc9d124c6d01e44b3d897e2e497ddd753c0c00960c17f503f91d SHA512 fbccd9d6e276d37e7874c4dcc31ea209e4e17bcac8feeb2ede386bb3ce8510428eba1e5fe58a1551fe81f61810454f177db61ce8607faa45a03509bafd303aad
+DIST dolphin-plugins-20.12.2.tar.xz 239368 BLAKE2B 638491ab7e97768bfe99e8eea47d34721f9d952ff9a5c236b7ac71862d3912bf10afca67dc5e5e8e8b5f8f3b6c6eafa2e7dadea0e089ca1296078694dd4d069c SHA512 b6d160c7aadddb332ef8d5440ef8171668a24e44eb837918557016272ad5e2e51456fcb2e155c93507737e341596c89621bdd0a35ac1d5f81e79afcfa89cd3ff
--- a/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-20.12.2.ebuild
+++ b/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-20.12.2.ebuild
@ -10,7 +10,7 @@ KDE_ORG_NAME="dolphin-plugins"
 MY_PLUGIN_NAME="mountiso"
 KFMIN=5.75.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.1
+QTMIN=5.15.2
 inherit ecm kde.org

 DESCRIPTION="Dolphin plugin for ISO loopback device mounting"
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/zile/zile-2.4.15.ebuild
+++ b/app-editors/zile/zile-2.4.15.ebuild
@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/zile/${P}.tar.gz"

 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="acl"

 RDEPEND=">=dev-libs/boehm-gc-7.2:=
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/docker-cli/Manifest
+++ b/app-emulation/docker-cli/Manifest
@ -1 +1,2 @@
 DIST docker-cli-20.10.2.tar.gz 7706210 BLAKE2B c8d537be8344dbd2113232c85a52f001231fdf653819710cf4492c86d58662e5f0d74f6fb00593d1034b5d481f15524cec89e2b3463900705a545b2051ab38d2 SHA512 907c846bf4043dcce4dd4e95e6335554b50e954464a83f75a44b1c0fcf9f2625c490a12758d18653c0d031768878a3f6fc91cb7fc6e1d3235d5e8f21ecd93caf
+DIST docker-cli-20.10.3.tar.gz 7733821 BLAKE2B ab71e6817e7fe0d7c5f8c776cb25ae7bc49b5a224c835fe833988b67dfdf562207cd0afed4710d33e8a31156bd16bdc70df13f1194e862314add069c320c4e6e SHA512 769bed3e5409f6be570ab3672bef1bea4d16d5bfaeb81af8c4b3b7cfb56732c108c5404464731c001cf94fefd77c40a142bed80c85f1b058041e187453a6b88e
--- a/app-emulation/docker-cli/docker-cli-20.10.3.ebuild
+++ b/app-emulation/docker-cli/docker-cli-20.10.3.ebuild
@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GIT_COMMIT=48d30b5b32
+EGO_PN="github.com/docker/cli"
+inherit bash-completion-r1  golang-vcs-snapshot
+
+DESCRIPTION="the command line binary for docker"
+HOMEPAGE="https://www.docker.com/"
+MY_PV=${PV/_/-}
+SRC_URI="https://github.com/docker/cli/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="hardened"
+
+RDEPEND="!<app-emulation/docker-20.10.1"
+BDEPEND="dev-go/go-md2man"
+
+RESTRICT="installsources strip"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+src_prepare() {
+	default
+	sed -i 's@dockerd\?\.exe@@g' contrib/completion/bash/docker || die
+	sed -i 's@md2man@go-md2man@' man/md2man-all.sh || die
+}
+
+src_compile() {
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+	export GOPATH="${WORKDIR}/${P}"
+	# setup CFLAGS and LDFLAGS for separate build target
+	# see https://github.com/tianon/docker-overlay/pull/10
+	export CGO_CFLAGS="-I${ROOT}/usr/include"
+	export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
+		emake \
+		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \
+		VERSION="$(cat VERSION)" \
+		GITCOMMIT="${GIT_COMMIT}" \
+		dynbinary
+
+	# build man pages
+	# see "cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man)
+	go build -o "${T}"/gen-manpages ./man ||
+		die 'build gen-manpages failed'
+	"${T}"/gen-manpages --root "$(pwd)" --target "$(pwd)"/man/man1 ||
+		die 'gen-manpages failed'
+	./man/md2man-all.sh -q ||
+		die 'md2man-all.sh failed'
+}
+
+src_install() {
+	dobin build/docker
+	doman man/man*/*
+	dobashcomp contrib/completion/bash/*
+	bashcomp_alias docker dockerd
+	insinto /usr/share/fish/vendor_completions.d/
+	doins contrib/completion/fish/docker.fish
+	insinto /usr/share/zsh/site-functions
+	doins contrib/completion/zsh/_*
+}
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@ -1,3 +1,5 @@
 DIST docker-19.03.13.tar.gz 18242693 BLAKE2B c19afed62694274298b42fc9af3b36c4cc6429b40f7e5447a996b87636a0d2e916476875652e20abd7aeab4e5e0e1cf887a04dcade1de03ded549fc36d911ac4 SHA512 5f34a14ef0b36a309d4a08926ac482ca82d24cdd873aa359c5ba7c65473cbb2e987fe615c38c1bc1c50135284da78a7eb98a8a0106d7d073aeda0cd8f1c31873
 DIST docker-19.03.14.tar.gz 18278132 BLAKE2B 5e32cb482fdc40531aa4ba79dd447093859f568b3d8b5c3ed584c78d5709fabf2a1e05e82af2686cd87462e1abd899bd3f0a746f97937b7d16950f5e94264dff SHA512 5e48185a7787d5637fc11f43f6af604d56a5fa4367fd5a558bb3a5ef3c0d767f1c7f83ecef369453696b68eed81e49520453f267fbe8c2b840b3f62d35f25c28
+DIST docker-19.03.15.tar.gz 18284803 BLAKE2B a1fac5d841934382d12c781353546b7c7a8167d0f2dc4150659a4aece210ea7361c59de25e3d450dae20fd536ea8dc33a18e55f9565ee4fdc818166810391fbf SHA512 ffd8e683a93a6ce69789603d24457aebe3379594692cb3dadc25bc8d407771a29d76087b0ca70856707f151622b1853f283a1071311c033ff90a1e44b0d9ffbc
 DIST docker-20.10.2.tar.gz 11045195 BLAKE2B 182ceabbabfa091eaae8ecf12a50dfbe296722072ee24cdde48c3ed2ad40f47d6f939830a00e1dbe7d5dfb1fa25ccda7efe25ce3e4f9a7bbf6ad85dac109168c SHA512 b514e98e3f71874fcf5374eeaaabc2c879691b48937dbc962be3577d834f571353d4f946aebfa69f1a62b1388c9220bfdff09b62bf62c134bd41f494e8506f56
+DIST docker-20.10.3.tar.gz 11063792 BLAKE2B 9309573dd83d0746bb492cf68e06d69e60550718f8f934a065b33d1538847a4effcf6310638daa9b535515bc43cc1b47636482c90d4499f2b46b74aa37882dd7 SHA512 8389980e0b47e34872301bbe703d7abfc7819946736bab0ef4fee983daa4f798c7c6373d823dc62a3995076e71ca6bc86dc793f736b68e8ec1040332193cfdb8
--- a/app-emulation/docker/docker-19.03.15.ebuild
+++ b/app-emulation/docker/docker-19.03.15.ebuild
@ -0,0 +1,333 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_PN="github.com/docker/docker-ce"
+
+if [[ ${PV} = *9999* ]]; then
+	# Docker cannot be fetched via "go get", thanks to autogenerated code
+	EGIT_REPO_URI="https://${EGO_PN}.git"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
+	inherit git-r3
+else
+	DOCKER_GITCOMMIT=420b1d3625
+	MY_PV=${PV/_/-}
+	SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
+	inherit golang-vcs-snapshot
+fi
+inherit bash-completion-r1 golang-base linux-info systemd udev
+
+DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
+HOMEPAGE="https://www.docker.com/"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="apparmor aufs btrfs +container-init device-mapper hardened overlay seccomp selinux"
+
+# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
+BDEPEND="
+	>=dev-lang/go-1.13.12
+	dev-go/go-md2man
+	virtual/pkgconfig
+"
+
+DEPEND="
+	acct-group/docker
+	>=dev-db/sqlite-3.7.9:3
+	apparmor? ( sys-libs/libapparmor )
+	btrfs? ( >=sys-fs/btrfs-progs-3.16.1 )
+	device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] )
+	seccomp? ( >=sys-libs/libseccomp-2.2.1 )
+"
+
+# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
+# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
+# https://github.com/docker/docker-ce/tree/master/components/engine/hack/dockerfile/install
+# make sure containerd, docker-proxy, runc and tini pinned to exact versions from ^,
+# for appropriate brachch/version of course
+RDEPEND="
+	${DEPEND}
+	!sys-apps/systemd[-cgroup-hybrid(+)]
+	>=net-firewall/iptables-1.4
+	sys-process/procps
+	>=dev-vcs/git-1.7
+	>=app-arch/xz-utils-4.9
+	dev-libs/libltdl
+	~app-emulation/containerd-1.3.9[apparmor?,btrfs?,device-mapper?,seccomp?,selinux?]
+	~app-emulation/runc-1.0.0_rc10[apparmor?,seccomp?,selinux(-)?]
+	~app-emulation/docker-proxy-0.8.0_p20201105
+	container-init? ( >=sys-process/tini-0.18.0[static] )
+"
+
+RESTRICT="installsources strip"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+# see "contrib/check-config.sh" from upstream's sources
+CONFIG_CHECK="
+	~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
+	~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
+	~KEYS
+	~VETH ~BRIDGE ~BRIDGE_NETFILTER
+	~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
+	~NETFILTER_NETLINK ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK ~NETFILTER_XT_MATCH_IPVS
+	~IP_NF_NAT ~NF_NAT
+	~POSIX_MQUEUE
+
+	~USER_NS
+	~SECCOMP
+	~CGROUP_PIDS
+	~MEMCG_SWAP
+
+	~BLK_CGROUP ~BLK_DEV_THROTTLING
+	~CGROUP_PERF
+	~CGROUP_HUGETLB
+	~NET_CLS_CGROUP
+	~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
+	~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR
+
+	~VXLAN
+	~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH ~XFRM_ALGO ~XFRM_USER
+	~IPVLAN
+	~MACVLAN ~DUMMY
+
+	~OVERLAY_FS ~!OVERLAY_FS_REDIRECT_DIR
+	~EXT4_FS_SECURITY
+	~EXT4_FS_POSIX_ACL
+"
+
+ERROR_KEYS="CONFIG_KEYS: is mandatory"
+ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
+ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering"
+
+ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering"
+ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering"
+ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering"
+ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering"
+ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks"
+ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks"
+
+pkg_setup() {
+	if kernel_is lt 3 10; then
+		ewarn ""
+		ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported."
+		ewarn " - http://docs.docker.com/engine/installation/binaries/#check-kernel-dependencies"
+	fi
+
+	if kernel_is le 3 18; then
+		CONFIG_CHECK+="
+			~RESOURCE_COUNTERS
+		"
+	fi
+
+	if kernel_is le 3 13; then
+		CONFIG_CHECK+="
+			~NETPRIO_CGROUP
+		"
+	else
+		CONFIG_CHECK+="
+			~CGROUP_NET_PRIO
+		"
+	fi
+
+	if kernel_is lt 4 5; then
+		CONFIG_CHECK+="
+			~MEMCG_KMEM
+		"
+		ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional"
+	fi
+
+	if kernel_is lt 4 7; then
+		CONFIG_CHECK+="
+			~DEVPTS_MULTIPLE_INSTANCES
+		"
+	fi
+
+	if kernel_is lt 5 1; then
+		CONFIG_CHECK+="
+			~NF_NAT_IPV4
+			~IOSCHED_CFQ
+			~CFQ_GROUP_IOSCHED
+		"
+	fi
+
+	if kernel_is lt 5 2; then
+		CONFIG_CHECK+="
+			~NF_NAT_NEEDED
+		"
+	fi
+
+	if kernel_is lt 5 8; then
+		CONFIG_CHECK+="
+			~MEMCG_SWAP_ENABLED
+		"
+	fi
+
+	if use aufs; then
+		CONFIG_CHECK+="
+			~AUFS_FS
+			~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
+		"
+		ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs is patched to kernel instead of using standalone"
+	fi
+
+	if use btrfs; then
+		CONFIG_CHECK+="
+			~BTRFS_FS
+			~BTRFS_FS_POSIX_ACL
+		"
+	fi
+
+	if use device-mapper; then
+		CONFIG_CHECK+="
+			~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
+		"
+	fi
+
+	linux-info_pkg_setup
+}
+
+src_compile() {
+	export GOPATH="${WORKDIR}/${P}"
+
+	# setup CFLAGS and LDFLAGS for separate build target
+	# see https://github.com/tianon/docker-overlay/pull/10
+	export CGO_CFLAGS="-I${ROOT}/usr/include"
+	export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
+
+	# if we're building from a tarball, we need the GITCOMMIT value
+	[[ ${DOCKER_GITCOMMIT} ]] && export DOCKER_GITCOMMIT
+
+	# fake golang layout
+	ln -s docker-ce/components/engine ../docker || die
+	ln -s docker-ce/components/cli ../cli || die
+
+	# let's set up some optional features :)
+	export DOCKER_BUILDTAGS=''
+	for gd in aufs btrfs device-mapper overlay; do
+		if ! use $gd; then
+			DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
+		fi
+	done
+
+	for tag in apparmor seccomp selinux; do
+		if use $tag; then
+			DOCKER_BUILDTAGS+=" $tag"
+		fi
+	done
+
+	pushd components/engine || die
+
+	if use hardened; then
+		sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die
+		grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
+		sed  "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
+			-i hack/make/dynbinary-daemon || die
+		grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed'
+	fi
+
+	# build daemon
+	VERSION="$(cat ../../VERSION)" \
+	./hack/make.sh dynbinary || die 'dynbinary failed'
+
+	popd || die # components/engine
+
+	pushd components/cli || die
+
+	# build cli
+	DISABLE_WARN_OUTSIDE_CONTAINER=1 emake \
+		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \
+		VERSION="$(cat ../../VERSION)" \
+		GITCOMMIT="${DOCKER_GITCOMMIT}" \
+		dynbinary
+
+	# build man pages
+	go build -o gen-manpages github.com/docker/cli/man || die
+	./gen-manpages --root . --target ./man/man1 || die
+	./man/md2man-all.sh -q || die
+	rm gen-manpages || die
+	# see "components/cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man)
+
+	popd || die # components/cli
+}
+
+src_install() {
+	dosym containerd /usr/bin/docker-containerd
+	dosym containerd-shim /usr/bin/docker-containerd-shim
+	dosym runc /usr/bin/docker-runc
+	use container-init && dosym tini /usr/bin/docker-init
+
+	pushd components/engine || die
+	newbin bundles/dynbinary-daemon/dockerd-${PV} dockerd
+
+	newinitd contrib/init/openrc/docker.initd docker
+	newconfd contrib/init/openrc/docker.confd docker
+
+	systemd_dounit contrib/init/systemd/docker.{service,socket}
+
+	udev_dorules contrib/udev/*.rules
+
+	dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
+	dodoc -r docs/*
+
+	insinto /usr/share/vim/vimfiles
+	doins -r contrib/syntax/vim/ftdetect
+	doins -r contrib/syntax/vim/syntax
+
+	# note: intentionally not using "doins" so that we preserve +x bits
+	dodir /usr/share/${PN}/contrib
+	cp -R contrib/* "${ED}/usr/share/${PN}/contrib"
+	popd || die # components/engine
+
+	pushd components/cli || die
+
+	newbin build/docker-* docker
+
+	doman man/man*/*
+
+	sed -i 's@dockerd\?\.exe@@g' contrib/completion/bash/docker || die
+	dobashcomp contrib/completion/bash/*
+	bashcomp_alias docker dockerd
+	insinto /usr/share/fish/vendor_completions.d/
+	doins contrib/completion/fish/docker.fish
+	insinto /usr/share/zsh/site-functions
+	doins contrib/completion/zsh/_*
+	popd || die # components/cli
+}
+
+pkg_postinst() {
+	udev_reload
+
+	elog
+	elog "To use Docker, the Docker daemon must be running as root. To automatically"
+	elog "start the Docker daemon at boot:"
+	if systemd_is_booted || has_version sys-apps/systemd; then
+		elog "  systemctl enable docker.service"
+	else
+		elog "  rc-update add docker default"
+	fi
+	elog
+	elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
+	elog '  usermod -aG docker <youruser>'
+	elog
+
+	if use device-mapper; then
+		elog " Devicemapper storage driver has been deprecated"
+		elog " It will be removed in a future release"
+		elog
+	fi
+
+	if use overlay; then
+		elog " Overlay storage driver/USEflag has been deprecated"
+		elog " in favor of overlay2 (enabled unconditionally)"
+		elog
+	fi
+
+	if has_version sys-fs/zfs; then
+		elog " ZFS storage driver is available"
+		elog " Check https://docs.docker.com/storage/storagedriver/zfs-driver for more info"
+		elog
+	fi
+}
--- a/app-emulation/docker/docker-20.10.3.ebuild
+++ b/app-emulation/docker/docker-20.10.3.ebuild
@ -0,0 +1,293 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+EGO_PN=github.com/docker/docker
+GIT_COMMIT=46229ca1d8
+inherit bash-completion-r1 linux-info systemd udev golang-vcs-snapshot
+
+DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
+HOMEPAGE="https://www.docker.com/"
+MY_PV=${PV/_/-}
+SRC_URI="https://github.com/moby/moby/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="apparmor aufs btrfs +cli +container-init device-mapper hardened overlay seccomp"
+
+DEPEND="
+	acct-group/docker
+	>=dev-db/sqlite-3.7.9:3
+	apparmor? ( sys-libs/libapparmor )
+	btrfs? ( >=sys-fs/btrfs-progs-3.16.1 )
+	device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] )
+	seccomp? ( >=sys-libs/libseccomp-2.2.1 )
+"
+
+# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#runtime-dependencies
+# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#optional-dependencies
+# https://github.com/moby/moby/tree/master//hack/dockerfile/install
+# make sure containerd, docker-proxy, runc and tini pinned to exact versions from ^,
+# for appropriate branchch/version of course
+RDEPEND="
+	${DEPEND}
+	>=net-firewall/iptables-1.4
+	sys-process/procps
+	>=dev-vcs/git-1.7
+	>=app-arch/xz-utils-4.9
+	dev-libs/libltdl
+	~app-emulation/containerd-1.4.3[apparmor?,btrfs?,device-mapper?,seccomp?]
+	~app-emulation/runc-1.0.0_rc92[apparmor?,seccomp?]
+	~app-emulation/docker-proxy-0.8.0_p20201215
+	cli? ( app-emulation/docker-cli )
+	container-init? ( >=sys-process/tini-0.19.0[static] )
+"
+
+# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
+BDEPEND="
+	>=dev-lang/go-1.13.12
+	dev-go/go-md2man
+	virtual/pkgconfig
+"
+
+RESTRICT="installsources strip"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+# see "contrib/check-config.sh" from upstream's sources
+CONFIG_CHECK="
+	~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
+	~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
+	~KEYS
+	~VETH ~BRIDGE ~BRIDGE_NETFILTER
+	~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
+	~NETFILTER_NETLINK ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK ~NETFILTER_XT_MATCH_IPVS
+	~IP_NF_NAT ~NF_NAT
+	~POSIX_MQUEUE
+
+	~USER_NS
+	~SECCOMP
+	~CGROUP_PIDS
+	~MEMCG_SWAP
+
+	~BLK_CGROUP ~BLK_DEV_THROTTLING
+	~CGROUP_PERF
+	~CGROUP_HUGETLB
+	~NET_CLS_CGROUP
+	~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
+	~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR
+
+	~VXLAN
+	~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH ~XFRM_ALGO ~XFRM_USER
+	~IPVLAN
+	~MACVLAN ~DUMMY
+
+	~OVERLAY_FS ~!OVERLAY_FS_REDIRECT_DIR
+	~EXT4_FS_SECURITY
+	~EXT4_FS_POSIX_ACL
+"
+
+ERROR_KEYS="CONFIG_KEYS: is mandatory"
+ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
+ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering"
+
+ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering"
+ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering"
+ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering"
+ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering"
+ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks"
+ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks"
+
+pkg_setup() {
+	if kernel_is lt 3 10; then
+		ewarn ""
+		ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported."
+		ewarn " - http://docs.docker.com/engine/installation/binaries/#check-kernel-dependencies"
+	fi
+
+	if kernel_is le 3 18; then
+		CONFIG_CHECK+="
+			~RESOURCE_COUNTERS
+		"
+	fi
+
+	if kernel_is le 3 13; then
+		CONFIG_CHECK+="
+			~NETPRIO_CGROUP
+		"
+	else
+		CONFIG_CHECK+="
+			~CGROUP_NET_PRIO
+		"
+	fi
+
+	if kernel_is lt 4 5; then
+		CONFIG_CHECK+="
+			~MEMCG_KMEM
+		"
+		ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional"
+	fi
+
+	if kernel_is lt 4 7; then
+		CONFIG_CHECK+="
+			~DEVPTS_MULTIPLE_INSTANCES
+		"
+	fi
+
+	if kernel_is lt 5 1; then
+		CONFIG_CHECK+="
+			~NF_NAT_IPV4
+			~IOSCHED_CFQ
+			~CFQ_GROUP_IOSCHED
+		"
+	fi
+
+	if kernel_is lt 5 2; then
+		CONFIG_CHECK+="
+			~NF_NAT_NEEDED
+		"
+	fi
+
+	if kernel_is lt 5 8; then
+		CONFIG_CHECK+="
+			~MEMCG_SWAP_ENABLED
+		"
+	fi
+
+	if use aufs; then
+		CONFIG_CHECK+="
+			~AUFS_FS
+			~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
+		"
+		ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs is patched to kernel instead of using standalone"
+	fi
+
+	if use btrfs; then
+		CONFIG_CHECK+="
+			~BTRFS_FS
+			~BTRFS_FS_POSIX_ACL
+		"
+	fi
+
+	if use device-mapper; then
+		CONFIG_CHECK+="
+			~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
+		"
+	fi
+
+	linux-info_pkg_setup
+}
+
+src_compile() {
+	export DOCKER_GITCOMMIT="${GIT_COMMIT}"
+	export GOPATH="${WORKDIR}/${P}"
+
+	# setup CFLAGS and LDFLAGS for separate build target
+	# see https://github.com/tianon/docker-overlay/pull/10
+	export CGO_CFLAGS="-I${ROOT}/usr/include"
+	export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
+
+	# let's set up some optional features :)
+	export DOCKER_BUILDTAGS=''
+	for gd in aufs btrfs device-mapper overlay; do
+		if ! use $gd; then
+			DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
+		fi
+	done
+
+	for tag in apparmor seccomp; do
+		if use $tag; then
+			DOCKER_BUILDTAGS+=" $tag"
+		fi
+	done
+
+	if use hardened; then
+		sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die
+		grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
+		sed  "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
+			-i hack/make/dynbinary-daemon || die
+		grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed'
+	fi
+
+	# build daemon
+	./hack/make.sh dynbinary || die 'dynbinary failed'
+}
+
+src_install() {
+	dosym containerd /usr/bin/docker-containerd
+	dosym containerd-shim /usr/bin/docker-containerd-shim
+	dosym runc /usr/bin/docker-runc
+	use container-init && dosym tini /usr/bin/docker-init
+	newbin bundles/dynbinary-daemon/dockerd dockerd
+
+	newinitd contrib/init/openrc/docker.initd docker
+	newconfd contrib/init/openrc/docker.confd docker
+
+	systemd_dounit contrib/init/systemd/docker.{service,socket}
+
+	udev_dorules contrib/udev/*.rules
+
+	dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
+	dodoc -r docs/*
+
+	# note: intentionally not using "doins" so that we preserve +x bits
+	dodir /usr/share/${PN}/contrib
+	cp -R contrib/* "${ED}/usr/share/${PN}/contrib"
+}
+
+pkg_postinst() {
+	udev_reload
+
+	elog
+	elog "To use Docker, the Docker daemon must be running as root. To automatically"
+	elog "start the Docker daemon at boot:"
+	if systemd_is_booted || has_version sys-apps/systemd; then
+		elog "  systemctl enable docker.service"
+	else
+		elog "  rc-update add docker default"
+	fi
+	elog
+	elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
+	elog '  usermod -aG docker <youruser>'
+	elog
+
+	if use device-mapper; then
+		elog " Devicemapper storage driver has been deprecated"
+		elog " It will be removed in a future release"
+		elog
+	fi
+
+	if use overlay; then
+		elog " Overlay storage driver/USEflag has been deprecated"
+		elog " in favor of overlay2 (enabled unconditionally)"
+		elog
+	fi
+
+	if has_version sys-fs/zfs; then
+		elog " ZFS storage driver is available"
+		elog " Check https://docs.docker.com/storage/storagedriver/zfs-driver for more info"
+		elog
+	fi
+
+	if use cli; then
+		ewarn "Starting with docker 20.10.2, docker has been split into"
+		ewarn "two packages upstream, so Gentoo has followed suit."
+		ewarn
+		ewarn "app-emulation/docker contains the daemon and"
+		ewarn "app-emulation/docker-cli contains the docker command."
+		ewarn
+		ewarn "docker currently installs docker-cli using the cli use flag."
+		ewarn
+		ewarn "This use flag is temporary, so you need to take the"
+		ewarn "following actions:"
+		ewarn
+		ewarn "First, disable the cli use flag for app-emulation/docker"
+		ewarn
+		ewarn "Then, if you need docker-cli and docker on the same machine,"
+		ewarn "run the following command:"
+		ewarn
+		ewarn "# emerge --noreplace docker-cli"
+		ewarn
+	fi
+}
--- a/app-emulation/xen/xen-4.13.2-r4.ebuild
+++ b/app-emulation/xen/xen-4.13.2-r4.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -15,7 +15,7 @@ if [[ $PV == *9999 ]]; then
 	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
 	SRC_URI=""
 else
-	KEYWORDS="~amd64 ~arm -x86"
+	KEYWORDS="amd64 ~arm -x86"
 	UPSTREAM_VER=3
 	SECURITY_VER=
 	GENTOO_VER=
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
--- a/app-i18n/transifex-client/transifex-client-0.13.9.ebuild
+++ b/app-i18n/transifex-client/transifex-client-0.13.9.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -9,7 +9,7 @@ DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1

 DESCRIPTION="A command line interface for Transifex"
-HOMEPAGE="https://pypi.org/project/transifex-client/ https://www.transifex.net/"
+HOMEPAGE="https://pypi.org/project/transifex-client/ https://www.transifex.net/ https://github.com/transifex/transifex-client"
 SRC_URI="mirror://pypi/t/${PN}/${P}.tar.gz"

 LICENSE="GPL-2"
--- a/app-i18n/transifex-client/transifex-client-0.14.2-r1.ebuild
+++ b/app-i18n/transifex-client/transifex-client-0.14.2-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -9,7 +9,7 @@ DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1

 DESCRIPTION="A command line interface for Transifex"
-HOMEPAGE="https://pypi.org/project/transifex-client/ https://www.transifex.net/"
+HOMEPAGE="https://pypi.org/project/transifex-client/ https://www.transifex.net/ https://github.com/transifex/transifex-client"
 SRC_URI="mirror://pypi/t/${PN}/${P}.tar.gz"

 LICENSE="GPL-2"
@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"

-BDEPEND="test? ( <dev-python/mock-4.0[${PYTHON_USEDEP}] )"
+BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
 RDEPEND="dev-python/GitPython[${PYTHON_USEDEP}]
 	<dev-python/python-slugify-5.0.0[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
@ -31,4 +31,5 @@ src_prepare() {
 	eapply_user
 	sed -i -e 's:test_fetch_timestamp_from_git_tree:_&:' \
 		tests/test_utils.py || die
+	sed -i '/tests_require=\["mock>=3.0.5,<4.0"\]/d' setup.py || die
 }
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
--- a/app-misc/jq/jq-1.7_pre20201109.ebuild
+++ b/app-misc/jq/jq-1.7_pre20201109.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${COMMIT_HASH}"

 LICENSE="MIT CC-BY-3.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
 IUSE="+oniguruma static-libs test"

 ONIGURUMA_MINPV='>=dev-libs/oniguruma-6.1.3' # Keep this in sync with bundled modules/oniguruma/
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
--- a/dev-db/mysql-connector-c/mysql-connector-c-8.0.23.ebuild
+++ b/dev-db/mysql-connector-c/mysql-connector-c-8.0.23.ebuild
@ -13,7 +13,7 @@ HOMEPAGE="https://dev.mysql.com/downloads/"
 LICENSE="GPL-2"

 SRC_URI="https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-boost-${PV}.tar.gz"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86"

 SLOT="0/21"
 IUSE="ldap libressl static-libs"
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
--- a/dev-embedded/esptool/esptool-3.0.ebuild
+++ b/dev-embedded/esptool/esptool-3.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -14,7 +14,7 @@ SRC_URI="https://github.com/espressif/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"

--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@ -1,3 +1,4 @@
+DIST apache-tomcat-10.0.2-src.tar.gz 5954905 BLAKE2B fa7ca630b287c96538955848ab0ef109beb22a381e884eae96fa5246c134164b543003669c65d716f453ffa7a0e72f119354d1f023b529a948befb11c5e375a1 SHA512 402e942b9a1006535fd0e1416a4606d880ca1af473d7c394d54aa3dff60ecfe80823a0bb14f354049e008fdf29ea67a1490d0828fbc50eaf39ea159ef36cbc53
 DIST apache-tomcat-4.1.40-src.tar.gz 3709719 BLAKE2B f7ca82052c1148a5c384fcbc3871beeddccdb4cfed05ba176581ebb50f52ba867bed8dbc500e97b7348a3a87b9693fb73eb81209df4f31e8c1ced7e30a6af30b SHA512 c455fa3da9da8fcbf1d54ae5dce808f8a4520ccafd627a6b2d1b003c37e8395d8b2a55d5471bf6c196549d082715862b3b8958aef88613293a07fc0160aa5c6e
 DIST apache-tomcat-5.5.36-src.tar.gz 3743113 BLAKE2B dbfcfd123a23b0ceb9f1fdd936e42324ea8b10cf327a1d0abf1703006535859c7122690a08b5ec27b86b526cc7709a7199b4f35f123538ff11f23f3b489358f3 SHA512 845636b5b992fbbb7d657d192afbab1e6a924bfd0c71b025cf22776eb4527d92d63f9b3f33475d4349a0df4cebd984ba3776eedd7482b820abdea909e90a97b7
 DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713b49bc1dfcff573bb3f4bd0ff5807c33a2a0fb991af618f6e11e5b3ce3fa55c589fc6569342cab5d5a00349c79bc7061d81e40 SHA512 915a0a18f5c2883625c9441eed6465973eff4f6bf41e08e925c7edaea89ef8f6ee9476d3e06fa38228d4bcb4decaf53e3a7bdb7ec7e899e6250db3e12a9f5f2c
@ -5,3 +6,4 @@ DIST apache-tomcat-7.0.107-src.tar.gz 5312698 BLAKE2B 1f2712ddce6aa604692aaf6a6c
 DIST apache-tomcat-8.5.61-src.tar.gz 5840559 BLAKE2B 18e1505b6b7d8e1a024d9f834d33ef105a16e6fc1f9e80abd3e6e88b2326597b9973e13c2ebc030a1db4a2d4dc5572d195b9f61db6cb7bf51e97cbfaa121678a SHA512 fd6bb5926b5e7cf44f359c93dadc4edd87fa5f2e26fb0fb3a9bc0a5c89ae4d844d66872055e1b441392cf03d7690aca3429b66afd8334319784f089f821d8c22
 DIST apache-tomcat-8.5.63-src.tar.gz 5853051 BLAKE2B d007d9922d54578bdebcbbaec3e7c0ffcafdce913e52fdd93d5c174c9d1304980b5eb7f126e957c5975a59dfb126857dcc87ef3ca5e479e44cd7910b6183e469 SHA512 d78a140117844675239e834a0890641c0ef0d6fc3c89eb4512536fece2c128f088edfdea15f79ba7a31e0478431f155230f8f60a57bfea0aed191298a95310c4
 DIST apache-tomcat-9.0.41-src.tar.gz 6022059 BLAKE2B 6e97390aec956c16f271e57a2fa8805b6f49f593434f0dff8d82e14bc9abc199b00a7523dbb8da335a7ffa9dfee6790430c30f8b0ee90bcd133694c8da42197f SHA512 094e7cbd2519a4b812a2ca865f92802ece3385a20826c5e29b5f7cda8b9265d01ede6f598999f8aa2f1b04bcaca2e67e3f0132781b3f22007356df49ab6b1838
+DIST apache-tomcat-9.0.43-src.tar.gz 6042010 BLAKE2B 78c0e7d711dd826ba93b12db6a96929ddeeb0df189a12e907c51f02baa08d84757915b8744b5ebd027892ff2823b955d7b1c3c749ab54b588686dfd8d3157640 SHA512 8c23f8a371b3ffbc1ab4d5f24be08ecf2c9e6ba466ef36ef97e075bd0f12b1ffc93f63b9ff1def9953b3f791319c7c355a76e7a54061a21d25be37a5dc22da26
--- a/dev-java/tomcat-servlet-api/files/tomcat-servlet-api-10.0.2-patch-out-aQute.bnd.annotation.spi.ServiceConsumer.patch
+++ b/dev-java/tomcat-servlet-api/files/tomcat-servlet-api-10.0.2-patch-out-aQute.bnd.annotation.spi.ServiceConsumer.patch
@ -0,0 +1,20 @@
+diff --git a/java/jakarta/el/ExpressionFactory.java b/java/jakarta/el/ExpressionFactory.java
+index 2f42de7..5d52580 100644
+--- a/java/jakarta/el/ExpressionFactory.java
+++ b/java/jakarta/el/ExpressionFactory.java
+@@ -36,13 +36,13 @@ import java.util.concurrent.locks.Lock;
+ import java.util.concurrent.locks.ReadWriteLock;
+ import java.util.concurrent.locks.ReentrantReadWriteLock;
+ 
+-import aQute.bnd.annotation.spi.ServiceConsumer;
+//import aQute.bnd.annotation.spi.ServiceConsumer;
+ 
+ /**
+  *
+  * @since 2.1
+  */
+-@ServiceConsumer(value=ExpressionFactory.class)
+//@ServiceConsumer(value=ExpressionFactory.class)
+ public abstract class ExpressionFactory {
+ 
+     private static final boolean IS_SECURITY_ENABLED =
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.2.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.2.ebuild
@ -0,0 +1,103 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-pkg-simple
+
+MY_A="apache-${PN}-${PV}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 5.0/JSP API 3.0/EL API 4.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-10/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="5.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.8"
+RDEPEND=">=virtual/jre-1.8"
+
+S="${WORKDIR}/${MY_P}/"
+
+# we don't have the aQute.bnd.annotation.spi packaged
+PATCHES=(
+	"${FILESDIR}/${P}-patch-out-aQute.bnd.annotation.spi.ServiceConsumer.patch"
+)
+
+JAVA_TEST_SRC_DIR="src/test"
+
+SERVLET_API_JAR="servlet-api.jar"
+SERVLET_API_SRC="src/main/servlet-api"
+SERVLET_API_RESOURCES="src/resources/servlet-api"
+EL_API_JAR="el-api.jar"
+EL_API_SRC="src/main/el-api"
+EL_API_RESOURCES="src/resources/el-api"
+JSP_API_JAR="jsp-api.jar"
+JSP_API_SRC="src/main/jsp-api"
+JSP_API_RESOURCES="src/resources/jsp-api"
+
+src_prepare() {
+	default
+
+	# The sources and also resources are mixed together so we first give it a structure to make it easier to compila and package
+	mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \
+		${EL_API_SRC} ${EL_API_RESOURCES} \
+		${JSP_API_SRC}/jakarta/servlet ${JSP_API_RESOURCES} \
+		${JAVA_TEST_SRC_DIR} || die "Failed to create source directory"
+
+	pushd java || die "Failed to cd to java dir"
+
+	cp --parents -R jakarta/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources"
+	mv "${S}/${SERVLET_API_SRC}/jakarta/servlet/jsp" "${S}/${JSP_API_SRC}/jakarta/servlet" || die "Failed to copy jsp-api sources"
+	cp --parents -R jakarta/el "${S}/${EL_API_SRC}/" || die "Failed to copy el-api sources"
+
+	popd
+
+	for file in $(find src -type f | grep -vE "\.java$"); do
+		target_dir=$(dirname $file | sed "s%src/main/%src/resources/%g")
+		mkdir -p ${target_dir} || die "Failed to create resource directory"
+		mv $file ${target_dir} || die "Failed to move resource file"
+	done
+
+	mv test/jakarta ${JAVA_TEST_SRC_DIR} || die "Failed to copy test sources"
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	JAVA_SRC_DIR="${SERVLET_API_SRC}"
+	JAVA_RESOURCE_DIRS="${SERVLET_API_RESOURCES}"
+	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
+	java-pkg-simple_src_compile
+	rm -fr target || die "Failed to remove compiled files"
+
+	JAVA_SRC_DIR="${EL_API_SRC}"
+	JAVA_RESOURCE_DIRS="${EL_API_RESOURCES}"
+	JAVA_JAR_FILENAME="${EL_API_JAR}"
+	java-pkg-simple_src_compile
+	rm -fr target || die "Failed to remove compiled files"
+
+	JAVA_SRC_DIR="${JSP_API_SRC}"
+	JAVA_RESOURCE_DIRS="${JSP_API_RESOURCES}"
+	JAVA_JAR_FILENAME="${JSP_API_JAR}"
+	JAVA_GENTOO_CLASSPATH_EXTRA="servlet-api.jar:el-api.jar"
+	java-pkg-simple_src_compile
+}
+
+src_install() {
+	JAVA_SRC_DIR="${SERVLET_API_SRC}"
+	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
+	java-pkg-simple_src_install
+
+	JAVA_SRC_DIR="${EL_API_SRC}"
+	JAVA_JAR_FILENAME="${EL_API_JAR}"
+	java-pkg-simple_src_install
+
+	JAVA_SRC_DIR="${JSP_API_SRC}"
+	JAVA_JAR_FILENAME="${JSP_API_JAR}"
+	java-pkg-simple_src_install
+}
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.43.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.43.ebuild
@ -0,0 +1,104 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-pkg-simple
+
+MY_A="apache-${PN}-${PV}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.3/EL API 3.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="4.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.8"
+RDEPEND=">=virtual/jre-1.8"
+
+S="${WORKDIR}/${MY_P}/"
+
+# we don't have the aQute.bnd.annotation.spi packaged
+PATCHES=(
+	"${FILESDIR}/tomcat-servlet-api-9.0.40-patch-out-aQute.bnd.annotation.spi.ServiceConsumer.patch"
+)
+
+JAVA_TEST_SRC_DIR="src/test"
+
+SERVLET_API_JAR="servlet-api.jar"
+SERVLET_API_SRC="src/main/servlet-api"
+SERVLET_API_RESOURCES="src/resources/servlet-api"
+EL_API_JAR="el-api.jar"
+EL_API_SRC="src/main/el-api"
+EL_API_RESOURCES="src/resources/el-api"
+JSP_API_JAR="jsp-api.jar"
+JSP_API_SRC="src/main/jsp-api"
+JSP_API_RESOURCES="src/resources/jsp-api"
+
+src_prepare() {
+	default
+
+	# The sources and also resources are mixed together so we first give it a structure to make it easier to compila and package
+
+	mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \
+		${EL_API_SRC} ${EL_API_RESOURCES} \
+		${JSP_API_SRC}/javax/servlet ${JSP_API_RESOURCES} \
+		${JAVA_TEST_SRC_DIR} || die "Failed to create source directory"
+
+	pushd java || die "Failed to cd to java dir"
+
+	cp --parents -R javax/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources"
+	mv "${S}/${SERVLET_API_SRC}/javax/servlet/jsp" "${S}/${JSP_API_SRC}/javax/servlet" || die "Failed to copy jsp-api sources"
+	cp --parents -R javax/el "${S}/${EL_API_SRC}/" || die "Failed to copy el-api sources"
+
+	popd
+
+	for file in $(find src -type f | grep -vE "\.java$"); do
+		target_dir=$(dirname $file | sed "s%src/main/%src/resources/%g")
+		mkdir -p ${target_dir} || die "Failed to create resource directory"
+		mv $file ${target_dir} || die "Failed to move resource file"
+	done
+
+	mv test/javax ${JAVA_TEST_SRC_DIR} || die "Failed to copy test sources"
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	JAVA_SRC_DIR="${SERVLET_API_SRC}"
+	JAVA_RESOURCE_DIRS="${SERVLET_API_RESOURCES}"
+	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
+	java-pkg-simple_src_compile
+	rm -fr target || die "Failed to remove compiled files"
+
+	JAVA_SRC_DIR="${EL_API_SRC}"
+	JAVA_RESOURCE_DIRS="${EL_API_RESOURCES}"
+	JAVA_JAR_FILENAME="${EL_API_JAR}"
+	java-pkg-simple_src_compile
+	rm -fr target || die "Failed to remove compiled files"
+
+	JAVA_SRC_DIR="${JSP_API_SRC}"
+	JAVA_RESOURCE_DIRS="${JSP_API_RESOURCES}"
+	JAVA_JAR_FILENAME="${JSP_API_JAR}"
+	JAVA_GENTOO_CLASSPATH_EXTRA="servlet-api.jar:el-api.jar"
+	java-pkg-simple_src_compile
+}
+
+src_install() {
+	JAVA_SRC_DIR="${SERVLET_API_SRC}"
+	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
+	java-pkg-simple_src_install
+
+	JAVA_SRC_DIR="${EL_API_SRC}"
+	JAVA_JAR_FILENAME="${EL_API_JAR}"
+	java-pkg-simple_src_install
+
+	JAVA_SRC_DIR="${JSP_API_SRC}"
+	JAVA_JAR_FILENAME="${JSP_API_JAR}"
+	java-pkg-simple_src_install
+}
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
--- a/dev-libs/boost/boost-1.74.0-r2.ebuild
+++ b/dev-libs/boost/boost-1.74.0-r2.ebuild
@ -16,7 +16,7 @@ SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar

 LICENSE="Boost-1.0"
 SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"
 IUSE="bzip2 context debug doc icu lzma +nls mpi numpy python static-libs +threads tools zlib zstd"
 REQUIRED_USE="
 	mpi? ( threads )
--- a/dev-libs/libzia/Manifest
+++ b/dev-libs/libzia/Manifest
@ -1,2 +1,3 @@
 DIST libzia-4.23.tar.gz 627405 BLAKE2B 913173aca367dd660b8e04502e1198072e99e9ece5cd30ef2d4ad528292b3aba00799d89ee336bdf6a1cebf43118610caddfeeedccdd4b5af48bd54ac795066b SHA512 c34aff9b8a19713ea9881ea5a58a038fe7f0127c3503c845ecd6187ab07f90f7ae2727331e43b9cfb6b8db15d8dcbf80b2e1f4105bb4a34e9b30d9778d3a815b
 DIST libzia-4.24.tar.gz 630318 BLAKE2B 83792c75e776b039788d46568a967690e10086b1f5daf3304a658721f1139bbed65b41a8fdcfe213757d342287696c383be7668be111896388b292086ca2cd0a SHA512 e7952822861d7702494309d70e9d7385c5dfa929b521387bc81883d4316a5fae96c5776b00f81da6dcbaa2965fdf30ac8a8a1b9963806d36454ebd6886ddcbd1
+DIST libzia-4.25.tar.gz 632565 BLAKE2B b677ef71a2c02baa04e3a3e1594b28cd7161762456a44f6532462e4514851e6298ade881b61c3d02175a7029b43358e94ebdad558aa82d8210600e35b9a32e30 SHA512 5d3d9f80b53baa3aeaf359d4b3c0eeec265177e47bf11bf2c5bcebf23d339e481eaa14a1ea7f5f686c9c7477fd607095c77d85399df479d297cc5bde1086535f
--- a/dev-libs/libzia/libzia-4.25.ebuild
+++ b/dev-libs/libzia/libzia-4.25.ebuild
@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="platform abstraction code for tucnak package"
+HOMEPAGE="http://tucnak.nagano.cz"
+SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ftdi"
+
+RDEPEND="dev-libs/glib:2
+	x11-libs/gtk+:2
+	media-libs/libsdl
+	media-libs/libpng:0
+	ftdi? ( dev-embedded/libftdi:1 )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+MAKEOPTS+=" -j1"
+
+src_prepare() {
+	eapply_user
+	sed -i -e "s/docsdir/#docsdir/g" \
+		-e "s/docs_/#docs_/g" Makefile.am || die
+
+	# Fix QA-Warning "QA Notice: pkg-config files with wrong LDFLAGS detected"
+	sed -i -e 's/@LDFLAGS@//' libzia.pc.in || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with ftdi) --with-sdl \
+		--with-png --without-bfd \
+		--disable-static
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	find "${D}" -name '*.la' -type f -delete || die
+}
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
--- a/dev-ml/ocamlbuild/ocamlbuild-0.11.0.ebuild
+++ b/dev-ml/ocamlbuild/ocamlbuild-0.11.0.ebuild
@ -21,6 +21,14 @@ RDEPEND="${DEPEND}
 DEPEND="${DEPEND}
 	test? ( dev-ml/findlib )"

+src_prepare() {
+	sed -i \
+		-e "/package_exists/s:camlp4.macro:xxxxxx:" \
+		-e "/package_exists/s:menhirLib.macro:xxxxxx:" \
+		testsuite/external.ml || die
+	default
+}
+
 src_configure() {
 	emake -f configure.make Makefile.config \
 		PREFIX="${EPREFIX}/usr" \
@ -31,6 +39,11 @@ src_configure() {
 		NATDYNLINK=$(usex ocamlopt true false)
 }

+src_compile() {
+	emake src/ocamlbuild_config.cmo
+	default
+}
+
 src_install() {
 	emake CHECK_IF_PREINSTALLED=false DESTDIR="${D}" install
 	dodoc Changes
--- a/dev-ml/ocamlbuild/ocamlbuild-0.14.0-r1.ebuild
+++ b/dev-ml/ocamlbuild/ocamlbuild-0.14.0-r1.ebuild
@ -9,7 +9,7 @@ SRC_URI="https://github.com/ocaml/ocamlbuild/archive/${PV}.tar.gz -> ${P}.tar.gz

 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"

--- a/dev-ml/ocamlbuild/ocamlbuild-0.14.0.ebuild
+++ b/dev-ml/ocamlbuild/ocamlbuild-0.14.0.ebuild
@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Generic build tool with built-in rules for building OCaml library and programs"
-HOMEPAGE="https://github.com/ocaml/ocamlbuild"
-SRC_URI="https://github.com/ocaml/ocamlbuild/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
-
-DEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?]"
-RDEPEND="${DEPEND}
-	!<dev-ml/findlib-1.6.1-r1
-"
-DEPEND="${DEPEND}
-	test? ( dev-ml/findlib )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.14.0-Disable-tests-failing-with-OCaml-4.08.0.patch
-)
-
-src_configure() {
-	emake -f configure.make Makefile.config \
-		PREFIX="${EPREFIX}/usr" \
-		BINDIR="${EPREFIX}/usr/bin" \
-		LIBDIR="$(ocamlc -where)" \
-		OCAML_NATIVE=$(usex ocamlopt true false) \
-		OCAML_NATIVE_TOOLS=$(usex ocamlopt true false) \
-		NATDYNLINK=$(usex ocamlopt true false)
-}
-
-src_install() {
-	emake CHECK_IF_PREINSTALLED=false DESTDIR="${D}" install
-	dodoc Changes
-}
--- a/dev-perl/Devel-CheckOS/Devel-CheckOS-1.830.0.ebuild
+++ b/dev-perl/Devel-CheckOS/Devel-CheckOS-1.830.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -9,7 +9,7 @@ inherit perl-module

 DESCRIPTION="require that we are running on a particular OS"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"

--- a/dev-perl/FileHandle-Unget/FileHandle-Unget-0.163.400.ebuild
+++ b/dev-perl/FileHandle-Unget/FileHandle-Unget-0.163.400.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -11,7 +11,7 @@ DESCRIPTION="A FileHandle which supports ungetting of multiple bytes"

 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"

--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
--- a/dev-perl/Test-Compile/Test-Compile-2.4.1.ebuild
+++ b/dev-perl/Test-Compile/Test-Compile-2.4.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -9,7 +9,7 @@ inherit perl-module

 DESCRIPTION="Check whether Perl files compile correctly"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~sparc ~x86"
 IUSE="minimal test"
 RESTRICT="!test? ( test )"

--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
--- a/dev-python/reedsolomon/reedsolomon-1.5.4.ebuild
+++ b/dev-python/reedsolomon/reedsolomon-1.5.4.ebuild
@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -12,7 +12,7 @@ SRC_URI="https://github.com/tomerfiliba/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.

 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"

--- a/dev-python/tree-sitter/tree-sitter-0.2.1.ebuild
+++ b/dev-python/tree-sitter/tree-sitter-0.2.1.ebuild
@ -15,6 +15,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
+KEYWORDS="~amd64 ~hppa ~sparc ~x86 ~x64-macos"

 S="${WORKDIR}/${MY_P}"
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
--- a/dev-util/pkgcheck/pkgcheck-0.8.1.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.8.1.ebuild
@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~x86 ~x64-macos"
+	KEYWORDS="~amd64 ~sparc ~x86 ~x64-macos"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi

--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
--- a/kde-apps/akonadi-calendar/Manifest
+++ b/kde-apps/akonadi-calendar/Manifest
@ -1,2 +1,2 @@
 DIST akonadi-calendar-20.08.3.tar.xz 344600 BLAKE2B 0f478e41b7b43119c6c1fc4abcc7bab2d7c7e48ccdf83d97471cb34f6364beb606dcf09e61e838c8601b7d0834bd4115c2273db11a3cf319b03dcf7aebf9581e SHA512 f9b48dd1f8820ddb4a3c1259b20eeb814ffd0f0209407cc0412c21491b42f4744b7fd09e9a0e56249f5e8cd9c8d29a0265ccf46607a6617a1b605b2e20f15c02
-DIST akonadi-calendar-20.12.1.tar.xz 342756 BLAKE2B cf49f1bed4dd9b590ca50270ebdf227a24a7f84302ffe848c74cac29458426689b4a7b48c475b14c5728aa926e057373819d7978650be6bf4f52209e0afd644b SHA512 dde5ccb4275d204f259236bbe8a4e3b442615320f5dbfecde19c4b221ba45a947ebda120c4f2a5d971cfc6bb5f99865128c57a827057d5236edee660c7700d4d
+DIST akonadi-calendar-20.12.2.tar.xz 342764 BLAKE2B 0c71a7a2f5949eff8ccd0c93d31f4c332d04015b507477f6d03d06ac930622ac9704794a18ae7fc263eeaee3c6e3550f7d4bedc62be90e275c11b412adef9263 SHA512 80d7d9e77d176c157e885d1229fee07def248728679d5fea90124518aefd6f998cde4a2a22a0b5087c49547ba4fda3811b1a6980a920c47d13bc9039a17e02ae
--- a/kde-apps/akonadi-calendar/akonadi-calendar-20.12.2.ebuild
+++ b/kde-apps/akonadi-calendar/akonadi-calendar-20.12.2.ebuild
@ -6,7 +6,7 @@ EAPI=7
 ECM_TEST="true"
 PVCUT=$(ver_cut 1-3)
 KFMIN=5.75.0
-QTMIN=5.15.1
+QTMIN=5.15.2
 inherit ecm kde.org

 DESCRIPTION="Library for akonadi calendar integration"
--- a/kde-apps/akonadi-contacts/Manifest
+++ b/kde-apps/akonadi-contacts/Manifest
@ -1,2 +1,2 @@
 DIST akonadi-contacts-20.08.3.tar.xz 409772 BLAKE2B c974d8b48c12bce036f833089f8a59eb523b65d3cd8e9649bb573eaaa7fb5cfd8fa56a7842dafd67bc816ab298c942721c4cc1ef0c5c4ed12d8a2fc40ba62f94 SHA512 1b6d10a4cce9b84092673f5779cbd1db71beef86887ef6c809174445fbc13d7a0b6d8417eb54e3cbd10504ed12155d53e148a7667569b9458e900eebd16ce943
-DIST akonadi-contacts-20.12.1.tar.xz 414204 BLAKE2B d85643220eba07892b6200212b70ff19c24212654cc66cb0a6171777f90508d9638f13ff3df37992bed4280f4af59b38736daa2b101f5ce5152e42623f3cc2ed SHA512 a36db546baf7f5e7be69d4cfbb7df95bd01150eecf1b8c128d8057854858b3f94872429b50b6eccc3fbfe1e02bfa96963d946fc37898230ec43336ebe4396d42
+DIST akonadi-contacts-20.12.2.tar.xz 414208 BLAKE2B d0cdd880e6a05422afed82d7ec0d69424928c9bc9a2d7ff1565fb89163d5f4842388cfc8a6805bd052a0aa06f2fd895f34103809f9e4c7072bc0c569594a14fe SHA512 9e6bb8162619a484fffe822d448ab3aae5199c5deacb2ce10ccfdafb025b19e1f1a3aa0241f013c261205f6e7c9b7501c755589d69b082d3bc00d5d6fb58ccb9
--- a/kde-apps/akonadi-contacts/akonadi-contacts-20.12.2.ebuild
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-20.12.2.ebuild
@ -6,7 +6,7 @@ EAPI=7
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
 KFMIN=5.75.0
-QTMIN=5.15.1
+QTMIN=5.15.2
 inherit ecm kde.org

 DESCRIPTION="Library for akonadi contact integration"
--- a/kde-apps/akonadi-import-wizard/Manifest
+++ b/kde-apps/akonadi-import-wizard/Manifest
@ -1,2 +1,2 @@
 DIST akonadi-import-wizard-20.08.3.tar.xz 506104 BLAKE2B d11db50eaae05cbf1fd7e6322d3e56ef9c8b6738107134e6db6417f1d155e4d36d623af50569126a7fe43cced56e8001e2bc8b7fce2a743d52ee30567ea59be5 SHA512 d0319d42b9ed4eef654c1bd2728c17919f3b04c806b12ed01c872ade5094309f0fb2dfd01462e1ec860515f8a989470549da8aae2e933251e69951f067b12da5
-DIST akonadi-import-wizard-20.12.1.tar.xz 506668 BLAKE2B 6d669f06f7a07d92af0d7ba700e70bd5b9f1b7dab0da72f0701e2eb5bdc37ab933da76b8829566fde90fc715004021811f55f8e2d2e86ca11f4f9d2d44f7c15f SHA512 03e446f2bb5a26f66dfe51bf83524c41739bc5a7ef88d63e81594c02b4540caf91ab20c7d4fdd10031bdccb79527a99fc8b98bbf4a2444c909efc00d0c019459
+DIST akonadi-import-wizard-20.12.2.tar.xz 506672 BLAKE2B fcb9c46b509787d68296e96ad55e960c994ce4bcc87e7d541a8ead254378433efde46339565e01894949ddeb69378078e469e21833a49b8406fc9a64fabd0d2f SHA512 459014c383e62566b85535468ea0ac2970315248b98cf2aa7b5581e01a799ad35aa0fb5488e66e71ca3e6a1d94eb3dc1421e9ff638d2b87e8ec7dc3b6461906b
--- a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-20.12.2.ebuild
+++ b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-20.12.2.ebuild
@ -6,7 +6,7 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 PVCUT=$(ver_cut 1-3)
 KFMIN=5.75.0
-QTMIN=5.15.1
+QTMIN=5.15.2
 inherit ecm kde.org

 DESCRIPTION="Assistant to import PIM data from other applications into Akonadi"
--- a/kde-apps/akonadi-mime/Manifest
+++ b/kde-apps/akonadi-mime/Manifest
@ -1,2 +1,2 @@
 DIST akonadi-mime-20.08.3.tar.xz 137936 BLAKE2B ceb9e46da5ba1cf62f3d47c54bf60ed0ab25d20a4006dc6b9f667f1b7f449cd216508de4a76a04784f686383f70447467144e990a564e10c3af214ac9a348ad0 SHA512 d5f996f5e8e1e1c148d7b78e48d88d622e190881cc522fbd3cb0bb683888ba037ac9f84d5ba964eec356ff1c201b88e5339351d489a8647d8cab5fef22a882a1
-DIST akonadi-mime-20.12.1.tar.xz 135128 BLAKE2B 32049ff35b718e5fa75760ea138f33d90f0b4da542dca395400e711ff7712fd95171d50b7a1527afd1cf6474f9652fb919e70aa52b331c00071d2b3a51b130da SHA512 79f873c73e4600d5a5ccd5769408046f286a5c10ee2710c83b33cfd7e2f7bdc59a32123553c5364ba14136ac99f8d9fb5dec729d4ab1d91bffb7f5e0948957c8
+DIST akonadi-mime-20.12.2.tar.xz 135892 BLAKE2B 29ee94c335728ffd815ddf75a4b9839707654a4894647e097398b7c148cb211e2a19ca951bfd4c249798e248c5b97bb256bd02615c10a7a6c266f551929783e5 SHA512 7d4aadacdeb2c9627bea5494ca3d986365af1aea3cb87482e7d671edb4aa3055a6069709bb57bdf8cd3a4e291160af548044ec42f2e3c3aa2dcacfc0ae018aaf
--- a/kde-apps/akonadi-mime/akonadi-mime-20.12.2.ebuild
+++ b/kde-apps/akonadi-mime/akonadi-mime-20.12.2.ebuild
@ -6,7 +6,7 @@ EAPI=7
 ECM_TEST="true"
 PVCUT=$(ver_cut 1-3)
 KFMIN=5.75.0
-QTMIN=5.15.1
+QTMIN=5.15.2
 inherit ecm kde.org

 DESCRIPTION="Library for akonadi mime types"
--- a/kde-apps/akonadi-notes/Manifest
+++ b/kde-apps/akonadi-notes/Manifest
@ -1,2 +1,2 @@
 DIST akonadi-notes-20.08.3.tar.xz 22784 BLAKE2B eb88c528218d2853f8182f37fbb0f93bd34b78a76a5cbb03f35983fb79eb1361c1bb8836c8bb65fc106530d49b5e7e48cc3e7633b1b881b741561d0c8f49f618 SHA512 7b38bfa0854da839b40c455a87bba59574af5ebb69019ce4f58aeb2811df5b652e34aaebd942d8a9f5519e8d93faaa713a2dc8298abffcf4b7af41cca1416cf6
-DIST akonadi-notes-20.12.1.tar.xz 22892 BLAKE2B ec9756d5139b3001f5915402770fbf2681767cc779250d466d2138221adaf7d5cf8f83154c83adec117bf00b165bd6562361c0bb92a5149e06629f850fa5da32 SHA512 994fc65b5d53db0e21b4d67af1a10c0cb9bb8300265fc53252eb76f76c9f7c8292f6996e5832df640207197c8425820e4d0964c59636907289e9901e52909293
+DIST akonadi-notes-20.12.2.tar.xz 22916 BLAKE2B 54928a4adf67d4e6afb6692067e177f634142bae2fa0041663c6154bef5bcd2ed051bcf0a1a597d27d9d4685ca18627f001401e7f7b70eec802e64468fd896ef SHA512 30e4fc0753abee49f69c5c0727b123ff8bf2e8e8c127043895e6f3a221f0cf1e6bf5ca89ed87687d83184e082c8cf7fad7f490f1bc5678317cac8c18d2e83b49
--- a/kde-apps/akonadi-notes/akonadi-notes-20.12.2.ebuild
+++ b/kde-apps/akonadi-notes/akonadi-notes-20.12.2.ebuild
@ -6,7 +6,7 @@ EAPI=7
 ECM_TEST="true"
 PVCUT=$(ver_cut 1-3)
 KFMIN=5.75.0
-QTMIN=5.15.1
+QTMIN=5.15.2
 inherit ecm kde.org

 DESCRIPTION="Library for akonadi notes integration"
--- a/kde-apps/akonadi-search/Manifest
+++ b/kde-apps/akonadi-search/Manifest
@ -1,2 +1,2 @@
 DIST akonadi-search-20.08.3.tar.xz 94772 BLAKE2B a1ab156b0306dc543eff92711a7c3e3d94fde423a16fead67559b4b01b937178e549421d41dd486e3f68e4743c13a3667d7f432b656d990f02cac6edb0968a1c SHA512 db6246e428bfbe77239089e1bc4036b99dd8c070a70a995c698785ab202e5f975e30a7e0f36ac3fa41c859b928821f626f545c2be21479ffe5809e83068dbee8
-DIST akonadi-search-20.12.1.tar.xz 93928 BLAKE2B c55a82e47f422b4f770a5c53d636de0e02c60dfaaffaa31903bef259954c3923c6bfb8e41a2f82dd5bfdbdce89b01ff97203ed4222880290b6b2c839d9fc0025 SHA512 c0aba7883c1036425131d97d0fac0252ecff888f6e9e619afbd96785d3832fed3ce959c77bdc0227612af916412eae5aabe14ac2c882a067f27c342ac2e08fe7
+DIST akonadi-search-20.12.2.tar.xz 93988 BLAKE2B 42b62605b4dbe27dae073761ccb78e6063b65fc9ad934aa77065baa380e4dba38b38062f30ac800ec9546697d1b10b275f1bc0ca21426ebe16f5d8e399560720 SHA512 cbb9bb579b0545198ebc145d41ca3ffdc84a5cdab00941ef133c5d2fba2e720eefdb4ea52edfa065bcd2baffe5a612c15058fd5d7a2106c8728ad4ff6e531de0
--- a/kde-apps/akonadi-search/akonadi-search-20.12.2.ebuild
+++ b/kde-apps/akonadi-search/akonadi-search-20.12.2.ebuild
@ -6,7 +6,7 @@ EAPI=7
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
 KFMIN=5.75.0
-QTMIN=5.15.1
+QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org

--- a/kde-apps/akonadi/Manifest
+++ b/kde-apps/akonadi/Manifest
@ -1,2 +1,2 @@
 DIST akonadi-20.08.3.tar.xz 1591360 BLAKE2B e237fc3307ae3cd785e29da9c2177832f1cff523ab3dc46279813c9ae152ac3a030649e6b73e8d566332f478992d6441457301355c2f6abd180c4db8c8d48011 SHA512 2d278a6189732e7c68a89321356915413771f1b4b1e3fb5a491b02f0000095163cce61278cc4f7f8b17759c1d71b3e3c08dbed0c89f3fe26be21da14adbbf720
-DIST akonadi-20.12.1.tar.xz 1593196 BLAKE2B a765faa8278dc49b191bb7c7813853826cc8a4bd3e58c2504ed0c095580f7fe0a4d24a0893cbbdf058decd25dc95e3cf38adf3dea2f36229e2fd3b2ebc6e7773 SHA512 17b90cfa4700388975b00693919a5e8f24bb94350513186227af1fd0b9dc0fe600216cd7be1d4763a2261cc3c9d3885e5b6a0633e9d1b1ac5cda371ee445c322
+DIST akonadi-20.12.2.tar.xz 1593452 BLAKE2B e3d058a43685a8b8bf92ffbb169f1c17b8e831712567a4ef8eba6ef1eee6321ae45f82a72a4c44a71835b65c18075497d26c8802b7a2f0a10c9baa21efefa65e SHA512 2c21db5d6ab6b8d9cedabad2f726fd518ba8219db3cb6f8f72820edc71ed72efa31efcb2c4cd8ff36e52e4c0a38a97dd890789bf6816ab524f0568892254523c
--- a/kde-apps/akonadi/akonadi-20.12.2.ebuild
+++ b/kde-apps/akonadi/akonadi-20.12.2.ebuild
@ -7,7 +7,7 @@ ECM_DESIGNERPLUGIN="true"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
 KFMIN=5.75.0
-QTMIN=5.15.1
+QTMIN=5.15.2
 VIRTUALDBUS_TEST="true"
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
--- a/kde-apps/akonadiconsole/Manifest
+++ b/kde-apps/akonadiconsole/Manifest
@ -1,2 +1,2 @@
 DIST akonadiconsole-20.08.3.tar.xz 195032 BLAKE2B 589266d05e295ab80c891937faa204fad3ab56d4f6cbffcb2a435b93fed407be03c95cbf8c8a9ef2e74f2fecae16b41b74555cf878aa051515ddbbacf2497932 SHA512 2770bd9a89f3e64d82d689301392285ccbd580edadceebb83ba5c456fd9fc1a8149cadea3b6eb14ba9a8d7e68c1c4308957df21111d721304dc6268fece3dfd9
-DIST akonadiconsole-20.12.1.tar.xz 198052 BLAKE2B 2cb1fa9fcbbcb3aba4d0953129bcd6cd0cb4f5ea6499b29ec4df866a8776603ba5b7156ef3cf85a716d4d3b2330eb76afee3f51da1c56c8a3a9856f7fa846bc2 SHA512 064567d17c5d377af4fe38f5f04b4a3864a23cd49a84925adadfc4462fca44518965fab489d76a00a5d543c00e10a0a51164655111339c5d4d709aa67e280270
+DIST akonadiconsole-20.12.2.tar.xz 198012 BLAKE2B 1cbbb43d7d20d45a5afe112345b1a4a17b1492fd128e885c61925d9ef7a34a3347f3440ab577b6d81309c378ad6ddef9e56d8b2beb51a68ad4c412bed99a8fff SHA512 f4b33bd2b8add0e09beb5443d6360d2bfd226249950233d8dd44e1e408e199e3d3e625e2b6a1e0d4b6c756371c2b1ee5e486394ca4b2bc47e48e476e0711a6e4
--- a/kde-apps/akonadiconsole/akonadiconsole-20.12.2.ebuild
+++ b/kde-apps/akonadiconsole/akonadiconsole-20.12.2.ebuild
@ -6,7 +6,7 @@ EAPI=7
 ECM_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
 PVCUT=$(ver_cut 1-3)
 KFMIN=5.75.0
-QTMIN=5.15.1
+QTMIN=5.15.2
 inherit ecm kde.org

 DESCRIPTION="Application for debugging Akonadi Resources"
--- a/kde-apps/akregator/Manifest
+++ b/kde-apps/akregator/Manifest
@ -1,2 +1,2 @@
 DIST akregator-20.08.3.tar.xz 2204024 BLAKE2B efe9b4acf8140eb018ce0b414f3829da2e4622348a54d43dc6707dd2a140eeec5bddcea1f33a04b8e3a96b312363d041b49d653597ff0985e9a8e2a1a8c89a02 SHA512 6df49879061e7163ab7c433929cfcb1ebbf2f8a974b7df9247c5576dd0e7aae4b8288daad2e65b0f302e0d208ef01de4dff838264b812f5f6d584051e3ca5c11
-DIST akregator-20.12.1.tar.xz 2203476 BLAKE2B 2f35414ec6cd874c129d8c57c7b4ce10d0a7721ebe5e38ffe8ff0ce779d30d06c46ec6de5743ade08ef83c8f3b340857df336cdd34c208c9a673094da3493fdf SHA512 4d9bc6dfefa7972efcf7723c7761d51ca2c705e609c9f41a26337f87546cec0643df1b7f56caac9ddb2981ec3bae0e809d85c3dc925b0e4db8c45648872582ae
+DIST akregator-20.12.2.tar.xz 2205104 BLAKE2B 56a05146aca50a419a659c93bbd9b8c5903e2465f80cd5125a01be14f53a67d1d9da6e7e7b2a97550ec86d28e85431f8f56392475d7c3f371b9c86754246ed17 SHA512 b8fef0b5f4a825d8854373810f173dc0c3d9e95007f6e96647d8b537801910f572d7b8593801137b078cbd754447e70af08c1ff3c2863e733be10dcfbc4c0913
--- a/kde-apps/akregator/akregator-20.12.2.ebuild
+++ b/kde-apps/akregator/akregator-20.12.2.ebuild
@ -7,7 +7,7 @@ ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
 KFMIN=5.75.0
-QTMIN=5.15.1
+QTMIN=5.15.2
 inherit ecm kde.org

 DESCRIPTION="News feed aggregator"
--- a/kde-apps/analitza/Manifest
+++ b/kde-apps/analitza/Manifest
@ -1,2 +1,2 @@
 DIST analitza-20.08.3.tar.xz 338512 BLAKE2B e5d80d4c944e77af8153fa80a0063917485fb884b9fcb3b003d028a72b4cff0dca92d89d1deed306f5b964d50eb8682c7f6a27ae4222ebf5bb24c35989a8903b SHA512 b5a92b5953668308c9ce095017e5c7fd62400223811f63d10e3f24968ed374e1259b8482f1a090dab7f96b624739a6b48e616152a8723668ae33e3d333b2b746
-DIST analitza-20.12.1.tar.xz 338536 BLAKE2B de5d4a16072835b591570c732866f2799e7d64d2eb1ae060a865a2a6c2c6bb6c3faf69118a185ac7ef09fe9fe7c9476ebc777ff1abd682f89a64ec29a87fda33 SHA512 c25797f2d5b4fb2788fba61c442ec64f00bf5266890ebc13c37b3929c43b0e16f7953667681c0af58e0c525861006bb8b918f08d0ec8d40fdf1920f3ffa6bb86
+DIST analitza-20.12.2.tar.xz 341716 BLAKE2B 27371bd9ba738e1f37d15071e7cf402268f862f5878954ed6ae7f4724914cd3fe7eacbdc94d15fdf79e72703f467350eba5c315d8858d0743f938949bf06317f SHA512 d66e4112c184168d600e6f0b98fbda091fb49a8ac3d1858fef447f748b364ef635ff792f31ac5e8c833e40367f7f32432a16b8a1fc44e1e4e0e3a72769b42b29
--- a/kde-apps/analitza/analitza-20.12.2.ebuild
+++ b/kde-apps/analitza/analitza-20.12.2.ebuild
@ -4,7 +4,7 @@
 EAPI=7

 ECM_TEST="forceoptional"
-QTMIN=5.15.1
+QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org

--- a/kde-apps/ark/Manifest
+++ b/kde-apps/ark/Manifest
@ -1,2 +1,2 @@
 DIST ark-20.08.3.tar.xz 2711708 BLAKE2B c486320f113ab3d12b67aec7589e7973a022415da5dbe01754a9e454c74bb59d2b6556c6934aafd7b5c0ee685e2eca7feee276ad3ebb8a0c6f57aea5bc666a0f SHA512 41ab1498b77f9d152f900eba9e784e8ed28127c849796e42c18db5beb963b0c8f2a1ef1c408d37db02fb21577e5d8e08d8561b72b14042e079a5f1baffa01a01
-DIST ark-20.12.1.tar.xz 2716648 BLAKE2B c24c36c9d91d7a06073b8d5d6cdee509551f81f68b92cfcf83ed3330a8615de92b8494f7f7b5968ca85d51c947da54d08e7181cd5c56ab306b9826ebb695cb58 SHA512 1b3c145c03ba29a742f36bd8808addc4484a519c7f2d514fbed43866d07e7b119e3b7c2df68ee14371f83e3d441bb575e5524495f1b8976062d9c0032bdb566a
+DIST ark-20.12.2.tar.xz 2717316 BLAKE2B d7ac5b3a69f8571ac66b51d726ed9d4d89aaa240ac32d4d9202ae25209951414c668d6d8902dd171728ce58e82a1cb3bfa86f4ef24ace566f36c77760daa52e9 SHA512 5992525f6459e007deec1047bb3e7f35cc47c3cb3e831e1af3a93044ce96fbf96f2e2466e411f12ac836243f463e15c0c67173251adee192e85a43b3afd461ba
--- a/kde-apps/ark/ark-20.12.2.ebuild
+++ b/kde-apps/ark/ark-20.12.2.ebuild
@ -6,7 +6,7 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="optional"
 KFMIN=5.75.0
-QTMIN=5.15.1
+QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org optfeature

@ -49,8 +49,6 @@ DEPEND="${RDEPEND}
 	>=dev-qt/qtconcurrent-${QTMIN}:5
 "

-PATCHES=( "${FILESDIR}/${P}-runtime-crash.patch" )
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package zip LibZip)
--- a/kde-apps/ark/files/ark-20.12.1-runtime-crash.patch
+++ b/kde-apps/ark/files/ark-20.12.1-runtime-crash.patch
@ -1,60 +0,0 @@
-From a41e69b30cc07dd758849f8685d322150459e4f1 Mon Sep 17 00:00:00 2001
-From: Elvis Angelaccio <elvis.angelaccio@kde.org>
-Date: Tue, 5 Jan 2021 21:50:34 +0100
-Subject: [PATCH] Fix crash after closing the window while loading a TAR
- archive
-
-A first problem was in LibarchivePlugin::list() not checking
-isInterruptionRequested() after the while loop. It was wrongly calling
-emitCorruptArchive() instead of aborting as requested.
-
-But according to the stacktrace, the actual crash seemed to be caused by
-the for() loop over qAsConst(m_jobs):
-
-    #0  0x00007ffff5f6a023 in QHashData::nextNode(QHashData::Node*) () from /usr/lib/libQt5Core.so.5
-    #1  0x00007fffe1dcb2ec in QHash<KJob*, QHashDummyValue>::const_iterator::operator++ (this=0x7fffffffc4d0) at /usr/include/qt/QtCore/qhash.h:426
-    #2  0x00007fffe1dcadac in QSet<KJob*>::const_iterator::operator++ (this=0x7fffffffc4d0) at /usr/include/qt/QtCore/qset.h:174
-    #3  0x00007fffe1dca17e in JobTracker::~JobTracker (this=0x555555c319c0) at ../part/jobtracker.cpp:41
-
-Porting to QSetIterator fixes the crash.
-
-BUG: 410092
-FIXED-IN: 20.12.2
---
- part/jobtracker.cpp                     | 4 +++-
- plugins/libarchive/libarchiveplugin.cpp | 4 ++++
- 2 files changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/part/jobtracker.cpp b/part/jobtracker.cpp
-index e11e402d..a7a57fef 100644
--- a/part/jobtracker.cpp
-+++ b/part/jobtracker.cpp
-@@ -38,7 +38,9 @@ JobTracker::JobTracker(QWidget *parent)
- 
- JobTracker::~JobTracker()
- {
-    for (KJob *job : qAsConst(m_jobs)) {
-+    QSetIterator<KJob *> it(m_jobs);
-+    while (it.hasNext()) {
-+        auto job = it.next();
-         job->kill();
-     }
- }
-diff --git a/plugins/libarchive/libarchiveplugin.cpp b/plugins/libarchive/libarchiveplugin.cpp
-index d2c0d7e1..8a6af526 100644
--- a/plugins/libarchive/libarchiveplugin.cpp
-+++ b/plugins/libarchive/libarchiveplugin.cpp
-@@ -113,6 +113,10 @@ bool LibarchivePlugin::list()
-         }
-     }
- 
-+    if (QThread::currentThread()->isInterruptionRequested()) {
-+        return false;
-+    }
-+
-     if (result != ARCHIVE_EOF) {
-         qCCritical(ARK) << "Error while reading archive:"
-                         << result
-- 
-GitLab
-
--- a/kde-apps/artikulate/Manifest
+++ b/kde-apps/artikulate/Manifest
@ -1,2 +1,2 @@
 DIST artikulate-20.08.3.tar.xz 1084024 BLAKE2B 021d0d7cc1ac04ecc5861e0b66df79bb9df2ddb4130906f565706b8cb1670daab792f0c5551506e7974116f468f4ce5f57c9d52d879bb337cb7e3fef9d06515f SHA512 6bce1555acdb9762277f9c54ef004f98fe5b08375d27716b0fc623d30906b053d4a025f79af93a3fc373341d37cf20e05b59bf01df6da9f4b1e8b3f43ea3d2f2
-DIST artikulate-20.12.1.tar.xz 1083468 BLAKE2B 0255794df77467dabf4040e93e6536417ef226f23559bc7f3b292a541d8ad2fd02a93bf716403d397d0e79b09743ff6419e42b9de1635826467212a8a1204223 SHA512 4da1834eeb0e2d9f1192ddd74827113fb5365fb7fc419c5bcc777772739e4c2822a7f3aaa5f6f9bfa0567072af1aeac08caf170451de80d4941478a9626d6f75
+DIST artikulate-20.12.2.tar.xz 1085312 BLAKE2B 2bc2c2a9ab7307436f7c2038f4f1eef860e21ef647b0d09757bfa8cc25cc1b28675bb75882cdca9530d2749752f787afb5e42f5ebfedda3a87de2e41e81ca4ac SHA512 c4e5020600f6b94a836c39b6da7a8ca662b5a87c2d2aeb2d4a2094ca3bbf57fbacd327a7e8d8f6a65b8b5ccd27a10979a4df5ab9b2413a0d7c2355a8168e8473
--- a/kde-apps/artikulate/artikulate-20.12.2.ebuild
+++ b/kde-apps/artikulate/artikulate-20.12.2.ebuild
@ -5,7 +5,7 @@ EAPI=7

 ECM_HANDBOOK="optional"
 KFMIN=5.75.0
-QTMIN=5.15.1
+QTMIN=5.15.2
 inherit ecm kde.org

 DESCRIPTION="Language learning application that helps improving pronunciation skills"
@ -14,11 +14,12 @@ HOMEPAGE="https://apps.kde.org/en/artikulate"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
 KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="gstreamer"
+IUSE=""

 DEPEND="
 	>=dev-qt/qtdeclarative-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtmultimedia-${QTMIN}:5
 	>=dev-qt/qtsql-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=dev-qt/qtxml-${QTMIN}:5
@ -31,15 +32,13 @@ DEPEND="
 	>=kde-frameworks/ki18n-${KFMIN}:5
 	>=kde-frameworks/knewstuff-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	gstreamer? ( >=media-libs/qt-gstreamer-1.2.0-r4 )
-	!gstreamer? ( >=dev-qt/qtmultimedia-${QTMIN}:5 )
 "
 RDEPEND="${DEPEND}"

 src_configure() {
 	local mycmakeargs=(
-		-DBUILD_GSTREAMER_PLUGIN=$(usex gstreamer)
-		-DBUILD_QTMULTIMEDIA_PLUGIN=$(usex !gstreamer)
+		-DBUILD_GSTREAMER_PLUGIN=OFF
+		-DBUILD_QTMULTIMEDIA_PLUGIN=ON
 	)

 	ecm_src_configure
--- a/kde-apps/audiocd-kio/Manifest
+++ b/kde-apps/audiocd-kio/Manifest
@ -1,2 +1,2 @@
 DIST audiocd-kio-20.08.3.tar.xz 498660 BLAKE2B 60fc9d06505b7ad03d8cb8eec78d4f3893ca54859d1a18f6ea3ac28060ba74780af64baf3ba6499b16d3fc6388837b111eb6a3cc602c5adf55de0b96eb0a71a4 SHA512 77d03d9aed910329a70dcb6c1825de34caeb5d9d215959c772d98e972e92fafb94a5245df0b14c65f1e5d08f5cf565b9bba00e9637320eca156837890b6dd87b
-DIST audiocd-kio-20.12.1.tar.xz 500504 BLAKE2B d3c4bd3e2b921539988014e6caed2a318ccbd144ca4b34dde575234a09e059db075266f7627f5cd559dc6b658dd916bf05747998d601cdc718249253c67cb131 SHA512 4758bf4782116bcaeaa1edaca7c9f02321d08cdb062d8b477a08d026dc4a888d0cdcd24d2017a7f0cec87140ffdaa849bdbf31568fe7608b2ac4324b69a84ca3
+DIST audiocd-kio-20.12.2.tar.xz 500628 BLAKE2B 62a8ea7357f70d792552d33e22e20d42e8441eebabd17a4d46bc1c0df9845b15c97e43c6b4a7fc4448f99028da1399549ecaf85d823395d2674a99880dab647a SHA512 c2af3d98273e87cf6e21660016c27bf03381c0b230c0c50a2dc74cef39ce7fa561d37dca3e2cd6a848589ee761e8ca98973a02bc726da445c562819535cdcc1a
--- a/kde-apps/audiocd-kio/audiocd-kio-20.12.2.ebuild
+++ b/kde-apps/audiocd-kio/audiocd-kio-20.12.2.ebuild
@ -6,7 +6,7 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 PVCUT=$(ver_cut 1-3)
 KFMIN=5.75.0
-QTMIN=5.15.1
+QTMIN=5.15.2
 inherit ecm kde.org

 DESCRIPTION="kioslave for accessing audio CDs"
--- a/kde-apps/baloo-widgets/Manifest
+++ b/kde-apps/baloo-widgets/Manifest
@ -1,2 +1,2 @@
 DIST baloo-widgets-20.08.3.tar.xz 261756 BLAKE2B 06fe1287ffd63608a50d05eef3a247d4231bb75475bfd3377bddad593551322fbd663c8a8d8e31503eb896e68b1b440185ec493fb3e06618e61e6005361dcdd4 SHA512 3a2d033d86a6b008c1c73f23f3f54b0bf4757f7fb0f8799b9e932d2951434ec49d01a2bbcc18ea25d4f4560baf549ac0cbd383e9f9aca7e24c684459aaa23b26
-DIST baloo-widgets-20.12.1.tar.xz 261700 BLAKE2B 19171d66748ce53e1e487dd2ba1b3253391614a201434b154c10c246e38ec5b84e2d38874bafb2af0ede71fbc1f89f251c4291e9b6564b23016406307888b4ca SHA512 a11584297095a7a2e31e9581d0ce71f278fa0fd80f1018e903d4595e0756e6c726d7ab1f51e5fd3ef4920ce9b33db2d1a9840159702fd4d1e5beb2141ccf4d80
+DIST baloo-widgets-20.12.2.tar.xz 261620 BLAKE2B 5e8a63fe9e8e6c71819f56b5085590c5a8ea849b6e31216a66bca0ae4df64c72875867d69a570f268a04b613c1115f402a5a600d37071008481dadccf04fc03a SHA512 a00488b2b4cfce05def757ba9b96c0c93599279dc58b0c38af4e9ec637a517eee484b4a13235f8f690ce1a4f2fafc3d75fc02ca38787cad01ff60420f3ebdab8
--- a/kde-apps/baloo-widgets/baloo-widgets-20.12.2.ebuild
+++ b/kde-apps/baloo-widgets/baloo-widgets-20.12.2.ebuild
@ -5,7 +5,7 @@ EAPI=7

 ECM_TEST="forceoptional"
 KFMIN=5.75.0
-QTMIN=5.15.1
+QTMIN=5.15.2
 inherit ecm kde.org

 DESCRIPTION="Widget library for baloo"
--- a/kde-apps/blinken/Manifest
+++ b/kde-apps/blinken/Manifest
@ -1,2 +1,2 @@
 DIST blinken-20.08.3.tar.xz 2828668 BLAKE2B f5feebddeaf03a7f45c44515ce2550e4d80daea0e6416ff35f3679598506b193491b7793134c472d9e77eebf40f9068c70b07fefaa84689785b1b08a40eb7003 SHA512 fdba92252b7997d51d13e49918b87644254bd4d61dc9451b8479c7f401206cd0e3594254d3a0cb28887aa2f9ab138332f4ec428fd534fae476f9ef1ed2d0eab6
-DIST blinken-20.12.1.tar.xz 2537956 BLAKE2B da3773b38961d342a8ad8449b68b6f890bfbc44312db396830f32ccbdb107cc191f1a03c7f2a17c53ca4abf6b568d32e13ee70d3e526f0b545efb231939b77a0 SHA512 2aa4d468a4d639ba2fbed9da147af3424f8c7b3aafb6069aea44232b5af8eb3210069d69614baa0290b04947a1575ef53ce224a8f89786d0be77bcdcccf3aca8
+DIST blinken-20.12.2.tar.xz 2537888 BLAKE2B a9380d54855448d7c4494a5c580bcd80b86f35482e4130305c12b779ea002afc9d6955ab68a37f32920d95405f5d4df8a2f5ce675ccfaf24d3a34577435bbd19 SHA512 7abe235193c8791ae1cd4c91038c81610826c593763083e9836ae2481d3557b4711e66b9cc03d1b03913e8759a7b6cb8db29bacb3491587e87d841eaa08f13be
--- a/kde-apps/blinken/blinken-20.12.2.ebuild
+++ b/kde-apps/blinken/blinken-20.12.2.ebuild
@ -5,7 +5,7 @@ EAPI=7

 ECM_HANDBOOK="forceoptional"
 KFMIN=5.75.0
-QTMIN=5.15.1
+QTMIN=5.15.2
 inherit ecm kde.org

 DESCRIPTION="Memory enhancement game based on KDE Frameworks"
--- a/kde-apps/bomber/Manifest
+++ b/kde-apps/bomber/Manifest
@ -1,2 +1,2 @@
 DIST bomber-20.08.3.tar.xz 824992 BLAKE2B 2f611fc9c0b91e538260a56c24d7634568f5dbbc1e71bea54306ac003125adf95e4643fac4e0e454c6617c91ca96957dd2658fec3a69af203e8beaf890d52ff7 SHA512 efc884a08aa1eaeda1c25a7a8b25a86858b4ab69e44a29967317c043960067ce4a02acd3541202d3c8c7f9c9faa130678442ecaeffc9c83c636f50f3f0a2fb41
-DIST bomber-20.12.1.tar.xz 825196 BLAKE2B 3c551bfff216efb825f19b66c7a18978260805071c959dc765a28025766ecbd4cc80ad1b61e2d16c858ccfa7e3bd6b387ca640904cf299a3505842b135012ed7 SHA512 29114e24a09109f6f1578b6b06269d155acd052f66c54b22f98f4e2527acb0e1114b20c47f76d79a48b76c82ebb48e0b8b227f9bbec5b4faf16606dffa9347f3
+DIST bomber-20.12.2.tar.xz 825284 BLAKE2B d5e71a54ce4416d25812502b37e06fd48d1e28c4dfcd71451afc2615a94e07d570a682c7870086d3a2118efade8a92251d36e9df9e2ca2aa1c1c79cc20c1513d SHA512 ef6d539ab0c538b147fdbbfa8df683bf700f12ef2b9cd3d8f9853d8ec534ab14ba7d2267d4a6157ce8ff92fa3aab1d937a830db6146ab544b98e9d9edfc63a91
--- a/kde-apps/bomber/bomber-20.12.2.ebuild
+++ b/kde-apps/bomber/bomber-20.12.2.ebuild
@ -6,7 +6,7 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 PVCUT=$(ver_cut 1-3)
 KFMIN=5.75.0
-QTMIN=5.15.1
+QTMIN=5.15.2
 inherit ecm kde.org

 DESCRIPTION="Single player arcade bombing game"
--- a/kde-apps/bovo/Manifest
+++ b/kde-apps/bovo/Manifest
@ -1,2 +1,2 @@
 DIST bovo-20.08.3.tar.xz 205900 BLAKE2B 65b220d02a36976f6c426caed1b518586affe3cc51948ce0018cbdcd2f667e20d1bc5a993b98b0c3340932c95fdecca03ace98f17fb7d585f6642a9414703f96 SHA512 f8b270add7930b665f7d4ef0eb1332e22016aa349743edc6bb4df3d5301ed4b58b86ede361a591cfcf95dd5cf0b319eea1efc9c961f63b0530a58c2350f30b6b
-DIST bovo-20.12.1.tar.xz 205844 BLAKE2B f86a86d1abb0a4423eff35a83f7df361319dcfed788cce90befb355fd5b70e00364702d5224b64710f9d0479c19e253d451b4baa596a6233c79e7c1807efc8b7 SHA512 6087fa9ca68d2b4332c7e96c97fccf6844727b73af892e1c268352410ec1380207534ad41b7e82c8fcff4658390c6e661aa480c0f642daf2d8b07d8301e027f1
+DIST bovo-20.12.2.tar.xz 205832 BLAKE2B 6eb8ba23bc72cae7e22079aab1a7e83323e093757022c31fd9265cb48b820d8eeb56f653962a8700e77dadf5375d02c27ecd676b9343bacaab9f8b4d47c5f401 SHA512 3b2a153ac15afe6334931ecc8b4f2bf5bd5c690e0446c9fac885b717b578fea9b16e1b0ae178ef28ebe74469224acb1b06c2fe34c965ef87c037306abf10c2e3
--- a/kde-apps/bovo/bovo-20.12.2.ebuild
+++ b/kde-apps/bovo/bovo-20.12.2.ebuild
@ -6,7 +6,7 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 PVCUT=$(ver_cut 1-3)
 KFMIN=5.75.0
-QTMIN=5.15.1
+QTMIN=5.15.2
 inherit ecm kde.org

 DESCRIPTION="Five-in-a-row Board Game"
--- a/kde-apps/calendarjanitor/Manifest
+++ b/kde-apps/calendarjanitor/Manifest
@ -1,2 +1,2 @@
 DIST akonadi-calendar-tools-20.08.3.tar.xz 228576 BLAKE2B 53d3beb42c766f0ac47ea54b5294b61680a6e712ed624489b7df2c182f014ec07fbcb81bd47ab6a2b045515a7d85f7efd1616b9aa672338e84b80258d98298b0 SHA512 d8dc7fbd74cce1081f2398d1d5478e08cd0b7e9c4aed5dc89b3a54b43e0427526c9a47f7304667b796bec2cb53d0f17d4541345f647165f50edfff44c7ee91a3
-DIST akonadi-calendar-tools-20.12.1.tar.xz 224868 BLAKE2B 4c59342679d1089e536d9a99d8eb07824ffbee038c1477050e4d3fc96cc348e13ec6f16f9d76af74f4d31dc06a0d002d51d446b0a65b309bb44f5fd058d8a5e2 SHA512 fc6c940e55fa86f91123a7cb0d2b2bb766b8adc7057d0a35f037bd100cd83efed11b7df7ca0cbc4d3e4e95133d1ce810b931fb0fe41b0e73f0a835a7edadea38
+DIST akonadi-calendar-tools-20.12.2.tar.xz 224864 BLAKE2B 137a0d975242b2e419007ebc9be0eaac55e5f024b708c78fb773158695a0bb0b673657b8634423826eeba03cfdab75ff7e85bcc6ce09e33372a0927490d0b9b8 SHA512 12ed3517ec1a308bbb80691bb1fccf29a2a44c9715436288f51aa5eeffee25c3842d6664c1bfbe7c2ac669806d5ae0f0123bc1dece279953abd95feaafafff81
--- a/kde-apps/calendarjanitor/calendarjanitor-20.12.2.ebuild
+++ b/kde-apps/calendarjanitor/calendarjanitor-20.12.2.ebuild
@ -8,7 +8,7 @@ ECM_TEST="false"
 KDE_ORG_NAME="akonadi-calendar-tools"
 PVCUT=$(ver_cut 1-3)
 KFMIN=5.75.0
-QTMIN=5.15.1
+QTMIN=5.15.2
 inherit ecm kde.org

 DESCRIPTION="Tool to scan calendar data for buggy instances"
--- a/kde-apps/calendarsupport/Manifest
+++ b/kde-apps/calendarsupport/Manifest
@ -1,2 +1,2 @@
 DIST calendarsupport-20.08.3.tar.xz 661708 BLAKE2B cf7ef77afe14db2e5eddd48617f47f3d32c93b6d2697ed35f8dfacb73ca50d39e04ab459f8fb5ba18f48068034828c5d6fdd1af2604ae97586bfa4bac33b3029 SHA512 dc1f1eb8b633f19edf841e9b4d50b78afea9297918a4b3d8bab47352b53caec2737566504c9487fe1e36a01873e6e4bda8e257f997742d244d276992ddcc77f5
-DIST calendarsupport-20.12.1.tar.xz 664960 BLAKE2B 878ce09888099d23c89f7826e027e05a181ad6681f0a86161acbf8bab21c8e871f87874fb4f5c43e850df72fcd4f0186db28c57ec01f2b9c665927d5180b0158 SHA512 28b1322ad0bd30f659161d95fe5abb89435af54d9ba13f7776e5903afebbe4a4ce1800d649804e65a4b97afe4c46121c4fcf7b765ef4a5e707b5776ab11e6b6c
+DIST calendarsupport-20.12.2.tar.xz 665200 BLAKE2B dbaf358e0295c27f663b87f91598a4aae6449f37bd470648f8416c69e654b8db39a37c9429c32ba204232118e7dc67cf3a1ef7927fdc2b84a04812620e0499f8 SHA512 63878598f52634e6dcd4aca527dd3f6278b9d2569b169d2a81a78d31b2cce632b45713da8fd4b97d241aa041fd9805a909b59aa2c090f6b55e685fe60e2f8cde
--- a/kde-apps/calendarsupport/calendarsupport-20.12.2.ebuild
+++ b/kde-apps/calendarsupport/calendarsupport-20.12.2.ebuild
@ -6,7 +6,7 @@ EAPI=7
 ECM_TEST="false"
 KFMIN=5.75.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.1
+QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org

--- a/kde-apps/cantor/Manifest
+++ b/kde-apps/cantor/Manifest
@ -1,2 +1,2 @@
 DIST cantor-20.08.3.tar.xz 9082332 BLAKE2B 7ea84959559e109a28794d1f610e07936de353c08e7732a90c6f8145828df99d6b408006580e367208e135c3d76530bdb02716c873a4adf491912ef07b470350 SHA512 8558bb6b3e6641c1c575a4f5f0b1db7f6d6003ed011432f555ee0954586f0cd3a0d1d897d55114dd29cd9aa58d7e6d7ffb9a2357b1e96c01bbf2b4f3623174dd
-DIST cantor-20.12.1.tar.xz 9125164 BLAKE2B 2474f5ae518b67058732500f3c1dfa391a0cb11d451529fbba53e4f07cbc214109e6f975b8ea126acf3fcabc1c56b32b16a22560bc999beb50fe07553ccdeb38 SHA512 242816c23b3ad239e209722429373a887b32121a8fa6d4b57a5bfb74b8e8a9df32f00682f67cc0ae8d7519cd04b4c0626f81a680387d7877d219a60df4642c17
+DIST cantor-20.12.2.tar.xz 9127216 BLAKE2B 8ebd44d43ddd2322838050412005d25ce2ce242c6cdde7c5eda0bb4ba39251a2c14012ae604b077fae891bdd40e3b3e278b7206bbaac8cd03915dd0bb8e136dc SHA512 1df804baff8b7847c08b7f2f6c6e4b208b230adc61c8164dd5b06be6fb19cc55825e34bdc7fd4ed60134e42e2557439b2a8943025ff47e29a2b274f9d1411ef9
--- a/kde-apps/cantor/cantor-20.12.2.ebuild
+++ b/kde-apps/cantor/cantor-20.12.2.ebuild
@ -10,7 +10,7 @@ LUA_COMPAT=( luajit )
 PYTHON_COMPAT=( python3_{7,8,9} )
 PVCUT=$(ver_cut 1-3)
 KFMIN=5.75.0
-QTMIN=5.15.1
+QTMIN=5.15.2
 inherit ecm kde.org lua-single optfeature python-single-r1

 DESCRIPTION="Interface for doing mathematics and scientific computing"
--- a/kde-apps/cervisia/Manifest
+++ b/kde-apps/cervisia/Manifest
@ -1,2 +1,2 @@
 DIST cervisia-20.08.3.tar.xz 1888324 BLAKE2B 06f4b3c72846f738c439a44b36b4daff3deca517cf37454df3abf4cacbaf48fbafde1ca6dbab77f81450712b198b0c85878df0a7319f211d418f8bce5429c620 SHA512 8479024588c458d60e45319b9e50928861a56bc7c4225dcb119c9b43a65a4e2ab2f639b6da304e2a5fa5767d01b5c4b9dd9d0b3be2399782ec453f8c3ef21a9d
-DIST cervisia-20.12.1.tar.xz 1888232 BLAKE2B 62ec3a92f7fac9f733c8fadcdc479d0e72e80fc516c676ea9115c1d048f6c9e398ac0c3a84cbe796d98d3b31373a52f86b4a6cc108a9c8bda751801474f8d007 SHA512 0ece4b3ced1bc3be7f71d00e574ff8143f6fd46c8b8d22ec22c40648c7c6cc0a0f75ffd9040ea1ec4a92f1a5a4c9957ae608ae3d0ac6e182e74e7a8de255f84a
+DIST cervisia-20.12.2.tar.xz 1888404 BLAKE2B f51d1d16d14e9ddc857ba9f6a14e7da9e33e6133a961192276d16fe9c7ecedf7aace1a8690e65c7cd7cc2f46df69d8d644f80695ec36b1e82fe5b51370d05c95 SHA512 cd81cd1f76c234a8362705d201b355982e2ba0b5d68ab06497a2a258cb868876b2502640019946cb855335a74248ad855a570298d8079ad053832a9cd75184e9
--- a/kde-apps/cervisia/cervisia-20.12.2.ebuild
+++ b/kde-apps/cervisia/cervisia-20.12.2.ebuild
@ -5,7 +5,7 @@ EAPI=7

 ECM_HANDBOOK="forceoptional"
 KFMIN=5.75.0
-QTMIN=5.15.1
+QTMIN=5.15.2
 inherit ecm kde.org

 DESCRIPTION="CVS frontend by KDE"
--- a/kde-apps/dolphin-plugins-dropbox/Manifest
+++ b/kde-apps/dolphin-plugins-dropbox/Manifest
@ -1,2 +1,2 @@
 DIST dolphin-plugins-20.08.3.tar.xz 230272 BLAKE2B 1978ffebe88d95350cac0892c56e127507b6ddd6d5675bca8f420990552e20ff271e6f5742a2bdeff685c82464e70177ac83e5e9368547eb175a3e8133d77624 SHA512 2010be567ef025375caac92e90c0259faea1eb58bdbc55e441e42a10af68b6313391707a7f6b6b10285ba80dcbdee92468fa5088970eb98d4ea8afea145976d9
-DIST dolphin-plugins-20.12.1.tar.xz 238592 BLAKE2B 32b8e7e92e16b65f10255eff940496bd77fd544ba96e63db1a914ab97b3e9049cbec5c3136ddbc9d124c6d01e44b3d897e2e497ddd753c0c00960c17f503f91d SHA512 fbccd9d6e276d37e7874c4dcc31ea209e4e17bcac8feeb2ede386bb3ce8510428eba1e5fe58a1551fe81f61810454f177db61ce8607faa45a03509bafd303aad
+DIST dolphin-plugins-20.12.2.tar.xz 239368 BLAKE2B 638491ab7e97768bfe99e8eea47d34721f9d952ff9a5c236b7ac71862d3912bf10afca67dc5e5e8e8b5f8f3b6c6eafa2e7dadea0e089ca1296078694dd4d069c SHA512 b6d160c7aadddb332ef8d5440ef8171668a24e44eb837918557016272ad5e2e51456fcb2e155c93507737e341596c89621bdd0a35ac1d5f81e79afcfa89cd3ff
--- a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-20.12.2.ebuild
+++ b/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-20.12.2.ebuild
@ -8,7 +8,7 @@ KDE_ORG_NAME="dolphin-plugins"
 MY_PLUGIN_NAME="dropbox"
 PVCUT=$(ver_cut 1-3)
 KFMIN=5.75.0
-QTMIN=5.15.1
+QTMIN=5.15.2
 inherit ecm kde.org

 DESCRIPTION="Dolphin plugin for Dropbox service integration"
@ -31,7 +31,6 @@ DEPEND="
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 "
 RDEPEND="${DEPEND}
-	!kde-apps/dolphin-plugins:5
 	net-misc/dropbox-cli
 "

--- a/kde-apps/dolphin-plugins-git/Manifest
+++ b/kde-apps/dolphin-plugins-git/Manifest
@ -1,2 +1,2 @@
 DIST dolphin-plugins-20.08.3.tar.xz 230272 BLAKE2B 1978ffebe88d95350cac0892c56e127507b6ddd6d5675bca8f420990552e20ff271e6f5742a2bdeff685c82464e70177ac83e5e9368547eb175a3e8133d77624 SHA512 2010be567ef025375caac92e90c0259faea1eb58bdbc55e441e42a10af68b6313391707a7f6b6b10285ba80dcbdee92468fa5088970eb98d4ea8afea145976d9
-DIST dolphin-plugins-20.12.1.tar.xz 238592 BLAKE2B 32b8e7e92e16b65f10255eff940496bd77fd544ba96e63db1a914ab97b3e9049cbec5c3136ddbc9d124c6d01e44b3d897e2e497ddd753c0c00960c17f503f91d SHA512 fbccd9d6e276d37e7874c4dcc31ea209e4e17bcac8feeb2ede386bb3ce8510428eba1e5fe58a1551fe81f61810454f177db61ce8607faa45a03509bafd303aad
+DIST dolphin-plugins-20.12.2.tar.xz 239368 BLAKE2B 638491ab7e97768bfe99e8eea47d34721f9d952ff9a5c236b7ac71862d3912bf10afca67dc5e5e8e8b5f8f3b6c6eafa2e7dadea0e089ca1296078694dd4d069c SHA512 b6d160c7aadddb332ef8d5440ef8171668a24e44eb837918557016272ad5e2e51456fcb2e155c93507737e341596c89621bdd0a35ac1d5f81e79afcfa89cd3ff
--- a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-20.12.2.ebuild
+++ b/kde-apps/dolphin-plugins-git/dolphin-plugins-git-20.12.2.ebuild
@ -8,7 +8,7 @@ KDE_ORG_NAME="dolphin-plugins"
 MY_PLUGIN_NAME="git"
 PVCUT=$(ver_cut 1-3)
 KFMIN=5.75.0
-QTMIN=5.15.1
+QTMIN=5.15.2
 inherit ecm kde.org

 DESCRIPTION="Dolphin plugin for Git integration"
@ -31,7 +31,6 @@ DEPEND="
 	>=kde-frameworks/ktextwidgets-${KFMIN}:5
 "
 RDEPEND="${DEPEND}
-	!kde-apps/dolphin-plugins:5
 	dev-vcs/git
 "

--- a/kde-apps/dolphin-plugins-mercurial/Manifest
+++ b/kde-apps/dolphin-plugins-mercurial/Manifest
@ -1,2 +1,2 @@
 DIST dolphin-plugins-20.08.3.tar.xz 230272 BLAKE2B 1978ffebe88d95350cac0892c56e127507b6ddd6d5675bca8f420990552e20ff271e6f5742a2bdeff685c82464e70177ac83e5e9368547eb175a3e8133d77624 SHA512 2010be567ef025375caac92e90c0259faea1eb58bdbc55e441e42a10af68b6313391707a7f6b6b10285ba80dcbdee92468fa5088970eb98d4ea8afea145976d9
-DIST dolphin-plugins-20.12.1.tar.xz 238592 BLAKE2B 32b8e7e92e16b65f10255eff940496bd77fd544ba96e63db1a914ab97b3e9049cbec5c3136ddbc9d124c6d01e44b3d897e2e497ddd753c0c00960c17f503f91d SHA512 fbccd9d6e276d37e7874c4dcc31ea209e4e17bcac8feeb2ede386bb3ce8510428eba1e5fe58a1551fe81f61810454f177db61ce8607faa45a03509bafd303aad
+DIST dolphin-plugins-20.12.2.tar.xz 239368 BLAKE2B 638491ab7e97768bfe99e8eea47d34721f9d952ff9a5c236b7ac71862d3912bf10afca67dc5e5e8e8b5f8f3b6c6eafa2e7dadea0e089ca1296078694dd4d069c SHA512 b6d160c7aadddb332ef8d5440ef8171668a24e44eb837918557016272ad5e2e51456fcb2e155c93507737e341596c89621bdd0a35ac1d5f81e79afcfa89cd3ff
--- a/Show More
+++ b/Show More