gentoo resync : 31.05.2021

48 files changed, 100 insertions, 847 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 07d3f20ecf78..0913ce83fa59 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/banner/Manifest b/app-misc/banner/Manifest
index e94a5107eb35..8fbade920d60 100644
--- a/app-misc/banner/Manifest
+++ b/app-misc/banner/Manifest
@@ -1,4 +1,4 @@
 AUX banner-1.3.3-ctype.h.patch 158 BLAKE2B efdf872b1d26d0bba8e3886b406e1642968aa4207c5d136a8558da37f5fd51113a5884a900584f13c98200471aea2e7ecaf61e97efbb63d244c31ecc1fa0e8ed SHA512 84fa0555f3fd6c41c3cdf06db92711e9be4c08e32b182ffdcd1385cccdf0d9056a7e3c61431e4a73d660b3314f763ad7e109f0b84105bd555e0c5d60a63746d8
 DIST BANNER_V1.3.5.tar.gz 135190 BLAKE2B 4accf00ad92f0351a1df49d3cb6451a71ee7f929fc6f2b25aee7fc6898780944b71cecf8070dc186888a9fb7580213ef2111a5086fc396f3c7e242e678cf8270 SHA512 6f2d79f1d76533fac920aa2984258e3f5278c40692d2b2dcae560734dcd5b06fcc8c99f266abdc91fb272eb291906bcea747f5ee53a67a4a5cb99179941897c3
-EBUILD banner-1.3.5.ebuild 515 BLAKE2B 60f2333c6ae267bad869c381ee13dbb5d6bafd64b35666c36b26ade7cb963d62af0f7427f074344e8d43b9f660c90bb2839876db6d6ea8ffd04cc6ec2835dd34 SHA512 67f9530e6f00a41e3c2b6242d96759fa538f0617bbaeb7a67e30c2e3ad97fda52f882259a3cc34af0e3210ff06ec20850bbd0ed7814c81ebc5279fcbdb368a6b
+EBUILD banner-1.3.5-r1.ebuild 519 BLAKE2B 4fb0c326dc09c1192702d1a24e5e61ee38c2aa4efe16aed5a02fce2f8a79aa51313baa284f20d423d7fc256ea78a843e19918532ee54318c674ef839aef199d0 SHA512 694228fd1d732fed4b1b47d2ad4a88d4d79cfda6c1ec4ba9f6ba39a20497d415381a0049f670e8e82d9f5a863e0b704c05fe059a344f055b96131202a9f7398f
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/app-misc/banner/banner-1.3.5.ebuild b/app-misc/banner/banner-1.3.5-r1.ebuild
index b3e96bed5c2c..73f22e99565e 100644
--- a/app-misc/banner/banner-1.3.5.ebuild
+++ b/app-misc/banner/banner-1.3.5-r1.ebuild
@@ -13,7 +13,7 @@ KEYWORDS="~alpha amd64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 S="${WORKDIR}/${PN}-${PN^^}_V${PV}"
 
-RDEPEND="!games-misc/bsd-games"
+RDEPEND="!<=games-misc/bsd-games-3"
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.3.3-ctype.h.patch
 )
diff --git a/app-misc/beanstalkd/Manifest b/app-misc/beanstalkd/Manifest
index 0a401dfc33a9..a23982881954 100644
--- a/app-misc/beanstalkd/Manifest
+++ b/app-misc/beanstalkd/Manifest
@@ -6,4 +6,4 @@ DIST beanstalkd-1.10.tar.gz 66243 BLAKE2B ff9c37b82073435523e0bc98169026ba9c1f8e
 DIST beanstalkd-1.11.tar.gz 73386 BLAKE2B 345873711b4d40c17044dddfec02a03a95cb42b274fa2a3459227aba585678c1b3e192947c4c82e9b6688050e1add5623c38ed75040a1135d523c888706d519e SHA512 322e6400c36fb3d7b06b7feb3e7dde5e64137382fb81ca1f11e3b9f72b4246ba719d139a571efcde9fe1738ba0e9e05a6ce3ac2d49a9628f6d455c81ec2a033e
 EBUILD beanstalkd-1.10.ebuild 1031 BLAKE2B 4f2acac9f9b39efab62fcfb505954c077215dfdb7ef1c26371c3e8129bda91ebf55507dc9e2edfad0ecb9077f93a5a4193a5b89252b07465be66ebbf8ad7e0a7 SHA512 121e35a3c4423c7323dbae112e4609a3b16b1c82b0f380f54133275fcef27dc74085949d55176ecb8ec49ee6a1684af12f821a1b7df590296f8a1c22d9adcf4f
 EBUILD beanstalkd-1.11.ebuild 967 BLAKE2B de995db0b67689a1bcfe0fe26782c1816516f0681bc03cd617db80966e7a7def2b90e3deac21d8289b753fc298a13b97cda23b70a0ad42e89f9680025a834527 SHA512 363223dc266de41d6ea04b6f8b67f480fee20e3cf55658c1182e3211b89d98e250c8c75570aefcf87f615961c4ed779a036184ec14a14fe25c5d67683a1298df
-MISC metadata.xml 335 BLAKE2B 4e07d8ed52588274c004754f8d1e379057a081091f2d4d7fdb21c8b0cd07a6f0b8ca2ecf447686051a60a969179bd5401c9117c50d5317c5667296678ce6f1f3 SHA512 ef75a50ccb4db0c6c8423aa8527e25b23bfbe88db0d1c2461c0921bdd859b2dc823227642d91e420e81c26fd08729ae51b38ca8b6b3ccddfa90e7ca75fe7c7f1
+MISC metadata.xml 250 BLAKE2B 7caaab71f81fdc8dea5bcf2e8d1896f61d0d0ca7ad0f837c6e09ec5f788ea4663d2c179f8e25bd2dc2c6e298b5ef34b1c066ffd8d4d99f191fab1de7965948e5 SHA512 2d931d2f89bc23783adbf91ac5be611b0b9bc00f16d36b0d1bbcb19cd2ad77ba6b4d3b2a6a9af7afd33027a1f850384a22cc48f148ea0620bb956d39c46247de
diff --git a/app-misc/beanstalkd/metadata.xml b/app-misc/beanstalkd/metadata.xml
index 7e81f273fbd7..7040d5c9d150 100644
--- a/app-misc/beanstalkd/metadata.xml
+++ b/app-misc/beanstalkd/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>patrick@gentoo.org</email>
-    <name>Patrick Lauer</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="github">kr/beanstalkd</remote-id>
   </upstream>
diff --git a/app-misc/bijiben/Manifest b/app-misc/bijiben/Manifest
index 54602d323945..f25487583ca8 100644
--- a/app-misc/bijiben/Manifest
+++ b/app-misc/bijiben/Manifest
@@ -1,7 +1,3 @@
-DIST bijiben-3.36.3.tar.xz 528772 BLAKE2B 2445f0b3b40aa9c556635d25e85b31f620a83a4be4ed4c6d3091d3f3c5f19d5b8fc13769ed56bea6a731184b9dfdd2f604a3f29ad8dbde9c019a1f58f4c41447 SHA512 dba2d9da6ae62dd10a75662b9b04475e0ba64f50065d1dab8da8601b6a4dc44cb4f2b6129dec1f4a415844bee80ff534704e703118838a993a4ffe3ebbe2d254
-DIST bijiben-40.0.tar.xz 642760 BLAKE2B 9c0f9f1d103e9775ce1369b16844828c11c2c43ba9808a5978d7090fe131d9dd54a25cd4fd06cb565b2d7936c6298a87f4a774cc5c30aa0cd6a86ae012b45043 SHA512 3fef381014109fe716d05b4b150f80778196c29af588e3a476b663aac5b113659f8ddfed82417811292bf9039a3d0982591503f72550130179ed1a7fef39edcd
 DIST bijiben-40.1.tar.xz 687344 BLAKE2B 187e6d0af40649ef35453af4ce51f286196bfd0570370136611cd2191e6c0c6b578e95eb4b6edf448bac6ae7b93b729afef161d3cd4d2cbd9c40f873ed5004c3 SHA512 5d2e0694f9eddca9a152eac5c208b51a15d2a5651ab77c79c1bb94425c0f1541c916887c3aab5fb8b105ca50d0f14c432ac18cd8ac64d03e2a0ee46c91901f10
-EBUILD bijiben-3.36.3.ebuild 1055 BLAKE2B 71f215d69edb0bc91637bd0361ac38d4c80900d9a04015a3df6354573cde3e368afd74e4b6b26cd704773267be6321b2068f4cb870deeb92c5512d1df396d83c SHA512 71f6b947acb39badc539d3f20b21a87ed20c7502b1a937de5a714836c9bd3782239d082d7f51dc3acad5bd128d8d828958fb2559222cf956f08181e15dd9205b
-EBUILD bijiben-40.0.ebuild 1106 BLAKE2B f2138107d53d7501984492309c87da72ccc7e318d3e7ce3b145316a4bfffa11ef4ab6ea057c9d5ba23117415f047ce647d352d96c2fbf63a781044ccf4adf4f7 SHA512 f525c1cdf291885dd5234a517811846f2108cc557aca493e72899559a0d0c1e96e155a1c6bf2fba2bf0963cd618fbd934f81bbc6b0b5d3a6467073bf17267429
-EBUILD bijiben-40.1.ebuild 1106 BLAKE2B f2138107d53d7501984492309c87da72ccc7e318d3e7ce3b145316a4bfffa11ef4ab6ea057c9d5ba23117415f047ce647d352d96c2fbf63a781044ccf4adf4f7 SHA512 f525c1cdf291885dd5234a517811846f2108cc557aca493e72899559a0d0c1e96e155a1c6bf2fba2bf0963cd618fbd934f81bbc6b0b5d3a6467073bf17267429
+EBUILD bijiben-40.1.ebuild 1104 BLAKE2B 63667725e00dfb8d9b2abc5398ee6d68baed6ab2bf6c70a050a1f947d37236beedffa5d664030b3c8291dcf99e0941008f5d7f9fc497281ce1b4e65ec099f488 SHA512 1202efa06d90c99f2fd48901bac9b1319ca1f80e9cb2f64088e2765e3d1a7b9a9683145d8fbc9f7870b4bfbe146e99347ea85bf3bb7122f7546ea0aa6a622d7c
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-misc/bijiben/bijiben-3.36.3.ebuild b/app-misc/bijiben/bijiben-3.36.3.ebuild
deleted file mode 100644
index 69d27cdd3d89..000000000000
--- a/app-misc/bijiben/bijiben-3.36.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="Note editor designed to remain simple to use"
-HOMEPAGE="https://wiki.gnome.org/Apps/Notes"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	app-misc/tracker:0/2.0
-	>=dev-libs/glib-2.53.4:2
-	net-libs/gnome-online-accounts:=
-	>=x11-libs/gtk+-3.19.3:3
-	>=gnome-extra/evolution-data-server-3.33.2:=
-	>=gui-libs/libhandy-0.0.10:0.0=
-	dev-libs/libxml2:2
-	sys-apps/util-linux
-	>=net-libs/webkit-gtk-2.10:4
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		-Dzeitgeist=false
-		-Dupdate_mimedb=false
-		-Dprivate_store=false # private store is mainly meant for flatpak builds
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-misc/bijiben/bijiben-40.0.ebuild b/app-misc/bijiben/bijiben-40.0.ebuild
deleted file mode 100644
index 6748c33e46a8..000000000000
--- a/app-misc/bijiben/bijiben-40.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-inherit gnome.org gnome2-utils meson python-any-r1 xdg
-
-DESCRIPTION="Note editor designed to remain simple to use"
-HOMEPAGE="https://wiki.gnome.org/Apps/Notes"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	app-misc/tracker:3=
-	>=dev-libs/glib-2.53.4:2
-	net-libs/gnome-online-accounts:=
-	>=x11-libs/gtk+-3.19.3:3
-	dev-libs/json-glib
-	>=gnome-extra/evolution-data-server-3.33.2:=
-	>=gui-libs/libhandy-1.0.0:1=
-	dev-libs/libxml2:2
-	sys-apps/util-linux
-	>=net-libs/webkit-gtk-2.26:4
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/appstream-glib
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		-Dupdate_mimedb=false
-		-Dprivate_store=false # private store is mainly meant for flatpak builds
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-misc/bijiben/bijiben-40.1.ebuild b/app-misc/bijiben/bijiben-40.1.ebuild
index 6748c33e46a8..aead6f71ccd5 100644
--- a/app-misc/bijiben/bijiben-40.1.ebuild
+++ b/app-misc/bijiben/bijiben-40.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Notes"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="
 	app-misc/tracker:3=
diff --git a/app-misc/blink1/Manifest b/app-misc/blink1/Manifest
index 6e300a49285b..5ea4870e4aec 100644
--- a/app-misc/blink1/Manifest
+++ b/app-misc/blink1/Manifest
@@ -1,3 +1,3 @@
 DIST blink1-1.98.tar.gz 29439933 BLAKE2B 5c775819c9401c04e1c9adeb3dcb1f524ed30b6493380368b063a6ef94af75ab30e8b7f43e1b195f17578a1625bc6118bd65c7402376560ab5ee00e80f0c5c04 SHA512 2057e3ccf149dbdaaea2d09dabaa95317125d65151dc79c675365f55e85a3d0988232fd5ff404bdcfd127ebc266495afa04fb1b3fd0e4ac931bb711b0bb63568
-EBUILD blink1-1.98.ebuild 2414 BLAKE2B db04108f1cef9fa3d1ef184bfa3e2c373a2a87f613ae5f2053f7ceaf029126013ef3d1f7c9cf126238f99d2ad57c1fb48794808f04cbfb698c0f1d593f2cbcca SHA512 0f7e756b91caaa36c33cce0c844678033c58efdb3f0b455dbb627b4ca355d5533bace1300b1895619e89de91f497a28f6bbd132bd77ee378f0b856bc4ae41806
+EBUILD blink1-1.98-r2.ebuild 2399 BLAKE2B e21101114f58e5013a8a024222ab424a0c83ca00220fe883ccb627007f3c7e26635ab1bb0e9c2f523a11ee3b7a946f0680c44ac9d1f6705663c97b7563be9f36 SHA512 9d29ad91b495027dcfb1a0730dd565fadc123749e3ab02f15c65e5d8415644fc489f4973ba9f69674b77169cb1d7644f7b8356282eba95ad706a80c64e755ebc
 MISC metadata.xml 578 BLAKE2B a095e5225c14fcb172a96bcfe1618693476739683425c9a7bff99beb075378d97a71dfcc6bd87a9ade7bba9df3fd2b1e8ab5ec5abc25f727928dd46688818645 SHA512 1051d39be9398b9bd430e99493c31cd73d2975797cd7fffc2a380ab48c11e7c6c4e3b0f32eb18372a52de691d471e9866031aeff99317bdcc8d27514b8d05c7e
diff --git a/app-misc/blink1/blink1-1.98.ebuild b/app-misc/blink1/blink1-1.98-r2.ebuild
index 4e4ac4135a5e..491a0fb73ed2 100644
--- a/app-misc/blink1/blink1-1.98.ebuild
+++ b/app-misc/blink1/blink1-1.98-r2.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=6
@@ -60,11 +60,13 @@ src_compile() {
 		emake OS=linux USBLIB_TYPE=HIDAPI blink1-tool
 		popd &>/dev/null
 	fi
+
 	if use mini-tool; then
 		pushd commandline/blink1-mini-tool &>/dev/null
 		emake OS=linux blink1-mini-tool
 		popd &>/dev/null
 	fi
+
 	if use server; then
 		pushd commandline &>/dev/null
 		emake OS=linux blink1-tiny-server
@@ -76,23 +78,29 @@ src_install() {
 	if use doc; then
 		dodoc docs/README.md
 	fi
+
+	if use server; then
+		if use doc; then
+			dodoc docs/{app-url-api.md,app-url-api-examples.md}
+		fi
+
+		dobin commandline/blink1-tiny-server
+	fi
+
 	if use tool; then
 		if use doc; then
 			dodoc docs/{blink1-tool.md,blink1-tool-tips.md,blink1-hid-commands.md,blink1-mk2-tricks.md}
 		fi
+
 		if use examples; then
-			docinto /usr/share/doc/"${PF}"/examples
+			docinto examples
 			dodoc commandline/scripts/{README.md,blink1-*.sh}
 		fi
+
 		dobin commandline/blink1-tool
 	fi
+
 	if use mini-tool; then
 		dobin commandline/blink1-mini-tool/blink1-mini-tool
 	fi
-	if use server; then
-		if use doc; then
-			dodoc docs/{app-url-api.md,app-url-api-examples.md}
-		fi
-		dobin commandline/blink1-tiny-server
-	fi
 }
diff --git a/app-misc/ca-certificates/Manifest b/app-misc/ca-certificates/Manifest
index 50ad53406873..5e92ef881520 100644
--- a/app-misc/ca-certificates/Manifest
+++ b/app-misc/ca-certificates/Manifest
@@ -1,6 +1,6 @@
 AUX ca-certificates-20150426-root.patch 1336 BLAKE2B f52a2ab1f84a18e447b37905f2d4fc6a8b59b9931db387e9045167973a0bb98ee11164ccbc13c7ea7fb545fab45a8112df5806a5a13d2b77abf682eec1390a15 SHA512 4e68e6068921e9ed54bda68af422a491cb530b60ffbb85fe1986a403cd9023522c179b5afcf65e22c223a665163d1c2d1993322d652053b72e3fe07efe692d59
 DIST ca-certificates_20210119.tar.xz 232964 BLAKE2B 593352912d2b490e3f46ea032ac1ddf1c87a7ac93859d475461cbba490918cdec853b0bb30bb253a634d8d597ca6f0304bc81122b4b31b5b31fd6a80e1faaf33 SHA512 a824209fa0ff0865872a07d8e6b901d8407f599243810fd5c820e1f69226e05b0b4f1e25e5ff3d8d398ff952529084442f026e32220961f359f6323f6bf03373
-DIST nss-3.64.tar.gz 82173054 BLAKE2B 4786a1ff6f4e47dbb6bfef6a2bc47ffeac51aa37f12168872d23799b8d6ca440578acf512e9ec7563ef64331d3fd84c387f17e41afa2ee30d8623c6f66207631 SHA512 0a85e1f64f97670f70596d8a479693939ca454025a4b3bbd557a54ed683ffed625c670fef6a6e3440365af9aa472384f84464942381b1c093659f6a6a222ba04
-DIST nss-cacert-class1-class3-r1.patch 22503 BLAKE2B d2ba6b5c3675484dab5b6709478101a9dadc0baded3dbf891dcd04e5eb912079b87cdd17f893a0f539a2a53fb05357c6dd309fb624facac3b021c82c7424a91f SHA512 68906d2442986ad13ebf9cd97c26fac34af3efd5cfaacb3d7824adad966349ad796c9cec8dec44c46d5c571df88ce83aea02ce82e71da337aa4e1aeef58eda66
-EBUILD ca-certificates-20210119.3.64.ebuild 5728 BLAKE2B 323aaef8860d5274ed1f0bdeee8908b6a33459bea6104a3ae9e184b680354f10825fab8c5caa285ca4546fe58f66f9e9f52f8ce7272a649ef80633855d65097f SHA512 c2799ca417533ef987df370055d920555cb7fde7c57a540cb05b7314f951803b0782ab01cd9015493301489ab54818b10d0aef0070a44ab244f07b10892ef760
-MISC metadata.xml 436 BLAKE2B f37fed732b387ea5e778bb88c349c78127b0db613def815d75e5cc2b7a7dbd049131eef33617fe3139975bd0c6bb187cf20e98c27e3ee10c3928b394fe6f02ac SHA512 dade84534ac0e574b3d127a1dc367b2f206874500057662d6139a00dc30506e1d977e3020b8e983750a8ef243bcfb34e152391d12027d88f8c116d151090ed9b
+DIST nss-3.66.tar.gz 82401896 BLAKE2B ae369899af681e1c6ea8046098c83da08c2112b16d85a0eaee46e9d4f97dfb3f7c3e97eb681ec947b5648446c6db51e8f1396ec9bb6c731c9678ecf925e7f743 SHA512 327129cb065a8c19246e081e3cbc4798c81dc52eab6ee366eade151e9d308990592075c52a7c672165725fd855a0c539d56a803c26ef066561c584d693e0e467
+DIST nss-cacert-class1-class3-r2.patch 21925 BLAKE2B 7627ff9a09f084c19d72d0490676865e3cab3ca7c920ae1ce4bea2db664f37fd0aa84fcda919809a516891ab2a62e2e7a43a9d6ada4c231adfe4c216525fac7d SHA512 1ce6ff9ab310aaca9005eafb461338b291df8523cc7044e096cd75774ce746c26eed19ec6bb2643c6c67f94650f2f309463492d80a90568f38ce2557f8ada2f4
+EBUILD ca-certificates-20210119.3.66.ebuild 5729 BLAKE2B 621fa9f502341120c79456c777adc53bc5f745e30c5f0262f9939115d0aa689e050c1fa0804c60f576e6a6e4d551eed66ae1688fb1221f3df0457a5d1fc12c66 SHA512 ebc95de3a0c5d64927d6aea7399ed7d7d314ff275de0e8ffe3c62a26b86518104cdba475ca99b01de0967a0dcc807bd8e1b5fc7528f77d890a7f7d46b30f2855
+MISC metadata.xml 372 BLAKE2B 115409fbb8814f06c4ddcb846a60f140a3f436ac15f91afef65d47a65c788cc3a892258bf6391951c09154f6159d60e87494bf6b52400ad5b2e999cdaa9f9023 SHA512 4b46c8692a486245ac6d6bf7b010ac758f133c05a470b4ef7261a67b42b4b4712938d02b266bde957ead6c9169e2509f8649531851b545442fb36b5c1159469d
diff --git a/app-misc/ca-certificates/ca-certificates-20210119.3.64.ebuild b/app-misc/ca-certificates/ca-certificates-20210119.3.66.ebuild
index 267df1da9ccf..08fedcfa8fe7 100644
--- a/app-misc/ca-certificates/ca-certificates-20210119.3.64.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20210119.3.66.ebuild
@@ -18,7 +18,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit python-any-r1
 
@@ -44,7 +44,7 @@ else
 	SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${DEB_VER}${NMU_PR:++nmu}${NMU_PR}.tar.xz
 		https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/nss-${NSS_VER}.tar.gz
 		cacert? (
-			https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r1.patch
+			https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r2.patch
 		)"
 fi
 
@@ -109,7 +109,7 @@ src_prepare() {
 
 		if use cacert ; then
 			pushd "${S}"/nss-${NSS_VER} >/dev/null || die
-			eapply "${DISTDIR}"/nss-cacert-class1-class3-r1.patch
+			eapply "${DISTDIR}"/nss-cacert-class1-class3-r2.patch
 			popd >/dev/null || die
 		fi
 	fi
diff --git a/app-misc/ca-certificates/metadata.xml b/app-misc/ca-certificates/metadata.xml
index f4cf8a2a0180..1a112563d717 100644
--- a/app-misc/ca-certificates/metadata.xml
+++ b/app-misc/ca-certificates/metadata.xml
@@ -7,8 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="cacert">
-			Include root certificates from CAcert (http://www.cacert.org/) and Software
-			in the Public Interest (http://www.spi-inc.org/)
+			Include root/class3 certs from CAcert (https://www.cacert.org/)
 		</flag>
 	</use>
 </pkgmetadata>
diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index 768a3226a9de..0bfb34ff86c9 100644
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -9,13 +9,10 @@ AUX elasticsearch.service.conf 235 BLAKE2B 23ada111be21dff12323edbe981883cb1ed27
 AUX elasticsearch.sysctl.d 24 BLAKE2B 4012fbdbc98a8b28df11aed33cb82c113790c44721eae1d69e19c595bfbf329618b9cb67be9528f1994c546233cffd31b20eee39edc142bc86f7a7cf5e08903e SHA512 9f3d8238edff6704bea06b6535ee8915f4a3c9bdc8389d9d4943bcfa49161b61f9a1ca49dbcc415580438f4396fbc3d58eef301554f9426287606a755ada715c
 AUX elasticsearch.tmpfiles.d 56 BLAKE2B 0c28c612fadfdd86321df797527399fa5073a7350de95ec2b32dfbe51cbf52fe5dcf68ebd4e3fba6cccba1cf252a16dee3b701c4c6692121745c41665cf3c972 SHA512 5cc722abcaae68afffde96e38b2c9572faf898178d3c291c945fe49fbf977e319322b99fb6fb5bf49cfb04e86f071dde0db621849288f712a56571b13af9a11a
 DIST elasticsearch-6.8.15.tar.gz 149102328 BLAKE2B 0ce9ba565d751cd27721f3d49dd24761937c3476cee4896ba1a4d84e4fc238296129481f18cad64270fe8af71a043c2e8e583df14f2a084850fb10c93fcea0ef SHA512 c62c4d9d1bb83e10d3e1079f56b834f2f89b1f712c29d9ce7e81786199c71d287ecbf6df158eca56a7af711eafe13dfb276e12b34e1a0a6cf6719e1fbb44a142
-DIST elasticsearch-7.10.2-no-jdk-linux-x86_64.tar.gz 164380146 BLAKE2B 16797ed48c4cb6f91ed891014f275ad86a4852579232df1827413389fc9e505327412729f70783750252190a34b0e0d552ec0b5f25f3d0a811724191eccc6568 SHA512 bd3def00af04670ad04556c911ef8c68b639e1c3b621f36a8973d9700f95873d10bc706a4e3a98f892ac59c1b761d56035a236068d6958af772874e428940dc4
 DIST elasticsearch-7.12.0-no-jdk-linux-x86_64.tar.gz 173069694 BLAKE2B 5de74b1e6de743246cf48e32254f9646fa25c2820d0be9df886fdefe131a302ddb8906546147f0d284e2fc0faf8cc0238bf854fe1611d28bf1e7cb1518bd4e31 SHA512 205aa2a2fa2ab7eb7b54087420e0123aa97e5456e2e1f31cad9ea7b84be3f9823a2a7c47d4cf1697833e5f795359477d3a3b0ea4955a8f92583cf2228071827e
 DIST elasticsearch-7.12.1-no-jdk-linux-x86_64.tar.gz 173079845 BLAKE2B 98214508c2c1dcb631f59d9e51d5949f9a7c5d1f68ff78c8d93af04c6a21fa1e1c6e2051f04bbdb8154443d6295ad54af2016695fcb9193b7595e1486777ba98 SHA512 c91fd66668977280d7339caf6b4fef9fce5640492f0e2a65bc537c6da8397c801a3727f1ff56b7a1591b11ea47195720c588a4eba473043f829a87cd3dcc0af4
 DIST elasticsearch-oss-6.8.15.tar.gz 68240776 BLAKE2B 431d845e02f2118a98021af4422ece34274b6d0811a32c5a3e679da3f8f56ca9cd45949307268811edbb83327a4a80fb84866cbbaaf01f7d3af042412b1e1bfa SHA512 7e6a819339ac6043af218f9d97d5d68c50ac46900e4293e7fa18992f7a50b10b0ab2434e26ff0dc1546204ae7526de8ac6ef6545fc0db9c862ceeaa0d96c56f5
-DIST elasticsearch-oss-7.10.2-no-jdk-linux-x86_64.tar.gz 76383466 BLAKE2B e99c04b0d10ef5755986515c7127ebde00b58e0eba69b6a05e12bd0bffee70266bbb023680584bfe0f321d5a3cf79af89cce3a5191923ad721a9f6039ab82743 SHA512 7b63237996569ccdc7c9d9e7cc097fcb23865396eddac30e5f02543484220d2fc70a7285b430877e5e76a5d8716d9682de9fc40d5e57a08f331e82011fc59756
 EBUILD elasticsearch-6.8.15.ebuild 2539 BLAKE2B de446b12484037a7952b5b21537189b1ee7157d87a779109e025648fe8cfe3c82f3c8d59dc823350faddc5ec0c6b01e7461739da052226134353ae9c3e388cea SHA512 ee3431551b5a0c2896172e00f42b96da8c400526fd907ba6c4e6e0b352a224fa85589c5b17924d42915490b0449b207652c6442b6fcd51a37d080f82b944069f
-EBUILD elasticsearch-7.10.2.ebuild 2465 BLAKE2B 8f830c799809cd2d12d47398d0ebc5a457d37a1b379af832f98a87b22f59e374147ddeb5cfbcbc3350c71d59006bb1c33f6dcfb4d58580440d555bf3ca5288f9 SHA512 03c22a13310360daacd75a2894bd0f1d241b8f0c26ecf1f6256cdb20e060d6046e9a92fbf7e2be1aad22c7e477b1e47cf2d5652e7909b294111c339d49f7d3cc
 EBUILD elasticsearch-7.12.0.ebuild 2454 BLAKE2B e41faa9592270795a3778d345db25c8029f8872644fe456dde749df19ddb6bd9fad3bc746e1b08ee94238ec437521d28cbef7c113d6ac85218bd1c4bdd03104b SHA512 c361cc56c306005896562c34f53fadf0ac586df353f9db925ff2e9abf07e7534bf8d3b33f5c04998ca06835d265bf58f1562f8a9e7314f318868fe526699136a
 EBUILD elasticsearch-7.12.1.ebuild 2389 BLAKE2B 0a33190cd4dd3c80a69bd4356ee696639c17f8e1d8b97780bac4a12435a03cd3fcb6186e0a7f916f04dfcd0358055fb6153fe3f090f9c4cfabfc982727f2fb88 SHA512 7fb066fb4aef44bb335675a20b52857d3b1cef213401bc48fc333483bc6091f8cd52e0056e0b93e1da3bba9cc571985ece4329397c93e401c7bbd9c012642ce2
 MISC metadata.xml 611 BLAKE2B 91d02c98271689922fc5d79355a378cb29a3c88e45b089ad89afb182e50f6a0bb19fa8160e2455eb8815e9b2655cea6232ba7845cfa970b4d82529993b5447b8 SHA512 daa5f2349a139c5952f9831c9517e6af48ebe337506f77e7ddbe67fc5ad6f243ecea82c858b7687e3baef26f20e1e3f0d2453f72ce00a5985c2a618dff2a6361
diff --git a/app-misc/elasticsearch/elasticsearch-7.10.2.ebuild b/app-misc/elasticsearch/elasticsearch-7.10.2.ebuild
deleted file mode 100644
index 826ad97256df..000000000000
--- a/app-misc/elasticsearch/elasticsearch-7.10.2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd tmpfiles
-
-DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
-HOMEPAGE="https://www.elastic.co/products/elasticsearch"
-SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${PN}/${P}-no-jdk-linux-x86_64.tar.gz )
-	!x-pack? ( https://artifacts.elastic.co/downloads/${PN}/${PN}-oss-${PV}-no-jdk-linux-x86_64.tar.gz )"
-LICENSE="Apache-2.0 BSD-2 LGPL-3 MIT public-domain x-pack? ( Elastic )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="x-pack"
-
-RDEPEND="acct-group/elasticsearch
-	acct-user/elasticsearch
-	virtual/jre"
-
-QA_PRESTRIPPED="usr/share/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/\(bin\|lib\)/.*"
-
-src_prepare() {
-	default
-
-	rm LICENSE.txt NOTICE.txt || die
-	rmdir logs || die
-}
-
-src_install() {
-	keepdir /etc/${PN}
-	keepdir /etc/${PN}/scripts
-
-	insinto /etc/${PN}
-	doins -r config/.
-	rm -r config || die
-
-	fowners root:${PN} /etc/${PN}
-	fperms 2750 /etc/${PN}
-
-	insinto /usr/share/${PN}
-	doins -r .
-
-	exeinto /usr/share/${PN}/bin
-	doexe "${FILESDIR}/elasticsearch-systemd-pre-exec"
-
-	fperms -R +x /usr/share/${PN}/bin
-
-	if use x-pack; then
-		fperms -R +x /usr/share/${PN}/modules/x-pack-ml/platform/linux-x86_64/bin
-	fi
-
-	keepdir /var/{lib,log}/${PN}
-	fowners ${PN}:${PN} /var/{lib,log}/${PN}
-	fperms 0750 /var/{lib,log}/${PN}
-	dodir /usr/share/${PN}/plugins
-
-	insinto /etc/sysctl.d
-	newins "${FILESDIR}/${PN}.sysctl.d" ${PN}.conf
-
-	newconfd "${FILESDIR}/${PN}.conf.3" ${PN}
-	newinitd "${FILESDIR}/${PN}.init.7" ${PN}
-
-	systemd_install_serviced "${FILESDIR}/${PN}.service.conf"
-	systemd_newunit "${FILESDIR}"/${PN}.service.3 ${PN}.service
-
-	newtmpfiles "${FILESDIR}"/${PN}.tmpfiles.d ${PN}.conf
-}
-
-pkg_postinst() {
-	tmpfiles_process /usr/lib/tmpfiles.d/${PN}.conf
-
-	elog
-	elog "You may create multiple instances of ${PN} by"
-	elog "symlinking the init script:"
-	elog "ln -sf /etc/init.d/${PN} /etc/init.d/${PN}.instance"
-	elog
-	elog "Please make sure you put elasticsearch.yml, log4j2.properties and scripts"
-	elog "from /etc/${PN} into the configuration directory of the instance:"
-	elog "/etc/${PN}/instance"
-	elog
-	ewarn "Please make sure you have proper permissions on /etc/${PN}"
-	ewarn "prior to keystore generation or you may experience startup fails."
-	ewarn "chown root:${PN} /etc/${PN} && chmod 2750 /etc/${PN}"
-	ewarn "chown root:${PN} /etc/${PN}/${PN}.keystore && chmod 0660 /etc/${PN}/${PN}.keystore"
-}
diff --git a/app-misc/geoclue/Manifest b/app-misc/geoclue/Manifest
index 283603b2f688..1acc74e12b59 100644
--- a/app-misc/geoclue/Manifest
+++ b/app-misc/geoclue/Manifest
@@ -1,4 +1,4 @@
 AUX 2.5.3-optional-vapi.patch 2135 BLAKE2B 0e2d2620fb1fbe287eef4f9d749d77c75452bf0d12fdcfd4f5cebe9d35118cb22ff6366562a0a1a9b07bfd452ac35580d563c498d4d77474dcf6613b24da5d80 SHA512 254fcffb4500031100c802e751cf84d2ca85b8a890cee7aa3b538dd9d5374cda560eaad262c5efd4ba7c2503d4130a958adeb77eba66162627708d2448096338
 DIST geoclue-2.5.7.tar.bz2 85764 BLAKE2B bf0a6e312b7a303ed2cfc33f02cfad0e68e44f60899a327c9eba12f4967d2a3a5922a475f8fefb6f47da328c92dc75706504b41bc2dcd21db3fc5da7c2a50180 SHA512 16ec15afa41910b7d993a9918dd3c068dea3f6c5be922b7ac772493cd6aabb0cad3fe2206b82c1a008781c3f1ddd8f4afd8f70b5d497920bea8ed5e473f0fd1f
-EBUILD geoclue-2.5.7.ebuild 1756 BLAKE2B 3ef91e37fe3ec67328819233bd6e88d969053dfddb3f6b88d2b938ec49d13c6d4db43f00f15e5b9aa1afd1c7ee3d4e7078326baae607832efcdc3227151e3e45 SHA512 a8a5031d8b675114e7c6f6f053aa4149e7c12aead12a5dc013dfd647778031c5fc340fee2194db34e500dc09858e00d17f8403a291d9c2728bb7cfbbc19d991b
+EBUILD geoclue-2.5.7.ebuild 1763 BLAKE2B 9feac54965408b9df68943bfa6ef003088d199ca9f64a1a57b35a02d9e0c269d70f48b8f09afad6dbc3465edd53ec40acfda4241aaa8a4ff59309e0991824ddd SHA512 0018a41975f19ca23ebb0fae024f60578277d11e9bab12decc3f0ac0b8666817da7517101c645beb38c6f7b54323b6463b8699c43193be776d90cd63be2351e3
 MISC metadata.xml 522 BLAKE2B 8a0c7c99c984e6aa1a2360deffb947c126e52681dd207afc5b75eae4731492f28199a74cc4febec4265e4497320b9213521a528c5ec8339efa2c0490c8769e27 SHA512 719b3b64c6bce05a9b02818748a96081ab73c4124296266c545306014862f38124d9f20578938af4b99eb416c053070fa5c801d7823a87fe845f6d1ca99536ec
diff --git a/app-misc/geoclue/geoclue-2.5.7.ebuild b/app-misc/geoclue/geoclue-2.5.7.ebuild
index b039c33965dd..4ebabf0ba6f2 100644
--- a/app-misc/geoclue/geoclue-2.5.7.ebuild
+++ b/app-misc/geoclue/geoclue-2.5.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://gitlab.freedesktop.org/geoclue/${PN}/-/archive/${PV}/${P}.tar.b
 
 LICENSE="LGPL-2.1+ GPL-2+"
 SLOT="2.0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="+introspection gtk-doc modemmanager vala zeroconf"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/app-misc/gnote/Manifest b/app-misc/gnote/Manifest
index 9254153c1ef1..0141d912c696 100644
--- a/app-misc/gnote/Manifest
+++ b/app-misc/gnote/Manifest
@@ -1,8 +1,4 @@
 AUX gnote-3.38.1-cstddef.patch 988 BLAKE2B 8281bd3b515d642b57e49e365b76b134a3ccc9021b4b95b46934d4713f39cb107a644db948cac73175fa6dcdbdf566639894521b1415957af2dc8b661aca08e1 SHA512 3f4cdb300299fc224f3c5fd2cc8a4f8d47a7eb41af47eb233555f714879cdf1d0e294c5045a4fb89b4b721b6029f5c38dac7fee5d6c1c11461efe0523a3edefe
-DIST gnote-3.38.1.tar.xz 3530348 BLAKE2B d3312162ffdf505dea31f8e8848bd755d6fc54a5f95250ce6b90a28e04801fb86a8c4e239471442a4501068a841e38e4764da8f16528849fdec57a88bd271891 SHA512 ccfe35ff3dc8e90fa96307565875401540c9e03a18ffd5b2c25fdb053927c4bb2b6b5515456f5260c053948b1a63bf6959a73e1ab09feefce61ed2adc257734f
-DIST gnote-40.0.tar.xz 3418516 BLAKE2B 93834a3d9cdae89604be01b96c5293741263a1812ed23cc51a151c250f42c33c560456ac78a5a97f713dffc095b6f53ffe465da89867df89497239443939f3c4 SHA512 098273ee2de15152e7da739b857a8f7c43561e51013d1f42a631b0a9f52edebcd089817a9009556697e4c4b43506834919cd0f8cae7b3d899517f4b6d42eeb31
 DIST gnote-40.1.tar.xz 3420216 BLAKE2B a84604b25301fb0332da161a7f1f258542f1dfa16a02f34e700280e87393a3eb6d9005a5ed18204b91d0fccea2f6e44738789ab57dae543707650bfce55165c8 SHA512 6f4286fef18b060bb46c1c9f43772df7d9d913d6d1e3e3801e38e277fa660aa213e46f4a825788795f153821f705bbea22df7d1ff90ee949752497274455ad37
-EBUILD gnote-3.38.1.ebuild 1604 BLAKE2B 3de1688743a57faa5d11f39adeb2fcbd337a58ed4e7e9b2784cf79916fe54248d19cba834890336ea22c7cc71bc6b481a44634e34485da1890f0368bce43d3b5 SHA512 ee634cbf38dbc32bc1c5804fe5bfb58a4f405ad1c3032a204041192c2ac54321027c3b0ebe41f0c1df984912a366de178adf671345cde65bbea5d4be41fc4a5d
-EBUILD gnote-40.0.ebuild 1563 BLAKE2B e9112a82cb20c0bfa6cb0d19c2cbc811fbc42251e76f84026cb5e849d728f7042315e4d7d3cafca19dd948b043d5054da938ff87312ed3ae20e09965a991d139 SHA512 070dee31791766de946e674387c3a65e57c5385d58571b07a45d86caa4b251d892064a38d20e94aaa1ebb03c828fe363b66f562af4deb7b7dd31eba5a237ed04
-EBUILD gnote-40.1.ebuild 1563 BLAKE2B e9112a82cb20c0bfa6cb0d19c2cbc811fbc42251e76f84026cb5e849d728f7042315e4d7d3cafca19dd948b043d5054da938ff87312ed3ae20e09965a991d139 SHA512 070dee31791766de946e674387c3a65e57c5385d58571b07a45d86caa4b251d892064a38d20e94aaa1ebb03c828fe363b66f562af4deb7b7dd31eba5a237ed04
+EBUILD gnote-40.1.ebuild 1561 BLAKE2B d408ae3b6729f5b9bf8e780898224abfbbe4057caa5c50d739c9fbff644f4071ccffa8017a83ced5cd2ef6dbb8aa82ec9fa2116e84b41a1fad30626f0ae772ea SHA512 11d3a079ee001ab75c7df3c382e5dc58de58db141eb5010f694f86c203f6ce4eb2ae96001738a497bc36572d83e04cf4e03e11c58a0cc07efbcc4694c694831b
 MISC metadata.xml 342 BLAKE2B 51d98560833845aa6d1f2b9f4c85021fd317434efcd81ba31d106c7b4945acd23cfefc2de2a601ffef3d330adcf93ec0377f69107fa37771d80f7dff056d32ff SHA512 c68c058e279222cc9293a5b97fbf450f95a940a70a32b1adcac3e6276783d2bcc545f39895e92e7bd62c9ac5dc98139dc9800513c2a828895ba1fcf023227d21
diff --git a/app-misc/gnote/gnote-3.38.1.ebuild b/app-misc/gnote/gnote-3.38.1.ebuild
deleted file mode 100644
index 6f20625b348c..000000000000
--- a/app-misc/gnote/gnote-3.38.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 readme.gentoo-r1
-
-DESCRIPTION="Desktop note-taking application"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gnote"
-
-LICENSE="GPL-3+ FDL-1.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-# Automagic:
-# glib-2.32 dep
-# >=dev-libs/unittest++-1.5.1 (but not detected due to missing .pc)
-COMMON_DEPEND="
-	>=app-crypt/libsecret-0.8
-	>=app-text/gspell-1.6.0:=
-	>=dev-cpp/glibmm-2.62.0:2
-	>=dev-cpp/gtkmm-3.22.20:3.0
-	>=dev-libs/glib-2.32:2[dbus]
-	>=dev-libs/libxml2-2:2
-	dev-libs/libxslt
-	>=sys-apps/util-linux-2.16:=
-	>=x11-libs/gtk+-3.22.20:3
-"
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/gsettings-desktop-schemas
-"
-DEPEND="${DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	>=dev-util/intltool-0.35.0
-	dev-util/itstool
-	virtual/pkgconfig
-"
-
-PATCHES=("${FILESDIR}"/${PN}-3.38.1-cstddef.patch)
-
-src_prepare() {
-	# Do not alter CFLAGS
-	sed 's/-DDEBUG -g/-DDEBUG/' -i configure.ac configure || die
-
-	gnome2_src_prepare
-
-	if has_version net-fs/wdfs; then
-		DOC_CONTENTS="You have net-fs/wdfs installed. app-misc/gnote will use it to
-		synchronize notes."
-	else
-		DOC_CONTENTS="Gnote can use net-fs/wdfs to synchronize notes.
-		If you want to use that functionality just emerge net-fs/wdfs.
-		Gnote will automatically detect that you did and let you use it."
-	fi
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable debug)
-}
-
-src_install() {
-	gnome2_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	readme.gentoo_print_elog
-}
diff --git a/app-misc/gnote/gnote-40.0.ebuild b/app-misc/gnote/gnote-40.0.ebuild
deleted file mode 100644
index d59f76c84cde..000000000000
--- a/app-misc/gnote/gnote-40.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2 readme.gentoo-r1
-
-DESCRIPTION="Desktop note-taking application"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gnote"
-
-LICENSE="GPL-3+ FDL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-# Automagic:
-# glib-2.32 dep
-# >=dev-libs/unittest++-1.5.1 (but not detected due to missing .pc)
-DEPEND="
-	>=app-crypt/libsecret-0.8
-	>=app-text/gspell-1.6.0:=
-	>=dev-cpp/glibmm-2.62.0:2
-	>=dev-cpp/gtkmm-3.22.20:3.0
-	>=dev-libs/glib-2.32:2[dbus]
-	>=dev-libs/libxml2-2:2
-	dev-libs/libxslt
-	>=sys-apps/util-linux-2.16:=
-	>=x11-libs/gtk+-3.22.20:3
-"
-RDEPEND="${DEPEND}
-	gnome-base/gsettings-desktop-schemas
-"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.1.2
-	>=dev-util/intltool-0.35.0
-	dev-util/itstool
-	virtual/pkgconfig
-"
-
-PATCHES=("${FILESDIR}"/${PN}-3.38.1-cstddef.patch)
-
-src_prepare() {
-	# Do not alter CFLAGS
-	sed 's/-DDEBUG -g/-DDEBUG/' -i configure.ac configure || die
-
-	gnome2_src_prepare
-
-	if has_version net-fs/wdfs; then
-		DOC_CONTENTS="You have net-fs/wdfs installed. app-misc/gnote will use it to
-		synchronize notes."
-	else
-		DOC_CONTENTS="Gnote can use net-fs/wdfs to synchronize notes.
-		If you want to use that functionality just emerge net-fs/wdfs.
-		Gnote will automatically detect that you did and let you use it."
-	fi
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable debug)
-}
-
-src_install() {
-	gnome2_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	readme.gentoo_print_elog
-}
diff --git a/app-misc/gnote/gnote-40.1.ebuild b/app-misc/gnote/gnote-40.1.ebuild
index d59f76c84cde..e4f9ebcf3a3d 100644
--- a/app-misc/gnote/gnote-40.1.ebuild
+++ b/app-misc/gnote/gnote-40.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Gnote"
 
 LICENSE="GPL-3+ FDL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 # Automagic:
diff --git a/app-misc/gnutu/Manifest b/app-misc/gnutu/Manifest
deleted file mode 100644
index 5e3ebb8b1f52..000000000000
--- a/app-misc/gnutu/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnutu-2.9.tar.gz 325519 BLAKE2B 4c98d9f7f6a4752821bff464d744a019736353f0011bb162624f3458e1e872dfbe6039572ed79f3c479cdcda4d93f61a4a12fd10c72cd3bbddff45be8d8b0775 SHA512 7ad470ff524422b2236f05bf79cf2a144d166cac7a26d94851b6aacda32e8fa4f8e0ef6abf12157aba19d1e92b7774c3b86f89a8e32514b1ebf7d6e460045411
-EBUILD gnutu-2.9.ebuild 615 BLAKE2B bc0996da02889440e32b910175f616840310124358cd859eeb198f2c7dda10526b9775d9f5da3525d195101a63cfdb0b6508f1d85ee2238d09af69ddb5f91e1d SHA512 646f8c0ebdfe18e9d7aefe7d4c2fba3e9d492a15b102fd312d9114f074e8cc0c214b82a4af925f1cc432b5fd997e8a04720dfc7eae5e4f6a75adc510bb285016
-MISC metadata.xml 1104 BLAKE2B dc393761862f4740978b34bda85b67e4874487bc4da9786893547140311c6832ce375b273d67c43be5eb17deee06cce4cdf1ab5e4166a3a55297b65ebc531810 SHA512 4fecb8706fa65197a7318dbec0410f81a842c3398068c656ed30ab570311bfef9124613ae4c9904a7686103ddcdb3514e1bd607a16b54830b30db2ef66156f02
diff --git a/app-misc/gnutu/gnutu-2.9.ebuild b/app-misc/gnutu/gnutu-2.9.ebuild
deleted file mode 100644
index 5063d6422303..000000000000
--- a/app-misc/gnutu/gnutu-2.9.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="GNU Student's Timetable for polish users"
-HOMEPAGE="https://sourceforge.net/projects/gnutu/"
-SRC_URI="https://master.dl.sourceforge.net/project/gnutu/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-lang/mono-1.2.5.1-r1
-	>=dev-dotnet/gtk-sharp-2.12.21
-"
-DEPEND="${RDEPEND}"
-BDEPEND="sys-devel/gettext"
-
-src_prepare() {
-	# Remove deprecated Application tag from .desktop file
-	sed -i 's/\;Application//g' gnutu.desktop.cs || die "Sed failed"
-	default
-}
diff --git a/app-misc/gnutu/metadata.xml b/app-misc/gnutu/metadata.xml
deleted file mode 100644
index a7d422630ba0..000000000000
--- a/app-misc/gnutu/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>jakov.smolic@sartura.hr</email>
-		<name>Jakov Smolic</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<longdescription lang="en">
-		GNUTU is a polish program. It is designed for students from primary and
-		secondary schools – using it, you can note various information (like marks,
-		tests dates and important school events). It also can create various statistics,
-		calculate your average; it can also serve as a journal and many, many more...
-	</longdescription>
-	<longdescription lang="ja">
-		GNUTUはポーランド語のプログラムです。GNUTUは学生のために作ったプログラムです。この
-		プログラムで、色々なこと(ノートやテストの年月日や必要なイベント)を取れる。統計を
-		作って、点数割り出すも出来る。
-	</longdescription>
-</pkgmetadata>
diff --git a/app-misc/logitech-applet/Manifest b/app-misc/logitech-applet/Manifest
deleted file mode 100644
index a30cb3cbace1..000000000000
--- a/app-misc/logitech-applet/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX 40-logitech_applet.rules 251 BLAKE2B f29b2df9ca3427e4bfbe993a9d92ce39df25aefc13d4698418a13530e60f2c57c80ae9f4f2a3baecc1ddd2da2178d5be5f68d354f44fb88a5ce357e05d510c4b SHA512 689058ab61508c342a29dea2de620473453e9237c33cc0119b2c22dc502b6c345d8e42d7769c7cc246c75efbbfa91bd2fdaea15c40ce89468224274b20b80670
-AUX logitech-applet-0.4_pre1-configure-error-handling.patch 594 BLAKE2B fc1484e8e35e79f7d6e27ba51ec9093f11c48974a59ce20d01032d978ab3786a8ef44533dd8b84b63ed4713d47de052ce589b3f3a99bb3dff4364454520f7780 SHA512 b67e2ca4fffd907168f75764d5cdfd1eba10e2137365b970b74bf2bddac57b0a8733f3f87e222eaf945023a6c9405eb09775c17cbaffc1fb904b1e06ff16e1bb
-AUX logitech-applet-0.4_pre1-mx300-mx518.patch 5815 BLAKE2B 79c277fd37a439ba3441e0414437004443967c06db6d5615a47da134ddf2daa8b4ffbde43aa3a210e6a76e8125def42fd033fe706ed85a937249db6feb5feb86 SHA512 5b613821ed6c88eed99c36bf1d6df5c27183e41e176082247752970f372aef0e299e729aaeda508ef1cfe323a0e3ce368d3ca1a13a6836278458a531531883ff
-DIST logitech_applet-0.4test1.tar.gz 75783 BLAKE2B 71ac28c1efab922c5d48db00be53eb0c9200ea05972d1fc1a9551f3963fd9d4be46e7a66ebabb873873e1c0e89486e0e32ea7810cafb3eb0ade67cf399c46508 SHA512 64389b365d9d3473bf3ec027c7d9ee34cbdcddf9abb6bfabf4e771a255dade80e6758b7a997da3eaf23c19f1bd4559e79fb199e9f62e0f2ad1af92eab4b23789
-EBUILD logitech-applet-0.4_pre1-r3.ebuild 851 BLAKE2B 34e6213378a443a4af39475ac562fd9bab46f3d829247611f432e24c96efe0a2cf0ba46115d9dbab3f0b3ebf6246d3e925514b8a4217058b91f426d6744b46b0 SHA512 8cd14c25828edef0a7c9477f07c25732cef7ed7b7f481409ce04afa7c9c7ea10dba7635e983d28cc702af1da60e822f3d1095b95a4db27d74999522fb561470a
-MISC metadata.xml 272 BLAKE2B 4dbd2b5ae92564a97b2a06ab0ec6562e8dce2dd636aaf0788ee09f8688ca5d5b6483084a65366dfbe6d144d30170e5558bc5759adecb96abb405ea96a5147285 SHA512 ebe67da08587903b5b82fc194aa3c8f1ab65371f60d2c134928362e089550d9e9fd9531bffe8b676a345b5bf0ab209ce7f50d37d98201a88176f002e17582493
diff --git a/app-misc/logitech-applet/files/40-logitech_applet.rules b/app-misc/logitech-applet/files/40-logitech_applet.rules
deleted file mode 100644
index a51277c3ecb9..000000000000
--- a/app-misc/logitech-applet/files/40-logitech_applet.rules
+++ /dev/null
@@ -1,6 +0,0 @@
-ACTION!="add", GOTO="logitech_applet_rules_end"
-SUBSYSTEM!="usb*", GOTO="logitech_applet_rules_end"
-
-ATTRS{manufacturer}=="Logitech", ATTRS{product}=="USB-PS/2 Optical Mouse", RUN+="/usr/sbin/logitech_applet -s 800"
-
-LABEL="logitech_applet_rules_end"
diff --git a/app-misc/logitech-applet/files/logitech-applet-0.4_pre1-configure-error-handling.patch b/app-misc/logitech-applet/files/logitech-applet-0.4_pre1-configure-error-handling.patch
deleted file mode 100644
index 1373a1010c1f..000000000000
--- a/app-misc/logitech-applet/files/logitech-applet-0.4_pre1-configure-error-handling.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -24,7 +24,7 @@ if test "$LUSB" = "no"; then
-   echo "   http://libusb.sourceforge.net"
-   echo "   or use the --with-libusb-includes option, if you have it installed"
-   echo "   in an unusual place"
--  exit
-+  exit 1
- fi
- AC_CHECK_LIB(usb, usb_init, LUSB="yes", LUSB="no")
- if test "$LUSB" = "no"; then
-@@ -33,7 +33,7 @@ if test "$LUSB" = "no"; then
-   echo "   http://libusb.sourceforge.net"
-   echo "   or use the --with-libusb-libraries option, if you have it installed"
-   echo "   in an unusual place"
--  exit
-+  exit 1
- fi
- 
- AC_OUTPUT(Makefile)
diff --git a/app-misc/logitech-applet/files/logitech-applet-0.4_pre1-mx300-mx518.patch b/app-misc/logitech-applet/files/logitech-applet-0.4_pre1-mx300-mx518.patch
deleted file mode 100644
index 3e2e06536fcd..000000000000
--- a/app-misc/logitech-applet/files/logitech-applet-0.4_pre1-mx300-mx518.patch
+++ /dev/null
@@ -1,139 +0,0 @@
---- a/logitech_applet.c
-+++ b/logitech_applet.c
-@@ -40,6 +40,44 @@
- #endif
- 
- #define VENDOR_LOGITECH 0x046D
-+#define HAS_RES 0x01  /* mouse supports variable resolution */
-+#define HAS_SS  0x02  /* mouse supports smart scroll control */
-+#define HAS_CSR  0x04  /* mouse supports cordless status reporting and control */
-+#define HAS_SSR  0x08  /* mouse supports smart scroll reporting */
-+#define USE_CH2  0x10 /* mouse needs to use the second channel */
-+
-+struct device_table {
-+    int idVendor;
-+    int idProduct;
-+    char* Model;
-+    char* Name;
-+    int flags;
-+} 
-+
-+device_table[] = {
-+    { VENDOR_LOGITECH, 0xC00E, "M-BJ58", "Wheel Mouse Optical", HAS_RES },
-+    { VENDOR_LOGITECH, 0xC00F, "M-BJ79", "MouseMan Traveler", HAS_RES },
-+    { VENDOR_LOGITECH, 0xC012, "M-BL63B", "MouseMan Dual Optical", HAS_RES },
-+    { VENDOR_LOGITECH, 0xC01B, "M-BP86", "MX310 Optical Mouse", HAS_RES },
-+    { VENDOR_LOGITECH, 0xC01D, "M-BS81A", "MX510 Optical Mouse", HAS_RES | HAS_SS | HAS_SSR },
-+    { VENDOR_LOGITECH, 0xC01E, "M-BS81A", "MX518 Optical Mouse", HAS_RES },
-+    { VENDOR_LOGITECH, 0xC01F, "M-BS82", "MX300 Optical Mouse", HAS_RES },
-+    { VENDOR_LOGITECH, 0xC024, "M-BP82", "MX300 Optical Mouse", HAS_RES },
-+    { VENDOR_LOGITECH, 0xC025, "M-BP81A", "MX500 Optical Mouse", HAS_RES | HAS_SS | HAS_SSR },
-+    { VENDOR_LOGITECH, 0xC031, "M-UT58A", "iFeel Mouse (silver)", HAS_RES },
-+    { VENDOR_LOGITECH, 0xC051, "M-BS81A", "MX518 Optical Mouse", HAS_RES },
-+    { VENDOR_LOGITECH, 0xC501, "C-BA4-MSE", "Mouse Receiver", HAS_CSR },
-+    { VENDOR_LOGITECH, 0xC502, "C-UA3-DUAL", "Dual Receiver", HAS_CSR | USE_CH2},
-+    { VENDOR_LOGITECH, 0xC504, "C-BD9-DUAL", "Cordless Freedom Optical", HAS_CSR | USE_CH2 },
-+    { VENDOR_LOGITECH, 0xC505, "C-BG17-DUAL", "Cordless Elite Duo", HAS_SS | HAS_SSR | HAS_CSR | USE_CH2},
-+    { VENDOR_LOGITECH, 0xC506, "C-BF16-MSE", "MX700 Optical Mouse", HAS_SS | HAS_CSR },
-+    { VENDOR_LOGITECH, 0xC508, "C-BA4-MSE", "Cordless Optical TrackMan", HAS_SS | HAS_CSR },
-+    { VENDOR_LOGITECH, 0xC50B, "967300-0403", "Cordless MX Duo Receiver", HAS_SS|HAS_CSR },
-+    { VENDOR_LOGITECH, 0xC50E, "M-RAG97", "MX1000 Laser Mouse", HAS_SS | HAS_CSR },
-+    { VENDOR_LOGITECH, 0xC702, "C-UF15", "Receiver for Cordless Presenter", HAS_CSR },
-+    { 0, 0, 0, 0, 0 }
-+};
-+
- 
- int get_resolution(struct usb_device *dev)
- {
-@@ -141,7 +179,12 @@
-     return cruise;
- }
- 
--/* resolution should be 0x03 for 400cpi, 0x04 for 800cpi */
-+/* resolution should be:
-+ *  - 0x03 for 400cpi
-+ *  - 0x04 for 800cpi
-+ *  - 0x05 for 1200cpi
-+ *  - 0x06 for 1600cpi (actually 1800cpi on newer MX518)
-+ */
- int set_resolution(struct usb_device *dev, int resolution)
- {
-     usb_dev_handle *usb_h;
-@@ -233,39 +276,6 @@
-     printf("Logitech Mouse Applet, Version %s\n", VERSION);
- }
- 
--#define HAS_RES 0x01  /* mouse supports variable resolution */
--#define HAS_SS  0x02  /* mouse supports smart scroll control */
--#define HAS_CSR  0x04  /* mouse supports cordless status reporting and control */
--#define HAS_SSR  0x08  /* mouse supports smart scroll reporting */
--#define USE_CH2  0x10 /* mouse needs to use the second channel */
--
--struct device_table {
--    int idVendor;
--    int idProduct;
--    char* Model;
--    char* Name;
--    int flags;
--} device_table[] = {
--    { VENDOR_LOGITECH, 0xC00E, "M-BJ58", "Wheel Mouse Optical", HAS_RES },
--    { VENDOR_LOGITECH, 0xC00F, "M-BJ79", "MouseMan Traveler", HAS_RES },
--    { VENDOR_LOGITECH, 0xC012, "M-BL63B", "MouseMan Dual Optical", HAS_RES },
--    { VENDOR_LOGITECH, 0xC01B, "M-BP86", "MX310 Optical Mouse", HAS_RES },
--    { VENDOR_LOGITECH, 0xC01D, "M-BS81A", "MX510 Optical Mouse", HAS_RES | HAS_SS | HAS_SSR },
--    { VENDOR_LOGITECH, 0xC024, "M-BP82", "MX300 Optical Mouse", HAS_RES },
--    { VENDOR_LOGITECH, 0xC025, "M-BP81A", "MX500 Optical Mouse", HAS_RES | HAS_SS | HAS_SSR },
--    { VENDOR_LOGITECH, 0xC031, "M-UT58A", "iFeel Mouse (silver)", HAS_RES },
--    { VENDOR_LOGITECH, 0xC501, "C-BA4-MSE", "Mouse Receiver", HAS_CSR },
--    { VENDOR_LOGITECH, 0xC502, "C-UA3-DUAL", "Dual Receiver", HAS_CSR | USE_CH2},
--    { VENDOR_LOGITECH, 0xC504, "C-BD9-DUAL", "Cordless Freedom Optical", HAS_CSR | USE_CH2 },
--    { VENDOR_LOGITECH, 0xC505, "C-BG17-DUAL", "Cordless Elite Duo", HAS_SS | HAS_SSR | HAS_CSR | USE_CH2},
--    { VENDOR_LOGITECH, 0xC506, "C-BF16-MSE", "MX700 Optical Mouse", HAS_SS | HAS_CSR },
--    { VENDOR_LOGITECH, 0xC508, "C-BA4-MSE", "Cordless Optical TrackMan", HAS_SS | HAS_CSR },
--    { VENDOR_LOGITECH, 0xC50B, "967300-0403", "Cordless MX Duo Receiver", HAS_SS|HAS_CSR },
--    { VENDOR_LOGITECH, 0xC50E, "M-RAG97", "MX1000 Laser Mouse", HAS_SS | HAS_CSR },
--    { VENDOR_LOGITECH, 0xC702, "C-UF15", "Receiver for Cordless Presenter", HAS_CSR },
--    { 0, 0, 0, 0, 0 }
--};
--
- int main(int argc, char **argv)
- {
-     struct usb_bus *bus;
-@@ -318,8 +328,12 @@
- 		resolution = 400;
- 	    else if (!strcmp("800", optarg))
- 		resolution = 800;
-+	    else if (!strcmp("1200", optarg))
-+		resolution = 1200;
-+	    else if (!strcmp("1600", optarg))
-+		resolution = 1600;
- 	    else
--		printf("Bad argument (should be 400 or 800)\n");
-+		printf("Bad argument (should be 400, 800, 1200 or 1600)\n");
-             break;
-         case 'v':
- 	    version();
-@@ -363,14 +377,22 @@
- 				    break;
- 				case 4: printf("800cpi\n");
- 				    break;
-+				case 5: printf("1200cpi\n");
-+				    break;
-+				case 6: printf("1600cpi\n");
-+				    break;
- 				default: printf("(Unexpected result:%i)\n", resolution);
- 				    break;
- 				}
- 			} else {
- 			    if (400 == resolution)
- 				set_resolution(dev, 0x03);
--			    else 
-+			    else if (800 == resolution) 
- 				set_resolution(dev, 0x04);
-+			    else if (1200 == resolution)
-+				set_resolution(dev, 0x05);
-+			    else
-+				set_resolution(dev, 0x06);
- 			}
- 		    }
- 
diff --git a/app-misc/logitech-applet/logitech-applet-0.4_pre1-r3.ebuild b/app-misc/logitech-applet/logitech-applet-0.4_pre1-r3.ebuild
deleted file mode 100644
index ed10f90c5788..000000000000
--- a/app-misc/logitech-applet/logitech-applet-0.4_pre1-r3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-MY_P=${P/_pre/test}
-MY_P=${MY_P/-applet/_applet}
-
-DESCRIPTION="Control utility for some special features of some special Logitech USB mice!"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="virtual/libusb:0"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-mx300-mx518.patch
-	"${FILESDIR}"/${PN}-0.4_pre1-configure-error-handling.patch
-)
-
-src_prepare() {
-	default
-
-	mv configure.{in,ac} || die
-
-	# For error handling patch
-	eautoreconf
-}
-
-src_install() {
-	dosbin logitech_applet
-	dodoc AUTHORS ChangeLog README doc/article.txt
-
-	docinto examples
-	dodoc "${FILESDIR}"/40-logitech_applet.rules
-}
diff --git a/app-misc/logitech-applet/metadata.xml b/app-misc/logitech-applet/metadata.xml
deleted file mode 100644
index 49c86a887b6a..000000000000
--- a/app-misc/logitech-applet/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>desktop-misc@gentoo.org</email>
-	<name>Gentoo Desktop Miscellaneous Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-misc/media-player-info/Manifest b/app-misc/media-player-info/Manifest
index 670e899f9607..3b8df0729a66 100644
--- a/app-misc/media-player-info/Manifest
+++ b/app-misc/media-player-info/Manifest
@@ -1,3 +1,3 @@
 DIST media-player-info-24.tar.gz 90017 BLAKE2B 4b8dff7ebc910cdee986756d211f7cec0c08d5089bc5478360bcea3d24613118d3e2557633866345b1970a39a1de5ff10648ea71b7ae6ec7e7ae5635b6d46bc3 SHA512 b762f82280d7ddc3ecc4cf612f6fb3bf887c56a3ece7d9e4a45ebc7e750d71a20ba70dbff63c2b5abaae0f1c3e079545e95d8eff07ae25e27add09e92b2b1544
-EBUILD media-player-info-24.ebuild 1003 BLAKE2B 9d38fd93b17e8d3b312b2ab410b711d810a17d725a9e2acbb049e663d9b969968bc047a0bf38bbcdfe123d3fad4739ef240ab3ffdfcb4ff3ab2b8ebb1b2540c3 SHA512 2cb9290404c027031a68eebc4c75e2c59e2f3b0110b8e5dc9aef9e612cf90335e0ca740a33c366732a605861df7e7cc4d6b1fc25204e8ca48ce4f8d99b74f8b9
+EBUILD media-player-info-24.ebuild 1005 BLAKE2B aea619cd1bc99d8144d85866d3a9370a9cbb95e8587cedd9f19bd94dd9cf2f957e61a6da4c3f6e8d4c528f74dfabddd862171f4c8f80071588171539b286480d SHA512 9911f9fda87c459099c64cf0ecfef842a440cb9a2f861a51f72a6c87ecfafd75774ac98ce9e171cd58f6945917c0f119fdbec629061f7c63a7d7bd60e21ac716
 MISC metadata.xml 266 BLAKE2B 9c01787259e2c33e012f96ae52558f21518e2dc4e2bae1e528e8d53b897a698d9d205226aaf5c3796002ac10335d09b57de0d7a0ec079ea9982c7e05d1f67091 SHA512 c4dde7027a929519d75bf240bdf01edee88b6ab874e56c9e524f783b801eb26b5e86a9378cf23b21f7fd2f0f9ee45764daa7deef9173a05e0fedd997e648313b
diff --git a/app-misc/media-player-info/media-player-info-24.ebuild b/app-misc/media-player-info/media-player-info-24.ebuild
index 56d988b7f53f..577806483871 100644
--- a/app-misc/media-player-info/media-player-info-24.ebuild
+++ b/app-misc/media-player-info/media-player-info-24.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..10} )
 inherit python-any-r1
 
 DESCRIPTION="Repository of data files describing media player capabilities"
diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index b360a5079998..ee65875c1ff3 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -1,5 +1,5 @@
 DIST pax-utils-1.2.9.tar.xz 705188 BLAKE2B 9eb9309f0317683dd06e491e6647ba20986f2cb248432fad0ed0eb277711e8d38c5b5148bc0b44e6dbc3d5d3d0093bccd4d10c057090801c49246a63f3bc0899 SHA512 47271cd75818728342e2a074fa05da24fce51ef0eeedb28237138525d7c86c207ca2b5d206fd02cb34529590340b726a14c54b205c65204539a51fb78ac55d41
 DIST pax-utils-1.3.1.tar.xz 718384 BLAKE2B eef34077dfaceba1bf6f3d56b5e9990090e6d6c5d8c14f7f4bd8506040f0abdcf1a7bd52c643092faa74d991f22ed48c96924572a50c556aaf879dd411569457 SHA512 1a3a463f3864a420b4dcdd8e5736fbee785ed7cb19545966819493cc98d3cea670eb44592c7f100188b2d45b58908bc1f8e2e010f8842c51b70495b260a03102
 EBUILD pax-utils-1.2.9.ebuild 1887 BLAKE2B ba4f47fff5eb0e56bcb845a04a7cfa61c655503878d66c6684b32a3fd15a19a2e30757c560a1ddecc1e49ace6540b420b2adc6d542c60e2285d63cfba0179d4b SHA512 dad5e4f7c102a6f4a490c5cdcb80759d0e71784081d8e363183d37970ddaa5bdf87a0bae66d010f88ce092cf74a328e719a5b0bacfa579654e8f7c06f99ed48c
-EBUILD pax-utils-1.3.1.ebuild 1875 BLAKE2B d09c134877a8ed1f9d3bcfc902c2f9ddfbfcb064a9ab0ce3b83d0b67629004d94f9d4cbf504c0872dfe2a0831ac6b54a68dd46cb346d98ab6308adde1c619948 SHA512 382380f70f4ad17cad97d423e7d4335c91563f62ca7651f33149d51ae9dc3329f55427e443846553224633c881c4742a079924791aed0923a8cf5d71b4091c25
+EBUILD pax-utils-1.3.1.ebuild 1872 BLAKE2B 72742c0c848c2a5a9c9697ac7316ed723635d8322af47d5cc6bdfbc02dce9f4247cd933a319dc1294e60f428e213e275637f29840fddc44d0e321c212b755d30 SHA512 3b635f5a72f16c02d6b1f6756c1efeef36bc2bbebe83f7be0e8e71a50c2776b5db385ede07d3bcf810692622a4b4b1d8087813c125b642668318f4d1a4bf3321
 MISC metadata.xml 795 BLAKE2B 410a2dbab6104e5da8b29d92f288ac82619bea027e1e452428c9bb993d8b34475a2ce6d7d0ed8c40244f0ac31b619cc7a221c3545b46b8029284adbcbd45d9e5 SHA512 97e8fafd52f62a3db3d28a61f55895ecf667592516be68977599dd82d10c2107eb325218ccfc102d51cf8ce453c3f64e8ab4b82b25a5298bcf3ff0e33cdf40f3
diff --git a/app-misc/pax-utils/pax-utils-1.3.1.ebuild b/app-misc/pax-utils/pax-utils-1.3.1.ebuild
index a1470ebee630..fa769d94228e 100644
--- a/app-misc/pax-utils/pax-utils-1.3.1.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.3.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="caps debug kernel_linux python seccomp"
 
 RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest
index 091aac6c4215..d5e2e4a33aae 100644
--- a/app-misc/screen/Manifest
+++ b/app-misc/screen/Manifest
@@ -3,7 +3,6 @@ AUX screen-4.6.2-utmp-exit.patch 1558 BLAKE2B e08e83f8b9f0cd09cd9bad4486a75d71bd
 AUX screen-CVE-2021-26937.patch 1864 BLAKE2B 7425a49e003601f21130cf9c42354aaeb5f3cd639dd274971393420ccf45e8273539ae020f8a1a6e4063e741e75dcbf8cecd4e35b26c6d04ffca108ddea7bd32 SHA512 419f4d10b23369fccdadfb024b6ce268794e7f76188b25dd9051ff8cd6080dc0c70f66b9c2480095d655bb63f20ba1fdfa1ce0c681c9b8aff4d4918764018516
 AUX screenrc 10412 BLAKE2B f4866f4a83b22c37484b66e4c7d52ec479fe12ae3e72e5c9e769b1b543ecf04d14ef4339e1c72064741cbf39502ef82d3beb213326a30889f128e135f60bd528 SHA512 06fbec5e28480a2c369330fac0c94faa47e5d28e037d9fefd0cb3e813002c504866dc8ac86872b7ac6f16059a219e396a9c425b578b8afe882153ddb506158f7
 DIST screen-4.8.0.tar.gz 854854 BLAKE2B 97ef6f18bf2c63c477260b742ac0b3501f112d380c41ccecc5cf2853db853cc62d4fd6d37edeca35fb41a43b76d98a5cfe160749c992d284f9764b0a0fdcc778 SHA512 770ebaf6ee9be711bcb8a6104b3294f2bf4523dae6683fdc5eac4b3aff7e511be2d922b6b2ad28ec241113c2e4fe0d80f9a482ae1658adc19c8c3a3680caa25c
-EBUILD screen-4.8.0-r1.ebuild 4116 BLAKE2B 6379bf40480069dc89f62c11bf6eb74d1f2f0a437437b93a277a825a3b344baff2b589c41f09ecee6a0d703269ea95e834accebd3d869fe6fe99be26f868302d SHA512 a99f93b9e4127129ff3258e79cf5cbed5357919289f5c77e72aa9ce51c7c65c8e79286b4ff857e7656bf47d2b241f7b4a302294e18d46c47f1b64370bb9f7922
 EBUILD screen-4.8.0-r2.ebuild 4158 BLAKE2B 05754b07214cbdbef6569408e697e503b171639bb795f4f2a00902ab539a33fbf25cf7e8de4bf3effa1e8eadce6f95c4a4cdedb4541e215a0c29cf27be140a17 SHA512 b16dbfa0934cbf58e72989dd30b5bd19abcb4bedd81aa2169d88f7bb06995b368ab57801212b6b114b69e163489446803547bd2b07a26f6690af3b1148f5566f
 EBUILD screen-9999.ebuild 4221 BLAKE2B b3156a67b9708e22c231e902ee005bf034c118cf610f5461b6408d17694601bb00e4b3aaccc670247aae6b762241e6375324db184cd1410fc3baca8a5bf22e13 SHA512 a8b839ebdbc262851c3725c7099bc85b444b8b00ed40badba7c240a5810eeb22aa0714971b2f116e1860de2c1204b403ffe3bda1200e86ecad2dd5c667a98ba3
 MISC metadata.xml 1782 BLAKE2B bb6d45dd49af2c1abcaf4801d509421a885cd9c636c44e71964962abbd111a54505cd3dcdc594479489b943714a4b534332eb4aa1c5a43d0d679a18866983920 SHA512 d12c60725b314af0ea8ea909d387699e18da8a742036c35f2822235536b6787595ec5acaa8b7e1af0a429e0eb618051e62ba937dcf53a245ae804c3ace29d47b
diff --git a/app-misc/screen/screen-4.8.0-r1.ebuild b/app-misc/screen/screen-4.8.0-r1.ebuild
deleted file mode 100644
index e0b624d80bfb..000000000000
--- a/app-misc/screen/screen-4.8.0-r1.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic pam tmpfiles toolchain-funcs
-
-DESCRIPTION="screen manager with VT100/ANSI terminal emulation"
-HOMEPAGE="https://www.gnu.org/software/screen/"
-
-if [[ "${PV}" != 9999 ]] ; then
-	SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" # needed for setting S later on
-	S="${WORKDIR}"/${P}/src
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug nethack pam selinux multiuser"
-
-CDEPEND="
-	>=sys-libs/ncurses-5.2:0=
-	pam? ( sys-libs/pam )"
-RDEPEND="${CDEPEND}
-	acct-group/utmp
-	selinux? ( sec-policy/selinux-screen )"
-DEPEND="${CDEPEND}
-	sys-apps/texinfo"
-
-PATCHES=(
-	# Don't use utempter even if it is found on the system.
-	"${FILESDIR}"/${PN}-4.3.0-no-utempter.patch
-	"${FILESDIR}"/${PN}-4.6.2-utmp-exit.patch
-)
-
-src_prepare() {
-	default
-
-	# sched.h is a system header and causes problems with some C libraries
-	mv sched.h _sched.h || die
-	sed -i '/include/ s:sched.h:_sched.h:' screen.h || die
-
-	# Fix manpage.
-	sed -i \
-		-e "s:/usr/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
-		-e "s:/usr/local/screens:${EPREFIX}/tmp/screen:g" \
-		-e "s:/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
-		-e "s:/etc/utmp:${EPREFIX}/var/run/utmp:g" \
-		-e "s:/local/screens/S\\\-:${EPREFIX}/tmp/screen/S\\\-:g" \
-		doc/screen.1 || die
-
-	if [[ ${CHOST} == *-darwin* ]] || use elibc_musl ; then
-		sed -i -e '/^#define UTMPOK/s/define/undef/' acconfig.h || die
-	fi
-
-	# disable musl dummy headers for utmp[x]
-	use elibc_musl && append-cppflags "-D_UTMP_H -D_UTMPX_H"
-
-	# reconfigure
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}"
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# enable msg_header by upping the feature standard compatible
-		# with c99 mode
-		append-cppflags -D_XOPEN_SOURCE=600
-	fi
-
-	use nethack || append-cppflags "-DNONETHACK"
-	use debug && append-cppflags "-DDEBUG"
-
-	local myeconfargs=(
-		--with-socket-dir="${EPREFIX}/tmp/${PN}"
-		--with-sys-screenrc="${EPREFIX}/etc/screenrc"
-		--with-pty-mode=0620
-		--with-pty-group=5
-		--enable-rxvt_osc
-		--enable-telnet
-		--enable-colors256
-		$(use_enable pam)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	LC_ALL=POSIX emake comm.h term.h
-	emake osdef.h
-
-	emake -C doc screen.info
-	default
-}
-
-src_install() {
-	local DOCS=(
-		README ChangeLog INSTALL TODO NEWS* patchlevel.h
-		doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
-	)
-
-	emake DESTDIR="${D}" SCREEN="${P}" install
-
-	local tmpfiles_perms tmpfiles_group
-
-	if use multiuser || use prefix ; then
-		fperms 4755 /usr/bin/${P}
-		tmpfiles_perms="0755"
-		tmpfiles_group="root"
-	else
-		fowners root:utmp /usr/bin/${P}
-		fperms 2755 /usr/bin/${P}
-		tmpfiles_perms="0775"
-		tmpfiles_group="utmp"
-	fi
-
-	newtmpfiles - screen.conf <<<"d /tmp/screen ${tmpfiles_perms} root ${tmpfiles_group}"
-
-	insinto /usr/share/${PN}
-	doins terminfo/{screencap,screeninfo.src}
-
-	insinto /etc
-	doins "${FILESDIR}"/screenrc
-
-	if use pam; then
-		pamd_mimic_system screen auth
-	fi
-
-	dodoc "${DOCS[@]}"
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]
-	then
-		elog "Some dangerous key bindings have been removed or changed to more safe values."
-		elog "We enable some xterm hacks in our default screenrc, which might break some"
-		elog "applications. Please check /etc/screenrc for information on these changes."
-	fi
-
-	# Add /tmp/screen in case it doesn't exist yet. This should solve
-	# problems like bug #508634 where tmpfiles.d isn't in effect.
-	local rundir="${EROOT}/tmp/${PN}"
-	if [[ ! -d ${rundir} ]] ; then
-		if use multiuser || use prefix ; then
-			tmpfiles_group="root"
-		else
-			tmpfiles_group="utmp"
-		fi
-		mkdir -m 0775 "${rundir}"
-		chgrp ${tmpfiles_group} "${rundir}"
-	fi
-
-	ewarn "This revision changes the screen socket location to ${rundir}"
-}
diff --git a/app-misc/screenfetch/Manifest b/app-misc/screenfetch/Manifest
index 5c30eb0f0598..a142eda1baef 100644
--- a/app-misc/screenfetch/Manifest
+++ b/app-misc/screenfetch/Manifest
@@ -1,4 +1,5 @@
 DIST screenfetch-3.9.1.tar.gz 77350 BLAKE2B 10852e63c9ad615cea9a5e53374f16e2f3ac40074bc247c144c91b5e96e0040c6b6623d2a79300e859cef0d8eeb2e935aad585c73d668676dda388d5af6693b3 SHA512 e186901480dcad57b765052b1b156b7706a196ce0e08b6b88264912a5d2a1250e5014923312353a82ccabd8129d4d2421891f13fd34f0ed76c50ce9633207df0
-EBUILD screenfetch-3.9.1.ebuild 698 BLAKE2B 19c4dc1b59b17d0857be792b7b4e853fb1a9e8c16740336a21c0d08dbe42d3aff0c3bb992b3fcb0fa03e6bf0476ccc0409cef440e74ec5faaccd99e4ea303774 SHA512 c446d204d054e4cb78aa0f2e6927b0bad2ed83304f825b37e433f22c0ec3f6f4dc0281048b99244cfe5a0b3310bddf10cc5adac54a166e2e2377be2d5b052bbe
-EBUILD screenfetch-9999.ebuild 700 BLAKE2B 13008f0c79a4b427033b78d372455448d45bba1dc422ae3e1169e7aec4b50c67a58885d0242581f21b9bf6b0473758417b12f5cdc41e4c52adfec00c556ab6ae SHA512 d14d09879a624d86ba79dbae445210d1226c9c780a3406b44386eaa92bed24650048caa034d0e96e0e5d483aa569828f56459eeb5269f5deaec37ced133e414c
+EBUILD screenfetch-3.9.1-r1.ebuild 783 BLAKE2B 6cc07a31e3a1f6f2bde2cf8fed3f3d487d6d8775b51dec38f1b29dbb3aaa6b5fe3fc5708acaf382739d252da5f05f6ee7ecbc6abf5b5b25a2b38a210838673c1 SHA512 073eac6b7f4108e02408eb91c97ca3ce2e1fe9b50dc8960eabc93117cb3a87b5bc4f0925145f62a7ef6dd47add325b3bb4e4a78b6c821ae0183d85dab46b68c1
+EBUILD screenfetch-3.9.1.ebuild 699 BLAKE2B f70b0de1eb3d79064a25e74315b1e9bea733c310d6c236c26b345f5ca460cfedef4cf85a854247e1fdb47918be5ed1fbdec82f6a0468d926dd516dd78fafdfad SHA512 4e1729290cc836d02578db0b6b2065cbdae13f2a55f14febf512aa12a064f6818c63cc8b25b91d9b0b4f24e2c431b16947ba229cafeb74d5865259402e8f5980
+EBUILD screenfetch-9999.ebuild 783 BLAKE2B 6cc07a31e3a1f6f2bde2cf8fed3f3d487d6d8775b51dec38f1b29dbb3aaa6b5fe3fc5708acaf382739d252da5f05f6ee7ecbc6abf5b5b25a2b38a210838673c1 SHA512 073eac6b7f4108e02408eb91c97ca3ce2e1fe9b50dc8960eabc93117cb3a87b5bc4f0925145f62a7ef6dd47add325b3bb4e4a78b6c821ae0183d85dab46b68c1
 MISC metadata.xml 433 BLAKE2B 50f5c928a8db5e71033fd780bd2ea13af87d8d14d83b694ff6765fc65ca3f7313c53de0a22ee5cdc0ed4ad88c754a0ccd750e59e46cfd1456b4ea185162ae1df SHA512 d07492a28cab27bba43976cc18148cde296f7e3a5ec76f06f066812b085c8b1a2b7ba9ed0a5eeea7aa838b052f177a2fde0a99ff5ff5ef9a46c4c0553cf012e0
diff --git a/app-misc/screenfetch/screenfetch-3.9.1-r1.ebuild b/app-misc/screenfetch/screenfetch-3.9.1-r1.ebuild
new file mode 100644
index 000000000000..8bb13a276cb6
--- /dev/null
+++ b/app-misc/screenfetch/screenfetch-3.9.1-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit optfeature
+
+MY_PN="${PN/f/F}"
+
+DESCRIPTION="Bash Screenshot Information Tool"
+HOMEPAGE="https://github.com/KittyKatt/screenFetch"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/KittyKatt/screenFetch.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
+	SRC_URI="https://github.com/KittyKatt/screenFetch/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${MY_PN}-${PV}"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+src_install() {
+	newbin ${PN}-dev ${PN}
+	einstalldocs
+}
+
+pkg_postinst() {
+	optfeature "screenshot taking" media-gfx/scrot
+	optfeature "screenshot uploading" net-misc/curl
+	optfeature "resolution detection" x11-apps/xdpyinfo
+}
diff --git a/app-misc/screenfetch/screenfetch-3.9.1.ebuild b/app-misc/screenfetch/screenfetch-3.9.1.ebuild
index 5a74091728ce..b60b0c410fdb 100644
--- a/app-misc/screenfetch/screenfetch-3.9.1.ebuild
+++ b/app-misc/screenfetch/screenfetch-3.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ else
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 IUSE="curl X"
 
diff --git a/app-misc/screenfetch/screenfetch-9999.ebuild b/app-misc/screenfetch/screenfetch-9999.ebuild
index 552e3a0655c6..8bb13a276cb6 100644
--- a/app-misc/screenfetch/screenfetch-9999.ebuild
+++ b/app-misc/screenfetch/screenfetch-9999.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+inherit optfeature
+
 MY_PN="${PN/f/F}"
 
 DESCRIPTION="Bash Screenshot Information Tool"
@@ -17,19 +19,16 @@ else
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
-IUSE="curl X"
-
-DEPEND=""
-RDEPEND="
-	curl? ( net-misc/curl )
-	X? (
-		media-gfx/scrot
-		x11-apps/xdpyinfo
-	)"
 
 src_install() {
 	newbin ${PN}-dev ${PN}
 	einstalldocs
 }
+
+pkg_postinst() {
+	optfeature "screenshot taking" media-gfx/scrot
+	optfeature "screenshot uploading" net-misc/curl
+	optfeature "resolution detection" x11-apps/xdpyinfo
+}
diff --git a/app-misc/tmuxp/Manifest b/app-misc/tmuxp/Manifest
index 7edf5e4c9bbc..d452c8fc0913 100644
--- a/app-misc/tmuxp/Manifest
+++ b/app-misc/tmuxp/Manifest
@@ -6,5 +6,5 @@ DIST tmuxp-1.6.5.tar.gz 1017117 BLAKE2B 4cc8955f9dcfffd237ffde3e7487496aaf85dd88
 DIST tmuxp-1.7.2.tar.gz 1027293 BLAKE2B 2564d196c9c327584d24f57ce72165a7cdff2209fe6869a4d3519eb0246329cd8159ecaa20c2a39e153bde224201b1f846f4244c4df72ac540cf0d71f9fba75a SHA512 2ccf63c9f5b7049438ca6079894aac92a0f7496a56c68d88e5a9d5c2a42188a4e40d559792857881f492b28392a329697d4d43781f38ee7c49ed592aac8a69f8
 EBUILD tmuxp-1.5.4.ebuild 964 BLAKE2B 643aaf5a7db258f05164547d93e0dc4a63af82a79048a247f08bb8e8cbd5ad5bd71d27e1c708f4f63573424ed70804dd66a6e25b62460e641339bc4426384444 SHA512 f9ed588279ec0739ffe842847a271144c8418d1dcb1aa8190816320eb621a1900b77a1a5bdb5dc037a0b12cd266b10334c72562e8b0444acd5cbdabf3e74a061
 EBUILD tmuxp-1.6.5.ebuild 1122 BLAKE2B 005720290707591c2291ce5f5431fc10484945080fe3d62b437966acab6fb6395f031f24793cd6a9b2321597e7f0dbc8341d541ebf9ccff2870f8397f7485b3e SHA512 f4bf6bfaab0999505f3822139d9ce10128e57f56a74d42ece314c900d128e9a9f8042e40f722e4776ab35cd990041193cc476b1512649a284f34cce88a357864
-EBUILD tmuxp-1.7.2-r1.ebuild 1179 BLAKE2B 349c0a275a49e8f1959cf2cfd1604ec9b2d8c7ef926d0c7255c6e7e2c431ee5a17cd74d9f791c8d5e1e5bcbccef3b156fb48268aff2ff30191d3862925781b68 SHA512 e3c424f0ecf58ea802f052188fd0ae48e6c68f42205d216e7e4cf9a105aa975fd8e6c8c22167d28b75c7831be2004d45239377639fe602870774ba1dc1a0a12e
+EBUILD tmuxp-1.7.2-r1.ebuild 1029 BLAKE2B a264f707e3898bdc8fe68ac47d91c1c8e59f899de1597f47f7fde1f6d1e26574618254a00de7e651050ca8bee83e3b90b16c2f8c9396d3bd82cad181ed45cbf2 SHA512 8cd38a771c382a6c466856d5bc9f0b46ee872abfde0d8d3438e063da87f64fe2a5c5fffddb5fb6e7d0cd95fb11c833084961190bc790ab13bbc86e88dccebe1a
 MISC metadata.xml 255 BLAKE2B 2bb3830b8cec850703f7912f4c22f5b0abeabeed0715222bc56141779d02160773cfd0f85417c553c1cd8f2738bfeb78c56dffb8e648e572019319657646d1ba SHA512 522158915afe67937f81ba572a918a2de8ca1f8591e097da56799c97870d7c44756c1acd8224d63bd3375c2b9ebc0e1ce50816899117948a48065a27804883bf
diff --git a/app-misc/tmuxp/tmuxp-1.7.2-r1.ebuild b/app-misc/tmuxp/tmuxp-1.7.2-r1.ebuild
index 25dcf9b50b9d..d18a7db82370 100644
--- a/app-misc/tmuxp/tmuxp-1.7.2-r1.ebuild
+++ b/app-misc/tmuxp/tmuxp-1.7.2-r1.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..8} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="tmux session manager. built on libtmux"
@@ -14,7 +13,6 @@ SRC_URI="https://github.com/tmux-python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="test"
 
 RDEPEND="
 	>=app-misc/tmux-3.0a
@@ -24,9 +22,8 @@ RDEPEND="
 	>=dev-python/click-7.0[${PYTHON_USEDEP}]
 	>=dev-python/colorama-0.3.9[${PYTHON_USEDEP}]
 "
-BDEPEND="${RDEPEND}
+BDEPEND="
 	test? (
-		>=dev-python/pytest-4.1.1[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
 		>=dev-python/pytest-rerunfailures-4.2[${PYTHON_USEDEP}]
 		!dev-python/flaky
@@ -39,8 +36,8 @@ PATCHES=(
 	"${FILESDIR}/tmuxp-1.7.2-relax-click-dep.patch"
 )
 
-distutils_enable_tests --install pytest
+distutils_enable_tests pytest
 
 python_test() {
-	SHELL="/bin/bash" pytest -vv || die "Tests fail with ${EPYTHON}"
+	SHELL="/bin/bash" epytest
 }
diff --git a/app-misc/tracker-miners/Manifest b/app-misc/tracker-miners/Manifest
index e3cc3abe7833..d6ad3ccb1b1b 100644
--- a/app-misc/tracker-miners/Manifest
+++ b/app-misc/tracker-miners/Manifest
@@ -2,7 +2,7 @@ AUX 2.3.5-fix-autostart-build.patch 3518 BLAKE2B e41b39cb8576a533bb4e1bae9b96daf
 AUX tracker-miners-3.1.1-Fix-asciidoc-manpage.xsl-location.patch 857 BLAKE2B 25e6a69bf2d868b5ab9045e4f890079a1edf81fb737e74beef7ac3037366bdc0986991aeb94053f0f027287e824abd2a4e0cc6a9ac94be680f1494bc0c4abc20 SHA512 112772fcf646a4b4c81473ac28a74f31706f41340c3867cd8272ecfb5b512158fdf4ed4756fb2d661883faa8478f51ebed897744582b42891e78039eb170139d
 DIST tracker-miners-2.3.5.tar.xz 3128428 BLAKE2B a45c642fb03433a6cf12d0904a82498aa6645f97ac70b1cfe04cc3b739b33b5d3fe307cd96f45a5a4af8927f029b4eade60195d2f72c1a684aa26ee723025d8a SHA512 13da1106bc1bc8a550093c4d1bf4336a205f636e0487dc9d42cee9ce2666eca73ead479fd04f03ccf15acb4e3b27a1c898860f63bdfa69ca74b02aa041731fa9
 DIST tracker-miners-3.1.1.tar.xz 4066784 BLAKE2B 60ae0141b295f08f9fce92b2697adcabfa1c7dcadd32759a5283771e6c98aed03a2f9a2afc8c60138a3c3590d96b59fbeb844dfbd34acb89d83dd40d1476858c SHA512 d7935fd02e0971a377106c65005b6ed4fdcc2c147f698d3cb36fea8e78019050e8b8ae5a407dea9809196c0186b8969c923767445249a85ad8b81a10e07c242f
-EBUILD tracker-miners-2.3.5-r1.ebuild 4731 BLAKE2B 97db115174c1a24648c1902c504c1cb3ecfae2ddd311b78f648badfa129bba7ad614577deaaec1b5babea2bb0bd58e51889480453aab7fa372c339f137aaca4c SHA512 761ff76fdd2eb02e46de77c42dcca2205d99db82240cb310d303d9af908f0c466b3599758c40e7d16d5a5058e81ba0bb97a48f721622e8054b14f82da78d0089
+EBUILD tracker-miners-2.3.5-r1.ebuild 4728 BLAKE2B 5c6b74b18dbe2aebb821d1d2c193c67e3503ee9fc1f9681f1ebc2858b57499a05ffab60cc0f55570f6594ef0d1238628d3777a4d5941ca982013424674d16133 SHA512 d0091dac5a17251612eeaf422bd7f4a62c2dde7be38c936295a8ed3ab98dd0d69a1dd610b8a4b121e2419fd28ec23a4559da4c3895f0188e04095612e64d6b08
 EBUILD tracker-miners-2.3.5.ebuild 5001 BLAKE2B b683e12c111b42c22a1703d14490809af17d54e1bc2943c2f208706eee6b715261a2e39a923d4d622a224f402c32bbae41e0eff45065dcd63848358976c1694d SHA512 ab5f4f7bcb7577ee88d96c19ebace33c85e4b71b54bcaf903a54e837d99e59575ae0c426bf61f9e93e2a85053c4e9609d80d514d2ce85ca1e343bf2ced27f8f5
-EBUILD tracker-miners-3.1.1.ebuild 4671 BLAKE2B 15ae1d63bef54b574a4510dc4ce7f80d10437bced6f708fb46cf5604d1a4db065ff5602b0fabd9c54da24830210bfd2895e8fe8e8b23cb67d4a2929e18b0ac56 SHA512 3d08035334401017d36d62ae386a20db75bbb899b9ce9df515001847ded8bf05ffbaceadf21c2b192663b4aad6f2187383fd4a275b8626d97619acae44ab6ba3
+EBUILD tracker-miners-3.1.1.ebuild 4668 BLAKE2B 7e785ea49f4e2f4e2e19c9b76889c99eec0a1c642073dfb08b454307c8cc44ed57bfe5cd000e119e3e528da3f4decb5c32f712720d474a2a6e5141ef317422b2 SHA512 c2138579041f5327730ad5522c576a8f68e63b67d684d5ca7c90c416b79f0e94eb9ad355efa621888eb72c6cd335a7045f843c4a2ff91476ba085113b3ebb77c
 MISC metadata.xml 739 BLAKE2B 0ac1d8e892ef4b1caebea7f598b35694bc21956680ccfc16b2693528f913fde9354fb984fc09f20bbf9ad3671af2438818691d05fbfc05a06783cd2aa401ed8c SHA512 e685c1ed8e5029828251ed7a6e8124e8716b365172d976116a29aea67ec01744450892a30e53ce0a3ae4f1fa2b41d9af8fd4429667c31478e83aa3086cc0aa01
diff --git a/app-misc/tracker-miners/tracker-miners-2.3.5-r1.ebuild b/app-misc/tracker-miners/tracker-miners-2.3.5-r1.ebuild
index 417aa39630d3..804672ef7215 100644
--- a/app-misc/tracker-miners/tracker-miners-2.3.5-r1.ebuild
+++ b/app-misc/tracker-miners/tracker-miners-2.3.5-r1.ebuild
@@ -16,7 +16,7 @@ IUSE="cue exif ffmpeg gif gsf +gstreamer iptc +iso +jpeg +pdf +playlist raw +rss
 REQUIRED_USE="cue? ( gstreamer )" # cue is currently only supported via gstreamer, not ffmpeg
 RESTRICT="!test? ( test )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 # tracker-2.1.7 currently always depends on ICU (theoretically could be libunistring instead); so choose ICU over enca always here for the time being (ICU is preferred)
 RDEPEND="
diff --git a/app-misc/tracker-miners/tracker-miners-3.1.1.ebuild b/app-misc/tracker-miners/tracker-miners-3.1.1.ebuild
index 1142f92f8000..885779a0c791 100644
--- a/app-misc/tracker-miners/tracker-miners-3.1.1.ebuild
+++ b/app-misc/tracker-miners/tracker-miners-3.1.1.ebuild
@@ -16,7 +16,7 @@ IUSE="cue exif ffmpeg gif gsf +gstreamer iptc +iso +jpeg networkmanager +pdf +pl
 REQUIRED_USE="cue? ( gstreamer )" # cue is currently only supported via gstreamer, not ffmpeg
 RESTRICT="!test? ( test )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 # tracker-2.1.7 currently always depends on ICU (theoretically could be libunistring instead); so choose ICU over enca always here for the time being (ICU is preferred)
 RDEPEND="
diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index 949c3af75cb3..6d82d23be221 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -2,5 +2,5 @@ AUX tracker-3.1.1-Fix-asciidoc-manpage.xsl-location.patch 835 BLAKE2B 70e949f1e3
 DIST tracker-2.3.5.tar.xz 1604004 BLAKE2B ad79682cb703056fd927649021a5f37fddb2e978ecc710d020c23ef5dd076f88c7e0c2cd9d4385343e9d6c2c2ac7473af7508d86793c505e2361a8021bf27d50 SHA512 74cd3b2671b811f3267a516e6f6047594fffa7c8a4a23fa5be4f7d71f581c417a88f12f614757418a848077a9231c0c876617d4486f3bb5b103382b871913d34
 DIST tracker-3.1.1.tar.xz 1434784 BLAKE2B fa73420736e82bc7a43ef9dd9dce9096e50a22aca3f83737a0c77802460fc307630403bb836a799ff2d03a838cd1e71fbb4a17a54fa0a7c823e122800530e050 SHA512 87e6cc6dbfb34cc17bef42defefc51fc9d9586bffebf7a282a89ec3b294e911c504ea862bb05e5a269e438a83fbeb8938670eb32fa11d0d09ba805e0b02e6dcd
 EBUILD tracker-2.3.5.ebuild 2591 BLAKE2B aa8a651907b383dd6b52ce9097ed0fdab39434245538141b76a8e6fe6bc1bcbc79cfffd607acfa67883cea86b6e55433e4cf5ed552aa97d53ab10d534b07205f SHA512 5578c76065635b94c67319261f7b66d4f222bf12c922b157c880bfc3a15a7ac47d1c389888550981f083417cfea3768aa609f914889eedd2004e973afaac12e8
-EBUILD tracker-3.1.1.ebuild 2509 BLAKE2B a18706f1f022fb677dc39ef357d4353e37364328ca9d83e69ca8051c0b7d81050181df7fbf284e554db8a196e700993c65e7963a8fc7b1384663e7e1fb700970 SHA512 3f8a8c1e670ffedd73adde7d6975b8f5af122ebb8db88fd7e2b3c09f398a0b130c1ff821fbcf5c33798c3e36c25765aa97396398e9a1771a9a9d2b7716026204
+EBUILD tracker-3.1.1.ebuild 2506 BLAKE2B 2f2319a938386cefe0a31ea8d11d2770ba2c28fce0e72483fb090052336a8ce49a9eb02b16f740e5c258c972d6da9601895e8e6443b16d07c8288e45ab508c4b SHA512 5e3aa5b23f710302c24eaa681a9ee83d947810489ef7836728cbe780e9beecb7f6b6428b746ce40d223f51d2c8a7704d144ddb595f76842806f7ec39a29bf8ac
 MISC metadata.xml 497 BLAKE2B 8517491ae43f5a339d49b10ac0acf928e942e69e4ff56d679fefc4ea102c8026f88442d77ab01411c8fa3b13348b590c53dfcfc849750ce488b7254ae6983090 SHA512 2062034fb1b59354a7f1c154ed059c602beba4959a984a3bd3d0abcc7c0b8449186f7c2a44acf325c5bb142bc2dfed3321b0eb25c041dacd121c23cf0281fb96
diff --git a/app-misc/tracker/tracker-3.1.1.ebuild b/app-misc/tracker/tracker-3.1.1.ebuild
index 0593bbbcb0c6..27a3c85ecf71 100644
--- a/app-misc/tracker/tracker-3.1.1.ebuild
+++ b/app-misc/tracker/tracker-3.1.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="3/0" # libtracker-sparql-3.0 soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="gtk-doc +miners stemmer test"
 RESTRICT="!test? ( test )"